diff --git a/.github/scripts/check-coverage-thresholds.js b/.github/scripts/check-coverage-thresholds.js index 6eb7a39e7..02c3995fd 100644 --- a/.github/scripts/check-coverage-thresholds.js +++ b/.github/scripts/check-coverage-thresholds.js @@ -1,5 +1,4 @@ const fs = require('fs'); -const { execSync } = require('child_process'); const coverage = require('../../coverage/coverage-summary.json'); const jestConfig = require('../../jest.config.js'); @@ -41,7 +40,6 @@ for (const key of ['branches', 'functions', 'lines', 'statements']) { if (failed) { const stars = '*'.repeat(warnMessage.length + 8); - execSync('clear', { stdio: 'inherit' }); console.log('\n\nCongratulations! You have successfully run the coverage check and added tests.'); console.log('\n\nThe jest.config.js file is not insync with your new test additions.'); console.log('Please update the coverage thresholds in jest.config.js.'); diff --git a/.github/workflows/review.yml b/.github/workflows/review.yml index 3c12bf4fe..b06877914 100644 --- a/.github/workflows/review.yml +++ b/.github/workflows/review.yml @@ -3,9 +3,7 @@ name: Require at least one approval on: pull_request: - types: [opened, reopened, ready_for_review, synchronize] - pull_request_review: - types: [submitted, edited, dismissed] + types: [opened, reopened, ready_for_review, synchronize, edited] jobs: check-approval: diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 7e41d3893..75fc25cd7 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -5,11 +5,29 @@ on: branches: ['*'] # or change to match your default branch push: branches: ['*'] + workflow_dispatch: jobs: test: runs-on: ubuntu-latest + steps: + - name: Checkout code + uses: actions/checkout@v3 + + - name: Use Node.js + uses: actions/setup-node@v4 + with: + node-version: 22.13.1 + + - name: Install dependencies + run: npm ci + + - name: Run Jest tests + run: npm run ci:test + test-coverage: + runs-on: ubuntu-latest + steps: - name: Checkout code uses: actions/checkout@v3 @@ -23,7 +41,27 @@ jobs: run: npm ci - name: Run Jest tests with coverage - run: npm run ci + run: npm run ci:test:coverage - name: Check coverage thresholds run: npm run test:check-coverage-thresholds + lint: + runs-on: ubuntu-latest + + steps: + - name: Checkout code + uses: actions/checkout@v4 + + - name: Use Node.js + uses: actions/setup-node@v4 + with: + node-version: 22.13.1 + + - name: Install dependencies + run: npm ci + + - name: Run linting + run: npm run lint + + - name: Check formatting with prettier + run: npm run format:check diff --git a/.gitignore b/.gitignore index 2f85265bd..fca5b5041 100644 --- a/.gitignore +++ b/.gitignore @@ -6,6 +6,7 @@ /tmp /out-tsc /bazel-out +/src/assets/config/config.json # Node /node_modules diff --git a/.husky/pre-push b/.husky/pre-push index 5a281490a..4bc89d416 100644 --- a/.husky/pre-push +++ b/.husky/pre-push @@ -17,3 +17,4 @@ npm run test:check-coverage-thresholds || { #printf "\n\nPlease address them before proceeding.\n\n\n\n" # exit 1 } + diff --git a/README.md b/README.md index 14508c7ab..8b4fbb3be 100644 --- a/README.md +++ b/README.md @@ -18,6 +18,7 @@ take up to 60 seconds once the docker build finishes. - Install git commit template: [Commit Template](docs/commit.template.md). - [Volta](#volta) +- 3rd-party tokens [Configuration](#configuration) ### Recommended @@ -25,6 +26,7 @@ take up to 60 seconds once the docker build finishes. - [Docker Commands](docs/docker.md). - [ESLint Strategy](docs/eslint.md). - [Git Conventions](docs/git-convention.md). +- [i18n](docs/i18n.md). - [NGXS Conventions](docs/ngxs.md). - [Testing Strategy](docs/testing.md). @@ -58,3 +60,9 @@ npm run test:check-coverage-thresholds OSF uses volta to manage node and npm versions inside of the repository Install Volta from [volta](https://volta.sh/) and it will automatically pin Node/npm per the repo toolchain. + +## Configuration + +OSF uses an `assets/config/config.json` file for any 3rd-party tokens. This file is not committed to the repo. + +There is a `assets/config/template.json` file that can be copied to `assets/config/config.json` to store any 3rd-party tokens locally. diff --git a/angular.json b/angular.json index 51ff0bd44..a799f5f67 100644 --- a/angular.json +++ b/angular.json @@ -29,9 +29,11 @@ "cedar-embeddable-editor", "cedar-artifact-viewer", "markdown-it-video", - "ace-builds/src-noconflict/ext-language_tools" + "ace-builds/src-noconflict/ext-language_tools", + "@traptitech/markdown-it-katex" ], "assets": [ + "src/favicon.ico", "src/assets", { "glob": "**/*", @@ -63,7 +65,7 @@ "budgets": [ { "type": "initial", - "maximumWarning": "7MB", + "maximumWarning": "9MB", "maximumError": "10MB" }, { @@ -79,25 +81,58 @@ "outputHashing": "none", "namedChunks": true }, - "local": { + "development": { "optimization": false, "extractLicenses": false, "sourceMap": true, "fileReplacements": [ { "replace": "src/environments/environment.ts", - "with": "src/environments/environment.local.ts" + "with": "src/environments/environment.development.ts" } ] }, - "development": { + "docker": { "optimization": false, "extractLicenses": false, "sourceMap": true, "fileReplacements": [ { "replace": "src/environments/environment.ts", - "with": "src/environments/environment.development.ts" + "with": "src/environments/environment.docker.ts" + } + ] + }, + "staging": { + "optimization": true, + "extractLicenses": false, + "sourceMap": false, + "fileReplacements": [ + { + "replace": "src/environments/environment.ts", + "with": "src/environments/environment.staging.ts" + } + ] + }, + "test": { + "optimization": true, + "extractLicenses": false, + "sourceMap": false, + "fileReplacements": [ + { + "replace": "src/environments/environment.ts", + "with": "src/environments/environment.test.ts" + } + ] + }, + "test-osf": { + "optimization": true, + "extractLicenses": false, + "sourceMap": false, + "fileReplacements": [ + { + "replace": "src/environments/environment.ts", + "with": "src/environments/environment.test-osf.ts" } ] } @@ -114,8 +149,20 @@ "buildTarget": "osf:build:development", "hmr": false }, - "local": { - "buildTarget": "osf:build:local", + "docker": { + "buildTarget": "osf:build:docker", + "hmr": false + }, + "staging": { + "buildTarget": "osf:build:staging", + "hmr": false + }, + "test": { + "buildTarget": "osf:build:test", + "hmr": false + }, + "test-osf": { + "buildTarget": "osf:build:test-osf", "hmr": false } }, diff --git a/commitlint.config.cjs b/commitlint.config.cjs index 33a11c3e9..2e552773e 100644 --- a/commitlint.config.cjs +++ b/commitlint.config.cjs @@ -5,15 +5,16 @@ module.exports = { 2, 'always', [ + 'chore', // Build process, CI/CD, dependencies + 'docs', // Documentation update 'feat', // New feature 'fix', // Bug fix - 'docs', // Documentation update - 'style', // Code style (formatting, missing semicolons, etc.) - 'refactor', // Code refactoring (no feature changes) + 'lang', // All updates related to i18n changes 'perf', // Performance improvements - 'test', // Adding tests - 'chore', // Build process, CI/CD, dependencies + 'refactor', // Code refactoring (no feature changes) 'revert', // Reverting changes + 'style', // Code style (formatting, missing semicolons, etc.) + 'test', // Adding tests ], ], 'scope-empty': [2, 'never'], // Scope must always be present diff --git a/docker-compose.yml b/docker-compose.yml index d5e025875..a8148f3b6 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,6 +22,7 @@ services: - ./angular.json:/app/angular.json - ./tsconfig.json:/app/tsconfig.json - ./tsconfig.app.json:/app/tsconfig.app.json + - ./docker/scripts:/app/docker # (CMD comes from Dockerfile, but you could override here if you wanted) command: ['npm', 'run', 'start:docker'] diff --git a/docker/scripts/check-config.js b/docker/scripts/check-config.js new file mode 100644 index 000000000..4dc32d9aa --- /dev/null +++ b/docker/scripts/check-config.js @@ -0,0 +1,12 @@ +const fs = require('fs'); +const path = require('path'); + +const configPath = path.join(__dirname, '../src/assets/config/config.json'); +const templatePath = path.join(__dirname, '../src/assets/config/template.json'); + +if (!fs.existsSync(configPath)) { + console.log('[INFO] config.json not found. Copying from template.json...'); + fs.copyFileSync(templatePath, configPath); +} else { + console.log('[INFO] config.json already exists.'); +} diff --git a/docs/admin.knowledge-base.md b/docs/admin.knowledge-base.md index 15d8adf5a..d33082099 100644 --- a/docs/admin.knowledge-base.md +++ b/docs/admin.knowledge-base.md @@ -1,7 +1,18 @@ # Admin Knowledge Base +## Index + +- [Overview](#overview) +- [All things GitHub](#all-things-github) + +--- + +## Overview + Information on updates that require admin permissions +--- + ## All things GitHub ### GitHub pipeline @@ -16,6 +27,8 @@ The `.github` folder contains the following: .github/workflows 4. The GitHub PR templates .github/pull_request_template.md +5. The backup json for the settings/rules + .github/rules ### Local pipeline diff --git a/docs/assets/osf-ngxs-diagram.png b/docs/assets/osf-ngxs-diagram.png index e19e06910..95460f3ae 100644 Binary files a/docs/assets/osf-ngxs-diagram.png and b/docs/assets/osf-ngxs-diagram.png differ diff --git a/docs/commit.template.md b/docs/commit.template.md index f5a591b92..5bcfdf575 100644 --- a/docs/commit.template.md +++ b/docs/commit.template.md @@ -1,5 +1,7 @@ ## 📝 Enabling the Shared Commit Template +## Overview + This project includes a Git commit message template stored at: ``` diff --git a/docs/compodoc.md b/docs/compodoc.md index 30ff0b86b..0f61cc364 100644 --- a/docs/compodoc.md +++ b/docs/compodoc.md @@ -1,5 +1,20 @@ # Angular Documentation with Compodoc +## Index + +- [Overview](#overview) +- [How to Generate Documentation](#how-to-generate-documentation) +- [Documentation Coverage Requirements](#documentation-coverage-requirements) +- [Pre-commit Enforcement via Husky](#pre-commit-enforcement-via-husky) +- [CI/CD Enforcement](#cicd-enforcement) +- [Tips for Passing Coverage](#tips-for-passing-coverage) +- [Output Directory](#output-directory) +- [Need Help?](#need-help) + +--- + +## Overview + This project uses [Compodoc](https://compodoc.app/) to generate and enforce documentation for all Angular code. Documentation is mandatory and must meet a **100% coverage threshold** to ensure consistent API clarity across the codebase. --- diff --git a/docs/docker.md b/docs/docker.md index 6cb529323..0404bdaa4 100644 --- a/docs/docker.md +++ b/docs/docker.md @@ -1,5 +1,15 @@ # Docker +## Index + +- [Overview](#overview) +- [Docker Commands](#docker-commands) +- [Troubleshooting](#troubleshooting) + +--- + +## Overview + The OSF angular project uses a docker image to simplify the developer process. ### Volumes @@ -33,6 +43,8 @@ If you don’t see the site, ensure the start script includes: "start": "ng serve --host 0.0.0.0 --port 4200 --poll 2000" ``` +--- + ## Docker Commands ### build + run in background (build is only required for the initial install or npm updates) @@ -105,6 +117,8 @@ docker rmi : docker rmi -f ``` +--- + ## Troubleshooting If the application does not open in your browser at [http://localhost:4200](http://localhost:4200), follow these steps in order: diff --git a/docs/eslint.md b/docs/eslint.md index 5a4933835..255d0cc3c 100644 --- a/docs/eslint.md +++ b/docs/eslint.md @@ -1,5 +1,13 @@ # Linting Strategy – OSF Angular +## Index + +- [Overview](#overview) +- [Linting Commands](#linting-commands) +- [ESLint Config Structure](#eslint-config-structure) +- [Pre-Commit Hook](#pre-commit-hook) +- [Summary](#summary) + --- ## Overview @@ -12,6 +20,9 @@ This project uses a **unified, modern ESLint flat config** approach to enforce c It also integrates into the **Git workflow** via `pre-commit` hooks to ensure clean, compliant code before every commit. +**IMPORTANT** +The OSF application must meet full accessibility (a11y) compliance to ensure equitable access for users of all abilities, in alignment with our commitment to inclusivity and funding obligations. + --- ## Linting Commands diff --git a/docs/git-convention.md b/docs/git-convention.md index d0c99b2b4..f231f792f 100644 --- a/docs/git-convention.md +++ b/docs/git-convention.md @@ -1,11 +1,25 @@ # CommitLint and Git Branch Naming Convention (Aligned with Angular Guideline) +## Index + +- [Overview](#overview) +- [Local pipeline](#local-pipeline) +- [Contributing Workflow](#contributing-workflow) +- [Commitlint](#commitlint) +- [Branch Naming Format](#branch-naming-format) + +--- + +## Overview + To maintain a clean, structured commit history and optimize team collaboration, we adhere to the Angular Conventional Commits standard for both commit messages and Git branch naming. This ensures every change type is immediately recognizable and supports automation for changelog generation, semantic versioning, and streamlined release processes. In addition, we enforce these standards using CommitLint, ensuring that all commit messages conform to the defined rules before they are accepted into the repository. This project employs both GitHub Actions and a local pre-commit pipeline to validate commit messages, enforce branch naming conventions, and maintain repository integrity throughout the development workflow. +--- + ## Local pipeline The local pipeline is managed via husky @@ -16,6 +30,8 @@ The local pipeline is managed via husky - All tests pass - Test coverage is met +--- + ## Contributing Workflow To contribute to this repository, follow these steps: @@ -69,6 +85,8 @@ This workflow ensures that: For a step-by-step guide on forking and creating pull requests, see [GitHub’s documentation on forks](https://docs.github.com/en/get-started/quickstart/fork-a-repo) and [about pull requests](https://docs.github.com/en/pull-requests). +--- + ## Commitlint OSF uses [Commitlint](https://www.npmjs.com/package/commitlint) to **enforce a consistent commit message format**. @@ -103,35 +121,37 @@ Commit messages must be structured as: | Type | Description | | ------------ | ------------------------------------------------------------------------------------- | +| **chore** | Changes to the build process, CI/CD pipeline, or dependencies. | +| **docs** | Documentation-only changes (e.g., README, comments). | | **feat** | New feature added to the codebase. | | **fix** | Bug fix for an existing issue. | -| **docs** | Documentation-only changes (e.g., README, comments). | -| **style** | Changes that do not affect code meaning (formatting, whitespace, missing semicolons). | -| **refactor** | Code restructuring without changing external behavior. | +| **lang** | Any updates to the i18n files in src/asssets/i18n/en.json. | | **perf** | Code changes that improve performance. | -| **test** | Adding or updating tests. | -| **chore** | Changes to the build process, CI/CD pipeline, or dependencies. | +| **refactor** | Code restructuring without changing external behavior. | | **revert** | Reverts a previous commit. | +| **style** | Changes that do not affect code meaning (formatting, whitespace, missing semicolons). | +| **test** | Adding or updating tests. | --- ### **Examples** -✅ **Good Examples** +**Good Examples** ``` +chore(deps): update Angular to v19 +docs(readme): add setup instructions for Windows feat(auth): add OAuth2 login support fix(user-profile): resolve avatar upload failure on Safari -docs(readme): add setup instructions for Windows -style(header): reformat nav menu CSS -refactor(api): simplify data fetching logic +lang(eng-4898): added new strings for preprint page perf(search): reduce API response time by caching results -test(auth): add tests for password reset flow -chore(deps): update Angular to v19 +refactor(api): simplify data fetching logic revert: revert “feat(auth): add OAuth2 login support” +style(header): reformat nav menu CSS +test(auth): add tests for password reset flow ``` -❌ **Bad Examples** +**Bad Examples** ``` fixed bug in login @@ -156,10 +176,10 @@ update stuff Refs #456 ``` ---- - Commitlint will run automatically and reject non-compliant messages. +--- + ## Branch Naming Format ### The branch name should follow the format: @@ -175,10 +195,14 @@ short-description – a brief description of the change. ``` +--- + ## Available Types (type) See the [Allowed Commit Types](#allowed-commit-types) section for details. +--- + ## Branch Naming Examples ### Here are some examples of branch names: @@ -192,7 +216,7 @@ See the [Allowed Commit Types](#allowed-commit-types) section for details. ``` -### 🛠 Example of Creating a Branch: +### Example of Creating a Branch: To create a new branch, use the following command: @@ -201,15 +225,15 @@ git checkout -b feat/1234-add-user-authentication ``` -### 🏆 Best Practices +### Best Practices -- ✅ Use short and clear descriptions in branch names. -- ✅ Follow a consistent style across all branches for better project structure. -- ✅ Avoid redundant words, e.g., fix/1234-fix-bug (the word "fix" is redundant). -- ✅ Use kebab-case (- instead of \_ or CamelCase). -- ✅ If there is no issue ID, omit it, e.g., docs/update-contributing-guide. +- Use short and clear descriptions in branch names. +- Follow a consistent style across all branches for better project structure. +- Avoid redundant words, e.g., fix/1234-fix-bug (the word "fix" is redundant). +- Use kebab-case (- instead of \_ or CamelCase). +- If there is no issue ID, omit it, e.g., docs/update-contributing-guide. -### 🔗 Additional Resources +### Additional Resources **Conventional Commits**: https://www.conventionalcommits.org @@ -219,7 +243,7 @@ git checkout -b feat/1234-add-user-authentication ### This branch naming strategy ensures better traceability and improves commit history readability. -### 🔗 Additional Resources +### Additional Resources Conventional Commits: https://www.conventionalcommits.org @@ -227,4 +251,4 @@ Angular Commit Guidelines: https://github.com/angular/angular/blob/main/CONTRIBU Git Flow: https://nvie.com/posts/a-successful-git-branching-model/ -This branch naming and commit message strategy ensures better traceability and improves commit history readability. 🚀 +This branch naming and commit message strategy ensures better traceability and improves commit history readability. diff --git a/docs/i18n.md b/docs/i18n.md new file mode 100644 index 000000000..45e7e2a39 --- /dev/null +++ b/docs/i18n.md @@ -0,0 +1,147 @@ +# OSF Angular – Internationalization (i18n) Strategy + +## Index + +- [Overview](#overview) +- [Integration: `@ngx-translate/core`](#integration-ngx-translatecore) +- [Usage Guidelines](#usage-guidelines) +- [Format: `en.json`](#format-enjson) +- [Source of Truth: `en.json` Only](#source-of-truth-enjson-only) +- [Language Branch Workflow](#language-branch-workflow) +- [Summary](#summary) + +--- + +## Overview + +The OSF Angular project uses [`@ngx-translate/core`](https://github.com/ngx-translate/core) to manage internationalization (i18n) across the entire application. This allows for consistent, dynamic translation of all user-visible text, making it easier to support multiple languages. + +All strings rendered to users—whether in HTML templates or dynamically via Angular components—must be sourced from the centralized i18n JSON files located in: + +``` +src/app/i18n/ +``` + +**IMPORTANT** +The OSF application must maintain 100% translation coverage, as it is a requirement of grant funding that supports a globally distributed user base. + +## Integration: `@ngx-translate/core` + +To support multilingual content, the following module is included globally: + +```ts +import { TranslatePipe } from '@ngx-translate/core'; +``` + +The translation service (`TranslateService`) is injected where necessary and used to load and access translations at runtime. + +## Usage Guidelines + +### 1. HTML Templates + +In templates, use the `translate` pipe: + +```html +

{{ 'home.title' | translate }}

+``` + +### 2. Dynamic Component Strings + +For component logic, use the `TranslateService`: + +```ts +private readonly translateService = inject(TranslateService); +public title!: string; + +ngOnInit(): void { + this.title = this.translate.instant('home.title'); +} +``` + +Avoid hardcoded strings in both the template and logic. All user-facing text must be represented by a translation key from the JSON files in `src/app/i18n`. + +## Format: `en.json` + +The primary English translation file is located at: + +``` +src/app/i18n/en.json +``` + +The structure should be **namespaced by feature or component** for maintainability: + +```json +{ + "home": { + "title": "Welcome to OSF", + "subTitle": "Your research. Your control." + }, + "login": { + "email": "Email Address", + "password": "Password" + } +} +``` + +Avoid deeply nested keys, and always use consistent camel-casing and key naming for reuse and clarity. + +**Note** + +The `common section` in the en.json file stores frequently used phrases to prevent one-off duplicate translations. + +## Source of Truth: `en.json` Only + +All translation key additions and updates must be made **only** in the `src/app/i18n/en.json` file. + +> Other language files (e.g., `fr.json`, `es.json`) must **not** be modified by non-OSF engineers. These translations will be handle internally by the OSF Angular team. + +This ensures consistency across translations and prevents desynchronization between supported languages. + +### Summary + +| Language File | Editable? | Notes | +| -------------------- | --------- | -------------------------------------------------- | +| `en.json` | Yes | Canonical source of all keys and values | +| `fr.json`, `es.json` | No | Never manually modified during feature development | + +Always validate that new translation keys appear in `en.json` only. + +## Language Branch Workflow + +All updates to the i18n translation files (e.g., `en.json`) must follow a strict workflow: + +### Branch Naming + +Create a branch prefixed with: + +``` +language/ +``` + +Example: + +``` +language/ENG-145-update-login-copy +``` + +### Commit Message Format + +The commit header must include the `lang()` label: + +``` +lang(ENG-145): update login page strings +``` + +This ensures that all translation updates are tracked, reviewed, and associated with the appropriate task or ticket. + +## Summary + +| Requirement | Description | +| ---------------------- | -------------------------------------------------------------- | +| Translation Library | [`@ngx-translate/core`](https://github.com/ngx-translate/core) | +| Source of All Strings | `src/app/i18n/*.json` | +| Required in HTML | Must use the `translate` pipe | +| Required in Components | Must use `TranslateService` | +| English File Format | Namespaced keys in `en.json` | +| Branch Naming | `language/` | +| Commit Convention | `lang(): message` | diff --git a/docs/ngxs.md b/docs/ngxs.md index 114db45fa..3f93391c0 100644 --- a/docs/ngxs.md +++ b/docs/ngxs.md @@ -1,4 +1,18 @@ -# NGXS State Management Overview +# NGXS State Management + +## Index + +- [Purpose](#purpose) +- [Core Concepts](#core-concepts) +- [Directory Structure](#directory-structure) +- [State Models](#state-models) +- [Tooling and Extensions](#tooling-and-extensions) +- [Testing](#testing) +- [Documentation](#documentation) + +--- + +## Overview The OSF Angular project uses [NGXS](https://www.ngxs.io/) as the state management library for Angular applications. NGXS provides a simple, powerful, and TypeScript-friendly framework for managing state across components and services. @@ -45,6 +59,33 @@ src/app/shared/services/ --- +## State Models + +The OSF Angular project follows a consistent NGXS state model structure to ensure clarity, predictability, and alignment across all features. The recommended shape for each domain-specific state is as follows: + +1. Domain state pattern: + +```ts +domain: { + data: [], // Array of typed model data (e.g., Project[], User[]) + isLoading: false, // Indicates if data retrieval (GET) is in progress + isSubmitting: false, // Indicates if data submission (POST/PUT/DELETE) is in progress + error: null, // Captures error messages from failed HTTP requests +} +``` + +2. `data` holds the strongly typed collection of entities defined by the feature's interface or model class. + +3. `isLoading` is a signal used to inform the component and template layer that a read or fetch operation is currently pending. + +4. `isSubmitting` signals that a write operation (form submission, update, delete, etc.) is currently in progress. + +5. `error` stores error state information (commonly strings or structured error objects) that result from failed service interactions. This can be displayed in UI or logged for debugging. + +Each domain state should be minimal, normalized, and scoped to its specific feature, mirroring the structure and shape of the corresponding OSF backend API response. + +--- + ## Tooling and Extensions - [Redux DevTools](https://github.com/zalmoxisus/redux-devtools-extension) is supported. Enable it in development via `NgxsReduxDevtoolsPluginModule`. @@ -55,7 +96,8 @@ src/app/shared/services/ ## Testing -- Mock `Store` using `jest.fn()` or test-specific modules for unit testing components and services. +- [Testing Strategy](docs/testing.md) +- [NGXS State Testing Strategy](docs/testing.md#ngxs-state-testing-strategy) --- diff --git a/docs/testing.md b/docs/testing.md index 17448bdc9..3de20e198 100644 --- a/docs/testing.md +++ b/docs/testing.md @@ -1,13 +1,9 @@ # OSF Angular Testing Strategy -## Overview - -The OSF Angular project uses a modular and mock-driven testing strategy. A shared `testing/` folder provides reusable mocks, mock data, and testing module configuration to support consistent and maintainable unit tests across the codebase. - ---- - ## Index +- [Overview](#overview) + - [Pro-tips](#pro-tips) - [Best Practices](#best-practices) - [Summary Table](#summary-table) - [Test Coverage Enforcement (100%)](#test-coverage-enforcement-100) @@ -18,7 +14,36 @@ The OSF Angular project uses a modular and mock-driven testing strategy. A share - [Testing Angular Directives](#testing-angular-directives) - [Testing Angular NGXS](#testing-ngxs) --- +--- + +## Overview + +The OSF Angular project uses a modular and mock-driven testing strategy. A shared `testing/` folder provides reusable mocks, mock data, and testing module configuration to support consistent and maintainable unit tests across the codebase. + +--- + +### Pro-tips + +**What to test** + +The OSF Angular testing strategy enforces 100% coverage while also serving as a guardrail for future engineers. Each test should highlight the most critical aspect of your code — what you’d want the next developer to understand before making changes. If a test fails during a refactor, it should clearly signal that a core feature was impacted, prompting them to investigate why and preserve the intended behavior. + +--- + +**Test Data** + +The OSF Angular Test Data module provides a centralized and consistent source of data across all unit tests. It is intended solely for use within unit tests. By standardizing test data, any changes to underlying data models will produce cascading failures, which help expose the full scope of a refactor. This is preferable to isolated or hardcoded test values, which can lead to false positives and missed regressions. + +The strategy for structuring test data follows two principles: + +1. Include enough data to cover all relevant permutations required by the test suite. +2. Ensure the data reflects all possible states (stati) of the model. + +**Test Scope** + +The OSF Angular project defines a `@testing` scope that can be used for importing all testing-related modules. + +--- ## Best Practices @@ -34,8 +59,8 @@ The OSF Angular project uses a modular and mock-driven testing strategy. A share | Location | Purpose | | ----------------------- | -------------------------------------- | | `osf.testing.module.ts` | Unified test module for shared imports | -| `mocks/*.mock.ts` | Mock services and tokens | -| `data/*.data.ts` | Static mock data for test cases | +| `src/mocks/*.mock.ts` | Mock services and tokens | +| `src/data/*.data.ts` | Static mock data for test cases | --- @@ -91,9 +116,11 @@ This guarantees **test integrity in CI** and **prevents regressions**. - **Push blocked** without passing 100% tests. - GitHub CI double-checks every PR. +--- + ## Key Structure -### `testing/osf.testing.module.ts` +### `src/testing/osf.testing.module.ts` This module centralizes commonly used providers, declarations, and test utilities. It's intended to be imported into any `*.spec.ts` test file to avoid repetitive boilerplate. @@ -101,7 +128,7 @@ Example usage: ```ts import { TestBed } from '@angular/core/testing'; -import { OsfTestingModule } from 'testing/osf.testing.module'; +import { OsfTestingModule } from '@testing/osf.testing.module'; beforeEach(async () => { await TestBed.configureTestingModule({ @@ -141,9 +168,9 @@ beforeEach(async () => { - `StoreMock` – mocks NgRx Store for selector and dispatch testing. - `ToastServiceMock` – injects a mock version of the UI toast service. -### `testing/mocks/` +### Testing Mocks -Provides common service and token mocks to isolate unit tests from real implementations. +The `src/testing/mocks/` directory provides common service and token mocks to isolate unit tests from real implementations. **examples** @@ -154,11 +181,16 @@ Provides common service and token mocks to isolate unit tests from real implemen --- -### `testing/data/` +### Test Data -Includes fake/mock data used by tests to simulate external API responses or internal state. +The `src/testing/data/` directory includes fake/mock data used by tests to simulate external API responses or internal state. -Only use data from the `testing/data` data mocks to ensure that all data is the centralized. +The OSF Angular Test Data module provides a centralized and consistent source of data across all unit tests. It is intended solely for use within unit tests. By standardizing test data, any changes to underlying data models will produce cascading failures, which help expose the full scope of a refactor. This is preferable to isolated or hardcoded test values, which can lead to false positives and missed regressions. + +The strategy for structuring test data follows two principles: + +1. Include enough data to cover all relevant permutations required by the test suite. +2. Ensure the data reflects all possible states (stati) of the model. **examples** @@ -169,11 +201,13 @@ Only use data from the `testing/data` data mocks to ensure that all data is the --- ---- - ## Testing Angular Services (with HTTP) -All OSF Angular services that make HTTP requests must be tested using `HttpClientTestingModule` and `HttpTestingController`. +All OSF Angular services that make HTTP requests must be tested using `HttpClientTestingModule` and `HttpTestingController`. This testing style verifies both the API call itself and the logic that maps the response into application data. + +When using HttpTestingController to flush HTTP requests in tests, only use data from the @testing/data mocks to ensure consistency and full test coverage. + +Any error handling will also need to be tested. ### Setup @@ -240,8 +274,86 @@ it('should call correct endpoint and return expected data', inject( --- -## Testing NGXS +## NGXS State Testing Strategy -- coming soon +The OSF Angular strategy for NGXS state testing is to create **small integration test scenarios**. This is a deliberate departure from traditional **black box isolated** testing. The rationale is: + +1. **NGXS actions** tested in isolation are difficult to mock and result in garbage-in/garbage-out tests. +2. **NGXS selectors** tested in isolation are easy to mock but also lead to garbage-in/garbage-out outcomes. +3. **NGXS states** tested in isolation are easy to invoke but provide no meaningful validation. +4. **Mocking service calls** during state testing introduces false positives, since the mocked service responses may not reflect actual backend behavior. + +This approach favors realism and accuracy over artificial test isolation. + +### Test Outline Strategy + +1. **Dispatch the primary action** – Kick off the state logic under test. +2. **Dispatch any dependent actions** – Include any secondary actions that rely on the primary action's outcome. +3. **Verify the loading selector is `true`** – Ensure the loading state is activated during the async flow. +4. **Verify the service call using `HttpTestingController` and `@testing/data` mocks** – Confirm that the correct HTTP request is made and flushed with known mock data. +5. **Verify the loading selector is `false`** – Ensure the loading state deactivates after the response is handled. +6. **Verify the primary data selector** – Check that the core selector related to the dispatched action returns the expected state. +7. **Verify any additional selectors** – Assert the output of other derived selectors relevant to the action. +8. **Validate the test with `httpMock.verify()`** – Confirm that all HTTP requests were flushed and none remain unhandled: + +```ts +expect(httpMock.verify).toBeTruthy(); +``` + +### Example + +This is an example of an NGXS action test that involves both a **primary action** and a **dependent action**. The dependency must be dispatched first to ensure the test environment mimics the actual runtime behavior. This pattern helps validate not only the action effects but also the full selector state after updates. All HTTP requests are flushed using the centralized `@testing/data` mocks. + +```ts +it('should test action, state and selectors', inject([HttpTestingController], (httpMock: HttpTestingController) => { + let result: any[] = []; + // Dependency Action + store.dispatch(new GetAuthorizedStorageAddons('reference-id')).subscribe(); + + // Primary Action + store.dispatch(new GetAuthorizedStorageOauthToken('account-id')).subscribe(() => { + result = store.selectSnapshot(AddonsSelectors.getAuthorizedStorageAddons); + }); + + // Loading selector is true + const loading = store.selectSignal(AddonsSelectors.getAuthorizedStorageAddonsLoading); + expect(loading()).toBeTruthy(); + + // Http request for service for dependency action + let request = httpMock.expectOne('api/path/dependency/action'); + expect(request.request.method).toBe('GET'); + // @testing/data response mock + request.flush(getAddonsAuthorizedStorageData()); + + // Http request for service for primary action + let request = httpMock.expectOne('api/path/primary/action'); + expect(request.request.method).toBe('PATCH'); + // @testing/data response mock with updates + const addonWithToken = getAddonsAuthorizedStorageData(1); + addonWithToken.data.attributes.oauth_token = 'ya2.34234324534'; + request.flush(addonWithToken); + + // Full testing of the dependency selector + expect(result[1]).toEqual( + Object({ + accountOwnerId: '0b441148-83e5-4f7f-b302-b07b528b160b', + }) + ); + + // Full testing of the primary selector + let oauthToken = store.selectSnapshot(AddonsSelectors.getAuthorizedStorageAddonOauthToken(result[0].id)); + expect(oauthToken).toBe('ya29.A0AS3H6NzDCKgrUx'); + + // Verify only the requested `account-id` was updated + oauthToken = store.selectSnapshot(AddonsSelectors.getAuthorizedStorageAddonOauthToken(result[1].id)); + expect(oauthToken).toBe(result[1].oauthToken); + + // Loading selector is false + expect(loading()).toBeFalsy(); + + // httpMock.verify to ensure no other api calls are called. + expect(httpMock.verify).toBeTruthy(); +})); +``` --- diff --git a/eslint.config.js b/eslint.config.js index 1b4ca309c..17c8f35d2 100644 --- a/eslint.config.js +++ b/eslint.config.js @@ -87,9 +87,6 @@ module.exports = tseslint.config( }, { files: ['**/*.html'], - plugins: { - '@angular-eslint/template': angularEslintTemplate, - }, languageOptions: { parser: angularTemplateParser, }, @@ -112,7 +109,7 @@ module.exports = tseslint.config( }, }, { - files: ['**/*.spec.ts'], + files: ['**/*.spec.ts', 'src/testing/**/*.ts'], rules: { '@typescript-eslint/no-explicit-any': 'off', '@typescript-eslint/no-empty-function': 'off', diff --git a/jest.config.js b/jest.config.js index 6a119eb3c..ecdfa34e0 100644 --- a/jest.config.js +++ b/jest.config.js @@ -8,7 +8,7 @@ module.exports = { '^@osf/(.*)$': '/src/app/$1', '^@core/(.*)$': '/src/app/core/$1', '^@shared/(.*)$': '/src/app/shared/$1', - '^@styles/(.*)$': '/src/styles/$1', + '^@styles/(.*)$': '/assets/styles/$1', '^@testing/(.*)$': '/src/testing/$1', '^src/environments/environment$': '/src/environments/environment.ts', }, @@ -28,13 +28,18 @@ module.exports = { coverageDirectory: 'coverage', collectCoverageFrom: [ 'src/app/**/*.{ts,js}', + '!src/app/core/theme/**', '!src/app/app.config.ts', - '!src/app/**/*.routes.{ts.js}', + '!src/app/app.routes.ts', + '!src/app/**/*.routes.{ts,js}', + '!src/app/**/**/*.routes.{ts,js}', + '!src/app/**/*.route.{ts,js}', + '!src/app/**/mappers/**', + '!src/app/shared/mappers/**', '!src/app/**/*.models.{ts.js}', '!src/app/**/*.model.{ts.js}', - '!src/app/**/*.route.{ts,js}', - '!src/app/**/*.enum.{ts,js}', - '!src/app/**/*.type.{ts,js}', + '!src/app/**/models/*.{ts,js}', + '!src/app/shared/models/**', '!src/app/**/*.enum.{ts,js}', '!src/app/**/*.type.{ts,js}', '!src/app/**/*.spec.{ts,js}', @@ -45,10 +50,10 @@ module.exports = { extensionsToTreatAsEsm: ['.ts'], coverageThreshold: { global: { - branches: 14.27, - functions: 15.55, - lines: 42.6, - statements: 43.2, + branches: 24.1, + functions: 28.73, + lines: 56.52, + statements: 56.82, }, }, watchPathIgnorePatterns: [ @@ -59,47 +64,23 @@ module.exports = { '/src/environments/', '/src/@types/', ], - watchPathIgnorePatterns: [ - '/node_modules/', - '/dist/', - '/coverage/', - '/src/assets/', - '/src/environments/', - '/src/@types/', - ], testPathIgnorePatterns: [ + '/src/environments', '/src/app/app.config.ts', '/src/app/app.routes.ts', - '/src/app/features/registry/', - '/src/app/features/project/addons/components/configure-configure-addon/', - '/src/app/features/project/addons/components/connect-configured-addon/', - '/src/app/features/project/addons/components/disconnect-addon-modal/', - '/src/app/features/project/addons/components/confirm-account-connection-modal/', - '/src/app/features/files/', - '/src/app/features/my-projects/', - '/src/app/features/preprints/', - '/src/app/features/project/contributors/', + '/src/app/features/files/pages/file-detail', + '/src/app/features/project/addons/', '/src/app/features/project/overview/', '/src/app/features/project/registrations', - '/src/app/features/project/settings', '/src/app/features/project/wiki', - '/src/app/features/project/project.component.ts', - '/src/app/features/registries/', + '/src/app/features/registry/components', + '/src/app/features/registry/pages/registry-wiki/registry-wiki', '/src/app/features/settings/addons/', - '/src/app/features/settings/settings-container.component.ts', - '/src/app/features/settings/tokens/components/', - '/src/app/features/settings/tokens/mappers/', '/src/app/features/settings/tokens/store/', - '/src/app/features/settings/tokens/pages/tokens-list/', '/src/app/shared/components/file-menu/', - '/src/app/shared/components/files-tree/', '/src/app/shared/components/line-chart/', - '/src/app/shared/components/make-decision-dialog/', '/src/app/shared/components/pie-chart/', - '/src/app/shared/components/resource-citations/', '/src/app/shared/components/reusable-filter/', - '/src/app/shared/components/subjects/', '/src/app/shared/components/wiki/edit-section/', - '/src/app/shared/components/wiki/wiki-list/', ], }; diff --git a/package-lock.docker.json b/package-lock.docker.json index d98c25804..3e765740e 100644 --- a/package-lock.docker.json +++ b/package-lock.docker.json @@ -3107,15 +3107,11 @@ "version": "0.25.4", "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.25.4.tgz", "integrity": "sha512-1VCICWypeQKhVbE9oW/sJaAmjLxhVqacdkvPLEjwlttjfwENRSClS8EjBz0KzRyFSCPDIkuXW34Je/vk7zdB7Q==", - "cpu": [ - "ppc64" - ], + "cpu": ["ppc64"], "dev": true, "license": "MIT", "optional": true, - "os": [ - "aix" - ], + "os": ["aix"], "engines": { "node": ">=18" } @@ -3124,15 +3120,11 @@ "version": "0.25.4", "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.25.4.tgz", "integrity": "sha512-QNdQEps7DfFwE3hXiU4BZeOV68HHzYwGd0Nthhd3uCkkEKK7/R6MTgM0P7H7FAs5pU/DIWsviMmEGxEoxIZ+ZQ==", - "cpu": [ - "arm" - ], + "cpu": ["arm"], "dev": true, "license": "MIT", "optional": true, - "os": [ - "android" - ], + "os": ["android"], "engines": { "node": ">=18" } @@ -3141,15 +3133,11 @@ "version": "0.25.4", "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.25.4.tgz", "integrity": "sha512-bBy69pgfhMGtCnwpC/x5QhfxAz/cBgQ9enbtwjf6V9lnPI/hMyT9iWpR1arm0l3kttTr4L0KSLpKmLp/ilKS9A==", - "cpu": [ - "arm64" - ], + "cpu": ["arm64"], "dev": true, "license": "MIT", "optional": true, - "os": [ - "android" - ], + "os": ["android"], "engines": { "node": ">=18" } @@ -3158,15 +3146,11 @@ "version": "0.25.4", "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.25.4.tgz", "integrity": "sha512-TVhdVtQIFuVpIIR282btcGC2oGQoSfZfmBdTip2anCaVYcqWlZXGcdcKIUklfX2wj0JklNYgz39OBqh2cqXvcQ==", - "cpu": [ - "x64" - ], + "cpu": ["x64"], "dev": true, "license": "MIT", "optional": true, - "os": [ - "android" - ], + "os": ["android"], "engines": { "node": ">=18" } @@ -3175,15 +3159,11 @@ "version": "0.25.4", "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.25.4.tgz", "integrity": "sha512-Y1giCfM4nlHDWEfSckMzeWNdQS31BQGs9/rouw6Ub91tkK79aIMTH3q9xHvzH8d0wDru5Ci0kWB8b3up/nl16g==", - "cpu": [ - "arm64" - ], + "cpu": ["arm64"], "dev": true, "license": "MIT", "optional": true, - "os": [ - "darwin" - ], + "os": ["darwin"], "engines": { "node": ">=18" } @@ -3192,15 +3172,11 @@ "version": "0.25.4", "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.25.4.tgz", "integrity": "sha512-CJsry8ZGM5VFVeyUYB3cdKpd/H69PYez4eJh1W/t38vzutdjEjtP7hB6eLKBoOdxcAlCtEYHzQ/PJ/oU9I4u0A==", - "cpu": [ - "x64" - ], + "cpu": ["x64"], "dev": true, "license": "MIT", "optional": true, - "os": [ - "darwin" - ], + "os": ["darwin"], "engines": { "node": ">=18" } @@ -3209,15 +3185,11 @@ "version": "0.25.4", "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.25.4.tgz", "integrity": "sha512-yYq+39NlTRzU2XmoPW4l5Ifpl9fqSk0nAJYM/V/WUGPEFfek1epLHJIkTQM6bBs1swApjO5nWgvr843g6TjxuQ==", - "cpu": [ - "arm64" - ], + "cpu": ["arm64"], "dev": true, "license": "MIT", "optional": true, - "os": [ - "freebsd" - ], + "os": ["freebsd"], "engines": { "node": ">=18" } @@ -3226,15 +3198,11 @@ "version": "0.25.4", "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.25.4.tgz", "integrity": "sha512-0FgvOJ6UUMflsHSPLzdfDnnBBVoCDtBTVyn/MrWloUNvq/5SFmh13l3dvgRPkDihRxb77Y17MbqbCAa2strMQQ==", - "cpu": [ - "x64" - ], + "cpu": ["x64"], "dev": true, "license": "MIT", "optional": true, - "os": [ - "freebsd" - ], + "os": ["freebsd"], "engines": { "node": ">=18" } @@ -3243,15 +3211,11 @@ "version": "0.25.4", "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.25.4.tgz", "integrity": "sha512-kro4c0P85GMfFYqW4TWOpvmF8rFShbWGnrLqlzp4X1TNWjRY3JMYUfDCtOxPKOIY8B0WC8HN51hGP4I4hz4AaQ==", - "cpu": [ - "arm" - ], + "cpu": ["arm"], "dev": true, "license": "MIT", "optional": true, - "os": [ - "linux" - ], + "os": ["linux"], "engines": { "node": ">=18" } @@ -3260,15 +3224,11 @@ "version": "0.25.4", "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.25.4.tgz", "integrity": "sha512-+89UsQTfXdmjIvZS6nUnOOLoXnkUTB9hR5QAeLrQdzOSWZvNSAXAtcRDHWtqAUtAmv7ZM1WPOOeSxDzzzMogiQ==", - "cpu": [ - "arm64" - ], + "cpu": ["arm64"], "dev": true, "license": "MIT", "optional": true, - "os": [ - "linux" - ], + "os": ["linux"], "engines": { "node": ">=18" } @@ -3277,15 +3237,11 @@ "version": "0.25.4", "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.25.4.tgz", "integrity": "sha512-yTEjoapy8UP3rv8dB0ip3AfMpRbyhSN3+hY8mo/i4QXFeDxmiYbEKp3ZRjBKcOP862Ua4b1PDfwlvbuwY7hIGQ==", - "cpu": [ - "ia32" - ], + "cpu": ["ia32"], "dev": true, "license": "MIT", "optional": true, - "os": [ - "linux" - ], + "os": ["linux"], "engines": { "node": ">=18" } @@ -3294,15 +3250,11 @@ "version": "0.25.4", "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.25.4.tgz", "integrity": "sha512-NeqqYkrcGzFwi6CGRGNMOjWGGSYOpqwCjS9fvaUlX5s3zwOtn1qwg1s2iE2svBe4Q/YOG1q6875lcAoQK/F4VA==", - "cpu": [ - "loong64" - ], + "cpu": ["loong64"], "dev": true, "license": "MIT", "optional": true, - "os": [ - "linux" - ], + "os": ["linux"], "engines": { "node": ">=18" } @@ -3311,15 +3263,11 @@ "version": "0.25.4", "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.25.4.tgz", "integrity": "sha512-IcvTlF9dtLrfL/M8WgNI/qJYBENP3ekgsHbYUIzEzq5XJzzVEV/fXY9WFPfEEXmu3ck2qJP8LG/p3Q8f7Zc2Xg==", - "cpu": [ - "mips64el" - ], + "cpu": ["mips64el"], "dev": true, "license": "MIT", "optional": true, - "os": [ - "linux" - ], + "os": ["linux"], "engines": { "node": ">=18" } @@ -3328,15 +3276,11 @@ "version": "0.25.4", "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.25.4.tgz", "integrity": "sha512-HOy0aLTJTVtoTeGZh4HSXaO6M95qu4k5lJcH4gxv56iaycfz1S8GO/5Jh6X4Y1YiI0h7cRyLi+HixMR+88swag==", - "cpu": [ - "ppc64" - ], + "cpu": ["ppc64"], "dev": true, "license": "MIT", "optional": true, - "os": [ - "linux" - ], + "os": ["linux"], "engines": { "node": ">=18" } @@ -3345,15 +3289,11 @@ "version": "0.25.4", "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.25.4.tgz", "integrity": "sha512-i8JUDAufpz9jOzo4yIShCTcXzS07vEgWzyX3NH2G7LEFVgrLEhjwL3ajFE4fZI3I4ZgiM7JH3GQ7ReObROvSUA==", - "cpu": [ - "riscv64" - ], + "cpu": ["riscv64"], "dev": true, "license": "MIT", "optional": true, - "os": [ - "linux" - ], + "os": ["linux"], "engines": { "node": ">=18" } @@ -3362,15 +3302,11 @@ "version": "0.25.4", "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.25.4.tgz", "integrity": "sha512-jFnu+6UbLlzIjPQpWCNh5QtrcNfMLjgIavnwPQAfoGx4q17ocOU9MsQ2QVvFxwQoWpZT8DvTLooTvmOQXkO51g==", - "cpu": [ - "s390x" - ], + "cpu": ["s390x"], "dev": true, "license": "MIT", "optional": true, - "os": [ - "linux" - ], + "os": ["linux"], "engines": { "node": ">=18" } @@ -3379,15 +3315,11 @@ "version": "0.25.4", "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.25.4.tgz", "integrity": "sha512-6e0cvXwzOnVWJHq+mskP8DNSrKBr1bULBvnFLpc1KY+d+irZSgZ02TGse5FsafKS5jg2e4pbvK6TPXaF/A6+CA==", - "cpu": [ - "x64" - ], + "cpu": ["x64"], "dev": true, "license": "MIT", "optional": true, - "os": [ - "linux" - ], + "os": ["linux"], "engines": { "node": ">=18" } @@ -3396,15 +3328,11 @@ "version": "0.25.4", "resolved": "https://registry.npmjs.org/@esbuild/netbsd-arm64/-/netbsd-arm64-0.25.4.tgz", "integrity": "sha512-vUnkBYxZW4hL/ie91hSqaSNjulOnYXE1VSLusnvHg2u3jewJBz3YzB9+oCw8DABeVqZGg94t9tyZFoHma8gWZQ==", - "cpu": [ - "arm64" - ], + "cpu": ["arm64"], "dev": true, "license": "MIT", "optional": true, - "os": [ - "netbsd" - ], + "os": ["netbsd"], "engines": { "node": ">=18" } @@ -3413,15 +3341,11 @@ "version": "0.25.4", "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.25.4.tgz", "integrity": "sha512-XAg8pIQn5CzhOB8odIcAm42QsOfa98SBeKUdo4xa8OvX8LbMZqEtgeWE9P/Wxt7MlG2QqvjGths+nq48TrUiKw==", - "cpu": [ - "x64" - ], + "cpu": ["x64"], "dev": true, "license": "MIT", "optional": true, - "os": [ - "netbsd" - ], + "os": ["netbsd"], "engines": { "node": ">=18" } @@ -3430,15 +3354,11 @@ "version": "0.25.4", "resolved": "https://registry.npmjs.org/@esbuild/openbsd-arm64/-/openbsd-arm64-0.25.4.tgz", "integrity": "sha512-Ct2WcFEANlFDtp1nVAXSNBPDxyU+j7+tId//iHXU2f/lN5AmO4zLyhDcpR5Cz1r08mVxzt3Jpyt4PmXQ1O6+7A==", - "cpu": [ - "arm64" - ], + "cpu": ["arm64"], "dev": true, "license": "MIT", "optional": true, - "os": [ - "openbsd" - ], + "os": ["openbsd"], "engines": { "node": ">=18" } @@ -3447,15 +3367,11 @@ "version": "0.25.4", "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.25.4.tgz", "integrity": "sha512-xAGGhyOQ9Otm1Xu8NT1ifGLnA6M3sJxZ6ixylb+vIUVzvvd6GOALpwQrYrtlPouMqd/vSbgehz6HaVk4+7Afhw==", - "cpu": [ - "x64" - ], + "cpu": ["x64"], "dev": true, "license": "MIT", "optional": true, - "os": [ - "openbsd" - ], + "os": ["openbsd"], "engines": { "node": ">=18" } @@ -3464,15 +3380,11 @@ "version": "0.25.4", "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.25.4.tgz", "integrity": "sha512-Mw+tzy4pp6wZEK0+Lwr76pWLjrtjmJyUB23tHKqEDP74R3q95luY/bXqXZeYl4NYlvwOqoRKlInQialgCKy67Q==", - "cpu": [ - "x64" - ], + "cpu": ["x64"], "dev": true, "license": "MIT", "optional": true, - "os": [ - "sunos" - ], + "os": ["sunos"], "engines": { "node": ">=18" } @@ -3481,15 +3393,11 @@ "version": "0.25.4", "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.25.4.tgz", "integrity": "sha512-AVUP428VQTSddguz9dO9ngb+E5aScyg7nOeJDrF1HPYu555gmza3bDGMPhmVXL8svDSoqPCsCPjb265yG/kLKQ==", - "cpu": [ - "arm64" - ], + "cpu": ["arm64"], "dev": true, "license": "MIT", "optional": true, - "os": [ - "win32" - ], + "os": ["win32"], "engines": { "node": ">=18" } @@ -3498,15 +3406,11 @@ "version": "0.25.4", "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.25.4.tgz", "integrity": "sha512-i1sW+1i+oWvQzSgfRcxxG2k4I9n3O9NRqy8U+uugaT2Dy7kLO9Y7wI72haOahxceMX8hZAzgGou1FhndRldxRg==", - "cpu": [ - "ia32" - ], + "cpu": ["ia32"], "dev": true, "license": "MIT", "optional": true, - "os": [ - "win32" - ], + "os": ["win32"], "engines": { "node": ">=18" } @@ -3515,15 +3419,11 @@ "version": "0.25.4", "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.25.4.tgz", "integrity": "sha512-nOT2vZNw6hJ+z43oP1SPea/G/6AbN6X+bGNhNuq8NtRHy4wsMhw765IKLNmnjek7GvjWBYQ8Q5VBoYTFg9y1UQ==", - "cpu": [ - "x64" - ], + "cpu": ["x64"], "dev": true, "license": "MIT", "optional": true, - "os": [ - "win32" - ], + "os": ["win32"], "engines": { "node": ">=18" } @@ -5164,169 +5064,121 @@ "version": "3.2.6", "resolved": "https://registry.npmjs.org/@lmdb/lmdb-darwin-arm64/-/lmdb-darwin-arm64-3.2.6.tgz", "integrity": "sha512-yF/ih9EJJZc72psFQbwnn8mExIWfTnzWJg+N02hnpXtDPETYLmQswIMBn7+V88lfCaFrMozJsUvcEQIkEPU0Gg==", - "cpu": [ - "arm64" - ], + "cpu": ["arm64"], "dev": true, "license": "MIT", "optional": true, - "os": [ - "darwin" - ] + "os": ["darwin"] }, "node_modules/@lmdb/lmdb-darwin-x64": { "version": "3.2.6", "resolved": "https://registry.npmjs.org/@lmdb/lmdb-darwin-x64/-/lmdb-darwin-x64-3.2.6.tgz", "integrity": "sha512-5BbCumsFLbCi586Bb1lTWQFkekdQUw8/t8cy++Uq251cl3hbDIGEwD9HAwh8H6IS2F6QA9KdKmO136LmipRNkg==", - "cpu": [ - "x64" - ], + "cpu": ["x64"], "dev": true, "license": "MIT", "optional": true, - "os": [ - "darwin" - ] + "os": ["darwin"] }, "node_modules/@lmdb/lmdb-linux-arm": { "version": "3.2.6", "resolved": "https://registry.npmjs.org/@lmdb/lmdb-linux-arm/-/lmdb-linux-arm-3.2.6.tgz", "integrity": "sha512-+6XgLpMb7HBoWxXj+bLbiiB4s0mRRcDPElnRS3LpWRzdYSe+gFk5MT/4RrVNqd2MESUDmb53NUXw1+BP69bjiQ==", - "cpu": [ - "arm" - ], + "cpu": ["arm"], "dev": true, "license": "MIT", "optional": true, - "os": [ - "linux" - ] + "os": ["linux"] }, "node_modules/@lmdb/lmdb-linux-arm64": { "version": "3.2.6", "resolved": "https://registry.npmjs.org/@lmdb/lmdb-linux-arm64/-/lmdb-linux-arm64-3.2.6.tgz", "integrity": "sha512-l5VmJamJ3nyMmeD1ANBQCQqy7do1ESaJQfKPSm2IG9/ADZryptTyCj8N6QaYgIWewqNUrcbdMkJajRQAt5Qjfg==", - "cpu": [ - "arm64" - ], + "cpu": ["arm64"], "dev": true, "license": "MIT", "optional": true, - "os": [ - "linux" - ] + "os": ["linux"] }, "node_modules/@lmdb/lmdb-linux-x64": { "version": "3.2.6", "resolved": "https://registry.npmjs.org/@lmdb/lmdb-linux-x64/-/lmdb-linux-x64-3.2.6.tgz", "integrity": "sha512-nDYT8qN9si5+onHYYaI4DiauDMx24OAiuZAUsEqrDy+ja/3EbpXPX/VAkMV8AEaQhy3xc4dRC+KcYIvOFefJ4Q==", - "cpu": [ - "x64" - ], + "cpu": ["x64"], "dev": true, "license": "MIT", "optional": true, - "os": [ - "linux" - ] + "os": ["linux"] }, "node_modules/@lmdb/lmdb-win32-x64": { "version": "3.2.6", "resolved": "https://registry.npmjs.org/@lmdb/lmdb-win32-x64/-/lmdb-win32-x64-3.2.6.tgz", "integrity": "sha512-XlqVtILonQnG+9fH2N3Aytria7P/1fwDgDhl29rde96uH2sLB8CHORIf2PfuLVzFQJ7Uqp8py9AYwr3ZUCFfWg==", - "cpu": [ - "x64" - ], + "cpu": ["x64"], "dev": true, "license": "MIT", "optional": true, - "os": [ - "win32" - ] + "os": ["win32"] }, "node_modules/@msgpackr-extract/msgpackr-extract-darwin-arm64": { "version": "3.0.3", "resolved": "https://registry.npmjs.org/@msgpackr-extract/msgpackr-extract-darwin-arm64/-/msgpackr-extract-darwin-arm64-3.0.3.tgz", "integrity": "sha512-QZHtlVgbAdy2zAqNA9Gu1UpIuI8Xvsd1v8ic6B2pZmeFnFcMWiPLfWXh7TVw4eGEZ/C9TH281KwhVoeQUKbyjw==", - "cpu": [ - "arm64" - ], + "cpu": ["arm64"], "dev": true, "license": "MIT", "optional": true, - "os": [ - "darwin" - ] + "os": ["darwin"] }, "node_modules/@msgpackr-extract/msgpackr-extract-darwin-x64": { "version": "3.0.3", "resolved": "https://registry.npmjs.org/@msgpackr-extract/msgpackr-extract-darwin-x64/-/msgpackr-extract-darwin-x64-3.0.3.tgz", "integrity": "sha512-mdzd3AVzYKuUmiWOQ8GNhl64/IoFGol569zNRdkLReh6LRLHOXxU4U8eq0JwaD8iFHdVGqSy4IjFL4reoWCDFw==", - "cpu": [ - "x64" - ], + "cpu": ["x64"], "dev": true, "license": "MIT", "optional": true, - "os": [ - "darwin" - ] + "os": ["darwin"] }, "node_modules/@msgpackr-extract/msgpackr-extract-linux-arm": { "version": "3.0.3", "resolved": "https://registry.npmjs.org/@msgpackr-extract/msgpackr-extract-linux-arm/-/msgpackr-extract-linux-arm-3.0.3.tgz", "integrity": "sha512-fg0uy/dG/nZEXfYilKoRe7yALaNmHoYeIoJuJ7KJ+YyU2bvY8vPv27f7UKhGRpY6euFYqEVhxCFZgAUNQBM3nw==", - "cpu": [ - "arm" - ], + "cpu": ["arm"], "dev": true, "license": "MIT", "optional": true, - "os": [ - "linux" - ] + "os": ["linux"] }, "node_modules/@msgpackr-extract/msgpackr-extract-linux-arm64": { "version": "3.0.3", "resolved": "https://registry.npmjs.org/@msgpackr-extract/msgpackr-extract-linux-arm64/-/msgpackr-extract-linux-arm64-3.0.3.tgz", "integrity": "sha512-YxQL+ax0XqBJDZiKimS2XQaf+2wDGVa1enVRGzEvLLVFeqa5kx2bWbtcSXgsxjQB7nRqqIGFIcLteF/sHeVtQg==", - "cpu": [ - "arm64" - ], + "cpu": ["arm64"], "dev": true, "license": "MIT", "optional": true, - "os": [ - "linux" - ] + "os": ["linux"] }, "node_modules/@msgpackr-extract/msgpackr-extract-linux-x64": { "version": "3.0.3", "resolved": "https://registry.npmjs.org/@msgpackr-extract/msgpackr-extract-linux-x64/-/msgpackr-extract-linux-x64-3.0.3.tgz", "integrity": "sha512-cvwNfbP07pKUfq1uH+S6KJ7dT9K8WOE4ZiAcsrSes+UY55E/0jLYc+vq+DO7jlmqRb5zAggExKm0H7O/CBaesg==", - "cpu": [ - "x64" - ], + "cpu": ["x64"], "dev": true, "license": "MIT", "optional": true, - "os": [ - "linux" - ] + "os": ["linux"] }, "node_modules/@msgpackr-extract/msgpackr-extract-win32-x64": { "version": "3.0.3", "resolved": "https://registry.npmjs.org/@msgpackr-extract/msgpackr-extract-win32-x64/-/msgpackr-extract-win32-x64-3.0.3.tgz", "integrity": "sha512-x0fWaQtYp4E6sktbsdAqnehxDgEc/VwM7uLsRCYWaiGu0ykYdZPiS8zCWdnjHwyiumousxfBm4SO31eXqwEZhQ==", - "cpu": [ - "x64" - ], + "cpu": ["x64"], "dev": true, "license": "MIT", "optional": true, - "os": [ - "win32" - ] + "os": ["win32"] }, "node_modules/@napi-rs/nice": { "version": "1.0.4", @@ -5365,15 +5217,11 @@ "version": "1.0.4", "resolved": "https://registry.npmjs.org/@napi-rs/nice-android-arm-eabi/-/nice-android-arm-eabi-1.0.4.tgz", "integrity": "sha512-OZFMYUkih4g6HCKTjqJHhMUlgvPiDuSLZPbPBWHLjKmFTv74COzRlq/gwHtmEVaR39mJQ6ZyttDl2HNMUbLVoA==", - "cpu": [ - "arm" - ], + "cpu": ["arm"], "dev": true, "license": "MIT", "optional": true, - "os": [ - "android" - ], + "os": ["android"], "engines": { "node": ">= 10" } @@ -5382,15 +5230,11 @@ "version": "1.0.4", "resolved": "https://registry.npmjs.org/@napi-rs/nice-android-arm64/-/nice-android-arm64-1.0.4.tgz", "integrity": "sha512-k8u7cjeA64vQWXZcRrPbmwjH8K09CBnNaPnI9L1D5N6iMPL3XYQzLcN6WwQonfcqCDv5OCY3IqX89goPTV4KMw==", - "cpu": [ - "arm64" - ], + "cpu": ["arm64"], "dev": true, "license": "MIT", "optional": true, - "os": [ - "android" - ], + "os": ["android"], "engines": { "node": ">= 10" } @@ -5399,15 +5243,11 @@ "version": "1.0.4", "resolved": "https://registry.npmjs.org/@napi-rs/nice-darwin-arm64/-/nice-darwin-arm64-1.0.4.tgz", "integrity": "sha512-GsLdQvUcuVzoyzmtjsThnpaVEizAqH5yPHgnsBmq3JdVoVZHELFo7PuJEdfOH1DOHi2mPwB9sCJEstAYf3XCJA==", - "cpu": [ - "arm64" - ], + "cpu": ["arm64"], "dev": true, "license": "MIT", "optional": true, - "os": [ - "darwin" - ], + "os": ["darwin"], "engines": { "node": ">= 10" } @@ -5416,15 +5256,11 @@ "version": "1.0.4", "resolved": "https://registry.npmjs.org/@napi-rs/nice-darwin-x64/-/nice-darwin-x64-1.0.4.tgz", "integrity": "sha512-1y3gyT3e5zUY5SxRl3QDtJiWVsbkmhtUHIYwdWWIQ3Ia+byd/IHIEpqAxOGW1nhhnIKfTCuxBadHQb+yZASVoA==", - "cpu": [ - "x64" - ], + "cpu": ["x64"], "dev": true, "license": "MIT", "optional": true, - "os": [ - "darwin" - ], + "os": ["darwin"], "engines": { "node": ">= 10" } @@ -5433,15 +5269,11 @@ "version": "1.0.4", "resolved": "https://registry.npmjs.org/@napi-rs/nice-freebsd-x64/-/nice-freebsd-x64-1.0.4.tgz", "integrity": "sha512-06oXzESPRdXUuzS8n2hGwhM2HACnDfl3bfUaSqLGImM8TA33pzDXgGL0e3If8CcFWT98aHows5Lk7xnqYNGFeA==", - "cpu": [ - "x64" - ], + "cpu": ["x64"], "dev": true, "license": "MIT", "optional": true, - "os": [ - "freebsd" - ], + "os": ["freebsd"], "engines": { "node": ">= 10" } @@ -5450,15 +5282,11 @@ "version": "1.0.4", "resolved": "https://registry.npmjs.org/@napi-rs/nice-linux-arm-gnueabihf/-/nice-linux-arm-gnueabihf-1.0.4.tgz", "integrity": "sha512-CgklZ6g8WL4+EgVVkxkEvvsi2DSLf9QIloxWO0fvQyQBp6VguUSX3eHLeRpqwW8cRm2Hv/Q1+PduNk7VK37VZw==", - "cpu": [ - "arm" - ], + "cpu": ["arm"], "dev": true, "license": "MIT", "optional": true, - "os": [ - "linux" - ], + "os": ["linux"], "engines": { "node": ">= 10" } @@ -5467,15 +5295,11 @@ "version": "1.0.4", "resolved": "https://registry.npmjs.org/@napi-rs/nice-linux-arm64-gnu/-/nice-linux-arm64-gnu-1.0.4.tgz", "integrity": "sha512-wdAJ7lgjhAlsANUCv0zi6msRwq+D4KDgU+GCCHssSxWmAERZa2KZXO0H2xdmoJ/0i03i6YfK/sWaZgUAyuW2oQ==", - "cpu": [ - "arm64" - ], + "cpu": ["arm64"], "dev": true, "license": "MIT", "optional": true, - "os": [ - "linux" - ], + "os": ["linux"], "engines": { "node": ">= 10" } @@ -5484,15 +5308,11 @@ "version": "1.0.4", "resolved": "https://registry.npmjs.org/@napi-rs/nice-linux-arm64-musl/-/nice-linux-arm64-musl-1.0.4.tgz", "integrity": "sha512-4b1KYG+sriufhFrpUS9uNOEYYJqSfcbnwGx6uGX7JjrH8tELG90cOpCawz5THNIwlS3DhLgnCOcn0+4p6z26QA==", - "cpu": [ - "arm64" - ], + "cpu": ["arm64"], "dev": true, "license": "MIT", "optional": true, - "os": [ - "linux" - ], + "os": ["linux"], "engines": { "node": ">= 10" } @@ -5501,15 +5321,11 @@ "version": "1.0.4", "resolved": "https://registry.npmjs.org/@napi-rs/nice-linux-ppc64-gnu/-/nice-linux-ppc64-gnu-1.0.4.tgz", "integrity": "sha512-iaf3vMRgr23oe1PUaKpxaH3DS0IMN0+N9iEiWVwYPm/U15vZFYdqVegGfN2PzrZLUl5lc8ZxbmEKDfuqslhAMA==", - "cpu": [ - "ppc64" - ], + "cpu": ["ppc64"], "dev": true, "license": "MIT", "optional": true, - "os": [ - "linux" - ], + "os": ["linux"], "engines": { "node": ">= 10" } @@ -5518,15 +5334,11 @@ "version": "1.0.4", "resolved": "https://registry.npmjs.org/@napi-rs/nice-linux-riscv64-gnu/-/nice-linux-riscv64-gnu-1.0.4.tgz", "integrity": "sha512-UXoREY6Yw6rHrGuTwQgBxpfjK34t6mTjibE9/cXbefL9AuUCJ9gEgwNKZiONuR5QGswChqo9cnthjdKkYyAdDg==", - "cpu": [ - "riscv64" - ], + "cpu": ["riscv64"], "dev": true, "license": "MIT", "optional": true, - "os": [ - "linux" - ], + "os": ["linux"], "engines": { "node": ">= 10" } @@ -5535,15 +5347,11 @@ "version": "1.0.4", "resolved": "https://registry.npmjs.org/@napi-rs/nice-linux-s390x-gnu/-/nice-linux-s390x-gnu-1.0.4.tgz", "integrity": "sha512-eFbgYCRPmsqbYPAlLYU5hYTNbogmIDUvknilehHsFhCH1+0/kN87lP+XaLT0Yeq4V/rpwChSd9vlz4muzFArtw==", - "cpu": [ - "s390x" - ], + "cpu": ["s390x"], "dev": true, "license": "MIT", "optional": true, - "os": [ - "linux" - ], + "os": ["linux"], "engines": { "node": ">= 10" } @@ -5552,15 +5360,11 @@ "version": "1.0.4", "resolved": "https://registry.npmjs.org/@napi-rs/nice-linux-x64-gnu/-/nice-linux-x64-gnu-1.0.4.tgz", "integrity": "sha512-4T3E6uTCwWT6IPnwuPcWVz3oHxvEp/qbrCxZhsgzwTUBEwu78EGNXGdHfKJQt3soth89MLqZJw+Zzvnhrsg1mQ==", - "cpu": [ - "x64" - ], + "cpu": ["x64"], "dev": true, "license": "MIT", "optional": true, - "os": [ - "linux" - ], + "os": ["linux"], "engines": { "node": ">= 10" } @@ -5569,15 +5373,11 @@ "version": "1.0.4", "resolved": "https://registry.npmjs.org/@napi-rs/nice-linux-x64-musl/-/nice-linux-x64-musl-1.0.4.tgz", "integrity": "sha512-NtbBkAeyBPLvCBkWtwkKXkNSn677eaT0cX3tygq+2qVv71TmHgX4gkX6o9BXjlPzdgPGwrUudavCYPT9tzkEqQ==", - "cpu": [ - "x64" - ], + "cpu": ["x64"], "dev": true, "license": "MIT", "optional": true, - "os": [ - "linux" - ], + "os": ["linux"], "engines": { "node": ">= 10" } @@ -5586,15 +5386,11 @@ "version": "1.0.4", "resolved": "https://registry.npmjs.org/@napi-rs/nice-win32-arm64-msvc/-/nice-win32-arm64-msvc-1.0.4.tgz", "integrity": "sha512-vubOe3i+YtSJGEk/++73y+TIxbuVHi+W8ZzrRm2eETCjCRwNlgbfToQZ85dSA+4iBB/NJRGNp+O4hfdbbttZWA==", - "cpu": [ - "arm64" - ], + "cpu": ["arm64"], "dev": true, "license": "MIT", "optional": true, - "os": [ - "win32" - ], + "os": ["win32"], "engines": { "node": ">= 10" } @@ -5603,15 +5399,11 @@ "version": "1.0.4", "resolved": "https://registry.npmjs.org/@napi-rs/nice-win32-ia32-msvc/-/nice-win32-ia32-msvc-1.0.4.tgz", "integrity": "sha512-BMOVrUDZeg1RNRKVlh4eyLv5djAAVLiSddfpuuQ47EFjBcklg0NUeKMFKNrKQR4UnSn4HAiACLD7YK7koskwmg==", - "cpu": [ - "ia32" - ], + "cpu": ["ia32"], "dev": true, "license": "MIT", "optional": true, - "os": [ - "win32" - ], + "os": ["win32"], "engines": { "node": ">= 10" } @@ -5620,15 +5412,11 @@ "version": "1.0.4", "resolved": "https://registry.npmjs.org/@napi-rs/nice-win32-x64-msvc/-/nice-win32-x64-msvc-1.0.4.tgz", "integrity": "sha512-kCNk6HcRZquhw/whwh4rHsdPyOSCQCgnVDVik+Y9cuSVTDy3frpiCJTScJqPPS872h4JgZKkr/+CwcwttNEo9Q==", - "cpu": [ - "x64" - ], + "cpu": ["x64"], "dev": true, "license": "MIT", "optional": true, - "os": [ - "win32" - ], + "os": ["win32"], "engines": { "node": ">= 10" } @@ -6129,15 +5917,11 @@ "version": "2.5.1", "resolved": "https://registry.npmjs.org/@parcel/watcher-android-arm64/-/watcher-android-arm64-2.5.1.tgz", "integrity": "sha512-KF8+j9nNbUN8vzOFDpRMsaKBHZ/mcjEjMToVMJOhTozkDonQFFrRcfdLWn6yWKCmJKmdVxSgHiYvTCef4/qcBA==", - "cpu": [ - "arm64" - ], + "cpu": ["arm64"], "dev": true, "license": "MIT", "optional": true, - "os": [ - "android" - ], + "os": ["android"], "engines": { "node": ">= 10.0.0" }, @@ -6150,15 +5934,11 @@ "version": "2.5.1", "resolved": "https://registry.npmjs.org/@parcel/watcher-darwin-arm64/-/watcher-darwin-arm64-2.5.1.tgz", "integrity": "sha512-eAzPv5osDmZyBhou8PoF4i6RQXAfeKL9tjb3QzYuccXFMQU0ruIc/POh30ePnaOyD1UXdlKguHBmsTs53tVoPw==", - "cpu": [ - "arm64" - ], + "cpu": ["arm64"], "dev": true, "license": "MIT", "optional": true, - "os": [ - "darwin" - ], + "os": ["darwin"], "engines": { "node": ">= 10.0.0" }, @@ -6171,15 +5951,11 @@ "version": "2.5.1", "resolved": "https://registry.npmjs.org/@parcel/watcher-darwin-x64/-/watcher-darwin-x64-2.5.1.tgz", "integrity": "sha512-1ZXDthrnNmwv10A0/3AJNZ9JGlzrF82i3gNQcWOzd7nJ8aj+ILyW1MTxVk35Db0u91oD5Nlk9MBiujMlwmeXZg==", - "cpu": [ - "x64" - ], + "cpu": ["x64"], "dev": true, "license": "MIT", "optional": true, - "os": [ - "darwin" - ], + "os": ["darwin"], "engines": { "node": ">= 10.0.0" }, @@ -6192,15 +5968,11 @@ "version": "2.5.1", "resolved": "https://registry.npmjs.org/@parcel/watcher-freebsd-x64/-/watcher-freebsd-x64-2.5.1.tgz", "integrity": "sha512-SI4eljM7Flp9yPuKi8W0ird8TI/JK6CSxju3NojVI6BjHsTyK7zxA9urjVjEKJ5MBYC+bLmMcbAWlZ+rFkLpJQ==", - "cpu": [ - "x64" - ], + "cpu": ["x64"], "dev": true, "license": "MIT", "optional": true, - "os": [ - "freebsd" - ], + "os": ["freebsd"], "engines": { "node": ">= 10.0.0" }, @@ -6213,15 +5985,11 @@ "version": "2.5.1", "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm-glibc/-/watcher-linux-arm-glibc-2.5.1.tgz", "integrity": "sha512-RCdZlEyTs8geyBkkcnPWvtXLY44BCeZKmGYRtSgtwwnHR4dxfHRG3gR99XdMEdQ7KeiDdasJwwvNSF5jKtDwdA==", - "cpu": [ - "arm" - ], + "cpu": ["arm"], "dev": true, "license": "MIT", "optional": true, - "os": [ - "linux" - ], + "os": ["linux"], "engines": { "node": ">= 10.0.0" }, @@ -6234,15 +6002,11 @@ "version": "2.5.1", "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm-musl/-/watcher-linux-arm-musl-2.5.1.tgz", "integrity": "sha512-6E+m/Mm1t1yhB8X412stiKFG3XykmgdIOqhjWj+VL8oHkKABfu/gjFj8DvLrYVHSBNC+/u5PeNrujiSQ1zwd1Q==", - "cpu": [ - "arm" - ], + "cpu": ["arm"], "dev": true, "license": "MIT", "optional": true, - "os": [ - "linux" - ], + "os": ["linux"], "engines": { "node": ">= 10.0.0" }, @@ -6255,15 +6019,11 @@ "version": "2.5.1", "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm64-glibc/-/watcher-linux-arm64-glibc-2.5.1.tgz", "integrity": "sha512-LrGp+f02yU3BN9A+DGuY3v3bmnFUggAITBGriZHUREfNEzZh/GO06FF5u2kx8x+GBEUYfyTGamol4j3m9ANe8w==", - "cpu": [ - "arm64" - ], + "cpu": ["arm64"], "dev": true, "license": "MIT", "optional": true, - "os": [ - "linux" - ], + "os": ["linux"], "engines": { "node": ">= 10.0.0" }, @@ -6276,15 +6036,11 @@ "version": "2.5.1", "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm64-musl/-/watcher-linux-arm64-musl-2.5.1.tgz", "integrity": "sha512-cFOjABi92pMYRXS7AcQv9/M1YuKRw8SZniCDw0ssQb/noPkRzA+HBDkwmyOJYp5wXcsTrhxO0zq1U11cK9jsFg==", - "cpu": [ - "arm64" - ], + "cpu": ["arm64"], "dev": true, "license": "MIT", "optional": true, - "os": [ - "linux" - ], + "os": ["linux"], "engines": { "node": ">= 10.0.0" }, @@ -6297,15 +6053,11 @@ "version": "2.5.1", "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-x64-glibc/-/watcher-linux-x64-glibc-2.5.1.tgz", "integrity": "sha512-GcESn8NZySmfwlTsIur+49yDqSny2IhPeZfXunQi48DMugKeZ7uy1FX83pO0X22sHntJ4Ub+9k34XQCX+oHt2A==", - "cpu": [ - "x64" - ], + "cpu": ["x64"], "dev": true, "license": "MIT", "optional": true, - "os": [ - "linux" - ], + "os": ["linux"], "engines": { "node": ">= 10.0.0" }, @@ -6318,15 +6070,11 @@ "version": "2.5.1", "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-x64-musl/-/watcher-linux-x64-musl-2.5.1.tgz", "integrity": "sha512-n0E2EQbatQ3bXhcH2D1XIAANAcTZkQICBPVaxMeaCVBtOpBZpWJuf7LwyWPSBDITb7In8mqQgJ7gH8CILCURXg==", - "cpu": [ - "x64" - ], + "cpu": ["x64"], "dev": true, "license": "MIT", "optional": true, - "os": [ - "linux" - ], + "os": ["linux"], "engines": { "node": ">= 10.0.0" }, @@ -6339,15 +6087,11 @@ "version": "2.5.1", "resolved": "https://registry.npmjs.org/@parcel/watcher-win32-arm64/-/watcher-win32-arm64-2.5.1.tgz", "integrity": "sha512-RFzklRvmc3PkjKjry3hLF9wD7ppR4AKcWNzH7kXR7GUe0Igb3Nz8fyPwtZCSquGrhU5HhUNDr/mKBqj7tqA2Vw==", - "cpu": [ - "arm64" - ], + "cpu": ["arm64"], "dev": true, "license": "MIT", "optional": true, - "os": [ - "win32" - ], + "os": ["win32"], "engines": { "node": ">= 10.0.0" }, @@ -6360,15 +6104,11 @@ "version": "2.5.1", "resolved": "https://registry.npmjs.org/@parcel/watcher-win32-ia32/-/watcher-win32-ia32-2.5.1.tgz", "integrity": "sha512-c2KkcVN+NJmuA7CGlaGD1qJh1cLfDnQsHjE89E60vUEMlqduHGCdCLJCID5geFVM0dOtA3ZiIO8BoEQmzQVfpQ==", - "cpu": [ - "ia32" - ], + "cpu": ["ia32"], "dev": true, "license": "MIT", "optional": true, - "os": [ - "win32" - ], + "os": ["win32"], "engines": { "node": ">= 10.0.0" }, @@ -6381,15 +6121,11 @@ "version": "2.5.1", "resolved": "https://registry.npmjs.org/@parcel/watcher-win32-x64/-/watcher-win32-x64-2.5.1.tgz", "integrity": "sha512-9lHBdJITeNR++EvSQVUcaZoWupyHfXe1jZvGZ06O/5MflPcuPLtEphScIBL+AiCWBO46tDSHzWyD0uDmmZqsgA==", - "cpu": [ - "x64" - ], + "cpu": ["x64"], "dev": true, "license": "MIT", "optional": true, - "os": [ - "win32" - ], + "os": ["win32"], "engines": { "node": ">= 10.0.0" }, @@ -6489,297 +6225,213 @@ "version": "4.34.8", "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.34.8.tgz", "integrity": "sha512-q217OSE8DTp8AFHuNHXo0Y86e1wtlfVrXiAlwkIvGRQv9zbc6mE3sjIVfwI8sYUyNxwOg0j/Vm1RKM04JcWLJw==", - "cpu": [ - "arm" - ], + "cpu": ["arm"], "dev": true, "license": "MIT", "optional": true, - "os": [ - "android" - ] + "os": ["android"] }, "node_modules/@rollup/rollup-android-arm64": { "version": "4.34.8", "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.34.8.tgz", "integrity": "sha512-Gigjz7mNWaOL9wCggvoK3jEIUUbGul656opstjaUSGC3eT0BM7PofdAJaBfPFWWkXNVAXbaQtC99OCg4sJv70Q==", - "cpu": [ - "arm64" - ], + "cpu": ["arm64"], "dev": true, "license": "MIT", "optional": true, - "os": [ - "android" - ] + "os": ["android"] }, "node_modules/@rollup/rollup-darwin-arm64": { "version": "4.34.8", "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.34.8.tgz", "integrity": "sha512-02rVdZ5tgdUNRxIUrFdcMBZQoaPMrxtwSb+/hOfBdqkatYHR3lZ2A2EGyHq2sGOd0Owk80oV3snlDASC24He3Q==", - "cpu": [ - "arm64" - ], + "cpu": ["arm64"], "dev": true, "license": "MIT", "optional": true, - "os": [ - "darwin" - ] + "os": ["darwin"] }, "node_modules/@rollup/rollup-darwin-x64": { "version": "4.34.8", "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.34.8.tgz", "integrity": "sha512-qIP/elwR/tq/dYRx3lgwK31jkZvMiD6qUtOycLhTzCvrjbZ3LjQnEM9rNhSGpbLXVJYQ3rq39A6Re0h9tU2ynw==", - "cpu": [ - "x64" - ], + "cpu": ["x64"], "dev": true, "license": "MIT", "optional": true, - "os": [ - "darwin" - ] + "os": ["darwin"] }, "node_modules/@rollup/rollup-freebsd-arm64": { "version": "4.34.8", "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.34.8.tgz", "integrity": "sha512-IQNVXL9iY6NniYbTaOKdrlVP3XIqazBgJOVkddzJlqnCpRi/yAeSOa8PLcECFSQochzqApIOE1GHNu3pCz+BDA==", - "cpu": [ - "arm64" - ], + "cpu": ["arm64"], "dev": true, "license": "MIT", "optional": true, - "os": [ - "freebsd" - ] + "os": ["freebsd"] }, "node_modules/@rollup/rollup-freebsd-x64": { "version": "4.34.8", "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.34.8.tgz", "integrity": "sha512-TYXcHghgnCqYFiE3FT5QwXtOZqDj5GmaFNTNt3jNC+vh22dc/ukG2cG+pi75QO4kACohZzidsq7yKTKwq/Jq7Q==", - "cpu": [ - "x64" - ], + "cpu": ["x64"], "dev": true, "license": "MIT", "optional": true, - "os": [ - "freebsd" - ] + "os": ["freebsd"] }, "node_modules/@rollup/rollup-linux-arm-gnueabihf": { "version": "4.34.8", "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.34.8.tgz", "integrity": "sha512-A4iphFGNkWRd+5m3VIGuqHnG3MVnqKe7Al57u9mwgbyZ2/xF9Jio72MaY7xxh+Y87VAHmGQr73qoKL9HPbXj1g==", - "cpu": [ - "arm" - ], + "cpu": ["arm"], "dev": true, "license": "MIT", "optional": true, - "os": [ - "linux" - ] + "os": ["linux"] }, "node_modules/@rollup/rollup-linux-arm-musleabihf": { "version": "4.34.8", "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.34.8.tgz", "integrity": "sha512-S0lqKLfTm5u+QTxlFiAnb2J/2dgQqRy/XvziPtDd1rKZFXHTyYLoVL58M/XFwDI01AQCDIevGLbQrMAtdyanpA==", - "cpu": [ - "arm" - ], + "cpu": ["arm"], "dev": true, "license": "MIT", "optional": true, - "os": [ - "linux" - ] + "os": ["linux"] }, "node_modules/@rollup/rollup-linux-arm64-gnu": { "version": "4.34.8", "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.34.8.tgz", "integrity": "sha512-jpz9YOuPiSkL4G4pqKrus0pn9aYwpImGkosRKwNi+sJSkz+WU3anZe6hi73StLOQdfXYXC7hUfsQlTnjMd3s1A==", - "cpu": [ - "arm64" - ], + "cpu": ["arm64"], "dev": true, "license": "MIT", "optional": true, - "os": [ - "linux" - ] + "os": ["linux"] }, "node_modules/@rollup/rollup-linux-arm64-musl": { "version": "4.34.8", "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.34.8.tgz", "integrity": "sha512-KdSfaROOUJXgTVxJNAZ3KwkRc5nggDk+06P6lgi1HLv1hskgvxHUKZ4xtwHkVYJ1Rep4GNo+uEfycCRRxht7+Q==", - "cpu": [ - "arm64" - ], + "cpu": ["arm64"], "dev": true, "license": "MIT", "optional": true, - "os": [ - "linux" - ] + "os": ["linux"] }, "node_modules/@rollup/rollup-linux-loongarch64-gnu": { "version": "4.34.8", "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loongarch64-gnu/-/rollup-linux-loongarch64-gnu-4.34.8.tgz", "integrity": "sha512-NyF4gcxwkMFRjgXBM6g2lkT58OWztZvw5KkV2K0qqSnUEqCVcqdh2jN4gQrTn/YUpAcNKyFHfoOZEer9nwo6uQ==", - "cpu": [ - "loong64" - ], + "cpu": ["loong64"], "dev": true, "license": "MIT", "optional": true, - "os": [ - "linux" - ] + "os": ["linux"] }, "node_modules/@rollup/rollup-linux-powerpc64le-gnu": { "version": "4.34.8", "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.34.8.tgz", "integrity": "sha512-LMJc999GkhGvktHU85zNTDImZVUCJ1z/MbAJTnviiWmmjyckP5aQsHtcujMjpNdMZPT2rQEDBlJfubhs3jsMfw==", - "cpu": [ - "ppc64" - ], + "cpu": ["ppc64"], "dev": true, "license": "MIT", "optional": true, - "os": [ - "linux" - ] + "os": ["linux"] }, "node_modules/@rollup/rollup-linux-ppc64-gnu": { "version": "4.46.2", "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-ppc64-gnu/-/rollup-linux-ppc64-gnu-4.46.2.tgz", "integrity": "sha512-B/l0dFcHVUnqcGZWKcWBSV2PF01YUt0Rvlurci5P+neqY/yMKchGU8ullZvIv5e8Y1C6wOn+U03mrDylP5q9Yw==", - "cpu": [ - "ppc64" - ], + "cpu": ["ppc64"], "dev": true, "license": "MIT", "optional": true, - "os": [ - "linux" - ], + "os": ["linux"], "peer": true }, "node_modules/@rollup/rollup-linux-riscv64-gnu": { "version": "4.34.8", "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.34.8.tgz", "integrity": "sha512-xAQCAHPj8nJq1PI3z8CIZzXuXCstquz7cIOL73HHdXiRcKk8Ywwqtx2wrIy23EcTn4aZ2fLJNBB8d0tQENPCmw==", - "cpu": [ - "riscv64" - ], + "cpu": ["riscv64"], "dev": true, "license": "MIT", "optional": true, - "os": [ - "linux" - ] + "os": ["linux"] }, "node_modules/@rollup/rollup-linux-riscv64-musl": { "version": "4.46.2", "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-musl/-/rollup-linux-riscv64-musl-4.46.2.tgz", "integrity": "sha512-t5B2loThlFEauloaQkZg9gxV05BYeITLvLkWOkRXogP4qHXLkWSbSHKM9S6H1schf/0YGP/qNKtiISlxvfmmZw==", - "cpu": [ - "riscv64" - ], + "cpu": ["riscv64"], "dev": true, "license": "MIT", "optional": true, - "os": [ - "linux" - ], + "os": ["linux"], "peer": true }, "node_modules/@rollup/rollup-linux-s390x-gnu": { "version": "4.34.8", "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.34.8.tgz", "integrity": "sha512-DdePVk1NDEuc3fOe3dPPTb+rjMtuFw89gw6gVWxQFAuEqqSdDKnrwzZHrUYdac7A7dXl9Q2Vflxpme15gUWQFA==", - "cpu": [ - "s390x" - ], + "cpu": ["s390x"], "dev": true, "license": "MIT", "optional": true, - "os": [ - "linux" - ] + "os": ["linux"] }, "node_modules/@rollup/rollup-linux-x64-gnu": { "version": "4.34.8", "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.34.8.tgz", "integrity": "sha512-8y7ED8gjxITUltTUEJLQdgpbPh1sUQ0kMTmufRF/Ns5tI9TNMNlhWtmPKKHCU0SilX+3MJkZ0zERYYGIVBYHIA==", - "cpu": [ - "x64" - ], + "cpu": ["x64"], "dev": true, "license": "MIT", "optional": true, - "os": [ - "linux" - ] + "os": ["linux"] }, "node_modules/@rollup/rollup-linux-x64-musl": { "version": "4.34.8", "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.34.8.tgz", "integrity": "sha512-SCXcP0ZpGFIe7Ge+McxY5zKxiEI5ra+GT3QRxL0pMMtxPfpyLAKleZODi1zdRHkz5/BhueUrYtYVgubqe9JBNQ==", - "cpu": [ - "x64" - ], + "cpu": ["x64"], "dev": true, "license": "MIT", "optional": true, - "os": [ - "linux" - ] + "os": ["linux"] }, "node_modules/@rollup/rollup-win32-arm64-msvc": { "version": "4.34.8", "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.34.8.tgz", "integrity": "sha512-YHYsgzZgFJzTRbth4h7Or0m5O74Yda+hLin0irAIobkLQFRQd1qWmnoVfwmKm9TXIZVAD0nZ+GEb2ICicLyCnQ==", - "cpu": [ - "arm64" - ], + "cpu": ["arm64"], "dev": true, "license": "MIT", "optional": true, - "os": [ - "win32" - ] + "os": ["win32"] }, "node_modules/@rollup/rollup-win32-ia32-msvc": { "version": "4.34.8", "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.34.8.tgz", "integrity": "sha512-r3NRQrXkHr4uWy5TOjTpTYojR9XmF0j/RYgKCef+Ag46FWUTltm5ziticv8LdNsDMehjJ543x/+TJAek/xBA2w==", - "cpu": [ - "ia32" - ], + "cpu": ["ia32"], "dev": true, "license": "MIT", "optional": true, - "os": [ - "win32" - ] + "os": ["win32"] }, "node_modules/@rollup/rollup-win32-x64-msvc": { "version": "4.34.8", "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.34.8.tgz", "integrity": "sha512-U0FaE5O1BCpZSeE6gBl3c5ObhePQSfk9vDRToMmTkbhCOgW4jqvtS5LGyQ76L1fH8sM0keRp4uDTsbjiUyjk0g==", - "cpu": [ - "x64" - ], + "cpu": ["x64"], "dev": true, "license": "MIT", "optional": true, - "os": [ - "win32" - ] + "os": ["win32"] }, "node_modules/@rtsao/scc": { "version": "1.1.0", @@ -8404,9 +8056,7 @@ "resolved": "https://registry.npmjs.org/ansi-html-community/-/ansi-html-community-0.0.8.tgz", "integrity": "sha512-1APHAyr3+PCamwNw3bXCPp4HFLONZt/yIH0sZp0/469KWNTEy+qN5jQ3GVX6DMZ1UXAi34yVwtTeaG/HpBuuzw==", "dev": true, - "engines": [ - "node >= 0.8.0" - ], + "engines": ["node >= 0.8.0"], "license": "Apache-2.0", "bin": { "ansi-html": "bin/ansi-html" @@ -12589,9 +12239,7 @@ "hasInstallScript": true, "license": "MIT", "optional": true, - "os": [ - "darwin" - ], + "os": ["darwin"], "engines": { "node": "^8.16.0 || ^10.6.0 || >=11.0.0" } @@ -15971,9 +15619,7 @@ "resolved": "https://registry.npmjs.org/jsonparse/-/jsonparse-1.3.1.tgz", "integrity": "sha512-POQXvpdL69+CluYsillJ7SUhKvytYjW9vG/GKpnf+xP8UWgYEM/RaMzHHofbALDiKbbP1W8UEYmgGl39WkPZsg==", "dev": true, - "engines": [ - "node >= 0.2.0" - ], + "engines": ["node >= 0.2.0"], "license": "MIT" }, "node_modules/JSONStream": { @@ -23193,270 +22839,198 @@ "version": "4.46.2", "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.46.2.tgz", "integrity": "sha512-Zj3Hl6sN34xJtMv7Anwb5Gu01yujyE/cLBDB2gnHTAHaWS1Z38L7kuSG+oAh0giZMqG060f/YBStXtMH6FvPMA==", - "cpu": [ - "arm" - ], + "cpu": ["arm"], "dev": true, "license": "MIT", "optional": true, - "os": [ - "android" - ], + "os": ["android"], "peer": true }, "node_modules/vite/node_modules/@rollup/rollup-android-arm64": { "version": "4.46.2", "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.46.2.tgz", "integrity": "sha512-nTeCWY83kN64oQ5MGz3CgtPx8NSOhC5lWtsjTs+8JAJNLcP3QbLCtDDgUKQc/Ro/frpMq4SHUaHN6AMltcEoLQ==", - "cpu": [ - "arm64" - ], + "cpu": ["arm64"], "dev": true, "license": "MIT", "optional": true, - "os": [ - "android" - ], + "os": ["android"], "peer": true }, "node_modules/vite/node_modules/@rollup/rollup-darwin-arm64": { "version": "4.46.2", "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.46.2.tgz", "integrity": "sha512-HV7bW2Fb/F5KPdM/9bApunQh68YVDU8sO8BvcW9OngQVN3HHHkw99wFupuUJfGR9pYLLAjcAOA6iO+evsbBaPQ==", - "cpu": [ - "arm64" - ], + "cpu": ["arm64"], "dev": true, "license": "MIT", "optional": true, - "os": [ - "darwin" - ], + "os": ["darwin"], "peer": true }, "node_modules/vite/node_modules/@rollup/rollup-darwin-x64": { "version": "4.46.2", "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.46.2.tgz", "integrity": "sha512-SSj8TlYV5nJixSsm/y3QXfhspSiLYP11zpfwp6G/YDXctf3Xkdnk4woJIF5VQe0of2OjzTt8EsxnJDCdHd2xMA==", - "cpu": [ - "x64" - ], + "cpu": ["x64"], "dev": true, "license": "MIT", "optional": true, - "os": [ - "darwin" - ], + "os": ["darwin"], "peer": true }, "node_modules/vite/node_modules/@rollup/rollup-freebsd-arm64": { "version": "4.46.2", "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.46.2.tgz", "integrity": "sha512-ZyrsG4TIT9xnOlLsSSi9w/X29tCbK1yegE49RYm3tu3wF1L/B6LVMqnEWyDB26d9Ecx9zrmXCiPmIabVuLmNSg==", - "cpu": [ - "arm64" - ], + "cpu": ["arm64"], "dev": true, "license": "MIT", "optional": true, - "os": [ - "freebsd" - ], + "os": ["freebsd"], "peer": true }, "node_modules/vite/node_modules/@rollup/rollup-freebsd-x64": { "version": "4.46.2", "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.46.2.tgz", "integrity": "sha512-pCgHFoOECwVCJ5GFq8+gR8SBKnMO+xe5UEqbemxBpCKYQddRQMgomv1104RnLSg7nNvgKy05sLsY51+OVRyiVw==", - "cpu": [ - "x64" - ], + "cpu": ["x64"], "dev": true, "license": "MIT", "optional": true, - "os": [ - "freebsd" - ], + "os": ["freebsd"], "peer": true }, "node_modules/vite/node_modules/@rollup/rollup-linux-arm-gnueabihf": { "version": "4.46.2", "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.46.2.tgz", "integrity": "sha512-EtP8aquZ0xQg0ETFcxUbU71MZlHaw9MChwrQzatiE8U/bvi5uv/oChExXC4mWhjiqK7azGJBqU0tt5H123SzVA==", - "cpu": [ - "arm" - ], + "cpu": ["arm"], "dev": true, "license": "MIT", "optional": true, - "os": [ - "linux" - ], + "os": ["linux"], "peer": true }, "node_modules/vite/node_modules/@rollup/rollup-linux-arm-musleabihf": { "version": "4.46.2", "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.46.2.tgz", "integrity": "sha512-qO7F7U3u1nfxYRPM8HqFtLd+raev2K137dsV08q/LRKRLEc7RsiDWihUnrINdsWQxPR9jqZ8DIIZ1zJJAm5PjQ==", - "cpu": [ - "arm" - ], + "cpu": ["arm"], "dev": true, "license": "MIT", "optional": true, - "os": [ - "linux" - ], + "os": ["linux"], "peer": true }, "node_modules/vite/node_modules/@rollup/rollup-linux-arm64-gnu": { "version": "4.46.2", "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.46.2.tgz", "integrity": "sha512-3dRaqLfcOXYsfvw5xMrxAk9Lb1f395gkoBYzSFcc/scgRFptRXL9DOaDpMiehf9CO8ZDRJW2z45b6fpU5nwjng==", - "cpu": [ - "arm64" - ], + "cpu": ["arm64"], "dev": true, "license": "MIT", "optional": true, - "os": [ - "linux" - ], + "os": ["linux"], "peer": true }, "node_modules/vite/node_modules/@rollup/rollup-linux-arm64-musl": { "version": "4.46.2", "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.46.2.tgz", "integrity": "sha512-fhHFTutA7SM+IrR6lIfiHskxmpmPTJUXpWIsBXpeEwNgZzZZSg/q4i6FU4J8qOGyJ0TR+wXBwx/L7Ho9z0+uDg==", - "cpu": [ - "arm64" - ], + "cpu": ["arm64"], "dev": true, "license": "MIT", "optional": true, - "os": [ - "linux" - ], + "os": ["linux"], "peer": true }, "node_modules/vite/node_modules/@rollup/rollup-linux-loongarch64-gnu": { "version": "4.46.2", "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loongarch64-gnu/-/rollup-linux-loongarch64-gnu-4.46.2.tgz", "integrity": "sha512-i7wfGFXu8x4+FRqPymzjD+Hyav8l95UIZ773j7J7zRYc3Xsxy2wIn4x+llpunexXe6laaO72iEjeeGyUFmjKeA==", - "cpu": [ - "loong64" - ], + "cpu": ["loong64"], "dev": true, "license": "MIT", "optional": true, - "os": [ - "linux" - ], + "os": ["linux"], "peer": true }, "node_modules/vite/node_modules/@rollup/rollup-linux-riscv64-gnu": { "version": "4.46.2", "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.46.2.tgz", "integrity": "sha512-32k4ENb5ygtkMwPMucAb8MtV8olkPT03oiTxJbgkJa7lJ7dZMr0GCFJlyvy+K8iq7F/iuOr41ZdUHaOiqyR3iQ==", - "cpu": [ - "riscv64" - ], + "cpu": ["riscv64"], "dev": true, "license": "MIT", "optional": true, - "os": [ - "linux" - ], + "os": ["linux"], "peer": true }, "node_modules/vite/node_modules/@rollup/rollup-linux-s390x-gnu": { "version": "4.46.2", "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.46.2.tgz", "integrity": "sha512-YKjekwTEKgbB7n17gmODSmJVUIvj8CX7q5442/CK80L8nqOUbMtf8b01QkG3jOqyr1rotrAnW6B/qiHwfcuWQA==", - "cpu": [ - "s390x" - ], + "cpu": ["s390x"], "dev": true, "license": "MIT", "optional": true, - "os": [ - "linux" - ], + "os": ["linux"], "peer": true }, "node_modules/vite/node_modules/@rollup/rollup-linux-x64-gnu": { "version": "4.46.2", "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.46.2.tgz", "integrity": "sha512-Jj5a9RUoe5ra+MEyERkDKLwTXVu6s3aACP51nkfnK9wJTraCC8IMe3snOfALkrjTYd2G1ViE1hICj0fZ7ALBPA==", - "cpu": [ - "x64" - ], + "cpu": ["x64"], "dev": true, "license": "MIT", "optional": true, - "os": [ - "linux" - ], + "os": ["linux"], "peer": true }, "node_modules/vite/node_modules/@rollup/rollup-linux-x64-musl": { "version": "4.46.2", "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.46.2.tgz", "integrity": "sha512-7kX69DIrBeD7yNp4A5b81izs8BqoZkCIaxQaOpumcJ1S/kmqNFjPhDu1LHeVXv0SexfHQv5cqHsxLOjETuqDuA==", - "cpu": [ - "x64" - ], + "cpu": ["x64"], "dev": true, "license": "MIT", "optional": true, - "os": [ - "linux" - ], + "os": ["linux"], "peer": true }, "node_modules/vite/node_modules/@rollup/rollup-win32-arm64-msvc": { "version": "4.46.2", "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.46.2.tgz", "integrity": "sha512-wiJWMIpeaak/jsbaq2HMh/rzZxHVW1rU6coyeNNpMwk5isiPjSTx0a4YLSlYDwBH/WBvLz+EtsNqQScZTLJy3g==", - "cpu": [ - "arm64" - ], + "cpu": ["arm64"], "dev": true, "license": "MIT", "optional": true, - "os": [ - "win32" - ], + "os": ["win32"], "peer": true }, "node_modules/vite/node_modules/@rollup/rollup-win32-ia32-msvc": { "version": "4.46.2", "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.46.2.tgz", "integrity": "sha512-gBgaUDESVzMgWZhcyjfs9QFK16D8K6QZpwAaVNJxYDLHWayOta4ZMjGm/vsAEy3hvlS2GosVFlBlP9/Wb85DqQ==", - "cpu": [ - "ia32" - ], + "cpu": ["ia32"], "dev": true, "license": "MIT", "optional": true, - "os": [ - "win32" - ], + "os": ["win32"], "peer": true }, "node_modules/vite/node_modules/@rollup/rollup-win32-x64-msvc": { "version": "4.46.2", "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.46.2.tgz", "integrity": "sha512-CvUo2ixeIQGtF6WvuB87XWqPQkoFAFqW+HUo/WzHwuHDvIwZCtjdWXoYCcr06iKGydiqTclC4jU/TNObC/xKZg==", - "cpu": [ - "x64" - ], + "cpu": ["x64"], "dev": true, "license": "MIT", "optional": true, - "os": [ - "win32" - ], + "os": ["win32"], "peer": true }, "node_modules/vite/node_modules/postcss": { diff --git a/package-lock.json b/package-lock.json index 912834b45..08471af56 100644 --- a/package-lock.json +++ b/package-lock.json @@ -17,7 +17,8 @@ "@angular/platform-browser": "^19.2.0", "@angular/platform-browser-dynamic": "^19.2.0", "@angular/router": "^19.2.0", - "@angular/service-worker": "^19.2.0", + "@citation-js/core": "^0.7.18", + "@citation-js/plugin-csl": "^0.7.18", "@fortawesome/fontawesome-free": "^6.7.2", "@ngx-translate/core": "^16.0.4", "@ngx-translate/http-loader": "^16.0.1", @@ -25,9 +26,12 @@ "@ngxs/logger-plugin": "^19.0.0", "@ngxs/store": "^19.0.0", "@primeng/themes": "^19.0.9", + "@sentry/angular": "^10.10.0", + "@traptitech/markdown-it-katex": "^3.6.0", "ace-builds": "^1.42.0", + "angular-google-tag-manager": "^1.11.0", "cedar-artifact-viewer": "^0.9.5", - "cedar-embeddable-editor": "^1.5.0", + "cedar-embeddable-editor": "1.2.2", "chart.js": "^4.4.9", "diff": "^8.0.2", "markdown-it": "^14.1.0", @@ -99,13 +103,13 @@ } }, "node_modules/@angular-devkit/architect": { - "version": "0.1902.15", - "resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1902.15.tgz", - "integrity": "sha512-RbqhStc6ZoRv57ZqLB36VOkBkAdU3nNezCvIs0AJV5V4+vLPMrb0hpIB0sF+9yMlMjWsolnRsj0/Fil+zQG3bw==", + "version": "0.1902.17", + "resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1902.17.tgz", + "integrity": "sha512-/LV8lXi6/SqevyI9ZAk2uAqlnN/pUwNwD6SyjotCqU55FBhBW8vM3/GucFXawJqTOzNmBXuMx1YVvQN5H0v5LQ==", "dev": true, "license": "MIT", "dependencies": { - "@angular-devkit/core": "19.2.15", + "@angular-devkit/core": "19.2.17", "rxjs": "7.8.1" }, "engines": { @@ -125,17 +129,17 @@ } }, "node_modules/@angular-devkit/build-angular": { - "version": "19.2.15", - "resolved": "https://registry.npmjs.org/@angular-devkit/build-angular/-/build-angular-19.2.15.tgz", - "integrity": "sha512-mqudAcyrSp/E7ZQdQoHfys0/nvQuwyJDaAzj3qL3HUStuUzb5ULNOj2f6sFBo+xYo+/WT8IzmzDN9DCqDgvFaA==", + "version": "19.2.17", + "resolved": "https://registry.npmjs.org/@angular-devkit/build-angular/-/build-angular-19.2.17.tgz", + "integrity": "sha512-lbvzNoSjHlhP6bcHtFMlEQHG/Zxc1tTdwoelm4+AWPuQH4rGfoty4SXH4rr50SXVBUg9Zb4xZuChOYZmYKpGLQ==", "dev": true, "license": "MIT", "dependencies": { "@ampproject/remapping": "2.3.0", - "@angular-devkit/architect": "0.1902.15", - "@angular-devkit/build-webpack": "0.1902.15", - "@angular-devkit/core": "19.2.15", - "@angular/build": "19.2.15", + "@angular-devkit/architect": "0.1902.17", + "@angular-devkit/build-webpack": "0.1902.17", + "@angular-devkit/core": "19.2.17", + "@angular/build": "19.2.17", "@babel/core": "7.26.10", "@babel/generator": "7.26.10", "@babel/helper-annotate-as-pure": "7.25.9", @@ -146,7 +150,7 @@ "@babel/preset-env": "7.26.9", "@babel/runtime": "7.26.10", "@discoveryjs/json-ext": "0.6.3", - "@ngtools/webpack": "19.2.15", + "@ngtools/webpack": "19.2.17", "@vitejs/plugin-basic-ssl": "1.2.0", "ansi-colors": "4.1.3", "autoprefixer": "10.4.20", @@ -200,7 +204,7 @@ "@angular/localize": "^19.0.0 || ^19.2.0-next.0", "@angular/platform-server": "^19.0.0 || ^19.2.0-next.0", "@angular/service-worker": "^19.0.0 || ^19.2.0-next.0", - "@angular/ssr": "^19.2.15", + "@angular/ssr": "^19.2.17", "@web/test-runner": "^0.20.0", "browser-sync": "^3.0.2", "jest": "^29.5.0", @@ -261,13 +265,13 @@ } }, "node_modules/@angular-devkit/build-webpack": { - "version": "0.1902.15", - "resolved": "https://registry.npmjs.org/@angular-devkit/build-webpack/-/build-webpack-0.1902.15.tgz", - "integrity": "sha512-pIfZeizWsViXx8bsMoBLZw7Tl7uFf7bM7hAfmNwk0bb0QGzx5k1BiW6IKWyaG+Dg6U4UCrlNpIiut2b78HwQZw==", + "version": "0.1902.17", + "resolved": "https://registry.npmjs.org/@angular-devkit/build-webpack/-/build-webpack-0.1902.17.tgz", + "integrity": "sha512-8NVJL7ujeTYKR1LgErkc5UN3EEoGYasqtu5AACXraFf9NLOw2p9N0+QY4cfjIwip1nyBp0RRzlBS4omGEymJCw==", "dev": true, "license": "MIT", "dependencies": { - "@angular-devkit/architect": "0.1902.15", + "@angular-devkit/architect": "0.1902.17", "rxjs": "7.8.1" }, "engines": { @@ -291,9 +295,9 @@ } }, "node_modules/@angular-devkit/core": { - "version": "19.2.15", - "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-19.2.15.tgz", - "integrity": "sha512-pU2RZYX6vhd7uLSdLwPnuBcr0mXJSjp3EgOXKsrlQFQZevc+Qs+2JdXgIElnOT/aDqtRtriDmLlSbtdE8n3ZbA==", + "version": "19.2.17", + "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-19.2.17.tgz", + "integrity": "sha512-Ah008x2RJkd0F+NLKqIpA34/vUGwjlprRCkvddjDopAWRzYn6xCkz1Tqwuhn0nR1Dy47wTLKYD999TYl5ONOAQ==", "dev": true, "license": "MIT", "dependencies": { @@ -329,13 +333,13 @@ } }, "node_modules/@angular-devkit/schematics": { - "version": "19.2.15", - "resolved": "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-19.2.15.tgz", - "integrity": "sha512-kNOJ+3vekJJCQKWihNmxBkarJzNW09kP5a9E1SRNiQVNOUEeSwcRR0qYotM65nx821gNzjjhJXnAZ8OazWldrg==", + "version": "19.2.17", + "resolved": "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-19.2.17.tgz", + "integrity": "sha512-ADfbaBsrG8mBF6Mfs+crKA/2ykB8AJI50Cv9tKmZfwcUcyAdmTr+vVvhsBCfvUAEokigSsgqgpYxfkJVxhJYeg==", "dev": true, "license": "MIT", "dependencies": { - "@angular-devkit/core": "19.2.15", + "@angular-devkit/core": "19.2.17", "jsonc-parser": "3.3.1", "magic-string": "0.30.17", "ora": "5.4.1", @@ -373,21 +377,21 @@ } }, "node_modules/@angular-eslint/bundled-angular-compiler": { - "version": "19.1.0", - "resolved": "https://registry.npmjs.org/@angular-eslint/bundled-angular-compiler/-/bundled-angular-compiler-19.1.0.tgz", - "integrity": "sha512-HUJyukRvnh8Z9lIdxdblBRuBaPYEVv4iAYZMw3d+dn4rrM27Nt5oh3/zkwYrrPkt36tZdeXdDWrOuz9jgjVN5w==", + "version": "19.8.1", + "resolved": "https://registry.npmjs.org/@angular-eslint/bundled-angular-compiler/-/bundled-angular-compiler-19.8.1.tgz", + "integrity": "sha512-WXi1YbSs7SIQo48u+fCcc5Nt14/T4QzYQPLZUnjtsUXPgQG7ZoahhcGf7PPQ+n0V3pSopHOlSHwqK+tSsYK87A==", "dev": true, "license": "MIT" }, "node_modules/@angular-eslint/eslint-plugin": { - "version": "19.1.0", - "resolved": "https://registry.npmjs.org/@angular-eslint/eslint-plugin/-/eslint-plugin-19.1.0.tgz", - "integrity": "sha512-TDO0+Ry+oNkxnaLHogKp1k2aey6IkJef5d7hathE4UFT6owjRizltWaRoX6bGw7Qu1yagVLL8L2Se8SddxSPAQ==", + "version": "19.8.1", + "resolved": "https://registry.npmjs.org/@angular-eslint/eslint-plugin/-/eslint-plugin-19.8.1.tgz", + "integrity": "sha512-wZEBMPwD2TRhifG751hcj137EMIEaFmsxRB2EI+vfINCgPnFGSGGOHXqi8aInn9fXqHs7VbXkAzXYdBsvy1m4Q==", "dev": true, "license": "MIT", "dependencies": { - "@angular-eslint/bundled-angular-compiler": "19.1.0", - "@angular-eslint/utils": "19.1.0" + "@angular-eslint/bundled-angular-compiler": "19.8.1", + "@angular-eslint/utils": "19.8.1" }, "peerDependencies": { "@typescript-eslint/utils": "^7.11.0 || ^8.0.0", @@ -396,18 +400,19 @@ } }, "node_modules/@angular-eslint/eslint-plugin-template": { - "version": "19.1.0", - "resolved": "https://registry.npmjs.org/@angular-eslint/eslint-plugin-template/-/eslint-plugin-template-19.1.0.tgz", - "integrity": "sha512-bIUizkCY40mnU8oAO1tLV7uN2H/cHf1evLlhpqlb9JYwc5dT2moiEhNDo61OtOgkJmDGNuThAeO9Xk9hGQc7nA==", + "version": "19.8.1", + "resolved": "https://registry.npmjs.org/@angular-eslint/eslint-plugin-template/-/eslint-plugin-template-19.8.1.tgz", + "integrity": "sha512-0ZVQldndLrDfB0tzFe/uIwvkUcakw8qGxvkEU0l7kSbv/ngNQ/qrkRi7P64otB15inIDUNZI2jtmVat52dqSfQ==", "dev": true, "license": "MIT", "dependencies": { - "@angular-eslint/bundled-angular-compiler": "19.1.0", - "@angular-eslint/utils": "19.1.0", + "@angular-eslint/bundled-angular-compiler": "19.8.1", + "@angular-eslint/utils": "19.8.1", "aria-query": "5.3.2", "axobject-query": "4.1.0" }, "peerDependencies": { + "@angular-eslint/template-parser": "19.8.1", "@typescript-eslint/types": "^7.11.0 || ^8.0.0", "@typescript-eslint/utils": "^7.11.0 || ^8.0.0", "eslint": "^8.57.0 || ^9.0.0", @@ -430,22 +435,49 @@ "strip-json-comments": "3.1.1" } }, - "node_modules/@angular-eslint/template-parser": { + "node_modules/@angular-eslint/schematics/node_modules/@angular-eslint/bundled-angular-compiler": { "version": "19.1.0", - "resolved": "https://registry.npmjs.org/@angular-eslint/template-parser/-/template-parser-19.1.0.tgz", - "integrity": "sha512-wbMi7adlC+uYqZo7NHNBShpNhFJRZsXLqihqvFpAUt1Ei6uDX8HR6MyMEDZ9tUnlqtPVW5nmbedPyLVG7HkjAA==", + "resolved": "https://registry.npmjs.org/@angular-eslint/bundled-angular-compiler/-/bundled-angular-compiler-19.1.0.tgz", + "integrity": "sha512-HUJyukRvnh8Z9lIdxdblBRuBaPYEVv4iAYZMw3d+dn4rrM27Nt5oh3/zkwYrrPkt36tZdeXdDWrOuz9jgjVN5w==", + "dev": true, + "license": "MIT" + }, + "node_modules/@angular-eslint/schematics/node_modules/@angular-eslint/eslint-plugin": { + "version": "19.1.0", + "resolved": "https://registry.npmjs.org/@angular-eslint/eslint-plugin/-/eslint-plugin-19.1.0.tgz", + "integrity": "sha512-TDO0+Ry+oNkxnaLHogKp1k2aey6IkJef5d7hathE4UFT6owjRizltWaRoX6bGw7Qu1yagVLL8L2Se8SddxSPAQ==", "dev": true, "license": "MIT", "dependencies": { "@angular-eslint/bundled-angular-compiler": "19.1.0", - "eslint-scope": "^8.0.2" + "@angular-eslint/utils": "19.1.0" }, "peerDependencies": { + "@typescript-eslint/utils": "^7.11.0 || ^8.0.0", "eslint": "^8.57.0 || ^9.0.0", "typescript": "*" } }, - "node_modules/@angular-eslint/utils": { + "node_modules/@angular-eslint/schematics/node_modules/@angular-eslint/eslint-plugin-template": { + "version": "19.1.0", + "resolved": "https://registry.npmjs.org/@angular-eslint/eslint-plugin-template/-/eslint-plugin-template-19.1.0.tgz", + "integrity": "sha512-bIUizkCY40mnU8oAO1tLV7uN2H/cHf1evLlhpqlb9JYwc5dT2moiEhNDo61OtOgkJmDGNuThAeO9Xk9hGQc7nA==", + "dev": true, + "license": "MIT", + "dependencies": { + "@angular-eslint/bundled-angular-compiler": "19.1.0", + "@angular-eslint/utils": "19.1.0", + "aria-query": "5.3.2", + "axobject-query": "4.1.0" + }, + "peerDependencies": { + "@typescript-eslint/types": "^7.11.0 || ^8.0.0", + "@typescript-eslint/utils": "^7.11.0 || ^8.0.0", + "eslint": "^8.57.0 || ^9.0.0", + "typescript": "*" + } + }, + "node_modules/@angular-eslint/schematics/node_modules/@angular-eslint/utils": { "version": "19.1.0", "resolved": "https://registry.npmjs.org/@angular-eslint/utils/-/utils-19.1.0.tgz", "integrity": "sha512-mcb7hPMH/u6wwUwvsewrmgb9y9NWN6ZacvpUvKlTOxF/jOtTdsu0XfV4YB43sp2A8NWzYzX0Str4c8K1xSmuBQ==", @@ -460,10 +492,40 @@ "typescript": "*" } }, + "node_modules/@angular-eslint/template-parser": { + "version": "19.8.1", + "resolved": "https://registry.npmjs.org/@angular-eslint/template-parser/-/template-parser-19.8.1.tgz", + "integrity": "sha512-pQiOg+se1AU/ncMlnJ9V6xYnMQ84qI1BGWuJpbU6A99VTXJg90scg0+T7DWmKssR1YjP5qmmBtrZfKsHEcLW/A==", + "dev": true, + "license": "MIT", + "dependencies": { + "@angular-eslint/bundled-angular-compiler": "19.8.1", + "eslint-scope": "^8.0.2" + }, + "peerDependencies": { + "eslint": "^8.57.0 || ^9.0.0", + "typescript": "*" + } + }, + "node_modules/@angular-eslint/utils": { + "version": "19.8.1", + "resolved": "https://registry.npmjs.org/@angular-eslint/utils/-/utils-19.8.1.tgz", + "integrity": "sha512-gVDKYWmAjeTPtaYmddT/HS03fCebXJtrk8G1MouQIviZbHqLjap6TbVlzlkBigRzaF0WnFnrDduQslkJzEdceA==", + "dev": true, + "license": "MIT", + "dependencies": { + "@angular-eslint/bundled-angular-compiler": "19.8.1" + }, + "peerDependencies": { + "@typescript-eslint/utils": "^7.11.0 || ^8.0.0", + "eslint": "^8.57.0 || ^9.0.0", + "typescript": "*" + } + }, "node_modules/@angular/animations": { - "version": "19.2.14", - "resolved": "https://registry.npmjs.org/@angular/animations/-/animations-19.2.14.tgz", - "integrity": "sha512-xhl8fLto5HHJdVj8Nb6EoBEiTAcXuWDYn1q5uHcGxyVH3kiwENWy/2OQXgCr2CuWo2e6hNUGzSLf/cjbsMNqEA==", + "version": "19.2.15", + "resolved": "https://registry.npmjs.org/@angular/animations/-/animations-19.2.15.tgz", + "integrity": "sha512-eq9vokLU8bjs7g/Znz8zJUQEOhT0MAJ/heBCHbB35S+CtZXJmItrsEqkI1tsRiR58NKXB6cbhBhULVo6qJbhXQ==", "license": "MIT", "dependencies": { "tslib": "^2.3.0" @@ -472,19 +534,19 @@ "node": "^18.19.1 || ^20.11.1 || >=22.0.0" }, "peerDependencies": { - "@angular/common": "19.2.14", - "@angular/core": "19.2.14" + "@angular/common": "19.2.15", + "@angular/core": "19.2.15" } }, "node_modules/@angular/build": { - "version": "19.2.15", - "resolved": "https://registry.npmjs.org/@angular/build/-/build-19.2.15.tgz", - "integrity": "sha512-iE4fp4d5ALu702uoL6/YkjM2JlGEXZ5G+RVzq3W2jg/Ft6ISAQnRKB6mymtetDD6oD7i87e8uSu9kFVNBauX2w==", + "version": "19.2.17", + "resolved": "https://registry.npmjs.org/@angular/build/-/build-19.2.17.tgz", + "integrity": "sha512-JrF9dSrsMip2xJzSz3zNoozBXu/OYg0bHuKfuPA/usPhz5AomJ2SQ2unvl6sDF00pTlgJohJMQ6SUHjylybn2g==", "dev": true, "license": "MIT", "dependencies": { "@ampproject/remapping": "2.3.0", - "@angular-devkit/architect": "0.1902.15", + "@angular-devkit/architect": "0.1902.17", "@babel/core": "7.26.10", "@babel/helper-annotate-as-pure": "7.25.9", "@babel/helper-split-export-declaration": "7.24.7", @@ -507,7 +569,7 @@ "sass": "1.85.0", "semver": "7.7.1", "source-map-support": "0.5.21", - "vite": "6.2.7", + "vite": "6.3.6", "watchpack": "2.4.2" }, "engines": { @@ -524,7 +586,7 @@ "@angular/localize": "^19.0.0 || ^19.2.0-next.0", "@angular/platform-server": "^19.0.0 || ^19.2.0-next.0", "@angular/service-worker": "^19.0.0 || ^19.2.0-next.0", - "@angular/ssr": "^19.2.15", + "@angular/ssr": "^19.2.17", "karma": "^6.4.0", "less": "^4.2.0", "ng-packagr": "^19.0.0 || ^19.2.0-next.0", @@ -562,107 +624,6 @@ } } }, - "node_modules/@angular/build/node_modules/vite": { - "version": "6.2.7", - "resolved": "https://registry.npmjs.org/vite/-/vite-6.2.7.tgz", - "integrity": "sha512-qg3LkeuinTrZoJHHF94coSaTfIPyBYoywp+ys4qu20oSJFbKMYoIJo0FWJT9q6Vp49l6z9IsJRbHdcGtiKbGoQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "esbuild": "^0.25.0", - "postcss": "^8.5.3", - "rollup": "^4.30.1" - }, - "bin": { - "vite": "bin/vite.js" - }, - "engines": { - "node": "^18.0.0 || ^20.0.0 || >=22.0.0" - }, - "funding": { - "url": "https://github.com/vitejs/vite?sponsor=1" - }, - "optionalDependencies": { - "fsevents": "~2.3.3" - }, - "peerDependencies": { - "@types/node": "^18.0.0 || ^20.0.0 || >=22.0.0", - "jiti": ">=1.21.0", - "less": "*", - "lightningcss": "^1.21.0", - "sass": "*", - "sass-embedded": "*", - "stylus": "*", - "sugarss": "*", - "terser": "^5.16.0", - "tsx": "^4.8.1", - "yaml": "^2.4.2" - }, - "peerDependenciesMeta": { - "@types/node": { - "optional": true - }, - "jiti": { - "optional": true - }, - "less": { - "optional": true - }, - "lightningcss": { - "optional": true - }, - "sass": { - "optional": true - }, - "sass-embedded": { - "optional": true - }, - "stylus": { - "optional": true - }, - "sugarss": { - "optional": true - }, - "terser": { - "optional": true - }, - "tsx": { - "optional": true - }, - "yaml": { - "optional": true - } - } - }, - "node_modules/@angular/build/node_modules/vite/node_modules/postcss": { - "version": "8.5.6", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.6.tgz", - "integrity": "sha512-3Ybi1tAuwAP9s0r1UQ2J4n5Y0G05bJkpUIO0/bI9MhwmD70S5aTWbXGBwxHrelT+XM1k6dM0pk+SwNkpTRN7Pg==", - "dev": true, - "funding": [ - { - "type": "opencollective", - "url": "https://opencollective.com/postcss/" - }, - { - "type": "tidelift", - "url": "https://tidelift.com/funding/github/npm/postcss" - }, - { - "type": "github", - "url": "https://github.com/sponsors/ai" - } - ], - "license": "MIT", - "dependencies": { - "nanoid": "^3.3.11", - "picocolors": "^1.1.1", - "source-map-js": "^1.2.1" - }, - "engines": { - "node": "^10 || ^12 || >=14" - } - }, "node_modules/@angular/cdk": { "version": "19.2.19", "resolved": "https://registry.npmjs.org/@angular/cdk/-/cdk-19.2.19.tgz", @@ -679,18 +640,18 @@ } }, "node_modules/@angular/cli": { - "version": "19.2.15", - "resolved": "https://registry.npmjs.org/@angular/cli/-/cli-19.2.15.tgz", - "integrity": "sha512-YRIpARHWSOnWkHusUWTQgeUrPWMjWvtQrOkjWc6stF36z2KUzKMEng6EzUvH6sZolNSwVwOFpODEP0ut4aBkvQ==", + "version": "19.2.17", + "resolved": "https://registry.npmjs.org/@angular/cli/-/cli-19.2.17.tgz", + "integrity": "sha512-BIdFAPbDOASSVUvtJ2sFRlsmkSyX9VgdAs631RoVMlw/BskIW1q/MUJtwzEsOsybVpSH7vGHYJa6JFqDDriiRg==", "dev": true, "license": "MIT", "dependencies": { - "@angular-devkit/architect": "0.1902.15", - "@angular-devkit/core": "19.2.15", - "@angular-devkit/schematics": "19.2.15", + "@angular-devkit/architect": "0.1902.17", + "@angular-devkit/core": "19.2.17", + "@angular-devkit/schematics": "19.2.17", "@inquirer/prompts": "7.3.2", "@listr2/prompt-adapter-inquirer": "2.0.18", - "@schematics/angular": "19.2.15", + "@schematics/angular": "19.2.17", "@yarnpkg/lockfile": "1.1.0", "ini": "5.0.0", "jsonc-parser": "3.3.1", @@ -713,9 +674,9 @@ } }, "node_modules/@angular/common": { - "version": "19.2.14", - "resolved": "https://registry.npmjs.org/@angular/common/-/common-19.2.14.tgz", - "integrity": "sha512-NcNklcuyqaTjOVGf7aru8APX9mjsnZ01gFZrn47BxHozhaR0EMRrotYQTdi8YdVjPkeYFYanVntSLfhyobq/jg==", + "version": "19.2.15", + "resolved": "https://registry.npmjs.org/@angular/common/-/common-19.2.15.tgz", + "integrity": "sha512-aVa/ctBYH/4qgA7r4sS7TV+/DzRYmcS+3d6l89pNKUXkI8gpmsd+r3FjccaemX4Wqru1QOrMvC+i+e7IBIVv0g==", "license": "MIT", "dependencies": { "tslib": "^2.3.0" @@ -724,14 +685,14 @@ "node": "^18.19.1 || ^20.11.1 || >=22.0.0" }, "peerDependencies": { - "@angular/core": "19.2.14", + "@angular/core": "19.2.15", "rxjs": "^6.5.3 || ^7.4.0" } }, "node_modules/@angular/compiler": { - "version": "19.2.14", - "resolved": "https://registry.npmjs.org/@angular/compiler/-/compiler-19.2.14.tgz", - "integrity": "sha512-ZqJDYOdhgKpVGNq3+n/Gbxma8DVYElDsoRe0tvNtjkWBVdaOxdZZUqmJ3kdCBsqD/aqTRvRBu0KGo9s2fCChkA==", + "version": "19.2.15", + "resolved": "https://registry.npmjs.org/@angular/compiler/-/compiler-19.2.15.tgz", + "integrity": "sha512-hMHZU6/03xG0tbPDIm1hbVSTFLnRkGYfh+xdBwUMnIFYYTS0QJ2hdPfEZKCJIXm+fz9IAI5MPdDTfeyp0sgaHQ==", "license": "MIT", "dependencies": { "tslib": "^2.3.0" @@ -741,9 +702,9 @@ } }, "node_modules/@angular/compiler-cli": { - "version": "19.2.14", - "resolved": "https://registry.npmjs.org/@angular/compiler-cli/-/compiler-cli-19.2.14.tgz", - "integrity": "sha512-e9/h86ETjoIK2yTLE9aUeMCKujdg/du2pq7run/aINjop4RtnNOw+ZlSTUa6R65lP5CVwDup1kPytpAoifw8cA==", + "version": "19.2.15", + "resolved": "https://registry.npmjs.org/@angular/compiler-cli/-/compiler-cli-19.2.15.tgz", + "integrity": "sha512-4r5tvGA2Ok3o8wROZBkF9qNKS7L0AEpdBIkAVJbLw2rBY2SlyycFIRYyV2+D1lJ1jq/f9U7uN6oon0MjTvNYkA==", "dev": true, "license": "MIT", "dependencies": { @@ -765,7 +726,7 @@ "node": "^18.19.1 || ^20.11.1 || >=22.0.0" }, "peerDependencies": { - "@angular/compiler": "19.2.14", + "@angular/compiler": "19.2.15", "typescript": ">=5.5 <5.9" } }, @@ -818,9 +779,9 @@ } }, "node_modules/@angular/core": { - "version": "19.2.14", - "resolved": "https://registry.npmjs.org/@angular/core/-/core-19.2.14.tgz", - "integrity": "sha512-EVErpW9tGqJ/wNcAN3G/ErH8pHCJ8mM1E6bsJ8UJIpDTZkpqqYjBMtZS9YWH5n3KwUd1tAkAB2w8FK125AjDUQ==", + "version": "19.2.15", + "resolved": "https://registry.npmjs.org/@angular/core/-/core-19.2.15.tgz", + "integrity": "sha512-PxhzCwwm23N4Mq6oV7UPoYiJF4r6FzGhRSxOBBlEp322k7zEQbIxd/XO6F3eoG73qC1UsOXMYYv6GnQpx42y3A==", "license": "MIT", "dependencies": { "tslib": "^2.3.0" @@ -834,9 +795,9 @@ } }, "node_modules/@angular/forms": { - "version": "19.2.14", - "resolved": "https://registry.npmjs.org/@angular/forms/-/forms-19.2.14.tgz", - "integrity": "sha512-hWtDOj2B0AuRTf+nkMJeodnFpDpmEK9OIhIv1YxcRe73ooaxrIdjgugkElO8I9Tj0E4/7m117ezhWDUkbqm1zA==", + "version": "19.2.15", + "resolved": "https://registry.npmjs.org/@angular/forms/-/forms-19.2.15.tgz", + "integrity": "sha512-pZDElcYPmNzPxvWJpZQCIizsNApDIfk9xLJE4I8hzLISfWGbQvfjuuarDAuQZEXudeLXoDOstDXkDja40muLGg==", "license": "MIT", "dependencies": { "tslib": "^2.3.0" @@ -845,16 +806,16 @@ "node": "^18.19.1 || ^20.11.1 || >=22.0.0" }, "peerDependencies": { - "@angular/common": "19.2.14", - "@angular/core": "19.2.14", - "@angular/platform-browser": "19.2.14", + "@angular/common": "19.2.15", + "@angular/core": "19.2.15", + "@angular/platform-browser": "19.2.15", "rxjs": "^6.5.3 || ^7.4.0" } }, "node_modules/@angular/platform-browser": { - "version": "19.2.14", - "resolved": "https://registry.npmjs.org/@angular/platform-browser/-/platform-browser-19.2.14.tgz", - "integrity": "sha512-hzkT5nmA64oVBQl6PRjdL4dIFT1n7lfM9rm5cAoS+6LUUKRgiE2d421Kpn/Hz3jaCJfo+calMIdtSMIfUJBmww==", + "version": "19.2.15", + "resolved": "https://registry.npmjs.org/@angular/platform-browser/-/platform-browser-19.2.15.tgz", + "integrity": "sha512-OelQ6weCjon8kZD8kcqNzwugvZJurjS3uMJCwsA2vXmP/3zJ31SWtNqE2zLT1R2csVuwnp0h+nRMgq+pINU7Rg==", "license": "MIT", "dependencies": { "tslib": "^2.3.0" @@ -863,9 +824,9 @@ "node": "^18.19.1 || ^20.11.1 || >=22.0.0" }, "peerDependencies": { - "@angular/animations": "19.2.14", - "@angular/common": "19.2.14", - "@angular/core": "19.2.14" + "@angular/animations": "19.2.15", + "@angular/common": "19.2.15", + "@angular/core": "19.2.15" }, "peerDependenciesMeta": { "@angular/animations": { @@ -874,9 +835,9 @@ } }, "node_modules/@angular/platform-browser-dynamic": { - "version": "19.2.14", - "resolved": "https://registry.npmjs.org/@angular/platform-browser-dynamic/-/platform-browser-dynamic-19.2.14.tgz", - "integrity": "sha512-Hfz0z1KDQmIdnFXVFCwCPykuIsHPkr1uW2aY396eARwZ6PK8i0Aadcm1ZOnpd3MR1bMyDrJo30VRS5kx89QWvA==", + "version": "19.2.15", + "resolved": "https://registry.npmjs.org/@angular/platform-browser-dynamic/-/platform-browser-dynamic-19.2.15.tgz", + "integrity": "sha512-dKy0SS395FCh8cW9AQ8nf4Wn3XlONaH7z50T1bGxm3eOoRqjxJYyIeIlEbDdJakMz4QPR3dGr81HleZd8TJumQ==", "license": "MIT", "dependencies": { "tslib": "^2.3.0" @@ -885,16 +846,16 @@ "node": "^18.19.1 || ^20.11.1 || >=22.0.0" }, "peerDependencies": { - "@angular/common": "19.2.14", - "@angular/compiler": "19.2.14", - "@angular/core": "19.2.14", - "@angular/platform-browser": "19.2.14" + "@angular/common": "19.2.15", + "@angular/compiler": "19.2.15", + "@angular/core": "19.2.15", + "@angular/platform-browser": "19.2.15" } }, "node_modules/@angular/router": { - "version": "19.2.14", - "resolved": "https://registry.npmjs.org/@angular/router/-/router-19.2.14.tgz", - "integrity": "sha512-cBTWY9Jx7YhbmDYDb7Hqz4Q7UNIMlKTkdKToJd2pbhIXyoS+kHVQrySmyca+jgvYMjWnIjsAEa3dpje12D4mFw==", + "version": "19.2.15", + "resolved": "https://registry.npmjs.org/@angular/router/-/router-19.2.15.tgz", + "integrity": "sha512-0TM1D8S7RQ00drKy7hA/ZLBY14dUBqFBgm06djcNcOjNzVAtgkeV0i+0Smq9tCC7UsGKdpZu4RgfYjHATBNlTQ==", "license": "MIT", "dependencies": { "tslib": "^2.3.0" @@ -903,29 +864,20 @@ "node": "^18.19.1 || ^20.11.1 || >=22.0.0" }, "peerDependencies": { - "@angular/common": "19.2.14", - "@angular/core": "19.2.14", - "@angular/platform-browser": "19.2.14", + "@angular/common": "19.2.15", + "@angular/core": "19.2.15", + "@angular/platform-browser": "19.2.15", "rxjs": "^6.5.3 || ^7.4.0" } }, - "node_modules/@angular/service-worker": { - "version": "19.2.14", - "resolved": "https://registry.npmjs.org/@angular/service-worker/-/service-worker-19.2.14.tgz", - "integrity": "sha512-ajH4kjsuzDvJNxnG18y8N47R0avXFKwOeLszoiirlr5160C+k4HmQvIbzcCjD5liW0OkmxJN1cMW6KdilP8/2w==", + "node_modules/@arr/every": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/@arr/every/-/every-1.0.1.tgz", + "integrity": "sha512-UQFQ6SgyJ6LX42W8rHCs8KVc0JS0tzVL9ct4XYedJukskYVWTo49tNiMEK9C2HTyarbNiT/RVIRSY82vH+6sTg==", + "dev": true, "license": "MIT", - "dependencies": { - "tslib": "^2.3.0" - }, - "bin": { - "ngsw-config": "ngsw-config.js" - }, "engines": { - "node": "^18.19.1 || ^20.11.1 || >=22.0.0" - }, - "peerDependencies": { - "@angular/core": "19.2.14", - "rxjs": "^6.5.3 || ^7.4.0" + "node": ">=4" } }, "node_modules/@babel/code-frame": { @@ -944,9 +896,9 @@ } }, "node_modules/@babel/compat-data": { - "version": "7.28.0", - "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.28.0.tgz", - "integrity": "sha512-60X7qkglvrap8mn1lh2ebxXdZYtUcpd7gsmy9kLaBJ4i/WdY8PqTSdxyA8qraikqKQK5C1KRBKXqznrVapyNaw==", + "version": "7.28.4", + "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.28.4.tgz", + "integrity": "sha512-YsmSKC29MJwf0gF8Rjjrg5LQCmyh+j/nD8/eP7f+BeoQTKYqs9RoWbjGOdy0+1Ekr68RJZMUOPVQaQisnIo4Rw==", "dev": true, "license": "MIT", "engines": { @@ -1059,18 +1011,18 @@ } }, "node_modules/@babel/helper-create-class-features-plugin": { - "version": "7.27.1", - "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.27.1.tgz", - "integrity": "sha512-QwGAmuvM17btKU5VqXfb+Giw4JcN0hjuufz3DYnpeVDvZLAObloM77bhMXiqry3Iio+Ai4phVRDwl6WU10+r5A==", + "version": "7.28.3", + "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.28.3.tgz", + "integrity": "sha512-V9f6ZFIYSLNEbuGA/92uOvYsGCJNsuA8ESZ4ldc09bWk/j8H8TKiPw8Mk1eG6olpnO0ALHJmYfZvF4MEE4gajg==", "dev": true, "license": "MIT", "dependencies": { - "@babel/helper-annotate-as-pure": "^7.27.1", + "@babel/helper-annotate-as-pure": "^7.27.3", "@babel/helper-member-expression-to-functions": "^7.27.1", "@babel/helper-optimise-call-expression": "^7.27.1", "@babel/helper-replace-supers": "^7.27.1", "@babel/helper-skip-transparent-expression-wrappers": "^7.27.1", - "@babel/traverse": "^7.27.1", + "@babel/traverse": "^7.28.3", "semver": "^6.3.1" }, "engines": { @@ -1200,15 +1152,15 @@ } }, "node_modules/@babel/helper-module-transforms": { - "version": "7.27.3", - "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.27.3.tgz", - "integrity": "sha512-dSOvYwvyLsWBeIRyOeHXp5vPj5l1I011r52FM1+r1jCERv+aFXYk4whgQccYEGYxK2H3ZAIA8nuPkQ0HaUo3qg==", + "version": "7.28.3", + "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.28.3.tgz", + "integrity": "sha512-gytXUbs8k2sXS9PnQptz5o0QnpLL51SwASIORY6XaBKF88nsOT0Zw9szLqlSGQDP/4TljBAD5y98p2U1fqkdsw==", "dev": true, "license": "MIT", "dependencies": { "@babel/helper-module-imports": "^7.27.1", "@babel/helper-validator-identifier": "^7.27.1", - "@babel/traverse": "^7.27.3" + "@babel/traverse": "^7.28.3" }, "engines": { "node": ">=6.9.0" @@ -1347,42 +1299,42 @@ } }, "node_modules/@babel/helper-wrap-function": { - "version": "7.27.1", - "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.27.1.tgz", - "integrity": "sha512-NFJK2sHUvrjo8wAU/nQTWU890/zB2jj0qBcCbZbbf+005cAsv6tMjXz31fBign6M5ov1o0Bllu+9nbqkfsjjJQ==", + "version": "7.28.3", + "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.28.3.tgz", + "integrity": "sha512-zdf983tNfLZFletc0RRXYrHrucBEg95NIFMkn6K9dbeMYnsgHaSBGcQqdsCSStG2PYwRre0Qc2NNSCXbG+xc6g==", "dev": true, "license": "MIT", "dependencies": { - "@babel/template": "^7.27.1", - "@babel/traverse": "^7.27.1", - "@babel/types": "^7.27.1" + "@babel/template": "^7.27.2", + "@babel/traverse": "^7.28.3", + "@babel/types": "^7.28.2" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helpers": { - "version": "7.28.2", - "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.28.2.tgz", - "integrity": "sha512-/V9771t+EgXz62aCcyofnQhGM8DQACbRhvzKFsXKC9QM+5MadF8ZmIm0crDMaz3+o0h0zXfJnd4EhbYbxsrcFw==", + "version": "7.28.4", + "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.28.4.tgz", + "integrity": "sha512-HFN59MmQXGHVyYadKLVumYsA9dBFun/ldYxipEjzA4196jpLZd8UjEEBLkbEkvfYreDqJhZxYAWFPtrfhNpj4w==", "dev": true, "license": "MIT", "dependencies": { "@babel/template": "^7.27.2", - "@babel/types": "^7.28.2" + "@babel/types": "^7.28.4" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/parser": { - "version": "7.28.0", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.28.0.tgz", - "integrity": "sha512-jVZGvOxOuNSsuQuLRTh13nU0AogFlw32w/MT+LV6D3sP5WdbW61E77RnkbaO2dUvmPAYrBDJXGn5gGS6tH4j8g==", + "version": "7.28.4", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.28.4.tgz", + "integrity": "sha512-yZbBqeM6TkpP9du/I2pUZnJsRMGGvOuIrhjzC1AwHwW+6he4mni6Bp/m8ijn0iOuZuPI2BfkCoSRunpyjnrQKg==", "dev": true, "license": "MIT", "dependencies": { - "@babel/types": "^7.28.0" + "@babel/types": "^7.28.4" }, "bin": { "parser": "bin/babel-parser.js" @@ -1459,14 +1411,14 @@ } }, "node_modules/@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly": { - "version": "7.27.1", - "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly/-/plugin-bugfix-v8-static-class-fields-redefine-readonly-7.27.1.tgz", - "integrity": "sha512-6BpaYGDavZqkI6yT+KSPdpZFfpnd68UKXbcjI9pJ13pvHhPrCKWOOLp+ysvMeA+DxnhuPpgIaRpxRxo5A9t5jw==", + "version": "7.28.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly/-/plugin-bugfix-v8-static-class-fields-redefine-readonly-7.28.3.tgz", + "integrity": "sha512-b6YTX108evsvE4YgWyQ921ZAFFQm3Bn+CA3+ZXlNVnPhx+UfsVURoPjfGAPCjBgrqo30yX/C2nZGX96DxvR9Iw==", "dev": true, "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.27.1", - "@babel/traverse": "^7.27.1" + "@babel/traverse": "^7.28.3" }, "engines": { "node": ">=6.9.0" @@ -1829,9 +1781,9 @@ } }, "node_modules/@babel/plugin-transform-block-scoping": { - "version": "7.28.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.28.0.tgz", - "integrity": "sha512-gKKnwjpdx5sER/wl0WN0efUBFzF/56YZO0RJrSYP4CljXnP31ByY7fol89AzomdlLNzI36AvOTmYHsnZTCkq8Q==", + "version": "7.28.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.28.4.tgz", + "integrity": "sha512-1yxmvN0MJHOhPVmAsmoW5liWwoILobu/d/ShymZmj867bAdxGbehIrew1DuLpw2Ukv+qDSSPQdYW1dLNE7t11A==", "dev": true, "license": "MIT", "dependencies": { @@ -1862,13 +1814,13 @@ } }, "node_modules/@babel/plugin-transform-class-static-block": { - "version": "7.27.1", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-class-static-block/-/plugin-transform-class-static-block-7.27.1.tgz", - "integrity": "sha512-s734HmYU78MVzZ++joYM+NkJusItbdRcbm+AGRgJCt3iA+yux0QpD9cBVdz3tKyrjVYWRl7j0mHSmv4lhV0aoA==", + "version": "7.28.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-class-static-block/-/plugin-transform-class-static-block-7.28.3.tgz", + "integrity": "sha512-LtPXlBbRoc4Njl/oh1CeD/3jC+atytbnf/UqLoqTDcEYGUPj022+rvfkbDYieUrSj3CaV4yHDByPE+T2HwfsJg==", "dev": true, "license": "MIT", "dependencies": { - "@babel/helper-create-class-features-plugin": "^7.27.1", + "@babel/helper-create-class-features-plugin": "^7.28.3", "@babel/helper-plugin-utils": "^7.27.1" }, "engines": { @@ -1879,9 +1831,9 @@ } }, "node_modules/@babel/plugin-transform-classes": { - "version": "7.28.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.28.0.tgz", - "integrity": "sha512-IjM1IoJNw72AZFlj33Cu8X0q2XK/6AaVC3jQu+cgQ5lThWD5ajnuUAml80dqRmOhmPkTH8uAwnpMu9Rvj0LTRA==", + "version": "7.28.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.28.4.tgz", + "integrity": "sha512-cFOlhIYPBv/iBoc+KS3M6et2XPtbT2HiCRfBXWtfpc9OAyostldxIf9YAYB6ypURBBbx+Qv6nyrLzASfJe+hBA==", "dev": true, "license": "MIT", "dependencies": { @@ -1890,7 +1842,7 @@ "@babel/helper-globals": "^7.28.0", "@babel/helper-plugin-utils": "^7.27.1", "@babel/helper-replace-supers": "^7.27.1", - "@babel/traverse": "^7.28.0" + "@babel/traverse": "^7.28.4" }, "engines": { "node": ">=6.9.0" @@ -2012,6 +1964,23 @@ "@babel/core": "^7.0.0-0" } }, + "node_modules/@babel/plugin-transform-explicit-resource-management": { + "version": "7.28.0", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-explicit-resource-management/-/plugin-transform-explicit-resource-management-7.28.0.tgz", + "integrity": "sha512-K8nhUcn3f6iB+P3gwCv/no7OdzOZQcKchW6N389V6PD8NUWKZHzndOd9sPDVbMoBsbmjMqlB4L9fm+fEFNVlwQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/helper-plugin-utils": "^7.27.1", + "@babel/plugin-transform-destructuring": "^7.28.0" + }, + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, "node_modules/@babel/plugin-transform-exponentiation-operator": { "version": "7.27.1", "resolved": "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.27.1.tgz", @@ -2279,9 +2248,9 @@ } }, "node_modules/@babel/plugin-transform-object-rest-spread": { - "version": "7.28.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-rest-spread/-/plugin-transform-object-rest-spread-7.28.0.tgz", - "integrity": "sha512-9VNGikXxzu5eCiQjdE4IZn8sb9q7Xsk5EXLDBKUYg1e/Tve8/05+KJEtcxGxAgCY5t/BpKQM+JEL/yT4tvgiUA==", + "version": "7.28.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-rest-spread/-/plugin-transform-object-rest-spread-7.28.4.tgz", + "integrity": "sha512-373KA2HQzKhQCYiRVIRr+3MjpCObqzDlyrM6u4I201wL8Mp2wHf7uB8GhDwis03k2ti8Zr65Zyyqs1xOxUF/Ew==", "dev": true, "license": "MIT", "dependencies": { @@ -2289,7 +2258,7 @@ "@babel/helper-plugin-utils": "^7.27.1", "@babel/plugin-transform-destructuring": "^7.28.0", "@babel/plugin-transform-parameters": "^7.27.7", - "@babel/traverse": "^7.28.0" + "@babel/traverse": "^7.28.4" }, "engines": { "node": ">=6.9.0" @@ -2429,9 +2398,9 @@ } }, "node_modules/@babel/plugin-transform-regenerator": { - "version": "7.28.1", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.28.1.tgz", - "integrity": "sha512-P0QiV/taaa3kXpLY+sXla5zec4E+4t4Aqc9ggHlfZ7a2cp8/x/Gv08jfwEtn9gnnYIMvHx6aoOZ8XJL8eU71Dg==", + "version": "7.28.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.28.4.tgz", + "integrity": "sha512-+ZEdQlBoRg9m2NnzvEeLgtvBMO4tkFBw5SQIUgLICgTrumLoU7lr+Oghi6km2PFj+dbUt2u1oby2w3BDO9YQnA==", "dev": true, "license": "MIT", "dependencies": { @@ -2794,18 +2763,18 @@ } }, "node_modules/@babel/traverse": { - "version": "7.28.0", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.28.0.tgz", - "integrity": "sha512-mGe7UK5wWyh0bKRfupsUchrQGqvDbZDbKJw+kcRGSmdHVYrv+ltd0pnpDTVpiTqnaBru9iEvA8pz8W46v0Amwg==", + "version": "7.28.4", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.28.4.tgz", + "integrity": "sha512-YEzuboP2qvQavAcjgQNVgsvHIDv6ZpwXvcvjmyySP2DIMuByS/6ioU5G9pYrWHM6T2YDfc7xga9iNzYOs12CFQ==", "dev": true, "license": "MIT", "dependencies": { "@babel/code-frame": "^7.27.1", - "@babel/generator": "^7.28.0", + "@babel/generator": "^7.28.3", "@babel/helper-globals": "^7.28.0", - "@babel/parser": "^7.28.0", + "@babel/parser": "^7.28.4", "@babel/template": "^7.27.2", - "@babel/types": "^7.28.0", + "@babel/types": "^7.28.4", "debug": "^4.3.1" }, "engines": { @@ -2813,14 +2782,14 @@ } }, "node_modules/@babel/traverse/node_modules/@babel/generator": { - "version": "7.28.0", - "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.28.0.tgz", - "integrity": "sha512-lJjzvrbEeWrhB4P3QBsH7tey117PjLZnDbLiQEKjQ/fNJTjuq4HSqgFA+UNSwZT8D7dxxbnuSBMsa1lrWzKlQg==", + "version": "7.28.3", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.28.3.tgz", + "integrity": "sha512-3lSpxGgvnmZznmBkCRnVREPUFJv2wrv9iAoFDvADJc0ypmdOxdUtcLeBgBJ6zE0PMeTKnxeQzyk0xTBq4Ep7zw==", "dev": true, "license": "MIT", "dependencies": { - "@babel/parser": "^7.28.0", - "@babel/types": "^7.28.0", + "@babel/parser": "^7.28.3", + "@babel/types": "^7.28.2", "@jridgewell/gen-mapping": "^0.3.12", "@jridgewell/trace-mapping": "^0.3.28", "jsesc": "^3.0.2" @@ -2830,9 +2799,9 @@ } }, "node_modules/@babel/types": { - "version": "7.28.2", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.28.2.tgz", - "integrity": "sha512-ruv7Ae4J5dUYULmeXw1gmb7rYRz57OWCPM57pHojnLq/3Z1CK2lNSLTCVjxVk1F/TZHwOZZrOWi0ur95BbLxNQ==", + "version": "7.28.4", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.28.4.tgz", + "integrity": "sha512-bkFqkLhh3pMBUQQkpVgWDWq/lqzc2678eUyDlTBhRqhCHFguYYGM0Efga7tYk4TogG/3x0EEl66/OQ+WGbWB/Q==", "dev": true, "license": "MIT", "dependencies": { @@ -2850,37 +2819,86 @@ "dev": true, "license": "MIT" }, - "node_modules/@commitlint/cli": { - "version": "19.8.1", - "resolved": "https://registry.npmjs.org/@commitlint/cli/-/cli-19.8.1.tgz", - "integrity": "sha512-LXUdNIkspyxrlV6VDHWBmCZRtkEVRpBKxi2Gtw3J54cGWhLCTouVD/Q6ZSaSvd2YaDObWK8mDjrz3TIKtaQMAA==", - "dev": true, + "node_modules/@citation-js/core": { + "version": "0.7.18", + "resolved": "https://registry.npmjs.org/@citation-js/core/-/core-0.7.18.tgz", + "integrity": "sha512-EjLuZWA5156dIFGdF7OnyPyWFBW43B8Ckje6Sn/W2RFxHDu0oACvW4/6TNgWT80jhEA4bVFm7ahrZe9MJ2B2UQ==", "license": "MIT", "dependencies": { - "@commitlint/format": "^19.8.1", - "@commitlint/lint": "^19.8.1", - "@commitlint/load": "^19.8.1", - "@commitlint/read": "^19.8.1", - "@commitlint/types": "^19.8.1", - "tinyexec": "^1.0.0", - "yargs": "^17.0.0" - }, - "bin": { - "commitlint": "cli.js" + "@citation-js/date": "^0.5.0", + "@citation-js/name": "^0.4.2", + "fetch-ponyfill": "^7.1.0", + "sync-fetch": "^0.4.1" }, "engines": { - "node": ">=v18" + "node": ">=16.0.0" } }, - "node_modules/@commitlint/config-conventional": { - "version": "19.8.1", - "resolved": "https://registry.npmjs.org/@commitlint/config-conventional/-/config-conventional-19.8.1.tgz", - "integrity": "sha512-/AZHJL6F6B/G959CsMAzrPKKZjeEiAVifRyEwXxcT6qtqbPwGw+iQxmNS+Bu+i09OCtdNRW6pNpBvgPrtMr9EQ==", - "dev": true, + "node_modules/@citation-js/date": { + "version": "0.5.1", + "resolved": "https://registry.npmjs.org/@citation-js/date/-/date-0.5.1.tgz", + "integrity": "sha512-1iDKAZ4ie48PVhovsOXQ+C6o55dWJloXqtznnnKy6CltJBQLIuLLuUqa8zlIvma0ZigjVjgDUhnVaNU1MErtZw==", "license": "MIT", - "dependencies": { - "@commitlint/types": "^19.8.1", - "conventional-changelog-conventionalcommits": "^7.0.2" + "engines": { + "node": ">=10.0.0" + } + }, + "node_modules/@citation-js/name": { + "version": "0.4.2", + "resolved": "https://registry.npmjs.org/@citation-js/name/-/name-0.4.2.tgz", + "integrity": "sha512-brSPsjs2fOVzSnARLKu0qncn6suWjHVQtrqSUrnqyaRH95r/Ad4wPF5EsoWr+Dx8HzkCGb/ogmoAzfCsqlTwTQ==", + "license": "MIT", + "engines": { + "node": ">=6" + } + }, + "node_modules/@citation-js/plugin-csl": { + "version": "0.7.18", + "resolved": "https://registry.npmjs.org/@citation-js/plugin-csl/-/plugin-csl-0.7.18.tgz", + "integrity": "sha512-cJcOdEZurmtIxNj0d4cOERHpVQJB/mN3YPSDNqfI/xTFRN3bWDpFAsaqubPtMO2ZPpoDS+ZGIP1kggbwCfMmlA==", + "license": "MIT", + "dependencies": { + "@citation-js/date": "^0.5.0", + "citeproc": "^2.4.6" + }, + "engines": { + "node": ">=16.0.0" + }, + "peerDependencies": { + "@citation-js/core": "^0.7.0" + } + }, + "node_modules/@commitlint/cli": { + "version": "19.8.1", + "resolved": "https://registry.npmjs.org/@commitlint/cli/-/cli-19.8.1.tgz", + "integrity": "sha512-LXUdNIkspyxrlV6VDHWBmCZRtkEVRpBKxi2Gtw3J54cGWhLCTouVD/Q6ZSaSvd2YaDObWK8mDjrz3TIKtaQMAA==", + "dev": true, + "license": "MIT", + "dependencies": { + "@commitlint/format": "^19.8.1", + "@commitlint/lint": "^19.8.1", + "@commitlint/load": "^19.8.1", + "@commitlint/read": "^19.8.1", + "@commitlint/types": "^19.8.1", + "tinyexec": "^1.0.0", + "yargs": "^17.0.0" + }, + "bin": { + "commitlint": "cli.js" + }, + "engines": { + "node": ">=v18" + } + }, + "node_modules/@commitlint/config-conventional": { + "version": "19.8.1", + "resolved": "https://registry.npmjs.org/@commitlint/config-conventional/-/config-conventional-19.8.1.tgz", + "integrity": "sha512-/AZHJL6F6B/G959CsMAzrPKKZjeEiAVifRyEwXxcT6qtqbPwGw+iQxmNS+Bu+i09OCtdNRW6pNpBvgPrtMr9EQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "@commitlint/types": "^19.8.1", + "conventional-changelog-conventionalcommits": "^7.0.2" }, "engines": { "node": ">=v18" @@ -3108,34 +3126,36 @@ } }, "node_modules/@compodoc/compodoc": { - "version": "1.1.26", - "resolved": "https://registry.npmjs.org/@compodoc/compodoc/-/compodoc-1.1.26.tgz", - "integrity": "sha512-CJkqTtdotxMA4SDyUx8J6Mrm3MMmcgFtfEViUnG9Of2CXhYiXIqNeD881+pxn0opmMC+VCTL0/SCD03tDYhWYA==", + "version": "1.1.30", + "resolved": "https://registry.npmjs.org/@compodoc/compodoc/-/compodoc-1.1.30.tgz", + "integrity": "sha512-pdFe1tnskXmvj8lfXZgq7LwgAxAPYfxflcGZiexMu1fOyRVsZYrBcHHEWp0sX9FU+or61IOicJv8Vdcri08FEQ==", "dev": true, "hasInstallScript": true, "license": "MIT", "dependencies": { - "@angular-devkit/schematics": "18.2.8", - "@babel/core": "7.25.8", - "@babel/plugin-transform-private-methods": "7.25.7", - "@babel/preset-env": "7.25.8", + "@angular-devkit/schematics": "20.2.2", + "@babel/core": "7.28.4", + "@babel/plugin-transform-private-methods": "7.27.1", + "@babel/preset-env": "7.28.3", "@compodoc/live-server": "^1.2.3", "@compodoc/ngd-transformer": "^2.1.3", - "bootstrap.native": "^5.0.13", - "cheerio": "1.0.0-rc.12", - "chokidar": "^4.0.1", + "@polka/send-type": "^0.5.2", + "body-parser": "^2.2.0", + "bootstrap.native": "^5.1.5", + "cheerio": "1.1.2", + "chokidar": "^4.0.3", "colors": "1.4.0", - "commander": "^12.1.0", + "commander": "^14.0.0", "cosmiconfig": "^9.0.0", "decache": "^4.6.2", "es6-shim": "^0.35.8", "fancy-log": "^2.0.0", - "fast-glob": "^3.3.2", - "fs-extra": "^11.2.0", - "glob": "^11.0.0", + "fast-glob": "^3.3.3", + "fs-extra": "^11.3.1", + "glob": "^11.0.3", "handlebars": "^4.7.8", - "html-entities": "^2.5.2", - "i18next": "^23.16.0", + "html-entities": "^2.6.0", + "i18next": "25.5.2", "json5": "^2.2.3", "lodash": "^4.17.21", "loglevel": "^1.9.2", @@ -3146,62 +3166,45 @@ "neotraverse": "^0.6.18", "opencollective-postinstall": "^2.0.3", "os-name": "4.0.1", - "picocolors": "^1.1.0", - "prismjs": "^1.29.0", - "semver": "^7.6.3", - "svg-pan-zoom": "^3.6.1", - "tablesort": "^5.3.0", - "ts-morph": "^24.0.0", - "uuid": "^10.0.0", + "picocolors": "^1.1.1", + "polka": "^0.5.2", + "prismjs": "^1.30.0", + "semver": "^7.7.2", + "sirv": "^3.0.2", + "svg-pan-zoom": "^3.6.2", + "tablesort": "^5.6.0", + "ts-morph": "^26.0.0", + "uuid": "^11.1.0", "vis": "^4.21.0-EOL" }, "bin": { "compodoc": "bin/index-cli.js" }, "engines": { - "node": ">= 16.0.0" + "node": "^20.19.0 || ^22.12.0 || >=24.0.0" } }, - "node_modules/@compodoc/compodoc/node_modules/@angular-devkit/schematics": { - "version": "18.2.8", - "resolved": "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-18.2.8.tgz", - "integrity": "sha512-i/h2Oji5FhJMC7wDSnIl5XUe/qym+C1ZwScaATJwDyRLCUIynZkj5rLgdG/uK6l+H0PgvxigkF+akWpokkwW6w==", - "dev": true, - "license": "MIT", - "dependencies": { - "@angular-devkit/core": "18.2.8", - "jsonc-parser": "3.3.1", - "magic-string": "0.30.11", - "ora": "5.4.1", - "rxjs": "7.8.1" - }, - "engines": { - "node": "^18.19.1 || ^20.11.1 || >=22.0.0", - "npm": "^6.11.0 || ^7.5.6 || >=8.0.0", - "yarn": ">= 1.13.0" - } - }, - "node_modules/@compodoc/compodoc/node_modules/@angular-devkit/schematics/node_modules/@angular-devkit/core": { - "version": "18.2.8", - "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-18.2.8.tgz", - "integrity": "sha512-4o2T6wsmXGE/v53+F8L7kGoN2+qzt03C9rtjLVQpOljzpJVttQ8bhvfWxyYLWwcl04RWqRa+82fpIZtBkOlZJw==", + "node_modules/@compodoc/compodoc/node_modules/@angular-devkit/core": { + "version": "20.2.2", + "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-20.2.2.tgz", + "integrity": "sha512-SC+f5isSWJBpEgR+R7jP++2Z14WExNWLAdKpIickLWjuL8FlGkj+kaF3dWXhh0KcXo+r6kKb4pWUptSaqer5gA==", "dev": true, "license": "MIT", "dependencies": { "ajv": "8.17.1", "ajv-formats": "3.0.1", "jsonc-parser": "3.3.1", - "picomatch": "4.0.2", - "rxjs": "7.8.1", - "source-map": "0.7.4" + "picomatch": "4.0.3", + "rxjs": "7.8.2", + "source-map": "0.7.6" }, "engines": { - "node": "^18.19.1 || ^20.11.1 || >=22.0.0", + "node": "^20.19.0 || ^22.12.0 || >=24.0.0", "npm": "^6.11.0 || ^7.5.6 || >=8.0.0", "yarn": ">= 1.13.0" }, "peerDependencies": { - "chokidar": "^3.5.2" + "chokidar": "^4.0.0" }, "peerDependenciesMeta": { "chokidar": { @@ -3209,50 +3212,42 @@ } } }, - "node_modules/@compodoc/compodoc/node_modules/@angular-devkit/schematics/node_modules/chokidar": { - "version": "3.6.0", - "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.6.0.tgz", - "integrity": "sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==", + "node_modules/@compodoc/compodoc/node_modules/@angular-devkit/schematics": { + "version": "20.2.2", + "resolved": "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-20.2.2.tgz", + "integrity": "sha512-rtL7slZjzdChQoiADKZv/Ra8D3C3tIw/WcVxd2stiLHdK/Oaf9ejx5m/X9o0QMEbNsy2Fy/RKodNqmz1CjzpCg==", "dev": true, "license": "MIT", - "optional": true, - "peer": true, "dependencies": { - "anymatch": "~3.1.2", - "braces": "~3.0.2", - "glob-parent": "~5.1.2", - "is-binary-path": "~2.1.0", - "is-glob": "~4.0.1", - "normalize-path": "~3.0.0", - "readdirp": "~3.6.0" + "@angular-devkit/core": "20.2.2", + "jsonc-parser": "3.3.1", + "magic-string": "0.30.17", + "ora": "8.2.0", + "rxjs": "7.8.2" }, "engines": { - "node": ">= 8.10.0" - }, - "funding": { - "url": "https://paulmillr.com/funding/" - }, - "optionalDependencies": { - "fsevents": "~2.3.2" + "node": "^20.19.0 || ^22.12.0 || >=24.0.0", + "npm": "^6.11.0 || ^7.5.6 || >=8.0.0", + "yarn": ">= 1.13.0" } }, "node_modules/@compodoc/compodoc/node_modules/@babel/core": { - "version": "7.25.8", - "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.25.8.tgz", - "integrity": "sha512-Oixnb+DzmRT30qu9d3tJSQkxuygWm32DFykT4bRoORPa9hZ/L4KhVB/XiRm6KG+roIEM7DBQlmg27kw2HZkdZg==", + "version": "7.28.4", + "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.28.4.tgz", + "integrity": "sha512-2BCOP7TN8M+gVDj7/ht3hsaO/B/n5oDbiAyyvnRlNOs+u1o+JWNYTQrmpuNp1/Wq2gcFrI01JAW+paEKDMx/CA==", "dev": true, "license": "MIT", "dependencies": { - "@ampproject/remapping": "^2.2.0", - "@babel/code-frame": "^7.25.7", - "@babel/generator": "^7.25.7", - "@babel/helper-compilation-targets": "^7.25.7", - "@babel/helper-module-transforms": "^7.25.7", - "@babel/helpers": "^7.25.7", - "@babel/parser": "^7.25.8", - "@babel/template": "^7.25.7", - "@babel/traverse": "^7.25.7", - "@babel/types": "^7.25.8", + "@babel/code-frame": "^7.27.1", + "@babel/generator": "^7.28.3", + "@babel/helper-compilation-targets": "^7.27.2", + "@babel/helper-module-transforms": "^7.28.3", + "@babel/helpers": "^7.28.4", + "@babel/parser": "^7.28.4", + "@babel/template": "^7.27.2", + "@babel/traverse": "^7.28.4", + "@babel/types": "^7.28.4", + "@jridgewell/remapping": "^2.3.5", "convert-source-map": "^2.0.0", "debug": "^4.1.0", "gensync": "^1.0.0-beta.2", @@ -3277,15 +3272,67 @@ "semver": "bin/semver.js" } }, - "node_modules/@compodoc/compodoc/node_modules/@babel/plugin-transform-private-methods": { - "version": "7.25.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-private-methods/-/plugin-transform-private-methods-7.25.7.tgz", - "integrity": "sha512-KY0hh2FluNxMLwOCHbxVOKfdB5sjWG4M183885FmaqWWiGMhRZq4DQRKH6mHdEucbJnyDyYiZNwNG424RymJjA==", + "node_modules/@compodoc/compodoc/node_modules/@babel/generator": { + "version": "7.28.3", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.28.3.tgz", + "integrity": "sha512-3lSpxGgvnmZznmBkCRnVREPUFJv2wrv9iAoFDvADJc0ypmdOxdUtcLeBgBJ6zE0PMeTKnxeQzyk0xTBq4Ep7zw==", "dev": true, "license": "MIT", "dependencies": { - "@babel/helper-create-class-features-plugin": "^7.25.7", - "@babel/helper-plugin-utils": "^7.25.7" + "@babel/parser": "^7.28.3", + "@babel/types": "^7.28.2", + "@jridgewell/gen-mapping": "^0.3.12", + "@jridgewell/trace-mapping": "^0.3.28", + "jsesc": "^3.0.2" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@compodoc/compodoc/node_modules/@babel/plugin-syntax-import-attributes": { + "version": "7.27.1", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-attributes/-/plugin-syntax-import-attributes-7.27.1.tgz", + "integrity": "sha512-oFT0FrKHgF53f4vOsZGi2Hh3I35PfSmVs4IBFLFj4dnafP+hIWDLg3VyKmUHfLoLHlyxY4C7DGtmHuJgn+IGww==", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/helper-plugin-utils": "^7.27.1" + }, + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@compodoc/compodoc/node_modules/@babel/plugin-transform-async-generator-functions": { + "version": "7.28.0", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-generator-functions/-/plugin-transform-async-generator-functions-7.28.0.tgz", + "integrity": "sha512-BEOdvX4+M765icNPZeidyADIvQ1m1gmunXufXxvRESy/jNNyfovIqUyE7MVgGBjWktCoJlzvFA1To2O4ymIO3Q==", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/helper-plugin-utils": "^7.27.1", + "@babel/helper-remap-async-to-generator": "^7.27.1", + "@babel/traverse": "^7.28.0" + }, + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@compodoc/compodoc/node_modules/@babel/plugin-transform-async-to-generator": { + "version": "7.27.1", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.27.1.tgz", + "integrity": "sha512-NREkZsZVJS4xmTr8qzE5y8AfIPqsdQfRuUiLRTEzb7Qii8iFWCyDKaUV2c0rCuh4ljDZ98ALHP/PetiBV2nddA==", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/helper-module-imports": "^7.27.1", + "@babel/helper-plugin-utils": "^7.27.1", + "@babel/helper-remap-async-to-generator": "^7.27.1" }, "engines": { "node": ">=6.9.0" @@ -3295,79 +3342,81 @@ } }, "node_modules/@compodoc/compodoc/node_modules/@babel/preset-env": { - "version": "7.25.8", - "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.25.8.tgz", - "integrity": "sha512-58T2yulDHMN8YMUxiLq5YmWUnlDCyY1FsHM+v12VMx+1/FlrUj5tY50iDCpofFQEM8fMYOaY9YRvym2jcjn1Dg==", + "version": "7.28.3", + "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.28.3.tgz", + "integrity": "sha512-ROiDcM+GbYVPYBOeCR6uBXKkQpBExLl8k9HO1ygXEyds39j+vCCsjmj7S8GOniZQlEs81QlkdJZe76IpLSiqpg==", "dev": true, "license": "MIT", "dependencies": { - "@babel/compat-data": "^7.25.8", - "@babel/helper-compilation-targets": "^7.25.7", - "@babel/helper-plugin-utils": "^7.25.7", - "@babel/helper-validator-option": "^7.25.7", - "@babel/plugin-bugfix-firefox-class-in-computed-class-key": "^7.25.7", - "@babel/plugin-bugfix-safari-class-field-initializer-scope": "^7.25.7", - "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": "^7.25.7", - "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "^7.25.7", - "@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly": "^7.25.7", + "@babel/compat-data": "^7.28.0", + "@babel/helper-compilation-targets": "^7.27.2", + "@babel/helper-plugin-utils": "^7.27.1", + "@babel/helper-validator-option": "^7.27.1", + "@babel/plugin-bugfix-firefox-class-in-computed-class-key": "^7.27.1", + "@babel/plugin-bugfix-safari-class-field-initializer-scope": "^7.27.1", + "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": "^7.27.1", + "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "^7.27.1", + "@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly": "^7.28.3", "@babel/plugin-proposal-private-property-in-object": "7.21.0-placeholder-for-preset-env.2", - "@babel/plugin-syntax-import-assertions": "^7.25.7", - "@babel/plugin-syntax-import-attributes": "^7.25.7", + "@babel/plugin-syntax-import-assertions": "^7.27.1", + "@babel/plugin-syntax-import-attributes": "^7.27.1", "@babel/plugin-syntax-unicode-sets-regex": "^7.18.6", - "@babel/plugin-transform-arrow-functions": "^7.25.7", - "@babel/plugin-transform-async-generator-functions": "^7.25.8", - "@babel/plugin-transform-async-to-generator": "^7.25.7", - "@babel/plugin-transform-block-scoped-functions": "^7.25.7", - "@babel/plugin-transform-block-scoping": "^7.25.7", - "@babel/plugin-transform-class-properties": "^7.25.7", - "@babel/plugin-transform-class-static-block": "^7.25.8", - "@babel/plugin-transform-classes": "^7.25.7", - "@babel/plugin-transform-computed-properties": "^7.25.7", - "@babel/plugin-transform-destructuring": "^7.25.7", - "@babel/plugin-transform-dotall-regex": "^7.25.7", - "@babel/plugin-transform-duplicate-keys": "^7.25.7", - "@babel/plugin-transform-duplicate-named-capturing-groups-regex": "^7.25.7", - "@babel/plugin-transform-dynamic-import": "^7.25.8", - "@babel/plugin-transform-exponentiation-operator": "^7.25.7", - "@babel/plugin-transform-export-namespace-from": "^7.25.8", - "@babel/plugin-transform-for-of": "^7.25.7", - "@babel/plugin-transform-function-name": "^7.25.7", - "@babel/plugin-transform-json-strings": "^7.25.8", - "@babel/plugin-transform-literals": "^7.25.7", - "@babel/plugin-transform-logical-assignment-operators": "^7.25.8", - "@babel/plugin-transform-member-expression-literals": "^7.25.7", - "@babel/plugin-transform-modules-amd": "^7.25.7", - "@babel/plugin-transform-modules-commonjs": "^7.25.7", - "@babel/plugin-transform-modules-systemjs": "^7.25.7", - "@babel/plugin-transform-modules-umd": "^7.25.7", - "@babel/plugin-transform-named-capturing-groups-regex": "^7.25.7", - "@babel/plugin-transform-new-target": "^7.25.7", - "@babel/plugin-transform-nullish-coalescing-operator": "^7.25.8", - "@babel/plugin-transform-numeric-separator": "^7.25.8", - "@babel/plugin-transform-object-rest-spread": "^7.25.8", - "@babel/plugin-transform-object-super": "^7.25.7", - "@babel/plugin-transform-optional-catch-binding": "^7.25.8", - "@babel/plugin-transform-optional-chaining": "^7.25.8", - "@babel/plugin-transform-parameters": "^7.25.7", - "@babel/plugin-transform-private-methods": "^7.25.7", - "@babel/plugin-transform-private-property-in-object": "^7.25.8", - "@babel/plugin-transform-property-literals": "^7.25.7", - "@babel/plugin-transform-regenerator": "^7.25.7", - "@babel/plugin-transform-reserved-words": "^7.25.7", - "@babel/plugin-transform-shorthand-properties": "^7.25.7", - "@babel/plugin-transform-spread": "^7.25.7", - "@babel/plugin-transform-sticky-regex": "^7.25.7", - "@babel/plugin-transform-template-literals": "^7.25.7", - "@babel/plugin-transform-typeof-symbol": "^7.25.7", - "@babel/plugin-transform-unicode-escapes": "^7.25.7", - "@babel/plugin-transform-unicode-property-regex": "^7.25.7", - "@babel/plugin-transform-unicode-regex": "^7.25.7", - "@babel/plugin-transform-unicode-sets-regex": "^7.25.7", + "@babel/plugin-transform-arrow-functions": "^7.27.1", + "@babel/plugin-transform-async-generator-functions": "^7.28.0", + "@babel/plugin-transform-async-to-generator": "^7.27.1", + "@babel/plugin-transform-block-scoped-functions": "^7.27.1", + "@babel/plugin-transform-block-scoping": "^7.28.0", + "@babel/plugin-transform-class-properties": "^7.27.1", + "@babel/plugin-transform-class-static-block": "^7.28.3", + "@babel/plugin-transform-classes": "^7.28.3", + "@babel/plugin-transform-computed-properties": "^7.27.1", + "@babel/plugin-transform-destructuring": "^7.28.0", + "@babel/plugin-transform-dotall-regex": "^7.27.1", + "@babel/plugin-transform-duplicate-keys": "^7.27.1", + "@babel/plugin-transform-duplicate-named-capturing-groups-regex": "^7.27.1", + "@babel/plugin-transform-dynamic-import": "^7.27.1", + "@babel/plugin-transform-explicit-resource-management": "^7.28.0", + "@babel/plugin-transform-exponentiation-operator": "^7.27.1", + "@babel/plugin-transform-export-namespace-from": "^7.27.1", + "@babel/plugin-transform-for-of": "^7.27.1", + "@babel/plugin-transform-function-name": "^7.27.1", + "@babel/plugin-transform-json-strings": "^7.27.1", + "@babel/plugin-transform-literals": "^7.27.1", + "@babel/plugin-transform-logical-assignment-operators": "^7.27.1", + "@babel/plugin-transform-member-expression-literals": "^7.27.1", + "@babel/plugin-transform-modules-amd": "^7.27.1", + "@babel/plugin-transform-modules-commonjs": "^7.27.1", + "@babel/plugin-transform-modules-systemjs": "^7.27.1", + "@babel/plugin-transform-modules-umd": "^7.27.1", + "@babel/plugin-transform-named-capturing-groups-regex": "^7.27.1", + "@babel/plugin-transform-new-target": "^7.27.1", + "@babel/plugin-transform-nullish-coalescing-operator": "^7.27.1", + "@babel/plugin-transform-numeric-separator": "^7.27.1", + "@babel/plugin-transform-object-rest-spread": "^7.28.0", + "@babel/plugin-transform-object-super": "^7.27.1", + "@babel/plugin-transform-optional-catch-binding": "^7.27.1", + "@babel/plugin-transform-optional-chaining": "^7.27.1", + "@babel/plugin-transform-parameters": "^7.27.7", + "@babel/plugin-transform-private-methods": "^7.27.1", + "@babel/plugin-transform-private-property-in-object": "^7.27.1", + "@babel/plugin-transform-property-literals": "^7.27.1", + "@babel/plugin-transform-regenerator": "^7.28.3", + "@babel/plugin-transform-regexp-modifiers": "^7.27.1", + "@babel/plugin-transform-reserved-words": "^7.27.1", + "@babel/plugin-transform-shorthand-properties": "^7.27.1", + "@babel/plugin-transform-spread": "^7.27.1", + "@babel/plugin-transform-sticky-regex": "^7.27.1", + "@babel/plugin-transform-template-literals": "^7.27.1", + "@babel/plugin-transform-typeof-symbol": "^7.27.1", + "@babel/plugin-transform-unicode-escapes": "^7.27.1", + "@babel/plugin-transform-unicode-property-regex": "^7.27.1", + "@babel/plugin-transform-unicode-regex": "^7.27.1", + "@babel/plugin-transform-unicode-sets-regex": "^7.27.1", "@babel/preset-modules": "0.1.6-no-external-plugins", - "babel-plugin-polyfill-corejs2": "^0.4.10", - "babel-plugin-polyfill-corejs3": "^0.10.6", - "babel-plugin-polyfill-regenerator": "^0.6.1", - "core-js-compat": "^3.38.1", + "babel-plugin-polyfill-corejs2": "^0.4.14", + "babel-plugin-polyfill-corejs3": "^0.13.0", + "babel-plugin-polyfill-regenerator": "^0.6.5", + "core-js-compat": "^3.43.0", "semver": "^6.3.1" }, "engines": { @@ -3388,14 +3437,14 @@ } }, "node_modules/@compodoc/compodoc/node_modules/babel-plugin-polyfill-corejs3": { - "version": "0.10.6", - "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.10.6.tgz", - "integrity": "sha512-b37+KR2i/khY5sKmWNVQAnitvquQbNdWy6lJdsr0kmquCKEEUgMKK4SboVM3HtfnZilfjr4MMQ7vY58FVWDtIA==", + "version": "0.13.0", + "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.13.0.tgz", + "integrity": "sha512-U+GNwMdSFgzVmfhNm8GJUX88AadB3uo9KpJqS3FaqNIPKgySuvMb+bHPsOmmuWyIcuqZj/pzt1RUIUZns4y2+A==", "dev": true, "license": "MIT", "dependencies": { - "@babel/helper-define-polyfill-provider": "^0.6.2", - "core-js-compat": "^3.38.0" + "@babel/helper-define-polyfill-provider": "^0.6.5", + "core-js-compat": "^3.43.0" }, "peerDependencies": { "@babel/core": "^7.4.0 || ^8.0.0-0 <8.0.0" @@ -3408,166 +3457,145 @@ "dev": true, "license": "MIT" }, - "node_modules/@compodoc/compodoc/node_modules/glob": { - "version": "11.0.3", - "resolved": "https://registry.npmjs.org/glob/-/glob-11.0.3.tgz", - "integrity": "sha512-2Nim7dha1KVkaiF4q6Dj+ngPPMdfvLJEOpZk/jKiUAkqKebpGAWQXAq9z1xu9HKu5lWfqw/FASuccEjyznjPaA==", + "node_modules/@compodoc/compodoc/node_modules/emoji-regex": { + "version": "10.5.0", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-10.5.0.tgz", + "integrity": "sha512-lb49vf1Xzfx080OKA0o6l8DQQpV+6Vg95zyCJX9VB/BqKYlhG7N4wgROUUHRA+ZPUefLnteQOad7z1kT2bV7bg==", "dev": true, - "license": "ISC", - "dependencies": { - "foreground-child": "^3.3.1", - "jackspeak": "^4.1.1", - "minimatch": "^10.0.3", - "minipass": "^7.1.2", - "package-json-from-dist": "^1.0.0", - "path-scurry": "^2.0.0" - }, - "bin": { - "glob": "dist/esm/bin.mjs" - }, + "license": "MIT" + }, + "node_modules/@compodoc/compodoc/node_modules/is-interactive": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/is-interactive/-/is-interactive-2.0.0.tgz", + "integrity": "sha512-qP1vozQRI+BMOPcjFzrjXuQvdak2pHNUMZoeG2eRbiSqyvbEf/wQtEOTOX1guk6E3t36RkaqiSt8A/6YElNxLQ==", + "dev": true, + "license": "MIT", "engines": { - "node": "20 || >=22" + "node": ">=12" }, "funding": { - "url": "https://github.com/sponsors/isaacs" + "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/@compodoc/compodoc/node_modules/glob-parent": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz", - "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==", + "node_modules/@compodoc/compodoc/node_modules/is-unicode-supported": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/is-unicode-supported/-/is-unicode-supported-2.1.0.tgz", + "integrity": "sha512-mE00Gnza5EEB3Ds0HfMyllZzbBrmLOX3vfWoj9A9PEnTfratQ/BcaJOuMhnkhjXvb2+FkY3VuHqtAGpTPmglFQ==", "dev": true, - "license": "ISC", - "optional": true, - "peer": true, - "dependencies": { - "is-glob": "^4.0.1" - }, + "license": "MIT", "engines": { - "node": ">= 6" + "node": ">=18" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/@compodoc/compodoc/node_modules/jackspeak": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-4.1.1.tgz", - "integrity": "sha512-zptv57P3GpL+O0I7VdMJNBZCu+BPHVQUk55Ft8/QCJjTVxrnJHuVuX/0Bl2A6/+2oyR/ZMEuFKwmzqqZ/U5nPQ==", + "node_modules/@compodoc/compodoc/node_modules/log-symbols": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-6.0.0.tgz", + "integrity": "sha512-i24m8rpwhmPIS4zscNzK6MSEhk0DUWa/8iYQWxhffV8jkI4Phvs3F+quL5xvS0gdQR0FyTCMMH33Y78dDTzzIw==", "dev": true, - "license": "BlueOak-1.0.0", + "license": "MIT", "dependencies": { - "@isaacs/cliui": "^8.0.2" + "chalk": "^5.3.0", + "is-unicode-supported": "^1.3.0" }, "engines": { - "node": "20 || >=22" + "node": ">=18" }, "funding": { - "url": "https://github.com/sponsors/isaacs" + "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/@compodoc/compodoc/node_modules/lru-cache": { - "version": "11.1.0", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-11.1.0.tgz", - "integrity": "sha512-QIXZUBJUx+2zHUdQujWejBkcD9+cs94tLn0+YL8UrCh+D5sCXZ4c7LaEH48pNwRY3MLDgqUFyhlCyjJPf1WP0A==", + "node_modules/@compodoc/compodoc/node_modules/log-symbols/node_modules/is-unicode-supported": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/is-unicode-supported/-/is-unicode-supported-1.3.0.tgz", + "integrity": "sha512-43r2mRvz+8JRIKnWJ+3j8JtjRKZ6GmjzfaE/qiBJnikNnYv/6bagRJ1kUhNk8R5EX/GkobD+r+sfxCPJsiKBLQ==", "dev": true, - "license": "ISC", + "license": "MIT", "engines": { - "node": "20 || >=22" + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/@compodoc/compodoc/node_modules/magic-string": { - "version": "0.30.11", - "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.11.tgz", - "integrity": "sha512-+Wri9p0QHMy+545hKww7YAu5NyzF8iomPL/RQazugQ9+Ez4Ic3mERMd8ZTX5rfK944j+560ZJi8iAwgak1Ac7A==", + "node_modules/@compodoc/compodoc/node_modules/ora": { + "version": "8.2.0", + "resolved": "https://registry.npmjs.org/ora/-/ora-8.2.0.tgz", + "integrity": "sha512-weP+BZ8MVNnlCm8c0Qdc1WSWq4Qn7I+9CJGm7Qali6g44e/PUzbjNqJX5NJ9ljlNMosfJvg1fKEGILklK9cwnw==", "dev": true, "license": "MIT", "dependencies": { - "@jridgewell/sourcemap-codec": "^1.5.0" - } - }, - "node_modules/@compodoc/compodoc/node_modules/minimatch": { - "version": "10.0.3", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-10.0.3.tgz", - "integrity": "sha512-IPZ167aShDZZUMdRk66cyQAW3qr0WzbHkPdMYa8bzZhlHhO3jALbKdxcaak7W9FfT2rZNpQuUu4Od7ILEpXSaw==", - "dev": true, - "license": "ISC", - "dependencies": { - "@isaacs/brace-expansion": "^5.0.0" + "chalk": "^5.3.0", + "cli-cursor": "^5.0.0", + "cli-spinners": "^2.9.2", + "is-interactive": "^2.0.0", + "is-unicode-supported": "^2.0.0", + "log-symbols": "^6.0.0", + "stdin-discarder": "^0.2.2", + "string-width": "^7.2.0", + "strip-ansi": "^7.1.0" }, "engines": { - "node": "20 || >=22" + "node": ">=18" }, "funding": { - "url": "https://github.com/sponsors/isaacs" + "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/@compodoc/compodoc/node_modules/path-scurry": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-2.0.0.tgz", - "integrity": "sha512-ypGJsmGtdXUOeM5u93TyeIEfEhM6s+ljAhrk5vAvSx8uyY/02OvrZnA0YNGUrPXfpJMgI1ODd3nwz8Npx4O4cg==", + "node_modules/@compodoc/compodoc/node_modules/picomatch": { + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.3.tgz", + "integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==", "dev": true, - "license": "BlueOak-1.0.0", - "dependencies": { - "lru-cache": "^11.0.0", - "minipass": "^7.1.2" - }, + "license": "MIT", "engines": { - "node": "20 || >=22" + "node": ">=12" }, "funding": { - "url": "https://github.com/sponsors/isaacs" + "url": "https://github.com/sponsors/jonschlinkert" } }, - "node_modules/@compodoc/compodoc/node_modules/readdirp": { - "version": "3.6.0", - "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz", - "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==", + "node_modules/@compodoc/compodoc/node_modules/semver": { + "version": "7.7.2", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.2.tgz", + "integrity": "sha512-RF0Fw+rO5AMf9MAyaRXI4AV0Ulj5lMHqVxxdSgiVbixSCXoEmmX/jk0CuJw4+3SqroYO9VoUh+HcuJivvtJemA==", "dev": true, - "license": "MIT", - "optional": true, - "peer": true, - "dependencies": { - "picomatch": "^2.2.1" + "license": "ISC", + "bin": { + "semver": "bin/semver.js" }, "engines": { - "node": ">=8.10.0" + "node": ">=10" } }, - "node_modules/@compodoc/compodoc/node_modules/readdirp/node_modules/picomatch": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz", - "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==", + "node_modules/@compodoc/compodoc/node_modules/source-map": { + "version": "0.7.6", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.6.tgz", + "integrity": "sha512-i5uvt8C3ikiWeNZSVZNWcfZPItFQOsYTUAOkcUPGd8DqDy1uOUikjt5dG+uRlwyvR108Fb9DOd4GvXfT0N2/uQ==", "dev": true, - "license": "MIT", - "optional": true, - "peer": true, + "license": "BSD-3-Clause", "engines": { - "node": ">=8.6" - }, - "funding": { - "url": "https://github.com/sponsors/jonschlinkert" - } - }, - "node_modules/@compodoc/compodoc/node_modules/rxjs": { - "version": "7.8.1", - "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.8.1.tgz", - "integrity": "sha512-AA3TVj+0A2iuIoQkWEK/tqFjBq2j+6PO6Y0zJcvzLAFhEFIO3HL0vls9hWLncZbAAbK0mar7oZ4V079I/qPMxg==", - "dev": true, - "license": "Apache-2.0", - "dependencies": { - "tslib": "^2.1.0" + "node": ">= 12" } }, - "node_modules/@compodoc/compodoc/node_modules/uuid": { - "version": "10.0.0", - "resolved": "https://registry.npmjs.org/uuid/-/uuid-10.0.0.tgz", - "integrity": "sha512-8XkAphELsDnEGrDxUOHB3RGvXz6TeuYSGEZBOjtTtPm2lwhGBjLgOzLHB63IUWfBpNucQjND6d3AOudO+H3RWQ==", + "node_modules/@compodoc/compodoc/node_modules/string-width": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-7.2.0.tgz", + "integrity": "sha512-tsaTIkKW9b4N+AEj+SVA+WhJzV7/zMhcSu78mLKWSk7cXMOSHsBKFWUs0fWwq8QyK3MgJBQRX6Gbi4kYbdvGkQ==", "dev": true, - "funding": [ - "https://github.com/sponsors/broofa", - "https://github.com/sponsors/ctavan" - ], "license": "MIT", - "bin": { - "uuid": "dist/bin/uuid" + "dependencies": { + "emoji-regex": "^10.3.0", + "get-east-asian-width": "^1.0.0", + "strip-ansi": "^7.1.0" + }, + "engines": { + "node": ">=18" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" } }, "node_modules/@compodoc/live-server": { @@ -4187,9 +4215,9 @@ } }, "node_modules/@eslint-community/eslint-utils": { - "version": "4.7.0", - "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.7.0.tgz", - "integrity": "sha512-dyybb3AcajC7uha6CvhdVRJqaKyn7w2YKqKyAN37NKYgZT36w+iRb0Dymmc5qEJ549c/S31cMMSFd75bteCpCw==", + "version": "4.9.0", + "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.9.0.tgz", + "integrity": "sha512-ayVFHdtZ+hsq1t2Dy24wCmGXGe4q9Gu3smhLYALJrr473ZH27MsnSL+LKUlimp4BWJqMDMLmPpx/Q9R3OAlL4g==", "dev": true, "license": "MIT", "dependencies": { @@ -4360,9 +4388,9 @@ } }, "node_modules/@eslint/js": { - "version": "9.33.0", - "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.33.0.tgz", - "integrity": "sha512-5K1/mKhWaMfreBGJTwval43JJmkip0RmM+3+IuqupeSKNC/Th2Kc7ucaq5ovTSra/OOKB9c58CGSz3QMVbWt0A==", + "version": "9.36.0", + "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.36.0.tgz", + "integrity": "sha512-uhCbYtYynH30iZErszX78U+nR3pJU3RHGQ57NXy5QupD4SBVwDeU8TNBy+MjMngc1UyIW9noKqsRqfjQTBU2dw==", "dev": true, "license": "MIT", "engines": { @@ -4416,33 +4444,19 @@ } }, "node_modules/@humanfs/node": { - "version": "0.16.6", - "resolved": "https://registry.npmjs.org/@humanfs/node/-/node-0.16.6.tgz", - "integrity": "sha512-YuI2ZHQL78Q5HbhDiBA1X4LmYdXCKCMQIfw0pw7piHJwyREFebJUvrQN4cMssyES6x+vfUbx1CIpaQUKYdQZOw==", + "version": "0.16.7", + "resolved": "https://registry.npmjs.org/@humanfs/node/-/node-0.16.7.tgz", + "integrity": "sha512-/zUx+yOsIrG4Y43Eh2peDeKCxlRt/gET6aHfaKpuq267qXdYDFViVHfMaLyygZOnl0kGWxFIgsBy8QFuTLUXEQ==", "dev": true, "license": "Apache-2.0", "dependencies": { "@humanfs/core": "^0.19.1", - "@humanwhocodes/retry": "^0.3.0" + "@humanwhocodes/retry": "^0.4.0" }, "engines": { "node": ">=18.18.0" } }, - "node_modules/@humanfs/node/node_modules/@humanwhocodes/retry": { - "version": "0.3.1", - "resolved": "https://registry.npmjs.org/@humanwhocodes/retry/-/retry-0.3.1.tgz", - "integrity": "sha512-JBxkERygn7Bv/GbN5Rv8Ul6LVknS+5Bp6RgDC/O8gEBU/yeH5Ui5C/OlWrTb6qct7LjjfT6Re2NxB0ln0yYybA==", - "dev": true, - "license": "Apache-2.0", - "engines": { - "node": ">=18.18" - }, - "funding": { - "type": "github", - "url": "https://github.com/sponsors/nzakas" - } - }, "node_modules/@humanwhocodes/module-importer": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz", @@ -4471,17 +4485,27 @@ "url": "https://github.com/sponsors/nzakas" } }, + "node_modules/@inquirer/ansi": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/@inquirer/ansi/-/ansi-1.0.0.tgz", + "integrity": "sha512-JWaTfCxI1eTmJ1BIv86vUfjVatOdxwD0DAVKYevY8SazeUUZtW+tNbsdejVO1GYE0GXJW1N1ahmiC3TFd+7wZA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=18" + } + }, "node_modules/@inquirer/checkbox": { - "version": "4.2.1", - "resolved": "https://registry.npmjs.org/@inquirer/checkbox/-/checkbox-4.2.1.tgz", - "integrity": "sha512-bevKGO6kX1eM/N+pdh9leS5L7TBF4ICrzi9a+cbWkrxeAeIcwlo/7OfWGCDERdRCI2/Q6tjltX4bt07ALHDwFw==", + "version": "4.2.4", + "resolved": "https://registry.npmjs.org/@inquirer/checkbox/-/checkbox-4.2.4.tgz", + "integrity": "sha512-2n9Vgf4HSciFq8ttKXk+qy+GsyTXPV1An6QAwe/8bkbbqvG4VW1I/ZY1pNu2rf+h9bdzMLPbRSfcNxkHBy/Ydw==", "dev": true, "license": "MIT", "dependencies": { - "@inquirer/core": "^10.1.15", + "@inquirer/ansi": "^1.0.0", + "@inquirer/core": "^10.2.2", "@inquirer/figures": "^1.0.13", "@inquirer/type": "^3.0.8", - "ansi-escapes": "^4.3.2", "yoctocolors-cjs": "^2.1.2" }, "engines": { @@ -4519,15 +4543,15 @@ } }, "node_modules/@inquirer/core": { - "version": "10.1.15", - "resolved": "https://registry.npmjs.org/@inquirer/core/-/core-10.1.15.tgz", - "integrity": "sha512-8xrp836RZvKkpNbVvgWUlxjT4CraKk2q+I3Ksy+seI2zkcE+y6wNs1BVhgcv8VyImFecUhdQrYLdW32pAjwBdA==", + "version": "10.2.2", + "resolved": "https://registry.npmjs.org/@inquirer/core/-/core-10.2.2.tgz", + "integrity": "sha512-yXq/4QUnk4sHMtmbd7irwiepjB8jXU0kkFRL4nr/aDBA2mDz13cMakEWdDwX3eSCTkk03kwcndD1zfRAIlELxA==", "dev": true, "license": "MIT", "dependencies": { + "@inquirer/ansi": "^1.0.0", "@inquirer/figures": "^1.0.13", "@inquirer/type": "^3.0.8", - "ansi-escapes": "^4.3.2", "cli-width": "^4.1.0", "mute-stream": "^2.0.0", "signal-exit": "^4.1.0", @@ -4547,14 +4571,14 @@ } }, "node_modules/@inquirer/editor": { - "version": "4.2.17", - "resolved": "https://registry.npmjs.org/@inquirer/editor/-/editor-4.2.17.tgz", - "integrity": "sha512-r6bQLsyPSzbWrZZ9ufoWL+CztkSatnJ6uSxqd6N+o41EZC51sQeWOzI6s5jLb+xxTWxl7PlUppqm8/sow241gg==", + "version": "4.2.20", + "resolved": "https://registry.npmjs.org/@inquirer/editor/-/editor-4.2.20.tgz", + "integrity": "sha512-7omh5y5bK672Q+Brk4HBbnHNowOZwrb/78IFXdrEB9PfdxL3GudQyDk8O9vQ188wj3xrEebS2M9n18BjJoI83g==", "dev": true, "license": "MIT", "dependencies": { - "@inquirer/core": "^10.1.15", - "@inquirer/external-editor": "^1.0.1", + "@inquirer/core": "^10.2.2", + "@inquirer/external-editor": "^1.0.2", "@inquirer/type": "^3.0.8" }, "engines": { @@ -4570,13 +4594,13 @@ } }, "node_modules/@inquirer/expand": { - "version": "4.0.17", - "resolved": "https://registry.npmjs.org/@inquirer/expand/-/expand-4.0.17.tgz", - "integrity": "sha512-PSqy9VmJx/VbE3CT453yOfNa+PykpKg/0SYP7odez1/NWBGuDXgPhp4AeGYYKjhLn5lUUavVS/JbeYMPdH50Mw==", + "version": "4.0.20", + "resolved": "https://registry.npmjs.org/@inquirer/expand/-/expand-4.0.20.tgz", + "integrity": "sha512-Dt9S+6qUg94fEvgn54F2Syf0Z3U8xmnBI9ATq2f5h9xt09fs2IJXSCIXyyVHwvggKWFXEY/7jATRo2K6Dkn6Ow==", "dev": true, "license": "MIT", "dependencies": { - "@inquirer/core": "^10.1.15", + "@inquirer/core": "^10.2.2", "@inquirer/type": "^3.0.8", "yoctocolors-cjs": "^2.1.2" }, @@ -4593,14 +4617,14 @@ } }, "node_modules/@inquirer/external-editor": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/@inquirer/external-editor/-/external-editor-1.0.1.tgz", - "integrity": "sha512-Oau4yL24d2B5IL4ma4UpbQigkVhzPDXLoqy1ggK4gnHg/stmkffJE4oOXHXF3uz0UEpywG68KcyXsyYpA1Re/Q==", + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/@inquirer/external-editor/-/external-editor-1.0.2.tgz", + "integrity": "sha512-yy9cOoBnx58TlsPrIxauKIFQTiyH+0MK4e97y4sV9ERbI+zDxw7i2hxHLCIEGIE/8PPvDxGhgzIOTSOWcs6/MQ==", "dev": true, "license": "MIT", "dependencies": { "chardet": "^2.1.0", - "iconv-lite": "^0.6.3" + "iconv-lite": "^0.7.0" }, "engines": { "node": ">=18" @@ -4625,13 +4649,13 @@ } }, "node_modules/@inquirer/input": { - "version": "4.2.1", - "resolved": "https://registry.npmjs.org/@inquirer/input/-/input-4.2.1.tgz", - "integrity": "sha512-tVC+O1rBl0lJpoUZv4xY+WGWY8V5b0zxU1XDsMsIHYregdh7bN5X5QnIONNBAl0K765FYlAfNHS2Bhn7SSOVow==", + "version": "4.2.4", + "resolved": "https://registry.npmjs.org/@inquirer/input/-/input-4.2.4.tgz", + "integrity": "sha512-cwSGpLBMwpwcZZsc6s1gThm0J+it/KIJ+1qFL2euLmSKUMGumJ5TcbMgxEjMjNHRGadouIYbiIgruKoDZk7klw==", "dev": true, "license": "MIT", "dependencies": { - "@inquirer/core": "^10.1.15", + "@inquirer/core": "^10.2.2", "@inquirer/type": "^3.0.8" }, "engines": { @@ -4647,13 +4671,13 @@ } }, "node_modules/@inquirer/number": { - "version": "3.0.17", - "resolved": "https://registry.npmjs.org/@inquirer/number/-/number-3.0.17.tgz", - "integrity": "sha512-GcvGHkyIgfZgVnnimURdOueMk0CztycfC8NZTiIY9arIAkeOgt6zG57G+7vC59Jns3UX27LMkPKnKWAOF5xEYg==", + "version": "3.0.20", + "resolved": "https://registry.npmjs.org/@inquirer/number/-/number-3.0.20.tgz", + "integrity": "sha512-bbooay64VD1Z6uMfNehED2A2YOPHSJnQLs9/4WNiV/EK+vXczf/R988itL2XLDGTgmhMF2KkiWZo+iEZmc4jqg==", "dev": true, "license": "MIT", "dependencies": { - "@inquirer/core": "^10.1.15", + "@inquirer/core": "^10.2.2", "@inquirer/type": "^3.0.8" }, "engines": { @@ -4669,15 +4693,15 @@ } }, "node_modules/@inquirer/password": { - "version": "4.0.17", - "resolved": "https://registry.npmjs.org/@inquirer/password/-/password-4.0.17.tgz", - "integrity": "sha512-DJolTnNeZ00E1+1TW+8614F7rOJJCM4y4BAGQ3Gq6kQIG+OJ4zr3GLjIjVVJCbKsk2jmkmv6v2kQuN/vriHdZA==", + "version": "4.0.20", + "resolved": "https://registry.npmjs.org/@inquirer/password/-/password-4.0.20.tgz", + "integrity": "sha512-nxSaPV2cPvvoOmRygQR+h0B+Av73B01cqYLcr7NXcGXhbmsYfUb8fDdw2Us1bI2YsX+VvY7I7upgFYsyf8+Nug==", "dev": true, "license": "MIT", "dependencies": { - "@inquirer/core": "^10.1.15", - "@inquirer/type": "^3.0.8", - "ansi-escapes": "^4.3.2" + "@inquirer/ansi": "^1.0.0", + "@inquirer/core": "^10.2.2", + "@inquirer/type": "^3.0.8" }, "engines": { "node": ">=18" @@ -4722,13 +4746,13 @@ } }, "node_modules/@inquirer/rawlist": { - "version": "4.1.5", - "resolved": "https://registry.npmjs.org/@inquirer/rawlist/-/rawlist-4.1.5.tgz", - "integrity": "sha512-R5qMyGJqtDdi4Ht521iAkNqyB6p2UPuZUbMifakg1sWtu24gc2Z8CJuw8rP081OckNDMgtDCuLe42Q2Kr3BolA==", + "version": "4.1.8", + "resolved": "https://registry.npmjs.org/@inquirer/rawlist/-/rawlist-4.1.8.tgz", + "integrity": "sha512-CQ2VkIASbgI2PxdzlkeeieLRmniaUU1Aoi5ggEdm6BIyqopE9GuDXdDOj9XiwOqK5qm72oI2i6J+Gnjaa26ejg==", "dev": true, "license": "MIT", "dependencies": { - "@inquirer/core": "^10.1.15", + "@inquirer/core": "^10.2.2", "@inquirer/type": "^3.0.8", "yoctocolors-cjs": "^2.1.2" }, @@ -4745,13 +4769,13 @@ } }, "node_modules/@inquirer/search": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/@inquirer/search/-/search-3.1.0.tgz", - "integrity": "sha512-PMk1+O/WBcYJDq2H7foV0aAZSmDdkzZB9Mw2v/DmONRJopwA/128cS9M/TXWLKKdEQKZnKwBzqu2G4x/2Nqx8Q==", + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/@inquirer/search/-/search-3.1.3.tgz", + "integrity": "sha512-D5T6ioybJJH0IiSUK/JXcoRrrm8sXwzrVMjibuPs+AgxmogKslaafy1oxFiorNI4s3ElSkeQZbhYQgLqiL8h6Q==", "dev": true, "license": "MIT", "dependencies": { - "@inquirer/core": "^10.1.15", + "@inquirer/core": "^10.2.2", "@inquirer/figures": "^1.0.13", "@inquirer/type": "^3.0.8", "yoctocolors-cjs": "^2.1.2" @@ -4769,16 +4793,16 @@ } }, "node_modules/@inquirer/select": { - "version": "4.3.1", - "resolved": "https://registry.npmjs.org/@inquirer/select/-/select-4.3.1.tgz", - "integrity": "sha512-Gfl/5sqOF5vS/LIrSndFgOh7jgoe0UXEizDqahFRkq5aJBLegZ6WjuMh/hVEJwlFQjyLq1z9fRtvUMkb7jM1LA==", + "version": "4.3.4", + "resolved": "https://registry.npmjs.org/@inquirer/select/-/select-4.3.4.tgz", + "integrity": "sha512-Qp20nySRmfbuJBBsgPU7E/cL62Hf250vMZRzYDcBHty2zdD1kKCnoDFWRr0WO2ZzaXp3R7a4esaVGJUx0E6zvA==", "dev": true, "license": "MIT", "dependencies": { - "@inquirer/core": "^10.1.15", + "@inquirer/ansi": "^1.0.0", + "@inquirer/core": "^10.2.2", "@inquirer/figures": "^1.0.13", "@inquirer/type": "^3.0.8", - "ansi-escapes": "^4.3.2", "yoctocolors-cjs": "^2.1.2" }, "engines": { @@ -4853,9 +4877,9 @@ } }, "node_modules/@isaacs/cliui/node_modules/ansi-styles": { - "version": "6.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.1.tgz", - "integrity": "sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==", + "version": "6.2.3", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.3.tgz", + "integrity": "sha512-4Dj6M28JB+oAH8kFkTLUo+a2jwOFkuqb3yucU0CANcRRUbxS0cP0nZYCGjcc3BNXwRIsUVmDGgzawme7zvJHvg==", "dev": true, "license": "MIT", "engines": { @@ -5630,6 +5654,17 @@ "@jridgewell/trace-mapping": "^0.3.24" } }, + "node_modules/@jridgewell/remapping": { + "version": "2.3.5", + "resolved": "https://registry.npmjs.org/@jridgewell/remapping/-/remapping-2.3.5.tgz", + "integrity": "sha512-LI9u/+laYG4Ds1TDKSJW2YPrIlcVYOwi2fUC6xB43lueCjgxV4lffOCZCtYFiH6TNOX+tQKXx97T4IKHbhyHEQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "@jridgewell/gen-mapping": "^0.3.5", + "@jridgewell/trace-mapping": "^0.3.24" + } + }, "node_modules/@jridgewell/resolve-uri": { "version": "3.1.2", "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.2.tgz", @@ -5659,9 +5694,9 @@ "license": "MIT" }, "node_modules/@jridgewell/trace-mapping": { - "version": "0.3.30", - "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.30.tgz", - "integrity": "sha512-GQ7Nw5G2lTu/BtHTKfXhKHok2WGetd4XYcVKGx00SjAk8GMwgJM3zr6zORiPGuOE+/vkc90KtTosSSvaCjKb2Q==", + "version": "0.3.31", + "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.31.tgz", + "integrity": "sha512-zzNR+SdQSDJzc8joaeP8QQoCQr8NuYx2dIIytl1QeBEZHJ9uW6hebsrYgbz8hJwUQao3TWCMtmfV8Nu1twOLAw==", "dev": true, "license": "MIT", "dependencies": { @@ -5721,9 +5756,9 @@ } }, "node_modules/@jsonjoy.com/json-pack": { - "version": "1.10.0", - "resolved": "https://registry.npmjs.org/@jsonjoy.com/json-pack/-/json-pack-1.10.0.tgz", - "integrity": "sha512-PMOU9Sh0baiLZEDewwR/YAHJBV2D8pPIzcFQSU7HQl/k/HNCDyVfO1OvkyDwBGp4dPtvZc7Hl9FFYWwTP1CbZw==", + "version": "1.14.0", + "resolved": "https://registry.npmjs.org/@jsonjoy.com/json-pack/-/json-pack-1.14.0.tgz", + "integrity": "sha512-LpWbYgVnKzphN5S6uss4M25jJ/9+m6q6UJoeN6zTkK4xAGhKsiBRPVeF7OYMWonn5repMQbE5vieRXcMUrKDKw==", "dev": true, "license": "Apache-2.0", "dependencies": { @@ -5747,13 +5782,14 @@ } }, "node_modules/@jsonjoy.com/json-pointer": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/@jsonjoy.com/json-pointer/-/json-pointer-1.0.1.tgz", - "integrity": "sha512-tJpwQfuBuxqZlyoJOSZcqf7OUmiYQ6MiPNmOv4KbZdXE/DdvBSSAwhos0zIlJU/AXxC8XpuO8p08bh2fIl+RKA==", + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/@jsonjoy.com/json-pointer/-/json-pointer-1.0.2.tgz", + "integrity": "sha512-Fsn6wM2zlDzY1U+v4Nc8bo3bVqgfNTGcn6dMgs6FjrEnt4ZCe60o6ByKRjOGlI2gow0aE/Q41QOigdTqkyK5fg==", "dev": true, "license": "Apache-2.0", "dependencies": { - "@jsonjoy.com/util": "^1.3.0" + "@jsonjoy.com/codegen": "^1.0.0", + "@jsonjoy.com/util": "^1.9.0" }, "engines": { "node": ">=10.0" @@ -6008,9 +6044,9 @@ ] }, "node_modules/@napi-rs/nice": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/@napi-rs/nice/-/nice-1.0.4.tgz", - "integrity": "sha512-Sqih1YARrmMoHlXGgI9JrrgkzxcaaEso0AH+Y7j8NHonUs+xe4iDsgC3IBIDNdzEewbNpccNN6hip+b5vmyRLw==", + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/@napi-rs/nice/-/nice-1.1.1.tgz", + "integrity": "sha512-xJIPs+bYuc9ASBl+cvGsKbGrJmS6fAKaSZCnT0lhahT5rhA2VVy9/EcIgd2JhtEuFOJNx7UHNn/qiTPTY4nrQw==", "dev": true, "license": "MIT", "optional": true, @@ -6022,28 +6058,29 @@ "url": "https://github.com/sponsors/Brooooooklyn" }, "optionalDependencies": { - "@napi-rs/nice-android-arm-eabi": "1.0.4", - "@napi-rs/nice-android-arm64": "1.0.4", - "@napi-rs/nice-darwin-arm64": "1.0.4", - "@napi-rs/nice-darwin-x64": "1.0.4", - "@napi-rs/nice-freebsd-x64": "1.0.4", - "@napi-rs/nice-linux-arm-gnueabihf": "1.0.4", - "@napi-rs/nice-linux-arm64-gnu": "1.0.4", - "@napi-rs/nice-linux-arm64-musl": "1.0.4", - "@napi-rs/nice-linux-ppc64-gnu": "1.0.4", - "@napi-rs/nice-linux-riscv64-gnu": "1.0.4", - "@napi-rs/nice-linux-s390x-gnu": "1.0.4", - "@napi-rs/nice-linux-x64-gnu": "1.0.4", - "@napi-rs/nice-linux-x64-musl": "1.0.4", - "@napi-rs/nice-win32-arm64-msvc": "1.0.4", - "@napi-rs/nice-win32-ia32-msvc": "1.0.4", - "@napi-rs/nice-win32-x64-msvc": "1.0.4" + "@napi-rs/nice-android-arm-eabi": "1.1.1", + "@napi-rs/nice-android-arm64": "1.1.1", + "@napi-rs/nice-darwin-arm64": "1.1.1", + "@napi-rs/nice-darwin-x64": "1.1.1", + "@napi-rs/nice-freebsd-x64": "1.1.1", + "@napi-rs/nice-linux-arm-gnueabihf": "1.1.1", + "@napi-rs/nice-linux-arm64-gnu": "1.1.1", + "@napi-rs/nice-linux-arm64-musl": "1.1.1", + "@napi-rs/nice-linux-ppc64-gnu": "1.1.1", + "@napi-rs/nice-linux-riscv64-gnu": "1.1.1", + "@napi-rs/nice-linux-s390x-gnu": "1.1.1", + "@napi-rs/nice-linux-x64-gnu": "1.1.1", + "@napi-rs/nice-linux-x64-musl": "1.1.1", + "@napi-rs/nice-openharmony-arm64": "1.1.1", + "@napi-rs/nice-win32-arm64-msvc": "1.1.1", + "@napi-rs/nice-win32-ia32-msvc": "1.1.1", + "@napi-rs/nice-win32-x64-msvc": "1.1.1" } }, "node_modules/@napi-rs/nice-android-arm-eabi": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/@napi-rs/nice-android-arm-eabi/-/nice-android-arm-eabi-1.0.4.tgz", - "integrity": "sha512-OZFMYUkih4g6HCKTjqJHhMUlgvPiDuSLZPbPBWHLjKmFTv74COzRlq/gwHtmEVaR39mJQ6ZyttDl2HNMUbLVoA==", + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/@napi-rs/nice-android-arm-eabi/-/nice-android-arm-eabi-1.1.1.tgz", + "integrity": "sha512-kjirL3N6TnRPv5iuHw36wnucNqXAO46dzK9oPb0wj076R5Xm8PfUVA9nAFB5ZNMmfJQJVKACAPd/Z2KYMppthw==", "cpu": [ "arm" ], @@ -6058,9 +6095,9 @@ } }, "node_modules/@napi-rs/nice-android-arm64": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/@napi-rs/nice-android-arm64/-/nice-android-arm64-1.0.4.tgz", - "integrity": "sha512-k8u7cjeA64vQWXZcRrPbmwjH8K09CBnNaPnI9L1D5N6iMPL3XYQzLcN6WwQonfcqCDv5OCY3IqX89goPTV4KMw==", + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/@napi-rs/nice-android-arm64/-/nice-android-arm64-1.1.1.tgz", + "integrity": "sha512-blG0i7dXgbInN5urONoUCNf+DUEAavRffrO7fZSeoRMJc5qD+BJeNcpr54msPF6qfDD6kzs9AQJogZvT2KD5nw==", "cpu": [ "arm64" ], @@ -6075,9 +6112,9 @@ } }, "node_modules/@napi-rs/nice-darwin-arm64": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/@napi-rs/nice-darwin-arm64/-/nice-darwin-arm64-1.0.4.tgz", - "integrity": "sha512-GsLdQvUcuVzoyzmtjsThnpaVEizAqH5yPHgnsBmq3JdVoVZHELFo7PuJEdfOH1DOHi2mPwB9sCJEstAYf3XCJA==", + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/@napi-rs/nice-darwin-arm64/-/nice-darwin-arm64-1.1.1.tgz", + "integrity": "sha512-s/E7w45NaLqTGuOjC2p96pct4jRfo61xb9bU1unM/MJ/RFkKlJyJDx7OJI/O0ll/hrfpqKopuAFDV8yo0hfT7A==", "cpu": [ "arm64" ], @@ -6092,9 +6129,9 @@ } }, "node_modules/@napi-rs/nice-darwin-x64": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/@napi-rs/nice-darwin-x64/-/nice-darwin-x64-1.0.4.tgz", - "integrity": "sha512-1y3gyT3e5zUY5SxRl3QDtJiWVsbkmhtUHIYwdWWIQ3Ia+byd/IHIEpqAxOGW1nhhnIKfTCuxBadHQb+yZASVoA==", + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/@napi-rs/nice-darwin-x64/-/nice-darwin-x64-1.1.1.tgz", + "integrity": "sha512-dGoEBnVpsdcC+oHHmW1LRK5eiyzLwdgNQq3BmZIav+9/5WTZwBYX7r5ZkQC07Nxd3KHOCkgbHSh4wPkH1N1LiQ==", "cpu": [ "x64" ], @@ -6109,9 +6146,9 @@ } }, "node_modules/@napi-rs/nice-freebsd-x64": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/@napi-rs/nice-freebsd-x64/-/nice-freebsd-x64-1.0.4.tgz", - "integrity": "sha512-06oXzESPRdXUuzS8n2hGwhM2HACnDfl3bfUaSqLGImM8TA33pzDXgGL0e3If8CcFWT98aHows5Lk7xnqYNGFeA==", + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/@napi-rs/nice-freebsd-x64/-/nice-freebsd-x64-1.1.1.tgz", + "integrity": "sha512-kHv4kEHAylMYmlNwcQcDtXjklYp4FCf0b05E+0h6nDHsZ+F0bDe04U/tXNOqrx5CmIAth4vwfkjjUmp4c4JktQ==", "cpu": [ "x64" ], @@ -6126,9 +6163,9 @@ } }, "node_modules/@napi-rs/nice-linux-arm-gnueabihf": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/@napi-rs/nice-linux-arm-gnueabihf/-/nice-linux-arm-gnueabihf-1.0.4.tgz", - "integrity": "sha512-CgklZ6g8WL4+EgVVkxkEvvsi2DSLf9QIloxWO0fvQyQBp6VguUSX3eHLeRpqwW8cRm2Hv/Q1+PduNk7VK37VZw==", + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/@napi-rs/nice-linux-arm-gnueabihf/-/nice-linux-arm-gnueabihf-1.1.1.tgz", + "integrity": "sha512-E1t7K0efyKXZDoZg1LzCOLxgolxV58HCkaEkEvIYQx12ht2pa8hoBo+4OB3qh7e+QiBlp1SRf+voWUZFxyhyqg==", "cpu": [ "arm" ], @@ -6143,9 +6180,9 @@ } }, "node_modules/@napi-rs/nice-linux-arm64-gnu": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/@napi-rs/nice-linux-arm64-gnu/-/nice-linux-arm64-gnu-1.0.4.tgz", - "integrity": "sha512-wdAJ7lgjhAlsANUCv0zi6msRwq+D4KDgU+GCCHssSxWmAERZa2KZXO0H2xdmoJ/0i03i6YfK/sWaZgUAyuW2oQ==", + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/@napi-rs/nice-linux-arm64-gnu/-/nice-linux-arm64-gnu-1.1.1.tgz", + "integrity": "sha512-CIKLA12DTIZlmTaaKhQP88R3Xao+gyJxNWEn04wZwC2wmRapNnxCUZkVwggInMJvtVElA+D4ZzOU5sX4jV+SmQ==", "cpu": [ "arm64" ], @@ -6160,9 +6197,9 @@ } }, "node_modules/@napi-rs/nice-linux-arm64-musl": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/@napi-rs/nice-linux-arm64-musl/-/nice-linux-arm64-musl-1.0.4.tgz", - "integrity": "sha512-4b1KYG+sriufhFrpUS9uNOEYYJqSfcbnwGx6uGX7JjrH8tELG90cOpCawz5THNIwlS3DhLgnCOcn0+4p6z26QA==", + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/@napi-rs/nice-linux-arm64-musl/-/nice-linux-arm64-musl-1.1.1.tgz", + "integrity": "sha512-+2Rzdb3nTIYZ0YJF43qf2twhqOCkiSrHx2Pg6DJaCPYhhaxbLcdlV8hCRMHghQ+EtZQWGNcS2xF4KxBhSGeutg==", "cpu": [ "arm64" ], @@ -6177,9 +6214,9 @@ } }, "node_modules/@napi-rs/nice-linux-ppc64-gnu": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/@napi-rs/nice-linux-ppc64-gnu/-/nice-linux-ppc64-gnu-1.0.4.tgz", - "integrity": "sha512-iaf3vMRgr23oe1PUaKpxaH3DS0IMN0+N9iEiWVwYPm/U15vZFYdqVegGfN2PzrZLUl5lc8ZxbmEKDfuqslhAMA==", + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/@napi-rs/nice-linux-ppc64-gnu/-/nice-linux-ppc64-gnu-1.1.1.tgz", + "integrity": "sha512-4FS8oc0GeHpwvv4tKciKkw3Y4jKsL7FRhaOeiPei0X9T4Jd619wHNe4xCLmN2EMgZoeGg+Q7GY7BsvwKpL22Tg==", "cpu": [ "ppc64" ], @@ -6194,9 +6231,9 @@ } }, "node_modules/@napi-rs/nice-linux-riscv64-gnu": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/@napi-rs/nice-linux-riscv64-gnu/-/nice-linux-riscv64-gnu-1.0.4.tgz", - "integrity": "sha512-UXoREY6Yw6rHrGuTwQgBxpfjK34t6mTjibE9/cXbefL9AuUCJ9gEgwNKZiONuR5QGswChqo9cnthjdKkYyAdDg==", + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/@napi-rs/nice-linux-riscv64-gnu/-/nice-linux-riscv64-gnu-1.1.1.tgz", + "integrity": "sha512-HU0nw9uD4FO/oGCCk409tCi5IzIZpH2agE6nN4fqpwVlCn5BOq0MS1dXGjXaG17JaAvrlpV5ZeyZwSon10XOXw==", "cpu": [ "riscv64" ], @@ -6211,9 +6248,9 @@ } }, "node_modules/@napi-rs/nice-linux-s390x-gnu": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/@napi-rs/nice-linux-s390x-gnu/-/nice-linux-s390x-gnu-1.0.4.tgz", - "integrity": "sha512-eFbgYCRPmsqbYPAlLYU5hYTNbogmIDUvknilehHsFhCH1+0/kN87lP+XaLT0Yeq4V/rpwChSd9vlz4muzFArtw==", + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/@napi-rs/nice-linux-s390x-gnu/-/nice-linux-s390x-gnu-1.1.1.tgz", + "integrity": "sha512-2YqKJWWl24EwrX0DzCQgPLKQBxYDdBxOHot1KWEq7aY2uYeX+Uvtv4I8xFVVygJDgf6/92h9N3Y43WPx8+PAgQ==", "cpu": [ "s390x" ], @@ -6228,9 +6265,9 @@ } }, "node_modules/@napi-rs/nice-linux-x64-gnu": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/@napi-rs/nice-linux-x64-gnu/-/nice-linux-x64-gnu-1.0.4.tgz", - "integrity": "sha512-4T3E6uTCwWT6IPnwuPcWVz3oHxvEp/qbrCxZhsgzwTUBEwu78EGNXGdHfKJQt3soth89MLqZJw+Zzvnhrsg1mQ==", + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/@napi-rs/nice-linux-x64-gnu/-/nice-linux-x64-gnu-1.1.1.tgz", + "integrity": "sha512-/gaNz3R92t+dcrfCw/96pDopcmec7oCcAQ3l/M+Zxr82KT4DljD37CpgrnXV+pJC263JkW572pdbP3hP+KjcIg==", "cpu": [ "x64" ], @@ -6245,9 +6282,9 @@ } }, "node_modules/@napi-rs/nice-linux-x64-musl": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/@napi-rs/nice-linux-x64-musl/-/nice-linux-x64-musl-1.0.4.tgz", - "integrity": "sha512-NtbBkAeyBPLvCBkWtwkKXkNSn677eaT0cX3tygq+2qVv71TmHgX4gkX6o9BXjlPzdgPGwrUudavCYPT9tzkEqQ==", + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/@napi-rs/nice-linux-x64-musl/-/nice-linux-x64-musl-1.1.1.tgz", + "integrity": "sha512-xScCGnyj/oppsNPMnevsBe3pvNaoK7FGvMjT35riz9YdhB2WtTG47ZlbxtOLpjeO9SqqQ2J2igCmz6IJOD5JYw==", "cpu": [ "x64" ], @@ -6261,10 +6298,27 @@ "node": ">= 10" } }, + "node_modules/@napi-rs/nice-openharmony-arm64": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/@napi-rs/nice-openharmony-arm64/-/nice-openharmony-arm64-1.1.1.tgz", + "integrity": "sha512-6uJPRVwVCLDeoOaNyeiW0gp2kFIM4r7PL2MczdZQHkFi9gVlgm+Vn+V6nTWRcu856mJ2WjYJiumEajfSm7arPQ==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "openharmony" + ], + "engines": { + "node": ">= 10" + } + }, "node_modules/@napi-rs/nice-win32-arm64-msvc": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/@napi-rs/nice-win32-arm64-msvc/-/nice-win32-arm64-msvc-1.0.4.tgz", - "integrity": "sha512-vubOe3i+YtSJGEk/++73y+TIxbuVHi+W8ZzrRm2eETCjCRwNlgbfToQZ85dSA+4iBB/NJRGNp+O4hfdbbttZWA==", + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/@napi-rs/nice-win32-arm64-msvc/-/nice-win32-arm64-msvc-1.1.1.tgz", + "integrity": "sha512-uoTb4eAvM5B2aj/z8j+Nv8OttPf2m+HVx3UjA5jcFxASvNhQriyCQF1OB1lHL43ZhW+VwZlgvjmP5qF3+59atA==", "cpu": [ "arm64" ], @@ -6279,9 +6333,9 @@ } }, "node_modules/@napi-rs/nice-win32-ia32-msvc": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/@napi-rs/nice-win32-ia32-msvc/-/nice-win32-ia32-msvc-1.0.4.tgz", - "integrity": "sha512-BMOVrUDZeg1RNRKVlh4eyLv5djAAVLiSddfpuuQ47EFjBcklg0NUeKMFKNrKQR4UnSn4HAiACLD7YK7koskwmg==", + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/@napi-rs/nice-win32-ia32-msvc/-/nice-win32-ia32-msvc-1.1.1.tgz", + "integrity": "sha512-CNQqlQT9MwuCsg1Vd/oKXiuH+TcsSPJmlAFc5frFyX/KkOh0UpBLEj7aoY656d5UKZQMQFP7vJNa1DNUNORvug==", "cpu": [ "ia32" ], @@ -6296,9 +6350,9 @@ } }, "node_modules/@napi-rs/nice-win32-x64-msvc": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/@napi-rs/nice-win32-x64-msvc/-/nice-win32-x64-msvc-1.0.4.tgz", - "integrity": "sha512-kCNk6HcRZquhw/whwh4rHsdPyOSCQCgnVDVik+Y9cuSVTDy3frpiCJTScJqPPS872h4JgZKkr/+CwcwttNEo9Q==", + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/@napi-rs/nice-win32-x64-msvc/-/nice-win32-x64-msvc-1.1.1.tgz", + "integrity": "sha512-vB+4G/jBQCAh0jelMTY3+kgFy00Hlx2f2/1zjMoH821IbplbWZOkLiTYXQkygNTzQJTq5cvwBDgn2ppHD+bglQ==", "cpu": [ "x64" ], @@ -6313,9 +6367,9 @@ } }, "node_modules/@ngtools/webpack": { - "version": "19.2.15", - "resolved": "https://registry.npmjs.org/@ngtools/webpack/-/webpack-19.2.15.tgz", - "integrity": "sha512-H37nop/wWMkSgoU2VvrMzanHePdLRRrX52nC5tT2ZhH3qP25+PrnMyw11PoLDLv3iWXC68uB1AiKNIT+jiQbuQ==", + "version": "19.2.17", + "resolved": "https://registry.npmjs.org/@ngtools/webpack/-/webpack-19.2.17.tgz", + "integrity": "sha512-HpbOLwS8tIW041UXcMqwfySqpZ9ztObH8U4NWKwjPBe0S5UDnF6doW2rS3GQm71hkiuB8sqbxOWz5I/NNvZFNQ==", "dev": true, "license": "MIT", "engines": { @@ -6561,45 +6615,106 @@ "npm-normalize-package-bin": "^4.0.0" }, "bin": { - "installed-package-contents": "bin/index.js" + "installed-package-contents": "bin/index.js" + }, + "engines": { + "node": "^18.17.0 || >=20.5.0" + } + }, + "node_modules/@npmcli/node-gyp": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/@npmcli/node-gyp/-/node-gyp-4.0.0.tgz", + "integrity": "sha512-+t5DZ6mO/QFh78PByMq1fGSAub/agLJZDRfJRMeOSNCt8s9YVlTjmGpIPwPhvXTGUIJk+WszlT0rQa1W33yzNA==", + "dev": true, + "license": "ISC", + "engines": { + "node": "^18.17.0 || >=20.5.0" + } + }, + "node_modules/@npmcli/package-json": { + "version": "6.2.0", + "resolved": "https://registry.npmjs.org/@npmcli/package-json/-/package-json-6.2.0.tgz", + "integrity": "sha512-rCNLSB/JzNvot0SEyXqWZ7tX2B5dD2a1br2Dp0vSYVo5jh8Z0EZ7lS9TsZ1UtziddB1UfNUaMCc538/HztnJGA==", + "dev": true, + "license": "ISC", + "dependencies": { + "@npmcli/git": "^6.0.0", + "glob": "^10.2.2", + "hosted-git-info": "^8.0.0", + "json-parse-even-better-errors": "^4.0.0", + "proc-log": "^5.0.0", + "semver": "^7.5.3", + "validate-npm-package-license": "^3.0.4" + }, + "engines": { + "node": "^18.17.0 || >=20.5.0" + } + }, + "node_modules/@npmcli/package-json/node_modules/glob": { + "version": "10.4.5", + "resolved": "https://registry.npmjs.org/glob/-/glob-10.4.5.tgz", + "integrity": "sha512-7Bv8RF0k6xjo7d4A/PxYLbUCfb6c+Vpd2/mB2yRDlew7Jb5hEXiCD9ibfO7wpk8i4sevK6DFny9h7EYbM3/sHg==", + "dev": true, + "license": "ISC", + "dependencies": { + "foreground-child": "^3.1.0", + "jackspeak": "^3.1.2", + "minimatch": "^9.0.4", + "minipass": "^7.1.2", + "package-json-from-dist": "^1.0.0", + "path-scurry": "^1.11.1" + }, + "bin": { + "glob": "dist/esm/bin.mjs" }, - "engines": { - "node": "^18.17.0 || >=20.5.0" + "funding": { + "url": "https://github.com/sponsors/isaacs" } }, - "node_modules/@npmcli/node-gyp": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/@npmcli/node-gyp/-/node-gyp-4.0.0.tgz", - "integrity": "sha512-+t5DZ6mO/QFh78PByMq1fGSAub/agLJZDRfJRMeOSNCt8s9YVlTjmGpIPwPhvXTGUIJk+WszlT0rQa1W33yzNA==", + "node_modules/@npmcli/package-json/node_modules/jackspeak": { + "version": "3.4.3", + "resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-3.4.3.tgz", + "integrity": "sha512-OGlZQpz2yfahA/Rd1Y8Cd9SIEsqvXkLVoSw/cgwhnhFMDbsQFeZYoJJ7bIZBS9BcamUW96asq/npPWugM+RQBw==", "dev": true, - "license": "ISC", - "engines": { - "node": "^18.17.0 || >=20.5.0" + "license": "BlueOak-1.0.0", + "dependencies": { + "@isaacs/cliui": "^8.0.2" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + }, + "optionalDependencies": { + "@pkgjs/parseargs": "^0.11.0" } }, - "node_modules/@npmcli/package-json": { - "version": "6.2.0", - "resolved": "https://registry.npmjs.org/@npmcli/package-json/-/package-json-6.2.0.tgz", - "integrity": "sha512-rCNLSB/JzNvot0SEyXqWZ7tX2B5dD2a1br2Dp0vSYVo5jh8Z0EZ7lS9TsZ1UtziddB1UfNUaMCc538/HztnJGA==", + "node_modules/@npmcli/package-json/node_modules/lru-cache": { + "version": "10.4.3", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.4.3.tgz", + "integrity": "sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==", "dev": true, - "license": "ISC", + "license": "ISC" + }, + "node_modules/@npmcli/package-json/node_modules/path-scurry": { + "version": "1.11.1", + "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-1.11.1.tgz", + "integrity": "sha512-Xa4Nw17FS9ApQFJ9umLiJS4orGjm7ZzwUrwamcGQuHSzDyth9boKDaycYdDcZDuqYATXw4HFXgaqWTctW/v1HA==", + "dev": true, + "license": "BlueOak-1.0.0", "dependencies": { - "@npmcli/git": "^6.0.0", - "glob": "^10.2.2", - "hosted-git-info": "^8.0.0", - "json-parse-even-better-errors": "^4.0.0", - "proc-log": "^5.0.0", - "semver": "^7.5.3", - "validate-npm-package-license": "^3.0.4" + "lru-cache": "^10.2.0", + "minipass": "^5.0.0 || ^6.0.2 || ^7.0.0" }, "engines": { - "node": "^18.17.0 || >=20.5.0" + "node": ">=16 || 14 >=14.18" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" } }, "node_modules/@npmcli/promise-spawn": { - "version": "8.0.2", - "resolved": "https://registry.npmjs.org/@npmcli/promise-spawn/-/promise-spawn-8.0.2.tgz", - "integrity": "sha512-/bNJhjc+o6qL+Dwz/bqfTQClkEO5nTQ1ZEcdCkAQjhkZMHIh22LPG7fNh1enJP1NKWDqYiiABnjFCY7E0zHYtQ==", + "version": "8.0.3", + "resolved": "https://registry.npmjs.org/@npmcli/promise-spawn/-/promise-spawn-8.0.3.tgz", + "integrity": "sha512-Yb00SWaL4F8w+K8YGhQ55+xE4RUNdMHV43WZGsiTM92gS+lC0mGsn7I4hLug7pbao035S6bj3Y3w0cUNGLfmkg==", "dev": true, "license": "ISC", "dependencies": { @@ -7045,6 +7160,20 @@ "url": "https://opencollective.com/pkgr" } }, + "node_modules/@polka/send-type": { + "version": "0.5.2", + "resolved": "https://registry.npmjs.org/@polka/send-type/-/send-type-0.5.2.tgz", + "integrity": "sha512-jGXalKihnhGQmMQ+xxfxrRfI2cWs38TIZuwgYpnbQDD4r9TkOiU3ocjAS+6CqqMNQNAu9Ul2iHU5YFRDODak2w==", + "dev": true, + "license": "MIT" + }, + "node_modules/@polka/url": { + "version": "0.5.0", + "resolved": "https://registry.npmjs.org/@polka/url/-/url-0.5.0.tgz", + "integrity": "sha512-oZLYFEAzUKyi3SKnXvj32ZCEGH6RDnao7COuCVhDydMS9NrCSVXhM79VaKyP5+Zc33m0QXEd2DN3UkU7OsHcfw==", + "dev": true, + "license": "MIT" + }, "node_modules/@popperjs/core": { "version": "2.11.8", "resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.11.8.tgz", @@ -7226,6 +7355,20 @@ "linux" ] }, + "node_modules/@rollup/rollup-linux-loong64-gnu": { + "version": "4.52.3", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loong64-gnu/-/rollup-linux-loong64-gnu-4.52.3.tgz", + "integrity": "sha512-3y5GA0JkBuirLqmjwAKwB0keDlI6JfGYduMlJD/Rl7fvb4Ni8iKdQs1eiunMZJhwDWdCvrcqXRY++VEBbvk6Eg==", + "cpu": [ + "loong64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ] + }, "node_modules/@rollup/rollup-linux-loongarch64-gnu": { "version": "4.34.8", "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loongarch64-gnu/-/rollup-linux-loongarch64-gnu-4.34.8.tgz", @@ -7255,9 +7398,9 @@ ] }, "node_modules/@rollup/rollup-linux-ppc64-gnu": { - "version": "4.46.2", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-ppc64-gnu/-/rollup-linux-ppc64-gnu-4.46.2.tgz", - "integrity": "sha512-B/l0dFcHVUnqcGZWKcWBSV2PF01YUt0Rvlurci5P+neqY/yMKchGU8ullZvIv5e8Y1C6wOn+U03mrDylP5q9Yw==", + "version": "4.52.3", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-ppc64-gnu/-/rollup-linux-ppc64-gnu-4.52.3.tgz", + "integrity": "sha512-AUUH65a0p3Q0Yfm5oD2KVgzTKgwPyp9DSXc3UA7DtxhEb/WSPfbG4wqXeSN62OG5gSo18em4xv6dbfcUGXcagw==", "cpu": [ "ppc64" ], @@ -7266,8 +7409,7 @@ "optional": true, "os": [ "linux" - ], - "peer": true + ] }, "node_modules/@rollup/rollup-linux-riscv64-gnu": { "version": "4.34.8", @@ -7284,9 +7426,9 @@ ] }, "node_modules/@rollup/rollup-linux-riscv64-musl": { - "version": "4.46.2", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-musl/-/rollup-linux-riscv64-musl-4.46.2.tgz", - "integrity": "sha512-t5B2loThlFEauloaQkZg9gxV05BYeITLvLkWOkRXogP4qHXLkWSbSHKM9S6H1schf/0YGP/qNKtiISlxvfmmZw==", + "version": "4.52.3", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-musl/-/rollup-linux-riscv64-musl-4.52.3.tgz", + "integrity": "sha512-OOFJa28dxfl8kLOPMUOQBCO6z3X2SAfzIE276fwT52uXDWUS178KWq0pL7d6p1kz7pkzA0yQwtqL0dEPoVcRWg==", "cpu": [ "riscv64" ], @@ -7295,8 +7437,7 @@ "optional": true, "os": [ "linux" - ], - "peer": true + ] }, "node_modules/@rollup/rollup-linux-s390x-gnu": { "version": "4.34.8", @@ -7340,6 +7481,20 @@ "linux" ] }, + "node_modules/@rollup/rollup-openharmony-arm64": { + "version": "4.52.3", + "resolved": "https://registry.npmjs.org/@rollup/rollup-openharmony-arm64/-/rollup-openharmony-arm64-4.52.3.tgz", + "integrity": "sha512-KTD/EqjZF3yvRaWUJdD1cW+IQBk4fbQaHYJUmP8N4XoKFZilVL8cobFSTDnjTtxWJQ3JYaMgF4nObY/+nYkumA==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "openharmony" + ] + }, "node_modules/@rollup/rollup-win32-arm64-msvc": { "version": "4.34.8", "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.34.8.tgz", @@ -7368,6 +7523,20 @@ "win32" ] }, + "node_modules/@rollup/rollup-win32-x64-gnu": { + "version": "4.52.3", + "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-gnu/-/rollup-win32-x64-gnu-4.52.3.tgz", + "integrity": "sha512-s0hybmlHb56mWVZQj8ra9048/WZTPLILKxcvcq+8awSZmyiSUZjjem1AhU3Tf4ZKpYhK4mg36HtHDOe8QJS5PQ==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "win32" + ] + }, "node_modules/@rollup/rollup-win32-x64-msvc": { "version": "4.34.8", "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.34.8.tgz", @@ -7390,14 +7559,14 @@ "license": "MIT" }, "node_modules/@schematics/angular": { - "version": "19.2.15", - "resolved": "https://registry.npmjs.org/@schematics/angular/-/angular-19.2.15.tgz", - "integrity": "sha512-dz/eoFQKG09POSygpEDdlCehFIMo35HUM2rVV8lx9PfQEibpbGwl1NNQYEbqwVjTyCyD/ILyIXCWPE+EfTnG4g==", + "version": "19.2.17", + "resolved": "https://registry.npmjs.org/@schematics/angular/-/angular-19.2.17.tgz", + "integrity": "sha512-FGNDJXjeCoYz3JMze3JReNOGkPsxLGs5LmLf5Zj3+BYYMsFoDUJD9BMRRf+tmc/epBkiZZtv80c8gmfhqGv4dA==", "dev": true, "license": "MIT", "dependencies": { - "@angular-devkit/core": "19.2.15", - "@angular-devkit/schematics": "19.2.15", + "@angular-devkit/core": "19.2.17", + "@angular-devkit/schematics": "19.2.17", "jsonc-parser": "3.3.1" }, "engines": { @@ -7406,6 +7575,101 @@ "yarn": ">= 1.13.0" } }, + "node_modules/@sentry-internal/browser-utils": { + "version": "10.15.0", + "resolved": "https://registry.npmjs.org/@sentry-internal/browser-utils/-/browser-utils-10.15.0.tgz", + "integrity": "sha512-hJxo6rj3cMqiYlZd6PC8o/i2FG6hRnZdHcJkfm1HXgWCRgdCPilKghL6WU+B2H5dLyRKJ17nWjDAVQPRdCxO9w==", + "license": "MIT", + "dependencies": { + "@sentry/core": "10.15.0" + }, + "engines": { + "node": ">=18" + } + }, + "node_modules/@sentry-internal/feedback": { + "version": "10.15.0", + "resolved": "https://registry.npmjs.org/@sentry-internal/feedback/-/feedback-10.15.0.tgz", + "integrity": "sha512-EP+NvdU9yfmepGzQwz0jnqhd0DBxHzrP16TsJIVXJe93QJ+gumdN3XQ0lvYtEC9zHuU08DghRLjfI1kLRfGzdQ==", + "license": "MIT", + "dependencies": { + "@sentry/core": "10.15.0" + }, + "engines": { + "node": ">=18" + } + }, + "node_modules/@sentry-internal/replay": { + "version": "10.15.0", + "resolved": "https://registry.npmjs.org/@sentry-internal/replay/-/replay-10.15.0.tgz", + "integrity": "sha512-vHBAFVdDfa51oqPWyRCK4fOIFhFeE2mVlqBWrBb+S3vCNcmtpvqJUq6o4sjSYcQzdZQpMSp5/Lj8Y3a8x/ed7w==", + "license": "MIT", + "dependencies": { + "@sentry-internal/browser-utils": "10.15.0", + "@sentry/core": "10.15.0" + }, + "engines": { + "node": ">=18" + } + }, + "node_modules/@sentry-internal/replay-canvas": { + "version": "10.15.0", + "resolved": "https://registry.npmjs.org/@sentry-internal/replay-canvas/-/replay-canvas-10.15.0.tgz", + "integrity": "sha512-SXgUWArk+haUJ24W6pIm9IiwmIk3WxeQyFUxFfMUetSRb06CVAoNjPb0YuzKIeuFYJb6hDPGQ9UWhShnQpTmkw==", + "license": "MIT", + "dependencies": { + "@sentry-internal/replay": "10.15.0", + "@sentry/core": "10.15.0" + }, + "engines": { + "node": ">=18" + } + }, + "node_modules/@sentry/angular": { + "version": "10.15.0", + "resolved": "https://registry.npmjs.org/@sentry/angular/-/angular-10.15.0.tgz", + "integrity": "sha512-HXnqABIzAbGO5YFNwAyt/5RvdFw7pLU6RufXDIkBpUK/daQqSzgHfybjOTGpK2Jx2JJg7JJtv/dWUMn2t4IS6Q==", + "license": "MIT", + "dependencies": { + "@sentry/browser": "10.15.0", + "@sentry/core": "10.15.0", + "tslib": "^2.4.1" + }, + "engines": { + "node": ">=18" + }, + "peerDependencies": { + "@angular/common": ">= 14.x <= 20.x", + "@angular/core": ">= 14.x <= 20.x", + "@angular/router": ">= 14.x <= 20.x", + "rxjs": "^6.5.5 || ^7.x" + } + }, + "node_modules/@sentry/browser": { + "version": "10.15.0", + "resolved": "https://registry.npmjs.org/@sentry/browser/-/browser-10.15.0.tgz", + "integrity": "sha512-YV42VgW7xdmY23u7+nQLNJXDVilNTP0d5WWkHDxeI/uD6AAvn3GyKjx1YMG/KCulxva3dPDPEUunzDm3al26Sw==", + "license": "MIT", + "dependencies": { + "@sentry-internal/browser-utils": "10.15.0", + "@sentry-internal/feedback": "10.15.0", + "@sentry-internal/replay": "10.15.0", + "@sentry-internal/replay-canvas": "10.15.0", + "@sentry/core": "10.15.0" + }, + "engines": { + "node": ">=18" + } + }, + "node_modules/@sentry/core": { + "version": "10.15.0", + "resolved": "https://registry.npmjs.org/@sentry/core/-/core-10.15.0.tgz", + "integrity": "sha512-J7WsQvb9G6nsVgWkTHwyX7wR2djtEACYCx19hAnRbSGIg+ysVG+7Ti3RL4bz9/VXfcxsz346cleKc7ljhynYlQ==", + "license": "MIT", + "engines": { + "node": ">=18" + } + }, "node_modules/@sigstore/bundle": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/@sigstore/bundle/-/bundle-3.1.0.tgz", @@ -7572,16 +7836,41 @@ "node": ">= 10" } }, + "node_modules/@traptitech/markdown-it-katex": { + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/@traptitech/markdown-it-katex/-/markdown-it-katex-3.6.0.tgz", + "integrity": "sha512-CnJzTWxsgLGXFdSrWRaGz7GZ1kUUi8g3E9HzJmeveX1YwVJavrKYqysktfHZQsujdnRqV5O7g8FPKEA/aeTkOQ==", + "license": "MIT", + "dependencies": { + "katex": "^0.16.0" + } + }, "node_modules/@ts-morph/common": { - "version": "0.25.0", - "resolved": "https://registry.npmjs.org/@ts-morph/common/-/common-0.25.0.tgz", - "integrity": "sha512-kMnZz+vGGHi4GoHnLmMhGNjm44kGtKUXGnOvrKmMwAuvNjM/PgKVGfUnL7IDvK7Jb2QQ82jq3Zmp04Gy+r3Dkg==", + "version": "0.27.0", + "resolved": "https://registry.npmjs.org/@ts-morph/common/-/common-0.27.0.tgz", + "integrity": "sha512-Wf29UqxWDpc+i61k3oIOzcUfQt79PIT9y/MWfAGlrkjg6lBC1hwDECLXPVJAhWjiGbfBCxZd65F/LIZF3+jeJQ==", "dev": true, "license": "MIT", "dependencies": { - "minimatch": "^9.0.4", - "path-browserify": "^1.0.1", - "tinyglobby": "^0.2.9" + "fast-glob": "^3.3.3", + "minimatch": "^10.0.1", + "path-browserify": "^1.0.1" + } + }, + "node_modules/@ts-morph/common/node_modules/minimatch": { + "version": "10.0.3", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-10.0.3.tgz", + "integrity": "sha512-IPZ167aShDZZUMdRk66cyQAW3qr0WzbHkPdMYa8bzZhlHhO3jALbKdxcaak7W9FfT2rZNpQuUu4Od7ILEpXSaw==", + "dev": true, + "license": "ISC", + "dependencies": { + "@isaacs/brace-expansion": "^5.0.0" + }, + "engines": { + "node": "20 || >=22" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" } }, "node_modules/@tufjs/canonical-json": { @@ -7901,19 +8190,19 @@ "license": "MIT" }, "node_modules/@types/node": { - "version": "24.2.1", - "resolved": "https://registry.npmjs.org/@types/node/-/node-24.2.1.tgz", - "integrity": "sha512-DRh5K+ka5eJic8CjH7td8QpYEV6Zo10gfRkjHCO3weqZHWDtAaSTFtl4+VMqOJ4N5jcuhZ9/l+yy8rVgw7BQeQ==", + "version": "24.5.2", + "resolved": "https://registry.npmjs.org/@types/node/-/node-24.5.2.tgz", + "integrity": "sha512-FYxk1I7wPv3K2XBaoyH2cTnocQEu8AOZ60hPbsyukMPLv5/5qr7V1i8PLHdl6Zf87I+xZXFvPCXYjiTFq+YSDQ==", "dev": true, "license": "MIT", "dependencies": { - "undici-types": "~7.10.0" + "undici-types": "~7.12.0" } }, "node_modules/@types/node-forge": { - "version": "1.3.13", - "resolved": "https://registry.npmjs.org/@types/node-forge/-/node-forge-1.3.13.tgz", - "integrity": "sha512-zePQJSW5QkwSHKRApqWCVKeKoSOt4xvEnLENZPjyvm9Ezdf/EyDeJM7jqLzOwjVICQQzvLZ63T55MKdJB5H6ww==", + "version": "1.3.14", + "resolved": "https://registry.npmjs.org/@types/node-forge/-/node-forge-1.3.14.tgz", + "integrity": "sha512-mhVF2BnD4BO+jtOp7z1CdzaK4mbuK0LLQYAvdOLqHTavxFNq4zA1EmYkpnFjP8HOUzedfQkRnp0E2ulSAYSzAw==", "dev": true, "license": "MIT", "dependencies": { @@ -8295,14 +8584,14 @@ } }, "node_modules/@typescript-eslint/project-service": { - "version": "8.39.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/project-service/-/project-service-8.39.1.tgz", - "integrity": "sha512-8fZxek3ONTwBu9ptw5nCKqZOSkXshZB7uAxuFF0J/wTMkKydjXCzqqga7MlFMpHi9DoG4BadhmTkITBcg8Aybw==", + "version": "8.44.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/project-service/-/project-service-8.44.1.tgz", + "integrity": "sha512-ycSa60eGg8GWAkVsKV4E6Nz33h+HjTXbsDT4FILyL8Obk5/mx4tbvCNsLf9zret3ipSumAOG89UcCs/KRaKYrA==", "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/tsconfig-utils": "^8.39.1", - "@typescript-eslint/types": "^8.39.1", + "@typescript-eslint/tsconfig-utils": "^8.44.1", + "@typescript-eslint/types": "^8.44.1", "debug": "^4.3.4" }, "engines": { @@ -8317,14 +8606,14 @@ } }, "node_modules/@typescript-eslint/scope-manager": { - "version": "8.39.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.39.1.tgz", - "integrity": "sha512-RkBKGBrjgskFGWuyUGz/EtD8AF/GW49S21J8dvMzpJitOF1slLEbbHnNEtAHtnDAnx8qDEdRrULRnWVx27wGBw==", + "version": "8.44.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.44.1.tgz", + "integrity": "sha512-NdhWHgmynpSvyhchGLXh+w12OMT308Gm25JoRIyTZqEbApiBiQHD/8xgb6LqCWCFcxFtWwaVdFsLPQI3jvhywg==", "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/types": "8.39.1", - "@typescript-eslint/visitor-keys": "8.39.1" + "@typescript-eslint/types": "8.44.1", + "@typescript-eslint/visitor-keys": "8.44.1" }, "engines": { "node": "^18.18.0 || ^20.9.0 || >=21.1.0" @@ -8335,9 +8624,9 @@ } }, "node_modules/@typescript-eslint/tsconfig-utils": { - "version": "8.39.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/tsconfig-utils/-/tsconfig-utils-8.39.1.tgz", - "integrity": "sha512-ePUPGVtTMR8XMU2Hee8kD0Pu4NDE1CN9Q1sxGSGd/mbOtGZDM7pnhXNJnzW63zk/q+Z54zVzj44HtwXln5CvHA==", + "version": "8.44.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/tsconfig-utils/-/tsconfig-utils-8.44.1.tgz", + "integrity": "sha512-B5OyACouEjuIvof3o86lRMvyDsFwZm+4fBOqFHccIctYgBjqR3qT39FBYGN87khcgf0ExpdCBeGKpKRhSFTjKQ==", "dev": true, "license": "MIT", "engines": { @@ -8490,9 +8779,9 @@ } }, "node_modules/@typescript-eslint/types": { - "version": "8.39.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.39.1.tgz", - "integrity": "sha512-7sPDKQQp+S11laqTrhHqeAbsCfMkwJMrV7oTDvtDds4mEofJYir414bYKUEb8YPUm9QL3U+8f6L6YExSoAGdQw==", + "version": "8.44.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.44.1.tgz", + "integrity": "sha512-Lk7uj7y9uQUOEguiDIDLYLJOrYHQa7oBiURYVFqIpGxclAFQ78f6VUOM8lI2XEuNOKNB7XuvM2+2cMXAoq4ALQ==", "dev": true, "license": "MIT", "engines": { @@ -8504,16 +8793,16 @@ } }, "node_modules/@typescript-eslint/typescript-estree": { - "version": "8.39.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.39.1.tgz", - "integrity": "sha512-EKkpcPuIux48dddVDXyQBlKdeTPMmALqBUbEk38McWv0qVEZwOpVJBi7ugK5qVNgeuYjGNQxrrnoM/5+TI/BPw==", + "version": "8.44.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.44.1.tgz", + "integrity": "sha512-qnQJ+mVa7szevdEyvfItbO5Vo+GfZ4/GZWWDRRLjrxYPkhM+6zYB2vRYwCsoJLzqFCdZT4mEqyJoyzkunsZ96A==", "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/project-service": "8.39.1", - "@typescript-eslint/tsconfig-utils": "8.39.1", - "@typescript-eslint/types": "8.39.1", - "@typescript-eslint/visitor-keys": "8.39.1", + "@typescript-eslint/project-service": "8.44.1", + "@typescript-eslint/tsconfig-utils": "8.44.1", + "@typescript-eslint/types": "8.44.1", + "@typescript-eslint/visitor-keys": "8.44.1", "debug": "^4.3.4", "fast-glob": "^3.3.2", "is-glob": "^4.0.3", @@ -8533,16 +8822,16 @@ } }, "node_modules/@typescript-eslint/utils": { - "version": "8.39.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.39.1.tgz", - "integrity": "sha512-VF5tZ2XnUSTuiqZFXCZfZs1cgkdd3O/sSYmdo2EpSyDlC86UM/8YytTmKnehOW3TGAlivqTDT6bS87B/GQ/jyg==", + "version": "8.44.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.44.1.tgz", + "integrity": "sha512-DpX5Fp6edTlocMCwA+mHY8Mra+pPjRZ0TfHkXI8QFelIKcbADQz1LUPNtzOFUriBB2UYqw4Pi9+xV4w9ZczHFg==", "dev": true, "license": "MIT", "dependencies": { "@eslint-community/eslint-utils": "^4.7.0", - "@typescript-eslint/scope-manager": "8.39.1", - "@typescript-eslint/types": "8.39.1", - "@typescript-eslint/typescript-estree": "8.39.1" + "@typescript-eslint/scope-manager": "8.44.1", + "@typescript-eslint/types": "8.44.1", + "@typescript-eslint/typescript-estree": "8.44.1" }, "engines": { "node": "^18.18.0 || ^20.9.0 || >=21.1.0" @@ -8557,13 +8846,13 @@ } }, "node_modules/@typescript-eslint/visitor-keys": { - "version": "8.39.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.39.1.tgz", - "integrity": "sha512-W8FQi6kEh2e8zVhQ0eeRnxdvIoOkAp/CPAahcNio6nO9dsIwb9b34z90KOlheoyuVf6LSOEdjlkxSkapNEc+4A==", + "version": "8.44.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.44.1.tgz", + "integrity": "sha512-576+u0QD+Jp3tZzvfRfxon0EA2lzcDt3lhUbsC6Lgzy9x2VR4E+JUiNyGHi5T8vk0TV+fpJ5GLG1JsJuWCaKhw==", "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/types": "8.39.1", + "@typescript-eslint/types": "8.44.1", "eslint-visitor-keys": "^4.2.1" }, "engines": { @@ -8825,9 +9114,9 @@ } }, "node_modules/ace-builds": { - "version": "1.43.2", - "resolved": "https://registry.npmjs.org/ace-builds/-/ace-builds-1.43.2.tgz", - "integrity": "sha512-3wzJUJX0RpMc03jo0V8Q3bSb/cKPnS7Nqqw8fVHsCCHweKMiTIxT3fP46EhjmVy6MCuxwP801ere+RW245phGw==", + "version": "1.43.3", + "resolved": "https://registry.npmjs.org/ace-builds/-/ace-builds-1.43.3.tgz", + "integrity": "sha512-MCl9rALmXwIty/4Qboijo/yNysx1r6hBTzG+6n/TiOm5LFhZpEvEIcIITPFiEOEFDfgBOEmxu+a4f54LEFM6Sg==", "license": "BSD-3-Clause" }, "node_modules/acorn": { @@ -8987,6 +9276,91 @@ "typescript-eslint": "^8.0.0" } }, + "node_modules/angular-eslint/node_modules/@angular-eslint/bundled-angular-compiler": { + "version": "19.1.0", + "resolved": "https://registry.npmjs.org/@angular-eslint/bundled-angular-compiler/-/bundled-angular-compiler-19.1.0.tgz", + "integrity": "sha512-HUJyukRvnh8Z9lIdxdblBRuBaPYEVv4iAYZMw3d+dn4rrM27Nt5oh3/zkwYrrPkt36tZdeXdDWrOuz9jgjVN5w==", + "dev": true, + "license": "MIT" + }, + "node_modules/angular-eslint/node_modules/@angular-eslint/eslint-plugin": { + "version": "19.1.0", + "resolved": "https://registry.npmjs.org/@angular-eslint/eslint-plugin/-/eslint-plugin-19.1.0.tgz", + "integrity": "sha512-TDO0+Ry+oNkxnaLHogKp1k2aey6IkJef5d7hathE4UFT6owjRizltWaRoX6bGw7Qu1yagVLL8L2Se8SddxSPAQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "@angular-eslint/bundled-angular-compiler": "19.1.0", + "@angular-eslint/utils": "19.1.0" + }, + "peerDependencies": { + "@typescript-eslint/utils": "^7.11.0 || ^8.0.0", + "eslint": "^8.57.0 || ^9.0.0", + "typescript": "*" + } + }, + "node_modules/angular-eslint/node_modules/@angular-eslint/eslint-plugin-template": { + "version": "19.1.0", + "resolved": "https://registry.npmjs.org/@angular-eslint/eslint-plugin-template/-/eslint-plugin-template-19.1.0.tgz", + "integrity": "sha512-bIUizkCY40mnU8oAO1tLV7uN2H/cHf1evLlhpqlb9JYwc5dT2moiEhNDo61OtOgkJmDGNuThAeO9Xk9hGQc7nA==", + "dev": true, + "license": "MIT", + "dependencies": { + "@angular-eslint/bundled-angular-compiler": "19.1.0", + "@angular-eslint/utils": "19.1.0", + "aria-query": "5.3.2", + "axobject-query": "4.1.0" + }, + "peerDependencies": { + "@typescript-eslint/types": "^7.11.0 || ^8.0.0", + "@typescript-eslint/utils": "^7.11.0 || ^8.0.0", + "eslint": "^8.57.0 || ^9.0.0", + "typescript": "*" + } + }, + "node_modules/angular-eslint/node_modules/@angular-eslint/template-parser": { + "version": "19.1.0", + "resolved": "https://registry.npmjs.org/@angular-eslint/template-parser/-/template-parser-19.1.0.tgz", + "integrity": "sha512-wbMi7adlC+uYqZo7NHNBShpNhFJRZsXLqihqvFpAUt1Ei6uDX8HR6MyMEDZ9tUnlqtPVW5nmbedPyLVG7HkjAA==", + "dev": true, + "license": "MIT", + "dependencies": { + "@angular-eslint/bundled-angular-compiler": "19.1.0", + "eslint-scope": "^8.0.2" + }, + "peerDependencies": { + "eslint": "^8.57.0 || ^9.0.0", + "typescript": "*" + } + }, + "node_modules/angular-eslint/node_modules/@angular-eslint/utils": { + "version": "19.1.0", + "resolved": "https://registry.npmjs.org/@angular-eslint/utils/-/utils-19.1.0.tgz", + "integrity": "sha512-mcb7hPMH/u6wwUwvsewrmgb9y9NWN6ZacvpUvKlTOxF/jOtTdsu0XfV4YB43sp2A8NWzYzX0Str4c8K1xSmuBQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "@angular-eslint/bundled-angular-compiler": "19.1.0" + }, + "peerDependencies": { + "@typescript-eslint/utils": "^7.11.0 || ^8.0.0", + "eslint": "^8.57.0 || ^9.0.0", + "typescript": "*" + } + }, + "node_modules/angular-google-tag-manager": { + "version": "1.11.0", + "resolved": "https://registry.npmjs.org/angular-google-tag-manager/-/angular-google-tag-manager-1.11.0.tgz", + "integrity": "sha512-r9sHS+LO9LUoQsiqPo05yTfGRpA3oODc/0AmL0QA1SbeboHKBkCRZIUHkv5w6+GGmWR/G+ZR52eHNLWcgTwIAA==", + "license": "MIT", + "dependencies": { + "tslib": "^2.5.0" + }, + "peerDependencies": { + "@angular/common": "^19.0.0", + "@angular/compiler": "^19.0.0" + } + }, "node_modules/angularx-qrcode": { "version": "19.0.0", "resolved": "https://registry.npmjs.org/angularx-qrcode/-/angularx-qrcode-19.0.0.tgz", @@ -9041,9 +9415,9 @@ } }, "node_modules/ansi-regex": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.1.0.tgz", - "integrity": "sha512-7HSX4QQb4CspciLpVFwyRe79O3xsIZDDLER21kERQ71oaPodF8jL725AgJMFAYbooIqolJoRLuM81SpeUkpkvA==", + "version": "6.2.2", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.2.2.tgz", + "integrity": "sha512-Bq3SmSpyFHaWjPk8If9yc6svM8c56dB5BAtW4Qbw5jHTwwXXcTLoRMkpDJp6VL0XzlWaCHTXrkFURMYmD0sLqg==", "dev": true, "license": "MIT", "engines": { @@ -9606,7 +9980,6 @@ "version": "1.5.1", "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz", "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==", - "dev": true, "funding": [ { "type": "github", @@ -9623,6 +9996,16 @@ ], "license": "MIT" }, + "node_modules/baseline-browser-mapping": { + "version": "2.8.9", + "resolved": "https://registry.npmjs.org/baseline-browser-mapping/-/baseline-browser-mapping-2.8.9.tgz", + "integrity": "sha512-hY/u2lxLrbecMEWSB0IpGzGyDyeoMFQhCvZd2jGFSE5I17Fh01sYUBPCJtkWERw7zrac9+cIghxm/ytJa2X8iA==", + "dev": true, + "license": "Apache-2.0", + "bin": { + "baseline-browser-mapping": "dist/cli.js" + } + }, "node_modules/basic-auth": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/basic-auth/-/basic-auth-2.0.1.tgz", @@ -9636,13 +10019,6 @@ "node": ">= 0.8" } }, - "node_modules/basic-auth/node_modules/safe-buffer": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", - "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==", - "dev": true, - "license": "MIT" - }, "node_modules/batch": { "version": "0.6.1", "resolved": "https://registry.npmjs.org/batch/-/batch-0.6.1.tgz", @@ -9713,60 +10089,39 @@ } }, "node_modules/body-parser": { - "version": "1.20.3", - "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.3.tgz", - "integrity": "sha512-7rAxByjUMqQ3/bHJy7D6OGXvx/MMc4IqBn/X0fcM1QUcAItpZrBEYhWGem+tzXH90c+G01ypMcYJBO9Y30203g==", + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-2.2.0.tgz", + "integrity": "sha512-02qvAaxv8tp7fBa/mw1ga98OGm+eCbqzJOKoRt70sLmfEEi+jyBYVTDGfCL/k06/4EMk/z01gCe7HoCH/f2LTg==", "dev": true, "license": "MIT", "dependencies": { - "bytes": "3.1.2", - "content-type": "~1.0.5", - "debug": "2.6.9", - "depd": "2.0.0", - "destroy": "1.2.0", - "http-errors": "2.0.0", - "iconv-lite": "0.4.24", - "on-finished": "2.4.1", - "qs": "6.13.0", - "raw-body": "2.5.2", - "type-is": "~1.6.18", - "unpipe": "1.0.0" + "bytes": "^3.1.2", + "content-type": "^1.0.5", + "debug": "^4.4.0", + "http-errors": "^2.0.0", + "iconv-lite": "^0.6.3", + "on-finished": "^2.4.1", + "qs": "^6.14.0", + "raw-body": "^3.0.0", + "type-is": "^2.0.0" }, "engines": { - "node": ">= 0.8", - "npm": "1.2.8000 || >= 1.4.16" - } - }, - "node_modules/body-parser/node_modules/debug": { - "version": "2.6.9", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", - "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", - "dev": true, - "license": "MIT", - "dependencies": { - "ms": "2.0.0" + "node": ">=18" } }, "node_modules/body-parser/node_modules/iconv-lite": { - "version": "0.4.24", - "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz", - "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==", + "version": "0.6.3", + "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz", + "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==", "dev": true, "license": "MIT", "dependencies": { - "safer-buffer": ">= 2.1.2 < 3" + "safer-buffer": ">= 2.1.2 < 3.0.0" }, "engines": { "node": ">=0.10.0" } }, - "node_modules/body-parser/node_modules/ms": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==", - "dev": true, - "license": "MIT" - }, "node_modules/bonjour-service": { "version": "1.3.0", "resolved": "https://registry.npmjs.org/bonjour-service/-/bonjour-service-1.3.0.tgz", @@ -9786,9 +10141,9 @@ "license": "ISC" }, "node_modules/bootstrap": { - "version": "5.3.7", - "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-5.3.7.tgz", - "integrity": "sha512-7KgiD8UHjfcPBHEpDNg+zGz8L3LqR3GVwqZiBRFX04a1BCArZOz1r2kjly2HQ0WokqTO0v1nF+QAt8dsW4lKlw==", + "version": "5.3.8", + "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-5.3.8.tgz", + "integrity": "sha512-HP1SZDqaLDPwsNiqRqi5NcP0SSXciX2s9E+RyqJIIqGo+vJeN5AJVM98CXmW/Wux0nQ5L7jeWUdplCEf0Ee+tg==", "funding": [ { "type": "github", @@ -9806,9 +10161,9 @@ } }, "node_modules/bootstrap.native": { - "version": "5.1.5", - "resolved": "https://registry.npmjs.org/bootstrap.native/-/bootstrap.native-5.1.5.tgz", - "integrity": "sha512-sQdFng2Szpseyo1TlpG5pV+se4nbGeQWFXBemsPSnrVzd82ps9F6hti+lHFwcGgS80oIc54dY5ycOYJwUpQn3A==", + "version": "5.1.6", + "resolved": "https://registry.npmjs.org/bootstrap.native/-/bootstrap.native-5.1.6.tgz", + "integrity": "sha512-bLveDBWhNLoFLsPctVo6yxSRQ1ysmKHBa+1FFMTQuruzTb3y7/InGSoe5lZdOiqZ4L0UOzpdbXMsI+bA5DoRew==", "dev": true, "license": "MIT", "dependencies": { @@ -9845,9 +10200,9 @@ } }, "node_modules/browserslist": { - "version": "4.25.2", - "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.25.2.tgz", - "integrity": "sha512-0si2SJK3ooGzIawRu61ZdPCO1IncZwS8IzuX73sPZsXW6EQ/w/DAfPyKI8l1ETTCr2MnvqWitmlCUxgdul45jA==", + "version": "4.26.2", + "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.26.2.tgz", + "integrity": "sha512-ECFzp6uFOSB+dcZ5BK/IBaGWssbSYBHvuMeMt3MMFyhI0Z8SqGgEkBLARgpRH3hutIgPVsALcMwbDrJqPxQ65A==", "dev": true, "funding": [ { @@ -9865,9 +10220,10 @@ ], "license": "MIT", "dependencies": { - "caniuse-lite": "^1.0.30001733", - "electron-to-chromium": "^1.5.199", - "node-releases": "^2.0.19", + "baseline-browser-mapping": "^2.8.3", + "caniuse-lite": "^1.0.30001741", + "electron-to-chromium": "^1.5.218", + "node-releases": "^2.0.21", "update-browserslist-db": "^1.1.3" }, "bin": { @@ -9917,7 +10273,6 @@ "version": "5.7.1", "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz", "integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==", - "dev": true, "funding": [ { "type": "github", @@ -10005,6 +10360,43 @@ "node": ">=18" } }, + "node_modules/cacache/node_modules/glob": { + "version": "10.4.5", + "resolved": "https://registry.npmjs.org/glob/-/glob-10.4.5.tgz", + "integrity": "sha512-7Bv8RF0k6xjo7d4A/PxYLbUCfb6c+Vpd2/mB2yRDlew7Jb5hEXiCD9ibfO7wpk8i4sevK6DFny9h7EYbM3/sHg==", + "dev": true, + "license": "ISC", + "dependencies": { + "foreground-child": "^3.1.0", + "jackspeak": "^3.1.2", + "minimatch": "^9.0.4", + "minipass": "^7.1.2", + "package-json-from-dist": "^1.0.0", + "path-scurry": "^1.11.1" + }, + "bin": { + "glob": "dist/esm/bin.mjs" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/cacache/node_modules/jackspeak": { + "version": "3.4.3", + "resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-3.4.3.tgz", + "integrity": "sha512-OGlZQpz2yfahA/Rd1Y8Cd9SIEsqvXkLVoSw/cgwhnhFMDbsQFeZYoJJ7bIZBS9BcamUW96asq/npPWugM+RQBw==", + "dev": true, + "license": "BlueOak-1.0.0", + "dependencies": { + "@isaacs/cliui": "^8.0.2" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + }, + "optionalDependencies": { + "@pkgjs/parseargs": "^0.11.0" + } + }, "node_modules/cacache/node_modules/lru-cache": { "version": "10.4.3", "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.4.3.tgz", @@ -10012,34 +10404,34 @@ "dev": true, "license": "ISC" }, - "node_modules/cacache/node_modules/mkdirp": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-3.0.1.tgz", - "integrity": "sha512-+NsyUUAZDmo6YVHzL/stxSu3t9YS1iljliy3BSDrXJ/dkn1KYdmtZODGGjLcc9XLgVVpH4KshHB8XmZgMhaBXg==", + "node_modules/cacache/node_modules/path-scurry": { + "version": "1.11.1", + "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-1.11.1.tgz", + "integrity": "sha512-Xa4Nw17FS9ApQFJ9umLiJS4orGjm7ZzwUrwamcGQuHSzDyth9boKDaycYdDcZDuqYATXw4HFXgaqWTctW/v1HA==", "dev": true, - "license": "MIT", - "bin": { - "mkdirp": "dist/cjs/src/bin.js" + "license": "BlueOak-1.0.0", + "dependencies": { + "lru-cache": "^10.2.0", + "minipass": "^5.0.0 || ^6.0.2 || ^7.0.0" }, "engines": { - "node": ">=10" + "node": ">=16 || 14 >=14.18" }, "funding": { "url": "https://github.com/sponsors/isaacs" } }, "node_modules/cacache/node_modules/tar": { - "version": "7.4.3", - "resolved": "https://registry.npmjs.org/tar/-/tar-7.4.3.tgz", - "integrity": "sha512-5S7Va8hKfV7W5U6g3aYxXmlPoZVAwUMy9AOKyF2fVuZa2UD3qZjg578OrLRt8PcNN1PleVaL/5/yYATNL0ICUw==", + "version": "7.5.1", + "resolved": "https://registry.npmjs.org/tar/-/tar-7.5.1.tgz", + "integrity": "sha512-nlGpxf+hv0v7GkWBK2V9spgactGOp0qvfWRxUMjqHyzrt3SgwE48DIv/FhqPHJYLHpgW1opq3nERbz5Anq7n1g==", "dev": true, "license": "ISC", "dependencies": { "@isaacs/fs-minipass": "^4.0.0", "chownr": "^3.0.0", "minipass": "^7.1.2", - "minizlib": "^3.0.1", - "mkdirp": "^3.0.1", + "minizlib": "^3.1.0", "yallist": "^5.0.0" }, "engines": { @@ -10136,9 +10528,9 @@ } }, "node_modules/caniuse-lite": { - "version": "1.0.30001734", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001734.tgz", - "integrity": "sha512-uhE1Ye5vgqju6OI71HTQqcBCZrvHugk0MjLak7Q+HfoBgoq5Bi+5YnwjP4fjDgrtYr/l8MVRBvzz9dPD4KyK0A==", + "version": "1.0.30001745", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001745.tgz", + "integrity": "sha512-ywt6i8FzvdgrrrGbr1jZVObnVv6adj+0if2/omv9cmR2oiZs30zL4DIyaptKcbOrBdOIc74QTMoJvSE2QHh5UQ==", "dev": true, "funding": [ { @@ -10163,15 +10555,15 @@ "license": "ISC" }, "node_modules/cedar-embeddable-editor": { - "version": "1.5.0", - "resolved": "https://registry.npmjs.org/cedar-embeddable-editor/-/cedar-embeddable-editor-1.5.0.tgz", - "integrity": "sha512-yZb/lmk+qUFmms/Ku6L+SPEDEE98d0+957JSsHqeR+EsvSu9D5IXYap4GEKWTHMUIsokJ3/Oj5UCxzFHlDJGzA==", + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/cedar-embeddable-editor/-/cedar-embeddable-editor-1.2.2.tgz", + "integrity": "sha512-GuwFKwz52JRl0ZwJMWl/cHn2gj5jtP9b8QMsYv8ulQClTUNn6FCDPWsQmBfPAhG+3NMtT3+jkm169C36itJmTA==", "license": "ISC" }, "node_modules/chalk": { - "version": "5.5.0", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-5.5.0.tgz", - "integrity": "sha512-1tm8DTaJhPBG3bIkVeZt1iZM9GfSX2lzOeDVZH9R9ffRHpmHvxZ/QhgQH/aDTkswQVt+YHdXAdS/In/30OjCbg==", + "version": "5.6.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-5.6.2.tgz", + "integrity": "sha512-7NzBL0rN6fMUW+f7A6Io4h40qQlG+xGmtMxfbnH/K7TAtt8JQWVQK+6g0UXKMeVJoyV5EkkNsErQ8pVD3bLHbA==", "dev": true, "license": "MIT", "engines": { @@ -10211,22 +10603,26 @@ } }, "node_modules/cheerio": { - "version": "1.0.0-rc.12", - "resolved": "https://registry.npmjs.org/cheerio/-/cheerio-1.0.0-rc.12.tgz", - "integrity": "sha512-VqR8m68vM46BNnuZ5NtnGBKIE/DfN0cRIzg9n40EIq9NOv90ayxLBXA8fXC5gquFRGJSTRqBq25Jt2ECLR431Q==", + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/cheerio/-/cheerio-1.1.2.tgz", + "integrity": "sha512-IkxPpb5rS/d1IiLbHMgfPuS0FgiWTtFIm/Nj+2woXDLTZ7fOT2eqzgYbdMlLweqlHbsZjxEChoVK+7iph7jyQg==", "dev": true, "license": "MIT", "dependencies": { "cheerio-select": "^2.1.0", "dom-serializer": "^2.0.0", "domhandler": "^5.0.3", - "domutils": "^3.0.1", - "htmlparser2": "^8.0.1", - "parse5": "^7.0.0", - "parse5-htmlparser2-tree-adapter": "^7.0.0" + "domutils": "^3.2.2", + "encoding-sniffer": "^0.2.1", + "htmlparser2": "^10.0.0", + "parse5": "^7.3.0", + "parse5-htmlparser2-tree-adapter": "^7.1.0", + "parse5-parser-stream": "^7.1.2", + "undici": "^7.12.0", + "whatwg-mimetype": "^4.0.0" }, "engines": { - "node": ">= 6" + "node": ">=20.18.1" }, "funding": { "url": "https://github.com/cheeriojs/cheerio?sponsor=1" @@ -10250,26 +10646,6 @@ "url": "https://github.com/sponsors/fb55" } }, - "node_modules/cheerio/node_modules/htmlparser2": { - "version": "8.0.2", - "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-8.0.2.tgz", - "integrity": "sha512-GYdjWKDkbRLkZ5geuHs5NY1puJ+PXwP7+fHPRz06Eirsb9ugf6d8kkXav6ADhcODhFFPMIXyxkxSuMf3D6NCFA==", - "dev": true, - "funding": [ - "https://github.com/fb55/htmlparser2?sponsor=1", - { - "type": "github", - "url": "https://github.com/sponsors/fb55" - } - ], - "license": "MIT", - "dependencies": { - "domelementtype": "^2.3.0", - "domhandler": "^5.0.3", - "domutils": "^3.0.1", - "entities": "^4.4.0" - } - }, "node_modules/chokidar": { "version": "4.0.3", "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-4.0.3.tgz", @@ -10322,6 +10698,12 @@ "node": ">=8" } }, + "node_modules/citeproc": { + "version": "2.4.63", + "resolved": "https://registry.npmjs.org/citeproc/-/citeproc-2.4.63.tgz", + "integrity": "sha512-68F95Bp4UbgZU/DBUGQn0qV3HDZLCdI9+Bb2ByrTaNJDL5VEm9LqaiNaxljsvoaExSLEXe1/r6n2Z06SCzW3/Q==", + "license": "CPAL-1.0 OR AGPL-1.0" + }, "node_modules/cjs-module-lexer": { "version": "1.4.3", "resolved": "https://registry.npmjs.org/cjs-module-lexer/-/cjs-module-lexer-1.4.3.tgz", @@ -10376,9 +10758,9 @@ } }, "node_modules/cli-truncate/node_modules/emoji-regex": { - "version": "10.4.0", - "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-10.4.0.tgz", - "integrity": "sha512-EC+0oUMY1Rqm4O6LLrgjtYDvcVYTy7chDnM4Q7030tP4Kwj3u/pR6gP9ygnp2CJMK5Gq+9Q2oqmrFJAz01DXjw==", + "version": "10.5.0", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-10.5.0.tgz", + "integrity": "sha512-lb49vf1Xzfx080OKA0o6l8DQQpV+6Vg95zyCJX9VB/BqKYlhG7N4wgROUUHRA+ZPUefLnteQOad7z1kT2bV7bg==", "dev": true, "license": "MIT" }, @@ -10638,13 +11020,13 @@ } }, "node_modules/commander": { - "version": "12.1.0", - "resolved": "https://registry.npmjs.org/commander/-/commander-12.1.0.tgz", - "integrity": "sha512-Vw8qHK3bZM9y/P10u3Vib8o/DdkvA2OtPtZvD871QKjy74Wj1WSKFILMPRPSdUSx5RFK1arlJzEtA4PkFgnbuA==", + "version": "14.0.1", + "resolved": "https://registry.npmjs.org/commander/-/commander-14.0.1.tgz", + "integrity": "sha512-2JkV3gUZUVrbNA+1sjBOYLsMZ5cEEl8GTFP2a4AVz5hvasAMCQ1D2l2le/cX+pV4N6ZU17zjUahLpIXRrnWL8A==", "dev": true, "license": "MIT", "engines": { - "node": ">=18" + "node": ">=20" } }, "node_modules/common-path-prefix": { @@ -10724,6 +11106,27 @@ "node": ">= 0.6" } }, + "node_modules/compression/node_modules/safe-buffer": { + "version": "5.2.1", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", + "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==", + "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ], + "license": "MIT" + }, "node_modules/concat-map": { "version": "0.0.1", "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", @@ -10767,35 +11170,6 @@ "ms": "2.0.0" } }, - "node_modules/connect/node_modules/encodeurl": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz", - "integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">= 0.8" - } - }, - "node_modules/connect/node_modules/finalhandler": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.2.tgz", - "integrity": "sha512-aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA==", - "dev": true, - "license": "MIT", - "dependencies": { - "debug": "2.6.9", - "encodeurl": "~1.0.2", - "escape-html": "~1.0.3", - "on-finished": "~2.3.0", - "parseurl": "~1.3.3", - "statuses": "~1.5.0", - "unpipe": "~1.0.0" - }, - "engines": { - "node": ">= 0.8" - } - }, "node_modules/connect/node_modules/ms": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", @@ -10803,29 +11177,6 @@ "dev": true, "license": "MIT" }, - "node_modules/connect/node_modules/on-finished": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz", - "integrity": "sha512-ikqdkGAAyf/X/gPhXGvfgAytDZtDbr+bkNUJ0N9h5MI/dmdgCs3l6hoHrcUv41sRKew3jIwrp4qQDXiK99Utww==", - "dev": true, - "license": "MIT", - "dependencies": { - "ee-first": "1.1.1" - }, - "engines": { - "node": ">= 0.8" - } - }, - "node_modules/connect/node_modules/statuses": { - "version": "1.5.0", - "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz", - "integrity": "sha512-OpZ3zP+jT1PI7I8nemJX4AKmAX070ZkYPVWV/AaKTJl+tXCTGyVdC1a4SL8RUQYEwk/f34ZX8UTykN68FwrqAA==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">= 0.6" - } - }, "node_modules/content-disposition": { "version": "0.5.4", "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.4.tgz", @@ -10839,6 +11190,27 @@ "node": ">= 0.6" } }, + "node_modules/content-disposition/node_modules/safe-buffer": { + "version": "5.2.1", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", + "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==", + "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ], + "license": "MIT" + }, "node_modules/content-type": { "version": "1.0.5", "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.5.tgz", @@ -10957,13 +11329,13 @@ } }, "node_modules/core-js-compat": { - "version": "3.45.0", - "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.45.0.tgz", - "integrity": "sha512-gRoVMBawZg0OnxaVv3zpqLLxaHmsubEGyTnqdpI/CEBvX4JadI1dMSHxagThprYRtSVbuQxvi6iUatdPxohHpA==", + "version": "3.45.1", + "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.45.1.tgz", + "integrity": "sha512-tqTt5T4PzsMIZ430XGviK4vzYSoeNJ6CXODi6c/voxOT6IZqBht5/EKaSNnYiEjjRYxjVz7DQIsOsY0XNi8PIA==", "dev": true, "license": "MIT", "dependencies": { - "browserslist": "^4.25.1" + "browserslist": "^4.25.3" }, "funding": { "type": "opencollective", @@ -11240,6 +11612,16 @@ "node": ">=12" } }, + "node_modules/data-urls/node_modules/whatwg-mimetype": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/whatwg-mimetype/-/whatwg-mimetype-3.0.0.tgz", + "integrity": "sha512-nt+N2dzIutVRxARx1nghPKGv1xHikU7HKdfafKkLNLindmPU/ch3U31NOCGGA/dmPcmb1VlofO0vnKAcsm0o/Q==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=12" + } + }, "node_modules/data-view-buffer": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/data-view-buffer/-/data-view-buffer-1.0.2.tgz", @@ -11295,9 +11677,9 @@ } }, "node_modules/debug": { - "version": "4.4.1", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.1.tgz", - "integrity": "sha512-KcKCqiftBJcZr++7ykoDIEwSa3XWowTfNPo92BYxjXiyYEVrUQh2aLyhxBCwww+heortUFxEJYcRzosstTEBYQ==", + "version": "4.4.3", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.3.tgz", + "integrity": "sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==", "dev": true, "license": "MIT", "dependencies": { @@ -11340,9 +11722,9 @@ "license": "MIT" }, "node_modules/dedent": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/dedent/-/dedent-1.6.0.tgz", - "integrity": "sha512-F1Z+5UCFpmQUzJa11agbyPVMbpgT/qA3/SKyJ1jyBgm7dUcUEa8v9JwDkerSQXfakBwFljIxhOJqGkjUwZ9FSA==", + "version": "1.7.0", + "resolved": "https://registry.npmjs.org/dedent/-/dedent-1.7.0.tgz", + "integrity": "sha512-HGFtf8yhuhGhqO07SV79tRp+br4MnbdjeVxotpn1QBl30pcLLCQjX5b2295ll0fv8RKDKsmWYrl05usHM9CewQ==", "dev": true, "license": "MIT", "peerDependencies": { @@ -11495,9 +11877,9 @@ } }, "node_modules/detect-libc": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-2.0.4.tgz", - "integrity": "sha512-3UDv+G9CsCKO1WKMGw9fwq/SWJYbI0c5Y7LU1AXYoDdbhE2AHQ6N6Nb34sG8Fj7T5APy8qXDCKuuIHd1BR0tVA==", + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-2.1.1.tgz", + "integrity": "sha512-ecqj/sy1jcK1uWrwpR67UhYrIFQ+5WlGxth34WquCbamhFA6hkkwiu37o6J5xCHdo1oixJRfVRw+ywV+Hq/0Aw==", "dev": true, "license": "Apache-2.0", "optional": true, @@ -11720,9 +12102,9 @@ } }, "node_modules/electron-to-chromium": { - "version": "1.5.200", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.200.tgz", - "integrity": "sha512-rFCxROw7aOe4uPTfIAx+rXv9cEcGx+buAF4npnhtTqCJk5KDFRnh3+KYj7rdVh6lsFt5/aPs+Irj9rZ33WMA7w==", + "version": "1.5.227", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.227.tgz", + "integrity": "sha512-ITxuoPfJu3lsNWUi2lBM2PaBPYgH3uqmxut5vmBxgYvyI4AlJ6P3Cai1O76mOrkJCBzq0IxWg/NtqOrpu/0gKA==", "dev": true, "license": "ISC" }, @@ -11766,24 +12148,63 @@ } }, "node_modules/encodeurl": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-2.0.0.tgz", - "integrity": "sha512-Q0n9HRi4m6JuGIV1eFlmvJB7ZEVxu93IrMyiMsGC0lrMJMWzRgx6WGquyfQgZVb31vhGgXnfmPNNXmxnOkRBrg==", + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz", + "integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/encoding": { + "version": "0.1.13", + "resolved": "https://registry.npmjs.org/encoding/-/encoding-0.1.13.tgz", + "integrity": "sha512-ETBauow1T35Y/WZMkio9jiM0Z5xjHHmJ4XmjZOq1l/dXz3lr2sRn87nJy20RupqSh1F2m3HHPSp8ShIPQJrJ3A==", + "license": "MIT", + "optional": true, + "dependencies": { + "iconv-lite": "^0.6.2" + } + }, + "node_modules/encoding-sniffer": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/encoding-sniffer/-/encoding-sniffer-0.2.1.tgz", + "integrity": "sha512-5gvq20T6vfpekVtqrYQsSCFZ1wEg5+wW0/QaZMWkFr6BqD3NfKs0rLCx4rrVlSWJeZb5NBJgVLswK/w2MWU+Gw==", + "dev": true, + "license": "MIT", + "dependencies": { + "iconv-lite": "^0.6.3", + "whatwg-encoding": "^3.1.1" + }, + "funding": { + "url": "https://github.com/fb55/encoding-sniffer?sponsor=1" + } + }, + "node_modules/encoding-sniffer/node_modules/iconv-lite": { + "version": "0.6.3", + "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz", + "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==", "dev": true, "license": "MIT", + "dependencies": { + "safer-buffer": ">= 2.1.2 < 3.0.0" + }, "engines": { - "node": ">= 0.8" + "node": ">=0.10.0" } }, - "node_modules/encoding": { - "version": "0.1.13", - "resolved": "https://registry.npmjs.org/encoding/-/encoding-0.1.13.tgz", - "integrity": "sha512-ETBauow1T35Y/WZMkio9jiM0Z5xjHHmJ4XmjZOq1l/dXz3lr2sRn87nJy20RupqSh1F2m3HHPSp8ShIPQJrJ3A==", - "dev": true, + "node_modules/encoding/node_modules/iconv-lite": { + "version": "0.6.3", + "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz", + "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==", "license": "MIT", "optional": true, "dependencies": { - "iconv-lite": "^0.6.2" + "safer-buffer": ">= 2.1.2 < 3.0.0" + }, + "engines": { + "node": ">=0.10.0" } }, "node_modules/end-of-stream": { @@ -11867,9 +12288,9 @@ } }, "node_modules/error-ex": { - "version": "1.3.2", - "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz", - "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==", + "version": "1.3.4", + "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.4.tgz", + "integrity": "sha512-sqQamAnR14VgCr1A618A3sGrygcpK+HEbenA/HiEAkkUwcZIIB/tgWqHFxWgOyDh4nB4JCRimh79dR5Ywc9MDQ==", "dev": true, "license": "MIT", "dependencies": { @@ -12157,19 +12578,19 @@ } }, "node_modules/eslint": { - "version": "9.33.0", - "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.33.0.tgz", - "integrity": "sha512-TS9bTNIryDzStCpJN93aC5VRSW3uTx9sClUn4B87pwiCaJh220otoI0X8mJKr+VcPtniMdN8GKjlwgWGUv5ZKA==", + "version": "9.36.0", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.36.0.tgz", + "integrity": "sha512-hB4FIzXovouYzwzECDcUkJ4OcfOEkXTv2zRY6B9bkwjx/cprAq0uvm1nl7zvQ0/TsUk0zQiN4uPfJpB9m+rPMQ==", "dev": true, "license": "MIT", "dependencies": { - "@eslint-community/eslint-utils": "^4.2.0", + "@eslint-community/eslint-utils": "^4.8.0", "@eslint-community/regexpp": "^4.12.1", "@eslint/config-array": "^0.21.0", "@eslint/config-helpers": "^0.3.1", "@eslint/core": "^0.15.2", "@eslint/eslintrc": "^3.3.1", - "@eslint/js": "9.33.0", + "@eslint/js": "9.36.0", "@eslint/plugin-kit": "^0.3.5", "@humanfs/node": "^0.16.6", "@humanwhocodes/module-importer": "^1.0.1", @@ -12403,9 +12824,9 @@ } }, "node_modules/eslint-plugin-unused-imports": { - "version": "4.1.4", - "resolved": "https://registry.npmjs.org/eslint-plugin-unused-imports/-/eslint-plugin-unused-imports-4.1.4.tgz", - "integrity": "sha512-YptD6IzQjDardkl0POxnnRBhU1OEePMV0nd6siHaRBbd+lyh6NAhFEobiznKU7kTsSsDeSD62Pe7kAM1b7dAZQ==", + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/eslint-plugin-unused-imports/-/eslint-plugin-unused-imports-4.2.0.tgz", + "integrity": "sha512-hLbJ2/wnjKq4kGA9AUaExVFIbNzyxYdVo49QZmKCnhk5pc9wcYRbfgLHvWJ8tnsdcseGhoUAddm9gn/lt+d74w==", "dev": true, "license": "MIT", "peerDependencies": { @@ -12856,6 +13277,31 @@ "url": "https://opencollective.com/express" } }, + "node_modules/express/node_modules/body-parser": { + "version": "1.20.3", + "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.3.tgz", + "integrity": "sha512-7rAxByjUMqQ3/bHJy7D6OGXvx/MMc4IqBn/X0fcM1QUcAItpZrBEYhWGem+tzXH90c+G01ypMcYJBO9Y30203g==", + "dev": true, + "license": "MIT", + "dependencies": { + "bytes": "3.1.2", + "content-type": "~1.0.5", + "debug": "2.6.9", + "depd": "2.0.0", + "destroy": "1.2.0", + "http-errors": "2.0.0", + "iconv-lite": "0.4.24", + "on-finished": "2.4.1", + "qs": "6.13.0", + "raw-body": "2.5.2", + "type-is": "~1.6.18", + "unpipe": "1.0.0" + }, + "engines": { + "node": ">= 0.8", + "npm": "1.2.8000 || >= 1.4.16" + } + }, "node_modules/express/node_modules/debug": { "version": "2.6.9", "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", @@ -12866,13 +13312,187 @@ "ms": "2.0.0" } }, - "node_modules/express/node_modules/ms": { + "node_modules/express/node_modules/debug/node_modules/ms": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==", "dev": true, "license": "MIT" }, + "node_modules/express/node_modules/encodeurl": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-2.0.0.tgz", + "integrity": "sha512-Q0n9HRi4m6JuGIV1eFlmvJB7ZEVxu93IrMyiMsGC0lrMJMWzRgx6WGquyfQgZVb31vhGgXnfmPNNXmxnOkRBrg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/express/node_modules/finalhandler": { + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.3.1.tgz", + "integrity": "sha512-6BN9trH7bp3qvnrRyzsBz+g3lZxTNZTbVO2EV1CS0WIcDbawYVdYvGflME/9QP0h0pYlCDBCTjYa9nZzMDpyxQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "debug": "2.6.9", + "encodeurl": "~2.0.0", + "escape-html": "~1.0.3", + "on-finished": "2.4.1", + "parseurl": "~1.3.3", + "statuses": "2.0.1", + "unpipe": "~1.0.0" + }, + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/express/node_modules/fresh": { + "version": "0.5.2", + "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz", + "integrity": "sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/express/node_modules/iconv-lite": { + "version": "0.4.24", + "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz", + "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==", + "dev": true, + "license": "MIT", + "dependencies": { + "safer-buffer": ">= 2.1.2 < 3" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/express/node_modules/media-typer": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz", + "integrity": "sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/express/node_modules/qs": { + "version": "6.13.0", + "resolved": "https://registry.npmjs.org/qs/-/qs-6.13.0.tgz", + "integrity": "sha512-+38qI9SOr8tfZ4QmJNplMUxqjbe7LKvvZgWdExBOmd+egZTtjLB67Gu0HRX3u/XOq7UU2Nx6nsjvS16Z9uwfpg==", + "dev": true, + "license": "BSD-3-Clause", + "dependencies": { + "side-channel": "^1.0.6" + }, + "engines": { + "node": ">=0.6" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/express/node_modules/raw-body": { + "version": "2.5.2", + "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.5.2.tgz", + "integrity": "sha512-8zGqypfENjCIqGhgXToC8aB2r7YrBX+AQAfIPs/Mlk+BtPTztOvTS01NRW/3Eh60J+a48lt8qsCzirQ6loCVfA==", + "dev": true, + "license": "MIT", + "dependencies": { + "bytes": "3.1.2", + "http-errors": "2.0.0", + "iconv-lite": "0.4.24", + "unpipe": "1.0.0" + }, + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/express/node_modules/safe-buffer": { + "version": "5.2.1", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", + "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==", + "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ], + "license": "MIT" + }, + "node_modules/express/node_modules/send": { + "version": "0.19.0", + "resolved": "https://registry.npmjs.org/send/-/send-0.19.0.tgz", + "integrity": "sha512-dW41u5VfLXu8SJh5bwRmyYUbAoSB3c9uQh6L8h/KtsFREPWpbX1lrljJo186Jc4nmci/sGUZ9a0a0J2zgfq2hw==", + "dev": true, + "license": "MIT", + "dependencies": { + "debug": "2.6.9", + "depd": "2.0.0", + "destroy": "1.2.0", + "encodeurl": "~1.0.2", + "escape-html": "~1.0.3", + "etag": "~1.8.1", + "fresh": "0.5.2", + "http-errors": "2.0.0", + "mime": "1.6.0", + "ms": "2.1.3", + "on-finished": "2.4.1", + "range-parser": "~1.2.1", + "statuses": "2.0.1" + }, + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/express/node_modules/send/node_modules/encodeurl": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz", + "integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/express/node_modules/statuses": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz", + "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/express/node_modules/type-is": { + "version": "1.6.18", + "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz", + "integrity": "sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==", + "dev": true, + "license": "MIT", + "dependencies": { + "media-typer": "0.3.0", + "mime-types": "~2.1.24" + }, + "engines": { + "node": ">= 0.6" + } + }, "node_modules/fancy-log": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/fancy-log/-/fancy-log-2.0.0.tgz", @@ -12945,9 +13565,9 @@ "license": "MIT" }, "node_modules/fast-uri": { - "version": "3.0.6", - "resolved": "https://registry.npmjs.org/fast-uri/-/fast-uri-3.0.6.tgz", - "integrity": "sha512-Atfo14OibSv5wAp4VWNsFYE1AchQRTv9cBGWET4pZWHzYshFSS9NQI6I57rdKn9croWVMbYFbLhJ+yJvmZIIHw==", + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/fast-uri/-/fast-uri-3.1.0.tgz", + "integrity": "sha512-iPeeDKJSWf4IEOasVVrknXpaBV0IApz/gp7S2bb7Z4Lljbl2MGJRqInZiUrQwV16cpzw/D3S5j5Julj/gT52AA==", "dev": true, "funding": [ { @@ -12995,11 +13615,14 @@ } }, "node_modules/fdir": { - "version": "6.4.6", - "resolved": "https://registry.npmjs.org/fdir/-/fdir-6.4.6.tgz", - "integrity": "sha512-hiFoqpyZcfNm1yc4u8oWCf9A2c4D3QjCrks3zmoVKVxpQRzmPNar1hUJcBG2RQHvEVGDN+Jm81ZheVLAQMK6+w==", + "version": "6.5.0", + "resolved": "https://registry.npmjs.org/fdir/-/fdir-6.5.0.tgz", + "integrity": "sha512-tIbYtZbucOs0BRGqPJkshJUYdL+SDH7dVM8gjy+ERp3WAUjLEFJE+02kanyHtwjWOnwrKYBiwAmM0p4kLJAnXg==", "dev": true, "license": "MIT", + "engines": { + "node": ">=12.0.0" + }, "peerDependencies": { "picomatch": "^3 || ^4" }, @@ -13009,6 +13632,15 @@ } } }, + "node_modules/fetch-ponyfill": { + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/fetch-ponyfill/-/fetch-ponyfill-7.1.0.tgz", + "integrity": "sha512-FhbbL55dj/qdVO3YNK7ZEkshvj3eQ7EuIGV2I6ic/2YiocvyWv+7jg2s4AyS0wdRU75s3tA8ZxI/xPigb0v5Aw==", + "license": "MIT", + "dependencies": { + "node-fetch": "~2.6.1" + } + }, "node_modules/file-entry-cache": { "version": "8.0.0", "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-8.0.0.tgz", @@ -13059,18 +13691,18 @@ } }, "node_modules/finalhandler": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.3.1.tgz", - "integrity": "sha512-6BN9trH7bp3qvnrRyzsBz+g3lZxTNZTbVO2EV1CS0WIcDbawYVdYvGflME/9QP0h0pYlCDBCTjYa9nZzMDpyxQ==", + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.2.tgz", + "integrity": "sha512-aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA==", "dev": true, "license": "MIT", "dependencies": { "debug": "2.6.9", - "encodeurl": "~2.0.0", + "encodeurl": "~1.0.2", "escape-html": "~1.0.3", - "on-finished": "2.4.1", + "on-finished": "~2.3.0", "parseurl": "~1.3.3", - "statuses": "2.0.1", + "statuses": "~1.5.0", "unpipe": "~1.0.0" }, "engines": { @@ -13094,6 +13726,19 @@ "dev": true, "license": "MIT" }, + "node_modules/finalhandler/node_modules/on-finished": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz", + "integrity": "sha512-ikqdkGAAyf/X/gPhXGvfgAytDZtDbr+bkNUJ0N9h5MI/dmdgCs3l6hoHrcUv41sRKew3jIwrp4qQDXiK99Utww==", + "dev": true, + "license": "MIT", + "dependencies": { + "ee-first": "1.1.1" + }, + "engines": { + "node": ">= 0.8" + } + }, "node_modules/find-cache-dir": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-4.0.0.tgz", @@ -13266,13 +13911,13 @@ } }, "node_modules/fresh": { - "version": "0.5.2", - "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz", - "integrity": "sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q==", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/fresh/-/fresh-2.0.0.tgz", + "integrity": "sha512-Rx/WycZ60HOaqLKAi6cHRKKI7zxWbJ31MhntmtwMoaTeF7XFH9hhBp8vITaMidfljRQ6eYWCKkaTK+ykVJHP2A==", "dev": true, "license": "MIT", "engines": { - "node": ">= 0.6" + "node": ">= 0.8" } }, "node_modules/from": { @@ -13283,28 +13928,18 @@ "license": "MIT" }, "node_modules/fs-extra": { - "version": "11.3.1", - "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-11.3.1.tgz", - "integrity": "sha512-eXvGGwZ5CL17ZSwHWd3bbgk7UUpF6IFHtP57NYYakPvHOs8GDgDe5KJI36jIJzDkJ6eJjuzRA8eBQb6SkKue0g==", + "version": "11.3.2", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-11.3.2.tgz", + "integrity": "sha512-Xr9F6z6up6Ws+NjzMCZc6WXg2YFRlrLP9NQDO3VQrWrfiojdhS56TzueT88ze0uBdCTwEIhQ3ptnmKeWGFAe0A==", "dev": true, "license": "MIT", "dependencies": { "graceful-fs": "^4.2.0", "jsonfile": "^6.0.1", "universalify": "^2.0.0" - }, - "engines": { - "node": ">=14.14" - } - }, - "node_modules/fs-extra/node_modules/universalify": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz", - "integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==", - "dev": true, - "license": "MIT", + }, "engines": { - "node": ">= 10.0.0" + "node": ">=14.14" } }, "node_modules/fs-minipass": { @@ -13404,9 +14039,9 @@ } }, "node_modules/get-east-asian-width": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/get-east-asian-width/-/get-east-asian-width-1.3.0.tgz", - "integrity": "sha512-vpeMIQKxczTD/0s2CdEWHcb0eeJe6TFjxb+J5xgX7hScxqrGuyjmv4c1D4A/gelKfyox0gJJwIHF+fLjeaM8kQ==", + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/get-east-asian-width/-/get-east-asian-width-1.4.0.tgz", + "integrity": "sha512-QZjmEOC+IT1uk6Rx0sX22V6uHWVwbdbxf1faPqJ1QhLdGgsRGCZoyaQBm/piRdJy/D2um6hM1UP7ZEeQ4EkP+Q==", "dev": true, "license": "MIT", "engines": { @@ -13515,22 +14150,25 @@ } }, "node_modules/glob": { - "version": "10.4.5", - "resolved": "https://registry.npmjs.org/glob/-/glob-10.4.5.tgz", - "integrity": "sha512-7Bv8RF0k6xjo7d4A/PxYLbUCfb6c+Vpd2/mB2yRDlew7Jb5hEXiCD9ibfO7wpk8i4sevK6DFny9h7EYbM3/sHg==", + "version": "11.0.3", + "resolved": "https://registry.npmjs.org/glob/-/glob-11.0.3.tgz", + "integrity": "sha512-2Nim7dha1KVkaiF4q6Dj+ngPPMdfvLJEOpZk/jKiUAkqKebpGAWQXAq9z1xu9HKu5lWfqw/FASuccEjyznjPaA==", "dev": true, "license": "ISC", "dependencies": { - "foreground-child": "^3.1.0", - "jackspeak": "^3.1.2", - "minimatch": "^9.0.4", + "foreground-child": "^3.3.1", + "jackspeak": "^4.1.1", + "minimatch": "^10.0.3", "minipass": "^7.1.2", "package-json-from-dist": "^1.0.0", - "path-scurry": "^1.11.1" + "path-scurry": "^2.0.0" }, "bin": { "glob": "dist/esm/bin.mjs" }, + "engines": { + "node": "20 || >=22" + }, "funding": { "url": "https://github.com/sponsors/isaacs" } @@ -13548,6 +14186,23 @@ "node": ">=10.13.0" } }, + "node_modules/glob-to-regex.js": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/glob-to-regex.js/-/glob-to-regex.js-1.0.1.tgz", + "integrity": "sha512-CG/iEvgQqfzoVsMUbxSJcwbG2JwyZ3naEqPkeltwl0BSS8Bp83k3xlGms+0QdWFUAwV+uvo80wNswKF6FWEkKg==", + "dev": true, + "license": "Apache-2.0", + "engines": { + "node": ">=10.0" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/streamich" + }, + "peerDependencies": { + "tslib": "2" + } + }, "node_modules/glob-to-regexp": { "version": "0.4.1", "resolved": "https://registry.npmjs.org/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz", @@ -13555,6 +14210,22 @@ "dev": true, "license": "BSD-2-Clause" }, + "node_modules/glob/node_modules/minimatch": { + "version": "10.0.3", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-10.0.3.tgz", + "integrity": "sha512-IPZ167aShDZZUMdRk66cyQAW3qr0WzbHkPdMYa8bzZhlHhO3jALbKdxcaak7W9FfT2rZNpQuUu4Od7ILEpXSaw==", + "dev": true, + "license": "ISC", + "dependencies": { + "@isaacs/brace-expansion": "^5.0.0" + }, + "engines": { + "node": "20 || >=22" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, "node_modules/global-directory": { "version": "4.0.1", "resolved": "https://registry.npmjs.org/global-directory/-/global-directory-4.0.1.tgz", @@ -13887,13 +14558,6 @@ "util-deprecate": "~1.0.1" } }, - "node_modules/hpack.js/node_modules/safe-buffer": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", - "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==", - "dev": true, - "license": "MIT" - }, "node_modules/hpack.js/node_modules/string_decoder": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", @@ -13917,6 +14581,32 @@ "node": ">=12" } }, + "node_modules/html-encoding-sniffer/node_modules/iconv-lite": { + "version": "0.6.3", + "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz", + "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==", + "dev": true, + "license": "MIT", + "dependencies": { + "safer-buffer": ">= 2.1.2 < 3.0.0" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/html-encoding-sniffer/node_modules/whatwg-encoding": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/whatwg-encoding/-/whatwg-encoding-2.0.0.tgz", + "integrity": "sha512-p41ogyeMUrw3jWclHWTQg1k05DSVXPLcVxRTYsXUk+ZooOCZLcoYgPZ/HL/D/N+uQPOtcp1me1WhBEaX02mhWg==", + "dev": true, + "license": "MIT", + "dependencies": { + "iconv-lite": "0.6.3" + }, + "engines": { + "node": ">=12" + } + }, "node_modules/html-entities": { "version": "2.6.0", "resolved": "https://registry.npmjs.org/html-entities/-/html-entities-2.6.0.tgz", @@ -14000,6 +14690,16 @@ "node": ">=8" } }, + "node_modules/http-auth/node_modules/uuid": { + "version": "8.3.2", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz", + "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==", + "dev": true, + "license": "MIT", + "bin": { + "uuid": "dist/bin/uuid" + } + }, "node_modules/http-cache-semantics": { "version": "4.2.0", "resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.2.0.tgz", @@ -14031,6 +14731,16 @@ "node": ">= 0.8" } }, + "node_modules/http-errors/node_modules/statuses": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz", + "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 0.8" + } + }, "node_modules/http-parser-js": { "version": "0.5.10", "resolved": "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.5.10.tgz", @@ -14150,9 +14860,9 @@ } }, "node_modules/i18next": { - "version": "23.16.8", - "resolved": "https://registry.npmjs.org/i18next/-/i18next-23.16.8.tgz", - "integrity": "sha512-06r/TitrM88Mg5FdUXAKL96dJMzgqLE5dv3ryBAra4KCwD9mJ4ndOTS95ZuymIGoE+2hzfdaMak2X11/es7ZWg==", + "version": "25.5.2", + "resolved": "https://registry.npmjs.org/i18next/-/i18next-25.5.2.tgz", + "integrity": "sha512-lW8Zeh37i/o0zVr+NoCHfNnfvVw+M6FQbRp36ZZ/NyHDJ3NJVpp2HhAUyU9WafL5AssymNoOjMRB48mmx2P6Hw==", "dev": true, "funding": [ { @@ -14170,13 +14880,31 @@ ], "license": "MIT", "dependencies": { - "@babel/runtime": "^7.23.2" + "@babel/runtime": "^7.27.6" + }, + "peerDependencies": { + "typescript": "^5" + }, + "peerDependenciesMeta": { + "typescript": { + "optional": true + } + } + }, + "node_modules/i18next/node_modules/@babel/runtime": { + "version": "7.28.4", + "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.28.4.tgz", + "integrity": "sha512-Q/N6JNWvIvPnLDvjlE1OUBLPQHH6l3CltCEsHIujp45zQUSSh8K+gHnaEX45yAT1nyngnINhvWtzN+Nb9D8RAQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6.9.0" } }, "node_modules/iconv-lite": { - "version": "0.6.3", - "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz", - "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==", + "version": "0.7.0", + "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.7.0.tgz", + "integrity": "sha512-cf6L2Ds3h57VVmkZe+Pn+5APsT7FpqJtEhhieDCvrE2MK5Qk9MyffgQyuxQTm6BChfeZNtcOLHp9IcWRVcIcBQ==", "dev": true, "license": "MIT", "dependencies": { @@ -14184,6 +14912,10 @@ }, "engines": { "node": ">=0.10.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/express" } }, "node_modules/icss-utils": { @@ -14203,7 +14935,6 @@ "version": "1.2.1", "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz", "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==", - "dev": true, "funding": [ { "type": "github", @@ -14391,9 +15122,9 @@ } }, "node_modules/import-meta-resolve": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/import-meta-resolve/-/import-meta-resolve-4.1.0.tgz", - "integrity": "sha512-I6fiaX09Xivtk+THaMfAwnA3MVA5Big1WHF1Dfx9hFuvNIWpXnorlkzhcQf6ehrqQiiZECRt1poOAkPmer3ruw==", + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/import-meta-resolve/-/import-meta-resolve-4.2.0.tgz", + "integrity": "sha512-Iqv2fzaTQN28s/FwZAoFq0ZSs/7hMAHJVX+w8PZl3cY19Pxk6jFFalxQoIfW2826i/fDLXv8IiEZRIT0lDuWcg==", "dev": true, "license": "MIT", "funding": { @@ -14783,9 +15514,9 @@ } }, "node_modules/is-network-error": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/is-network-error/-/is-network-error-1.1.0.tgz", - "integrity": "sha512-tUdRRAnhT+OtCZR/LxZelH/C7QtjtFrTu5tXCA8pl55eTUElUHT+GPYV8MBMBvea/j+NxQqVt3LbWMRir7Gx9g==", + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/is-network-error/-/is-network-error-1.3.0.tgz", + "integrity": "sha512-6oIwpsgRfnDiyEDLMay/GqCl3HoAtH5+RUKW29gYkL0QA+ipzpDLA16yQs7/RHCSu+BwgbJaOUqa4A99qNVQVw==", "dev": true, "license": "MIT", "engines": { @@ -15161,9 +15892,9 @@ } }, "node_modules/istanbul-reports": { - "version": "3.1.7", - "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-3.1.7.tgz", - "integrity": "sha512-BewmUXImeuRk2YY0PVbxgKAysvhRPUQE0h5QRM++nVWyubKGV0l8qQ5op8+B2DOmwSe63Jivj0BjkPQVf8fP5g==", + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-3.2.0.tgz", + "integrity": "sha512-HGYWWS/ehqTV3xN10i23tkPkpH46MLCIMFNCaaKNavAXTF1RkqxawEPtnjnGZ6XKSInBKkiOA5BKS+aZiY3AvA==", "dev": true, "license": "BSD-3-Clause", "dependencies": { @@ -15175,19 +15906,19 @@ } }, "node_modules/jackspeak": { - "version": "3.4.3", - "resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-3.4.3.tgz", - "integrity": "sha512-OGlZQpz2yfahA/Rd1Y8Cd9SIEsqvXkLVoSw/cgwhnhFMDbsQFeZYoJJ7bIZBS9BcamUW96asq/npPWugM+RQBw==", + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-4.1.1.tgz", + "integrity": "sha512-zptv57P3GpL+O0I7VdMJNBZCu+BPHVQUk55Ft8/QCJjTVxrnJHuVuX/0Bl2A6/+2oyR/ZMEuFKwmzqqZ/U5nPQ==", "dev": true, "license": "BlueOak-1.0.0", "dependencies": { "@isaacs/cliui": "^8.0.2" }, + "engines": { + "node": "20 || >=22" + }, "funding": { "url": "https://github.com/sponsors/isaacs" - }, - "optionalDependencies": { - "@pkgjs/parseargs": "^0.11.0" } }, "node_modules/jake": { @@ -16492,9 +17223,9 @@ } }, "node_modules/jiti": { - "version": "2.5.1", - "resolved": "https://registry.npmjs.org/jiti/-/jiti-2.5.1.tgz", - "integrity": "sha512-twQoecYPiVA5K/h6SxtORw/Bs3ar+mLUtoPSc7iMXzQzK8d7eJ/R09wmTwAjiamETn1cXYPGfNnu7DMoHgu12w==", + "version": "2.6.0", + "resolved": "https://registry.npmjs.org/jiti/-/jiti-2.6.0.tgz", + "integrity": "sha512-VXe6RjJkBPj0ohtqaO8vSWP3ZhAKo66fKrFNCll4BTcwljPLz03pCbaNKfzGP5MbrCYcbJ7v0nOYYwUzTEIdXQ==", "dev": true, "license": "MIT", "bin": { @@ -16594,6 +17325,42 @@ "node": ">= 6" } }, + "node_modules/jsdom/node_modules/iconv-lite": { + "version": "0.6.3", + "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz", + "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==", + "dev": true, + "license": "MIT", + "dependencies": { + "safer-buffer": ">= 2.1.2 < 3.0.0" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/jsdom/node_modules/whatwg-encoding": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/whatwg-encoding/-/whatwg-encoding-2.0.0.tgz", + "integrity": "sha512-p41ogyeMUrw3jWclHWTQg1k05DSVXPLcVxRTYsXUk+ZooOCZLcoYgPZ/HL/D/N+uQPOtcp1me1WhBEaX02mhWg==", + "dev": true, + "license": "MIT", + "dependencies": { + "iconv-lite": "0.6.3" + }, + "engines": { + "node": ">=12" + } + }, + "node_modules/jsdom/node_modules/whatwg-mimetype": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/whatwg-mimetype/-/whatwg-mimetype-3.0.0.tgz", + "integrity": "sha512-nt+N2dzIutVRxARx1nghPKGv1xHikU7HKdfafKkLNLindmPU/ch3U31NOCGGA/dmPcmb1VlofO0vnKAcsm0o/Q==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=12" + } + }, "node_modules/jsesc": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-3.1.0.tgz", @@ -16671,16 +17438,6 @@ "graceful-fs": "^4.1.6" } }, - "node_modules/jsonfile/node_modules/universalify": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz", - "integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">= 10.0.0" - } - }, "node_modules/jsonparse": { "version": "1.3.1", "resolved": "https://registry.npmjs.org/jsonparse/-/jsonparse-1.3.1.tgz", @@ -16718,6 +17475,31 @@ "source-map-support": "^0.5.5" } }, + "node_modules/katex": { + "version": "0.16.22", + "resolved": "https://registry.npmjs.org/katex/-/katex-0.16.22.tgz", + "integrity": "sha512-XCHRdUw4lf3SKBaJe4EvgqIuWwkPSo9XoeO8GjQW94Bp7TWv9hNhzZjZ+OH9yf1UmLygb7DIT5GSFQiyt16zYg==", + "funding": [ + "https://opencollective.com/katex", + "https://github.com/sponsors/katex" + ], + "license": "MIT", + "dependencies": { + "commander": "^8.3.0" + }, + "bin": { + "katex": "cli.js" + } + }, + "node_modules/katex/node_modules/commander": { + "version": "8.3.0", + "resolved": "https://registry.npmjs.org/commander/-/commander-8.3.0.tgz", + "integrity": "sha512-OkTL9umf+He2DZkUq8f8J9of7yL6RJKI24dVITBmNfZBmri9zYZQrKkuXiKhyfPSu8tUhnVBB1iKXevvnlR4Ww==", + "license": "MIT", + "engines": { + "node": ">= 12" + } + }, "node_modules/keycharm": { "version": "0.2.0", "resolved": "https://registry.npmjs.org/keycharm/-/keycharm-0.2.0.tgz", @@ -17115,9 +17897,9 @@ } }, "node_modules/listr2/node_modules/ansi-styles": { - "version": "6.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.1.tgz", - "integrity": "sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==", + "version": "6.2.3", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.3.tgz", + "integrity": "sha512-4Dj6M28JB+oAH8kFkTLUo+a2jwOFkuqb3yucU0CANcRRUbxS0cP0nZYCGjcc3BNXwRIsUVmDGgzawme7zvJHvg==", "dev": true, "license": "MIT", "engines": { @@ -17128,9 +17910,9 @@ } }, "node_modules/listr2/node_modules/emoji-regex": { - "version": "10.4.0", - "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-10.4.0.tgz", - "integrity": "sha512-EC+0oUMY1Rqm4O6LLrgjtYDvcVYTy7chDnM4Q7030tP4Kwj3u/pR6gP9ygnp2CJMK5Gq+9Q2oqmrFJAz01DXjw==", + "version": "10.5.0", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-10.5.0.tgz", + "integrity": "sha512-lb49vf1Xzfx080OKA0o6l8DQQpV+6Vg95zyCJX9VB/BqKYlhG7N4wgROUUHRA+ZPUefLnteQOad7z1kT2bV7bg==", "dev": true, "license": "MIT" }, @@ -17160,9 +17942,9 @@ } }, "node_modules/listr2/node_modules/wrap-ansi": { - "version": "9.0.0", - "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-9.0.0.tgz", - "integrity": "sha512-G8ura3S+3Z2G+mkgNRq8dqaFZAuxfsxpBB8OCTGRTCtp+l/v9nbFNmCUP1BZMts3G1142MsZfn6eeUKrr4PD1Q==", + "version": "9.0.2", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-9.0.2.tgz", + "integrity": "sha512-42AtmgqjV+X1VpdOfyTGOYRi0/zsoLqtXQckTmqTeybT+BDIbM/Guxo7x3pE2vtpr1ok6xRqM9OpBe+Jyoqyww==", "dev": true, "license": "MIT", "dependencies": { @@ -17395,9 +18177,9 @@ } }, "node_modules/log-update/node_modules/ansi-escapes": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-7.0.0.tgz", - "integrity": "sha512-GdYO7a61mR0fOlAsvC9/rIHf7L96sBc6dEWzeOu+KAea5bZyQRPIpojrVoI4AXGJS/ycu/fBTdLrUkA4ODrvjw==", + "version": "7.1.1", + "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-7.1.1.tgz", + "integrity": "sha512-Zhl0ErHcSRUaVfGUeUdDuLgpkEo8KIFjB4Y9uAc46ScOpdDiU1Dbyplh7qWJeJ/ZHpbyMSM26+X3BySgnIz40Q==", "dev": true, "license": "MIT", "dependencies": { @@ -17411,9 +18193,9 @@ } }, "node_modules/log-update/node_modules/ansi-styles": { - "version": "6.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.1.tgz", - "integrity": "sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==", + "version": "6.2.3", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.3.tgz", + "integrity": "sha512-4Dj6M28JB+oAH8kFkTLUo+a2jwOFkuqb3yucU0CANcRRUbxS0cP0nZYCGjcc3BNXwRIsUVmDGgzawme7zvJHvg==", "dev": true, "license": "MIT", "engines": { @@ -17424,20 +18206,20 @@ } }, "node_modules/log-update/node_modules/emoji-regex": { - "version": "10.4.0", - "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-10.4.0.tgz", - "integrity": "sha512-EC+0oUMY1Rqm4O6LLrgjtYDvcVYTy7chDnM4Q7030tP4Kwj3u/pR6gP9ygnp2CJMK5Gq+9Q2oqmrFJAz01DXjw==", + "version": "10.5.0", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-10.5.0.tgz", + "integrity": "sha512-lb49vf1Xzfx080OKA0o6l8DQQpV+6Vg95zyCJX9VB/BqKYlhG7N4wgROUUHRA+ZPUefLnteQOad7z1kT2bV7bg==", "dev": true, "license": "MIT" }, "node_modules/log-update/node_modules/is-fullwidth-code-point": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-5.0.0.tgz", - "integrity": "sha512-OVa3u9kkBbw7b8Xw5F9P+D/T9X+Z4+JruYVNapTjPYZYUznQ5YfWeFkOj606XYYW8yugTfC8Pj0hYqvi4ryAhA==", + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-5.1.0.tgz", + "integrity": "sha512-5XHYaSyiqADb4RnZ1Bdad6cPp8Toise4TzEjcOYDHZkTCbKgiUl7WTUCpNWHuxmDt91wnsZBc9xinNzopv3JMQ==", "dev": true, "license": "MIT", "dependencies": { - "get-east-asian-width": "^1.0.0" + "get-east-asian-width": "^1.3.1" }, "engines": { "node": ">=18" @@ -17447,9 +18229,9 @@ } }, "node_modules/log-update/node_modules/slice-ansi": { - "version": "7.1.0", - "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-7.1.0.tgz", - "integrity": "sha512-bSiSngZ/jWeX93BqeIAbImyTbEihizcwNjFoRUIY/T1wWQsfsm2Vw1agPKylXvQTU7iASGdHhyqRlqQzfz+Htg==", + "version": "7.1.2", + "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-7.1.2.tgz", + "integrity": "sha512-iOBWFgUX7caIZiuutICxVgX1SdxwAVFFKwt1EvMYYec/NWO5meOJ6K5uQxhrYBdQJne4KxiqZc+KptFOWFSI9w==", "dev": true, "license": "MIT", "dependencies": { @@ -17482,9 +18264,9 @@ } }, "node_modules/log-update/node_modules/wrap-ansi": { - "version": "9.0.0", - "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-9.0.0.tgz", - "integrity": "sha512-G8ura3S+3Z2G+mkgNRq8dqaFZAuxfsxpBB8OCTGRTCtp+l/v9nbFNmCUP1BZMts3G1142MsZfn6eeUKrr4PD1Q==", + "version": "9.0.2", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-9.0.2.tgz", + "integrity": "sha512-42AtmgqjV+X1VpdOfyTGOYRi0/zsoLqtXQckTmqTeybT+BDIbM/Guxo7x3pE2vtpr1ok6xRqM9OpBe+Jyoqyww==", "dev": true, "license": "MIT", "dependencies": { @@ -17659,6 +18441,19 @@ "node": ">= 16" } }, + "node_modules/matchit": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/matchit/-/matchit-1.1.0.tgz", + "integrity": "sha512-+nGYoOlfHmxe5BW5tE0EMJppXEwdSf8uBA1GTZC7Q77kbT35+VKLYJMzVNWCHSsga1ps1tPYFtFyvxvKzWVmMA==", + "dev": true, + "license": "MIT", + "dependencies": { + "@arr/every": "^1.0.0" + }, + "engines": { + "node": ">=6" + } + }, "node_modules/math-intrinsics": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/math-intrinsics/-/math-intrinsics-1.1.0.tgz", @@ -17676,30 +18471,29 @@ "license": "MIT" }, "node_modules/media-typer": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz", - "integrity": "sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ==", + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-1.1.0.tgz", + "integrity": "sha512-aisnrDP4GNe06UcKFnV5bfMNPBUw4jsLGaWwWfnH3v02GnBuXX2MCVn5RbrWo0j3pczUilYblq7fQ7Nw2t5XKw==", "dev": true, "license": "MIT", "engines": { - "node": ">= 0.6" + "node": ">= 0.8" } }, "node_modules/memfs": { - "version": "4.36.0", - "resolved": "https://registry.npmjs.org/memfs/-/memfs-4.36.0.tgz", - "integrity": "sha512-mfBfzGUdoEw5AZwG8E965ej3BbvW2F9LxEWj4uLxF6BEh1dO2N9eS3AGu9S6vfenuQYrVjsbUOOZK7y3vz4vyQ==", + "version": "4.47.0", + "resolved": "https://registry.npmjs.org/memfs/-/memfs-4.47.0.tgz", + "integrity": "sha512-Xey8IZA57tfotV/TN4d6BmccQuhFP+CqRiI7TTNdipZdZBzF2WnzUcH//Cudw6X4zJiUbo/LTuU/HPA/iC/pNg==", "dev": true, "license": "Apache-2.0", "dependencies": { - "@jsonjoy.com/json-pack": "^1.0.3", - "@jsonjoy.com/util": "^1.3.0", - "tree-dump": "^1.0.1", + "@jsonjoy.com/json-pack": "^1.11.0", + "@jsonjoy.com/util": "^1.9.0", + "glob-to-regex.js": "^1.0.1", + "thingies": "^2.5.0", + "tree-dump": "^1.0.3", "tslib": "^2.0.0" }, - "engines": { - "node": ">= 4.0.0" - }, "funding": { "type": "github", "url": "https://github.com/sponsors/streamich" @@ -18036,9 +18830,9 @@ "license": "ISC" }, "node_modules/minizlib": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-3.0.2.tgz", - "integrity": "sha512-oG62iEk+CYt5Xj2YqI5Xi9xWUeZhDI8jjQmC5oThVH5JGCTgIjr7ciJDzC7MBzYd//WvR1OTmP5Q38Q8ShQtVA==", + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-3.1.0.tgz", + "integrity": "sha512-KZxYo1BUkWD2TVFLr0MQoM8vUUigWD3LlD83a/75BqC+4qE0Hb1Vo5v1FgcfaNXvfXzr+5EhQ6ing/CaBijTlw==", "dev": true, "license": "MIT", "dependencies": { @@ -18237,6 +19031,20 @@ "node": ">= 4.4.x" } }, + "node_modules/needle/node_modules/iconv-lite": { + "version": "0.6.3", + "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz", + "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==", + "dev": true, + "license": "MIT", + "optional": true, + "dependencies": { + "safer-buffer": ">= 2.1.2 < 3.0.0" + }, + "engines": { + "node": ">=0.10.0" + } + }, "node_modules/negotiator": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-1.0.0.tgz", @@ -18326,7 +19134,49 @@ "integrity": "sha512-+eawOlIgy680F0kBzPUNFhMZGtJ1YmqM6l4+Crf4IkImjYrO/mqPwRMh352g23uIaQKFItcQ64I7KMaJxHgAVA==", "dev": true, "license": "MIT", - "optional": true + "optional": true + }, + "node_modules/node-fetch": { + "version": "2.6.13", + "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.13.tgz", + "integrity": "sha512-StxNAxh15zr77QvvkmveSQ8uCQ4+v5FkvNTj0OESmiHu+VRi/gXArXtkWMElOsOUNLtUEvI4yS+rdtOHZTwlQA==", + "license": "MIT", + "dependencies": { + "whatwg-url": "^5.0.0" + }, + "engines": { + "node": "4.x || >=6.0.0" + }, + "peerDependencies": { + "encoding": "^0.1.0" + }, + "peerDependenciesMeta": { + "encoding": { + "optional": true + } + } + }, + "node_modules/node-fetch/node_modules/tr46": { + "version": "0.0.3", + "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz", + "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==", + "license": "MIT" + }, + "node_modules/node-fetch/node_modules/webidl-conversions": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz", + "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==", + "license": "BSD-2-Clause" + }, + "node_modules/node-fetch/node_modules/whatwg-url": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz", + "integrity": "sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==", + "license": "MIT", + "dependencies": { + "tr46": "~0.0.3", + "webidl-conversions": "^3.0.0" + } }, "node_modules/node-forge": { "version": "1.3.1", @@ -18339,9 +19189,9 @@ } }, "node_modules/node-gyp": { - "version": "11.3.0", - "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-11.3.0.tgz", - "integrity": "sha512-9J0+C+2nt3WFuui/mC46z2XCZ21/cKlFDuywULmseD/LlmnOrSeEAE4c/1jw6aybXLmpZnQY3/LmOJfgyHIcng==", + "version": "11.4.2", + "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-11.4.2.tgz", + "integrity": "sha512-3gD+6zsrLQH7DyYOUIutaauuXrcyxeTPyQuZQCQoNPZMHMMS5m4y0xclNpvYzoK3VNzuyxT6eF4mkIL4WSZ1eQ==", "dev": true, "license": "MIT", "dependencies": { @@ -18399,34 +19249,17 @@ "node": ">=16" } }, - "node_modules/node-gyp/node_modules/mkdirp": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-3.0.1.tgz", - "integrity": "sha512-+NsyUUAZDmo6YVHzL/stxSu3t9YS1iljliy3BSDrXJ/dkn1KYdmtZODGGjLcc9XLgVVpH4KshHB8XmZgMhaBXg==", - "dev": true, - "license": "MIT", - "bin": { - "mkdirp": "dist/cjs/src/bin.js" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, "node_modules/node-gyp/node_modules/tar": { - "version": "7.4.3", - "resolved": "https://registry.npmjs.org/tar/-/tar-7.4.3.tgz", - "integrity": "sha512-5S7Va8hKfV7W5U6g3aYxXmlPoZVAwUMy9AOKyF2fVuZa2UD3qZjg578OrLRt8PcNN1PleVaL/5/yYATNL0ICUw==", + "version": "7.5.1", + "resolved": "https://registry.npmjs.org/tar/-/tar-7.5.1.tgz", + "integrity": "sha512-nlGpxf+hv0v7GkWBK2V9spgactGOp0qvfWRxUMjqHyzrt3SgwE48DIv/FhqPHJYLHpgW1opq3nERbz5Anq7n1g==", "dev": true, "license": "ISC", "dependencies": { "@isaacs/fs-minipass": "^4.0.0", "chownr": "^3.0.0", "minipass": "^7.1.2", - "minizlib": "^3.0.1", - "mkdirp": "^3.0.1", + "minizlib": "^3.1.0", "yallist": "^5.0.0" }, "engines": { @@ -18467,9 +19300,9 @@ "license": "MIT" }, "node_modules/node-releases": { - "version": "2.0.19", - "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.19.tgz", - "integrity": "sha512-xxOWJsBKtzAq7DY0J+DTzuz58K8e7sJbdgwkbMWQe8UYB6ekmsQ45q0M/tJDsGaZmbC+l7n57UV8Hl5tHxO9uw==", + "version": "2.0.21", + "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.21.tgz", + "integrity": "sha512-5b0pgg78U3hwXkCM8Z9b2FJdPZlr9Psr9V2gQPESdGHqbntyFJKFW4r5TeWGFzafGY3hzs1JC62VEQMbl1JFkw==", "dev": true, "license": "MIT" }, @@ -18523,9 +19356,9 @@ } }, "node_modules/npm-install-checks": { - "version": "7.1.1", - "resolved": "https://registry.npmjs.org/npm-install-checks/-/npm-install-checks-7.1.1.tgz", - "integrity": "sha512-u6DCwbow5ynAX5BdiHQ9qvexme4U3qHW3MWe5NqH+NeBm0LbiH6zvGjNNew1fY+AZZUtVHbOPF3j7mJxbUzpXg==", + "version": "7.1.2", + "resolved": "https://registry.npmjs.org/npm-install-checks/-/npm-install-checks-7.1.2.tgz", + "integrity": "sha512-z9HJBCYw9Zr8BqXcllKIs5nI+QggAImbBdHphOzVYrz2CB4iQ6FzWyKmlqDZua+51nAu7FcemlbTc9VgQN5XDQ==", "dev": true, "license": "BSD-2-Clause", "dependencies": { @@ -18637,9 +19470,9 @@ } }, "node_modules/nwsapi": { - "version": "2.2.21", - "resolved": "https://registry.npmjs.org/nwsapi/-/nwsapi-2.2.21.tgz", - "integrity": "sha512-o6nIY3qwiSXl7/LuOU0Dmuctd34Yay0yeuZRLFmDPrrdHpXKFndPj3hM+YEPVHYC5fx2otBx4Ilc/gyYSAUaIA==", + "version": "2.2.22", + "resolved": "https://registry.npmjs.org/nwsapi/-/nwsapi-2.2.22.tgz", + "integrity": "sha512-ujSMe1OWVn55euT1ihwCI1ZcAaAU3nxUiDwfDQldc51ZXaB9m2AyOn6/jh1BLe2t/G8xd6uKG1UBF2aZJeg2SQ==", "dev": true, "license": "MIT" }, @@ -19251,6 +20084,19 @@ "url": "https://github.com/inikulin/parse5?sponsor=1" } }, + "node_modules/parse5-parser-stream": { + "version": "7.1.2", + "resolved": "https://registry.npmjs.org/parse5-parser-stream/-/parse5-parser-stream-7.1.2.tgz", + "integrity": "sha512-JyeQc9iwFLn5TbvvqACIF/VXG6abODeB3Fwmv/TGdLk2LfbWkaySGY72at4+Ty7EkPZj854u4CrICqNk2qIbow==", + "dev": true, + "license": "MIT", + "dependencies": { + "parse5": "^7.0.0" + }, + "funding": { + "url": "https://github.com/inikulin/parse5?sponsor=1" + } + }, "node_modules/parse5-sax-parser": { "version": "7.0.0", "resolved": "https://registry.npmjs.org/parse5-sax-parser/-/parse5-sax-parser-7.0.0.tgz", @@ -19331,28 +20177,31 @@ "license": "MIT" }, "node_modules/path-scurry": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-1.11.1.tgz", - "integrity": "sha512-Xa4Nw17FS9ApQFJ9umLiJS4orGjm7ZzwUrwamcGQuHSzDyth9boKDaycYdDcZDuqYATXw4HFXgaqWTctW/v1HA==", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-2.0.0.tgz", + "integrity": "sha512-ypGJsmGtdXUOeM5u93TyeIEfEhM6s+ljAhrk5vAvSx8uyY/02OvrZnA0YNGUrPXfpJMgI1ODd3nwz8Npx4O4cg==", "dev": true, "license": "BlueOak-1.0.0", "dependencies": { - "lru-cache": "^10.2.0", - "minipass": "^5.0.0 || ^6.0.2 || ^7.0.0" + "lru-cache": "^11.0.0", + "minipass": "^7.1.2" }, "engines": { - "node": ">=16 || 14 >=14.18" + "node": "20 || >=22" }, "funding": { "url": "https://github.com/sponsors/isaacs" } }, "node_modules/path-scurry/node_modules/lru-cache": { - "version": "10.4.3", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.4.3.tgz", - "integrity": "sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==", + "version": "11.2.2", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-11.2.2.tgz", + "integrity": "sha512-F9ODfyqML2coTIsQpSkRHnLSZMtkU8Q+mSfcaIyKwy58u+8k5nvAYeiNhsyMARvzNcXJ9QfWVrcPsC9e9rAxtg==", "dev": true, - "license": "ISC" + "license": "ISC", + "engines": { + "node": "20 || >=22" + } }, "node_modules/path-to-regexp": { "version": "0.1.12", @@ -19494,6 +20343,17 @@ "node": ">=10.13.0" } }, + "node_modules/polka": { + "version": "0.5.2", + "resolved": "https://registry.npmjs.org/polka/-/polka-0.5.2.tgz", + "integrity": "sha512-FVg3vDmCqP80tOrs+OeNlgXYmFppTXdjD5E7I4ET1NjvtNmQrb1/mJibybKkb/d4NA7YWAr1ojxuhpL3FHqdlw==", + "dev": true, + "license": "MIT", + "dependencies": { + "@polka/url": "^0.5.0", + "trouter": "^2.0.1" + } + }, "node_modules/possible-typed-array-names": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/possible-typed-array-names/-/possible-typed-array-names-1.1.0.tgz", @@ -20116,13 +20976,13 @@ } }, "node_modules/qs": { - "version": "6.13.0", - "resolved": "https://registry.npmjs.org/qs/-/qs-6.13.0.tgz", - "integrity": "sha512-+38qI9SOr8tfZ4QmJNplMUxqjbe7LKvvZgWdExBOmd+egZTtjLB67Gu0HRX3u/XOq7UU2Nx6nsjvS16Z9uwfpg==", + "version": "6.14.0", + "resolved": "https://registry.npmjs.org/qs/-/qs-6.14.0.tgz", + "integrity": "sha512-YWWTjgABSKcvs/nWBi9PycY/JiPJqOD4JA6o9Sej2AtvSGarXxKC3OQSk4pAarbdQlKAh5D4FCQkJNkW+GAn3w==", "dev": true, "license": "BSD-3-Clause", "dependencies": { - "side-channel": "^1.0.6" + "side-channel": "^1.1.0" }, "engines": { "node": ">=0.6" @@ -20180,32 +21040,19 @@ } }, "node_modules/raw-body": { - "version": "2.5.2", - "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.5.2.tgz", - "integrity": "sha512-8zGqypfENjCIqGhgXToC8aB2r7YrBX+AQAfIPs/Mlk+BtPTztOvTS01NRW/3Eh60J+a48lt8qsCzirQ6loCVfA==", + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-3.0.1.tgz", + "integrity": "sha512-9G8cA+tuMS75+6G/TzW8OtLzmBDMo8p1JRxN5AZ+LAp8uxGA8V8GZm4GQ4/N5QNQEnLmg6SS7wyuSmbKepiKqA==", "dev": true, "license": "MIT", "dependencies": { "bytes": "3.1.2", "http-errors": "2.0.0", - "iconv-lite": "0.4.24", + "iconv-lite": "0.7.0", "unpipe": "1.0.0" }, "engines": { - "node": ">= 0.8" - } - }, - "node_modules/raw-body/node_modules/iconv-lite": { - "version": "0.4.24", - "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz", - "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==", - "dev": true, - "license": "MIT", - "dependencies": { - "safer-buffer": ">= 2.1.2 < 3" - }, - "engines": { - "node": ">=0.10.0" + "node": ">= 0.10" } }, "node_modules/react-is": { @@ -20282,9 +21129,9 @@ "license": "MIT" }, "node_modules/regenerate-unicode-properties": { - "version": "10.2.0", - "resolved": "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-10.2.0.tgz", - "integrity": "sha512-DqHn3DwbmmPVzeKj9woBadqmXxLvQoQIwu7nopMc72ztvxVmVk2SBhSnx67zuye5TP+lJsb/TBQsjLKhnDf3MA==", + "version": "10.2.2", + "resolved": "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-10.2.2.tgz", + "integrity": "sha512-m03P+zhBeQd1RGnYxrGyDAPpWX/epKirLrp8e3qevZdVkKtnCrjjWczIbYc8+xd6vcTStVlqfycTx1KR4LOr0g==", "dev": true, "license": "MIT", "dependencies": { @@ -20330,18 +21177,18 @@ } }, "node_modules/regexpu-core": { - "version": "6.2.0", - "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-6.2.0.tgz", - "integrity": "sha512-H66BPQMrv+V16t8xtmq+UC0CBpiTBA60V8ibS1QVReIp8T1z8hwFxqcGzm9K6lgsN7sB5edVH8a+ze6Fqm4weA==", + "version": "6.4.0", + "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-6.4.0.tgz", + "integrity": "sha512-0ghuzq67LI9bLXpOX/ISfve/Mq33a4aFRzoQYhnnok1JOFpmE/A2TBGkNVenOGEeSBCjIiWcc6MVOG5HEQv0sA==", "dev": true, "license": "MIT", "dependencies": { "regenerate": "^1.4.2", - "regenerate-unicode-properties": "^10.2.0", + "regenerate-unicode-properties": "^10.2.2", "regjsgen": "^0.8.0", - "regjsparser": "^0.12.0", + "regjsparser": "^0.13.0", "unicode-match-property-ecmascript": "^2.0.0", - "unicode-match-property-value-ecmascript": "^2.1.0" + "unicode-match-property-value-ecmascript": "^2.2.1" }, "engines": { "node": ">=4" @@ -20355,31 +21202,18 @@ "license": "MIT" }, "node_modules/regjsparser": { - "version": "0.12.0", - "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.12.0.tgz", - "integrity": "sha512-cnE+y8bz4NhMjISKbgeVJtqNbtf5QpjZP+Bslo+UqkIt9QPnX9q095eiRRASJG1/tz6dlNr6Z5NsBiWYokp6EQ==", + "version": "0.13.0", + "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.13.0.tgz", + "integrity": "sha512-NZQZdC5wOE/H3UT28fVGL+ikOZcEzfMGk/c3iN9UGxzWHMa1op7274oyiUVrAG4B2EuFhus8SvkaYnhvW92p9Q==", "dev": true, "license": "BSD-2-Clause", "dependencies": { - "jsesc": "~3.0.2" + "jsesc": "~3.1.0" }, "bin": { "regjsparser": "bin/parser" } }, - "node_modules/regjsparser/node_modules/jsesc": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-3.0.2.tgz", - "integrity": "sha512-xKqzzWXDttJuOcawBt4KnKHHIf5oQ/Cxax+0PWFG+DFDgHNAdi+TXECADI+RYiFUMmx8792xsMbbgXj4CwnP4g==", - "dev": true, - "license": "MIT", - "bin": { - "jsesc": "bin/jsesc" - }, - "engines": { - "node": ">=6" - } - }, "node_modules/require-directory": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz", @@ -20678,9 +21512,9 @@ "license": "MIT" }, "node_modules/run-applescript": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/run-applescript/-/run-applescript-7.0.0.tgz", - "integrity": "sha512-9by4Ij99JUr/MCFBUkDKLWK3G9HVXmabKz9U5MlIAIuvuzkiOicRYs8XJLxX+xahD+mLiiCYDqF9dKAgtzKP1A==", + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/run-applescript/-/run-applescript-7.1.0.tgz", + "integrity": "sha512-DPe5pVFaAsinSaV6QjQ6gdiedWDcRCbUuiQfQa2wmWV7+xC9bGulGI8+TdRmoFkAPaBXk8CrAbnlY2ISniJ47Q==", "dev": true, "license": "MIT", "engines": { @@ -20744,24 +21578,10 @@ } }, "node_modules/safe-buffer": { - "version": "5.2.1", - "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", - "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==", + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", + "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==", "dev": true, - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/feross" - }, - { - "type": "patreon", - "url": "https://www.patreon.com/feross" - }, - { - "type": "consulting", - "url": "https://feross.org/support" - } - ], "license": "MIT" }, "node_modules/safe-push-apply": { @@ -20803,7 +21623,7 @@ "version": "2.1.2", "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz", "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==", - "dev": true, + "devOptional": true, "license": "MIT" }, "node_modules/sass": { @@ -20962,51 +21782,65 @@ } }, "node_modules/send": { - "version": "0.19.0", - "resolved": "https://registry.npmjs.org/send/-/send-0.19.0.tgz", - "integrity": "sha512-dW41u5VfLXu8SJh5bwRmyYUbAoSB3c9uQh6L8h/KtsFREPWpbX1lrljJo186Jc4nmci/sGUZ9a0a0J2zgfq2hw==", + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/send/-/send-1.2.0.tgz", + "integrity": "sha512-uaW0WwXKpL9blXE2o0bRhoL2EGXIrZxQ2ZQ4mgcfoBxdFmQold+qWsD2jLrfZ0trjKL6vOw0j//eAwcALFjKSw==", "dev": true, "license": "MIT", "dependencies": { - "debug": "2.6.9", - "depd": "2.0.0", - "destroy": "1.2.0", - "encodeurl": "~1.0.2", - "escape-html": "~1.0.3", - "etag": "~1.8.1", - "fresh": "0.5.2", - "http-errors": "2.0.0", - "mime": "1.6.0", - "ms": "2.1.3", - "on-finished": "2.4.1", - "range-parser": "~1.2.1", - "statuses": "2.0.1" + "debug": "^4.3.5", + "encodeurl": "^2.0.0", + "escape-html": "^1.0.3", + "etag": "^1.8.1", + "fresh": "^2.0.0", + "http-errors": "^2.0.0", + "mime-types": "^3.0.1", + "ms": "^2.1.3", + "on-finished": "^2.4.1", + "range-parser": "^1.2.1", + "statuses": "^2.0.1" }, "engines": { - "node": ">= 0.8.0" + "node": ">= 18" } }, - "node_modules/send/node_modules/debug": { - "version": "2.6.9", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", - "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "node_modules/send/node_modules/encodeurl": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-2.0.0.tgz", + "integrity": "sha512-Q0n9HRi4m6JuGIV1eFlmvJB7ZEVxu93IrMyiMsGC0lrMJMWzRgx6WGquyfQgZVb31vhGgXnfmPNNXmxnOkRBrg==", "dev": true, "license": "MIT", - "dependencies": { - "ms": "2.0.0" + "engines": { + "node": ">= 0.8" } }, - "node_modules/send/node_modules/debug/node_modules/ms": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==", + "node_modules/send/node_modules/mime-db": { + "version": "1.54.0", + "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.54.0.tgz", + "integrity": "sha512-aU5EJuIN2WDemCcAp2vFBfp/m4EAhWJnUNSSw0ixs7/kXbd6Pg64EmwJkNdFhB8aWt1sH2CTXrLxo/iAGV3oPQ==", "dev": true, - "license": "MIT" + "license": "MIT", + "engines": { + "node": ">= 0.6" + } }, - "node_modules/send/node_modules/encodeurl": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz", - "integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==", + "node_modules/send/node_modules/mime-types": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-3.0.1.tgz", + "integrity": "sha512-xRc4oEhT6eaBpU1XF7AjpOFD+xQmXNB5OVKwp4tqCuBpHLS/ZbBDrc07mYTDqVMg6PfxUjjNp85O6Cd2Z/5HWA==", + "dev": true, + "license": "MIT", + "dependencies": { + "mime-db": "^1.54.0" + }, + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/send/node_modules/statuses": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.2.tgz", + "integrity": "sha512-DvEy55V3DB7uknRo+4iOGT5fP1slR8wQohVdknigZPMpMstaKJQWhwiYBACJE3Ul2pTnATihhBYnRhZQHGBiRw==", "dev": true, "license": "MIT", "engines": { @@ -21099,30 +21933,102 @@ "dev": true, "license": "ISC" }, - "node_modules/serve-index/node_modules/statuses": { - "version": "1.5.0", - "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz", - "integrity": "sha512-OpZ3zP+jT1PI7I8nemJX4AKmAX070ZkYPVWV/AaKTJl+tXCTGyVdC1a4SL8RUQYEwk/f34ZX8UTykN68FwrqAA==", + "node_modules/serve-static": { + "version": "1.16.2", + "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.16.2.tgz", + "integrity": "sha512-VqpjJZKadQB/PEbEwvFdO43Ax5dFBZ2UECszz8bQ7pi7wt//PWe1P6MN7eCnjsatYtBT6EuiClbjSWP2WrIoTw==", + "dev": true, + "license": "MIT", + "dependencies": { + "encodeurl": "~2.0.0", + "escape-html": "~1.0.3", + "parseurl": "~1.3.3", + "send": "0.19.0" + }, + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/serve-static/node_modules/debug": { + "version": "2.6.9", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", + "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "dev": true, + "license": "MIT", + "dependencies": { + "ms": "2.0.0" + } + }, + "node_modules/serve-static/node_modules/debug/node_modules/ms": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==", + "dev": true, + "license": "MIT" + }, + "node_modules/serve-static/node_modules/encodeurl": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-2.0.0.tgz", + "integrity": "sha512-Q0n9HRi4m6JuGIV1eFlmvJB7ZEVxu93IrMyiMsGC0lrMJMWzRgx6WGquyfQgZVb31vhGgXnfmPNNXmxnOkRBrg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/serve-static/node_modules/fresh": { + "version": "0.5.2", + "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz", + "integrity": "sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q==", "dev": true, "license": "MIT", "engines": { "node": ">= 0.6" } }, - "node_modules/serve-static": { - "version": "1.16.2", - "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.16.2.tgz", - "integrity": "sha512-VqpjJZKadQB/PEbEwvFdO43Ax5dFBZ2UECszz8bQ7pi7wt//PWe1P6MN7eCnjsatYtBT6EuiClbjSWP2WrIoTw==", + "node_modules/serve-static/node_modules/send": { + "version": "0.19.0", + "resolved": "https://registry.npmjs.org/send/-/send-0.19.0.tgz", + "integrity": "sha512-dW41u5VfLXu8SJh5bwRmyYUbAoSB3c9uQh6L8h/KtsFREPWpbX1lrljJo186Jc4nmci/sGUZ9a0a0J2zgfq2hw==", + "dev": true, + "license": "MIT", + "dependencies": { + "debug": "2.6.9", + "depd": "2.0.0", + "destroy": "1.2.0", + "encodeurl": "~1.0.2", + "escape-html": "~1.0.3", + "etag": "~1.8.1", + "fresh": "0.5.2", + "http-errors": "2.0.0", + "mime": "1.6.0", + "ms": "2.1.3", + "on-finished": "2.4.1", + "range-parser": "~1.2.1", + "statuses": "2.0.1" + }, + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/serve-static/node_modules/send/node_modules/encodeurl": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz", + "integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/serve-static/node_modules/statuses": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz", + "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==", "dev": true, "license": "MIT", - "dependencies": { - "encodeurl": "~2.0.0", - "escape-html": "~1.0.3", - "parseurl": "~1.3.3", - "send": "0.19.0" - }, "engines": { - "node": ">= 0.8.0" + "node": ">= 0.8" } }, "node_modules/set-blocking": { @@ -21344,6 +22250,28 @@ "node": "^18.17.0 || >=20.5.0" } }, + "node_modules/sirv": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/sirv/-/sirv-3.0.2.tgz", + "integrity": "sha512-2wcC/oGxHis/BoHkkPwldgiPSYcpZK3JU28WoMVv55yHJgcZ8rlXvuG9iZggz+sU1d4bRgIGASwyWqjxu3FM0g==", + "dev": true, + "license": "MIT", + "dependencies": { + "@polka/url": "^1.0.0-next.24", + "mrmime": "^2.0.0", + "totalist": "^3.0.0" + }, + "engines": { + "node": ">=18" + } + }, + "node_modules/sirv/node_modules/@polka/url": { + "version": "1.0.0-next.29", + "resolved": "https://registry.npmjs.org/@polka/url/-/url-1.0.0-next.29.tgz", + "integrity": "sha512-wwQAWhWSuHaag8c4q/KN/vCoeOJYshAIvMQwD4GpSb3OiZklFfvAgmj0VCBBImRpuF/aFgIRzllXlVX93Jevww==", + "dev": true, + "license": "MIT" + }, "node_modules/sisteransi": { "version": "1.0.5", "resolved": "https://registry.npmjs.org/sisteransi/-/sisteransi-1.0.5.tgz", @@ -21382,9 +22310,9 @@ } }, "node_modules/slice-ansi/node_modules/ansi-styles": { - "version": "6.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.1.tgz", - "integrity": "sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==", + "version": "6.2.3", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.3.tgz", + "integrity": "sha512-4Dj6M28JB+oAH8kFkTLUo+a2jwOFkuqb3yucU0CANcRRUbxS0cP0nZYCGjcc3BNXwRIsUVmDGgzawme7zvJHvg==", "dev": true, "license": "MIT", "engines": { @@ -21417,6 +22345,16 @@ "websocket-driver": "^0.7.4" } }, + "node_modules/sockjs/node_modules/uuid": { + "version": "8.3.2", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz", + "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==", + "dev": true, + "license": "MIT", + "bin": { + "uuid": "dist/bin/uuid" + } + }, "node_modules/socks": { "version": "2.8.7", "resolved": "https://registry.npmjs.org/socks/-/socks-2.8.7.tgz", @@ -21755,6 +22693,19 @@ "webpack": "^5.72.1" } }, + "node_modules/source-map-loader/node_modules/iconv-lite": { + "version": "0.6.3", + "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz", + "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==", + "dev": true, + "license": "MIT", + "dependencies": { + "safer-buffer": ">= 2.1.2 < 3.0.0" + }, + "engines": { + "node": ">=0.10.0" + } + }, "node_modules/source-map-support": { "version": "0.5.21", "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz", @@ -21911,13 +22862,26 @@ } }, "node_modules/statuses": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz", - "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==", + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz", + "integrity": "sha512-OpZ3zP+jT1PI7I8nemJX4AKmAX070ZkYPVWV/AaKTJl+tXCTGyVdC1a4SL8RUQYEwk/f34ZX8UTykN68FwrqAA==", "dev": true, "license": "MIT", "engines": { - "node": ">= 0.8" + "node": ">= 0.6" + } + }, + "node_modules/stdin-discarder": { + "version": "0.2.2", + "resolved": "https://registry.npmjs.org/stdin-discarder/-/stdin-discarder-0.2.2.tgz", + "integrity": "sha512-UhDfHmA92YAlNnCfhmq0VeNL5bDbiZGg7sZ2IvPsXubGkiNa9EC+tUTsjBRsYUAz87btI6/1wf4XoVvQ3uRnmQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=18" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" } }, "node_modules/stop-iteration-iterator": { @@ -21955,6 +22919,27 @@ "safe-buffer": "~5.2.0" } }, + "node_modules/string_decoder/node_modules/safe-buffer": { + "version": "5.2.1", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", + "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==", + "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ], + "license": "MIT" + }, "node_modules/string-argv": { "version": "0.3.2", "resolved": "https://registry.npmjs.org/string-argv/-/string-argv-0.3.2.tgz", @@ -22136,9 +23121,9 @@ } }, "node_modules/strip-ansi": { - "version": "7.1.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz", - "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==", + "version": "7.1.2", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.2.tgz", + "integrity": "sha512-gmBGslpoQJtgnMAvOVqGZpEz9dyoKTCzy2nfz/n8aIFhN/jCE/rCmcxabB6jOOHV+0WNnylOxaxBQPSvcWklhA==", "dev": true, "license": "MIT", "dependencies": { @@ -22265,6 +23250,19 @@ "dev": true, "license": "MIT" }, + "node_modules/sync-fetch": { + "version": "0.4.5", + "resolved": "https://registry.npmjs.org/sync-fetch/-/sync-fetch-0.4.5.tgz", + "integrity": "sha512-esiWJ7ixSKGpd9DJPBTC4ckChqdOjIwJfYhVHkcQ2Gnm41323p1TRmEI+esTQ9ppD+b5opps2OTEGTCGX5kF+g==", + "license": "MIT", + "dependencies": { + "buffer": "^5.7.1", + "node-fetch": "^2.6.1" + }, + "engines": { + "node": ">=14" + } + }, "node_modules/synckit": { "version": "0.11.11", "resolved": "https://registry.npmjs.org/synckit/-/synckit-0.11.11.tgz", @@ -22293,13 +23291,17 @@ } }, "node_modules/tapable": { - "version": "2.2.2", - "resolved": "https://registry.npmjs.org/tapable/-/tapable-2.2.2.tgz", - "integrity": "sha512-Re10+NauLTMCudc7T5WLFLAwDhQ0JWdrMK+9B2M8zR5hRExKmsRDCBA7/aV/pNJFltmBFO5BAMlQFi/vq3nKOg==", + "version": "2.2.3", + "resolved": "https://registry.npmjs.org/tapable/-/tapable-2.2.3.tgz", + "integrity": "sha512-ZL6DDuAlRlLGghwcfmSn9sK3Hr6ArtyudlSAiCqQ6IfE+b+HHbydbYDIG15IfS5do+7XQQBdBiubF/cV2dnDzg==", "dev": true, "license": "MIT", "engines": { "node": ">=6" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/webpack" } }, "node_modules/tar": { @@ -22622,14 +23624,14 @@ "license": "MIT" }, "node_modules/tinyglobby": { - "version": "0.2.14", - "resolved": "https://registry.npmjs.org/tinyglobby/-/tinyglobby-0.2.14.tgz", - "integrity": "sha512-tX5e7OM1HnYr2+a2C/4V0htOcSQcoSTH9KgJnVvNm5zm/cyEWKJ7j7YutsH9CxMdtOkkLFy2AHrMci9IM8IPZQ==", + "version": "0.2.15", + "resolved": "https://registry.npmjs.org/tinyglobby/-/tinyglobby-0.2.15.tgz", + "integrity": "sha512-j2Zq4NyQYG5XMST4cbs02Ak8iJUdxRM0XI5QyxXuZOzKOINmWurp3smXu3y5wDcJrptwpSjgXHzIQxR0omXljQ==", "dev": true, "license": "MIT", "dependencies": { - "fdir": "^6.4.4", - "picomatch": "^4.0.2" + "fdir": "^6.5.0", + "picomatch": "^4.0.3" }, "engines": { "node": ">=12.0.0" @@ -22638,6 +23640,19 @@ "url": "https://github.com/sponsors/SuperchupuDev" } }, + "node_modules/tinyglobby/node_modules/picomatch": { + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.3.tgz", + "integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/jonschlinkert" + } + }, "node_modules/tmpl": { "version": "1.0.5", "resolved": "https://registry.npmjs.org/tmpl/-/tmpl-1.0.5.tgz", @@ -22668,6 +23683,16 @@ "node": ">=0.6" } }, + "node_modules/totalist": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/totalist/-/totalist-3.0.1.tgz", + "integrity": "sha512-sf4i37nQ2LBx4m3wB74y+ubopq6W/dIzXg0FDGjsYnZHVa1Da8FH853wlL2gtUhg+xJXjfk3kUZS3BRoQeoQBQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6" + } + }, "node_modules/tough-cookie": { "version": "4.1.4", "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.1.4.tgz", @@ -22684,6 +23709,16 @@ "node": ">=6" } }, + "node_modules/tough-cookie/node_modules/universalify": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.2.0.tgz", + "integrity": "sha512-CJ1QgKmNg3CwvAv/kOFmtnEN05f0D/cn9QntgNOQlQF9dgvVTHj3t+8JPdjqawCHk7V/KA+fbUqzZ9XWhcqPUg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 4.0.0" + } + }, "node_modules/tr46": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/tr46/-/tr46-3.0.0.tgz", @@ -22698,9 +23733,9 @@ } }, "node_modules/tree-dump": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/tree-dump/-/tree-dump-1.0.3.tgz", - "integrity": "sha512-il+Cv80yVHFBwokQSfd4bldvr1Md951DpgAGfmhydt04L+YzHgubm2tQ7zueWDcGENKHq0ZvGFR/hjvNXilHEg==", + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/tree-dump/-/tree-dump-1.1.0.tgz", + "integrity": "sha512-rMuvhU4MCDbcbnleZTFezWsaZXRFemSqAM+7jPnzUl1fo9w3YEKOxAeui0fz3OI4EU4hf23iyA7uQRVko+UaBA==", "dev": true, "license": "Apache-2.0", "engines": { @@ -22724,6 +23759,19 @@ "tree-kill": "cli.js" } }, + "node_modules/trouter": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/trouter/-/trouter-2.0.1.tgz", + "integrity": "sha512-kr8SKKw94OI+xTGOkfsvwZQ8mWoikZDd2n8XZHjJVZUARZT+4/VV6cacRS6CLsH9bNm+HFIPU1Zx4CnNnb4qlQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "matchit": "^1.0.0" + }, + "engines": { + "node": ">=6" + } + }, "node_modules/ts-api-utils": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/ts-api-utils/-/ts-api-utils-2.1.0.tgz", @@ -22738,9 +23786,9 @@ } }, "node_modules/ts-jest": { - "version": "29.4.1", - "resolved": "https://registry.npmjs.org/ts-jest/-/ts-jest-29.4.1.tgz", - "integrity": "sha512-SaeUtjfpg9Uqu8IbeDKtdaS0g8lS6FT6OzM3ezrDfErPJPHNDo/Ey+VFGP1bQIDfagYDLyRpd7O15XpG1Es2Uw==", + "version": "29.4.4", + "resolved": "https://registry.npmjs.org/ts-jest/-/ts-jest-29.4.4.tgz", + "integrity": "sha512-ccVcRABct5ZELCT5U0+DZwkXMCcOCLi2doHRrKy1nK/s7J7bch6TzJMsrY09WxgUUIP/ITfmcDS8D2yl63rnXw==", "dev": true, "license": "MIT", "dependencies": { @@ -22817,13 +23865,13 @@ } }, "node_modules/ts-morph": { - "version": "24.0.0", - "resolved": "https://registry.npmjs.org/ts-morph/-/ts-morph-24.0.0.tgz", - "integrity": "sha512-2OAOg/Ob5yx9Et7ZX4CvTCc0UFoZHwLEJ+dpDPSUi5TgwwlTlX47w+iFRrEwzUZwYACjq83cgjS/Da50Ga37uw==", + "version": "26.0.0", + "resolved": "https://registry.npmjs.org/ts-morph/-/ts-morph-26.0.0.tgz", + "integrity": "sha512-ztMO++owQnz8c/gIENcM9XfCEzgoGphTv+nKpYNM1bgsdOVC/jRZuEBf6N+mLLDNg68Kl+GgUZfOySaRiG1/Ug==", "dev": true, "license": "MIT", "dependencies": { - "@ts-morph/common": "~0.25.0", + "@ts-morph/common": "~0.27.0", "code-block-writer": "^13.0.3" } }, @@ -22921,14 +23969,38 @@ } }, "node_modules/type-is": { - "version": "1.6.18", - "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz", - "integrity": "sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==", + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/type-is/-/type-is-2.0.1.tgz", + "integrity": "sha512-OZs6gsjF4vMp32qrCbiVSkrFmXtG/AZhY3t0iAMrMBiAZyV9oALtXO8hsrHbMXF9x6L3grlFuwW2oAz7cav+Gw==", "dev": true, "license": "MIT", "dependencies": { - "media-typer": "0.3.0", - "mime-types": "~2.1.24" + "content-type": "^1.0.5", + "media-typer": "^1.1.0", + "mime-types": "^3.0.0" + }, + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/type-is/node_modules/mime-db": { + "version": "1.54.0", + "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.54.0.tgz", + "integrity": "sha512-aU5EJuIN2WDemCcAp2vFBfp/m4EAhWJnUNSSw0ixs7/kXbd6Pg64EmwJkNdFhB8aWt1sH2CTXrLxo/iAGV3oPQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/type-is/node_modules/mime-types": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-3.0.1.tgz", + "integrity": "sha512-xRc4oEhT6eaBpU1XF7AjpOFD+xQmXNB5OVKwp4tqCuBpHLS/ZbBDrc07mYTDqVMg6PfxUjjNp85O6Cd2Z/5HWA==", + "dev": true, + "license": "MIT", + "dependencies": { + "mime-db": "^1.54.0" }, "engines": { "node": ">= 0.6" @@ -23209,10 +24281,20 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/undici": { + "version": "7.16.0", + "resolved": "https://registry.npmjs.org/undici/-/undici-7.16.0.tgz", + "integrity": "sha512-QEg3HPMll0o3t2ourKwOeUAZ159Kn9mx5pnzHRQO8+Wixmh88YdZRiIwat0iNzNNXn0yoEtXJqFpyW7eM8BV7g==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=20.18.1" + } + }, "node_modules/undici-types": { - "version": "7.10.0", - "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-7.10.0.tgz", - "integrity": "sha512-t5Fy/nfn+14LuOc2KNYg75vZqClpAiqscVvMygNnlsHBFpSXdJaYtXMcdNLpl/Qvc3P2cB3s6lOV51nqsFq4ag==", + "version": "7.12.0", + "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-7.12.0.tgz", + "integrity": "sha512-goOacqME2GYyOZZfb5Lgtu+1IDmAlAEu5xnD3+xTzS10hT0vzpf0SPjkXwAw9Jm+4n/mQGDP3LO8CPbYROeBfQ==", "dev": true, "license": "MIT" }, @@ -23241,9 +24323,9 @@ } }, "node_modules/unicode-match-property-value-ecmascript": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-2.2.0.tgz", - "integrity": "sha512-4IehN3V/+kkr5YeSSDDQG8QLqO26XpL2XP3GQtqwlT/QYSECAwFztxVHjlbh0+gjJ3XmNLS0zDsbgs9jWKExLg==", + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-2.2.1.tgz", + "integrity": "sha512-JQ84qTuMg4nVkx8ga4A16a1epI9H6uTXAknqxkGF/aFfRLw1xC/Bp24HNLaZhHSkWd3+84t8iXnp1J0kYcZHhg==", "dev": true, "license": "MIT", "engines": { @@ -23251,9 +24333,9 @@ } }, "node_modules/unicode-property-aliases-ecmascript": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-2.1.0.tgz", - "integrity": "sha512-6t3foTQI9qne+OZoVQB/8x8rk2k1eVy1gRXhV3oFQ5T6R1dqQ1xtin3XqSlx3+ATBkliTaR/hHyJBm+LVPNM8w==", + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-2.2.0.tgz", + "integrity": "sha512-hpbDzxUY9BFwX+UeBnxv3Sh1q7HFxj48DTmXchNgRa46lO8uj3/1iEn3MiNUYTg1g9ctIqXCCERn8gYZhHC5lQ==", "dev": true, "license": "MIT", "engines": { @@ -23300,13 +24382,13 @@ } }, "node_modules/universalify": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.2.0.tgz", - "integrity": "sha512-CJ1QgKmNg3CwvAv/kOFmtnEN05f0D/cn9QntgNOQlQF9dgvVTHj3t+8JPdjqawCHk7V/KA+fbUqzZ9XWhcqPUg==", + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz", + "integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==", "dev": true, "license": "MIT", "engines": { - "node": ">= 4.0.0" + "node": ">= 10.0.0" } }, "node_modules/unix-crypt-td-js": { @@ -23396,13 +24478,17 @@ } }, "node_modules/uuid": { - "version": "8.3.2", - "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz", - "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==", + "version": "11.1.0", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-11.1.0.tgz", + "integrity": "sha512-0/A9rDy9P7cJ+8w1c9WD9V//9Wj15Ce2MPz8Ri6032usz+NfePxx5AcN3bN+r6ZL6jEo066/yNYB3tn4pQEx+A==", "dev": true, + "funding": [ + "https://github.com/sponsors/broofa", + "https://github.com/sponsors/ctavan" + ], "license": "MIT", "bin": { - "uuid": "dist/bin/uuid" + "uuid": "dist/esm/bin/uuid" } }, "node_modules/v8-to-istanbul": { @@ -23474,12 +24560,11 @@ } }, "node_modules/vite": { - "version": "6.3.5", - "resolved": "https://registry.npmjs.org/vite/-/vite-6.3.5.tgz", - "integrity": "sha512-cZn6NDFE7wdTpINgs++ZJ4N49W2vRp8LCKrn3Ob1kYNtOo21vfDoaV5GzBfLU4MovSAB8uNRm4jgzVQZ+mBzPQ==", + "version": "6.3.6", + "resolved": "https://registry.npmjs.org/vite/-/vite-6.3.6.tgz", + "integrity": "sha512-0msEVHJEScQbhkbVTb/4iHZdJ6SXp/AvxL2sjwYQFfBqleHtnCqv1J3sa9zbWz/6kW1m9Tfzn92vW+kZ1WV6QA==", "dev": true, "license": "MIT", - "peer": true, "dependencies": { "esbuild": "^0.25.0", "fdir": "^6.4.4", @@ -23550,9 +24635,9 @@ } }, "node_modules/vite/node_modules/@rollup/rollup-android-arm-eabi": { - "version": "4.46.2", - "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.46.2.tgz", - "integrity": "sha512-Zj3Hl6sN34xJtMv7Anwb5Gu01yujyE/cLBDB2gnHTAHaWS1Z38L7kuSG+oAh0giZMqG060f/YBStXtMH6FvPMA==", + "version": "4.52.3", + "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.52.3.tgz", + "integrity": "sha512-h6cqHGZ6VdnwliFG1NXvMPTy/9PS3h8oLh7ImwR+kl+oYnQizgjxsONmmPSb2C66RksfkfIxEVtDSEcJiO0tqw==", "cpu": [ "arm" ], @@ -23561,13 +24646,12 @@ "optional": true, "os": [ "android" - ], - "peer": true + ] }, "node_modules/vite/node_modules/@rollup/rollup-android-arm64": { - "version": "4.46.2", - "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.46.2.tgz", - "integrity": "sha512-nTeCWY83kN64oQ5MGz3CgtPx8NSOhC5lWtsjTs+8JAJNLcP3QbLCtDDgUKQc/Ro/frpMq4SHUaHN6AMltcEoLQ==", + "version": "4.52.3", + "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.52.3.tgz", + "integrity": "sha512-wd+u7SLT/u6knklV/ifG7gr5Qy4GUbH2hMWcDauPFJzmCZUAJ8L2bTkVXC2niOIxp8lk3iH/QX8kSrUxVZrOVw==", "cpu": [ "arm64" ], @@ -23576,13 +24660,12 @@ "optional": true, "os": [ "android" - ], - "peer": true + ] }, "node_modules/vite/node_modules/@rollup/rollup-darwin-arm64": { - "version": "4.46.2", - "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.46.2.tgz", - "integrity": "sha512-HV7bW2Fb/F5KPdM/9bApunQh68YVDU8sO8BvcW9OngQVN3HHHkw99wFupuUJfGR9pYLLAjcAOA6iO+evsbBaPQ==", + "version": "4.52.3", + "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.52.3.tgz", + "integrity": "sha512-lj9ViATR1SsqycwFkJCtYfQTheBdvlWJqzqxwc9f2qrcVrQaF/gCuBRTiTolkRWS6KvNxSk4KHZWG7tDktLgjg==", "cpu": [ "arm64" ], @@ -23591,13 +24674,12 @@ "optional": true, "os": [ "darwin" - ], - "peer": true + ] }, "node_modules/vite/node_modules/@rollup/rollup-darwin-x64": { - "version": "4.46.2", - "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.46.2.tgz", - "integrity": "sha512-SSj8TlYV5nJixSsm/y3QXfhspSiLYP11zpfwp6G/YDXctf3Xkdnk4woJIF5VQe0of2OjzTt8EsxnJDCdHd2xMA==", + "version": "4.52.3", + "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.52.3.tgz", + "integrity": "sha512-+Dyo7O1KUmIsbzx1l+4V4tvEVnVQqMOIYtrxK7ncLSknl1xnMHLgn7gddJVrYPNZfEB8CIi3hK8gq8bDhb3h5A==", "cpu": [ "x64" ], @@ -23606,13 +24688,12 @@ "optional": true, "os": [ "darwin" - ], - "peer": true + ] }, "node_modules/vite/node_modules/@rollup/rollup-freebsd-arm64": { - "version": "4.46.2", - "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.46.2.tgz", - "integrity": "sha512-ZyrsG4TIT9xnOlLsSSi9w/X29tCbK1yegE49RYm3tu3wF1L/B6LVMqnEWyDB26d9Ecx9zrmXCiPmIabVuLmNSg==", + "version": "4.52.3", + "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.52.3.tgz", + "integrity": "sha512-u9Xg2FavYbD30g3DSfNhxgNrxhi6xVG4Y6i9Ur1C7xUuGDW3banRbXj+qgnIrwRN4KeJ396jchwy9bCIzbyBEQ==", "cpu": [ "arm64" ], @@ -23621,13 +24702,12 @@ "optional": true, "os": [ "freebsd" - ], - "peer": true + ] }, "node_modules/vite/node_modules/@rollup/rollup-freebsd-x64": { - "version": "4.46.2", - "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.46.2.tgz", - "integrity": "sha512-pCgHFoOECwVCJ5GFq8+gR8SBKnMO+xe5UEqbemxBpCKYQddRQMgomv1104RnLSg7nNvgKy05sLsY51+OVRyiVw==", + "version": "4.52.3", + "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.52.3.tgz", + "integrity": "sha512-5M8kyi/OX96wtD5qJR89a/3x5x8x5inXBZO04JWhkQb2JWavOWfjgkdvUqibGJeNNaz1/Z1PPza5/tAPXICI6A==", "cpu": [ "x64" ], @@ -23636,13 +24716,12 @@ "optional": true, "os": [ "freebsd" - ], - "peer": true + ] }, "node_modules/vite/node_modules/@rollup/rollup-linux-arm-gnueabihf": { - "version": "4.46.2", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.46.2.tgz", - "integrity": "sha512-EtP8aquZ0xQg0ETFcxUbU71MZlHaw9MChwrQzatiE8U/bvi5uv/oChExXC4mWhjiqK7azGJBqU0tt5H123SzVA==", + "version": "4.52.3", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.52.3.tgz", + "integrity": "sha512-IoerZJ4l1wRMopEHRKOO16e04iXRDyZFZnNZKrWeNquh5d6bucjezgd+OxG03mOMTnS1x7hilzb3uURPkJ0OfA==", "cpu": [ "arm" ], @@ -23651,13 +24730,12 @@ "optional": true, "os": [ "linux" - ], - "peer": true + ] }, "node_modules/vite/node_modules/@rollup/rollup-linux-arm-musleabihf": { - "version": "4.46.2", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.46.2.tgz", - "integrity": "sha512-qO7F7U3u1nfxYRPM8HqFtLd+raev2K137dsV08q/LRKRLEc7RsiDWihUnrINdsWQxPR9jqZ8DIIZ1zJJAm5PjQ==", + "version": "4.52.3", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.52.3.tgz", + "integrity": "sha512-ZYdtqgHTDfvrJHSh3W22TvjWxwOgc3ThK/XjgcNGP2DIwFIPeAPNsQxrJO5XqleSlgDux2VAoWQ5iJrtaC1TbA==", "cpu": [ "arm" ], @@ -23666,13 +24744,12 @@ "optional": true, "os": [ "linux" - ], - "peer": true + ] }, "node_modules/vite/node_modules/@rollup/rollup-linux-arm64-gnu": { - "version": "4.46.2", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.46.2.tgz", - "integrity": "sha512-3dRaqLfcOXYsfvw5xMrxAk9Lb1f395gkoBYzSFcc/scgRFptRXL9DOaDpMiehf9CO8ZDRJW2z45b6fpU5nwjng==", + "version": "4.52.3", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.52.3.tgz", + "integrity": "sha512-NcViG7A0YtuFDA6xWSgmFb6iPFzHlf5vcqb2p0lGEbT+gjrEEz8nC/EeDHvx6mnGXnGCC1SeVV+8u+smj0CeGQ==", "cpu": [ "arm64" ], @@ -23681,13 +24758,12 @@ "optional": true, "os": [ "linux" - ], - "peer": true + ] }, "node_modules/vite/node_modules/@rollup/rollup-linux-arm64-musl": { - "version": "4.46.2", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.46.2.tgz", - "integrity": "sha512-fhHFTutA7SM+IrR6lIfiHskxmpmPTJUXpWIsBXpeEwNgZzZZSg/q4i6FU4J8qOGyJ0TR+wXBwx/L7Ho9z0+uDg==", + "version": "4.52.3", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.52.3.tgz", + "integrity": "sha512-d3pY7LWno6SYNXRm6Ebsq0DJGoiLXTb83AIPCXl9fmtIQs/rXoS8SJxxUNtFbJ5MiOvs+7y34np77+9l4nfFMw==", "cpu": [ "arm64" ], @@ -23696,28 +24772,12 @@ "optional": true, "os": [ "linux" - ], - "peer": true - }, - "node_modules/vite/node_modules/@rollup/rollup-linux-loongarch64-gnu": { - "version": "4.46.2", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loongarch64-gnu/-/rollup-linux-loongarch64-gnu-4.46.2.tgz", - "integrity": "sha512-i7wfGFXu8x4+FRqPymzjD+Hyav8l95UIZ773j7J7zRYc3Xsxy2wIn4x+llpunexXe6laaO72iEjeeGyUFmjKeA==", - "cpu": [ - "loong64" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "linux" - ], - "peer": true + ] }, "node_modules/vite/node_modules/@rollup/rollup-linux-riscv64-gnu": { - "version": "4.46.2", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.46.2.tgz", - "integrity": "sha512-32k4ENb5ygtkMwPMucAb8MtV8olkPT03oiTxJbgkJa7lJ7dZMr0GCFJlyvy+K8iq7F/iuOr41ZdUHaOiqyR3iQ==", + "version": "4.52.3", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.52.3.tgz", + "integrity": "sha512-1makPhFFVBqZE+XFg3Dkq+IkQ7JvmUrwwqaYBL2CE+ZpxPaqkGaiWFEWVGyvTwZace6WLJHwjVh/+CXbKDGPmg==", "cpu": [ "riscv64" ], @@ -23726,13 +24786,12 @@ "optional": true, "os": [ "linux" - ], - "peer": true + ] }, "node_modules/vite/node_modules/@rollup/rollup-linux-s390x-gnu": { - "version": "4.46.2", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.46.2.tgz", - "integrity": "sha512-YKjekwTEKgbB7n17gmODSmJVUIvj8CX7q5442/CK80L8nqOUbMtf8b01QkG3jOqyr1rotrAnW6B/qiHwfcuWQA==", + "version": "4.52.3", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.52.3.tgz", + "integrity": "sha512-jMdsML2VI5l+V7cKfZx3ak+SLlJ8fKvLJ0Eoa4b9/vCUrzXKgoKxvHqvJ/mkWhFiyp88nCkM5S2v6nIwRtPcgg==", "cpu": [ "s390x" ], @@ -23741,13 +24800,12 @@ "optional": true, "os": [ "linux" - ], - "peer": true + ] }, "node_modules/vite/node_modules/@rollup/rollup-linux-x64-gnu": { - "version": "4.46.2", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.46.2.tgz", - "integrity": "sha512-Jj5a9RUoe5ra+MEyERkDKLwTXVu6s3aACP51nkfnK9wJTraCC8IMe3snOfALkrjTYd2G1ViE1hICj0fZ7ALBPA==", + "version": "4.52.3", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.52.3.tgz", + "integrity": "sha512-tPgGd6bY2M2LJTA1uGq8fkSPK8ZLYjDjY+ZLK9WHncCnfIz29LIXIqUgzCR0hIefzy6Hpbe8Th5WOSwTM8E7LA==", "cpu": [ "x64" ], @@ -23756,13 +24814,12 @@ "optional": true, "os": [ "linux" - ], - "peer": true + ] }, "node_modules/vite/node_modules/@rollup/rollup-linux-x64-musl": { - "version": "4.46.2", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.46.2.tgz", - "integrity": "sha512-7kX69DIrBeD7yNp4A5b81izs8BqoZkCIaxQaOpumcJ1S/kmqNFjPhDu1LHeVXv0SexfHQv5cqHsxLOjETuqDuA==", + "version": "4.52.3", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.52.3.tgz", + "integrity": "sha512-BCFkJjgk+WFzP+tcSMXq77ymAPIxsX9lFJWs+2JzuZTLtksJ2o5hvgTdIcZ5+oKzUDMwI0PfWzRBYAydAHF2Mw==", "cpu": [ "x64" ], @@ -23771,13 +24828,12 @@ "optional": true, "os": [ "linux" - ], - "peer": true + ] }, "node_modules/vite/node_modules/@rollup/rollup-win32-arm64-msvc": { - "version": "4.46.2", - "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.46.2.tgz", - "integrity": "sha512-wiJWMIpeaak/jsbaq2HMh/rzZxHVW1rU6coyeNNpMwk5isiPjSTx0a4YLSlYDwBH/WBvLz+EtsNqQScZTLJy3g==", + "version": "4.52.3", + "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.52.3.tgz", + "integrity": "sha512-+zteHZdoUYLkyYKObGHieibUFLbttX2r+58l27XZauq0tcWYYuKUwY2wjeCN9oK1Um2YgH2ibd6cnX/wFD7DuA==", "cpu": [ "arm64" ], @@ -23786,13 +24842,12 @@ "optional": true, "os": [ "win32" - ], - "peer": true + ] }, "node_modules/vite/node_modules/@rollup/rollup-win32-ia32-msvc": { - "version": "4.46.2", - "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.46.2.tgz", - "integrity": "sha512-gBgaUDESVzMgWZhcyjfs9QFK16D8K6QZpwAaVNJxYDLHWayOta4ZMjGm/vsAEy3hvlS2GosVFlBlP9/Wb85DqQ==", + "version": "4.52.3", + "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.52.3.tgz", + "integrity": "sha512-of1iHkTQSo3kr6dTIRX6t81uj/c/b15HXVsPcEElN5sS859qHrOepM5p9G41Hah+CTqSh2r8Bm56dL2z9UQQ7g==", "cpu": [ "ia32" ], @@ -23801,13 +24856,12 @@ "optional": true, "os": [ "win32" - ], - "peer": true + ] }, "node_modules/vite/node_modules/@rollup/rollup-win32-x64-msvc": { - "version": "4.46.2", - "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.46.2.tgz", - "integrity": "sha512-CvUo2ixeIQGtF6WvuB87XWqPQkoFAFqW+HUo/WzHwuHDvIwZCtjdWXoYCcr06iKGydiqTclC4jU/TNObC/xKZg==", + "version": "4.52.3", + "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.52.3.tgz", + "integrity": "sha512-zGIbEVVXVtauFgl3MRwGWEN36P5ZGenHRMgNw88X5wEhEBpq0XrMEZwOn07+ICrwM17XO5xfMZqh0OldCH5VTA==", "cpu": [ "x64" ], @@ -23816,8 +24870,7 @@ "optional": true, "os": [ "win32" - ], - "peer": true + ] }, "node_modules/vite/node_modules/postcss": { "version": "8.5.6", @@ -23839,7 +24892,6 @@ } ], "license": "MIT", - "peer": true, "dependencies": { "nanoid": "^3.3.11", "picocolors": "^1.1.1", @@ -23850,12 +24902,11 @@ } }, "node_modules/vite/node_modules/rollup": { - "version": "4.46.2", - "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.46.2.tgz", - "integrity": "sha512-WMmLFI+Boh6xbop+OAGo9cQ3OgX9MIg7xOQjn+pTCwOkk+FNDAeAemXkJ3HzDJrVXleLOFVa1ipuc1AmEx1Dwg==", + "version": "4.52.3", + "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.52.3.tgz", + "integrity": "sha512-RIDh866U8agLgiIcdpB+COKnlCreHJLfIhWC3LVflku5YHfpnsIKigRZeFfMfCc4dVcqNVfQQ5gO/afOck064A==", "dev": true, "license": "MIT", - "peer": true, "dependencies": { "@types/estree": "1.0.8" }, @@ -23867,26 +24918,28 @@ "npm": ">=8.0.0" }, "optionalDependencies": { - "@rollup/rollup-android-arm-eabi": "4.46.2", - "@rollup/rollup-android-arm64": "4.46.2", - "@rollup/rollup-darwin-arm64": "4.46.2", - "@rollup/rollup-darwin-x64": "4.46.2", - "@rollup/rollup-freebsd-arm64": "4.46.2", - "@rollup/rollup-freebsd-x64": "4.46.2", - "@rollup/rollup-linux-arm-gnueabihf": "4.46.2", - "@rollup/rollup-linux-arm-musleabihf": "4.46.2", - "@rollup/rollup-linux-arm64-gnu": "4.46.2", - "@rollup/rollup-linux-arm64-musl": "4.46.2", - "@rollup/rollup-linux-loongarch64-gnu": "4.46.2", - "@rollup/rollup-linux-ppc64-gnu": "4.46.2", - "@rollup/rollup-linux-riscv64-gnu": "4.46.2", - "@rollup/rollup-linux-riscv64-musl": "4.46.2", - "@rollup/rollup-linux-s390x-gnu": "4.46.2", - "@rollup/rollup-linux-x64-gnu": "4.46.2", - "@rollup/rollup-linux-x64-musl": "4.46.2", - "@rollup/rollup-win32-arm64-msvc": "4.46.2", - "@rollup/rollup-win32-ia32-msvc": "4.46.2", - "@rollup/rollup-win32-x64-msvc": "4.46.2", + "@rollup/rollup-android-arm-eabi": "4.52.3", + "@rollup/rollup-android-arm64": "4.52.3", + "@rollup/rollup-darwin-arm64": "4.52.3", + "@rollup/rollup-darwin-x64": "4.52.3", + "@rollup/rollup-freebsd-arm64": "4.52.3", + "@rollup/rollup-freebsd-x64": "4.52.3", + "@rollup/rollup-linux-arm-gnueabihf": "4.52.3", + "@rollup/rollup-linux-arm-musleabihf": "4.52.3", + "@rollup/rollup-linux-arm64-gnu": "4.52.3", + "@rollup/rollup-linux-arm64-musl": "4.52.3", + "@rollup/rollup-linux-loong64-gnu": "4.52.3", + "@rollup/rollup-linux-ppc64-gnu": "4.52.3", + "@rollup/rollup-linux-riscv64-gnu": "4.52.3", + "@rollup/rollup-linux-riscv64-musl": "4.52.3", + "@rollup/rollup-linux-s390x-gnu": "4.52.3", + "@rollup/rollup-linux-x64-gnu": "4.52.3", + "@rollup/rollup-linux-x64-musl": "4.52.3", + "@rollup/rollup-openharmony-arm64": "4.52.3", + "@rollup/rollup-win32-arm64-msvc": "4.52.3", + "@rollup/rollup-win32-ia32-msvc": "4.52.3", + "@rollup/rollup-win32-x64-gnu": "4.52.3", + "@rollup/rollup-win32-x64-msvc": "4.52.3", "fsevents": "~2.3.2" } }, @@ -24293,26 +25346,39 @@ } }, "node_modules/whatwg-encoding": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/whatwg-encoding/-/whatwg-encoding-2.0.0.tgz", - "integrity": "sha512-p41ogyeMUrw3jWclHWTQg1k05DSVXPLcVxRTYsXUk+ZooOCZLcoYgPZ/HL/D/N+uQPOtcp1me1WhBEaX02mhWg==", + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/whatwg-encoding/-/whatwg-encoding-3.1.1.tgz", + "integrity": "sha512-6qN4hJdMwfYBtE3YBTTHhoeuUrDBPZmbQaxWAqSALV/MeEnR5z1xd8UKud2RAkFoPkmB+hli1TZSnyi84xz1vQ==", "dev": true, "license": "MIT", "dependencies": { "iconv-lite": "0.6.3" }, "engines": { - "node": ">=12" + "node": ">=18" + } + }, + "node_modules/whatwg-encoding/node_modules/iconv-lite": { + "version": "0.6.3", + "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz", + "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==", + "dev": true, + "license": "MIT", + "dependencies": { + "safer-buffer": ">= 2.1.2 < 3.0.0" + }, + "engines": { + "node": ">=0.10.0" } }, "node_modules/whatwg-mimetype": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/whatwg-mimetype/-/whatwg-mimetype-3.0.0.tgz", - "integrity": "sha512-nt+N2dzIutVRxARx1nghPKGv1xHikU7HKdfafKkLNLindmPU/ch3U31NOCGGA/dmPcmb1VlofO0vnKAcsm0o/Q==", + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/whatwg-mimetype/-/whatwg-mimetype-4.0.0.tgz", + "integrity": "sha512-QaKxh0eNIi2mE9p2vEdzfagOKHCcj1pJ56EEHGQOVxp8r9/iszLUUV7v89x9O1p/T+NlTM5W7jW6+cz4Fq1YVg==", "dev": true, "license": "MIT", "engines": { - "node": ">=12" + "node": ">=18" } }, "node_modules/whatwg-url": { @@ -24909,9 +25975,9 @@ } }, "node_modules/yoctocolors-cjs": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/yoctocolors-cjs/-/yoctocolors-cjs-2.1.2.tgz", - "integrity": "sha512-cYVsTjKl8b+FrnidjibDWskAv7UKOfcwaVZdp/it9n1s9fU3IkgDbhdIRKCW4JDsAlECJY0ytoVPT3sK6kideA==", + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/yoctocolors-cjs/-/yoctocolors-cjs-2.1.3.tgz", + "integrity": "sha512-U/PBtDf35ff0D8X8D0jfdzHYEPFxAI7jJlxZXwCSez5M3190m+QobIfh+sWDWSHMCWWJN2AWamkegn6vr6YBTw==", "dev": true, "license": "MIT", "engines": { diff --git a/package.json b/package.json index 533339fcc..190ded296 100644 --- a/package.json +++ b/package.json @@ -5,7 +5,9 @@ "ng": "ng", "analyze-bundle": "ng build --configuration=analyze-bundle && source-map-explorer dist/**/*.js --no-border-checks", "build": "ng build", - "ci": "npm run lint && jest --coverage", + "check:config": "node ./docker/check-config.js", + "ci:test": "jest", + "ci:test:coverage": "jest --coverage", "docs": "./node_modules/.bin/compodoc -p tsconfig.docs.json --name 'OSF Angular Documentation' --theme 'laravel' -s", "docs:coverage": "./node_modules/.bin/compodoc -p tsconfig.docs.json --coverageTest 0 --coverageMinimumPerFile 0", "lint": "ng lint", @@ -17,9 +19,11 @@ "ngxs:store": "ng generate @ngxs/store:store --name --path", "prepare": "husky", "start": "ng serve", - "start:docker": "ng serve --host 0.0.0.0 --port 4200 --poll 2000", - "start:docker:local": "ng serve --host 0.0.0.0 --port 4200 --poll 2000 --configuration local", - "test": "jest && npm run test:display", + "start:docker": "npm run check:config && ng serve --host 0.0.0.0 --port 4200 --poll 2000 --configuration development", + "start:docker:local": "npm run check:config && ng serve --host 0.0.0.0 --port 4200 --poll 2000 --configuration docker", + "start:test": "ng serve --configuration test-osf", + "start:test:future": "ng serve --configuration test", + "test": "jest", "test:watch": "jest --watch", "test:coverage": "jest --coverage && npm run test:display", "test:check-coverage-thresholds": "node .github/scripts/check-coverage-thresholds.js", @@ -37,7 +41,8 @@ "@angular/platform-browser": "^19.2.0", "@angular/platform-browser-dynamic": "^19.2.0", "@angular/router": "^19.2.0", - "@angular/service-worker": "^19.2.0", + "@citation-js/core": "^0.7.18", + "@citation-js/plugin-csl": "^0.7.18", "@fortawesome/fontawesome-free": "^6.7.2", "@ngx-translate/core": "^16.0.4", "@ngx-translate/http-loader": "^16.0.1", @@ -45,9 +50,12 @@ "@ngxs/logger-plugin": "^19.0.0", "@ngxs/store": "^19.0.0", "@primeng/themes": "^19.0.9", + "@sentry/angular": "^10.10.0", + "@traptitech/markdown-it-katex": "^3.6.0", "ace-builds": "^1.42.0", + "angular-google-tag-manager": "^1.11.0", "cedar-artifact-viewer": "^0.9.5", - "cedar-embeddable-editor": "^1.5.0", + "cedar-embeddable-editor": "1.2.2", "chart.js": "^4.4.9", "diff": "^8.0.2", "markdown-it": "^14.1.0", diff --git a/src/@types/citation-js.d.ts b/src/@types/citation-js.d.ts new file mode 100644 index 000000000..08d254d03 --- /dev/null +++ b/src/@types/citation-js.d.ts @@ -0,0 +1,29 @@ +declare module '@citation-js/core' { + export class Cite { + constructor(data?: unknown); + + format( + type: string, + options?: { + format?: string; + template?: string; + lang?: string; + } + ): string; + + static plugins: { + config: { + get(name: string): { + templates: { + add(id: string, template: string): void; + has(id: string): boolean; + }; + }; + }; + }; + } + + export = Cite; +} + +declare module '@citation-js/plugin-csl'; diff --git a/src/@types/global.d.ts b/src/@types/global.d.ts index 582a45a49..1d6eba8ad 100644 --- a/src/@types/global.d.ts +++ b/src/@types/global.d.ts @@ -1,10 +1,51 @@ import type gapi from 'gapi-script'; // or just `import gapi from 'gapi-script';` +/** + * Extends the global `Window` interface to include additional properties used by the application, + * such as Google APIs (`gapi`, `google.picker`) and the `dataLayer` for analytics or GTM integration. + */ declare global { interface Window { + /** + * Represents the Google API client library (`gapi`) attached to the global window. + * Used for OAuth, Picker API, Drive API, etc. + * + * @see https://developers.google.com/api-client-library/javascript/ + */ gapi: typeof gapi; + + /** + * Contains Google-specific UI services attached to the global window, + * such as the `google.picker` API. + * + * @see https://developers.google.com/picker/docs/ + */ google: { + /** + * Reference to the Google Picker API used for file selection and Drive integration. + */ picker: typeof google.picker; }; + + /** + * Global analytics `dataLayer` object used by Google Tag Manager (GTM). + * Can store custom application metadata for tracking and event push. + * + * @property resourceType - The type of resource currently being viewed (e.g., 'project', 'file', etc.) + * @property loggedIn - Indicates whether the user is currently authenticated. + */ + dataLayer: { + /** + * The type of content or context being viewed (e.g., "project", "node", etc.). + * Optional — may be undefined depending on when or where GTM initializes. + */ + resourceType: string | undefined; + + /** + * Indicates if the current user is authenticated. + * Used for segmenting analytics based on login state. + */ + loggedIn: boolean; + }; } } diff --git a/src/app/app.component.spec.ts b/src/app/app.component.spec.ts index 3edc6c1e5..d3706b5af 100644 --- a/src/app/app.component.spec.ts +++ b/src/app/app.component.spec.ts @@ -1,52 +1,105 @@ import { provideStore, Store } from '@ngxs/store'; -import { MockComponents } from 'ng-mocks'; +import { MockComponents, MockProvider } from 'ng-mocks'; + +import { Subject } from 'rxjs'; -import { provideHttpClient } from '@angular/common/http'; -import { provideHttpClientTesting } from '@angular/common/http/testing'; import { ComponentFixture, TestBed } from '@angular/core/testing'; import { By } from '@angular/platform-browser'; +import { NavigationEnd, Router } from '@angular/router'; +import { CookieConsentBannerComponent } from '@core/components/osf-banners/cookie-consent-banner/cookie-consent-banner.component'; +import { ENVIRONMENT } from '@core/provider/environment.provider'; import { GetCurrentUser, UserState } from '@core/store/user'; import { UserEmailsState } from '@core/store/user-emails'; +import { CustomDialogService } from '@shared/services'; + +import { TranslateServiceMock } from '../testing/mocks'; import { FullScreenLoaderComponent, ToastComponent } from './shared/components'; -import { TranslateServiceMock } from './shared/mocks'; import { AppComponent } from './app.component'; -describe('AppComponent', () => { - let component: AppComponent; +import { OSFTestingModule } from '@testing/osf.testing.module'; +import { CustomDialogServiceMockBuilder } from '@testing/providers/custom-dialog-provider.mock'; +import { GoogleTagManagerService } from 'angular-google-tag-manager'; + +describe('Component: App', () => { + let routerEvents$: Subject; + let gtmServiceMock: jest.Mocked; let fixture: ComponentFixture; + let mockCustomDialogService: ReturnType; beforeEach(async () => { + mockCustomDialogService = CustomDialogServiceMockBuilder.create().build(); + routerEvents$ = new Subject(); + + gtmServiceMock = { + pushTag: jest.fn(), + } as any; + await TestBed.configureTestingModule({ - imports: [AppComponent, ...MockComponents(ToastComponent, FullScreenLoaderComponent)], + imports: [ + OSFTestingModule, + AppComponent, + ...MockComponents(ToastComponent, FullScreenLoaderComponent, CookieConsentBannerComponent), + ], providers: [ provideStore([UserState, UserEmailsState]), - provideHttpClient(), - provideHttpClientTesting(), + MockProvider(CustomDialogService, mockCustomDialogService), TranslateServiceMock, + { provide: GoogleTagManagerService, useValue: gtmServiceMock }, + { + provide: Router, + useValue: { + events: routerEvents$.asObservable(), + }, + }, ], }).compileComponents(); fixture = TestBed.createComponent(AppComponent); - component = fixture.componentInstance; - fixture.detectChanges(); }); - it('should create', () => { - expect(component).toBeTruthy(); - }); + describe('detect changes', () => { + beforeEach(() => { + fixture.detectChanges(); + }); - it('should dispatch GetCurrentUser action on initialization', () => { - const store = TestBed.inject(Store); - const dispatchSpy = jest.spyOn(store, 'dispatch'); - store.dispatch(GetCurrentUser); - expect(dispatchSpy).toHaveBeenCalledWith(GetCurrentUser); + it('should dispatch GetCurrentUser action on initialization', () => { + const store = TestBed.inject(Store); + const dispatchSpy = jest.spyOn(store, 'dispatch'); + store.dispatch(GetCurrentUser); + expect(dispatchSpy).toHaveBeenCalledWith(GetCurrentUser); + }); + + it('should render router outlet', () => { + const routerOutlet = fixture.debugElement.query(By.css('router-outlet')); + expect(routerOutlet).toBeTruthy(); + }); }); - it('should render router outlet', () => { - const routerOutlet = fixture.debugElement.query(By.css('router-outlet')); - expect(routerOutlet).toBeTruthy(); + describe('Google Tag Manager', () => { + it('should push GTM tag on NavigationEnd with google tag id', () => { + fixture.detectChanges(); + const event = new NavigationEnd(1, '/previous', '/current'); + + routerEvents$.next(event); + + expect(gtmServiceMock.pushTag).toHaveBeenCalledWith({ + event: 'page', + pageName: '/current', + }); + }); + + it('should not push GTM tag on NavigationEnd without google tag id', () => { + const environment = TestBed.inject(ENVIRONMENT); + environment.googleTagManagerId = ''; + fixture.detectChanges(); + const event = new NavigationEnd(1, '/previous', '/current'); + + routerEvents$.next(event); + + expect(gtmServiceMock.pushTag).not.toHaveBeenCalled(); + }); }); }); diff --git a/src/app/app.component.ts b/src/app/app.component.ts index ccf75a496..e1eb1045b 100644 --- a/src/app/app.component.ts +++ b/src/app/app.component.ts @@ -1,21 +1,20 @@ -import { createDispatchMap, select } from '@ngxs/store'; +import { Actions, createDispatchMap, ofActionSuccessful, select } from '@ngxs/store'; -import { TranslateService } from '@ngx-translate/core'; - -import { DialogService } from 'primeng/dynamicdialog'; - -import { filter } from 'rxjs/operators'; +import { filter, take } from 'rxjs'; import { ChangeDetectionStrategy, Component, DestroyRef, effect, inject, OnInit } from '@angular/core'; import { takeUntilDestroyed } from '@angular/core/rxjs-interop'; import { NavigationEnd, Router, RouterOutlet } from '@angular/router'; +import { ENVIRONMENT } from '@core/provider/environment.provider'; import { GetCurrentUser } from '@core/store/user'; import { GetEmails, UserEmailsSelectors } from '@core/store/user-emails'; import { ConfirmEmailComponent } from '@shared/components'; +import { CustomDialogService } from '@shared/services'; import { FullScreenLoaderComponent, ToastComponent } from './shared/components'; -import { MetaTagsService } from './shared/services/meta-tags.service'; + +import { GoogleTagManagerService } from 'angular-google-tag-manager'; @Component({ selector: 'osf-root', @@ -23,21 +22,19 @@ import { MetaTagsService } from './shared/services/meta-tags.service'; templateUrl: './app.component.html', styleUrl: './app.component.scss', changeDetection: ChangeDetectionStrategy.OnPush, - providers: [DialogService], }) export class AppComponent implements OnInit { + private readonly googleTagManagerService = inject(GoogleTagManagerService); private readonly destroyRef = inject(DestroyRef); - private readonly dialogService = inject(DialogService); + private readonly customDialogService = inject(CustomDialogService); private readonly router = inject(Router); - private readonly translateService = inject(TranslateService); - private readonly metaTagsService = inject(MetaTagsService); - + private readonly environment = inject(ENVIRONMENT); + private readonly actions$ = inject(Actions); private readonly actions = createDispatchMap({ getCurrentUser: GetCurrentUser, getEmails: GetEmails }); unverifiedEmails = select(UserEmailsSelectors.getUnverifiedEmails); constructor() { - this.setupMetaTagsCleanup(); effect(() => { if (this.unverifiedEmails().length) { this.showEmailDialog(); @@ -47,26 +44,32 @@ export class AppComponent implements OnInit { ngOnInit(): void { this.actions.getCurrentUser(); - this.actions.getEmails(); - } - private setupMetaTagsCleanup(): void { - this.router.events - .pipe( - filter((event) => event instanceof NavigationEnd), - takeUntilDestroyed(this.destroyRef) - ) - .subscribe((event: NavigationEnd) => this.metaTagsService.clearMetaTagsIfNeeded(event.url)); + this.actions$.pipe(ofActionSuccessful(GetCurrentUser), take(1)).subscribe(() => { + this.actions.getEmails(); + }); + + if (this.environment.googleTagManagerId) { + this.router.events + .pipe( + filter((event) => event instanceof NavigationEnd), + takeUntilDestroyed(this.destroyRef) + ) + .subscribe((event: NavigationEnd) => { + this.googleTagManagerService.pushTag({ + event: 'page', + pageName: event.urlAfterRedirects, + }); + }); + } } private showEmailDialog() { - this.dialogService.open(ConfirmEmailComponent, { + const unverifiedEmailsData = this.unverifiedEmails(); + this.customDialogService.open(ConfirmEmailComponent, { + header: unverifiedEmailsData[0].isMerge ? 'home.confirmEmail.merge.title' : 'home.confirmEmail.add.title', width: '448px', - focusOnShow: false, - header: this.translateService.instant('home.confirmEmail.title'), - modal: true, - closable: false, - data: this.unverifiedEmails(), + data: unverifiedEmailsData, }); } } diff --git a/src/app/app.config.ts b/src/app/app.config.ts index 4f619d1f6..0f53a5184 100644 --- a/src/app/app.config.ts +++ b/src/app/app.config.ts @@ -5,25 +5,36 @@ import { TranslateModule } from '@ngx-translate/core'; import { ConfirmationService, MessageService } from 'primeng/api'; import { providePrimeNG } from 'primeng/config'; +import { DialogService } from 'primeng/dynamicdialog'; import { provideHttpClient, withInterceptors } from '@angular/common/http'; import { ApplicationConfig, ErrorHandler, importProvidersFrom, provideZoneChangeDetection } from '@angular/core'; import { provideAnimations } from '@angular/platform-browser/animations'; -import { provideRouter } from '@angular/router'; +import { provideRouter, withInMemoryScrolling } from '@angular/router'; import { STATES } from '@core/constants'; import { provideTranslation } from '@core/helpers'; +import { APPLICATION_INITIALIZATION_PROVIDER } from '@core/provider/application.initialization.provider'; +import { SENTRY_PROVIDER } from '@core/provider/sentry.provider'; -import { GlobalErrorHandler } from './core/handlers'; import { authInterceptor, errorInterceptor, viewOnlyInterceptor } from './core/interceptors'; import CustomPreset from './core/theme/custom-preset'; import { routes } from './app.routes'; +import * as Sentry from '@sentry/angular'; + export const appConfig: ApplicationConfig = { providers: [ - provideZoneChangeDetection({ eventCoalescing: true }), - provideRouter(routes), - provideStore(STATES, withNgxsReduxDevtoolsPlugin({ disabled: false })), + APPLICATION_INITIALIZATION_PROVIDER, + ConfirmationService, + DialogService, + MessageService, + { + provide: ErrorHandler, + useFactory: () => Sentry.createErrorHandler({ showDialog: false }), + }, + importProvidersFrom(TranslateModule.forRoot(provideTranslation())), + provideAnimations(), providePrimeNG({ theme: { preset: CustomPreset, @@ -36,11 +47,10 @@ export const appConfig: ApplicationConfig = { }, }, }), - provideAnimations(), provideHttpClient(withInterceptors([authInterceptor, viewOnlyInterceptor, errorInterceptor])), - importProvidersFrom(TranslateModule.forRoot(provideTranslation())), - ConfirmationService, - MessageService, - { provide: ErrorHandler, useClass: GlobalErrorHandler }, + provideRouter(routes, withInMemoryScrolling({ scrollPositionRestoration: 'top', anchorScrolling: 'enabled' })), + provideStore(STATES, withNgxsReduxDevtoolsPlugin({ disabled: true })), + provideZoneChangeDetection({ eventCoalescing: true }), + SENTRY_PROVIDER, ], }; diff --git a/src/app/app.routes.ts b/src/app/app.routes.ts index c4812db23..fefa6332e 100644 --- a/src/app/app.routes.ts +++ b/src/app/app.routes.ts @@ -8,22 +8,17 @@ import { BookmarksState, ProjectsState } from '@shared/stores'; import { authGuard, redirectIfLoggedInGuard } from './core/guards'; import { isProjectGuard } from './core/guards/is-project.guard'; import { isRegistryGuard } from './core/guards/is-registry.guard'; -import { MyProfileResourceFiltersOptionsState } from './features/my-profile/components/filters/store'; -import { MyProfileResourceFiltersState } from './features/my-profile/components/my-profile-resource-filters/store'; -import { MyProfileState } from './features/my-profile/store'; import { PreprintState } from './features/preprints/store/preprint'; +import { ProfileState } from './features/profile/store'; import { RegistriesState } from './features/registries/store'; import { LicensesHandlers, ProjectsHandlers, ProvidersHandlers } from './features/registries/store/handlers'; import { FilesHandlers } from './features/registries/store/handlers/files.handlers'; -import { ResourceFiltersOptionsState } from './features/search/components/filters/store'; -import { ResourceFiltersState } from './features/search/components/resource-filters/store'; -import { SearchState } from './features/search/store'; import { LicensesService } from './shared/services'; export const routes: Routes = [ { path: '', - loadComponent: () => import('./core/components/root/root.component').then((mod) => mod.RootComponent), + loadComponent: () => import('./core/components/layout/layout.component').then((mod) => mod.LayoutComponent), children: [ { path: '', @@ -40,11 +35,6 @@ export const routes: Routes = [ canActivate: [authGuard], providers: [provideStates([ProjectsState])], }, - { - path: 'confirm/:userId/:token', - loadComponent: () => import('./features/home/home.component').then((mod) => mod.HomeComponent), - data: { skipBreadcrumbs: true }, - }, { path: 'register', canActivate: [redirectIfLoggedInGuard], @@ -71,7 +61,6 @@ export const routes: Routes = [ { path: 'search', loadComponent: () => import('./features/search/search.component').then((mod) => mod.SearchComponent), - providers: [provideStates([ResourceFiltersState, ResourceFiltersOptionsState, SearchState])], }, { path: 'my-projects', @@ -118,13 +107,17 @@ export const routes: Routes = [ loadChildren: () => import('./features/registries/registries.routes').then((mod) => mod.registriesRoutes), }, { - path: 'my-profile', - loadComponent: () => import('./features/my-profile/my-profile.component').then((mod) => mod.MyProfileComponent), - providers: [ - provideStates([MyProfileResourceFiltersState, MyProfileResourceFiltersOptionsState, MyProfileState]), - ], + path: 'profile', + loadComponent: () => import('./features/profile/profile.component').then((mod) => mod.ProfileComponent), + providers: [provideStates([ProfileState])], + data: { scrollToTop: false }, canActivate: [authGuard], }, + { + path: 'user/:id', + loadComponent: () => import('./features/profile/profile.component').then((mod) => mod.ProfileComponent), + providers: [provideStates([ProfileState])], + }, { path: 'institutions', loadChildren: () => import('./features/institutions/institutions.routes').then((r) => r.routes), @@ -164,6 +157,27 @@ export const routes: Routes = [ import('./core/components/request-access/request-access.component').then((mod) => mod.RequestAccessComponent), data: { skipBreadcrumbs: true }, }, + { + path: 'not-found', + loadComponent: () => + import('./core/components/page-not-found/page-not-found.component').then((mod) => mod.PageNotFoundComponent), + data: { skipBreadcrumbs: true }, + }, + { + path: ':id/files/:provider/:fileId', + loadComponent: () => + import('./features/files/pages/file-redirect/file-redirect.component').then((m) => m.FileRedirectComponent), + }, + { + path: 'project/:id/files/:provider/:fileId', + loadComponent: () => + import('./features/files/pages/file-redirect/file-redirect.component').then((m) => m.FileRedirectComponent), + }, + { + path: 'project/:id/node/:nodeId/files/:provider/:fileId', + loadComponent: () => + import('./features/files/pages/file-redirect/file-redirect.component').then((m) => m.FileRedirectComponent), + }, { path: ':id', canMatch: [isFileGuard], diff --git a/src/app/core/animations/fade.in-out.animation.ts b/src/app/core/animations/fade.in-out.animation.ts new file mode 100644 index 000000000..7befb072b --- /dev/null +++ b/src/app/core/animations/fade.in-out.animation.ts @@ -0,0 +1,39 @@ +import { animate, style, transition, trigger } from '@angular/animations'; + +/** + * Angular animation trigger for fading elements in and out. + * + * This trigger can be used with Angular structural directives like `*ngIf` or `@if` + * to smoothly animate the appearance and disappearance of components or elements. + * + * ## Usage: + * + * In the component decorator: + * ```ts + * @Component({ + * selector: 'my-component', + * templateUrl: './my.component.html', + * animations: [fadeInOut] + * }) + * export class MyComponent {} + * ``` + * + * In the template: + * ```html + * @if (show) { + *
+ * Fades in and out! + *
+ * } + * ``` + * + * ## Transitions: + * - **:enter** — Fades in from opacity `0` to `1` over `200ms`. + * - **:leave** — Fades out from opacity `1` to `0` over `200ms`. + * + * @returns An Angular `AnimationTriggerMetadata` object used for component animations. + */ +export const fadeInOutAnimation = trigger('fadeInOut', [ + transition(':enter', [style({ opacity: 0 }), animate('200ms', style({ opacity: 1 }))]), + transition(':leave', [animate('200ms', style({ opacity: 0 }))]), +]); diff --git a/src/app/core/components/breadcrumb/breadcrumb.component.html b/src/app/core/components/breadcrumb/breadcrumb.component.html index dd294e46b..0f6c4b35f 100644 --- a/src/app/core/components/breadcrumb/breadcrumb.component.html +++ b/src/app/core/components/breadcrumb/breadcrumb.component.html @@ -2,8 +2,8 @@

/

- @for (url of parsedUrl(); track $index; let l = $last) { - {{ url }} + @for (breadcrumb of breadcrumbs(); track $index; let l = $last) { + {{ breadcrumb }} @if (!l) { / } diff --git a/src/app/core/components/breadcrumb/breadcrumb.component.scss b/src/app/core/components/breadcrumb/breadcrumb.component.scss index a43a08f1a..c74bc77ce 100644 --- a/src/app/core/components/breadcrumb/breadcrumb.component.scss +++ b/src/app/core/components/breadcrumb/breadcrumb.component.scss @@ -1,7 +1,5 @@ -@use "styles/variables" as var; - .breadcrumbs { - color: var(--header-color, var.$dark-blue-1); + color: var(--header-color, var(--dark-blue-1)); font-weight: 600; text-transform: capitalize; background-color: var(--header-background-color); diff --git a/src/app/core/components/breadcrumb/breadcrumb.component.spec.ts b/src/app/core/components/breadcrumb/breadcrumb.component.spec.ts index edaaad4f9..9b0039645 100644 --- a/src/app/core/components/breadcrumb/breadcrumb.component.spec.ts +++ b/src/app/core/components/breadcrumb/breadcrumb.component.spec.ts @@ -5,9 +5,15 @@ import { of } from 'rxjs'; import { ComponentFixture, TestBed } from '@angular/core/testing'; import { ActivatedRoute, NavigationEnd, Router } from '@angular/router'; +import { ProviderSelectors } from '@core/store/provider'; +import { InstitutionsAdminSelectors } from '@osf/features/admin-institutions/store'; +import { InstitutionsSearchSelectors } from '@shared/stores/institutions-search'; + import { BreadcrumbComponent } from './breadcrumb.component'; -describe('BreadcrumbComponent', () => { +import { provideMockStore } from '@testing/providers/store-provider.mock'; + +describe('Component: Breadcrumb', () => { let component: BreadcrumbComponent; let fixture: ComponentFixture; @@ -17,8 +23,18 @@ describe('BreadcrumbComponent', () => { }; const mockActivatedRoute = { + root: { + snapshot: { + url: [], + params: {}, + data: {}, + firstChild: null, + }, + }, snapshot: { data: { skipBreadcrumbs: false }, + url: [], + params: {}, }, firstChild: null, }; @@ -26,7 +42,17 @@ describe('BreadcrumbComponent', () => { beforeEach(async () => { await TestBed.configureTestingModule({ imports: [BreadcrumbComponent], - providers: [MockProvider(Router, mockRouter), { provide: ActivatedRoute, useValue: mockActivatedRoute }], + providers: [ + MockProvider(Router, mockRouter), + { provide: ActivatedRoute, useValue: mockActivatedRoute }, + provideMockStore({ + signals: [ + { selector: ProviderSelectors.getCurrentProvider, value: null }, + { selector: InstitutionsSearchSelectors.getInstitution, value: null }, + { selector: InstitutionsAdminSelectors.getInstitution, value: null }, + ], + }), + ], }).compileComponents(); fixture = TestBed.createComponent(BreadcrumbComponent); @@ -34,9 +60,16 @@ describe('BreadcrumbComponent', () => { fixture.detectChanges(); }); - it('should create and parse URL correctly', () => { + it('should create', () => { expect(component).toBeTruthy(); - expect(component['url']()).toBe('/test/path'); - expect(component['parsedUrl']()).toEqual(['test', 'path']); + }); + + it('should show breadcrumb when skipBreadcrumbs is false', () => { + expect(component.showBreadcrumb()).toBe(true); + }); + + it('should build breadcrumbs from route', () => { + expect(component.breadcrumbs()).toBeDefined(); + expect(Array.isArray(component.breadcrumbs())).toBe(true); }); }); diff --git a/src/app/core/components/breadcrumb/breadcrumb.component.ts b/src/app/core/components/breadcrumb/breadcrumb.component.ts index 767689e46..2c71234f7 100644 --- a/src/app/core/components/breadcrumb/breadcrumb.component.ts +++ b/src/app/core/components/breadcrumb/breadcrumb.component.ts @@ -1,11 +1,16 @@ +import { select } from '@ngxs/store'; + import { filter, map, startWith } from 'rxjs'; import { Component, computed, inject } from '@angular/core'; import { toSignal } from '@angular/core/rxjs-interop'; -import { ActivatedRoute, NavigationEnd, Router } from '@angular/router'; +import { ActivatedRoute, ActivatedRouteSnapshot, NavigationEnd, Router } from '@angular/router'; +import { ProviderSelectors } from '@core/store/provider'; import { RouteData } from '@osf/core/models'; +import { InstitutionsAdminSelectors } from '@osf/features/admin-institutions/store'; import { IconComponent } from '@osf/shared/components'; +import { InstitutionsSearchSelectors } from '@shared/stores/institutions-search'; @Component({ selector: 'osf-breadcrumb', @@ -17,16 +22,11 @@ export class BreadcrumbComponent { private readonly router = inject(Router); private readonly route = inject(ActivatedRoute); - protected readonly url = toSignal( - this.router.events.pipe( - filter((event) => event instanceof NavigationEnd), - map(() => this.router.url), - startWith(this.router.url) - ), - { initialValue: this.router.url } - ); + currentProvider = select(ProviderSelectors.getCurrentProvider); + institution = select(InstitutionsSearchSelectors.getInstitution); + institutionDashboard = select(InstitutionsAdminSelectors.getInstitution); - protected readonly routeData = toSignal( + readonly routeData = toSignal( this.router.events.pipe( filter((event) => event instanceof NavigationEnd), map(() => this.getCurrentRouteData()), @@ -35,15 +35,50 @@ export class BreadcrumbComponent { { initialValue: { skipBreadcrumbs: false } as RouteData } ); - protected readonly showBreadcrumb = computed(() => this.routeData()?.skipBreadcrumbs !== true); + readonly showBreadcrumb = computed(() => this.routeData()?.skipBreadcrumbs !== true); - protected readonly parsedUrl = computed(() => - this.url() - .split('?')[0] - .split('/') - .filter(Boolean) - .map((segment) => segment.replace(/-/g, ' ')) - ); + readonly breadcrumbs = computed(() => { + // eslint-disable-next-line @typescript-eslint/no-unused-vars + const currentRoute = this.routeData(); // Trigger recomputation when route data changes + const providerName = this.currentProvider()?.name; + const institution = this.institution()?.name; + const institutionDashboard = this.institutionDashboard()?.name; + + return this.buildBreadcrumbs(this.route.root.snapshot, providerName, institution ?? institutionDashboard); + }); + + private buildBreadcrumbs( + route: ActivatedRouteSnapshot, + providerName: string | undefined, + institutionName: string | undefined, + segments: string[] = [] + ): string[] { + for (const segment of route.url) { + const segmentPath = segment.path; + let label = segmentPath.replace(/-/g, ' '); + + const isProviderIdSegment = route.params['providerId'] === segmentPath; + const isInstitutionIdSegment = route.params['institutionId'] === segmentPath; + + if (isProviderIdSegment && providerName) { + label = providerName; + } + + if (isInstitutionIdSegment && institutionName) { + label = institutionName; + } + + if (label && label.trim().length > 0) { + segments.push(label); + } + } + + if (route.firstChild) { + return this.buildBreadcrumbs(route.firstChild, providerName, institutionName, segments); + } + + return segments; + } private getCurrentRouteData(): RouteData { let currentRoute = this.route; diff --git a/src/app/core/components/footer/footer.component.html b/src/app/core/components/footer/footer.component.html index b11f9dd2b..619c89393 100644 --- a/src/app/core/components/footer/footer.component.html +++ b/src/app/core/components/footer/footer.component.html @@ -1,12 +1,12 @@ diff --git a/src/app/core/components/footer/footer.component.scss b/src/app/core/components/footer/footer.component.scss index a58c8093c..3a7de64be 100644 --- a/src/app/core/components/footer/footer.component.scss +++ b/src/app/core/components/footer/footer.component.scss @@ -5,10 +5,6 @@ color: var(--dark-blue-1); padding: 0 1.5rem; - .separator { - margin: 0 mix.rem(6px); - } - a { color: var(--dark-blue-1); text-align: center; diff --git a/src/app/core/components/footer/footer.component.spec.ts b/src/app/core/components/footer/footer.component.spec.ts index e1b280dee..6c1aedbca 100644 --- a/src/app/core/components/footer/footer.component.spec.ts +++ b/src/app/core/components/footer/footer.component.spec.ts @@ -1,12 +1,9 @@ import { TranslatePipe, TranslateService } from '@ngx-translate/core'; import { MockComponent, MockPipe, MockProvider } from 'ng-mocks'; -import { BehaviorSubject } from 'rxjs'; - import { ComponentFixture, TestBed } from '@angular/core/testing'; import { ActivatedRoute } from '@angular/router'; -import { IS_WEB } from '@osf/shared/helpers'; import { IconComponent } from '@shared/components'; import { FooterComponent } from './footer.component'; @@ -14,14 +11,11 @@ import { FooterComponent } from './footer.component'; describe('FooterComponent', () => { let component: FooterComponent; let fixture: ComponentFixture; - let isWebSubject: BehaviorSubject; beforeEach(async () => { - isWebSubject = new BehaviorSubject(true); - await TestBed.configureTestingModule({ imports: [FooterComponent, MockComponent(IconComponent), MockPipe(TranslatePipe)], - providers: [MockProvider(TranslateService), MockProvider(ActivatedRoute), MockProvider(IS_WEB, isWebSubject)], + providers: [MockProvider(TranslateService), MockProvider(ActivatedRoute)], }).compileComponents(); fixture = TestBed.createComponent(FooterComponent); diff --git a/src/app/core/components/footer/footer.component.ts b/src/app/core/components/footer/footer.component.ts index 227a253d9..c96bde332 100644 --- a/src/app/core/components/footer/footer.component.ts +++ b/src/app/core/components/footer/footer.component.ts @@ -1,12 +1,10 @@ import { TranslatePipe } from '@ngx-translate/core'; -import { ChangeDetectionStrategy, Component, inject } from '@angular/core'; -import { toSignal } from '@angular/core/rxjs-interop'; +import { ChangeDetectionStrategy, Component } from '@angular/core'; import { RouterLink } from '@angular/router'; import { SOCIAL_ICONS } from '@osf/core/constants'; import { IconComponent } from '@osf/shared/components'; -import { IS_WEB } from '@osf/shared/helpers'; @Component({ selector: 'osf-footer', @@ -16,7 +14,5 @@ import { IS_WEB } from '@osf/shared/helpers'; changeDetection: ChangeDetectionStrategy.OnPush, }) export class FooterComponent { - isWeb = toSignal(inject(IS_WEB)); - - protected readonly socialIcons = SOCIAL_ICONS; + readonly socialIcons = SOCIAL_ICONS; } diff --git a/src/app/core/components/forbidden-page/forbidden-page.component.ts b/src/app/core/components/forbidden-page/forbidden-page.component.ts index 0ed9a686d..0c55c5ec8 100644 --- a/src/app/core/components/forbidden-page/forbidden-page.component.ts +++ b/src/app/core/components/forbidden-page/forbidden-page.component.ts @@ -1,8 +1,8 @@ import { TranslatePipe } from '@ngx-translate/core'; -import { ChangeDetectionStrategy, Component } from '@angular/core'; +import { ChangeDetectionStrategy, Component, inject } from '@angular/core'; -import { environment } from 'src/environments/environment'; +import { ENVIRONMENT } from '@core/provider/environment.provider'; @Component({ selector: 'osf-forbidden-page', @@ -12,5 +12,6 @@ import { environment } from 'src/environments/environment'; changeDetection: ChangeDetectionStrategy.OnPush, }) export class ForbiddenPageComponent { - readonly supportEmail = environment.supportEmail; + private readonly environment = inject(ENVIRONMENT); + readonly supportEmail = this.environment.supportEmail; } diff --git a/src/app/core/components/header/header.component.html b/src/app/core/components/header/header.component.html index c76adec66..92fd3187a 100644 --- a/src/app/core/components/header/header.component.html +++ b/src/app/core/components/header/header.component.html @@ -1,9 +1,10 @@
-
+
@if (currentUser()) { - {{ item.label | translate }} + {{ item.label | translate }} } @else { diff --git a/src/app/core/components/header/header.component.spec.ts b/src/app/core/components/header/header.component.spec.ts index 043e46f3a..344394e6e 100644 --- a/src/app/core/components/header/header.component.spec.ts +++ b/src/app/core/components/header/header.component.spec.ts @@ -9,12 +9,13 @@ import { signal } from '@angular/core'; import { ComponentFixture, TestBed } from '@angular/core/testing'; import { UserSelectors } from '@osf/core/store/user'; -import { MOCK_STORE, MOCK_USER } from '@osf/shared/mocks'; import { BreadcrumbComponent } from '../breadcrumb/breadcrumb.component'; import { HeaderComponent } from './header.component'; +import { MOCK_STORE, MOCK_USER } from '@testing/mocks'; + describe('HeaderComponent', () => { let component: HeaderComponent; let fixture: ComponentFixture; diff --git a/src/app/core/components/header/header.component.ts b/src/app/core/components/header/header.component.ts index a599fcefd..52f04a1fd 100644 --- a/src/app/core/components/header/header.component.ts +++ b/src/app/core/components/header/header.component.ts @@ -29,7 +29,7 @@ export class HeaderComponent { items = [ { label: 'navigation.myProfile', - command: () => this.router.navigate(['my-profile']), + command: () => this.router.navigate(['profile']), }, { label: 'navigation.settings', command: () => this.router.navigate(['settings']) }, { diff --git a/src/app/core/components/index.ts b/src/app/core/components/index.ts index 251086f78..37255faf6 100644 --- a/src/app/core/components/index.ts +++ b/src/app/core/components/index.ts @@ -1,7 +1,8 @@ export { BreadcrumbComponent } from './breadcrumb/breadcrumb.component'; export { FooterComponent } from './footer/footer.component'; export { HeaderComponent } from './header/header.component'; +export { LayoutComponent } from './layout/layout.component'; +export { MaintenanceBannerComponent } from './osf-banners/maintenance-banner/maintenance-banner.component'; export { PageNotFoundComponent } from './page-not-found/page-not-found.component'; -export { RootComponent } from './root/root.component'; export { SidenavComponent } from './sidenav/sidenav.component'; export { TopnavComponent } from './topnav/topnav.component'; diff --git a/src/app/core/components/layout/layout.component.html b/src/app/core/components/layout/layout.component.html new file mode 100644 index 000000000..c67d66397 --- /dev/null +++ b/src/app/core/components/layout/layout.component.html @@ -0,0 +1,28 @@ +
+ @if (isWeb()) { + + } + +
+ @if (isWeb()) { + + + } @else { + + @if (isMedium()) { + + } + + } + + + + +
+
+ + diff --git a/src/app/core/components/layout/layout.component.scss b/src/app/core/components/layout/layout.component.scss new file mode 100644 index 000000000..75e7a3a05 --- /dev/null +++ b/src/app/core/components/layout/layout.component.scss @@ -0,0 +1,86 @@ +@use "styles/mixins" as mix; + +:host { + display: flex; + height: 100vh; + max-width: 100vw; +} + +.layout-desktop { + display: flex; + flex: 1; + background-color: var(--dark-blue-1); + max-width: 100vw; + + .content-wrapper { + position: relative; + background-color: var(--bg-blue-3); + border-radius: mix.rem(12px); + margin: mix.rem(6px); + display: flex; + flex-direction: column; + flex: 1; + overflow-y: auto; + } +} + +.layout-tablet { + @include mix.flex-center; + flex: 1; + max-width: 100vw; + + .content-wrapper { + @include mix.flex-column; + width: 100%; + height: 100%; + flex: 1; + overflow-y: auto; + background-color: var(--bg-blue-3); + + .content { + position: relative; + @include mix.flex-column; + flex: 1; + } + } +} + +.layout { + display: flex; + flex: 1; + max-width: 100vw; + + .content-wrapper { + display: flex; + flex-direction: column; + flex: 1; + overflow-y: auto; + background-color: var(--bg-blue-3); + } +} + +.layout.layout-desktop { + background-color: var(--dark-blue-1); + + .content-wrapper { + position: relative; + border-radius: mix.rem(12px); + margin: mix.rem(6px); + } +} + +.layout.layout-tablet { + @include mix.flex-center; + + .content-wrapper { + @include mix.flex-column; + width: 100%; + height: 100%; + + .content { + position: relative; + @include mix.flex-column; + flex: 1; + } + } +} diff --git a/src/app/core/components/layout/layout.component.spec.ts b/src/app/core/components/layout/layout.component.spec.ts new file mode 100644 index 000000000..be2d217e3 --- /dev/null +++ b/src/app/core/components/layout/layout.component.spec.ts @@ -0,0 +1,83 @@ +import { MockComponents, MockProvider } from 'ng-mocks'; + +import { ConfirmationService } from 'primeng/api'; +import { ConfirmDialog } from 'primeng/confirmdialog'; + +import { BehaviorSubject } from 'rxjs'; + +import { ComponentFixture, TestBed } from '@angular/core/testing'; + +import { IS_WEB } from '@osf/shared/helpers'; + +import { BreadcrumbComponent } from '../breadcrumb/breadcrumb.component'; +import { FooterComponent } from '../footer/footer.component'; +import { HeaderComponent } from '../header/header.component'; +import { OSFBannerComponent } from '../osf-banners/osf-banner.component'; +import { SidenavComponent } from '../sidenav/sidenav.component'; +import { TopnavComponent } from '../topnav/topnav.component'; + +import { LayoutComponent } from './layout.component'; + +import { OSFTestingModule } from '@testing/osf.testing.module'; + +describe('Component: Root', () => { + let component: LayoutComponent; + let fixture: ComponentFixture; + let isWebSubject: BehaviorSubject; + + beforeEach(async () => { + isWebSubject = new BehaviorSubject(true); + + await TestBed.configureTestingModule({ + imports: [ + LayoutComponent, + OSFTestingModule, + ...MockComponents( + HeaderComponent, + FooterComponent, + TopnavComponent, + ConfirmDialog, + BreadcrumbComponent, + SidenavComponent, + OSFBannerComponent + ), + ], + providers: [MockProvider(IS_WEB, isWebSubject), MockProvider(ConfirmationService)], + }).compileComponents(); + + fixture = TestBed.createComponent(LayoutComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); + + it('should show desktop layout when isWeb is true', () => { + isWebSubject.next(true); + fixture.detectChanges(); + + const desktopLayout = fixture.nativeElement.querySelector('.layout-desktop'); + const tabletLayout = fixture.nativeElement.querySelector('.layout-tablet'); + + expect(desktopLayout).toBeTruthy(); + expect(tabletLayout).toBeFalsy(); + }); + + it('should show tablet layout when isWeb is false', () => { + isWebSubject.next(false); + fixture.detectChanges(); + + const desktopLayout = fixture.nativeElement.querySelector('.layout-desktop'); + const tabletLayout = fixture.nativeElement.querySelector('.layout-tablet'); + + expect(desktopLayout).toBeFalsy(); + expect(tabletLayout).toBeTruthy(); + }); + + it('should contain confirm dialog component', () => { + const confirmDialog = fixture.nativeElement.querySelector('p-confirm-dialog'); + expect(confirmDialog).toBeTruthy(); + }); +}); diff --git a/src/app/core/components/layout/layout.component.ts b/src/app/core/components/layout/layout.component.ts new file mode 100644 index 000000000..c3c8030f5 --- /dev/null +++ b/src/app/core/components/layout/layout.component.ts @@ -0,0 +1,42 @@ +import { TranslatePipe } from '@ngx-translate/core'; + +import { ConfirmDialog } from 'primeng/confirmdialog'; + +import { CommonModule } from '@angular/common'; +import { ChangeDetectionStrategy, Component, inject } from '@angular/core'; +import { toSignal } from '@angular/core/rxjs-interop'; +import { RouterOutlet } from '@angular/router'; + +import { ScrollTopOnRouteChangeDirective } from '@osf/shared/directives'; +import { IS_MEDIUM, IS_WEB } from '@osf/shared/helpers'; + +import { BreadcrumbComponent } from '../breadcrumb/breadcrumb.component'; +import { FooterComponent } from '../footer/footer.component'; +import { HeaderComponent } from '../header/header.component'; +import { OSFBannerComponent } from '../osf-banners/osf-banner.component'; +import { SidenavComponent } from '../sidenav/sidenav.component'; +import { TopnavComponent } from '../topnav/topnav.component'; + +@Component({ + selector: 'osf-layout', + imports: [ + BreadcrumbComponent, + CommonModule, + ConfirmDialog, + FooterComponent, + HeaderComponent, + OSFBannerComponent, + RouterOutlet, + ScrollTopOnRouteChangeDirective, + SidenavComponent, + TopnavComponent, + TranslatePipe, + ], + templateUrl: './layout.component.html', + styleUrls: ['./layout.component.scss'], + changeDetection: ChangeDetectionStrategy.OnPush, +}) +export class LayoutComponent { + isWeb = toSignal(inject(IS_WEB)); + isMedium = toSignal(inject(IS_MEDIUM)); +} diff --git a/src/app/core/components/nav-menu/nav-menu.component.spec.ts b/src/app/core/components/nav-menu/nav-menu.component.spec.ts index 2aefca610..2ab3830a4 100644 --- a/src/app/core/components/nav-menu/nav-menu.component.spec.ts +++ b/src/app/core/components/nav-menu/nav-menu.component.spec.ts @@ -1,20 +1,66 @@ -import { TranslatePipe, TranslateService } from '@ngx-translate/core'; -import { MockPipe, MockProvider } from 'ng-mocks'; +import { MockProvider } from 'ng-mocks'; +import { NO_ERRORS_SCHEMA, signal } from '@angular/core'; import { ComponentFixture, TestBed } from '@angular/core/testing'; -import { provideNoopAnimations } from '@angular/platform-browser/animations'; -import { ActivatedRoute } from '@angular/router'; +import { ActivatedRoute, Router } from '@angular/router'; + +import { CustomMenuItem } from '@osf/core/models'; +import { AuthService } from '@osf/core/services'; +import { ProviderSelectors } from '@osf/core/store/provider/provider.selectors'; +import { UserSelectors } from '@osf/core/store/user/user.selectors'; +import { CurrentResourceSelectors } from '@osf/shared/stores'; import { NavMenuComponent } from './nav-menu.component'; -describe.skip('NavMenuComponent', () => { +import { MOCK_USER } from '@testing/mocks'; +import { OSFTestingModule } from '@testing/osf.testing.module'; +import { ActivatedRouteMockBuilder } from '@testing/providers/route-provider.mock'; +import { RouterMockBuilder } from '@testing/providers/router-provider.mock'; +import { provideMockStore } from '@testing/providers/store-provider.mock'; + +describe('NavMenuComponent', () => { let component: NavMenuComponent; let fixture: ComponentFixture; + let mockAuthService: any; beforeEach(async () => { + Object.defineProperty(window, 'open', { + writable: true, + value: jest.fn(), + }); + mockAuthService = { + navigateToSignIn: jest.fn(), + logout: jest.fn(), + }; + await TestBed.configureTestingModule({ - imports: [NavMenuComponent, MockPipe(TranslatePipe)], - providers: [MockProvider(ActivatedRoute), MockProvider(TranslateService), provideNoopAnimations()], + imports: [NavMenuComponent, OSFTestingModule], + providers: [ + provideMockStore({ + signals: [ + { selector: UserSelectors.isAuthenticated, value: signal(false) }, + { selector: UserSelectors.getCurrentUser, value: signal(MOCK_USER) }, + { selector: UserSelectors.getCanViewReviews, value: signal(false) }, + { selector: ProviderSelectors.getCurrentProvider, value: signal(null) }, + { selector: CurrentResourceSelectors.getCurrentResource, value: signal(null) }, + ], + }), + { + provide: Router, + useValue: { + ...RouterMockBuilder.create().withUrl('/test').build(), + serializeUrl: jest.fn(() => '/test'), + parseUrl: jest.fn(() => ({})), + isActive: jest.fn(() => false), + }, + }, + { + provide: ActivatedRoute, + useValue: ActivatedRouteMockBuilder.create().build(), + }, + MockProvider(AuthService, mockAuthService), + ], + schemas: [NO_ERRORS_SCHEMA], }).compileComponents(); fixture = TestBed.createComponent(NavMenuComponent); @@ -25,4 +71,121 @@ describe.skip('NavMenuComponent', () => { it('should create', () => { expect(component).toBeTruthy(); }); + + it('should open external links in new tab for support and donate items', () => { + const openSpy = jest.spyOn(window, 'open'); + const supportItem: CustomMenuItem = { id: 'support', url: 'https://support.example.com' }; + const donateItem: CustomMenuItem = { id: 'donate', url: 'https://donate.example.com' }; + + component.goToLink(supportItem); + expect(openSpy).toHaveBeenCalledWith('https://support.example.com', '_blank'); + + component.goToLink(donateItem); + expect(openSpy).toHaveBeenCalledWith('https://donate.example.com', '_blank'); + }); + + it('should navigate to sign in for sign-in item', () => { + const signInItem: CustomMenuItem = { id: 'sign-in' }; + + component.goToLink(signInItem); + expect(mockAuthService.navigateToSignIn).toHaveBeenCalled(); + }); + + it('should logout for log-out item', () => { + const logOutItem: CustomMenuItem = { id: 'log-out' }; + + component.goToLink(logOutItem); + expect(mockAuthService.logout).toHaveBeenCalled(); + }); + + it('should emit closeMenu for items without children', () => { + const emitSpy = jest.spyOn(component.closeMenu, 'emit'); + const menuItem: CustomMenuItem = { id: 'test-item' }; + + component.goToLink(menuItem); + expect(emitSpy).toHaveBeenCalled(); + }); + + it('should not emit closeMenu for items with children', () => { + const emitSpy = jest.spyOn(component.closeMenu, 'emit'); + const menuItemWithChildren: CustomMenuItem = { + id: 'test-item', + items: [{ id: 'child-item' }], + }; + + component.goToLink(menuItemWithChildren); + expect(emitSpy).not.toHaveBeenCalled(); + }); + + it('should return false for items without items array', () => { + const menuItem: CustomMenuItem = { id: 'test-item' }; + expect(component.hasVisibleChildren(menuItem)).toBe(false); + }); + + it('should return false for items with empty items array', () => { + const menuItem: CustomMenuItem = { id: 'test-item', items: [] }; + expect(component.hasVisibleChildren(menuItem)).toBe(false); + }); + + it('should return false for items with all invisible children', () => { + const menuItem: CustomMenuItem = { + id: 'test-item', + items: [ + { id: 'child1', visible: false }, + { id: 'child2', visible: false }, + ], + }; + expect(component.hasVisibleChildren(menuItem)).toBe(false); + }); + + it('should return true for items with at least one visible child', () => { + const menuItem: CustomMenuItem = { + id: 'test-item', + items: [ + { id: 'child1', visible: false }, + { id: 'child2', visible: true }, + ], + }; + expect(component.hasVisibleChildren(menuItem)).toBe(true); + }); + + it('should return false for items with children that have visible property undefined', () => { + const menuItem: CustomMenuItem = { + id: 'test-item', + items: [{ id: 'child1' }], + }; + expect(component.hasVisibleChildren(menuItem)).toBe(false); + }); + + it('should have mainMenuItems computed property', () => { + expect(component.mainMenuItems).toBeDefined(); + expect(typeof component.mainMenuItems).toBe('function'); + }); + + it('should have currentRoute computed property', () => { + expect(component.currentRoute).toBeDefined(); + }); + + it('should have currentResourceId computed property', () => { + expect(component.currentResourceId).toBeDefined(); + expect(typeof component.currentResourceId).toBe('function'); + }); + + it('should have isCollectionsRoute computed property', () => { + expect(component.isCollectionsRoute).toBeDefined(); + expect(typeof component.isCollectionsRoute).toBe('function'); + }); + + it('should have isPreprintRoute computed property', () => { + expect(component.isPreprintRoute).toBeDefined(); + expect(typeof component.isPreprintRoute).toBe('function'); + }); + + it('should emit closeMenu event', () => { + const emitSpy = jest.spyOn(component.closeMenu, 'emit'); + + component.closeMenu.emit(); + + expect(emitSpy).toHaveBeenCalled(); + }); }); diff --git a/src/app/core/components/nav-menu/nav-menu.component.ts b/src/app/core/components/nav-menu/nav-menu.component.ts index 29a552419..496ef7c72 100644 --- a/src/app/core/components/nav-menu/nav-menu.component.ts +++ b/src/app/core/components/nav-menu/nav-menu.component.ts @@ -1,8 +1,7 @@ -import { select } from '@ngxs/store'; +import { createDispatchMap, select } from '@ngxs/store'; import { TranslatePipe } from '@ngx-translate/core'; -import { MenuItem } from 'primeng/api'; import { PanelMenuModule } from 'primeng/panelmenu'; import { filter, map } from 'rxjs'; @@ -12,15 +11,16 @@ import { toSignal } from '@angular/core/rxjs-interop'; import { ActivatedRoute, NavigationEnd, Router, RouterLink, RouterLinkActive } from '@angular/router'; import { MENU_ITEMS } from '@core/constants'; +import { ProviderSelectors } from '@core/store/provider'; import { filterMenuItems, updateMenuItems } from '@osf/core/helpers'; -import { RouteContext } from '@osf/core/models'; +import { CustomMenuItem, RouteContext } from '@osf/core/models'; import { AuthService } from '@osf/core/services'; import { UserSelectors } from '@osf/core/store/user'; import { IconComponent } from '@osf/shared/components'; -import { CurrentResourceType } from '@osf/shared/enums'; +import { CurrentResourceType, ReviewPermissions } from '@osf/shared/enums'; import { getViewOnlyParam } from '@osf/shared/helpers'; import { WrapFnPipe } from '@osf/shared/pipes'; -import { CurrentResourceSelectors } from '@osf/shared/stores'; +import { CurrentResourceSelectors, GetResourceDetails } from '@osf/shared/stores'; @Component({ selector: 'osf-nav-menu', @@ -37,25 +37,37 @@ export class NavMenuComponent { private readonly isAuthenticated = select(UserSelectors.isAuthenticated); private readonly currentResource = select(CurrentResourceSelectors.getCurrentResource); + private readonly provider = select(ProviderSelectors.getCurrentProvider); - protected readonly mainMenuItems = computed(() => { + readonly actions = createDispatchMap({ getResourceDetails: GetResourceDetails }); + + readonly mainMenuItems = computed(() => { const isAuthenticated = this.isAuthenticated(); const filtered = filterMenuItems(MENU_ITEMS, isAuthenticated); const routeContext: RouteContext = { resourceId: this.currentResourceId(), - providerId: this.currentProviderId(), + providerId: this.provider()?.id, isProject: this.currentResource()?.type === CurrentResourceType.Projects && this.currentResourceId() === this.currentResource()?.id, + wikiPageVisible: this.currentResource()?.wikiEnabled, isRegistry: this.currentResource()?.type === CurrentResourceType.Registrations && this.currentResourceId() === this.currentResource()?.id, isPreprint: this.isPreprintRoute(), preprintReviewsPageVisible: this.canUserViewReviews(), + registrationModerationPageVisible: + this.provider()?.type === CurrentResourceType.Registrations && + this.provider()?.permissions?.includes(ReviewPermissions.ViewSubmissions) && + !!this.provider()?.reviewsWorkflow, + collectionModerationPageVisible: + this.provider()?.type === CurrentResourceType.Collections && + this.provider()?.permissions?.includes(ReviewPermissions.ViewSubmissions), isCollections: this.isCollectionsRoute() || false, currentUrl: this.router.url, isViewOnly: !!getViewOnlyParam(this.router), + permissions: this.currentResource()?.permissions, }; const items = updateMenuItems(filtered, routeContext); @@ -63,7 +75,7 @@ export class NavMenuComponent { return items; }); - protected readonly currentRoute = toSignal( + readonly currentRoute = toSignal( this.router.events.pipe( filter((event): event is NavigationEnd => event instanceof NavigationEnd), map(() => this.getRouteInfo()) @@ -73,11 +85,10 @@ export class NavMenuComponent { } ); - protected readonly currentResourceId = computed(() => this.currentRoute().resourceId); - protected readonly currentProviderId = computed(() => this.currentRoute().providerId); - protected readonly isCollectionsRoute = computed(() => this.currentRoute().isCollectionsWithId); - protected readonly isPreprintRoute = computed(() => this.currentRoute().isPreprintRoute); - protected readonly canUserViewReviews = select(UserSelectors.getCanViewReviews); + readonly currentResourceId = computed(() => this.currentRoute().resourceId); + readonly isCollectionsRoute = computed(() => this.currentRoute().isCollectionsWithId); + readonly isPreprintRoute = computed(() => this.currentRoute().isPreprintRoute); + readonly canUserViewReviews = select(UserSelectors.getCanViewReviews); private getRouteInfo() { const urlSegments = this.router.url.split('/').filter((segment) => segment); @@ -95,7 +106,7 @@ export class NavMenuComponent { }; } - goToLink(item: MenuItem) { + goToLink(item: CustomMenuItem) { if (item.id === 'support' || item.id === 'donate') { window.open(item.url, '_blank'); } @@ -115,6 +126,6 @@ export class NavMenuComponent { } } - protected readonly hasVisibleChildren = (item: MenuItem): boolean => + readonly hasVisibleChildren = (item: CustomMenuItem): boolean => Array.isArray(item.items) && item.items.some((child) => !!child.visible); } diff --git a/src/app/core/components/osf-banners/cookie-consent-banner/cookie-consent-banner.component.html b/src/app/core/components/osf-banners/cookie-consent-banner/cookie-consent-banner.component.html new file mode 100644 index 000000000..0b40808a3 --- /dev/null +++ b/src/app/core/components/osf-banners/cookie-consent-banner/cookie-consent-banner.component.html @@ -0,0 +1,17 @@ +@if (displayBanner()) { +
+ + +
+
+ + {{ 'toast.cookie-consent.message' | translate }} +
+
+ +
+
+ + +
+} diff --git a/src/app/features/my-profile/components/filters/my-profile-date-created-filter/my-profile-date-created-filter.component.scss b/src/app/core/components/osf-banners/cookie-consent-banner/cookie-consent-banner.component.scss similarity index 100% rename from src/app/features/my-profile/components/filters/my-profile-date-created-filter/my-profile-date-created-filter.component.scss rename to src/app/core/components/osf-banners/cookie-consent-banner/cookie-consent-banner.component.scss diff --git a/src/app/core/components/osf-banners/cookie-consent-banner/cookie-consent-banner.component.spec.ts b/src/app/core/components/osf-banners/cookie-consent-banner/cookie-consent-banner.component.spec.ts new file mode 100644 index 000000000..9c097775f --- /dev/null +++ b/src/app/core/components/osf-banners/cookie-consent-banner/cookie-consent-banner.component.spec.ts @@ -0,0 +1,57 @@ +import { CookieService } from 'ngx-cookie-service'; + +import { Button } from 'primeng/button'; + +import { ComponentFixture, TestBed } from '@angular/core/testing'; + +import { CookieConsentBannerComponent } from './cookie-consent-banner.component'; + +import { OSFTestingModule } from '@testing/osf.testing.module'; + +describe('Component: Cookie Consent Banner', () => { + let fixture: ComponentFixture; + let component: CookieConsentBannerComponent; + + const cookieServiceMock = { + check: jest.fn(), + set: jest.fn(), + }; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + imports: [OSFTestingModule, CookieConsentBannerComponent, Button], + + providers: [{ provide: CookieService, useValue: cookieServiceMock }], + }); + + jest.clearAllMocks(); + }); + + it('should show the banner if cookie is not set', () => { + cookieServiceMock.check.mockReturnValue(false); + fixture = TestBed.createComponent(CookieConsentBannerComponent); + component = fixture.componentInstance; + + expect(component.displayBanner()).toBe(true); + }); + + it('should hide the banner if cookie is set', () => { + cookieServiceMock.check.mockReturnValue(true); + fixture = TestBed.createComponent(CookieConsentBannerComponent); + component = fixture.componentInstance; + + expect(component.displayBanner()).toBe(false); + }); + + it('should set cookie and hide banner on acceptCookies()', () => { + cookieServiceMock.check.mockReturnValue(false); + fixture = TestBed.createComponent(CookieConsentBannerComponent); + component = fixture.componentInstance; + + component.acceptCookies(); + + expect(cookieServiceMock.set).toHaveBeenCalledWith('cookie-consent', 'true', new Date('9999-12-31T23:59:59Z'), '/'); + + expect(component.displayBanner()).toBe(false); + }); +}); diff --git a/src/app/core/components/osf-banners/cookie-consent-banner/cookie-consent-banner.component.ts b/src/app/core/components/osf-banners/cookie-consent-banner/cookie-consent-banner.component.ts new file mode 100644 index 000000000..4d3b7ca5a --- /dev/null +++ b/src/app/core/components/osf-banners/cookie-consent-banner/cookie-consent-banner.component.ts @@ -0,0 +1,63 @@ +import { CookieService } from 'ngx-cookie-service'; +import { TranslatePipe } from '@ngx-translate/core'; + +import { Button } from 'primeng/button'; +import { Message } from 'primeng/message'; + +import { ChangeDetectionStrategy, Component, inject, signal } from '@angular/core'; + +import { fadeInOutAnimation } from '@core/animations/fade.in-out.animation'; +import { IconComponent } from '@shared/components'; + +/** + * Displays a cookie consent banner until the user accepts. + * + * - Uses `ngx-cookie-service` to persist acceptance across sessions. + * - Automatically hides the banner if consent is already recorded. + * - Animates in/out using the `fadeInOutAnimation`. + * - Supports translation via `TranslatePipe`. + */ +@Component({ + selector: 'osf-cookie-consent-banner', + templateUrl: './cookie-consent-banner.component.html', + styleUrls: ['./cookie-consent-banner.component.scss'], + imports: [Button, TranslatePipe, IconComponent, Message], + animations: [fadeInOutAnimation], + changeDetection: ChangeDetectionStrategy.OnPush, +}) +export class CookieConsentBannerComponent { + /** + * The name of the cookie used to track whether the user accepted cookies. + */ + private readonly cookieName = 'cookie-consent'; + + /** + * Signal controlling the visibility of the cookie banner. + * Set to `true` if the user has not accepted cookies yet. + */ + readonly displayBanner = signal(false); + + /** + * Cookie service used to persist dismissal state in the browser. + */ + private readonly cookies = inject(CookieService); + + /** + * Initializes the component and sets the banner display + * based on the existence of the cookie. + */ + constructor() { + this.displayBanner.set(!this.cookies.check(this.cookieName)); + } + + /** + * Called when the user accepts cookies. + * - Sets a persistent cookie with a far-future expiration. + * - Hides the banner immediately. + */ + acceptCookies() { + const expireDate = new Date('9999-12-31T23:59:59Z'); + this.cookies.set(this.cookieName, 'true', expireDate, '/'); + this.displayBanner.set(false); + } +} diff --git a/src/app/core/components/osf-banners/maintenance-banner/maintenance-banner.component.html b/src/app/core/components/osf-banners/maintenance-banner/maintenance-banner.component.html new file mode 100644 index 000000000..a936ebefc --- /dev/null +++ b/src/app/core/components/osf-banners/maintenance-banner/maintenance-banner.component.html @@ -0,0 +1,13 @@ +@if (maintenance() && !dismissed()) { + + +} diff --git a/src/app/features/my-profile/components/filters/my-profile-funder-filter/my-profile-funder-filter.component.scss b/src/app/core/components/osf-banners/maintenance-banner/maintenance-banner.component.scss similarity index 100% rename from src/app/features/my-profile/components/filters/my-profile-funder-filter/my-profile-funder-filter.component.scss rename to src/app/core/components/osf-banners/maintenance-banner/maintenance-banner.component.scss diff --git a/src/app/core/components/osf-banners/maintenance-banner/maintenance-banner.component.spec.ts b/src/app/core/components/osf-banners/maintenance-banner/maintenance-banner.component.spec.ts new file mode 100644 index 000000000..1711da79c --- /dev/null +++ b/src/app/core/components/osf-banners/maintenance-banner/maintenance-banner.component.spec.ts @@ -0,0 +1,150 @@ +import { CookieService } from 'ngx-cookie-service'; + +import { MessageModule } from 'primeng/message'; + +import { of } from 'rxjs'; + +import { HttpClient } from '@angular/common/http'; +import { ComponentFixture, fakeAsync, TestBed, tick } from '@angular/core/testing'; +import { By } from '@angular/platform-browser'; +import { NoopAnimationsModule } from '@angular/platform-browser/animations'; + +import { MaintenanceBannerComponent } from './maintenance-banner.component'; + +describe('Component: Maintenance Banner', () => { + let fixture: ComponentFixture; + let httpClient: { get: jest.Mock }; + let cookieService: jest.Mocked; + + beforeEach(async () => { + cookieService = { + check: jest.fn(), + set: jest.fn(), + } as any; + httpClient = { get: jest.fn() } as any; + await TestBed.configureTestingModule({ + imports: [MaintenanceBannerComponent, NoopAnimationsModule, MessageModule], + providers: [ + { provide: CookieService, useValue: cookieService }, + { provide: HttpClient, useValue: httpClient }, + ], + }).compileComponents(); + + fixture = TestBed.createComponent(MaintenanceBannerComponent); + }); + + afterEach(() => { + jest.clearAllMocks(); + }); + + it('should render info banner when maintenance data is present', fakeAsync(() => { + cookieService.check.mockReturnValue(false); + const now = new Date(); + const start = new Date(now.getTime() - 24 * 60 * 60 * 1000).toISOString(); + const end = new Date(now.getTime() + 24 * 60 * 60 * 1000).toISOString(); + httpClient.get.mockReturnValueOnce( + of({ + maintenance: { level: 1, message: 'Info message', start, end }, + }) + ); + fixture.detectChanges(); + tick(); + fixture.detectChanges(); + const banner = fixture.debugElement.query(By.css('p-message')); + expect(banner).toBeTruthy(); + expect(banner.componentInstance.severity).toBe('info'); + expect(banner.nativeElement.textContent).toContain('Info message'); + })); + + it('should render warning banner when level is 2', fakeAsync(() => { + cookieService.check.mockReturnValue(false); + const now = new Date(); + const start = new Date(now.getTime() - 24 * 60 * 60 * 1000).toISOString(); + const end = new Date(now.getTime() + 24 * 60 * 60 * 1000).toISOString(); + httpClient.get.mockReturnValueOnce( + of({ + maintenance: { + level: 2, + message: 'Warning message', + start, + end, + }, + }) + ); + fixture.detectChanges(); + tick(); + fixture.detectChanges(); + const banner = fixture.debugElement.query(By.css('p-message')); + expect(banner).toBeTruthy(); + expect(banner.componentInstance.severity).toBe('warn'); + expect(banner.nativeElement.textContent).toContain('Warning message'); + })); + + it('should render danger banner when level is 3', fakeAsync(() => { + cookieService.check.mockReturnValue(false); + const now = new Date(); + const start = new Date(now.getTime() - 24 * 60 * 60 * 1000).toISOString(); + const end = new Date(now.getTime() + 24 * 60 * 60 * 1000).toISOString(); + httpClient.get.mockReturnValueOnce( + of({ + maintenance: { + level: 3, + message: 'Danger message', + start, + end, + }, + }) + ); + fixture.detectChanges(); + tick(); + fixture.detectChanges(); + const banner = fixture.debugElement.query(By.css('p-message')); + expect(banner).toBeTruthy(); + expect(banner.componentInstance.severity).toBe('error'); + expect(banner.nativeElement.textContent).toContain('Danger message'); + })); + + it('should not render banner if cookie is set', fakeAsync(() => { + cookieService.check.mockReturnValue(true); + fixture.detectChanges(); + expect(httpClient.get).not.toHaveBeenCalled(); + fixture.detectChanges(); + const banner = fixture.debugElement.query(By.css('p-message')); + expect(banner).toBeFalsy(); + })); + + it('should not render banner if outside maintenance window', fakeAsync(() => { + cookieService.check.mockReturnValue(false); + httpClient.get.mockReturnValueOnce( + of({ + maintenance: { level: 1, message: 'Old message', start: '2020-01-01T00:00:00Z', end: '2020-01-02T00:00:00Z' }, + }) + ); + fixture.detectChanges(); + tick(); + fixture.detectChanges(); + const banner = fixture.debugElement.query(By.css('p-message')); + expect(banner).toBeFalsy(); + })); + + it('should dismiss banner when close button is clicked', fakeAsync(() => { + cookieService.check.mockReturnValue(false); + const now = new Date(); + const start = new Date(now.getTime() - 24 * 60 * 60 * 1000).toISOString(); + const end = new Date(now.getTime() + 24 * 60 * 60 * 1000).toISOString(); + httpClient.get.mockReturnValueOnce( + of({ + maintenance: { level: 1, message: 'Dismiss me', start, end }, + }) + ); + fixture.detectChanges(); + tick(); + fixture.detectChanges(); + const banner = fixture.debugElement.query(By.css('p-message')); + expect(banner).toBeTruthy(); + banner.triggerEventHandler('onClose', {}); + fixture.detectChanges(); + expect(fixture.debugElement.query(By.css('p-message'))).toBeFalsy(); + expect(cookieService.set).toHaveBeenCalled(); + })); +}); diff --git a/src/app/core/components/osf-banners/maintenance-banner/maintenance-banner.component.ts b/src/app/core/components/osf-banners/maintenance-banner/maintenance-banner.component.ts new file mode 100644 index 000000000..2632ce03d --- /dev/null +++ b/src/app/core/components/osf-banners/maintenance-banner/maintenance-banner.component.ts @@ -0,0 +1,100 @@ +import { CookieService } from 'ngx-cookie-service'; + +import { MessageModule } from 'primeng/message'; + +import { CommonModule } from '@angular/common'; +import { ChangeDetectionStrategy, Component, inject, OnInit, signal } from '@angular/core'; + +import { fadeInOutAnimation } from '@core/animations/fade.in-out.animation'; + +import { MaintenanceModel } from '../models/maintenance.model'; +import { MaintenanceService } from '../services/maintenance.service'; + +/** + * A banner component that displays a scheduled maintenance message to users. + * + * This component checks a cookie to determine whether the user has previously dismissed + * the banner. If not, it queries the maintenance status from the server and displays + * the maintenance message if one is active. + * + * The component supports animation via `fadeInOutAnimation` and is optimized with `OnPush` change detection. + * + * @example + * ```html + * + * ``` + */ +@Component({ + selector: 'osf-maintenance-banner', + imports: [CommonModule, MessageModule], + templateUrl: './maintenance-banner.component.html', + styleUrls: ['./maintenance-banner.component.scss'], + animations: [fadeInOutAnimation], + changeDetection: ChangeDetectionStrategy.OnPush, +}) +export class MaintenanceBannerComponent implements OnInit { + /** + * Signal to track whether the user has dismissed the banner. + */ + dismissed = signal(false); + + /** + * Signal that holds the current maintenance status fetched from the server. + */ + maintenance = signal(null); + + /** + * Service used to fetch maintenance status from the backend. + */ + private readonly maintenanceService = inject(MaintenanceService); + + /** + * Cookie service used to persist dismissal state in the browser. + */ + private readonly cookies = inject(CookieService); + + /** + * The cookie name used to store whether the user dismissed the banner. + */ + private readonly cookieName = 'osf-maintenance-dismissed'; + + /** + * Duration (in hours) to persist the dismissal cookie. + */ + private readonly cookieDurationHours = 24; + + /** + * Lifecycle hook that initializes the component: + * - Checks if dismissal cookie exists and sets `dismissed` + * - If not dismissed, triggers a fetch of current maintenance status + */ + ngOnInit(): void { + this.dismissed.set(this.cookies.check(this.cookieName)); + if (!this.dismissed()) { + this.fetchMaintenanceStatus(); + } + } + + /** + * Fetches the current maintenance status from the backend via the `MaintenanceService` + * and sets it to the `maintenance` signal. + * + * If no maintenance is active, the signal remains `null`. + */ + private fetchMaintenanceStatus(): void { + this.maintenanceService.fetchMaintenanceStatus().subscribe((maintenance: MaintenanceModel | null) => { + this.maintenance.set(maintenance); + }); + } + + /** + * Dismisses the banner: + * - Sets a cookie to remember dismissal for 24 hours + * - Updates the `dismissed` and `maintenance` signals + */ + dismiss(): void { + this.cookies.set(this.cookieName, '1', this.cookieDurationHours, '/'); + this.dismissed.set(true); + this.maintenance.set(null); + } +} diff --git a/src/app/core/components/osf-banners/models/banner.model.ts b/src/app/core/components/osf-banners/models/banner.model.ts new file mode 100644 index 000000000..9e464c604 --- /dev/null +++ b/src/app/core/components/osf-banners/models/banner.model.ts @@ -0,0 +1,65 @@ +/** + * Represents a scheduled banner to be displayed on the site. + * + * Banners are time-based promotional or informational elements that can be + * rendered conditionally depending on screen size (mobile vs desktop) and timing. + */ +export interface BannerModel { + /** + * Unique identifier for the banner. + */ + id: string; + + /** + * The start date and time when the banner should become visible. + */ + startDate: Date; + + /** + * The end date and time when the banner should no longer be visible. + */ + endDate: Date; + + /** + * The background color of the banner (in CSS color format). + */ + color: string; + + /** + * The license type or terms associated with the banner image/media. + */ + license: string; + + /** + * The internal or display name for the banner. + */ + name: string; + + /** + * Alt text for the banner image on desktop or default view. + * Used for accessibility and screen readers. + */ + defaultAltText: string; + + /** + * Alt text for the banner image on mobile view. + * Helps with accessibility and improves mobile UX. + */ + mobileAltText: string; + + /** + * URL path to the default (desktop) banner image. + */ + defaultPhoto: string; + + /** + * URL path to the mobile-optimized banner image. + */ + mobilePhoto: string; + + /** + * The external link to open when the banner is clicked. + * Typically opens in a new tab (`target="_blank"`). + */ + link: string; +} diff --git a/src/app/core/components/osf-banners/models/maintenance.model.ts b/src/app/core/components/osf-banners/models/maintenance.model.ts new file mode 100644 index 000000000..ba67520ab --- /dev/null +++ b/src/app/core/components/osf-banners/models/maintenance.model.ts @@ -0,0 +1,9 @@ +export type MaintenanceSeverityType = 'info' | 'warn' | 'error'; + +export interface MaintenanceModel { + level: number; + message: string; + start: string; + end: string; + severity?: MaintenanceSeverityType; +} diff --git a/src/app/core/components/osf-banners/osf-banner.component.html b/src/app/core/components/osf-banners/osf-banner.component.html new file mode 100644 index 000000000..828e32dd3 --- /dev/null +++ b/src/app/core/components/osf-banners/osf-banner.component.html @@ -0,0 +1,3 @@ + + + diff --git a/src/app/core/components/osf-banners/osf-banner.component.spec.ts b/src/app/core/components/osf-banners/osf-banner.component.spec.ts new file mode 100644 index 000000000..d1f8859ac --- /dev/null +++ b/src/app/core/components/osf-banners/osf-banner.component.spec.ts @@ -0,0 +1,35 @@ +import { MockComponent } from 'ng-mocks'; + +import { ComponentFixture, TestBed } from '@angular/core/testing'; +import { NoopAnimationsModule } from '@angular/platform-browser/animations'; + +import { CookieConsentBannerComponent } from './cookie-consent-banner/cookie-consent-banner.component'; +import { TosConsentBannerComponent } from './tos-consent-banner/tos-consent-banner.component'; +import { OSFBannerComponent } from './osf-banner.component'; + +import { OSFTestingModule } from '@testing/osf.testing.module'; +import { MockComponentWithSignal } from '@testing/providers/component-provider.mock'; + +describe('Component: OSF Banner', () => { + let fixture: ComponentFixture; + let component: OSFBannerComponent; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + imports: [ + OSFTestingModule, + OSFBannerComponent, + NoopAnimationsModule, + MockComponentWithSignal('osf-maintenance-banner'), + MockComponent(CookieConsentBannerComponent), + MockComponent(TosConsentBannerComponent), + ], + }).compileComponents(); + + fixture = TestBed.createComponent(OSFBannerComponent); + component = fixture.componentInstance; + }); + it('should create the component', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/core/components/osf-banners/osf-banner.component.ts b/src/app/core/components/osf-banners/osf-banner.component.ts new file mode 100644 index 000000000..de860250d --- /dev/null +++ b/src/app/core/components/osf-banners/osf-banner.component.ts @@ -0,0 +1,28 @@ +import { ChangeDetectionStrategy, Component } from '@angular/core'; + +import { CookieConsentBannerComponent } from './cookie-consent-banner/cookie-consent-banner.component'; +import { MaintenanceBannerComponent } from './maintenance-banner/maintenance-banner.component'; +import { TosConsentBannerComponent } from './tos-consent-banner/tos-consent-banner.component'; + +/** + * Wrapper component responsible for rendering all global or conditional banners. + * + * Currently, it includes the `MaintenanceBannerComponent`, which displays scheduled + * maintenance notices based on server configuration and cookie state. + * + * This component is structured to allow future expansion for additional banners (e.g., announcements, alerts). + * + * Change detection is set to `OnPush` to improve performance. + * + * @example + * ```html + * + * ``` + */ +@Component({ + selector: 'osf-banner-component', + imports: [MaintenanceBannerComponent, CookieConsentBannerComponent, TosConsentBannerComponent], + templateUrl: './osf-banner.component.html', + changeDetection: ChangeDetectionStrategy.OnPush, +}) +export class OSFBannerComponent {} diff --git a/src/app/core/components/osf-banners/scheduled-banner/scheduled-banner.component.html b/src/app/core/components/osf-banners/scheduled-banner/scheduled-banner.component.html new file mode 100644 index 000000000..3037dde30 --- /dev/null +++ b/src/app/core/components/osf-banners/scheduled-banner/scheduled-banner.component.html @@ -0,0 +1,16 @@ +@if (shouldShowBanner()) { +
+ + + +
+} diff --git a/src/app/features/my-profile/components/filters/my-profile-institution-filter/my-profile-institution-filter.component.scss b/src/app/core/components/osf-banners/scheduled-banner/scheduled-banner.component.scss similarity index 100% rename from src/app/features/my-profile/components/filters/my-profile-institution-filter/my-profile-institution-filter.component.scss rename to src/app/core/components/osf-banners/scheduled-banner/scheduled-banner.component.scss diff --git a/src/app/core/components/osf-banners/scheduled-banner/scheduled-banner.component.spec.ts b/src/app/core/components/osf-banners/scheduled-banner/scheduled-banner.component.spec.ts new file mode 100644 index 000000000..a72198b04 --- /dev/null +++ b/src/app/core/components/osf-banners/scheduled-banner/scheduled-banner.component.spec.ts @@ -0,0 +1,144 @@ +import { Store } from '@ngxs/store'; + +import { BehaviorSubject } from 'rxjs'; + +import { signal, WritableSignal } from '@angular/core'; +import { ComponentFixture, TestBed } from '@angular/core/testing'; + +import { BannerModel } from '@core/components/osf-banners/models/banner.model'; +import { IS_XSMALL } from '@osf/shared/helpers'; +import { BannersSelector, GetCurrentScheduledBanner } from '@osf/shared/stores/banners'; + +import { ScheduledBannerComponent } from './scheduled-banner.component'; + +import { provideMockStore } from '@testing/providers/store-provider.mock'; + +describe('Component: Scheduled Banner', () => { + let fixture: ComponentFixture; + let store: Store; + let component: ScheduledBannerComponent; + + const currentBannerSignal: WritableSignal = signal(null); + let isMobile$: BehaviorSubject; + + beforeEach(() => { + isMobile$ = new BehaviorSubject(false); + + TestBed.configureTestingModule({ + imports: [ScheduledBannerComponent], + providers: [ + { + provide: IS_XSMALL, + useValue: isMobile$, + }, + ], + }).overrideProvider(Store, { + useValue: provideMockStore({ + signals: [{ selector: BannersSelector.getCurrentBanner, value: currentBannerSignal }], + actions: [{ action: new GetCurrentScheduledBanner(), value: true }], + }).useValue, + }); + + fixture = TestBed.createComponent(ScheduledBannerComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + + store = TestBed.inject(Store); + }); + + afterEach(() => { + jest.clearAllMocks(); + }); + + it('should create the component', () => { + expect(component).toBeInstanceOf(ScheduledBannerComponent); + }); + + it('should dispatch FetchCurrentScheduledBanner on init', () => { + const dispatchSpy = jest.spyOn(store, 'dispatch'); + component.ngOnInit(); + expect(dispatchSpy).toHaveBeenCalledWith(new GetCurrentScheduledBanner()); + }); + + it('should return false if no banner is set', () => { + currentBannerSignal.set(null); + expect(component.shouldShowBanner()).toBe(false); + }); + + it('should return true if current time is within banner window', () => { + const showBanner = component.shouldShowBanner; + expect(showBanner()).toBeFalsy(); + + const now = new Date(); + currentBannerSignal.set( + Object({ + color: '#123456', + link: '', + defaultPhoto: '', + defaultAltText: '', + mobilePhoto: '', + mobileAltText: '', + startDate: new Date(now.getTime() - 5000), + endDate: new Date(now.getTime() + 5000), + }) + ); + + fixture.detectChanges(); + expect(showBanner()).toBeTruthy(); + const parent = fixture.nativeElement.querySelector('[data-test-banner-parent]'); + const link = fixture.nativeElement.querySelector('[data-test-banner-href]'); + expect(parent.style.backgroundColor).toBe('rgb(18, 52, 86)'); + expect(link.getAttribute('href')).toBe(''); + }); + + it('should return false if current time is outside the banner window', () => { + const now = new Date(); + currentBannerSignal.set( + Object({ + startDate: new Date(now.getTime() - 2000), + endDate: new Date(now.getTime() - 1000), + }) + ); + fixture.detectChanges(); + const parent = fixture.nativeElement.querySelector('[data-test-banner-parent]'); + const link = fixture.nativeElement.querySelector('[data-test-banner-href]'); + + expect(component.shouldShowBanner()).toBe(false); + expect(parent).toBeNull(); + expect(link).toBeNull(); + }); + + it('should reflect the isMobile signal', () => { + const now = new Date(); + currentBannerSignal.set( + Object({ + color: '#123456', + link: '', + defaultPhoto: 'default.jpg', + defaultAltText: 'default alt', + mobilePhoto: 'mobile.jpg', + mobileAltText: 'mobile alt', + startDate: new Date(now.getTime() - 5000), + endDate: new Date(now.getTime() + 5000), + }) + ); + fixture.detectChanges(); + const image = fixture.nativeElement.querySelector('[data-test-banner-image]'); + + expect(image.getAttribute('src')).toBe('default.jpg'); + expect(image.getAttribute('alt')).toBe('default alt'); + expect(component.isMobile()).toBe(false); + + isMobile$.next(true); + fixture.detectChanges(); + expect(image.getAttribute('src')).toBe('mobile.jpg'); + expect(image.getAttribute('alt')).toBe('mobile alt'); + expect(component.isMobile()).toBe(true); + + isMobile$.next(false); + fixture.detectChanges(); + expect(image.getAttribute('src')).toBe('default.jpg'); + expect(image.getAttribute('alt')).toBe('default alt'); + expect(component.isMobile()).toBe(false); + }); +}); diff --git a/src/app/core/components/osf-banners/scheduled-banner/scheduled-banner.component.ts b/src/app/core/components/osf-banners/scheduled-banner/scheduled-banner.component.ts new file mode 100644 index 000000000..be8307906 --- /dev/null +++ b/src/app/core/components/osf-banners/scheduled-banner/scheduled-banner.component.ts @@ -0,0 +1,70 @@ +import { Store } from '@ngxs/store'; + +import { ChangeDetectionStrategy, Component, computed, inject, OnInit } from '@angular/core'; +import { toSignal } from '@angular/core/rxjs-interop'; + +import { IS_XSMALL } from '@osf/shared/helpers'; +import { BannersSelector, GetCurrentScheduledBanner } from '@osf/shared/stores/banners'; + +/** + * Component to display a scheduled banner when one is active and visible + * based on the current time and the banner's scheduled window. + * + * This component is intended to show time-based promotional or informational banners + * fetched from the store via NGXS and displayed responsively on desktop or mobile. + * + * - Uses `ChangeDetectionStrategy.OnPush` for performance. + * - Observes the current screen size to adjust image and layout responsively. + */ +@Component({ + selector: 'osf-scheduled-banner', + templateUrl: './scheduled-banner.component.html', + styleUrls: ['./scheduled-banner.component.scss'], + changeDetection: ChangeDetectionStrategy.OnPush, +}) +export class ScheduledBannerComponent implements OnInit { + /** + * Injected NGXS Store instance used to dispatch actions and select state. + */ + private readonly store = inject(Store); + + /** + * Reactive signal of the currently scheduled banner fetched from the NGXS store. + */ + currentBanner = this.store.selectSignal(BannersSelector.getCurrentBanner); + + /** + * Signal representing whether the screen size is classified as 'extra small'. + * Used to conditionally render mobile-optimized images or styles. + */ + isMobile = toSignal(inject(IS_XSMALL)); + + /** + * Lifecycle hook that dispatches a store action to fetch the scheduled banner + * when the component initializes. + */ + ngOnInit(): void { + this.store.dispatch(new GetCurrentScheduledBanner()); + } + + /** + * A computed signal that determines if the current banner should be shown. + * + * @returns `true` if: + * - A banner exists + * - The current time is within the start and end time window of the banner + * + * Otherwise returns `false`. + */ + shouldShowBanner = computed(() => { + const banner = this.currentBanner(); + if (banner) { + const bannerStartTime = banner.startDate; + const bannerEndTime = banner.endDate; + const currentTime = new Date(); + + return bannerStartTime < currentTime && bannerEndTime > currentTime; + } + return false; + }); +} diff --git a/src/app/core/components/osf-banners/services/maintenance.service.spec.ts b/src/app/core/components/osf-banners/services/maintenance.service.spec.ts new file mode 100644 index 000000000..e7b6856ee --- /dev/null +++ b/src/app/core/components/osf-banners/services/maintenance.service.spec.ts @@ -0,0 +1,102 @@ +import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing'; +import { TestBed } from '@angular/core/testing'; + +import { MaintenanceModel } from '../models/maintenance.model'; + +import { MaintenanceService } from './maintenance.service'; + +import { environment } from 'src/environments/environment'; + +describe('MaintenanceService', () => { + let service: MaintenanceService; + let httpMock: HttpTestingController; + + const apiUrl = `${environment.apiDomainUrl}/v2/status/`; + + const futureDate = (offsetMinutes: number) => new Date(Date.now() + offsetMinutes * 60000).toISOString(); + + const validMaintenance: MaintenanceModel = { + start: futureDate(-10), + end: futureDate(10), + level: 2, + message: 'Scheduled maintenance', + }; + + const expiredMaintenance: MaintenanceModel = { + start: futureDate(-60), + end: futureDate(-30), + level: 1, + message: 'Old maintenance', + }; + + beforeEach(() => { + TestBed.configureTestingModule({ + imports: [HttpClientTestingModule], + providers: [MaintenanceService], + }); + service = TestBed.inject(MaintenanceService); + httpMock = TestBed.inject(HttpTestingController); + }); + + afterEach(() => { + httpMock.verify(); + }); + + it('should return maintenance when within window and map severity correctly', (done) => { + service.fetchMaintenanceStatus().subscribe((result) => { + expect(result).toEqual({ + ...validMaintenance, + severity: 'warn', + }); + done(); + }); + + const req = httpMock.expectOne(apiUrl); + expect(req.request.method).toBe('GET'); + req.flush({ maintenance: validMaintenance }); + httpMock.verify(); + }); + + it('should return null when maintenance is outside window', (done) => { + service.fetchMaintenanceStatus().subscribe((result) => { + expect(result).toBeNull(); + done(); + }); + + const req = httpMock.expectOne(apiUrl); + req.flush({ maintenance: expiredMaintenance }); + httpMock.verify(); + }); + + it('should return null when maintenance is not present', (done) => { + service.fetchMaintenanceStatus().subscribe((result) => { + expect(result).toBeNull(); + done(); + }); + + const req = httpMock.expectOne(apiUrl); + req.flush({}); + httpMock.verify(); + }); + + it('should handle errors and return null', (done) => { + service.fetchMaintenanceStatus().subscribe((result) => { + expect(result).toBeNull(); + done(); + }); + + const req = httpMock.expectOne(apiUrl); + req.error(new ProgressEvent('error')); + }); + + it('should map unknown severity level to "info"', () => { + const result = (service as any).getSeverity(99); + expect(result).toBe('info'); + }); + + it('should return false if start or end is missing', () => { + const partial: Partial = { level: 1, message: 'Missing dates' }; + const result = (service as any).isWithinMaintenanceWindow(partial); + expect(result).toBe(false); + }); +}); diff --git a/src/app/core/components/osf-banners/services/maintenance.service.ts b/src/app/core/components/osf-banners/services/maintenance.service.ts new file mode 100644 index 000000000..a18a081f4 --- /dev/null +++ b/src/app/core/components/osf-banners/services/maintenance.service.ts @@ -0,0 +1,70 @@ +import { catchError, Observable, of } from 'rxjs'; +import { map } from 'rxjs/operators'; + +import { HttpClient } from '@angular/common/http'; +import { inject, Injectable } from '@angular/core'; + +import { ENVIRONMENT } from '@core/provider/environment.provider'; + +import { MaintenanceModel, MaintenanceSeverityType } from '../models/maintenance.model'; + +/** + * `MaintenanceService` is responsible for retrieving the current maintenance status from the backend API. + * + * It transforms raw API responses into structured `MaintenanceModel` objects and adds computed severity levels. + * If the current time is outside the declared maintenance window, the service returns `null`. + */ +@Injectable({ providedIn: 'root' }) +export class MaintenanceService { + /** Injected Angular `HttpClient` for making API requests. */ + private readonly http = inject(HttpClient); + private readonly environment = inject(ENVIRONMENT); + + get apiUrl() { + return `${this.environment.apiDomainUrl}/v2`; + } + + /** + * Fetches the maintenance status from the API and transforms the response. + * + * If a maintenance window is active and properly defined, the method adds a `severity` key to the response. + * Otherwise, it returns `null`. In case of an error (e.g., network failure), it gracefully returns `null`. + * + * @returns An observable emitting the active `MaintenanceModel` or `null` if none or on error. + */ + fetchMaintenanceStatus(): Observable { + return this.http.get<{ maintenance?: MaintenanceModel }>(`${this.apiUrl}/status/`).pipe( + map((data) => { + const maintenance = data.maintenance; + if (maintenance && this.isWithinMaintenanceWindow(maintenance)) { + return { ...maintenance, severity: this.getSeverity(maintenance.level) }; + } + return null; + }), + catchError(() => of(null)) + ); + } + + /** + * Converts a numeric maintenance level (1–3) to a user-friendly severity string. + * + * @param level - The raw numeric severity level from the backend (1 = info, 2 = warn, 3 = error) + * @returns A mapped string-based severity level used in the UI + */ + private getSeverity(level: number): MaintenanceSeverityType { + const map: Record = { 1: 'info', 2: 'warn', 3: 'error' }; + return map[level] ?? 'info'; + } + + /** + * Checks whether the current time falls within the declared maintenance window. + * + * @param maintenance - The maintenance object containing `start` and `end` date strings + * @returns `true` if now is between the start and end, otherwise `false` + */ + private isWithinMaintenanceWindow(maintenance: MaintenanceModel): boolean { + if (!maintenance.start || !maintenance.end) return false; + const now = new Date(); + return now >= new Date(maintenance.start) && now <= new Date(maintenance.end); + } +} diff --git a/src/app/core/components/osf-banners/tos-consent-banner/tos-consent-banner.component.html b/src/app/core/components/osf-banners/tos-consent-banner/tos-consent-banner.component.html new file mode 100644 index 000000000..a34bb0daa --- /dev/null +++ b/src/app/core/components/osf-banners/tos-consent-banner/tos-consent-banner.component.html @@ -0,0 +1,48 @@ +@if (!acceptedTermsOfServiceChange()) { +
+ + +
+
+ + + + {{ 'toast.tos-consent.message' | translate }} + + {{ 'toast.tos-consent.termsOfUse' | translate }} + + {{ 'toast.tos-consent.and' | translate }} + + {{ 'toast.tos-consent.privacyPolicy' | translate }} + + +
+ +
+
+ + + + +
+ + + +
+
+ + +
+} diff --git a/src/app/core/components/osf-banners/tos-consent-banner/tos-consent-banner.component.spec.ts b/src/app/core/components/osf-banners/tos-consent-banner/tos-consent-banner.component.spec.ts new file mode 100644 index 000000000..83e2ef0a0 --- /dev/null +++ b/src/app/core/components/osf-banners/tos-consent-banner/tos-consent-banner.component.spec.ts @@ -0,0 +1,86 @@ +import { Store } from '@ngxs/store'; + +import { MockComponent } from 'ng-mocks'; + +import { of } from 'rxjs'; + +import { ComponentFixture, TestBed } from '@angular/core/testing'; +import { By } from '@angular/platform-browser'; + +import { AcceptTermsOfServiceByUser } from '@core/store/user'; +import { UserSelectors } from '@osf/core/store/user'; +import { IconComponent } from '@shared/components'; + +import { TosConsentBannerComponent } from './tos-consent-banner.component'; + +import { MOCK_USER } from '@testing/mocks'; +import { TranslationServiceMock } from '@testing/mocks/translation.service.mock'; +import { OSFTestingStoreModule } from '@testing/osf.testing.module'; +import { provideMockStore } from '@testing/providers/store-provider.mock'; + +describe('TosConsentBannerComponent', () => { + let fixture: ComponentFixture; + let store: jest.Mocked; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + imports: [TosConsentBannerComponent, OSFTestingStoreModule, MockComponent(IconComponent)], + providers: [ + provideMockStore({ + signals: [{ selector: UserSelectors.getCurrentUser, value: MOCK_USER }], + }), + TranslationServiceMock, + ], + }).compileComponents(); + + fixture = TestBed.createComponent(TosConsentBannerComponent); + store = TestBed.inject(Store) as jest.Mocked; + store.dispatch = jest.fn().mockReturnValue(of(undefined)); + fixture.detectChanges(); + }); + + it('should have the "Continue" button disabled by default', () => { + const continueButton = fixture.debugElement.query(By.css('p-button button')).nativeElement; + expect(continueButton.disabled).toBe(true); + }); + + it('should enable the "Continue" button when the checkbox is checked', () => { + const checkboxInput = fixture.debugElement.query(By.css('p-checkbox input')).nativeElement; + checkboxInput.click(); + fixture.detectChanges(); + const continueButton = fixture.debugElement.query(By.css('p-button button')).nativeElement; + expect(continueButton.disabled).toBe(false); + }); + + it('should dispatch AcceptTermsOfServiceByUser action when "Continue" is clicked', () => { + const checkboxInput = fixture.debugElement.query(By.css('p-checkbox input')).nativeElement; + checkboxInput.click(); + fixture.detectChanges(); + + const continueButton = fixture.debugElement.query(By.css('p-button button')).nativeElement; + continueButton.click(); + fixture.detectChanges(); + + expect(store.dispatch).toHaveBeenCalledWith(new AcceptTermsOfServiceByUser()); + }); + + it('should return true for "acceptedTermsOfServiceChange" when user is null to not show banner', async () => { + await TestBed.resetTestingModule() + .configureTestingModule({ + imports: [TosConsentBannerComponent, OSFTestingStoreModule, MockComponent(IconComponent)], + providers: [ + provideMockStore({ + signals: [{ selector: UserSelectors.getCurrentUser, value: null }], + }), + TranslationServiceMock, + ], + }) + .compileComponents(); + + const fixture = TestBed.createComponent(TosConsentBannerComponent); + const component = fixture.componentInstance; + + fixture.detectChanges(); + expect(component.acceptedTermsOfServiceChange()).toBe(true); + }); +}); diff --git a/src/app/core/components/osf-banners/tos-consent-banner/tos-consent-banner.component.ts b/src/app/core/components/osf-banners/tos-consent-banner/tos-consent-banner.component.ts new file mode 100644 index 000000000..8ccebf39b --- /dev/null +++ b/src/app/core/components/osf-banners/tos-consent-banner/tos-consent-banner.component.ts @@ -0,0 +1,72 @@ +import { createDispatchMap, select } from '@ngxs/store'; + +import { TranslatePipe } from '@ngx-translate/core'; + +import { Button } from 'primeng/button'; +import { Checkbox } from 'primeng/checkbox'; +import { Message } from 'primeng/message'; + +import { Component, computed, signal } from '@angular/core'; +import { FormsModule } from '@angular/forms'; +import { RouterLink } from '@angular/router'; + +import { AcceptTermsOfServiceByUser, UserSelectors } from '@core/store/user'; +import { IconComponent } from '@osf/shared/components'; + +/** + * TosConsentBannerComponent displays a Terms of Service (ToS) consent banner for users who haven't accepted yet. + * It includes a checkbox, error handling, and dispatches an action to accept the ToS upon confirmation. + * + * This component integrates: + * - PrimeNG UI elements (`Checkbox`, `Button`, `Message`) + * - i18n translation support + * - NGXS store selectors and actions + * - Signal-based reactivity and computed values + * - Toast notifications for user feedback + * + * @component + * @example + * + */ +@Component({ + selector: 'osf-tos-consent-banner', + imports: [FormsModule, Checkbox, Button, Message, TranslatePipe, IconComponent, RouterLink], + templateUrl: './tos-consent-banner.component.html', +}) +export class TosConsentBannerComponent { + /** + * NGXS dispatch map for the AcceptTermsOfServiceByUser action. + */ + readonly actions = createDispatchMap({ acceptTermsOfServiceByUser: AcceptTermsOfServiceByUser }); + + /** + * Signal of the current user from NGXS UserSelectors. + */ + readonly currentUser = select(UserSelectors.getCurrentUser); + + /** + * Local signal tracking whether the user has accepted the Terms of Service via checkbox. + */ + acceptedTermsOfService = signal(false); + + /** + * Computed signal indicating whether the user has already accepted the Terms of Service. + */ + acceptedTermsOfServiceChange = computed(() => { + const user = this.currentUser(); + /** + * if user is authenticated we check whether is accepted terms of service to hide banner or show if not + * otherwise user is not authenticated we hide banner always + */ + return user ? user.acceptedTermsOfService : true; + }); + + /** + * Triggered when the user clicks the Continue button. + * - Shows an error toast if checkbox is not checked. + * - Dispatches `AcceptTermsOfServiceByUser` action otherwise. + */ + onContinue() { + this.actions.acceptTermsOfServiceByUser(); + } +} diff --git a/src/app/core/components/page-not-found/page-not-found.component.ts b/src/app/core/components/page-not-found/page-not-found.component.ts index dae4c41cf..b8e4aadf5 100644 --- a/src/app/core/components/page-not-found/page-not-found.component.ts +++ b/src/app/core/components/page-not-found/page-not-found.component.ts @@ -1,8 +1,8 @@ import { TranslatePipe } from '@ngx-translate/core'; -import { ChangeDetectionStrategy, Component } from '@angular/core'; +import { ChangeDetectionStrategy, Component, inject } from '@angular/core'; -import { environment } from 'src/environments/environment'; +import { ENVIRONMENT } from '@core/provider/environment.provider'; @Component({ selector: 'osf-page-not-found', @@ -12,5 +12,6 @@ import { environment } from 'src/environments/environment'; changeDetection: ChangeDetectionStrategy.OnPush, }) export class PageNotFoundComponent { - readonly supportEmail = environment.supportEmail; + private readonly environment = inject(ENVIRONMENT); + readonly supportEmail = this.environment.supportEmail; } diff --git a/src/app/core/components/request-access/request-access.component.ts b/src/app/core/components/request-access/request-access.component.ts index 784e7e6a3..a6b10d493 100644 --- a/src/app/core/components/request-access/request-access.component.ts +++ b/src/app/core/components/request-access/request-access.component.ts @@ -11,11 +11,10 @@ import { toSignal } from '@angular/core/rxjs-interop'; import { FormsModule } from '@angular/forms'; import { ActivatedRoute, Router } from '@angular/router'; -import { AuthService, RequestAccessService } from '@osf/core/services'; +import { ENVIRONMENT } from '@core/provider/environment.provider'; +import { AuthService } from '@core/services'; import { InputLimits } from '@osf/shared/constants'; -import { LoaderService, ToastService } from '@osf/shared/services'; - -import { environment } from 'src/environments/environment'; +import { LoaderService, RequestAccessService, ToastService } from '@osf/shared/services'; @Component({ selector: 'osf-request-access', @@ -27,7 +26,8 @@ import { environment } from 'src/environments/environment'; export class RequestAccessComponent { comment = model(''); - readonly supportEmail = environment.supportEmail; + private readonly environment = inject(ENVIRONMENT); + readonly supportEmail = this.environment.supportEmail; readonly commentLimit = InputLimits.requestAccessComment.maxLength; private readonly route = inject(ActivatedRoute); diff --git a/src/app/core/components/root/root.component.html b/src/app/core/components/root/root.component.html deleted file mode 100644 index 735043347..000000000 --- a/src/app/core/components/root/root.component.html +++ /dev/null @@ -1,29 +0,0 @@ -@if (isWeb()) { -
- - -
- - - - - -
-
-} @else { -
-
- - - @if (isMedium()) { - - } - - - - -
-
-} - - diff --git a/src/app/core/components/root/root.component.scss b/src/app/core/components/root/root.component.scss deleted file mode 100644 index 7d6df6575..000000000 --- a/src/app/core/components/root/root.component.scss +++ /dev/null @@ -1,47 +0,0 @@ -@use "styles/mixins" as mix; -@use "styles/variables" as var; - -:host { - display: flex; - height: 100vh; - max-width: 100vw; -} - -.layout-desktop { - display: flex; - flex: 1; - background-color: var.$dark-blue-1; - max-width: 100vw; - - .content-wrapper { - position: relative; - background-color: var.$bg-blue-3; - border-radius: mix.rem(12px); - margin: mix.rem(6px); - display: flex; - flex-direction: column; - flex: 1; - overflow-y: auto; - } -} - -.layout-tablet { - @include mix.flex-center; - flex: 1; - max-width: 100vw; - - .content-wrapper { - @include mix.flex-column; - width: 100%; - height: 100%; - flex: 1; - overflow-y: auto; - background-color: var.$bg-blue-3; - - .content { - position: relative; - @include mix.flex-column; - flex: 1; - } - } -} diff --git a/src/app/core/components/root/root.component.spec.ts b/src/app/core/components/root/root.component.spec.ts deleted file mode 100644 index 4a4ddf252..000000000 --- a/src/app/core/components/root/root.component.spec.ts +++ /dev/null @@ -1,93 +0,0 @@ -import { MockComponents, MockProvider } from 'ng-mocks'; - -import { ConfirmationService } from 'primeng/api'; -import { ConfirmDialog } from 'primeng/confirmdialog'; - -import { BehaviorSubject } from 'rxjs'; - -import { ComponentFixture, TestBed } from '@angular/core/testing'; - -import { BreadcrumbComponent } from '@core/components/breadcrumb/breadcrumb.component'; -import { FooterComponent } from '@core/components/footer/footer.component'; -import { HeaderComponent } from '@core/components/header/header.component'; -import { TopnavComponent } from '@core/components/topnav/topnav.component'; -import { IS_WEB, IS_XSMALL } from '@osf/shared/helpers'; - -import { SidenavComponent } from '../sidenav/sidenav.component'; - -import { RootComponent } from './root.component'; - -describe('RootComponent', () => { - let component: RootComponent; - let fixture: ComponentFixture; - let isWebSubject: BehaviorSubject; - let isMobileSubject: BehaviorSubject; - - beforeEach(async () => { - isWebSubject = new BehaviorSubject(true); - isMobileSubject = new BehaviorSubject(false); - - await TestBed.configureTestingModule({ - imports: [ - RootComponent, - ...MockComponents( - HeaderComponent, - FooterComponent, - TopnavComponent, - ConfirmDialog, - BreadcrumbComponent, - SidenavComponent - ), - ], - providers: [ - MockProvider(IS_WEB, isWebSubject), - MockProvider(IS_XSMALL, isMobileSubject), - MockProvider(ConfirmationService), - ], - }).compileComponents(); - - fixture = TestBed.createComponent(RootComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); - - it('should show desktop layout when isWeb is true', () => { - isWebSubject.next(true); - fixture.detectChanges(); - - const desktopLayout = fixture.nativeElement.querySelector('.layout-desktop'); - const tabletLayout = fixture.nativeElement.querySelector('.layout-tablet'); - - expect(desktopLayout).toBeTruthy(); - expect(tabletLayout).toBeFalsy(); - }); - - it('should show tablet layout when isWeb is false', () => { - isWebSubject.next(false); - fixture.detectChanges(); - - const desktopLayout = fixture.nativeElement.querySelector('.layout-desktop'); - const tabletLayout = fixture.nativeElement.querySelector('.layout-tablet'); - - expect(desktopLayout).toBeFalsy(); - expect(tabletLayout).toBeTruthy(); - }); - - it('should hide breadcrumb in tablet layout when mobile', () => { - isWebSubject.next(false); - isMobileSubject.next(true); - fixture.detectChanges(); - - const breadcrumb = fixture.nativeElement.querySelector('osf-breadcrumb'); - expect(breadcrumb).toBeFalsy(); - }); - - it('should contain confirm dialog component', () => { - const confirmDialog = fixture.nativeElement.querySelector('p-confirm-dialog'); - expect(confirmDialog).toBeTruthy(); - }); -}); diff --git a/src/app/core/components/root/root.component.ts b/src/app/core/components/root/root.component.ts deleted file mode 100644 index 12083b732..000000000 --- a/src/app/core/components/root/root.component.ts +++ /dev/null @@ -1,34 +0,0 @@ -import { ConfirmDialog } from 'primeng/confirmdialog'; - -import { CommonModule } from '@angular/common'; -import { ChangeDetectionStrategy, Component, inject } from '@angular/core'; -import { toSignal } from '@angular/core/rxjs-interop'; -import { RouterOutlet } from '@angular/router'; - -import { SidenavComponent } from '@core/components'; -import { BreadcrumbComponent } from '@core/components/breadcrumb/breadcrumb.component'; -import { FooterComponent } from '@core/components/footer/footer.component'; -import { HeaderComponent } from '@core/components/header/header.component'; -import { TopnavComponent } from '@core/components/topnav/topnav.component'; -import { IS_MEDIUM, IS_WEB } from '@osf/shared/helpers'; - -@Component({ - selector: 'osf-root', - imports: [ - CommonModule, - HeaderComponent, - FooterComponent, - TopnavComponent, - ConfirmDialog, - BreadcrumbComponent, - RouterOutlet, - SidenavComponent, - ], - templateUrl: './root.component.html', - styleUrls: ['./root.component.scss'], - changeDetection: ChangeDetectionStrategy.OnPush, -}) -export class RootComponent { - isWeb = toSignal(inject(IS_WEB)); - isMedium = toSignal(inject(IS_MEDIUM)); -} diff --git a/src/app/core/components/sidenav/sidenav.component.html b/src/app/core/components/sidenav/sidenav.component.html index dc22dbcb6..bbf9db82e 100644 --- a/src/app/core/components/sidenav/sidenav.component.html +++ b/src/app/core/components/sidenav/sidenav.component.html @@ -1,4 +1,4 @@ diff --git a/src/app/core/components/topnav/topnav.component.html b/src/app/core/components/topnav/topnav.component.html index 96662a3a0..e1e0892ec 100644 --- a/src/app/core/components/topnav/topnav.component.html +++ b/src/app/core/components/topnav/topnav.component.html @@ -1,5 +1,5 @@
- OSF Logo + OSF Logo ('App Environment', { +/** + * Injection token representing the app's static environment configuration. + * + * Do not use this directly unless necessary. Prefer the proxy-based `ENVIRONMENT` token for safer access. + */ +export const ENVIRONMENT_DO_NO_USE = new InjectionToken('App Environment', { providedIn: 'root', - factory: () => environment, + + /** + * Factory function that returns the raw environment object cast to `EnvironmentModel`. + * This is a one-time snapshot of the environment loaded at build time. + */ + factory: () => environment as EnvironmentModel, }); diff --git a/src/app/core/constants/error-messages.ts b/src/app/core/constants/error-messages.ts index 747b0e921..c3284b020 100644 --- a/src/app/core/constants/error-messages.ts +++ b/src/app/core/constants/error-messages.ts @@ -4,5 +4,6 @@ export const ERROR_MESSAGES = { 403: `You don't have permission to access this resource.`, 404: 'The requested resource was not found.', 500: 'An unexpected error occurred. Please try again later.', + 0: 'An unexpected error occurred. Please try again later.', default: 'An unknown error occurred. Please try again.', }; diff --git a/src/app/core/constants/index.ts b/src/app/core/constants/index.ts index b97b14391..54e8fcb58 100644 --- a/src/app/core/constants/index.ts +++ b/src/app/core/constants/index.ts @@ -2,4 +2,3 @@ export * from './error-messages'; export * from './nav-items.constant'; export * from './ngxs-states.constant'; export * from './social-icons.constant'; -export * from './storage-locations.constant'; diff --git a/src/app/core/constants/nav-items.constant.ts b/src/app/core/constants/nav-items.constant.ts index 314cd1b31..781031d38 100644 --- a/src/app/core/constants/nav-items.constant.ts +++ b/src/app/core/constants/nav-items.constant.ts @@ -1,12 +1,15 @@ import { MenuItem } from 'primeng/api'; +import { UserPermissions } from '@osf/shared/enums'; + +import { CustomMenuItem } from '../models/custom-menu-item.model'; + export const AUTHENTICATED_MENU_ITEMS: string[] = [ 'my-profile', 'my-resources', 'my-registrations', 'my-projects', 'my-preprints', - 'registries-overview', 'settings', ]; @@ -15,6 +18,7 @@ export const VIEW_ONLY_PROJECT_MENU_ITEMS: string[] = [ 'project-files', 'project-wiki', 'project-analytics', + 'project-links', ]; export const VIEW_ONLY_REGISTRY_MENU_ITEMS: string[] = [ @@ -23,22 +27,23 @@ export const VIEW_ONLY_REGISTRY_MENU_ITEMS: string[] = [ 'registration-wiki', 'registration-analytics', 'registration-components', + 'registration-recent-activity', ]; -export const PROJECT_MENU_ITEMS: MenuItem[] = [ +export const PROJECT_MENU_ITEMS: CustomMenuItem[] = [ { id: 'project-overview', label: 'navigation.overview', routerLink: 'overview', visible: true, - routerLinkActiveOptions: { exact: true }, + routerLinkActiveOptions: { exact: false }, }, { id: 'project-metadata', label: 'navigation.metadata', routerLink: 'metadata', visible: true, - routerLinkActiveOptions: { exact: true }, + routerLinkActiveOptions: { exact: false }, }, { id: 'project-files', @@ -59,14 +64,15 @@ export const PROJECT_MENU_ITEMS: MenuItem[] = [ label: 'navigation.registrations', routerLink: 'registrations', visible: true, - routerLinkActiveOptions: { exact: true }, + routerLinkActiveOptions: { exact: false }, }, { id: 'project-contributors', label: 'navigation.contributors', routerLink: 'contributors', visible: true, - routerLinkActiveOptions: { exact: true }, + requiredPermission: UserPermissions.Read, + routerLinkActiveOptions: { exact: false }, }, { id: 'project-analytics', @@ -80,14 +86,23 @@ export const PROJECT_MENU_ITEMS: MenuItem[] = [ label: 'navigation.addons', routerLink: 'addons', visible: true, - routerLinkActiveOptions: { exact: true }, + requiredPermission: UserPermissions.Write, + routerLinkActiveOptions: { exact: false }, + }, + { + id: 'project-linked-services', + label: 'navigation.linkedServices', + routerLink: 'links', + visible: true, + routerLinkActiveOptions: { exact: false }, }, { id: 'project-settings', label: 'navigation.settings', routerLink: 'settings', visible: true, - routerLinkActiveOptions: { exact: true }, + requiredPermission: UserPermissions.Read, + routerLinkActiveOptions: { exact: false }, }, ]; @@ -101,20 +116,20 @@ export const PREPRINT_MENU_ITEMS: MenuItem[] = [ }, ]; -export const REGISTRATION_MENU_ITEMS: MenuItem[] = [ +export const REGISTRATION_MENU_ITEMS: CustomMenuItem[] = [ { id: 'registration-overview', label: 'navigation.overview', routerLink: 'overview', visible: true, - routerLinkActiveOptions: { exact: true }, + routerLinkActiveOptions: { exact: false }, }, { id: 'registration-metadata', label: 'navigation.metadata', routerLink: 'metadata', visible: true, - routerLinkActiveOptions: { exact: true }, + routerLinkActiveOptions: { exact: false }, }, { id: 'registration-files', @@ -149,6 +164,7 @@ export const REGISTRATION_MENU_ITEMS: MenuItem[] = [ label: 'navigation.contributors', routerLink: 'contributors', visible: true, + requiredPermission: UserPermissions.Read, routerLinkActiveOptions: { exact: true }, }, { @@ -165,9 +181,16 @@ export const REGISTRATION_MENU_ITEMS: MenuItem[] = [ visible: true, routerLinkActiveOptions: { exact: false }, }, + { + id: 'registration-recent-activity', + label: 'navigation.recentActivity', + routerLink: 'recent-activity', + visible: true, + routerLinkActiveOptions: { exact: true }, + }, ]; -export const MENU_ITEMS: MenuItem[] = [ +export const MENU_ITEMS: CustomMenuItem[] = [ { id: 'home', routerLink: '/', @@ -254,14 +277,14 @@ export const MENU_ITEMS: MenuItem[] = [ routerLink: '/registries/discover', label: 'navigation.discover', visible: true, - routerLinkActiveOptions: { exact: true }, + routerLinkActiveOptions: { exact: false }, }, { id: 'registries-moderation', - routerLink: '/registries/osf/moderation', + routerLink: '/registries', label: 'navigation.moderation', visible: false, - routerLinkActiveOptions: { exact: true }, + routerLinkActiveOptions: { exact: false }, }, { id: 'registry-details', @@ -316,7 +339,7 @@ export const MENU_ITEMS: MenuItem[] = [ routerLink: 'moderation', label: 'navigation.moderation', visible: false, - routerLinkActiveOptions: { exact: true }, + routerLinkActiveOptions: { exact: false }, }, ], }, @@ -339,7 +362,7 @@ export const MENU_ITEMS: MenuItem[] = [ }, { id: 'my-profile', - routerLink: '/my-profile', + routerLink: '/profile', label: 'navigation.profile', icon: 'fas fa-user', visible: false, @@ -353,15 +376,15 @@ export const MENU_ITEMS: MenuItem[] = [ visible: false, items: [ { - id: 'settings-profile-settings', - routerLink: '/settings/profile-settings', + id: 'settings-profile', + routerLink: '/settings/profile', label: 'navigation.profileSettings', visible: true, routerLinkActiveOptions: { exact: true }, }, { - id: 'settings-account-settings', - routerLink: '/settings/account-settings', + id: 'settings-account', + routerLink: '/settings/account', label: 'navigation.accountSettings', visible: true, routerLinkActiveOptions: { exact: true }, diff --git a/src/app/core/constants/ngxs-states.constant.ts b/src/app/core/constants/ngxs-states.constant.ts index f1e1db0eb..409a3d258 100644 --- a/src/app/core/constants/ngxs-states.constant.ts +++ b/src/app/core/constants/ngxs-states.constant.ts @@ -1,13 +1,18 @@ import { ProviderState } from '@core/store/provider'; import { UserState } from '@core/store/user'; import { UserEmailsState } from '@core/store/user-emails'; +import { InstitutionsAdminState } from '@osf/features/admin-institutions/store'; import { FilesState } from '@osf/features/files/store'; import { MetadataState } from '@osf/features/metadata/store'; import { ProjectOverviewState } from '@osf/features/project/overview/store'; import { RegistrationsState } from '@osf/features/project/registrations/store'; import { AddonsState, CurrentResourceState, WikiState } from '@osf/shared/stores'; +import { BannersState } from '@osf/shared/stores/banners'; +import { GlobalSearchState } from '@shared/stores/global-search'; import { InstitutionsState } from '@shared/stores/institutions'; +import { InstitutionsSearchState } from '@shared/stores/institutions-search'; import { LicensesState } from '@shared/stores/licenses'; +import { LinkedProjectsState } from '@shared/stores/linked-projects'; import { MyResourcesState } from '@shared/stores/my-resources'; import { RegionsState } from '@shared/stores/regions'; @@ -18,6 +23,8 @@ export const STATES = [ ProviderState, MyResourcesState, InstitutionsState, + InstitutionsAdminState, + InstitutionsSearchState, ProjectOverviewState, WikiState, RegistrationsState, @@ -26,4 +33,7 @@ export const STATES = [ FilesState, MetadataState, CurrentResourceState, + GlobalSearchState, + BannersState, + LinkedProjectsState, ]; diff --git a/src/app/core/constants/storage-locations.constant.ts b/src/app/core/constants/storage-locations.constant.ts deleted file mode 100644 index 0a38c5df1..000000000 --- a/src/app/core/constants/storage-locations.constant.ts +++ /dev/null @@ -1,8 +0,0 @@ -import { CustomOption } from '@osf/shared/models'; - -export const STORAGE_LOCATIONS: CustomOption[] = [ - { label: 'United States', value: 'us' }, - { label: 'Canada - Montréal', value: 'ca-1' }, - { label: 'Germany - Frankfurt', value: 'de-1' }, - { label: 'Australia - Sydney', value: 'de-1' }, -]; diff --git a/src/app/core/guards/auth.guard.ts b/src/app/core/guards/auth.guard.ts index 91962328e..9e233a5d6 100644 --- a/src/app/core/guards/auth.guard.ts +++ b/src/app/core/guards/auth.guard.ts @@ -5,12 +5,14 @@ import { map, switchMap, take } from 'rxjs'; import { inject } from '@angular/core'; import { CanActivateFn, Router } from '@angular/router'; +import { AuthService } from '@core/services'; import { GetCurrentUser, UserSelectors } from '@osf/core/store/user'; import { hasViewOnlyParam } from '@osf/shared/helpers'; export const authGuard: CanActivateFn = () => { const store = inject(Store); const router = inject(Router); + const authService = inject(AuthService); const isAuthenticated = store.selectSnapshot(UserSelectors.isAuthenticated); @@ -28,7 +30,7 @@ export const authGuard: CanActivateFn = () => { take(1), map((isAuthenticated) => { if (!isAuthenticated) { - router.navigate(['/']); + authService.navigateToSignIn(); return false; } diff --git a/src/app/core/guards/is-file.guard.ts b/src/app/core/guards/is-file.guard.ts index f05adf254..d94cfbdc3 100644 --- a/src/app/core/guards/is-file.guard.ts +++ b/src/app/core/guards/is-file.guard.ts @@ -14,19 +14,23 @@ export const isFileGuard: CanMatchFn = (route: Route, segments: UrlSegment[]) => const id = segments[0]?.path; const isMetadataPath = segments[1]?.path === 'metadata'; + + const urlObj = new URL(window.location.href); + const viewOnly = urlObj.searchParams.get('view_only'); + const extras = viewOnly ? { queryParams: { view_only: viewOnly } } : {}; + if (!id) { return false; } const currentResource = store.selectSnapshot(CurrentResourceSelectors.getCurrentResource); - if (currentResource && currentResource.id === id) { if (currentResource.type === CurrentResourceType.Files) { if (isMetadataPath) { return true; } if (currentResource.parentId) { - router.navigate(['/', currentResource.parentId, 'files', id]); + router.navigate(['/', currentResource.parentId, 'files', id], extras); return false; } } @@ -46,7 +50,7 @@ export const isFileGuard: CanMatchFn = (route: Route, segments: UrlSegment[]) => return true; } if (resource.parentId) { - router.navigate(['/', resource.parentId, 'files', id]); + router.navigate(['/', resource.parentId, 'files', id], extras); return false; } } diff --git a/src/app/core/guards/is-project.guard.ts b/src/app/core/guards/is-project.guard.ts index 0f78310ef..d1eb1d6fb 100644 --- a/src/app/core/guards/is-project.guard.ts +++ b/src/app/core/guards/is-project.guard.ts @@ -5,8 +5,9 @@ import { map, switchMap } from 'rxjs/operators'; import { inject } from '@angular/core'; import { CanMatchFn, Route, Router, UrlSegment } from '@angular/router'; -import { CurrentResourceType } from '../../shared/enums'; -import { CurrentResourceSelectors, GetResource } from '../../shared/stores'; +import { UserSelectors } from '@core/store/user'; +import { CurrentResourceType } from '@shared/enums'; +import { CurrentResourceSelectors, GetResource } from '@shared/stores'; export const isProjectGuard: CanMatchFn = (route: Route, segments: UrlSegment[]) => { const store = inject(Store); @@ -19,10 +20,11 @@ export const isProjectGuard: CanMatchFn = (route: Route, segments: UrlSegment[]) } const currentResource = store.selectSnapshot(CurrentResourceSelectors.getCurrentResource); + const currentUser = store.selectSnapshot(UserSelectors.getCurrentUser); - if (currentResource && currentResource.id === id) { + if (currentResource && !id.startsWith(currentResource.id)) { if (currentResource.type === CurrentResourceType.Projects && currentResource.parentId) { - router.navigate(['/', currentResource.parentId, 'files', id]); + router.navigate(['/', currentResource.parentId, 'files', id], { queryParamsHandling: 'preserve' }); return true; } @@ -32,7 +34,11 @@ export const isProjectGuard: CanMatchFn = (route: Route, segments: UrlSegment[]) } if (currentResource.type === CurrentResourceType.Users) { - router.navigate(['/profile', id]); + if (currentUser && currentUser.id === currentResource.id) { + router.navigate(['/profile']); + } else { + router.navigate(['/user', id]); + } return false; } @@ -42,12 +48,12 @@ export const isProjectGuard: CanMatchFn = (route: Route, segments: UrlSegment[]) return store.dispatch(new GetResource(id)).pipe( switchMap(() => store.select(CurrentResourceSelectors.getCurrentResource)), map((resource) => { - if (!resource || resource.id !== id) { + if (!resource || !id.startsWith(resource.id)) { return false; } if (resource.type === CurrentResourceType.Projects && resource.parentId) { - router.navigate(['/', resource.parentId, 'files', id]); + router.navigate(['/', resource.parentId, 'files', id], { queryParamsHandling: 'preserve' }); return true; } @@ -57,7 +63,11 @@ export const isProjectGuard: CanMatchFn = (route: Route, segments: UrlSegment[]) } if (resource.type === CurrentResourceType.Users) { - router.navigate(['/user', id]); + if (currentUser && currentUser.id === resource.id) { + router.navigate(['/profile']); + } else { + router.navigate(['/user', id]); + } return false; } diff --git a/src/app/core/guards/is-registry.guard.ts b/src/app/core/guards/is-registry.guard.ts index 0f592b553..63dfe4a28 100644 --- a/src/app/core/guards/is-registry.guard.ts +++ b/src/app/core/guards/is-registry.guard.ts @@ -5,8 +5,9 @@ import { map, switchMap } from 'rxjs/operators'; import { inject } from '@angular/core'; import { CanMatchFn, Route, Router, UrlSegment } from '@angular/router'; -import { CurrentResourceType } from '../../shared/enums'; -import { CurrentResourceSelectors, GetResource } from '../../shared/stores'; +import { UserSelectors } from '@core/store/user'; +import { CurrentResourceType } from '@shared/enums'; +import { CurrentResourceSelectors, GetResource } from '@shared/stores'; export const isRegistryGuard: CanMatchFn = (route: Route, segments: UrlSegment[]) => { const store = inject(Store); @@ -19,10 +20,11 @@ export const isRegistryGuard: CanMatchFn = (route: Route, segments: UrlSegment[] } const currentResource = store.selectSnapshot(CurrentResourceSelectors.getCurrentResource); + const currentUser = store.selectSnapshot(UserSelectors.getCurrentUser); - if (currentResource && currentResource.id === id) { + if (currentResource && !id.startsWith(currentResource.id)) { if (currentResource.type === CurrentResourceType.Registrations && currentResource.parentId) { - router.navigate(['/', currentResource.parentId, 'files', id]); + router.navigate(['/', currentResource.parentId, 'files', id], { queryParamsHandling: 'preserve' }); return true; } @@ -32,7 +34,11 @@ export const isRegistryGuard: CanMatchFn = (route: Route, segments: UrlSegment[] } if (currentResource.type === CurrentResourceType.Users) { - router.navigate(['/user', id]); + if (currentUser && currentUser.id === currentResource.id) { + router.navigate(['/profile']); + } else { + router.navigate(['/user', id]); + } return false; } @@ -42,12 +48,12 @@ export const isRegistryGuard: CanMatchFn = (route: Route, segments: UrlSegment[] return store.dispatch(new GetResource(id)).pipe( switchMap(() => store.select(CurrentResourceSelectors.getCurrentResource)), map((resource) => { - if (!resource || resource.id !== id) { + if (!resource || !id.startsWith(resource.id)) { return false; } if (resource.type === CurrentResourceType.Registrations && resource.parentId) { - router.navigate(['/', resource.parentId, 'files', id]); + router.navigate(['/', resource.parentId, 'files', id], { queryParamsHandling: 'preserve' }); return true; } @@ -57,7 +63,11 @@ export const isRegistryGuard: CanMatchFn = (route: Route, segments: UrlSegment[] } if (resource.type === CurrentResourceType.Users) { - router.navigate(['/profile', id]); + if (currentUser && currentUser.id === resource.id) { + router.navigate(['/profile']); + } else { + router.navigate(['/user', id]); + } return false; } diff --git a/src/app/core/guards/registration-moderation.guard.ts b/src/app/core/guards/registration-moderation.guard.ts new file mode 100644 index 000000000..b9286fa5b --- /dev/null +++ b/src/app/core/guards/registration-moderation.guard.ts @@ -0,0 +1,35 @@ +import { Store } from '@ngxs/store'; + +import { map, switchMap, take } from 'rxjs'; + +import { inject } from '@angular/core'; +import { CanActivateFn, Router } from '@angular/router'; + +import { GetRegistryProvider, RegistrationProviderSelectors } from '@osf/shared/stores/registration-provider'; + +export const registrationModerationGuard: CanActivateFn = (route) => { + const store = inject(Store); + const router = inject(Router); + + const provider = store.selectSnapshot(RegistrationProviderSelectors.getBrandedProvider); + + if (provider?.reviewsWorkflow) { + return true; + } + const id = route.params['providerId']; + return store.dispatch(new GetRegistryProvider(id)).pipe( + switchMap(() => { + return store.select(RegistrationProviderSelectors.getBrandedProvider).pipe( + take(1), + map((provider) => { + if (!provider?.reviewsWorkflow) { + router.navigate(['/not-found']); + return false; + } + + return true; + }) + ); + }) + ); +}; diff --git a/src/app/core/handlers/global-error.handler.ts b/src/app/core/handlers/global-error.handler.ts deleted file mode 100644 index 6d6bcc907..000000000 --- a/src/app/core/handlers/global-error.handler.ts +++ /dev/null @@ -1,8 +0,0 @@ -import { ErrorHandler, Injectable } from '@angular/core'; - -@Injectable() -export class GlobalErrorHandler implements ErrorHandler { - handleError(error: unknown): void { - console.error('Error:', error); - } -} diff --git a/src/app/core/handlers/index.ts b/src/app/core/handlers/index.ts deleted file mode 100644 index 400695f14..000000000 --- a/src/app/core/handlers/index.ts +++ /dev/null @@ -1 +0,0 @@ -export { GlobalErrorHandler } from './global-error.handler'; diff --git a/src/app/core/helpers/nav-menu.helper.ts b/src/app/core/helpers/nav-menu.helper.ts index 306801165..279c15c42 100644 --- a/src/app/core/helpers/nav-menu.helper.ts +++ b/src/app/core/helpers/nav-menu.helper.ts @@ -1,5 +1,4 @@ -import { MenuItem } from 'primeng/api'; - +import { UserPermissions } from '@osf/shared/enums'; import { getViewOnlyParamFromUrl } from '@osf/shared/helpers'; import { @@ -11,12 +10,21 @@ import { VIEW_ONLY_REGISTRY_MENU_ITEMS, } from '../constants'; import { RouteContext } from '../models'; +import { CustomMenuItem } from '../models/custom-menu-item.model'; + +function shouldShowMenuItem(menuItem: CustomMenuItem, permissions: UserPermissions[] | undefined): boolean { + if (!menuItem.requiredPermission) { + return true; + } + + return permissions?.length ? permissions.includes(menuItem.requiredPermission) : false; +} -export function filterMenuItems(items: MenuItem[], isAuthenticated: boolean): MenuItem[] { +export function filterMenuItems(items: CustomMenuItem[], isAuthenticated: boolean): CustomMenuItem[] { return items.map((item) => { const isAuthenticatedItem = AUTHENTICATED_MENU_ITEMS.includes(item.id || ''); - let updatedItem: MenuItem = { ...item, visible: isAuthenticatedItem ? isAuthenticated : item.visible }; + let updatedItem: CustomMenuItem = { ...item, visible: isAuthenticatedItem ? isAuthenticated : item.visible }; if (item.id === 'home') { updatedItem = { @@ -42,7 +50,7 @@ export function filterMenuItems(items: MenuItem[], isAuthenticated: boolean): Me }); } -export function updateMenuItems(menuItems: MenuItem[], ctx: RouteContext): MenuItem[] { +export function updateMenuItems(menuItems: CustomMenuItem[], ctx: RouteContext): CustomMenuItem[] { return menuItems.map((item) => { if (item.id === 'my-resources') { return updateMyResourcesMenuItem(item, ctx); @@ -61,14 +69,14 @@ export function updateMenuItems(menuItems: MenuItem[], ctx: RouteContext): MenuI } if (item.id === 'collections') { - return { ...item, visible: ctx.isCollections }; + return updateCollectionMenuItem(item, ctx); } return item; }); } -function updateMyResourcesMenuItem(item: MenuItem, ctx: RouteContext): MenuItem { +function updateMyResourcesMenuItem(item: CustomMenuItem, ctx: RouteContext): CustomMenuItem { const currentUrl = ctx.currentUrl || ''; const isMyResourcesActive = currentUrl.startsWith('/my-projects') || @@ -81,7 +89,7 @@ function updateMyResourcesMenuItem(item: MenuItem, ctx: RouteContext): MenuItem }; } -function updateProjectMenuItem(item: MenuItem, ctx: RouteContext): MenuItem { +function updateProjectMenuItem(item: CustomMenuItem, ctx: RouteContext): CustomMenuItem { const hasProject = ctx.isProject && !!ctx.resourceId; const items = (item.items || []).map((subItem) => { if (subItem.id === 'project-details') { @@ -93,6 +101,22 @@ function updateProjectMenuItem(item: MenuItem, ctx: RouteContext): MenuItem { menuItems = PROJECT_MENU_ITEMS.filter((menuItem) => allowedViewOnlyItems.includes(menuItem.id || '')); } + menuItems = menuItems.map((menuItem) => { + const isVisible = shouldShowMenuItem(menuItem, ctx.permissions); + + if (menuItem.id === 'project-wiki') { + return { + ...menuItem, + visible: ctx.wikiPageVisible && isVisible, + }; + } + + return { + ...menuItem, + visible: isVisible, + }; + }); + return { ...subItem, visible: true, @@ -112,7 +136,7 @@ function updateProjectMenuItem(item: MenuItem, ctx: RouteContext): MenuItem { return { ...item, visible: hasProject, expanded: hasProject, items }; } -function updateRegistryMenuItem(item: MenuItem, ctx: RouteContext): MenuItem { +function updateRegistryMenuItem(item: CustomMenuItem, ctx: RouteContext): CustomMenuItem { const hasRegistry = ctx.isRegistry && !!ctx.resourceId; const items = (item.items || []).map((subItem) => { if (subItem.id === 'registry-details') { @@ -124,26 +148,46 @@ function updateRegistryMenuItem(item: MenuItem, ctx: RouteContext): MenuItem { menuItems = REGISTRATION_MENU_ITEMS.filter((menuItem) => allowedViewOnlyItems.includes(menuItem.id || '')); } + menuItems = menuItems.map((menuItem) => { + const isVisible = shouldShowMenuItem(menuItem, ctx.permissions); + + return { + ...menuItem, + visible: isVisible, + }; + }); + return { ...subItem, visible: true, expanded: true, - items: menuItems.map((menuItem) => ({ - ...menuItem, - routerLink: [ctx.resourceId as string, menuItem.routerLink], - queryParams: ctx.isViewOnly ? { view_only: getViewOnlyParamFromUrl(ctx.currentUrl) } : undefined, - })), + items: menuItems.map((menuItem) => { + return { + ...menuItem, + routerLink: [ctx.resourceId as string, menuItem.routerLink], + queryParams: ctx.isViewOnly ? { view_only: getViewOnlyParamFromUrl(ctx.currentUrl) } : undefined, + }; + }), }; } return { ...subItem, visible: false, expanded: false }; } + + if (subItem.id === 'registries-moderation') { + return { + ...subItem, + visible: ctx.registrationModerationPageVisible, + routerLink: ['/registries', ctx.providerId, 'moderation'], + }; + } + return subItem; }); return { ...item, expanded: ctx.isRegistry, items }; } -function updatePreprintMenuItem(item: MenuItem, ctx: RouteContext): MenuItem { +function updatePreprintMenuItem(item: CustomMenuItem, ctx: RouteContext): CustomMenuItem { const hasPreprint = ctx.isPreprint && !!ctx.resourceId; const items = (item.items || []).map((subItem) => { if (subItem.id === 'preprints-details') { @@ -169,3 +213,20 @@ function updatePreprintMenuItem(item: MenuItem, ctx: RouteContext): MenuItem { return { ...item, expanded: ctx.isPreprint, items }; } + +function updateCollectionMenuItem(item: CustomMenuItem, ctx: RouteContext): CustomMenuItem { + const isCollections = ctx.isCollections; + + const items = (item.items || []).map((subItem) => { + if (subItem.id === 'collections-moderation') { + return { + ...subItem, + visible: isCollections && ctx.collectionModerationPageVisible, + routerLink: ['/collections', ctx.providerId, 'moderation'], + }; + } + return subItem; + }); + + return { ...item, items, visible: ctx.isCollections }; +} diff --git a/src/app/core/interceptors/auth.interceptor.ts b/src/app/core/interceptors/auth.interceptor.ts index 108fbd579..9c73826bc 100644 --- a/src/app/core/interceptors/auth.interceptor.ts +++ b/src/app/core/interceptors/auth.interceptor.ts @@ -14,10 +14,13 @@ export const authInterceptor: HttpInterceptorFn = ( const csrfToken = cookieService.get('api-csrf'); if (!req.url.includes('/api.crossref.org/funders')) { - const headers: Record = { - Accept: req.responseType === 'text' ? '*/*' : 'application/vnd.api+json;version=2.20', - 'Content-Type': 'application/vnd.api+json', - }; + const headers: Record = {}; + + headers['Accept'] = req.responseType === 'text' ? '*/*' : 'application/vnd.api+json;version=2.20'; + + if (!req.headers.has('Content-Type')) { + headers['Content-Type'] = 'application/vnd.api+json'; + } if (csrfToken) { headers['X-CSRFToken'] = csrfToken; diff --git a/src/app/core/interceptors/error-interceptor.tokens.ts b/src/app/core/interceptors/error-interceptor.tokens.ts new file mode 100644 index 000000000..83b2c9e1b --- /dev/null +++ b/src/app/core/interceptors/error-interceptor.tokens.ts @@ -0,0 +1,3 @@ +import { HttpContextToken } from '@angular/common/http'; + +export const BYPASS_ERROR_INTERCEPTOR = new HttpContextToken(() => false); diff --git a/src/app/core/interceptors/error.interceptor.ts b/src/app/core/interceptors/error.interceptor.ts index 6019e8c7e..8c50bbc61 100644 --- a/src/app/core/interceptors/error.interceptor.ts +++ b/src/app/core/interceptors/error.interceptor.ts @@ -5,21 +5,29 @@ import { HttpErrorResponse, HttpInterceptorFn } from '@angular/common/http'; import { inject } from '@angular/core'; import { Router } from '@angular/router'; +import { SENTRY_TOKEN } from '@core/provider/sentry.provider'; import { hasViewOnlyParam } from '@osf/shared/helpers'; import { LoaderService, ToastService } from '@osf/shared/services'; import { ERROR_MESSAGES } from '../constants'; import { AuthService } from '../services'; +import { BYPASS_ERROR_INTERCEPTOR } from './error-interceptor.tokens'; + export const errorInterceptor: HttpInterceptorFn = (req, next) => { const toastService = inject(ToastService); const loaderService = inject(LoaderService); const router = inject(Router); const authService = inject(AuthService); + const sentry = inject(SENTRY_TOKEN); return next(req).pipe( catchError((error: HttpErrorResponse) => { let errorMessage: string; + if (req.context.get(BYPASS_ERROR_INTERCEPTOR)) { + sentry.captureException(error); + return throwError(() => error); + } if (error.error instanceof ErrorEvent) { errorMessage = error.error.message; @@ -31,6 +39,16 @@ export const errorInterceptor: HttpInterceptorFn = (req, next) => { } } + const serverErrorRegex = /5\d{2}/; + + if (serverErrorRegex.test(error.status.toString())) { + errorMessage = error.error.message || 'common.errorMessages.serverError'; + } + + if (error.status === 409) { + return throwError(() => error); + } + if (error.status === 401) { if (!hasViewOnlyParam(router)) { authService.logout(); @@ -39,6 +57,12 @@ export const errorInterceptor: HttpInterceptorFn = (req, next) => { } if (error.status === 403) { + const requestAccessRegex = /\/v2\/nodes\/[^/]+\/requests\/?$/i; + if (error.url && requestAccessRegex.test(error.url)) { + loaderService.hide(); + return throwError(() => error); + } + if (error.url?.includes('v2/nodes/')) { const match = error.url.match(/\/nodes\/([^/]+)/); const id = match ? match[1] : null; diff --git a/src/app/core/interceptors/index.ts b/src/app/core/interceptors/index.ts index 2f3e471eb..b3bee1a9a 100644 --- a/src/app/core/interceptors/index.ts +++ b/src/app/core/interceptors/index.ts @@ -1,3 +1,4 @@ -export * from './auth.interceptor'; -export * from './error.interceptor'; -export * from './view-only.interceptor'; +export { authInterceptor } from './auth.interceptor'; +export { errorInterceptor } from './error.interceptor'; +export { BYPASS_ERROR_INTERCEPTOR } from './error-interceptor.tokens'; +export { viewOnlyInterceptor } from './view-only.interceptor'; diff --git a/src/app/core/interceptors/view-only.interceptor.ts b/src/app/core/interceptors/view-only.interceptor.ts index 908913796..a0a4d91e1 100644 --- a/src/app/core/interceptors/view-only.interceptor.ts +++ b/src/app/core/interceptors/view-only.interceptor.ts @@ -15,6 +15,10 @@ export const viewOnlyInterceptor: HttpInterceptorFn = ( const viewOnlyParam = getViewOnlyParam(router); if (!req.url.includes('/api.crossref.org/funders') && viewOnlyParam) { + if (req.url.includes('view_only=')) { + return next(req); + } + const separator = req.url.includes('?') ? '&' : '?'; const updatedUrl = `${req.url}${separator}view_only=${encodeURIComponent(viewOnlyParam)}`; diff --git a/src/app/core/models/config.model.ts b/src/app/core/models/config.model.ts new file mode 100644 index 000000000..de810b2ef --- /dev/null +++ b/src/app/core/models/config.model.ts @@ -0,0 +1,54 @@ +export type ConfigModelType = string | number | boolean | null; + +/** + * Interface representing the application-wide configuration model + * loaded from `assets/config/config.json`. + * + * This config supports both strongly typed properties and dynamic keys. + * + */ +export interface ConfigModel { + /** + * The DSN (Data Source Name) used to configure Sentry for error tracking. + * This string is provided by Sentry and uniquely identifies your project. + * + * @example "https://1234567890abcdef.ingest.sentry.io/1234567" + */ + sentryDsn: string; + + /** + * The Google Tag Manager ID used to embed GTM scripts for analytics tracking. + * This ID typically starts with "GTM-". + * + * @example "GTM-ABCDE123" + */ + googleTagManagerId: string; + + /** + * API Key used to load the Google Picker API. + * This key should be restricted in the Google Cloud Console to limit usage. + * + * @example "AIzaSyA...your_api_key" + */ + googleFilePickerApiKey: string; + + /** + * Google Cloud Project App ID used by the Google Picker SDK. + * This numeric ID identifies your Google project and is required for some configurations. + * + * @example 123456789012 + */ + googleFilePickerAppId: number; + + /** + * A catch-all for additional configuration keys not explicitly defined. + * Each dynamic property maps to a `ConfigModelType` value. + * + * @example + * { + * "featureToggle": true, + * "apiUrl": "https://api.example.com" + * } + */ + [key: string]: ConfigModelType; +} diff --git a/src/app/core/models/custom-menu-item.model.ts b/src/app/core/models/custom-menu-item.model.ts new file mode 100644 index 000000000..c8af4ba3e --- /dev/null +++ b/src/app/core/models/custom-menu-item.model.ts @@ -0,0 +1,8 @@ +import { MenuItem } from 'primeng/api'; + +import { UserPermissions } from '@osf/shared/enums'; + +export interface CustomMenuItem extends MenuItem { + requiredPermission?: UserPermissions; + items?: CustomMenuItem[]; +} diff --git a/src/app/core/models/index.ts b/src/app/core/models/index.ts index 746090022..86f9cf210 100644 --- a/src/app/core/models/index.ts +++ b/src/app/core/models/index.ts @@ -1,3 +1,4 @@ +export * from './custom-menu-item.model'; export * from './route-context.model'; export * from './route-data.model'; export * from './sign-up.model'; diff --git a/src/app/core/models/route-context.model.ts b/src/app/core/models/route-context.model.ts index 636bcf291..456173ee2 100644 --- a/src/app/core/models/route-context.model.ts +++ b/src/app/core/models/route-context.model.ts @@ -1,11 +1,17 @@ +import { UserPermissions } from '@osf/shared/enums'; + export interface RouteContext { resourceId: string | undefined; providerId?: string; isProject: boolean; + wikiPageVisible?: boolean; isRegistry: boolean; isPreprint: boolean; preprintReviewsPageVisible?: boolean; + registrationModerationPageVisible?: boolean; + collectionModerationPageVisible?: boolean; isCollections: boolean; currentUrl?: string; isViewOnly?: boolean; + permissions?: UserPermissions[]; } diff --git a/src/app/core/provider/application.initialization.provider.spec.ts b/src/app/core/provider/application.initialization.provider.spec.ts new file mode 100644 index 000000000..12b73f067 --- /dev/null +++ b/src/app/core/provider/application.initialization.provider.spec.ts @@ -0,0 +1,95 @@ +import { HttpTestingController } from '@angular/common/http/testing'; +import { runInInjectionContext } from '@angular/core'; +import { TestBed } from '@angular/core/testing'; + +import { OSFConfigService } from '@core/services/osf-config.service'; + +import { initializeApplication } from './application.initialization.provider'; +import { ENVIRONMENT } from './environment.provider'; + +import * as Sentry from '@sentry/angular'; +import { OSFTestingModule } from '@testing/osf.testing.module'; +import { GoogleTagManagerConfiguration } from 'angular-google-tag-manager'; + +jest.mock('@sentry/angular', () => ({ + init: jest.fn(), + createErrorHandler: jest.fn(() => 'mockErrorHandler'), +})); + +describe('Provider: sentry', () => { + let osfConfigServiceMock: OSFConfigService; + let googleTagManagerConfigurationMock: GoogleTagManagerConfiguration; + let httpMock: HttpTestingController; + + const configServiceMock = { + load: jest.fn(), + } as unknown as jest.Mocked; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + imports: [OSFTestingModule], + providers: [ + { + provide: OSFConfigService, + useValue: configServiceMock, + }, + { + provide: GoogleTagManagerConfiguration, + useValue: { + set: jest.fn(), + }, + }, + { + provide: ENVIRONMENT, + useValue: { + googleTagManagerId: 'google-id', + sentryDsn: 'https://dsn.url', + }, + }, + ], + }).compileComponents(); + + osfConfigServiceMock = TestBed.inject(OSFConfigService); + googleTagManagerConfigurationMock = TestBed.inject(GoogleTagManagerConfiguration); + httpMock = TestBed.inject(HttpTestingController); + }); + + afterEach(() => { + jest.clearAllMocks(); + }); + + it('should initialize Sentry if DSN is provided', async () => { + await runInInjectionContext(TestBed, async () => { + await initializeApplication()(); + }); + + expect(Sentry.init).toHaveBeenCalledWith({ + dsn: 'https://dsn.url', + integrations: [], + environment: 'development', + maxBreadcrumbs: 50, + sampleRate: 1, + }); + + expect(googleTagManagerConfigurationMock.set).toHaveBeenCalledWith({ + id: 'google-id', + }); + expect(osfConfigServiceMock.load).toHaveBeenCalledWith(); + + expect(httpMock.verify).toBeTruthy(); + }); + + it('should initialize Sentry if DSN is missing', async () => { + const environment = TestBed.inject(ENVIRONMENT); + environment.sentryDsn = ''; + environment.googleTagManagerId = ''; + await runInInjectionContext(TestBed, async () => { + await initializeApplication()(); + }); + + expect(Sentry.init).not.toHaveBeenCalled(); + + expect(googleTagManagerConfigurationMock.set).not.toHaveBeenCalled(); + expect(httpMock.verify).toBeTruthy(); + }); +}); diff --git a/src/app/core/provider/application.initialization.provider.ts b/src/app/core/provider/application.initialization.provider.ts new file mode 100644 index 000000000..9d7c7a406 --- /dev/null +++ b/src/app/core/provider/application.initialization.provider.ts @@ -0,0 +1,59 @@ +import { inject, provideAppInitializer } from '@angular/core'; + +import { OSFConfigService } from '@core/services/osf-config.service'; + +import { ENVIRONMENT } from './environment.provider'; + +import * as Sentry from '@sentry/angular'; +import { GoogleTagManagerConfiguration } from 'angular-google-tag-manager'; + +/** + * Asynchronous initializer function that loads the Sentry DSN from the config service + * and initializes Sentry at application bootstrap. + * + * This function is meant to be used with `provideAppInitializer`, which blocks Angular + * bootstrap until the Promise resolves. This avoids race conditions when reading config. + * + * @returns A Promise that resolves once Sentry is initialized (or skipped if no DSN) + */ +export function initializeApplication() { + return async () => { + const configService = inject(OSFConfigService); + const googleTagManagerConfiguration = inject(GoogleTagManagerConfiguration); + const environment = inject(ENVIRONMENT); + + await configService.load(); + + const googleTagManagerId = environment.googleTagManagerId; + if (googleTagManagerId) { + googleTagManagerConfiguration.set({ id: googleTagManagerId }); + } + + const dsn = environment.sentryDsn; + if (dsn) { + // More Options + // https://docs.sentry.io/platforms/javascript/guides/angular/configuration/options/ + Sentry.init({ + dsn, + environment: environment.production ? 'production' : 'development', + maxBreadcrumbs: 50, + sampleRate: 1.0, + integrations: [], + }); + } + }; +} + +/** + * Provides the Sentry initialization logic during Angular's application bootstrap phase. + * + * This uses `provideAppInitializer` to block application startup until Sentry is initialized. + * It ensures that the Sentry DSN (fetched from OSFConfigService) is available and configured + * before any errors are handled or reported by the app. + * + * `initializeSentry` is a function that returns a Promise which resolves after Sentry is fully initialized. + * + * @see https://docs.sentry.io/platforms/javascript/guides/angular/ + * @see Angular's `provideAppInitializer`: https://angular.io/api/core/provideAppInitializer + */ +export const APPLICATION_INITIALIZATION_PROVIDER = provideAppInitializer(initializeApplication()); diff --git a/src/app/core/provider/environment.provider.spec.ts b/src/app/core/provider/environment.provider.spec.ts new file mode 100644 index 000000000..9548e0b07 --- /dev/null +++ b/src/app/core/provider/environment.provider.spec.ts @@ -0,0 +1,63 @@ +import { TestBed } from '@angular/core/testing'; + +import { EnvironmentModel } from '@osf/shared/models/environment.model'; + +import { ENVIRONMENT } from './environment.provider'; + +import { OSFTestingModule } from '@testing/osf.testing.module'; + +describe('Provider: Environment', () => { + let environment: EnvironmentModel; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + imports: [OSFTestingModule], + }).compileComponents(); + + environment = TestBed.inject(ENVIRONMENT); + }); + + it('should allow updating a string value', () => { + expect(environment.apiDomainUrl).toBe('http://localhost:8000'); + environment.apiDomainUrl = 'https://new-api.example.com'; + expect(environment.apiDomainUrl).toBe('https://new-api.example.com'); + }); + + it('should allow updating a boolean value', () => { + expect(environment.production).toBeFalsy(); + environment.production = true; + expect(environment.production).toBeTruthy(); + }); + + it('should allow updating a nullable value', () => { + environment.dataciteTrackerRepoId = 'new-repo-id'; + expect(environment.dataciteTrackerRepoId).toBe('new-repo-id'); + + environment.dataciteTrackerRepoId = null; + expect(environment.dataciteTrackerRepoId).toBeNull(); + }); + + it('should allow updating an optional nested object', () => { + environment.activityLogs = { pageSize: 100 }; + expect(environment.activityLogs).toEqual({ pageSize: 100 }); + environment.activityLogs.pageSize = 200; + expect(environment.activityLogs).toEqual({ pageSize: 200 }); + expect(environment.activityLogs.pageSize).toBe(200); + }); + + it('should reflect changes in subsequent reads', () => { + environment.facebookAppId = 'abc123'; + expect(environment.facebookAppId).toBe('abc123'); + + environment.facebookAppId = 'xyz999'; + expect(environment.facebookAppId).toBe('xyz999'); + }); + + it('should support type-safe key/value updates through keyof', () => { + const key: keyof EnvironmentModel = 'supportEmail'; + const newValue = 'support@newdomain.com'; + + environment[key] = newValue; + expect(environment.supportEmail).toBe(newValue); + }); +}); diff --git a/src/app/core/provider/environment.provider.ts b/src/app/core/provider/environment.provider.ts new file mode 100644 index 000000000..bfc7ad4dc --- /dev/null +++ b/src/app/core/provider/environment.provider.ts @@ -0,0 +1,45 @@ +import { inject, InjectionToken } from '@angular/core'; + +import { ENVIRONMENT_DO_NO_USE } from '@core/constants/environment.token'; +import { EnvironmentModel } from '@osf/shared/models/environment.model'; + +/** + * `ENVIRONMENT` is an Angular `InjectionToken` that provides a **runtime-mutable proxy** + * over the application's static environment configuration. + * + * This factory wraps the base environment config (`ENVIRONMENT_DO_NO_USE`) in a `Proxy` + * so values can be accessed and overridden at runtime while preserving type safety + * based on the `EnvironmentModel` interface. + * + * ## Key Features: + * - Provides type-safe access to environment variables (e.g. `apiDomainUrl`, `recaptchaSiteKey`) + * - Supports **runtime modification** of values (e.g. `environment.featureFlag = true`) + * - Works seamlessly with Angular dependency injection + * + * @example + * ```ts + * const env = inject(ENVIRONMENT); + * console.log(env.apiDomainUrl); + * env.apiDomainUrl = 'https://dev.example.com'; // Override at runtime + * ``` + * + * @see EnvironmentModel for a complete list of available keys. + * @see ENVIRONMENT_DO_NO_USE for the static base config (not modifiable). + */ +export const ENVIRONMENT = new InjectionToken('EnvironmentProxy', { + providedIn: 'root', + factory: () => { + const environment = inject(ENVIRONMENT_DO_NO_USE); + + return new Proxy( + { ...environment }, + { + get: (target, prop: keyof EnvironmentModel) => target[prop], + set: (target: EnvironmentModel, prop: K, value: EnvironmentModel[K]) => { + target[prop] = value; + return true; + }, + } + ); + }, +}); diff --git a/src/app/core/provider/sentry.provider.spec.ts b/src/app/core/provider/sentry.provider.spec.ts new file mode 100644 index 000000000..82e18573d --- /dev/null +++ b/src/app/core/provider/sentry.provider.spec.ts @@ -0,0 +1,19 @@ +import { TestBed } from '@angular/core/testing'; + +import { SENTRY_PROVIDER, SENTRY_TOKEN } from './sentry.provider'; + +import * as Sentry from '@sentry/angular'; + +describe('Provider: Sentry', () => { + beforeEach(() => { + TestBed.configureTestingModule({ + providers: [SENTRY_PROVIDER], + }); + }); + + it('should provide the Sentry module via the injection token', () => { + const provided = TestBed.inject(SENTRY_TOKEN); + expect(provided).toBe(Sentry); + expect(typeof provided.captureException).toBe('function'); + }); +}); diff --git a/src/app/core/provider/sentry.provider.ts b/src/app/core/provider/sentry.provider.ts new file mode 100644 index 000000000..baac5068e --- /dev/null +++ b/src/app/core/provider/sentry.provider.ts @@ -0,0 +1,49 @@ +import { InjectionToken } from '@angular/core'; + +import * as Sentry from '@sentry/angular'; + +/** + * Injection token used to provide the Sentry module via Angular's dependency injection system. + * + * This token represents the entire Sentry module (`@sentry/angular`), allowing you to inject + * and use Sentry APIs (e.g., `captureException`, `init`, `setUser`, etc.) in Angular services + * or components. + * + * @example + * ```ts + * const Sentry = inject(SENTRY_TOKEN); + * Sentry.captureException(new Error('Something went wrong')); + * ``` + */ +export const SENTRY_TOKEN = new InjectionToken('Sentry'); + +/** + * Angular provider that binds the `SENTRY_TOKEN` to the actual `@sentry/angular` module. + * + * Use this provider in your module or application configuration to make Sentry injectable. + * + * @example + * ```ts + * providers: [ + * SENTRY_PROVIDER, + * ] + * ``` + * + * Inject the Sentry module via the factory token + * private readonly Sentry = inject(SENTRY_TOKEN); + * + * throwError(): void { + * try { + * throw new Error('Test error for Sentry capture'); + * } catch (error) { + * Send the error to Sentry + * this.Sentry.captureException(error); + * } + * } + * + * @see SENTRY_TOKEN + */ +export const SENTRY_PROVIDER = { + provide: SENTRY_TOKEN, + useValue: Sentry, +}; diff --git a/src/app/core/provider/window.provider.spec.ts b/src/app/core/provider/window.provider.spec.ts new file mode 100644 index 000000000..7f45aef72 --- /dev/null +++ b/src/app/core/provider/window.provider.spec.ts @@ -0,0 +1,35 @@ +import { CommonModule } from '@angular/common'; +import { PLATFORM_ID } from '@angular/core'; +import { TestBed } from '@angular/core/testing'; + +import { WINDOW } from './window.provider'; + +describe('Provider: WINDOW', () => { + describe('when running in the browser', () => { + beforeEach(() => { + TestBed.configureTestingModule({ + imports: [CommonModule], + providers: [{ provide: PLATFORM_ID, useValue: 'browser' }], + }); + }); + + it('should return the real window object', () => { + const result = TestBed.inject(WINDOW); + expect(result).toBe(window); + }); + }); + + describe('when running on the server', () => { + beforeEach(() => { + TestBed.configureTestingModule({ + imports: [CommonModule], + providers: [{ provide: PLATFORM_ID, useValue: 'server' }], + }); + }); + + it('should return an empty object instead of window', () => { + const result = TestBed.inject(WINDOW); + expect(result).toEqual({}); + }); + }); +}); diff --git a/src/app/core/provider/window.provider.ts b/src/app/core/provider/window.provider.ts new file mode 100644 index 000000000..3e846c776 --- /dev/null +++ b/src/app/core/provider/window.provider.ts @@ -0,0 +1,22 @@ +import { isPlatformBrowser } from '@angular/common'; +import { inject, InjectionToken, PLATFORM_ID } from '@angular/core'; + +/** + * `WINDOW` is an Angular InjectionToken that provides access to the global `window` object, + * but only when running in the browser (never on the server). + * + * This makes Angular Universal (SSR) safe by returning a mock object `{}` during server-side rendering. + * + * @example + * ```ts + * const win = inject(WINDOW); + * win.localStorage.getItem('token'); + * ``` + */ +export const WINDOW = new InjectionToken('Global Window Object', { + providedIn: 'root', + factory: () => { + const platformId = inject(PLATFORM_ID); + return isPlatformBrowser(platformId) ? window : ({} as Window); + }, +}); diff --git a/src/app/core/services/auth.service.ts b/src/app/core/services/auth.service.ts index 492bfc3f0..7da6a169e 100644 --- a/src/app/core/services/auth.service.ts +++ b/src/app/core/services/auth.service.ts @@ -4,14 +4,13 @@ import { CookieService } from 'ngx-cookie-service'; import { inject, Injectable } from '@angular/core'; +import { ENVIRONMENT } from '@core/provider/environment.provider'; import { ClearCurrentUser } from '@osf/core/store/user'; import { urlParam } from '@osf/shared/helpers'; import { JsonApiService, LoaderService } from '@osf/shared/services'; import { SignUpModel } from '../models'; -import { environment } from 'src/environments/environment'; - @Injectable({ providedIn: 'root', }) @@ -19,26 +18,39 @@ export class AuthService { private readonly jsonApiService = inject(JsonApiService); private readonly cookieService = inject(CookieService); private readonly loaderService = inject(LoaderService); + private readonly environment = inject(ENVIRONMENT); private readonly actions = createDispatchMap({ clearCurrentUser: ClearCurrentUser }); + get apiUrl() { + return `${this.environment.apiDomainUrl}/v2/users/`; + } + + get webUrl() { + return this.environment.webUrl; + } + + get casUrl() { + return this.environment.casUrl; + } + navigateToSignIn(): void { this.loaderService.show(); - const loginUrl = `${environment.casUrl}/login?${urlParam({ service: `${environment.webUrl}/login` })}`; + const loginUrl = `${this.casUrl}/login?${urlParam({ service: `${this.webUrl}/login` })}`; window.location.href = loginUrl; } - navigateToOrcidSingIn(): void { - const loginUrl = `${environment.casUrl}/login?${urlParam({ + navigateToOrcidSignIn(): void { + const loginUrl = `${this.casUrl}/login?${urlParam({ redirectOrcid: 'true', - service: `${environment.webUrl}/login/?next=${encodeURIComponent(environment.webUrl)}`, + service: `${this.webUrl}/login/?next=${encodeURIComponent(this.webUrl)}`, })}`; window.location.href = loginUrl; } navigateToInstitutionSignIn(): void { - const loginUrl = `${environment.casUrl}/login?${urlParam({ + const loginUrl = `${this.casUrl}/login?${urlParam({ campaign: 'institution', - service: `${environment.webUrl}/login/?next=${encodeURIComponent(environment.webUrl)}`, + service: `${this.webUrl}/login/?next=${encodeURIComponent(this.webUrl)}`, })}`; window.location.href = loginUrl; } @@ -47,25 +59,25 @@ export class AuthService { this.loaderService.show(); this.cookieService.deleteAll(); this.actions.clearCurrentUser(); - window.location.href = `${environment.webUrl}/logout/?next=${encodeURIComponent('/')}`; + window.location.href = `${this.webUrl}/logout/?next=${encodeURIComponent('/')}`; } register(payload: SignUpModel) { - const baseUrl = `${environment.apiUrlV1}/register/`; + const baseUrl = `${this.webUrl}/api/v1/register/`; const body = { ...payload, 'g-recaptcha-response': payload.recaptcha, campaign: null }; return this.jsonApiService.post(baseUrl, body); } forgotPassword(email: string) { - const baseUrl = `${environment.apiUrl}/users/reset_password/`; + const baseUrl = `${this.apiUrl}/reset_password/`; const params: Record = { email }; return this.jsonApiService.get(baseUrl, params); } resetPassword(userId: string, token: string, newPassword: string) { - const baseUrl = `${environment.apiUrl}/users/reset_password/`; + const baseUrl = `${this.apiUrl}/reset_password/`; const body = { data: { attributes: { diff --git a/src/app/core/services/help-scout.service.spec.ts b/src/app/core/services/help-scout.service.spec.ts new file mode 100644 index 000000000..454a98fff --- /dev/null +++ b/src/app/core/services/help-scout.service.spec.ts @@ -0,0 +1,115 @@ +import { Store } from '@ngxs/store'; + +import { signal } from '@angular/core'; +import { TestBed } from '@angular/core/testing'; + +import { WINDOW } from '@core/provider/window.provider'; +import { UserSelectors } from '@core/store/user/user.selectors'; + +import { HelpScoutService } from './help-scout.service'; + +describe('HelpScoutService', () => { + const storeMock: Partial = { + selectSignal: jest.fn().mockImplementation((selector) => { + if (selector === UserSelectors.isAuthenticated) { + return authSignal; + } + return signal(null); // fallback + }), + }; + let service: HelpScoutService; + let mockWindow: any; + const authSignal = signal(false); + + afterEach(() => { + jest.clearAllMocks(); + }); + + describe('initialization - no dataLayer', () => { + beforeEach(() => { + mockWindow = {}; + TestBed.configureTestingModule({ + providers: [ + { provide: WINDOW, useValue: mockWindow }, + HelpScoutService, + { provide: Store, useValue: storeMock }, + ], + }); + + service = TestBed.inject(HelpScoutService); + }); + + it('should initialize dataLayer with default values', () => { + expect(mockWindow.dataLayer).toEqual({ + loggedIn: false, + resourceType: undefined, + }); + }); + + it('should set the resourceType', () => { + service.setResourceType('project'); + expect(mockWindow.dataLayer.resourceType).toBe('project'); + }); + + it('should unset the resourceType', () => { + service.setResourceType('node'); + service.unsetResourceType(); + expect(mockWindow.dataLayer.resourceType).toBeUndefined(); + }); + + it('should set loggedIn to true or false', () => { + authSignal.set(true); + TestBed.flushEffects(); + expect(mockWindow.dataLayer.loggedIn).toBeTruthy(); + + authSignal.set(false); + TestBed.flushEffects(); + expect(mockWindow.dataLayer.loggedIn).toBeFalsy(); + }); + }); + + describe('initialization - dataLayer', () => { + beforeEach(() => { + mockWindow = { + dataLayer: {}, + }; + TestBed.configureTestingModule({ + providers: [ + { provide: WINDOW, useValue: mockWindow }, + HelpScoutService, + { provide: Store, useValue: storeMock }, + ], + }); + + service = TestBed.inject(HelpScoutService); + }); + + it('should initialize dataLayer with default values', () => { + expect(mockWindow.dataLayer).toEqual({ + loggedIn: false, + resourceType: undefined, + }); + }); + + it('should set the resourceType', () => { + service.setResourceType('project'); + expect(mockWindow.dataLayer.resourceType).toBe('project'); + }); + + it('should unset the resourceType', () => { + service.setResourceType('node'); + service.unsetResourceType(); + expect(mockWindow.dataLayer.resourceType).toBeUndefined(); + }); + + it('should set loggedIn to true or false', () => { + authSignal.set(true); + TestBed.flushEffects(); + expect(mockWindow.dataLayer.loggedIn).toBeTruthy(); + + authSignal.set(false); + TestBed.flushEffects(); + expect(mockWindow.dataLayer.loggedIn).toBeFalsy(); + }); + }); +}); diff --git a/src/app/core/services/help-scout.service.ts b/src/app/core/services/help-scout.service.ts new file mode 100644 index 000000000..e8a00b71b --- /dev/null +++ b/src/app/core/services/help-scout.service.ts @@ -0,0 +1,84 @@ +import { Store } from '@ngxs/store'; + +import { effect, inject, Injectable } from '@angular/core'; + +import { WINDOW } from '@core/provider/window.provider'; +import { UserSelectors } from '@osf/core/store/user'; + +/** + * HelpScoutService manages GTM-compatible `dataLayer` state + * related to user authentication and resource type. + * + * This service ensures that specific fields in the global + * `window.dataLayer` object are set correctly for downstream + * tools like Google Tag Manager or HelpScout integrations. + */ +@Injectable({ + providedIn: 'root', +}) +export class HelpScoutService { + /** + * Reference to the global window object, injected via a factory. + * Used to access and manipulate `dataLayer` for tracking. + */ + private window = inject(WINDOW); + + /** + * Angular Store instance used to access application state via NgRx. + * Injected using Angular's `inject()` function. + * + * @private + * @type {Store} + */ + private store = inject(Store); + + /** + * Signal that represents the current authentication state of the user. + * Derived from the NgRx selector `UserSelectors.isAuthenticated`. + * + * Can be used reactively in effects or template bindings to update UI or behavior + * based on whether the user is logged in. + * + * @private + * @type {Signal} + */ + private isAuthenticated = this.store.selectSignal(UserSelectors.isAuthenticated); + + /** + * Initializes the `dataLayer` with default values. + * + * - `loggedIn`: false + * - `resourceType`: undefined + */ + constructor() { + if (this.window.dataLayer) { + this.window.dataLayer.loggedIn = false; + this.window.dataLayer.resourceType = undefined; + } else { + this.window.dataLayer = { + loggedIn: false, + resourceType: undefined, + }; + } + + effect(() => { + this.window.dataLayer.loggedIn = this.isAuthenticated(); + }); + } + + /** + * Sets the current resource type in the `dataLayer`. + * + * @param resourceType - The name of the resource (e.g., 'project', 'node') + */ + setResourceType(resourceType: string): void { + this.window.dataLayer.resourceType = resourceType; + } + + /** + * Clears the `resourceType` from the `dataLayer`, setting it to `undefined`. + */ + unsetResourceType(): void { + this.window.dataLayer.resourceType = undefined; + } +} diff --git a/src/app/core/services/index.ts b/src/app/core/services/index.ts index 45baa421e..acb0db14e 100644 --- a/src/app/core/services/index.ts +++ b/src/app/core/services/index.ts @@ -1,4 +1,3 @@ export { AuthService } from './auth.service'; -export { RequestAccessService } from './request-access.service'; export { UserService } from './user.service'; export { UserEmailsService } from './user-emails.service'; diff --git a/src/app/core/services/osf-config.service.spec.ts b/src/app/core/services/osf-config.service.spec.ts new file mode 100644 index 000000000..2c899ab48 --- /dev/null +++ b/src/app/core/services/osf-config.service.spec.ts @@ -0,0 +1,65 @@ +import { HttpTestingController } from '@angular/common/http/testing'; +import { TestBed } from '@angular/core/testing'; + +import { ConfigModel } from '@core/models/config.model'; +import { ENVIRONMENT } from '@core/provider/environment.provider'; +import { EnvironmentModel } from '@osf/shared/models/environment.model'; + +import { OSFConfigService } from './osf-config.service'; + +import { OSFTestingModule } from '@testing/osf.testing.module'; + +describe('Service: Config', () => { + let service: OSFConfigService; + let httpMock: HttpTestingController; + let environment: EnvironmentModel; + + const mockConfig: ConfigModel = { + apiDomainUrl: 'https://api.example.com', + production: true, + } as any; // Cast to any if index signature isn’t added + + beforeEach(async () => { + jest.clearAllMocks(); + await TestBed.configureTestingModule({ + imports: [OSFTestingModule], + providers: [OSFConfigService], + }).compileComponents(); + + service = TestBed.inject(OSFConfigService); + httpMock = TestBed.inject(HttpTestingController); + environment = TestBed.inject(ENVIRONMENT); + }); + + it('should return a value with get()', async () => { + let loadPromise = service.load(); + const request = httpMock.expectOne('/assets/config/config.json'); + request.flush(mockConfig); + await loadPromise; + expect(environment.apiDomainUrl).toBe('https://api.example.com'); + expect(environment.production).toBeTruthy(); + loadPromise = service.load(); + await loadPromise; + + expect(environment.apiDomainUrl).toBe('https://api.example.com'); + expect(environment.production).toBeTruthy(); + + expect(httpMock.verify()).toBeUndefined(); + }); + + it('should return a value with ahs()', async () => { + let loadPromise = service.load(); + const request = httpMock.expectOne('/assets/config/config.json'); + request.flush(mockConfig); + await loadPromise; + expect(environment.apiDomainUrl).toBe('https://api.example.com'); + expect(environment.production).toBeTruthy(); + + loadPromise = service.load(); + await loadPromise; + expect(environment.apiDomainUrl).toBe('https://api.example.com'); + expect(environment.production).toBeTruthy(); + + expect(httpMock.verify()).toBeUndefined(); + }); +}); diff --git a/src/app/core/services/osf-config.service.ts b/src/app/core/services/osf-config.service.ts new file mode 100644 index 000000000..6d23156f3 --- /dev/null +++ b/src/app/core/services/osf-config.service.ts @@ -0,0 +1,59 @@ +import { catchError, lastValueFrom, of, shareReplay } from 'rxjs'; + +import { HttpClient } from '@angular/common/http'; +import { inject, Injectable } from '@angular/core'; + +import { ConfigModel } from '@core/models/config.model'; +import { ENVIRONMENT } from '@core/provider/environment.provider'; + +/** + * Service for loading and accessing configuration values + * from the static JSON file at `/assets/config/config.json`. + * + * This service ensures that the configuration is only fetched once + * and made available application-wide via promise-based access. + * + * Consumers must call `get()` or `has()` using `await` to ensure + * that config values are available after loading completes. + */ +@Injectable({ providedIn: 'root' }) +export class OSFConfigService { + /** + * Angular's HttpClient used to fetch the configuration JSON. + * Injected via Angular's dependency injection system. + */ + private http: HttpClient = inject(HttpClient); + + /** + * Injected instance of the application environment configuration. + * */ + private environment = inject(ENVIRONMENT); + + /** + * Stores the loaded configuration object after it is fetched from the server. + * Remains `null` until `load()` is successfully called. + */ + private config: ConfigModel | null = null; + + /** + * Loads the configuration from the JSON file if not already loaded. + * Ensures that only one request is made. + */ + async load(): Promise { + if (!this.config) { + this.config = await lastValueFrom( + this.http.get('/assets/config/config.json').pipe( + shareReplay(1), + catchError(() => of({} as ConfigModel)) + ) + ); + + // Apply every key from config to environment + for (const [key, value] of Object.entries(this.config)) { + // eslint-disable-next-line + // @ts-ignore + this.environment[key] = value; + } + } + } +} diff --git a/src/app/core/services/request-access.service.ts b/src/app/core/services/request-access.service.ts deleted file mode 100644 index 86e60e493..000000000 --- a/src/app/core/services/request-access.service.ts +++ /dev/null @@ -1,28 +0,0 @@ -import { Observable } from 'rxjs'; - -import { inject, Injectable } from '@angular/core'; - -import { JsonApiService } from '../../shared/services/json-api.service'; - -import { environment } from 'src/environments/environment'; - -@Injectable({ - providedIn: 'root', -}) -export class RequestAccessService { - jsonApiService = inject(JsonApiService); - - requestAccessToProject(projectId: string, comment = ''): Observable { - const payload = { - data: { - attributes: { - comment, - request_type: 'access', - }, - type: 'node-requests', - }, - }; - - return this.jsonApiService.post(`${environment.apiUrl}/nodes/${projectId}/requests/`, payload); - } -} diff --git a/src/app/core/services/user-emails.service.ts b/src/app/core/services/user-emails.service.ts index 3a55fe78c..1ee9834e2 100644 --- a/src/app/core/services/user-emails.service.ts +++ b/src/app/core/services/user-emails.service.ts @@ -2,18 +2,21 @@ import { map, Observable } from 'rxjs'; import { inject, Injectable } from '@angular/core'; +import { ENVIRONMENT } from '@core/provider/environment.provider'; import { MapEmail, MapEmails } from '@osf/shared/mappers'; import { AccountEmailModel, EmailResponseJsonApi, EmailsDataJsonApi, EmailsResponseJsonApi } from '@osf/shared/models'; import { JsonApiService } from '@osf/shared/services'; -import { environment } from 'src/environments/environment'; - @Injectable({ providedIn: 'root', }) export class UserEmailsService { private readonly jsonApiService = inject(JsonApiService); - private readonly baseUrl = `${environment.apiUrl}/users`; + private readonly environment = inject(ENVIRONMENT); + + get apiUrl() { + return `${this.environment.apiDomainUrl}/v2/users`; + } getEmails(): Observable { const params: Record = { @@ -22,7 +25,7 @@ export class UserEmailsService { }; return this.jsonApiService - .get(`${this.baseUrl}/me/settings/emails/`, params) + .get(`${this.apiUrl}/me/settings/emails/`, params) .pipe(map((response) => MapEmails(response.data))); } @@ -32,7 +35,7 @@ export class UserEmailsService { }; return this.jsonApiService - .get(`${this.baseUrl}/me/settings/emails/${emailId}/`, params) + .get(`${this.apiUrl}/me/settings/emails/${emailId}/`, params) .pipe(map((response) => MapEmail(response.data))); } @@ -55,7 +58,7 @@ export class UserEmailsService { }; return this.jsonApiService - .post(`${this.baseUrl}/${userId}/settings/emails/`, body) + .post(`${this.apiUrl}/${userId}/settings/emails/`, body) .pipe(map((response) => MapEmail(response.data))); } @@ -71,7 +74,7 @@ export class UserEmailsService { }; return this.jsonApiService - .patch(`${this.baseUrl}/me/settings/emails/${emailId}/`, body) + .patch(`${this.apiUrl}/me/settings/emails/${emailId}/`, body) .pipe(map((response) => MapEmail(response))); } @@ -87,11 +90,11 @@ export class UserEmailsService { }; return this.jsonApiService - .patch(`${this.baseUrl}/me/settings/emails/${emailId}/`, body) + .patch(`${this.apiUrl}/me/settings/emails/${emailId}/`, body) .pipe(map((response) => MapEmail(response))); } deleteEmail(emailId: string): Observable { - return this.jsonApiService.delete(`${this.baseUrl}/me/settings/emails/${emailId}/`); + return this.jsonApiService.delete(`${this.apiUrl}/me/settings/emails/${emailId}/`); } } diff --git a/src/app/core/services/user.service.ts b/src/app/core/services/user.service.ts index 97abb9860..bffea800f 100644 --- a/src/app/core/services/user.service.ts +++ b/src/app/core/services/user.service.ts @@ -2,56 +2,64 @@ import { map, Observable } from 'rxjs'; import { inject, Injectable } from '@angular/core'; +import { ENVIRONMENT } from '@core/provider/environment.provider'; import { ProfileSettingsKey } from '@osf/shared/enums'; import { UserMapper } from '@osf/shared/mappers'; import { - JsonApiResponse, ProfileSettingsUpdate, - User, + UserAcceptedTermsOfServiceJsonApi, UserData, + UserDataJsonApi, UserDataResponseJsonApi, - UserGetResponse, - UserSettings, - UserSettingsGetResponse, + UserModel, + UserResponseJsonApi, } from '@osf/shared/models'; - -import { JsonApiService } from '../../shared/services'; - -import { environment } from 'src/environments/environment'; +import { JsonApiService } from '@shared/services'; @Injectable({ providedIn: 'root', }) export class UserService { - jsonApiService = inject(JsonApiService); + private readonly jsonApiService = inject(JsonApiService); + private readonly environment = inject(ENVIRONMENT); - getCurrentUser(): Observable { - return this.jsonApiService - .get(`${environment.apiUrl}/`) - .pipe(map((response) => UserMapper.fromUserDataGetResponse(response))); + get apiUrl() { + return `${this.environment.apiDomainUrl}/v2`; } - getCurrentUserSettings(): Observable { + getUserById(userId: string): Observable { return this.jsonApiService - .get>(`${environment.apiUrl}/users/me/settings/`) - .pipe(map((response) => UserMapper.fromUserSettingsGetResponse(response.data))); + .get(`${this.apiUrl}/users/${userId}/`) + .pipe(map((response) => UserMapper.fromUserGetResponse(response.data))); } - updateUserSettings(userId: string, userSettings: UserSettings): Observable { - const request = UserMapper.toUpdateUserSettingsRequest(userId, userSettings); - + getCurrentUser(): Observable { return this.jsonApiService - .patch(`${environment.apiUrl}/users/${userId}/settings/`, request) - .pipe(map((response) => UserMapper.fromUserSettingsGetResponse(response))); + .get(`${this.apiUrl}/`) + .pipe(map((response) => UserMapper.fromUserDataGetResponse(response))); } - updateUserProfile(userId: string, key: string, data: ProfileSettingsUpdate): Observable { - const patchedData = key === ProfileSettingsKey.User ? data : { [key]: data }; + updateUserProfile(userId: string, key: string, data: ProfileSettingsUpdate): Observable { + const dataFormatted = + // eslint-disable-next-line no-prototype-builtins + ProfileSettingsKey.User && data.hasOwnProperty('acceptedTermsOfService') + ? { accepted_terms_of_service: true } + : data; + + const patchedData = key === ProfileSettingsKey.User ? dataFormatted : { [key]: dataFormatted }; return this.jsonApiService - .patch(`${environment.apiUrl}/users/${userId}/`, { + .patch(`${this.apiUrl}/users/${userId}/`, { data: { type: 'users', id: userId, attributes: patchedData }, }) .pipe(map((response) => UserMapper.fromUserGetResponse(response))); } + + updateUserAcceptedTermsOfService(userId: string, data: UserAcceptedTermsOfServiceJsonApi): Observable { + return this.jsonApiService + .patch(`${this.apiUrl}/users/${userId}/`, { + data: { type: 'users', id: userId, attributes: data }, + }) + .pipe(map((response) => UserMapper.fromUserGetResponse(response))); + } } diff --git a/src/app/core/store/provider/provider.actions.ts b/src/app/core/store/provider/provider.actions.ts index 698ca905b..aeed386b5 100644 --- a/src/app/core/store/provider/provider.actions.ts +++ b/src/app/core/store/provider/provider.actions.ts @@ -1,6 +1,10 @@ -import { ProviderModel } from '@osf/shared/models'; +import { ProviderShortInfoModel } from '@osf/shared/models'; export class SetCurrentProvider { static readonly type = '[Provider] Set Current Provider'; - constructor(public provider: ProviderModel) {} + constructor(public provider: ProviderShortInfoModel) {} +} + +export class ClearCurrentProvider { + static readonly type = '[Provider] Clear Current Provider'; } diff --git a/src/app/core/store/provider/provider.model.ts b/src/app/core/store/provider/provider.model.ts index 61d743858..bc5d90faa 100644 --- a/src/app/core/store/provider/provider.model.ts +++ b/src/app/core/store/provider/provider.model.ts @@ -1,7 +1,7 @@ -import { ProviderModel } from '@osf/shared/models'; +import { ProviderShortInfoModel } from '@osf/shared/models'; export interface ProviderStateModel { - currentProvider: ProviderModel | null; + currentProvider: ProviderShortInfoModel | null; } export const PROVIDER_STATE_INITIAL: ProviderStateModel = { diff --git a/src/app/core/store/provider/provider.selectors.ts b/src/app/core/store/provider/provider.selectors.ts index 9379ae8dc..c63f3b537 100644 --- a/src/app/core/store/provider/provider.selectors.ts +++ b/src/app/core/store/provider/provider.selectors.ts @@ -1,13 +1,13 @@ import { Selector } from '@ngxs/store'; -import { ProviderModel } from '@osf/shared/models'; +import { ProviderShortInfoModel } from '@osf/shared/models'; import { ProviderStateModel } from './provider.model'; import { ProviderState } from './provider.state'; export class ProviderSelectors { @Selector([ProviderState]) - static getCurrentProvider(state: ProviderStateModel): ProviderModel | null { + static getCurrentProvider(state: ProviderStateModel): ProviderShortInfoModel | null { return state.currentProvider; } } diff --git a/src/app/core/store/provider/provider.state.ts b/src/app/core/store/provider/provider.state.ts index 10cc0d83a..d0e62c67f 100644 --- a/src/app/core/store/provider/provider.state.ts +++ b/src/app/core/store/provider/provider.state.ts @@ -2,7 +2,7 @@ import { Action, State, StateContext } from '@ngxs/store'; import { Injectable } from '@angular/core'; -import { SetCurrentProvider } from './provider.actions'; +import { ClearCurrentProvider, SetCurrentProvider } from './provider.actions'; import { PROVIDER_STATE_INITIAL, ProviderStateModel } from './provider.model'; @State({ @@ -13,8 +13,11 @@ import { PROVIDER_STATE_INITIAL, ProviderStateModel } from './provider.model'; export class ProviderState { @Action(SetCurrentProvider) setCurrentProvider(ctx: StateContext, action: SetCurrentProvider) { - ctx.patchState({ - currentProvider: action.provider, - }); + ctx.patchState({ currentProvider: action.provider }); + } + + @Action(ClearCurrentProvider) + clearCurrentProvider(ctx: StateContext) { + ctx.setState(PROVIDER_STATE_INITIAL); } } diff --git a/src/app/core/store/user-emails/user-emails.state.ts b/src/app/core/store/user-emails/user-emails.state.ts index 12508728c..3b1c176c8 100644 --- a/src/app/core/store/user-emails/user-emails.state.ts +++ b/src/app/core/store/user-emails/user-emails.state.ts @@ -1,6 +1,6 @@ import { Action, State, StateContext, Store } from '@ngxs/store'; -import { catchError, tap, throwError } from 'rxjs'; +import { catchError, tap } from 'rxjs'; import { inject, Injectable } from '@angular/core'; @@ -140,9 +140,25 @@ export class UserEmailsState { @Action(ResendConfirmation) resendConfirmation(ctx: StateContext, action: ResendConfirmation) { - return this.userEmailsService - .resendConfirmation(action.emailId) - .pipe(catchError((error) => throwError(() => error))); + ctx.patchState({ + emails: { + ...ctx.getState().emails, + isSubmitting: true, + error: null, + }, + }); + + return this.userEmailsService.resendConfirmation(action.emailId).pipe( + tap(() => { + ctx.patchState({ + emails: { + ...ctx.getState().emails, + isSubmitting: false, + }, + }); + }), + catchError((error) => handleSectionError(ctx, 'emails', error)) + ); } @Action(MakePrimary) diff --git a/src/app/core/store/user/user.actions.ts b/src/app/core/store/user/user.actions.ts index 716f9c09f..b81dab84d 100644 --- a/src/app/core/store/user/user.actions.ts +++ b/src/app/core/store/user/user.actions.ts @@ -1,4 +1,4 @@ -import { Education, Employment, Social, User, UserSettings } from '@osf/shared/models'; +import { Education, Employment, SocialModel, UserModel } from '@osf/shared/models'; export class GetCurrentUser { static readonly type = '[User] Get Current User'; @@ -6,19 +6,7 @@ export class GetCurrentUser { export class SetCurrentUser { static readonly type = '[User] Set Current User'; - constructor(public user: User) {} -} - -export class GetCurrentUserSettings { - static readonly type = '[User] Get Current User Settings'; -} - -export class UpdateUserSettings { - static readonly type = '[User] Update User Settings'; - constructor( - public userId: string, - public updatedUserSettings: UserSettings - ) {} + constructor(public user: UserModel) {} } export class UpdateProfileSettingsEmployment { @@ -36,17 +24,17 @@ export class UpdateProfileSettingsEducation { export class UpdateProfileSettingsSocialLinks { static readonly type = '[Profile Settings] Update Social Links'; - constructor(public payload: Partial[]) {} + constructor(public payload: Partial[]) {} } export class UpdateProfileSettingsUser { static readonly type = '[Profile Settings] Update User'; - constructor(public payload: Partial) {} + constructor(public payload: Partial) {} } -export class SetUserAsModerator { - static readonly type = '[User] Set User As Moderator'; +export class AcceptTermsOfServiceByUser { + static readonly type = '[User] Accept Terms Of Service'; } export class ClearCurrentUser { diff --git a/src/app/core/store/user/user.model.ts b/src/app/core/store/user/user.model.ts index bdae49d6d..83207c2f8 100644 --- a/src/app/core/store/user/user.model.ts +++ b/src/app/core/store/user/user.model.ts @@ -1,8 +1,7 @@ -import { AsyncStateModel, User, UserSettings } from '@osf/shared/models'; +import { AsyncStateModel, UserModel } from '@osf/shared/models'; export interface UserStateModel { - currentUser: AsyncStateModel; - currentUserSettings: AsyncStateModel; + currentUser: AsyncStateModel; activeFlags: string[]; } @@ -12,11 +11,5 @@ export const USER_STATE_INITIAL: UserStateModel = { isLoading: false, error: null, }, - currentUserSettings: { - data: null, - isLoading: false, - isSubmitting: false, - error: null, - }, activeFlags: [], }; diff --git a/src/app/core/store/user/user.selectors.ts b/src/app/core/store/user/user.selectors.ts index 88ab9dd9d..9839b480d 100644 --- a/src/app/core/store/user/user.selectors.ts +++ b/src/app/core/store/user/user.selectors.ts @@ -1,13 +1,13 @@ import { Selector } from '@ngxs/store'; -import { Education, Employment, Social, User, UserSettings } from '@osf/shared/models'; +import { Education, Employment, SocialModel, UserModel } from '@osf/shared/models'; import { UserStateModel } from './user.model'; import { UserState } from './user.state'; export class UserSelectors { @Selector([UserState]) - static getCurrentUser(state: UserStateModel): User | null { + static getCurrentUser(state: UserStateModel): UserModel | null { return state.currentUser.data || localStorage.getItem('currentUser') ? JSON.parse(localStorage.getItem('currentUser')!) : null; @@ -18,28 +18,13 @@ export class UserSelectors { return state.currentUser.isLoading; } - @Selector([UserState]) - static getCurrentUserSettings(state: UserStateModel): UserSettings | null { - return state.currentUserSettings.data; - } - - @Selector([UserState]) - static isUserSettingsLoading(state: UserStateModel): boolean { - return state.currentUserSettings.isLoading; - } - - @Selector([UserState]) - static isUserSettingsSubmitting(state: UserStateModel): boolean { - return state.currentUserSettings.isSubmitting!; - } - @Selector([UserState]) static getShareIndexing(state: UserStateModel): boolean | undefined { return state.currentUser.data?.allowIndexing; } @Selector([UserState]) - static getUserNames(state: UserStateModel): Partial | null { + static getUserNames(state: UserStateModel): Partial | null { return state.currentUser.data; } @@ -54,15 +39,10 @@ export class UserSelectors { } @Selector([UserState]) - static getSocialLinks(state: UserStateModel): Social | undefined { + static getSocialLinks(state: UserStateModel): SocialModel | undefined { return state.currentUser.data?.social; } - @Selector([UserState]) - static isCurrentUserModerator(state: UserStateModel): boolean { - return !!state.currentUser.data?.isModerator; - } - @Selector([UserState]) static getCanViewReviews(state: UserStateModel): boolean { return state.currentUser.data?.canViewReviews || false; diff --git a/src/app/core/store/user/user.state.ts b/src/app/core/store/user/user.state.ts index 1067d11ef..760a77b65 100644 --- a/src/app/core/store/user/user.state.ts +++ b/src/app/core/store/user/user.state.ts @@ -1,5 +1,4 @@ import { Action, State, StateContext } from '@ngxs/store'; -import { patch } from '@ngxs/store/operators'; import { tap } from 'rxjs'; @@ -8,21 +7,19 @@ import { inject, Injectable } from '@angular/core'; import { ProfileSettingsKey } from '@osf/shared/enums'; import { removeNullable } from '@osf/shared/helpers'; import { UserMapper } from '@osf/shared/mappers'; -import { Social } from '@osf/shared/models'; +import { SocialModel, UserModel } from '@osf/shared/models'; import { UserService } from '../../services'; import { + AcceptTermsOfServiceByUser, ClearCurrentUser, GetCurrentUser, - GetCurrentUserSettings, SetCurrentUser, - SetUserAsModerator, UpdateProfileSettingsEducation, UpdateProfileSettingsEmployment, UpdateProfileSettingsSocialLinks, UpdateProfileSettingsUser, - UpdateUserSettings, } from './user.actions'; import { USER_STATE_INITIAL, UserStateModel } from './user.model'; @@ -90,42 +87,6 @@ export class UserState { localStorage.setItem('currentUser', JSON.stringify(action.user)); } - @Action(GetCurrentUserSettings) - getCurrentUserSettings(ctx: StateContext) { - ctx.setState(patch({ currentUserSettings: patch({ isLoading: true }) })); - - return this.userService.getCurrentUserSettings().pipe( - tap((userSettings) => { - ctx.setState( - patch({ - currentUserSettings: patch({ - data: userSettings, - isLoading: false, - }), - }) - ); - }) - ); - } - - @Action(UpdateUserSettings) - updateUserSettings(ctx: StateContext, action: UpdateUserSettings) { - ctx.setState(patch({ currentUserSettings: patch({ isSubmitting: true }) })); - - return this.userService.updateUserSettings(action.userId, action.updatedUserSettings).pipe( - tap(() => { - ctx.setState( - patch({ - currentUserSettings: patch({ - data: action.updatedUserSettings, - isSubmitting: false, - }), - }) - ); - }) - ); - } - @Action(UpdateProfileSettingsEmployment) updateProfileSettingsEmployment(ctx: StateContext, { payload }: UpdateProfileSettingsEmployment) { const state = ctx.getState(); @@ -210,7 +171,7 @@ export class UserState { return; } - let social = {} as Partial; + let social = {} as Partial; payload.forEach((item) => { social = { @@ -233,8 +194,8 @@ export class UserState { ); } - @Action(SetUserAsModerator) - setUserAsModerator(ctx: StateContext) { + @Action(AcceptTermsOfServiceByUser) + acceptTermsOfServiceByUser(ctx: StateContext) { const state = ctx.getState(); const currentUser = state.currentUser.data; @@ -242,15 +203,27 @@ export class UserState { return; } - ctx.patchState({ - currentUser: { - ...state.currentUser, - data: { - ...currentUser, - isModerator: true, - }, - }, - }); + const updatePayload: Partial = { + acceptedTermsOfService: true, + }; + const apiRequest = UserMapper.toAcceptedTermsOfServiceRequest(updatePayload); + + return this.userService.updateUserAcceptedTermsOfService(currentUser.id, apiRequest).pipe( + tap((response: UserModel): void => { + if (response.acceptedTermsOfService) { + ctx.patchState({ + currentUser: { + ...state.currentUser, + data: { + ...currentUser, + acceptedTermsOfService: true, + }, + }, + }); + localStorage.setItem('currentUser', JSON.stringify(response)); + } + }) + ); } @Action(ClearCurrentUser) diff --git a/src/app/features/admin-institutions/admin-institutions.component.html b/src/app/features/admin-institutions/admin-institutions.component.html index bbdd54d54..2e86a3b56 100644 --- a/src/app/features/admin-institutions/admin-institutions.component.html +++ b/src/app/features/admin-institutions/admin-institutions.component.html @@ -1,4 +1,4 @@ -
+
@if (isInstitutionLoading()) {
@@ -28,7 +28,7 @@

{{ institution().name }}

/>
-
diff --git a/src/app/features/settings/addons/components/connect-addon/connect-addon.component.scss b/src/app/features/settings/settings-addons/components/connect-addon/connect-addon.component.scss similarity index 100% rename from src/app/features/settings/addons/components/connect-addon/connect-addon.component.scss rename to src/app/features/settings/settings-addons/components/connect-addon/connect-addon.component.scss diff --git a/src/app/features/settings/addons/components/connect-addon/connect-addon.component.spec.ts b/src/app/features/settings/settings-addons/components/connect-addon/connect-addon.component.spec.ts similarity index 96% rename from src/app/features/settings/addons/components/connect-addon/connect-addon.component.spec.ts rename to src/app/features/settings/settings-addons/components/connect-addon/connect-addon.component.spec.ts index 51487357a..b666a5baf 100644 --- a/src/app/features/settings/addons/components/connect-addon/connect-addon.component.spec.ts +++ b/src/app/features/settings/settings-addons/components/connect-addon/connect-addon.component.spec.ts @@ -10,12 +10,13 @@ import { provideNoopAnimations } from '@angular/platform-browser/animations'; import { ActivatedRoute, Navigation, Router, UrlTree } from '@angular/router'; import { SubHeaderComponent } from '@osf/shared/components'; -import { MOCK_ADDON } from '@shared/mocks'; import { AddonsSelectors } from '@shared/stores/addons'; import { ConnectAddonComponent } from './connect-addon.component'; -describe('ConnectAddonComponent', () => { +import { MOCK_ADDON } from '@testing/mocks'; + +describe.skip('ConnectAddonComponent', () => { let component: ConnectAddonComponent; let fixture: ComponentFixture; diff --git a/src/app/features/settings/settings-addons/components/connect-addon/connect-addon.component.ts b/src/app/features/settings/settings-addons/components/connect-addon/connect-addon.component.ts new file mode 100644 index 000000000..d30efac78 --- /dev/null +++ b/src/app/features/settings/settings-addons/components/connect-addon/connect-addon.component.ts @@ -0,0 +1,123 @@ +import { createDispatchMap, select } from '@ngxs/store'; + +import { TranslatePipe } from '@ngx-translate/core'; + +import { Button } from 'primeng/button'; +import { StepPanel, StepPanels, Stepper } from 'primeng/stepper'; +import { TableModule } from 'primeng/table'; + +import { Component, computed, DestroyRef, effect, inject, signal, viewChild } from '@angular/core'; +import { FormsModule, ReactiveFormsModule } from '@angular/forms'; +import { Router, RouterLink } from '@angular/router'; + +import { SubHeaderComponent } from '@osf/shared/components'; +import { AddonServiceNames, AddonType, ProjectAddonsStepperValue } from '@osf/shared/enums'; +import { getAddonTypeString, isAuthorizedAddon } from '@osf/shared/helpers'; +import { AddonSetupAccountFormComponent, AddonTermsComponent } from '@shared/components/addons'; +import { AddonModel, AddonTerm, AuthorizedAccountModel, AuthorizedAddonRequestJsonApi } from '@shared/models'; +import { AddonOAuthService, ToastService } from '@shared/services'; +import { AddonsSelectors, CreateAuthorizedAddon, UpdateAuthorizedAddon } from '@shared/stores/addons'; + +@Component({ + selector: 'osf-connect-addon', + imports: [ + SubHeaderComponent, + StepPanel, + StepPanels, + Stepper, + Button, + TableModule, + RouterLink, + FormsModule, + ReactiveFormsModule, + TranslatePipe, + AddonTermsComponent, + AddonSetupAccountFormComponent, + ], + templateUrl: './connect-addon.component.html', + styleUrl: './connect-addon.component.scss', +}) +export class ConnectAddonComponent { + private readonly router = inject(Router); + private readonly toastService = inject(ToastService); + private readonly oauthService = inject(AddonOAuthService); + private readonly destroyRef = inject(DestroyRef); + + readonly stepper = viewChild(Stepper); + readonly AddonType = AddonType; + readonly ProjectAddonsStepperValue = ProjectAddonsStepperValue; + + terms = signal([]); + addon = signal(null); + addonAuthUrl = signal('/settings/addons'); + + addonsUserReference = select(AddonsSelectors.getAddonsUserReference); + createdAddon = select(AddonsSelectors.getCreatedOrUpdatedAuthorizedAddon); + isCreatingAuthorizedAddon = select(AddonsSelectors.getCreatedOrUpdatedStorageAddonSubmitting); + + isAuthorized = computed(() => isAuthorizedAddon(this.addon())); + addonTypeString = computed(() => getAddonTypeString(this.addon())); + userReferenceId = computed(() => this.addonsUserReference()[0]?.id); + baseUrl = computed(() => this.router.url.split('/addons')[0]); + + actions = createDispatchMap({ + createAuthorizedAddon: CreateAuthorizedAddon, + updateAuthorizedAddon: UpdateAuthorizedAddon, + }); + + constructor() { + const addon = this.router.getCurrentNavigation()?.extras.state?.['addon'] as AddonModel | AuthorizedAccountModel; + if (!addon) { + this.router.navigate([`${this.baseUrl()}/addons`]); + } + this.addon.set(addon); + + effect(() => { + if (this.isAuthorized()) { + this.stepper()?.value.set(ProjectAddonsStepperValue.SETUP_NEW_ACCOUNT); + } + }); + + this.destroyRef.onDestroy(() => { + this.oauthService.stopOAuthTracking(); + }); + } + + handleConnectAuthorizedAddon(payload: AuthorizedAddonRequestJsonApi): void { + if (!this.addon()) return; + + const action = this.isAuthorized() + ? this.actions.updateAuthorizedAddon(payload, this.addonTypeString(), this.addon()!.id) + : this.actions.createAuthorizedAddon(payload, this.addonTypeString()); + + action.subscribe({ + complete: () => { + const createdAddon = this.createdAddon(); + if (createdAddon?.authUrl) { + this.startOauthFlow(createdAddon); + } else { + this.showSuccessAndRedirect(createdAddon); + } + }, + }); + } + + private startOauthFlow(createdAddon: AuthorizedAccountModel): void { + this.addonAuthUrl.set(createdAddon.authUrl!); + window.open(createdAddon.authUrl!, '_blank'); + this.stepper()?.value.set(ProjectAddonsStepperValue.AUTH); + + this.oauthService.startOAuthTracking(createdAddon, this.addonTypeString(), { + onSuccess: (updatedAddon) => { + this.showSuccessAndRedirect(updatedAddon); + }, + }); + } + + private showSuccessAndRedirect(createdAddon: AuthorizedAccountModel | null): void { + this.router.navigate([`${this.baseUrl()}/addons`]); + this.toastService.showSuccess('settings.addons.toast.createSuccess', { + addonName: AddonServiceNames[createdAddon?.externalServiceName as keyof typeof AddonServiceNames], + }); + } +} diff --git a/src/app/features/settings/addons/components/index.ts b/src/app/features/settings/settings-addons/components/index.ts similarity index 100% rename from src/app/features/settings/addons/components/index.ts rename to src/app/features/settings/settings-addons/components/index.ts diff --git a/src/app/features/settings/settings-addons/settings-addons.component.html b/src/app/features/settings/settings-addons/settings-addons.component.html new file mode 100644 index 000000000..d76f457ed --- /dev/null +++ b/src/app/features/settings/settings-addons/settings-addons.component.html @@ -0,0 +1,61 @@ + +
+ + + + + + +

+ {{ 'settings.addons.description' | translate }} +

+ + + + @if (!isAddonsLoading()) { + + } @else { +
+ +
+ } + + + +

+ {{ 'settings.addons.connectedDescription' | translate }} +

+ + + @if (!isAuthorizedAddonsLoading()) { + + } @else { +
+ +
+ } + + + +
diff --git a/src/app/features/settings/addons/addons.component.scss b/src/app/features/settings/settings-addons/settings-addons.component.scss similarity index 100% rename from src/app/features/settings/addons/addons.component.scss rename to src/app/features/settings/settings-addons/settings-addons.component.scss diff --git a/src/app/features/settings/settings-addons/settings-addons.component.spec.ts b/src/app/features/settings/settings-addons/settings-addons.component.spec.ts new file mode 100644 index 000000000..d79efd313 --- /dev/null +++ b/src/app/features/settings/settings-addons/settings-addons.component.spec.ts @@ -0,0 +1,82 @@ +import { Store } from '@ngxs/store'; + +import { MockComponents, MockProvider } from 'ng-mocks'; + +import { ComponentFixture, TestBed } from '@angular/core/testing'; + +import { UserSelectors } from '@osf/core/store/user'; +import { SearchInputComponent, SubHeaderComponent } from '@osf/shared/components'; +import { AddonCardListComponent } from '@shared/components/addons'; +import { AddonsSelectors } from '@shared/stores/addons'; + +import { SettingsAddonsComponent } from './settings-addons.component'; + +import { TranslateServiceMock } from '@testing/mocks'; + +describe.skip('AddonsComponent', () => { + let component: SettingsAddonsComponent; + let fixture: ComponentFixture; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + imports: [ + SettingsAddonsComponent, + ...MockComponents(SubHeaderComponent, SearchInputComponent, AddonCardListComponent), + ], + providers: [ + TranslateServiceMock, + + MockProvider(Store, { + selectSignal: jest.fn().mockImplementation((selector) => { + if (selector === UserSelectors.getCurrentUser) { + return () => ({ id: 'test-user-id' }); + } + if (selector === AddonsSelectors.getAddonsUserReference) { + return () => [{ id: 'test-reference-id' }]; + } + if (selector === AddonsSelectors.getStorageAddons) { + return () => []; + } + if (selector === AddonsSelectors.getCitationAddons) { + return () => []; + } + if (selector === AddonsSelectors.getAuthorizedStorageAddons) { + return () => []; + } + if (selector === AddonsSelectors.getAuthorizedCitationAddons) { + return () => []; + } + return () => null; + }), + dispatch: jest.fn(), + }), + ], + }).compileComponents(); + + fixture = TestBed.createComponent(SettingsAddonsComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); + + it('should render the connected description paragraph', () => { + component['selectedTab'].set(component['AddonTabValue'].ALL_ADDONS); + fixture.detectChanges(); + const compiled: HTMLElement = fixture.nativeElement; + const p = compiled.querySelector('p'); + expect(p).toBeTruthy(); + expect(p?.textContent?.trim()).toContain('settings.addons.description'); + }); + + it('should render the connected description paragraph', () => { + component['selectedTab'].set(component['AddonTabValue'].CONNECTED_ADDONS); + fixture.detectChanges(); + const compiled: HTMLElement = fixture.nativeElement; + const p = compiled.querySelector('p'); + expect(p).toBeTruthy(); + expect(p?.textContent?.trim()).toContain('settings.addons.connectedDescription'); + }); +}); diff --git a/src/app/features/settings/settings-addons/settings-addons.component.ts b/src/app/features/settings/settings-addons/settings-addons.component.ts new file mode 100644 index 000000000..7460b81e2 --- /dev/null +++ b/src/app/features/settings/settings-addons/settings-addons.component.ts @@ -0,0 +1,293 @@ +import { createDispatchMap, select } from '@ngxs/store'; + +import { TranslatePipe } from '@ngx-translate/core'; + +import { Tab, TabList, TabPanel, TabPanels, Tabs } from 'primeng/tabs'; + +import { debounceTime, distinctUntilChanged } from 'rxjs'; + +import { + ChangeDetectionStrategy, + Component, + computed, + DestroyRef, + effect, + inject, + model, + OnInit, + signal, + untracked, +} from '@angular/core'; +import { takeUntilDestroyed } from '@angular/core/rxjs-interop'; +import { FormControl, FormsModule } from '@angular/forms'; +import { ActivatedRoute } from '@angular/router'; + +import { UserSelectors } from '@osf/core/store/user'; +import { LoadingSpinnerComponent, SelectComponent, SubHeaderComponent } from '@osf/shared/components'; +import { sortAddonCardsAlphabetically } from '@osf/shared/helpers'; +import { AddonCardListComponent, AddonsToolbarComponent } from '@shared/components/addons'; +import { ADDON_CATEGORY_OPTIONS, ADDON_TAB_OPTIONS } from '@shared/constants'; +import { AddonCategory, AddonTabValue } from '@shared/enums'; +import { AddonsQueryParamsService } from '@shared/services/addons-query-params.service'; +import { + AddonsSelectors, + ClearAuthorizedAddons, + CreateAuthorizedAddon, + DeleteAuthorizedAddon, + GetAddonsUserReference, + GetAuthorizedCitationAddons, + GetAuthorizedLinkAddons, + GetAuthorizedStorageAddons, + GetCitationAddons, + GetLinkAddons, + GetStorageAddons, + UpdateAuthorizedAddon, +} from '@shared/stores/addons'; + +@Component({ + selector: 'osf-settings-addons', + imports: [ + SubHeaderComponent, + TabList, + Tabs, + Tab, + TabPanel, + TabPanels, + AddonsToolbarComponent, + AddonCardListComponent, + FormsModule, + TranslatePipe, + LoadingSpinnerComponent, + SelectComponent, + ], + templateUrl: './settings-addons.component.html', + styleUrl: './settings-addons.component.scss', + changeDetection: ChangeDetectionStrategy.OnPush, +}) +export class SettingsAddonsComponent implements OnInit { + private readonly destroyRef = inject(DestroyRef); + private readonly route = inject(ActivatedRoute); + private readonly queryParamsService = inject(AddonsQueryParamsService); + readonly tabOptions = ADDON_TAB_OPTIONS; + readonly categoryOptions = ADDON_CATEGORY_OPTIONS; + readonly AddonTabValue = AddonTabValue; + readonly defaultTabValue = AddonTabValue.ALL_ADDONS; + searchControl = new FormControl(''); + searchValue = signal(''); + selectedCategory = signal(AddonCategory.EXTERNAL_STORAGE_SERVICES); + selectedTab = model(this.defaultTabValue); + + currentUser = select(UserSelectors.getCurrentUser); + addonsUserReference = select(AddonsSelectors.getAddonsUserReference); + storageAddons = select(AddonsSelectors.getStorageAddons); + citationAddons = select(AddonsSelectors.getCitationAddons); + linkAddons = select(AddonsSelectors.getLinkAddons); + authorizedStorageAddons = select(AddonsSelectors.getAuthorizedStorageAddons); + authorizedCitationAddons = select(AddonsSelectors.getAuthorizedCitationAddons); + authorizedLinkAddons = select(AddonsSelectors.getAuthorizedLinkAddons); + + isCurrentUserLoading = select(UserSelectors.getCurrentUserLoading); + isUserReferenceLoading = select(AddonsSelectors.getAddonsUserReferenceLoading); + isStorageAddonsLoading = select(AddonsSelectors.getStorageAddonsLoading); + isCitationAddonsLoading = select(AddonsSelectors.getCitationAddonsLoading); + isLinkAddonsLoading = select(AddonsSelectors.getLinkAddonsLoading); + isAuthorizedStorageAddonsLoading = select(AddonsSelectors.getAuthorizedStorageAddonsLoading); + isAuthorizedCitationAddonsLoading = select(AddonsSelectors.getAuthorizedCitationAddonsLoading); + isAuthorizedLinkAddonsLoading = select(AddonsSelectors.getAuthorizedLinkAddonsLoading); + + currentAddonsLoading = computed(() => { + switch (this.selectedCategory()) { + case AddonCategory.EXTERNAL_STORAGE_SERVICES: + return this.isStorageAddonsLoading(); + case AddonCategory.EXTERNAL_CITATION_SERVICES: + return this.isCitationAddonsLoading(); + case AddonCategory.EXTERNAL_LINK_SERVICES: + return this.isLinkAddonsLoading(); + default: + return this.isStorageAddonsLoading(); + } + }); + + isAddonsLoading = computed(() => { + return this.currentAddonsLoading() || this.isUserReferenceLoading() || this.isCurrentUserLoading(); + }); + + isAuthorizedAddonsLoading = computed(() => { + let categoryLoading; + + switch (this.selectedCategory()) { + case AddonCategory.EXTERNAL_STORAGE_SERVICES: + categoryLoading = this.isAuthorizedStorageAddonsLoading(); + break; + case AddonCategory.EXTERNAL_CITATION_SERVICES: + categoryLoading = this.isAuthorizedCitationAddonsLoading(); + break; + case AddonCategory.EXTERNAL_LINK_SERVICES: + categoryLoading = this.isAuthorizedLinkAddonsLoading(); + break; + default: + categoryLoading = + this.isAuthorizedStorageAddonsLoading() || + this.isAuthorizedCitationAddonsLoading() || + this.isAuthorizedLinkAddonsLoading(); + } + + return categoryLoading || this.isUserReferenceLoading() || this.isCurrentUserLoading(); + }); + + actions = createDispatchMap({ + getStorageAddons: GetStorageAddons, + getCitationAddons: GetCitationAddons, + getLinkAddons: GetLinkAddons, + getAuthorizedStorageAddons: GetAuthorizedStorageAddons, + getAuthorizedCitationAddons: GetAuthorizedCitationAddons, + getAuthorizedLinkAddons: GetAuthorizedLinkAddons, + createAuthorizedAddon: CreateAuthorizedAddon, + updateAuthorizedAddon: UpdateAuthorizedAddon, + getAddonsUserReference: GetAddonsUserReference, + deleteAuthorizedAddon: DeleteAuthorizedAddon, + clearAuthorizedAddons: ClearAuthorizedAddons, + }); + + readonly allAuthorizedAddons = computed(() => { + let authorizedAddons; + + switch (this.selectedCategory()) { + case AddonCategory.EXTERNAL_STORAGE_SERVICES: + authorizedAddons = this.authorizedStorageAddons(); + break; + case AddonCategory.EXTERNAL_CITATION_SERVICES: + authorizedAddons = this.authorizedCitationAddons(); + break; + case AddonCategory.EXTERNAL_LINK_SERVICES: + authorizedAddons = this.authorizedLinkAddons(); + break; + default: + authorizedAddons = [ + ...this.authorizedStorageAddons(), + ...this.authorizedCitationAddons(), + ...this.authorizedLinkAddons(), + ]; + } + + const searchValue = this.searchValue().toLowerCase(); + const filteredAddons = authorizedAddons.filter((card) => card.displayName.toLowerCase().includes(searchValue)); + + return sortAddonCardsAlphabetically(filteredAddons); + }); + + readonly userReferenceId = computed(() => { + return this.addonsUserReference()[0]?.id; + }); + + readonly currentAction = computed(() => { + switch (this.selectedCategory()) { + case AddonCategory.EXTERNAL_STORAGE_SERVICES: + return this.actions.getStorageAddons; + case AddonCategory.EXTERNAL_CITATION_SERVICES: + return this.actions.getCitationAddons; + case AddonCategory.EXTERNAL_LINK_SERVICES: + return this.actions.getLinkAddons; + default: + return this.actions.getStorageAddons; + } + }); + + readonly currentAddonsState = computed(() => { + switch (this.selectedCategory()) { + case AddonCategory.EXTERNAL_STORAGE_SERVICES: + return this.storageAddons(); + case AddonCategory.EXTERNAL_CITATION_SERVICES: + return this.citationAddons(); + case AddonCategory.EXTERNAL_LINK_SERVICES: + return this.linkAddons(); + default: + return this.storageAddons(); + } + }); + + readonly filteredAddonCards = computed(() => { + const searchValue = this.searchValue().toLowerCase(); + const filteredAddons = this.currentAddonsState().filter( + (card) => + card.externalServiceName.toLowerCase().includes(searchValue) || + card.displayName.toLowerCase().includes(searchValue) + ); + + return sortAddonCardsAlphabetically(filteredAddons); + }); + + constructor() { + this.setupEffects(); + + this.searchControl.valueChanges + .pipe(debounceTime(300), distinctUntilChanged(), takeUntilDestroyed(this.destroyRef)) + .subscribe((value) => this.searchValue.set(value ?? '')); + + this.destroyRef.onDestroy(() => { + this.actions.clearAuthorizedAddons(); + }); + } + + ngOnInit(): void { + const params = this.queryParamsService.readQueryParams(this.route); + + if (params.activeTab !== undefined) { + this.selectedTab.set(params.activeTab); + } + } + + private setupEffects() { + effect(() => { + const activeTab = this.selectedTab(); + this.queryParamsService.updateQueryParams(this.route, { activeTab }); + }); + + effect(() => { + if (this.currentUser() && !this.userReferenceId()) { + this.actions.getAddonsUserReference(); + } + }); + + effect(() => { + if (this.currentUser() && this.userReferenceId()) { + const action = this.currentAction(); + const addons = this.currentAddonsState(); + + if (!addons?.length) { + action(); + } + } + }); + + effect(() => { + const userReferenceId = this.userReferenceId(); + const selectedCategory = this.selectedCategory(); + if (userReferenceId) { + this.fetchAuthorizedAddonsByCategory(userReferenceId, selectedCategory); + } + }); + } + + private fetchAuthorizedAddonsByCategory(userReferenceId: string, category: string): void { + untracked(() => { + switch (category) { + case AddonCategory.EXTERNAL_STORAGE_SERVICES: + if (!this.authorizedStorageAddons().length && !this.isAuthorizedStorageAddonsLoading()) { + this.actions.getAuthorizedStorageAddons(userReferenceId); + } + break; + case AddonCategory.EXTERNAL_CITATION_SERVICES: + if (!this.authorizedCitationAddons().length && !this.isAuthorizedCitationAddonsLoading()) { + this.actions.getAuthorizedCitationAddons(userReferenceId); + } + break; + case AddonCategory.EXTERNAL_LINK_SERVICES: + if (!this.authorizedLinkAddons().length && !this.isAuthorizedLinkAddonsLoading()) { + this.actions.getAuthorizedLinkAddons(userReferenceId); + } + break; + } + }); + } +} diff --git a/src/app/features/settings/settings-container.component.spec.ts b/src/app/features/settings/settings-container.component.spec.ts index 8b56cb825..b504e3372 100644 --- a/src/app/features/settings/settings-container.component.spec.ts +++ b/src/app/features/settings/settings-container.component.spec.ts @@ -1,28 +1,41 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { By } from '@angular/platform-browser'; +import { HelpScoutService } from '@core/services/help-scout.service'; + import { SettingsContainerComponent } from './settings-container.component'; -describe('SettingsContainerComponent', () => { - let component: SettingsContainerComponent; +import { OSFTestingModule } from '@testing/osf.testing.module'; + +describe('Component: Settings', () => { let fixture: ComponentFixture; + let helpScoutService: HelpScoutService; beforeEach(async () => { await TestBed.configureTestingModule({ - imports: [SettingsContainerComponent], + imports: [SettingsContainerComponent, OSFTestingModule], + providers: [ + { + provide: HelpScoutService, + useValue: { + setResourceType: jest.fn(), + unsetResourceType: jest.fn(), + }, + }, + ], }).compileComponents(); + helpScoutService = TestBed.inject(HelpScoutService); fixture = TestBed.createComponent(SettingsContainerComponent); - component = fixture.componentInstance; fixture.detectChanges(); }); - it('should create', () => { - expect(component).toBeTruthy(); - }); - it('should render router outlet', () => { const routerOutlet = fixture.debugElement.query(By.css('router-outlet')); expect(routerOutlet).toBeTruthy(); }); + + it('should called the helpScoutService', () => { + expect(helpScoutService.setResourceType).toHaveBeenCalledWith('user'); + }); }); diff --git a/src/app/features/settings/settings-container.component.ts b/src/app/features/settings/settings-container.component.ts index ee731c455..12c980d7e 100644 --- a/src/app/features/settings/settings-container.component.ts +++ b/src/app/features/settings/settings-container.component.ts @@ -1,6 +1,8 @@ -import { ChangeDetectionStrategy, Component } from '@angular/core'; +import { ChangeDetectionStrategy, Component, inject, OnDestroy } from '@angular/core'; import { RouterOutlet } from '@angular/router'; +import { HelpScoutService } from '@core/services/help-scout.service'; + @Component({ selector: 'osf-settings-container', imports: [RouterOutlet], @@ -8,4 +10,14 @@ import { RouterOutlet } from '@angular/router'; styleUrl: './settings-container.component.scss', changeDetection: ChangeDetectionStrategy.OnPush, }) -export class SettingsContainerComponent {} +export class SettingsContainerComponent implements OnDestroy { + private readonly helpScoutService = inject(HelpScoutService); + + constructor() { + this.helpScoutService.setResourceType('user'); + } + + ngOnDestroy(): void { + this.helpScoutService.unsetResourceType(); + } +} diff --git a/src/app/features/settings/settings.routes.ts b/src/app/features/settings/settings.routes.ts index dc349dbd1..5c1989b2a 100644 --- a/src/app/features/settings/settings.routes.ts +++ b/src/app/features/settings/settings.routes.ts @@ -17,15 +17,15 @@ export const settingsRoutes: Routes = [ { path: '', pathMatch: 'full', - redirectTo: 'profile-settings', + redirectTo: 'profile', }, { - path: 'profile-settings', + path: 'profile', loadComponent: () => import('./profile-settings/profile-settings.component').then((c) => c.ProfileSettingsComponent), }, { - path: 'account-settings', + path: 'account', loadComponent: () => import('./account-settings/account-settings.component').then((c) => c.AccountSettingsComponent), }, @@ -35,12 +35,15 @@ export const settingsRoutes: Routes = [ children: [ { path: '', - loadComponent: () => import('./addons/addons.component').then((mod) => mod.AddonsComponent), + loadComponent: () => + import('@osf/features/settings/settings-addons/settings-addons.component').then( + (mod) => mod.SettingsAddonsComponent + ), }, { path: 'connect-addon', loadComponent: () => - import('@osf/features/settings/addons/components/connect-addon/connect-addon.component').then( + import('@osf/features/settings/settings-addons/components/connect-addon/connect-addon.component').then( (mod) => mod.ConnectAddonComponent ), }, diff --git a/src/app/features/settings/tokens/components/token-add-edit-form/token-add-edit-form.component.spec.ts b/src/app/features/settings/tokens/components/token-add-edit-form/token-add-edit-form.component.spec.ts index c31f6fe11..7cfde1067 100644 --- a/src/app/features/settings/tokens/components/token-add-edit-form/token-add-edit-form.component.spec.ts +++ b/src/app/features/settings/tokens/components/token-add-edit-form/token-add-edit-form.component.spec.ts @@ -1,47 +1,59 @@ import { Store } from '@ngxs/store'; -import { TranslatePipe } from '@ngx-translate/core'; -import { MockPipe, MockProvider } from 'ng-mocks'; +import { TranslateService } from '@ngx-translate/core'; +import { MockProvider } from 'ng-mocks'; import { DialogService, DynamicDialogRef } from 'primeng/dynamicdialog'; import { of } from 'rxjs'; import { ComponentFixture, TestBed } from '@angular/core/testing'; -import { ActivatedRoute } from '@angular/router'; +import { ReactiveFormsModule } from '@angular/forms'; +import { ActivatedRoute, Router } from '@angular/router'; -import { TranslateServiceMock } from '@shared/mocks'; +import { TokenCreatedDialogComponent } from '@osf/features/settings/tokens/components'; +import { InputLimits } from '@osf/shared/constants'; import { ToastService } from '@shared/services'; +import { TokenFormControls, TokenModel } from '../../models'; +import { CreateToken, TokensSelectors } from '../../store'; + import { TokenAddEditFormComponent } from './token-add-edit-form.component'; +import { MOCK_SCOPES, MOCK_STORE, MOCK_TOKEN, TranslateServiceMock } from '@testing/mocks'; +import { OSFTestingStoreModule } from '@testing/osf.testing.module'; +import { ToastServiceMockBuilder } from '@testing/providers/toast-provider.mock'; + describe('TokenAddEditFormComponent', () => { let component: TokenAddEditFormComponent; let fixture: ComponentFixture; - let store: Partial; let dialogService: Partial; let dialogRef: Partial; let activatedRoute: Partial; + let router: Partial; + let toastService: jest.Mocked; + let translateService: jest.Mocked; + let toastServiceMock: ReturnType; - const mockToken = { - id: '1', - name: 'Test Token', - tokenId: 'token1', - scopes: ['read', 'write'], - ownerId: 'user1', - }; + const mockTokens: TokenModel[] = [MOCK_TOKEN]; - const mockScopes = [ - { id: 'read', attributes: { description: 'Read access' } }, - { id: 'write', attributes: { description: 'Write access' } }, - ]; + const fillForm = (tokenName: string = MOCK_TOKEN.name, scopes: string[] = MOCK_TOKEN.scopes): void => { + component.tokenForm.patchValue({ + [TokenFormControls.TokenName]: tokenName, + [TokenFormControls.Scopes]: scopes, + }); + }; beforeEach(async () => { - store = { - dispatch: jest.fn().mockReturnValue(of(undefined)), - selectSignal: jest.fn().mockReturnValue(() => mockScopes), - selectSnapshot: jest.fn().mockReturnValue([mockToken]), - }; + (MOCK_STORE.selectSignal as jest.Mock).mockImplementation((selector) => { + if (selector === TokensSelectors.getScopes) return () => MOCK_SCOPES; + if (selector === TokensSelectors.isTokensLoading) return () => false; + if (selector === TokensSelectors.getTokens) return () => mockTokens; + if (selector === TokensSelectors.getTokenById) { + return () => (id: string) => mockTokens.find((token) => token.id === id); + } + return () => null; + }); dialogService = { open: jest.fn(), @@ -52,27 +64,202 @@ describe('TokenAddEditFormComponent', () => { }; activatedRoute = { - params: of({ id: mockToken.id }), + params: of({ id: MOCK_TOKEN.id }), }; + router = { + navigate: jest.fn(), + }; + + toastServiceMock = ToastServiceMockBuilder.create().build(); + await TestBed.configureTestingModule({ - imports: [TokenAddEditFormComponent, MockPipe(TranslatePipe)], + imports: [TokenAddEditFormComponent, ReactiveFormsModule, OSFTestingStoreModule], providers: [ TranslateServiceMock, - MockProvider(Store, store), + MockProvider(Store, MOCK_STORE), MockProvider(DialogService, dialogService), MockProvider(DynamicDialogRef, dialogRef), MockProvider(ActivatedRoute, activatedRoute), - MockProvider(ToastService), + MockProvider(Router, router), + MockProvider(ToastService, toastServiceMock), ], }).compileComponents(); fixture = TestBed.createComponent(TokenAddEditFormComponent); component = fixture.componentInstance; + + toastService = TestBed.inject(ToastService) as jest.Mocked; + translateService = TestBed.inject(TranslateService) as jest.Mocked; + fixture.detectChanges(); }); it('should create', () => { expect(component).toBeTruthy(); }); + + it('should patch form with initial values on init', () => { + fixture.componentRef.setInput('initialValues', MOCK_TOKEN); + const patchSpy = jest.spyOn(component.tokenForm, 'patchValue'); + + component.ngOnInit(); + + expect(patchSpy).toHaveBeenCalledWith( + expect.objectContaining({ + [TokenFormControls.TokenName]: MOCK_TOKEN.name, + [TokenFormControls.Scopes]: MOCK_TOKEN.scopes, + }) + ); + expect(component.tokenForm.get(TokenFormControls.TokenName)?.value).toBe(MOCK_TOKEN.name); + expect(component.tokenForm.get(TokenFormControls.Scopes)?.value).toEqual(MOCK_TOKEN.scopes); + }); + + it('should not patch form when initialValues are not provided', () => { + fixture.componentRef.setInput('initialValues', null); + + fillForm('Existing Name', ['read']); + + component.ngOnInit(); + + expect(component.tokenForm.get(TokenFormControls.TokenName)?.value).toBe('Existing Name'); + expect(component.tokenForm.get(TokenFormControls.Scopes)?.value).toEqual(['read']); + }); + + it('should not submit when form is invalid', () => { + fillForm('', []); + + const markAllAsTouchedSpy = jest.spyOn(component.tokenForm, 'markAllAsTouched'); + const markAsDirtySpy = jest.spyOn(component.tokenForm.get(TokenFormControls.TokenName)!, 'markAsDirty'); + const markScopesAsDirtySpy = jest.spyOn(component.tokenForm.get(TokenFormControls.Scopes)!, 'markAsDirty'); + + component.handleSubmitForm(); + + expect(markAllAsTouchedSpy).toHaveBeenCalled(); + expect(markAsDirtySpy).toHaveBeenCalled(); + expect(markScopesAsDirtySpy).toHaveBeenCalled(); + expect(MOCK_STORE.dispatch).not.toHaveBeenCalled(); + }); + + it('should return early when tokenName is missing', () => { + fillForm('', ['read']); + + component.handleSubmitForm(); + + expect(MOCK_STORE.dispatch).not.toHaveBeenCalled(); + }); + + it('should return early when scopes is missing', () => { + fillForm('Test Token', []); + + component.handleSubmitForm(); + + expect(MOCK_STORE.dispatch).not.toHaveBeenCalled(); + }); + + it('should create token when not in edit mode', () => { + fixture.componentRef.setInput('isEditMode', false); + fillForm('Test Token', ['read', 'write']); + + MOCK_STORE.dispatch.mockReturnValue(of(undefined)); + + component.handleSubmitForm(); + + expect(MOCK_STORE.dispatch).toHaveBeenCalledWith(new CreateToken('Test Token', ['read', 'write'])); + }); + + it('should show success toast and close dialog after creating token', () => { + fixture.componentRef.setInput('isEditMode', false); + fillForm('Test Token', ['read', 'write']); + + MOCK_STORE.dispatch.mockReturnValue(of(undefined)); + + component.handleSubmitForm(); + + expect(toastService.showSuccess).toHaveBeenCalledWith('settings.tokens.toastMessage.successCreate'); + expect(dialogRef.close).toHaveBeenCalled(); + }); + + it('should show success toast and navigate after updating token', () => { + fixture.componentRef.setInput('isEditMode', true); + fillForm('Updated Token', ['read', 'write']); + + MOCK_STORE.dispatch.mockReturnValue(of(undefined)); + + component.handleSubmitForm(); + + expect(toastService.showSuccess).toHaveBeenCalledWith('settings.tokens.toastMessage.successEdit'); + expect(router.navigate).toHaveBeenCalledWith(['settings/tokens']); + }); + + it('should open dialog with correct configuration', () => { + const tokenName = 'Test Token'; + const tokenValue = 'test-token-value'; + + component.showTokenCreatedDialog(tokenName, tokenValue); + + expect(dialogService.open).toHaveBeenCalledWith( + TokenCreatedDialogComponent, + expect.objectContaining({ + width: '500px', + header: 'settings.tokens.createdDialog.title', + closeOnEscape: true, + modal: true, + closable: true, + data: { + tokenName, + tokenValue, + }, + }) + ); + }); + + it('should use TranslateService.instant for dialog header', () => { + component.showTokenCreatedDialog('Name', 'Value'); + expect(translateService.instant).toHaveBeenCalledWith('settings.tokens.createdDialog.title'); + }); + + it('should read tokens via selectSignal after create', () => { + fixture.componentRef.setInput('isEditMode', false); + fillForm('Test Token', ['read']); + + const selectSpy = jest.spyOn(MOCK_STORE, 'selectSignal'); + MOCK_STORE.dispatch.mockReturnValue(of(undefined)); + + component.handleSubmitForm(); + + expect(selectSpy).toHaveBeenCalledWith(TokensSelectors.getTokens); + }); + + it('should expose the same inputLimits as InputLimits.fullName', () => { + expect(component.inputLimits).toBe(InputLimits.fullName); + }); + + it('should require token name', () => { + const tokenNameControl = component.tokenForm.get(TokenFormControls.TokenName); + expect(tokenNameControl?.hasError('required')).toBe(true); + }); + + it('should require scopes', () => { + const scopesControl = component.tokenForm.get(TokenFormControls.Scopes); + expect(scopesControl?.hasError('required')).toBe(true); + }); + + it('should be valid when both fields are filled', () => { + fillForm('Test Token', ['read']); + + expect(component.tokenForm.valid).toBe(true); + }); + + it('should have correct input limits for token name', () => { + expect(component.inputLimits).toBeDefined(); + }); + + it('should expose tokenId from route params', () => { + expect(component.tokenId()).toBe(MOCK_TOKEN.id); + }); + + it('should expose scopes from store via tokenScopes signal', () => { + expect(component.tokenScopes()).toEqual(MOCK_SCOPES); + }); }); diff --git a/src/app/features/settings/tokens/components/token-add-edit-form/token-add-edit-form.component.ts b/src/app/features/settings/tokens/components/token-add-edit-form/token-add-edit-form.component.ts index cf2a5d7d1..2abd3b83e 100644 --- a/src/app/features/settings/tokens/components/token-add-edit-form/token-add-edit-form.component.ts +++ b/src/app/features/settings/tokens/components/token-add-edit-form/token-add-edit-form.component.ts @@ -1,10 +1,10 @@ import { createDispatchMap, select, Store } from '@ngxs/store'; -import { TranslatePipe, TranslateService } from '@ngx-translate/core'; +import { TranslatePipe } from '@ngx-translate/core'; import { Button } from 'primeng/button'; import { Checkbox } from 'primeng/checkbox'; -import { DialogService, DynamicDialogRef } from 'primeng/dynamicdialog'; +import { DynamicDialogRef } from 'primeng/dynamicdialog'; import { map } from 'rxjs'; @@ -15,7 +15,7 @@ import { ActivatedRoute, Router } from '@angular/router'; import { TextInputComponent } from '@osf/shared/components'; import { InputLimits } from '@osf/shared/constants'; -import { ToastService } from '@osf/shared/services'; +import { CustomDialogService, ToastService } from '@osf/shared/services'; import { TokenForm, TokenFormControls, TokenModel } from '../../models'; import { CreateToken, GetTokens, TokensSelectors, UpdateToken } from '../../store'; @@ -31,8 +31,7 @@ import { TokenCreatedDialogComponent } from '../token-created-dialog/token-creat export class TokenAddEditFormComponent implements OnInit { private readonly route = inject(ActivatedRoute); private readonly router = inject(Router); - private readonly dialogService = inject(DialogService); - private readonly translateService = inject(TranslateService); + private readonly customDialogService = inject(CustomDialogService); private readonly toastService = inject(ToastService); private readonly store = inject(Store); @@ -65,9 +64,7 @@ export class TokenAddEditFormComponent implements OnInit { }); constructor() { - effect(() => { - return this.isLoading() ? this.tokenForm.disable() : this.tokenForm.enable(); - }); + effect(() => (this.isLoading() ? this.tokenForm.disable() : this.tokenForm.enable())); } ngOnInit(): void { @@ -98,7 +95,7 @@ export class TokenAddEditFormComponent implements OnInit { const tokens = this.store.selectSignal(TokensSelectors.getTokens); const newToken = tokens()[0]; this.dialogRef.close(); - this.showTokenCreatedDialog(newToken.name, newToken.id); + this.showTokenCreatedDialog(newToken.name, newToken.tokenId); }, }); } else { @@ -112,12 +109,9 @@ export class TokenAddEditFormComponent implements OnInit { } showTokenCreatedDialog(tokenName: string, tokenValue: string) { - this.dialogService.open(TokenCreatedDialogComponent, { + this.customDialogService.open(TokenCreatedDialogComponent, { + header: 'settings.tokens.createdDialog.title', width: '500px', - header: this.translateService.instant('settings.tokens.createdDialog.title'), - closeOnEscape: true, - modal: true, - closable: true, data: { tokenName, tokenValue, diff --git a/src/app/features/settings/tokens/components/token-created-dialog/token-created-dialog.component.spec.ts b/src/app/features/settings/tokens/components/token-created-dialog/token-created-dialog.component.spec.ts index 515a47cdc..455b2f0de 100644 --- a/src/app/features/settings/tokens/components/token-created-dialog/token-created-dialog.component.spec.ts +++ b/src/app/features/settings/tokens/components/token-created-dialog/token-created-dialog.component.spec.ts @@ -1,34 +1,30 @@ -import { TranslatePipe } from '@ngx-translate/core'; -import { MockPipe, MockProvider } from 'ng-mocks'; +import { MockComponent, MockProvider } from 'ng-mocks'; import { DynamicDialogConfig, DynamicDialogRef } from 'primeng/dynamicdialog'; +import { NgZone } from '@angular/core'; import { ComponentFixture, TestBed } from '@angular/core/testing'; -import { By } from '@angular/platform-browser'; -import { TranslateServiceMock } from '@shared/mocks'; -import { ToastService } from '@shared/services'; +import { CopyButtonComponent } from '@shared/components'; import { TokenCreatedDialogComponent } from './token-created-dialog.component'; +import { MOCK_TOKEN } from '@testing/mocks'; +import { OSFTestingModule } from '@testing/osf.testing.module'; + describe('TokenCreatedDialogComponent', () => { let component: TokenCreatedDialogComponent; let fixture: ComponentFixture; - const mockTokenName = 'Test Token'; - const mockTokenValue = 'test-token-value'; - beforeEach(async () => { await TestBed.configureTestingModule({ - imports: [TokenCreatedDialogComponent, MockPipe(TranslatePipe)], + imports: [TokenCreatedDialogComponent, OSFTestingModule, MockComponent(CopyButtonComponent)], providers: [ - TranslateServiceMock, - MockProvider(ToastService), MockProvider(DynamicDialogRef, { close: jest.fn() }), MockProvider(DynamicDialogConfig, { data: { - tokenName: mockTokenName, - tokenValue: mockTokenValue, + tokenName: MOCK_TOKEN.name, + tokenValue: MOCK_TOKEN.scopes[0], }, }), ], @@ -43,19 +39,21 @@ describe('TokenCreatedDialogComponent', () => { expect(component).toBeTruthy(); }); - it('should initialize with token data from config', () => { - expect(component.tokenName()).toBe(mockTokenName); - expect(component.tokenId()).toBe(mockTokenValue); + it('should initialize inputs from dialog config', () => { + expect(component.tokenName()).toBe(MOCK_TOKEN.name); + expect(component.tokenId()).toBe(MOCK_TOKEN.scopes[0]); }); - it('should display token name and value in the template', () => { - const tokenInput = fixture.debugElement.query(By.css('input')).nativeElement; - expect(tokenInput.value).toBe(mockTokenValue); - }); + it('should set selection range after render', () => { + const fixture = TestBed.createComponent(TokenCreatedDialogComponent); + const zone = TestBed.inject(NgZone); + const spy = jest.spyOn(HTMLInputElement.prototype, 'setSelectionRange'); + + zone.run(() => { + fixture.autoDetectChanges(true); + fixture.detectChanges(); + }); - it('should set input selection range to 0 after render', () => { - const input = fixture.debugElement.query(By.css('input')).nativeElement; - expect(input.selectionStart).toBe(0); - expect(input.selectionEnd).toBe(0); + expect(spy).toHaveBeenCalledWith(0, 0); }); }); diff --git a/src/app/features/settings/tokens/mappers/token.mapper.ts b/src/app/features/settings/tokens/mappers/token.mapper.ts index 92451a3cf..00a23d80c 100644 --- a/src/app/features/settings/tokens/mappers/token.mapper.ts +++ b/src/app/features/settings/tokens/mappers/token.mapper.ts @@ -16,6 +16,7 @@ export class TokenMapper { static fromGetResponse(response: TokenGetResponseJsonApi): TokenModel { return { id: response.id, + tokenId: response.attributes.token_id, name: response.attributes.name, scopes: response.embeds.scopes.data.map((item) => item.id), }; diff --git a/src/app/features/settings/tokens/models/token-json-api.model.ts b/src/app/features/settings/tokens/models/token-json-api.model.ts index 66bc0ac31..c2875fe9b 100644 --- a/src/app/features/settings/tokens/models/token-json-api.model.ts +++ b/src/app/features/settings/tokens/models/token-json-api.model.ts @@ -16,6 +16,7 @@ export interface TokenGetResponseJsonApi { interface TokenAttributesJsonApi { name: string; + token_id: string; } interface TokenEmbedsJsonApi { diff --git a/src/app/features/settings/tokens/models/token.model.ts b/src/app/features/settings/tokens/models/token.model.ts index 735b29bcd..2174e0e66 100644 --- a/src/app/features/settings/tokens/models/token.model.ts +++ b/src/app/features/settings/tokens/models/token.model.ts @@ -1,5 +1,6 @@ export interface TokenModel { id: string; + tokenId: string; name: string; scopes: string[]; } diff --git a/src/app/features/settings/tokens/pages/token-details/token-details.component.spec.ts b/src/app/features/settings/tokens/pages/token-details/token-details.component.spec.ts index 4b95a898c..d4ebaeb3b 100644 --- a/src/app/features/settings/tokens/pages/token-details/token-details.component.spec.ts +++ b/src/app/features/settings/tokens/pages/token-details/token-details.component.spec.ts @@ -1,75 +1,103 @@ import { Store } from '@ngxs/store'; -import { TranslateModule } from '@ngx-translate/core'; import { MockProvider } from 'ng-mocks'; -import { ConfirmationService, MessageService } from 'primeng/api'; - import { of } from 'rxjs'; -import { signal } from '@angular/core'; import { ComponentFixture, TestBed } from '@angular/core/testing'; -import { ActivatedRoute, provideRouter, RouterModule } from '@angular/router'; +import { ActivatedRoute } from '@angular/router'; -import { ToastService } from '@shared/services'; +import { CustomConfirmationService, CustomDialogService } from '@shared/services'; import { TokenModel } from '../../models'; +import { TokensSelectors } from '../../store'; import { TokenDetailsComponent } from './token-details.component'; -describe.only('TokenDetailsComponent', () => { +import { OSFTestingModule } from '@testing/osf.testing.module'; +import { CustomDialogServiceMockBuilder } from '@testing/providers/custom-dialog-provider.mock'; + +describe('TokenDetailsComponent', () => { let component: TokenDetailsComponent; let fixture: ComponentFixture; - let store: Partial; - let confirmationService: Partial; + let confirmationService: Partial; + let mockCustomDialogService: ReturnType; const mockToken: TokenModel = { id: '1', name: 'Test Token', - tokenId: 'token1', scopes: ['read', 'write'], - ownerId: 'user1', }; + const storeMock = { + dispatch: jest.fn().mockReturnValue(of({})), + selectSnapshot: jest.fn().mockImplementation((selector: unknown) => { + if (selector === TokensSelectors.getTokenById) { + return (id: string) => (id === mockToken.id ? mockToken : null); + } + return null; + }), + selectSignal: jest.fn().mockImplementation((selector: unknown) => { + if (selector === TokensSelectors.isTokensLoading) return () => false; + if (selector === TokensSelectors.getTokenById) + return () => (id: string) => (id === mockToken.id ? mockToken : null); + return () => null; + }), + } as unknown as jest.Mocked; + beforeEach(async () => { - const tokenSelector = (id: string) => (id === mockToken.id ? mockToken : null); + mockCustomDialogService = CustomDialogServiceMockBuilder.create().build(); - store = { - dispatch: jest.fn().mockReturnValue(of(undefined)), - selectSignal: jest.fn().mockReturnValue(signal(tokenSelector)), - selectSnapshot: jest.fn().mockReturnValue(tokenSelector), - }; confirmationService = { - confirm: jest.fn(), + confirmDelete: jest.fn(), }; await TestBed.configureTestingModule({ - imports: [TokenDetailsComponent, TranslateModule.forRoot(), RouterModule.forRoot([])], + imports: [TokenDetailsComponent, OSFTestingModule], providers: [ - MockProvider(ToastService), - { provide: Store, useValue: store }, - { provide: ConfirmationService, useValue: confirmationService }, - { provide: MessageService, useValue: {} }, // ✅ ADD THIS LINE + MockProvider(Store, storeMock), + MockProvider(CustomConfirmationService, confirmationService), + MockProvider(CustomDialogService, mockCustomDialogService), { provide: ActivatedRoute, useValue: { params: of({ id: mockToken.id }), snapshot: { + paramMap: new Map(Object.entries({ id: mockToken.id })), params: { id: mockToken.id }, queryParams: {}, }, }, }, - provideRouter([]), ], }).compileComponents(); fixture = TestBed.createComponent(TokenDetailsComponent); component = fixture.componentInstance; + fixture.detectChanges(); }); it('should create', () => { expect(component).toBeTruthy(); }); + + it('should dispatch GetTokenById on init when tokenId exists', () => { + component.ngOnInit(); + expect(storeMock.dispatch).toHaveBeenCalled(); + }); + + it('should confirm and delete token on deleteToken()', () => { + (confirmationService.confirmDelete as jest.Mock).mockImplementation(({ onConfirm }: any) => onConfirm()); + + component.deleteToken(); + + expect(confirmationService.confirmDelete).toHaveBeenCalledWith( + expect.objectContaining({ + headerKey: 'settings.tokens.confirmation.delete.title', + messageKey: 'settings.tokens.confirmation.delete.message', + }) + ); + expect(storeMock.dispatch).toHaveBeenCalled(); + }); }); diff --git a/src/app/features/settings/tokens/pages/token-details/token-details.component.ts b/src/app/features/settings/tokens/pages/token-details/token-details.component.ts index 454885e29..107d978dd 100644 --- a/src/app/features/settings/tokens/pages/token-details/token-details.component.ts +++ b/src/app/features/settings/tokens/pages/token-details/token-details.component.ts @@ -4,7 +4,6 @@ import { TranslatePipe } from '@ngx-translate/core'; import { Button } from 'primeng/button'; import { Card } from 'primeng/card'; -import { DialogService, DynamicDialogRef } from 'primeng/dynamicdialog'; import { ChangeDetectionStrategy, Component, computed, inject, OnInit, signal } from '@angular/core'; import { ActivatedRoute, Router, RouterLink } from '@angular/router'; @@ -21,7 +20,6 @@ import { DeleteToken, GetTokenById, TokensSelectors } from '../../store'; changeDetection: ChangeDetectionStrategy.OnPush, templateUrl: './token-details.component.html', styleUrls: ['./token-details.component.scss'], - providers: [DialogService, DynamicDialogRef], }) export class TokenDetailsComponent implements OnInit { private readonly customConfirmationService = inject(CustomConfirmationService); diff --git a/src/app/features/settings/tokens/pages/tokens-list/tokens-list.component.spec.ts b/src/app/features/settings/tokens/pages/tokens-list/tokens-list.component.spec.ts index a7060bd02..d97150ef1 100644 --- a/src/app/features/settings/tokens/pages/tokens-list/tokens-list.component.spec.ts +++ b/src/app/features/settings/tokens/pages/tokens-list/tokens-list.component.spec.ts @@ -1,4 +1,5 @@ import { TranslatePipe } from '@ngx-translate/core'; +import { MockPipe } from 'ng-mocks'; import { Button } from 'primeng/button'; import { Card } from 'primeng/card'; @@ -9,7 +10,8 @@ import { of } from 'rxjs'; import { ComponentFixture, TestBed } from '@angular/core/testing'; import { RouterLink } from '@angular/router'; -import { CustomConfirmationService, ToastService } from '@osf/shared/services'; +import { CustomConfirmationService } from '@osf/shared/services/custom-confirmation.service'; +import { ToastService } from '@osf/shared/services/toast.service'; import { TokenModel } from '../../models'; @@ -18,7 +20,12 @@ import { TokensListComponent } from './tokens-list.component'; jest.mock('@core/store/user', () => ({})); jest.mock('@osf/shared/stores/collections', () => ({})); jest.mock('@osf/shared/stores/addons', () => ({})); -jest.mock('@osf/features/settings/tokens/store', () => ({})); +jest.mock('../../store', () => ({ + TokensSelectors: { + isTokensLoading: function isTokensLoading() {}, + getTokens: function getTokens() {}, + }, +})); const mockGetTokens = jest.fn(); const mockDeleteToken = jest.fn(() => of(void 0)); @@ -31,9 +38,9 @@ jest.mock('@ngxs/store', () => { })), select: (selectorFn: any) => { const name = selectorFn?.name; - if (name === 'isTokensLoading') return of(false); - if (name === 'getTokens') return of([]); - return of(undefined); + if (name === 'isTokensLoading') return () => false; + if (name === 'getTokens') return () => []; + return () => undefined; }, }; }); @@ -52,7 +59,7 @@ describe('TokensListComponent', () => { beforeEach(async () => { await TestBed.configureTestingModule({ - imports: [TokensListComponent, TranslatePipe, Button, Card, Skeleton, RouterLink], + imports: [TokensListComponent, MockPipe(TranslatePipe), Button, Card, Skeleton, RouterLink], providers: [ { provide: CustomConfirmationService, useValue: mockConfirmationService }, { provide: ToastService, useValue: mockToastService }, diff --git a/src/app/features/settings/tokens/pages/tokens-list/tokens-list.component.ts b/src/app/features/settings/tokens/pages/tokens-list/tokens-list.component.ts index 12b081d8d..46c794d28 100644 --- a/src/app/features/settings/tokens/pages/tokens-list/tokens-list.component.ts +++ b/src/app/features/settings/tokens/pages/tokens-list/tokens-list.component.ts @@ -26,7 +26,7 @@ export class TokensListComponent implements OnInit { private readonly customConfirmationService = inject(CustomConfirmationService); private readonly toastService = inject(ToastService); - protected readonly isLoading = select(TokensSelectors.isTokensLoading); + readonly isLoading = select(TokensSelectors.isTokensLoading); tokens = select(TokensSelectors.getTokens); diff --git a/src/app/features/settings/tokens/services/tokens.service.spec.ts b/src/app/features/settings/tokens/services/tokens.service.spec.ts index 7d14565e0..d8aa7b31b 100644 --- a/src/app/features/settings/tokens/services/tokens.service.spec.ts +++ b/src/app/features/settings/tokens/services/tokens.service.spec.ts @@ -42,7 +42,7 @@ describe('TokensService', () => { jsonApiServiceMock.get.mockReturnValue(of(mockResponse)); service.getScopes().subscribe((result) => { - expect(jsonApiServiceMock.get).toHaveBeenCalledWith(`${environment.apiUrl}/scopes/`); + expect(jsonApiServiceMock.get).toHaveBeenCalledWith(`${environment.apiDomainUrl}/v2/scopes/`); expect(result).toBe(mappedScopes); done(); }); @@ -75,7 +75,7 @@ describe('TokensService', () => { jsonApiServiceMock.get.mockReturnValue(of(mockApiResponse)); service.getTokenById(tokenId).subscribe((token) => { - expect(jsonApiServiceMock.get).toHaveBeenCalledWith(`${environment.apiUrl}/tokens/${tokenId}/`); + expect(jsonApiServiceMock.get).toHaveBeenCalledWith(`${environment.apiDomainUrl}/v2/tokens/${tokenId}/`); expect(token).toBe(mappedToken); done(); }); @@ -94,7 +94,7 @@ describe('TokensService', () => { jsonApiServiceMock.post.mockReturnValue(of(apiResponse)); service.createToken(name, scopes).subscribe((token) => { - expect(jsonApiServiceMock.post).toHaveBeenCalledWith(`${environment.apiUrl}/tokens/`, requestBody); + expect(jsonApiServiceMock.post).toHaveBeenCalledWith(`${environment.apiDomainUrl}/v2/tokens/`, requestBody); expect(token).toEqual(mapped); done(); }); @@ -114,7 +114,10 @@ describe('TokensService', () => { jsonApiServiceMock.patch.mockReturnValue(of(apiResponse)); service.updateToken(tokenId, name, scopes).subscribe((token) => { - expect(jsonApiServiceMock.patch).toHaveBeenCalledWith(`${environment.apiUrl}/tokens/${tokenId}/`, requestBody); + expect(jsonApiServiceMock.patch).toHaveBeenCalledWith( + `${environment.apiDomainUrl}/v2/tokens/${tokenId}/`, + requestBody + ); expect(token).toEqual(mapped); done(); }); @@ -125,7 +128,7 @@ describe('TokensService', () => { jsonApiServiceMock.delete.mockReturnValue(of(void 0)); service.deleteToken(tokenId).subscribe((result) => { - expect(jsonApiServiceMock.delete).toHaveBeenCalledWith(`${environment.apiUrl}/tokens/${tokenId}/`); + expect(jsonApiServiceMock.delete).toHaveBeenCalledWith(`${environment.apiDomainUrl}/v2/tokens/${tokenId}/`); expect(result).toBeUndefined(); done(); }); diff --git a/src/app/features/settings/tokens/services/tokens.service.ts b/src/app/features/settings/tokens/services/tokens.service.ts index 2735c5bad..41f0bd75f 100644 --- a/src/app/features/settings/tokens/services/tokens.service.ts +++ b/src/app/features/settings/tokens/services/tokens.service.ts @@ -3,35 +3,39 @@ import { map } from 'rxjs/operators'; import { inject, Injectable } from '@angular/core'; +import { ENVIRONMENT } from '@core/provider/environment.provider'; import { JsonApiResponse } from '@osf/shared/models'; import { JsonApiService } from '@osf/shared/services'; import { ScopeMapper, TokenMapper } from '../mappers'; import { ScopeJsonApi, ScopeModel, TokenGetResponseJsonApi, TokenModel } from '../models'; -import { environment } from 'src/environments/environment'; - @Injectable({ providedIn: 'root', }) export class TokensService { private readonly jsonApiService = inject(JsonApiService); + private readonly environment = inject(ENVIRONMENT); + + get apiUrl() { + return `${this.environment.apiDomainUrl}/v2`; + } getScopes(): Observable { return this.jsonApiService - .get>(`${environment.apiUrl}/scopes/`) + .get>(`${this.apiUrl}/scopes/`) .pipe(map((responses) => ScopeMapper.fromResponse(responses.data))); } getTokens(): Observable { return this.jsonApiService - .get>(`${environment.apiUrl}/tokens/`) + .get>(`${this.apiUrl}/tokens/`) .pipe(map((responses) => responses.data.map((response) => TokenMapper.fromGetResponse(response)))); } getTokenById(tokenId: string): Observable { return this.jsonApiService - .get>(`${environment.apiUrl}/tokens/${tokenId}/`) + .get>(`${this.apiUrl}/tokens/${tokenId}/`) .pipe(map((response) => TokenMapper.fromGetResponse(response.data))); } @@ -39,7 +43,7 @@ export class TokensService { const request = TokenMapper.toRequest(name, scopes); return this.jsonApiService - .post>(environment.apiUrl + '/tokens/', request) + .post>(`${this.apiUrl}/tokens/`, request) .pipe(map((response) => TokenMapper.fromGetResponse(response.data))); } @@ -47,11 +51,11 @@ export class TokensService { const request = TokenMapper.toRequest(name, scopes); return this.jsonApiService - .patch(`${environment.apiUrl}/tokens/${tokenId}/`, request) + .patch(`${this.apiUrl}/tokens/${tokenId}/`, request) .pipe(map((response) => TokenMapper.fromGetResponse(response))); } deleteToken(tokenId: string): Observable { - return this.jsonApiService.delete(`${environment.apiUrl}/tokens/${tokenId}/`); + return this.jsonApiService.delete(`${this.apiUrl}/tokens/${tokenId}/`); } } diff --git a/src/app/features/settings/tokens/tokens.component.spec.ts b/src/app/features/settings/tokens/tokens.component.spec.ts index de8bf16cc..44090e96a 100644 --- a/src/app/features/settings/tokens/tokens.component.spec.ts +++ b/src/app/features/settings/tokens/tokens.component.spec.ts @@ -1,24 +1,61 @@ +import { Store } from '@ngxs/store'; + +import { MockProvider } from 'ng-mocks'; + +import { DialogService } from 'primeng/dynamicdialog'; + import { ComponentFixture, TestBed } from '@angular/core/testing'; +import { CustomDialogService } from '@shared/services'; + +import { GetScopes } from './store'; import { TokensComponent } from './tokens.component'; +import { MOCK_STORE } from '@testing/mocks'; import { OSFTestingModule } from '@testing/osf.testing.module'; +import { CustomDialogServiceMockBuilder } from '@testing/providers/custom-dialog-provider.mock'; +import { DialogServiceMockBuilder } from '@testing/providers/dialog-provider.mock'; -describe.skip('TokensComponent', () => { +describe('TokensComponent', () => { let component: TokensComponent; let fixture: ComponentFixture; + let mockCustomDialogService: ReturnType; + let mockDialogService: ReturnType; beforeEach(async () => { + mockCustomDialogService = CustomDialogServiceMockBuilder.create().withOpen(jest.fn()).build(); + mockDialogService = DialogServiceMockBuilder.create().withOpenMock().build(); + await TestBed.configureTestingModule({ imports: [TokensComponent, OSFTestingModule], + providers: [ + MockProvider(Store, MOCK_STORE), + MockProvider(CustomDialogService, mockCustomDialogService), + MockProvider(DialogService, mockDialogService), + ], }).compileComponents(); fixture = TestBed.createComponent(TokensComponent); component = fixture.componentInstance; + (MOCK_STORE.dispatch as jest.Mock).mockClear(); fixture.detectChanges(); }); it('should create', () => { expect(component).toBeTruthy(); }); + + it('should dispatch getScopes on init', () => { + expect(MOCK_STORE.dispatch).toHaveBeenCalledWith(new GetScopes()); + }); + + it('should open create token dialog with correct config', () => { + component.createToken(); + expect(mockCustomDialogService.open).toHaveBeenCalledWith( + expect.any(Function), + expect.objectContaining({ + header: 'settings.tokens.form.createTitle', + }) + ); + }); }); diff --git a/src/app/features/settings/tokens/tokens.component.ts b/src/app/features/settings/tokens/tokens.component.ts index 194bfd636..4cb0d2dbf 100644 --- a/src/app/features/settings/tokens/tokens.component.ts +++ b/src/app/features/settings/tokens/tokens.component.ts @@ -1,8 +1,6 @@ import { createDispatchMap } from '@ngxs/store'; -import { TranslatePipe, TranslateService } from '@ngx-translate/core'; - -import { DialogService } from 'primeng/dynamicdialog'; +import { TranslatePipe } from '@ngx-translate/core'; import { map } from 'rxjs'; @@ -11,7 +9,7 @@ import { toSignal } from '@angular/core/rxjs-interop'; import { Router, RouterOutlet } from '@angular/router'; import { SubHeaderComponent } from '@osf/shared/components'; -import { IS_SMALL } from '@osf/shared/helpers'; +import { CustomDialogService } from '@osf/shared/services'; import { TokenAddEditFormComponent } from './components'; import { GetScopes } from './store'; @@ -21,16 +19,13 @@ import { GetScopes } from './store'; imports: [SubHeaderComponent, RouterOutlet, TranslatePipe], templateUrl: './tokens.component.html', styleUrl: './tokens.component.scss', - providers: [DialogService], changeDetection: ChangeDetectionStrategy.OnPush, }) export class TokensComponent implements OnInit { - private readonly dialogService = inject(DialogService); + private readonly customDialogService = inject(CustomDialogService); private readonly router = inject(Router); - private readonly translateService = inject(TranslateService); private readonly actions = createDispatchMap({ getScopes: GetScopes }); - readonly isSmall = toSignal(inject(IS_SMALL)); readonly isBaseRoute = toSignal(this.router.events.pipe(map(() => this.router.url === '/settings/tokens')), { initialValue: this.router.url === '/settings/tokens', }); @@ -40,15 +35,9 @@ export class TokensComponent implements OnInit { } createToken(): void { - const dialogWidth = this.isSmall() ? '800px ' : '95vw'; - - this.dialogService.open(TokenAddEditFormComponent, { - width: dialogWidth, - focusOnShow: false, - header: this.translateService.instant('settings.tokens.form.createTitle'), - closeOnEscape: true, - modal: true, - closable: true, + this.customDialogService.open(TokenAddEditFormComponent, { + header: 'settings.tokens.form.createTitle', + width: '800px', }); } } diff --git a/src/app/features/static/privacy-policy/privacy-policy.component.html b/src/app/features/static/privacy-policy/privacy-policy.component.html index 57e496bbd..ab2600e78 100644 --- a/src/app/features/static/privacy-policy/privacy-policy.component.html +++ b/src/app/features/static/privacy-policy/privacy-policy.component.html @@ -716,7 +716,7 @@

20. CONTACTING US

Version history for this policy is available - here + here.

diff --git a/src/app/features/static/privacy-policy/privacy-policy.component.ts b/src/app/features/static/privacy-policy/privacy-policy.component.ts index b7fc71312..8ee7afbcd 100644 --- a/src/app/features/static/privacy-policy/privacy-policy.component.ts +++ b/src/app/features/static/privacy-policy/privacy-policy.component.ts @@ -1,6 +1,6 @@ -import { ChangeDetectionStrategy, Component } from '@angular/core'; +import { ChangeDetectionStrategy, Component, inject } from '@angular/core'; -import { environment } from 'src/environments/environment'; +import { ENVIRONMENT } from '@core/provider/environment.provider'; @Component({ selector: 'osf-privacy-policy', @@ -10,5 +10,7 @@ import { environment } from 'src/environments/environment'; changeDetection: ChangeDetectionStrategy.OnPush, }) export class PrivacyPolicyComponent { - readonly supportEmail = environment.supportEmail; + private readonly environment = inject(ENVIRONMENT); + + readonly supportEmail = this.environment.supportEmail; } diff --git a/src/app/features/static/terms-of-use/terms-of-use.component.html b/src/app/features/static/terms-of-use/terms-of-use.component.html index df74a589c..ccfc37295 100644 --- a/src/app/features/static/terms-of-use/terms-of-use.component.html +++ b/src/app/features/static/terms-of-use/terms-of-use.component.html @@ -674,7 +674,7 @@

24. QUESTIONS

Version history for this policy is available - here + here.

diff --git a/src/app/features/static/terms-of-use/terms-of-use.component.ts b/src/app/features/static/terms-of-use/terms-of-use.component.ts index 455f4b1c0..b8d4b331b 100644 --- a/src/app/features/static/terms-of-use/terms-of-use.component.ts +++ b/src/app/features/static/terms-of-use/terms-of-use.component.ts @@ -1,6 +1,6 @@ -import { ChangeDetectionStrategy, Component } from '@angular/core'; +import { ChangeDetectionStrategy, Component, inject } from '@angular/core'; -import { environment } from 'src/environments/environment'; +import { ENVIRONMENT } from '@core/provider/environment.provider'; @Component({ selector: 'osf-terms-of-use', @@ -10,5 +10,7 @@ import { environment } from 'src/environments/environment'; changeDetection: ChangeDetectionStrategy.OnPush, }) export class TermsOfUseComponent { - readonly supportEmail = environment.supportEmail; + private readonly environment = inject(ENVIRONMENT); + + readonly supportEmail = this.environment.supportEmail; } diff --git a/src/app/shared/components/add-project-form/add-project-form.component.html b/src/app/shared/components/add-project-form/add-project-form.component.html index ee76fb2c5..3de7dced4 100644 --- a/src/app/shared/components/add-project-form/add-project-form.component.html +++ b/src/app/shared/components/add-project-form/add-project-form.component.html @@ -20,15 +20,18 @@ />
-
-

- {{ 'myProjects.createProject.affiliation.title' | translate }} -

- -
+ @if (affiliations() && affiliations().length) { +
+

+ {{ 'myProjects.createProject.affiliation.title' | translate }} +

+ +
+ }