From e6ebb8c16b3f41976e41b86ed5d4d130ed80fa32 Mon Sep 17 00:00:00 2001 From: ripkurrle Date: Wed, 26 Jun 2024 14:41:29 +0100 Subject: [PATCH 01/28] docs(website): fix typo (#878) --- website/docs/05_comparisons/02_timoni.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/docs/05_comparisons/02_timoni.md b/website/docs/05_comparisons/02_timoni.md index e52e44ce7..4c75cb59a 100644 --- a/website/docs/05_comparisons/02_timoni.md +++ b/website/docs/05_comparisons/02_timoni.md @@ -11,7 +11,7 @@ description: Timoni installs and updates cloud-native applications as bundles (O Timoni is closer related to Helm than Glasskube, but brings some features and new approaches to the table Helm doesn't offer. Its bundles are OCI images, so the only way to install these bundles is to publish them first to an OCI registry, -which makes additional security features like image (co-)singing possible. +which makes additional security features like image (co-)signing possible. Similar to Glasskube it performs garbage collection of orphan resources after an uninstallation operation. Timoni is generally more mature than Glasskube. However, it doesn't prioritize making standard package installation and upgrades easy. From 921d049ff4f3575ee863a1f2ed3f5b78ea94bf47 Mon Sep 17 00:00:00 2001 From: Jakob Steiner Date: Wed, 26 Jun 2024 16:33:18 +0200 Subject: [PATCH 02/28] fix(open): fix typo in service name candidate (#885) Signed-off-by: Jakob Steiner --- pkg/open/open.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/open/open.go b/pkg/open/open.go index cf090afb8..a7038f264 100644 --- a/pkg/open/open.go +++ b/pkg/open/open.go @@ -204,8 +204,8 @@ func (o *opener) service( if manifest.Helm != nil { svcNameCandidates = append(svcNameCandidates, - strings.Join([]string{pkg.GetName(), entrypoint.Name}, "-"), - strings.Join([]string{names.HelmResourceName(pkg, manifest), entrypoint.Name}, "-"), + strings.Join([]string{pkg.GetName(), entrypoint.ServiceName}, "-"), + strings.Join([]string{names.HelmResourceName(pkg, manifest), entrypoint.ServiceName}, "-"), names.HelmResourceName(pkg, manifest), ) } From 146dc25b11771cb81aa782fa9ec4895bccdd4a07 Mon Sep 17 00:00:00 2001 From: Shoaib Akhtar Date: Wed, 26 Jun 2024 20:44:39 +0530 Subject: [PATCH 03/28] docs(website): fix broken link (#886) --- website/docs/03_components/02_package-operator.md | 4 ++-- website/guides/01_cert-manager.mdx | 2 +- website/guides/02_ingress-nginx.mdx | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/website/docs/03_components/02_package-operator.md b/website/docs/03_components/02_package-operator.md index 2a7f1e543..55709b8ca 100644 --- a/website/docs/03_components/02_package-operator.md +++ b/website/docs/03_components/02_package-operator.md @@ -7,7 +7,7 @@ The package operator follows the [Kubernetes Operator Pattern](https://kubernete The Package controller manages the `Package` resources of the cluster. Whenever a `Package` has been created, changed or deleted these changes will be picked up and applied by the Package controller. -The Package controller also makes sure that dependencies of a `Package` are met without conflicting installations, by applying the logic described [here](#dependency-management). +The Package controller also makes sure that dependencies of a `Package` are met without conflicting installations, by applying the logic described [here](../04_design/dependency-management.md). ## PackageInfo Controller @@ -69,4 +69,4 @@ while there might already be a prerelease of a new major version like `v2.0.0-al Instead of fetching `repository.xyz/package-name/package.yaml`, the operator fetches `repository.xyz/package-name/version/package.yaml` -Check the [package repository docs](../package-repository#structure) and [dependency management docs](../04_design/dependency-management.md) for more information. +Check the [package repository docs](./03_package-repository.md#structure) and [dependency management docs](../04_design/dependency-management.md) for more information. diff --git a/website/guides/01_cert-manager.mdx b/website/guides/01_cert-manager.mdx index e65ebb7c8..c62abe53c 100644 --- a/website/guides/01_cert-manager.mdx +++ b/website/guides/01_cert-manager.mdx @@ -128,7 +128,7 @@ kubectl apply -f cluster-issuer.yaml ``` Cert-manager creates an Ingress to validate the ACME challenge, if no Ingress controller is already installed in -the cluster the [ingress-nginx controller](./ingress-nginx) can easily be installed with Glasskube. +the cluster the [ingress-nginx controller](./02_ingress-nginx.mdx) can easily be installed with Glasskube. Further links about cert-manager: diff --git a/website/guides/02_ingress-nginx.mdx b/website/guides/02_ingress-nginx.mdx index ef8e6aa96..6fd7db197 100644 --- a/website/guides/02_ingress-nginx.mdx +++ b/website/guides/02_ingress-nginx.mdx @@ -142,7 +142,7 @@ spec: This Ingress tells the controller that all traffic to the domain "app.your-company.com" with a path prefix of "/" should be routed to a Service in the same namespace named "your-app". With the addition of a `cert-manager.io/cluster-issuer` annotation and `tls` block, it also instructs [cert-manager](https://cert-manager.io/) to issue a certificate for this domain name. -To learn more about cert-manager, check out [our guide on how to install cert-manager using Glasskube](./cert-manager). +To learn more about cert-manager, check out [our guide on how to install cert-manager using Glasskube](./01_cert-manager.mdx). Further links about ingress-nginx: From 613cbb728da7cd1329b75b3148b17c2cb01ea50b Mon Sep 17 00:00:00 2001 From: Mridul Dhiman <60432617+MridulDhiman@users.noreply.github.com> Date: Thu, 27 Jun 2024 14:27:46 +0530 Subject: [PATCH 04/28] chore(website): configure eslint with docusaurus, react-ts and prettier plugins (#858) Signed-off-by: Mridul Dhiman --- website/.prettierignore | 9 + website/.prettierrc.mjs | 11 + website/eslint.config.mjs | 52 + website/package-lock.json | 2243 +++++++++++++++++++++++++++++-------- website/package.json | 17 +- 5 files changed, 1891 insertions(+), 441 deletions(-) create mode 100644 website/.prettierignore create mode 100644 website/.prettierrc.mjs create mode 100644 website/eslint.config.mjs diff --git a/website/.prettierignore b/website/.prettierignore new file mode 100644 index 000000000..77c3fa4d8 --- /dev/null +++ b/website/.prettierignore @@ -0,0 +1,9 @@ +node_modules +/build +.docusaurus +.cache-loader +.DS_Store +.env.local +.env.development.local +.env.test.local +.env.production.local diff --git a/website/.prettierrc.mjs b/website/.prettierrc.mjs new file mode 100644 index 000000000..aaab946a0 --- /dev/null +++ b/website/.prettierrc.mjs @@ -0,0 +1,11 @@ +export default { + arrowParens: "avoid", + bracketSameLine: true, + bracketSpacing: false, + singleQuote: true, + trailingComma: "all", + tabWidth: 2, + useTabs: false, + semi: true, + printWidth: 80, +}; diff --git a/website/eslint.config.mjs b/website/eslint.config.mjs new file mode 100644 index 000000000..a998af6e8 --- /dev/null +++ b/website/eslint.config.mjs @@ -0,0 +1,52 @@ +import globals from "globals"; +import pluginJs from "@eslint/js"; +import * as tseslint from "typescript-eslint"; +import pluginReactConfig from "eslint-plugin-react/configs/recommended.js"; +import prettierEslintPlugin from "eslint-plugin-prettier"; +import docusaurusEslintPlugin from "@docusaurus/eslint-plugin"; +import pluginPrettierConfig from "eslint-config-prettier"; + +/** @type {import('eslint').Linter.FlatConfig[]} */ +export default [ + {ignores: [".docusaurus/*", "build/*"]}, + { + plugins: { + prettier: prettierEslintPlugin, + "@docusaurus": docusaurusEslintPlugin, + }, + }, + { + languageOptions: { + parser: tseslint.parser, + parserOptions: { + ecmaFeatures: {jsx: true}, + sourceType: "module" + }, + globals: { + ...globals.browser, + ...globals.es2021, + ...globals.node + }, + }, + }, + pluginJs.configs.recommended, + ...tseslint.configs.recommended, + pluginPrettierConfig, + pluginReactConfig, + { + settings: { + react: { + version: "detect", + }, + }, + }, + { + rules: { + "prettier/prettier": "warn", + "@docusaurus/string-literal-i18n-messages": "warn", + "@docusaurus/no-untranslated-text": "warn", + "@docusaurus/no-html-links": "warn", + "react/react-in-jsx-scope": "off" + }, + }, +]; \ No newline at end of file diff --git a/website/package-lock.json b/website/package-lock.json index 22ddf0d56..415b2685a 100644 --- a/website/package-lock.json +++ b/website/package-lock.json @@ -34,11 +34,21 @@ "typewriter-effect": "^2.21.0" }, "devDependencies": { + "@docusaurus/eslint-plugin": "^3.4.0", "@docusaurus/module-type-aliases": "3.4.0", "@docusaurus/tsconfig": "3.4.0", "@docusaurus/types": "3.4.0", + "@eslint/js": "^9.5.0", + "@types/eslint": "^8.56.10", + "eslint": "^8.57.0", + "eslint-config-prettier": "^9.1.0", "eslint-plugin-import": "^2.29.1", - "typescript": "~5.5.0" + "eslint-plugin-prettier": "^5.1.3", + "eslint-plugin-react": "^7.34.3", + "globals": "^15.6.0", + "prettier": "^3.3.2", + "typescript": "~5.5.0", + "typescript-eslint": "^7.14.1" }, "engines": { "node": ">=18.0" @@ -49,7 +59,6 @@ "resolved": "https://registry.npmjs.org/@aashutoshrathi/word-wrap/-/word-wrap-1.2.6.tgz", "integrity": "sha512-1Yjs2SvM8TflER/OD3cOjhWWOZb58A2t7wpE2S9XfBYTiIl+XFhQG2bjy4Pu1I+EAlCNUzRDYDdFwFYUKvXcIA==", "devOptional": true, - "peer": true, "engines": { "node": ">=0.10.0" } @@ -1197,6 +1206,14 @@ "@babel/core": "^7.0.0-0" } }, + "node_modules/@babel/plugin-transform-classes/node_modules/globals": { + "version": "11.12.0", + "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz", + "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==", + "engines": { + "node": ">=4" + } + }, "node_modules/@babel/plugin-transform-computed-properties": { "version": "7.23.3", "resolved": "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.23.3.tgz", @@ -2125,6 +2142,14 @@ "node": ">=6.9.0" } }, + "node_modules/@babel/traverse/node_modules/globals": { + "version": "11.12.0", + "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz", + "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==", + "engines": { + "node": ">=4" + } + }, "node_modules/@babel/types": { "version": "7.23.6", "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.23.6.tgz", @@ -2297,6 +2322,22 @@ "node": ">=18.0" } }, + "node_modules/@docusaurus/eslint-plugin": { + "version": "3.4.0", + "resolved": "https://registry.npmjs.org/@docusaurus/eslint-plugin/-/eslint-plugin-3.4.0.tgz", + "integrity": "sha512-3Y9SwkxwY36TmsvZGyLZepifHbXIjZHMEFGuPcvtkFNnVgFIUkoAkf17GfwKKHnAloYVG/hpLV1m8q2BVKSLNQ==", + "dev": true, + "dependencies": { + "@typescript-eslint/utils": "^5.62.0", + "tslib": "^2.6.0" + }, + "engines": { + "node": ">=18.0" + }, + "peerDependencies": { + "eslint": ">=6" + } + }, "node_modules/@docusaurus/logger": { "version": "3.4.0", "resolved": "https://registry.npmjs.org/@docusaurus/logger/-/logger-3.4.0.tgz", @@ -2985,7 +3026,6 @@ "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.4.0.tgz", "integrity": "sha512-1/sA4dwrzBAyeUoQ6oxahHKmrZvsnLCg4RfxW3ZFGGmQkSNQPFNLV9CUEFQP1x9EYXHTo5p6xdhZM1Ne9p/AfA==", "devOptional": true, - "peer": true, "dependencies": { "eslint-visitor-keys": "^3.3.0" }, @@ -3001,7 +3041,6 @@ "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.10.0.tgz", "integrity": "sha512-Cu96Sd2By9mCNTx2iyKOmq10v22jUVQv0lQnlGNy16oE9589yE+QADPbrMGCkA51cKZSg3Pu/aTJVTGfL/qjUA==", "devOptional": true, - "peer": true, "engines": { "node": "^12.0.0 || ^14.0.0 || >=16.0.0" } @@ -3011,7 +3050,6 @@ "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.1.4.tgz", "integrity": "sha512-269Z39MS6wVJtsoUl10L60WdkhJVdPG24Q4eZTH3nnF6lpvSShEK3wQjDX9JRWAUPvPh7COouPpU9IrqaZFvtQ==", "devOptional": true, - "peer": true, "dependencies": { "ajv": "^6.12.4", "debug": "^4.3.2", @@ -3035,7 +3073,6 @@ "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz", "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==", "devOptional": true, - "peer": true, "dependencies": { "fast-deep-equal": "^3.1.1", "fast-json-stable-stringify": "^2.0.0", @@ -3052,7 +3089,6 @@ "resolved": "https://registry.npmjs.org/globals/-/globals-13.24.0.tgz", "integrity": "sha512-AhO5QUcj8llrbG09iWhPU2B204J1xnPeL8kQmVorSsy+Sjj1sk8gIyh6cUocGmH4L0UuhAJy+hJMRA4mgA4mFQ==", "devOptional": true, - "peer": true, "dependencies": { "type-fest": "^0.20.2" }, @@ -3067,15 +3103,13 @@ "version": "0.4.1", "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==", - "devOptional": true, - "peer": true + "devOptional": true }, "node_modules/@eslint/eslintrc/node_modules/type-fest": { "version": "0.20.2", "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz", "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==", "devOptional": true, - "peer": true, "engines": { "node": ">=10" }, @@ -3084,13 +3118,12 @@ } }, "node_modules/@eslint/js": { - "version": "8.56.0", - "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.56.0.tgz", - "integrity": "sha512-gMsVel9D7f2HLkBma9VbtzZRehRogVRfbr++f06nL2vnCGCNlzOD+/MUov/F4p8myyAHspEhVobgjpX64q5m6A==", - "devOptional": true, - "peer": true, + "version": "9.5.0", + "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.5.0.tgz", + "integrity": "sha512-A7+AOT2ICkodvtsWnxZP4Xxk3NbZ3VMHd8oihydLRGrJgqqdEz1qSeEgXYyT/Cu8h1TWWsQRejIx48mtjZ5y1w==", + "dev": true, "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" } }, "node_modules/@fontsource/inter": { @@ -3205,7 +3238,6 @@ "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.14.tgz", "integrity": "sha512-3T8LkOmg45BV5FICb15QQMsyUSWrQ8AygVfC7ZG32zOalnqrilm018ZVCw0eapXux8FtA33q8PSRSstjee3jSg==", "devOptional": true, - "peer": true, "dependencies": { "@humanwhocodes/object-schema": "^2.0.2", "debug": "^4.3.1", @@ -3220,7 +3252,6 @@ "resolved": "https://registry.npmjs.org/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz", "integrity": "sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==", "devOptional": true, - "peer": true, "engines": { "node": ">=12.22" }, @@ -3233,8 +3264,7 @@ "version": "2.0.2", "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-2.0.2.tgz", "integrity": "sha512-6EwiSjwWYP7pTckG6I5eyFANjPhmPjUX9JRLUSfNPC7FX7zK9gyZAfUEaECL6ALTpGX5AjnBq3C9XmVWPitNpw==", - "devOptional": true, - "peer": true + "devOptional": true }, "node_modules/@jest/schemas": { "version": "29.6.3", @@ -3668,6 +3698,18 @@ "node": ">= 8" } }, + "node_modules/@pkgr/core": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/@pkgr/core/-/core-0.1.1.tgz", + "integrity": "sha512-cq8o4cWH0ibXh9VGi5P20Tu9XF/0fFXl9EUinr9QfTM7a7p0oTA4iJRCQWppXR1Pg8dSM0UCItCkPwsk9qWWYA==", + "dev": true, + "engines": { + "node": "^12.20.0 || ^14.18.0 || >=16.0.0" + }, + "funding": { + "url": "https://opencollective.com/unts" + } + }, "node_modules/@pnpm/config.env-replace": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/@pnpm/config.env-replace/-/config.env-replace-1.1.0.tgz", @@ -4108,9 +4150,9 @@ } }, "node_modules/@types/eslint": { - "version": "8.56.2", - "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-8.56.2.tgz", - "integrity": "sha512-uQDwm1wFHmbBbCZCqAlq6Do9LYwByNZHWzXppSnay9SuwJ+VRbjkbLABer54kcPnMSlG6Fdiy2yaFXm/z9Z5gw==", + "version": "8.56.10", + "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-8.56.10.tgz", + "integrity": "sha512-Shavhk87gCtY2fhXDctcfS3e6FdxWkCx1iUZ9eEUbh7rTqlZT0/IzOkCOVt0fCjcFuZ9FPYfuezTBImfHCDBGQ==", "dependencies": { "@types/estree": "*", "@types/json-schema": "*" @@ -4354,6 +4396,12 @@ "resolved": "https://registry.npmjs.org/@types/scheduler/-/scheduler-0.16.8.tgz", "integrity": "sha512-WZLiwShhwLRmeV6zH+GkbOFT6Z6VklCItrDioxUnv+u4Ll+8vKeFySoFyK/0ctcRpOmwAicELfmys1sDc/Rw+A==" }, + "node_modules/@types/semver": { + "version": "7.5.8", + "resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.5.8.tgz", + "integrity": "sha512-I8EUhyrgfLrcTkzV3TSsGyl1tSuPrEDzr0yd5m90UgNxQkyDXULk3b6MlQqTCpZpNtWe1K0hzclnZkTcLBe2UQ==", + "dev": true + }, "node_modules/@types/send": { "version": "0.17.4", "resolved": "https://registry.npmjs.org/@types/send/-/send-0.17.4.tgz", @@ -4420,162 +4468,691 @@ "resolved": "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-21.0.3.tgz", "integrity": "sha512-I4q9QU9MQv4oEOz4tAHJtNz1cwuLxn2F3xcc2iV5WdqLPpUnj30aUuxt1mAxYTG+oe8CZMV/+6rU4S4gRDzqtQ==" }, - "node_modules/@ungap/structured-clone": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/@ungap/structured-clone/-/structured-clone-1.2.0.tgz", - "integrity": "sha512-zuVdFrMJiuCDQUMCzQaD6KL28MjnqqN8XnAqiEq9PNm/hCPTSGfrXCOfwj1ow4LFb/tNymJPwsNbVePc1xFqrQ==" - }, - "node_modules/@webassemblyjs/ast": { - "version": "1.11.6", - "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.11.6.tgz", - "integrity": "sha512-IN1xI7PwOvLPgjcf180gC1bqn3q/QaOCwYUahIOhbYUu8KA/3tw2RT/T0Gidi1l7Hhj5D/INhJxiICObqpMu4Q==", - "dependencies": { - "@webassemblyjs/helper-numbers": "1.11.6", - "@webassemblyjs/helper-wasm-bytecode": "1.11.6" - } - }, - "node_modules/@webassemblyjs/floating-point-hex-parser": { - "version": "1.11.6", - "resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.6.tgz", - "integrity": "sha512-ejAj9hfRJ2XMsNHk/v6Fu2dGS+i4UaXBXGemOfQ/JfQ6mdQg/WXtwleQRLLS4OvfDhv8rYnVwH27YJLMyYsxhw==" - }, - "node_modules/@webassemblyjs/helper-api-error": { - "version": "1.11.6", - "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.6.tgz", - "integrity": "sha512-o0YkoP4pVu4rN8aTJgAyj9hC2Sv5UlkzCHhxqWj8butaLvnpdc2jOwh4ewE6CX0txSfLn/UYaV/pheS2Txg//Q==" - }, - "node_modules/@webassemblyjs/helper-buffer": { - "version": "1.11.6", - "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.11.6.tgz", - "integrity": "sha512-z3nFzdcp1mb8nEOFFk8DrYLpHvhKC3grJD2ardfKOzmbmJvEf/tPIqCY+sNcwZIY8ZD7IkB2l7/pqhUhqm7hLA==" - }, - "node_modules/@webassemblyjs/helper-numbers": { - "version": "1.11.6", - "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.6.tgz", - "integrity": "sha512-vUIhZ8LZoIWHBohiEObxVm6hwP034jwmc9kuq5GdHZH0wiLVLIPcMCdpJzG4C11cHoQ25TFIQj9kaVADVX7N3g==", + "node_modules/@typescript-eslint/eslint-plugin": { + "version": "7.14.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-7.14.1.tgz", + "integrity": "sha512-aAJd6bIf2vvQRjUG3ZkNXkmBpN+J7Wd0mfQiiVCJMu9Z5GcZZdcc0j8XwN/BM97Fl7e3SkTXODSk4VehUv7CGw==", + "dev": true, "dependencies": { - "@webassemblyjs/floating-point-hex-parser": "1.11.6", - "@webassemblyjs/helper-api-error": "1.11.6", - "@xtuc/long": "4.2.2" + "@eslint-community/regexpp": "^4.10.0", + "@typescript-eslint/scope-manager": "7.14.1", + "@typescript-eslint/type-utils": "7.14.1", + "@typescript-eslint/utils": "7.14.1", + "@typescript-eslint/visitor-keys": "7.14.1", + "graphemer": "^1.4.0", + "ignore": "^5.3.1", + "natural-compare": "^1.4.0", + "ts-api-utils": "^1.3.0" + }, + "engines": { + "node": "^18.18.0 || >=20.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + }, + "peerDependencies": { + "@typescript-eslint/parser": "^7.0.0", + "eslint": "^8.56.0" + }, + "peerDependenciesMeta": { + "typescript": { + "optional": true + } } }, - "node_modules/@webassemblyjs/helper-wasm-bytecode": { - "version": "1.11.6", - "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.6.tgz", - "integrity": "sha512-sFFHKwcmBprO9e7Icf0+gddyWYDViL8bpPjJJl0WHxCdETktXdmtWLGVzoHbqUcY4Be1LkNfwTmXOJUFZYSJdA==" - }, - "node_modules/@webassemblyjs/helper-wasm-section": { - "version": "1.11.6", - "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.11.6.tgz", - "integrity": "sha512-LPpZbSOwTpEC2cgn4hTydySy1Ke+XEu+ETXuoyvuyezHO3Kjdu90KK95Sh9xTbmjrCsUwvWwCOQQNta37VrS9g==", + "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/scope-manager": { + "version": "7.14.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-7.14.1.tgz", + "integrity": "sha512-gPrFSsoYcsffYXTOZ+hT7fyJr95rdVe4kGVX1ps/dJ+DfmlnjFN/GcMxXcVkeHDKqsq6uAcVaQaIi3cFffmAbA==", + "dev": true, "dependencies": { - "@webassemblyjs/ast": "1.11.6", - "@webassemblyjs/helper-buffer": "1.11.6", - "@webassemblyjs/helper-wasm-bytecode": "1.11.6", - "@webassemblyjs/wasm-gen": "1.11.6" + "@typescript-eslint/types": "7.14.1", + "@typescript-eslint/visitor-keys": "7.14.1" + }, + "engines": { + "node": "^18.18.0 || >=20.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" } }, - "node_modules/@webassemblyjs/ieee754": { - "version": "1.11.6", - "resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.11.6.tgz", - "integrity": "sha512-LM4p2csPNvbij6U1f19v6WR56QZ8JcHg3QIJTlSwzFcmx6WSORicYj6I63f9yU1kEUtrpG+kjkiIAkevHpDXrg==", - "dependencies": { - "@xtuc/ieee754": "^1.2.0" + "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/types": { + "version": "7.14.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-7.14.1.tgz", + "integrity": "sha512-mL7zNEOQybo5R3AavY+Am7KLv8BorIv7HCYS5rKoNZKQD9tsfGUpO4KdAn3sSUvTiS4PQkr2+K0KJbxj8H9NDg==", + "dev": true, + "engines": { + "node": "^18.18.0 || >=20.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" } }, - "node_modules/@webassemblyjs/leb128": { - "version": "1.11.6", - "resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.11.6.tgz", - "integrity": "sha512-m7a0FhE67DQXgouf1tbN5XQcdWoNgaAuoULHIfGFIEVKA6tu/edls6XnIlkmS6FrXAquJRPni3ZZKjw6FSPjPQ==", + "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/typescript-estree": { + "version": "7.14.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-7.14.1.tgz", + "integrity": "sha512-k5d0VuxViE2ulIO6FbxxSZaxqDVUyMbXcidC8rHvii0I56XZPv8cq+EhMns+d/EVIL41sMXqRbK3D10Oza1bbA==", + "dev": true, "dependencies": { - "@xtuc/long": "4.2.2" + "@typescript-eslint/types": "7.14.1", + "@typescript-eslint/visitor-keys": "7.14.1", + "debug": "^4.3.4", + "globby": "^11.1.0", + "is-glob": "^4.0.3", + "minimatch": "^9.0.4", + "semver": "^7.6.0", + "ts-api-utils": "^1.3.0" + }, + "engines": { + "node": "^18.18.0 || >=20.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + }, + "peerDependenciesMeta": { + "typescript": { + "optional": true + } } }, - "node_modules/@webassemblyjs/utf8": { - "version": "1.11.6", - "resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.11.6.tgz", - "integrity": "sha512-vtXf2wTQ3+up9Zsg8sa2yWiQpzSsMyXj0qViVP6xKGCUT8p8YJ6HqI7l5eCnWx1T/FYdsv07HQs2wTFbbof/RA==" - }, - "node_modules/@webassemblyjs/wasm-edit": { - "version": "1.11.6", - "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.11.6.tgz", - "integrity": "sha512-Ybn2I6fnfIGuCR+Faaz7YcvtBKxvoLV3Lebn1tM4o/IAJzmi9AWYIPWpyBfU8cC+JxAO57bk4+zdsTjJR+VTOw==", + "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/utils": { + "version": "7.14.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-7.14.1.tgz", + "integrity": "sha512-CMmVVELns3nak3cpJhZosDkm63n+DwBlDX8g0k4QUa9BMnF+lH2lr3d130M1Zt1xxmB3LLk3NV7KQCq86ZBBhQ==", + "dev": true, "dependencies": { - "@webassemblyjs/ast": "1.11.6", - "@webassemblyjs/helper-buffer": "1.11.6", - "@webassemblyjs/helper-wasm-bytecode": "1.11.6", - "@webassemblyjs/helper-wasm-section": "1.11.6", - "@webassemblyjs/wasm-gen": "1.11.6", - "@webassemblyjs/wasm-opt": "1.11.6", - "@webassemblyjs/wasm-parser": "1.11.6", - "@webassemblyjs/wast-printer": "1.11.6" + "@eslint-community/eslint-utils": "^4.4.0", + "@typescript-eslint/scope-manager": "7.14.1", + "@typescript-eslint/types": "7.14.1", + "@typescript-eslint/typescript-estree": "7.14.1" + }, + "engines": { + "node": "^18.18.0 || >=20.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + }, + "peerDependencies": { + "eslint": "^8.56.0" } }, - "node_modules/@webassemblyjs/wasm-gen": { - "version": "1.11.6", - "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.11.6.tgz", - "integrity": "sha512-3XOqkZP/y6B4F0PBAXvI1/bky7GryoogUtfwExeP/v7Nzwo1QLcq5oQmpKlftZLbT+ERUOAZVQjuNVak6UXjPA==", + "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/visitor-keys": { + "version": "7.14.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-7.14.1.tgz", + "integrity": "sha512-Crb+F75U1JAEtBeQGxSKwI60hZmmzaqA3z9sYsVm8X7W5cwLEm5bRe0/uXS6+MR/y8CVpKSR/ontIAIEPFcEkA==", + "dev": true, "dependencies": { - "@webassemblyjs/ast": "1.11.6", - "@webassemblyjs/helper-wasm-bytecode": "1.11.6", - "@webassemblyjs/ieee754": "1.11.6", - "@webassemblyjs/leb128": "1.11.6", - "@webassemblyjs/utf8": "1.11.6" + "@typescript-eslint/types": "7.14.1", + "eslint-visitor-keys": "^3.4.3" + }, + "engines": { + "node": "^18.18.0 || >=20.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" } }, - "node_modules/@webassemblyjs/wasm-opt": { - "version": "1.11.6", - "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.11.6.tgz", - "integrity": "sha512-cOrKuLRE7PCe6AsOVl7WasYf3wbSo4CeOk6PkrjS7g57MFfVUF9u6ysQBBODX0LdgSvQqRiGz3CXvIDKcPNy4g==", + "node_modules/@typescript-eslint/eslint-plugin/node_modules/brace-expansion": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", + "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", + "dev": true, "dependencies": { - "@webassemblyjs/ast": "1.11.6", - "@webassemblyjs/helper-buffer": "1.11.6", - "@webassemblyjs/wasm-gen": "1.11.6", - "@webassemblyjs/wasm-parser": "1.11.6" + "balanced-match": "^1.0.0" } }, - "node_modules/@webassemblyjs/wasm-parser": { - "version": "1.11.6", - "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.11.6.tgz", - "integrity": "sha512-6ZwPeGzMJM3Dqp3hCsLgESxBGtT/OeCvCZ4TA1JUPYgmhAx38tTPR9JaKy0S5H3evQpO/h2uWs2j6Yc/fjkpTQ==", + "node_modules/@typescript-eslint/eslint-plugin/node_modules/minimatch": { + "version": "9.0.4", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.4.tgz", + "integrity": "sha512-KqWh+VchfxcMNRAJjj2tnsSJdNbHsVgnkBhTNrW7AjVo6OvLtxw8zfT9oLw1JSohlFzJ8jCoTgaoXvJ+kHt6fw==", + "dev": true, "dependencies": { - "@webassemblyjs/ast": "1.11.6", - "@webassemblyjs/helper-api-error": "1.11.6", - "@webassemblyjs/helper-wasm-bytecode": "1.11.6", - "@webassemblyjs/ieee754": "1.11.6", - "@webassemblyjs/leb128": "1.11.6", - "@webassemblyjs/utf8": "1.11.6" + "brace-expansion": "^2.0.1" + }, + "engines": { + "node": ">=16 || 14 >=14.17" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" } }, - "node_modules/@webassemblyjs/wast-printer": { - "version": "1.11.6", - "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.11.6.tgz", - "integrity": "sha512-JM7AhRcE+yW2GWYaKeHL5vt4xqee5N2WcezptmgyhNS+ScggqcT1OtXykhAb13Sn5Yas0j2uv9tHgrjwvzAP4A==", + "node_modules/@typescript-eslint/parser": { + "version": "7.14.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-7.14.1.tgz", + "integrity": "sha512-8lKUOebNLcR0D7RvlcloOacTOWzOqemWEWkKSVpMZVF/XVcwjPR+3MD08QzbW9TCGJ+DwIc6zUSGZ9vd8cO1IA==", + "dev": true, "dependencies": { - "@webassemblyjs/ast": "1.11.6", - "@xtuc/long": "4.2.2" + "@typescript-eslint/scope-manager": "7.14.1", + "@typescript-eslint/types": "7.14.1", + "@typescript-eslint/typescript-estree": "7.14.1", + "@typescript-eslint/visitor-keys": "7.14.1", + "debug": "^4.3.4" + }, + "engines": { + "node": "^18.18.0 || >=20.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + }, + "peerDependencies": { + "eslint": "^8.56.0" + }, + "peerDependenciesMeta": { + "typescript": { + "optional": true + } } }, - "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==" - }, - "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==" - }, - "node_modules/accepts": { - "version": "1.3.8", - "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.8.tgz", - "integrity": "sha512-PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw==", + "node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/scope-manager": { + "version": "7.14.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-7.14.1.tgz", + "integrity": "sha512-gPrFSsoYcsffYXTOZ+hT7fyJr95rdVe4kGVX1ps/dJ+DfmlnjFN/GcMxXcVkeHDKqsq6uAcVaQaIi3cFffmAbA==", + "dev": true, "dependencies": { - "mime-types": "~2.1.34", - "negotiator": "0.6.3" + "@typescript-eslint/types": "7.14.1", + "@typescript-eslint/visitor-keys": "7.14.1" }, "engines": { - "node": ">= 0.6" + "node": "^18.18.0 || >=20.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + } + }, + "node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/types": { + "version": "7.14.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-7.14.1.tgz", + "integrity": "sha512-mL7zNEOQybo5R3AavY+Am7KLv8BorIv7HCYS5rKoNZKQD9tsfGUpO4KdAn3sSUvTiS4PQkr2+K0KJbxj8H9NDg==", + "dev": true, + "engines": { + "node": "^18.18.0 || >=20.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + } + }, + "node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/typescript-estree": { + "version": "7.14.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-7.14.1.tgz", + "integrity": "sha512-k5d0VuxViE2ulIO6FbxxSZaxqDVUyMbXcidC8rHvii0I56XZPv8cq+EhMns+d/EVIL41sMXqRbK3D10Oza1bbA==", + "dev": true, + "dependencies": { + "@typescript-eslint/types": "7.14.1", + "@typescript-eslint/visitor-keys": "7.14.1", + "debug": "^4.3.4", + "globby": "^11.1.0", + "is-glob": "^4.0.3", + "minimatch": "^9.0.4", + "semver": "^7.6.0", + "ts-api-utils": "^1.3.0" + }, + "engines": { + "node": "^18.18.0 || >=20.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + }, + "peerDependenciesMeta": { + "typescript": { + "optional": true + } + } + }, + "node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/visitor-keys": { + "version": "7.14.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-7.14.1.tgz", + "integrity": "sha512-Crb+F75U1JAEtBeQGxSKwI60hZmmzaqA3z9sYsVm8X7W5cwLEm5bRe0/uXS6+MR/y8CVpKSR/ontIAIEPFcEkA==", + "dev": true, + "dependencies": { + "@typescript-eslint/types": "7.14.1", + "eslint-visitor-keys": "^3.4.3" + }, + "engines": { + "node": "^18.18.0 || >=20.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + } + }, + "node_modules/@typescript-eslint/parser/node_modules/brace-expansion": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", + "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", + "dev": true, + "dependencies": { + "balanced-match": "^1.0.0" + } + }, + "node_modules/@typescript-eslint/parser/node_modules/minimatch": { + "version": "9.0.4", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.4.tgz", + "integrity": "sha512-KqWh+VchfxcMNRAJjj2tnsSJdNbHsVgnkBhTNrW7AjVo6OvLtxw8zfT9oLw1JSohlFzJ8jCoTgaoXvJ+kHt6fw==", + "dev": true, + "dependencies": { + "brace-expansion": "^2.0.1" + }, + "engines": { + "node": ">=16 || 14 >=14.17" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/@typescript-eslint/scope-manager": { + "version": "5.62.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.62.0.tgz", + "integrity": "sha512-VXuvVvZeQCQb5Zgf4HAxc04q5j+WrNAtNh9OwCsCgpKqESMTu3tF/jhZ3xG6T4NZwWl65Bg8KuS2uEvhSfLl0w==", + "dev": true, + "dependencies": { + "@typescript-eslint/types": "5.62.0", + "@typescript-eslint/visitor-keys": "5.62.0" + }, + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + } + }, + "node_modules/@typescript-eslint/type-utils": { + "version": "7.14.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-7.14.1.tgz", + "integrity": "sha512-/MzmgNd3nnbDbOi3LfasXWWe292+iuo+umJ0bCCMCPc1jLO/z2BQmWUUUXvXLbrQey/JgzdF/OV+I5bzEGwJkQ==", + "dev": true, + "dependencies": { + "@typescript-eslint/typescript-estree": "7.14.1", + "@typescript-eslint/utils": "7.14.1", + "debug": "^4.3.4", + "ts-api-utils": "^1.3.0" + }, + "engines": { + "node": "^18.18.0 || >=20.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + }, + "peerDependencies": { + "eslint": "^8.56.0" + }, + "peerDependenciesMeta": { + "typescript": { + "optional": true + } + } + }, + "node_modules/@typescript-eslint/type-utils/node_modules/@typescript-eslint/scope-manager": { + "version": "7.14.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-7.14.1.tgz", + "integrity": "sha512-gPrFSsoYcsffYXTOZ+hT7fyJr95rdVe4kGVX1ps/dJ+DfmlnjFN/GcMxXcVkeHDKqsq6uAcVaQaIi3cFffmAbA==", + "dev": true, + "dependencies": { + "@typescript-eslint/types": "7.14.1", + "@typescript-eslint/visitor-keys": "7.14.1" + }, + "engines": { + "node": "^18.18.0 || >=20.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + } + }, + "node_modules/@typescript-eslint/type-utils/node_modules/@typescript-eslint/types": { + "version": "7.14.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-7.14.1.tgz", + "integrity": "sha512-mL7zNEOQybo5R3AavY+Am7KLv8BorIv7HCYS5rKoNZKQD9tsfGUpO4KdAn3sSUvTiS4PQkr2+K0KJbxj8H9NDg==", + "dev": true, + "engines": { + "node": "^18.18.0 || >=20.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + } + }, + "node_modules/@typescript-eslint/type-utils/node_modules/@typescript-eslint/typescript-estree": { + "version": "7.14.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-7.14.1.tgz", + "integrity": "sha512-k5d0VuxViE2ulIO6FbxxSZaxqDVUyMbXcidC8rHvii0I56XZPv8cq+EhMns+d/EVIL41sMXqRbK3D10Oza1bbA==", + "dev": true, + "dependencies": { + "@typescript-eslint/types": "7.14.1", + "@typescript-eslint/visitor-keys": "7.14.1", + "debug": "^4.3.4", + "globby": "^11.1.0", + "is-glob": "^4.0.3", + "minimatch": "^9.0.4", + "semver": "^7.6.0", + "ts-api-utils": "^1.3.0" + }, + "engines": { + "node": "^18.18.0 || >=20.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + }, + "peerDependenciesMeta": { + "typescript": { + "optional": true + } + } + }, + "node_modules/@typescript-eslint/type-utils/node_modules/@typescript-eslint/utils": { + "version": "7.14.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-7.14.1.tgz", + "integrity": "sha512-CMmVVELns3nak3cpJhZosDkm63n+DwBlDX8g0k4QUa9BMnF+lH2lr3d130M1Zt1xxmB3LLk3NV7KQCq86ZBBhQ==", + "dev": true, + "dependencies": { + "@eslint-community/eslint-utils": "^4.4.0", + "@typescript-eslint/scope-manager": "7.14.1", + "@typescript-eslint/types": "7.14.1", + "@typescript-eslint/typescript-estree": "7.14.1" + }, + "engines": { + "node": "^18.18.0 || >=20.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + }, + "peerDependencies": { + "eslint": "^8.56.0" + } + }, + "node_modules/@typescript-eslint/type-utils/node_modules/@typescript-eslint/visitor-keys": { + "version": "7.14.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-7.14.1.tgz", + "integrity": "sha512-Crb+F75U1JAEtBeQGxSKwI60hZmmzaqA3z9sYsVm8X7W5cwLEm5bRe0/uXS6+MR/y8CVpKSR/ontIAIEPFcEkA==", + "dev": true, + "dependencies": { + "@typescript-eslint/types": "7.14.1", + "eslint-visitor-keys": "^3.4.3" + }, + "engines": { + "node": "^18.18.0 || >=20.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + } + }, + "node_modules/@typescript-eslint/type-utils/node_modules/brace-expansion": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", + "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", + "dev": true, + "dependencies": { + "balanced-match": "^1.0.0" + } + }, + "node_modules/@typescript-eslint/type-utils/node_modules/minimatch": { + "version": "9.0.4", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.4.tgz", + "integrity": "sha512-KqWh+VchfxcMNRAJjj2tnsSJdNbHsVgnkBhTNrW7AjVo6OvLtxw8zfT9oLw1JSohlFzJ8jCoTgaoXvJ+kHt6fw==", + "dev": true, + "dependencies": { + "brace-expansion": "^2.0.1" + }, + "engines": { + "node": ">=16 || 14 >=14.17" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/@typescript-eslint/types": { + "version": "5.62.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.62.0.tgz", + "integrity": "sha512-87NVngcbVXUahrRTqIK27gD2t5Cu1yuCXxbLcFtCzZGlfyVWWh8mLHkoxzjsB6DDNnvdL+fW8MiwPEJyGJQDgQ==", + "dev": true, + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + } + }, + "node_modules/@typescript-eslint/typescript-estree": { + "version": "5.62.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.62.0.tgz", + "integrity": "sha512-CmcQ6uY7b9y694lKdRB8FEel7JbU/40iSAPomu++SjLMntB+2Leay2LO6i8VnJk58MtE9/nQSFIH6jpyRWyYzA==", + "dev": true, + "dependencies": { + "@typescript-eslint/types": "5.62.0", + "@typescript-eslint/visitor-keys": "5.62.0", + "debug": "^4.3.4", + "globby": "^11.1.0", + "is-glob": "^4.0.3", + "semver": "^7.3.7", + "tsutils": "^3.21.0" + }, + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + }, + "peerDependenciesMeta": { + "typescript": { + "optional": true + } + } + }, + "node_modules/@typescript-eslint/utils": { + "version": "5.62.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.62.0.tgz", + "integrity": "sha512-n8oxjeb5aIbPFEtmQxQYOLI0i9n5ySBEY/ZEHHZqKQSFnxio1rv6dthascc9dLuwrL0RC5mPCxB7vnAVGAYWAQ==", + "dev": true, + "dependencies": { + "@eslint-community/eslint-utils": "^4.2.0", + "@types/json-schema": "^7.0.9", + "@types/semver": "^7.3.12", + "@typescript-eslint/scope-manager": "5.62.0", + "@typescript-eslint/types": "5.62.0", + "@typescript-eslint/typescript-estree": "5.62.0", + "eslint-scope": "^5.1.1", + "semver": "^7.3.7" + }, + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + }, + "peerDependencies": { + "eslint": "^6.0.0 || ^7.0.0 || ^8.0.0" + } + }, + "node_modules/@typescript-eslint/visitor-keys": { + "version": "5.62.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.62.0.tgz", + "integrity": "sha512-07ny+LHRzQXepkGg6w0mFY41fVUNBrL2Roj/++7V1txKugfjm/Ci/qSND03r2RhlJhJYMcTn9AhhSSqQp0Ysyw==", + "dev": true, + "dependencies": { + "@typescript-eslint/types": "5.62.0", + "eslint-visitor-keys": "^3.3.0" + }, + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + } + }, + "node_modules/@ungap/structured-clone": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/@ungap/structured-clone/-/structured-clone-1.2.0.tgz", + "integrity": "sha512-zuVdFrMJiuCDQUMCzQaD6KL28MjnqqN8XnAqiEq9PNm/hCPTSGfrXCOfwj1ow4LFb/tNymJPwsNbVePc1xFqrQ==" + }, + "node_modules/@webassemblyjs/ast": { + "version": "1.11.6", + "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.11.6.tgz", + "integrity": "sha512-IN1xI7PwOvLPgjcf180gC1bqn3q/QaOCwYUahIOhbYUu8KA/3tw2RT/T0Gidi1l7Hhj5D/INhJxiICObqpMu4Q==", + "dependencies": { + "@webassemblyjs/helper-numbers": "1.11.6", + "@webassemblyjs/helper-wasm-bytecode": "1.11.6" + } + }, + "node_modules/@webassemblyjs/floating-point-hex-parser": { + "version": "1.11.6", + "resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.6.tgz", + "integrity": "sha512-ejAj9hfRJ2XMsNHk/v6Fu2dGS+i4UaXBXGemOfQ/JfQ6mdQg/WXtwleQRLLS4OvfDhv8rYnVwH27YJLMyYsxhw==" + }, + "node_modules/@webassemblyjs/helper-api-error": { + "version": "1.11.6", + "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.6.tgz", + "integrity": "sha512-o0YkoP4pVu4rN8aTJgAyj9hC2Sv5UlkzCHhxqWj8butaLvnpdc2jOwh4ewE6CX0txSfLn/UYaV/pheS2Txg//Q==" + }, + "node_modules/@webassemblyjs/helper-buffer": { + "version": "1.11.6", + "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.11.6.tgz", + "integrity": "sha512-z3nFzdcp1mb8nEOFFk8DrYLpHvhKC3grJD2ardfKOzmbmJvEf/tPIqCY+sNcwZIY8ZD7IkB2l7/pqhUhqm7hLA==" + }, + "node_modules/@webassemblyjs/helper-numbers": { + "version": "1.11.6", + "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.6.tgz", + "integrity": "sha512-vUIhZ8LZoIWHBohiEObxVm6hwP034jwmc9kuq5GdHZH0wiLVLIPcMCdpJzG4C11cHoQ25TFIQj9kaVADVX7N3g==", + "dependencies": { + "@webassemblyjs/floating-point-hex-parser": "1.11.6", + "@webassemblyjs/helper-api-error": "1.11.6", + "@xtuc/long": "4.2.2" + } + }, + "node_modules/@webassemblyjs/helper-wasm-bytecode": { + "version": "1.11.6", + "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.6.tgz", + "integrity": "sha512-sFFHKwcmBprO9e7Icf0+gddyWYDViL8bpPjJJl0WHxCdETktXdmtWLGVzoHbqUcY4Be1LkNfwTmXOJUFZYSJdA==" + }, + "node_modules/@webassemblyjs/helper-wasm-section": { + "version": "1.11.6", + "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.11.6.tgz", + "integrity": "sha512-LPpZbSOwTpEC2cgn4hTydySy1Ke+XEu+ETXuoyvuyezHO3Kjdu90KK95Sh9xTbmjrCsUwvWwCOQQNta37VrS9g==", + "dependencies": { + "@webassemblyjs/ast": "1.11.6", + "@webassemblyjs/helper-buffer": "1.11.6", + "@webassemblyjs/helper-wasm-bytecode": "1.11.6", + "@webassemblyjs/wasm-gen": "1.11.6" + } + }, + "node_modules/@webassemblyjs/ieee754": { + "version": "1.11.6", + "resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.11.6.tgz", + "integrity": "sha512-LM4p2csPNvbij6U1f19v6WR56QZ8JcHg3QIJTlSwzFcmx6WSORicYj6I63f9yU1kEUtrpG+kjkiIAkevHpDXrg==", + "dependencies": { + "@xtuc/ieee754": "^1.2.0" + } + }, + "node_modules/@webassemblyjs/leb128": { + "version": "1.11.6", + "resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.11.6.tgz", + "integrity": "sha512-m7a0FhE67DQXgouf1tbN5XQcdWoNgaAuoULHIfGFIEVKA6tu/edls6XnIlkmS6FrXAquJRPni3ZZKjw6FSPjPQ==", + "dependencies": { + "@xtuc/long": "4.2.2" + } + }, + "node_modules/@webassemblyjs/utf8": { + "version": "1.11.6", + "resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.11.6.tgz", + "integrity": "sha512-vtXf2wTQ3+up9Zsg8sa2yWiQpzSsMyXj0qViVP6xKGCUT8p8YJ6HqI7l5eCnWx1T/FYdsv07HQs2wTFbbof/RA==" + }, + "node_modules/@webassemblyjs/wasm-edit": { + "version": "1.11.6", + "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.11.6.tgz", + "integrity": "sha512-Ybn2I6fnfIGuCR+Faaz7YcvtBKxvoLV3Lebn1tM4o/IAJzmi9AWYIPWpyBfU8cC+JxAO57bk4+zdsTjJR+VTOw==", + "dependencies": { + "@webassemblyjs/ast": "1.11.6", + "@webassemblyjs/helper-buffer": "1.11.6", + "@webassemblyjs/helper-wasm-bytecode": "1.11.6", + "@webassemblyjs/helper-wasm-section": "1.11.6", + "@webassemblyjs/wasm-gen": "1.11.6", + "@webassemblyjs/wasm-opt": "1.11.6", + "@webassemblyjs/wasm-parser": "1.11.6", + "@webassemblyjs/wast-printer": "1.11.6" + } + }, + "node_modules/@webassemblyjs/wasm-gen": { + "version": "1.11.6", + "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.11.6.tgz", + "integrity": "sha512-3XOqkZP/y6B4F0PBAXvI1/bky7GryoogUtfwExeP/v7Nzwo1QLcq5oQmpKlftZLbT+ERUOAZVQjuNVak6UXjPA==", + "dependencies": { + "@webassemblyjs/ast": "1.11.6", + "@webassemblyjs/helper-wasm-bytecode": "1.11.6", + "@webassemblyjs/ieee754": "1.11.6", + "@webassemblyjs/leb128": "1.11.6", + "@webassemblyjs/utf8": "1.11.6" + } + }, + "node_modules/@webassemblyjs/wasm-opt": { + "version": "1.11.6", + "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.11.6.tgz", + "integrity": "sha512-cOrKuLRE7PCe6AsOVl7WasYf3wbSo4CeOk6PkrjS7g57MFfVUF9u6ysQBBODX0LdgSvQqRiGz3CXvIDKcPNy4g==", + "dependencies": { + "@webassemblyjs/ast": "1.11.6", + "@webassemblyjs/helper-buffer": "1.11.6", + "@webassemblyjs/wasm-gen": "1.11.6", + "@webassemblyjs/wasm-parser": "1.11.6" + } + }, + "node_modules/@webassemblyjs/wasm-parser": { + "version": "1.11.6", + "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.11.6.tgz", + "integrity": "sha512-6ZwPeGzMJM3Dqp3hCsLgESxBGtT/OeCvCZ4TA1JUPYgmhAx38tTPR9JaKy0S5H3evQpO/h2uWs2j6Yc/fjkpTQ==", + "dependencies": { + "@webassemblyjs/ast": "1.11.6", + "@webassemblyjs/helper-api-error": "1.11.6", + "@webassemblyjs/helper-wasm-bytecode": "1.11.6", + "@webassemblyjs/ieee754": "1.11.6", + "@webassemblyjs/leb128": "1.11.6", + "@webassemblyjs/utf8": "1.11.6" + } + }, + "node_modules/@webassemblyjs/wast-printer": { + "version": "1.11.6", + "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.11.6.tgz", + "integrity": "sha512-JM7AhRcE+yW2GWYaKeHL5vt4xqee5N2WcezptmgyhNS+ScggqcT1OtXykhAb13Sn5Yas0j2uv9tHgrjwvzAP4A==", + "dependencies": { + "@webassemblyjs/ast": "1.11.6", + "@xtuc/long": "4.2.2" + } + }, + "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==" + }, + "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==" + }, + "node_modules/accepts": { + "version": "1.3.8", + "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.8.tgz", + "integrity": "sha512-PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw==", + "dependencies": { + "mime-types": "~2.1.34", + "negotiator": "0.6.3" + }, + "engines": { + "node": ">= 0.6" } }, "node_modules/accepts/node_modules/mime-db": { @@ -4808,13 +5385,16 @@ "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==" }, "node_modules/array-buffer-byte-length": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/array-buffer-byte-length/-/array-buffer-byte-length-1.0.0.tgz", - "integrity": "sha512-LPuwb2P+NrQw3XhxGc36+XSvuBPopovXYTR9Ew++Du9Yb/bx5AzBfrIsBoj0EZUifjQU+sHL21sseZ3jerWO/A==", + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/array-buffer-byte-length/-/array-buffer-byte-length-1.0.1.tgz", + "integrity": "sha512-ahC5W1xgou+KTXix4sAO8Ki12Q+jf4i0+tmk3sC+zgcynshkHxzpXdImBehiUYKKKDwvfFiJl1tZt6ewscS1Mg==", "dev": true, "dependencies": { - "call-bind": "^1.0.2", - "is-array-buffer": "^3.0.1" + "call-bind": "^1.0.5", + "is-array-buffer": "^3.0.4" + }, + "engines": { + "node": ">= 0.4" }, "funding": { "url": "https://github.com/sponsors/ljharb" @@ -4826,15 +5406,16 @@ "integrity": "sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg==" }, "node_modules/array-includes": { - "version": "3.1.7", - "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.1.7.tgz", - "integrity": "sha512-dlcsNBIiWhPkHdOEEKnehA+RNUWDc4UqFtnIXU4uuYDPtA4LDkr7qip2p0VvFAEXNDr0yWZ9PJyIRiGjRLQzwQ==", + "version": "3.1.8", + "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.1.8.tgz", + "integrity": "sha512-itaWrbYbqpGXkGhZPGUulwnhVf5Hpy1xiCFsGqyIGglbBxmG5vSjxQen3/WGOjPpNEv1RtBLKxbmVXm8HpJStQ==", "dev": true, "dependencies": { - "call-bind": "^1.0.2", - "define-properties": "^1.2.0", - "es-abstract": "^1.22.1", - "get-intrinsic": "^1.2.1", + "call-bind": "^1.0.7", + "define-properties": "^1.2.1", + "es-abstract": "^1.23.2", + "es-object-atoms": "^1.0.0", + "get-intrinsic": "^1.2.4", "is-string": "^1.0.7" }, "engines": { @@ -4852,6 +5433,26 @@ "node": ">=8" } }, + "node_modules/array.prototype.findlast": { + "version": "1.2.5", + "resolved": "https://registry.npmjs.org/array.prototype.findlast/-/array.prototype.findlast-1.2.5.tgz", + "integrity": "sha512-CVvd6FHg1Z3POpBLxO6E6zr+rSKEQ9L6rZHAaY7lLfhKsWYUBBOuMs0e9o24oopj6H+geRCX0YJ+TJLBK2eHyQ==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.7", + "define-properties": "^1.2.1", + "es-abstract": "^1.23.2", + "es-errors": "^1.3.0", + "es-object-atoms": "^1.0.0", + "es-shim-unscopables": "^1.0.2" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/array.prototype.findlastindex": { "version": "1.2.3", "resolved": "https://registry.npmjs.org/array.prototype.findlastindex/-/array.prototype.findlastindex-1.2.3.tgz", @@ -4907,18 +5508,47 @@ "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/arraybuffer.prototype.slice": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/arraybuffer.prototype.slice/-/arraybuffer.prototype.slice-1.0.2.tgz", - "integrity": "sha512-yMBKppFur/fbHu9/6USUe03bZ4knMYiwFBcyiaXB8Go0qNehwX6inYPzK9U0NeQvGxKthcmHcaR8P5MStSRBAw==", + "node_modules/array.prototype.toreversed": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/array.prototype.toreversed/-/array.prototype.toreversed-1.1.2.tgz", + "integrity": "sha512-wwDCoT4Ck4Cz7sLtgUmzR5UV3YF5mFHUlbChCzZBQZ+0m2cl/DH3tKgvphv1nKgFsJ48oCSg6p91q2Vm0I/ZMA==", "dev": true, "dependencies": { - "array-buffer-byte-length": "^1.0.0", "call-bind": "^1.0.2", "define-properties": "^1.2.0", "es-abstract": "^1.22.1", - "get-intrinsic": "^1.2.1", - "is-array-buffer": "^3.0.2", + "es-shim-unscopables": "^1.0.0" + } + }, + "node_modules/array.prototype.tosorted": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/array.prototype.tosorted/-/array.prototype.tosorted-1.1.4.tgz", + "integrity": "sha512-p6Fx8B7b7ZhL/gmUsAy0D15WhvDccw3mnGNbZpi3pmeJdxtWsj2jEaI4Y6oo3XiHfzuSgPwKc04MYt6KgvC/wA==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.7", + "define-properties": "^1.2.1", + "es-abstract": "^1.23.3", + "es-errors": "^1.3.0", + "es-shim-unscopables": "^1.0.2" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/arraybuffer.prototype.slice": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/arraybuffer.prototype.slice/-/arraybuffer.prototype.slice-1.0.3.tgz", + "integrity": "sha512-bMxMKAjg13EBSVscxTaYA4mRc5t1UAXa2kXiGTNfZ079HIWXEkKmkgFrh/nJqamaLSrXO5H4WFFkPEaLJWbs3A==", + "dev": true, + "dependencies": { + "array-buffer-byte-length": "^1.0.1", + "call-bind": "^1.0.5", + "define-properties": "^1.2.1", + "es-abstract": "^1.22.3", + "es-errors": "^1.2.1", + "get-intrinsic": "^1.2.3", + "is-array-buffer": "^3.0.4", "is-shared-array-buffer": "^1.0.2" }, "engines": { @@ -4991,10 +5621,13 @@ } }, "node_modules/available-typed-arrays": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/available-typed-arrays/-/available-typed-arrays-1.0.5.tgz", - "integrity": "sha512-DMD0KiN46eipeziST1LPP/STfDU0sufISXmjSgvVsoU2tqxctQeASejWcfNtxYKqETM1UxQ8sp2OrSBWpHY6sw==", + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/available-typed-arrays/-/available-typed-arrays-1.0.7.tgz", + "integrity": "sha512-wvUjBtSGN7+7SjNpq/9M2Tg350UZD3q62IFZLbRAR1bSMlCo1ZaeW+BJ+D090e4hIIZLBcTDWe4Mh4jvUDajzQ==", "dev": true, + "dependencies": { + "possible-typed-array-names": "^1.0.0" + }, "engines": { "node": ">= 0.4" }, @@ -5342,13 +5975,18 @@ } }, "node_modules/call-bind": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.5.tgz", - "integrity": "sha512-C3nQxfFZxFRVoJoGKKI8y3MOEo129NQ+FgQ08iye+Mk4zNZZGdjfs06bVTr+DBSlA66Q2VEcMki/cUCP4SercQ==", + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.7.tgz", + "integrity": "sha512-GHTSNSYICQ7scH7sZ+M2rFopRoLh8t2bLSW6BbgrtLsahOIB5iyAVJf9GjWK3cYTDaMj4XdBpM1cA6pIS0Kv2w==", "dependencies": { + "es-define-property": "^1.0.0", + "es-errors": "^1.3.0", "function-bind": "^1.1.2", - "get-intrinsic": "^1.2.1", - "set-function-length": "^1.1.1" + "get-intrinsic": "^1.2.4", + "set-function-length": "^1.2.1" + }, + "engines": { + "node": ">= 0.4" }, "funding": { "url": "https://github.com/sponsors/ljharb" @@ -6813,6 +7451,57 @@ "lodash-es": "^4.17.21" } }, + "node_modules/data-view-buffer": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/data-view-buffer/-/data-view-buffer-1.0.1.tgz", + "integrity": "sha512-0lht7OugA5x3iJLOWFhWK/5ehONdprk0ISXqVFn/NFrDu+cuc8iADFrGQz5BnRK7LLU3JmkbXSxaqX+/mXYtUA==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.6", + "es-errors": "^1.3.0", + "is-data-view": "^1.0.1" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/data-view-byte-length": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/data-view-byte-length/-/data-view-byte-length-1.0.1.tgz", + "integrity": "sha512-4J7wRJD3ABAzr8wP+OcIcqq2dlUKp4DVflx++hs5h5ZKydWMI6/D/fAot+yh6g2tHh8fLFTvNOaVN357NvSrOQ==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.7", + "es-errors": "^1.3.0", + "is-data-view": "^1.0.1" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/data-view-byte-offset": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/data-view-byte-offset/-/data-view-byte-offset-1.0.0.tgz", + "integrity": "sha512-t/Ygsytq+R995EJ5PZlD4Cu56sWa8InXySaViRzw9apusqsOO2bQP+SbYzAhR0pFKoB+43lYy8rWban9JSuXnA==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.6", + "es-errors": "^1.3.0", + "is-data-view": "^1.0.1" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/dayjs": { "version": "1.11.10", "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.11.10.tgz", @@ -6888,8 +7577,7 @@ "version": "0.1.4", "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz", "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==", - "devOptional": true, - "peer": true + "devOptional": true }, "node_modules/deepmerge": { "version": "4.3.1", @@ -6919,16 +7607,19 @@ } }, "node_modules/define-data-property": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.1.tgz", - "integrity": "sha512-E7uGkTzkk1d0ByLeSc6ZsFS79Axg+m1P/VsgYsxHgiuc3tFSj+MjMIwe90FC4lOAZzNBdY7kkO2P2wKdsQ1vgQ==", + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.4.tgz", + "integrity": "sha512-rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A==", "dependencies": { - "get-intrinsic": "^1.2.1", - "gopd": "^1.0.1", - "has-property-descriptors": "^1.0.0" + "es-define-property": "^1.0.0", + "es-errors": "^1.3.0", + "gopd": "^1.0.1" }, "engines": { "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" } }, "node_modules/define-lazy-prop": { @@ -7111,7 +7802,6 @@ "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz", "integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==", "devOptional": true, - "peer": true, "dependencies": { "esutils": "^2.0.2" }, @@ -7325,50 +8015,57 @@ } }, "node_modules/es-abstract": { - "version": "1.22.3", - "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.22.3.tgz", - "integrity": "sha512-eiiY8HQeYfYH2Con2berK+To6GrK2RxbPawDkGq4UiCQQfZHb6wX9qQqkbpPqaxQFcl8d9QzZqo0tGE0VcrdwA==", + "version": "1.23.3", + "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.23.3.tgz", + "integrity": "sha512-e+HfNH61Bj1X9/jLc5v1owaLYuHdeHHSQlkhCBiTK8rBvKaULl/beGMxwrMXjpYrv4pz22BlY570vVePA2ho4A==", "dev": true, "dependencies": { - "array-buffer-byte-length": "^1.0.0", - "arraybuffer.prototype.slice": "^1.0.2", - "available-typed-arrays": "^1.0.5", - "call-bind": "^1.0.5", - "es-set-tostringtag": "^2.0.1", + "array-buffer-byte-length": "^1.0.1", + "arraybuffer.prototype.slice": "^1.0.3", + "available-typed-arrays": "^1.0.7", + "call-bind": "^1.0.7", + "data-view-buffer": "^1.0.1", + "data-view-byte-length": "^1.0.1", + "data-view-byte-offset": "^1.0.0", + "es-define-property": "^1.0.0", + "es-errors": "^1.3.0", + "es-object-atoms": "^1.0.0", + "es-set-tostringtag": "^2.0.3", "es-to-primitive": "^1.2.1", "function.prototype.name": "^1.1.6", - "get-intrinsic": "^1.2.2", - "get-symbol-description": "^1.0.0", + "get-intrinsic": "^1.2.4", + "get-symbol-description": "^1.0.2", "globalthis": "^1.0.3", "gopd": "^1.0.1", - "has-property-descriptors": "^1.0.0", - "has-proto": "^1.0.1", + "has-property-descriptors": "^1.0.2", + "has-proto": "^1.0.3", "has-symbols": "^1.0.3", - "hasown": "^2.0.0", - "internal-slot": "^1.0.5", - "is-array-buffer": "^3.0.2", + "hasown": "^2.0.2", + "internal-slot": "^1.0.7", + "is-array-buffer": "^3.0.4", "is-callable": "^1.2.7", - "is-negative-zero": "^2.0.2", + "is-data-view": "^1.0.1", + "is-negative-zero": "^2.0.3", "is-regex": "^1.1.4", - "is-shared-array-buffer": "^1.0.2", + "is-shared-array-buffer": "^1.0.3", "is-string": "^1.0.7", - "is-typed-array": "^1.1.12", + "is-typed-array": "^1.1.13", "is-weakref": "^1.0.2", "object-inspect": "^1.13.1", "object-keys": "^1.1.1", - "object.assign": "^4.1.4", - "regexp.prototype.flags": "^1.5.1", - "safe-array-concat": "^1.0.1", - "safe-regex-test": "^1.0.0", - "string.prototype.trim": "^1.2.8", - "string.prototype.trimend": "^1.0.7", - "string.prototype.trimstart": "^1.0.7", - "typed-array-buffer": "^1.0.0", - "typed-array-byte-length": "^1.0.0", - "typed-array-byte-offset": "^1.0.0", - "typed-array-length": "^1.0.4", + "object.assign": "^4.1.5", + "regexp.prototype.flags": "^1.5.2", + "safe-array-concat": "^1.1.2", + "safe-regex-test": "^1.0.3", + "string.prototype.trim": "^1.2.9", + "string.prototype.trimend": "^1.0.8", + "string.prototype.trimstart": "^1.0.8", + "typed-array-buffer": "^1.0.2", + "typed-array-byte-length": "^1.0.1", + "typed-array-byte-offset": "^1.0.2", + "typed-array-length": "^1.0.6", "unbox-primitive": "^1.0.2", - "which-typed-array": "^1.1.13" + "which-typed-array": "^1.1.15" }, "engines": { "node": ">= 0.4" @@ -7377,20 +8074,76 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/es-define-property": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.0.tgz", + "integrity": "sha512-jxayLKShrEqqzJ0eumQbVhTYQM27CfT1T35+gCgDFoL82JLsXqTJ76zv6A0YLOgEnLUMvLzsDsGIrl8NFpT2gQ==", + "dependencies": { + "get-intrinsic": "^1.2.4" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/es-errors": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/es-errors/-/es-errors-1.3.0.tgz", + "integrity": "sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==", + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/es-iterator-helpers": { + "version": "1.0.19", + "resolved": "https://registry.npmjs.org/es-iterator-helpers/-/es-iterator-helpers-1.0.19.tgz", + "integrity": "sha512-zoMwbCcH5hwUkKJkT8kDIBZSz9I6mVG//+lDCinLCGov4+r7NIy0ld8o03M0cJxl2spVf6ESYVS6/gpIfq1FFw==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.7", + "define-properties": "^1.2.1", + "es-abstract": "^1.23.3", + "es-errors": "^1.3.0", + "es-set-tostringtag": "^2.0.3", + "function-bind": "^1.1.2", + "get-intrinsic": "^1.2.4", + "globalthis": "^1.0.3", + "has-property-descriptors": "^1.0.2", + "has-proto": "^1.0.3", + "has-symbols": "^1.0.3", + "internal-slot": "^1.0.7", + "iterator.prototype": "^1.1.2", + "safe-array-concat": "^1.1.2" + }, + "engines": { + "node": ">= 0.4" + } + }, "node_modules/es-module-lexer": { "version": "1.4.1", "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-1.4.1.tgz", "integrity": "sha512-cXLGjP0c4T3flZJKQSuziYoq7MlT+rnvfZjfp7h+I7K9BNX54kP9nyWvdbwjQ4u1iWbOL4u96fgeZLToQlZC7w==" }, + "node_modules/es-object-atoms": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/es-object-atoms/-/es-object-atoms-1.0.0.tgz", + "integrity": "sha512-MZ4iQ6JwHOBQjahnjwaC1ZtIBH+2ohjamzAO3oaHcXYup7qxjF2fixyH+Q71voWHeOkI2q/TnJao/KfXYIZWbw==", + "dev": true, + "dependencies": { + "es-errors": "^1.3.0" + }, + "engines": { + "node": ">= 0.4" + } + }, "node_modules/es-set-tostringtag": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.0.2.tgz", - "integrity": "sha512-BuDyupZt65P9D2D2vA/zqcI3G5xRsklm5N3xCwuiy+/vKy8i0ifdsQP1sLgO4tZDSCaQUSnmC48khknGMV3D2Q==", + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.0.3.tgz", + "integrity": "sha512-3T8uNMC3OQTHkFUsFq8r/BwAXLHvU/9O9mE0fBc/MY5iq/8H7ncvO947LmYA6ldWw9Uh8Yhf25zu6n7nML5QWQ==", "dev": true, "dependencies": { - "get-intrinsic": "^1.2.2", - "has-tostringtag": "^1.0.0", - "hasown": "^2.0.0" + "get-intrinsic": "^1.2.4", + "has-tostringtag": "^1.0.2", + "hasown": "^2.0.1" }, "engines": { "node": ">= 0.4" @@ -7458,17 +8211,16 @@ } }, "node_modules/eslint": { - "version": "8.56.0", - "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.56.0.tgz", - "integrity": "sha512-Go19xM6T9puCOWntie1/P997aXxFsOi37JIHRWI514Hc6ZnaHGKY9xFhrU65RT6CcBEzZoGG1e6Nq+DT04ZtZQ==", + "version": "8.57.0", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.57.0.tgz", + "integrity": "sha512-dZ6+mexnaTIbSBZWgou51U6OmzIhYM2VcNdtiTtI7qPNZm35Akpr0f6vtw3w1Kmn5PYo+tZVfh13WrhpS6oLqQ==", "devOptional": true, - "peer": true, "dependencies": { "@eslint-community/eslint-utils": "^4.2.0", "@eslint-community/regexpp": "^4.6.1", "@eslint/eslintrc": "^2.1.4", - "@eslint/js": "8.56.0", - "@humanwhocodes/config-array": "^0.11.13", + "@eslint/js": "8.57.0", + "@humanwhocodes/config-array": "^0.11.14", "@humanwhocodes/module-importer": "^1.0.1", "@nodelib/fs.walk": "^1.2.8", "@ungap/structured-clone": "^1.2.0", @@ -7513,6 +8265,18 @@ "url": "https://opencollective.com/eslint" } }, + "node_modules/eslint-config-prettier": { + "version": "9.1.0", + "resolved": "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-9.1.0.tgz", + "integrity": "sha512-NSWl5BFQWEPi1j4TjVNItzYV7dZXZ+wP6I6ZhrBGpChQhZRUaElihE9uRRkcbRnNb76UMKDF3r+WTmNcGPKsqw==", + "dev": true, + "bin": { + "eslint-config-prettier": "bin/cli.js" + }, + "peerDependencies": { + "eslint": ">=7.0.0" + } + }, "node_modules/eslint-import-resolver-node": { "version": "0.3.9", "resolved": "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.9.tgz", @@ -7599,7 +8363,90 @@ "ms": "^2.1.1" } }, - "node_modules/eslint-plugin-import/node_modules/doctrine": { + "node_modules/eslint-plugin-import/node_modules/doctrine": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz", + "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==", + "dev": true, + "dependencies": { + "esutils": "^2.0.2" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "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==", + "dev": true, + "bin": { + "semver": "bin/semver.js" + } + }, + "node_modules/eslint-plugin-prettier": { + "version": "5.1.3", + "resolved": "https://registry.npmjs.org/eslint-plugin-prettier/-/eslint-plugin-prettier-5.1.3.tgz", + "integrity": "sha512-C9GCVAs4Eq7ZC/XFQHITLiHJxQngdtraXaM+LoUFoFp/lHNl2Zn8f3WQbe9HvTBBQ9YnKFB0/2Ajdqwo5D1EAw==", + "dev": true, + "dependencies": { + "prettier-linter-helpers": "^1.0.0", + "synckit": "^0.8.6" + }, + "engines": { + "node": "^14.18.0 || >=16.0.0" + }, + "funding": { + "url": "https://opencollective.com/eslint-plugin-prettier" + }, + "peerDependencies": { + "@types/eslint": ">=8.0.0", + "eslint": ">=8.0.0", + "eslint-config-prettier": "*", + "prettier": ">=3.0.0" + }, + "peerDependenciesMeta": { + "@types/eslint": { + "optional": true + }, + "eslint-config-prettier": { + "optional": true + } + } + }, + "node_modules/eslint-plugin-react": { + "version": "7.34.3", + "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.34.3.tgz", + "integrity": "sha512-aoW4MV891jkUulwDApQbPYTVZmeuSyFrudpbTAQuj5Fv8VL+o6df2xIGpw8B0hPjAaih1/Fb0om9grCdyFYemA==", + "dev": true, + "dependencies": { + "array-includes": "^3.1.8", + "array.prototype.findlast": "^1.2.5", + "array.prototype.flatmap": "^1.3.2", + "array.prototype.toreversed": "^1.1.2", + "array.prototype.tosorted": "^1.1.4", + "doctrine": "^2.1.0", + "es-iterator-helpers": "^1.0.19", + "estraverse": "^5.3.0", + "jsx-ast-utils": "^2.4.1 || ^3.0.0", + "minimatch": "^3.1.2", + "object.entries": "^1.1.8", + "object.fromentries": "^2.0.8", + "object.hasown": "^1.1.4", + "object.values": "^1.2.0", + "prop-types": "^15.8.1", + "resolve": "^2.0.0-next.5", + "semver": "^6.3.1", + "string.prototype.matchall": "^4.0.11" + }, + "engines": { + "node": ">=4" + }, + "peerDependencies": { + "eslint": "^3 || ^4 || ^5 || ^6 || ^7 || ^8" + } + }, + "node_modules/eslint-plugin-react/node_modules/doctrine": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz", "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==", @@ -7611,7 +8458,33 @@ "node": ">=0.10.0" } }, - "node_modules/eslint-plugin-import/node_modules/semver": { + "node_modules/eslint-plugin-react/node_modules/estraverse": { + "version": "5.3.0", + "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz", + "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==", + "dev": true, + "engines": { + "node": ">=4.0" + } + }, + "node_modules/eslint-plugin-react/node_modules/resolve": { + "version": "2.0.0-next.5", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-2.0.0-next.5.tgz", + "integrity": "sha512-U7WjGVG9sH8tvjW5SmGbQuui75FiyjAX72HX15DwBBwF9dNiQZRQAg9nnPhYy+TUnE0+VcrttuvNI8oSxZcocA==", + "dev": true, + "dependencies": { + "is-core-module": "^2.13.0", + "path-parse": "^1.0.7", + "supports-preserve-symlinks-flag": "^1.0.0" + }, + "bin": { + "resolve": "bin/resolve" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/eslint-plugin-react/node_modules/semver": { "version": "6.3.1", "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", @@ -7637,7 +8510,6 @@ "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz", "integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==", "devOptional": true, - "peer": true, "engines": { "node": "^12.22.0 || ^14.17.0 || >=16.0.0" }, @@ -7645,12 +8517,20 @@ "url": "https://opencollective.com/eslint" } }, + "node_modules/eslint/node_modules/@eslint/js": { + "version": "8.57.0", + "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.57.0.tgz", + "integrity": "sha512-Ys+3g2TaW7gADOJzPt83SJtCDhMjndcDMFVQ/Tj9iA1BfJzFKD9mAUXT3OenpuPHbI6P/myECxRJrofUsDx/5g==", + "devOptional": true, + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + } + }, "node_modules/eslint/node_modules/ajv": { "version": "6.12.6", "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz", "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==", "devOptional": true, - "peer": true, "dependencies": { "fast-deep-equal": "^3.1.1", "fast-json-stable-stringify": "^2.0.0", @@ -7667,7 +8547,6 @@ "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.2.2.tgz", "integrity": "sha512-dOt21O7lTMhDM+X9mB4GX+DZrZtCUJPL/wlcTqxyrx5IvO0IYtILdtrQGQp+8n5S0gwSVmOf9NQrjMOgfQZlIg==", "devOptional": true, - "peer": true, "dependencies": { "esrecurse": "^4.3.0", "estraverse": "^5.2.0" @@ -7684,7 +8563,6 @@ "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz", "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==", "devOptional": true, - "peer": true, "engines": { "node": ">=4.0" } @@ -7694,7 +8572,6 @@ "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz", "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==", "devOptional": true, - "peer": true, "dependencies": { "locate-path": "^6.0.0", "path-exists": "^4.0.0" @@ -7711,7 +8588,6 @@ "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz", "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==", "devOptional": true, - "peer": true, "dependencies": { "is-glob": "^4.0.3" }, @@ -7724,7 +8600,6 @@ "resolved": "https://registry.npmjs.org/globals/-/globals-13.24.0.tgz", "integrity": "sha512-AhO5QUcj8llrbG09iWhPU2B204J1xnPeL8kQmVorSsy+Sjj1sk8gIyh6cUocGmH4L0UuhAJy+hJMRA4mgA4mFQ==", "devOptional": true, - "peer": true, "dependencies": { "type-fest": "^0.20.2" }, @@ -7739,15 +8614,13 @@ "version": "0.4.1", "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==", - "devOptional": true, - "peer": true + "devOptional": true }, "node_modules/eslint/node_modules/locate-path": { "version": "6.0.0", "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz", "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==", "devOptional": true, - "peer": true, "dependencies": { "p-locate": "^5.0.0" }, @@ -7763,7 +8636,6 @@ "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz", "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==", "devOptional": true, - "peer": true, "dependencies": { "yocto-queue": "^0.1.0" }, @@ -7779,7 +8651,6 @@ "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz", "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==", "devOptional": true, - "peer": true, "dependencies": { "p-limit": "^3.0.2" }, @@ -7795,7 +8666,6 @@ "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==", "devOptional": true, - "peer": true, "engines": { "node": ">=8" } @@ -7805,7 +8675,6 @@ "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz", "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==", "devOptional": true, - "peer": true, "engines": { "node": ">=10" }, @@ -7818,7 +8687,6 @@ "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz", "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==", "devOptional": true, - "peer": true, "engines": { "node": ">=10" }, @@ -7831,7 +8699,6 @@ "resolved": "https://registry.npmjs.org/espree/-/espree-9.6.1.tgz", "integrity": "sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ==", "devOptional": true, - "peer": true, "dependencies": { "acorn": "^8.9.0", "acorn-jsx": "^5.3.2", @@ -7861,7 +8728,6 @@ "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.5.0.tgz", "integrity": "sha512-YQLXUplAwJgCydQ78IMJywZCceoqk1oH01OERdSAJc/7U2AylwjhSCLDEtqwg811idIS/9fIU5GjG73IgjKMVg==", "devOptional": true, - "peer": true, "dependencies": { "estraverse": "^5.1.0" }, @@ -7874,7 +8740,6 @@ "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz", "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==", "devOptional": true, - "peer": true, "engines": { "node": ">=4.0" } @@ -8177,8 +9042,7 @@ "version": "1.3.0", "resolved": "https://registry.npmjs.org/fast-diff/-/fast-diff-1.3.0.tgz", "integrity": "sha512-VxPP4NqbUjj6MaAOafWeUn2cXWLcCtljklUtZf0Ind4XQ+QPtmA0b18zZy0jIQx+ExRVCR/ZQpBmik5lXshNsw==", - "optional": true, - "peer": true + "devOptional": true }, "node_modules/fast-fifo": { "version": "1.3.2", @@ -8209,8 +9073,7 @@ "version": "2.0.6", "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz", "integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==", - "devOptional": true, - "peer": true + "devOptional": true }, "node_modules/fast-url-parser": { "version": "1.1.3", @@ -8267,7 +9130,6 @@ "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz", "integrity": "sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==", "devOptional": true, - "peer": true, "dependencies": { "flat-cache": "^3.0.4" }, @@ -8431,7 +9293,6 @@ "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.2.0.tgz", "integrity": "sha512-CYcENa+FtcUKLmhhqyctpclsq7QF38pKjZHsGNiSQF5r4FtoKDWabFDl3hzaEQMvT1LHEysw5twgLvpYYb4vbw==", "devOptional": true, - "peer": true, "dependencies": { "flatted": "^3.2.9", "keyv": "^4.5.3", @@ -8445,8 +9306,7 @@ "version": "3.2.9", "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.9.tgz", "integrity": "sha512-36yxDn5H7OFZQla0/jFJmbIKTdZAQHngCedGxiMmpNfEZM0sdEeT+WczLQrjK6D7o2aiyLYDnkw0R3JK0Qv1RQ==", - "devOptional": true, - "peer": true + "devOptional": true }, "node_modules/follow-redirects": { "version": "1.15.6", @@ -8725,15 +9585,19 @@ } }, "node_modules/get-intrinsic": { - "version": "1.2.2", - "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.2.tgz", - "integrity": "sha512-0gSo4ml/0j98Y3lngkFEot/zhiCeWsbYIlZ+uZOVgzLyLaUw7wxUL+nCTP0XJvJg1AXulJRI3UJi8GsbDuxdGA==", + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.4.tgz", + "integrity": "sha512-5uYhsJH8VJBTv7oslg4BznJYhDoRI6waYCxMmCdnTrcCrHA/fCFKoTFz2JKKE0HdDFUF7/oQuhzumXJK7paBRQ==", "dependencies": { + "es-errors": "^1.3.0", "function-bind": "^1.1.2", "has-proto": "^1.0.1", "has-symbols": "^1.0.3", "hasown": "^2.0.0" }, + "engines": { + "node": ">= 0.4" + }, "funding": { "url": "https://github.com/sponsors/ljharb" } @@ -8755,13 +9619,14 @@ } }, "node_modules/get-symbol-description": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/get-symbol-description/-/get-symbol-description-1.0.0.tgz", - "integrity": "sha512-2EmdH1YvIQiZpltCNgkuiUnyukzxM/R6NDJX31Ke3BG1Nq5b0S2PhX59UKi9vZpPDQVdqn+1IcaAwnzTT5vCjw==", + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/get-symbol-description/-/get-symbol-description-1.0.2.tgz", + "integrity": "sha512-g0QYk1dZBxGwk+Ngc+ltRH2IBp2f7zBkBMBJZCDerh6EhlhSR6+9irMCuT/09zD6qkarHUSn529sK/yL4S27mg==", "dev": true, "dependencies": { - "call-bind": "^1.0.2", - "get-intrinsic": "^1.1.1" + "call-bind": "^1.0.5", + "es-errors": "^1.3.0", + "get-intrinsic": "^1.2.4" }, "engines": { "node": ">= 0.4" @@ -8886,11 +9751,15 @@ } }, "node_modules/globals": { - "version": "11.12.0", - "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz", - "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==", + "version": "15.6.0", + "resolved": "https://registry.npmjs.org/globals/-/globals-15.6.0.tgz", + "integrity": "sha512-UzcJi88Hw//CurUIRa9Jxb0vgOCcuD/MNjwmXp633cyaRKkCWACkoqHCtfZv43b1kqXGg/fpOa8bwgacCeXsVg==", + "dev": true, "engines": { - "node": ">=4" + "node": ">=18" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" } }, "node_modules/globalthis": { @@ -8982,8 +9851,7 @@ "version": "1.4.0", "resolved": "https://registry.npmjs.org/graphemer/-/graphemer-1.4.0.tgz", "integrity": "sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==", - "devOptional": true, - "peer": true + "devOptional": true }, "node_modules/gray-matter": { "version": "4.0.3", @@ -9056,20 +9924,20 @@ } }, "node_modules/has-property-descriptors": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.1.tgz", - "integrity": "sha512-VsX8eaIewvas0xnvinAe9bw4WfIeODpGYikiWYLH+dma0Jw6KHYqWiWfhQlgOVK8D6PvjubK5Uc4P0iIhIcNVg==", + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.2.tgz", + "integrity": "sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg==", "dependencies": { - "get-intrinsic": "^1.2.2" + "es-define-property": "^1.0.0" }, "funding": { "url": "https://github.com/sponsors/ljharb" } }, "node_modules/has-proto": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.0.1.tgz", - "integrity": "sha512-7qE+iP+O+bgF9clE5+UoBFzE65mlBiVj3tKCrlNQ0Ogwm0BjpT/gK4SlLYDMybDh5I3TCTKnPPa0oMG7JDYrhg==", + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.0.3.tgz", + "integrity": "sha512-SJ1amZAJUiZS+PhsVLf5tGydlaVB8EdFpaSO4gmiUKUOxk8qzn5AIy4ZeJUmh22znIdk/uMAUT2pl3FxzVUH+Q==", "engines": { "node": ">= 0.4" }, @@ -9089,12 +9957,12 @@ } }, "node_modules/has-tostringtag": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.0.tgz", - "integrity": "sha512-kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ==", + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.2.tgz", + "integrity": "sha512-NqADB8VjPFLM2V0VvHUewwwsw0ZWBaIdgo+ieHtK3hasLz4qeCRjYcqfB6AQrBggRKppKF8L52/VqdVsO47Dlw==", "dev": true, "dependencies": { - "has-symbols": "^1.0.2" + "has-symbols": "^1.0.3" }, "engines": { "node": ">= 0.4" @@ -9115,9 +9983,9 @@ } }, "node_modules/hasown": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.0.tgz", - "integrity": "sha512-vUptKVTpIJhcczKBbgnS+RtcuYMB8+oNzPK2/Hp3hanz8JmpATdmmgLgSaadVREkDm+e2giHwY3ZRkyjSIDDFA==", + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz", + "integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==", "dependencies": { "function-bind": "^1.1.2" }, @@ -9662,9 +10530,9 @@ ] }, "node_modules/ignore": { - "version": "5.3.0", - "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.0.tgz", - "integrity": "sha512-g7dmpshy+gD7mh88OC9NwSGTKoc3kyLAZQRU1mt53Aw/vnvfXnbC+F/7F7QoYVKbV+KNvJx8wArewKy1vXMtlg==", + "version": "5.3.1", + "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.1.tgz", + "integrity": "sha512-5Fytz/IraMjqpwfd34ke28PTVMjZjJG2MPn5t7OE4eUCUNf8BAa7b5WUS9/Qvr6mwOQS7Mk6vdsMno5he+T8Xw==", "engines": { "node": ">= 4" } @@ -9769,12 +10637,12 @@ "integrity": "sha512-7NXolsK4CAS5+xvdj5OMMbI962hU/wvwoxk+LWR9Ek9bVtyuuYScDN6eS0rUm6TxApFpw7CX1o4uJzcd4AyD3Q==" }, "node_modules/internal-slot": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.6.tgz", - "integrity": "sha512-Xj6dv+PsbtwyPpEflsejS+oIZxmMlV44zAhG479uYu89MsjcYOhCFnNyKrkJrihbsiasQyY0afoCl/9BLR65bg==", + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.7.tgz", + "integrity": "sha512-NGnrKwXzSms2qUUih/ILZ5JBqNTSa1+ZmP6flaIp6KmSElgE9qdndzS3cqjrDovwFdmwsGsLdeFgB6suw+1e9g==", "dev": true, "dependencies": { - "get-intrinsic": "^1.2.2", + "es-errors": "^1.3.0", "hasown": "^2.0.0", "side-channel": "^1.0.4" }, @@ -9837,14 +10705,16 @@ } }, "node_modules/is-array-buffer": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/is-array-buffer/-/is-array-buffer-3.0.2.tgz", - "integrity": "sha512-y+FyyR/w8vfIRq4eQcM1EYgSTnmHXPqaF+IgzgraytCFq5Xh8lllDVmAZolPJiZttZLeFSINPYMaEJ7/vWUa1w==", + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/is-array-buffer/-/is-array-buffer-3.0.4.tgz", + "integrity": "sha512-wcjaerHw0ydZwfhiKbXJWLDY8A7yV7KhjQOpb83hGgGfId/aQa4TOvwyzn2PuswW2gPCYEL/nEAiSVpdOj1lXw==", "dev": true, "dependencies": { "call-bind": "^1.0.2", - "get-intrinsic": "^1.2.0", - "is-typed-array": "^1.1.10" + "get-intrinsic": "^1.2.1" + }, + "engines": { + "node": ">= 0.4" }, "funding": { "url": "https://github.com/sponsors/ljharb" @@ -9855,6 +10725,21 @@ "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz", "integrity": "sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==" }, + "node_modules/is-async-function": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/is-async-function/-/is-async-function-2.0.0.tgz", + "integrity": "sha512-Y1JXKrfykRJGdlDwdKlLpLyMIiWqWvuSd17TvZk68PLAOGOoF4Xyav1z0Xhoi+gCYjZVeC5SI+hYFOfvXmGRCA==", + "dev": true, + "dependencies": { + "has-tostringtag": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/is-bigint": { "version": "1.0.4", "resolved": "https://registry.npmjs.org/is-bigint/-/is-bigint-1.0.4.tgz", @@ -9928,6 +10813,21 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/is-data-view": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/is-data-view/-/is-data-view-1.0.1.tgz", + "integrity": "sha512-AHkaJrsUVW6wq6JS8y3JnM/GJF/9cf+k20+iDzlSaJrinEo5+7vRiteOSwBhHRiAyQATN1AmY4hwzxJKPmYf+w==", + "dev": true, + "dependencies": { + "is-typed-array": "^1.1.13" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/is-date-object": { "version": "1.0.5", "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.5.tgz", @@ -9982,6 +10882,18 @@ "node": ">=0.10.0" } }, + "node_modules/is-finalizationregistry": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/is-finalizationregistry/-/is-finalizationregistry-1.0.2.tgz", + "integrity": "sha512-0by5vtUJs8iFQb5TYUHHPudOR+qXYIMKtiUzvLIZITZUjknFmziyBJuLhVRc+Ds0dREFlskDNJKYIdIzu/9pfw==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.2" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/is-fullwidth-code-point": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", @@ -9990,6 +10902,21 @@ "node": ">=8" } }, + "node_modules/is-generator-function": { + "version": "1.0.10", + "resolved": "https://registry.npmjs.org/is-generator-function/-/is-generator-function-1.0.10.tgz", + "integrity": "sha512-jsEjy9l3yiXEQ+PsXdmBwEPcOxaXWLspKdplFUVI9vq1iZgIekeC0L167qeu86czQaxed3q/Uzuw0swL0irL8A==", + "dev": true, + "dependencies": { + "has-tostringtag": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/is-glob": { "version": "4.0.3", "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz", @@ -10025,10 +10952,22 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/is-map": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/is-map/-/is-map-2.0.3.tgz", + "integrity": "sha512-1Qed0/Hr2m+YqxnM09CjA2d/i6YZNfF6R2oRAOj36eUdS6qIV/huPJNSEpKbupewFs+ZsJlxsjjPbc0/afW6Lw==", + "dev": true, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/is-negative-zero": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.2.tgz", - "integrity": "sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA==", + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.3.tgz", + "integrity": "sha512-5KoIu2Ngpyek75jXodFvnafB6DJgr3u8uuK0LEZJjrU19DrMD3EVERaR8sjz8CCGgpZvxPl9SuE1GMVPFHx1mw==", "dev": true, "engines": { "node": ">= 0.4" @@ -10154,13 +11093,28 @@ "node": ">=6" } }, + "node_modules/is-set": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/is-set/-/is-set-2.0.3.tgz", + "integrity": "sha512-iPAjerrse27/ygGLxw+EBR9agv9Y6uLeYVJMu+QNCoouJ1/1ri0mGrcWpfCqFZuzzx3WjtwxG098X+n4OuRkPg==", + "dev": true, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/is-shared-array-buffer": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.2.tgz", - "integrity": "sha512-sqN2UDu1/0y6uvXyStCOzyhAjCSlHceFoMKJW8W9EU9cvic/QdsZ0kEU93HEy3IUEFZIiH/3w+AH/UQbPHNdhA==", + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.3.tgz", + "integrity": "sha512-nA2hv5XIhLR3uVzDDfCIknerhx8XUKnstuOERPNNIinXG7v9u+ohXF67vxm4TPTEPU6lm61ZkwP3c9PCB97rhg==", "dev": true, "dependencies": { - "call-bind": "^1.0.2" + "call-bind": "^1.0.7" + }, + "engines": { + "node": ">= 0.4" }, "funding": { "url": "https://github.com/sponsors/ljharb" @@ -10208,12 +11162,12 @@ } }, "node_modules/is-typed-array": { - "version": "1.1.12", - "resolved": "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.12.tgz", - "integrity": "sha512-Z14TF2JNG8Lss5/HMqt0//T9JeHXttXy5pH/DBU4vi98ozO2btxzq9MwYDZYnKwU8nRsz/+GVFVRDq3DkVuSPg==", + "version": "1.1.13", + "resolved": "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.13.tgz", + "integrity": "sha512-uZ25/bUAlUY5fR4OKT4rZQEBrzQWYV9ZJYGGsUmEJ6thodVJ1HX64ePQ6Z0qPWP+m+Uq6e9UugrE38jeYsDSMw==", "dev": true, "dependencies": { - "which-typed-array": "^1.1.11" + "which-typed-array": "^1.1.14" }, "engines": { "node": ">= 0.4" @@ -10227,6 +11181,18 @@ "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz", "integrity": "sha512-cyA56iCMHAh5CdzjJIa4aohJyeO1YbwLi3Jc35MmRU6poroFjIGZzUzupGiRPOjgHg9TLu43xbpwXk523fMxKA==" }, + "node_modules/is-weakmap": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/is-weakmap/-/is-weakmap-2.0.2.tgz", + "integrity": "sha512-K5pXYOm9wqY1RgjpL3YTkF39tni1XajUIkawTLUo9EZEVUFga5gSQJF8nNS7ZwJQ02y+1YCNYcMh+HIf1ZqE+w==", + "dev": true, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/is-weakref": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/is-weakref/-/is-weakref-1.0.2.tgz", @@ -10239,6 +11205,22 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/is-weakset": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/is-weakset/-/is-weakset-2.0.3.tgz", + "integrity": "sha512-LvIm3/KWzS9oRFHugab7d+M/GcBXuXX5xZkzPmN+NxihdQlZUQ4dWuSV1xR/sq6upL1TJEDrfBgRepHFdBtSNQ==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.7", + "get-intrinsic": "^1.2.4" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/is-wsl": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-2.2.0.tgz", @@ -10276,6 +11258,19 @@ "node": ">=0.10.0" } }, + "node_modules/iterator.prototype": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/iterator.prototype/-/iterator.prototype-1.1.2.tgz", + "integrity": "sha512-DR33HMMr8EzwuRL8Y9D3u2BMj8+RqSE850jfGu59kS7tbmPLzGkZmVSfyCFSDxuZiEY6Rzt3T2NA/qU+NwVj1w==", + "dev": true, + "dependencies": { + "define-properties": "^1.2.1", + "get-intrinsic": "^1.2.1", + "has-symbols": "^1.0.3", + "reflect.getprototypeof": "^1.0.4", + "set-function-name": "^2.0.1" + } + }, "node_modules/jest-util": { "version": "29.7.0", "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-29.7.0.tgz", @@ -10417,8 +11412,7 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz", "integrity": "sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==", - "devOptional": true, - "peer": true + "devOptional": true }, "node_modules/json5": { "version": "2.2.3", @@ -10442,6 +11436,21 @@ "graceful-fs": "^4.1.6" } }, + "node_modules/jsx-ast-utils": { + "version": "3.3.5", + "resolved": "https://registry.npmjs.org/jsx-ast-utils/-/jsx-ast-utils-3.3.5.tgz", + "integrity": "sha512-ZZow9HBI5O6EPgSJLUb8n2NKgmVWTwCvHGwFuJlMjvLFqlGG6pjirPhtdsseaLZjSibD8eegzmYpUZwoIlj2cQ==", + "dev": true, + "dependencies": { + "array-includes": "^3.1.6", + "array.prototype.flat": "^1.3.1", + "object.assign": "^4.1.4", + "object.values": "^1.1.6" + }, + "engines": { + "node": ">=4.0" + } + }, "node_modules/keyv": { "version": "4.5.4", "resolved": "https://registry.npmjs.org/keyv/-/keyv-4.5.4.tgz", @@ -10520,7 +11529,6 @@ "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz", "integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==", "devOptional": true, - "peer": true, "dependencies": { "prelude-ls": "^1.2.1", "type-check": "~0.4.0" @@ -10646,8 +11654,7 @@ "version": "4.6.2", "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz", "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==", - "devOptional": true, - "peer": true + "devOptional": true }, "node_modules/lodash.uniq": { "version": "4.5.0", @@ -13503,8 +14510,7 @@ "version": "1.4.0", "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz", "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==", - "devOptional": true, - "peer": true + "devOptional": true }, "node_modules/negotiator": { "version": "0.6.3", @@ -13660,15 +14666,30 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/object.entries": { + "version": "1.1.8", + "resolved": "https://registry.npmjs.org/object.entries/-/object.entries-1.1.8.tgz", + "integrity": "sha512-cmopxi8VwRIAw/fkijJohSfpef5PdN0pMQJN6VC/ZKvn0LIknWD8KtgY6KlQdEc4tIjcQ3HxSMmnvtzIscdaYQ==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.7", + "define-properties": "^1.2.1", + "es-object-atoms": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" + } + }, "node_modules/object.fromentries": { - "version": "2.0.7", - "resolved": "https://registry.npmjs.org/object.fromentries/-/object.fromentries-2.0.7.tgz", - "integrity": "sha512-UPbPHML6sL8PI/mOqPwsH4G6iyXcCGzLin8KvEPenOZN5lpCNBZZQ+V62vdjB1mQHrmqGQt5/OJzemUA+KJmEA==", + "version": "2.0.8", + "resolved": "https://registry.npmjs.org/object.fromentries/-/object.fromentries-2.0.8.tgz", + "integrity": "sha512-k6E21FzySsSK5a21KRADBd/NGneRegFO5pLHfdQLpRDETUNJueLXs3WCzyQ3tFRDYgbq3KHGXfTbi2bs8WQ6rQ==", "dev": true, "dependencies": { - "call-bind": "^1.0.2", - "define-properties": "^1.2.0", - "es-abstract": "^1.22.1" + "call-bind": "^1.0.7", + "define-properties": "^1.2.1", + "es-abstract": "^1.23.2", + "es-object-atoms": "^1.0.0" }, "engines": { "node": ">= 0.4" @@ -13689,15 +14710,32 @@ "get-intrinsic": "^1.2.1" } }, + "node_modules/object.hasown": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/object.hasown/-/object.hasown-1.1.4.tgz", + "integrity": "sha512-FZ9LZt9/RHzGySlBARE3VF+gE26TxR38SdmqOqliuTnl9wrKulaQs+4dee1V+Io8VfxqzAfHu6YuRgUy8OHoTg==", + "dev": true, + "dependencies": { + "define-properties": "^1.2.1", + "es-abstract": "^1.23.2", + "es-object-atoms": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/object.values": { - "version": "1.1.7", - "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.1.7.tgz", - "integrity": "sha512-aU6xnDFYT3x17e/f0IiiwlGPTy2jzMySGfUB4fq6z7CV8l85CWHDk5ErhyhpfDHhrOMwGFhSQkhMGHaIotA6Ng==", + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.2.0.tgz", + "integrity": "sha512-yBYjY9QX2hnRmZHAjG/f13MzmBzxzYgQhFrke06TTyKY5zSTEqkOeukBzIdVA3j3ulu8Qa3MbVFShV7T2RmGtQ==", "dev": true, "dependencies": { - "call-bind": "^1.0.2", - "define-properties": "^1.2.0", - "es-abstract": "^1.22.1" + "call-bind": "^1.0.7", + "define-properties": "^1.2.1", + "es-object-atoms": "^1.0.0" }, "engines": { "node": ">= 0.4" @@ -13781,7 +14819,6 @@ "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.3.tgz", "integrity": "sha512-JjCoypp+jKn1ttEFExxhetCKeJt9zhAgAve5FXHixTvFDW/5aEktX9bufBKLRRMdU7bNtpLfcGu94B3cdEJgjg==", "devOptional": true, - "peer": true, "dependencies": { "@aashutoshrathi/word-wrap": "^1.2.3", "deep-is": "^0.1.3", @@ -14149,6 +15186,15 @@ "node": ">=4" } }, + "node_modules/possible-typed-array-names": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/possible-typed-array-names/-/possible-typed-array-names-1.0.0.tgz", + "integrity": "sha512-d7Uw+eZoloe0EHDIYoe+bQ5WXnGMOpmiZFTuMWCwpjzzkL2nTjcKiAk4hh8TjnGye2TwWOk3UXucZ+3rbmBa8Q==", + "dev": true, + "engines": { + "node": ">= 0.4" + } + }, "node_modules/postcss": { "version": "8.4.38", "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.38.tgz", @@ -14773,17 +15819,43 @@ "readable-stream": "^3.1.1" }, "engines": { - "node": ">=6" + "node": ">=6" + } + }, + "node_modules/prelude-ls": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz", + "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==", + "devOptional": true, + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/prettier": { + "version": "3.3.2", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.3.2.tgz", + "integrity": "sha512-rAVeHYMcv8ATV5d508CFdn+8/pHPpXeIid1DdrPwXnaAdH7cqjVbpJaT5eq4yRAFU/lsbwYwSF/n5iNrdJHPQA==", + "dev": true, + "bin": { + "prettier": "bin/prettier.cjs" + }, + "engines": { + "node": ">=14" + }, + "funding": { + "url": "https://github.com/prettier/prettier?sponsor=1" } }, - "node_modules/prelude-ls": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz", - "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==", - "devOptional": true, - "peer": true, + "node_modules/prettier-linter-helpers": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/prettier-linter-helpers/-/prettier-linter-helpers-1.0.0.tgz", + "integrity": "sha512-GbK2cP9nraSSUF9N2XwUwqfzlAFlMNYYl+ShE/V+H8a9uNl/oUqB1w2EL54Jh0OlyRSd8RfWYJ3coVS4TROP2w==", + "dev": true, + "dependencies": { + "fast-diff": "^1.1.2" + }, "engines": { - "node": ">= 0.8.0" + "node": ">=6.0.0" } }, "node_modules/pretty-error": { @@ -15391,6 +16463,27 @@ "node": ">=6.0.0" } }, + "node_modules/reflect.getprototypeof": { + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/reflect.getprototypeof/-/reflect.getprototypeof-1.0.6.tgz", + "integrity": "sha512-fmfw4XgoDke3kdI6h4xcUz1dG8uaiv5q9gcEwLS4Pnth2kxT+GZ7YehS1JTMGBQmtV7Y4GFGbs2re2NqhdozUg==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.7", + "define-properties": "^1.2.1", + "es-abstract": "^1.23.1", + "es-errors": "^1.3.0", + "get-intrinsic": "^1.2.4", + "globalthis": "^1.0.3", + "which-builtin-type": "^1.1.3" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/regenerate": { "version": "1.4.2", "resolved": "https://registry.npmjs.org/regenerate/-/regenerate-1.4.2.tgz", @@ -15421,14 +16514,15 @@ } }, "node_modules/regexp.prototype.flags": { - "version": "1.5.1", - "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.5.1.tgz", - "integrity": "sha512-sy6TXMN+hnP/wMy+ISxg3krXx7BAtWVO4UouuCN/ziM9UEne0euamVNafDfvC83bRNr95y0V5iijeDQFUNpvrg==", + "version": "1.5.2", + "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.5.2.tgz", + "integrity": "sha512-NcDiDkTLuPR+++OCKB0nWafEmhg/Da8aUPLPMQbK+bxKKCm1/S5he+AqYa4PlMCVBalb4/yxIRub6qkEx5yJbw==", "dev": true, "dependencies": { - "call-bind": "^1.0.2", - "define-properties": "^1.2.0", - "set-function-name": "^2.0.0" + "call-bind": "^1.0.6", + "define-properties": "^1.2.1", + "es-errors": "^1.3.0", + "set-function-name": "^2.0.1" }, "engines": { "node": ">= 0.4" @@ -15908,13 +17002,13 @@ } }, "node_modules/safe-array-concat": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/safe-array-concat/-/safe-array-concat-1.1.0.tgz", - "integrity": "sha512-ZdQ0Jeb9Ofti4hbt5lX3T2JcAamT9hfzYU1MNB+z/jaEbB6wfFfPIR/zEORmZqobkCCJhSjodobH6WHNmJ97dg==", + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/safe-array-concat/-/safe-array-concat-1.1.2.tgz", + "integrity": "sha512-vj6RsCsWBCf19jIeHEfkRMw8DPiBb+DMXklQ/1SGDHOMlHdPUkZXFQ2YdplS23zESTijAcurb1aSgJA3AgMu1Q==", "dev": true, "dependencies": { - "call-bind": "^1.0.5", - "get-intrinsic": "^1.2.2", + "call-bind": "^1.0.7", + "get-intrinsic": "^1.2.4", "has-symbols": "^1.0.3", "isarray": "^2.0.5" }, @@ -15951,13 +17045,13 @@ ] }, "node_modules/safe-regex-test": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/safe-regex-test/-/safe-regex-test-1.0.2.tgz", - "integrity": "sha512-83S9w6eFq12BBIJYvjMux6/dkirb8+4zJRA9cxNBVb7Wq5fJBW+Xze48WqR8pxua7bDuAaaAxtVVd4Idjp1dBQ==", + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/safe-regex-test/-/safe-regex-test-1.0.3.tgz", + "integrity": "sha512-CdASjNJPvRa7roO6Ra/gLYBTzYzzPyyBXxIMdGW3USQLyjWEls2RgW5UBTXaQVp+OrpeCK3bLem8smtmheoRuw==", "dev": true, "dependencies": { - "call-bind": "^1.0.5", - "get-intrinsic": "^1.2.2", + "call-bind": "^1.0.6", + "es-errors": "^1.3.0", "is-regex": "^1.1.4" }, "engines": { @@ -16039,12 +17133,9 @@ } }, "node_modules/semver": { - "version": "7.5.4", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz", - "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==", - "dependencies": { - "lru-cache": "^6.0.0" - }, + "version": "7.6.2", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.2.tgz", + "integrity": "sha512-FNAIBWCx9qcRhoHcgcJ0gvU7SN1lYU2ZXuSfl04bSC5OpvDHFyJCjdNHomPXxjQlCBU67YW64PzY7/VIEH7F2w==", "bin": { "semver": "bin/semver.js" }, @@ -16066,22 +17157,6 @@ "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/semver/node_modules/lru-cache": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", - "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", - "dependencies": { - "yallist": "^4.0.0" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/semver/node_modules/yallist": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", - "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==" - }, "node_modules/send": { "version": "0.18.0", "resolved": "https://registry.npmjs.org/send/-/send-0.18.0.tgz", @@ -16263,28 +17338,31 @@ } }, "node_modules/set-function-length": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.1.1.tgz", - "integrity": "sha512-VoaqjbBJKiWtg4yRcKBQ7g7wnGnLV3M8oLvVWwOk2PdYY6PEFegR1vezXR0tw6fZGF9csVakIRjrJiy2veSBFQ==", + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.2.2.tgz", + "integrity": "sha512-pgRc4hJ4/sNjWCSS9AmnS40x3bNMDTknHgL5UaMBTMyJnU90EgWh1Rz+MC9eFu4BuN/UwZjKQuY/1v3rM7HMfg==", "dependencies": { - "define-data-property": "^1.1.1", - "get-intrinsic": "^1.2.1", + "define-data-property": "^1.1.4", + "es-errors": "^1.3.0", + "function-bind": "^1.1.2", + "get-intrinsic": "^1.2.4", "gopd": "^1.0.1", - "has-property-descriptors": "^1.0.0" + "has-property-descriptors": "^1.0.2" }, "engines": { "node": ">= 0.4" } }, "node_modules/set-function-name": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/set-function-name/-/set-function-name-2.0.1.tgz", - "integrity": "sha512-tMNCiqYVkXIZgc2Hnoy2IvC/f8ezc5koaRFkCjrpWzGpCd3qbZXPzVy9MAZzK1ch/X0jvSkojys3oqJN0qCmdA==", + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/set-function-name/-/set-function-name-2.0.2.tgz", + "integrity": "sha512-7PGFlmtwsEADb0WYyvCMa1t+yke6daIG4Wirafur5kcf+MhUnPms1UeR0CKQdTZD81yESwMHbtn+TR+dMviakQ==", "dev": true, "dependencies": { - "define-data-property": "^1.0.1", + "define-data-property": "^1.1.4", + "es-errors": "^1.3.0", "functions-have-names": "^1.2.3", - "has-property-descriptors": "^1.0.0" + "has-property-descriptors": "^1.0.2" }, "engines": { "node": ">= 0.4" @@ -16377,13 +17455,17 @@ } }, "node_modules/side-channel": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz", - "integrity": "sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==", + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.6.tgz", + "integrity": "sha512-fDW/EZ6Q9RiO8eFG8Hj+7u/oW+XrPTIChwCOM2+th2A6OblDtYYIpve9m+KvI9Z4C9qSEXlaGR6bTEYHReuglA==", "dependencies": { - "call-bind": "^1.0.0", - "get-intrinsic": "^1.0.2", - "object-inspect": "^1.9.0" + "call-bind": "^1.0.7", + "es-errors": "^1.3.0", + "get-intrinsic": "^1.2.4", + "object-inspect": "^1.13.1" + }, + "engines": { + "node": ">= 0.4" }, "funding": { "url": "https://github.com/sponsors/ljharb" @@ -16704,15 +17786,42 @@ "url": "https://github.com/chalk/strip-ansi?sponsor=1" } }, + "node_modules/string.prototype.matchall": { + "version": "4.0.11", + "resolved": "https://registry.npmjs.org/string.prototype.matchall/-/string.prototype.matchall-4.0.11.tgz", + "integrity": "sha512-NUdh0aDavY2og7IbBPenWqR9exH+E26Sv8e0/eTe1tltDGZL+GtBkDAnnyBtmekfK6/Dq3MkcGtzXFEd1LQrtg==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.7", + "define-properties": "^1.2.1", + "es-abstract": "^1.23.2", + "es-errors": "^1.3.0", + "es-object-atoms": "^1.0.0", + "get-intrinsic": "^1.2.4", + "gopd": "^1.0.1", + "has-symbols": "^1.0.3", + "internal-slot": "^1.0.7", + "regexp.prototype.flags": "^1.5.2", + "set-function-name": "^2.0.2", + "side-channel": "^1.0.6" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/string.prototype.trim": { - "version": "1.2.8", - "resolved": "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.2.8.tgz", - "integrity": "sha512-lfjY4HcixfQXOfaqCvcBuOIapyaroTXhbkfJN3gcB1OtyupngWK4sEET9Knd0cXd28kTUqu/kHoV4HKSJdnjiQ==", + "version": "1.2.9", + "resolved": "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.2.9.tgz", + "integrity": "sha512-klHuCNxiMZ8MlsOihJhJEBJAiMVqU3Z2nEXWfWnIqjN0gEFS9J9+IxKozWWtQGcgoa1WUZzLjKPTr4ZHNFTFxw==", "dev": true, "dependencies": { - "call-bind": "^1.0.2", - "define-properties": "^1.2.0", - "es-abstract": "^1.22.1" + "call-bind": "^1.0.7", + "define-properties": "^1.2.1", + "es-abstract": "^1.23.0", + "es-object-atoms": "^1.0.0" }, "engines": { "node": ">= 0.4" @@ -16722,28 +17831,31 @@ } }, "node_modules/string.prototype.trimend": { - "version": "1.0.7", - "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.7.tgz", - "integrity": "sha512-Ni79DqeB72ZFq1uH/L6zJ+DKZTkOtPIHovb3YZHQViE+HDouuU4mBrLOLDn5Dde3RF8qw5qVETEjhu9locMLvA==", + "version": "1.0.8", + "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.8.tgz", + "integrity": "sha512-p73uL5VCHCO2BZZ6krwwQE3kCzM7NKmis8S//xEC6fQonchbum4eP6kR4DLEjQFO3Wnj3Fuo8NM0kOSjVdHjZQ==", "dev": true, "dependencies": { - "call-bind": "^1.0.2", - "define-properties": "^1.2.0", - "es-abstract": "^1.22.1" + "call-bind": "^1.0.7", + "define-properties": "^1.2.1", + "es-object-atoms": "^1.0.0" }, "funding": { "url": "https://github.com/sponsors/ljharb" } }, "node_modules/string.prototype.trimstart": { - "version": "1.0.7", - "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.7.tgz", - "integrity": "sha512-NGhtDFu3jCEm7B4Fy0DpLewdJQOZcQ0rGbwQ/+stjnrp2i+rlKeCvos9hOIeCmqwratM47OBxY7uFZzjxHXmrg==", + "version": "1.0.8", + "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.8.tgz", + "integrity": "sha512-UXSH262CSZY1tfu3G3Secr6uGLCFVPMhIqHjlgCUtCCcgihYc/xKs9djMTMUOb2j1mVSeU8EU6NWc/iQKU6Gfg==", "dev": true, "dependencies": { - "call-bind": "^1.0.2", - "define-properties": "^1.2.0", - "es-abstract": "^1.22.1" + "call-bind": "^1.0.7", + "define-properties": "^1.2.1", + "es-object-atoms": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" }, "funding": { "url": "https://github.com/sponsors/ljharb" @@ -16909,6 +18021,22 @@ "node": ">= 10" } }, + "node_modules/synckit": { + "version": "0.8.8", + "resolved": "https://registry.npmjs.org/synckit/-/synckit-0.8.8.tgz", + "integrity": "sha512-HwOKAP7Wc5aRGYdKH+dw0PRRpbO841v2DENBtjnR5HFWoiNByAl7vrx3p0G/rCyYXQsrxqtX48TImFtPcIHSpQ==", + "dev": true, + "dependencies": { + "@pkgr/core": "^0.1.0", + "tslib": "^2.6.2" + }, + "engines": { + "node": "^14.18.0 || >=16.0.0" + }, + "funding": { + "url": "https://opencollective.com/unts" + } + }, "node_modules/tapable": { "version": "2.2.1", "resolved": "https://registry.npmjs.org/tapable/-/tapable-2.2.1.tgz", @@ -17149,6 +18277,18 @@ "url": "https://github.com/sponsors/wooorm" } }, + "node_modules/ts-api-utils": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/ts-api-utils/-/ts-api-utils-1.3.0.tgz", + "integrity": "sha512-UQMIo7pb8WRomKR1/+MFVLTroIvDVtMX3K6OUir8ynLyzB8Jeriont2bTAtmNPa1ekAgN7YPDyf6V+ygrdU+eQ==", + "dev": true, + "engines": { + "node": ">=16" + }, + "peerDependencies": { + "typescript": ">=4.2.0" + } + }, "node_modules/ts-dedent": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/ts-dedent/-/ts-dedent-2.2.0.tgz", @@ -17186,6 +18326,27 @@ "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz", "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==" }, + "node_modules/tsutils": { + "version": "3.21.0", + "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-3.21.0.tgz", + "integrity": "sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==", + "dev": true, + "dependencies": { + "tslib": "^1.8.1" + }, + "engines": { + "node": ">= 6" + }, + "peerDependencies": { + "typescript": ">=2.8.0 || >= 3.2.0-dev || >= 3.3.0-dev || >= 3.4.0-dev || >= 3.5.0-dev || >= 3.6.0-dev || >= 3.6.0-beta || >= 3.7.0-dev || >= 3.7.0-beta" + } + }, + "node_modules/tsutils/node_modules/tslib": { + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", + "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==", + "dev": true + }, "node_modules/tunnel-agent": { "version": "0.6.0", "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz", @@ -17202,7 +18363,6 @@ "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz", "integrity": "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==", "devOptional": true, - "peer": true, "dependencies": { "prelude-ls": "^1.2.1" }, @@ -17253,29 +18413,30 @@ } }, "node_modules/typed-array-buffer": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/typed-array-buffer/-/typed-array-buffer-1.0.0.tgz", - "integrity": "sha512-Y8KTSIglk9OZEr8zywiIHG/kmQ7KWyjseXs1CbSo8vC42w7hg2HgYTxSWwP0+is7bWDc1H+Fo026CpHFwm8tkw==", + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/typed-array-buffer/-/typed-array-buffer-1.0.2.tgz", + "integrity": "sha512-gEymJYKZtKXzzBzM4jqa9w6Q1Jjm7x2d+sh19AdsD4wqnMPDYyvwpsIc2Q/835kHuo3BEQ7CjelGhfTsoBb2MQ==", "dev": true, "dependencies": { - "call-bind": "^1.0.2", - "get-intrinsic": "^1.2.1", - "is-typed-array": "^1.1.10" + "call-bind": "^1.0.7", + "es-errors": "^1.3.0", + "is-typed-array": "^1.1.13" }, "engines": { "node": ">= 0.4" } }, "node_modules/typed-array-byte-length": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/typed-array-byte-length/-/typed-array-byte-length-1.0.0.tgz", - "integrity": "sha512-Or/+kvLxNpeQ9DtSydonMxCx+9ZXOswtwJn17SNLvhptaXYDJvkFFP5zbfU/uLmvnBJlI4yrnXRxpdWH/M5tNA==", + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/typed-array-byte-length/-/typed-array-byte-length-1.0.1.tgz", + "integrity": "sha512-3iMJ9q0ao7WE9tWcaYKIptkNBuOIcZCCT0d4MRvuuH88fEoEH62IuQe0OtraD3ebQEoTRk8XCBoknUNc1Y67pw==", "dev": true, "dependencies": { - "call-bind": "^1.0.2", + "call-bind": "^1.0.7", "for-each": "^0.3.3", - "has-proto": "^1.0.1", - "is-typed-array": "^1.1.10" + "gopd": "^1.0.1", + "has-proto": "^1.0.3", + "is-typed-array": "^1.1.13" }, "engines": { "node": ">= 0.4" @@ -17285,16 +18446,17 @@ } }, "node_modules/typed-array-byte-offset": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/typed-array-byte-offset/-/typed-array-byte-offset-1.0.0.tgz", - "integrity": "sha512-RD97prjEt9EL8YgAgpOkf3O4IF9lhJFr9g0htQkm0rchFp/Vx7LW5Q8fSXXub7BXAODyUQohRMyOc3faCPd0hg==", + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/typed-array-byte-offset/-/typed-array-byte-offset-1.0.2.tgz", + "integrity": "sha512-Ous0vodHa56FviZucS2E63zkgtgrACj7omjwd/8lTEMEPFFyjfixMZ1ZXenpgCFBBt4EC1J2XsyVS2gkG0eTFA==", "dev": true, "dependencies": { - "available-typed-arrays": "^1.0.5", - "call-bind": "^1.0.2", + "available-typed-arrays": "^1.0.7", + "call-bind": "^1.0.7", "for-each": "^0.3.3", - "has-proto": "^1.0.1", - "is-typed-array": "^1.1.10" + "gopd": "^1.0.1", + "has-proto": "^1.0.3", + "is-typed-array": "^1.1.13" }, "engines": { "node": ">= 0.4" @@ -17304,14 +18466,20 @@ } }, "node_modules/typed-array-length": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/typed-array-length/-/typed-array-length-1.0.4.tgz", - "integrity": "sha512-KjZypGq+I/H7HI5HlOoGHkWUUGq+Q0TPhQurLbyrVrvnKTBgzLhIJ7j6J/XTQOi0d1RjyZ0wdas8bKs2p0x3Ng==", + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/typed-array-length/-/typed-array-length-1.0.6.tgz", + "integrity": "sha512-/OxDN6OtAk5KBpGb28T+HZc2M+ADtvRxXrKKbUwtsLgdoxgX13hyy7ek6bFRl5+aBs2yZzB0c4CnQfAtVypW/g==", "dev": true, "dependencies": { - "call-bind": "^1.0.2", + "call-bind": "^1.0.7", "for-each": "^0.3.3", - "is-typed-array": "^1.1.9" + "gopd": "^1.0.1", + "has-proto": "^1.0.3", + "is-typed-array": "^1.1.13", + "possible-typed-array-names": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" }, "funding": { "url": "https://github.com/sponsors/ljharb" @@ -17338,6 +18506,153 @@ "node": ">=14.17" } }, + "node_modules/typescript-eslint": { + "version": "7.14.1", + "resolved": "https://registry.npmjs.org/typescript-eslint/-/typescript-eslint-7.14.1.tgz", + "integrity": "sha512-Eo1X+Y0JgGPspcANKjeR6nIqXl4VL5ldXLc15k4m9upq+eY5fhU2IueiEZL6jmHrKH8aCfbIvM/v3IrX5Hg99w==", + "dev": true, + "dependencies": { + "@typescript-eslint/eslint-plugin": "7.14.1", + "@typescript-eslint/parser": "7.14.1", + "@typescript-eslint/utils": "7.14.1" + }, + "engines": { + "node": "^18.18.0 || >=20.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + }, + "peerDependencies": { + "eslint": "^8.56.0" + }, + "peerDependenciesMeta": { + "typescript": { + "optional": true + } + } + }, + "node_modules/typescript-eslint/node_modules/@typescript-eslint/scope-manager": { + "version": "7.14.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-7.14.1.tgz", + "integrity": "sha512-gPrFSsoYcsffYXTOZ+hT7fyJr95rdVe4kGVX1ps/dJ+DfmlnjFN/GcMxXcVkeHDKqsq6uAcVaQaIi3cFffmAbA==", + "dev": true, + "dependencies": { + "@typescript-eslint/types": "7.14.1", + "@typescript-eslint/visitor-keys": "7.14.1" + }, + "engines": { + "node": "^18.18.0 || >=20.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + } + }, + "node_modules/typescript-eslint/node_modules/@typescript-eslint/types": { + "version": "7.14.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-7.14.1.tgz", + "integrity": "sha512-mL7zNEOQybo5R3AavY+Am7KLv8BorIv7HCYS5rKoNZKQD9tsfGUpO4KdAn3sSUvTiS4PQkr2+K0KJbxj8H9NDg==", + "dev": true, + "engines": { + "node": "^18.18.0 || >=20.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + } + }, + "node_modules/typescript-eslint/node_modules/@typescript-eslint/typescript-estree": { + "version": "7.14.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-7.14.1.tgz", + "integrity": "sha512-k5d0VuxViE2ulIO6FbxxSZaxqDVUyMbXcidC8rHvii0I56XZPv8cq+EhMns+d/EVIL41sMXqRbK3D10Oza1bbA==", + "dev": true, + "dependencies": { + "@typescript-eslint/types": "7.14.1", + "@typescript-eslint/visitor-keys": "7.14.1", + "debug": "^4.3.4", + "globby": "^11.1.0", + "is-glob": "^4.0.3", + "minimatch": "^9.0.4", + "semver": "^7.6.0", + "ts-api-utils": "^1.3.0" + }, + "engines": { + "node": "^18.18.0 || >=20.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + }, + "peerDependenciesMeta": { + "typescript": { + "optional": true + } + } + }, + "node_modules/typescript-eslint/node_modules/@typescript-eslint/utils": { + "version": "7.14.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-7.14.1.tgz", + "integrity": "sha512-CMmVVELns3nak3cpJhZosDkm63n+DwBlDX8g0k4QUa9BMnF+lH2lr3d130M1Zt1xxmB3LLk3NV7KQCq86ZBBhQ==", + "dev": true, + "dependencies": { + "@eslint-community/eslint-utils": "^4.4.0", + "@typescript-eslint/scope-manager": "7.14.1", + "@typescript-eslint/types": "7.14.1", + "@typescript-eslint/typescript-estree": "7.14.1" + }, + "engines": { + "node": "^18.18.0 || >=20.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + }, + "peerDependencies": { + "eslint": "^8.56.0" + } + }, + "node_modules/typescript-eslint/node_modules/@typescript-eslint/visitor-keys": { + "version": "7.14.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-7.14.1.tgz", + "integrity": "sha512-Crb+F75U1JAEtBeQGxSKwI60hZmmzaqA3z9sYsVm8X7W5cwLEm5bRe0/uXS6+MR/y8CVpKSR/ontIAIEPFcEkA==", + "dev": true, + "dependencies": { + "@typescript-eslint/types": "7.14.1", + "eslint-visitor-keys": "^3.4.3" + }, + "engines": { + "node": "^18.18.0 || >=20.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + } + }, + "node_modules/typescript-eslint/node_modules/brace-expansion": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", + "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", + "dev": true, + "dependencies": { + "balanced-match": "^1.0.0" + } + }, + "node_modules/typescript-eslint/node_modules/minimatch": { + "version": "9.0.4", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.4.tgz", + "integrity": "sha512-KqWh+VchfxcMNRAJjj2tnsSJdNbHsVgnkBhTNrW7AjVo6OvLtxw8zfT9oLw1JSohlFzJ8jCoTgaoXvJ+kHt6fw==", + "dev": true, + "dependencies": { + "brace-expansion": "^2.0.1" + }, + "engines": { + "node": ">=16 || 14 >=14.17" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, "node_modules/typewriter-effect": { "version": "2.21.0", "resolved": "https://registry.npmjs.org/typewriter-effect/-/typewriter-effect-2.21.0.tgz", @@ -18263,17 +19578,67 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/which-builtin-type": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/which-builtin-type/-/which-builtin-type-1.1.3.tgz", + "integrity": "sha512-YmjsSMDBYsM1CaFiayOVT06+KJeXf0o5M/CAd4o1lTadFAtacTUM49zoYxr/oroopFDfhvN6iEcBxUyc3gvKmw==", + "dev": true, + "dependencies": { + "function.prototype.name": "^1.1.5", + "has-tostringtag": "^1.0.0", + "is-async-function": "^2.0.0", + "is-date-object": "^1.0.5", + "is-finalizationregistry": "^1.0.2", + "is-generator-function": "^1.0.10", + "is-regex": "^1.1.4", + "is-weakref": "^1.0.2", + "isarray": "^2.0.5", + "which-boxed-primitive": "^1.0.2", + "which-collection": "^1.0.1", + "which-typed-array": "^1.1.9" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/which-builtin-type/node_modules/isarray": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.5.tgz", + "integrity": "sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==", + "dev": true + }, + "node_modules/which-collection": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/which-collection/-/which-collection-1.0.2.tgz", + "integrity": "sha512-K4jVyjnBdgvc86Y6BkaLZEN933SwYOuBFkdmBu9ZfkcAbdVbpITnDmjvZ/aQjRXQrv5EPkTnD1s39GiiqbngCw==", + "dev": true, + "dependencies": { + "is-map": "^2.0.3", + "is-set": "^2.0.3", + "is-weakmap": "^2.0.2", + "is-weakset": "^2.0.3" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/which-typed-array": { - "version": "1.1.13", - "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.13.tgz", - "integrity": "sha512-P5Nra0qjSncduVPEAr7xhoF5guty49ArDTwzJ/yNuPIbZppyRxFQsRCWrocxIY+CnMVG+qfbU2FmDKyvSGClow==", + "version": "1.1.15", + "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.15.tgz", + "integrity": "sha512-oV0jmFtUky6CXfkqehVvBP/LSWJ2sy4vWMioiENyJLePrBO/yKyV9OyJySfAKosh+RYkIl5zJCNZ8/4JncrpdA==", "dev": true, "dependencies": { - "available-typed-arrays": "^1.0.5", - "call-bind": "^1.0.4", + "available-typed-arrays": "^1.0.7", + "call-bind": "^1.0.7", "for-each": "^0.3.3", "gopd": "^1.0.1", - "has-tostringtag": "^1.0.0" + "has-tostringtag": "^1.0.2" }, "engines": { "node": ">= 0.4" diff --git a/website/package.json b/website/package.json index fb6d4d9e0..b0b3a69f1 100644 --- a/website/package.json +++ b/website/package.json @@ -12,7 +12,10 @@ "serve": "docusaurus serve", "write-translations": "docusaurus write-translations", "write-heading-ids": "docusaurus write-heading-ids", - "typecheck": "tsc" + "typecheck": "tsc", + "lint": "eslint .", + "lint:fix": "eslint --fix .", + "format": "prettier --write ." }, "dependencies": { "@docusaurus/core": "3.4.0", @@ -41,11 +44,21 @@ "typewriter-effect": "^2.21.0" }, "devDependencies": { + "@docusaurus/eslint-plugin": "^3.4.0", "@docusaurus/module-type-aliases": "3.4.0", "@docusaurus/tsconfig": "3.4.0", "@docusaurus/types": "3.4.0", + "@eslint/js": "^9.5.0", + "@types/eslint": "^8.56.10", + "eslint": "^8.57.0", + "eslint-config-prettier": "^9.1.0", "eslint-plugin-import": "^2.29.1", - "typescript": "~5.5.0" + "eslint-plugin-prettier": "^5.1.3", + "eslint-plugin-react": "^7.34.3", + "globals": "^15.6.0", + "prettier": "^3.3.2", + "typescript": "~5.5.0", + "typescript-eslint": "^7.14.1" }, "browserslist": { "production": [ From 3040ab10f156a551c1bcbbaa06c79e819460dad3 Mon Sep 17 00:00:00 2001 From: Harshit <67193749+Harshitk-cp@users.noreply.github.com> Date: Thu, 27 Jun 2024 14:29:21 +0530 Subject: [PATCH 05/28] feat(cli): add ascii art on glasskube version (#879) --- cmd/glasskube/cmd/version.go | 4 +++- internal/constants/constants.go | 7 +++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/cmd/glasskube/cmd/version.go b/cmd/glasskube/cmd/version.go index 498b82cfa..db9b167d8 100644 --- a/cmd/glasskube/cmd/version.go +++ b/cmd/glasskube/cmd/version.go @@ -4,10 +4,11 @@ import ( "fmt" "os" + "github.com/fatih/color" "github.com/glasskube/glasskube/internal/clientutils" - "github.com/glasskube/glasskube/internal/cliutils" "github.com/glasskube/glasskube/internal/config" + "github.com/glasskube/glasskube/internal/constants" "github.com/spf13/cobra" ) @@ -17,6 +18,7 @@ var versioncmd = &cobra.Command{ Long: `Print the version of glasskube and package-operator`, PreRun: cliutils.SetupClientContext(false, &rootCmdOptions.SkipUpdateCheck), Run: func(cmd *cobra.Command, args []string) { + color.Blue(constants.GlasskubeAscii) glasskubeVersion := config.Version fmt.Fprintf(os.Stderr, "glasskube: v%s\n", glasskubeVersion) operatorVersion, err := clientutils.GetPackageOperatorVersion(cmd.Context()) diff --git a/internal/constants/constants.go b/internal/constants/constants.go index 7af74cd83..8ace40455 100644 --- a/internal/constants/constants.go +++ b/internal/constants/constants.go @@ -5,4 +5,11 @@ var ( DaemonSet = "DaemonSet" StatefulSet = "StatefulSet" DefaultRepoUrl = "https://packages.dl.glasskube.dev/packages" + GlasskubeAscii = ` + ____ _ _ ____ ____ _ ___ _ ____ _____ + / ___| | / \ / ___/ ___|| |/ / | | | __ )| ____| +| | _| | / _ \ \___ \___ \| ' /| | | | _ \| _| +| |_| | |___ / ___ \ ___) |__) | . \| |_| | |_) | |___ + \____|_____/_/ \_\____/____/|_|\_\\___/|____/|_____| + ` ) From 7d23c1e638c406e827a25388a56efd0707eeecac Mon Sep 17 00:00:00 2001 From: Jakob Steiner Date: Thu, 27 Jun 2024 11:36:21 +0200 Subject: [PATCH 06/28] fix(cli): standardize usage texts (#848) Signed-off-by: Jakob Steiner --- cmd/glasskube/cmd/configure.go | 2 +- cmd/glasskube/cmd/describe.go | 2 +- cmd/glasskube/cmd/install.go | 2 +- cmd/glasskube/cmd/kind_options.go | 2 +- cmd/glasskube/cmd/open.go | 2 +- cmd/glasskube/cmd/output_options.go | 2 +- cmd/glasskube/cmd/repo_add.go | 2 +- cmd/glasskube/cmd/repo_options.go | 2 +- cmd/glasskube/cmd/repo_update.go | 2 +- cmd/glasskube/cmd/telemetry.go | 2 +- cmd/glasskube/cmd/uninstall.go | 2 +- cmd/glasskube/cmd/update.go | 2 +- internal/manifestvalues/flags/flags.go | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) diff --git a/cmd/glasskube/cmd/configure.go b/cmd/glasskube/cmd/configure.go index 35fd16994..9b39d9603 100644 --- a/cmd/glasskube/cmd/configure.go +++ b/cmd/glasskube/cmd/configure.go @@ -27,7 +27,7 @@ var configureCmdOptions = struct { } var configureCmd = &cobra.Command{ - Use: "configure [package-name]", + Use: "configure ", Short: "Configure a package", Args: cobra.ExactArgs(1), PreRun: cliutils.SetupClientContext(true, &rootCmdOptions.SkipUpdateCheck), diff --git a/cmd/glasskube/cmd/describe.go b/cmd/glasskube/cmd/describe.go index 803d6df7d..2f0ff2b1d 100644 --- a/cmd/glasskube/cmd/describe.go +++ b/cmd/glasskube/cmd/describe.go @@ -33,7 +33,7 @@ var describeCmdOptions = struct { }{} var describeCmd = &cobra.Command{ - Use: "describe [package-name]", + Use: "describe ", Short: "Describe a package", Long: "Shows additional information about the given package.", Args: cobra.ExactArgs(1), diff --git a/cmd/glasskube/cmd/install.go b/cmd/glasskube/cmd/install.go index eb9403d6f..f18cb1dfa 100644 --- a/cmd/glasskube/cmd/install.go +++ b/cmd/glasskube/cmd/install.go @@ -44,7 +44,7 @@ var installCmdOptions = struct { } var installCmd = &cobra.Command{ - Use: "install [package-name]", + Use: "install ", Short: "Install a package", Long: `Install a package.`, Args: cobra.ExactArgs(1), diff --git a/cmd/glasskube/cmd/kind_options.go b/cmd/glasskube/cmd/kind_options.go index ebaeb636b..2a847da57 100644 --- a/cmd/glasskube/cmd/kind_options.go +++ b/cmd/glasskube/cmd/kind_options.go @@ -39,7 +39,7 @@ func (kind *ResourceKind) String() string { // Type implements pflag.Value. func (r *ResourceKind) Type() string { - return fmt.Sprintf("[%v|%v]", KindPackage, KindClusterPackage) + return fmt.Sprintf("(%v|%v)", KindPackage, KindClusterPackage) } type KindOptions struct { diff --git a/cmd/glasskube/cmd/open.go b/cmd/glasskube/cmd/open.go index 36f2d9693..578bbbad5 100644 --- a/cmd/glasskube/cmd/open.go +++ b/cmd/glasskube/cmd/open.go @@ -24,7 +24,7 @@ var ( ) var openCmd = &cobra.Command{ - Use: "open [package-name] [entrypoint]", + Use: "open []", Short: "Open the Web UI of a package", Long: `Open the Web UI of a package. If the package manifest has more than one entrypoint, specify the name of the entrypoint to open.`, diff --git a/cmd/glasskube/cmd/output_options.go b/cmd/glasskube/cmd/output_options.go index 420055114..cfafa7e40 100644 --- a/cmd/glasskube/cmd/output_options.go +++ b/cmd/glasskube/cmd/output_options.go @@ -28,7 +28,7 @@ func (of *OutputFormat) Set(value string) error { } func (of *OutputFormat) Type() string { - return fmt.Sprintf("[%v|%v]", OutputFormatJSON, OutputFormatYAML) + return fmt.Sprintf("(%v|%v)", OutputFormatJSON, OutputFormatYAML) } type OutputOptions struct { diff --git a/cmd/glasskube/cmd/repo_add.go b/cmd/glasskube/cmd/repo_add.go index f86a996d9..a662ea3e3 100644 --- a/cmd/glasskube/cmd/repo_add.go +++ b/cmd/glasskube/cmd/repo_add.go @@ -14,7 +14,7 @@ import ( var repoAddCmdOptions = repoOptions{} var repoAddCmd = &cobra.Command{ - Use: "add [name] [url]", + Use: "add ", Short: "Add a package repository to the current cluster", Args: cobra.ExactArgs(2), PreRun: cliutils.SetupClientContext(true, &rootCmdOptions.SkipUpdateCheck), diff --git a/cmd/glasskube/cmd/repo_options.go b/cmd/glasskube/cmd/repo_options.go index ad02ebe74..b0ffdc5b3 100644 --- a/cmd/glasskube/cmd/repo_options.go +++ b/cmd/glasskube/cmd/repo_options.go @@ -28,7 +28,7 @@ func (t *repoAuthType) Set(v string) error { } func (e *repoAuthType) Type() string { - return fmt.Sprintf("[%v|%v|%v]", repoNoAuth, repoBasicAuth, repoBearerAuth) + return fmt.Sprintf("(%v|%v|%v)", repoNoAuth, repoBasicAuth, repoBearerAuth) } const ( diff --git a/cmd/glasskube/cmd/repo_update.go b/cmd/glasskube/cmd/repo_update.go index a1b685f31..3836267dc 100644 --- a/cmd/glasskube/cmd/repo_update.go +++ b/cmd/glasskube/cmd/repo_update.go @@ -13,7 +13,7 @@ import ( var repoUpdateCmdOptions = repoOptions{} var repoUpdateCmd = &cobra.Command{ - Use: "update [name]", + Use: "update ", Short: "Update a package repository for the current cluster", Args: cobra.ExactArgs(1), PreRun: cliutils.SetupClientContext(true, &rootCmdOptions.SkipUpdateCheck), diff --git a/cmd/glasskube/cmd/telemetry.go b/cmd/glasskube/cmd/telemetry.go index 0ac98d374..ea713d811 100644 --- a/cmd/glasskube/cmd/telemetry.go +++ b/cmd/glasskube/cmd/telemetry.go @@ -39,7 +39,7 @@ var telemetryStatusCmd = &cobra.Command{ } var telemetryCmd = &cobra.Command{ - Use: "telemetry ", + Use: "telemetry (enable|disable)", Short: "View and modify telemetry settings", Long: "View and modify telemetry settings. \n" + "For more information on how Glasskube uses telemetry see https://glasskube.dev/telemetry", diff --git a/cmd/glasskube/cmd/uninstall.go b/cmd/glasskube/cmd/uninstall.go index 7fd9d0cb8..d94366607 100644 --- a/cmd/glasskube/cmd/uninstall.go +++ b/cmd/glasskube/cmd/uninstall.go @@ -20,7 +20,7 @@ var uninstallCmdOptions = struct { }{} var uninstallCmd = &cobra.Command{ - Use: "uninstall [package-name]", + Use: "uninstall ", Short: "Uninstall a package", Long: `Uninstall a package.`, Args: cobra.ExactArgs(1), diff --git a/cmd/glasskube/cmd/update.go b/cmd/glasskube/cmd/update.go index 3c9029968..1f722f775 100644 --- a/cmd/glasskube/cmd/update.go +++ b/cmd/glasskube/cmd/update.go @@ -31,7 +31,7 @@ var updateCmdOptions struct { } var updateCmd = &cobra.Command{ - Use: "update [packages...]", + Use: "update [...]", Short: "Update some or all packages in your cluster", PreRun: cliutils.SetupClientContext(true, &rootCmdOptions.SkipUpdateCheck), ValidArgsFunction: completeInstalledPackageNames, diff --git a/internal/manifestvalues/flags/flags.go b/internal/manifestvalues/flags/flags.go index 186323f76..75113ee81 100644 --- a/internal/manifestvalues/flags/flags.go +++ b/internal/manifestvalues/flags/flags.go @@ -39,7 +39,7 @@ func (opts *ValuesOptions) AddFlagsToCommand(cmd *cobra.Command) { flags.StringArrayVar(&opts.Values, "value", opts.Values, "set a value via flag (can be used multiple times).\n"+ "You can create values referencing data in other resources using the following syntax: "+ - "$$[specifier...].\n"+ + "$$[[,...]].\n"+ "For example:\n"+ " * Reference a ConfigMap key: --value \"name=$ConfigMapRef$namespace,name,key\"\n"+ " * Reference a Secret key: --value \"name=$SecretRef$namespace,name,key\"\n"+ From bfcfb8b90fd759a72cbac0319a8e90b30ec549a4 Mon Sep 17 00:00:00 2001 From: "glasskube[bot]" <133648757+glasskube-bot@users.noreply.github.com> Date: Thu, 27 Jun 2024 11:41:30 +0200 Subject: [PATCH 07/28] chore(main): release 0.11.0 (#854) --- .release-please-manifest.json | 2 +- CHANGELOG.md | 28 ++++++++++++++++++++++++++++ config/default/kustomization.yaml | 2 +- website/src/partials/_install.mdx | 10 +++++----- website/static/release.json | 2 +- 5 files changed, 36 insertions(+), 8 deletions(-) diff --git a/.release-please-manifest.json b/.release-please-manifest.json index e1a244283..f7014c353 100644 --- a/.release-please-manifest.json +++ b/.release-please-manifest.json @@ -1,3 +1,3 @@ { - ".": "0.10.1" + ".": "0.11.0" } \ No newline at end of file diff --git a/CHANGELOG.md b/CHANGELOG.md index 2f0075637..2c914cdbf 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,33 @@ # Changelog +## [0.11.0](https://github.com/glasskube/glasskube/compare/v0.10.1...v0.11.0) (2024-06-27) + + +### Features + +* **cli:** add ascii art on glasskube version ([#879](https://github.com/glasskube/glasskube/issues/879)) ([3040ab1](https://github.com/glasskube/glasskube/commit/3040ab10f156a551c1bcbbaa06c79e819460dad3)) + + +### Bug Fixes + +* **cli:** standardize usage texts ([#848](https://github.com/glasskube/glasskube/issues/848)) ([7d23c1e](https://github.com/glasskube/glasskube/commit/7d23c1e638c406e827a25388a56efd0707eeecac)) +* **deps:** update module github.com/yuin/goldmark to v1.7.4 ([#868](https://github.com/glasskube/glasskube/issues/868)) ([d7ce5fa](https://github.com/glasskube/glasskube/commit/d7ce5fa72434e93720a9681279e8ad3e5e058cfe)) +* **open:** fix typo in service name candidate ([#885](https://github.com/glasskube/glasskube/issues/885)) ([921d049](https://github.com/glasskube/glasskube/commit/921d049ff4f3575ee863a1f2ed3f5b78ea94bf47)) + + +### Other + +* **website:** configure eslint with docusaurus, react-ts and prettier plugins ([#858](https://github.com/glasskube/glasskube/issues/858)) ([613cbb7](https://github.com/glasskube/glasskube/commit/613cbb728da7cd1329b75b3148b17c2cb01ea50b)) + + +### Docs + +* exchange static image with gif ([#862](https://github.com/glasskube/glasskube/issues/862)) ([946baf4](https://github.com/glasskube/glasskube/commit/946baf46f4872ed2b45188dfb378ed0f2df6cb24)) +* **website:** exchange repo mockup with actual screenshots ([#852](https://github.com/glasskube/glasskube/issues/852)) ([8adf8fb](https://github.com/glasskube/glasskube/commit/8adf8fb8e20f29e635eb9ce812338dd068f297bb)) +* **website:** fix broken link ([#886](https://github.com/glasskube/glasskube/issues/886)) ([146dc25](https://github.com/glasskube/glasskube/commit/146dc25b11771cb81aa782fa9ec4895bccdd4a07)) +* **website:** fix typo ([#878](https://github.com/glasskube/glasskube/issues/878)) ([e6ebb8c](https://github.com/glasskube/glasskube/commit/e6ebb8c16b3f41976e41b86ed5d4d130ed80fa32)) +* **website:** glasskube is backed by Y Combinator ([#853](https://github.com/glasskube/glasskube/issues/853)) ([05e2ef7](https://github.com/glasskube/glasskube/commit/05e2ef7ce37af1ee31618dbb49258ab45d3a8a37)) + ## [0.10.1](https://github.com/glasskube/glasskube/compare/v0.10.0...v0.10.1) (2024-06-24) diff --git a/config/default/kustomization.yaml b/config/default/kustomization.yaml index 4a440c3dd..5ef32f3e0 100644 --- a/config/default/kustomization.yaml +++ b/config/default/kustomization.yaml @@ -34,7 +34,7 @@ resources: images: - name: controller newName: ghcr.io/glasskube/package-operator - newTag: v0.10.1 # x-release-please-version + newTag: v0.11.0 # x-release-please-version # [WEBHOOK] To enable webhook, uncomment all the sections with [WEBHOOK] prefix including the one in # crd/kustomization.yaml diff --git a/website/src/partials/_install.mdx b/website/src/partials/_install.mdx index f130ba237..88f9fd2b5 100644 --- a/website/src/partials/_install.mdx +++ b/website/src/partials/_install.mdx @@ -15,7 +15,7 @@ import TabItem from '@theme/TabItem'; {/* x-release-please-start-version */} ``` - dnf install https://releases.dl.glasskube.dev/glasskube_v0.10.1_amd64.rpm + dnf install https://releases.dl.glasskube.dev/glasskube_v0.11.0_amd64.rpm ``` {/* x-release-please-end */} @@ -25,8 +25,8 @@ import TabItem from '@theme/TabItem'; {/* x-release-please-start-version */} ``` - curl -LO https://releases.dl.glasskube.dev/glasskube_v0.10.1_amd64.deb - sudo dpkg -i glasskube_v0.10.1_amd64.deb + curl -LO https://releases.dl.glasskube.dev/glasskube_v0.11.0_amd64.deb + sudo dpkg -i glasskube_v0.11.0_amd64.deb ``` {/* x-release-please-end */} @@ -35,7 +35,7 @@ import TabItem from '@theme/TabItem'; APK-based installation (Alpine) {/* x-release-please-start-version */} ``` - curl -LO https://releases.dl.glasskube.dev/glasskube_v0.10.1_amd64.apk + curl -LO https://releases.dl.glasskube.dev/glasskube_v0.11.0_amd64.apk apk add glasskube.apk ``` {/* x-release-please-end */} @@ -47,7 +47,7 @@ import TabItem from '@theme/TabItem'; {/* x-release-please-start-version */} - Download the [windows archive](https://releases.dl.glasskube.dev/glasskube_v0.10.1_windows_x86_64.zip) from our + Download the [windows archive](https://releases.dl.glasskube.dev/glasskube_v0.11.0_windows_x86_64.zip) from our latest [Release](https://github.com/glasskube/glasskube/releases/latest) and unpack it using Windows Explorer. {/* x-release-please-end */} diff --git a/website/static/release.json b/website/static/release.json index fdb2d86b0..33e4f2840 100644 --- a/website/static/release.json +++ b/website/static/release.json @@ -1 +1 @@ -{"version":"0.10.1"} +{"version":"0.11.0"} From 41b3773e88e064ce68958ee45c5d89885777204d Mon Sep 17 00:00:00 2001 From: Jakob Steiner Date: Thu, 27 Jun 2024 11:46:02 +0200 Subject: [PATCH 08/28] feat(cli): add uninstalling namespaced packages (#857) Signed-off-by: Jakob Steiner --- cmd/glasskube/cmd/uninstall.go | 55 ++++++++++++++++++++-------------- pkg/uninstall/uninstall.go | 52 ++++++++++++++++++++++++-------- 2 files changed, 73 insertions(+), 34 deletions(-) diff --git a/cmd/glasskube/cmd/uninstall.go b/cmd/glasskube/cmd/uninstall.go index d94366607..6eaaf850e 100644 --- a/cmd/glasskube/cmd/uninstall.go +++ b/cmd/glasskube/cmd/uninstall.go @@ -5,19 +5,21 @@ import ( "os" "github.com/fatih/color" - "github.com/glasskube/glasskube/api/v1alpha1" "github.com/glasskube/glasskube/internal/clicontext" "github.com/glasskube/glasskube/internal/cliutils" "github.com/glasskube/glasskube/pkg/statuswriter" "github.com/glasskube/glasskube/pkg/uninstall" "github.com/spf13/cobra" - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) var uninstallCmdOptions = struct { NoWait bool Yes bool -}{} + KindOptions + NamespaceOptions +}{ + KindOptions: DefaultKindOptions(), +} var uninstallCmd = &cobra.Command{ Use: "uninstall ", @@ -32,39 +34,46 @@ var uninstallCmd = &cobra.Command{ currentContext := clicontext.RawConfigFromContext(ctx).CurrentContext client := clicontext.PackageClientFromContext(ctx) dm := cliutils.DependencyManager(ctx) + uninstaller := uninstall.NewUninstaller(client) + if !rootCmdOptions.NoProgress { + uninstaller.WithStatusWriter(statuswriter.Spinner()) + } - if g, err := dm.NewGraph(ctx); err != nil { - fmt.Fprintf(os.Stderr, "❌ Error validating uninstall: %v\n", err) + pkg, err := getPackageOrClusterPackage( + ctx, pkgName, uninstallCmdOptions.KindOptions, uninstallCmdOptions.NamespaceOptions) + if err != nil { + fmt.Fprintf(os.Stderr, "❌ Could not get resource: %v\n", err) cliutils.ExitWithError() - } else { - g.Delete(pkgName) - pruned := g.Prune() - if err := g.Validate(); err != nil { - fmt.Fprintf(os.Stderr, "❌ %v can not be uninstalled for the following reason: %v\n", pkgName, err) + } + + if !pkg.IsNamespaceScoped() { + if g, err := dm.NewGraph(ctx); err != nil { + fmt.Fprintf(os.Stderr, "❌ Error validating uninstall: %v\n", err) cliutils.ExitWithError() } else { - showUninstallDetails(currentContext, pkgName, pruned) - if !uninstallCmdOptions.Yes && !cliutils.YesNoPrompt("Do you want to continue?", false) { - fmt.Println("❌ Uninstallation cancelled.") - cliutils.ExitSuccess() + g.Delete(pkgName) + pruned := g.Prune() + if err := g.Validate(); err != nil { + fmt.Fprintf(os.Stderr, "❌ %v can not be uninstalled for the following reason: %v\n", pkgName, err) + cliutils.ExitWithError() + } else { + showUninstallDetails(currentContext, pkgName, pruned) + if !uninstallCmdOptions.Yes && !cliutils.YesNoPrompt("Do you want to continue?", false) { + fmt.Println("❌ Uninstallation cancelled.") + cliutils.ExitSuccess() + } } } } - uninstaller := uninstall.NewUninstaller(client) - if !rootCmdOptions.NoProgress { - uninstaller.WithStatusWriter(statuswriter.Spinner()) - } - - pkg := v1alpha1.ClusterPackage{ObjectMeta: metav1.ObjectMeta{Name: pkgName}} if uninstallCmdOptions.NoWait { - if err := uninstaller.Uninstall(ctx, &pkg); err != nil { + if err := uninstaller.Uninstall(ctx, pkg); err != nil { fmt.Fprintf(os.Stderr, "\n❌ An error occurred during uninstallation:\n\n%v\n", err) cliutils.ExitWithError() } fmt.Fprintln(os.Stderr, "Uninstallation started in background") } else { - if err := uninstaller.UninstallBlocking(ctx, &pkg); err != nil { + if err := uninstaller.UninstallBlocking(ctx, pkg); err != nil { fmt.Fprintf(os.Stderr, "\n❌ An error occurred during uninstallation:\n\n%v\n", err) cliutils.ExitWithError() } @@ -85,6 +94,8 @@ func showUninstallDetails(context, name string, pruned []string) { } func init() { + uninstallCmdOptions.KindOptions.AddFlagsToCommand(uninstallCmd) + uninstallCmdOptions.NamespaceOptions.AddFlagsToCommand(uninstallCmd) uninstallCmd.PersistentFlags().BoolVar(&uninstallCmdOptions.NoWait, "no-wait", false, "perform non-blocking uninstall") uninstallCmd.PersistentFlags().BoolVarP(&uninstallCmdOptions.Yes, "yes", "y", false, diff --git a/pkg/uninstall/uninstall.go b/pkg/uninstall/uninstall.go index c718250e2..a92c55a6f 100644 --- a/pkg/uninstall/uninstall.go +++ b/pkg/uninstall/uninstall.go @@ -6,6 +6,8 @@ import ( "fmt" "github.com/glasskube/glasskube/api/v1alpha1" + "github.com/glasskube/glasskube/internal/controller/ctrlpkg" + "github.com/glasskube/glasskube/internal/util" "github.com/glasskube/glasskube/pkg/client" "github.com/glasskube/glasskube/pkg/statuswriter" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -17,8 +19,6 @@ type uninstaller struct { status statuswriter.StatusWriter } -var deletePropagationForeground = metav1.DeletePropagationForeground - func NewUninstaller(pkgClient client.PackageV1Alpha1Client) *uninstaller { return &uninstaller{client: pkgClient, status: statuswriter.Noop()} } @@ -30,37 +30,48 @@ func (obj *uninstaller) WithStatusWriter(sw statuswriter.StatusWriter) *uninstal // UninstallBlocking deletes the v1alpha1.Package custom resource from the // cluster and waits until the package is fully deleted. -func (obj *uninstaller) UninstallBlocking(ctx context.Context, pkg *v1alpha1.ClusterPackage) error { +func (obj *uninstaller) UninstallBlocking(ctx context.Context, pkg ctrlpkg.Package) error { obj.status.Start() defer obj.status.Stop() err := obj.delete(ctx, pkg) if err != nil { return err } - return obj.awaitDeletion(ctx, pkg.Name) + return obj.awaitDeletion(ctx, pkg) } // Uninstall deletes the v1alpha1.Package custom resource from the cluster. -func (obj *uninstaller) Uninstall(ctx context.Context, pkg *v1alpha1.ClusterPackage) error { +func (obj *uninstaller) Uninstall(ctx context.Context, pkg ctrlpkg.Package) error { obj.status.Start() defer obj.status.Stop() return obj.delete(ctx, pkg) } -func (obj *uninstaller) delete(ctx context.Context, pkg *v1alpha1.ClusterPackage) error { - obj.status.SetStatus(fmt.Sprintf("Uninstalling %v...", pkg.Name)) - return obj.client.ClusterPackages(). - Delete(ctx, pkg, metav1.DeleteOptions{PropagationPolicy: &deletePropagationForeground}) +func (uninstaller *uninstaller) delete(ctx context.Context, pkg ctrlpkg.Package) error { + deleteOptions := metav1.DeleteOptions{ + PropagationPolicy: util.Pointer(metav1.DeletePropagationForeground), + } + + uninstaller.status.SetStatus(fmt.Sprintf("Uninstalling %v...", pkg.GetName())) + + switch pkg := pkg.(type) { + case *v1alpha1.ClusterPackage: + return uninstaller.client.ClusterPackages().Delete(ctx, pkg, deleteOptions) + case *v1alpha1.Package: + return uninstaller.client.Packages(pkg.Namespace).Delete(ctx, pkg, deleteOptions) + default: + return fmt.Errorf("unexpected object kind: %v", pkg.GroupVersionKind().Kind) + } } -func (obj *uninstaller) awaitDeletion(ctx context.Context, name string) error { - watcher, err := obj.client.ClusterPackages().Watch(ctx, metav1.ListOptions{}) +func (obj *uninstaller) awaitDeletion(ctx context.Context, pkg ctrlpkg.Package) error { + watcher, err := obj.createWatcher(ctx, pkg) if err != nil { return err } defer watcher.Stop() for event := range watcher.ResultChan() { - if pkg, ok := event.Object.(*v1alpha1.ClusterPackage); ok && pkg.Name == name { + if eventPkg, ok := event.Object.(ctrlpkg.Package); ok && isSameResource(eventPkg, pkg) { if event.Type == watch.Deleted { return nil // Package deletion confirmed } @@ -68,3 +79,20 @@ func (obj *uninstaller) awaitDeletion(ctx context.Context, name string) error { } return errors.New("failed to confirm package deletion") } + +func (obj *uninstaller) createWatcher(ctx context.Context, pkg ctrlpkg.Package) (watch.Interface, error) { + switch pkg := pkg.(type) { + case *v1alpha1.ClusterPackage: + return obj.client.ClusterPackages().Watch(ctx, metav1.ListOptions{}) + case *v1alpha1.Package: + return obj.client.Packages(pkg.Namespace).Watch(ctx, metav1.ListOptions{}) + default: + return nil, fmt.Errorf("unexpected object kind: %v", pkg.GroupVersionKind().Kind) + } +} + +func isSameResource(a, b ctrlpkg.Package) bool { + return a.GetName() == b.GetName() && + a.GroupVersionKind() == b.GroupVersionKind() && + a.GetNamespace() == b.GetNamespace() +} From d25231a88175f0f55378ae3714008f47d3982b6a Mon Sep 17 00:00:00 2001 From: Shoaib Akhtar Date: Thu, 27 Jun 2024 15:21:52 +0530 Subject: [PATCH 09/28] docs(website): change YouTube embeds to use youtube-nocookie (#888) --- website/blog/2024-03-22-release-0.1.0/index.mdx | 2 +- website/blog/2024-04-26-beta-launch-blog/index.mdx | 4 ++-- website/guides/04_kubectl-guide.mdx | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/website/blog/2024-03-22-release-0.1.0/index.mdx b/website/blog/2024-03-22-release-0.1.0/index.mdx index 1ee663b6c..7bbbe8f25 100644 --- a/website/blog/2024-03-22-release-0.1.0/index.mdx +++ b/website/blog/2024-03-22-release-0.1.0/index.mdx @@ -26,7 +26,7 @@ We are happy you choose to be part of our journey in making Kubernetes package m Watch our release video to get an overview of what has changed: - diff --git a/website/blog/2024-04-26-beta-launch-blog/index.mdx b/website/blog/2024-04-26-beta-launch-blog/index.mdx index 91f3cdae4..44605c63d 100644 --- a/website/blog/2024-04-26-beta-launch-blog/index.mdx +++ b/website/blog/2024-04-26-beta-launch-blog/index.mdx @@ -17,7 +17,7 @@ The Glasskube team as well as the growing community of Glasskube open source con As we [release Glasskube Beta](https://github.com/glasskube/glasskube/releases) we aim to bring to Kubernetes engineers tasked with maintaining the lifecycle of the packages that make up their clusters with an expanded and more mature version of Glasskube that delivers on the early promises of on app package configuration, automated updates and an ever growing package catalogue. The Beta release is still not intended to be run in production environments, in order to become production ready in the upcoming releases we hope to get valuable feedback from the Glasskube community. - + We are so excited to get this release in the hands of all of you and see what you think. Here as some of the features and updated shipped: @@ -71,7 +71,7 @@ The [Kubeflow](https://www.kubeflow.org/) project is dedicated to making deploym Here Glasskube co-founder [Philip Miglinci](https://www.linkedin.com/in/pmigat/) walked us through the new Glasskube features, improvements and gave a greate demo that included how to install and manage kubernetes packages using a GitOps framework by leveraging ArgoCD and a super simple process to seemlessly manage your cluster package stack. Really cool talk! - + ## We launched on Product Hunt 😼 diff --git a/website/guides/04_kubectl-guide.mdx b/website/guides/04_kubectl-guide.mdx index 32709a40a..bdd249bc7 100644 --- a/website/guides/04_kubectl-guide.mdx +++ b/website/guides/04_kubectl-guide.mdx @@ -433,7 +433,7 @@ Cluster package management with conventional package management tools can be a p #### Glasskube: With [Glasskube](https://github.com/glasskube/glasskube) all the pain points found in conventional package managers like helm are solved to ensure you have time to manage your workloads and not have to worry about managing your k8s package stack. - + ### Networking 🌐 From a7b5627899c0ea6eea4bf2fd283f5a9bdbc33ee7 Mon Sep 17 00:00:00 2001 From: Jakob Steiner Date: Thu, 27 Jun 2024 13:23:58 +0200 Subject: [PATCH 10/28] chore(cli): enable `--kind`, `--namespace` flags (#856) Signed-off-by: Jakob Steiner --- cmd/glasskube/cmd/configure.go | 5 ++--- cmd/glasskube/cmd/kind_options.go | 3 +-- cmd/glasskube/cmd/open.go | 5 ++--- internal/dependency/manager.go | 5 ++--- internal/dependency/manager_test.go | 5 ++--- internal/webhook/package_validator_test.go | 5 ++--- 6 files changed, 11 insertions(+), 17 deletions(-) diff --git a/cmd/glasskube/cmd/configure.go b/cmd/glasskube/cmd/configure.go index 9b39d9603..9b15b7a4f 100644 --- a/cmd/glasskube/cmd/configure.go +++ b/cmd/glasskube/cmd/configure.go @@ -132,8 +132,7 @@ func runConfigure(cmd *cobra.Command, args []string) { func init() { configureCmdOptions.ValuesOptions.AddFlagsToCommand(configureCmd) configureCmdOptions.OutputOptions.AddFlagsToCommand(configureCmd) - // TODO: Enable these flags to support namespaced packages - // configureCmdOptions.NamespaceOptions.AddFlagsToCommand(configureCmd) - // configureCmdOptions.KindOptions.AddFlagsToCommand(configureCmd) + configureCmdOptions.NamespaceOptions.AddFlagsToCommand(configureCmd) + configureCmdOptions.KindOptions.AddFlagsToCommand(configureCmd) RootCmd.AddCommand(configureCmd) } diff --git a/cmd/glasskube/cmd/kind_options.go b/cmd/glasskube/cmd/kind_options.go index 2a847da57..554879be4 100644 --- a/cmd/glasskube/cmd/kind_options.go +++ b/cmd/glasskube/cmd/kind_options.go @@ -52,8 +52,7 @@ func (opts *KindOptions) AddFlagsToCommand(cmd *cobra.Command) { func DefaultKindOptions() KindOptions { return KindOptions{ - // TODO: Change to KindUnspecified to support namespaced packages - Kind: KindClusterPackage, + Kind: KindUnspecified, } } diff --git a/cmd/glasskube/cmd/open.go b/cmd/glasskube/cmd/open.go index 578bbbad5..3835e80b4 100644 --- a/cmd/glasskube/cmd/open.go +++ b/cmd/glasskube/cmd/open.go @@ -89,9 +89,8 @@ If the package manifest has more than one entrypoint, specify the name of the en } func init() { - // TODO: Enable these flags to support namespaced packages - // openCmdOptions.KindOptions.AddFlagsToCommand(openCmd) - // openCmdOptions.NamespaceOptions.AddFlagsToCommand(openCmd) + openCmdOptions.KindOptions.AddFlagsToCommand(openCmd) + openCmdOptions.NamespaceOptions.AddFlagsToCommand(openCmd) openCmd.Flags().Int32Var(&openCmdOptions.Port, "port", openCmdOptions.Port, "custom port for opening the package") RootCmd.AddCommand(openCmd) } diff --git a/internal/dependency/manager.go b/internal/dependency/manager.go index 16a53a8f0..b290ebb5a 100644 --- a/internal/dependency/manager.go +++ b/internal/dependency/manager.go @@ -98,14 +98,13 @@ func (dm *DependendcyManager) NewGraph(ctx context.Context) (*graph.DependencyGr } } - // TODO re-enable this when we fully support namespaced packages (this is just a quickfix to avoid client-side rate limits) - /*if pkgs, err := dm.pkgClient.ListPackages(ctx, ""); err != nil { + if pkgs, err := dm.pkgClient.ListPackages(ctx, ""); err != nil { return nil, err } else { for i := range pkgs.Items { allPkgs = append(allPkgs, &pkgs.Items[i]) } - }*/ + } g := graph.NewGraph() for _, pkg := range allPkgs { diff --git a/internal/dependency/manager_test.go b/internal/dependency/manager_test.go index 6e4d0a06c..e0ccca84c 100644 --- a/internal/dependency/manager_test.go +++ b/internal/dependency/manager_test.go @@ -535,8 +535,7 @@ var _ = Describe("Dependency Manager", func() { BeforeEach(func() { ni.Status.Manifest.Dependencies = []v1alpha1.Dependency{{Name: d.Name, Version: "1.x.x"}} }) - // TODO re-enable - /*It("should prevent illegal update of D", func(ctx context.Context) { + It("should prevent illegal update of D", func(ctx context.Context) { d, di = createClusterPackageAndInfo("D", "2.0.0", false) res, err := dm.Validate(ctx, di.Status.Manifest, di.Spec.Version) Expect(err).ShouldNot(HaveOccurred()) @@ -544,7 +543,7 @@ var _ = Describe("Dependency Manager", func() { Expect(res.Status).Should(Equal(ValidationResultStatusConflict)) Expect(res.Requirements).Should(BeEmpty()) Expect(res.Conflicts).Should(HaveLen(1)) - })*/ + }) It("should allow legal update of D", func(ctx context.Context) { d, di = createClusterPackageAndInfo("D", "1.2.0", false) res, err := dm.Validate(ctx, di.Status.Manifest, di.Spec.Version) diff --git a/internal/webhook/package_validator_test.go b/internal/webhook/package_validator_test.go index 063c105eb..c953ecbab 100644 --- a/internal/webhook/package_validator_test.go +++ b/internal/webhook/package_validator_test.go @@ -222,14 +222,13 @@ var _ = Describe("PackageValidatingWebhook", Ordered, func() { Expect(err).To(HaveOccurred()) }) }) - // TODO re-enable - /*When("a namespaced dependent exists with constraint", func() { + When("a namespaced dependent exists with constraint", func() { It("should return error", func(ctx context.Context) { webhook := newPackageValidatingWebhook(&nspv1pkg, &nspv1pi, &foov1pkg, &foov1pi) _, err := webhook.ValidateUpdate(ctx, &foov1pkg, &foov2pkg) Expect(err).To(HaveOccurred()) }) - })*/ + }) }) Context("ValidateDelete", func() { From e92cecdb38fba125129d10109ce397a9109bf229 Mon Sep 17 00:00:00 2001 From: Parth Johri <76129377+ParthJohri@users.noreply.github.com> Date: Thu, 27 Jun 2024 16:59:29 +0530 Subject: [PATCH 11/28] fix(ui): improve navbar for smaller screens (#876) --- internal/web/templates/layout/base.html | 50 ++++++++++++++----------- 1 file changed, 28 insertions(+), 22 deletions(-) diff --git a/internal/web/templates/layout/base.html b/internal/web/templates/layout/base.html index 7db35ae82..969c24e02 100644 --- a/internal/web/templates/layout/base.html +++ b/internal/web/templates/layout/base.html @@ -21,30 +21,36 @@
-
- - Logo -

Glasskube

- +
+
+ + Logo +

Glasskube

+ -
    -
  • - {{ with $packages := "packages" }} - Packages - {{ end }} -
    • -
  • - Apps -
    • -
  • - {{ with $settings := "settings" }} - Settings - {{ end }} -
    • -
+
    +
  • + {{ with $packages := "packages" }} + Packages + {{ end }} +
    • +
  • + Apps +
    • +
  • + {{ with $settings := "settings" }} + Settings + {{ end }} +
    • +
+
-
-
    +
    +
    • Glasskube Cloud Date: Thu, 27 Jun 2024 13:52:59 +0200 Subject: [PATCH 12/28] feat(ui): add support for namespace-scoped packages (#817) Signed-off-by: christoph Signed-off-by: Jakob Steiner Co-authored-by: Jakob Steiner --- api/v1alpha1/package_manifest.go | 8 + cmd/glasskube/cmd/auto-update.go | 6 +- cmd/glasskube/cmd/describe.go | 2 +- cmd/glasskube/cmd/install.go | 6 +- cmd/glasskube/cmd/list.go | 176 +++- cmd/glasskube/cmd/update.go | 14 +- internal/repo/types/types.go | 11 +- internal/telemetry/client.go | 2 +- .../components/pkg_config_input/controller.go | 28 +- .../components/pkg_detail_btns/controller.go | 10 +- .../components/pkg_overview_btn/controller.go | 22 +- .../components/pkg_update_alert/controller.go | 6 +- internal/web/configurationvalues.go | 57 +- internal/web/discussions.go | 85 +- internal/web/packagedetail.go | 217 +++++ internal/web/response.go | 50 + internal/web/server.go | 904 +++++++++++------- internal/web/templates.go | 51 +- ...rview-btn.html => clpkg-overview-btn.html} | 11 +- .../components/pkg-config-advanced.html | 6 +- .../components/pkg-config-input.html | 14 +- .../templates/components/pkg-detail-btns.html | 8 +- .../components/pkg-detail-header.html | 62 +- .../components/pkg-uninstall-modal.html | 22 +- .../components/pkg-update-alert.html | 2 +- .../components/pkg-update-modal.html | 12 +- internal/web/templates/layout/base.html | 12 +- .../web/templates/pages/clusterpackages.html | 65 ++ internal/web/templates/pages/discussion.html | 4 +- internal/web/templates/pages/package.html | 61 +- internal/web/templates/pages/packages.html | 197 +++- internal/web/util/packagehref.go | 41 + pkg/client/builder.go | 48 +- pkg/client/client_base.go | 2 + pkg/client/client_cached.go | 75 +- pkg/client/interface.go | 1 + pkg/describe/describe.go | 38 +- pkg/install/install.go | 32 +- pkg/list/lister.go | 185 +++- pkg/list/result.go | 16 +- pkg/update/update.go | 123 ++- website/static/schemas/v1/index.json | 9 + 42 files changed, 1990 insertions(+), 711 deletions(-) create mode 100644 internal/web/packagedetail.go create mode 100644 internal/web/response.go rename internal/web/templates/components/{pkg-overview-btn.html => clpkg-overview-btn.html} (85%) create mode 100644 internal/web/templates/pages/clusterpackages.html create mode 100644 internal/web/util/packagehref.go diff --git a/api/v1alpha1/package_manifest.go b/api/v1alpha1/package_manifest.go index c26a1e077..2360674bd 100644 --- a/api/v1alpha1/package_manifest.go +++ b/api/v1alpha1/package_manifest.go @@ -85,6 +85,14 @@ func (PackageScope) JSONSchema() *jsonschema.Schema { } } +func (s *PackageScope) IsCluster() bool { + return s == nil || *s == ScopeCluster +} + +func (s *PackageScope) IsNamespaced() bool { + return s != nil && *s == ScopeNamespaced +} + type PackageManifest struct { // Scope is optional (default is Cluster) Scope *PackageScope `json:"scope,omitempty"` diff --git a/cmd/glasskube/cmd/auto-update.go b/cmd/glasskube/cmd/auto-update.go index f72451d2f..6a47a807c 100644 --- a/cmd/glasskube/cmd/auto-update.go +++ b/cmd/glasskube/cmd/auto-update.go @@ -123,20 +123,20 @@ func runAutoUpdate(cmd *cobra.Command, args []string) { cliutils.ExitSuccess() } - tx, err := updater.Prepare(ctx, packageNames) + tx, err := updater.Prepare(ctx, packageNames, nil) if err != nil { fmt.Fprintf(os.Stderr, "Error preparing update: %v\n", err) cliutils.ExitWithError() } printTransaction(*tx) - if updated, err := updater.Apply(ctx, tx); err != nil { + if updated, err := updater.ApplyBlocking(ctx, tx); err != nil { fmt.Fprintf(os.Stderr, "Error applying update: %v\n", err) cliutils.ExitWithError() } else { updatedNames := make([]string, len(updated)) for i := range updated { - updatedNames[i] = updated[i].Name + updatedNames[i] = updated[i].GetName() } fmt.Fprintf(os.Stderr, "Updated packages: %v\n", strings.Join(updatedNames, ", ")) } diff --git a/cmd/glasskube/cmd/describe.go b/cmd/glasskube/cmd/describe.go index 2f0ff2b1d..97651c635 100644 --- a/cmd/glasskube/cmd/describe.go +++ b/cmd/glasskube/cmd/describe.go @@ -57,7 +57,7 @@ var describeCmd = &cobra.Command{ cliutils.ExitWithError() } - pkg, manifest, err := describe.DescribeInstalledPackage(ctx, pkgName) + pkg, manifest, err := describe.DescribeInstalledClusterPackage(ctx, pkgName) if err != nil && !apierrors.IsNotFound(err) { // Unhandled error -> exit fmt.Fprintf(os.Stderr, "❌ Could not describe package %v: %v\n", pkgName, err) diff --git a/cmd/glasskube/cmd/install.go b/cmd/glasskube/cmd/install.go index f18cb1dfa..807b2998a 100644 --- a/cmd/glasskube/cmd/install.go +++ b/cmd/glasskube/cmd/install.go @@ -65,7 +65,7 @@ var installCmd = &cobra.Command{ bold := color.New(color.Bold).SprintFunc() packageName := args[0] - pkgBuilder := client.ClusterPackageBuilder(packageName) + pkgBuilder := client.PackageBuilder(packageName) var repoClient repoclient.RepoClient if len(installCmdOptions.Repository) > 0 { @@ -159,7 +159,7 @@ var installCmd = &cobra.Command{ pkgBuilder.WithAutoUpdates(installCmdOptions.EnableAutoUpdates) - pkg := pkgBuilder.Build() + pkg := pkgBuilder.BuildClusterPackage() fmt.Fprintln(os.Stderr, bold("Summary:")) fmt.Fprintf(os.Stderr, " * The following packages will be installed in your cluster (%v):\n", config.CurrentContext) @@ -190,7 +190,7 @@ var installCmd = &cobra.Command{ } if installCmdOptions.NoWait { - if err := installer.Install(ctx, pkg, opts); err != nil { + if err := installer.InstallClusterPackage(ctx, pkg, opts); err != nil { fmt.Fprintf(os.Stderr, "An error occurred during installation:\n\n%v\n", err) cliutils.ExitWithError() } diff --git a/cmd/glasskube/cmd/list.go b/cmd/glasskube/cmd/list.go index a87ff38a6..7d5cf4d8f 100644 --- a/cmd/glasskube/cmd/list.go +++ b/cmd/glasskube/cmd/list.go @@ -6,6 +6,8 @@ import ( "os" "strings" + "github.com/glasskube/glasskube/internal/controller/ctrlpkg" + "github.com/glasskube/glasskube/internal/clientutils" "github.com/glasskube/glasskube/internal/cliutils" "github.com/glasskube/glasskube/internal/semver" @@ -21,6 +23,7 @@ type ListCmdOptions struct { ShowLatestVersion bool More bool OutputOptions + KindOptions } func (o ListCmdOptions) toListOptions() list.ListOptions { @@ -30,7 +33,9 @@ func (o ListCmdOptions) toListOptions() list.ListOptions { } } -var listCmdOptions = ListCmdOptions{} +var listCmdOptions = ListCmdOptions{ + KindOptions: DefaultKindOptions(), +} var listCmd = &cobra.Command{ Use: "list", @@ -45,49 +50,55 @@ var listCmd = &cobra.Command{ listCmdOptions.ShowLatestVersion = true listCmdOptions.ShowDescription = true } - pkgs, err := list.NewLister(ctx).GetPackagesWithStatus(ctx, listCmdOptions.toListOptions()) - if err != nil { - fmt.Fprintf(os.Stderr, "❗ An error occurred listing packages: %v\n", err) - if len(pkgs) == 0 { - cliutils.ExitWithError() - } else { - fmt.Fprint(os.Stderr, "⚠️ The table shown below may be incomplete due to the error above.\n\n") - } + lister := list.NewListerWithRepoCache(ctx) + var clPkgs []*list.PackageWithStatus + var pkgs []*list.PackagesWithStatus + var err error + if listCmdOptions.Kind != KindPackage { + clPkgs, err = lister.GetClusterPackagesWithStatus(ctx, listCmdOptions.toListOptions()) + handleListErr(len(clPkgs), err, "clusterpackages") } - if len(pkgs) == 0 { - if listCmdOptions.ListOutdatedOnly { - fmt.Fprintln(os.Stderr, "All installed packages are up-to-date.") - } else if listCmdOptions.ListInstalledOnly { - fmt.Fprintln(os.Stderr, "There are currently no packages installed in your cluster.\n"+ - "Run \"glasskube help install\" to get started.") - } else { - fmt.Fprintln(os.Stderr, "No packages found. This is probably a bug.") + if listCmdOptions.Kind != KindClusterPackage { + pkgs, err = lister.GetPackagesWithStatus(ctx, listCmdOptions.toListOptions()) + handleListErr(len(pkgs), err, "packages") + } + noPkgs := len(pkgs) == 0 && listCmdOptions.Kind != KindClusterPackage + noClPkgs := len(clPkgs) == 0 && listCmdOptions.Kind != KindPackage + if noPkgs { + handleEmptyList("packages") + } else if len(pkgs) > 0 { + printPackageTable(pkgs) + if listCmdOptions.Kind != KindPackage { + fmt.Fprintln(os.Stderr, "") } - } else { + } + if noClPkgs { + handleEmptyList("clusterpackages") + } else if len(clPkgs) > 0 { if listCmdOptions.Output == OutputFormatJSON { - printPackageJSON(pkgs) + printPackageJSON(clPkgs) } else if listCmdOptions.Output == OutputFormatYAML { - printPackageYAML(pkgs) + printPackageYAML(clPkgs) } else { - printPackageTable(pkgs) + printClusterPackageTable(clPkgs) } } - }, } func init() { listCmd.PersistentFlags().BoolVarP(&listCmdOptions.ListInstalledOnly, "installed", "i", false, - "list only installed packages") + "list only installed (cluster-)packages") listCmd.PersistentFlags().BoolVar(&listCmdOptions.ListOutdatedOnly, "outdated", false, - "list only outdated packages") + "list only outdated (cluster-)packages") listCmd.PersistentFlags().BoolVar(&listCmdOptions.ShowDescription, "show-description", false, - "show the package description") + "show the (cluster-)package description") listCmd.PersistentFlags().BoolVar(&listCmdOptions.ShowLatestVersion, "show-latest", false, - "show the latest version of packages if available") + "show the latest version of (cluster-)packages if available") listCmd.PersistentFlags().BoolVarP(&listCmdOptions.More, "more", "m", false, - "show additional information about packages (like --show-description --show-latest)") + "show additional information about (cluster-)packages (like --show-description --show-latest)") listCmdOptions.OutputOptions.AddFlagsToCommand(listCmd) + listCmdOptions.KindOptions.AddFlagsToCommand(listCmd) listCmd.MarkFlagsMutuallyExclusive("show-description", "more") listCmd.MarkFlagsMutuallyExclusive("show-latest", "more") @@ -95,7 +106,29 @@ func init() { RootCmd.AddCommand(listCmd) } -func printPackageTable(packages []*list.PackageWithStatus) { +func handleListErr(listLen int, err error, resource string) { + if err != nil { + fmt.Fprintf(os.Stderr, "❗ An error occurred listing %s: %v\n", resource, err) + if listLen == 0 { + cliutils.ExitWithError() + } else { + fmt.Fprint(os.Stderr, "⚠️ The table shown below may be incomplete due to the error above.\n\n") + } + } +} + +func handleEmptyList(resource string) { + if listCmdOptions.ListOutdatedOnly { + fmt.Fprintf(os.Stderr, "All installed %s are up-to-date.\n", resource) + } else if listCmdOptions.ListInstalledOnly { + fmt.Fprintf(os.Stderr, "There are currently no %s installed in your cluster.\n"+ + "Run \"glasskube help install\" to get started.\n", resource) + } else { + fmt.Fprintf(os.Stderr, "No %s found in the available repositories.\n", resource) + } +} + +func printClusterPackageTable(packages []*list.PackageWithStatus) { header := []string{"NAME", "STATUS", "VERSION", "AUTO-UPDATE"} if listCmdOptions.ShowLatestVersion { header = append(header, "LATEST VERSION") @@ -104,11 +137,67 @@ func printPackageTable(packages []*list.PackageWithStatus) { if listCmdOptions.ShowDescription { header = append(header, "DESCRIPTION") } + err := cliutils.PrintTable(os.Stdout, packages, header, func(pkg *list.PackageWithStatus) []string { - row := []string{pkg.Name, statusString(*pkg), versionString(*pkg), clientutils.AutoUpdateString(pkg.Package, "")} + row := []string{pkg.Name, statusString(*pkg), versionString(*pkg), + clientutils.AutoUpdateString(pkg.ClusterPackage, "")} + if listCmdOptions.ShowLatestVersion { + row = append(row, pkg.LatestVersion) + } + s := make([]string, len(pkg.Repos)) + if pkg.ClusterPackage != nil { + for i, r := range pkg.Repos { + if pkg.ClusterPackage.Spec.PackageInfo.RepositoryName == r { + s[i] = fmt.Sprintf("%v (used)", r) + } else { + s[i] = r + } + } + } else { + s = pkg.Repos + } + row = append(row, strings.Join(s, ", ")) + if listCmdOptions.ShowDescription { + row = append(row, pkg.ShortDescription) + } + return row + }) + if err != nil { + fmt.Fprintf(os.Stderr, "There was an error displaying the clusterpackage table:\n%v\n(This is a bug)\n", err) + cliutils.ExitWithError() + } +} + +func printPackageTable(packages []*list.PackagesWithStatus) { + header := []string{"PACKAGENAME", "NAMESPACE", "NAME", "STATUS", "VERSION", "AUTO-UPDATE"} + if listCmdOptions.ShowLatestVersion { + header = append(header, "LATEST VERSION") + } + header = append(header, "REPOSITORY") + if listCmdOptions.ShowDescription { + header = append(header, "DESCRIPTION") + } + + var flattenedPkgs []*list.PackageWithStatus + for _, pkgs := range packages { + if len(pkgs.Packages) == 0 { + flattenedPkgs = append(flattenedPkgs, &list.PackageWithStatus{ + MetaIndexItem: pkgs.MetaIndexItem, + }) + } else { + flattenedPkgs = append(flattenedPkgs, pkgs.Packages...) + } + } + + err := cliutils.PrintTable(os.Stdout, + flattenedPkgs, + header, + func(pkg *list.PackageWithStatus) []string { + row := []string{pkg.Name, pkgNamespaceString(*pkg), pkgNameString(*pkg), statusString(*pkg), versionString(*pkg), + clientutils.AutoUpdateString(pkg.Package, "")} if listCmdOptions.ShowLatestVersion { row = append(row, pkg.LatestVersion) } @@ -147,7 +236,6 @@ func printPackageJSON(packages []*list.PackageWithStatus) { } func printPackageYAML(packages []*list.PackageWithStatus) { - for i, pkg := range packages { yamlData, err := yaml.Marshal(pkg) if err != nil { @@ -163,6 +251,22 @@ func printPackageYAML(packages []*list.PackageWithStatus) { } } +func pkgNamespaceString(pkg list.PackageWithStatus) string { + if pkg.Package != nil { + return pkg.Package.Namespace + } else { + return "" + } +} + +func pkgNameString(pkg list.PackageWithStatus) string { + if pkg.Package != nil { + return pkg.Package.Name + } else { + return "" + } +} + func statusString(pkg list.PackageWithStatus) string { if pkg.Status != nil { return pkg.Status.Status @@ -172,9 +276,15 @@ func statusString(pkg list.PackageWithStatus) string { } func versionString(pkg list.PackageWithStatus) string { - if pkg.Package != nil { - specVersion := pkg.Package.Spec.PackageInfo.Version - statusVersion := pkg.Package.Status.Version + var p ctrlpkg.Package + if pkg.ClusterPackage != nil { + p = pkg.ClusterPackage + } else if pkg.Package != nil { + p = pkg.Package + } + if pkg.ClusterPackage != nil || pkg.Package != nil { + specVersion := p.GetSpec().PackageInfo.Version + statusVersion := p.GetStatus().Version repoVersion := pkg.LatestVersion if statusVersion != "" { diff --git a/cmd/glasskube/cmd/update.go b/cmd/glasskube/cmd/update.go index 1f722f775..2cd244b90 100644 --- a/cmd/glasskube/cmd/update.go +++ b/cmd/glasskube/cmd/update.go @@ -9,6 +9,8 @@ import ( "strings" "text/tabwriter" + "github.com/glasskube/glasskube/internal/controller/ctrlpkg" + "github.com/glasskube/glasskube/api/v1alpha1" "github.com/glasskube/glasskube/internal/clicontext" "github.com/glasskube/glasskube/internal/cliutils" @@ -61,7 +63,7 @@ var updateCmd = &cobra.Command{ cliutils.ExitWithError() } } else { - tx, err = updater.Prepare(ctx, packageNames) + tx, err = updater.Prepare(ctx, packageNames, nil) if err != nil { fmt.Fprintf(os.Stderr, "❌ update preparation failed: %v\n", err) cliutils.ExitWithError() @@ -74,7 +76,7 @@ var updateCmd = &cobra.Command{ fmt.Fprintf(os.Stderr, "⛔ Update cancelled. No changes were made.\n") cliutils.ExitSuccess() } - updatedPackages, err := updater.Apply(ctx, tx) + updatedPackages, err := updater.ApplyBlocking(ctx, tx) if err != nil { fmt.Fprintf(os.Stderr, "❌ update failed: %v\n", err) cliutils.ExitWithError() @@ -91,10 +93,10 @@ func printTransaction(tx update.UpdateTransaction) { for _, item := range tx.Items { if item.UpdateRequired() { fmt.Fprintf(w, "%v:\t%v\t-> %v\n", - item.Package.Name, item.Package.Spec.PackageInfo.Version, item.Version) + item.Package.GetName(), item.Package.GetSpec().PackageInfo.Version, item.Version) } else { fmt.Fprintf(w, "%v:\t%v\t(up-to-date)\n", - item.Package.Name, item.Package.Spec.PackageInfo.Version) + item.Package.GetName(), item.Package.GetSpec().PackageInfo.Version) } } for _, req := range tx.Requirements { @@ -103,7 +105,7 @@ func printTransaction(tx update.UpdateTransaction) { _ = w.Flush() } -func handleOutput(pkgs []v1alpha1.ClusterPackage) { +func handleOutput(pkgs []ctrlpkg.Package) { if updateCmdOptions.Output == "" { return } @@ -111,7 +113,7 @@ func handleOutput(pkgs []v1alpha1.ClusterPackage) { var outputData []byte var err error for i := range pkgs { - if gvks, _, err := scheme.Scheme.ObjectKinds(&pkgs[i]); err == nil && len(gvks) == 1 { + if gvks, _, err := scheme.Scheme.ObjectKinds(pkgs[i]); err == nil && len(gvks) == 1 { pkgs[i].SetGroupVersionKind(gvks[0]) } else { fmt.Fprintf(os.Stderr, "❌ failed to set GVK for package: %v\n", err) diff --git a/internal/repo/types/types.go b/internal/repo/types/types.go index 47751854b..5619a1fae 100644 --- a/internal/repo/types/types.go +++ b/internal/repo/types/types.go @@ -1,5 +1,7 @@ package types +import "github.com/glasskube/glasskube/api/v1alpha1" + type PackageIndex struct { Versions []PackageIndexItem `json:"versions" jsonschema:"required"` LatestVersion string `json:"latestVersion" jsonschema:"required"` @@ -14,10 +16,11 @@ type PackageRepoIndex struct { } type PackageRepoIndexItem struct { - Name string `json:"name"` - ShortDescription string `json:"shortDescription,omitempty"` - IconUrl string `json:"iconUrl,omitempty"` - LatestVersion string `json:"latestVersion,omitempty"` + Name string `json:"name"` + ShortDescription string `json:"shortDescription,omitempty"` + IconUrl string `json:"iconUrl,omitempty"` + LatestVersion string `json:"latestVersion,omitempty"` + Scope *v1alpha1.PackageScope `json:"scope,omitempty"` } type MetaIndex struct { diff --git a/internal/telemetry/client.go b/internal/telemetry/client.go index 0153fe815..555f86a3b 100644 --- a/internal/telemetry/client.go +++ b/internal/telemetry/client.go @@ -225,7 +225,7 @@ func HttpMiddleware() func(http.Handler) http.Handler { ev := instance.getBaseEvent("ui_endpoint", false) ev.Properties["$current_url"] = r.URL.String() ev.Properties["method"] = r.Method - ev.Properties["path"] = r.URL + ev.Properties["path"] = r.URL // TODO exclusions necessary since namespace/name are part of the URL! ev.Properties["execution_time"] = time.Since(start).Milliseconds() ev.Properties["user_agent"] = r.UserAgent() _ = instance.posthog.Enqueue(ev) diff --git a/internal/web/components/pkg_config_input/controller.go b/internal/web/components/pkg_config_input/controller.go index 61692846f..d37aded05 100644 --- a/internal/web/components/pkg_config_input/controller.go +++ b/internal/web/components/pkg_config_input/controller.go @@ -4,6 +4,10 @@ import ( "fmt" "strconv" + "github.com/glasskube/glasskube/internal/web/util" + + "github.com/glasskube/glasskube/internal/controller/ctrlpkg" + "github.com/glasskube/glasskube/api/v1alpha1" ) @@ -34,11 +38,12 @@ type pkgConfigInputInput struct { ValueError error Autofocus bool DatalistOptions *PkgConfigInputDatalistOptions + PackageHref string } -func getStringValue(pkg *v1alpha1.ClusterPackage, valueName string, valueDefinition *v1alpha1.ValueDefinition) string { - if pkg != nil { - if valueConfiguration, ok := pkg.Spec.Values[valueName]; ok { +func getStringValue(pkg ctrlpkg.Package, valueName string, valueDefinition *v1alpha1.ValueDefinition) string { + if !pkg.IsNil() { + if valueConfiguration, ok := pkg.GetSpec().Values[valueName]; ok { if valueConfiguration.Value != nil { return *valueConfiguration.Value } @@ -47,7 +52,7 @@ func getStringValue(pkg *v1alpha1.ClusterPackage, valueName string, valueDefinit return valueDefinition.DefaultValue } -func getBoolValue(pkg *v1alpha1.ClusterPackage, valueName string, valueDefinition *v1alpha1.ValueDefinition) bool { +func getBoolValue(pkg ctrlpkg.Package, valueName string, valueDefinition *v1alpha1.ValueDefinition) bool { if valueDefinition.Type == v1alpha1.ValueTypeBoolean { strVal := getStringValue(pkg, valueName, valueDefinition) if valBool, err := strconv.ParseBool(strVal); err == nil { @@ -65,9 +70,9 @@ func getLabel(valueName string, valueDefinition *v1alpha1.ValueDefinition) strin return inputLabel } -func getExistingReferenceAndKind(pkg *v1alpha1.ClusterPackage, valueName string) (*v1alpha1.ValueReference, string) { - if pkg != nil { - if val, ok := pkg.Spec.Values[valueName]; ok { +func getExistingReferenceAndKind(pkg ctrlpkg.Package, valueName string) (*v1alpha1.ValueReference, string) { + if !pkg.IsNil() { + if val, ok := pkg.GetSpec().Values[valueName]; ok { if val.Value == nil && val.ValueFrom != nil { if val.ValueFrom.ConfigMapRef != nil { return val.ValueFrom, "ConfigMap" @@ -83,7 +88,7 @@ func getExistingReferenceAndKind(pkg *v1alpha1.ClusterPackage, valueName string) } func getOrCreateReference( - pkg *v1alpha1.ClusterPackage, valueName string, desiredRefKind *string) (v1alpha1.ValueReference, string) { + pkg ctrlpkg.Package, valueName string, desiredRefKind *string) (v1alpha1.ValueReference, string) { existingReference, existingRefKind := getExistingReferenceAndKind(pkg, valueName) if desiredRefKind != nil && *desiredRefKind != existingRefKind { return v1alpha1.ValueReference{}, *desiredRefKind @@ -95,10 +100,10 @@ func getOrCreateReference( } func ForPkgConfigInput( - pkg *v1alpha1.ClusterPackage, + pkg ctrlpkg.Package, repositoryName string, selectedVersion string, - pkgName string, + manifest *v1alpha1.PackageManifest, valueName string, valueDefinition v1alpha1.ValueDefinition, valueError error, @@ -112,7 +117,7 @@ func ForPkgConfigInput( return &pkgConfigInputInput{ RepositoryName: repositoryName, SelectedVersion: selectedVersion, - PkgName: pkgName, + PkgName: manifest.Name, ValueName: valueName, ValueDefinition: valueDefinition, StringValue: getStringValue(pkg, valueName, &valueDefinition), @@ -125,5 +130,6 @@ func ForPkgConfigInput( ValueError: valueError, Autofocus: options.Autofocus, DatalistOptions: datalistOptions, + PackageHref: util.GetPackageHrefWithFallback(pkg, manifest), } } diff --git a/internal/web/components/pkg_detail_btns/controller.go b/internal/web/components/pkg_detail_btns/controller.go index 65483da3e..dbf33f1d2 100644 --- a/internal/web/components/pkg_detail_btns/controller.go +++ b/internal/web/components/pkg_detail_btns/controller.go @@ -3,6 +3,10 @@ package pkg_detail_btns import ( "fmt" + "github.com/glasskube/glasskube/internal/web/util" + + "github.com/glasskube/glasskube/internal/controller/ctrlpkg" + "github.com/glasskube/glasskube/api/v1alpha1" "github.com/glasskube/glasskube/pkg/client" ) @@ -15,7 +19,8 @@ type pkgDetailBtnsInput struct { Status *client.PackageStatus Manifest *v1alpha1.PackageManifest UpdateAvailable bool - Pkg *v1alpha1.ClusterPackage + Pkg ctrlpkg.Package + PackageHref string } func getId(pkgName string) string { @@ -26,7 +31,7 @@ func ForPkgDetailBtns( pkgName string, status *client.PackageStatus, manifest *v1alpha1.PackageManifest, - pkg *v1alpha1.ClusterPackage, + pkg ctrlpkg.Package, updateAvailable bool, ) *pkgDetailBtnsInput { id := getId(pkgName) @@ -37,5 +42,6 @@ func ForPkgDetailBtns( Manifest: manifest, UpdateAvailable: updateAvailable, Pkg: pkg, + PackageHref: util.GetPackageHref(pkg, manifest), } } diff --git a/internal/web/components/pkg_overview_btn/controller.go b/internal/web/components/pkg_overview_btn/controller.go index 8c76536e8..d1fbea729 100644 --- a/internal/web/components/pkg_overview_btn/controller.go +++ b/internal/web/components/pkg_overview_btn/controller.go @@ -3,34 +3,42 @@ package pkg_overview_btn import ( "fmt" + "github.com/glasskube/glasskube/internal/web/util" + "github.com/glasskube/glasskube/api/v1alpha1" "github.com/glasskube/glasskube/pkg/client" "github.com/glasskube/glasskube/pkg/list" ) -const TemplateId = "pkg-overview-btn" +const templateId = "clpkg-overview-btn" -type pkgOverviewBtnInput struct { +type clpkgOverviewBtnInput struct { ButtonId string PackageName string Status *client.PackageStatus Manifest *v1alpha1.PackageManifest UpdateAvailable bool - Pkg *v1alpha1.ClusterPackage + InDeletion bool + PackageHref string } func getButtonId(pkgName string) string { - return fmt.Sprintf("%v-%v", TemplateId, pkgName) + return fmt.Sprintf("%v-%v", templateId, pkgName) } -func ForPkgOverviewBtn(packageWithStatus *list.PackageWithStatus, updateAvailable bool) *pkgOverviewBtnInput { +func ForClPkgOverviewBtn(packageWithStatus *list.PackageWithStatus, updateAvailable bool) *clpkgOverviewBtnInput { buttonId := getButtonId(packageWithStatus.Name) - return &pkgOverviewBtnInput{ + inDeletion := false + if packageWithStatus.ClusterPackage != nil { + inDeletion = !packageWithStatus.ClusterPackage.DeletionTimestamp.IsZero() + } + return &clpkgOverviewBtnInput{ ButtonId: buttonId, PackageName: packageWithStatus.Name, Status: packageWithStatus.Status, Manifest: packageWithStatus.InstalledManifest, UpdateAvailable: updateAvailable, - Pkg: packageWithStatus.Package, + InDeletion: inDeletion, + PackageHref: util.GetClusterPkgHref(packageWithStatus.Name), } } diff --git a/internal/web/components/pkg_update_alert/controller.go b/internal/web/components/pkg_update_alert/controller.go index ea816c692..8c4481c24 100644 --- a/internal/web/components/pkg_update_alert/controller.go +++ b/internal/web/components/pkg_update_alert/controller.go @@ -4,8 +4,12 @@ const TemplateId = "pkg-update-alert" type pkgUpdateAlertInput struct { UpdatesAvailable bool + PackageHref string } func ForPkgUpdateAlert(data map[string]any) *pkgUpdateAlertInput { - return &pkgUpdateAlertInput{UpdatesAvailable: data["UpdatesAvailable"].(bool)} + return &pkgUpdateAlertInput{ + UpdatesAvailable: data["UpdatesAvailable"].(bool), + PackageHref: data["PackageHref"].(string), + } } diff --git a/internal/web/configurationvalues.go b/internal/web/configurationvalues.go index ce97eabb7..257ea1e34 100644 --- a/internal/web/configurationvalues.go +++ b/internal/web/configurationvalues.go @@ -100,31 +100,64 @@ func extractPackageValueSource(r *http.Request, valueName string) *v1alpha1.Pack } } -// packageConfigurationInput is a GET endpoint, which returns an html snippet containing an input container. +// packageConfigurationInput is like clusterPackageConfigurationInput but for packages +func (s *server) packageConfigurationInput(w http.ResponseWriter, r *http.Request) { + manifestName := mux.Vars(r)["manifestName"] + namespace := mux.Vars(r)["namespace"] + name := mux.Vars(r)["name"] + selectedVersion := r.FormValue("selectedVersion") + repositoryName := r.FormValue("repositoryName") + pkg, manifest, err := describe.DescribeInstalledPackage(r.Context(), namespace, name) + if err != nil && !errors.IsNotFound(err) { + err = fmt.Errorf("an error occurred fetching package details of %v: %w", manifestName, err) + fmt.Fprintf(os.Stderr, "%v\n", err) + return + } + + s.handleConfigurationInput(w, r, &packageDetailPageContext{ + repositoryName: repositoryName, + selectedVersion: selectedVersion, + manifestName: manifestName, + pkg: pkg, + manifest: manifest, + }) +} + +// clusterPackageConfigurationInput is a GET endpoint, which returns an html snippet containing an input container. // The endpoint requires the pkgName query parameter to be set, as well as the valueName query parameter (which holds // the name of the desired value according to the package value definitions). // An optional query parameter refKind can be passed to request the snippet in a certain variant, where the accepted // refKind values are: ConfigMap, Secret, Package. If no refKind is given, the "regular" input is returned. // In any case, the input container consists of a button where the user can change the type of reference or remove the // reference, and the actual input field(s). -func (s *server) packageConfigurationInput(w http.ResponseWriter, r *http.Request) { +func (s *server) clusterPackageConfigurationInput(w http.ResponseWriter, r *http.Request) { pkgName := mux.Vars(r)["pkgName"] selectedVersion := r.FormValue("selectedVersion") repositoryName := r.FormValue("repositoryName") - pkg, manifest, err := describe.DescribeInstalledPackage(r.Context(), pkgName) + pkg, manifest, err := describe.DescribeInstalledClusterPackage(r.Context(), pkgName) if err != nil && !errors.IsNotFound(err) { err = fmt.Errorf("an error occurred fetching package details of %v: %w", pkgName, err) fmt.Fprintf(os.Stderr, "%v\n", err) return } - if manifest == nil { - manifest = &v1alpha1.PackageManifest{} - if err := s.repoClientset.ForRepoWithName(repositoryName). - FetchPackageManifest(pkgName, selectedVersion, manifest); err != nil { + s.handleConfigurationInput(w, r, &packageDetailPageContext{ + repositoryName: repositoryName, + selectedVersion: selectedVersion, + manifestName: pkgName, + pkg: pkg, + manifest: manifest, + }) +} + +func (s *server) handleConfigurationInput(w http.ResponseWriter, r *http.Request, d *packageDetailPageContext) { + if d.manifest == nil { + d.manifest = &v1alpha1.PackageManifest{} + if err := s.repoClientset.ForRepoWithName(d.repositoryName). + FetchPackageManifest(d.manifestName, d.selectedVersion, d.manifest); err != nil { // TODO check error handling again? s.respondAlertAndLog(w, err, - fmt.Sprintf("An error occurred fetching manifest of %v in version %v", pkgName, selectedVersion), + fmt.Sprintf("An error occurred fetching manifest of %v in version %v", d.manifestName, d.selectedVersion), "danger") return } @@ -132,7 +165,7 @@ func (s *server) packageConfigurationInput(w http.ResponseWriter, r *http.Reques valueName := mux.Vars(r)["valueName"] refKind := r.URL.Query().Get("refKind") - if valueDefinition, ok := manifest.ValueDefinitions[valueName]; ok { + if valueDefinition, ok := d.manifest.ValueDefinitions[valueName]; ok { options := pkg_config_input.PkgConfigInputDatalistOptions{} if refKind == refKindConfigMap || refKind == refKindSecret { if opts, err := s.getNamespaceOptions(); err != nil { @@ -148,13 +181,13 @@ func (s *server) packageConfigurationInput(w http.ResponseWriter, r *http.Reques } } input := pkg_config_input.ForPkgConfigInput( - pkg, repositoryName, selectedVersion, pkgName, valueName, valueDefinition, nil, &options, + d.pkg, d.repositoryName, d.selectedVersion, d.manifest, valueName, valueDefinition, nil, &options, &pkg_config_input.PkgConfigInputRenderOptions{ Autofocus: true, DesiredRefKind: &refKind, }) - err = s.templates.pkgConfigInput.Execute(w, input) - checkTmplError(err, fmt.Sprintf("package config input (%s, %s)", pkgName, valueName)) + err := s.templates.pkgConfigInput.Execute(w, input) + checkTmplError(err, fmt.Sprintf("package config input (%s, %s)", d.manifestName, valueName)) } } diff --git a/internal/web/discussions.go b/internal/web/discussions.go index 791f38fa2..ea3d7d00d 100644 --- a/internal/web/discussions.go +++ b/internal/web/discussions.go @@ -5,6 +5,8 @@ import ( "net/http" "os" + "github.com/glasskube/glasskube/internal/web/util" + "github.com/glasskube/glasskube/internal/giscus" "github.com/glasskube/glasskube/internal/httperror" @@ -20,53 +22,96 @@ import ( // packageDiscussion is a full page for showing various discussions, reactions, etc. func (s *server) packageDiscussion(w http.ResponseWriter, r *http.Request) { if r.Method == http.MethodPost { - githubUrl := r.FormValue("githubUrl") - telemetry.SetUserProperty("github_url", githubUrl) + s.handleGiscus(r) + return + } + manifestName := mux.Vars(r)["manifestName"] + namespace := mux.Vars(r)["namespace"] + name := mux.Vars(r)["name"] + repositoryName := mux.Vars(r)["repositoryName"] + pkg, manifest, err := describe.DescribeInstalledPackage(r.Context(), namespace, name) + if err != nil && !errors.IsNotFound(err) { + s.respondAlertAndLog(w, err, + fmt.Sprintf("An error occurred fetching installed package %v", name), "danger") + return + } + + s.handlePackageDiscussionPage(w, r, &packageDetailPageContext{ + repositoryName: repositoryName, + manifestName: manifestName, + pkg: pkg, + manifest: manifest, + }) + +} + +// clusterPackageDiscussion is a full page for showing various discussions, reactions, etc. +func (s *server) clusterPackageDiscussion(w http.ResponseWriter, r *http.Request) { + if r.Method == http.MethodPost { + s.handleGiscus(r) return } pkgName := mux.Vars(r)["pkgName"] repositoryName := mux.Vars(r)["repositoryName"] - pkg, manifest, err := describe.DescribeInstalledPackage(r.Context(), pkgName) + pkg, manifest, err := describe.DescribeInstalledClusterPackage(r.Context(), pkgName) if err != nil && !errors.IsNotFound(err) { s.respondAlertAndLog(w, err, fmt.Sprintf("An error occurred fetching installed package %v", pkgName), "danger") return - } else if err != nil { - // implies that the package is not installed - err = nil } + s.handlePackageDiscussionPage(w, r, &packageDetailPageContext{ + repositoryName: repositoryName, + manifestName: pkgName, + pkg: pkg, + manifest: manifest, + }) +} + +func (s *server) handleGiscus(r *http.Request) { + githubUrl := r.FormValue("githubUrl") + telemetry.SetUserProperty("github_url", githubUrl) +} + +func (s *server) handlePackageDiscussionPage(w http.ResponseWriter, r *http.Request, d *packageDetailPageContext) { var idx repo.PackageIndex - if err := s.repoClientset.ForRepoWithName(repositoryName).FetchPackageIndex(pkgName, &idx); err != nil { - s.respondAlertAndLog(w, err, "An error occurred fetching versions of "+pkgName, "danger") + if err := s.repoClientset.ForRepoWithName(d.repositoryName).FetchPackageIndex(d.manifestName, &idx); err != nil { + s.respondAlertAndLog(w, err, "An error occurred fetching versions of "+d.manifestName, "danger") return } - if manifest == nil { - manifest = &v1alpha1.PackageManifest{} - if err := s.repoClientset.ForRepoWithName(repositoryName). - FetchPackageManifest(pkgName, idx.LatestVersion, manifest); err != nil { + if d.manifest == nil { + d.manifest = &v1alpha1.PackageManifest{} + if err := s.repoClientset.ForRepoWithName(d.repositoryName). + FetchPackageManifest(d.manifestName, idx.LatestVersion, d.manifest); err != nil { s.respondAlertAndLog(w, err, fmt.Sprintf("An error occurred fetching manifest of %v in version %v in repository %v", - pkgName, idx.LatestVersion, repositoryName), "danger") + d.manifest, idx.LatestVersion, d.repositoryName), "danger") return } } - err = s.templates.pkgDiscussionPageTmpl.Execute(w, s.enrichPage(r, map[string]any{ + pkgHref := util.GetPackageHref(d.pkg, d.manifest) + + err := s.templates.pkgDiscussionPageTmpl.Execute(w, s.enrichPage(r, map[string]any{ "Giscus": giscus.Client().Config, - "Package": pkg, - "Status": client.GetStatusOrPending(pkg), - "Manifest": manifest, + "Package": d.pkg, + "Status": client.GetStatusOrPending(d.pkg), + "Manifest": d.manifest, "LatestVersion": idx.LatestVersion, - "UpdateAvailable": pkg != nil && s.isUpdateAvailable(r.Context(), pkgName), + "UpdateAvailable": s.isUpdateAvailableForPkg(r.Context(), d.pkg), "ShowDiscussionLink": true, - }, err)) - checkTmplError(err, fmt.Sprintf("package-detail (%s)", pkgName)) + "PackageHref": pkgHref, + "DiscussionHref": fmt.Sprintf("%s/discussion", pkgHref), + }, nil)) + checkTmplError(err, fmt.Sprintf("package-discussion (%s)", d.manifestName)) } func (s *server) discussionBadge(w http.ResponseWriter, r *http.Request) { pkgName := mux.Vars(r)["pkgName"] + if pkgName == "" { + pkgName = mux.Vars(r)["manifestName"] + } var totalCount int if counts, err := giscus.Client().GetCountsFor(pkgName); err != nil { diff --git a/internal/web/packagedetail.go b/internal/web/packagedetail.go new file mode 100644 index 000000000..a0cfe694b --- /dev/null +++ b/internal/web/packagedetail.go @@ -0,0 +1,217 @@ +package web + +import ( + "context" + "fmt" + "net/http" + "os" + "slices" + + webutil "github.com/glasskube/glasskube/internal/web/util" + + "github.com/glasskube/glasskube/api/v1alpha1" + "github.com/glasskube/glasskube/internal/clientutils" + "github.com/glasskube/glasskube/internal/controller/ctrlpkg" + "github.com/glasskube/glasskube/internal/dependency" + "github.com/glasskube/glasskube/internal/repo" + "github.com/glasskube/glasskube/internal/repo/types" + "github.com/glasskube/glasskube/internal/util" + "github.com/glasskube/glasskube/internal/web/components/pkg_config_input" + "github.com/glasskube/glasskube/pkg/client" + "github.com/glasskube/glasskube/pkg/describe" + "github.com/gorilla/mux" + "k8s.io/apimachinery/pkg/api/errors" +) + +type packageDetailPageContext struct { + repositoryName string + selectedVersion string + manifestName string + pkg ctrlpkg.Package + manifest *v1alpha1.PackageManifest +} + +func (s *server) packageDetail(w http.ResponseWriter, r *http.Request) { + ctx := r.Context() + manifestName := mux.Vars(r)["manifestName"] + namespace := mux.Vars(r)["namespace"] + name := mux.Vars(r)["name"] + repositoryName := r.FormValue("repositoryName") + selectedVersion := r.FormValue("selectedVersion") + + var pkg *v1alpha1.Package + var manifest *v1alpha1.PackageManifest + if namespace != "" && name != "" && namespace != "-" && name != "-" { + var err error + pkg, manifest, err = describe.DescribeInstalledPackage(ctx, namespace, name) + if err != nil && !errors.IsNotFound(err) { + s.respondAlertAndLog(w, err, + fmt.Sprintf("An error occurred fetching package details of installed package %v in namespace %v", name, namespace), + "danger") + return + } else if errors.IsNotFound(err) { + s.swappingRedirect(w, "/packages", "main", "main") + w.WriteHeader(http.StatusNotFound) + return + } else if pkg != nil { + repositoryName = pkg.Spec.PackageInfo.RepositoryName + } + } + + s.handlePackageDetailPage(ctx, &packageDetailPageContext{ + repositoryName: repositoryName, + selectedVersion: selectedVersion, + manifestName: manifestName, + pkg: pkg, + manifest: manifest, + }, r, w) +} + +func (s *server) clusterPackageDetail(w http.ResponseWriter, r *http.Request) { + ctx := r.Context() + pkgName := mux.Vars(r)["pkgName"] + repositoryName := r.FormValue("repositoryName") + selectedVersion := r.FormValue("selectedVersion") + + pkg, manifest, err := describe.DescribeInstalledClusterPackage(ctx, pkgName) + if err != nil && !errors.IsNotFound(err) { + s.respondAlertAndLog(w, err, + fmt.Sprintf("An error occurred fetching package details of installed package %v", pkgName), + "danger") + return + } else if pkg != nil { + repositoryName = pkg.Spec.PackageInfo.RepositoryName + } + + s.handlePackageDetailPage(ctx, &packageDetailPageContext{ + repositoryName: repositoryName, + selectedVersion: selectedVersion, + manifestName: pkgName, + pkg: pkg, + manifest: manifest, + }, r, w) +} + +func (s *server) handlePackageDetailPage(ctx context.Context, d *packageDetailPageContext, r *http.Request, w http.ResponseWriter) { + var err error + var repos []v1alpha1.PackageRepository + var usedRepo *v1alpha1.PackageRepository + if d.repositoryName, repos, usedRepo, err = s.getRepos( + ctx, d.manifestName, d.repositoryName); err != nil { + s.respondAlertAndLog(w, err, "", "danger") + return + } + + var idx repo.PackageIndex + var latestVersion string + if idx, latestVersion, d.selectedVersion, err = s.getVersions( + d.repositoryName, d.manifestName, d.selectedVersion); err != nil { + s.respondAlertAndLog(w, err, + fmt.Sprintf("An error occurred fetching package index of %v in repository %v", d.manifestName, d.repositoryName), + "danger") + return + } + + if d.manifest == nil { + d.manifest = &v1alpha1.PackageManifest{} + if err := s.repoClientset.ForRepoWithName(d.repositoryName). + FetchPackageManifest(d.manifestName, d.selectedVersion, d.manifest); err != nil { + s.respondAlertAndLog(w, err, + fmt.Sprintf("An error occurred fetching manifest of %v in version %v in repository %v", + d.manifestName, d.selectedVersion, d.repositoryName), + "danger") + return + } + } + + res, err := s.dependencyMgr.Validate(r.Context(), d.manifest, d.selectedVersion) + if err != nil { + s.respondAlertAndLog(w, err, + fmt.Sprintf("An error occurred validating dependencies of %v in version %v", d.manifestName, d.selectedVersion), + "danger") + return + } + + valueErrors := make(map[string]error) + datalistOptions := make(map[string]*pkg_config_input.PkgConfigInputDatalistOptions) + if !d.pkg.IsNil() { + nsOptions, _ := s.getNamespaceOptions() + pkgsOptions, _ := s.getPackagesOptions(r.Context()) + for key, v := range d.pkg.GetSpec().Values { + if _, err := s.valueResolver.ResolveValue(r.Context(), v); err != nil { + valueErrors[key] = util.GetRootCause(err) + } + if v.ValueFrom != nil { + options, err := s.getDatalistOptions(r.Context(), v.ValueFrom, nsOptions, pkgsOptions) + if err != nil { + fmt.Fprintf(os.Stderr, "%v\n", err) + } + datalistOptions[key] = options + } + } + } + + err = s.templates.pkgPageTmpl.Execute(w, s.enrichPage(r, map[string]any{ + "Package": d.pkg, + "Status": client.GetStatusOrPending(d.pkg), + "Manifest": d.manifest, + "LatestVersion": latestVersion, + "UpdateAvailable": s.isUpdateAvailableForPkg(r.Context(), d.pkg), + "AutoUpdate": clientutils.AutoUpdateString(d.pkg, "Disabled"), + "ValidationResult": res, + "ShowConflicts": res.Status == dependency.ValidationResultStatusConflict, + "SelectedVersion": d.selectedVersion, + "PackageIndex": &idx, + "Repositories": repos, + "RepositoryName": d.repositoryName, + "ShowConfiguration": (!d.pkg.IsNil() && len(d.manifest.ValueDefinitions) > 0 && d.pkg.GetDeletionTimestamp().IsZero()) || d.pkg.IsNil(), + "ValueErrors": valueErrors, + "DatalistOptions": datalistOptions, + "ShowDiscussionLink": usedRepo.IsGlasskubeRepo(), + "PackageHref": webutil.GetPackageHrefWithFallback(d.pkg, d.manifest), + }, err)) + checkTmplError(err, fmt.Sprintf("package-detail (%s)", d.manifestName)) +} + +func (s *server) getVersions(repositoryName string, pkgName string, selectedVersion string) (repo.PackageIndex, string, string, error) { + var idx repo.PackageIndex + if err := s.repoClientset.ForRepoWithName(repositoryName).FetchPackageIndex(pkgName, &idx); err != nil { + return repo.PackageIndex{}, "", "", err + } + latestVersion := idx.LatestVersion + + if selectedVersion == "" { + selectedVersion = latestVersion + } else if !slices.ContainsFunc(idx.Versions, func(item types.PackageIndexItem) bool { + return item.Version == selectedVersion + }) { + selectedVersion = latestVersion + } + return idx, latestVersion, selectedVersion, nil +} + +func (s *server) getRepos(ctx context.Context, manifestName string, repositoryName string) ( + string, []v1alpha1.PackageRepository, *v1alpha1.PackageRepository, error) { + var repos []v1alpha1.PackageRepository + var err error + if repos, err = s.repoClientset.Meta().GetReposForPackage(manifestName); err != nil { + fmt.Fprintf(os.Stderr, "error getting repos for package; %v", err) + } else if repositoryName == "" { + if len(repos) == 0 { + return "", nil, nil, fmt.Errorf("%v not found in any repository", manifestName) + } + for _, r := range repos { + repositoryName = r.Name + if r.IsDefaultRepository() { + break + } + } + } + + var usedRepo v1alpha1.PackageRepository + if err := s.pkgClient.PackageRepositories().Get(ctx, repositoryName, &usedRepo); err != nil { + return "", nil, nil, err + } + + return repositoryName, repos, &usedRepo, nil +} diff --git a/internal/web/response.go b/internal/web/response.go new file mode 100644 index 000000000..e7648b4ff --- /dev/null +++ b/internal/web/response.go @@ -0,0 +1,50 @@ +package web + +import ( + "encoding/json" + "fmt" + "net/http" + "os" +) + +func (s *server) respondSuccess(w http.ResponseWriter) { + err := s.templates.alertTmpl.Execute(w, map[string]any{ + "Message": "Configuration updated successfully", + "Dismissible": true, + "Type": "success", + }) + checkTmplError(err, "success") +} + +func (s *server) respondAlertAndLog(w http.ResponseWriter, err error, wrappingMsg string, alertType string) { + if wrappingMsg != "" { + err = fmt.Errorf("%v: %w", wrappingMsg, err) + } + fmt.Fprintf(os.Stderr, "%v\n", err) + s.respondAlert(w, err.Error(), alertType) +} + +func (s *server) respondAlert(w http.ResponseWriter, message string, alertType string) { + w.Header().Add("Hx-Reselect", "div.alert") // overwrite any existing hx-select (which was a little intransparent sometimes) + w.Header().Add("Hx-Reswap", "afterbegin") + w.WriteHeader(http.StatusBadRequest) + err := s.templates.alertTmpl.Execute(w, map[string]any{ + "Message": message, + "Dismissible": true, + "Type": alertType, + }) + checkTmplError(err, "alert") +} + +// swappingRedirect adds the Hx-Location header to the response, which, when interpreted by htmx.js, will make +// the frontend redirect to the given path and swap the given target with the given slect from the response +// also see: https://htmx.org/headers/hx-location/ +func (s *server) swappingRedirect(w http.ResponseWriter, path string, target string, slect string) { + locationData := map[string]string{ + "path": path, + "target": target, + "select": slect, + } + locationJson, _ := json.Marshal(locationData) + w.Header().Add("Hx-Location", string(locationJson)) +} diff --git a/internal/web/server.go b/internal/web/server.go index fccad1923..94466419d 100644 --- a/internal/web/server.go +++ b/internal/web/server.go @@ -18,6 +18,12 @@ import ( "sync" "syscall" + apitypes "k8s.io/apimachinery/pkg/types" + + "github.com/glasskube/glasskube/internal/controller/ctrlpkg" + + "github.com/glasskube/glasskube/internal/web/util" + "github.com/Masterminds/semver/v3" "github.com/glasskube/glasskube/api/v1alpha1" clientadapter "github.com/glasskube/glasskube/internal/adapter/goclient" @@ -28,10 +34,8 @@ import ( "github.com/glasskube/glasskube/internal/manifestvalues" "github.com/glasskube/glasskube/internal/repo" repoclient "github.com/glasskube/glasskube/internal/repo/client" - "github.com/glasskube/glasskube/internal/repo/types" + repotypes "github.com/glasskube/glasskube/internal/repo/types" "github.com/glasskube/glasskube/internal/telemetry" - "github.com/glasskube/glasskube/internal/util" - "github.com/glasskube/glasskube/internal/web/components/pkg_config_input" "github.com/glasskube/glasskube/internal/web/handler" "github.com/glasskube/glasskube/pkg/bootstrap" "github.com/glasskube/glasskube/pkg/client" @@ -174,23 +178,49 @@ func (s *server) Start(ctx context.Context) error { router.HandleFunc("/kubeconfig", s.kubeconfigPage) router.Handle("/bootstrap", s.requireKubeconfig(s.bootstrapPage)) router.Handle("/kubeconfig/persist", s.requireKubeconfig(s.persistKubeconfig)) + // overview pages router.Handle("/packages", s.requireReady(s.packages)) - router.Handle("/packages/update", s.requireReady(s.update)) - router.Handle("/packages/update/modal", s.requireReady(s.updateModal)) - router.Handle("/packages/uninstall", s.requireReady(s.uninstall)) - router.Handle("/packages/uninstall/modal", s.requireReady(s.uninstallModal)) - router.Handle("/packages/open", s.requireReady(s.open)) - router.Handle("/packages/{pkgName}", s.requireReady(s.packageDetail)) - router.Handle("/packages/{pkgName}/discussion", s.requireReady(s.packageDiscussion)) - router.Handle("/packages/{pkgName}/discussion/badge", s.requireReady(s.discussionBadge)) - router.Handle("/packages/{pkgName}/configure", s.requireReady(s.installOrConfigurePackage)) - router.Handle("/packages/{pkgName}/configure/advanced", s.requireReady(s.advancedConfiguration)) - router.Handle("/packages/{pkgName}/configuration/{valueName}", s.requireReady(s.packageConfigurationInput)) - router.Handle("/packages/{pkgName}/configuration/{valueName}/datalists/names", s.requireReady(s.namesDatalist)) - router.Handle("/packages/{pkgName}/configuration/{valueName}/datalists/keys", s.requireReady(s.keysDatalist)) + router.Handle("/clusterpackages", s.requireReady(s.clusterPackages)) + + // detail page endpoints + pkgBasePath := "/packages/{manifestName}" + installedPkgBasePath := pkgBasePath + "/{namespace}/{name}" + clpkgBasePath := "/clusterpackages/{pkgName}" + router.Handle(pkgBasePath, s.requireReady(s.packageDetail)) + router.Handle(installedPkgBasePath, s.requireReady(s.packageDetail)) + router.Handle(clpkgBasePath, s.requireReady(s.clusterPackageDetail)) + // discussion endpoints + router.Handle(pkgBasePath+"/discussion", s.requireReady(s.packageDiscussion)) + router.Handle(installedPkgBasePath+"/discussion", s.requireReady(s.packageDiscussion)) + router.Handle(clpkgBasePath+"/discussion", s.requireReady(s.clusterPackageDiscussion)) + router.Handle(pkgBasePath+"/discussion/badge", s.requireReady(s.discussionBadge)) + router.Handle(installedPkgBasePath+"/discussion/badge", s.requireReady(s.discussionBadge)) + router.Handle(clpkgBasePath+"/discussion/badge", s.requireReady(s.discussionBadge)) + // configuration endpoints + router.Handle(installedPkgBasePath+"/configure", s.requireReady(s.installOrConfigurePackage)) + router.Handle(clpkgBasePath+"/configure", s.requireReady(s.installOrConfigureClusterPackage)) + router.Handle(installedPkgBasePath+"/configure/advanced", s.requireReady(s.advancedPackageConfiguration)) + router.Handle(clpkgBasePath+"/configure/advanced", s.requireReady(s.advancedClusterPackageConfiguration)) + router.Handle(pkgBasePath+"/configuration/{valueName}", s.requireReady(s.packageConfigurationInput)) + router.Handle(installedPkgBasePath+"/configuration/{valueName}", s.requireReady(s.packageConfigurationInput)) + router.Handle(clpkgBasePath+"/configuration/{valueName}", s.requireReady(s.clusterPackageConfigurationInput)) + // update endpoints + router.Handle(installedPkgBasePath+"/update", s.requireReady(s.update)) + router.Handle(clpkgBasePath+"/update", s.requireReady(s.update)) + // open endpoints + router.Handle(installedPkgBasePath+"/open", s.requireReady(s.open)) + router.Handle(clpkgBasePath+"/open", s.requireReady(s.open)) + // uninstall endpoints + router.Handle(installedPkgBasePath+"/uninstall", s.requireReady(s.uninstall)) + router.Handle(clpkgBasePath+"/uninstall", s.requireReady(s.uninstall)) + + // configuration datalist endpoints + router.Handle("/datalists/{valueName}/names", s.requireReady(s.namesDatalist)) + router.Handle("/datalists/{valueName}/keys", s.requireReady(s.keysDatalist)) + // settings router.Handle("/settings", s.requireReady(s.settingsPage)) router.HandleFunc("/", func(w http.ResponseWriter, r *http.Request) { - http.Redirect(w, r, "/packages", http.StatusFound) + http.Redirect(w, r, "/clusterpackages", http.StatusFound) }) http.Handle("/", s.enrichContext(router)) @@ -232,351 +262,412 @@ func (s *server) Start(ctx context.Context) error { return nil } -func (s *server) updateModal(w http.ResponseWriter, r *http.Request) { +// uninstall is an endpoint, which returns the modal html for GET requests, and performs the update for POST +func (s *server) update(w http.ResponseWriter, r *http.Request) { ctx := r.Context() - pkgName := r.FormValue("packageName") - pkgs := make([]string, 0, 1) - if pkgName != "" { - pkgs = append(pkgs, pkgName) - } + pkgName := mux.Vars(r)["pkgName"] + manifestName := mux.Vars(r)["manifestName"] + namespace := mux.Vars(r)["namespace"] + name := mux.Vars(r)["name"] - updates := make([]map[string]any, 0) - updater := update.NewUpdater(ctx).WithStatusWriter(statuswriter.Stderr()) - ut, err := updater.Prepare(ctx, pkgs) - if err != nil { - s.respondAlertAndLog(w, err, "An error occurred preparing update of "+pkgName, "danger") - return - } - utId := rand.Int() - s.updateMutex.Lock() - s.updateTransactions[utId] = *ut - s.updateMutex.Unlock() + if r.Method == http.MethodPost { + updater := update.NewUpdater(ctx).WithStatusWriter(statuswriter.Stderr()) + s.updateMutex.Lock() + defer s.updateMutex.Unlock() + utIdStr := r.FormValue("updateTransactionId") + if utId, err := strconv.Atoi(utIdStr); err != nil { + s.respondAlertAndLog(w, err, "Failed to parse updateTransactionId", "danger") + return + } else if ut, ok := s.updateTransactions[utId]; !ok { + s.respondAlert(w, fmt.Sprintf("Failed to find UpdateTransaction with ID %d", utId), "danger") + return + } else if _, err := updater.Apply(ctx, &ut); err != nil { + delete(s.updateTransactions, utId) + s.respondAlertAndLog(w, err, "An error occurred during the update", "danger") + return + } else { + delete(s.updateTransactions, utId) + } + } else { + packageHref := "" + updates := make([]map[string]any, 0) + updater := update.NewUpdater(ctx).WithStatusWriter(statuswriter.Stderr()) + var clpkgNames []string + var pkgNames []apitypes.NamespacedName + if pkgName != "" { + packageHref = "/clusterpackages/" + pkgName + // update concerns cluster packages + if pkgName == "-" { + // prepare updates for all installed packages + var clPkgList v1alpha1.ClusterPackageList + if err := s.pkgClient.ClusterPackages().GetAll(ctx, &clPkgList); err != nil { + s.respondAlertAndLog(w, err, "An error occurred listing all clusterpackages for update", "danger") + return + } + for _, item := range clPkgList.Items { + clpkgNames = append(clpkgNames, item.Spec.PackageInfo.Name) + } + } else { + // prepare update for a specific package + clpkgNames = append(clpkgNames, pkgName) + } + } else { + // update concerns namespaced packages + packageHref = util.GetNamespacedPkgHref(manifestName, namespace, name) + if manifestName == "-" { + // prepare updates for all installed namespaced packages + var pkgList v1alpha1.PackageList + if err := s.pkgClient.Packages("").GetAll(ctx, &pkgList); err != nil { + s.respondAlertAndLog(w, err, "An error occurred listing all packages for update", "danger") + return + } + for _, item := range pkgList.Items { + pkgNames = append(pkgNames, apitypes.NamespacedName{ + Namespace: item.GetNamespace(), + Name: item.GetName(), + }) + } + } else { + // prepare update for a specific namespaced package + pkgNames = append(pkgNames, apitypes.NamespacedName{ + Namespace: namespace, + Name: name, + }) + } + } - for _, u := range ut.Items { - if u.UpdateRequired() { + ut, err := updater.Prepare(ctx, clpkgNames, pkgNames) + if err != nil { + s.respondAlertAndLog(w, err, "An error occurred preparing update of "+pkgName, "danger") + return + } + utId := rand.Int() + s.updateMutex.Lock() + s.updateTransactions[utId] = *ut + s.updateMutex.Unlock() + + for _, u := range ut.Items { + if u.UpdateRequired() { + updates = append(updates, map[string]any{ + "Package": u.Package, + "CurrentVersion": u.Package.GetSpec().PackageInfo.Version, + "LatestVersion": u.Version, + }) + } + } + for _, req := range ut.Requirements { updates = append(updates, map[string]any{ - "Name": u.Package.Name, - "CurrentVersion": u.Package.Spec.PackageInfo.Version, - "LatestVersion": u.Version, + "Package": req, + "CurrentVersion": "-", + "LatestVersion": req.Version, }) } - } - for _, req := range ut.Requirements { - updates = append(updates, map[string]any{ - "Name": req.Name, - "CurrentVersion": "-", - "LatestVersion": req.Version, + + err = s.templates.pkgUpdateModalTmpl.Execute(w, map[string]any{ + "UpdateTransactionId": utId, + "Updates": updates, + "PackageHref": packageHref, }) + checkTmplError(err, "pkgUpdateModalTmpl") } - - err = s.templates.pkgUpdateModalTmpl.Execute(w, map[string]any{ - "UpdateTransactionId": utId, - "Updates": updates, - "PackageName": pkgName, - }) - checkTmplError(err, "pkgUpdateModalTmpl") } -func (s *server) update(w http.ResponseWriter, r *http.Request) { +// uninstall is an endpoint, which returns the modal html for GET requests, and performs the uninstallation for POST +func (s *server) uninstall(w http.ResponseWriter, r *http.Request) { ctx := r.Context() - updater := update.NewUpdater(ctx).WithStatusWriter(statuswriter.Stderr()) - s.updateMutex.Lock() - defer s.updateMutex.Unlock() - utIdStr := r.FormValue("updateTransactionId") - if utId, err := strconv.Atoi(utIdStr); err != nil { - s.respondAlertAndLog(w, err, "Failed to parse updateTransactionId", "danger") - return - } else if ut, ok := s.updateTransactions[utId]; !ok { - s.respondAlert(w, fmt.Sprintf("Failed to find UpdateTransaction with ID %d", utId), "danger") - return - } else if _, err := updater.Apply(ctx, &ut); err != nil { - delete(s.updateTransactions, utId) - s.respondAlertAndLog(w, err, "An error occurred during the update", "danger") - return - } else { - delete(s.updateTransactions, utId) - } -} + pkgName := mux.Vars(r)["pkgName"] + manifestName := mux.Vars(r)["manifestName"] + namespace := mux.Vars(r)["namespace"] + name := mux.Vars(r)["name"] -func (s *server) uninstallModal(w http.ResponseWriter, r *http.Request) { - pkgName := r.FormValue("packageName") - var pruned []string - var err error - if g, err1 := s.dependencyMgr.NewGraph(r.Context()); err1 != nil { - err = fmt.Errorf("error validating uninstall: %w", err1) + if r.Method == http.MethodPost { + uninstaller := uninstall.NewUninstaller(s.pkgClient).WithStatusWriter(statuswriter.Stderr()) + if pkgName != "" { + var pkg v1alpha1.ClusterPackage + if err := s.pkgClient.ClusterPackages().Get(ctx, pkgName, &pkg); err != nil { + s.respondAlertAndLog(w, err, fmt.Sprintf("An error occurred fetching %v during uninstall", pkgName), "danger") + return + } + if err := uninstaller.Uninstall(ctx, &pkg); err != nil { + s.respondAlertAndLog(w, err, "An error occurred uninstalling "+pkgName, "danger") + return + } + } else { + var pkg v1alpha1.Package + if err := s.pkgClient.Packages(namespace).Get(ctx, name, &pkg); err != nil { + s.respondAlertAndLog(w, err, fmt.Sprintf("An error occurred fetching %v during uninstall", name), "danger") + return + } + if err := uninstaller.Uninstall(ctx, &pkg); err != nil { + s.respondAlertAndLog(w, err, "An error occurred uninstalling "+name, "danger") + return + } + } } else { - g.Delete(pkgName) - pruned = g.Prune() - if err1 := g.Validate(); err1 != nil { - err = fmt.Errorf("%v cannot be uninstalled: %w", pkgName, err1) + if pkgName != "" { + var pruned []string + var err error + // dependency checks are only necessary for clusterpackages, as there are no dependencies on namespaced packages + if g, err1 := s.dependencyMgr.NewGraph(r.Context()); err1 != nil { + err = fmt.Errorf("error validating uninstall: %w", err1) + } else { + g.Delete(pkgName) + pruned = g.Prune() + if err1 := g.Validate(); err1 != nil { + err = fmt.Errorf("%v cannot be uninstalled: %w", pkgName, err1) + } + } + err = s.templates.pkgUninstallModalTmpl.Execute(w, map[string]any{ + "PackageName": pkgName, + "Pruned": pruned, + "Err": err, + "PackageHref": util.GetClusterPkgHref(pkgName), + }) + checkTmplError(err, "pkgUninstallModalTmpl") + } else { + err := s.templates.pkgUninstallModalTmpl.Execute(w, map[string]any{ + "Namespace": namespace, + "Name": name, + "PackageHref": util.GetNamespacedPkgHref(manifestName, namespace, name), + }) + checkTmplError(err, "pkgUninstallModalTmpl") } } - err = s.templates.pkgUninstallModalTmpl.Execute(w, map[string]any{ - "PackageName": pkgName, - "Pruned": pruned, - "Err": err, - }) - checkTmplError(err, "pkgUninstallModalTmpl") } -func (s *server) uninstall(w http.ResponseWriter, r *http.Request) { +func (s *server) open(w http.ResponseWriter, r *http.Request) { ctx := r.Context() - pkgName := r.FormValue("packageName") - var pkg v1alpha1.ClusterPackage - if err := s.pkgClient.ClusterPackages().Get(ctx, pkgName, &pkg); err != nil { - s.respondAlertAndLog(w, err, fmt.Sprintf("An error occurred fetching %v during uninstall", pkgName), "danger") - return - } - if err := uninstall.NewUninstaller(s.pkgClient). - WithStatusWriter(statuswriter.Stderr()). - Uninstall(ctx, &pkg); err != nil { - s.respondAlertAndLog(w, err, "An error occurred uninstalling "+pkgName, "danger") - return + pkgName := mux.Vars(r)["pkgName"] + namespace := mux.Vars(r)["namespace"] + name := mux.Vars(r)["name"] + + if pkgName != "" { + var pkg v1alpha1.ClusterPackage + if err := s.pkgClient.ClusterPackages().Get(ctx, pkgName, &pkg); err != nil { + s.respondAlertAndLog(w, err, "Could not get ClusterPackage", "danger") + return + } + s.handleOpen(ctx, w, &pkg) + } else { + var pkg v1alpha1.Package + if err := s.pkgClient.Packages(namespace).Get(ctx, name, &pkg); err != nil { + s.respondAlertAndLog(w, err, "Could not get Package", "danger") + return + } + s.handleOpen(ctx, w, &pkg) } } -func (s *server) open(w http.ResponseWriter, r *http.Request) { - pkgName := r.FormValue("packageName") - if result, ok := s.forwarders[pkgName]; ok { +func (s *server) handleOpen(ctx context.Context, w http.ResponseWriter, pkg ctrlpkg.Package) { + fwName := cache.NewObjectName(pkg.GetNamespace(), pkg.GetName()).String() + if result, ok := s.forwarders[fwName]; ok { result.WaitReady() _ = cliutils.OpenInBrowser(result.Url) return } - var pkg v1alpha1.ClusterPackage - if err := s.pkgClient.ClusterPackages().Get(r.Context(), pkgName, &pkg); err != nil { - s.respondAlertAndLog(w, err, "Could not get ClusterPackage", "danger") - return - } - - result, err := open.NewOpener().Open(r.Context(), &pkg, "", 0) + result, err := open.NewOpener().Open(ctx, pkg, "", 0) if err != nil { - s.respondAlertAndLog(w, err, "Could not open "+pkgName, "danger") + s.respondAlertAndLog(w, err, "Could not open "+pkg.GetName(), "danger") } else { - s.forwarders[pkgName] = result + s.forwarders[fwName] = result result.WaitReady() _ = cliutils.OpenInBrowser(result.Url) w.WriteHeader(http.StatusAccepted) } } +func (s *server) clusterPackages(w http.ResponseWriter, r *http.Request) { + ctx := r.Context() + clpkgs, listErr := list.NewLister(ctx).GetClusterPackagesWithStatus(ctx, list.ListOptions{IncludePackageInfos: true}) + if listErr != nil && len(clpkgs) == 0 { + listErr = fmt.Errorf("could not load clusterpackages: %w", listErr) + fmt.Fprintf(os.Stderr, "%v\n", listErr) + } + + // Call isUpdateAvailable for each installed clusterpackage. + // This is not the same as getting all updates in a single transaction, because some dependency + // conflicts could be resolvable by installing individual clpkgs. + installedClPkgNames := make([]string, 0, len(clpkgs)) + clpkgUpdateAvailable := map[string]bool{} + for _, pkg := range clpkgs { + if pkg.ClusterPackage != nil { + installedClPkgNames = append(installedClPkgNames, pkg.Name) + } + clpkgUpdateAvailable[pkg.Name] = pkg.ClusterPackage != nil && s.isUpdateAvailableForClPkg(r.Context(), pkg.Name) + } + + overallUpdatesAvailable := false + if len(installedClPkgNames) > 0 { + overallUpdatesAvailable = s.isUpdateAvailable(r.Context(), installedClPkgNames, nil) + } + + tmplErr := s.templates.clusterPkgsPageTemplate.Execute(w, s.enrichPage(r, map[string]any{ + "ClusterPackages": clpkgs, + "ClusterPackageUpdateAvailable": clpkgUpdateAvailable, + "UpdatesAvailable": overallUpdatesAvailable, + "PackageHref": util.GetClusterPkgHref("-"), + }, listErr)) + checkTmplError(tmplErr, "clusterpackages") +} + func (s *server) packages(w http.ResponseWriter, r *http.Request) { ctx := r.Context() - packages, listErr := list.NewLister(ctx).GetPackagesWithStatus(ctx, list.ListOptions{IncludePackageInfos: true}) - if listErr != nil && len(packages) == 0 { + allPkgs, listErr := list.NewLister(ctx).GetPackagesWithStatus(ctx, list.ListOptions{IncludePackageInfos: true}) + if listErr != nil { listErr = fmt.Errorf("could not load packages: %w", listErr) fmt.Fprintf(os.Stderr, "%v\n", listErr) + // TODO check again } - // Call isUpdateAvailable for each installed package. - // This is not the same as getting all updates in a single transaction, because some dependency - // conflicts could be resolvable by installing individual packages. packageUpdateAvailable := map[string]bool{} - for _, pkg := range packages { - packageUpdateAvailable[pkg.Name] = pkg.Package != nil && s.isUpdateAvailable(r.Context(), pkg.Name) + var installed []*list.PackagesWithStatus + var available []*list.PackagesWithStatus + var installedPkgsNames []apitypes.NamespacedName + for _, pkgsWithStatus := range allPkgs { + if len(pkgsWithStatus.Packages) > 0 { + for _, pkgWithStatus := range pkgsWithStatus.Packages { + namespacedName := apitypes.NamespacedName{ + Namespace: pkgWithStatus.Package.Namespace, + Name: pkgWithStatus.Package.Name, + } + installedPkgsNames = append(installedPkgsNames, namespacedName) + + // Call isUpdateAvailable for each installed package. + // This is not the same as getting all updates in a single transaction, because some dependency + // conflicts could be resolvable by installing individual packages. + packageUpdateAvailable[namespacedName.String()] = s.isUpdateAvailableForPkg(ctx, pkgWithStatus.Package) + } + installed = append(installed, pkgsWithStatus) + } else { + available = append(available, pkgsWithStatus) + } + } + + overallUpdatesAvailable := false + if len(installedPkgsNames) > 0 { + overallUpdatesAvailable = s.isUpdateAvailable(r.Context(), nil, installedPkgsNames) } tmplErr := s.templates.pkgsPageTmpl.Execute(w, s.enrichPage(r, map[string]any{ - "Packages": packages, + "InstalledPackages": installed, + "AvailablePackages": available, "PackageUpdateAvailable": packageUpdateAvailable, - "UpdatesAvailable": s.isUpdateAvailable(r.Context()), + "UpdatesAvailable": overallUpdatesAvailable, + "PackageHref": util.GetNamespacedPkgHref("-", "-", "-"), }, listErr)) checkTmplError(tmplErr, "packages") } -func (s *server) packageDetail(w http.ResponseWriter, r *http.Request) { +// installOrConfigurePackage is like installOrConfigureClusterPackage but for packages +func (s *server) installOrConfigurePackage(w http.ResponseWriter, r *http.Request) { ctx := r.Context() - pkgName := mux.Vars(r)["pkgName"] + manifestName := mux.Vars(r)["manifestName"] + namespace := mux.Vars(r)["namespace"] + name := mux.Vars(r)["name"] + requestedNamespace := r.FormValue("requestedNamespace") + requestedName := r.FormValue("requestedName") repositoryName := r.FormValue("repositoryName") selectedVersion := r.FormValue("selectedVersion") + enableAutoUpdate := r.FormValue("enableAutoUpdate") - pkg, manifest, err := describe.DescribeInstalledPackage(ctx, pkgName) - if err != nil && !apierrors.IsNotFound(err) { - s.respondAlertAndLog(w, err, - fmt.Sprintf("An error occurred fetching package details of installed package %v", pkgName), - "danger") + var err error + pkg := &v1alpha1.Package{} + var mf *v1alpha1.PackageManifest + if err := s.pkgClient.Packages(namespace).Get(ctx, name, pkg); err != nil && !apierrors.IsNotFound(err) { + s.respondAlertAndLog(w, err, fmt.Sprintf("An error occurred fetching package details of %v", name), "danger") return - } else if pkg != nil { - repositoryName = pkg.Spec.PackageInfo.RepositoryName - } - - var repos []v1alpha1.PackageRepository - if repos, err = s.repoClientset.Meta().GetReposForPackage(pkgName); err != nil { - fmt.Fprintf(os.Stderr, "error getting repos for package; %v", err) - } else if repositoryName == "" { - if len(repos) == 0 { - s.respondAlertAndLog(w, fmt.Errorf("%v not found in any repository", pkgName), "", "danger") - return - } - for _, r := range repos { - repositoryName = r.Name - if r.IsDefaultRepository() { - break - } - } + } else if err != nil { + pkg = nil } - var usedRepo v1alpha1.PackageRepository - if err := s.pkgClient.PackageRepositories().Get(r.Context(), repositoryName, &usedRepo); err != nil { - s.respondAlertAndLog(w, err, - fmt.Sprintf("An error occurred fetching repository %v", repositoryName), - "danger") + repositoryName, mf, err = s.getUsedRepoAndManifest(ctx, pkg, repositoryName, manifestName, selectedVersion) + if err != nil { + s.respondAlertAndLog(w, err, fmt.Sprintf("An error occurred getting manifest and repo for %s", manifestName), "danger") return } - var idx repo.PackageIndex - if err := s.repoClientset.ForRepoWithName(repositoryName).FetchPackageIndex(pkgName, &idx); err != nil { - s.respondAlertAndLog(w, err, - fmt.Sprintf("An error occurred fetching package index of %v in repository %v", pkgName, repositoryName), - "danger") + if values, err := extractValues(r, mf); err != nil { + s.respondAlertAndLog(w, err, "An error occurred parsing the form", "danger") return - } - latestVersion := idx.LatestVersion - - if selectedVersion == "" { - selectedVersion = latestVersion - } else if !slices.ContainsFunc(idx.Versions, func(item types.PackageIndexItem) bool { - return item.Version == selectedVersion - }) { - selectedVersion = latestVersion - } - - if manifest == nil { - manifest = &v1alpha1.PackageManifest{} - if err := s.repoClientset.ForRepoWithName(repositoryName). - FetchPackageManifest(pkgName, selectedVersion, manifest); err != nil { - s.respondAlertAndLog(w, err, - fmt.Sprintf("An error occurred fetching manifest of %v in version %v in repository %v", - pkgName, selectedVersion, repositoryName), - "danger") + } else if pkg == nil { + pkg = client.PackageBuilder(manifestName).WithVersion(selectedVersion). + WithVersion(selectedVersion). + WithRepositoryName(repositoryName). + WithAutoUpdates(strings.ToLower(enableAutoUpdate) == "on"). + WithValues(values). + WithNamespace(requestedNamespace). + WithName(requestedName). + BuildPackage() + opts := metav1.CreateOptions{} + err := install.NewInstaller(s.pkgClient). + WithStatusWriter(statuswriter.Stderr()). + InstallPackage(ctx, pkg, opts) + if err != nil { + s.respondAlertAndLog(w, err, "An error occurred installing "+manifestName, "danger") + } else { + s.swappingRedirect(w, "/packages", "main", "main") + w.WriteHeader(http.StatusAccepted) + } + } else { + pkg.Spec.Values = values + if err := s.pkgClient.Packages(pkg.GetNamespace()).Update(ctx, pkg); err != nil { + s.respondAlertAndLog(w, err, fmt.Sprintf("An error occurred updating package %v", manifestName), "danger") return } - } - - res, err := s.dependencyMgr.Validate(r.Context(), manifest, selectedVersion) - if err != nil { - s.respondAlertAndLog(w, err, - fmt.Sprintf("An error occurred validating dependencies of %v in version %v", pkgName, selectedVersion), - "danger") - return - } - - valueErrors := make(map[string]error) - datalistOptions := make(map[string]*pkg_config_input.PkgConfigInputDatalistOptions) - if pkg != nil { - nsOptions, _ := s.getNamespaceOptions() - pkgsOptions, _ := s.getPackagesOptions(r.Context()) - for key, v := range pkg.Spec.Values { - if _, err := s.valueResolver.ResolveValue(r.Context(), v); err != nil { - valueErrors[key] = util.GetRootCause(err) - } - if v.ValueFrom != nil { - options, err := s.getDatalistOptions(r.Context(), v.ValueFrom, nsOptions, pkgsOptions) - if err != nil { - fmt.Fprintf(os.Stderr, "%v\n", err) - } - datalistOptions[key] = options - } + if _, err := s.valueResolver.Resolve(ctx, values); err != nil { + s.respondAlertAndLog(w, err, "Some values could not be resolved: ", "warning") + } else { + s.respondSuccess(w) } } - - err = s.templates.pkgPageTmpl.Execute(w, s.enrichPage(r, map[string]any{ - "Package": pkg, - "Status": client.GetStatusOrPending(pkg), - "Manifest": manifest, - "LatestVersion": latestVersion, - "UpdateAvailable": pkg != nil && s.isUpdateAvailable(r.Context(), pkgName), - "AutoUpdate": clientutils.AutoUpdateString(pkg, "Disabled"), - "ValidationResult": res, - "ShowConflicts": res.Status == dependency.ValidationResultStatusConflict, - "SelectedVersion": selectedVersion, - "PackageIndex": &idx, - "Repositories": repos, - "RepositoryName": repositoryName, - "ShowConfiguration": (pkg != nil && len(manifest.ValueDefinitions) > 0 && pkg.DeletionTimestamp.IsZero()) || pkg == nil, - "ValueErrors": valueErrors, - "DatalistOptions": datalistOptions, - "ShowDiscussionLink": usedRepo.IsGlasskubeRepo(), - }, err)) - checkTmplError(err, fmt.Sprintf("package-detail (%s)", pkgName)) } -// installOrConfigurePackage is an endpoint which takes POST requests, containing all necessary parameters to either +// installOrConfigureClusterPackage is an endpoint which takes POST requests, containing all necessary parameters to either // install a new package if it does not exist yet, or update the configuration of an existing package. // The name of the concerned package is given in the pkgName query parameter. // In case the given package is not installed yet in the cluster, there must be a form parameter selectedVersion // containing which version should be installed. // In either case, the parameters from the form are parsed and converted into ValueConfiguration objects, which are // being set in the packages spec. -func (s *server) installOrConfigurePackage(w http.ResponseWriter, r *http.Request) { +func (s *server) installOrConfigureClusterPackage(w http.ResponseWriter, r *http.Request) { ctx := r.Context() pkgName := mux.Vars(r)["pkgName"] repositoryName := r.FormValue("repositoryName") selectedVersion := r.FormValue("selectedVersion") enableAutoUpdate := r.FormValue("enableAutoUpdate") + var err error pkg := &v1alpha1.ClusterPackage{} - var mf v1alpha1.PackageManifest - if err := s.pkgClient.ClusterPackages().Get(ctx, pkgName, pkg); err != nil && !apierrors.IsNotFound(err) { + var mf *v1alpha1.PackageManifest + if err = s.pkgClient.ClusterPackages().Get(ctx, pkgName, pkg); err != nil && !apierrors.IsNotFound(err) { s.respondAlertAndLog(w, err, fmt.Sprintf("An error occurred fetching package details of %v", pkgName), "danger") return } else if err != nil { pkg = nil } - if pkg == nil { - var repoClient repoclient.RepoClient - if len(repositoryName) == 0 { - repos, err := s.repoClientset.Meta().GetReposForPackage(pkgName) - if err != nil { - s.respondAlertAndLog(w, err, "", "danger") - return - } - switch len(repos) { - case 0: - // TODO: show error in UI - fmt.Fprintf(os.Stderr, "package not found in any repository") - return - case 1: - repositoryName = repos[0].Name - repoClient = s.repoClientset.ForRepo(repos[0]) - default: - // TODO: show error in UI - fmt.Fprintf(os.Stderr, "package found in multiple repositories") - return - } - } else { - repoClient = s.repoClientset.ForRepoWithName(repositoryName) - } - if err := repoClient.FetchPackageManifest(pkgName, selectedVersion, &mf); err != nil { - s.respondAlertAndLog(w, err, fmt.Sprintf("An error occurred fetching manifest of %v in version %v", pkgName, selectedVersion), "danger") - return - } - } else { - if mf1, err := manifest.GetInstalledManifestForPackage(ctx, pkg); err != nil { - s.respondAlertAndLog(w, err, fmt.Sprintf("An error occurred fetching package details of %v", pkgName), "danger") - return - } else { - mf = *mf1 - } + repositoryName, mf, err = s.getUsedRepoAndManifest(ctx, pkg, repositoryName, pkgName, selectedVersion) + if err != nil { + s.respondAlertAndLog(w, err, fmt.Sprintf("An error occurred getting manifest and repo for %s", pkgName), "danger") + return } - if values, err := extractValues(r, &mf); err != nil { + if values, err := extractValues(r, mf); err != nil { s.respondAlertAndLog(w, err, "An error occurred parsing the form", "danger") return } else if pkg == nil { - pkg = client.ClusterPackageBuilder(pkgName). + pkg = client.PackageBuilder(pkgName).WithVersion(selectedVersion). WithVersion(selectedVersion). WithRepositoryName(repositoryName). WithAutoUpdates(strings.ToLower(enableAutoUpdate) == "on"). WithValues(values). - Build() + BuildClusterPackage() opts := metav1.CreateOptions{} err := install.NewInstaller(s.pkgClient). WithStatusWriter(statuswriter.Stderr()). - Install(ctx, pkg, opts) + InstallClusterPackage(ctx, pkg, opts) if err != nil { s.respondAlertAndLog(w, err, "An error occurred installing "+pkgName, "danger") - return } } else { pkg.Spec.Values = values @@ -587,26 +678,58 @@ func (s *server) installOrConfigurePackage(w http.ResponseWriter, r *http.Reques if _, err := s.valueResolver.Resolve(ctx, values); err != nil { s.respondAlertAndLog(w, err, "Some values could not be resolved: ", "warning") } else { - err := s.templates.alertTmpl.Execute(w, map[string]any{ - "Message": "Configuration updated successfully", - "Dismissible": true, - "Type": "success", - }) - checkTmplError(err, "success") + s.respondSuccess(w) } } } -// advancedConfiguration is a GET+POST endpoint which can be used for advanced package installation options, most notably -// for changing the package repository and changing to a specific (maybe even lower than installed) version of the package. -// It is only intended to be used for already installed packages, for new packages these options exist anyway and -// should be available for every user. -func (s *server) advancedConfiguration(w http.ResponseWriter, r *http.Request) { +func (s *server) getUsedRepoAndManifest(ctx context.Context, pkg ctrlpkg.Package, repositoryName string, manifestName string, selectedVersion string) ( + string, *v1alpha1.PackageManifest, error) { + + var mf v1alpha1.PackageManifest + if pkg.IsNil() { + var repoClient repoclient.RepoClient + if len(repositoryName) == 0 { + repos, err := s.repoClientset.Meta().GetReposForPackage(manifestName) + if err != nil { + return "", nil, err + } + switch len(repos) { + case 0: + return "", nil, errors.New("package not found in any repository") + case 1: + repositoryName = repos[0].Name + repoClient = s.repoClientset.ForRepo(repos[0]) + default: + return "", nil, errors.New("package found in multiple repositories") + } + } else { + repoClient = s.repoClientset.ForRepoWithName(repositoryName) + } + if err := repoClient.FetchPackageManifest(manifestName, selectedVersion, &mf); err != nil { + return "", nil, err + } + } else { + if installedMf, err := manifest.GetInstalledManifestForPackage(ctx, pkg); err != nil { + return "", nil, err + } else { + mf = *installedMf + } + } + return repositoryName, &mf, nil +} + +// advancedClusterPackageConfiguration is a GET+POST endpoint which can be used for advanced package installation options, +// most notably for changing the package repository and changing to a specific (maybe even lower than installed) +// version of the package. +// It is only intended to be used for already installed clusterpackages, for new clusterpackages these options exist +// anyway and should be available for every user. +func (s *server) advancedClusterPackageConfiguration(w http.ResponseWriter, r *http.Request) { ctx := r.Context() pkgName := mux.Vars(r)["pkgName"] repositoryName := r.FormValue("repositoryName") selectedVersion := r.FormValue("selectedVersion") - pkg, manifest, err := describe.DescribeInstalledPackage(ctx, pkgName) + pkg, manifest, err := describe.DescribeInstalledClusterPackage(ctx, pkgName) if err != nil && !apierrors.IsNotFound(err) { s.respondAlertAndLog(w, err, fmt.Sprintf("An error occurred fetching package details of installed package %v", pkgName), @@ -620,16 +743,58 @@ func (s *server) advancedConfiguration(w http.ResponseWriter, r *http.Request) { } else if repositoryName == "" { repositoryName = pkg.Spec.PackageInfo.RepositoryName } + s.handleAdvancedConfig(ctx, &packageDetailPageContext{ + repositoryName: repositoryName, + selectedVersion: selectedVersion, + manifestName: pkgName, + pkg: pkg, + manifest: manifest, + }, r, w) +} + +// advancedPackageConfiguration is like advancedClusterPackageConfiguration but for packages +func (s *server) advancedPackageConfiguration(w http.ResponseWriter, r *http.Request) { + ctx := r.Context() + manifestName := mux.Vars(r)["manifestName"] + namespace := mux.Vars(r)["namespace"] + name := mux.Vars(r)["name"] + repositoryName := r.FormValue("repositoryName") + selectedVersion := r.FormValue("selectedVersion") + pkg, manifest, err := describe.DescribeInstalledPackage(ctx, namespace, name) + if err != nil && !apierrors.IsNotFound(err) { + s.respondAlertAndLog(w, err, + fmt.Sprintf("An error occurred fetching package details of installed package %v", manifestName), + "danger") + return + } else if pkg == nil { + s.respondAlertAndLog(w, err, + fmt.Sprintf("Package %v is not installed", manifestName), + "danger") + return + } else if repositoryName == "" { + repositoryName = pkg.Spec.PackageInfo.RepositoryName + } + s.handleAdvancedConfig(ctx, &packageDetailPageContext{ + repositoryName: repositoryName, + selectedVersion: selectedVersion, + manifestName: manifestName, + pkg: pkg, + manifest: manifest, + }, r, w) +} + +func (s *server) handleAdvancedConfig(ctx context.Context, d *packageDetailPageContext, r *http.Request, w http.ResponseWriter) { + var err error var repos []v1alpha1.PackageRepository - if repos, err = s.repoClientset.Meta().GetReposForPackage(pkgName); err != nil { + if repos, err = s.repoClientset.Meta().GetReposForPackage(d.manifestName); err != nil { fmt.Fprintf(os.Stderr, "error getting repos for package; %v", err) - } else if repositoryName == "" { + } else if d.repositoryName == "" { if len(repos) == 0 { - s.respondAlertAndLog(w, fmt.Errorf("%v not found in any repository", pkgName), "", "danger") + s.respondAlertAndLog(w, fmt.Errorf("%v not found in any repository", d.manifestName), "", "danger") return } for _, r := range repos { - repositoryName = r.Name + d.repositoryName = r.Name if r.IsDefaultRepository() { break } @@ -638,59 +803,71 @@ func (s *server) advancedConfiguration(w http.ResponseWriter, r *http.Request) { if r.Method == http.MethodGet { var idx repo.PackageIndex - if err := s.repoClientset.ForRepoWithName(repositoryName).FetchPackageIndex(pkgName, &idx); err != nil { + if err := s.repoClientset.ForRepoWithName(d.repositoryName).FetchPackageIndex(d.manifestName, &idx); err != nil { s.respondAlertAndLog(w, err, - fmt.Sprintf("An error occurred fetching package index of %v in repository %v", pkgName, repositoryName), + fmt.Sprintf("An error occurred fetching package index of %v in repository %v", d.manifestName, d.repositoryName), "danger") return } latestVersion := idx.LatestVersion - if selectedVersion == "" { - selectedVersion = latestVersion - } else if !slices.ContainsFunc(idx.Versions, func(item types.PackageIndexItem) bool { - return item.Version == selectedVersion + if d.selectedVersion == "" { + d.selectedVersion = latestVersion + } else if !slices.ContainsFunc(idx.Versions, func(item repotypes.PackageIndexItem) bool { + return item.Version == d.selectedVersion }) { - selectedVersion = latestVersion + d.selectedVersion = latestVersion } - res, err := s.dependencyMgr.Validate(r.Context(), manifest, selectedVersion) + res, err := s.dependencyMgr.Validate(r.Context(), d.manifest, d.selectedVersion) if err != nil { s.respondAlertAndLog(w, err, - fmt.Sprintf("An error occurred validating dependencies of %v in version %v", pkgName, selectedVersion), + fmt.Sprintf("An error occurred validating dependencies of %v in version %v", d.manifestName, d.selectedVersion), "danger") return } err = s.templates.pkgConfigAdvancedTmpl.Execute(w, s.enrichPage(r, map[string]any{ - "Status": client.GetStatusOrPending(pkg), - "Manifest": manifest, + "Status": client.GetStatusOrPending(d.pkg), + "Manifest": d.manifest, "LatestVersion": latestVersion, "ValidationResult": res, "ShowConflicts": res.Status == dependency.ValidationResultStatusConflict, - "SelectedVersion": selectedVersion, + "SelectedVersion": d.selectedVersion, "PackageIndex": &idx, "Repositories": repos, - "RepositoryName": repositoryName, + "RepositoryName": d.repositoryName, + "SelfHref": fmt.Sprintf("%s/configure/advanced", util.GetPackageHref(d.pkg, d.manifest)), }, err)) - checkTmplError(err, fmt.Sprintf("advanced-config (%s)", pkgName)) + checkTmplError(err, fmt.Sprintf("advanced-config (%s)", d.manifestName)) } else if r.Method == http.MethodPost { - pkg.Spec.PackageInfo.Version = selectedVersion - if repositoryName != "" { - pkg.Spec.PackageInfo.RepositoryName = repositoryName + d.pkg.GetSpec().PackageInfo.Version = d.selectedVersion + if d.repositoryName != "" { + d.pkg.GetSpec().PackageInfo.RepositoryName = d.repositoryName } - if err := s.pkgClient.ClusterPackages().Update(ctx, pkg); err != nil { - s.respondAlertAndLog(w, err, - fmt.Sprintf("An error occurred updating package %v to version %v in repo %v", pkgName, selectedVersion, repositoryName), - "danger") - return - } else { - err := s.templates.alertTmpl.Execute(w, map[string]any{ - "Message": "Configuration updated successfully", - "Dismissible": true, - "Type": "success", - }) - checkTmplError(err, "success") + switch pkg := d.pkg.(type) { + case *v1alpha1.ClusterPackage: + if err := s.pkgClient.ClusterPackages().Update(ctx, pkg); err != nil { + s.respondAlertAndLog(w, err, + fmt.Sprintf("An error occurred updating clusterpackage %v to version %v in repo %v", + d.manifestName, d.selectedVersion, d.repositoryName), + "danger") + return + } else { + s.respondSuccess(w) + } + case *v1alpha1.Package: + if err := s.pkgClient.Packages(d.pkg.GetNamespace()).Update(ctx, pkg); err != nil { + s.respondAlertAndLog(w, err, + fmt.Sprintf("An error occurred updating package %v to version %v in repo %v", + d.manifestName, d.selectedVersion, d.repositoryName), + "danger") + return + } else { + s.respondSuccess(w) + } + default: + panic("unexpected package type") } } } @@ -936,13 +1113,15 @@ func (server *server) initWhenBootstrapped(ctx context.Context) { } func (server *server) initCachedClient(ctx context.Context) { + clusterPackageStore, clusterPackageController := server.initClusterPackageStoreAndController(ctx) packageStore, packageController := server.initPackageStoreAndController(ctx) packageInfoStore, packageInfoController := server.initPackageInfoStoreAndController(ctx) packageRepoStore, packageRepoController := server.initPackageRepoStoreAndController(ctx) + go clusterPackageController.Run(ctx.Done()) go packageController.Run(ctx.Done()) go packageInfoController.Run(ctx.Done()) go packageRepoController.Run(ctx.Done()) - server.pkgClient = server.pkgClient.WithStores(packageStore, packageInfoStore, packageRepoStore) + server.pkgClient = server.pkgClient.WithStores(clusterPackageStore, packageStore, packageInfoStore, packageRepoStore) } func (s *server) enrichContext(h http.Handler) http.Handler { @@ -994,7 +1173,7 @@ func defaultKubeconfigExists() bool { } } -func (s *server) initPackageStoreAndController(ctx context.Context) (cache.Store, cache.Controller) { +func (s *server) initClusterPackageStoreAndController(ctx context.Context) (cache.Store, cache.Controller) { pkgClient := s.pkgClient return cache.NewInformer( &cache.ListWatch{ @@ -1012,32 +1191,86 @@ func (s *server) initPackageStoreAndController(ctx context.Context) (cache.Store cache.ResourceEventHandlerFuncs{ AddFunc: func(obj any) { if pkg, ok := obj.(*v1alpha1.ClusterPackage); ok { - s.broadcastRefreshTriggers(pkg) + s.broadcastClusterPackageRefreshTriggers(pkg) } }, UpdateFunc: func(oldObj, newObj any) { if pkg, ok := newObj.(*v1alpha1.ClusterPackage); ok { - s.broadcastRefreshTriggers(pkg) + s.broadcastClusterPackageRefreshTriggers(pkg) } }, DeleteFunc: func(obj any) { if pkg, ok := obj.(*v1alpha1.ClusterPackage); ok { - s.broadcastRefreshTriggers(pkg) + s.broadcastClusterPackageRefreshTriggers(pkg) + fwName := pkg.GetName() + if result, ok := s.forwarders[fwName]; ok { + result.Stop() + delete(s.forwarders, fwName) + } + } + }, + }, + ) +} + +func (s *server) initPackageStoreAndController(ctx context.Context) (cache.Store, cache.Controller) { + pkgClient := s.pkgClient + return cache.NewInformer( + &cache.ListWatch{ + ListFunc: func(options metav1.ListOptions) (runtime.Object, error) { + var pkgList v1alpha1.PackageList + err := pkgClient.Packages("").GetAll(ctx, &pkgList) + return &pkgList, err + }, + WatchFunc: func(options metav1.ListOptions) (watch.Interface, error) { + return pkgClient.Packages("").Watch(ctx, withDecreasedTimeout(options)) + }, + }, + &v1alpha1.Package{}, + 0, + cache.ResourceEventHandlerFuncs{ + AddFunc: func(obj any) { + if pkg, ok := obj.(*v1alpha1.Package); ok { + s.broadcastPackageRefreshTriggers(pkg) + } + }, + UpdateFunc: func(oldObj, newObj any) { + if pkg, ok := newObj.(*v1alpha1.Package); ok { + s.broadcastPackageRefreshTriggers(pkg) + } + }, + DeleteFunc: func(obj any) { + if pkg, ok := obj.(*v1alpha1.Package); ok { + s.broadcastPackageRefreshTriggers(pkg) + fwName := cache.ObjectName{Namespace: pkg.GetNamespace(), Name: pkg.GetName()}.String() + if result, ok := s.forwarders[fwName]; ok { + result.Stop() + delete(s.forwarders, fwName) + } } }, }, ) } -func (s *server) broadcastRefreshTriggers(pkg *v1alpha1.ClusterPackage) { +func (s *server) broadcastClusterPackageRefreshTriggers(pkg *v1alpha1.ClusterPackage) { s.sseHub.Broadcast <- &sse{ - event: "refresh-pkg-overview", + event: "refresh-clusterpackage-overview", } s.sseHub.Broadcast <- &sse{ event: fmt.Sprintf("refresh-pkg-detail-%s", pkg.Name), } } +func (s *server) broadcastPackageRefreshTriggers(pkg *v1alpha1.Package) { + s.sseHub.Broadcast <- &sse{ + event: "refresh-package-overview", + } + s.sseHub.Broadcast <- &sse{ + event: fmt.Sprintf("refresh-pkg-detail-%s-%s", pkg.Namespace, pkg.Name), + } +} + func (s *server) initPackageInfoStoreAndController(ctx context.Context) (cache.Store, cache.Controller) { pkgClient := s.pkgClient return cache.NewInformer( @@ -1085,33 +1318,30 @@ func withDecreasedTimeout(opts metav1.ListOptions) metav1.ListOptions { return opts } -func (s *server) isUpdateAvailable(ctx context.Context, packages ...string) bool { - if tx, err := update.NewUpdater(ctx).Prepare(ctx, packages); err != nil { - fmt.Fprintf(os.Stderr, "Error checking for updates: %v\n", err) +func (s *server) isUpdateAvailableForClPkg(ctx context.Context, name string) bool { + return s.isUpdateAvailable(ctx, []string{name}, nil) +} + +func (s *server) isUpdateAvailableForPkg(ctx context.Context, pkg ctrlpkg.Package) bool { + if pkg.IsNil() { return false + } + if pkg.IsNamespaceScoped() { + return s.isUpdateAvailable(ctx, nil, []apitypes.NamespacedName{ + {Namespace: pkg.GetNamespace(), Name: pkg.GetName()}, + }) } else { - return !tx.IsEmpty() + return s.isUpdateAvailable(ctx, []string{pkg.GetName()}, nil) } } -func (s *server) respondAlertAndLog(w http.ResponseWriter, err error, wrappingMsg string, alertType string) { - if wrappingMsg != "" { - err = fmt.Errorf("%v: %w", wrappingMsg, err) +func (s *server) isUpdateAvailable(ctx context.Context, clpkgs []string, pkgs []apitypes.NamespacedName) bool { + if tx, err := update.NewUpdater(ctx).Prepare(ctx, clpkgs, pkgs); err != nil { + fmt.Fprintf(os.Stderr, "Error checking for updates: %v\n", err) + return false + } else { + return !tx.IsEmpty() } - fmt.Fprintf(os.Stderr, "%v\n", err) - s.respondAlert(w, err.Error(), alertType) -} - -func (s *server) respondAlert(w http.ResponseWriter, message string, alertType string) { - w.Header().Add("Hx-Reselect", "div.alert") // overwrite any existing hx-select (which was a little intransparent sometimes) - w.Header().Add("Hx-Reswap", "afterbegin") - w.WriteHeader(http.StatusBadRequest) - err := s.templates.alertTmpl.Execute(w, map[string]any{ - "Message": message, - "Dismissible": true, - "Type": alertType, - }) - checkTmplError(err, "alert") } func isPortConflictError(err error) bool { diff --git a/internal/web/templates.go b/internal/web/templates.go index 9431e651b..7ad11054d 100644 --- a/internal/web/templates.go +++ b/internal/web/templates.go @@ -31,23 +31,24 @@ import ( ) type templates struct { - templateFuncs template.FuncMap - baseTemplate *template.Template - pkgsPageTmpl *template.Template - pkgPageTmpl *template.Template - pkgDiscussionPageTmpl *template.Template - supportPageTmpl *template.Template - bootstrapPageTmpl *template.Template - kubeconfigPageTmpl *template.Template - settingsPageTmpl *template.Template - pkgUpdateModalTmpl *template.Template - pkgConfigInput *template.Template - pkgConfigAdvancedTmpl *template.Template - pkgUninstallModalTmpl *template.Template - alertTmpl *template.Template - datalistTmpl *template.Template - pkgDiscussionBadgeTmpl *template.Template - repoClientset repoclient.RepoClientset + templateFuncs template.FuncMap + baseTemplate *template.Template + clusterPkgsPageTemplate *template.Template + pkgsPageTmpl *template.Template + pkgPageTmpl *template.Template + pkgDiscussionPageTmpl *template.Template + supportPageTmpl *template.Template + bootstrapPageTmpl *template.Template + kubeconfigPageTmpl *template.Template + settingsPageTmpl *template.Template + pkgUpdateModalTmpl *template.Template + pkgConfigInput *template.Template + pkgConfigAdvancedTmpl *template.Template + pkgUninstallModalTmpl *template.Template + alertTmpl *template.Template + datalistTmpl *template.Template + pkgDiscussionBadgeTmpl *template.Template + repoClientset repoclient.RepoClientset } var ( @@ -77,9 +78,9 @@ func (t *templates) watchTemplates() error { func (t *templates) parseTemplates() { t.templateFuncs = template.FuncMap{ - "ForPkgOverviewBtn": pkg_overview_btn.ForPkgOverviewBtn, - "ForPkgDetailBtns": pkg_detail_btns.ForPkgDetailBtns, - "ForPkgUpdateAlert": pkg_update_alert.ForPkgUpdateAlert, + "ForClPkgOverviewBtn": pkg_overview_btn.ForClPkgOverviewBtn, + "ForPkgDetailBtns": pkg_detail_btns.ForPkgDetailBtns, + "ForPkgUpdateAlert": pkg_update_alert.ForPkgUpdateAlert, "PackageManifestUrl": func(pkg ctrlpkg.Package) string { if !pkg.IsNil() { url, err := t.repoClientset.ForPackage(pkg). @@ -135,11 +136,21 @@ func (t *templates) parseTemplates() { cond := meta.FindStatusCondition(repo.Status.Conditions, string(condition.Ready)) return cond != nil && cond.Status == metav1.ConditionTrue }, + "PackageDetailRefreshId": func(manifest *v1alpha1.PackageManifest, pkg ctrlpkg.Package) string { + var id string + if manifest.Scope.IsCluster() { + id = manifest.Name + } else if !pkg.IsNil() { + id = fmt.Sprintf("%s-%s", pkg.GetNamespace(), pkg.GetName()) + } + return fmt.Sprintf("refresh-pkg-detail-%s", id) + }, } t.baseTemplate = template.Must(template.New("base.html"). Funcs(t.templateFuncs). ParseFS(webFs, path.Join(templatesDir, "layout", "base.html"))) + t.clusterPkgsPageTemplate = t.pageTmpl("clusterpackages.html") t.pkgsPageTmpl = t.pageTmpl("packages.html") t.pkgPageTmpl = t.pageTmpl("package.html") t.pkgDiscussionPageTmpl = t.pageTmpl("discussion.html") diff --git a/internal/web/templates/components/pkg-overview-btn.html b/internal/web/templates/components/clpkg-overview-btn.html similarity index 85% rename from internal/web/templates/components/pkg-overview-btn.html rename to internal/web/templates/components/clpkg-overview-btn.html index 926275d5c..2c71ef932 100644 --- a/internal/web/templates/components/pkg-overview-btn.html +++ b/internal/web/templates/components/clpkg-overview-btn.html @@ -1,8 +1,8 @@ -{{ define "pkg-overview-btn" }} +{{ define "clpkg-overview-btn" }} {{ if eq .Status nil }} Install - {{ else if not .Pkg.DeletionTimestamp.IsZero }} + {{ else if .InDeletion }}
      @@ -21,8 +21,9 @@ Installation Failed
    {{ else if .UpdateAvailable }} +
Advanced Options hx-select="#advanced-options" hx-swap="outerHTML" hx-target="#advanced-options" - hx-get="/packages/{{ .Manifest.Name }}/configure/advanced" + hx-get="{{ .SelfHref }}" hx-include="#advanced-pkg-install-version"> {{ range .Repositories }}
+ {{ if ne .Status nil }} +
+ {{ if .Manifest.Scope.IsNamespaced }} + + Namespace: + {{ .Package.Namespace }} + + + Name: + {{ .Package.Name }} + + {{ end }} + + Repository: + {{ .Package.Spec.PackageInfo.RepositoryName }} + + + Installed version: + {{ .Package.Spec.PackageInfo.Version }} + + + Auto-Update: + {{ .AutoUpdate }} + +
+ {{ end }} {{ end }} diff --git a/internal/web/templates/components/pkg-uninstall-modal.html b/internal/web/templates/components/pkg-uninstall-modal.html index 36104e6d6..0cf119e7c 100644 --- a/internal/web/templates/components/pkg-uninstall-modal.html +++ b/internal/web/templates/components/pkg-uninstall-modal.html @@ -1,9 +1,16 @@ +{{ define "pkg-uninstall-pkg-name" }} + {{ if .PackageName }}{{ .PackageName }}{{ else }}{{ .Namespace }}/{{ .Name }}{{ end }} +{{ end }} + {{ define "pkg-uninstall-modal" }}