diff --git a/.eslintrc.json b/.eslintrc.json index bcc7ef05..356d70c6 100644 --- a/.eslintrc.json +++ b/.eslintrc.json @@ -8,28 +8,16 @@ "files": [ "*.ts" ], - "parserOptions": { - "project": [ - "tsconfig.json" - ], - "createDefaultProgram": true - }, "extends": [ - "plugin:@angular-eslint/ng-cli-compat", - "plugin:@angular-eslint/ng-cli-compat--formatting-add-on", - "plugin:@angular-eslint/template/process-inline-templates" + "eslint:recommended", + "plugin:@typescript-eslint/recommended", + "plugin:@angular-eslint/recommended", + "plugin:@angular-eslint/template/process-inline-templates", + "plugin:@ngrx/recommended-requiring-type-checking" ], "rules": { "no-console": "error", "no-debugger": "error", - "@angular-eslint/component-selector": [ - "error", - { - "type": "element", - "prefix": "sm", - "style": "kebab-case" - } - ], "@angular-eslint/directive-selector": [ "error", { @@ -38,49 +26,15 @@ "style": "camelCase" } ], - "@typescript-eslint/consistent-type-definitions": "error", - "@typescript-eslint/dot-notation": "off", - "@typescript-eslint/member-ordering": "off", - "@typescript-eslint/explicit-member-accessibility": [ - "off", - { - "accessibility": "explicit" - } - ], - "@typescript-eslint/no-inferrable-types": [ - "off", - { - "ignoreParameters": true - } - ], - "@typescript-eslint/no-unused-expressions": "off", - "@typescript-eslint/no-unused-vars": "error", - "@typescript-eslint/no-use-before-define": "error", - "brace-style": [ - "error", - "1tbs" - ], - "eqeqeq": [ - "off", - "smart" - ], - "id-blacklist": "off", - "id-match": "off", - "max-len": [ + "@angular-eslint/component-selector": [ "error", { - "code": 2000 + "type": "element", + "prefix": "sm", + "style": "kebab-case" } ], - "no-bitwise": "off", - "no-shadow": [ - "off", - { - "hoist": "all" - } - ], - "no-underscore-dangle": "off", - "valid-typeof": "error" + "@ngrx/prefer-effect-callback-in-block-statement": "off" } }, { @@ -88,7 +42,8 @@ "*.html" ], "extends": [ - "plugin:@angular-eslint/template/recommended" + "plugin:@angular-eslint/template/recommended", + "plugin:@angular-eslint/template/accessibility" ], "rules": { "@angular-eslint/template/use-track-by-function": "warn" diff --git a/README.md b/README.md index dbcb2675..9c81f583 100644 --- a/README.md +++ b/README.md @@ -2,16 +2,22 @@ ## Building the UI from source ### Prerequisite -* a linux machine -* Node 16 with latest npm -* clone the project to your local machine +* Node 18 with latest npm +* use git to clone the project to your local machine -### build -* `cd` to the root of the project +### Build +* `cd clearml-web` to the root of the project * run `npm ci` to install required node modules * run `npm run build` -## Application Structure + +### Development +During development, the development server will need to proxy an API server. to achieve that: +* in [proxy.config.js](proxy.config.js) update the list of targets in line 3 with a working API server URI. +* Angular is already configured to use this proxy configuration +* If more than 1 API server is configured `apiBaseUrl` should be updated with the server enumeration in [environment.ts](src%2Fenvironments%2Fenvironment.ts) + +Start the development server: `npm run start` #### Business Logic module Contains ClearML logic. api calls and ClearML objects (e.g tasks, models) and ClearML logic function (e.g isTaskHidden) diff --git a/angular.json b/angular.json index abd1e6c9..9f71d603 100644 --- a/angular.json +++ b/angular.json @@ -43,8 +43,7 @@ "src/fonts.scss" ], "scripts": [ - "node_modules/ngx-markdown-editor/assets/highlight.js/highlight.min.js", - "node_modules/ngx-markdown-editor/assets/marked.min.js" + "node_modules/ngx-markdown-editor/assets/highlight.js/highlight.min.js" ], "allowedCommonJsDependencies": [ "ansi-to-html", @@ -65,7 +64,9 @@ "dom-to-image", "ace-builds", "hocon-parser", - "taira" + "taira", + "base-64", + "export-to-csv" ], "vendorChunk": true, "extractLicenses": false, @@ -319,5 +320,8 @@ "@angular-eslint/schematics:library": { "setParserOptionsProject": true } + }, + "cli": { + "analytics": false } } diff --git a/package-lock.json b/package-lock.json index dbbb6e80..0fa865d1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,41 +1,40 @@ { "name": "clearml-webapp", - "version": "1.12.0", + "version": "1.13.0", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "clearml-webapp", - "version": "1.12.0", + "version": "1.13.0", "dependencies": { - "@angular/animations": "^15.2.8", - "@angular/cdk": "^15.2.8", - "@angular/common": "^15.2.8", - "@angular/compiler": "^15.2.8", - "@angular/core": "^15.2.8", - "@angular/forms": "^15.2.8", - "@angular/material": "^15.2.8", - "@angular/platform-browser": "^15.2.8", - "@angular/platform-browser-dynamic": "^15.2.8", - "@angular/platform-server": "^15.2.8", - "@angular/router": "^15.2.8", - "@angular/service-worker": "^15.2.8", - "@angular/youtube-player": "^15.2.8", - "@aws-sdk/client-s3": "^3.360.0", - "@aws-sdk/s3-request-presigner": "^3.360.0", - "@ctrl/ngx-github-buttons": "^8.0.0", + "@angular/animations": "^16.1.5", + "@angular/cdk": "16.1.5", + "@angular/common": "^16.1.5", + "@angular/compiler": "^16.1.5", + "@angular/core": "^16.1.5", + "@angular/forms": "^16.1.5", + "@angular/material": "16.1.5", + "@angular/platform-browser": "^16.1.5", + "@angular/platform-browser-dynamic": "^16.1.5", + "@angular/platform-server": "^16.1.5", + "@angular/router": "^16.1.5", + "@angular/service-worker": "^16.1.5", + "@angular/youtube-player": "^16.1.5", + "@aws-sdk/client-s3": "^3.370.0", + "@aws-sdk/s3-request-presigner": "^3.370.0", + "@ctrl/ngx-github-buttons": "^9.0.0", + "@ctrl/tinycolor": "^4.0.1", "@ngneat/dag": "^2.0.0", - "@ngrx/effects": "^15.4.0", - "@ngrx/entity": "^15.4.0", - "@ngrx/router-store": "^15.4.0", - "@ngrx/store": "^15.4.0", - "ace-builds": "^1.18.0", - "angular-google-tag-manager": "^1.7.0", + "@ngrx/effects": "^16.1.0", + "@ngrx/entity": "^16.1.0", + "@ngrx/router-store": "^16.1.0", + "@ngrx/store": "^16.1.0", + "ace-builds": "^1.23.4", "angular-resizable-element": "^7.0.2", "angular-split": "^15.0.0", - "angular2-csv": "^0.2.9", "ansi-to-html": "^0.7.2", - "bootstrap": "^5.2.3", + "bootstrap": "^5.3.0", "britecharts": "^3.0.0-alpha-6.1.6", "curved-arrows": "^0.1.0", "d3-selection": "^3.0.0", @@ -43,6 +42,8 @@ "d3-zoom": "^3.0.0", "diff": "^5.1.0", "dom-to-image": "^2.6.0", + "dompurify": "^3.0.6", + "export-to-csv": "^0.2.1", "filesize": "^10.0.7", "has-ansi": "^5.0.1", "hocon-parser": "^1.0.1", @@ -50,63 +51,73 @@ "localforage": "^1.10.0", "lodash-es": "^4.17.21", "lucene": "^2.1.1", + "marked": "^7.0.5", "ngx-clipboard": "^16.0.0", "ngx-color-picker": "^14.0.0", - "ngx-device-detector": "^5.0.1", + "ngx-device-detector": "^6.0.2", "ngx-markdown-editor": "^5.3.1", "ngx-print": "^1.3.1", "ngx-window-token": "^7.0.0", "object-hash": "^3.0.0", "primeicons": "^6.0.1", - "primeng": "^15.4.1", + "primeng": "^16.2.0", "process": "^0.11.10", - "rxjs": "^7.8.0", + "rxjs": "^7.8.1", "string-to-color": "^2.2.2", "taira": "^3.2.2", - "tinycolor2": "^1.6.0", - "tslib": "^2.5.0", - "url": "^0.11.0", + "tslib": "^2.6.0", + "url": "^0.11.1", "uuid": "^9.0.0", - "zone.js": "^0.12.0" + "zone.js": "~0.13.1" }, "devDependencies": { - "@angular-devkit/build-angular": "^15.2.6", - "@angular-devkit/core": "^15.2.6", - "@angular-devkit/schematics": "^15.2.6", - "@angular-devkit/schematics-cli": "^15.2.5", - "@angular-eslint/builder": "^15.2.1", - "@angular-eslint/eslint-plugin": "^15.2.1", - "@angular-eslint/eslint-plugin-template": "^15.2.1", - "@angular-eslint/schematics": "15.2.1", - "@angular-eslint/template-parser": "^15.2.1", - "@angular/cli": "^15.2.6", - "@angular/compiler-cli": "^15.2.8", - "@angular/language-service": "^15.2.8", + "@angular-devkit/build-angular": "^16.1.4", + "@angular-devkit/core": "^16.1.4", + "@angular-devkit/schematics": "^16.1.4", + "@angular-devkit/schematics-cli": "^16.1.4", + "@angular-eslint/builder": "16.1.2", + "@angular-eslint/eslint-plugin": "16.1.2", + "@angular-eslint/eslint-plugin-template": "16.1.2", + "@angular-eslint/schematics": "16.1.2", + "@angular-eslint/template-parser": "^16.1.2", + "@angular/cli": "^16.1.4", + "@angular/compiler-cli": "^16.1.5", + "@angular/language-service": "^16.1.5", "@fortawesome/fontawesome-free": "^6.4.0", - "@ngrx/schematics": "^15.4.0", - "@ngrx/store-devtools": "^15.4.0", + "@ngrx/eslint-plugin": "^16.2.0", + "@ngrx/schematics": "^16.1.0", + "@ngrx/store-devtools": "^16.1.0", "@types/d3-selection": "^3.0.5", - "@types/lodash-es": "^4.17.7", + "@types/lodash-es": "^4.17.8", "@types/node": "^18.16.0", - "@types/plotly.js": "^2.12.18", + "@types/plotly.js": "^2.12.24", + "@types/tinycolor2": "^1.4.3", "@types/uuid": "^9.0.2", - "@typescript-eslint/eslint-plugin": "^5.59.1", - "@typescript-eslint/parser": "^5.59.1", - "codelyzer": "^6.0.2", - "eslint": "^8.39.0", - "eslint-plugin-import": "2.27.5", - "eslint-plugin-jsdoc": "41.1.2", - "eslint-plugin-prefer-arrow": "1.2.3", - "typescript": "~4.9.5" + "@typescript-eslint/eslint-plugin": "6.7.0", + "@typescript-eslint/parser": "6.7.0", + "eslint": "^8.49.0", + "eslint-plugin-import": "^2.28.1", + "eslint-plugin-jsdoc": "^46.6.0", + "eslint-plugin-prefer-arrow": "^1.2.3", + "typescript": "~5.1.6" + } + }, + "node_modules/@aashutoshrathi/word-wrap": { + "version": "1.2.6", + "resolved": "https://registry.npmjs.org/@aashutoshrathi/word-wrap/-/word-wrap-1.2.6.tgz", + "integrity": "sha512-1Yjs2SvM8TflER/OD3cOjhWWOZb58A2t7wpE2S9XfBYTiIl+XFhQG2bjy4Pu1I+EAlCNUzRDYDdFwFYUKvXcIA==", + "dev": true, + "engines": { + "node": ">=0.10.0" } }, "node_modules/@ampproject/remapping": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.2.0.tgz", - "integrity": "sha512-qRmjj8nj9qmLTQXXmaR1cck3UXSRMPrbsLJAasZpF+t3riI71BXed5ebIOYwQntykeZuhjsdweEc9BxH5Jc26w==", + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.2.1.tgz", + "integrity": "sha512-lFMjJTrFL3j7L9yBxwYfCq2k6qqwHyzuUl/XBnif78PWTJYyL/dfowQHWE3sp6U6ZzqWiiIZnpTMO96zhkjwtg==", "dev": true, "dependencies": { - "@jridgewell/gen-mapping": "^0.1.0", + "@jridgewell/gen-mapping": "^0.3.0", "@jridgewell/trace-mapping": "^0.3.9" }, "engines": { @@ -114,72 +125,55 @@ } }, "node_modules/@angular-devkit/architect": { - "version": "0.1502.8", - "resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1502.8.tgz", - "integrity": "sha512-rTltw2ABHrcKc8EGimALvXmrDTP5hlNbEy6nYolJoXEI9EwHgriWrVLVPs3OEF+/ed47dbJi9EGOXUOgzgpB5A==", + "version": "0.1602.3", + "resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1602.3.tgz", + "integrity": "sha512-7f4U5LzAYRcQcOvRJwunSwLd5/nwbNxY/E4jTgwFxCNvCBSMysNJBi3g9v0t8zm2XYOv4ok5eYqIwriXVypRBg==", "dev": true, "dependencies": { - "@angular-devkit/core": "15.2.8", - "rxjs": "6.6.7" + "@angular-devkit/core": "16.2.3", + "rxjs": "7.8.1" }, "engines": { - "node": "^14.20.0 || ^16.13.0 || >=18.10.0", + "node": "^16.14.0 || >=18.10.0", "npm": "^6.11.0 || ^7.5.6 || >=8.0.0", "yarn": ">= 1.13.0" } }, - "node_modules/@angular-devkit/architect/node_modules/rxjs": { - "version": "6.6.7", - "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.7.tgz", - "integrity": "sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==", - "dev": true, - "dependencies": { - "tslib": "^1.9.0" - }, - "engines": { - "npm": ">=2.0.0" - } - }, - "node_modules/@angular-devkit/architect/node_modules/tslib": { - "version": "1.14.1", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", - "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==", - "dev": true - }, "node_modules/@angular-devkit/build-angular": { - "version": "15.2.8", - "resolved": "https://registry.npmjs.org/@angular-devkit/build-angular/-/build-angular-15.2.8.tgz", - "integrity": "sha512-TGDnXhhOG6h6TOrWWzfnkha7wYBOXi7iJc1o1w1VKCayE3T6TZZdF847aK66vL9KG7AKYVdGhWEGw2WBHUBUpg==", + "version": "16.2.3", + "resolved": "https://registry.npmjs.org/@angular-devkit/build-angular/-/build-angular-16.2.3.tgz", + "integrity": "sha512-GQo14ui3jGBa3ORslO9AcNLCmLuV6EohFk7KbHMTpTY1267z3kdkJfUXhwPKTYQX4ZvQZK2lHLMrSjpFQ5vtOQ==", "dev": true, "dependencies": { - "@ampproject/remapping": "2.2.0", - "@angular-devkit/architect": "0.1502.8", - "@angular-devkit/build-webpack": "0.1502.8", - "@angular-devkit/core": "15.2.8", - "@babel/core": "7.20.12", - "@babel/generator": "7.20.14", - "@babel/helper-annotate-as-pure": "7.18.6", - "@babel/helper-split-export-declaration": "7.18.6", + "@ampproject/remapping": "2.2.1", + "@angular-devkit/architect": "0.1602.3", + "@angular-devkit/build-webpack": "0.1602.3", + "@angular-devkit/core": "16.2.3", + "@babel/core": "7.22.9", + "@babel/generator": "7.22.9", + "@babel/helper-annotate-as-pure": "7.22.5", + "@babel/helper-split-export-declaration": "7.22.6", "@babel/plugin-proposal-async-generator-functions": "7.20.7", - "@babel/plugin-transform-async-to-generator": "7.20.7", - "@babel/plugin-transform-runtime": "7.19.6", - "@babel/preset-env": "7.20.2", - "@babel/runtime": "7.20.13", - "@babel/template": "7.20.7", + "@babel/plugin-transform-async-to-generator": "7.22.5", + "@babel/plugin-transform-runtime": "7.22.9", + "@babel/preset-env": "7.22.9", + "@babel/runtime": "7.22.6", + "@babel/template": "7.22.5", "@discoveryjs/json-ext": "0.5.7", - "@ngtools/webpack": "15.2.8", + "@ngtools/webpack": "16.2.3", + "@vitejs/plugin-basic-ssl": "1.0.1", "ansi-colors": "4.1.3", - "autoprefixer": "10.4.13", - "babel-loader": "9.1.2", + "autoprefixer": "10.4.14", + "babel-loader": "9.1.3", "babel-plugin-istanbul": "6.1.1", - "browserslist": "4.21.5", - "cacache": "17.0.4", + "browserslist": "^4.21.5", "chokidar": "3.5.3", "copy-webpack-plugin": "11.0.0", - "critters": "0.0.16", - "css-loader": "6.7.3", - "esbuild-wasm": "0.17.8", - "glob": "8.1.0", + "critters": "0.0.20", + "css-loader": "6.8.1", + "esbuild-wasm": "0.18.17", + "fast-glob": "3.3.1", + "guess-parser": "0.4.22", "https-proxy-agent": "5.0.1", "inquirer": "8.2.4", "jsonc-parser": "3.2.0", @@ -188,49 +182,54 @@ "less-loader": "11.1.0", "license-webpack-plugin": "4.0.2", "loader-utils": "3.2.1", - "magic-string": "0.29.0", - "mini-css-extract-plugin": "2.7.2", - "open": "8.4.1", + "magic-string": "0.30.1", + "mini-css-extract-plugin": "2.7.6", + "mrmime": "1.0.1", + "open": "8.4.2", "ora": "5.4.1", "parse5-html-rewriting-stream": "7.0.0", - "piscina": "3.2.0", - "postcss": "8.4.21", - "postcss-loader": "7.0.2", + "picomatch": "2.3.1", + "piscina": "4.0.0", + "postcss": "8.4.27", + "postcss-loader": "7.3.3", "resolve-url-loader": "5.0.0", - "rxjs": "6.6.7", - "sass": "1.58.1", - "sass-loader": "13.2.0", - "semver": "7.3.8", + "rxjs": "7.8.1", + "sass": "1.64.1", + "sass-loader": "13.3.2", + "semver": "7.5.4", "source-map-loader": "4.0.1", "source-map-support": "0.5.21", - "terser": "5.16.3", + "terser": "5.19.2", "text-table": "0.2.0", "tree-kill": "1.2.2", - "tslib": "2.5.0", - "webpack": "5.76.1", - "webpack-dev-middleware": "6.0.1", - "webpack-dev-server": "4.11.1", - "webpack-merge": "5.8.0", + "tslib": "2.6.1", + "vite": "4.4.7", + "webpack": "5.88.2", + "webpack-dev-middleware": "6.1.1", + "webpack-dev-server": "4.15.1", + "webpack-merge": "5.9.0", "webpack-subresource-integrity": "5.1.0" }, "engines": { - "node": "^14.20.0 || ^16.13.0 || >=18.10.0", + "node": "^16.14.0 || >=18.10.0", "npm": "^6.11.0 || ^7.5.6 || >=8.0.0", "yarn": ">= 1.13.0" }, "optionalDependencies": { - "esbuild": "0.17.8" + "esbuild": "0.18.17" }, "peerDependencies": { - "@angular/compiler-cli": "^15.0.0", - "@angular/localize": "^15.0.0", - "@angular/platform-server": "^15.0.0", - "@angular/service-worker": "^15.0.0", + "@angular/compiler-cli": "^16.0.0", + "@angular/localize": "^16.0.0", + "@angular/platform-server": "^16.0.0", + "@angular/service-worker": "^16.0.0", + "jest": "^29.5.0", + "jest-environment-jsdom": "^29.5.0", "karma": "^6.3.0", - "ng-packagr": "^15.0.0", + "ng-packagr": "^16.0.0", "protractor": "^7.0.0", "tailwindcss": "^2.0.0 || ^3.0.0", - "typescript": ">=4.8.2 <5.0" + "typescript": ">=4.9.3 <5.2" }, "peerDependenciesMeta": { "@angular/localize": { @@ -242,6 +241,12 @@ "@angular/service-worker": { "optional": true }, + "jest": { + "optional": true + }, + "jest-environment-jsdom": { + "optional": true + }, "karma": { "optional": true }, @@ -257,26 +262,26 @@ } }, "node_modules/@angular-devkit/build-angular/node_modules/@babel/core": { - "version": "7.20.12", - "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.20.12.tgz", - "integrity": "sha512-XsMfHovsUYHFMdrIHkZphTN/2Hzzi78R08NuHfDBehym2VsPDL6Zn/JAD/JQdnRvbSsbQc4mVaU1m6JgtTEElg==", + "version": "7.22.9", + "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.22.9.tgz", + "integrity": "sha512-G2EgeufBcYw27U4hhoIwFcgc1XU7TlXJ3mv04oOv1WCuo900U/anZSPzEqNjwdjgffkk2Gs0AN0dW1CKVLcG7w==", "dev": true, "dependencies": { - "@ampproject/remapping": "^2.1.0", - "@babel/code-frame": "^7.18.6", - "@babel/generator": "^7.20.7", - "@babel/helper-compilation-targets": "^7.20.7", - "@babel/helper-module-transforms": "^7.20.11", - "@babel/helpers": "^7.20.7", - "@babel/parser": "^7.20.7", - "@babel/template": "^7.20.7", - "@babel/traverse": "^7.20.12", - "@babel/types": "^7.20.7", + "@ampproject/remapping": "^2.2.0", + "@babel/code-frame": "^7.22.5", + "@babel/generator": "^7.22.9", + "@babel/helper-compilation-targets": "^7.22.9", + "@babel/helper-module-transforms": "^7.22.9", + "@babel/helpers": "^7.22.6", + "@babel/parser": "^7.22.7", + "@babel/template": "^7.22.5", + "@babel/traverse": "^7.22.8", + "@babel/types": "^7.22.5", "convert-source-map": "^1.7.0", "debug": "^4.1.0", "gensync": "^1.0.0-beta.2", "json5": "^2.2.2", - "semver": "^6.3.0" + "semver": "^6.3.1" }, "engines": { "node": ">=6.9.0" @@ -287,83 +292,46 @@ } }, "node_modules/@angular-devkit/build-angular/node_modules/@babel/core/node_modules/semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", + "version": "6.3.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", + "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", "dev": true, "bin": { "semver": "bin/semver.js" } }, - "node_modules/@angular-devkit/build-angular/node_modules/brace-expansion": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", - "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", + "node_modules/@angular-devkit/build-angular/node_modules/semver": { + "version": "7.5.4", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz", + "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==", "dev": true, "dependencies": { - "balanced-match": "^1.0.0" - } - }, - "node_modules/@angular-devkit/build-angular/node_modules/glob": { - "version": "8.1.0", - "resolved": "https://registry.npmjs.org/glob/-/glob-8.1.0.tgz", - "integrity": "sha512-r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ==", - "dev": true, - "dependencies": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^5.0.1", - "once": "^1.3.0" + "lru-cache": "^6.0.0" }, - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, - "node_modules/@angular-devkit/build-angular/node_modules/minimatch": { - "version": "5.1.6", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz", - "integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==", - "dev": true, - "dependencies": { - "brace-expansion": "^2.0.1" + "bin": { + "semver": "bin/semver.js" }, "engines": { "node": ">=10" } }, - "node_modules/@angular-devkit/build-angular/node_modules/rxjs": { - "version": "6.6.7", - "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.7.tgz", - "integrity": "sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==", - "dev": true, - "dependencies": { - "tslib": "^1.9.0" - }, - "engines": { - "npm": ">=2.0.0" - } - }, - "node_modules/@angular-devkit/build-angular/node_modules/rxjs/node_modules/tslib": { - "version": "1.14.1", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", - "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==", + "node_modules/@angular-devkit/build-angular/node_modules/tslib": { + "version": "2.6.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.1.tgz", + "integrity": "sha512-t0hLfiEKfMUoqhG+U1oid7Pva4bbDPHYfJNiB7BiIjRkj1pyC++4N3huJfqY6aRH6VTB0rvtzQwjM4K6qpfOig==", "dev": true }, "node_modules/@angular-devkit/build-webpack": { - "version": "0.1502.8", - "resolved": "https://registry.npmjs.org/@angular-devkit/build-webpack/-/build-webpack-0.1502.8.tgz", - "integrity": "sha512-jWtNv+S03FFLDe/C8SPCcRvkz3bSb2R+919IT086Q9axIPQ1VowOEwzt2k3qXPSSrC7GSYuASM+X92dB47NTQQ==", + "version": "0.1602.3", + "resolved": "https://registry.npmjs.org/@angular-devkit/build-webpack/-/build-webpack-0.1602.3.tgz", + "integrity": "sha512-ls2aC7UvM748f/UqCDNsz9apWb4ArAKHtJ1Jwxx1DUQo+qT4c9/8WpiqxgTNkZTjCZbZZG1Ojub/rviw9Y88lA==", "dev": true, "dependencies": { - "@angular-devkit/architect": "0.1502.8", - "rxjs": "6.6.7" + "@angular-devkit/architect": "0.1602.3", + "rxjs": "7.8.1" }, "engines": { - "node": "^14.20.0 || ^16.13.0 || >=18.10.0", + "node": "^16.14.0 || >=18.10.0", "npm": "^6.11.0 || ^7.5.6 || >=8.0.0", "yarn": ">= 1.13.0" }, @@ -372,38 +340,21 @@ "webpack-dev-server": "^4.0.0" } }, - "node_modules/@angular-devkit/build-webpack/node_modules/rxjs": { - "version": "6.6.7", - "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.7.tgz", - "integrity": "sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==", - "dev": true, - "dependencies": { - "tslib": "^1.9.0" - }, - "engines": { - "npm": ">=2.0.0" - } - }, - "node_modules/@angular-devkit/build-webpack/node_modules/tslib": { - "version": "1.14.1", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", - "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==", - "dev": true - }, "node_modules/@angular-devkit/core": { - "version": "15.2.8", - "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-15.2.8.tgz", - "integrity": "sha512-Lo4XrbDMtXarKnMrFgWLmQdSX+3QPNAg4otG8cmp/U4jJyjV4dAYKEAsb1sCNGUSM4h4v09EQU/5ugVjDU29lQ==", + "version": "16.2.3", + "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-16.2.3.tgz", + "integrity": "sha512-oZLdg2XTx7likYAXRj1CU0XmrsCfe5f2grj3iwuI3OB1LXwwpdbHBztruj03y3yHES+TnO+dIbkvRnvMXs7uAA==", "dev": true, "dependencies": { "ajv": "8.12.0", "ajv-formats": "2.1.1", "jsonc-parser": "3.2.0", - "rxjs": "6.6.7", + "picomatch": "2.3.1", + "rxjs": "7.8.1", "source-map": "0.7.4" }, "engines": { - "node": "^14.20.0 || ^16.13.0 || >=18.10.0", + "node": "^16.14.0 || >=18.10.0", "npm": "^6.11.0 || ^7.5.6 || >=8.0.0", "yarn": ">= 1.13.0" }, @@ -416,50 +367,32 @@ } } }, - "node_modules/@angular-devkit/core/node_modules/rxjs": { - "version": "6.6.7", - "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.7.tgz", - "integrity": "sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==", - "dev": true, - "dependencies": { - "tslib": "^1.9.0" - }, - "engines": { - "npm": ">=2.0.0" - } - }, - "node_modules/@angular-devkit/core/node_modules/tslib": { - "version": "1.14.1", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", - "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==", - "dev": true - }, "node_modules/@angular-devkit/schematics": { - "version": "15.2.8", - "resolved": "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-15.2.8.tgz", - "integrity": "sha512-w6EUGC96kVsH9f8sEzajzbONMawezyVBiSo+JYp5r25rQArAz/a+KZntbuETWHQ0rQOEsKmUNKxwmr11BaptSQ==", + "version": "16.2.3", + "resolved": "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-16.2.3.tgz", + "integrity": "sha512-+lBiHxi/C9HCfiCbtW25DldwvJDXXXv5oWw+Tg4s18BO/lYZLveGUEaZWu9ZJ5VIJ8GliUi2LohxhDxBkh4Oxg==", "dev": true, "dependencies": { - "@angular-devkit/core": "15.2.8", + "@angular-devkit/core": "16.2.3", "jsonc-parser": "3.2.0", - "magic-string": "0.29.0", + "magic-string": "0.30.1", "ora": "5.4.1", - "rxjs": "6.6.7" + "rxjs": "7.8.1" }, "engines": { - "node": "^14.20.0 || ^16.13.0 || >=18.10.0", + "node": "^16.14.0 || >=18.10.0", "npm": "^6.11.0 || ^7.5.6 || >=8.0.0", "yarn": ">= 1.13.0" } }, "node_modules/@angular-devkit/schematics-cli": { - "version": "15.2.5", - "resolved": "https://registry.npmjs.org/@angular-devkit/schematics-cli/-/schematics-cli-15.2.5.tgz", - "integrity": "sha512-MOmdYMCT4Bbl8B9L4zDqbJwakYpECb0K9guERxUqMwpufi9GqOa/GNhIsbHcc4J8qn6ykG2y3BZQf8Q14/eRZQ==", + "version": "16.2.3", + "resolved": "https://registry.npmjs.org/@angular-devkit/schematics-cli/-/schematics-cli-16.2.3.tgz", + "integrity": "sha512-5YQCbQmY9Kc03a9Io4XHOrxGXjnzcVveUuUO64R1m5x2aA5I+mVR8NVvxuoGRAeoI1FWusAKRe9hH8nRCLrelA==", "dev": true, "dependencies": { - "@angular-devkit/core": "15.2.5", - "@angular-devkit/schematics": "15.2.5", + "@angular-devkit/core": "16.2.3", + "@angular-devkit/schematics": "16.2.3", "ansi-colors": "4.1.3", "inquirer": "8.2.4", "symbol-observable": "4.0.0", @@ -469,115 +402,39 @@ "schematics": "bin/schematics.js" }, "engines": { - "node": "^14.20.0 || ^16.13.0 || >=18.10.0", + "node": "^16.14.0 || >=18.10.0", "npm": "^6.11.0 || ^7.5.6 || >=8.0.0", "yarn": ">= 1.13.0" } }, - "node_modules/@angular-devkit/schematics-cli/node_modules/@angular-devkit/core": { - "version": "15.2.5", - "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-15.2.5.tgz", - "integrity": "sha512-ZfjEkAe2yYeekc3xjZ/U4pK9nb+w6BFwAEjou6mE8PWZH7iYskm0YCCXkmu+B+zViEcCLhAkJAxu9MwX4efd8g==", - "dev": true, - "dependencies": { - "ajv": "8.12.0", - "ajv-formats": "2.1.1", - "jsonc-parser": "3.2.0", - "rxjs": "6.6.7", - "source-map": "0.7.4" - }, - "engines": { - "node": "^14.20.0 || ^16.13.0 || >=18.10.0", - "npm": "^6.11.0 || ^7.5.6 || >=8.0.0", - "yarn": ">= 1.13.0" - }, - "peerDependencies": { - "chokidar": "^3.5.2" - }, - "peerDependenciesMeta": { - "chokidar": { - "optional": true - } - } - }, - "node_modules/@angular-devkit/schematics-cli/node_modules/@angular-devkit/schematics": { - "version": "15.2.5", - "resolved": "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-15.2.5.tgz", - "integrity": "sha512-zm7chQRQtPXQzzSAvK/mbZ+RJ3eP7hlU53yyJ/i6kjWAh3Y5uiSHNYGmqhhAHFuzw4Jhb4OC2S9iycxrqmI8TA==", - "dev": true, - "dependencies": { - "@angular-devkit/core": "15.2.5", - "jsonc-parser": "3.2.0", - "magic-string": "0.29.0", - "ora": "5.4.1", - "rxjs": "6.6.7" - }, - "engines": { - "node": "^14.20.0 || ^16.13.0 || >=18.10.0", - "npm": "^6.11.0 || ^7.5.6 || >=8.0.0", - "yarn": ">= 1.13.0" - } - }, - "node_modules/@angular-devkit/schematics-cli/node_modules/rxjs": { - "version": "6.6.7", - "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.7.tgz", - "integrity": "sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==", - "dev": true, - "dependencies": { - "tslib": "^1.9.0" - }, - "engines": { - "npm": ">=2.0.0" - } - }, - "node_modules/@angular-devkit/schematics-cli/node_modules/tslib": { - "version": "1.14.1", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", - "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==", - "dev": true - }, - "node_modules/@angular-devkit/schematics/node_modules/rxjs": { - "version": "6.6.7", - "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.7.tgz", - "integrity": "sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==", - "dev": true, - "dependencies": { - "tslib": "^1.9.0" - }, - "engines": { - "npm": ">=2.0.0" - } - }, - "node_modules/@angular-devkit/schematics/node_modules/tslib": { - "version": "1.14.1", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", - "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==", - "dev": true - }, "node_modules/@angular-eslint/builder": { - "version": "15.2.1", - "resolved": "https://registry.npmjs.org/@angular-eslint/builder/-/builder-15.2.1.tgz", - "integrity": "sha512-7x2DANebLRl997Mj4DhZrnz5+vnSjavGGveJ0mBuU7CEsL0ZYLftdRqL0e0HtU3ksseS7xpchD6OM08nkNgySw==", + "version": "16.1.2", + "resolved": "https://registry.npmjs.org/@angular-eslint/builder/-/builder-16.1.2.tgz", + "integrity": "sha512-Y95IBEWqzWA7SyIh5nlPuFasw/4lOILrAdY5Ji6tOpIJgNFoiR9K1UcH46i34r3384ApN8GEQJ7FlK6D6qCOJA==", "dev": true, + "dependencies": { + "@nx/devkit": "16.5.1", + "nx": "16.5.1" + }, "peerDependencies": { "eslint": "^7.20.0 || ^8.0.0", "typescript": "*" } }, "node_modules/@angular-eslint/bundled-angular-compiler": { - "version": "15.2.1", - "resolved": "https://registry.npmjs.org/@angular-eslint/bundled-angular-compiler/-/bundled-angular-compiler-15.2.1.tgz", - "integrity": "sha512-LO7Am8eVCr7oh6a0VmKSL7K03CnQEQhFO7Wt/YtbfYOxVjrbwmYLwJn+wZPOT7A02t/BttOD/WXuDrOWtSMQ/Q==", + "version": "16.1.2", + "resolved": "https://registry.npmjs.org/@angular-eslint/bundled-angular-compiler/-/bundled-angular-compiler-16.1.2.tgz", + "integrity": "sha512-wDiHPFsKTijMcQUPNcoHOJ5kezIPCCbmDK6LHH7hAdAC/eDY9NHL5e4zQ2Xkf3/r1PFuwVLGTwwreEHlmeENDw==", "dev": true }, "node_modules/@angular-eslint/eslint-plugin": { - "version": "15.2.1", - "resolved": "https://registry.npmjs.org/@angular-eslint/eslint-plugin/-/eslint-plugin-15.2.1.tgz", - "integrity": "sha512-OM7b1kS4E4CkXjkaWN+lEzawh4VxY6l7FO1Cuk4s7iv3/YpZG3rJxIZBqnFLTixwrBuqw8y4FNBzF3eDgmFAUw==", + "version": "16.1.2", + "resolved": "https://registry.npmjs.org/@angular-eslint/eslint-plugin/-/eslint-plugin-16.1.2.tgz", + "integrity": "sha512-lYVvoKUIOg/ez15yfN4zY2A++vnIeJe1xh2ADNTmmjSh2PFV24K9YOgrTbgrY3Ul9kzGDTBkvYqslq+IvMGdIw==", "dev": true, "dependencies": { - "@angular-eslint/utils": "15.2.1", - "@typescript-eslint/utils": "5.48.2" + "@angular-eslint/utils": "16.1.2", + "@typescript-eslint/utils": "5.62.0" }, "peerDependencies": { "eslint": "^7.20.0 || ^8.0.0", @@ -585,16 +442,16 @@ } }, "node_modules/@angular-eslint/eslint-plugin-template": { - "version": "15.2.1", - "resolved": "https://registry.npmjs.org/@angular-eslint/eslint-plugin-template/-/eslint-plugin-template-15.2.1.tgz", - "integrity": "sha512-IeiSLk6YxapFdH2z5o/O3R7VwtBd2T6fWmhLFPwDYMDknrwegnOjwswCdBplOccpUp0wqlCeGUx7LTsuzwaz7w==", + "version": "16.1.2", + "resolved": "https://registry.npmjs.org/@angular-eslint/eslint-plugin-template/-/eslint-plugin-template-16.1.2.tgz", + "integrity": "sha512-2qsoUgPg9Qp4EVUJRwWcJ+8JMxBb0ma3pNBjFmY6LOd59igRYorJKfWep4Nln1EicYRDRsCLzeLHO976+b1yaQ==", "dev": true, "dependencies": { - "@angular-eslint/bundled-angular-compiler": "15.2.1", - "@angular-eslint/utils": "15.2.1", - "@typescript-eslint/type-utils": "5.48.2", - "@typescript-eslint/utils": "5.48.2", - "aria-query": "5.1.3", + "@angular-eslint/bundled-angular-compiler": "16.1.2", + "@angular-eslint/utils": "16.1.2", + "@typescript-eslint/type-utils": "5.62.0", + "@typescript-eslint/utils": "5.62.0", + "aria-query": "5.3.0", "axobject-query": "3.1.1" }, "peerDependencies": { @@ -602,256 +459,31 @@ "typescript": "*" } }, - "node_modules/@angular-eslint/eslint-plugin-template/node_modules/@typescript-eslint/scope-manager": { - "version": "5.48.2", - "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.48.2.tgz", - "integrity": "sha512-zEUFfonQid5KRDKoI3O+uP1GnrFd4tIHlvs+sTJXiWuypUWMuDaottkJuR612wQfOkjYbsaskSIURV9xo4f+Fw==", - "dev": true, - "dependencies": { - "@typescript-eslint/types": "5.48.2", - "@typescript-eslint/visitor-keys": "5.48.2" - }, - "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/typescript-eslint" - } - }, - "node_modules/@angular-eslint/eslint-plugin-template/node_modules/@typescript-eslint/type-utils": { - "version": "5.48.2", - "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.48.2.tgz", - "integrity": "sha512-QVWx7J5sPMRiOMJp5dYshPxABRoZV1xbRirqSk8yuIIsu0nvMTZesKErEA3Oix1k+uvsk8Cs8TGJ6kQ0ndAcew==", - "dev": true, - "dependencies": { - "@typescript-eslint/typescript-estree": "5.48.2", - "@typescript-eslint/utils": "5.48.2", - "debug": "^4.3.4", - "tsutils": "^3.21.0" - }, - "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/typescript-eslint" - }, - "peerDependencies": { - "eslint": "*" - }, - "peerDependenciesMeta": { - "typescript": { - "optional": true - } - } - }, - "node_modules/@angular-eslint/eslint-plugin-template/node_modules/@typescript-eslint/types": { - "version": "5.48.2", - "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.48.2.tgz", - "integrity": "sha512-hE7dA77xxu7ByBc6KCzikgfRyBCTst6dZQpwaTy25iMYOnbNljDT4hjhrGEJJ0QoMjrfqrx+j1l1B9/LtKeuqA==", - "dev": true, - "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/typescript-eslint" - } - }, - "node_modules/@angular-eslint/eslint-plugin-template/node_modules/@typescript-eslint/typescript-estree": { - "version": "5.48.2", - "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.48.2.tgz", - "integrity": "sha512-bibvD3z6ilnoVxUBFEgkO0k0aFvUc4Cttt0dAreEr+nrAHhWzkO83PEVVuieK3DqcgL6VAK5dkzK8XUVja5Zcg==", - "dev": true, - "dependencies": { - "@typescript-eslint/types": "5.48.2", - "@typescript-eslint/visitor-keys": "5.48.2", - "debug": "^4.3.4", - "globby": "^11.1.0", - "is-glob": "^4.0.3", - "semver": "^7.3.7", - "tsutils": "^3.21.0" - }, - "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/typescript-eslint" - }, - "peerDependenciesMeta": { - "typescript": { - "optional": true - } - } - }, - "node_modules/@angular-eslint/eslint-plugin-template/node_modules/@typescript-eslint/utils": { - "version": "5.48.2", - "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.48.2.tgz", - "integrity": "sha512-2h18c0d7jgkw6tdKTlNaM7wyopbLRBiit8oAxoP89YnuBOzCZ8g8aBCaCqq7h208qUTroL7Whgzam7UY3HVLow==", - "dev": true, - "dependencies": { - "@types/json-schema": "^7.0.9", - "@types/semver": "^7.3.12", - "@typescript-eslint/scope-manager": "5.48.2", - "@typescript-eslint/types": "5.48.2", - "@typescript-eslint/typescript-estree": "5.48.2", - "eslint-scope": "^5.1.1", - "eslint-utils": "^3.0.0", - "semver": "^7.3.7" - }, - "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/typescript-eslint" - }, - "peerDependencies": { - "eslint": "^6.0.0 || ^7.0.0 || ^8.0.0" - } - }, - "node_modules/@angular-eslint/eslint-plugin-template/node_modules/@typescript-eslint/visitor-keys": { - "version": "5.48.2", - "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.48.2.tgz", - "integrity": "sha512-z9njZLSkwmjFWUelGEwEbdf4NwKvfHxvGC0OcGN1Hp/XNDIcJ7D5DpPNPv6x6/mFvc1tQHsaWmpD/a4gOvvCJQ==", - "dev": true, - "dependencies": { - "@typescript-eslint/types": "5.48.2", - "eslint-visitor-keys": "^3.3.0" - }, - "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/typescript-eslint" - } - }, - "node_modules/@angular-eslint/eslint-plugin/node_modules/@typescript-eslint/scope-manager": { - "version": "5.48.2", - "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.48.2.tgz", - "integrity": "sha512-zEUFfonQid5KRDKoI3O+uP1GnrFd4tIHlvs+sTJXiWuypUWMuDaottkJuR612wQfOkjYbsaskSIURV9xo4f+Fw==", - "dev": true, - "dependencies": { - "@typescript-eslint/types": "5.48.2", - "@typescript-eslint/visitor-keys": "5.48.2" - }, - "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/typescript-eslint" - } - }, - "node_modules/@angular-eslint/eslint-plugin/node_modules/@typescript-eslint/types": { - "version": "5.48.2", - "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.48.2.tgz", - "integrity": "sha512-hE7dA77xxu7ByBc6KCzikgfRyBCTst6dZQpwaTy25iMYOnbNljDT4hjhrGEJJ0QoMjrfqrx+j1l1B9/LtKeuqA==", - "dev": true, - "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/typescript-eslint" - } - }, - "node_modules/@angular-eslint/eslint-plugin/node_modules/@typescript-eslint/typescript-estree": { - "version": "5.48.2", - "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.48.2.tgz", - "integrity": "sha512-bibvD3z6ilnoVxUBFEgkO0k0aFvUc4Cttt0dAreEr+nrAHhWzkO83PEVVuieK3DqcgL6VAK5dkzK8XUVja5Zcg==", - "dev": true, - "dependencies": { - "@typescript-eslint/types": "5.48.2", - "@typescript-eslint/visitor-keys": "5.48.2", - "debug": "^4.3.4", - "globby": "^11.1.0", - "is-glob": "^4.0.3", - "semver": "^7.3.7", - "tsutils": "^3.21.0" - }, - "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/typescript-eslint" - }, - "peerDependenciesMeta": { - "typescript": { - "optional": true - } - } - }, - "node_modules/@angular-eslint/eslint-plugin/node_modules/@typescript-eslint/utils": { - "version": "5.48.2", - "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.48.2.tgz", - "integrity": "sha512-2h18c0d7jgkw6tdKTlNaM7wyopbLRBiit8oAxoP89YnuBOzCZ8g8aBCaCqq7h208qUTroL7Whgzam7UY3HVLow==", - "dev": true, - "dependencies": { - "@types/json-schema": "^7.0.9", - "@types/semver": "^7.3.12", - "@typescript-eslint/scope-manager": "5.48.2", - "@typescript-eslint/types": "5.48.2", - "@typescript-eslint/typescript-estree": "5.48.2", - "eslint-scope": "^5.1.1", - "eslint-utils": "^3.0.0", - "semver": "^7.3.7" - }, - "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/typescript-eslint" - }, - "peerDependencies": { - "eslint": "^6.0.0 || ^7.0.0 || ^8.0.0" - } - }, - "node_modules/@angular-eslint/eslint-plugin/node_modules/@typescript-eslint/visitor-keys": { - "version": "5.48.2", - "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.48.2.tgz", - "integrity": "sha512-z9njZLSkwmjFWUelGEwEbdf4NwKvfHxvGC0OcGN1Hp/XNDIcJ7D5DpPNPv6x6/mFvc1tQHsaWmpD/a4gOvvCJQ==", - "dev": true, - "dependencies": { - "@typescript-eslint/types": "5.48.2", - "eslint-visitor-keys": "^3.3.0" - }, - "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/typescript-eslint" - } - }, "node_modules/@angular-eslint/schematics": { - "version": "15.2.1", - "resolved": "https://registry.npmjs.org/@angular-eslint/schematics/-/schematics-15.2.1.tgz", - "integrity": "sha512-0ZfBCejHWIcgy3J5kFs9sS/jqi8i5AptxggOwFySOlCLJ+CzNrktjD4jff1Zy8K/VLzY0Ci0BSZXvgWfP0k9Rg==", + "version": "16.1.2", + "resolved": "https://registry.npmjs.org/@angular-eslint/schematics/-/schematics-16.1.2.tgz", + "integrity": "sha512-319i47NU6nfaAaQTQYN7k320proTIBCueWGt+fbT11210CMqQriFmD+B85AatCwQgMgLd8Rhs1/F7YL2OOhegA==", "dev": true, "dependencies": { - "@angular-eslint/eslint-plugin": "15.2.1", - "@angular-eslint/eslint-plugin-template": "15.2.1", + "@angular-eslint/eslint-plugin": "16.1.2", + "@angular-eslint/eslint-plugin-template": "16.1.2", + "@nx/devkit": "16.5.1", "ignore": "5.2.4", + "nx": "16.5.1", "strip-json-comments": "3.1.1", "tmp": "0.2.1" }, "peerDependencies": { - "@angular/cli": ">= 15.0.0 < 16.0.0" + "@angular/cli": ">= 16.0.0 < 17.0.0" } }, "node_modules/@angular-eslint/template-parser": { - "version": "15.2.1", - "resolved": "https://registry.npmjs.org/@angular-eslint/template-parser/-/template-parser-15.2.1.tgz", - "integrity": "sha512-ViCi79gC2aKJecmYLkOT+QlT5WMRNXeYz0Dr9Pr8qXzIbY0oAWE7nOT5jkXwQ9oUk+ybtGCWHma5JVJWVJsIog==", + "version": "16.2.0", + "resolved": "https://registry.npmjs.org/@angular-eslint/template-parser/-/template-parser-16.2.0.tgz", + "integrity": "sha512-v2jVKTy2wN7iM9nHpBkxLn2wfL8jSl4IlPrXThIqj8No2VHtpLQZPKuXbGPUXQX05VS2Mj5feScQ36ZVGS8Rbw==", "dev": true, "dependencies": { - "@angular-eslint/bundled-angular-compiler": "15.2.1", + "@angular-eslint/bundled-angular-compiler": "16.2.0", "eslint-scope": "^7.0.0" }, "peerDependencies": { @@ -859,6 +491,12 @@ "typescript": "*" } }, + "node_modules/@angular-eslint/template-parser/node_modules/@angular-eslint/bundled-angular-compiler": { + "version": "16.2.0", + "resolved": "https://registry.npmjs.org/@angular-eslint/bundled-angular-compiler/-/bundled-angular-compiler-16.2.0.tgz", + "integrity": "sha512-ct9orDYxkMl2+uvM7UBfgV28Dq57V4dEs+Drh7cD673JIMa6sXbgmd0QEtm8W3cmyK/jcTzmuoufxbH7hOxd6g==", + "dev": true + }, "node_modules/@angular-eslint/template-parser/node_modules/eslint-scope": { "version": "7.1.1", "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.1.1.tgz", @@ -882,137 +520,37 @@ } }, "node_modules/@angular-eslint/utils": { - "version": "15.2.1", - "resolved": "https://registry.npmjs.org/@angular-eslint/utils/-/utils-15.2.1.tgz", - "integrity": "sha512-++FneAJHxJqcSu0igVN6uOkSoHxlzgLoMBswuovYJy3UKwm33/T6WFku8++753Ca/JucIoR1gdUfO7SoSspMDg==", + "version": "16.1.2", + "resolved": "https://registry.npmjs.org/@angular-eslint/utils/-/utils-16.1.2.tgz", + "integrity": "sha512-2yfEK3BPSJsUhP4JCz0EB6ktu4E4+/zc9qdtZvPWNF/eww2J/oYVPjY47C/HVg4MXpjJTI8vbdkvcnxrICIkfw==", "dev": true, "dependencies": { - "@angular-eslint/bundled-angular-compiler": "15.2.1", - "@typescript-eslint/utils": "5.48.2" + "@angular-eslint/bundled-angular-compiler": "16.1.2", + "@typescript-eslint/utils": "5.62.0" }, "peerDependencies": { "eslint": "^7.20.0 || ^8.0.0", "typescript": "*" } }, - "node_modules/@angular-eslint/utils/node_modules/@typescript-eslint/scope-manager": { - "version": "5.48.2", - "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.48.2.tgz", - "integrity": "sha512-zEUFfonQid5KRDKoI3O+uP1GnrFd4tIHlvs+sTJXiWuypUWMuDaottkJuR612wQfOkjYbsaskSIURV9xo4f+Fw==", - "dev": true, - "dependencies": { - "@typescript-eslint/types": "5.48.2", - "@typescript-eslint/visitor-keys": "5.48.2" - }, - "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/typescript-eslint" - } - }, - "node_modules/@angular-eslint/utils/node_modules/@typescript-eslint/types": { - "version": "5.48.2", - "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.48.2.tgz", - "integrity": "sha512-hE7dA77xxu7ByBc6KCzikgfRyBCTst6dZQpwaTy25iMYOnbNljDT4hjhrGEJJ0QoMjrfqrx+j1l1B9/LtKeuqA==", - "dev": true, - "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/typescript-eslint" - } - }, - "node_modules/@angular-eslint/utils/node_modules/@typescript-eslint/typescript-estree": { - "version": "5.48.2", - "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.48.2.tgz", - "integrity": "sha512-bibvD3z6ilnoVxUBFEgkO0k0aFvUc4Cttt0dAreEr+nrAHhWzkO83PEVVuieK3DqcgL6VAK5dkzK8XUVja5Zcg==", - "dev": true, - "dependencies": { - "@typescript-eslint/types": "5.48.2", - "@typescript-eslint/visitor-keys": "5.48.2", - "debug": "^4.3.4", - "globby": "^11.1.0", - "is-glob": "^4.0.3", - "semver": "^7.3.7", - "tsutils": "^3.21.0" - }, - "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/typescript-eslint" - }, - "peerDependenciesMeta": { - "typescript": { - "optional": true - } - } - }, - "node_modules/@angular-eslint/utils/node_modules/@typescript-eslint/utils": { - "version": "5.48.2", - "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.48.2.tgz", - "integrity": "sha512-2h18c0d7jgkw6tdKTlNaM7wyopbLRBiit8oAxoP89YnuBOzCZ8g8aBCaCqq7h208qUTroL7Whgzam7UY3HVLow==", - "dev": true, - "dependencies": { - "@types/json-schema": "^7.0.9", - "@types/semver": "^7.3.12", - "@typescript-eslint/scope-manager": "5.48.2", - "@typescript-eslint/types": "5.48.2", - "@typescript-eslint/typescript-estree": "5.48.2", - "eslint-scope": "^5.1.1", - "eslint-utils": "^3.0.0", - "semver": "^7.3.7" - }, - "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/typescript-eslint" - }, - "peerDependencies": { - "eslint": "^6.0.0 || ^7.0.0 || ^8.0.0" - } - }, - "node_modules/@angular-eslint/utils/node_modules/@typescript-eslint/visitor-keys": { - "version": "5.48.2", - "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.48.2.tgz", - "integrity": "sha512-z9njZLSkwmjFWUelGEwEbdf4NwKvfHxvGC0OcGN1Hp/XNDIcJ7D5DpPNPv6x6/mFvc1tQHsaWmpD/a4gOvvCJQ==", - "dev": true, - "dependencies": { - "@typescript-eslint/types": "5.48.2", - "eslint-visitor-keys": "^3.3.0" - }, - "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/typescript-eslint" - } - }, "node_modules/@angular/animations": { - "version": "15.2.8", - "resolved": "https://registry.npmjs.org/@angular/animations/-/animations-15.2.8.tgz", - "integrity": "sha512-I3xh8EASQ04s3qXQYpIORI0jFiFmvBQERBqS70TieTCIML7banOf9R3K7sAWB9frG5J0CEUwr+wtF47DCs/7eQ==", + "version": "16.2.6", + "resolved": "https://registry.npmjs.org/@angular/animations/-/animations-16.2.6.tgz", + "integrity": "sha512-NHnHdZFKLr1PB8RhscjsE/DMSVHhtjCqc3bhtOiOMYfAgm4nYrSFvp6nAaT5OoMTeAWuM0n8/HvAiFweEQgVQA==", "dependencies": { "tslib": "^2.3.0" }, "engines": { - "node": "^14.20.0 || ^16.13.0 || >=18.10.0" + "node": "^16.14.0 || >=18.10.0" }, "peerDependencies": { - "@angular/core": "15.2.8" + "@angular/core": "16.2.6" } }, "node_modules/@angular/cdk": { - "version": "15.2.8", - "resolved": "https://registry.npmjs.org/@angular/cdk/-/cdk-15.2.8.tgz", - "integrity": "sha512-jiCoxfBFMH29IZIiPmVUzIWetfUNpMIvC20xYVF8RMM819vPogoObzwK4DN/sXcp/6oVbBzZFaYdijhhIt9soQ==", + "version": "16.1.5", + "resolved": "https://registry.npmjs.org/@angular/cdk/-/cdk-16.1.5.tgz", + "integrity": "sha512-8wjYhLwW9bWicBYSdDXuN71SBP7NbJmXs+XiWiRkaFUkVDeU9z8Qkitogl+qqsSXvsOmi+12MowrbJ3tPizaLw==", "dependencies": { "tslib": "^2.3.0" }, @@ -1020,72 +558,87 @@ "parse5": "^7.1.2" }, "peerDependencies": { - "@angular/common": "^15.0.0 || ^16.0.0", - "@angular/core": "^15.0.0 || ^16.0.0", + "@angular/common": "^16.0.0 || ^17.0.0", + "@angular/core": "^16.0.0 || ^17.0.0", "rxjs": "^6.5.3 || ^7.4.0" } }, "node_modules/@angular/cli": { - "version": "15.2.8", - "resolved": "https://registry.npmjs.org/@angular/cli/-/cli-15.2.8.tgz", - "integrity": "sha512-3VlTfm6DUZfFHBY43vQSAaqmFTxy3VtRd/iDBCHcEPhHwYLWBvNwReJuJfNja8O105QQ6DBiYVBExEBtPmjQ4w==", + "version": "16.2.3", + "resolved": "https://registry.npmjs.org/@angular/cli/-/cli-16.2.3.tgz", + "integrity": "sha512-XYewIme6CPxgyK9A4aBDUOwv88h8RHwCeLxuBQcOYY2kVhWIiQjFwdkODQPG0WZkRZxtwXk6wErIO80Nz1K8BA==", "dev": true, "dependencies": { - "@angular-devkit/architect": "0.1502.8", - "@angular-devkit/core": "15.2.8", - "@angular-devkit/schematics": "15.2.8", - "@schematics/angular": "15.2.8", + "@angular-devkit/architect": "0.1602.3", + "@angular-devkit/core": "16.2.3", + "@angular-devkit/schematics": "16.2.3", + "@schematics/angular": "16.2.3", "@yarnpkg/lockfile": "1.1.0", "ansi-colors": "4.1.3", - "ini": "3.0.1", + "ini": "4.1.1", "inquirer": "8.2.4", "jsonc-parser": "3.2.0", "npm-package-arg": "10.1.0", "npm-pick-manifest": "8.0.1", - "open": "8.4.1", + "open": "8.4.2", "ora": "5.4.1", - "pacote": "15.1.0", - "resolve": "1.22.1", - "semver": "7.3.8", + "pacote": "15.2.0", + "resolve": "1.22.2", + "semver": "7.5.4", "symbol-observable": "4.0.0", - "yargs": "17.6.2" + "yargs": "17.7.2" }, "bin": { "ng": "bin/ng.js" }, "engines": { - "node": "^14.20.0 || ^16.13.0 || >=18.10.0", + "node": "^16.14.0 || >=18.10.0", "npm": "^6.11.0 || ^7.5.6 || >=8.0.0", "yarn": ">= 1.13.0" } }, + "node_modules/@angular/cli/node_modules/semver": { + "version": "7.5.4", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz", + "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==", + "dev": true, + "dependencies": { + "lru-cache": "^6.0.0" + }, + "bin": { + "semver": "bin/semver.js" + }, + "engines": { + "node": ">=10" + } + }, "node_modules/@angular/common": { - "version": "15.2.8", - "resolved": "https://registry.npmjs.org/@angular/common/-/common-15.2.8.tgz", - "integrity": "sha512-yLDQihiRcVl38HrWMPbqgzOaSUw85AQH5BsGdjbS6BpoBQj3EXOpccCMFsuxOKxPG4toatgawNqrEnK0Jpv9Mw==", + "version": "16.2.6", + "resolved": "https://registry.npmjs.org/@angular/common/-/common-16.2.6.tgz", + "integrity": "sha512-BjnahvtJHh2zXfCZjpWit+zMkggl/PrgUtPd02egzLmEKyXIMmQLYNpDZ+Pqgpb7eefU8yBPhL7WA2oKFjHjSg==", "dependencies": { "tslib": "^2.3.0" }, "engines": { - "node": "^14.20.0 || ^16.13.0 || >=18.10.0" + "node": "^16.14.0 || >=18.10.0" }, "peerDependencies": { - "@angular/core": "15.2.8", + "@angular/core": "16.2.6", "rxjs": "^6.5.3 || ^7.4.0" } }, "node_modules/@angular/compiler": { - "version": "15.2.8", - "resolved": "https://registry.npmjs.org/@angular/compiler/-/compiler-15.2.8.tgz", - "integrity": "sha512-+dvspIDvuGoYqdL7r/3o9ojkR3fH1zevgC0ISJivcIrMi+WcJ0FV2JmJdnm8V52oNsHy+sMF9eEZGEbCbACE/A==", + "version": "16.2.6", + "resolved": "https://registry.npmjs.org/@angular/compiler/-/compiler-16.2.6.tgz", + "integrity": "sha512-FKv9isn8BdM9TydyhdqcFhFD8nn11+fGqg3qbIQnOlnLb0ryYign93zBmlx/qFu46PvPtTmhsa4saE2NwvrSbg==", "dependencies": { "tslib": "^2.3.0" }, "engines": { - "node": "^14.20.0 || ^16.13.0 || >=18.10.0" + "node": "^16.14.0 || >=18.10.0" }, "peerDependencies": { - "@angular/core": "15.2.8" + "@angular/core": "16.2.6" }, "peerDependenciesMeta": { "@angular/core": { @@ -1094,17 +647,15 @@ } }, "node_modules/@angular/compiler-cli": { - "version": "15.2.9", - "resolved": "https://registry.npmjs.org/@angular/compiler-cli/-/compiler-cli-15.2.9.tgz", - "integrity": "sha512-zsbI8G2xHOeYWI0hjFzrI//ZhZV9il/uQW5dAimfwJp06KZDeXZ3PdwY9JQslf6F+saLwOObxy6QMrIVvfjy9w==", + "version": "16.2.6", + "resolved": "https://registry.npmjs.org/@angular/compiler-cli/-/compiler-cli-16.2.6.tgz", + "integrity": "sha512-rzyI4dKVj8T9dCnZCIffoxZ2PplYLmC9yd65VoaKxOQFxf/95/hgIRdt5kafjnZvzFN1qUbQuEfyviY+KFdQKg==", "dev": true, "dependencies": { - "@babel/core": "7.19.3", + "@babel/core": "7.22.5", "@jridgewell/sourcemap-codec": "^1.4.14", "chokidar": "^3.0.0", "convert-source-map": "^1.5.1", - "dependency-graph": "^0.11.0", - "magic-string": "^0.27.0", "reflect-metadata": "^0.1.2", "semver": "^7.0.0", "tslib": "^2.3.0", @@ -1113,147 +664,135 @@ "bin": { "ng-xi18n": "bundles/src/bin/ng_xi18n.js", "ngc": "bundles/src/bin/ngc.js", - "ngcc": "bundles/ngcc/main-ngcc.js" + "ngcc": "bundles/ngcc/index.js" }, "engines": { - "node": "^14.20.0 || ^16.13.0 || >=18.10.0" + "node": "^16.14.0 || >=18.10.0" }, "peerDependencies": { - "@angular/compiler": "15.2.9", - "typescript": ">=4.8.2 <5.0" - } - }, - "node_modules/@angular/compiler-cli/node_modules/magic-string": { - "version": "0.27.0", - "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.27.0.tgz", - "integrity": "sha512-8UnnX2PeRAPZuN12svgR9j7M1uWMovg/CEnIwIG0LFkXSJJe4PdfUGiTGl8V9bsBHFUtfVINcSyYxd7q+kx9fA==", - "dev": true, - "dependencies": { - "@jridgewell/sourcemap-codec": "^1.4.13" - }, - "engines": { - "node": ">=12" + "@angular/compiler": "16.2.6", + "typescript": ">=4.9.3 <5.2" } }, "node_modules/@angular/core": { - "version": "15.2.8", - "resolved": "https://registry.npmjs.org/@angular/core/-/core-15.2.8.tgz", - "integrity": "sha512-NDs+g4uM4EhyCvluf8a0YBCFXsDAEfCMHOD5cS00Bl+liTQ7JwtmepkWXMyjLB92irC9JaR79kdy4BoIKOh8WA==", + "version": "16.2.6", + "resolved": "https://registry.npmjs.org/@angular/core/-/core-16.2.6.tgz", + "integrity": "sha512-F7kJbkVHLupdVQbwjjEuWp5rtxmfnL571VtqRN/8OJZAI2OjZjnSbL+FRZGEZHDmOZ2cNgPKpYt/d3nbK8hpSw==", "dependencies": { "tslib": "^2.3.0" }, "engines": { - "node": "^14.20.0 || ^16.13.0 || >=18.10.0" + "node": "^16.14.0 || >=18.10.0" }, "peerDependencies": { "rxjs": "^6.5.3 || ^7.4.0", - "zone.js": "~0.11.4 || ~0.12.0 || ~0.13.0" + "zone.js": "~0.13.0" } }, "node_modules/@angular/forms": { - "version": "15.2.8", - "resolved": "https://registry.npmjs.org/@angular/forms/-/forms-15.2.8.tgz", - "integrity": "sha512-VyevVj20DdQWjAQUyiFTe+DAzqG9GqfAOWn376Y/lhPcwxAojXePTGNgtQud566/urDrNrP5haaLD6O36/3n+w==", + "version": "16.2.6", + "resolved": "https://registry.npmjs.org/@angular/forms/-/forms-16.2.6.tgz", + "integrity": "sha512-TsSpV6Oh0Z5WlCmRB6jEsChLA8ChBn8CY1uOkTh4YQEzdMCwvBvc1Q2DugER5iGvZU/hRNgjyHX7VR3ysB3JlQ==", "dependencies": { "tslib": "^2.3.0" }, "engines": { - "node": "^14.20.0 || ^16.13.0 || >=18.10.0" + "node": "^16.14.0 || >=18.10.0" }, "peerDependencies": { - "@angular/common": "15.2.8", - "@angular/core": "15.2.8", - "@angular/platform-browser": "15.2.8", + "@angular/common": "16.2.6", + "@angular/core": "16.2.6", + "@angular/platform-browser": "16.2.6", "rxjs": "^6.5.3 || ^7.4.0" } }, "node_modules/@angular/language-service": { - "version": "15.2.8", - "resolved": "https://registry.npmjs.org/@angular/language-service/-/language-service-15.2.8.tgz", - "integrity": "sha512-3wlaJrpxe8ZLe7ZGIOs/Z++kgJMOHZCUvdXLyp/4t1ejULgUgW9yi7nGsemWnSzsUCjf7595BP1Cp1gA/J/1QQ==", + "version": "16.2.6", + "resolved": "https://registry.npmjs.org/@angular/language-service/-/language-service-16.2.6.tgz", + "integrity": "sha512-CfGAPLTfYluyMdmYGIK/9hvHDZffLbKc+YZYVE5obgdVszeAJhjC60corbzNu30oTx5a994Q2OtdiKBgAJJ+Kg==", "dev": true, "engines": { - "node": "^14.20.0 || ^16.13.0 || >=18.10.0" + "node": "^16.14.0 || >=18.10.0" } }, "node_modules/@angular/material": { - "version": "15.2.8", - "resolved": "https://registry.npmjs.org/@angular/material/-/material-15.2.8.tgz", - "integrity": "sha512-bk0dv8PSJGFDgAv3CU3+jfvnOO0ah/L9JUyvw73kjiKezgjW/O8Lgq/dwkDTQ1dF3zCF+JWNqhEJmgi0GVW/cQ==", + "version": "16.1.5", + "resolved": "https://registry.npmjs.org/@angular/material/-/material-16.1.5.tgz", + "integrity": "sha512-l11mH/WWBmfiBhrf4/0hCihhLxK4Ldu7+fP8zucHO3X2TiLlpsgJZpcYwJkZf0Ai0rDqIzqCVnks7L9jiuTGCQ==", "dependencies": { - "@material/animation": "15.0.0-canary.684e33d25.0", - "@material/auto-init": "15.0.0-canary.684e33d25.0", - "@material/banner": "15.0.0-canary.684e33d25.0", - "@material/base": "15.0.0-canary.684e33d25.0", - "@material/button": "15.0.0-canary.684e33d25.0", - "@material/card": "15.0.0-canary.684e33d25.0", - "@material/checkbox": "15.0.0-canary.684e33d25.0", - "@material/chips": "15.0.0-canary.684e33d25.0", - "@material/circular-progress": "15.0.0-canary.684e33d25.0", - "@material/data-table": "15.0.0-canary.684e33d25.0", - "@material/density": "15.0.0-canary.684e33d25.0", - "@material/dialog": "15.0.0-canary.684e33d25.0", - "@material/dom": "15.0.0-canary.684e33d25.0", - "@material/drawer": "15.0.0-canary.684e33d25.0", - "@material/elevation": "15.0.0-canary.684e33d25.0", - "@material/fab": "15.0.0-canary.684e33d25.0", - "@material/feature-targeting": "15.0.0-canary.684e33d25.0", - "@material/floating-label": "15.0.0-canary.684e33d25.0", - "@material/form-field": "15.0.0-canary.684e33d25.0", - "@material/icon-button": "15.0.0-canary.684e33d25.0", - "@material/image-list": "15.0.0-canary.684e33d25.0", - "@material/layout-grid": "15.0.0-canary.684e33d25.0", - "@material/line-ripple": "15.0.0-canary.684e33d25.0", - "@material/linear-progress": "15.0.0-canary.684e33d25.0", - "@material/list": "15.0.0-canary.684e33d25.0", - "@material/menu": "15.0.0-canary.684e33d25.0", - "@material/menu-surface": "15.0.0-canary.684e33d25.0", - "@material/notched-outline": "15.0.0-canary.684e33d25.0", - "@material/radio": "15.0.0-canary.684e33d25.0", - "@material/ripple": "15.0.0-canary.684e33d25.0", - "@material/rtl": "15.0.0-canary.684e33d25.0", - "@material/segmented-button": "15.0.0-canary.684e33d25.0", - "@material/select": "15.0.0-canary.684e33d25.0", - "@material/shape": "15.0.0-canary.684e33d25.0", - "@material/slider": "15.0.0-canary.684e33d25.0", - "@material/snackbar": "15.0.0-canary.684e33d25.0", - "@material/switch": "15.0.0-canary.684e33d25.0", - "@material/tab": "15.0.0-canary.684e33d25.0", - "@material/tab-bar": "15.0.0-canary.684e33d25.0", - "@material/tab-indicator": "15.0.0-canary.684e33d25.0", - "@material/tab-scroller": "15.0.0-canary.684e33d25.0", - "@material/textfield": "15.0.0-canary.684e33d25.0", - "@material/theme": "15.0.0-canary.684e33d25.0", - "@material/tooltip": "15.0.0-canary.684e33d25.0", - "@material/top-app-bar": "15.0.0-canary.684e33d25.0", - "@material/touch-target": "15.0.0-canary.684e33d25.0", - "@material/typography": "15.0.0-canary.684e33d25.0", + "@material/animation": "15.0.0-canary.b994146f6.0", + "@material/auto-init": "15.0.0-canary.b994146f6.0", + "@material/banner": "15.0.0-canary.b994146f6.0", + "@material/base": "15.0.0-canary.b994146f6.0", + "@material/button": "15.0.0-canary.b994146f6.0", + "@material/card": "15.0.0-canary.b994146f6.0", + "@material/checkbox": "15.0.0-canary.b994146f6.0", + "@material/chips": "15.0.0-canary.b994146f6.0", + "@material/circular-progress": "15.0.0-canary.b994146f6.0", + "@material/data-table": "15.0.0-canary.b994146f6.0", + "@material/density": "15.0.0-canary.b994146f6.0", + "@material/dialog": "15.0.0-canary.b994146f6.0", + "@material/dom": "15.0.0-canary.b994146f6.0", + "@material/drawer": "15.0.0-canary.b994146f6.0", + "@material/elevation": "15.0.0-canary.b994146f6.0", + "@material/fab": "15.0.0-canary.b994146f6.0", + "@material/feature-targeting": "15.0.0-canary.b994146f6.0", + "@material/floating-label": "15.0.0-canary.b994146f6.0", + "@material/form-field": "15.0.0-canary.b994146f6.0", + "@material/icon-button": "15.0.0-canary.b994146f6.0", + "@material/image-list": "15.0.0-canary.b994146f6.0", + "@material/layout-grid": "15.0.0-canary.b994146f6.0", + "@material/line-ripple": "15.0.0-canary.b994146f6.0", + "@material/linear-progress": "15.0.0-canary.b994146f6.0", + "@material/list": "15.0.0-canary.b994146f6.0", + "@material/menu": "15.0.0-canary.b994146f6.0", + "@material/menu-surface": "15.0.0-canary.b994146f6.0", + "@material/notched-outline": "15.0.0-canary.b994146f6.0", + "@material/radio": "15.0.0-canary.b994146f6.0", + "@material/ripple": "15.0.0-canary.b994146f6.0", + "@material/rtl": "15.0.0-canary.b994146f6.0", + "@material/segmented-button": "15.0.0-canary.b994146f6.0", + "@material/select": "15.0.0-canary.b994146f6.0", + "@material/shape": "15.0.0-canary.b994146f6.0", + "@material/slider": "15.0.0-canary.b994146f6.0", + "@material/snackbar": "15.0.0-canary.b994146f6.0", + "@material/switch": "15.0.0-canary.b994146f6.0", + "@material/tab": "15.0.0-canary.b994146f6.0", + "@material/tab-bar": "15.0.0-canary.b994146f6.0", + "@material/tab-indicator": "15.0.0-canary.b994146f6.0", + "@material/tab-scroller": "15.0.0-canary.b994146f6.0", + "@material/textfield": "15.0.0-canary.b994146f6.0", + "@material/theme": "15.0.0-canary.b994146f6.0", + "@material/tooltip": "15.0.0-canary.b994146f6.0", + "@material/top-app-bar": "15.0.0-canary.b994146f6.0", + "@material/touch-target": "15.0.0-canary.b994146f6.0", + "@material/typography": "15.0.0-canary.b994146f6.0", "tslib": "^2.3.0" }, "peerDependencies": { - "@angular/animations": "^15.0.0 || ^16.0.0", - "@angular/cdk": "15.2.8", - "@angular/common": "^15.0.0 || ^16.0.0", - "@angular/core": "^15.0.0 || ^16.0.0", - "@angular/forms": "^15.0.0 || ^16.0.0", - "@angular/platform-browser": "^15.0.0 || ^16.0.0", + "@angular/animations": "^16.0.0 || ^17.0.0", + "@angular/cdk": "16.1.5", + "@angular/common": "^16.0.0 || ^17.0.0", + "@angular/core": "^16.0.0 || ^17.0.0", + "@angular/forms": "^16.0.0 || ^17.0.0", + "@angular/platform-browser": "^16.0.0 || ^17.0.0", "rxjs": "^6.5.3 || ^7.4.0" } }, "node_modules/@angular/platform-browser": { - "version": "15.2.8", - "resolved": "https://registry.npmjs.org/@angular/platform-browser/-/platform-browser-15.2.8.tgz", - "integrity": "sha512-8sKFUld54inj0FnQ1ydhFxnDgsbbf43W9FALye/5uEtLgwwE/ZvkNYMaQ7hq1JPuQRMDj3gJkFqaLeFjplpHDA==", + "version": "16.2.6", + "resolved": "https://registry.npmjs.org/@angular/platform-browser/-/platform-browser-16.2.6.tgz", + "integrity": "sha512-jXtarSZ/n6ytZQ9+Y0aDuazz5POz4UmLN3GxIWtc4kqPOQp4o3DCM16Ig4ioSm53Z/WSDASVaMwtRWN5SXCKfw==", "dependencies": { "tslib": "^2.3.0" }, "engines": { - "node": "^14.20.0 || ^16.13.0 || >=18.10.0" + "node": "^16.14.0 || >=18.10.0" }, "peerDependencies": { - "@angular/animations": "15.2.8", - "@angular/common": "15.2.8", - "@angular/core": "15.2.8" + "@angular/animations": "16.2.6", + "@angular/common": "16.2.6", + "@angular/core": "16.2.6" }, "peerDependenciesMeta": { "@angular/animations": { @@ -1262,64 +801,62 @@ } }, "node_modules/@angular/platform-browser-dynamic": { - "version": "15.2.8", - "resolved": "https://registry.npmjs.org/@angular/platform-browser-dynamic/-/platform-browser-dynamic-15.2.8.tgz", - "integrity": "sha512-75HyoZNibA3u/FvdK4Aw5KMzUmS/nDk5N8s7gfM09fe1resSPgFiW8JJEkr1xiUdA2WtSRbHs34y5rHLDe7n1Q==", + "version": "16.2.6", + "resolved": "https://registry.npmjs.org/@angular/platform-browser-dynamic/-/platform-browser-dynamic-16.2.6.tgz", + "integrity": "sha512-i3prfdjnOMMemQMLk7vywGueDsjRIcug+jNf4ZdSb4AEaAhv86mzt5z3iNNSSA3bec7oJfrxOayMz3o6zq3QXA==", "dependencies": { "tslib": "^2.3.0" }, "engines": { - "node": "^14.20.0 || ^16.13.0 || >=18.10.0" + "node": "^16.14.0 || >=18.10.0" }, "peerDependencies": { - "@angular/common": "15.2.8", - "@angular/compiler": "15.2.8", - "@angular/core": "15.2.8", - "@angular/platform-browser": "15.2.8" + "@angular/common": "16.2.6", + "@angular/compiler": "16.2.6", + "@angular/core": "16.2.6", + "@angular/platform-browser": "16.2.6" } }, "node_modules/@angular/platform-server": { - "version": "15.2.8", - "resolved": "https://registry.npmjs.org/@angular/platform-server/-/platform-server-15.2.8.tgz", - "integrity": "sha512-YfPAoK2zp3mTO6ubDe0C9Vzg9Vi4BxXkxHCPG0k8IM3Ivjedkv5PZ+vC0a+GjV2xR/0YqiVE3FCwXk4X6m6LuQ==", + "version": "16.2.6", + "resolved": "https://registry.npmjs.org/@angular/platform-server/-/platform-server-16.2.6.tgz", + "integrity": "sha512-cobq32X6P21CAVrvhCe9COlqwsdJcqhkJaGe6fl3yVh6CfrojBT6a9vsjgNKH6etVXEaGlLY+lh6hCfyJmZ72A==", "dependencies": { - "domino": "^2.1.2", "tslib": "^2.3.0", "xhr2": "^0.2.0" }, "engines": { - "node": "^14.20.0 || ^16.13.0 || >=18.10.0" + "node": "^16.14.0 || >=18.10.0" }, "peerDependencies": { - "@angular/animations": "15.2.8", - "@angular/common": "15.2.8", - "@angular/compiler": "15.2.8", - "@angular/core": "15.2.8", - "@angular/platform-browser": "15.2.8", - "@angular/platform-browser-dynamic": "15.2.8" + "@angular/animations": "16.2.6", + "@angular/common": "16.2.6", + "@angular/compiler": "16.2.6", + "@angular/core": "16.2.6", + "@angular/platform-browser": "16.2.6" } }, "node_modules/@angular/router": { - "version": "15.2.8", - "resolved": "https://registry.npmjs.org/@angular/router/-/router-15.2.8.tgz", - "integrity": "sha512-C62QBEeJSBTNTrQHZiklPrxwJwuENoZzWX22MMJ7dxl+7VjRgnmj8J7mcX9fLjHlL+mC3RvesMlX7sGZRQV1cg==", + "version": "16.2.6", + "resolved": "https://registry.npmjs.org/@angular/router/-/router-16.2.6.tgz", + "integrity": "sha512-huORA6D1UriaswbvVgfxpYQJofZ3hSDdJYRMI4lDcu1n6CaCoYnj8E3rqaU5U1Va0OeFmxzOuXG+3WyL+YfZgg==", "dependencies": { "tslib": "^2.3.0" }, "engines": { - "node": "^14.20.0 || ^16.13.0 || >=18.10.0" + "node": "^16.14.0 || >=18.10.0" }, "peerDependencies": { - "@angular/common": "15.2.8", - "@angular/core": "15.2.8", - "@angular/platform-browser": "15.2.8", + "@angular/common": "16.2.6", + "@angular/core": "16.2.6", + "@angular/platform-browser": "16.2.6", "rxjs": "^6.5.3 || ^7.4.0" } }, "node_modules/@angular/service-worker": { - "version": "15.2.8", - "resolved": "https://registry.npmjs.org/@angular/service-worker/-/service-worker-15.2.8.tgz", - "integrity": "sha512-iD3qsqN/N2014uCuCka77pu0tqPPsLcP9rUZgAJEM01o/A/ez+E3TmWW2PYvSq2zLZQnZZ40a7dWonIAclJq3Q==", + "version": "16.2.6", + "resolved": "https://registry.npmjs.org/@angular/service-worker/-/service-worker-16.2.6.tgz", + "integrity": "sha512-kLs+kQYI2w7OPi7B1F/YFwJiFos8+RJiHI7tDux3IVe5KeWr5XN9U8CEpTS2qL+CktXtWb6I9q3fFqcaaTQdDQ==", "dependencies": { "tslib": "^2.3.0" }, @@ -1327,24 +864,24 @@ "ngsw-config": "ngsw-config.js" }, "engines": { - "node": "^14.20.0 || ^16.13.0 || >=18.10.0" + "node": "^16.14.0 || >=18.10.0" }, "peerDependencies": { - "@angular/common": "15.2.8", - "@angular/core": "15.2.8" + "@angular/common": "16.2.6", + "@angular/core": "16.2.6" } }, "node_modules/@angular/youtube-player": { - "version": "15.2.8", - "resolved": "https://registry.npmjs.org/@angular/youtube-player/-/youtube-player-15.2.8.tgz", - "integrity": "sha512-yo5C48spbYF3S8iMg7XCgXEapA2azOhUqiEsFv38DMCKcd8UyvUEtoNaW85J3JTsb/oB66hjtxcF8xyZbWdaBQ==", + "version": "16.2.5", + "resolved": "https://registry.npmjs.org/@angular/youtube-player/-/youtube-player-16.2.5.tgz", + "integrity": "sha512-4RzjKIdTmY0/XFAKuSpaTyp9wYdBV90E5FqyfBwcEOpzoX3rv24N23zrpY9g2xyF2q5AKbvKxBctsLXf1iDToA==", "dependencies": { "@types/youtube": "^0.0.42", "tslib": "^2.3.0" }, "peerDependencies": { - "@angular/common": "^15.0.0 || ^16.0.0", - "@angular/core": "^15.0.0 || ^16.0.0", + "@angular/common": "^16.0.0 || ^17.0.0", + "@angular/core": "^16.0.0 || ^17.0.0", "rxjs": "^6.5.3 || ^7.4.0" } }, @@ -1479,83 +1016,64 @@ "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==" }, - "node_modules/@aws-sdk/abort-controller": { - "version": "3.357.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/abort-controller/-/abort-controller-3.357.0.tgz", - "integrity": "sha512-nQYDJon87quPwt2JZJwUN2GFKJnvE5kWb6tZP4xb5biSGUKBqDQo06oYed7yokatCuCMouIXV462aN0fWODtOw==", - "dependencies": { - "@aws-sdk/types": "3.357.0", - "tslib": "^2.5.0" - }, - "engines": { - "node": ">=14.0.0" - } - }, - "node_modules/@aws-sdk/chunked-blob-reader": { - "version": "3.310.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/chunked-blob-reader/-/chunked-blob-reader-3.310.0.tgz", - "integrity": "sha512-CrJS3exo4mWaLnWxfCH+w88Ou0IcAZSIkk4QbmxiHl/5Dq705OLoxf4385MVyExpqpeVJYOYQ2WaD8i/pQZ2fg==", - "dependencies": { - "tslib": "^2.5.0" - } - }, "node_modules/@aws-sdk/client-s3": { - "version": "3.360.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/client-s3/-/client-s3-3.360.0.tgz", - "integrity": "sha512-6URI0ZWk5ar0atJ8xTxD2u/oLWwBlosLTyqNpsMe7DKvZQ5DgUfLw3BHeC2d4FQID1I74rkGCdHLtRe4MOiIfA==", + "version": "3.418.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/client-s3/-/client-s3-3.418.0.tgz", + "integrity": "sha512-VdDM9xS84t8W1B2/QJTK6mYVCnf7Hovg8Aum9NHm+bD7F0Ni2NTLVjm8+qq9STi4YSeXAy3Pe+FBUP9Wthw7Iw==", "dependencies": { "@aws-crypto/sha1-browser": "3.0.0", "@aws-crypto/sha256-browser": "3.0.0", "@aws-crypto/sha256-js": "3.0.0", - "@aws-sdk/client-sts": "3.360.0", - "@aws-sdk/config-resolver": "3.357.0", - "@aws-sdk/credential-provider-node": "3.360.0", - "@aws-sdk/eventstream-serde-browser": "3.357.0", - "@aws-sdk/eventstream-serde-config-resolver": "3.357.0", - "@aws-sdk/eventstream-serde-node": "3.357.0", - "@aws-sdk/fetch-http-handler": "3.357.0", - "@aws-sdk/hash-blob-browser": "3.357.0", - "@aws-sdk/hash-node": "3.357.0", - "@aws-sdk/hash-stream-node": "3.357.0", - "@aws-sdk/invalid-dependency": "3.357.0", - "@aws-sdk/md5-js": "3.357.0", - "@aws-sdk/middleware-bucket-endpoint": "3.357.0", - "@aws-sdk/middleware-content-length": "3.357.0", - "@aws-sdk/middleware-endpoint": "3.357.0", - "@aws-sdk/middleware-expect-continue": "3.357.0", - "@aws-sdk/middleware-flexible-checksums": "3.357.0", - "@aws-sdk/middleware-host-header": "3.357.0", - "@aws-sdk/middleware-location-constraint": "3.357.0", - "@aws-sdk/middleware-logger": "3.357.0", - "@aws-sdk/middleware-recursion-detection": "3.357.0", - "@aws-sdk/middleware-retry": "3.357.0", - "@aws-sdk/middleware-sdk-s3": "3.357.0", - "@aws-sdk/middleware-serde": "3.357.0", - "@aws-sdk/middleware-signing": "3.357.0", - "@aws-sdk/middleware-ssec": "3.357.0", - "@aws-sdk/middleware-stack": "3.357.0", - "@aws-sdk/middleware-user-agent": "3.357.0", - "@aws-sdk/node-config-provider": "3.357.0", - "@aws-sdk/node-http-handler": "3.360.0", - "@aws-sdk/signature-v4-multi-region": "3.357.0", - "@aws-sdk/smithy-client": "3.360.0", - "@aws-sdk/types": "3.357.0", - "@aws-sdk/url-parser": "3.357.0", - "@aws-sdk/util-base64": "3.310.0", - "@aws-sdk/util-body-length-browser": "3.310.0", - "@aws-sdk/util-body-length-node": "3.310.0", - "@aws-sdk/util-defaults-mode-browser": "3.360.0", - "@aws-sdk/util-defaults-mode-node": "3.360.0", - "@aws-sdk/util-endpoints": "3.357.0", - "@aws-sdk/util-retry": "3.357.0", - "@aws-sdk/util-stream": "3.360.0", - "@aws-sdk/util-user-agent-browser": "3.357.0", - "@aws-sdk/util-user-agent-node": "3.357.0", - "@aws-sdk/util-utf8": "3.310.0", - "@aws-sdk/util-waiter": "3.357.0", + "@aws-sdk/client-sts": "3.418.0", + "@aws-sdk/credential-provider-node": "3.418.0", + "@aws-sdk/middleware-bucket-endpoint": "3.418.0", + "@aws-sdk/middleware-expect-continue": "3.418.0", + "@aws-sdk/middleware-flexible-checksums": "3.418.0", + "@aws-sdk/middleware-host-header": "3.418.0", + "@aws-sdk/middleware-location-constraint": "3.418.0", + "@aws-sdk/middleware-logger": "3.418.0", + "@aws-sdk/middleware-recursion-detection": "3.418.0", + "@aws-sdk/middleware-sdk-s3": "3.418.0", + "@aws-sdk/middleware-signing": "3.418.0", + "@aws-sdk/middleware-ssec": "3.418.0", + "@aws-sdk/middleware-user-agent": "3.418.0", + "@aws-sdk/region-config-resolver": "3.418.0", + "@aws-sdk/signature-v4-multi-region": "3.418.0", + "@aws-sdk/types": "3.418.0", + "@aws-sdk/util-endpoints": "3.418.0", + "@aws-sdk/util-user-agent-browser": "3.418.0", + "@aws-sdk/util-user-agent-node": "3.418.0", "@aws-sdk/xml-builder": "3.310.0", - "@smithy/protocol-http": "^1.0.1", - "@smithy/types": "^1.0.0", + "@smithy/config-resolver": "^2.0.10", + "@smithy/eventstream-serde-browser": "^2.0.9", + "@smithy/eventstream-serde-config-resolver": "^2.0.9", + "@smithy/eventstream-serde-node": "^2.0.9", + "@smithy/fetch-http-handler": "^2.1.5", + "@smithy/hash-blob-browser": "^2.0.9", + "@smithy/hash-node": "^2.0.9", + "@smithy/hash-stream-node": "^2.0.9", + "@smithy/invalid-dependency": "^2.0.9", + "@smithy/md5-js": "^2.0.9", + "@smithy/middleware-content-length": "^2.0.11", + "@smithy/middleware-endpoint": "^2.0.9", + "@smithy/middleware-retry": "^2.0.12", + "@smithy/middleware-serde": "^2.0.9", + "@smithy/middleware-stack": "^2.0.2", + "@smithy/node-config-provider": "^2.0.12", + "@smithy/node-http-handler": "^2.1.5", + "@smithy/protocol-http": "^3.0.5", + "@smithy/smithy-client": "^2.1.6", + "@smithy/types": "^2.3.3", + "@smithy/url-parser": "^2.0.9", + "@smithy/util-base64": "^2.0.0", + "@smithy/util-body-length-browser": "^2.0.0", + "@smithy/util-body-length-node": "^2.1.0", + "@smithy/util-defaults-mode-browser": "^2.0.10", + "@smithy/util-defaults-mode-node": "^2.0.12", + "@smithy/util-retry": "^2.0.2", + "@smithy/util-stream": "^2.0.12", + "@smithy/util-utf8": "^2.0.0", + "@smithy/util-waiter": "^2.0.9", "fast-xml-parser": "4.2.5", "tslib": "^2.5.0" }, @@ -1564,85 +1082,43 @@ } }, "node_modules/@aws-sdk/client-sso": { - "version": "3.360.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/client-sso/-/client-sso-3.360.0.tgz", - "integrity": "sha512-0f6eG+6XFbDxrma5xxNGg/FJxh/OHC6h8AkfNms9Lv1gBoQSagpcTor+ax0z9F6lypOjaelX6k4DpeKAp4PZeA==", + "version": "3.418.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/client-sso/-/client-sso-3.418.0.tgz", + "integrity": "sha512-fakz3YeSW/kCAOJ5w4ObrrQBxsYO8sU8i6WHLv6iWAsYZKAws2Mqa8g89P61+GitSH4z9waksdLouS6ep78/5A==", "dependencies": { "@aws-crypto/sha256-browser": "3.0.0", "@aws-crypto/sha256-js": "3.0.0", - "@aws-sdk/config-resolver": "3.357.0", - "@aws-sdk/fetch-http-handler": "3.357.0", - "@aws-sdk/hash-node": "3.357.0", - "@aws-sdk/invalid-dependency": "3.357.0", - "@aws-sdk/middleware-content-length": "3.357.0", - "@aws-sdk/middleware-endpoint": "3.357.0", - "@aws-sdk/middleware-host-header": "3.357.0", - "@aws-sdk/middleware-logger": "3.357.0", - "@aws-sdk/middleware-recursion-detection": "3.357.0", - "@aws-sdk/middleware-retry": "3.357.0", - "@aws-sdk/middleware-serde": "3.357.0", - "@aws-sdk/middleware-stack": "3.357.0", - "@aws-sdk/middleware-user-agent": "3.357.0", - "@aws-sdk/node-config-provider": "3.357.0", - "@aws-sdk/node-http-handler": "3.360.0", - "@aws-sdk/smithy-client": "3.360.0", - "@aws-sdk/types": "3.357.0", - "@aws-sdk/url-parser": "3.357.0", - "@aws-sdk/util-base64": "3.310.0", - "@aws-sdk/util-body-length-browser": "3.310.0", - "@aws-sdk/util-body-length-node": "3.310.0", - "@aws-sdk/util-defaults-mode-browser": "3.360.0", - "@aws-sdk/util-defaults-mode-node": "3.360.0", - "@aws-sdk/util-endpoints": "3.357.0", - "@aws-sdk/util-retry": "3.357.0", - "@aws-sdk/util-user-agent-browser": "3.357.0", - "@aws-sdk/util-user-agent-node": "3.357.0", - "@aws-sdk/util-utf8": "3.310.0", - "@smithy/protocol-http": "^1.0.1", - "@smithy/types": "^1.0.0", - "tslib": "^2.5.0" - }, - "engines": { - "node": ">=14.0.0" - } - }, - "node_modules/@aws-sdk/client-sso-oidc": { - "version": "3.360.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/client-sso-oidc/-/client-sso-oidc-3.360.0.tgz", - "integrity": "sha512-czIpPt75fS3gH3vgFz76+WTaKcvPxC/DnPuqVyHdihMmP0UuwGPU9jn+Xx9RdUw7Yay3+rJRe3AYgBn4Xb220g==", - "dependencies": { - "@aws-crypto/sha256-browser": "3.0.0", - "@aws-crypto/sha256-js": "3.0.0", - "@aws-sdk/config-resolver": "3.357.0", - "@aws-sdk/fetch-http-handler": "3.357.0", - "@aws-sdk/hash-node": "3.357.0", - "@aws-sdk/invalid-dependency": "3.357.0", - "@aws-sdk/middleware-content-length": "3.357.0", - "@aws-sdk/middleware-endpoint": "3.357.0", - "@aws-sdk/middleware-host-header": "3.357.0", - "@aws-sdk/middleware-logger": "3.357.0", - "@aws-sdk/middleware-recursion-detection": "3.357.0", - "@aws-sdk/middleware-retry": "3.357.0", - "@aws-sdk/middleware-serde": "3.357.0", - "@aws-sdk/middleware-stack": "3.357.0", - "@aws-sdk/middleware-user-agent": "3.357.0", - "@aws-sdk/node-config-provider": "3.357.0", - "@aws-sdk/node-http-handler": "3.360.0", - "@aws-sdk/smithy-client": "3.360.0", - "@aws-sdk/types": "3.357.0", - "@aws-sdk/url-parser": "3.357.0", - "@aws-sdk/util-base64": "3.310.0", - "@aws-sdk/util-body-length-browser": "3.310.0", - "@aws-sdk/util-body-length-node": "3.310.0", - "@aws-sdk/util-defaults-mode-browser": "3.360.0", - "@aws-sdk/util-defaults-mode-node": "3.360.0", - "@aws-sdk/util-endpoints": "3.357.0", - "@aws-sdk/util-retry": "3.357.0", - "@aws-sdk/util-user-agent-browser": "3.357.0", - "@aws-sdk/util-user-agent-node": "3.357.0", - "@aws-sdk/util-utf8": "3.310.0", - "@smithy/protocol-http": "^1.0.1", - "@smithy/types": "^1.0.0", + "@aws-sdk/middleware-host-header": "3.418.0", + "@aws-sdk/middleware-logger": "3.418.0", + "@aws-sdk/middleware-recursion-detection": "3.418.0", + "@aws-sdk/middleware-user-agent": "3.418.0", + "@aws-sdk/region-config-resolver": "3.418.0", + "@aws-sdk/types": "3.418.0", + "@aws-sdk/util-endpoints": "3.418.0", + "@aws-sdk/util-user-agent-browser": "3.418.0", + "@aws-sdk/util-user-agent-node": "3.418.0", + "@smithy/config-resolver": "^2.0.10", + "@smithy/fetch-http-handler": "^2.1.5", + "@smithy/hash-node": "^2.0.9", + "@smithy/invalid-dependency": "^2.0.9", + "@smithy/middleware-content-length": "^2.0.11", + "@smithy/middleware-endpoint": "^2.0.9", + "@smithy/middleware-retry": "^2.0.12", + "@smithy/middleware-serde": "^2.0.9", + "@smithy/middleware-stack": "^2.0.2", + "@smithy/node-config-provider": "^2.0.12", + "@smithy/node-http-handler": "^2.1.5", + "@smithy/protocol-http": "^3.0.5", + "@smithy/smithy-client": "^2.1.6", + "@smithy/types": "^2.3.3", + "@smithy/url-parser": "^2.0.9", + "@smithy/util-base64": "^2.0.0", + "@smithy/util-body-length-browser": "^2.0.0", + "@smithy/util-body-length-node": "^2.1.0", + "@smithy/util-defaults-mode-browser": "^2.0.10", + "@smithy/util-defaults-mode-node": "^2.0.12", + "@smithy/util-retry": "^2.0.2", + "@smithy/util-utf8": "^2.0.0", "tslib": "^2.5.0" }, "engines": { @@ -1650,45 +1126,46 @@ } }, "node_modules/@aws-sdk/client-sts": { - "version": "3.360.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/client-sts/-/client-sts-3.360.0.tgz", - "integrity": "sha512-ORRwSdwlSYGHfhQCXKtr1eJeTjI14l5IZRJbRDgXs46y4/GQj/rt/2Q6WGjVMfM1ZRRiEII2/vK7mU7IJcWkFw==", + "version": "3.418.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/client-sts/-/client-sts-3.418.0.tgz", + "integrity": "sha512-L0n0Hw+Pm+BhXTN1bYZ0y4JAMArYgazdHf1nUSlEHndgZicCCuQtlMLxfo3i/IbtWi0dzfZcZ9d/MdAM8p4Jyw==", "dependencies": { "@aws-crypto/sha256-browser": "3.0.0", "@aws-crypto/sha256-js": "3.0.0", - "@aws-sdk/config-resolver": "3.357.0", - "@aws-sdk/credential-provider-node": "3.360.0", - "@aws-sdk/fetch-http-handler": "3.357.0", - "@aws-sdk/hash-node": "3.357.0", - "@aws-sdk/invalid-dependency": "3.357.0", - "@aws-sdk/middleware-content-length": "3.357.0", - "@aws-sdk/middleware-endpoint": "3.357.0", - "@aws-sdk/middleware-host-header": "3.357.0", - "@aws-sdk/middleware-logger": "3.357.0", - "@aws-sdk/middleware-recursion-detection": "3.357.0", - "@aws-sdk/middleware-retry": "3.357.0", - "@aws-sdk/middleware-sdk-sts": "3.357.0", - "@aws-sdk/middleware-serde": "3.357.0", - "@aws-sdk/middleware-signing": "3.357.0", - "@aws-sdk/middleware-stack": "3.357.0", - "@aws-sdk/middleware-user-agent": "3.357.0", - "@aws-sdk/node-config-provider": "3.357.0", - "@aws-sdk/node-http-handler": "3.360.0", - "@aws-sdk/smithy-client": "3.360.0", - "@aws-sdk/types": "3.357.0", - "@aws-sdk/url-parser": "3.357.0", - "@aws-sdk/util-base64": "3.310.0", - "@aws-sdk/util-body-length-browser": "3.310.0", - "@aws-sdk/util-body-length-node": "3.310.0", - "@aws-sdk/util-defaults-mode-browser": "3.360.0", - "@aws-sdk/util-defaults-mode-node": "3.360.0", - "@aws-sdk/util-endpoints": "3.357.0", - "@aws-sdk/util-retry": "3.357.0", - "@aws-sdk/util-user-agent-browser": "3.357.0", - "@aws-sdk/util-user-agent-node": "3.357.0", - "@aws-sdk/util-utf8": "3.310.0", - "@smithy/protocol-http": "^1.0.1", - "@smithy/types": "^1.0.0", + "@aws-sdk/credential-provider-node": "3.418.0", + "@aws-sdk/middleware-host-header": "3.418.0", + "@aws-sdk/middleware-logger": "3.418.0", + "@aws-sdk/middleware-recursion-detection": "3.418.0", + "@aws-sdk/middleware-sdk-sts": "3.418.0", + "@aws-sdk/middleware-signing": "3.418.0", + "@aws-sdk/middleware-user-agent": "3.418.0", + "@aws-sdk/region-config-resolver": "3.418.0", + "@aws-sdk/types": "3.418.0", + "@aws-sdk/util-endpoints": "3.418.0", + "@aws-sdk/util-user-agent-browser": "3.418.0", + "@aws-sdk/util-user-agent-node": "3.418.0", + "@smithy/config-resolver": "^2.0.10", + "@smithy/fetch-http-handler": "^2.1.5", + "@smithy/hash-node": "^2.0.9", + "@smithy/invalid-dependency": "^2.0.9", + "@smithy/middleware-content-length": "^2.0.11", + "@smithy/middleware-endpoint": "^2.0.9", + "@smithy/middleware-retry": "^2.0.12", + "@smithy/middleware-serde": "^2.0.9", + "@smithy/middleware-stack": "^2.0.2", + "@smithy/node-config-provider": "^2.0.12", + "@smithy/node-http-handler": "^2.1.5", + "@smithy/protocol-http": "^3.0.5", + "@smithy/smithy-client": "^2.1.6", + "@smithy/types": "^2.3.3", + "@smithy/url-parser": "^2.0.9", + "@smithy/util-base64": "^2.0.0", + "@smithy/util-body-length-browser": "^2.0.0", + "@smithy/util-body-length-node": "^2.1.0", + "@smithy/util-defaults-mode-browser": "^2.0.10", + "@smithy/util-defaults-mode-node": "^2.0.12", + "@smithy/util-retry": "^2.0.2", + "@smithy/util-utf8": "^2.0.0", "fast-xml-parser": "4.2.5", "tslib": "^2.5.0" }, @@ -1696,42 +1173,14 @@ "node": ">=14.0.0" } }, - "node_modules/@aws-sdk/config-resolver": { - "version": "3.357.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/config-resolver/-/config-resolver-3.357.0.tgz", - "integrity": "sha512-cukfg0nX7Tzx/xFyH5F4Eyb8DA1ITCGtSQv4vnEjgUop+bkzckuGLKEeBcBhyZY+aw+2C9CVwIHwIMhRm0ul5w==", - "dependencies": { - "@aws-sdk/types": "3.357.0", - "@aws-sdk/util-config-provider": "3.310.0", - "@aws-sdk/util-middleware": "3.357.0", - "tslib": "^2.5.0" - }, - "engines": { - "node": ">=14.0.0" - } - }, "node_modules/@aws-sdk/credential-provider-env": { - "version": "3.357.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-env/-/credential-provider-env-3.357.0.tgz", - "integrity": "sha512-UOecwfqvXgJVqhfWSZ2S44v2Nq2oceW0PQVQp0JAa9opc2rxSVIfyOhPr0yMoPmpyNcP22rgeg6ce70KULYwiA==", + "version": "3.418.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-env/-/credential-provider-env-3.418.0.tgz", + "integrity": "sha512-e74sS+x63EZUBO+HaI8zor886YdtmULzwKdctsZp5/37Xho1CVUNtEC+fYa69nigBD9afoiH33I4JggaHgrekQ==", "dependencies": { - "@aws-sdk/property-provider": "3.357.0", - "@aws-sdk/types": "3.357.0", - "tslib": "^2.5.0" - }, - "engines": { - "node": ">=14.0.0" - } - }, - "node_modules/@aws-sdk/credential-provider-imds": { - "version": "3.357.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-imds/-/credential-provider-imds-3.357.0.tgz", - "integrity": "sha512-upw/bfsl7/WydT6gM0lBuR4Ipp4fzYm/E3ObFr0Mg5OkgVPt5ZJE+eeFTvwCpDdBSTKs4JfrK6/iEK8A23Q1jQ==", - "dependencies": { - "@aws-sdk/node-config-provider": "3.357.0", - "@aws-sdk/property-provider": "3.357.0", - "@aws-sdk/types": "3.357.0", - "@aws-sdk/url-parser": "3.357.0", + "@aws-sdk/types": "3.418.0", + "@smithy/property-provider": "^2.0.0", + "@smithy/types": "^2.3.3", "tslib": "^2.5.0" }, "engines": { @@ -1739,18 +1188,19 @@ } }, "node_modules/@aws-sdk/credential-provider-ini": { - "version": "3.360.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-ini/-/credential-provider-ini-3.360.0.tgz", - "integrity": "sha512-pWuLTq+yjSFssPGhDJ8oxvZsu7/F1KissGRt65G4qrfxHhoiMRcLF1GtFJueDQpitZ1i3mZXHVn/OSv4LPQ1Lw==", + "version": "3.418.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-ini/-/credential-provider-ini-3.418.0.tgz", + "integrity": "sha512-LTAeKKV85unlSqGNIeqEZ4N9gufaSoH+670n5YTUEk564zHCkUQW0PJomzLF5jKBco6Yfzv6rPBTukd+x9XWqw==", "dependencies": { - "@aws-sdk/credential-provider-env": "3.357.0", - "@aws-sdk/credential-provider-imds": "3.357.0", - "@aws-sdk/credential-provider-process": "3.357.0", - "@aws-sdk/credential-provider-sso": "3.360.0", - "@aws-sdk/credential-provider-web-identity": "3.357.0", - "@aws-sdk/property-provider": "3.357.0", - "@aws-sdk/shared-ini-file-loader": "3.357.0", - "@aws-sdk/types": "3.357.0", + "@aws-sdk/credential-provider-env": "3.418.0", + "@aws-sdk/credential-provider-process": "3.418.0", + "@aws-sdk/credential-provider-sso": "3.418.0", + "@aws-sdk/credential-provider-web-identity": "3.418.0", + "@aws-sdk/types": "3.418.0", + "@smithy/credential-provider-imds": "^2.0.0", + "@smithy/property-provider": "^2.0.0", + "@smithy/shared-ini-file-loader": "^2.0.6", + "@smithy/types": "^2.3.3", "tslib": "^2.5.0" }, "engines": { @@ -1758,19 +1208,20 @@ } }, "node_modules/@aws-sdk/credential-provider-node": { - "version": "3.360.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-node/-/credential-provider-node-3.360.0.tgz", - "integrity": "sha512-j4Lu5vXkdzz/L6fGKKxnL0vcwAGHlwFHjTg9nRagMn1lvaVjtktXeM30duHTBQq9i+ejdFxpVNWYrmHGaWPNdg==", + "version": "3.418.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-node/-/credential-provider-node-3.418.0.tgz", + "integrity": "sha512-VveTjtSC6m8YXj3fQDkMKEZuHv+CR2Z4u/NAN51Fi4xOtIWUtOBj5rfZ8HmBYoBjRF0DtRlPXuMiNnXAzTctfQ==", "dependencies": { - "@aws-sdk/credential-provider-env": "3.357.0", - "@aws-sdk/credential-provider-imds": "3.357.0", - "@aws-sdk/credential-provider-ini": "3.360.0", - "@aws-sdk/credential-provider-process": "3.357.0", - "@aws-sdk/credential-provider-sso": "3.360.0", - "@aws-sdk/credential-provider-web-identity": "3.357.0", - "@aws-sdk/property-provider": "3.357.0", - "@aws-sdk/shared-ini-file-loader": "3.357.0", - "@aws-sdk/types": "3.357.0", + "@aws-sdk/credential-provider-env": "3.418.0", + "@aws-sdk/credential-provider-ini": "3.418.0", + "@aws-sdk/credential-provider-process": "3.418.0", + "@aws-sdk/credential-provider-sso": "3.418.0", + "@aws-sdk/credential-provider-web-identity": "3.418.0", + "@aws-sdk/types": "3.418.0", + "@smithy/credential-provider-imds": "^2.0.0", + "@smithy/property-provider": "^2.0.0", + "@smithy/shared-ini-file-loader": "^2.0.6", + "@smithy/types": "^2.3.3", "tslib": "^2.5.0" }, "engines": { @@ -1778,13 +1229,14 @@ } }, "node_modules/@aws-sdk/credential-provider-process": { - "version": "3.357.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-process/-/credential-provider-process-3.357.0.tgz", - "integrity": "sha512-qFWWilFPsc2hR7O0KIhwcE78w+pVIK+uQR6MQMfdRyxUndgiuCorJwVjedc3yZtmnoELHF34j+m8whTBXv9E7Q==", + "version": "3.418.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-process/-/credential-provider-process-3.418.0.tgz", + "integrity": "sha512-xPbdm2WKz1oH6pTkrJoUmr3OLuqvvcPYTQX0IIlc31tmDwDWPQjXGGFD/vwZGIZIkKaFpFxVMgAzfFScxox7dw==", "dependencies": { - "@aws-sdk/property-provider": "3.357.0", - "@aws-sdk/shared-ini-file-loader": "3.357.0", - "@aws-sdk/types": "3.357.0", + "@aws-sdk/types": "3.418.0", + "@smithy/property-provider": "^2.0.0", + "@smithy/shared-ini-file-loader": "^2.0.6", + "@smithy/types": "^2.3.3", "tslib": "^2.5.0" }, "engines": { @@ -1792,15 +1244,16 @@ } }, "node_modules/@aws-sdk/credential-provider-sso": { - "version": "3.360.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-sso/-/credential-provider-sso-3.360.0.tgz", - "integrity": "sha512-kW0FR8AbMQrJxADxIqYSjHVN2RXwHmA5DzogYm1AjOkYRMN9JHDVOMQP2K2M6FCynZqTYsKW5lzjPOjS0fu8Dw==", + "version": "3.418.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-sso/-/credential-provider-sso-3.418.0.tgz", + "integrity": "sha512-tUF5Hg/HfaU5t+E7IuvohYlodSIlBXa28xAJPPFxhKrUnvP6AIoW6JLazOtCIQjQgJYEUILV29XX+ojUuITcaw==", "dependencies": { - "@aws-sdk/client-sso": "3.360.0", - "@aws-sdk/property-provider": "3.357.0", - "@aws-sdk/shared-ini-file-loader": "3.357.0", - "@aws-sdk/token-providers": "3.360.0", - "@aws-sdk/types": "3.357.0", + "@aws-sdk/client-sso": "3.418.0", + "@aws-sdk/token-providers": "3.418.0", + "@aws-sdk/types": "3.418.0", + "@smithy/property-provider": "^2.0.0", + "@smithy/shared-ini-file-loader": "^2.0.6", + "@smithy/types": "^2.3.3", "tslib": "^2.5.0" }, "engines": { @@ -1808,196 +1261,30 @@ } }, "node_modules/@aws-sdk/credential-provider-web-identity": { - "version": "3.357.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-web-identity/-/credential-provider-web-identity-3.357.0.tgz", - "integrity": "sha512-0KRRAFrXy5HJe2vqnCWCoCS+fQw7IoIj3KQsuURJMW4F+ifisxCgEsh3brJ2LQlN4ElWTRJhlrDHNZ/pd61D4w==", + "version": "3.418.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-web-identity/-/credential-provider-web-identity-3.418.0.tgz", + "integrity": "sha512-do7ang565n9p3dS1JdsQY01rUfRx8vkxQqz5M8OlcEHBNiCdi2PvSjNwcBdrv/FKkyIxZb0TImOfBSt40hVdxQ==", "dependencies": { - "@aws-sdk/property-provider": "3.357.0", - "@aws-sdk/types": "3.357.0", + "@aws-sdk/types": "3.418.0", + "@smithy/property-provider": "^2.0.0", + "@smithy/types": "^2.3.3", "tslib": "^2.5.0" }, "engines": { "node": ">=14.0.0" } }, - "node_modules/@aws-sdk/eventstream-codec": { - "version": "3.357.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/eventstream-codec/-/eventstream-codec-3.357.0.tgz", - "integrity": "sha512-bqenTHG6GH6aCk/Il+ooWXVVAZuc8lOgVEy9bE2hI49oVqT8zSuXxQB+w1WWyZoAOPcelsjayB1wfPub8VDBxQ==", - "dependencies": { - "@aws-crypto/crc32": "3.0.0", - "@aws-sdk/types": "3.357.0", - "@aws-sdk/util-hex-encoding": "3.310.0", - "tslib": "^2.5.0" - } - }, - "node_modules/@aws-sdk/eventstream-serde-browser": { - "version": "3.357.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/eventstream-serde-browser/-/eventstream-serde-browser-3.357.0.tgz", - "integrity": "sha512-hBabtmwuspVHGSKnUccDiSIbg+IVoBThx6wYt6i4edbWAITHF3ADVKXy7icV400CAyG0XTZgxjE6FKpiDxj9rQ==", - "dependencies": { - "@aws-sdk/eventstream-serde-universal": "3.357.0", - "@aws-sdk/types": "3.357.0", - "tslib": "^2.5.0" - }, - "engines": { - "node": ">=14.0.0" - } - }, - "node_modules/@aws-sdk/eventstream-serde-config-resolver": { - "version": "3.357.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/eventstream-serde-config-resolver/-/eventstream-serde-config-resolver-3.357.0.tgz", - "integrity": "sha512-E6rwk+1KFXhKmJ+v7JW5Uyyda1yN5XRVupCnCrtFsHFmhVGQxFacoUZIee3bfuCpC58dLSyESggxGpUd3XOSsw==", - "dependencies": { - "@aws-sdk/types": "3.357.0", - "tslib": "^2.5.0" - }, - "engines": { - "node": ">=14.0.0" - } - }, - "node_modules/@aws-sdk/eventstream-serde-node": { - "version": "3.357.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/eventstream-serde-node/-/eventstream-serde-node-3.357.0.tgz", - "integrity": "sha512-boXDy+JWcPfHc9OIKV6I4Bh2XrLcg+eac+/LldNZFcDIB33/gHIM2CJw8u565Iebdz1NKEkP/QPPZbk2y+abPA==", - "dependencies": { - "@aws-sdk/eventstream-serde-universal": "3.357.0", - "@aws-sdk/types": "3.357.0", - "tslib": "^2.5.0" - }, - "engines": { - "node": ">=14.0.0" - } - }, - "node_modules/@aws-sdk/eventstream-serde-universal": { - "version": "3.357.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/eventstream-serde-universal/-/eventstream-serde-universal-3.357.0.tgz", - "integrity": "sha512-9/Wcdxx38XQAturqOAGYNCaLOzFVnW+xwxd4af9eNOfZfZ5PP5PRKBIpvKDsN26e3l4f3GodHx7MS1WB7BBc2w==", - "dependencies": { - "@aws-sdk/eventstream-codec": "3.357.0", - "@aws-sdk/types": "3.357.0", - "tslib": "^2.5.0" - }, - "engines": { - "node": ">=14.0.0" - } - }, - "node_modules/@aws-sdk/fetch-http-handler": { - "version": "3.357.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/fetch-http-handler/-/fetch-http-handler-3.357.0.tgz", - "integrity": "sha512-5sPloTO8y8fAnS/6/Sfp/aVoL9zuhzkLdWBORNzMazdynVNEzWKWCPZ27RQpgkaCDHiXjqUY4kfuFXAGkvFfDQ==", - "dependencies": { - "@aws-sdk/protocol-http": "3.357.0", - "@aws-sdk/querystring-builder": "3.357.0", - "@aws-sdk/types": "3.357.0", - "@aws-sdk/util-base64": "3.310.0", - "tslib": "^2.5.0" - } - }, - "node_modules/@aws-sdk/hash-blob-browser": { - "version": "3.357.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/hash-blob-browser/-/hash-blob-browser-3.357.0.tgz", - "integrity": "sha512-RDd6UgrGHDmleTnXM9LRSSVa69euSAG2mlNhZMEDWk3OFseXVYqBDaqroVbQ01rM2UAe8MeBFchlV9OmxuVgvw==", - "dependencies": { - "@aws-sdk/chunked-blob-reader": "3.310.0", - "@aws-sdk/types": "3.357.0", - "tslib": "^2.5.0" - } - }, - "node_modules/@aws-sdk/hash-node": { - "version": "3.357.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/hash-node/-/hash-node-3.357.0.tgz", - "integrity": "sha512-fq3LS9AxHKb7dTZkm6iM1TrGk6XOTZz96iEZPME1+vjiSEXGWuebHt87q92n+KozVGRypn9MId3lHOPBBjygNQ==", - "dependencies": { - "@aws-sdk/types": "3.357.0", - "@aws-sdk/util-buffer-from": "3.310.0", - "@aws-sdk/util-utf8": "3.310.0", - "tslib": "^2.5.0" - }, - "engines": { - "node": ">=14.0.0" - } - }, - "node_modules/@aws-sdk/hash-stream-node": { - "version": "3.357.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/hash-stream-node/-/hash-stream-node-3.357.0.tgz", - "integrity": "sha512-KZjN1VAw1KHNp+xKVOWBGS+MpaYQTjZFD5f+7QQqW4TfbAkFFwIAEYIHq5Q8Gw+jVh0h61OrV/LyW3J2PVzc+w==", - "dependencies": { - "@aws-sdk/types": "3.357.0", - "@aws-sdk/util-utf8": "3.310.0", - "tslib": "^2.5.0" - }, - "engines": { - "node": ">=14.0.0" - } - }, - "node_modules/@aws-sdk/invalid-dependency": { - "version": "3.357.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/invalid-dependency/-/invalid-dependency-3.357.0.tgz", - "integrity": "sha512-HnCYZczf0VdyxMVMMxmA3QJAyyPSFbcMtZzgKbxVTWTG7GKpQe0psWZu/7O2Nk31mKg6vEUdiP1FylqLBsgMOA==", - "dependencies": { - "@aws-sdk/types": "3.357.0", - "tslib": "^2.5.0" - } - }, - "node_modules/@aws-sdk/is-array-buffer": { - "version": "3.310.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/is-array-buffer/-/is-array-buffer-3.310.0.tgz", - "integrity": "sha512-urnbcCR+h9NWUnmOtet/s4ghvzsidFmspfhYaHAmSRdy9yDjdjBJMFjjsn85A1ODUktztm+cVncXjQ38WCMjMQ==", - "dependencies": { - "tslib": "^2.5.0" - }, - "engines": { - "node": ">=14.0.0" - } - }, - "node_modules/@aws-sdk/md5-js": { - "version": "3.357.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/md5-js/-/md5-js-3.357.0.tgz", - "integrity": "sha512-to42sFAL7KgV/X9X40LLfEaNMHMGQL6/7mPMVCL/W2BZf3zw5OTl3lAaNyjXA+gO5Uo4lFEiQKAQVKNbr8b8Nw==", - "dependencies": { - "@aws-sdk/types": "3.357.0", - "@aws-sdk/util-utf8": "3.310.0", - "tslib": "^2.5.0" - } - }, "node_modules/@aws-sdk/middleware-bucket-endpoint": { - "version": "3.357.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-bucket-endpoint/-/middleware-bucket-endpoint-3.357.0.tgz", - "integrity": "sha512-ep2T0FJXRDl6nffLqiVZUYfDocZ3B72wvHeozckkLVRX0TK91WEpzv4Zz2vdeBp6CGkM3g8oGjbb6ZqllUZ6TA==", + "version": "3.418.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-bucket-endpoint/-/middleware-bucket-endpoint-3.418.0.tgz", + "integrity": "sha512-gj/mj1UfbKkGbQ1N4YUvjTTp8BVs5fO1QAL2AjFJ+jfJOToLReX72aNEkm7sPGbHML0TqOY4cQbJuWYy+zdD5g==", "dependencies": { - "@aws-sdk/protocol-http": "3.357.0", - "@aws-sdk/types": "3.357.0", + "@aws-sdk/types": "3.418.0", "@aws-sdk/util-arn-parser": "3.310.0", - "@aws-sdk/util-config-provider": "3.310.0", - "tslib": "^2.5.0" - }, - "engines": { - "node": ">=14.0.0" - } - }, - "node_modules/@aws-sdk/middleware-content-length": { - "version": "3.357.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-content-length/-/middleware-content-length-3.357.0.tgz", - "integrity": "sha512-zQOFEyzOXAgN4M54tYNWGxKxnyzY0WwYDTFzh9riJRmxN1hTEKHUKmze4nILIf5rkQmOG4kTf1qmfazjkvZAhw==", - "dependencies": { - "@aws-sdk/protocol-http": "3.357.0", - "@aws-sdk/types": "3.357.0", - "tslib": "^2.5.0" - }, - "engines": { - "node": ">=14.0.0" - } - }, - "node_modules/@aws-sdk/middleware-endpoint": { - "version": "3.357.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-endpoint/-/middleware-endpoint-3.357.0.tgz", - "integrity": "sha512-ScJi0SL8X/Lyi0Fp5blg0QN/Z6PoRwV/ZJXd8dQkXSznkbSvJHfqPP0xk/w3GcQ1TKsu5YEPfeYy8ejcq+7Pgg==", - "dependencies": { - "@aws-sdk/middleware-serde": "3.357.0", - "@aws-sdk/types": "3.357.0", - "@aws-sdk/url-parser": "3.357.0", - "@aws-sdk/util-middleware": "3.357.0", + "@smithy/node-config-provider": "^2.0.12", + "@smithy/protocol-http": "^3.0.5", + "@smithy/types": "^2.3.3", + "@smithy/util-config-provider": "^2.0.0", "tslib": "^2.5.0" }, "engines": { @@ -2005,12 +1292,13 @@ } }, "node_modules/@aws-sdk/middleware-expect-continue": { - "version": "3.357.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-expect-continue/-/middleware-expect-continue-3.357.0.tgz", - "integrity": "sha512-KeizuiiDmdLeAbiNsJt/rZENY5iJo4wCTl7h81htDC60wSwVwFG03IdgvZlFH6jktYRh4mUDD/6Oljme6yPNxw==", + "version": "3.418.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-expect-continue/-/middleware-expect-continue-3.418.0.tgz", + "integrity": "sha512-6x4rcIj685EmqDLQkbWoCur3Dg5DRClHMen6nHXmD3CR5Xyt3z1Gk/+jmZICxyJo9c6M4AeZht8o95BopkmYAQ==", "dependencies": { - "@aws-sdk/protocol-http": "3.357.0", - "@aws-sdk/types": "3.357.0", + "@aws-sdk/types": "3.418.0", + "@smithy/protocol-http": "^3.0.5", + "@smithy/types": "^2.3.3", "tslib": "^2.5.0" }, "engines": { @@ -2018,16 +1306,17 @@ } }, "node_modules/@aws-sdk/middleware-flexible-checksums": { - "version": "3.357.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-flexible-checksums/-/middleware-flexible-checksums-3.357.0.tgz", - "integrity": "sha512-NNQ/iPN6YyzqgVaV8AeYQMZ8y1OmUW27vmt0R66UUw5H5THGc6X9QXoKfie7OHn80Qv1S8P5jw8z5MpvDtjSnQ==", + "version": "3.418.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-flexible-checksums/-/middleware-flexible-checksums-3.418.0.tgz", + "integrity": "sha512-3O203dqS2JU5P1TAAbo7p1qplXQh59pevw9nqzPVb3EG8B+mSucVf2kKmF7kGHqKSk+nK/mB/4XGSsZBzGt6Wg==", "dependencies": { "@aws-crypto/crc32": "3.0.0", "@aws-crypto/crc32c": "3.0.0", - "@aws-sdk/is-array-buffer": "3.310.0", - "@aws-sdk/protocol-http": "3.357.0", - "@aws-sdk/types": "3.357.0", - "@aws-sdk/util-utf8": "3.310.0", + "@aws-sdk/types": "3.418.0", + "@smithy/is-array-buffer": "^2.0.0", + "@smithy/protocol-http": "^3.0.5", + "@smithy/types": "^2.3.3", + "@smithy/util-utf8": "^2.0.0", "tslib": "^2.5.0" }, "engines": { @@ -2035,12 +1324,13 @@ } }, "node_modules/@aws-sdk/middleware-host-header": { - "version": "3.357.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-host-header/-/middleware-host-header-3.357.0.tgz", - "integrity": "sha512-HuGLcP7JP1qJ5wGT9GSlEknDaTSnOzHY4T6IPFuvFjAy3PvY5siQNm6+VRqdVS+n6/kzpL3JP5sAVM3aoxHT6Q==", + "version": "3.418.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-host-header/-/middleware-host-header-3.418.0.tgz", + "integrity": "sha512-LrMTdzalkPw/1ujLCKPLwCGvPMCmT4P+vOZQRbSEVZPnlZk+Aj++aL/RaHou0jL4kJH3zl8iQepriBt4a7UvXQ==", "dependencies": { - "@aws-sdk/protocol-http": "3.357.0", - "@aws-sdk/types": "3.357.0", + "@aws-sdk/types": "3.418.0", + "@smithy/protocol-http": "^3.0.5", + "@smithy/types": "^2.3.3", "tslib": "^2.5.0" }, "engines": { @@ -2048,11 +1338,12 @@ } }, "node_modules/@aws-sdk/middleware-location-constraint": { - "version": "3.357.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-location-constraint/-/middleware-location-constraint-3.357.0.tgz", - "integrity": "sha512-4IsIHhwZ2/o7yjLI1XtGMkJ442cbIN5/NtI/Ml0G5UHYviUm8sqvH2vldFBMK5bPuVdk6GpqXpy6wYc9rLJj2w==", + "version": "3.418.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-location-constraint/-/middleware-location-constraint-3.418.0.tgz", + "integrity": "sha512-cc8M3VEaESHJhDsDV8tTpt2QYUprDWhvAVVSlcL43cTdZ54Quc0W+toDiaVOUlwrAZz2Y7g5NDj22ibJGFbOvw==", "dependencies": { - "@aws-sdk/types": "3.357.0", + "@aws-sdk/types": "3.418.0", + "@smithy/types": "^2.3.3", "tslib": "^2.5.0" }, "engines": { @@ -2060,11 +1351,12 @@ } }, "node_modules/@aws-sdk/middleware-logger": { - "version": "3.357.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-logger/-/middleware-logger-3.357.0.tgz", - "integrity": "sha512-dncT3tr+lZ9+duZo52rASgO6AKVwRcsc2/T93gmaYVrJqI6WWAwQ7yML5s72l9ZjQ5LZ+4jjrgtlufavAS0eCg==", + "version": "3.418.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-logger/-/middleware-logger-3.418.0.tgz", + "integrity": "sha512-StKGmyPVfoO/wdNTtKemYwoJsqIl4l7oqarQY7VSf2Mp3mqaa+njLViHsQbirYpyqpgUEusOnuTlH5utxJ1NsQ==", "dependencies": { - "@aws-sdk/types": "3.357.0", + "@aws-sdk/types": "3.418.0", + "@smithy/types": "^2.3.3", "tslib": "^2.5.0" }, "engines": { @@ -2072,51 +1364,29 @@ } }, "node_modules/@aws-sdk/middleware-recursion-detection": { - "version": "3.357.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-recursion-detection/-/middleware-recursion-detection-3.357.0.tgz", - "integrity": "sha512-AXC54IeDS3jC1dbbkYHML4STvBPcKZ4IJTWdjEK1RCOgqXd0Ze1cE1e21wyj1tM6prF03zLyvpBd+3TS++nqfA==", + "version": "3.418.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-recursion-detection/-/middleware-recursion-detection-3.418.0.tgz", + "integrity": "sha512-kKFrIQglBLUFPbHSDy1+bbe3Na2Kd70JSUC3QLMbUHmqipXN8KeXRfAj7vTv97zXl0WzG0buV++WcNwOm1rFjg==", "dependencies": { - "@aws-sdk/protocol-http": "3.357.0", - "@aws-sdk/types": "3.357.0", + "@aws-sdk/types": "3.418.0", + "@smithy/protocol-http": "^3.0.5", + "@smithy/types": "^2.3.3", "tslib": "^2.5.0" }, "engines": { "node": ">=14.0.0" } }, - "node_modules/@aws-sdk/middleware-retry": { - "version": "3.357.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-retry/-/middleware-retry-3.357.0.tgz", - "integrity": "sha512-ZCbXCYv3nglQqwREYxxpclrnR9MYPAnHlLcC8e9PbApqxGnaZdhoywxoqbgqT3hf/RM7kput4vEHDl1fyymcRQ==", - "dependencies": { - "@aws-sdk/protocol-http": "3.357.0", - "@aws-sdk/service-error-classification": "3.357.0", - "@aws-sdk/types": "3.357.0", - "@aws-sdk/util-middleware": "3.357.0", - "@aws-sdk/util-retry": "3.357.0", - "tslib": "^2.5.0", - "uuid": "^8.3.2" - }, - "engines": { - "node": ">=14.0.0" - } - }, - "node_modules/@aws-sdk/middleware-retry/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==", - "bin": { - "uuid": "dist/bin/uuid" - } - }, "node_modules/@aws-sdk/middleware-sdk-s3": { - "version": "3.357.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-sdk-s3/-/middleware-sdk-s3-3.357.0.tgz", - "integrity": "sha512-EFQaPD8SoXcK7RiEOZz0zIX9owQW6txu8vrOOVva9xMts36z/3E7b4FVsgEJ53Ixa1x38ddPJxp4U8EIaf+pvQ==", + "version": "3.418.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-sdk-s3/-/middleware-sdk-s3-3.418.0.tgz", + "integrity": "sha512-rei32LF45SyqL3NlWDjEOfMwAca9A5F4QgUyXJqvASc43oWC1tJnLIhiCxNh8qkWAiRyRzFpcanTeqyaRSsZpA==", "dependencies": { - "@aws-sdk/protocol-http": "3.357.0", - "@aws-sdk/types": "3.357.0", + "@aws-sdk/types": "3.418.0", "@aws-sdk/util-arn-parser": "3.310.0", + "@smithy/protocol-http": "^3.0.5", + "@smithy/smithy-client": "^2.1.6", + "@smithy/types": "^2.3.3", "tslib": "^2.5.0" }, "engines": { @@ -2124,24 +1394,13 @@ } }, "node_modules/@aws-sdk/middleware-sdk-sts": { - "version": "3.357.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-sdk-sts/-/middleware-sdk-sts-3.357.0.tgz", - "integrity": "sha512-Ng2VjLrPiL02QOcs1qs9jG2boO4Gn+v3VIbOJLG4zXcfbSq55iIWtlmr2ljfw9vP5aLhWtcODfmKHS5Bp+019Q==", + "version": "3.418.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-sdk-sts/-/middleware-sdk-sts-3.418.0.tgz", + "integrity": "sha512-cW8ijrCTP+mgihvcq4+TbhAcE/we5lFl4ydRqvTdtcSnYQAVQADg47rnTScQiFsPFEB3NKq7BGeyTJF9MKolPA==", "dependencies": { - "@aws-sdk/middleware-signing": "3.357.0", - "@aws-sdk/types": "3.357.0", - "tslib": "^2.5.0" - }, - "engines": { - "node": ">=14.0.0" - } - }, - "node_modules/@aws-sdk/middleware-serde": { - "version": "3.357.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-serde/-/middleware-serde-3.357.0.tgz", - "integrity": "sha512-bGI4kYuuEsFjlANbyJLyy4AovETnyf/SukgLOG7Qjbua+ZGuzvRhMsk21mBKKGrnsTO4PmtieJo6xClThGAN8g==", - "dependencies": { - "@aws-sdk/types": "3.357.0", + "@aws-sdk/middleware-signing": "3.418.0", + "@aws-sdk/types": "3.418.0", + "@smithy/types": "^2.3.3", "tslib": "^2.5.0" }, "engines": { @@ -2149,15 +1408,16 @@ } }, "node_modules/@aws-sdk/middleware-signing": { - "version": "3.357.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-signing/-/middleware-signing-3.357.0.tgz", - "integrity": "sha512-yB9ewEqI6Fw1OrmKFrUypbCqN5ijk06UGPochybamMuPxxkwMT3bnrm7eezsCA+TZbJyKhpffpyobwuv+xGNrA==", + "version": "3.418.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-signing/-/middleware-signing-3.418.0.tgz", + "integrity": "sha512-onvs5KoYQE8OlOE740RxWBGtsUyVIgAo0CzRKOQO63ZEYqpL1Os+MS1CGzdNhvQnJgJruE1WW+Ix8fjN30zKPA==", "dependencies": { - "@aws-sdk/property-provider": "3.357.0", - "@aws-sdk/protocol-http": "3.357.0", - "@aws-sdk/signature-v4": "3.357.0", - "@aws-sdk/types": "3.357.0", - "@aws-sdk/util-middleware": "3.357.0", + "@aws-sdk/types": "3.418.0", + "@smithy/property-provider": "^2.0.0", + "@smithy/protocol-http": "^3.0.5", + "@smithy/signature-v4": "^2.0.0", + "@smithy/types": "^2.3.3", + "@smithy/util-middleware": "^2.0.2", "tslib": "^2.5.0" }, "engines": { @@ -2165,22 +1425,12 @@ } }, "node_modules/@aws-sdk/middleware-ssec": { - "version": "3.357.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-ssec/-/middleware-ssec-3.357.0.tgz", - "integrity": "sha512-uE3nNvJclcY7SgGoOgDCUgfc7ElXQmWVpks8AZzAjJj7bG5j6Bv3FOOYtGtvtxUzTHaOdn+yQwjssV1cZ6GTQw==", - "dependencies": { - "@aws-sdk/types": "3.357.0", - "tslib": "^2.5.0" - }, - "engines": { - "node": ">=14.0.0" - } - }, - "node_modules/@aws-sdk/middleware-stack": { - "version": "3.357.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-stack/-/middleware-stack-3.357.0.tgz", - "integrity": "sha512-nNV+jfwGwmbOGZujAY/U8AW3EbVlxa9DJDLz3TPp/39o6Vu5KEzHJyDDNreo2k9V/TMvV+nOzHafufgPdagv7w==", + "version": "3.418.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-ssec/-/middleware-ssec-3.418.0.tgz", + "integrity": "sha512-J7K+5h6aP7IYMlu/NwHEIjb0+WDu1eFvO8TCPo6j1H9xYRi8B/6h+6pa9Rk9IgRUzFnrdlDu9FazG8Tp0KKLyg==", "dependencies": { + "@aws-sdk/types": "3.418.0", + "@smithy/types": "^2.3.3", "tslib": "^2.5.0" }, "engines": { @@ -2188,91 +1438,29 @@ } }, "node_modules/@aws-sdk/middleware-user-agent": { - "version": "3.357.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-user-agent/-/middleware-user-agent-3.357.0.tgz", - "integrity": "sha512-M/CsAXjGblZS4rEbMb0Dn9IXbfq4EjVaTHBfvuILU/dKRppWvjnm2lRtqCZ+LIT3ATbAjA3/dY7dWsjxQWwijA==", + "version": "3.418.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-user-agent/-/middleware-user-agent-3.418.0.tgz", + "integrity": "sha512-Jdcztg9Tal9SEAL0dKRrnpKrm6LFlWmAhvuwv0dQ7bNTJxIxyEFbpqdgy7mpQHsLVZgq1Aad/7gT/72c9igyZw==", "dependencies": { - "@aws-sdk/protocol-http": "3.357.0", - "@aws-sdk/types": "3.357.0", - "@aws-sdk/util-endpoints": "3.357.0", + "@aws-sdk/types": "3.418.0", + "@aws-sdk/util-endpoints": "3.418.0", + "@smithy/protocol-http": "^3.0.5", + "@smithy/types": "^2.3.3", "tslib": "^2.5.0" }, "engines": { "node": ">=14.0.0" } }, - "node_modules/@aws-sdk/node-config-provider": { - "version": "3.357.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/node-config-provider/-/node-config-provider-3.357.0.tgz", - "integrity": "sha512-kwBIzKCaW3UWqLdELhy7TcN8itNMOjbzga530nalFILMvn2IxrkdKQhNgxGBXy6QK6kCOtH6OmcrG3/oZkLwig==", + "node_modules/@aws-sdk/region-config-resolver": { + "version": "3.418.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/region-config-resolver/-/region-config-resolver-3.418.0.tgz", + "integrity": "sha512-lJRZ/9TjZU6yLz+mAwxJkcJZ6BmyYoIJVo1p5+BN//EFdEmC8/c0c9gXMRzfISV/mqWSttdtccpAyN4/goHTYA==", "dependencies": { - "@aws-sdk/property-provider": "3.357.0", - "@aws-sdk/shared-ini-file-loader": "3.357.0", - "@aws-sdk/types": "3.357.0", - "tslib": "^2.5.0" - }, - "engines": { - "node": ">=14.0.0" - } - }, - "node_modules/@aws-sdk/node-http-handler": { - "version": "3.360.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/node-http-handler/-/node-http-handler-3.360.0.tgz", - "integrity": "sha512-oMsXdMmNwHpUbebETO44bq0N4SocEMGfPjYNUTRs8md7ita5fuFd2qFuvf+ZRt6iVcGWluIqmF8DidD+b7d+TA==", - "dependencies": { - "@aws-sdk/abort-controller": "3.357.0", - "@aws-sdk/protocol-http": "3.357.0", - "@aws-sdk/querystring-builder": "3.357.0", - "@aws-sdk/types": "3.357.0", - "tslib": "^2.5.0" - }, - "engines": { - "node": ">=14.0.0" - } - }, - "node_modules/@aws-sdk/property-provider": { - "version": "3.357.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/property-provider/-/property-provider-3.357.0.tgz", - "integrity": "sha512-im4W0u8WaYxG7J7ko4Xl3OEzK3Mrm1Rz6/txTGe6hTIHlyUISu1ekOQJXK6XYPqNMn8v1G3BiQREoRXUEJFbHg==", - "dependencies": { - "@aws-sdk/types": "3.357.0", - "tslib": "^2.5.0" - }, - "engines": { - "node": ">=14.0.0" - } - }, - "node_modules/@aws-sdk/protocol-http": { - "version": "3.357.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/protocol-http/-/protocol-http-3.357.0.tgz", - "integrity": "sha512-w1JHiI50VEea7duDeAspUiKJmmdIQblvRyjVMOqWA6FIQAyDVuEiPX7/MdQr0ScxhtRQxHbP0I4MFyl7ctRQvA==", - "dependencies": { - "@aws-sdk/types": "3.357.0", - "tslib": "^2.5.0" - }, - "engines": { - "node": ">=14.0.0" - } - }, - "node_modules/@aws-sdk/querystring-builder": { - "version": "3.357.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/querystring-builder/-/querystring-builder-3.357.0.tgz", - "integrity": "sha512-aQcicqB6Y2cNaXPPwunz612a01SMiQQPsdz632F/3Lzn0ua82BJKobHOtaiTUlmVJ5Q4/EAeNfwZgL7tTUNtDQ==", - "dependencies": { - "@aws-sdk/types": "3.357.0", - "@aws-sdk/util-uri-escape": "3.310.0", - "tslib": "^2.5.0" - }, - "engines": { - "node": ">=14.0.0" - } - }, - "node_modules/@aws-sdk/querystring-parser": { - "version": "3.357.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/querystring-parser/-/querystring-parser-3.357.0.tgz", - "integrity": "sha512-Svvq+atRNP9s2VxiklcUNgCzmt3T5kfs7X2C+yjmxHvOQTPjLNaNGbfC/vhjOK7aoXw0h+lBac48r5ymx1PbQA==", - "dependencies": { - "@aws-sdk/types": "3.357.0", + "@smithy/node-config-provider": "^2.0.12", + "@smithy/types": "^2.3.3", + "@smithy/util-config-provider": "^2.0.0", + "@smithy/util-middleware": "^2.0.2", "tslib": "^2.5.0" }, "engines": { @@ -2280,54 +1468,17 @@ } }, "node_modules/@aws-sdk/s3-request-presigner": { - "version": "3.360.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/s3-request-presigner/-/s3-request-presigner-3.360.0.tgz", - "integrity": "sha512-SWfRyyEbGKnrllKRWHsFfS4xbfM1YHYsaO2PJRo49vYIZvsj10vs0HZX8fF0v4md1XW99E7wBanxkoMo3mYVvg==", + "version": "3.418.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/s3-request-presigner/-/s3-request-presigner-3.418.0.tgz", + "integrity": "sha512-fR/46jnNW2tpebUH5dSv0teZ1dXXgf/QjSxqnhmWFSs3CAxMNd6W54QqgbOMPdRBGFsVJH/OBu7bl7EhEBbY4w==", "dependencies": { - "@aws-sdk/middleware-endpoint": "3.357.0", - "@aws-sdk/protocol-http": "3.357.0", - "@aws-sdk/signature-v4-multi-region": "3.357.0", - "@aws-sdk/smithy-client": "3.360.0", - "@aws-sdk/types": "3.357.0", - "@aws-sdk/util-format-url": "3.357.0", - "tslib": "^2.5.0" - }, - "engines": { - "node": ">=14.0.0" - } - }, - "node_modules/@aws-sdk/service-error-classification": { - "version": "3.357.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/service-error-classification/-/service-error-classification-3.357.0.tgz", - "integrity": "sha512-VuXeL4g5vKO9HjgCZlxmH8Uv1FcqUSjmbPpQkbNtYIDck6u0qzM0rG+n0/1EjyQbPSr3MhW/pkWs5nx2Nljlyg==", - "engines": { - "node": ">=14.0.0" - } - }, - "node_modules/@aws-sdk/shared-ini-file-loader": { - "version": "3.357.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/shared-ini-file-loader/-/shared-ini-file-loader-3.357.0.tgz", - "integrity": "sha512-ceyqM4XxQe0Plb/oQAD2t1UOV2Iy4PFe1oAGM8dfJzYrRKu7zvMwru7/WaB3NYq+/mIY6RU+jjhRmjQ3GySVqA==", - "dependencies": { - "@aws-sdk/types": "3.357.0", - "tslib": "^2.5.0" - }, - "engines": { - "node": ">=14.0.0" - } - }, - "node_modules/@aws-sdk/signature-v4": { - "version": "3.357.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/signature-v4/-/signature-v4-3.357.0.tgz", - "integrity": "sha512-itt4/Jh9FqnzK30qIjXFBvM4J7zN4S/AAqsRMnaX7U4f/MV+1YxQHmzimpdMnsCXXs2jqFqKVRu6DewxJ3nbxg==", - "dependencies": { - "@aws-sdk/eventstream-codec": "3.357.0", - "@aws-sdk/is-array-buffer": "3.310.0", - "@aws-sdk/types": "3.357.0", - "@aws-sdk/util-hex-encoding": "3.310.0", - "@aws-sdk/util-middleware": "3.357.0", - "@aws-sdk/util-uri-escape": "3.310.0", - "@aws-sdk/util-utf8": "3.310.0", + "@aws-sdk/signature-v4-multi-region": "3.418.0", + "@aws-sdk/types": "3.418.0", + "@aws-sdk/util-format-url": "3.418.0", + "@smithy/middleware-endpoint": "^2.0.9", + "@smithy/protocol-http": "^3.0.5", + "@smithy/smithy-client": "^2.1.6", + "@smithy/types": "^2.3.3", "tslib": "^2.5.0" }, "engines": { @@ -2335,36 +1486,14 @@ } }, "node_modules/@aws-sdk/signature-v4-multi-region": { - "version": "3.357.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/signature-v4-multi-region/-/signature-v4-multi-region-3.357.0.tgz", - "integrity": "sha512-eyO3GibYLNCPZ/YxM/ZVDh1fTMKvIUj4fpVo0bxQTKNlqNkVumAIOVLoH5um1A9FN7nDdz+40a7jwYSPlkxW6A==", + "version": "3.418.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/signature-v4-multi-region/-/signature-v4-multi-region-3.418.0.tgz", + "integrity": "sha512-LeVYMZeUQUURFqDf4yZxTEv016g64hi0LqYBjU0mjwd8aPc0k6hckwvshezc80jCNbuLyjNfQclvlg3iFliItQ==", "dependencies": { - "@aws-sdk/protocol-http": "3.357.0", - "@aws-sdk/signature-v4": "3.357.0", - "@aws-sdk/types": "3.357.0", - "tslib": "^2.5.0" - }, - "engines": { - "node": ">=14.0.0" - }, - "peerDependencies": { - "@aws-sdk/signature-v4-crt": "^3.118.0" - }, - "peerDependenciesMeta": { - "@aws-sdk/signature-v4-crt": { - "optional": true - } - } - }, - "node_modules/@aws-sdk/smithy-client": { - "version": "3.360.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/smithy-client/-/smithy-client-3.360.0.tgz", - "integrity": "sha512-R7wbT2SkgWNEAxMekOTNcPcvBszabW2+qHjrcelbbVJNjx/2yK+MbpZI4WRSncByQMeeoW+aSUP+JgsbpiOWfw==", - "dependencies": { - "@aws-sdk/middleware-stack": "3.357.0", - "@aws-sdk/types": "3.357.0", - "@aws-sdk/util-stream": "3.360.0", - "@smithy/types": "^1.0.0", + "@aws-sdk/types": "3.418.0", + "@smithy/protocol-http": "^3.0.5", + "@smithy/signature-v4": "^2.0.0", + "@smithy/types": "^2.3.3", "tslib": "^2.5.0" }, "engines": { @@ -2372,14 +1501,44 @@ } }, "node_modules/@aws-sdk/token-providers": { - "version": "3.360.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/token-providers/-/token-providers-3.360.0.tgz", - "integrity": "sha512-gtnCmn2NL7uSwadqQPeU74Wo7Wf1NMJtui+KSWPYpc3joRZqIYj0kL5w0IT2S9tPQwCFerWVfhkvRkSGJ4nZ/g==", + "version": "3.418.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/token-providers/-/token-providers-3.418.0.tgz", + "integrity": "sha512-9P7Q0VN0hEzTngy3Sz5eya2qEOEf0Q8qf1vB3um0gE6ID6EVAdz/nc/DztfN32MFxk8FeVBrCP5vWdoOzmd72g==", "dependencies": { - "@aws-sdk/client-sso-oidc": "3.360.0", - "@aws-sdk/property-provider": "3.357.0", - "@aws-sdk/shared-ini-file-loader": "3.357.0", - "@aws-sdk/types": "3.357.0", + "@aws-crypto/sha256-browser": "3.0.0", + "@aws-crypto/sha256-js": "3.0.0", + "@aws-sdk/middleware-host-header": "3.418.0", + "@aws-sdk/middleware-logger": "3.418.0", + "@aws-sdk/middleware-recursion-detection": "3.418.0", + "@aws-sdk/middleware-user-agent": "3.418.0", + "@aws-sdk/types": "3.418.0", + "@aws-sdk/util-endpoints": "3.418.0", + "@aws-sdk/util-user-agent-browser": "3.418.0", + "@aws-sdk/util-user-agent-node": "3.418.0", + "@smithy/config-resolver": "^2.0.10", + "@smithy/fetch-http-handler": "^2.1.5", + "@smithy/hash-node": "^2.0.9", + "@smithy/invalid-dependency": "^2.0.9", + "@smithy/middleware-content-length": "^2.0.11", + "@smithy/middleware-endpoint": "^2.0.9", + "@smithy/middleware-retry": "^2.0.12", + "@smithy/middleware-serde": "^2.0.9", + "@smithy/middleware-stack": "^2.0.2", + "@smithy/node-config-provider": "^2.0.12", + "@smithy/node-http-handler": "^2.1.5", + "@smithy/property-provider": "^2.0.0", + "@smithy/protocol-http": "^3.0.5", + "@smithy/shared-ini-file-loader": "^2.0.6", + "@smithy/smithy-client": "^2.1.6", + "@smithy/types": "^2.3.3", + "@smithy/url-parser": "^2.0.9", + "@smithy/util-base64": "^2.0.0", + "@smithy/util-body-length-browser": "^2.0.0", + "@smithy/util-body-length-node": "^2.1.0", + "@smithy/util-defaults-mode-browser": "^2.0.10", + "@smithy/util-defaults-mode-node": "^2.0.12", + "@smithy/util-retry": "^2.0.2", + "@smithy/util-utf8": "^2.0.0", "tslib": "^2.5.0" }, "engines": { @@ -2387,26 +1546,17 @@ } }, "node_modules/@aws-sdk/types": { - "version": "3.357.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/types/-/types-3.357.0.tgz", - "integrity": "sha512-/riCRaXg3p71BeWnShrai0y0QTdXcouPSM0Cn1olZbzTf7s71aLEewrc96qFrL70XhY4XvnxMpqQh+r43XIL3g==", + "version": "3.418.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/types/-/types-3.418.0.tgz", + "integrity": "sha512-y4PQSH+ulfFLY0+FYkaK4qbIaQI9IJNMO2xsxukW6/aNoApNymN1D2FSi2la8Qbp/iPjNDKsG8suNPm9NtsWXQ==", "dependencies": { + "@smithy/types": "^2.3.3", "tslib": "^2.5.0" }, "engines": { "node": ">=14.0.0" } }, - "node_modules/@aws-sdk/url-parser": { - "version": "3.357.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/url-parser/-/url-parser-3.357.0.tgz", - "integrity": "sha512-fAaU6cFsaAba01lCRsRJiYR/LfXvX2wudyEyutBVglE4dWSoSeu3QJNxImIzTBULfbiFhz59++NQ1JUVx88IVg==", - "dependencies": { - "@aws-sdk/querystring-parser": "3.357.0", - "@aws-sdk/types": "3.357.0", - "tslib": "^2.5.0" - } - }, "node_modules/@aws-sdk/util-arn-parser": { "version": "3.310.0", "resolved": "https://registry.npmjs.org/@aws-sdk/util-arn-parser/-/util-arn-parser-3.310.0.tgz", @@ -2418,96 +1568,12 @@ "node": ">=14.0.0" } }, - "node_modules/@aws-sdk/util-base64": { - "version": "3.310.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/util-base64/-/util-base64-3.310.0.tgz", - "integrity": "sha512-v3+HBKQvqgdzcbL+pFswlx5HQsd9L6ZTlyPVL2LS9nNXnCcR3XgGz9jRskikRUuUvUXtkSG1J88GAOnJ/apTPg==", - "dependencies": { - "@aws-sdk/util-buffer-from": "3.310.0", - "tslib": "^2.5.0" - }, - "engines": { - "node": ">=14.0.0" - } - }, - "node_modules/@aws-sdk/util-body-length-browser": { - "version": "3.310.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/util-body-length-browser/-/util-body-length-browser-3.310.0.tgz", - "integrity": "sha512-sxsC3lPBGfpHtNTUoGXMQXLwjmR0zVpx0rSvzTPAuoVILVsp5AU/w5FphNPxD5OVIjNbZv9KsKTuvNTiZjDp9g==", - "dependencies": { - "tslib": "^2.5.0" - } - }, - "node_modules/@aws-sdk/util-body-length-node": { - "version": "3.310.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/util-body-length-node/-/util-body-length-node-3.310.0.tgz", - "integrity": "sha512-2tqGXdyKhyA6w4zz7UPoS8Ip+7sayOg9BwHNidiGm2ikbDxm1YrCfYXvCBdwaJxa4hJfRVz+aL9e+d3GqPI9pQ==", - "dependencies": { - "tslib": "^2.5.0" - }, - "engines": { - "node": ">=14.0.0" - } - }, - "node_modules/@aws-sdk/util-buffer-from": { - "version": "3.310.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/util-buffer-from/-/util-buffer-from-3.310.0.tgz", - "integrity": "sha512-i6LVeXFtGih5Zs8enLrt+ExXY92QV25jtEnTKHsmlFqFAuL3VBeod6boeMXkN2p9lbSVVQ1sAOOYZOHYbYkntw==", - "dependencies": { - "@aws-sdk/is-array-buffer": "3.310.0", - "tslib": "^2.5.0" - }, - "engines": { - "node": ">=14.0.0" - } - }, - "node_modules/@aws-sdk/util-config-provider": { - "version": "3.310.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/util-config-provider/-/util-config-provider-3.310.0.tgz", - "integrity": "sha512-xIBaYo8dwiojCw8vnUcIL4Z5tyfb1v3yjqyJKJWV/dqKUFOOS0U591plmXbM+M/QkXyML3ypon1f8+BoaDExrg==", - "dependencies": { - "tslib": "^2.5.0" - }, - "engines": { - "node": ">=14.0.0" - } - }, - "node_modules/@aws-sdk/util-defaults-mode-browser": { - "version": "3.360.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/util-defaults-mode-browser/-/util-defaults-mode-browser-3.360.0.tgz", - "integrity": "sha512-/GR8VlK9xo1Q5WbVYuNaZ+XfoCFdWNb4z4mpoEgvEgBH4R0GjqiAqLftUA8Ykq1tJuDAKPYVzUNzK8DC0pt7/g==", - "dependencies": { - "@aws-sdk/property-provider": "3.357.0", - "@aws-sdk/types": "3.357.0", - "bowser": "^2.11.0", - "tslib": "^2.5.0" - }, - "engines": { - "node": ">= 10.0.0" - } - }, - "node_modules/@aws-sdk/util-defaults-mode-node": { - "version": "3.360.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/util-defaults-mode-node/-/util-defaults-mode-node-3.360.0.tgz", - "integrity": "sha512-gR3Ctqpyl7SgStDJ1Jlq6qQDuw/rS9AgbAXx+s3wsmm3fm8lHKkXkDPYVvNDqd6dVXRO6q8MRx00lwkGI4qrpQ==", - "dependencies": { - "@aws-sdk/config-resolver": "3.357.0", - "@aws-sdk/credential-provider-imds": "3.357.0", - "@aws-sdk/node-config-provider": "3.357.0", - "@aws-sdk/property-provider": "3.357.0", - "@aws-sdk/types": "3.357.0", - "tslib": "^2.5.0" - }, - "engines": { - "node": ">= 10.0.0" - } - }, "node_modules/@aws-sdk/util-endpoints": { - "version": "3.357.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/util-endpoints/-/util-endpoints-3.357.0.tgz", - "integrity": "sha512-XHKyS5JClT9su9hDif715jpZiWHQF9gKZXER8tW0gOizU3R9cyWc9EsJ2BRhFNhi7nt/JF/CLUEc5qDx3ETbUw==", + "version": "3.418.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/util-endpoints/-/util-endpoints-3.418.0.tgz", + "integrity": "sha512-sYSDwRTl7yE7LhHkPzemGzmIXFVHSsi3AQ1KeNEk84eBqxMHHcCc2kqklaBk2roXWe50QDgRMy1ikZUxvtzNHQ==", "dependencies": { - "@aws-sdk/types": "3.357.0", + "@aws-sdk/types": "3.418.0", "tslib": "^2.5.0" }, "engines": { @@ -2515,23 +1581,13 @@ } }, "node_modules/@aws-sdk/util-format-url": { - "version": "3.357.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/util-format-url/-/util-format-url-3.357.0.tgz", - "integrity": "sha512-mdTO210Nkraw+gY/KxJN9wvX8brIT5+d5tLtLSNKx4K8Fx+qbIug9VeOaVVlv9S1tX5lUvG1l9SEIwq3RCserg==", - "dependencies": { - "@aws-sdk/querystring-builder": "3.357.0", - "@aws-sdk/types": "3.357.0", - "tslib": "^2.5.0" - }, - "engines": { - "node": ">=14.0.0" - } - }, - "node_modules/@aws-sdk/util-hex-encoding": { - "version": "3.310.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/util-hex-encoding/-/util-hex-encoding-3.310.0.tgz", - "integrity": "sha512-sVN7mcCCDSJ67pI1ZMtk84SKGqyix6/0A1Ab163YKn+lFBQRMKexleZzpYzNGxYzmQS6VanP/cfU7NiLQOaSfA==", + "version": "3.418.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/util-format-url/-/util-format-url-3.418.0.tgz", + "integrity": "sha512-7/Xy+8J1txuOYOKsez6vpKTIkHYIIX4c7anjp/aQgUQL23FDwkPisj56cIlevJ7useGugnYw1rUR6fMULGzQ/g==", "dependencies": { + "@aws-sdk/types": "3.418.0", + "@smithy/querystring-builder": "^2.0.9", + "@smithy/types": "^2.3.3", "tslib": "^2.5.0" }, "engines": { @@ -2549,75 +1605,25 @@ "node": ">=14.0.0" } }, - "node_modules/@aws-sdk/util-middleware": { - "version": "3.357.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/util-middleware/-/util-middleware-3.357.0.tgz", - "integrity": "sha512-pV1krjZs7BdahZBfsCJMatE8kcor7GFsBOWrQgQDm9T0We5b5xPpOO2vxAD0RytBpY8Ky2ELs/+qXMv7l5fWIA==", - "dependencies": { - "tslib": "^2.5.0" - }, - "engines": { - "node": ">=14.0.0" - } - }, - "node_modules/@aws-sdk/util-retry": { - "version": "3.357.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/util-retry/-/util-retry-3.357.0.tgz", - "integrity": "sha512-SUqYJE9msbuOVq+vnUy+t0LH7XuYNFz66dSF8q6tedsbJK4j8tgya0I1Ct3m06ynGrXDJMaj39I7AXCyW9bjtw==", - "dependencies": { - "@aws-sdk/service-error-classification": "3.357.0", - "tslib": "^2.5.0" - }, - "engines": { - "node": ">= 14.0.0" - } - }, - "node_modules/@aws-sdk/util-stream": { - "version": "3.360.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/util-stream/-/util-stream-3.360.0.tgz", - "integrity": "sha512-t3naBfNesXwLis29pzSfLx2ifCn2180GiPjRaIsQP14IiVCBOeT1xaU6Dpyk7WeR/jW4cu7wGl+kbeyfNF6QmQ==", - "dependencies": { - "@aws-sdk/fetch-http-handler": "3.357.0", - "@aws-sdk/node-http-handler": "3.360.0", - "@aws-sdk/types": "3.357.0", - "@aws-sdk/util-base64": "3.310.0", - "@aws-sdk/util-buffer-from": "3.310.0", - "@aws-sdk/util-hex-encoding": "3.310.0", - "@aws-sdk/util-utf8": "3.310.0", - "tslib": "^2.5.0" - }, - "engines": { - "node": ">=14.0.0" - } - }, - "node_modules/@aws-sdk/util-uri-escape": { - "version": "3.310.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/util-uri-escape/-/util-uri-escape-3.310.0.tgz", - "integrity": "sha512-drzt+aB2qo2LgtDoiy/3sVG8w63cgLkqFIa2NFlGpUgHFWTXkqtbgf4L5QdjRGKWhmZsnqkbtL7vkSWEcYDJ4Q==", - "dependencies": { - "tslib": "^2.5.0" - }, - "engines": { - "node": ">=14.0.0" - } - }, "node_modules/@aws-sdk/util-user-agent-browser": { - "version": "3.357.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/util-user-agent-browser/-/util-user-agent-browser-3.357.0.tgz", - "integrity": "sha512-JHaWlNIUkPNvXkqeDOrqFzAlAgdwZK5mZw7FQnCRvf8tdSogpGZSkuyb9Z6rLD9gC40Srbc2nepO1cFpeMsDkA==", + "version": "3.418.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/util-user-agent-browser/-/util-user-agent-browser-3.418.0.tgz", + "integrity": "sha512-c4p4mc0VV/jIeNH0lsXzhJ1MpWRLuboGtNEpqE4s1Vl9ck2amv9VdUUZUmHbg+bVxlMgRQ4nmiovA4qIrqGuyg==", "dependencies": { - "@aws-sdk/types": "3.357.0", + "@aws-sdk/types": "3.418.0", + "@smithy/types": "^2.3.3", "bowser": "^2.11.0", "tslib": "^2.5.0" } }, "node_modules/@aws-sdk/util-user-agent-node": { - "version": "3.357.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/util-user-agent-node/-/util-user-agent-node-3.357.0.tgz", - "integrity": "sha512-RdpQoaJWQvcS99TVgSbT451iGrlH4qpWUWFA9U1IRhxOSsmC1hz8ME7xc8nci9SREx/ZlfT3ai6LpoAzAtIEMA==", + "version": "3.418.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/util-user-agent-node/-/util-user-agent-node-3.418.0.tgz", + "integrity": "sha512-BXMskXFtg+dmzSCgmnWOffokxIbPr1lFqa1D9kvM3l3IFRiFGx2IyDg+8MAhq11aPDLvoa/BDuQ0Yqma5izOhg==", "dependencies": { - "@aws-sdk/node-config-provider": "3.357.0", - "@aws-sdk/types": "3.357.0", + "@aws-sdk/types": "3.418.0", + "@smithy/node-config-provider": "^2.0.12", + "@smithy/types": "^2.3.3", "tslib": "^2.5.0" }, "engines": { @@ -2632,18 +1638,6 @@ } } }, - "node_modules/@aws-sdk/util-utf8": { - "version": "3.310.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/util-utf8/-/util-utf8-3.310.0.tgz", - "integrity": "sha512-DnLfFT8uCO22uOJc0pt0DsSNau1GTisngBCDw8jQuWT5CqogMJu4b/uXmwEqfj8B3GX6Xsz8zOd6JpRlPftQoA==", - "dependencies": { - "@aws-sdk/util-buffer-from": "3.310.0", - "tslib": "^2.5.0" - }, - "engines": { - "node": ">=14.0.0" - } - }, "node_modules/@aws-sdk/util-utf8-browser": { "version": "3.259.0", "resolved": "https://registry.npmjs.org/@aws-sdk/util-utf8-browser/-/util-utf8-browser-3.259.0.tgz", @@ -2652,19 +1646,6 @@ "tslib": "^2.3.1" } }, - "node_modules/@aws-sdk/util-waiter": { - "version": "3.357.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/util-waiter/-/util-waiter-3.357.0.tgz", - "integrity": "sha512-jQQGA5G8bm0JP5C4U85VzMpkFHdeeT7fOSUncXLG9Sh8Ambzi4XTud8m5/dA7aNJkvPwZeIF9QdgWCOzpkp1xA==", - "dependencies": { - "@aws-sdk/abort-controller": "3.357.0", - "@aws-sdk/types": "3.357.0", - "tslib": "^2.5.0" - }, - "engines": { - "node": ">=14.0.0" - } - }, "node_modules/@aws-sdk/xml-builder": { "version": "3.310.0", "resolved": "https://registry.npmjs.org/@aws-sdk/xml-builder/-/xml-builder-3.310.0.tgz", @@ -2677,46 +1658,47 @@ } }, "node_modules/@babel/code-frame": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.22.5.tgz", - "integrity": "sha512-Xmwn266vad+6DAqEB2A6V/CcZVp62BbwVmcOJc2RPuwih1kw02TjQvWVWlcKGbBPd+8/0V5DEkOcizRGYsspYQ==", + "version": "7.22.13", + "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.22.13.tgz", + "integrity": "sha512-XktuhWlJ5g+3TJXc5upd9Ks1HutSArik6jf2eAjYFyIOf4ej3RN+184cZbzDvbPnuTJIUhPKKJE3cIsYTiAT3w==", "dev": true, "dependencies": { - "@babel/highlight": "^7.22.5" + "@babel/highlight": "^7.22.13", + "chalk": "^2.4.2" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/compat-data": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.22.5.tgz", - "integrity": "sha512-4Jc/YuIaYqKnDDz892kPIledykKg12Aw1PYX5i/TY28anJtacvM1Rrr8wbieB9GfEJwlzqT0hUEao0CxEebiDA==", + "version": "7.22.20", + "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.22.20.tgz", + "integrity": "sha512-BQYjKbpXjoXwFW5jGqiizJQQT/aC7pFm9Ok1OWssonuguICi264lbgMzRp2ZMmRSlfkX6DsWDDcsrctK8Rwfiw==", "dev": true, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/core": { - "version": "7.19.3", - "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.19.3.tgz", - "integrity": "sha512-WneDJxdsjEvyKtXKsaBGbDeiyOjR5vYq4HcShxnIbG0qixpoHjI3MqeZM9NDvsojNCEBItQE4juOo/bU6e72gQ==", + "version": "7.22.5", + "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.22.5.tgz", + "integrity": "sha512-SBuTAjg91A3eKOvD+bPEz3LlhHZRNu1nFOVts9lzDJTXshHTjII0BAtDS3Y2DAkdZdDKWVZGVwkDfc4Clxn1dg==", "dev": true, "dependencies": { - "@ampproject/remapping": "^2.1.0", - "@babel/code-frame": "^7.18.6", - "@babel/generator": "^7.19.3", - "@babel/helper-compilation-targets": "^7.19.3", - "@babel/helper-module-transforms": "^7.19.0", - "@babel/helpers": "^7.19.0", - "@babel/parser": "^7.19.3", - "@babel/template": "^7.18.10", - "@babel/traverse": "^7.19.3", - "@babel/types": "^7.19.3", + "@ampproject/remapping": "^2.2.0", + "@babel/code-frame": "^7.22.5", + "@babel/generator": "^7.22.5", + "@babel/helper-compilation-targets": "^7.22.5", + "@babel/helper-module-transforms": "^7.22.5", + "@babel/helpers": "^7.22.5", + "@babel/parser": "^7.22.5", + "@babel/template": "^7.22.5", + "@babel/traverse": "^7.22.5", + "@babel/types": "^7.22.5", "convert-source-map": "^1.7.0", "debug": "^4.1.0", "gensync": "^1.0.0-beta.2", - "json5": "^2.2.1", + "json5": "^2.2.2", "semver": "^6.3.0" }, "engines": { @@ -2737,75 +1719,58 @@ } }, "node_modules/@babel/generator": { - "version": "7.20.14", - "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.20.14.tgz", - "integrity": "sha512-AEmuXHdcD3A52HHXxaTmYlb8q/xMEhoRP67B3T4Oq7lbmSoqroMZzjnGj3+i1io3pdnF8iBYVu4Ilj+c4hBxYg==", + "version": "7.22.9", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.22.9.tgz", + "integrity": "sha512-KtLMbmicyuK2Ak/FTCJVbDnkN1SlT8/kceFTiuDiiRUUSMnHMidxSCdG4ndkTOHHpoomWe/4xkvHkEOncwjYIw==", "dev": true, "dependencies": { - "@babel/types": "^7.20.7", + "@babel/types": "^7.22.5", "@jridgewell/gen-mapping": "^0.3.2", + "@jridgewell/trace-mapping": "^0.3.17", "jsesc": "^2.5.1" }, "engines": { "node": ">=6.9.0" } }, - "node_modules/@babel/generator/node_modules/@jridgewell/gen-mapping": { - "version": "0.3.2", - "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.2.tgz", - "integrity": "sha512-mh65xKQAzI6iBcFzwv28KVWSmCkdRBWoOh+bYQGW3+6OZvbbN3TqMGo5hqYxQniRcH9F2VZIoJCm4pa3BPDK/A==", - "dev": true, - "dependencies": { - "@jridgewell/set-array": "^1.0.1", - "@jridgewell/sourcemap-codec": "^1.4.10", - "@jridgewell/trace-mapping": "^0.3.9" - }, - "engines": { - "node": ">=6.0.0" - } - }, "node_modules/@babel/helper-annotate-as-pure": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.18.6.tgz", - "integrity": "sha512-duORpUiYrEpzKIop6iNbjnwKLAKnJ47csTyRACyEmWj0QdUrm5aqNJGHSSEQSUAvNW0ojX0dOmK9dZduvkfeXA==", + "version": "7.22.5", + "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.22.5.tgz", + "integrity": "sha512-LvBTxu8bQSQkcyKOU+a1btnNFQ1dMAd0R6PyW3arXes06F6QLWLIrd681bxRPIXlrMGR3XYnW9JyML7dP3qgxg==", "dev": true, "dependencies": { - "@babel/types": "^7.18.6" + "@babel/types": "^7.22.5" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-builder-binary-assignment-operator-visitor": { - "version": "7.18.9", - "resolved": "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.18.9.tgz", - "integrity": "sha512-yFQ0YCHoIqarl8BCRwBL8ulYUaZpz3bNsA7oFepAzee+8/+ImtADXNOmO5vJvsPff3qi+hvpkY/NYBTrBQgdNw==", + "version": "7.22.15", + "resolved": "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.22.15.tgz", + "integrity": "sha512-QkBXwGgaoC2GtGZRoma6kv7Szfv06khvhFav67ZExau2RaXzy8MpHSMO2PNoP2XtmQphJQRHFfg77Bq731Yizw==", "dev": true, "dependencies": { - "@babel/helper-explode-assignable-expression": "^7.18.6", - "@babel/types": "^7.18.9" + "@babel/types": "^7.22.15" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-compilation-targets": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.22.5.tgz", - "integrity": "sha512-Ji+ywpHeuqxB8WDxraCiqR0xfhYjiDE/e6k7FuIaANnoOFxAHskHChz4vA1mJC9Lbm01s1PVAGhQY4FUKSkGZw==", + "version": "7.22.15", + "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.22.15.tgz", + "integrity": "sha512-y6EEzULok0Qvz8yyLkCvVX+02ic+By2UdOhylwUOvOn9dvYc9mKICJuuU1n1XBI02YWsNsnrY1kc6DVbjcXbtw==", "dev": true, "dependencies": { - "@babel/compat-data": "^7.22.5", - "@babel/helper-validator-option": "^7.22.5", - "browserslist": "^4.21.3", + "@babel/compat-data": "^7.22.9", + "@babel/helper-validator-option": "^7.22.15", + "browserslist": "^4.21.9", "lru-cache": "^5.1.1", - "semver": "^6.3.0" + "semver": "^6.3.1" }, "engines": { "node": ">=6.9.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0" } }, "node_modules/@babel/helper-compilation-targets/node_modules/lru-cache": { @@ -2818,9 +1783,9 @@ } }, "node_modules/@babel/helper-compilation-targets/node_modules/semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", + "version": "6.3.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", + "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", "dev": true, "bin": { "semver": "bin/semver.js" @@ -2833,19 +1798,20 @@ "dev": true }, "node_modules/@babel/helper-create-class-features-plugin": { - "version": "7.20.12", - "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.20.12.tgz", - "integrity": "sha512-9OunRkbT0JQcednL0UFvbfXpAsUXiGjUk0a7sN8fUXX7Mue79cUSMjHGDRRi/Vz9vYlpIhLV5fMD5dKoMhhsNQ==", + "version": "7.22.15", + "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.22.15.tgz", + "integrity": "sha512-jKkwA59IXcvSaiK2UN45kKwSC9o+KuoXsBDvHvU/7BecYIp8GQ2UwrVvFgJASUT+hBnwJx6MhvMCuMzwZZ7jlg==", "dev": true, "dependencies": { - "@babel/helper-annotate-as-pure": "^7.18.6", - "@babel/helper-environment-visitor": "^7.18.9", - "@babel/helper-function-name": "^7.19.0", - "@babel/helper-member-expression-to-functions": "^7.20.7", - "@babel/helper-optimise-call-expression": "^7.18.6", - "@babel/helper-replace-supers": "^7.20.7", - "@babel/helper-skip-transparent-expression-wrappers": "^7.20.0", - "@babel/helper-split-export-declaration": "^7.18.6" + "@babel/helper-annotate-as-pure": "^7.22.5", + "@babel/helper-environment-visitor": "^7.22.5", + "@babel/helper-function-name": "^7.22.5", + "@babel/helper-member-expression-to-functions": "^7.22.15", + "@babel/helper-optimise-call-expression": "^7.22.5", + "@babel/helper-replace-supers": "^7.22.9", + "@babel/helper-skip-transparent-expression-wrappers": "^7.22.5", + "@babel/helper-split-export-declaration": "^7.22.6", + "semver": "^6.3.1" }, "engines": { "node": ">=6.9.0" @@ -2854,91 +1820,88 @@ "@babel/core": "^7.0.0" } }, - "node_modules/@babel/helper-create-regexp-features-plugin": { - "version": "7.20.5", - "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.20.5.tgz", - "integrity": "sha512-m68B1lkg3XDGX5yCvGO0kPx3v9WIYLnzjKfPcQiwntEQa5ZeRkPmo2X/ISJc8qxWGfwUr+kvZAeEzAwLec2r2w==", - "dev": true, - "dependencies": { - "@babel/helper-annotate-as-pure": "^7.18.6", - "regexpu-core": "^5.2.1" - }, - "engines": { - "node": ">=6.9.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0" - } - }, - "node_modules/@babel/helper-define-polyfill-provider": { - "version": "0.3.3", - "resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.3.3.tgz", - "integrity": "sha512-z5aQKU4IzbqCC1XH0nAqfsFLMVSo22SBKUc0BxGrLkolTdPTructy0ToNnlO2zA4j9Q/7pjMZf0DSY+DSTYzww==", - "dev": true, - "dependencies": { - "@babel/helper-compilation-targets": "^7.17.7", - "@babel/helper-plugin-utils": "^7.16.7", - "debug": "^4.1.1", - "lodash.debounce": "^4.0.8", - "resolve": "^1.14.2", - "semver": "^6.1.2" - }, - "peerDependencies": { - "@babel/core": "^7.4.0-0" - } - }, - "node_modules/@babel/helper-define-polyfill-provider/node_modules/semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", + "node_modules/@babel/helper-create-class-features-plugin/node_modules/semver": { + "version": "6.3.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", + "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", "dev": true, "bin": { "semver": "bin/semver.js" } }, - "node_modules/@babel/helper-environment-visitor": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.22.5.tgz", - "integrity": "sha512-XGmhECfVA/5sAt+H+xpSg0mfrHq6FzNr9Oxh7PSEBBRUb/mL7Kz3NICXb194rCqAEdxkhPT1a88teizAFyvk8Q==", - "dev": true, - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/@babel/helper-explode-assignable-expression": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.18.6.tgz", - "integrity": "sha512-eyAYAsQmB80jNfg4baAtLeWAQHfHFiR483rzFK+BhETlGZaQC9bsfrugfXDCbRHLQbIA7U5NxhhOxN7p/dWIcg==", + "node_modules/@babel/helper-create-regexp-features-plugin": { + "version": "7.22.15", + "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.22.15.tgz", + "integrity": "sha512-29FkPLFjn4TPEa3RE7GpW+qbE8tlsu3jntNYNfcGsc49LphF1PQIiD+vMZ1z1xVOKt+93khA9tc2JBs3kBjA7w==", "dev": true, "dependencies": { - "@babel/types": "^7.18.6" + "@babel/helper-annotate-as-pure": "^7.22.5", + "regexpu-core": "^5.3.1", + "semver": "^6.3.1" }, + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0" + } + }, + "node_modules/@babel/helper-create-regexp-features-plugin/node_modules/semver": { + "version": "6.3.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", + "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", + "dev": true, + "bin": { + "semver": "bin/semver.js" + } + }, + "node_modules/@babel/helper-define-polyfill-provider": { + "version": "0.4.2", + "resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.4.2.tgz", + "integrity": "sha512-k0qnnOqHn5dK9pZpfD5XXZ9SojAITdCKRn2Lp6rnDGzIbaP0rHyMPk/4wsSxVBVz4RfN0q6VpXWP2pDGIoQ7hw==", + "dev": true, + "dependencies": { + "@babel/helper-compilation-targets": "^7.22.6", + "@babel/helper-plugin-utils": "^7.22.5", + "debug": "^4.1.1", + "lodash.debounce": "^4.0.8", + "resolve": "^1.14.2" + }, + "peerDependencies": { + "@babel/core": "^7.4.0 || ^8.0.0-0 <8.0.0" + } + }, + "node_modules/@babel/helper-environment-visitor": { + "version": "7.22.20", + "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.22.20.tgz", + "integrity": "sha512-zfedSIzFhat/gFhWfHtgWvlec0nqB9YEIVrpuwjruLlXfUSnA8cJB0miHKwqDnQ7d32aKo2xt88/xZptwxbfhA==", + "dev": true, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-function-name": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.22.5.tgz", - "integrity": "sha512-wtHSq6jMRE3uF2otvfuD3DIvVhOsSNshQl0Qrd7qC9oQJzHvOL4qQXlQn2916+CXGywIjpGuIkoyZRRxHPiNQQ==", + "version": "7.23.0", + "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.23.0.tgz", + "integrity": "sha512-OErEqsrxjZTJciZ4Oo+eoZqeW9UIiOcuYKRJA4ZAgV9myA+pOXhhmpfNCKjEH/auVfEYVFJ6y1Tc4r0eIApqiw==", "dev": true, "dependencies": { - "@babel/template": "^7.22.5", - "@babel/types": "^7.22.5" + "@babel/template": "^7.22.15", + "@babel/types": "^7.23.0" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-function-name/node_modules/@babel/template": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.22.5.tgz", - "integrity": "sha512-X7yV7eiwAxdj9k94NEylvbVHLiVG1nvzCV2EAowhxLTwODV1jl9UzZ48leOC0sH7OnuHrIkllaBgneUykIcZaw==", + "version": "7.22.15", + "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.22.15.tgz", + "integrity": "sha512-QPErUVm4uyJa60rkI73qneDacvdvzxshT3kksGqlGWYdOTIUOwJ7RDUL8sGqslY1uXWSL6xMFKEXDS3ox2uF0w==", "dev": true, "dependencies": { - "@babel/code-frame": "^7.22.5", - "@babel/parser": "^7.22.5", - "@babel/types": "^7.22.5" + "@babel/code-frame": "^7.22.13", + "@babel/parser": "^7.22.15", + "@babel/types": "^7.22.15" }, "engines": { "node": ">=6.9.0" @@ -2957,46 +1920,46 @@ } }, "node_modules/@babel/helper-member-expression-to-functions": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.22.5.tgz", - "integrity": "sha512-aBiH1NKMG0H2cGZqspNvsaBe6wNGjbJjuLy29aU+eDZjSbbN53BaxlpB02xm9v34pLTZ1nIQPFYn2qMZoa5BQQ==", + "version": "7.23.0", + "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.23.0.tgz", + "integrity": "sha512-6gfrPwh7OuT6gZyJZvd6WbTfrqAo7vm4xCzAXOusKqq/vWdKXphTpj5klHKNmRUU6/QRGlBsyU9mAIPaWHlqJA==", "dev": true, "dependencies": { - "@babel/types": "^7.22.5" + "@babel/types": "^7.23.0" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-module-imports": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.18.6.tgz", - "integrity": "sha512-0NFvs3VkuSYbFi1x2Vd6tKrywq+z/cLeYC/RJNFrIX/30Bf5aiGYbtvGXolEktzJH8o5E5KJ3tT+nkxuuZFVlA==", + "version": "7.22.15", + "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.22.15.tgz", + "integrity": "sha512-0pYVBnDKZO2fnSPCrgM/6WMc7eS20Fbok+0r88fp+YtWVLZrp4CkafFGIp+W0VKw4a22sgebPT99y+FDNMdP4w==", "dev": true, "dependencies": { - "@babel/types": "^7.18.6" + "@babel/types": "^7.22.15" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-module-transforms": { - "version": "7.20.11", - "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.20.11.tgz", - "integrity": "sha512-uRy78kN4psmji1s2QtbtcCSaj/LILFDp0f/ymhpQH5QY3nljUZCaNWz9X1dEj/8MBdBEFECs7yRhKn8i7NjZgg==", + "version": "7.23.0", + "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.23.0.tgz", + "integrity": "sha512-WhDWw1tdrlT0gMgUJSlX0IQvoO1eN279zrAUbVB+KpV2c3Tylz8+GnKOLllCS6Z/iZQEyVYxhZVUdPTqs2YYPw==", "dev": true, "dependencies": { - "@babel/helper-environment-visitor": "^7.18.9", - "@babel/helper-module-imports": "^7.18.6", - "@babel/helper-simple-access": "^7.20.2", - "@babel/helper-split-export-declaration": "^7.18.6", - "@babel/helper-validator-identifier": "^7.19.1", - "@babel/template": "^7.20.7", - "@babel/traverse": "^7.20.10", - "@babel/types": "^7.20.7" + "@babel/helper-environment-visitor": "^7.22.20", + "@babel/helper-module-imports": "^7.22.15", + "@babel/helper-simple-access": "^7.22.5", + "@babel/helper-split-export-declaration": "^7.22.6", + "@babel/helper-validator-identifier": "^7.22.20" }, "engines": { "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0" } }, "node_modules/@babel/helper-optimise-call-expression": { @@ -3021,15 +1984,14 @@ } }, "node_modules/@babel/helper-remap-async-to-generator": { - "version": "7.18.9", - "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.18.9.tgz", - "integrity": "sha512-dI7q50YKd8BAv3VEfgg7PS7yD3Rtbi2J1XMXaalXO0W0164hYLnh8zpjRS0mte9MfVp/tltvr/cfdXPvJr1opA==", + "version": "7.22.20", + "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.22.20.tgz", + "integrity": "sha512-pBGyV4uBqOns+0UvhsTO8qgl8hO89PmiDYv+/COyp1aeMcmfrfruz+/nCMFiYyFF/Knn0yfrC85ZzNFjembFTw==", "dev": true, "dependencies": { - "@babel/helper-annotate-as-pure": "^7.18.6", - "@babel/helper-environment-visitor": "^7.18.9", - "@babel/helper-wrap-function": "^7.18.9", - "@babel/types": "^7.18.9" + "@babel/helper-annotate-as-pure": "^7.22.5", + "@babel/helper-environment-visitor": "^7.22.20", + "@babel/helper-wrap-function": "^7.22.20" }, "engines": { "node": ">=6.9.0" @@ -3039,67 +2001,53 @@ } }, "node_modules/@babel/helper-replace-supers": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.22.5.tgz", - "integrity": "sha512-aLdNM5I3kdI/V9xGNyKSF3X/gTyMUBohTZ+/3QdQKAA9vxIiy12E+8E2HoOP1/DjeqU+g6as35QHJNMDDYpuCg==", + "version": "7.22.20", + "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.22.20.tgz", + "integrity": "sha512-qsW0In3dbwQUbK8kejJ4R7IHVGwHJlV6lpG6UA7a9hSa2YEiAib+N1T2kr6PEeUT+Fl7najmSOS6SmAwCHK6Tw==", "dev": true, "dependencies": { - "@babel/helper-environment-visitor": "^7.22.5", - "@babel/helper-member-expression-to-functions": "^7.22.5", - "@babel/helper-optimise-call-expression": "^7.22.5", - "@babel/template": "^7.22.5", - "@babel/traverse": "^7.22.5", - "@babel/types": "^7.22.5" + "@babel/helper-environment-visitor": "^7.22.20", + "@babel/helper-member-expression-to-functions": "^7.22.15", + "@babel/helper-optimise-call-expression": "^7.22.5" }, "engines": { "node": ">=6.9.0" - } - }, - "node_modules/@babel/helper-replace-supers/node_modules/@babel/template": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.22.5.tgz", - "integrity": "sha512-X7yV7eiwAxdj9k94NEylvbVHLiVG1nvzCV2EAowhxLTwODV1jl9UzZ48leOC0sH7OnuHrIkllaBgneUykIcZaw==", - "dev": true, - "dependencies": { - "@babel/code-frame": "^7.22.5", - "@babel/parser": "^7.22.5", - "@babel/types": "^7.22.5" }, - "engines": { - "node": ">=6.9.0" + "peerDependencies": { + "@babel/core": "^7.0.0" } }, "node_modules/@babel/helper-simple-access": { - "version": "7.20.2", - "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.20.2.tgz", - "integrity": "sha512-+0woI/WPq59IrqDYbVGfshjT5Dmk/nnbdpcF8SnMhhXObpTq2KNBdLFRFrkVdbDOyUmHBCxzm5FHV1rACIkIbA==", + "version": "7.22.5", + "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.22.5.tgz", + "integrity": "sha512-n0H99E/K+Bika3++WNL17POvo4rKWZ7lZEp1Q+fStVbUi8nxPQEBOlTmCOxW/0JsS56SKKQ+ojAe2pHKJHN35w==", "dev": true, "dependencies": { - "@babel/types": "^7.20.2" + "@babel/types": "^7.22.5" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-skip-transparent-expression-wrappers": { - "version": "7.20.0", - "resolved": "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.20.0.tgz", - "integrity": "sha512-5y1JYeNKfvnT8sZcK9DVRtpTbGiomYIHviSP3OQWmDPU3DeH4a1ZlT/N2lyQ5P8egjcRaT/Y9aNqUxK0WsnIIg==", + "version": "7.22.5", + "resolved": "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.22.5.tgz", + "integrity": "sha512-tK14r66JZKiC43p8Ki33yLBVJKlQDFoA8GYN67lWCDCqoL6EMMSuM9b+Iff2jHaM/RRFYl7K+iiru7hbRqNx8Q==", "dev": true, "dependencies": { - "@babel/types": "^7.20.0" + "@babel/types": "^7.22.5" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-split-export-declaration": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.18.6.tgz", - "integrity": "sha512-bde1etTx6ZyTmobl9LLMMQsaizFVZrquTEHOqKeQESMKo4PlObf+8+JA25ZsIpZhT/WEd39+vOdLXAFG/nELpA==", + "version": "7.22.6", + "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.22.6.tgz", + "integrity": "sha512-AsUnxuLhRYsisFiaJwvp1QF+I3KjD5FOxut14q/GzovUe6orHLesW2C7d754kRm53h5gqrz6sFl6sxc4BVtE/g==", "dev": true, "dependencies": { - "@babel/types": "^7.18.6" + "@babel/types": "^7.22.5" }, "engines": { "node": ">=6.9.0" @@ -3115,60 +2063,87 @@ } }, "node_modules/@babel/helper-validator-identifier": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.5.tgz", - "integrity": "sha512-aJXu+6lErq8ltp+JhkJUfk1MTGyuA4v7f3pA+BJ5HLfNC6nAQ0Cpi9uOquUj8Hehg0aUiHzWQbOVJGao6ztBAQ==", + "version": "7.22.20", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.20.tgz", + "integrity": "sha512-Y4OZ+ytlatR8AI+8KZfKuL5urKp7qey08ha31L8b3BwewJAoJamTzyvxPR/5D+KkdJCGPq/+8TukHBlY10FX9A==", "dev": true, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-validator-option": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.22.5.tgz", - "integrity": "sha512-R3oB6xlIVKUnxNUxbmgq7pKjxpru24zlimpE8WK47fACIlM0II/Hm1RS8IaOI7NgCr6LNS+jl5l75m20npAziw==", + "version": "7.22.15", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.22.15.tgz", + "integrity": "sha512-bMn7RmyFjY/mdECUbgn9eoSY4vqvacUnS9i9vGAGttgFWesO6B4CYWA7XlpbWgBt71iv/hfbPlynohStqnu5hA==", "dev": true, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-wrap-function": { - "version": "7.20.5", - "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.20.5.tgz", - "integrity": "sha512-bYMxIWK5mh+TgXGVqAtnu5Yn1un+v8DDZtqyzKRLUzrh70Eal2O3aZ7aPYiMADO4uKlkzOiRiZ6GX5q3qxvW9Q==", + "version": "7.22.20", + "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.22.20.tgz", + "integrity": "sha512-pms/UwkOpnQe/PDAEdV/d7dVCoBbB+R4FvYoHGZz+4VPcg7RtYy2KP7S2lbuWM6FCSgob5wshfGESbC/hzNXZw==", "dev": true, "dependencies": { - "@babel/helper-function-name": "^7.19.0", - "@babel/template": "^7.18.10", - "@babel/traverse": "^7.20.5", - "@babel/types": "^7.20.5" + "@babel/helper-function-name": "^7.22.5", + "@babel/template": "^7.22.15", + "@babel/types": "^7.22.19" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/helper-wrap-function/node_modules/@babel/template": { + "version": "7.22.15", + "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.22.15.tgz", + "integrity": "sha512-QPErUVm4uyJa60rkI73qneDacvdvzxshT3kksGqlGWYdOTIUOwJ7RDUL8sGqslY1uXWSL6xMFKEXDS3ox2uF0w==", + "dev": true, + "dependencies": { + "@babel/code-frame": "^7.22.13", + "@babel/parser": "^7.22.15", + "@babel/types": "^7.22.15" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helpers": { - "version": "7.20.13", - "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.20.13.tgz", - "integrity": "sha512-nzJ0DWCL3gB5RCXbUO3KIMMsBY2Eqbx8mBpKGE/02PgyRQFcPQLbkQ1vyy596mZLaP+dAfD+R4ckASzNVmW3jg==", + "version": "7.23.1", + "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.23.1.tgz", + "integrity": "sha512-chNpneuK18yW5Oxsr+t553UZzzAs3aZnFm4bxhebsNTeshrC95yA7l5yl7GBAG+JG1rF0F7zzD2EixK9mWSDoA==", "dev": true, "dependencies": { - "@babel/template": "^7.20.7", - "@babel/traverse": "^7.20.13", - "@babel/types": "^7.20.7" + "@babel/template": "^7.22.15", + "@babel/traverse": "^7.23.0", + "@babel/types": "^7.23.0" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/helpers/node_modules/@babel/template": { + "version": "7.22.15", + "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.22.15.tgz", + "integrity": "sha512-QPErUVm4uyJa60rkI73qneDacvdvzxshT3kksGqlGWYdOTIUOwJ7RDUL8sGqslY1uXWSL6xMFKEXDS3ox2uF0w==", + "dev": true, + "dependencies": { + "@babel/code-frame": "^7.22.13", + "@babel/parser": "^7.22.15", + "@babel/types": "^7.22.15" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/highlight": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.22.5.tgz", - "integrity": "sha512-BSKlD1hgnedS5XRnGOljZawtag7H1yPfQp0tdNJCHoH6AZ+Pcm9VvkrK59/Yy593Ypg0zMxH2BxD1VPYUQ7UIw==", + "version": "7.22.20", + "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.22.20.tgz", + "integrity": "sha512-dkdMCN3py0+ksCgYmGG8jKeGA/8Tk+gJwSYYlFGxG5lmhfKNoAy004YpLxpS1W2J8m/EK2Ew+yOs9pVRwO89mg==", "dev": true, "dependencies": { - "@babel/helper-validator-identifier": "^7.22.5", - "chalk": "^2.0.0", + "@babel/helper-validator-identifier": "^7.22.20", + "chalk": "^2.4.2", "js-tokens": "^4.0.0" }, "engines": { @@ -3176,9 +2151,9 @@ } }, "node_modules/@babel/parser": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.22.5.tgz", - "integrity": "sha512-DFZMC9LJUG9PLOclRC32G63UXwzqS2koQC8dkx+PLdmt1xSePYpbT/NbsrJy8Q/muXz7o/h/d4A7Fuyixm559Q==", + "version": "7.23.0", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.23.0.tgz", + "integrity": "sha512-vvPKKdMemU85V9WE/l5wZEmImpCtLqbnTvqDS2U1fJ96KrxoW7KrXhNsNCblQlg8Ck4b85yxdTyelsMUgFUXiw==", "dev": true, "bin": { "parser": "bin/babel-parser.js" @@ -3188,12 +2163,12 @@ } }, "node_modules/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.18.6.tgz", - "integrity": "sha512-Dgxsyg54Fx1d4Nge8UnvTrED63vrwOdPmyvPzlNN/boaliRP54pm3pGzZD1SJUwrBA+Cs/xdG8kXX6Mn/RfISQ==", + "version": "7.22.15", + "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.22.15.tgz", + "integrity": "sha512-FB9iYlz7rURmRJyXRKEnalYPPdn87H5no108cyuQQyMwlpJ2SJtpIUBI27kdTin956pz+LPypkPVPUTlxOmrsg==", "dev": true, "dependencies": { - "@babel/helper-plugin-utils": "^7.18.6" + "@babel/helper-plugin-utils": "^7.22.5" }, "engines": { "node": ">=6.9.0" @@ -3203,14 +2178,14 @@ } }, "node_modules/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": { - "version": "7.20.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.20.7.tgz", - "integrity": "sha512-sbr9+wNE5aXMBBFBICk01tt7sBf2Oc9ikRFEcem/ZORup9IMUdNhW7/wVLEbbtlWOsEubJet46mHAL2C8+2jKQ==", + "version": "7.22.15", + "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.22.15.tgz", + "integrity": "sha512-Hyph9LseGvAeeXzikV88bczhsrLrIZqDPxO+sSmAunMPaGrBGhfMWzCPYTtiW9t+HzSE2wtV8e5cc5P6r1xMDQ==", "dev": true, "dependencies": { - "@babel/helper-plugin-utils": "^7.20.2", - "@babel/helper-skip-transparent-expression-wrappers": "^7.20.0", - "@babel/plugin-proposal-optional-chaining": "^7.20.7" + "@babel/helper-plugin-utils": "^7.22.5", + "@babel/helper-skip-transparent-expression-wrappers": "^7.22.5", + "@babel/plugin-transform-optional-chaining": "^7.22.15" }, "engines": { "node": ">=6.9.0" @@ -3223,6 +2198,7 @@ "version": "7.20.7", "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.20.7.tgz", "integrity": "sha512-xMbiLsn/8RK7Wq7VeVytytS2L6qE69bXPB10YCmMdDZbKF4okCqY74pI/jJQ/8U0b/F6NrT2+14b8/P9/3AMGA==", + "deprecated": "This proposal has been merged to the ECMAScript standard and thus this plugin is no longer maintained. Please use @babel/plugin-transform-async-generator-functions instead.", "dev": true, "dependencies": { "@babel/helper-environment-visitor": "^7.18.9", @@ -3237,214 +2213,11 @@ "@babel/core": "^7.0.0-0" } }, - "node_modules/@babel/plugin-proposal-class-properties": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.18.6.tgz", - "integrity": "sha512-cumfXOF0+nzZrrN8Rf0t7M+tF6sZc7vhQwYQck9q1/5w2OExlD+b4v4RpMJFaV1Z7WcDRgO6FqvxqxGlwo+RHQ==", - "dev": true, - "dependencies": { - "@babel/helper-create-class-features-plugin": "^7.18.6", - "@babel/helper-plugin-utils": "^7.18.6" - }, - "engines": { - "node": ">=6.9.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, - "node_modules/@babel/plugin-proposal-class-static-block": { - "version": "7.20.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-class-static-block/-/plugin-proposal-class-static-block-7.20.7.tgz", - "integrity": "sha512-AveGOoi9DAjUYYuUAG//Ig69GlazLnoyzMw68VCDux+c1tsnnH/OkYcpz/5xzMkEFC6UxjR5Gw1c+iY2wOGVeQ==", - "dev": true, - "dependencies": { - "@babel/helper-create-class-features-plugin": "^7.20.7", - "@babel/helper-plugin-utils": "^7.20.2", - "@babel/plugin-syntax-class-static-block": "^7.14.5" - }, - "engines": { - "node": ">=6.9.0" - }, - "peerDependencies": { - "@babel/core": "^7.12.0" - } - }, - "node_modules/@babel/plugin-proposal-dynamic-import": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.18.6.tgz", - "integrity": "sha512-1auuwmK+Rz13SJj36R+jqFPMJWyKEDd7lLSdOj4oJK0UTgGueSAtkrCvz9ewmgyU/P941Rv2fQwZJN8s6QruXw==", - "dev": true, - "dependencies": { - "@babel/helper-plugin-utils": "^7.18.6", - "@babel/plugin-syntax-dynamic-import": "^7.8.3" - }, - "engines": { - "node": ">=6.9.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, - "node_modules/@babel/plugin-proposal-export-namespace-from": { - "version": "7.18.9", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.18.9.tgz", - "integrity": "sha512-k1NtHyOMvlDDFeb9G5PhUXuGj8m/wiwojgQVEhJ/fsVsMCpLyOP4h0uGEjYJKrRI+EVPlb5Jk+Gt9P97lOGwtA==", - "dev": true, - "dependencies": { - "@babel/helper-plugin-utils": "^7.18.9", - "@babel/plugin-syntax-export-namespace-from": "^7.8.3" - }, - "engines": { - "node": ">=6.9.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, - "node_modules/@babel/plugin-proposal-json-strings": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.18.6.tgz", - "integrity": "sha512-lr1peyn9kOdbYc0xr0OdHTZ5FMqS6Di+H0Fz2I/JwMzGmzJETNeOFq2pBySw6X/KFL5EWDjlJuMsUGRFb8fQgQ==", - "dev": true, - "dependencies": { - "@babel/helper-plugin-utils": "^7.18.6", - "@babel/plugin-syntax-json-strings": "^7.8.3" - }, - "engines": { - "node": ">=6.9.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, - "node_modules/@babel/plugin-proposal-logical-assignment-operators": { - "version": "7.20.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.20.7.tgz", - "integrity": "sha512-y7C7cZgpMIjWlKE5T7eJwp+tnRYM89HmRvWM5EQuB5BoHEONjmQ8lSNmBUwOyy/GFRsohJED51YBF79hE1djug==", - "dev": true, - "dependencies": { - "@babel/helper-plugin-utils": "^7.20.2", - "@babel/plugin-syntax-logical-assignment-operators": "^7.10.4" - }, - "engines": { - "node": ">=6.9.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, - "node_modules/@babel/plugin-proposal-nullish-coalescing-operator": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.18.6.tgz", - "integrity": "sha512-wQxQzxYeJqHcfppzBDnm1yAY0jSRkUXR2z8RePZYrKwMKgMlE8+Z6LUno+bd6LvbGh8Gltvy74+9pIYkr+XkKA==", - "dev": true, - "dependencies": { - "@babel/helper-plugin-utils": "^7.18.6", - "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3" - }, - "engines": { - "node": ">=6.9.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, - "node_modules/@babel/plugin-proposal-numeric-separator": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.18.6.tgz", - "integrity": "sha512-ozlZFogPqoLm8WBr5Z8UckIoE4YQ5KESVcNudyXOR8uqIkliTEgJ3RoketfG6pmzLdeZF0H/wjE9/cCEitBl7Q==", - "dev": true, - "dependencies": { - "@babel/helper-plugin-utils": "^7.18.6", - "@babel/plugin-syntax-numeric-separator": "^7.10.4" - }, - "engines": { - "node": ">=6.9.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, - "node_modules/@babel/plugin-proposal-object-rest-spread": { - "version": "7.20.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.20.7.tgz", - "integrity": "sha512-d2S98yCiLxDVmBmE8UjGcfPvNEUbA1U5q5WxaWFUGRzJSVAZqm5W6MbPct0jxnegUZ0niLeNX+IOzEs7wYg9Dg==", - "dev": true, - "dependencies": { - "@babel/compat-data": "^7.20.5", - "@babel/helper-compilation-targets": "^7.20.7", - "@babel/helper-plugin-utils": "^7.20.2", - "@babel/plugin-syntax-object-rest-spread": "^7.8.3", - "@babel/plugin-transform-parameters": "^7.20.7" - }, - "engines": { - "node": ">=6.9.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, - "node_modules/@babel/plugin-proposal-optional-catch-binding": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.18.6.tgz", - "integrity": "sha512-Q40HEhs9DJQyaZfUjjn6vE8Cv4GmMHCYuMGIWUnlxH6400VGxOuwWsPt4FxXxJkC/5eOzgn0z21M9gMT4MOhbw==", - "dev": true, - "dependencies": { - "@babel/helper-plugin-utils": "^7.18.6", - "@babel/plugin-syntax-optional-catch-binding": "^7.8.3" - }, - "engines": { - "node": ">=6.9.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, - "node_modules/@babel/plugin-proposal-optional-chaining": { - "version": "7.20.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.20.7.tgz", - "integrity": "sha512-T+A7b1kfjtRM51ssoOfS1+wbyCVqorfyZhT99TvxxLMirPShD8CzKMRepMlCBGM5RpHMbn8s+5MMHnPstJH6mQ==", - "dev": true, - "dependencies": { - "@babel/helper-plugin-utils": "^7.20.2", - "@babel/helper-skip-transparent-expression-wrappers": "^7.20.0", - "@babel/plugin-syntax-optional-chaining": "^7.8.3" - }, - "engines": { - "node": ">=6.9.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, - "node_modules/@babel/plugin-proposal-private-methods": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.18.6.tgz", - "integrity": "sha512-nutsvktDItsNn4rpGItSNV2sz1XwS+nfU0Rg8aCx3W3NOKVzdMjJRu0O5OkgDp3ZGICSTbgRpxZoWsxoKRvbeA==", - "dev": true, - "dependencies": { - "@babel/helper-create-class-features-plugin": "^7.18.6", - "@babel/helper-plugin-utils": "^7.18.6" - }, - "engines": { - "node": ">=6.9.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, "node_modules/@babel/plugin-proposal-private-property-in-object": { - "version": "7.20.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.20.5.tgz", - "integrity": "sha512-Vq7b9dUA12ByzB4EjQTPo25sFhY+08pQDBSZRtUAkj7lb7jahaHR5igera16QZ+3my1nYR4dKsNdYj5IjPHilQ==", + "version": "7.21.0-placeholder-for-preset-env.2", + "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.21.0-placeholder-for-preset-env.2.tgz", + "integrity": "sha512-SOSkfJDddaM7mak6cPEpswyTRnuRltl429hMraQEglW+OkovnCzsiszTmsrlY//qLFjCpQDFRvjdm2wA5pPm9w==", "dev": true, - "dependencies": { - "@babel/helper-annotate-as-pure": "^7.18.6", - "@babel/helper-create-class-features-plugin": "^7.20.5", - "@babel/helper-plugin-utils": "^7.20.2", - "@babel/plugin-syntax-private-property-in-object": "^7.14.5" - }, "engines": { "node": ">=6.9.0" }, @@ -3456,6 +2229,7 @@ "version": "7.18.6", "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.18.6.tgz", "integrity": "sha512-2BShG/d5yoZyXZfVePH91urL5wTG6ASZU9M4o03lKK8u8UW1y08OMttBSOADTcJrnPMpvDXRG3G8fyLh4ovs8w==", + "deprecated": "This proposal has been merged to the ECMAScript standard and thus this plugin is no longer maintained. Please use @babel/plugin-transform-unicode-property-regex instead.", "dev": true, "dependencies": { "@babel/helper-create-regexp-features-plugin": "^7.18.6", @@ -3532,12 +2306,12 @@ } }, "node_modules/@babel/plugin-syntax-import-assertions": { - "version": "7.20.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.20.0.tgz", - "integrity": "sha512-IUh1vakzNoWalR8ch/areW7qFopR2AEw03JlG7BbrDqmQ4X3q9uuipQwSGrUn7oGiemKjtSLDhNtQHzMHr1JdQ==", + "version": "7.22.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.22.5.tgz", + "integrity": "sha512-rdV97N7KqsRzeNGoWUOK6yUsWarLjE5Su/Snk9IYPU9CwkWHs4t+rTGOvffTR8XGkJMTAdLfO0xVnXm8wugIJg==", "dev": true, "dependencies": { - "@babel/helper-plugin-utils": "^7.19.0" + "@babel/helper-plugin-utils": "^7.22.5" }, "engines": { "node": ">=6.9.0" @@ -3546,6 +2320,33 @@ "@babel/core": "^7.0.0-0" } }, + "node_modules/@babel/plugin-syntax-import-attributes": { + "version": "7.22.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-attributes/-/plugin-syntax-import-attributes-7.22.5.tgz", + "integrity": "sha512-KwvoWDeNKPETmozyFE0P2rOLqh39EoQHNjqizrI5B8Vt0ZNS7M56s7dAiAqbYfiAYOuIzIh96z3iR2ktgu3tEg==", + "dev": true, + "dependencies": { + "@babel/helper-plugin-utils": "^7.22.5" + }, + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@babel/plugin-syntax-import-meta": { + "version": "7.10.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-meta/-/plugin-syntax-import-meta-7.10.4.tgz", + "integrity": "sha512-Yqfm+XDx0+Prh3VSeEQCPU81yC+JWZ2pDPFSS4ZdpfZhp4MkFMaDC1UqseovEKwSUpnIL7+vK+Clp7bfh0iD7g==", + "dev": true, + "dependencies": { + "@babel/helper-plugin-utils": "^7.10.4" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, "node_modules/@babel/plugin-syntax-json-strings": { "version": "7.8.3", "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz", @@ -3660,150 +2461,10 @@ "@babel/core": "^7.0.0-0" } }, - "node_modules/@babel/plugin-transform-arrow-functions": { - "version": "7.20.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.20.7.tgz", - "integrity": "sha512-3poA5E7dzDomxj9WXWwuD6A5F3kc7VXwIJO+E+J8qtDtS+pXPAhrgEyh+9GBwBgPq1Z+bB+/JD60lp5jsN7JPQ==", - "dev": true, - "dependencies": { - "@babel/helper-plugin-utils": "^7.20.2" - }, - "engines": { - "node": ">=6.9.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, - "node_modules/@babel/plugin-transform-async-to-generator": { - "version": "7.20.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.20.7.tgz", - "integrity": "sha512-Uo5gwHPT9vgnSXQxqGtpdufUiWp96gk7yiP4Mp5bm1QMkEmLXBO7PAGYbKoJ6DhAwiNkcHFBol/x5zZZkL/t0Q==", - "dev": true, - "dependencies": { - "@babel/helper-module-imports": "^7.18.6", - "@babel/helper-plugin-utils": "^7.20.2", - "@babel/helper-remap-async-to-generator": "^7.18.9" - }, - "engines": { - "node": ">=6.9.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, - "node_modules/@babel/plugin-transform-block-scoped-functions": { + "node_modules/@babel/plugin-syntax-unicode-sets-regex": { "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.18.6.tgz", - "integrity": "sha512-ExUcOqpPWnliRcPqves5HJcJOvHvIIWfuS4sroBUenPuMdmW+SMHDakmtS7qOo13sVppmUijqeTv7qqGsvURpQ==", - "dev": true, - "dependencies": { - "@babel/helper-plugin-utils": "^7.18.6" - }, - "engines": { - "node": ">=6.9.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, - "node_modules/@babel/plugin-transform-block-scoping": { - "version": "7.20.15", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.20.15.tgz", - "integrity": "sha512-Vv4DMZ6MiNOhu/LdaZsT/bsLRxgL94d269Mv4R/9sp6+Mp++X/JqypZYypJXLlM4mlL352/Egzbzr98iABH1CA==", - "dev": true, - "dependencies": { - "@babel/helper-plugin-utils": "^7.20.2" - }, - "engines": { - "node": ">=6.9.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, - "node_modules/@babel/plugin-transform-classes": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.22.5.tgz", - "integrity": "sha512-2edQhLfibpWpsVBx2n/GKOz6JdGQvLruZQfGr9l1qes2KQaWswjBzhQF7UDUZMNaMMQeYnQzxwOMPsbYF7wqPQ==", - "dev": true, - "dependencies": { - "@babel/helper-annotate-as-pure": "^7.22.5", - "@babel/helper-compilation-targets": "^7.22.5", - "@babel/helper-environment-visitor": "^7.22.5", - "@babel/helper-function-name": "^7.22.5", - "@babel/helper-optimise-call-expression": "^7.22.5", - "@babel/helper-plugin-utils": "^7.22.5", - "@babel/helper-replace-supers": "^7.22.5", - "@babel/helper-split-export-declaration": "^7.22.5", - "globals": "^11.1.0" - }, - "engines": { - "node": ">=6.9.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, - "node_modules/@babel/plugin-transform-classes/node_modules/@babel/helper-annotate-as-pure": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.22.5.tgz", - "integrity": "sha512-LvBTxu8bQSQkcyKOU+a1btnNFQ1dMAd0R6PyW3arXes06F6QLWLIrd681bxRPIXlrMGR3XYnW9JyML7dP3qgxg==", - "dev": true, - "dependencies": { - "@babel/types": "^7.22.5" - }, - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/@babel/plugin-transform-classes/node_modules/@babel/helper-split-export-declaration": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.22.5.tgz", - "integrity": "sha512-thqK5QFghPKWLhAV321lxF95yCg2K3Ob5yw+M3VHWfdia0IkPXUtoLH8x/6Fh486QUvzhb8YOWHChTVen2/PoQ==", - "dev": true, - "dependencies": { - "@babel/types": "^7.22.5" - }, - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/@babel/plugin-transform-computed-properties": { - "version": "7.20.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.20.7.tgz", - "integrity": "sha512-Lz7MvBK6DTjElHAmfu6bfANzKcxpyNPeYBGEafyA6E5HtRpjpZwU+u7Qrgz/2OR0z+5TvKYbPdphfSaAcZBrYQ==", - "dev": true, - "dependencies": { - "@babel/helper-plugin-utils": "^7.20.2", - "@babel/template": "^7.20.7" - }, - "engines": { - "node": ">=6.9.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, - "node_modules/@babel/plugin-transform-destructuring": { - "version": "7.20.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.20.7.tgz", - "integrity": "sha512-Xwg403sRrZb81IVB79ZPqNQME23yhugYVqgTxAhT99h485F4f+GMELFhhOsscDUB7HCswepKeCKLn/GZvUKoBA==", - "dev": true, - "dependencies": { - "@babel/helper-plugin-utils": "^7.20.2" - }, - "engines": { - "node": ">=6.9.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, - "node_modules/@babel/plugin-transform-dotall-regex": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.18.6.tgz", - "integrity": "sha512-6S3jpun1eEbAxq7TdjLotAsl4WpQI9DxfkycRcKrjhQYzU87qpXdknpBg/e+TdcMehqGnLFi7tnFUBR02Vq6wg==", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-unicode-sets-regex/-/plugin-syntax-unicode-sets-regex-7.18.6.tgz", + "integrity": "sha512-727YkEAPwSIQTv5im8QHz3upqp92JTWhidIC81Tdx4VJYIte/VndKf1qKrfnnhPLiPghStWfvC/iFaMCQu7Nqg==", "dev": true, "dependencies": { "@babel/helper-create-regexp-features-plugin": "^7.18.6", @@ -3812,17 +2473,216 @@ "engines": { "node": ">=6.9.0" }, + "peerDependencies": { + "@babel/core": "^7.0.0" + } + }, + "node_modules/@babel/plugin-transform-arrow-functions": { + "version": "7.22.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.22.5.tgz", + "integrity": "sha512-26lTNXoVRdAnsaDXPpvCNUq+OVWEVC6bx7Vvz9rC53F2bagUWW4u4ii2+h8Fejfh7RYqPxn+libeFBBck9muEw==", + "dev": true, + "dependencies": { + "@babel/helper-plugin-utils": "^7.22.5" + }, + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@babel/plugin-transform-async-generator-functions": { + "version": "7.22.15", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-generator-functions/-/plugin-transform-async-generator-functions-7.22.15.tgz", + "integrity": "sha512-jBm1Es25Y+tVoTi5rfd5t1KLmL8ogLKpXszboWOTTtGFGz2RKnQe2yn7HbZ+kb/B8N0FVSGQo874NSlOU1T4+w==", + "dev": true, + "dependencies": { + "@babel/helper-environment-visitor": "^7.22.5", + "@babel/helper-plugin-utils": "^7.22.5", + "@babel/helper-remap-async-to-generator": "^7.22.9", + "@babel/plugin-syntax-async-generators": "^7.8.4" + }, + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@babel/plugin-transform-async-to-generator": { + "version": "7.22.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.22.5.tgz", + "integrity": "sha512-b1A8D8ZzE/VhNDoV1MSJTnpKkCG5bJo+19R4o4oy03zM7ws8yEMK755j61Dc3EyvdysbqH5BOOTquJ7ZX9C6vQ==", + "dev": true, + "dependencies": { + "@babel/helper-module-imports": "^7.22.5", + "@babel/helper-plugin-utils": "^7.22.5", + "@babel/helper-remap-async-to-generator": "^7.22.5" + }, + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@babel/plugin-transform-block-scoped-functions": { + "version": "7.22.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.22.5.tgz", + "integrity": "sha512-tdXZ2UdknEKQWKJP1KMNmuF5Lx3MymtMN/pvA+p/VEkhK8jVcQ1fzSy8KM9qRYhAf2/lV33hoMPKI/xaI9sADA==", + "dev": true, + "dependencies": { + "@babel/helper-plugin-utils": "^7.22.5" + }, + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@babel/plugin-transform-block-scoping": { + "version": "7.23.0", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.23.0.tgz", + "integrity": "sha512-cOsrbmIOXmf+5YbL99/S49Y3j46k/T16b9ml8bm9lP6N9US5iQ2yBK7gpui1pg0V/WMcXdkfKbTb7HXq9u+v4g==", + "dev": true, + "dependencies": { + "@babel/helper-plugin-utils": "^7.22.5" + }, + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@babel/plugin-transform-class-properties": { + "version": "7.22.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-class-properties/-/plugin-transform-class-properties-7.22.5.tgz", + "integrity": "sha512-nDkQ0NfkOhPTq8YCLiWNxp1+f9fCobEjCb0n8WdbNUBc4IB5V7P1QnX9IjpSoquKrXF5SKojHleVNs2vGeHCHQ==", + "dev": true, + "dependencies": { + "@babel/helper-create-class-features-plugin": "^7.22.5", + "@babel/helper-plugin-utils": "^7.22.5" + }, + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@babel/plugin-transform-class-static-block": { + "version": "7.22.11", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-class-static-block/-/plugin-transform-class-static-block-7.22.11.tgz", + "integrity": "sha512-GMM8gGmqI7guS/llMFk1bJDkKfn3v3C4KHK9Yg1ey5qcHcOlKb0QvcMrgzvxo+T03/4szNh5lghY+fEC98Kq9g==", + "dev": true, + "dependencies": { + "@babel/helper-create-class-features-plugin": "^7.22.11", + "@babel/helper-plugin-utils": "^7.22.5", + "@babel/plugin-syntax-class-static-block": "^7.14.5" + }, + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.12.0" + } + }, + "node_modules/@babel/plugin-transform-classes": { + "version": "7.22.15", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.22.15.tgz", + "integrity": "sha512-VbbC3PGjBdE0wAWDdHM9G8Gm977pnYI0XpqMd6LrKISj8/DJXEsWqgRuTYaNE9Bv0JGhTZUzHDlMk18IpOuoqw==", + "dev": true, + "dependencies": { + "@babel/helper-annotate-as-pure": "^7.22.5", + "@babel/helper-compilation-targets": "^7.22.15", + "@babel/helper-environment-visitor": "^7.22.5", + "@babel/helper-function-name": "^7.22.5", + "@babel/helper-optimise-call-expression": "^7.22.5", + "@babel/helper-plugin-utils": "^7.22.5", + "@babel/helper-replace-supers": "^7.22.9", + "@babel/helper-split-export-declaration": "^7.22.6", + "globals": "^11.1.0" + }, + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@babel/plugin-transform-computed-properties": { + "version": "7.22.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.22.5.tgz", + "integrity": "sha512-4GHWBgRf0krxPX+AaPtgBAlTgTeZmqDynokHOX7aqqAB4tHs3U2Y02zH6ETFdLZGcg9UQSD1WCmkVrE9ErHeOg==", + "dev": true, + "dependencies": { + "@babel/helper-plugin-utils": "^7.22.5", + "@babel/template": "^7.22.5" + }, + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@babel/plugin-transform-destructuring": { + "version": "7.23.0", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.23.0.tgz", + "integrity": "sha512-vaMdgNXFkYrB+8lbgniSYWHsgqK5gjaMNcc84bMIOMRLH0L9AqYq3hwMdvnyqj1OPqea8UtjPEuS/DCenah1wg==", + "dev": true, + "dependencies": { + "@babel/helper-plugin-utils": "^7.22.5" + }, + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@babel/plugin-transform-dotall-regex": { + "version": "7.22.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.22.5.tgz", + "integrity": "sha512-5/Yk9QxCQCl+sOIB1WelKnVRxTJDSAIxtJLL2/pqL14ZVlbH0fUQUZa/T5/UnQtBNgghR7mfB8ERBKyKPCi7Vw==", + "dev": true, + "dependencies": { + "@babel/helper-create-regexp-features-plugin": "^7.22.5", + "@babel/helper-plugin-utils": "^7.22.5" + }, + "engines": { + "node": ">=6.9.0" + }, "peerDependencies": { "@babel/core": "^7.0.0-0" } }, "node_modules/@babel/plugin-transform-duplicate-keys": { - "version": "7.18.9", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.18.9.tgz", - "integrity": "sha512-d2bmXCtZXYc59/0SanQKbiWINadaJXqtvIQIzd4+hNwkWBgyCd5F/2t1kXoUdvPMrxzPvhK6EMQRROxsue+mfw==", + "version": "7.22.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.22.5.tgz", + "integrity": "sha512-dEnYD+9BBgld5VBXHnF/DbYGp3fqGMsyxKbtD1mDyIA7AkTSpKXFhCVuj/oQVOoALfBs77DudA0BE4d5mcpmqw==", "dev": true, "dependencies": { - "@babel/helper-plugin-utils": "^7.18.9" + "@babel/helper-plugin-utils": "^7.22.5" + }, + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@babel/plugin-transform-dynamic-import": { + "version": "7.22.11", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dynamic-import/-/plugin-transform-dynamic-import-7.22.11.tgz", + "integrity": "sha512-g/21plo58sfteWjaO0ZNVb+uEOkJNjAaHhbejrnBmu011l/eNDScmkbjCC3l4FKb10ViaGU4aOkFznSu2zRHgA==", + "dev": true, + "dependencies": { + "@babel/helper-plugin-utils": "^7.22.5", + "@babel/plugin-syntax-dynamic-import": "^7.8.3" }, "engines": { "node": ">=6.9.0" @@ -3832,13 +2692,29 @@ } }, "node_modules/@babel/plugin-transform-exponentiation-operator": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.18.6.tgz", - "integrity": "sha512-wzEtc0+2c88FVR34aQmiz56dxEkxr2g8DQb/KfaFa1JYXOFVsbhvAonFN6PwVWj++fKmku8NP80plJ5Et4wqHw==", + "version": "7.22.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.22.5.tgz", + "integrity": "sha512-vIpJFNM/FjZ4rh1myqIya9jXwrwwgFRHPjT3DkUA9ZLHuzox8jiXkOLvwm1H+PQIP3CqfC++WPKeuDi0Sjdj1g==", "dev": true, "dependencies": { - "@babel/helper-builder-binary-assignment-operator-visitor": "^7.18.6", - "@babel/helper-plugin-utils": "^7.18.6" + "@babel/helper-builder-binary-assignment-operator-visitor": "^7.22.5", + "@babel/helper-plugin-utils": "^7.22.5" + }, + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@babel/plugin-transform-export-namespace-from": { + "version": "7.22.11", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-export-namespace-from/-/plugin-transform-export-namespace-from-7.22.11.tgz", + "integrity": "sha512-xa7aad7q7OiT8oNZ1mU7NrISjlSkVdMbNxn9IuLZyL9AJEhs1Apba3I+u5riX1dIkdptP5EKDG5XDPByWxtehw==", + "dev": true, + "dependencies": { + "@babel/helper-plugin-utils": "^7.22.5", + "@babel/plugin-syntax-export-namespace-from": "^7.8.3" }, "engines": { "node": ">=6.9.0" @@ -3848,12 +2724,12 @@ } }, "node_modules/@babel/plugin-transform-for-of": { - "version": "7.18.8", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.18.8.tgz", - "integrity": "sha512-yEfTRnjuskWYo0k1mHUqrVWaZwrdq8AYbfrpqULOJOaucGSp4mNMVps+YtA8byoevxS/urwU75vyhQIxcCgiBQ==", + "version": "7.22.15", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.22.15.tgz", + "integrity": "sha512-me6VGeHsx30+xh9fbDLLPi0J1HzmeIIyenoOQHuw2D4m2SAU3NrspX5XxJLBpqn5yrLzrlw2Iy3RA//Bx27iOA==", "dev": true, "dependencies": { - "@babel/helper-plugin-utils": "^7.18.6" + "@babel/helper-plugin-utils": "^7.22.5" }, "engines": { "node": ">=6.9.0" @@ -3879,13 +2755,45 @@ "@babel/core": "^7.0.0-0" } }, - "node_modules/@babel/plugin-transform-literals": { - "version": "7.18.9", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.18.9.tgz", - "integrity": "sha512-IFQDSRoTPnrAIrI5zoZv73IFeZu2dhu6irxQjY9rNjTT53VmKg9fenjvoiOWOkJ6mm4jKVPtdMzBY98Fp4Z4cg==", + "node_modules/@babel/plugin-transform-json-strings": { + "version": "7.22.11", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-json-strings/-/plugin-transform-json-strings-7.22.11.tgz", + "integrity": "sha512-CxT5tCqpA9/jXFlme9xIBCc5RPtdDq3JpkkhgHQqtDdiTnTI0jtZ0QzXhr5DILeYifDPp2wvY2ad+7+hLMW5Pw==", "dev": true, "dependencies": { - "@babel/helper-plugin-utils": "^7.18.9" + "@babel/helper-plugin-utils": "^7.22.5", + "@babel/plugin-syntax-json-strings": "^7.8.3" + }, + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@babel/plugin-transform-literals": { + "version": "7.22.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.22.5.tgz", + "integrity": "sha512-fTLj4D79M+mepcw3dgFBTIDYpbcB9Sm0bpm4ppXPaO+U+PKFFyV9MGRvS0gvGw62sd10kT5lRMKXAADb9pWy8g==", + "dev": true, + "dependencies": { + "@babel/helper-plugin-utils": "^7.22.5" + }, + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@babel/plugin-transform-logical-assignment-operators": { + "version": "7.22.11", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-logical-assignment-operators/-/plugin-transform-logical-assignment-operators-7.22.11.tgz", + "integrity": "sha512-qQwRTP4+6xFCDV5k7gZBF3C31K34ut0tbEcTKxlX/0KXxm9GLcO14p570aWxFvVzx6QAfPgq7gaeIHXJC8LswQ==", + "dev": true, + "dependencies": { + "@babel/helper-plugin-utils": "^7.22.5", + "@babel/plugin-syntax-logical-assignment-operators": "^7.10.4" }, "engines": { "node": ">=6.9.0" @@ -3895,12 +2803,12 @@ } }, "node_modules/@babel/plugin-transform-member-expression-literals": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.18.6.tgz", - "integrity": "sha512-qSF1ihLGO3q+/g48k85tUjD033C29TNTVB2paCwZPVmOsjn9pClvYYrM2VeJpBY2bcNkuny0YUyTNRyRxJ54KA==", + "version": "7.22.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.22.5.tgz", + "integrity": "sha512-RZEdkNtzzYCFl9SE9ATaUMTj2hqMb4StarOJLrZRbqqU4HSBE7UlBw9WBWQiDzrJZJdUWiMTVDI6Gv/8DPvfew==", "dev": true, "dependencies": { - "@babel/helper-plugin-utils": "^7.18.6" + "@babel/helper-plugin-utils": "^7.22.5" }, "engines": { "node": ">=6.9.0" @@ -3910,13 +2818,13 @@ } }, "node_modules/@babel/plugin-transform-modules-amd": { - "version": "7.20.11", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.20.11.tgz", - "integrity": "sha512-NuzCt5IIYOW0O30UvqktzHYR2ud5bOWbY0yaxWZ6G+aFzOMJvrs5YHNikrbdaT15+KNO31nPOy5Fim3ku6Zb5g==", + "version": "7.23.0", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.23.0.tgz", + "integrity": "sha512-xWT5gefv2HGSm4QHtgc1sYPbseOyf+FFDo2JbpE25GWl5BqTGO9IMwTYJRoIdjsF85GE+VegHxSCUt5EvoYTAw==", "dev": true, "dependencies": { - "@babel/helper-module-transforms": "^7.20.11", - "@babel/helper-plugin-utils": "^7.20.2" + "@babel/helper-module-transforms": "^7.23.0", + "@babel/helper-plugin-utils": "^7.22.5" }, "engines": { "node": ">=6.9.0" @@ -3926,14 +2834,14 @@ } }, "node_modules/@babel/plugin-transform-modules-commonjs": { - "version": "7.20.11", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.20.11.tgz", - "integrity": "sha512-S8e1f7WQ7cimJQ51JkAaDrEtohVEitXjgCGAS2N8S31Y42E+kWwfSz83LYz57QdBm7q9diARVqanIaH2oVgQnw==", + "version": "7.23.0", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.23.0.tgz", + "integrity": "sha512-32Xzss14/UVc7k9g775yMIvkVK8xwKE0DPdP5JTapr3+Z9w4tzeOuLNY6BXDQR6BdnzIlXnCGAzsk/ICHBLVWQ==", "dev": true, "dependencies": { - "@babel/helper-module-transforms": "^7.20.11", - "@babel/helper-plugin-utils": "^7.20.2", - "@babel/helper-simple-access": "^7.20.2" + "@babel/helper-module-transforms": "^7.23.0", + "@babel/helper-plugin-utils": "^7.22.5", + "@babel/helper-simple-access": "^7.22.5" }, "engines": { "node": ">=6.9.0" @@ -3943,15 +2851,15 @@ } }, "node_modules/@babel/plugin-transform-modules-systemjs": { - "version": "7.20.11", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.20.11.tgz", - "integrity": "sha512-vVu5g9BPQKSFEmvt2TA4Da5N+QVS66EX21d8uoOihC+OCpUoGvzVsXeqFdtAEfVa5BILAeFt+U7yVmLbQnAJmw==", + "version": "7.23.0", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.23.0.tgz", + "integrity": "sha512-qBej6ctXZD2f+DhlOC9yO47yEYgUh5CZNz/aBoH4j/3NOlRfJXJbY7xDQCqQVf9KbrqGzIWER1f23doHGrIHFg==", "dev": true, "dependencies": { - "@babel/helper-hoist-variables": "^7.18.6", - "@babel/helper-module-transforms": "^7.20.11", - "@babel/helper-plugin-utils": "^7.20.2", - "@babel/helper-validator-identifier": "^7.19.1" + "@babel/helper-hoist-variables": "^7.22.5", + "@babel/helper-module-transforms": "^7.23.0", + "@babel/helper-plugin-utils": "^7.22.5", + "@babel/helper-validator-identifier": "^7.22.20" }, "engines": { "node": ">=6.9.0" @@ -3961,13 +2869,13 @@ } }, "node_modules/@babel/plugin-transform-modules-umd": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.18.6.tgz", - "integrity": "sha512-dcegErExVeXcRqNtkRU/z8WlBLnvD4MRnHgNs3MytRO1Mn1sHRyhbcpYbVMGclAqOjdW+9cfkdZno9dFdfKLfQ==", + "version": "7.22.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.22.5.tgz", + "integrity": "sha512-+S6kzefN/E1vkSsKx8kmQuqeQsvCKCd1fraCM7zXm4SFoggI099Tr4G8U81+5gtMdUeMQ4ipdQffbKLX0/7dBQ==", "dev": true, "dependencies": { - "@babel/helper-module-transforms": "^7.18.6", - "@babel/helper-plugin-utils": "^7.18.6" + "@babel/helper-module-transforms": "^7.22.5", + "@babel/helper-plugin-utils": "^7.22.5" }, "engines": { "node": ">=6.9.0" @@ -3977,13 +2885,13 @@ } }, "node_modules/@babel/plugin-transform-named-capturing-groups-regex": { - "version": "7.20.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.20.5.tgz", - "integrity": "sha512-mOW4tTzi5iTLnw+78iEq3gr8Aoq4WNRGpmSlrogqaiCBoR1HFhpU4JkpQFOHfeYx3ReVIFWOQJS4aZBRvuZ6mA==", + "version": "7.22.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.22.5.tgz", + "integrity": "sha512-YgLLKmS3aUBhHaxp5hi1WJTgOUb/NCuDHzGT9z9WTt3YG+CPRhJs6nprbStx6DnWM4dh6gt7SU3sZodbZ08adQ==", "dev": true, "dependencies": { - "@babel/helper-create-regexp-features-plugin": "^7.20.5", - "@babel/helper-plugin-utils": "^7.20.2" + "@babel/helper-create-regexp-features-plugin": "^7.22.5", + "@babel/helper-plugin-utils": "^7.22.5" }, "engines": { "node": ">=6.9.0" @@ -3993,12 +2901,63 @@ } }, "node_modules/@babel/plugin-transform-new-target": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.18.6.tgz", - "integrity": "sha512-DjwFA/9Iu3Z+vrAn+8pBUGcjhxKguSMlsFqeCKbhb9BAV756v0krzVK04CRDi/4aqmk8BsHb4a/gFcaA5joXRw==", + "version": "7.22.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.22.5.tgz", + "integrity": "sha512-AsF7K0Fx/cNKVyk3a+DW0JLo+Ua598/NxMRvxDnkpCIGFh43+h/v2xyhRUYf6oD8gE4QtL83C7zZVghMjHd+iw==", "dev": true, "dependencies": { - "@babel/helper-plugin-utils": "^7.18.6" + "@babel/helper-plugin-utils": "^7.22.5" + }, + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@babel/plugin-transform-nullish-coalescing-operator": { + "version": "7.22.11", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-nullish-coalescing-operator/-/plugin-transform-nullish-coalescing-operator-7.22.11.tgz", + "integrity": "sha512-YZWOw4HxXrotb5xsjMJUDlLgcDXSfO9eCmdl1bgW4+/lAGdkjaEvOnQ4p5WKKdUgSzO39dgPl0pTnfxm0OAXcg==", + "dev": true, + "dependencies": { + "@babel/helper-plugin-utils": "^7.22.5", + "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3" + }, + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@babel/plugin-transform-numeric-separator": { + "version": "7.22.11", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-numeric-separator/-/plugin-transform-numeric-separator-7.22.11.tgz", + "integrity": "sha512-3dzU4QGPsILdJbASKhF/V2TVP+gJya1PsueQCxIPCEcerqF21oEcrob4mzjsp2Py/1nLfF5m+xYNMDpmA8vffg==", + "dev": true, + "dependencies": { + "@babel/helper-plugin-utils": "^7.22.5", + "@babel/plugin-syntax-numeric-separator": "^7.10.4" + }, + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@babel/plugin-transform-object-rest-spread": { + "version": "7.22.15", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-rest-spread/-/plugin-transform-object-rest-spread-7.22.15.tgz", + "integrity": "sha512-fEB+I1+gAmfAyxZcX1+ZUwLeAuuf8VIg67CTznZE0MqVFumWkh8xWtn58I4dxdVf080wn7gzWoF8vndOViJe9Q==", + "dev": true, + "dependencies": { + "@babel/compat-data": "^7.22.9", + "@babel/helper-compilation-targets": "^7.22.15", + "@babel/helper-plugin-utils": "^7.22.5", + "@babel/plugin-syntax-object-rest-spread": "^7.8.3", + "@babel/plugin-transform-parameters": "^7.22.15" }, "engines": { "node": ">=6.9.0" @@ -4008,13 +2967,46 @@ } }, "node_modules/@babel/plugin-transform-object-super": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.18.6.tgz", - "integrity": "sha512-uvGz6zk+pZoS1aTZrOvrbj6Pp/kK2mp45t2B+bTDre2UgsZZ8EZLSJtUg7m/no0zOJUWgFONpB7Zv9W2tSaFlA==", + "version": "7.22.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.22.5.tgz", + "integrity": "sha512-klXqyaT9trSjIUrcsYIfETAzmOEZL3cBYqOYLJxBHfMFFggmXOv+NYSX/Jbs9mzMVESw/WycLFPRx8ba/b2Ipw==", "dev": true, "dependencies": { - "@babel/helper-plugin-utils": "^7.18.6", - "@babel/helper-replace-supers": "^7.18.6" + "@babel/helper-plugin-utils": "^7.22.5", + "@babel/helper-replace-supers": "^7.22.5" + }, + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@babel/plugin-transform-optional-catch-binding": { + "version": "7.22.11", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-catch-binding/-/plugin-transform-optional-catch-binding-7.22.11.tgz", + "integrity": "sha512-rli0WxesXUeCJnMYhzAglEjLWVDF6ahb45HuprcmQuLidBJFWjNnOzssk2kuc6e33FlLaiZhG/kUIzUMWdBKaQ==", + "dev": true, + "dependencies": { + "@babel/helper-plugin-utils": "^7.22.5", + "@babel/plugin-syntax-optional-catch-binding": "^7.8.3" + }, + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@babel/plugin-transform-optional-chaining": { + "version": "7.23.0", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-chaining/-/plugin-transform-optional-chaining-7.23.0.tgz", + "integrity": "sha512-sBBGXbLJjxTzLBF5rFWaikMnOGOk/BmK6vVByIdEggZ7Vn6CvWXZyRkkLFK6WE0IF8jSliyOkUN6SScFgzCM0g==", + "dev": true, + "dependencies": { + "@babel/helper-plugin-utils": "^7.22.5", + "@babel/helper-skip-transparent-expression-wrappers": "^7.22.5", + "@babel/plugin-syntax-optional-chaining": "^7.8.3" }, "engines": { "node": ">=6.9.0" @@ -4024,12 +3016,46 @@ } }, "node_modules/@babel/plugin-transform-parameters": { - "version": "7.20.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.20.7.tgz", - "integrity": "sha512-WiWBIkeHKVOSYPO0pWkxGPfKeWrCJyD3NJ53+Lrp/QMSZbsVPovrVl2aWZ19D/LTVnaDv5Ap7GJ/B2CTOZdrfA==", + "version": "7.22.15", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.22.15.tgz", + "integrity": "sha512-hjk7qKIqhyzhhUvRT683TYQOFa/4cQKwQy7ALvTpODswN40MljzNDa0YldevS6tGbxwaEKVn502JmY0dP7qEtQ==", "dev": true, "dependencies": { - "@babel/helper-plugin-utils": "^7.20.2" + "@babel/helper-plugin-utils": "^7.22.5" + }, + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@babel/plugin-transform-private-methods": { + "version": "7.22.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-private-methods/-/plugin-transform-private-methods-7.22.5.tgz", + "integrity": "sha512-PPjh4gyrQnGe97JTalgRGMuU4icsZFnWkzicB/fUtzlKUqvsWBKEpPPfr5a2JiyirZkHxnAqkQMO5Z5B2kK3fA==", + "dev": true, + "dependencies": { + "@babel/helper-create-class-features-plugin": "^7.22.5", + "@babel/helper-plugin-utils": "^7.22.5" + }, + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@babel/plugin-transform-private-property-in-object": { + "version": "7.22.11", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-private-property-in-object/-/plugin-transform-private-property-in-object-7.22.11.tgz", + "integrity": "sha512-sSCbqZDBKHetvjSwpyWzhuHkmW5RummxJBVbYLkGkaiTOWGxml7SXt0iWa03bzxFIx7wOj3g/ILRd0RcJKBeSQ==", + "dev": true, + "dependencies": { + "@babel/helper-annotate-as-pure": "^7.22.5", + "@babel/helper-create-class-features-plugin": "^7.22.11", + "@babel/helper-plugin-utils": "^7.22.5", + "@babel/plugin-syntax-private-property-in-object": "^7.14.5" }, "engines": { "node": ">=6.9.0" @@ -4039,12 +3065,12 @@ } }, "node_modules/@babel/plugin-transform-property-literals": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.18.6.tgz", - "integrity": "sha512-cYcs6qlgafTud3PAzrrRNbQtfpQ8+y/+M5tKmksS9+M1ckbH6kzY8MrexEM9mcA6JDsukE19iIRvAyYl463sMg==", + "version": "7.22.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.22.5.tgz", + "integrity": "sha512-TiOArgddK3mK/x1Qwf5hay2pxI6wCZnvQqrFSqbtg1GLl2JcNMitVH/YnqjP+M31pLUeTfzY1HAXFDnUBV30rQ==", "dev": true, "dependencies": { - "@babel/helper-plugin-utils": "^7.18.6" + "@babel/helper-plugin-utils": "^7.22.5" }, "engines": { "node": ">=6.9.0" @@ -4054,13 +3080,13 @@ } }, "node_modules/@babel/plugin-transform-regenerator": { - "version": "7.20.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.20.5.tgz", - "integrity": "sha512-kW/oO7HPBtntbsahzQ0qSE3tFvkFwnbozz3NWFhLGqH75vLEg+sCGngLlhVkePlCs3Jv0dBBHDzCHxNiFAQKCQ==", + "version": "7.22.10", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.22.10.tgz", + "integrity": "sha512-F28b1mDt8KcT5bUyJc/U9nwzw6cV+UmTeRlXYIl2TNqMMJif0Jeey9/RQ3C4NOd2zp0/TRsDns9ttj2L523rsw==", "dev": true, "dependencies": { - "@babel/helper-plugin-utils": "^7.20.2", - "regenerator-transform": "^0.15.1" + "@babel/helper-plugin-utils": "^7.22.5", + "regenerator-transform": "^0.15.2" }, "engines": { "node": ">=6.9.0" @@ -4070,12 +3096,12 @@ } }, "node_modules/@babel/plugin-transform-reserved-words": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.18.6.tgz", - "integrity": "sha512-oX/4MyMoypzHjFrT1CdivfKZ+XvIPMFXwwxHp/r0Ddy2Vuomt4HDFGmft1TAY2yiTKiNSsh3kjBAzcM8kSdsjA==", + "version": "7.22.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.22.5.tgz", + "integrity": "sha512-DTtGKFRQUDm8svigJzZHzb/2xatPc6TzNvAIJ5GqOKDsGFYgAskjRulbR/vGsPKq3OPqtexnz327qYpP57RFyA==", "dev": true, "dependencies": { - "@babel/helper-plugin-utils": "^7.18.6" + "@babel/helper-plugin-utils": "^7.22.5" }, "engines": { "node": ">=6.9.0" @@ -4085,17 +3111,17 @@ } }, "node_modules/@babel/plugin-transform-runtime": { - "version": "7.19.6", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.19.6.tgz", - "integrity": "sha512-PRH37lz4JU156lYFW1p8OxE5i7d6Sl/zV58ooyr+q1J1lnQPyg5tIiXlIwNVhJaY4W3TmOtdc8jqdXQcB1v5Yw==", + "version": "7.22.9", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.22.9.tgz", + "integrity": "sha512-9KjBH61AGJetCPYp/IEyLEp47SyybZb0nDRpBvmtEkm+rUIwxdlKpyNHI1TmsGkeuLclJdleQHRZ8XLBnnh8CQ==", "dev": true, "dependencies": { - "@babel/helper-module-imports": "^7.18.6", - "@babel/helper-plugin-utils": "^7.19.0", - "babel-plugin-polyfill-corejs2": "^0.3.3", - "babel-plugin-polyfill-corejs3": "^0.6.0", - "babel-plugin-polyfill-regenerator": "^0.4.1", - "semver": "^6.3.0" + "@babel/helper-module-imports": "^7.22.5", + "@babel/helper-plugin-utils": "^7.22.5", + "babel-plugin-polyfill-corejs2": "^0.4.4", + "babel-plugin-polyfill-corejs3": "^0.8.2", + "babel-plugin-polyfill-regenerator": "^0.5.1", + "semver": "^6.3.1" }, "engines": { "node": ">=6.9.0" @@ -4105,21 +3131,21 @@ } }, "node_modules/@babel/plugin-transform-runtime/node_modules/semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", + "version": "6.3.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", + "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", "dev": true, "bin": { "semver": "bin/semver.js" } }, "node_modules/@babel/plugin-transform-shorthand-properties": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.18.6.tgz", - "integrity": "sha512-eCLXXJqv8okzg86ywZJbRn19YJHU4XUa55oz2wbHhaQVn/MM+XhukiT7SYqp/7o00dg52Rj51Ny+Ecw4oyoygw==", + "version": "7.22.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.22.5.tgz", + "integrity": "sha512-vM4fq9IXHscXVKzDv5itkO1X52SmdFBFcMIBZ2FRn2nqVYqw6dBexUgMvAjHW+KXpPPViD/Yo3GrDEBaRC0QYA==", "dev": true, "dependencies": { - "@babel/helper-plugin-utils": "^7.18.6" + "@babel/helper-plugin-utils": "^7.22.5" }, "engines": { "node": ">=6.9.0" @@ -4129,13 +3155,13 @@ } }, "node_modules/@babel/plugin-transform-spread": { - "version": "7.20.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.20.7.tgz", - "integrity": "sha512-ewBbHQ+1U/VnH1fxltbJqDeWBU1oNLG8Dj11uIv3xVf7nrQu0bPGe5Rf716r7K5Qz+SqtAOVswoVunoiBtGhxw==", + "version": "7.22.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.22.5.tgz", + "integrity": "sha512-5ZzDQIGyvN4w8+dMmpohL6MBo+l2G7tfC/O2Dg7/hjpgeWvUx8FzfeOKxGog9IimPa4YekaQ9PlDqTLOljkcxg==", "dev": true, "dependencies": { - "@babel/helper-plugin-utils": "^7.20.2", - "@babel/helper-skip-transparent-expression-wrappers": "^7.20.0" + "@babel/helper-plugin-utils": "^7.22.5", + "@babel/helper-skip-transparent-expression-wrappers": "^7.22.5" }, "engines": { "node": ">=6.9.0" @@ -4145,12 +3171,12 @@ } }, "node_modules/@babel/plugin-transform-sticky-regex": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.18.6.tgz", - "integrity": "sha512-kfiDrDQ+PBsQDO85yj1icueWMfGfJFKN1KCkndygtu/C9+XUfydLC8Iv5UYJqRwy4zk8EcplRxEOeLyjq1gm6Q==", + "version": "7.22.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.22.5.tgz", + "integrity": "sha512-zf7LuNpHG0iEeiyCNwX4j3gDg1jgt1k3ZdXBKbZSoA3BbGQGvMiSvfbZRR3Dr3aeJe3ooWFZxOOG3IRStYp2Bw==", "dev": true, "dependencies": { - "@babel/helper-plugin-utils": "^7.18.6" + "@babel/helper-plugin-utils": "^7.22.5" }, "engines": { "node": ">=6.9.0" @@ -4160,12 +3186,12 @@ } }, "node_modules/@babel/plugin-transform-template-literals": { - "version": "7.18.9", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.18.9.tgz", - "integrity": "sha512-S8cOWfT82gTezpYOiVaGHrCbhlHgKhQt8XH5ES46P2XWmX92yisoZywf5km75wv5sYcXDUCLMmMxOLCtthDgMA==", + "version": "7.22.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.22.5.tgz", + "integrity": "sha512-5ciOehRNf+EyUeewo8NkbQiUs4d6ZxiHo6BcBcnFlgiJfu16q0bQUw9Jvo0b0gBKFG1SMhDSjeKXSYuJLeFSMA==", "dev": true, "dependencies": { - "@babel/helper-plugin-utils": "^7.18.9" + "@babel/helper-plugin-utils": "^7.22.5" }, "engines": { "node": ">=6.9.0" @@ -4175,12 +3201,12 @@ } }, "node_modules/@babel/plugin-transform-typeof-symbol": { - "version": "7.18.9", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.18.9.tgz", - "integrity": "sha512-SRfwTtF11G2aemAZWivL7PD+C9z52v9EvMqH9BuYbabyPuKUvSWks3oCg6041pT925L4zVFqaVBeECwsmlguEw==", + "version": "7.22.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.22.5.tgz", + "integrity": "sha512-bYkI5lMzL4kPii4HHEEChkD0rkc+nvnlR6+o/qdqR6zrm0Sv/nodmyLhlq2DO0YKLUNd2VePmPRjJXSBh9OIdA==", "dev": true, "dependencies": { - "@babel/helper-plugin-utils": "^7.18.9" + "@babel/helper-plugin-utils": "^7.22.5" }, "engines": { "node": ">=6.9.0" @@ -4190,12 +3216,28 @@ } }, "node_modules/@babel/plugin-transform-unicode-escapes": { - "version": "7.18.10", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.18.10.tgz", - "integrity": "sha512-kKAdAI+YzPgGY/ftStBFXTI1LZFju38rYThnfMykS+IXy8BVx+res7s2fxf1l8I35DV2T97ezo6+SGrXz6B3iQ==", + "version": "7.22.10", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.22.10.tgz", + "integrity": "sha512-lRfaRKGZCBqDlRU3UIFovdp9c9mEvlylmpod0/OatICsSfuQ9YFthRo1tpTkGsklEefZdqlEFdY4A2dwTb6ohg==", "dev": true, "dependencies": { - "@babel/helper-plugin-utils": "^7.18.9" + "@babel/helper-plugin-utils": "^7.22.5" + }, + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@babel/plugin-transform-unicode-property-regex": { + "version": "7.22.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-property-regex/-/plugin-transform-unicode-property-regex-7.22.5.tgz", + "integrity": "sha512-HCCIb+CbJIAE6sXn5CjFQXMwkCClcOfPCzTlilJ8cUatfzwHlWQkbtV0zD338u9dZskwvuOYTuuaMaA8J5EI5A==", + "dev": true, + "dependencies": { + "@babel/helper-create-regexp-features-plugin": "^7.22.5", + "@babel/helper-plugin-utils": "^7.22.5" }, "engines": { "node": ">=6.9.0" @@ -4205,13 +3247,13 @@ } }, "node_modules/@babel/plugin-transform-unicode-regex": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.18.6.tgz", - "integrity": "sha512-gE7A6Lt7YLnNOL3Pb9BNeZvi+d8l7tcRrG4+pwJjK9hD2xX4mEvjlQW60G9EEmfXVYRPv9VRQcyegIVHCql/AA==", + "version": "7.22.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.22.5.tgz", + "integrity": "sha512-028laaOKptN5vHJf9/Arr/HiJekMd41hOEZYvNsrsXqJ7YPYuX2bQxh31fkZzGmq3YqHRJzYFFAVYvKfMPKqyg==", "dev": true, "dependencies": { - "@babel/helper-create-regexp-features-plugin": "^7.18.6", - "@babel/helper-plugin-utils": "^7.18.6" + "@babel/helper-create-regexp-features-plugin": "^7.22.5", + "@babel/helper-plugin-utils": "^7.22.5" }, "engines": { "node": ">=6.9.0" @@ -4220,39 +3262,43 @@ "@babel/core": "^7.0.0-0" } }, - "node_modules/@babel/preset-env": { - "version": "7.20.2", - "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.20.2.tgz", - "integrity": "sha512-1G0efQEWR1EHkKvKHqbG+IN/QdgwfByUpM5V5QroDzGV2t3S/WXNQd693cHiHTlCFMpr9B6FkPFXDA2lQcKoDg==", + "node_modules/@babel/plugin-transform-unicode-sets-regex": { + "version": "7.22.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-sets-regex/-/plugin-transform-unicode-sets-regex-7.22.5.tgz", + "integrity": "sha512-lhMfi4FC15j13eKrh3DnYHjpGj6UKQHtNKTbtc1igvAhRy4+kLhV07OpLcsN0VgDEw/MjAvJO4BdMJsHwMhzCg==", "dev": true, "dependencies": { - "@babel/compat-data": "^7.20.1", - "@babel/helper-compilation-targets": "^7.20.0", - "@babel/helper-plugin-utils": "^7.20.2", - "@babel/helper-validator-option": "^7.18.6", - "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": "^7.18.6", - "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "^7.18.9", - "@babel/plugin-proposal-async-generator-functions": "^7.20.1", - "@babel/plugin-proposal-class-properties": "^7.18.6", - "@babel/plugin-proposal-class-static-block": "^7.18.6", - "@babel/plugin-proposal-dynamic-import": "^7.18.6", - "@babel/plugin-proposal-export-namespace-from": "^7.18.9", - "@babel/plugin-proposal-json-strings": "^7.18.6", - "@babel/plugin-proposal-logical-assignment-operators": "^7.18.9", - "@babel/plugin-proposal-nullish-coalescing-operator": "^7.18.6", - "@babel/plugin-proposal-numeric-separator": "^7.18.6", - "@babel/plugin-proposal-object-rest-spread": "^7.20.2", - "@babel/plugin-proposal-optional-catch-binding": "^7.18.6", - "@babel/plugin-proposal-optional-chaining": "^7.18.9", - "@babel/plugin-proposal-private-methods": "^7.18.6", - "@babel/plugin-proposal-private-property-in-object": "^7.18.6", - "@babel/plugin-proposal-unicode-property-regex": "^7.18.6", + "@babel/helper-create-regexp-features-plugin": "^7.22.5", + "@babel/helper-plugin-utils": "^7.22.5" + }, + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0" + } + }, + "node_modules/@babel/preset-env": { + "version": "7.22.9", + "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.22.9.tgz", + "integrity": "sha512-wNi5H/Emkhll/bqPjsjQorSykrlfY5OWakd6AulLvMEytpKasMVUpVy8RL4qBIBs5Ac6/5i0/Rv0b/Fg6Eag/g==", + "dev": true, + "dependencies": { + "@babel/compat-data": "^7.22.9", + "@babel/helper-compilation-targets": "^7.22.9", + "@babel/helper-plugin-utils": "^7.22.5", + "@babel/helper-validator-option": "^7.22.5", + "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": "^7.22.5", + "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "^7.22.5", + "@babel/plugin-proposal-private-property-in-object": "7.21.0-placeholder-for-preset-env.2", "@babel/plugin-syntax-async-generators": "^7.8.4", "@babel/plugin-syntax-class-properties": "^7.12.13", "@babel/plugin-syntax-class-static-block": "^7.14.5", "@babel/plugin-syntax-dynamic-import": "^7.8.3", "@babel/plugin-syntax-export-namespace-from": "^7.8.3", - "@babel/plugin-syntax-import-assertions": "^7.20.0", + "@babel/plugin-syntax-import-assertions": "^7.22.5", + "@babel/plugin-syntax-import-attributes": "^7.22.5", + "@babel/plugin-syntax-import-meta": "^7.10.4", "@babel/plugin-syntax-json-strings": "^7.8.3", "@babel/plugin-syntax-logical-assignment-operators": "^7.10.4", "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3", @@ -4262,45 +3308,62 @@ "@babel/plugin-syntax-optional-chaining": "^7.8.3", "@babel/plugin-syntax-private-property-in-object": "^7.14.5", "@babel/plugin-syntax-top-level-await": "^7.14.5", - "@babel/plugin-transform-arrow-functions": "^7.18.6", - "@babel/plugin-transform-async-to-generator": "^7.18.6", - "@babel/plugin-transform-block-scoped-functions": "^7.18.6", - "@babel/plugin-transform-block-scoping": "^7.20.2", - "@babel/plugin-transform-classes": "^7.20.2", - "@babel/plugin-transform-computed-properties": "^7.18.9", - "@babel/plugin-transform-destructuring": "^7.20.2", - "@babel/plugin-transform-dotall-regex": "^7.18.6", - "@babel/plugin-transform-duplicate-keys": "^7.18.9", - "@babel/plugin-transform-exponentiation-operator": "^7.18.6", - "@babel/plugin-transform-for-of": "^7.18.8", - "@babel/plugin-transform-function-name": "^7.18.9", - "@babel/plugin-transform-literals": "^7.18.9", - "@babel/plugin-transform-member-expression-literals": "^7.18.6", - "@babel/plugin-transform-modules-amd": "^7.19.6", - "@babel/plugin-transform-modules-commonjs": "^7.19.6", - "@babel/plugin-transform-modules-systemjs": "^7.19.6", - "@babel/plugin-transform-modules-umd": "^7.18.6", - "@babel/plugin-transform-named-capturing-groups-regex": "^7.19.1", - "@babel/plugin-transform-new-target": "^7.18.6", - "@babel/plugin-transform-object-super": "^7.18.6", - "@babel/plugin-transform-parameters": "^7.20.1", - "@babel/plugin-transform-property-literals": "^7.18.6", - "@babel/plugin-transform-regenerator": "^7.18.6", - "@babel/plugin-transform-reserved-words": "^7.18.6", - "@babel/plugin-transform-shorthand-properties": "^7.18.6", - "@babel/plugin-transform-spread": "^7.19.0", - "@babel/plugin-transform-sticky-regex": "^7.18.6", - "@babel/plugin-transform-template-literals": "^7.18.9", - "@babel/plugin-transform-typeof-symbol": "^7.18.9", - "@babel/plugin-transform-unicode-escapes": "^7.18.10", - "@babel/plugin-transform-unicode-regex": "^7.18.6", + "@babel/plugin-syntax-unicode-sets-regex": "^7.18.6", + "@babel/plugin-transform-arrow-functions": "^7.22.5", + "@babel/plugin-transform-async-generator-functions": "^7.22.7", + "@babel/plugin-transform-async-to-generator": "^7.22.5", + "@babel/plugin-transform-block-scoped-functions": "^7.22.5", + "@babel/plugin-transform-block-scoping": "^7.22.5", + "@babel/plugin-transform-class-properties": "^7.22.5", + "@babel/plugin-transform-class-static-block": "^7.22.5", + "@babel/plugin-transform-classes": "^7.22.6", + "@babel/plugin-transform-computed-properties": "^7.22.5", + "@babel/plugin-transform-destructuring": "^7.22.5", + "@babel/plugin-transform-dotall-regex": "^7.22.5", + "@babel/plugin-transform-duplicate-keys": "^7.22.5", + "@babel/plugin-transform-dynamic-import": "^7.22.5", + "@babel/plugin-transform-exponentiation-operator": "^7.22.5", + "@babel/plugin-transform-export-namespace-from": "^7.22.5", + "@babel/plugin-transform-for-of": "^7.22.5", + "@babel/plugin-transform-function-name": "^7.22.5", + "@babel/plugin-transform-json-strings": "^7.22.5", + "@babel/plugin-transform-literals": "^7.22.5", + "@babel/plugin-transform-logical-assignment-operators": "^7.22.5", + "@babel/plugin-transform-member-expression-literals": "^7.22.5", + "@babel/plugin-transform-modules-amd": "^7.22.5", + "@babel/plugin-transform-modules-commonjs": "^7.22.5", + "@babel/plugin-transform-modules-systemjs": "^7.22.5", + "@babel/plugin-transform-modules-umd": "^7.22.5", + "@babel/plugin-transform-named-capturing-groups-regex": "^7.22.5", + "@babel/plugin-transform-new-target": "^7.22.5", + "@babel/plugin-transform-nullish-coalescing-operator": "^7.22.5", + "@babel/plugin-transform-numeric-separator": "^7.22.5", + "@babel/plugin-transform-object-rest-spread": "^7.22.5", + "@babel/plugin-transform-object-super": "^7.22.5", + "@babel/plugin-transform-optional-catch-binding": "^7.22.5", + "@babel/plugin-transform-optional-chaining": "^7.22.6", + "@babel/plugin-transform-parameters": "^7.22.5", + "@babel/plugin-transform-private-methods": "^7.22.5", + "@babel/plugin-transform-private-property-in-object": "^7.22.5", + "@babel/plugin-transform-property-literals": "^7.22.5", + "@babel/plugin-transform-regenerator": "^7.22.5", + "@babel/plugin-transform-reserved-words": "^7.22.5", + "@babel/plugin-transform-shorthand-properties": "^7.22.5", + "@babel/plugin-transform-spread": "^7.22.5", + "@babel/plugin-transform-sticky-regex": "^7.22.5", + "@babel/plugin-transform-template-literals": "^7.22.5", + "@babel/plugin-transform-typeof-symbol": "^7.22.5", + "@babel/plugin-transform-unicode-escapes": "^7.22.5", + "@babel/plugin-transform-unicode-property-regex": "^7.22.5", + "@babel/plugin-transform-unicode-regex": "^7.22.5", + "@babel/plugin-transform-unicode-sets-regex": "^7.22.5", "@babel/preset-modules": "^0.1.5", - "@babel/types": "^7.20.2", - "babel-plugin-polyfill-corejs2": "^0.3.3", - "babel-plugin-polyfill-corejs3": "^0.6.0", - "babel-plugin-polyfill-regenerator": "^0.4.1", - "core-js-compat": "^3.25.1", - "semver": "^6.3.0" + "@babel/types": "^7.22.5", + "babel-plugin-polyfill-corejs2": "^0.4.4", + "babel-plugin-polyfill-corejs3": "^0.8.2", + "babel-plugin-polyfill-regenerator": "^0.5.1", + "core-js-compat": "^3.31.0", + "semver": "^6.3.1" }, "engines": { "node": ">=6.9.0" @@ -4310,18 +3373,18 @@ } }, "node_modules/@babel/preset-env/node_modules/semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", + "version": "6.3.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", + "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", "dev": true, "bin": { "semver": "bin/semver.js" } }, "node_modules/@babel/preset-modules": { - "version": "0.1.5", - "resolved": "https://registry.npmjs.org/@babel/preset-modules/-/preset-modules-0.1.5.tgz", - "integrity": "sha512-A57th6YRG7oR3cq/yt/Y84MvGgE0eJG2F1JLhKuyG+jFxEgrd/HAMJatiFtmOiZurz+0DkrvbheCLaV5f2JfjA==", + "version": "0.1.6", + "resolved": "https://registry.npmjs.org/@babel/preset-modules/-/preset-modules-0.1.6.tgz", + "integrity": "sha512-ID2yj6K/4lKfhuU3+EX4UvNbIt7eACFbHmNUjzA+ep+B5971CknnA/9DEWKbRokfbbtblxxxXFJJrH47UEAMVg==", "dev": true, "dependencies": { "@babel/helper-plugin-utils": "^7.0.0", @@ -4331,13 +3394,19 @@ "esutils": "^2.0.2" }, "peerDependencies": { - "@babel/core": "^7.0.0-0" + "@babel/core": "^7.0.0-0 || ^8.0.0-0 <8.0.0" } }, + "node_modules/@babel/regjsgen": { + "version": "0.8.0", + "resolved": "https://registry.npmjs.org/@babel/regjsgen/-/regjsgen-0.8.0.tgz", + "integrity": "sha512-x/rqGMdzj+fWZvCOYForTghzbtqPDZ5gPwaoNGHdgDfF2QA/XZbCBp4Moo5scrkAMPhB7z26XM/AaHuIJdgauA==", + "dev": true + }, "node_modules/@babel/runtime": { - "version": "7.20.13", - "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.20.13.tgz", - "integrity": "sha512-gt3PKXs0DBoL9xCvOIIZ2NEqAGZqHjAnmVbfQtB620V0uReIQutpel14KcneZuer7UioY8ALKZ7iocavvzTNFA==", + "version": "7.22.6", + "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.22.6.tgz", + "integrity": "sha512-wDb5pWm4WDdF6LFUde3Jl8WzPA+3ZbxYqkC6xAXuD3irdEHN1k0NfTRrJD8ZD378SJ61miMLCqIOXYhd8x+AJQ==", "dev": true, "dependencies": { "regenerator-runtime": "^0.13.11" @@ -4347,33 +3416,33 @@ } }, "node_modules/@babel/template": { - "version": "7.20.7", - "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.20.7.tgz", - "integrity": "sha512-8SegXApWe6VoNw0r9JHpSteLKTpTiLZ4rMlGIm9JQ18KiCtyQiAMEazujAHrUS5flrcqYZa75ukev3P6QmUwUw==", + "version": "7.22.5", + "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.22.5.tgz", + "integrity": "sha512-X7yV7eiwAxdj9k94NEylvbVHLiVG1nvzCV2EAowhxLTwODV1jl9UzZ48leOC0sH7OnuHrIkllaBgneUykIcZaw==", "dev": true, "dependencies": { - "@babel/code-frame": "^7.18.6", - "@babel/parser": "^7.20.7", - "@babel/types": "^7.20.7" + "@babel/code-frame": "^7.22.5", + "@babel/parser": "^7.22.5", + "@babel/types": "^7.22.5" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/traverse": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.22.5.tgz", - "integrity": "sha512-7DuIjPgERaNo6r+PZwItpjCZEa5vyw4eJGufeLxrPdBXBoLcCJCIasvK6pK/9DVNrLZTLFhUGqaC6X/PA007TQ==", + "version": "7.23.0", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.23.0.tgz", + "integrity": "sha512-t/QaEvyIoIkwzpiZ7aoSKK8kObQYeF7T2v+dazAYCb8SXtp58zEVkWW7zAnju8FNKNdr4ScAOEDmMItbyOmEYw==", "dev": true, "dependencies": { - "@babel/code-frame": "^7.22.5", - "@babel/generator": "^7.22.5", - "@babel/helper-environment-visitor": "^7.22.5", - "@babel/helper-function-name": "^7.22.5", + "@babel/code-frame": "^7.22.13", + "@babel/generator": "^7.23.0", + "@babel/helper-environment-visitor": "^7.22.20", + "@babel/helper-function-name": "^7.23.0", "@babel/helper-hoist-variables": "^7.22.5", - "@babel/helper-split-export-declaration": "^7.22.5", - "@babel/parser": "^7.22.5", - "@babel/types": "^7.22.5", + "@babel/helper-split-export-declaration": "^7.22.6", + "@babel/parser": "^7.23.0", + "@babel/types": "^7.23.0", "debug": "^4.1.0", "globals": "^11.1.0" }, @@ -4382,12 +3451,12 @@ } }, "node_modules/@babel/traverse/node_modules/@babel/generator": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.22.5.tgz", - "integrity": "sha512-+lcUbnTRhd0jOewtFSedLyiPsD5tswKkbgcezOqqWFUVNEwoUTlpPOBmvhG7OXWLR4jMdv0czPGH5XbflnD1EA==", + "version": "7.23.0", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.23.0.tgz", + "integrity": "sha512-lN85QRR+5IbYrMWM6Y4pE/noaQtg4pNiqeNGX60eqOfo6gtEj6uw/JagelB8vVztSd7R6M5n1+PQkDbHbBRU4g==", "dev": true, "dependencies": { - "@babel/types": "^7.22.5", + "@babel/types": "^7.23.0", "@jridgewell/gen-mapping": "^0.3.2", "@jridgewell/trace-mapping": "^0.3.17", "jsesc": "^2.5.1" @@ -4396,40 +3465,14 @@ "node": ">=6.9.0" } }, - "node_modules/@babel/traverse/node_modules/@babel/helper-split-export-declaration": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.22.5.tgz", - "integrity": "sha512-thqK5QFghPKWLhAV321lxF95yCg2K3Ob5yw+M3VHWfdia0IkPXUtoLH8x/6Fh486QUvzhb8YOWHChTVen2/PoQ==", - "dev": true, - "dependencies": { - "@babel/types": "^7.22.5" - }, - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/@babel/traverse/node_modules/@jridgewell/gen-mapping": { - "version": "0.3.3", - "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.3.tgz", - "integrity": "sha512-HLhSWOLRi875zjjMG/r+Nv0oCW8umGb0BgEhyX3dDX3egwZtB8PqLnjz3yedt8R5StBrzcg4aBpnh8UA9D1BoQ==", - "dev": true, - "dependencies": { - "@jridgewell/set-array": "^1.0.1", - "@jridgewell/sourcemap-codec": "^1.4.10", - "@jridgewell/trace-mapping": "^0.3.9" - }, - "engines": { - "node": ">=6.0.0" - } - }, "node_modules/@babel/types": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.22.5.tgz", - "integrity": "sha512-zo3MIHGOkPOfoRXitsgHLjEXmlDaD/5KU1Uzuc9GNiZPhSqVxVRtxuPaSBZDsYZ9qV88AjtMtWW7ww98loJ9KA==", + "version": "7.23.0", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.23.0.tgz", + "integrity": "sha512-0oIyUfKoI3mSqMvsxBdclDwxXKXAUA8v/apZbc+iSyARYou1o8ZGDxbUYyLFoW2arqS2jDGqJuZvv1d/io1axg==", "dev": true, "dependencies": { "@babel/helper-string-parser": "^7.22.5", - "@babel/helper-validator-identifier": "^7.22.5", + "@babel/helper-validator-identifier": "^7.22.20", "to-fast-properties": "^2.0.0" }, "engines": { @@ -4437,15 +3480,23 @@ } }, "node_modules/@ctrl/ngx-github-buttons": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/@ctrl/ngx-github-buttons/-/ngx-github-buttons-8.0.0.tgz", - "integrity": "sha512-0YOT7DbC+Yu0BfxRQAvq2S56Q30fCzv/aUbU1taw65cbzD3XAR/c1BzaU29JVQnQMHjpddXacf4qH2oiN1TeTw==", + "version": "9.0.0", + "resolved": "https://registry.npmjs.org/@ctrl/ngx-github-buttons/-/ngx-github-buttons-9.0.0.tgz", + "integrity": "sha512-GNcDw5DCUW8r2ctCS82yLgUgOJ3NEN8DKk2MCZbvdfQLiOEb2FLTqLojdrC2oc7Tppm0/uztrN8EP5qRLMW0wA==", "dependencies": { "tslib": "^2.3.0" }, "peerDependencies": { - "@angular/common": ">=14.0.0-0", - "@angular/core": ">=14.0.0-0" + "@angular/common": ">=16.0.0-0", + "@angular/core": ">=16.0.0-0" + } + }, + "node_modules/@ctrl/tinycolor": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/@ctrl/tinycolor/-/tinycolor-4.0.2.tgz", + "integrity": "sha512-fKQinXE9pJ83J1n+C3rDl2xNLJwfoYNvXLRy5cYZA9hBJJw2q+sbb/AOSNKmLxnTWyNTmy4994dueSwP4opi5g==", + "engines": { + "node": ">=14" } }, "node_modules/@discoveryjs/json-ext": { @@ -4458,23 +3509,23 @@ } }, "node_modules/@es-joy/jsdoccomment": { - "version": "0.37.0", - "resolved": "https://registry.npmjs.org/@es-joy/jsdoccomment/-/jsdoccomment-0.37.0.tgz", - "integrity": "sha512-hjK0wnsPCYLlF+HHB4R/RbUjOWeLW2SlarB67+Do5WsKILOkmIZvvPJFbtWSmbypxcjpoECLAMzoao0D4Bg5ZQ==", + "version": "0.40.1", + "resolved": "https://registry.npmjs.org/@es-joy/jsdoccomment/-/jsdoccomment-0.40.1.tgz", + "integrity": "sha512-YORCdZSusAlBrFpZ77pJjc5r1bQs5caPWtAu+WWmiSo+8XaUzseapVrfAtiRFbQWnrBxxLLEwF6f6ZG/UgCQCg==", "dev": true, "dependencies": { - "comment-parser": "1.3.1", - "esquery": "^1.4.0", + "comment-parser": "1.4.0", + "esquery": "^1.5.0", "jsdoc-type-pratt-parser": "~4.0.0" }, "engines": { - "node": "^14 || ^16 || ^17 || ^18 || ^19" + "node": ">=16" } }, "node_modules/@esbuild/android-arm": { - "version": "0.17.8", - "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.17.8.tgz", - "integrity": "sha512-0/rb91GYKhrtbeglJXOhAv9RuYimgI8h623TplY2X+vA4EXnk3Zj1fXZreJ0J3OJJu1bwmb0W7g+2cT/d8/l/w==", + "version": "0.18.17", + "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.18.17.tgz", + "integrity": "sha512-wHsmJG/dnL3OkpAcwbgoBTTMHVi4Uyou3F5mf58ZtmUyIKfcdA7TROav/6tCzET4A3QW2Q2FC+eFneMU+iyOxg==", "cpu": [ "arm" ], @@ -4488,9 +3539,9 @@ } }, "node_modules/@esbuild/android-arm64": { - "version": "0.17.8", - "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.17.8.tgz", - "integrity": "sha512-oa/N5j6v1svZQs7EIRPqR8f+Bf8g6HBDjD/xHC02radE/NjKHK7oQmtmLxPs1iVwYyvE+Kolo6lbpfEQ9xnhxQ==", + "version": "0.18.17", + "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.18.17.tgz", + "integrity": "sha512-9np+YYdNDed5+Jgr1TdWBsozZ85U1Oa3xW0c7TWqH0y2aGghXtZsuT8nYRbzOMcl0bXZXjOGbksoTtVOlWrRZg==", "cpu": [ "arm64" ], @@ -4504,9 +3555,9 @@ } }, "node_modules/@esbuild/android-x64": { - "version": "0.17.8", - "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.17.8.tgz", - "integrity": "sha512-bTliMLqD7pTOoPg4zZkXqCDuzIUguEWLpeqkNfC41ODBHwoUgZ2w5JBeYimv4oP6TDVocoYmEhZrCLQTrH89bg==", + "version": "0.18.17", + "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.18.17.tgz", + "integrity": "sha512-O+FeWB/+xya0aLg23hHEM2E3hbfwZzjqumKMSIqcHbNvDa+dza2D0yLuymRBQQnC34CWrsJUXyH2MG5VnLd6uw==", "cpu": [ "x64" ], @@ -4520,9 +3571,9 @@ } }, "node_modules/@esbuild/darwin-arm64": { - "version": "0.17.8", - "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.17.8.tgz", - "integrity": "sha512-ghAbV3ia2zybEefXRRm7+lx8J/rnupZT0gp9CaGy/3iolEXkJ6LYRq4IpQVI9zR97ID80KJVoUlo3LSeA/sMAg==", + "version": "0.18.17", + "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.18.17.tgz", + "integrity": "sha512-M9uJ9VSB1oli2BE/dJs3zVr9kcCBBsE883prage1NWz6pBS++1oNn/7soPNS3+1DGj0FrkSvnED4Bmlu1VAE9g==", "cpu": [ "arm64" ], @@ -4536,9 +3587,9 @@ } }, "node_modules/@esbuild/darwin-x64": { - "version": "0.17.8", - "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.17.8.tgz", - "integrity": "sha512-n5WOpyvZ9TIdv2V1K3/iIkkJeKmUpKaCTdun9buhGRWfH//osmUjlv4Z5mmWdPWind/VGcVxTHtLfLCOohsOXw==", + "version": "0.18.17", + "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.18.17.tgz", + "integrity": "sha512-XDre+J5YeIJDMfp3n0279DFNrGCXlxOuGsWIkRb1NThMZ0BsrWXoTg23Jer7fEXQ9Ye5QjrvXpxnhzl3bHtk0g==", "cpu": [ "x64" ], @@ -4552,9 +3603,9 @@ } }, "node_modules/@esbuild/freebsd-arm64": { - "version": "0.17.8", - "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.17.8.tgz", - "integrity": "sha512-a/SATTaOhPIPFWvHZDoZYgxaZRVHn0/LX1fHLGfZ6C13JqFUZ3K6SMD6/HCtwOQ8HnsNaEeokdiDSFLuizqv5A==", + "version": "0.18.17", + "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.18.17.tgz", + "integrity": "sha512-cjTzGa3QlNfERa0+ptykyxs5A6FEUQQF0MuilYXYBGdBxD3vxJcKnzDlhDCa1VAJCmAxed6mYhA2KaJIbtiNuQ==", "cpu": [ "arm64" ], @@ -4568,9 +3619,9 @@ } }, "node_modules/@esbuild/freebsd-x64": { - "version": "0.17.8", - "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.17.8.tgz", - "integrity": "sha512-xpFJb08dfXr5+rZc4E+ooZmayBW6R3q59daCpKZ/cDU96/kvDM+vkYzNeTJCGd8rtO6fHWMq5Rcv/1cY6p6/0Q==", + "version": "0.18.17", + "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.18.17.tgz", + "integrity": "sha512-sOxEvR8d7V7Kw8QqzxWc7bFfnWnGdaFBut1dRUYtu+EIRXefBc/eIsiUiShnW0hM3FmQ5Zf27suDuHsKgZ5QrA==", "cpu": [ "x64" ], @@ -4584,9 +3635,9 @@ } }, "node_modules/@esbuild/linux-arm": { - "version": "0.17.8", - "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.17.8.tgz", - "integrity": "sha512-6Ij8gfuGszcEwZpi5jQIJCVIACLS8Tz2chnEBfYjlmMzVsfqBP1iGmHQPp7JSnZg5xxK9tjCc+pJ2WtAmPRFVA==", + "version": "0.18.17", + "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.18.17.tgz", + "integrity": "sha512-2d3Lw6wkwgSLC2fIvXKoMNGVaeY8qdN0IC3rfuVxJp89CRfA3e3VqWifGDfuakPmp90+ZirmTfye1n4ncjv2lg==", "cpu": [ "arm" ], @@ -4600,9 +3651,9 @@ } }, "node_modules/@esbuild/linux-arm64": { - "version": "0.17.8", - "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.17.8.tgz", - "integrity": "sha512-v3iwDQuDljLTxpsqQDl3fl/yihjPAyOguxuloON9kFHYwopeJEf1BkDXODzYyXEI19gisEsQlG1bM65YqKSIww==", + "version": "0.18.17", + "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.18.17.tgz", + "integrity": "sha512-c9w3tE7qA3CYWjT+M3BMbwMt+0JYOp3vCMKgVBrCl1nwjAlOMYzEo+gG7QaZ9AtqZFj5MbUc885wuBBmu6aADQ==", "cpu": [ "arm64" ], @@ -4616,9 +3667,9 @@ } }, "node_modules/@esbuild/linux-ia32": { - "version": "0.17.8", - "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.17.8.tgz", - "integrity": "sha512-8svILYKhE5XetuFk/B6raFYIyIqydQi+GngEXJgdPdI7OMKUbSd7uzR02wSY4kb53xBrClLkhH4Xs8P61Q2BaA==", + "version": "0.18.17", + "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.18.17.tgz", + "integrity": "sha512-1DS9F966pn5pPnqXYz16dQqWIB0dmDfAQZd6jSSpiT9eX1NzKh07J6VKR3AoXXXEk6CqZMojiVDSZi1SlmKVdg==", "cpu": [ "ia32" ], @@ -4632,9 +3683,9 @@ } }, "node_modules/@esbuild/linux-loong64": { - "version": "0.17.8", - "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.17.8.tgz", - "integrity": "sha512-B6FyMeRJeV0NpyEOYlm5qtQfxbdlgmiGdD+QsipzKfFky0K5HW5Td6dyK3L3ypu1eY4kOmo7wW0o94SBqlqBSA==", + "version": "0.18.17", + "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.18.17.tgz", + "integrity": "sha512-EvLsxCk6ZF0fpCB6w6eOI2Fc8KW5N6sHlIovNe8uOFObL2O+Mr0bflPHyHwLT6rwMg9r77WOAWb2FqCQrVnwFg==", "cpu": [ "loong64" ], @@ -4648,9 +3699,9 @@ } }, "node_modules/@esbuild/linux-mips64el": { - "version": "0.17.8", - "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.17.8.tgz", - "integrity": "sha512-CCb67RKahNobjm/eeEqeD/oJfJlrWyw29fgiyB6vcgyq97YAf3gCOuP6qMShYSPXgnlZe/i4a8WFHBw6N8bYAA==", + "version": "0.18.17", + "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.18.17.tgz", + "integrity": "sha512-e0bIdHA5p6l+lwqTE36NAW5hHtw2tNRmHlGBygZC14QObsA3bD4C6sXLJjvnDIjSKhW1/0S3eDy+QmX/uZWEYQ==", "cpu": [ "mips64el" ], @@ -4664,9 +3715,9 @@ } }, "node_modules/@esbuild/linux-ppc64": { - "version": "0.17.8", - "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.17.8.tgz", - "integrity": "sha512-bytLJOi55y55+mGSdgwZ5qBm0K9WOCh0rx+vavVPx+gqLLhxtSFU0XbeYy/dsAAD6xECGEv4IQeFILaSS2auXw==", + "version": "0.18.17", + "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.18.17.tgz", + "integrity": "sha512-BAAilJ0M5O2uMxHYGjFKn4nJKF6fNCdP1E0o5t5fvMYYzeIqy2JdAP88Az5LHt9qBoUa4tDaRpfWt21ep5/WqQ==", "cpu": [ "ppc64" ], @@ -4680,9 +3731,9 @@ } }, "node_modules/@esbuild/linux-riscv64": { - "version": "0.17.8", - "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.17.8.tgz", - "integrity": "sha512-2YpRyQJmKVBEHSBLa8kBAtbhucaclb6ex4wchfY0Tj3Kg39kpjeJ9vhRU7x4mUpq8ISLXRXH1L0dBYjAeqzZAw==", + "version": "0.18.17", + "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.18.17.tgz", + "integrity": "sha512-Wh/HW2MPnC3b8BqRSIme/9Zhab36PPH+3zam5pqGRH4pE+4xTrVLx2+XdGp6fVS3L2x+DrsIcsbMleex8fbE6g==", "cpu": [ "riscv64" ], @@ -4696,9 +3747,9 @@ } }, "node_modules/@esbuild/linux-s390x": { - "version": "0.17.8", - "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.17.8.tgz", - "integrity": "sha512-QgbNY/V3IFXvNf11SS6exkpVcX0LJcob+0RWCgV9OiDAmVElnxciHIisoSix9uzYzScPmS6dJFbZULdSAEkQVw==", + "version": "0.18.17", + "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.18.17.tgz", + "integrity": "sha512-j/34jAl3ul3PNcK3pfI0NSlBANduT2UO5kZ7FCaK33XFv3chDhICLY8wJJWIhiQ+YNdQ9dxqQctRg2bvrMlYgg==", "cpu": [ "s390x" ], @@ -4712,9 +3763,9 @@ } }, "node_modules/@esbuild/linux-x64": { - "version": "0.17.8", - "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.17.8.tgz", - "integrity": "sha512-mM/9S0SbAFDBc4OPoyP6SEOo5324LpUxdpeIUUSrSTOfhHU9hEfqRngmKgqILqwx/0DVJBzeNW7HmLEWp9vcOA==", + "version": "0.18.17", + "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.18.17.tgz", + "integrity": "sha512-QM50vJ/y+8I60qEmFxMoxIx4de03pGo2HwxdBeFd4nMh364X6TIBZ6VQ5UQmPbQWUVWHWws5MmJXlHAXvJEmpQ==", "cpu": [ "x64" ], @@ -4728,9 +3779,9 @@ } }, "node_modules/@esbuild/netbsd-x64": { - "version": "0.17.8", - "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.17.8.tgz", - "integrity": "sha512-eKUYcWaWTaYr9zbj8GertdVtlt1DTS1gNBWov+iQfWuWyuu59YN6gSEJvFzC5ESJ4kMcKR0uqWThKUn5o8We6Q==", + "version": "0.18.17", + "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.18.17.tgz", + "integrity": "sha512-/jGlhWR7Sj9JPZHzXyyMZ1RFMkNPjC6QIAan0sDOtIo2TYk3tZn5UDrkE0XgsTQCxWTTOcMPf9p6Rh2hXtl5TQ==", "cpu": [ "x64" ], @@ -4744,9 +3795,9 @@ } }, "node_modules/@esbuild/openbsd-x64": { - "version": "0.17.8", - "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.17.8.tgz", - "integrity": "sha512-Vc9J4dXOboDyMXKD0eCeW0SIeEzr8K9oTHJU+Ci1mZc5njPfhKAqkRt3B/fUNU7dP+mRyralPu8QUkiaQn7iIg==", + "version": "0.18.17", + "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.18.17.tgz", + "integrity": "sha512-rSEeYaGgyGGf4qZM2NonMhMOP/5EHp4u9ehFiBrg7stH6BYEEjlkVREuDEcQ0LfIl53OXLxNbfuIj7mr5m29TA==", "cpu": [ "x64" ], @@ -4760,9 +3811,9 @@ } }, "node_modules/@esbuild/sunos-x64": { - "version": "0.17.8", - "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.17.8.tgz", - "integrity": "sha512-0xvOTNuPXI7ft1LYUgiaXtpCEjp90RuBBYovdd2lqAFxje4sEucurg30M1WIm03+3jxByd3mfo+VUmPtRSVuOw==", + "version": "0.18.17", + "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.18.17.tgz", + "integrity": "sha512-Y7ZBbkLqlSgn4+zot4KUNYst0bFoO68tRgI6mY2FIM+b7ZbyNVtNbDP5y8qlu4/knZZ73fgJDlXID+ohY5zt5g==", "cpu": [ "x64" ], @@ -4776,9 +3827,9 @@ } }, "node_modules/@esbuild/win32-arm64": { - "version": "0.17.8", - "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.17.8.tgz", - "integrity": "sha512-G0JQwUI5WdEFEnYNKzklxtBheCPkuDdu1YrtRrjuQv30WsYbkkoixKxLLv8qhJmNI+ATEWquZe/N0d0rpr55Mg==", + "version": "0.18.17", + "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.18.17.tgz", + "integrity": "sha512-bwPmTJsEQcbZk26oYpc4c/8PvTY3J5/QK8jM19DVlEsAB41M39aWovWoHtNm78sd6ip6prilxeHosPADXtEJFw==", "cpu": [ "arm64" ], @@ -4792,9 +3843,9 @@ } }, "node_modules/@esbuild/win32-ia32": { - "version": "0.17.8", - "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.17.8.tgz", - "integrity": "sha512-Fqy63515xl20OHGFykjJsMnoIWS+38fqfg88ClvPXyDbLtgXal2DTlhb1TfTX34qWi3u4I7Cq563QcHpqgLx8w==", + "version": "0.18.17", + "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.18.17.tgz", + "integrity": "sha512-H/XaPtPKli2MhW+3CQueo6Ni3Avggi6hP/YvgkEe1aSaxw+AeO8MFjq8DlgfTd9Iz4Yih3QCZI6YLMoyccnPRg==", "cpu": [ "ia32" ], @@ -4808,9 +3859,9 @@ } }, "node_modules/@esbuild/win32-x64": { - "version": "0.17.8", - "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.17.8.tgz", - "integrity": "sha512-1iuezdyDNngPnz8rLRDO2C/ZZ/emJLb72OsZeqQ6gL6Avko/XCXZw+NuxBSNhBAP13Hie418V7VMt9et1FMvpg==", + "version": "0.18.17", + "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.18.17.tgz", + "integrity": "sha512-fGEb8f2BSA3CW7riJVurug65ACLuQAzKq0SSqkY2b2yHHH0MzDfbLyKIGzHwOI/gkHcxM/leuSW6D5w/LMNitA==", "cpu": [ "x64" ], @@ -4839,23 +3890,23 @@ } }, "node_modules/@eslint-community/regexpp": { - "version": "4.5.0", - "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.5.0.tgz", - "integrity": "sha512-vITaYzIcNmjn5tF5uxcZ/ft7/RXGrMUIS9HalWckEOF6ESiwXKoMzAQf2UW0aVd6rnOeExTJVd5hmWXucBKGXQ==", + "version": "4.8.2", + "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.8.2.tgz", + "integrity": "sha512-0MGxAVt1m/ZK+LTJp/j0qF7Hz97D9O/FH9Ms3ltnyIdDD57cbb1ACIQTkbHvNXtWDv5TPq7w5Kq56+cNukbo7g==", "dev": true, "engines": { "node": "^12.0.0 || ^14.0.0 || >=16.0.0" } }, "node_modules/@eslint/eslintrc": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.0.2.tgz", - "integrity": "sha512-3W4f5tDUra+pA+FzgugqL2pRimUTDJWKr7BINqOpkZrC0uYI0NIc0/JFgBROCU07HR6GieA5m3/rsPIhDmCXTQ==", + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.1.2.tgz", + "integrity": "sha512-+wvgpDsrB1YqAMdEUCcnTlpfVBH7Vqn6A/NT3D8WVXFIaKMlErPIZT3oCIAVCOtarRpMtelZLqJeU3t7WY6X6g==", "dev": true, "dependencies": { "ajv": "^6.12.4", "debug": "^4.3.2", - "espree": "^9.5.1", + "espree": "^9.6.0", "globals": "^13.19.0", "ignore": "^5.2.0", "import-fresh": "^3.2.1", @@ -4893,9 +3944,9 @@ "dev": true }, "node_modules/@eslint/eslintrc/node_modules/globals": { - "version": "13.20.0", - "resolved": "https://registry.npmjs.org/globals/-/globals-13.20.0.tgz", - "integrity": "sha512-Qg5QtVkCy/kv3FUSlu4ukeZDVf9ee0iXLAUYX13gbR17bnejFTzr4iS9bY7kwCf1NztRNm1t91fjOiyx4CSwPQ==", + "version": "13.22.0", + "resolved": "https://registry.npmjs.org/globals/-/globals-13.22.0.tgz", + "integrity": "sha512-H1Ddc/PbZHTDVJSnj8kWptIRSD6AM3pK+mKytuIVF4uoBV7rshFlhhvA58ceJ5wp3Er58w6zj7bykMpYXt3ETw==", "dev": true, "dependencies": { "type-fest": "^0.20.2" @@ -4938,9 +3989,9 @@ } }, "node_modules/@eslint/js": { - "version": "8.39.0", - "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.39.0.tgz", - "integrity": "sha512-kf9RB0Fg7NZfap83B3QOqOGg9QmD9yBudqQXzzOtn3i4y7ZUXe5ONeW34Gwi+TxhH4mvj72R1Zc300KUMa9Bng==", + "version": "8.50.0", + "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.50.0.tgz", + "integrity": "sha512-NCC3zz2+nvYd+Ckfh87rA47zfu2QsQpvc6k1yzTk+b9KzRj0wkGa8LSoGOXN6Zv4lRf/EIoZ80biDh9HOI+RNQ==", "dev": true, "engines": { "node": "^12.22.0 || ^14.17.0 || >=16.0.0" @@ -4956,16 +4007,10 @@ "node": ">=6" } }, - "node_modules/@gar/promisify": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/@gar/promisify/-/promisify-1.1.3.tgz", - "integrity": "sha512-k2Ty1JcVojjJFwrg/ThKi2ujJ7XNLYaFGNB/bWT9wGR+oSMJHMa5w+CUq6p/pVrKeNNgA7pCqEcjSnHVoqJQFw==", - "dev": true - }, "node_modules/@humanwhocodes/config-array": { - "version": "0.11.8", - "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.8.tgz", - "integrity": "sha512-UybHIJzJnR5Qc/MsD9Kr+RpO2h+/P1GhOwdiLPXK5TWk5sgTdu88bTD9UP+CKbPPh5Rni1u0GjAdYQLemG8g+g==", + "version": "0.11.11", + "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.11.tgz", + "integrity": "sha512-N2brEuAadi0CcdeMXUkhbZB84eskAc8MEX1By6qEchoVywSgXPIjou4rYsl0V3Hj0ZnuGycGCjdNgockbzeWNA==", "dev": true, "dependencies": { "@humanwhocodes/object-schema": "^1.2.1", @@ -4995,6 +4040,90 @@ "integrity": "sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==", "dev": true }, + "node_modules/@isaacs/cliui": { + "version": "8.0.2", + "resolved": "https://registry.npmjs.org/@isaacs/cliui/-/cliui-8.0.2.tgz", + "integrity": "sha512-O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA==", + "dev": true, + "dependencies": { + "string-width": "^5.1.2", + "string-width-cjs": "npm:string-width@^4.2.0", + "strip-ansi": "^7.0.1", + "strip-ansi-cjs": "npm:strip-ansi@^6.0.1", + "wrap-ansi": "^8.1.0", + "wrap-ansi-cjs": "npm:wrap-ansi@^7.0.0" + }, + "engines": { + "node": ">=12" + } + }, + "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==", + "dev": true, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" + } + }, + "node_modules/@isaacs/cliui/node_modules/emoji-regex": { + "version": "9.2.2", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz", + "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==", + "dev": true + }, + "node_modules/@isaacs/cliui/node_modules/string-width": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-5.1.2.tgz", + "integrity": "sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==", + "dev": true, + "dependencies": { + "eastasianwidth": "^0.2.0", + "emoji-regex": "^9.2.2", + "strip-ansi": "^7.0.1" + }, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/@isaacs/cliui/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==", + "dev": true, + "dependencies": { + "ansi-regex": "^6.0.1" + }, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/chalk/strip-ansi?sponsor=1" + } + }, + "node_modules/@isaacs/cliui/node_modules/wrap-ansi": { + "version": "8.1.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-8.1.0.tgz", + "integrity": "sha512-si7QWI6zUMq56bESFvagtmzMdGOtoxfR+Sez11Mobfc7tm+VkUckk9bW2UeffTGVUbOksxmSw0AA2gs8g71NCQ==", + "dev": true, + "dependencies": { + "ansi-styles": "^6.1.0", + "string-width": "^5.0.1", + "strip-ansi": "^7.0.1" + }, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/chalk/wrap-ansi?sponsor=1" + } + }, "node_modules/@istanbuljs/load-nyc-config": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz", @@ -5021,13 +4150,14 @@ } }, "node_modules/@jridgewell/gen-mapping": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.1.1.tgz", - "integrity": "sha512-sQXCasFk+U8lWYEe66WxRDOE9PjVz4vSM51fTu3Hw+ClTpUSQb718772vH3pyS5pShp6lvQM7SxgIDXXXmOX7w==", + "version": "0.3.3", + "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.3.tgz", + "integrity": "sha512-HLhSWOLRi875zjjMG/r+Nv0oCW8umGb0BgEhyX3dDX3egwZtB8PqLnjz3yedt8R5StBrzcg4aBpnh8UA9D1BoQ==", "dev": true, "dependencies": { - "@jridgewell/set-array": "^1.0.0", - "@jridgewell/sourcemap-codec": "^1.4.10" + "@jridgewell/set-array": "^1.0.1", + "@jridgewell/sourcemap-codec": "^1.4.10", + "@jridgewell/trace-mapping": "^0.3.9" }, "engines": { "node": ">=6.0.0" @@ -5052,29 +4182,15 @@ } }, "node_modules/@jridgewell/source-map": { - "version": "0.3.2", - "resolved": "https://registry.npmjs.org/@jridgewell/source-map/-/source-map-0.3.2.tgz", - "integrity": "sha512-m7O9o2uR8k2ObDysZYzdfhb08VuEml5oWGiosa1VdaPZ/A6QyPkAJuwN0Q1lhULOf6B7MtQmHENS743hWtCrgw==", + "version": "0.3.5", + "resolved": "https://registry.npmjs.org/@jridgewell/source-map/-/source-map-0.3.5.tgz", + "integrity": "sha512-UTYAUj/wviwdsMfzoSJspJxbkH5o1snzwX0//0ENX1u/55kkZZkcTZP6u9bwKGkv+dkk9at4m1Cpt0uY80kcpQ==", "dev": true, "dependencies": { "@jridgewell/gen-mapping": "^0.3.0", "@jridgewell/trace-mapping": "^0.3.9" } }, - "node_modules/@jridgewell/source-map/node_modules/@jridgewell/gen-mapping": { - "version": "0.3.2", - "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.2.tgz", - "integrity": "sha512-mh65xKQAzI6iBcFzwv28KVWSmCkdRBWoOh+bYQGW3+6OZvbbN3TqMGo5hqYxQniRcH9F2VZIoJCm4pa3BPDK/A==", - "dev": true, - "dependencies": { - "@jridgewell/set-array": "^1.0.1", - "@jridgewell/sourcemap-codec": "^1.4.10", - "@jridgewell/trace-mapping": "^0.3.9" - }, - "engines": { - "node": ">=6.0.0" - } - }, "node_modules/@jridgewell/sourcemap-codec": { "version": "1.4.14", "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.14.tgz", @@ -5098,753 +4214,754 @@ "dev": true }, "node_modules/@material/animation": { - "version": "15.0.0-canary.684e33d25.0", - "resolved": "https://registry.npmjs.org/@material/animation/-/animation-15.0.0-canary.684e33d25.0.tgz", - "integrity": "sha512-5osi1z4JQIXcklPALbH/zTfOm2pDzHt9Fxm7ZyURy250xIZj6QjULRzPTnzOhC2ropfix9ra2Cfggbf0dcRbEQ==", + "version": "15.0.0-canary.b994146f6.0", + "resolved": "https://registry.npmjs.org/@material/animation/-/animation-15.0.0-canary.b994146f6.0.tgz", + "integrity": "sha512-kqqzG54tabYJ5VsBur5k1bqCFQCEpaW3hmLRMiSVVxRY7XgTt7qkuOOz48gs+MPqR6P8VIi6gFpuscV1+DWDhw==", "dependencies": { "tslib": "^2.1.0" } }, "node_modules/@material/auto-init": { - "version": "15.0.0-canary.684e33d25.0", - "resolved": "https://registry.npmjs.org/@material/auto-init/-/auto-init-15.0.0-canary.684e33d25.0.tgz", - "integrity": "sha512-OigQTmrVzkcGvxNjOaIe5oItTFPgrO9xLewvharDI6m6yvO1z7OBnkcW+sFN6ggLNYNxd0O1u9v64vMsmeDABQ==", + "version": "15.0.0-canary.b994146f6.0", + "resolved": "https://registry.npmjs.org/@material/auto-init/-/auto-init-15.0.0-canary.b994146f6.0.tgz", + "integrity": "sha512-8nLe/XeueJg5yyYx5e4UxWQXpTDyUhibKfyroGwnRKc8pdpOCOulHSOj/fIVGJAIbxkEJoebwMadWUNCjUhc9A==", "dependencies": { - "@material/base": "15.0.0-canary.684e33d25.0", + "@material/base": "15.0.0-canary.b994146f6.0", "tslib": "^2.1.0" } }, "node_modules/@material/banner": { - "version": "15.0.0-canary.684e33d25.0", - "resolved": "https://registry.npmjs.org/@material/banner/-/banner-15.0.0-canary.684e33d25.0.tgz", - "integrity": "sha512-PqtGp3KWzdu58rWv/DIvSfe38m5YKOBbAAbBinSvgadBb/da+IE1t5F7YPNKE1T5lJsQBGVUYx6QBIeXm+aI/A==", + "version": "15.0.0-canary.b994146f6.0", + "resolved": "https://registry.npmjs.org/@material/banner/-/banner-15.0.0-canary.b994146f6.0.tgz", + "integrity": "sha512-gJ4/VdP4dJgHP72Kdjy2f/UjHB45J4CuxoGvI0NIQYUjOSsr4kQiQHsjVgyEPZR/5wa7kBhM7/0mJ+zF7Ghv2A==", "dependencies": { - "@material/base": "15.0.0-canary.684e33d25.0", - "@material/button": "15.0.0-canary.684e33d25.0", - "@material/dom": "15.0.0-canary.684e33d25.0", - "@material/elevation": "15.0.0-canary.684e33d25.0", - "@material/feature-targeting": "15.0.0-canary.684e33d25.0", - "@material/ripple": "15.0.0-canary.684e33d25.0", - "@material/rtl": "15.0.0-canary.684e33d25.0", - "@material/shape": "15.0.0-canary.684e33d25.0", - "@material/theme": "15.0.0-canary.684e33d25.0", - "@material/tokens": "15.0.0-canary.684e33d25.0", - "@material/typography": "15.0.0-canary.684e33d25.0", + "@material/base": "15.0.0-canary.b994146f6.0", + "@material/button": "15.0.0-canary.b994146f6.0", + "@material/dom": "15.0.0-canary.b994146f6.0", + "@material/elevation": "15.0.0-canary.b994146f6.0", + "@material/feature-targeting": "15.0.0-canary.b994146f6.0", + "@material/ripple": "15.0.0-canary.b994146f6.0", + "@material/rtl": "15.0.0-canary.b994146f6.0", + "@material/shape": "15.0.0-canary.b994146f6.0", + "@material/theme": "15.0.0-canary.b994146f6.0", + "@material/tokens": "15.0.0-canary.b994146f6.0", + "@material/typography": "15.0.0-canary.b994146f6.0", "tslib": "^2.1.0" } }, "node_modules/@material/base": { - "version": "15.0.0-canary.684e33d25.0", - "resolved": "https://registry.npmjs.org/@material/base/-/base-15.0.0-canary.684e33d25.0.tgz", - "integrity": "sha512-oOaqb/SfjWwTKsdJUZmeh/Qrs41nIJI0N+zELsxnvbGjSIN1ZMAKYZFPMahqvC68OJ6+5CvJM8PoTNs5l+B8IQ==", + "version": "15.0.0-canary.b994146f6.0", + "resolved": "https://registry.npmjs.org/@material/base/-/base-15.0.0-canary.b994146f6.0.tgz", + "integrity": "sha512-rW2upYD5YjRFBL6DzYn3SCRhtvpEDkwplDS810e3vt71uLMRyqXyw4OQJH+Nab/t+32TFDtKNUphXIzwICXGDQ==", "dependencies": { "tslib": "^2.1.0" } }, "node_modules/@material/button": { - "version": "15.0.0-canary.684e33d25.0", - "resolved": "https://registry.npmjs.org/@material/button/-/button-15.0.0-canary.684e33d25.0.tgz", - "integrity": "sha512-Nkekk4edeX+ObVOa7UlwavaHdmckPV5wU4SAJf3iA3R61cmz+KsgAgpzfcwv5WfNhIlc2nLu8QYEecpHdo9d/w==", + "version": "15.0.0-canary.b994146f6.0", + "resolved": "https://registry.npmjs.org/@material/button/-/button-15.0.0-canary.b994146f6.0.tgz", + "integrity": "sha512-SMyqtsvJuCqpXBz2JgciuR6wddNJSGpTXUFxmLbGluBy5/hHm06JWlOFcUOxGDv46OdRGGrRfkg6A9JtvtsJsw==", "dependencies": { - "@material/density": "15.0.0-canary.684e33d25.0", - "@material/dom": "15.0.0-canary.684e33d25.0", - "@material/elevation": "15.0.0-canary.684e33d25.0", - "@material/feature-targeting": "15.0.0-canary.684e33d25.0", - "@material/focus-ring": "15.0.0-canary.684e33d25.0", - "@material/ripple": "15.0.0-canary.684e33d25.0", - "@material/rtl": "15.0.0-canary.684e33d25.0", - "@material/shape": "15.0.0-canary.684e33d25.0", - "@material/theme": "15.0.0-canary.684e33d25.0", - "@material/tokens": "15.0.0-canary.684e33d25.0", - "@material/touch-target": "15.0.0-canary.684e33d25.0", - "@material/typography": "15.0.0-canary.684e33d25.0", + "@material/density": "15.0.0-canary.b994146f6.0", + "@material/dom": "15.0.0-canary.b994146f6.0", + "@material/elevation": "15.0.0-canary.b994146f6.0", + "@material/feature-targeting": "15.0.0-canary.b994146f6.0", + "@material/focus-ring": "15.0.0-canary.b994146f6.0", + "@material/ripple": "15.0.0-canary.b994146f6.0", + "@material/rtl": "15.0.0-canary.b994146f6.0", + "@material/shape": "15.0.0-canary.b994146f6.0", + "@material/theme": "15.0.0-canary.b994146f6.0", + "@material/tokens": "15.0.0-canary.b994146f6.0", + "@material/touch-target": "15.0.0-canary.b994146f6.0", + "@material/typography": "15.0.0-canary.b994146f6.0", "tslib": "^2.1.0" } }, "node_modules/@material/card": { - "version": "15.0.0-canary.684e33d25.0", - "resolved": "https://registry.npmjs.org/@material/card/-/card-15.0.0-canary.684e33d25.0.tgz", - "integrity": "sha512-xhyB7XX5KkEiCEqwSPkl58ZGYL6xFdnY62zimyBXJRG/Eaa0Swj3kW20hVCpt4f7c9Zmp8Se27rg8vnKmhvO3g==", + "version": "15.0.0-canary.b994146f6.0", + "resolved": "https://registry.npmjs.org/@material/card/-/card-15.0.0-canary.b994146f6.0.tgz", + "integrity": "sha512-WSggGon91HcDhJyatnYLFkoM9glkkeJjyjFDWrcJkwN1rdrPJU+GH+PNjvmArz5hGv9WkmjDjhOdAuPnL4Mb7g==", "dependencies": { - "@material/dom": "15.0.0-canary.684e33d25.0", - "@material/elevation": "15.0.0-canary.684e33d25.0", - "@material/feature-targeting": "15.0.0-canary.684e33d25.0", - "@material/ripple": "15.0.0-canary.684e33d25.0", - "@material/rtl": "15.0.0-canary.684e33d25.0", - "@material/shape": "15.0.0-canary.684e33d25.0", - "@material/theme": "15.0.0-canary.684e33d25.0", - "@material/tokens": "15.0.0-canary.684e33d25.0", + "@material/dom": "15.0.0-canary.b994146f6.0", + "@material/elevation": "15.0.0-canary.b994146f6.0", + "@material/feature-targeting": "15.0.0-canary.b994146f6.0", + "@material/ripple": "15.0.0-canary.b994146f6.0", + "@material/rtl": "15.0.0-canary.b994146f6.0", + "@material/shape": "15.0.0-canary.b994146f6.0", + "@material/theme": "15.0.0-canary.b994146f6.0", + "@material/tokens": "15.0.0-canary.b994146f6.0", "tslib": "^2.1.0" } }, "node_modules/@material/checkbox": { - "version": "15.0.0-canary.684e33d25.0", - "resolved": "https://registry.npmjs.org/@material/checkbox/-/checkbox-15.0.0-canary.684e33d25.0.tgz", - "integrity": "sha512-NFpM3TS924PmVsk2KQLNU95OYCf8ZwYgzeqfnAexU0bEfjUJXINBun2Go0AaeOUMjuvWUe+byjrXgv8SFYbMUA==", + "version": "15.0.0-canary.b994146f6.0", + "resolved": "https://registry.npmjs.org/@material/checkbox/-/checkbox-15.0.0-canary.b994146f6.0.tgz", + "integrity": "sha512-pulRiwG9S/dS6WBG+GteODBltddFiL0Sb7HAqdzF2BTKNKv25q1ZIR3ftoEa09TNeWM88AOzTJ4aBHiADfJn2w==", "dependencies": { - "@material/animation": "15.0.0-canary.684e33d25.0", - "@material/base": "15.0.0-canary.684e33d25.0", - "@material/density": "15.0.0-canary.684e33d25.0", - "@material/dom": "15.0.0-canary.684e33d25.0", - "@material/feature-targeting": "15.0.0-canary.684e33d25.0", - "@material/focus-ring": "15.0.0-canary.684e33d25.0", - "@material/ripple": "15.0.0-canary.684e33d25.0", - "@material/theme": "15.0.0-canary.684e33d25.0", - "@material/touch-target": "15.0.0-canary.684e33d25.0", + "@material/animation": "15.0.0-canary.b994146f6.0", + "@material/base": "15.0.0-canary.b994146f6.0", + "@material/density": "15.0.0-canary.b994146f6.0", + "@material/dom": "15.0.0-canary.b994146f6.0", + "@material/feature-targeting": "15.0.0-canary.b994146f6.0", + "@material/focus-ring": "15.0.0-canary.b994146f6.0", + "@material/ripple": "15.0.0-canary.b994146f6.0", + "@material/rtl": "15.0.0-canary.b994146f6.0", + "@material/theme": "15.0.0-canary.b994146f6.0", + "@material/touch-target": "15.0.0-canary.b994146f6.0", "tslib": "^2.1.0" } }, "node_modules/@material/chips": { - "version": "15.0.0-canary.684e33d25.0", - "resolved": "https://registry.npmjs.org/@material/chips/-/chips-15.0.0-canary.684e33d25.0.tgz", - "integrity": "sha512-z4ajQ4NnsAQ/Si9tZ4xmxzjj2Qb+vW++4QjCjjjwAGIZbCe0xglAnMh2t66XLJUxt7RoKZuZVEO7ZqcFZpvJFQ==", + "version": "15.0.0-canary.b994146f6.0", + "resolved": "https://registry.npmjs.org/@material/chips/-/chips-15.0.0-canary.b994146f6.0.tgz", + "integrity": "sha512-3yJPj7x+eKLA4LMKG7aTWI+itAnKRVGOcniuR6aiXVy0OKr5asNuWNeZc9J0/VErjjxF3tdybDzDSPo01qPy9w==", "dependencies": { - "@material/animation": "15.0.0-canary.684e33d25.0", - "@material/base": "15.0.0-canary.684e33d25.0", - "@material/checkbox": "15.0.0-canary.684e33d25.0", - "@material/density": "15.0.0-canary.684e33d25.0", - "@material/dom": "15.0.0-canary.684e33d25.0", - "@material/elevation": "15.0.0-canary.684e33d25.0", - "@material/feature-targeting": "15.0.0-canary.684e33d25.0", - "@material/focus-ring": "15.0.0-canary.684e33d25.0", - "@material/ripple": "15.0.0-canary.684e33d25.0", - "@material/rtl": "15.0.0-canary.684e33d25.0", - "@material/shape": "15.0.0-canary.684e33d25.0", - "@material/theme": "15.0.0-canary.684e33d25.0", - "@material/tokens": "15.0.0-canary.684e33d25.0", - "@material/touch-target": "15.0.0-canary.684e33d25.0", - "@material/typography": "15.0.0-canary.684e33d25.0", + "@material/animation": "15.0.0-canary.b994146f6.0", + "@material/base": "15.0.0-canary.b994146f6.0", + "@material/checkbox": "15.0.0-canary.b994146f6.0", + "@material/density": "15.0.0-canary.b994146f6.0", + "@material/dom": "15.0.0-canary.b994146f6.0", + "@material/elevation": "15.0.0-canary.b994146f6.0", + "@material/feature-targeting": "15.0.0-canary.b994146f6.0", + "@material/focus-ring": "15.0.0-canary.b994146f6.0", + "@material/ripple": "15.0.0-canary.b994146f6.0", + "@material/rtl": "15.0.0-canary.b994146f6.0", + "@material/shape": "15.0.0-canary.b994146f6.0", + "@material/theme": "15.0.0-canary.b994146f6.0", + "@material/tokens": "15.0.0-canary.b994146f6.0", + "@material/touch-target": "15.0.0-canary.b994146f6.0", + "@material/typography": "15.0.0-canary.b994146f6.0", "safevalues": "^0.3.4", "tslib": "^2.1.0" } }, "node_modules/@material/circular-progress": { - "version": "15.0.0-canary.684e33d25.0", - "resolved": "https://registry.npmjs.org/@material/circular-progress/-/circular-progress-15.0.0-canary.684e33d25.0.tgz", - "integrity": "sha512-G6qD0nGNtEUwWnAMJuA9INYFpZoKtx7KFjBaPF4Ol2YLHtmShALNAYyn54TMAK8AZ2IpW08PXjGS7Ye88vrdEQ==", + "version": "15.0.0-canary.b994146f6.0", + "resolved": "https://registry.npmjs.org/@material/circular-progress/-/circular-progress-15.0.0-canary.b994146f6.0.tgz", + "integrity": "sha512-6YUvGXdtZKJoE7AuovR4xk1aiWp/EDZ6j2U3TOeynd1assQQCg5XT4abqAoHtpJrRPaCFgUAp836HyiDVVuYug==", "dependencies": { - "@material/animation": "15.0.0-canary.684e33d25.0", - "@material/base": "15.0.0-canary.684e33d25.0", - "@material/dom": "15.0.0-canary.684e33d25.0", - "@material/feature-targeting": "15.0.0-canary.684e33d25.0", - "@material/progress-indicator": "15.0.0-canary.684e33d25.0", - "@material/rtl": "15.0.0-canary.684e33d25.0", - "@material/theme": "15.0.0-canary.684e33d25.0", + "@material/animation": "15.0.0-canary.b994146f6.0", + "@material/base": "15.0.0-canary.b994146f6.0", + "@material/dom": "15.0.0-canary.b994146f6.0", + "@material/feature-targeting": "15.0.0-canary.b994146f6.0", + "@material/progress-indicator": "15.0.0-canary.b994146f6.0", + "@material/rtl": "15.0.0-canary.b994146f6.0", + "@material/theme": "15.0.0-canary.b994146f6.0", "tslib": "^2.1.0" } }, "node_modules/@material/data-table": { - "version": "15.0.0-canary.684e33d25.0", - "resolved": "https://registry.npmjs.org/@material/data-table/-/data-table-15.0.0-canary.684e33d25.0.tgz", - "integrity": "sha512-+wDw1DDDFfAsKAMzs84f/5GCjux39zjNfW8tL4wFbkWNwewmQrG9zaQMJhBpVOtLCrM8Gj6SOgOANqgqoCjvGg==", + "version": "15.0.0-canary.b994146f6.0", + "resolved": "https://registry.npmjs.org/@material/data-table/-/data-table-15.0.0-canary.b994146f6.0.tgz", + "integrity": "sha512-v4hIduIe/wzyibuL/RPM/ErYrt8XpB7fxyQqtV+0JsMpFa8E81QYyvMCS9EJj9m4YdkrQnZgA+vXQlOkhWvmdQ==", "dependencies": { - "@material/animation": "15.0.0-canary.684e33d25.0", - "@material/base": "15.0.0-canary.684e33d25.0", - "@material/checkbox": "15.0.0-canary.684e33d25.0", - "@material/density": "15.0.0-canary.684e33d25.0", - "@material/dom": "15.0.0-canary.684e33d25.0", - "@material/elevation": "15.0.0-canary.684e33d25.0", - "@material/feature-targeting": "15.0.0-canary.684e33d25.0", - "@material/icon-button": "15.0.0-canary.684e33d25.0", - "@material/linear-progress": "15.0.0-canary.684e33d25.0", - "@material/list": "15.0.0-canary.684e33d25.0", - "@material/menu": "15.0.0-canary.684e33d25.0", - "@material/rtl": "15.0.0-canary.684e33d25.0", - "@material/select": "15.0.0-canary.684e33d25.0", - "@material/shape": "15.0.0-canary.684e33d25.0", - "@material/theme": "15.0.0-canary.684e33d25.0", - "@material/tokens": "15.0.0-canary.684e33d25.0", - "@material/touch-target": "15.0.0-canary.684e33d25.0", - "@material/typography": "15.0.0-canary.684e33d25.0", + "@material/animation": "15.0.0-canary.b994146f6.0", + "@material/base": "15.0.0-canary.b994146f6.0", + "@material/checkbox": "15.0.0-canary.b994146f6.0", + "@material/density": "15.0.0-canary.b994146f6.0", + "@material/dom": "15.0.0-canary.b994146f6.0", + "@material/elevation": "15.0.0-canary.b994146f6.0", + "@material/feature-targeting": "15.0.0-canary.b994146f6.0", + "@material/icon-button": "15.0.0-canary.b994146f6.0", + "@material/linear-progress": "15.0.0-canary.b994146f6.0", + "@material/list": "15.0.0-canary.b994146f6.0", + "@material/menu": "15.0.0-canary.b994146f6.0", + "@material/rtl": "15.0.0-canary.b994146f6.0", + "@material/select": "15.0.0-canary.b994146f6.0", + "@material/shape": "15.0.0-canary.b994146f6.0", + "@material/theme": "15.0.0-canary.b994146f6.0", + "@material/tokens": "15.0.0-canary.b994146f6.0", + "@material/touch-target": "15.0.0-canary.b994146f6.0", + "@material/typography": "15.0.0-canary.b994146f6.0", "tslib": "^2.1.0" } }, "node_modules/@material/density": { - "version": "15.0.0-canary.684e33d25.0", - "resolved": "https://registry.npmjs.org/@material/density/-/density-15.0.0-canary.684e33d25.0.tgz", - "integrity": "sha512-661yEVRMGrlq6S6WuSbPRO+ZwpdUOg2glCc7y96doM6itSLOa3UEAldjOLfsYZVB74GnKCiuDp//QmfoRyYTfA==", + "version": "15.0.0-canary.b994146f6.0", + "resolved": "https://registry.npmjs.org/@material/density/-/density-15.0.0-canary.b994146f6.0.tgz", + "integrity": "sha512-m8l0vuoWSoAPItBpWp5eZDvitUcB2JWoO8V486hLgdveVcKgXG09xWM43ScH+PLXAWjzr5olDEuJ2tvfkN3SpQ==", "dependencies": { "tslib": "^2.1.0" } }, "node_modules/@material/dialog": { - "version": "15.0.0-canary.684e33d25.0", - "resolved": "https://registry.npmjs.org/@material/dialog/-/dialog-15.0.0-canary.684e33d25.0.tgz", - "integrity": "sha512-szn0dHnfeQTSOC6SSRSGAzX6Tnx+4NnSMUwNkXm+3bwjds8ZVK26+DXwLrP5f3ID5F1K5sFsRf2INo5/TNTHyQ==", + "version": "15.0.0-canary.b994146f6.0", + "resolved": "https://registry.npmjs.org/@material/dialog/-/dialog-15.0.0-canary.b994146f6.0.tgz", + "integrity": "sha512-JucU92yh8cfZQpyRBunHr6uohacePLYmhcPaGpkAGQ1b+zCznEsNs55tjhaVQNoj91XA9rrBqtL6Otg+fxFJtQ==", "dependencies": { - "@material/animation": "15.0.0-canary.684e33d25.0", - "@material/base": "15.0.0-canary.684e33d25.0", - "@material/button": "15.0.0-canary.684e33d25.0", - "@material/dom": "15.0.0-canary.684e33d25.0", - "@material/elevation": "15.0.0-canary.684e33d25.0", - "@material/feature-targeting": "15.0.0-canary.684e33d25.0", - "@material/icon-button": "15.0.0-canary.684e33d25.0", - "@material/ripple": "15.0.0-canary.684e33d25.0", - "@material/rtl": "15.0.0-canary.684e33d25.0", - "@material/shape": "15.0.0-canary.684e33d25.0", - "@material/theme": "15.0.0-canary.684e33d25.0", - "@material/tokens": "15.0.0-canary.684e33d25.0", - "@material/touch-target": "15.0.0-canary.684e33d25.0", - "@material/typography": "15.0.0-canary.684e33d25.0", + "@material/animation": "15.0.0-canary.b994146f6.0", + "@material/base": "15.0.0-canary.b994146f6.0", + "@material/button": "15.0.0-canary.b994146f6.0", + "@material/dom": "15.0.0-canary.b994146f6.0", + "@material/elevation": "15.0.0-canary.b994146f6.0", + "@material/feature-targeting": "15.0.0-canary.b994146f6.0", + "@material/icon-button": "15.0.0-canary.b994146f6.0", + "@material/ripple": "15.0.0-canary.b994146f6.0", + "@material/rtl": "15.0.0-canary.b994146f6.0", + "@material/shape": "15.0.0-canary.b994146f6.0", + "@material/theme": "15.0.0-canary.b994146f6.0", + "@material/tokens": "15.0.0-canary.b994146f6.0", + "@material/touch-target": "15.0.0-canary.b994146f6.0", + "@material/typography": "15.0.0-canary.b994146f6.0", "tslib": "^2.1.0" } }, "node_modules/@material/dom": { - "version": "15.0.0-canary.684e33d25.0", - "resolved": "https://registry.npmjs.org/@material/dom/-/dom-15.0.0-canary.684e33d25.0.tgz", - "integrity": "sha512-7pEJLYov+tGgfuD8mZxoVU6rWtPI8ppjTAhz+F27Hz9FG0JETMWTKpDPBXLnKvX7vhIxL83GvZ9geNHCe8Hfog==", + "version": "15.0.0-canary.b994146f6.0", + "resolved": "https://registry.npmjs.org/@material/dom/-/dom-15.0.0-canary.b994146f6.0.tgz", + "integrity": "sha512-DiUsTezrCi4iytjIn7xXoXZSNFvuTrVVZgc7cR9cW8yu2Hpz8bPf87PacVn4IP9OsNwy/dCDMk1Kcq/DMh7gXQ==", "dependencies": { - "@material/feature-targeting": "15.0.0-canary.684e33d25.0", - "@material/rtl": "15.0.0-canary.684e33d25.0", + "@material/feature-targeting": "15.0.0-canary.b994146f6.0", + "@material/rtl": "15.0.0-canary.b994146f6.0", "tslib": "^2.1.0" } }, "node_modules/@material/drawer": { - "version": "15.0.0-canary.684e33d25.0", - "resolved": "https://registry.npmjs.org/@material/drawer/-/drawer-15.0.0-canary.684e33d25.0.tgz", - "integrity": "sha512-/KMckLf1PYU/H3PXnS4e0aFl03qG3JlSv4LGgX6juJufcONqGTl/m63EMO/L/eUy6H1CRrXmVDjik/jzHLyDhg==", + "version": "15.0.0-canary.b994146f6.0", + "resolved": "https://registry.npmjs.org/@material/drawer/-/drawer-15.0.0-canary.b994146f6.0.tgz", + "integrity": "sha512-Kbuf32V0eX69amvCVbAjNSabNDerZWyG8ip466EfQHRh0OUZwvsbhLp9FZOB7AyR+/bQiHf3mVLcombOdmdkcQ==", "dependencies": { - "@material/animation": "15.0.0-canary.684e33d25.0", - "@material/base": "15.0.0-canary.684e33d25.0", - "@material/dom": "15.0.0-canary.684e33d25.0", - "@material/elevation": "15.0.0-canary.684e33d25.0", - "@material/feature-targeting": "15.0.0-canary.684e33d25.0", - "@material/list": "15.0.0-canary.684e33d25.0", - "@material/ripple": "15.0.0-canary.684e33d25.0", - "@material/rtl": "15.0.0-canary.684e33d25.0", - "@material/shape": "15.0.0-canary.684e33d25.0", - "@material/theme": "15.0.0-canary.684e33d25.0", - "@material/typography": "15.0.0-canary.684e33d25.0", + "@material/animation": "15.0.0-canary.b994146f6.0", + "@material/base": "15.0.0-canary.b994146f6.0", + "@material/dom": "15.0.0-canary.b994146f6.0", + "@material/elevation": "15.0.0-canary.b994146f6.0", + "@material/feature-targeting": "15.0.0-canary.b994146f6.0", + "@material/list": "15.0.0-canary.b994146f6.0", + "@material/ripple": "15.0.0-canary.b994146f6.0", + "@material/rtl": "15.0.0-canary.b994146f6.0", + "@material/shape": "15.0.0-canary.b994146f6.0", + "@material/theme": "15.0.0-canary.b994146f6.0", + "@material/typography": "15.0.0-canary.b994146f6.0", "tslib": "^2.1.0" } }, "node_modules/@material/elevation": { - "version": "15.0.0-canary.684e33d25.0", - "resolved": "https://registry.npmjs.org/@material/elevation/-/elevation-15.0.0-canary.684e33d25.0.tgz", - "integrity": "sha512-WDF8SsRtq3rXUbVVbd9K4DUijIPH0bUFSOreVYxudpuxAfTlDS5+aeS1EK9UIBFYLuba4u5wVT2tDv6e1RTfrQ==", + "version": "15.0.0-canary.b994146f6.0", + "resolved": "https://registry.npmjs.org/@material/elevation/-/elevation-15.0.0-canary.b994146f6.0.tgz", + "integrity": "sha512-l2YDNgBajSI6oA2l6gaeYCTGHRao657syqQ/tv95/Hkcee9900A4RrsxCwSxOqqAs5pZZDEJ33kFJjj27nqZDw==", "dependencies": { - "@material/animation": "15.0.0-canary.684e33d25.0", - "@material/base": "15.0.0-canary.684e33d25.0", - "@material/feature-targeting": "15.0.0-canary.684e33d25.0", - "@material/rtl": "15.0.0-canary.684e33d25.0", - "@material/theme": "15.0.0-canary.684e33d25.0", + "@material/animation": "15.0.0-canary.b994146f6.0", + "@material/base": "15.0.0-canary.b994146f6.0", + "@material/feature-targeting": "15.0.0-canary.b994146f6.0", + "@material/rtl": "15.0.0-canary.b994146f6.0", + "@material/theme": "15.0.0-canary.b994146f6.0", "tslib": "^2.1.0" } }, "node_modules/@material/fab": { - "version": "15.0.0-canary.684e33d25.0", - "resolved": "https://registry.npmjs.org/@material/fab/-/fab-15.0.0-canary.684e33d25.0.tgz", - "integrity": "sha512-KCu87rWOKEAe9vZcAm6K8XazYSWPNjMG+OhrbPjHW6bCO7as1YCgtmkBkhff7csY/rFmcVpIy884xtUfLmSudQ==", + "version": "15.0.0-canary.b994146f6.0", + "resolved": "https://registry.npmjs.org/@material/fab/-/fab-15.0.0-canary.b994146f6.0.tgz", + "integrity": "sha512-ExyDVkNWINpns41Ahj4u8I/OhiVkqI0nmcqjFRtgTJMmKEd4NhlvqIxE7gakAlyS68riJu5UleqTSTVmt8mv2Q==", "dependencies": { - "@material/animation": "15.0.0-canary.684e33d25.0", - "@material/dom": "15.0.0-canary.684e33d25.0", - "@material/elevation": "15.0.0-canary.684e33d25.0", - "@material/feature-targeting": "15.0.0-canary.684e33d25.0", - "@material/focus-ring": "15.0.0-canary.684e33d25.0", - "@material/ripple": "15.0.0-canary.684e33d25.0", - "@material/rtl": "15.0.0-canary.684e33d25.0", - "@material/shape": "15.0.0-canary.684e33d25.0", - "@material/theme": "15.0.0-canary.684e33d25.0", - "@material/tokens": "15.0.0-canary.684e33d25.0", - "@material/touch-target": "15.0.0-canary.684e33d25.0", - "@material/typography": "15.0.0-canary.684e33d25.0", + "@material/animation": "15.0.0-canary.b994146f6.0", + "@material/dom": "15.0.0-canary.b994146f6.0", + "@material/elevation": "15.0.0-canary.b994146f6.0", + "@material/feature-targeting": "15.0.0-canary.b994146f6.0", + "@material/focus-ring": "15.0.0-canary.b994146f6.0", + "@material/ripple": "15.0.0-canary.b994146f6.0", + "@material/rtl": "15.0.0-canary.b994146f6.0", + "@material/shape": "15.0.0-canary.b994146f6.0", + "@material/theme": "15.0.0-canary.b994146f6.0", + "@material/tokens": "15.0.0-canary.b994146f6.0", + "@material/touch-target": "15.0.0-canary.b994146f6.0", + "@material/typography": "15.0.0-canary.b994146f6.0", "tslib": "^2.1.0" } }, "node_modules/@material/feature-targeting": { - "version": "15.0.0-canary.684e33d25.0", - "resolved": "https://registry.npmjs.org/@material/feature-targeting/-/feature-targeting-15.0.0-canary.684e33d25.0.tgz", - "integrity": "sha512-HyH1erNTSjS63sigNSUMaCd0nJhTNdDFeC+myrxwtDaQm+uYJ8troCNtQM3g6mx0XATNtX5aTOoPmrM6yVVi1A==", + "version": "15.0.0-canary.b994146f6.0", + "resolved": "https://registry.npmjs.org/@material/feature-targeting/-/feature-targeting-15.0.0-canary.b994146f6.0.tgz", + "integrity": "sha512-HR/FjSQmza98B1DF80MRjODyfOI9r7wXkPSts/cLQsYkpwZ5uJmxhvQKjDCeYVpMV0lQuvuvVOQo7uD44TdWEg==", "dependencies": { "tslib": "^2.1.0" } }, "node_modules/@material/floating-label": { - "version": "15.0.0-canary.684e33d25.0", - "resolved": "https://registry.npmjs.org/@material/floating-label/-/floating-label-15.0.0-canary.684e33d25.0.tgz", - "integrity": "sha512-f7TPp6bKpGvV3sYYiZHSGlrixXKkXXITW3Esp7KB9jRq42c0H82novmdwvY0eTef4ootmA2JEysr78KQfHBUPg==", + "version": "15.0.0-canary.b994146f6.0", + "resolved": "https://registry.npmjs.org/@material/floating-label/-/floating-label-15.0.0-canary.b994146f6.0.tgz", + "integrity": "sha512-g64talBNWCS0FUfLWal0uB637gUciSIqYxFzSW//LglTtbZLGK2J4+9gAEswQGnKeO4ux08EN2n1ZcMDYQ58ow==", "dependencies": { - "@material/animation": "15.0.0-canary.684e33d25.0", - "@material/base": "15.0.0-canary.684e33d25.0", - "@material/dom": "15.0.0-canary.684e33d25.0", - "@material/feature-targeting": "15.0.0-canary.684e33d25.0", - "@material/rtl": "15.0.0-canary.684e33d25.0", - "@material/theme": "15.0.0-canary.684e33d25.0", - "@material/typography": "15.0.0-canary.684e33d25.0", + "@material/animation": "15.0.0-canary.b994146f6.0", + "@material/base": "15.0.0-canary.b994146f6.0", + "@material/dom": "15.0.0-canary.b994146f6.0", + "@material/feature-targeting": "15.0.0-canary.b994146f6.0", + "@material/rtl": "15.0.0-canary.b994146f6.0", + "@material/theme": "15.0.0-canary.b994146f6.0", + "@material/typography": "15.0.0-canary.b994146f6.0", "tslib": "^2.1.0" } }, "node_modules/@material/focus-ring": { - "version": "15.0.0-canary.684e33d25.0", - "resolved": "https://registry.npmjs.org/@material/focus-ring/-/focus-ring-15.0.0-canary.684e33d25.0.tgz", - "integrity": "sha512-ikw2RVUfgzXChpWIzPH1VzRvTjYb5ZKj4H+CZf7jqPUXMstFOZg90Bp7ARLZHqYiyNMuUq3zUTHozS6iHorSqg==", + "version": "15.0.0-canary.b994146f6.0", + "resolved": "https://registry.npmjs.org/@material/focus-ring/-/focus-ring-15.0.0-canary.b994146f6.0.tgz", + "integrity": "sha512-87qEMuXsCvlQfTiimnzJUZoebnIXWcMtRZevNLymN9Y0t9jGckQxZPmrI0llRkpyiR/Ewhec5SI/JGrFlYHnsA==", "dependencies": { - "@material/dom": "15.0.0-canary.684e33d25.0", - "@material/feature-targeting": "15.0.0-canary.684e33d25.0", - "@material/rtl": "15.0.0-canary.684e33d25.0" + "@material/dom": "15.0.0-canary.b994146f6.0", + "@material/feature-targeting": "15.0.0-canary.b994146f6.0", + "@material/rtl": "15.0.0-canary.b994146f6.0" } }, "node_modules/@material/form-field": { - "version": "15.0.0-canary.684e33d25.0", - "resolved": "https://registry.npmjs.org/@material/form-field/-/form-field-15.0.0-canary.684e33d25.0.tgz", - "integrity": "sha512-vpF9N/uq5no/7+8GAbEH0868FhOuBgxAWRr1Sfb+jthKfBr8OS/wPU/AHzZHdHdAm7PQynbeOXfDsX2dI//PDA==", + "version": "15.0.0-canary.b994146f6.0", + "resolved": "https://registry.npmjs.org/@material/form-field/-/form-field-15.0.0-canary.b994146f6.0.tgz", + "integrity": "sha512-Tg1SQQaopvXMyDEYxGTWnhCWQmNcWVIoKMLmle9P/gi2p8ulcj0iOCPYf+3ECqUBVozOmTPKlYOOiRwtKStAeA==", "dependencies": { - "@material/base": "15.0.0-canary.684e33d25.0", - "@material/feature-targeting": "15.0.0-canary.684e33d25.0", - "@material/ripple": "15.0.0-canary.684e33d25.0", - "@material/rtl": "15.0.0-canary.684e33d25.0", - "@material/theme": "15.0.0-canary.684e33d25.0", - "@material/typography": "15.0.0-canary.684e33d25.0", + "@material/base": "15.0.0-canary.b994146f6.0", + "@material/feature-targeting": "15.0.0-canary.b994146f6.0", + "@material/ripple": "15.0.0-canary.b994146f6.0", + "@material/rtl": "15.0.0-canary.b994146f6.0", + "@material/theme": "15.0.0-canary.b994146f6.0", + "@material/typography": "15.0.0-canary.b994146f6.0", "tslib": "^2.1.0" } }, "node_modules/@material/icon-button": { - "version": "15.0.0-canary.684e33d25.0", - "resolved": "https://registry.npmjs.org/@material/icon-button/-/icon-button-15.0.0-canary.684e33d25.0.tgz", - "integrity": "sha512-wMI+XGzmIN/o2ePBKg2hLyx7H4pXCRAyyIKMQS1FMp1UKa2tYmiHVX/V8skhKwCqxg3i6Ls/LxMjfPxTR18WvQ==", + "version": "15.0.0-canary.b994146f6.0", + "resolved": "https://registry.npmjs.org/@material/icon-button/-/icon-button-15.0.0-canary.b994146f6.0.tgz", + "integrity": "sha512-X6DvOv4jpymHUjI7ZAbO946nDgGYKDwPZfkRzBE84gv2XEr2qfMuABhojxkYubRbt03oauBdcJVVMFCXkVhArQ==", "dependencies": { - "@material/base": "15.0.0-canary.684e33d25.0", - "@material/density": "15.0.0-canary.684e33d25.0", - "@material/dom": "15.0.0-canary.684e33d25.0", - "@material/elevation": "15.0.0-canary.684e33d25.0", - "@material/feature-targeting": "15.0.0-canary.684e33d25.0", - "@material/focus-ring": "15.0.0-canary.684e33d25.0", - "@material/ripple": "15.0.0-canary.684e33d25.0", - "@material/rtl": "15.0.0-canary.684e33d25.0", - "@material/theme": "15.0.0-canary.684e33d25.0", - "@material/touch-target": "15.0.0-canary.684e33d25.0", + "@material/base": "15.0.0-canary.b994146f6.0", + "@material/density": "15.0.0-canary.b994146f6.0", + "@material/dom": "15.0.0-canary.b994146f6.0", + "@material/elevation": "15.0.0-canary.b994146f6.0", + "@material/feature-targeting": "15.0.0-canary.b994146f6.0", + "@material/focus-ring": "15.0.0-canary.b994146f6.0", + "@material/ripple": "15.0.0-canary.b994146f6.0", + "@material/rtl": "15.0.0-canary.b994146f6.0", + "@material/theme": "15.0.0-canary.b994146f6.0", + "@material/touch-target": "15.0.0-canary.b994146f6.0", "tslib": "^2.1.0" } }, "node_modules/@material/image-list": { - "version": "15.0.0-canary.684e33d25.0", - "resolved": "https://registry.npmjs.org/@material/image-list/-/image-list-15.0.0-canary.684e33d25.0.tgz", - "integrity": "sha512-Ol+uaHYBe5R/cgzlfh5ONnMVX0wO6fV74JMUcQCQlxP6lXau/edARo4tkRc7A7UJUkU3VRv0EpEjLoCRNUPGaA==", + "version": "15.0.0-canary.b994146f6.0", + "resolved": "https://registry.npmjs.org/@material/image-list/-/image-list-15.0.0-canary.b994146f6.0.tgz", + "integrity": "sha512-kf903XFF1P+V5ZPXCt+7R6c55g4UyQE1ZHkTViCIJfd52gU40bHODMhTQy/ywBkwDeJfNk8uf1V1IM24WQYpxA==", "dependencies": { - "@material/feature-targeting": "15.0.0-canary.684e33d25.0", - "@material/shape": "15.0.0-canary.684e33d25.0", - "@material/theme": "15.0.0-canary.684e33d25.0", - "@material/typography": "15.0.0-canary.684e33d25.0", + "@material/feature-targeting": "15.0.0-canary.b994146f6.0", + "@material/shape": "15.0.0-canary.b994146f6.0", + "@material/theme": "15.0.0-canary.b994146f6.0", + "@material/typography": "15.0.0-canary.b994146f6.0", "tslib": "^2.1.0" } }, "node_modules/@material/layout-grid": { - "version": "15.0.0-canary.684e33d25.0", - "resolved": "https://registry.npmjs.org/@material/layout-grid/-/layout-grid-15.0.0-canary.684e33d25.0.tgz", - "integrity": "sha512-ALXE1mqFNb/RB2lVRQ3/r1Aufw2mFZnOjRE+boYDVepmAG/xWyPCyaGoavELJF5l4GAb0tXi8wA/8HeGbLOpuA==", + "version": "15.0.0-canary.b994146f6.0", + "resolved": "https://registry.npmjs.org/@material/layout-grid/-/layout-grid-15.0.0-canary.b994146f6.0.tgz", + "integrity": "sha512-OALBSGue8g1/mEwLYYi2d950dJFpNYKW87jPS9/KM65JKMyxoU7tU2d4An1BuyqK0r9sopGq6Pn/zhill0iLaw==", "dependencies": { "tslib": "^2.1.0" } }, "node_modules/@material/line-ripple": { - "version": "15.0.0-canary.684e33d25.0", - "resolved": "https://registry.npmjs.org/@material/line-ripple/-/line-ripple-15.0.0-canary.684e33d25.0.tgz", - "integrity": "sha512-7hRx8C/e9i0P6pgQpNOMfTwSS2r1fwEvBL72QDVGLtLuoKKwsjjgP6Z0Jat/GeHJe87u9LQvGBoD4upt+of/HA==", + "version": "15.0.0-canary.b994146f6.0", + "resolved": "https://registry.npmjs.org/@material/line-ripple/-/line-ripple-15.0.0-canary.b994146f6.0.tgz", + "integrity": "sha512-evjZxCu4iodiKtW8N0xjY8ACRXm3sY+4rAmq3vV5BmHWAJ3BobjbFYslDMZQ+4mu3HmwMatbJehKxHegahitNg==", "dependencies": { - "@material/animation": "15.0.0-canary.684e33d25.0", - "@material/base": "15.0.0-canary.684e33d25.0", - "@material/feature-targeting": "15.0.0-canary.684e33d25.0", - "@material/theme": "15.0.0-canary.684e33d25.0", + "@material/animation": "15.0.0-canary.b994146f6.0", + "@material/base": "15.0.0-canary.b994146f6.0", + "@material/feature-targeting": "15.0.0-canary.b994146f6.0", + "@material/theme": "15.0.0-canary.b994146f6.0", "tslib": "^2.1.0" } }, "node_modules/@material/linear-progress": { - "version": "15.0.0-canary.684e33d25.0", - "resolved": "https://registry.npmjs.org/@material/linear-progress/-/linear-progress-15.0.0-canary.684e33d25.0.tgz", - "integrity": "sha512-iJclt7mKmcMk6pqD7ocXKfCWZhqBoODp7N593jYlxVpTJuEz2wiVAjZUDn/YGj/Uz3CRH+2YFfOiLr9pwWjhDg==", + "version": "15.0.0-canary.b994146f6.0", + "resolved": "https://registry.npmjs.org/@material/linear-progress/-/linear-progress-15.0.0-canary.b994146f6.0.tgz", + "integrity": "sha512-jlXh+tIj+/o0Ks7fHdC/24fH6IXCAl2vF52U6NwT39ESrlwmlLhp3gtag5GSBHN5E7Z09nK871Yo1G/b1F+COg==", "dependencies": { - "@material/animation": "15.0.0-canary.684e33d25.0", - "@material/base": "15.0.0-canary.684e33d25.0", - "@material/dom": "15.0.0-canary.684e33d25.0", - "@material/feature-targeting": "15.0.0-canary.684e33d25.0", - "@material/progress-indicator": "15.0.0-canary.684e33d25.0", - "@material/rtl": "15.0.0-canary.684e33d25.0", - "@material/theme": "15.0.0-canary.684e33d25.0", + "@material/animation": "15.0.0-canary.b994146f6.0", + "@material/base": "15.0.0-canary.b994146f6.0", + "@material/dom": "15.0.0-canary.b994146f6.0", + "@material/feature-targeting": "15.0.0-canary.b994146f6.0", + "@material/progress-indicator": "15.0.0-canary.b994146f6.0", + "@material/rtl": "15.0.0-canary.b994146f6.0", + "@material/theme": "15.0.0-canary.b994146f6.0", "tslib": "^2.1.0" } }, "node_modules/@material/list": { - "version": "15.0.0-canary.684e33d25.0", - "resolved": "https://registry.npmjs.org/@material/list/-/list-15.0.0-canary.684e33d25.0.tgz", - "integrity": "sha512-rQ+FCSdzmwTcT00IYE0uRV3CS4oGSccKFl9hkcF+aHFW61L7ORh/SCGUDPrEfQFrFkMn5f8qroVJjpUAMXBz4g==", + "version": "15.0.0-canary.b994146f6.0", + "resolved": "https://registry.npmjs.org/@material/list/-/list-15.0.0-canary.b994146f6.0.tgz", + "integrity": "sha512-kY/i6VvFBb/W3VvCPvWRMzWvu7mvNFJ+R8ijfawDoAXiv4fj42GO4iFyTcFXaUevEPKp791pN/09BMJQ6jYEvA==", "dependencies": { - "@material/base": "15.0.0-canary.684e33d25.0", - "@material/density": "15.0.0-canary.684e33d25.0", - "@material/dom": "15.0.0-canary.684e33d25.0", - "@material/feature-targeting": "15.0.0-canary.684e33d25.0", - "@material/ripple": "15.0.0-canary.684e33d25.0", - "@material/rtl": "15.0.0-canary.684e33d25.0", - "@material/shape": "15.0.0-canary.684e33d25.0", - "@material/theme": "15.0.0-canary.684e33d25.0", - "@material/tokens": "15.0.0-canary.684e33d25.0", - "@material/typography": "15.0.0-canary.684e33d25.0", + "@material/base": "15.0.0-canary.b994146f6.0", + "@material/density": "15.0.0-canary.b994146f6.0", + "@material/dom": "15.0.0-canary.b994146f6.0", + "@material/feature-targeting": "15.0.0-canary.b994146f6.0", + "@material/ripple": "15.0.0-canary.b994146f6.0", + "@material/rtl": "15.0.0-canary.b994146f6.0", + "@material/shape": "15.0.0-canary.b994146f6.0", + "@material/theme": "15.0.0-canary.b994146f6.0", + "@material/tokens": "15.0.0-canary.b994146f6.0", + "@material/typography": "15.0.0-canary.b994146f6.0", "tslib": "^2.1.0" } }, "node_modules/@material/menu": { - "version": "15.0.0-canary.684e33d25.0", - "resolved": "https://registry.npmjs.org/@material/menu/-/menu-15.0.0-canary.684e33d25.0.tgz", - "integrity": "sha512-r7wzDLSGSI9629/mfpvsMzkVxpmV75kcD3IrW0Pcu6/Bv/1xi0EvjcUXzNJJoQlwN4Zj35Ymz/PCjZkIDIz68Q==", + "version": "15.0.0-canary.b994146f6.0", + "resolved": "https://registry.npmjs.org/@material/menu/-/menu-15.0.0-canary.b994146f6.0.tgz", + "integrity": "sha512-y6smNmLJ+U0DoXWbyqzW+VW/uWDuklhdGHc5MbZrTOhsKkhvoTVNMSOa+NFPU4gTwrplvUjaUvnIsQ0wygwD3g==", "dependencies": { - "@material/base": "15.0.0-canary.684e33d25.0", - "@material/dom": "15.0.0-canary.684e33d25.0", - "@material/elevation": "15.0.0-canary.684e33d25.0", - "@material/feature-targeting": "15.0.0-canary.684e33d25.0", - "@material/list": "15.0.0-canary.684e33d25.0", - "@material/menu-surface": "15.0.0-canary.684e33d25.0", - "@material/ripple": "15.0.0-canary.684e33d25.0", - "@material/rtl": "15.0.0-canary.684e33d25.0", - "@material/shape": "15.0.0-canary.684e33d25.0", - "@material/theme": "15.0.0-canary.684e33d25.0", - "@material/tokens": "15.0.0-canary.684e33d25.0", + "@material/base": "15.0.0-canary.b994146f6.0", + "@material/dom": "15.0.0-canary.b994146f6.0", + "@material/elevation": "15.0.0-canary.b994146f6.0", + "@material/feature-targeting": "15.0.0-canary.b994146f6.0", + "@material/list": "15.0.0-canary.b994146f6.0", + "@material/menu-surface": "15.0.0-canary.b994146f6.0", + "@material/ripple": "15.0.0-canary.b994146f6.0", + "@material/rtl": "15.0.0-canary.b994146f6.0", + "@material/shape": "15.0.0-canary.b994146f6.0", + "@material/theme": "15.0.0-canary.b994146f6.0", + "@material/tokens": "15.0.0-canary.b994146f6.0", "tslib": "^2.1.0" } }, "node_modules/@material/menu-surface": { - "version": "15.0.0-canary.684e33d25.0", - "resolved": "https://registry.npmjs.org/@material/menu-surface/-/menu-surface-15.0.0-canary.684e33d25.0.tgz", - "integrity": "sha512-RVO5GAYcfWPaKwxsF/NhUAmrYXQCQBKvRQW0TIlbmAJz6lcFeTs6YZqF3u1C7qrL3ZQGz+sur/7ywj6QU0oMow==", + "version": "15.0.0-canary.b994146f6.0", + "resolved": "https://registry.npmjs.org/@material/menu-surface/-/menu-surface-15.0.0-canary.b994146f6.0.tgz", + "integrity": "sha512-StmM3lrRn1iMEZfq532jpMNppqyBBy68FbPurKEsHuP/3q+CscfnwjrS9ym+JcHqXKMHnQXbL/49ymffRGX2AQ==", "dependencies": { - "@material/animation": "15.0.0-canary.684e33d25.0", - "@material/base": "15.0.0-canary.684e33d25.0", - "@material/elevation": "15.0.0-canary.684e33d25.0", - "@material/feature-targeting": "15.0.0-canary.684e33d25.0", - "@material/rtl": "15.0.0-canary.684e33d25.0", - "@material/shape": "15.0.0-canary.684e33d25.0", - "@material/theme": "15.0.0-canary.684e33d25.0", + "@material/animation": "15.0.0-canary.b994146f6.0", + "@material/base": "15.0.0-canary.b994146f6.0", + "@material/elevation": "15.0.0-canary.b994146f6.0", + "@material/feature-targeting": "15.0.0-canary.b994146f6.0", + "@material/rtl": "15.0.0-canary.b994146f6.0", + "@material/shape": "15.0.0-canary.b994146f6.0", + "@material/theme": "15.0.0-canary.b994146f6.0", "tslib": "^2.1.0" } }, "node_modules/@material/notched-outline": { - "version": "15.0.0-canary.684e33d25.0", - "resolved": "https://registry.npmjs.org/@material/notched-outline/-/notched-outline-15.0.0-canary.684e33d25.0.tgz", - "integrity": "sha512-9YHcBkvJLPVYzkHcWoTpBZAFrEd+j1hjhGxLhh0LuNrZe8VroUkZD1TTnUAPHRG3os6EqEWWaKb0RN+aPIF2yQ==", + "version": "15.0.0-canary.b994146f6.0", + "resolved": "https://registry.npmjs.org/@material/notched-outline/-/notched-outline-15.0.0-canary.b994146f6.0.tgz", + "integrity": "sha512-UZxU8jXM2t/bk/CiO0K+TSPspuJRZIyrYlIS0gd+qq/u8Gi2DpALBlLAh9Jeu46IUg4YGlPsNWYfe8p3QAVyoA==", "dependencies": { - "@material/base": "15.0.0-canary.684e33d25.0", - "@material/feature-targeting": "15.0.0-canary.684e33d25.0", - "@material/floating-label": "15.0.0-canary.684e33d25.0", - "@material/rtl": "15.0.0-canary.684e33d25.0", - "@material/shape": "15.0.0-canary.684e33d25.0", - "@material/theme": "15.0.0-canary.684e33d25.0", + "@material/base": "15.0.0-canary.b994146f6.0", + "@material/feature-targeting": "15.0.0-canary.b994146f6.0", + "@material/floating-label": "15.0.0-canary.b994146f6.0", + "@material/rtl": "15.0.0-canary.b994146f6.0", + "@material/shape": "15.0.0-canary.b994146f6.0", + "@material/theme": "15.0.0-canary.b994146f6.0", "tslib": "^2.1.0" } }, "node_modules/@material/progress-indicator": { - "version": "15.0.0-canary.684e33d25.0", - "resolved": "https://registry.npmjs.org/@material/progress-indicator/-/progress-indicator-15.0.0-canary.684e33d25.0.tgz", - "integrity": "sha512-c0icji4faeNWUoqGENGC7Hav0Puxh0RwXIDVizffaUxKIGbajpIp5+4Zop73fK/xFLGMB/npg7TbP+aCGjQ3fw==", + "version": "15.0.0-canary.b994146f6.0", + "resolved": "https://registry.npmjs.org/@material/progress-indicator/-/progress-indicator-15.0.0-canary.b994146f6.0.tgz", + "integrity": "sha512-VT+mOQhohaM+pBX1rknbVOI6JCGKg9NiOHBoYljIvnexNeILE+mW9g6mtQ0ZCJPz0oMmiSAMLcuxMIcBXx84Xw==", "dependencies": { "tslib": "^2.1.0" } }, "node_modules/@material/radio": { - "version": "15.0.0-canary.684e33d25.0", - "resolved": "https://registry.npmjs.org/@material/radio/-/radio-15.0.0-canary.684e33d25.0.tgz", - "integrity": "sha512-U3Eh8sNUA8trDla1Bq8Bo02foxYvtoewaKeF8A8tAju81XZ4jRiftfOsOWZDZEHCVbbCB2QwvutvFlnay5n+Aw==", + "version": "15.0.0-canary.b994146f6.0", + "resolved": "https://registry.npmjs.org/@material/radio/-/radio-15.0.0-canary.b994146f6.0.tgz", + "integrity": "sha512-U/RR2lVNWwEO2+kJtGz9XzvnOF0gAZn1krMY0z/eU9Wnl0OgPZbqQrxXMoVNv1pzKYSEwZQEGado/rv8qp7piA==", "dependencies": { - "@material/animation": "15.0.0-canary.684e33d25.0", - "@material/base": "15.0.0-canary.684e33d25.0", - "@material/density": "15.0.0-canary.684e33d25.0", - "@material/dom": "15.0.0-canary.684e33d25.0", - "@material/feature-targeting": "15.0.0-canary.684e33d25.0", - "@material/focus-ring": "15.0.0-canary.684e33d25.0", - "@material/ripple": "15.0.0-canary.684e33d25.0", - "@material/theme": "15.0.0-canary.684e33d25.0", - "@material/touch-target": "15.0.0-canary.684e33d25.0", + "@material/animation": "15.0.0-canary.b994146f6.0", + "@material/base": "15.0.0-canary.b994146f6.0", + "@material/density": "15.0.0-canary.b994146f6.0", + "@material/dom": "15.0.0-canary.b994146f6.0", + "@material/feature-targeting": "15.0.0-canary.b994146f6.0", + "@material/focus-ring": "15.0.0-canary.b994146f6.0", + "@material/ripple": "15.0.0-canary.b994146f6.0", + "@material/theme": "15.0.0-canary.b994146f6.0", + "@material/touch-target": "15.0.0-canary.b994146f6.0", "tslib": "^2.1.0" } }, "node_modules/@material/ripple": { - "version": "15.0.0-canary.684e33d25.0", - "resolved": "https://registry.npmjs.org/@material/ripple/-/ripple-15.0.0-canary.684e33d25.0.tgz", - "integrity": "sha512-RyePu7SjIm/OuyyEieZ/gxiPYkNZOZHeid72WRcN9ofdlljj2pifcdPvcfZA+v/DMS33xo5GjG2L/Qj6ClWrKw==", + "version": "15.0.0-canary.b994146f6.0", + "resolved": "https://registry.npmjs.org/@material/ripple/-/ripple-15.0.0-canary.b994146f6.0.tgz", + "integrity": "sha512-WzIbc8wYTzMOczqGXVCBPdNcv/73Ef8FwcQYsscGMaqCzgVsdpoqilTfsx7Ryyz6dQbyfmJqp7s+YpPujcezOA==", "dependencies": { - "@material/animation": "15.0.0-canary.684e33d25.0", - "@material/base": "15.0.0-canary.684e33d25.0", - "@material/dom": "15.0.0-canary.684e33d25.0", - "@material/feature-targeting": "15.0.0-canary.684e33d25.0", - "@material/rtl": "15.0.0-canary.684e33d25.0", - "@material/theme": "15.0.0-canary.684e33d25.0", + "@material/animation": "15.0.0-canary.b994146f6.0", + "@material/base": "15.0.0-canary.b994146f6.0", + "@material/dom": "15.0.0-canary.b994146f6.0", + "@material/feature-targeting": "15.0.0-canary.b994146f6.0", + "@material/rtl": "15.0.0-canary.b994146f6.0", + "@material/theme": "15.0.0-canary.b994146f6.0", "tslib": "^2.1.0" } }, "node_modules/@material/rtl": { - "version": "15.0.0-canary.684e33d25.0", - "resolved": "https://registry.npmjs.org/@material/rtl/-/rtl-15.0.0-canary.684e33d25.0.tgz", - "integrity": "sha512-NqdJl8Ayupp1Th+vCNCpVQHbUFOuF7TCte9LD1norTIBUF/QizIxWby2W5uUEiPbnh5j9PmE1CJtfLwKun3pcw==", + "version": "15.0.0-canary.b994146f6.0", + "resolved": "https://registry.npmjs.org/@material/rtl/-/rtl-15.0.0-canary.b994146f6.0.tgz", + "integrity": "sha512-H/W6BVn4Ygfkrf/FgSrNhbu1uY7PST2wlsjEYQt06EfAM0CDHEwSL1MwV4FmpQA/r40Q0PqoLN6moDrtCe5S8g==", "dependencies": { - "@material/theme": "15.0.0-canary.684e33d25.0", + "@material/theme": "15.0.0-canary.b994146f6.0", "tslib": "^2.1.0" } }, "node_modules/@material/segmented-button": { - "version": "15.0.0-canary.684e33d25.0", - "resolved": "https://registry.npmjs.org/@material/segmented-button/-/segmented-button-15.0.0-canary.684e33d25.0.tgz", - "integrity": "sha512-bEGgg8vgXNLyukyV8HRjFMuQ6t6nm5LQ4Pgm22um61Yc8qyi0BOqV41OR4SVdUrUqZxh1aVD+p+4NN03+LfQXw==", + "version": "15.0.0-canary.b994146f6.0", + "resolved": "https://registry.npmjs.org/@material/segmented-button/-/segmented-button-15.0.0-canary.b994146f6.0.tgz", + "integrity": "sha512-jd+f4BTnU0tghxBpAM/XdVmruDXSoQ88TYSFWbrhulS+/c/ooCZURWvVC4mHNej+QR/fODkx4adbqkBiwwCtMw==", "dependencies": { - "@material/base": "15.0.0-canary.684e33d25.0", - "@material/elevation": "15.0.0-canary.684e33d25.0", - "@material/feature-targeting": "15.0.0-canary.684e33d25.0", - "@material/ripple": "15.0.0-canary.684e33d25.0", - "@material/theme": "15.0.0-canary.684e33d25.0", - "@material/touch-target": "15.0.0-canary.684e33d25.0", - "@material/typography": "15.0.0-canary.684e33d25.0", + "@material/base": "15.0.0-canary.b994146f6.0", + "@material/elevation": "15.0.0-canary.b994146f6.0", + "@material/feature-targeting": "15.0.0-canary.b994146f6.0", + "@material/ripple": "15.0.0-canary.b994146f6.0", + "@material/theme": "15.0.0-canary.b994146f6.0", + "@material/touch-target": "15.0.0-canary.b994146f6.0", + "@material/typography": "15.0.0-canary.b994146f6.0", "tslib": "^2.1.0" } }, "node_modules/@material/select": { - "version": "15.0.0-canary.684e33d25.0", - "resolved": "https://registry.npmjs.org/@material/select/-/select-15.0.0-canary.684e33d25.0.tgz", - "integrity": "sha512-kf178/2TeEinTv0mgmSBcmmExQ2h7a7dtR1E3WuqQgisJ/R6+zVLMkC2CnfIyzxYX2vkuUTG0ue3Reh/6XiqSg==", + "version": "15.0.0-canary.b994146f6.0", + "resolved": "https://registry.npmjs.org/@material/select/-/select-15.0.0-canary.b994146f6.0.tgz", + "integrity": "sha512-5thEQS+B17JSm3I8D+mqQe2G3ArVnXJALTEEE9FmMUKwKYkrsLplm3FYuEXERZGJnYeTRdkdmhYY/YeocfZoyA==", "dependencies": { - "@material/animation": "15.0.0-canary.684e33d25.0", - "@material/base": "15.0.0-canary.684e33d25.0", - "@material/density": "15.0.0-canary.684e33d25.0", - "@material/dom": "15.0.0-canary.684e33d25.0", - "@material/elevation": "15.0.0-canary.684e33d25.0", - "@material/feature-targeting": "15.0.0-canary.684e33d25.0", - "@material/floating-label": "15.0.0-canary.684e33d25.0", - "@material/line-ripple": "15.0.0-canary.684e33d25.0", - "@material/list": "15.0.0-canary.684e33d25.0", - "@material/menu": "15.0.0-canary.684e33d25.0", - "@material/menu-surface": "15.0.0-canary.684e33d25.0", - "@material/notched-outline": "15.0.0-canary.684e33d25.0", - "@material/ripple": "15.0.0-canary.684e33d25.0", - "@material/rtl": "15.0.0-canary.684e33d25.0", - "@material/shape": "15.0.0-canary.684e33d25.0", - "@material/theme": "15.0.0-canary.684e33d25.0", - "@material/tokens": "15.0.0-canary.684e33d25.0", - "@material/typography": "15.0.0-canary.684e33d25.0", + "@material/animation": "15.0.0-canary.b994146f6.0", + "@material/base": "15.0.0-canary.b994146f6.0", + "@material/density": "15.0.0-canary.b994146f6.0", + "@material/dom": "15.0.0-canary.b994146f6.0", + "@material/elevation": "15.0.0-canary.b994146f6.0", + "@material/feature-targeting": "15.0.0-canary.b994146f6.0", + "@material/floating-label": "15.0.0-canary.b994146f6.0", + "@material/line-ripple": "15.0.0-canary.b994146f6.0", + "@material/list": "15.0.0-canary.b994146f6.0", + "@material/menu": "15.0.0-canary.b994146f6.0", + "@material/menu-surface": "15.0.0-canary.b994146f6.0", + "@material/notched-outline": "15.0.0-canary.b994146f6.0", + "@material/ripple": "15.0.0-canary.b994146f6.0", + "@material/rtl": "15.0.0-canary.b994146f6.0", + "@material/shape": "15.0.0-canary.b994146f6.0", + "@material/theme": "15.0.0-canary.b994146f6.0", + "@material/tokens": "15.0.0-canary.b994146f6.0", + "@material/typography": "15.0.0-canary.b994146f6.0", "tslib": "^2.1.0" } }, "node_modules/@material/shape": { - "version": "15.0.0-canary.684e33d25.0", - "resolved": "https://registry.npmjs.org/@material/shape/-/shape-15.0.0-canary.684e33d25.0.tgz", - "integrity": "sha512-aEelpaTFmpnCji3TUGP9bVCS/bRVjUmLTHBPZtuu1gOrUVVtJ6kYOg73dZNJF+XOoNL2yOX/LRcKwsop29tptA==", + "version": "15.0.0-canary.b994146f6.0", + "resolved": "https://registry.npmjs.org/@material/shape/-/shape-15.0.0-canary.b994146f6.0.tgz", + "integrity": "sha512-sINM3gr3aLgdvqZVfqfXV5EB77owLLJjy+2NqchJ8ZPqucCJ+F/BsCBfLA2Wu3O4Sc9IpAEn/o1hzYm/CWAFAw==", "dependencies": { - "@material/feature-targeting": "15.0.0-canary.684e33d25.0", - "@material/rtl": "15.0.0-canary.684e33d25.0", - "@material/theme": "15.0.0-canary.684e33d25.0", + "@material/feature-targeting": "15.0.0-canary.b994146f6.0", + "@material/rtl": "15.0.0-canary.b994146f6.0", + "@material/theme": "15.0.0-canary.b994146f6.0", "tslib": "^2.1.0" } }, "node_modules/@material/slider": { - "version": "15.0.0-canary.684e33d25.0", - "resolved": "https://registry.npmjs.org/@material/slider/-/slider-15.0.0-canary.684e33d25.0.tgz", - "integrity": "sha512-WVyK+2pSNSZmj07M2K/a3TADoQ9FBCndfNC/vE7/wGIg4dddJJK5KvQ+yruf9R2cSzTL/S1sZ5WpyyeM8E9HTw==", + "version": "15.0.0-canary.b994146f6.0", + "resolved": "https://registry.npmjs.org/@material/slider/-/slider-15.0.0-canary.b994146f6.0.tgz", + "integrity": "sha512-dyT72+Kp//AEajJxDUVoMoizUjf2uggVMGXOaQ7FhpGHuf7LC3EyEjrrJ15efFzYgTjdJUU1YQkCwGmdt6CQsA==", "dependencies": { - "@material/animation": "15.0.0-canary.684e33d25.0", - "@material/base": "15.0.0-canary.684e33d25.0", - "@material/dom": "15.0.0-canary.684e33d25.0", - "@material/elevation": "15.0.0-canary.684e33d25.0", - "@material/feature-targeting": "15.0.0-canary.684e33d25.0", - "@material/ripple": "15.0.0-canary.684e33d25.0", - "@material/rtl": "15.0.0-canary.684e33d25.0", - "@material/theme": "15.0.0-canary.684e33d25.0", - "@material/tokens": "15.0.0-canary.684e33d25.0", - "@material/typography": "15.0.0-canary.684e33d25.0", + "@material/animation": "15.0.0-canary.b994146f6.0", + "@material/base": "15.0.0-canary.b994146f6.0", + "@material/dom": "15.0.0-canary.b994146f6.0", + "@material/elevation": "15.0.0-canary.b994146f6.0", + "@material/feature-targeting": "15.0.0-canary.b994146f6.0", + "@material/ripple": "15.0.0-canary.b994146f6.0", + "@material/rtl": "15.0.0-canary.b994146f6.0", + "@material/theme": "15.0.0-canary.b994146f6.0", + "@material/tokens": "15.0.0-canary.b994146f6.0", + "@material/typography": "15.0.0-canary.b994146f6.0", "tslib": "^2.1.0" } }, "node_modules/@material/snackbar": { - "version": "15.0.0-canary.684e33d25.0", - "resolved": "https://registry.npmjs.org/@material/snackbar/-/snackbar-15.0.0-canary.684e33d25.0.tgz", - "integrity": "sha512-itO+DCkOannZzR1/cCHcqAm7ifhuFvXmDItNoA8qLEcAyJDJJRkhpwj3XQ01yuo9gBFcSctp7Txt7e+Hncm/Jg==", + "version": "15.0.0-canary.b994146f6.0", + "resolved": "https://registry.npmjs.org/@material/snackbar/-/snackbar-15.0.0-canary.b994146f6.0.tgz", + "integrity": "sha512-fEhPASJossScNpcrNYrrH8uU+rUf6+kw7/ZMrpUzzz1lVXliL28jTNEmU1nFpcDI4M2GXH+Z64f7vl2hiMDG8g==", "dependencies": { - "@material/animation": "15.0.0-canary.684e33d25.0", - "@material/base": "15.0.0-canary.684e33d25.0", - "@material/button": "15.0.0-canary.684e33d25.0", - "@material/dom": "15.0.0-canary.684e33d25.0", - "@material/elevation": "15.0.0-canary.684e33d25.0", - "@material/feature-targeting": "15.0.0-canary.684e33d25.0", - "@material/icon-button": "15.0.0-canary.684e33d25.0", - "@material/ripple": "15.0.0-canary.684e33d25.0", - "@material/rtl": "15.0.0-canary.684e33d25.0", - "@material/shape": "15.0.0-canary.684e33d25.0", - "@material/theme": "15.0.0-canary.684e33d25.0", - "@material/tokens": "15.0.0-canary.684e33d25.0", - "@material/typography": "15.0.0-canary.684e33d25.0", + "@material/animation": "15.0.0-canary.b994146f6.0", + "@material/base": "15.0.0-canary.b994146f6.0", + "@material/button": "15.0.0-canary.b994146f6.0", + "@material/dom": "15.0.0-canary.b994146f6.0", + "@material/elevation": "15.0.0-canary.b994146f6.0", + "@material/feature-targeting": "15.0.0-canary.b994146f6.0", + "@material/icon-button": "15.0.0-canary.b994146f6.0", + "@material/ripple": "15.0.0-canary.b994146f6.0", + "@material/rtl": "15.0.0-canary.b994146f6.0", + "@material/shape": "15.0.0-canary.b994146f6.0", + "@material/theme": "15.0.0-canary.b994146f6.0", + "@material/tokens": "15.0.0-canary.b994146f6.0", + "@material/typography": "15.0.0-canary.b994146f6.0", "tslib": "^2.1.0" } }, "node_modules/@material/switch": { - "version": "15.0.0-canary.684e33d25.0", - "resolved": "https://registry.npmjs.org/@material/switch/-/switch-15.0.0-canary.684e33d25.0.tgz", - "integrity": "sha512-Jxi0gl92yvvZZsAPxvVHzXx2ga+T/djMow98jvEczmpUorWnAhgiCr9CsSSRoosahWyRB8NLZOxUQrACxvffjw==", + "version": "15.0.0-canary.b994146f6.0", + "resolved": "https://registry.npmjs.org/@material/switch/-/switch-15.0.0-canary.b994146f6.0.tgz", + "integrity": "sha512-czCXTUa30ILIf1J3exiuSVIRcodGATHexd3eWDq4sfHo4iMh4rBMaIxcqkmnb2iwE/mMTNyVfoauijx2QiNKrA==", "dependencies": { - "@material/animation": "15.0.0-canary.684e33d25.0", - "@material/base": "15.0.0-canary.684e33d25.0", - "@material/density": "15.0.0-canary.684e33d25.0", - "@material/dom": "15.0.0-canary.684e33d25.0", - "@material/elevation": "15.0.0-canary.684e33d25.0", - "@material/feature-targeting": "15.0.0-canary.684e33d25.0", - "@material/focus-ring": "15.0.0-canary.684e33d25.0", - "@material/ripple": "15.0.0-canary.684e33d25.0", - "@material/rtl": "15.0.0-canary.684e33d25.0", - "@material/shape": "15.0.0-canary.684e33d25.0", - "@material/theme": "15.0.0-canary.684e33d25.0", - "@material/tokens": "15.0.0-canary.684e33d25.0", + "@material/animation": "15.0.0-canary.b994146f6.0", + "@material/base": "15.0.0-canary.b994146f6.0", + "@material/density": "15.0.0-canary.b994146f6.0", + "@material/dom": "15.0.0-canary.b994146f6.0", + "@material/elevation": "15.0.0-canary.b994146f6.0", + "@material/feature-targeting": "15.0.0-canary.b994146f6.0", + "@material/focus-ring": "15.0.0-canary.b994146f6.0", + "@material/ripple": "15.0.0-canary.b994146f6.0", + "@material/rtl": "15.0.0-canary.b994146f6.0", + "@material/shape": "15.0.0-canary.b994146f6.0", + "@material/theme": "15.0.0-canary.b994146f6.0", + "@material/tokens": "15.0.0-canary.b994146f6.0", "safevalues": "^0.3.4", "tslib": "^2.1.0" } }, "node_modules/@material/tab": { - "version": "15.0.0-canary.684e33d25.0", - "resolved": "https://registry.npmjs.org/@material/tab/-/tab-15.0.0-canary.684e33d25.0.tgz", - "integrity": "sha512-WQL3wj9syHNcfe8KbgGGUcA34M8C/xZ+n0Fkkh8Kk6puVwaU+xqUNihsxPY6YzKpmh4PZ4oJaBdiN8zvFT1zqQ==", + "version": "15.0.0-canary.b994146f6.0", + "resolved": "https://registry.npmjs.org/@material/tab/-/tab-15.0.0-canary.b994146f6.0.tgz", + "integrity": "sha512-ygswooiNdBNNDnQdbPX0nzDQu7oQlHo8vWZ0/xL4IPVEXabY5zCzsEbGNZw2u/syo56c/NHPyMsUmXDGRSXOvQ==", "dependencies": { - "@material/base": "15.0.0-canary.684e33d25.0", - "@material/elevation": "15.0.0-canary.684e33d25.0", - "@material/feature-targeting": "15.0.0-canary.684e33d25.0", - "@material/focus-ring": "15.0.0-canary.684e33d25.0", - "@material/ripple": "15.0.0-canary.684e33d25.0", - "@material/rtl": "15.0.0-canary.684e33d25.0", - "@material/tab-indicator": "15.0.0-canary.684e33d25.0", - "@material/theme": "15.0.0-canary.684e33d25.0", - "@material/tokens": "15.0.0-canary.684e33d25.0", - "@material/typography": "15.0.0-canary.684e33d25.0", + "@material/base": "15.0.0-canary.b994146f6.0", + "@material/elevation": "15.0.0-canary.b994146f6.0", + "@material/feature-targeting": "15.0.0-canary.b994146f6.0", + "@material/focus-ring": "15.0.0-canary.b994146f6.0", + "@material/ripple": "15.0.0-canary.b994146f6.0", + "@material/rtl": "15.0.0-canary.b994146f6.0", + "@material/tab-indicator": "15.0.0-canary.b994146f6.0", + "@material/theme": "15.0.0-canary.b994146f6.0", + "@material/tokens": "15.0.0-canary.b994146f6.0", + "@material/typography": "15.0.0-canary.b994146f6.0", "tslib": "^2.1.0" } }, "node_modules/@material/tab-bar": { - "version": "15.0.0-canary.684e33d25.0", - "resolved": "https://registry.npmjs.org/@material/tab-bar/-/tab-bar-15.0.0-canary.684e33d25.0.tgz", - "integrity": "sha512-SW/cMaDsIGGkM1ag3A7GJRlmr8eXmObWsvitQJzh6Azr5zzZtSI+GQygkMesAEE1gbpqOVN8d40rh3H7VVIAcA==", + "version": "15.0.0-canary.b994146f6.0", + "resolved": "https://registry.npmjs.org/@material/tab-bar/-/tab-bar-15.0.0-canary.b994146f6.0.tgz", + "integrity": "sha512-F9NegACnFEWMu1pAAypV4Jd7qROeffkvEgVO28Xxk/CvzZxFz8kAjYJZ+rI6RUhPX3BhXzwsz/AlLwsJMT2tnA==", "dependencies": { - "@material/animation": "15.0.0-canary.684e33d25.0", - "@material/base": "15.0.0-canary.684e33d25.0", - "@material/density": "15.0.0-canary.684e33d25.0", - "@material/elevation": "15.0.0-canary.684e33d25.0", - "@material/feature-targeting": "15.0.0-canary.684e33d25.0", - "@material/tab": "15.0.0-canary.684e33d25.0", - "@material/tab-indicator": "15.0.0-canary.684e33d25.0", - "@material/tab-scroller": "15.0.0-canary.684e33d25.0", - "@material/theme": "15.0.0-canary.684e33d25.0", - "@material/tokens": "15.0.0-canary.684e33d25.0", - "@material/typography": "15.0.0-canary.684e33d25.0", + "@material/animation": "15.0.0-canary.b994146f6.0", + "@material/base": "15.0.0-canary.b994146f6.0", + "@material/density": "15.0.0-canary.b994146f6.0", + "@material/elevation": "15.0.0-canary.b994146f6.0", + "@material/feature-targeting": "15.0.0-canary.b994146f6.0", + "@material/tab": "15.0.0-canary.b994146f6.0", + "@material/tab-indicator": "15.0.0-canary.b994146f6.0", + "@material/tab-scroller": "15.0.0-canary.b994146f6.0", + "@material/theme": "15.0.0-canary.b994146f6.0", + "@material/tokens": "15.0.0-canary.b994146f6.0", + "@material/typography": "15.0.0-canary.b994146f6.0", "tslib": "^2.1.0" } }, "node_modules/@material/tab-indicator": { - "version": "15.0.0-canary.684e33d25.0", - "resolved": "https://registry.npmjs.org/@material/tab-indicator/-/tab-indicator-15.0.0-canary.684e33d25.0.tgz", - "integrity": "sha512-kKICqSPqOlaf0lzaFFCmuOqPXJC+cK48Qmsc+m5o6fJhkmuZRCYpIwB2JeP+uZSOq/bTH+SrPtCtnVlgWg6ksA==", + "version": "15.0.0-canary.b994146f6.0", + "resolved": "https://registry.npmjs.org/@material/tab-indicator/-/tab-indicator-15.0.0-canary.b994146f6.0.tgz", + "integrity": "sha512-8IH/DmwlZhQlw/2Y3aKrEvjEhZB+qbKUiyaij3BkTAexvyFeDBh5cLNjRpYkUJSGeSPhS6yu4SYzMHPmQEwQmA==", "dependencies": { - "@material/animation": "15.0.0-canary.684e33d25.0", - "@material/base": "15.0.0-canary.684e33d25.0", - "@material/feature-targeting": "15.0.0-canary.684e33d25.0", - "@material/theme": "15.0.0-canary.684e33d25.0", + "@material/animation": "15.0.0-canary.b994146f6.0", + "@material/base": "15.0.0-canary.b994146f6.0", + "@material/feature-targeting": "15.0.0-canary.b994146f6.0", + "@material/theme": "15.0.0-canary.b994146f6.0", "tslib": "^2.1.0" } }, "node_modules/@material/tab-scroller": { - "version": "15.0.0-canary.684e33d25.0", - "resolved": "https://registry.npmjs.org/@material/tab-scroller/-/tab-scroller-15.0.0-canary.684e33d25.0.tgz", - "integrity": "sha512-H6EU/TSiK/M2DyyORX5GEtXD9rKYxTMHC2VxsNWARPMFJGzgeW2ugYkFv+rKI1/c0bs0CJ4e+qFnOlBsQXZvyQ==", + "version": "15.0.0-canary.b994146f6.0", + "resolved": "https://registry.npmjs.org/@material/tab-scroller/-/tab-scroller-15.0.0-canary.b994146f6.0.tgz", + "integrity": "sha512-1MeWkr62OICfTv8oqhIZe6jFo0dKeMlUfB+/WcgnpoeMBszCOSlx5tQ4pedxUkuR3I+Z7rsTfSN0LavgF8bATA==", "dependencies": { - "@material/animation": "15.0.0-canary.684e33d25.0", - "@material/base": "15.0.0-canary.684e33d25.0", - "@material/dom": "15.0.0-canary.684e33d25.0", - "@material/feature-targeting": "15.0.0-canary.684e33d25.0", - "@material/tab": "15.0.0-canary.684e33d25.0", + "@material/animation": "15.0.0-canary.b994146f6.0", + "@material/base": "15.0.0-canary.b994146f6.0", + "@material/dom": "15.0.0-canary.b994146f6.0", + "@material/feature-targeting": "15.0.0-canary.b994146f6.0", + "@material/tab": "15.0.0-canary.b994146f6.0", "tslib": "^2.1.0" } }, "node_modules/@material/textfield": { - "version": "15.0.0-canary.684e33d25.0", - "resolved": "https://registry.npmjs.org/@material/textfield/-/textfield-15.0.0-canary.684e33d25.0.tgz", - "integrity": "sha512-OvgpDXjvpyJTtAWskO69IDybFvDNzr9w2PN/Fk7yFm+uNVupaWz1Ew8lZ4gGslaTNSVmh2XcsvmzxcLINSiiNg==", + "version": "15.0.0-canary.b994146f6.0", + "resolved": "https://registry.npmjs.org/@material/textfield/-/textfield-15.0.0-canary.b994146f6.0.tgz", + "integrity": "sha512-Kxb3DoJ5o8u3Y1gRMHKmWrDl1TirVxuf/UFrxPFiCE3J1SqiE2VQpakiD1emZwp+LSKtbRsQ/iILYLB/h7Wuvw==", "dependencies": { - "@material/animation": "15.0.0-canary.684e33d25.0", - "@material/base": "15.0.0-canary.684e33d25.0", - "@material/density": "15.0.0-canary.684e33d25.0", - "@material/dom": "15.0.0-canary.684e33d25.0", - "@material/feature-targeting": "15.0.0-canary.684e33d25.0", - "@material/floating-label": "15.0.0-canary.684e33d25.0", - "@material/line-ripple": "15.0.0-canary.684e33d25.0", - "@material/notched-outline": "15.0.0-canary.684e33d25.0", - "@material/ripple": "15.0.0-canary.684e33d25.0", - "@material/rtl": "15.0.0-canary.684e33d25.0", - "@material/shape": "15.0.0-canary.684e33d25.0", - "@material/theme": "15.0.0-canary.684e33d25.0", - "@material/tokens": "15.0.0-canary.684e33d25.0", - "@material/typography": "15.0.0-canary.684e33d25.0", + "@material/animation": "15.0.0-canary.b994146f6.0", + "@material/base": "15.0.0-canary.b994146f6.0", + "@material/density": "15.0.0-canary.b994146f6.0", + "@material/dom": "15.0.0-canary.b994146f6.0", + "@material/feature-targeting": "15.0.0-canary.b994146f6.0", + "@material/floating-label": "15.0.0-canary.b994146f6.0", + "@material/line-ripple": "15.0.0-canary.b994146f6.0", + "@material/notched-outline": "15.0.0-canary.b994146f6.0", + "@material/ripple": "15.0.0-canary.b994146f6.0", + "@material/rtl": "15.0.0-canary.b994146f6.0", + "@material/shape": "15.0.0-canary.b994146f6.0", + "@material/theme": "15.0.0-canary.b994146f6.0", + "@material/tokens": "15.0.0-canary.b994146f6.0", + "@material/typography": "15.0.0-canary.b994146f6.0", "tslib": "^2.1.0" } }, "node_modules/@material/theme": { - "version": "15.0.0-canary.684e33d25.0", - "resolved": "https://registry.npmjs.org/@material/theme/-/theme-15.0.0-canary.684e33d25.0.tgz", - "integrity": "sha512-AZxaXXAvRKzAi20RlMxzt2U5UmkCWyv7DMWEBXsxtG5Tk54mi1HsbVUp3fxDPTlmL7Pq8p1/DESg/o7TgRCVlw==", + "version": "15.0.0-canary.b994146f6.0", + "resolved": "https://registry.npmjs.org/@material/theme/-/theme-15.0.0-canary.b994146f6.0.tgz", + "integrity": "sha512-5tsZ92dAeUcZ9g9CrIkqX/GYc0M5DIfsydtI1PAidaBzr1Uokuh4rTZVQZBv7gyglF0yDua59lkb0I6wI9vxXg==", "dependencies": { - "@material/feature-targeting": "15.0.0-canary.684e33d25.0", + "@material/feature-targeting": "15.0.0-canary.b994146f6.0", "tslib": "^2.1.0" } }, "node_modules/@material/tokens": { - "version": "15.0.0-canary.684e33d25.0", - "resolved": "https://registry.npmjs.org/@material/tokens/-/tokens-15.0.0-canary.684e33d25.0.tgz", - "integrity": "sha512-wVwbQOTCXDPKYPdHQHLr026y36MMFelID1CmbfRk6mSol4O8yE9U0fXcShfRDW8Qo5E3X31w9c2A6T3neJY7wQ==", + "version": "15.0.0-canary.b994146f6.0", + "resolved": "https://registry.npmjs.org/@material/tokens/-/tokens-15.0.0-canary.b994146f6.0.tgz", + "integrity": "sha512-jFqU7PtvGkrP8b8i2soCrYQInTrnZ1/rIPDi+Xm3sa/qSghCNwFrdJEqwcwtv1fPlJIOtzkIuVRYRmAP9rXQIQ==", "dependencies": { - "@material/elevation": "15.0.0-canary.684e33d25.0" + "@material/elevation": "15.0.0-canary.b994146f6.0" } }, "node_modules/@material/tooltip": { - "version": "15.0.0-canary.684e33d25.0", - "resolved": "https://registry.npmjs.org/@material/tooltip/-/tooltip-15.0.0-canary.684e33d25.0.tgz", - "integrity": "sha512-dtm26QjxyQdinc8btgz6yys07b7bUW4FZgNF2EBPeGrICrPg7jf+JEvDziz5g8VMaTBQLOQRSCGy0MKuRlOjLw==", + "version": "15.0.0-canary.b994146f6.0", + "resolved": "https://registry.npmjs.org/@material/tooltip/-/tooltip-15.0.0-canary.b994146f6.0.tgz", + "integrity": "sha512-bVzydXGn3fauHJ8pkh32DsdyRJXleeFQ4t7jZ/rcRik+n4G1BvYiblfuu3Z/OCC0m3TJDyMdJhd+sLqRDqLUUg==", "dependencies": { - "@material/animation": "15.0.0-canary.684e33d25.0", - "@material/base": "15.0.0-canary.684e33d25.0", - "@material/button": "15.0.0-canary.684e33d25.0", - "@material/dom": "15.0.0-canary.684e33d25.0", - "@material/elevation": "15.0.0-canary.684e33d25.0", - "@material/feature-targeting": "15.0.0-canary.684e33d25.0", - "@material/rtl": "15.0.0-canary.684e33d25.0", - "@material/shape": "15.0.0-canary.684e33d25.0", - "@material/theme": "15.0.0-canary.684e33d25.0", - "@material/tokens": "15.0.0-canary.684e33d25.0", - "@material/typography": "15.0.0-canary.684e33d25.0", + "@material/animation": "15.0.0-canary.b994146f6.0", + "@material/base": "15.0.0-canary.b994146f6.0", + "@material/button": "15.0.0-canary.b994146f6.0", + "@material/dom": "15.0.0-canary.b994146f6.0", + "@material/elevation": "15.0.0-canary.b994146f6.0", + "@material/feature-targeting": "15.0.0-canary.b994146f6.0", + "@material/rtl": "15.0.0-canary.b994146f6.0", + "@material/shape": "15.0.0-canary.b994146f6.0", + "@material/theme": "15.0.0-canary.b994146f6.0", + "@material/tokens": "15.0.0-canary.b994146f6.0", + "@material/typography": "15.0.0-canary.b994146f6.0", "safevalues": "^0.3.4", "tslib": "^2.1.0" } }, "node_modules/@material/top-app-bar": { - "version": "15.0.0-canary.684e33d25.0", - "resolved": "https://registry.npmjs.org/@material/top-app-bar/-/top-app-bar-15.0.0-canary.684e33d25.0.tgz", - "integrity": "sha512-1M+oupUxflfW7u81P1XlxoLZB8bLzwtpKofIfDNRbEsiKhlLTERJR3Yak3BGE9xakNMysAaBHlkb5MrN5bNPFw==", + "version": "15.0.0-canary.b994146f6.0", + "resolved": "https://registry.npmjs.org/@material/top-app-bar/-/top-app-bar-15.0.0-canary.b994146f6.0.tgz", + "integrity": "sha512-VHq0wX3OJE1TKvjO8Qtlu+rv5EGoqAhNLBcEjpUUGoqHH/gpd356FEuIqJId4pUh5jaWf8T4ZU9xVbQGMtntzw==", "dependencies": { - "@material/animation": "15.0.0-canary.684e33d25.0", - "@material/base": "15.0.0-canary.684e33d25.0", - "@material/elevation": "15.0.0-canary.684e33d25.0", - "@material/ripple": "15.0.0-canary.684e33d25.0", - "@material/rtl": "15.0.0-canary.684e33d25.0", - "@material/shape": "15.0.0-canary.684e33d25.0", - "@material/theme": "15.0.0-canary.684e33d25.0", - "@material/typography": "15.0.0-canary.684e33d25.0", + "@material/animation": "15.0.0-canary.b994146f6.0", + "@material/base": "15.0.0-canary.b994146f6.0", + "@material/elevation": "15.0.0-canary.b994146f6.0", + "@material/ripple": "15.0.0-canary.b994146f6.0", + "@material/rtl": "15.0.0-canary.b994146f6.0", + "@material/shape": "15.0.0-canary.b994146f6.0", + "@material/theme": "15.0.0-canary.b994146f6.0", + "@material/typography": "15.0.0-canary.b994146f6.0", "tslib": "^2.1.0" } }, "node_modules/@material/touch-target": { - "version": "15.0.0-canary.684e33d25.0", - "resolved": "https://registry.npmjs.org/@material/touch-target/-/touch-target-15.0.0-canary.684e33d25.0.tgz", - "integrity": "sha512-zdE69Slg8+T7sTn1OwqZ6H7WBYac9mxJ/JlJqfTqthzIjZRcCxBSYymQJcDHjsrPnUojOtr9U4Tpm5YZ96TEkQ==", + "version": "15.0.0-canary.b994146f6.0", + "resolved": "https://registry.npmjs.org/@material/touch-target/-/touch-target-15.0.0-canary.b994146f6.0.tgz", + "integrity": "sha512-X26Y9OWvIqYOHo+sC2VMvOoeQWlUR3/yb7uPdfq92Y44zlQ4Vexgq7nEUblEiXQ8Fj+d0T9rIhRh1y9PP3Z2dw==", "dependencies": { - "@material/base": "15.0.0-canary.684e33d25.0", - "@material/feature-targeting": "15.0.0-canary.684e33d25.0", - "@material/rtl": "15.0.0-canary.684e33d25.0", - "@material/theme": "15.0.0-canary.684e33d25.0", + "@material/base": "15.0.0-canary.b994146f6.0", + "@material/feature-targeting": "15.0.0-canary.b994146f6.0", + "@material/rtl": "15.0.0-canary.b994146f6.0", + "@material/theme": "15.0.0-canary.b994146f6.0", "tslib": "^2.1.0" } }, "node_modules/@material/typography": { - "version": "15.0.0-canary.684e33d25.0", - "resolved": "https://registry.npmjs.org/@material/typography/-/typography-15.0.0-canary.684e33d25.0.tgz", - "integrity": "sha512-aVnvgMwcfNa/K4wujzpKDIxjGl2hbkEL+m+OKDSQqWYjKcP9QrbzCXJruJBqxrBoPRHLbqo47k5f9uT8raSgjw==", + "version": "15.0.0-canary.b994146f6.0", + "resolved": "https://registry.npmjs.org/@material/typography/-/typography-15.0.0-canary.b994146f6.0.tgz", + "integrity": "sha512-sWU5W30WWqdw5P6bsRx9AbvMNcz/QvQg56Syr06V6nfgSztpeuo7TfPk2J+N0ArRALo1mUrkAPk66iWYQ2p/QA==", "dependencies": { - "@material/feature-targeting": "15.0.0-canary.684e33d25.0", - "@material/theme": "15.0.0-canary.684e33d25.0", + "@material/feature-targeting": "15.0.0-canary.b994146f6.0", + "@material/theme": "15.0.0-canary.b994146f6.0", "tslib": "^2.1.0" } }, @@ -5863,90 +4980,106 @@ } }, "node_modules/@ngrx/effects": { - "version": "15.4.0", - "resolved": "https://registry.npmjs.org/@ngrx/effects/-/effects-15.4.0.tgz", - "integrity": "sha512-/8gHhOM9aeGaw8OG2LLwi4I4p84xzG0EU9TqWrvQcW74wn8sFZONjLvUte5YOzJ5502PPFFrfXSOc+lHnVAJUA==", + "version": "16.2.0", + "resolved": "https://registry.npmjs.org/@ngrx/effects/-/effects-16.2.0.tgz", + "integrity": "sha512-zZfq47LNoiRK+uS66Xm36mN07zm11AER1D9lTalX/G6jrV0bywgnAaukNNav9E33ZRrPEnCD8uu9BXZoboEYgA==", "dependencies": { "tslib": "^2.0.0" }, "peerDependencies": { - "@angular/core": "^15.0.0", - "@ngrx/store": "15.4.0", + "@angular/core": "^16.0.0", + "@ngrx/store": "16.2.0", "rxjs": "^6.5.3 || ^7.5.0" } }, "node_modules/@ngrx/entity": { - "version": "15.4.0", - "resolved": "https://registry.npmjs.org/@ngrx/entity/-/entity-15.4.0.tgz", - "integrity": "sha512-DmfbbasV5bth9APAiwH9ovDwJ/rtEUm4pJvTd6Eds/kOJ6Ime9MZwEhtglXlk2jMwe7f08pl1jzFhYIjI277aQ==", + "version": "16.2.0", + "resolved": "https://registry.npmjs.org/@ngrx/entity/-/entity-16.2.0.tgz", + "integrity": "sha512-n8Vsz48/u14R8S7akLO7TWmqXGcvCYacCIS106hC3FVkOwAOflhcstGYu6oShbqOVuu0Vcw7s/amc2oAJV4YkQ==", "dependencies": { "tslib": "^2.0.0" }, "peerDependencies": { - "@angular/core": "^15.0.0", - "@ngrx/store": "15.4.0", + "@angular/core": "^16.0.0", + "@ngrx/store": "16.2.0", "rxjs": "^6.5.3 || ^7.5.0" } }, + "node_modules/@ngrx/eslint-plugin": { + "version": "16.2.0", + "resolved": "https://registry.npmjs.org/@ngrx/eslint-plugin/-/eslint-plugin-16.2.0.tgz", + "integrity": "sha512-BeCBRLQge0OIUTS1bCNfXB0WjAdXvHl8RgdrkQ4n4gsvvfzO8zetNmQREcHJsvpyMz3YjJuiOueuaiBRdbZfMA==", + "dev": true, + "dependencies": { + "@typescript-eslint/experimental-utils": "^5.4.0", + "eslint-etc": "^5.1.0", + "semver": "^7.3.5", + "strip-json-comments": "3.1.1" + }, + "peerDependencies": { + "eslint": ">=8.0.0", + "typescript": ">=4.4.0" + } + }, "node_modules/@ngrx/router-store": { - "version": "15.4.0", - "resolved": "https://registry.npmjs.org/@ngrx/router-store/-/router-store-15.4.0.tgz", - "integrity": "sha512-uc8gx+SMr2gyly+WSBmGnpHTPsMVhenUG6skH3Qk67hrwdVG3SABjw3qdP4GibbfwwajMQ67sLaLY8PQZ5Sb2g==", + "version": "16.2.0", + "resolved": "https://registry.npmjs.org/@ngrx/router-store/-/router-store-16.2.0.tgz", + "integrity": "sha512-nVqIKWqJnE7pKpcTg6vUpWZtjIwnh66LhJ3hcNLpWRTAzyhQh6EZuYvZX3XSVmdR9XIUltlBCFGCrmTRkeWrTg==", "dependencies": { "tslib": "^2.0.0" }, "peerDependencies": { - "@angular/common": "^15.0.0", - "@angular/core": "^15.0.0", - "@angular/router": "^15.0.0", - "@ngrx/store": "15.4.0", + "@angular/common": "^16.0.0", + "@angular/core": "^16.0.0", + "@angular/router": "^16.0.0", + "@ngrx/store": "16.2.0", "rxjs": "^6.5.3 || ^7.5.0" } }, "node_modules/@ngrx/schematics": { - "version": "15.4.0", - "resolved": "https://registry.npmjs.org/@ngrx/schematics/-/schematics-15.4.0.tgz", - "integrity": "sha512-vOio2+0BNuzgde8OtIR5Gbzn/+59V0V2TyDyrxxpOi8v7FuaKCPh+o525ekjU/PfVi3ZiMVRjbmrTAR4wzBmug==", + "version": "16.2.0", + "resolved": "https://registry.npmjs.org/@ngrx/schematics/-/schematics-16.2.0.tgz", + "integrity": "sha512-AfRgSCYhrg9+b3KjcLNS1BTuRKcf8XR2GkplBLZK5NFK8nQc9/JtmLk4PoUtKTL8BFAhDmXBPziAWKMwupjzlw==", "dev": true }, "node_modules/@ngrx/store": { - "version": "15.4.0", - "resolved": "https://registry.npmjs.org/@ngrx/store/-/store-15.4.0.tgz", - "integrity": "sha512-OvCuNBHL8mAUnRTS6QSFm+IunspsYNu2cCwDovBNn7EGhxRuGihBeNoX47jCqWPHBFtokj4BlatDfpJ/yCh4xQ==", + "version": "16.2.0", + "resolved": "https://registry.npmjs.org/@ngrx/store/-/store-16.2.0.tgz", + "integrity": "sha512-C7oIUC87xXV+1dTGUwYG/L4p0IZdYv/Ou1nTL/LffyAHllmmygTA5gzLB87abLOhucAxlFIQMQ8t/GSxdk/+QA==", "dependencies": { "tslib": "^2.0.0" }, "peerDependencies": { - "@angular/core": "^15.0.0", + "@angular/core": "^16.0.0", "rxjs": "^6.5.3 || ^7.5.0" } }, "node_modules/@ngrx/store-devtools": { - "version": "15.4.0", - "resolved": "https://registry.npmjs.org/@ngrx/store-devtools/-/store-devtools-15.4.0.tgz", - "integrity": "sha512-AqWRprSyS3u/vZlpsBOPMW1/0TZS2LE13/KpZedEY+RMCW+mi53esqgrdNGOB3Wr4vrI82Ar9fgaIm4TQO6LPg==", + "version": "16.2.0", + "resolved": "https://registry.npmjs.org/@ngrx/store-devtools/-/store-devtools-16.2.0.tgz", + "integrity": "sha512-m7mkNpIIp8fA8yNG5T0ZKm1RCP2fE0IVBEtcbj2Z/88fW4vyvobVBdBqha6zgYTuA5X4m28npMra9GPNPsuDLA==", "dev": true, "dependencies": { "tslib": "^2.0.0" }, "peerDependencies": { - "@ngrx/store": "15.4.0", + "@ngrx/store": "16.2.0", "rxjs": "^6.5.3 || ^7.5.0" } }, "node_modules/@ngtools/webpack": { - "version": "15.2.8", - "resolved": "https://registry.npmjs.org/@ngtools/webpack/-/webpack-15.2.8.tgz", - "integrity": "sha512-BJexeT4FxMtToVBGa3wdl6rrkYXgilP0kkSH4Qzu4MPlLPbeBSr4XQalQriewlpC2uzG0r2SJfrAe2eDhtSykA==", + "version": "16.2.3", + "resolved": "https://registry.npmjs.org/@ngtools/webpack/-/webpack-16.2.3.tgz", + "integrity": "sha512-GkMGYMXL2tyxjjh7plKOFptJJPU2arzxLsYZs706InOJKmM9pE9prz//LohSdcXiPAw+S3Qfsc27k/VqNdKJxA==", "dev": true, "engines": { - "node": "^14.20.0 || ^16.13.0 || >=18.10.0", + "node": "^16.14.0 || >=18.10.0", "npm": "^6.11.0 || ^7.5.6 || >=8.0.0", "yarn": ">= 1.13.0" }, "peerDependencies": { - "@angular/compiler-cli": "^15.0.0", - "typescript": ">=4.8.2 <5.0", + "@angular/compiler-cli": "^16.0.0", + "typescript": ">=4.9.3 <5.2", "webpack": "^5.54.0" } }, @@ -5998,9 +5131,9 @@ } }, "node_modules/@npmcli/git": { - "version": "4.0.4", - "resolved": "https://registry.npmjs.org/@npmcli/git/-/git-4.0.4.tgz", - "integrity": "sha512-5yZghx+u5M47LghaybLCkdSyFzV/w4OuH12d96HO389Ik9CDsLaDZJVynSGGVJOLn6gy/k7Dz5XYcplM3uxXRg==", + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/@npmcli/git/-/git-4.1.0.tgz", + "integrity": "sha512-9hwoB3gStVfa0N31ymBmrX+GuDGdVA/QWShZVqE0HK2Af+7QGGrCTbZia/SW0ImUTjTne7SP91qxDmtXvDHRPQ==", "dev": true, "dependencies": { "@npmcli/promise-spawn": "^6.0.0", @@ -6026,9 +5159,9 @@ } }, "node_modules/@npmcli/git/node_modules/which": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/which/-/which-3.0.0.tgz", - "integrity": "sha512-nla//68K9NU6yRiwDY/Q8aU6siKlSs64aEC7+IV56QoAuyQT2ovsJcgGYGyqMOmI/CGN1BOR6mM5EN0FBO+zyQ==", + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/which/-/which-3.0.1.tgz", + "integrity": "sha512-XA1b62dzQzLfaEOSQFTCOd5KFf/1VSzZo7/7TUjnya6u0vGGKzU96UQBZTAThCb2j4/xjBAyii1OhRLJEivHvg==", "dev": true, "dependencies": { "isexe": "^2.0.0" @@ -6056,20 +5189,6 @@ "node": "^14.17.0 || ^16.13.0 || >=18.0.0" } }, - "node_modules/@npmcli/move-file": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/@npmcli/move-file/-/move-file-2.0.1.tgz", - "integrity": "sha512-mJd2Z5TjYWq/ttPLLGqArdtnC74J6bOzg4rMDnN+p1xTacZ2yPRCk2y0oSWQtygLR9YVQXgOcONrwtnk3JupxQ==", - "deprecated": "This functionality has been moved to @npmcli/fs", - "dev": true, - "dependencies": { - "mkdirp": "^1.0.4", - "rimraf": "^3.0.2" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || >=16.0.0" - } - }, "node_modules/@npmcli/node-gyp": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/@npmcli/node-gyp/-/node-gyp-3.0.0.tgz", @@ -6092,9 +5211,9 @@ } }, "node_modules/@npmcli/promise-spawn/node_modules/which": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/which/-/which-3.0.0.tgz", - "integrity": "sha512-nla//68K9NU6yRiwDY/Q8aU6siKlSs64aEC7+IV56QoAuyQT2ovsJcgGYGyqMOmI/CGN1BOR6mM5EN0FBO+zyQ==", + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/which/-/which-3.0.1.tgz", + "integrity": "sha512-XA1b62dzQzLfaEOSQFTCOd5KFf/1VSzZo7/7TUjnya6u0vGGKzU96UQBZTAThCb2j4/xjBAyii1OhRLJEivHvg==", "dev": true, "dependencies": { "isexe": "^2.0.0" @@ -6107,9 +5226,9 @@ } }, "node_modules/@npmcli/run-script": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/@npmcli/run-script/-/run-script-6.0.0.tgz", - "integrity": "sha512-ql+AbRur1TeOdl1FY+RAwGW9fcr4ZwiVKabdvm93mujGREVuVLbdkXRJDrkTXSdCjaxYydr1wlA2v67jxWG5BQ==", + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/@npmcli/run-script/-/run-script-6.0.2.tgz", + "integrity": "sha512-NCcr1uQo1k5U+SYlnIrbAh3cxy+OQT1VtqiAbxdymSlptbzBb62AjH2xXgjNCoP073hoa1CfCAcwoZ8k96C4nA==", "dev": true, "dependencies": { "@npmcli/node-gyp": "^3.0.0", @@ -6123,9 +5242,9 @@ } }, "node_modules/@npmcli/run-script/node_modules/which": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/which/-/which-3.0.0.tgz", - "integrity": "sha512-nla//68K9NU6yRiwDY/Q8aU6siKlSs64aEC7+IV56QoAuyQT2ovsJcgGYGyqMOmI/CGN1BOR6mM5EN0FBO+zyQ==", + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/which/-/which-3.0.1.tgz", + "integrity": "sha512-XA1b62dzQzLfaEOSQFTCOd5KFf/1VSzZo7/7TUjnya6u0vGGKzU96UQBZTAThCb2j4/xjBAyii1OhRLJEivHvg==", "dev": true, "dependencies": { "isexe": "^2.0.0" @@ -6137,37 +5256,702 @@ "node": "^14.17.0 || ^16.13.0 || >=18.0.0" } }, - "node_modules/@schematics/angular": { - "version": "15.2.8", - "resolved": "https://registry.npmjs.org/@schematics/angular/-/angular-15.2.8.tgz", - "integrity": "sha512-F49IEzCFxQlpaMIgTO/wF1l/CLQKif7VaiDdyiTKOeT22IMmyd61FUmWDyZYfCBqMlvBmvDGx64HaHWes1HYCg==", + "node_modules/@nrwl/devkit": { + "version": "16.5.1", + "resolved": "https://registry.npmjs.org/@nrwl/devkit/-/devkit-16.5.1.tgz", + "integrity": "sha512-NB+DE/+AFJ7lKH/WBFyatJEhcZGj25F24ncDkwjZ6MzEiSOGOJS0LaV/R+VUsmS5EHTPXYOpn3zHWWAcJhyOmA==", "dev": true, "dependencies": { - "@angular-devkit/core": "15.2.8", - "@angular-devkit/schematics": "15.2.8", + "@nx/devkit": "16.5.1" + } + }, + "node_modules/@nrwl/tao": { + "version": "16.5.1", + "resolved": "https://registry.npmjs.org/@nrwl/tao/-/tao-16.5.1.tgz", + "integrity": "sha512-x+gi/fKdM6uQNIti9exFlm3V5LBP3Y8vOEziO42HdOigyrXa0S0HD2WMpccmp6PclYKhwEDUjKJ39xh5sdh4Ig==", + "dev": true, + "dependencies": { + "nx": "16.5.1" + }, + "bin": { + "tao": "index.js" + } + }, + "node_modules/@nx/devkit": { + "version": "16.5.1", + "resolved": "https://registry.npmjs.org/@nx/devkit/-/devkit-16.5.1.tgz", + "integrity": "sha512-T1acZrVVmJw/sJ4PIGidCBYBiBqlg/jT9e8nIGXLSDS20xcLvfo4zBQf8UZLrmHglnwwpDpOWuVJCp2rYA5aDg==", + "dev": true, + "dependencies": { + "@nrwl/devkit": "16.5.1", + "ejs": "^3.1.7", + "ignore": "^5.0.4", + "semver": "7.5.3", + "tmp": "~0.2.1", + "tslib": "^2.3.0" + }, + "peerDependencies": { + "nx": ">= 15 <= 17" + } + }, + "node_modules/@nx/nx-darwin-arm64": { + "version": "16.5.1", + "resolved": "https://registry.npmjs.org/@nx/nx-darwin-arm64/-/nx-darwin-arm64-16.5.1.tgz", + "integrity": "sha512-q98TFI4B/9N9PmKUr1jcbtD4yAFs1HfYd9jUXXTQOlfO9SbDjnrYJgZ4Fp9rMNfrBhgIQ4x1qx0AukZccKmH9Q==", + "cpu": [ + "arm64" + ], + "dev": true, + "optional": true, + "os": [ + "darwin" + ], + "engines": { + "node": ">= 10" + } + }, + "node_modules/@nx/nx-darwin-x64": { + "version": "16.5.1", + "resolved": "https://registry.npmjs.org/@nx/nx-darwin-x64/-/nx-darwin-x64-16.5.1.tgz", + "integrity": "sha512-j9HmL1l8k7EVJ3eOM5y8COF93gqrydpxCDoz23ZEtsY+JHY77VAiRQsmqBgEx9GGA2dXi9VEdS67B0+1vKariw==", + "cpu": [ + "x64" + ], + "dev": true, + "optional": true, + "os": [ + "darwin" + ], + "engines": { + "node": ">= 10" + } + }, + "node_modules/@nx/nx-freebsd-x64": { + "version": "16.5.1", + "resolved": "https://registry.npmjs.org/@nx/nx-freebsd-x64/-/nx-freebsd-x64-16.5.1.tgz", + "integrity": "sha512-CXSPT01aVS869tvCCF2tZ7LnCa8l41wJ3mTVtWBkjmRde68E5Up093hklRMyXb3kfiDYlfIKWGwrV4r0eH6x1A==", + "cpu": [ + "x64" + ], + "dev": true, + "optional": true, + "os": [ + "freebsd" + ], + "engines": { + "node": ">= 10" + } + }, + "node_modules/@nx/nx-linux-arm-gnueabihf": { + "version": "16.5.1", + "resolved": "https://registry.npmjs.org/@nx/nx-linux-arm-gnueabihf/-/nx-linux-arm-gnueabihf-16.5.1.tgz", + "integrity": "sha512-BhrumqJSZCWFfLFUKl4CAUwR0Y0G2H5EfFVGKivVecEQbb+INAek1aa6c89evg2/OvetQYsJ+51QknskwqvLsA==", + "cpu": [ + "arm" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">= 10" + } + }, + "node_modules/@nx/nx-linux-arm64-gnu": { + "version": "16.5.1", + "resolved": "https://registry.npmjs.org/@nx/nx-linux-arm64-gnu/-/nx-linux-arm64-gnu-16.5.1.tgz", + "integrity": "sha512-x7MsSG0W+X43WVv7JhiSq2eKvH2suNKdlUHEG09Yt0vm3z0bhtym1UCMUg3IUAK7jy9hhLeDaFVFkC6zo+H/XQ==", + "cpu": [ + "arm64" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">= 10" + } + }, + "node_modules/@nx/nx-linux-arm64-musl": { + "version": "16.5.1", + "resolved": "https://registry.npmjs.org/@nx/nx-linux-arm64-musl/-/nx-linux-arm64-musl-16.5.1.tgz", + "integrity": "sha512-J+/v/mFjOm74I0PNtH5Ka+fDd+/dWbKhpcZ2R1/6b9agzZk+Ff/SrwJcSYFXXWKbPX+uQ4RcJoytT06Zs3s0ow==", + "cpu": [ + "arm64" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">= 10" + } + }, + "node_modules/@nx/nx-linux-x64-gnu": { + "version": "16.5.1", + "resolved": "https://registry.npmjs.org/@nx/nx-linux-x64-gnu/-/nx-linux-x64-gnu-16.5.1.tgz", + "integrity": "sha512-igooWJ5YxQ94Zft7IqgL+Lw0qHaY15Btw4gfK756g/YTYLZEt4tTvR1y6RnK/wdpE3sa68bFTLVBNCGTyiTiDQ==", + "cpu": [ + "x64" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">= 10" + } + }, + "node_modules/@nx/nx-linux-x64-musl": { + "version": "16.5.1", + "resolved": "https://registry.npmjs.org/@nx/nx-linux-x64-musl/-/nx-linux-x64-musl-16.5.1.tgz", + "integrity": "sha512-zF/exnPqFYbrLAduGhTmZ7zNEyADid2bzNQiIjJkh8Y6NpDwrQIwVIyvIxqynsjMrIs51kBH+8TUjKjj2Jgf5A==", + "cpu": [ + "x64" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">= 10" + } + }, + "node_modules/@nx/nx-win32-arm64-msvc": { + "version": "16.5.1", + "resolved": "https://registry.npmjs.org/@nx/nx-win32-arm64-msvc/-/nx-win32-arm64-msvc-16.5.1.tgz", + "integrity": "sha512-qtqiLS9Y9TYyAbbpq58kRoOroko4ZXg5oWVqIWFHoxc5bGPweQSJCROEqd1AOl2ZDC6BxfuVHfhDDop1kK05WA==", + "cpu": [ + "arm64" + ], + "dev": true, + "optional": true, + "os": [ + "win32" + ], + "engines": { + "node": ">= 10" + } + }, + "node_modules/@nx/nx-win32-x64-msvc": { + "version": "16.5.1", + "resolved": "https://registry.npmjs.org/@nx/nx-win32-x64-msvc/-/nx-win32-x64-msvc-16.5.1.tgz", + "integrity": "sha512-kUJBLakK7iyA9WfsGGQBVennA4jwf5XIgm0lu35oMOphtZIluvzItMt0EYBmylEROpmpEIhHq0P6J9FA+WH0Rg==", + "cpu": [ + "x64" + ], + "dev": true, + "optional": true, + "os": [ + "win32" + ], + "engines": { + "node": ">= 10" + } + }, + "node_modules/@parcel/watcher": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/@parcel/watcher/-/watcher-2.0.4.tgz", + "integrity": "sha512-cTDi+FUDBIUOBKEtj+nhiJ71AZVlkAsQFuGQTun5tV9mwQBQgZvhCzG+URPQc8myeN32yRVZEfVAPCs1RW+Jvg==", + "dev": true, + "hasInstallScript": true, + "dependencies": { + "node-addon-api": "^3.2.1", + "node-gyp-build": "^4.3.0" + }, + "engines": { + "node": ">= 10.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/parcel" + } + }, + "node_modules/@pkgjs/parseargs": { + "version": "0.11.0", + "resolved": "https://registry.npmjs.org/@pkgjs/parseargs/-/parseargs-0.11.0.tgz", + "integrity": "sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==", + "dev": true, + "optional": true, + "engines": { + "node": ">=14" + } + }, + "node_modules/@schematics/angular": { + "version": "16.2.3", + "resolved": "https://registry.npmjs.org/@schematics/angular/-/angular-16.2.3.tgz", + "integrity": "sha512-QZOh6iH3BQo4azmqGIoydW95KuxTGezTXl+cfekr4ru5IJ7FqCwrg4wQKWD8/3FkxakXjAFdqsWhlxn1kGtyqw==", + "dev": true, + "dependencies": { + "@angular-devkit/core": "16.2.3", + "@angular-devkit/schematics": "16.2.3", "jsonc-parser": "3.2.0" }, "engines": { - "node": "^14.20.0 || ^16.13.0 || >=18.10.0", + "node": "^16.14.0 || >=18.10.0", "npm": "^6.11.0 || ^7.5.6 || >=8.0.0", "yarn": ">= 1.13.0" } }, + "node_modules/@sigstore/bundle": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@sigstore/bundle/-/bundle-1.1.0.tgz", + "integrity": "sha512-PFutXEy0SmQxYI4texPw3dd2KewuNqv7OuK1ZFtY2fM754yhvG2KdgwIhRnoEE2uHdtdGNQ8s0lb94dW9sELog==", + "dev": true, + "dependencies": { + "@sigstore/protobuf-specs": "^0.2.0" + }, + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, "node_modules/@sigstore/protobuf-specs": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/@sigstore/protobuf-specs/-/protobuf-specs-0.1.0.tgz", - "integrity": "sha512-a31EnjuIDSX8IXBUib3cYLDRlPMU36AWX4xS8ysLaNu4ZzUesDiPt83pgrW2X1YLMe5L2HbDyaKK5BrL4cNKaQ==", + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/@sigstore/protobuf-specs/-/protobuf-specs-0.2.1.tgz", + "integrity": "sha512-XTWVxnWJu+c1oCshMLwnKvz8ZQJJDVOlciMfgpJBQbThVjKTCG8dwyhgLngBD2KN0ap9F/gOV8rFDEx8uh7R2A==", "dev": true, "engines": { "node": "^14.17.0 || ^16.13.0 || >=18.0.0" } }, - "node_modules/@smithy/protocol-http": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/@smithy/protocol-http/-/protocol-http-1.1.0.tgz", - "integrity": "sha512-H5y/kZOqfJSqRkwtcAoVbqONmhdXwSgYNJ1Glk5Ry8qlhVVy5qUzD9EklaCH8/XLnoCsLO/F/Giee8MIvaBRkg==", + "node_modules/@sigstore/sign": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/@sigstore/sign/-/sign-1.0.0.tgz", + "integrity": "sha512-INxFVNQteLtcfGmcoldzV6Je0sbbfh9I16DM4yJPw3j5+TFP8X6uIiA18mvpEa9yyeycAKgPmOA3X9hVdVTPUA==", + "dev": true, "dependencies": { - "@smithy/types": "^1.1.0", + "@sigstore/bundle": "^1.1.0", + "@sigstore/protobuf-specs": "^0.2.0", + "make-fetch-happen": "^11.0.1" + }, + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, + "node_modules/@sigstore/tuf": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/@sigstore/tuf/-/tuf-1.0.3.tgz", + "integrity": "sha512-2bRovzs0nJZFlCN3rXirE4gwxCn97JNjMmwpecqlbgV9WcxX7WRuIrgzx/X7Ib7MYRbyUTpBYE0s2x6AmZXnlg==", + "dev": true, + "dependencies": { + "@sigstore/protobuf-specs": "^0.2.0", + "tuf-js": "^1.1.7" + }, + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, + "node_modules/@smithy/abort-controller": { + "version": "2.0.9", + "resolved": "https://registry.npmjs.org/@smithy/abort-controller/-/abort-controller-2.0.9.tgz", + "integrity": "sha512-8liHOEbx99xcy4VndeQNQhyA0LS+e7UqsuRnDTSIA26IKBv/7vA9w09KOd4fgNULrvX0r3WpA6cwsQTRJpSWkg==", + "dependencies": { + "@smithy/types": "^2.3.3", + "tslib": "^2.5.0" + }, + "engines": { + "node": ">=14.0.0" + } + }, + "node_modules/@smithy/chunked-blob-reader": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/@smithy/chunked-blob-reader/-/chunked-blob-reader-2.0.0.tgz", + "integrity": "sha512-k+J4GHJsMSAIQPChGBrjEmGS+WbPonCXesoqP9fynIqjn7rdOThdH8FAeCmokP9mxTYKQAKoHCLPzNlm6gh7Wg==", + "dependencies": { + "tslib": "^2.5.0" + } + }, + "node_modules/@smithy/chunked-blob-reader-native": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/@smithy/chunked-blob-reader-native/-/chunked-blob-reader-native-2.0.0.tgz", + "integrity": "sha512-HM8V2Rp1y8+1343tkZUKZllFhEQPNmpNdgFAncbTsxkZ18/gqjk23XXv3qGyXWp412f3o43ZZ1UZHVcHrpRnCQ==", + "dependencies": { + "@smithy/util-base64": "^2.0.0", + "tslib": "^2.5.0" + } + }, + "node_modules/@smithy/config-resolver": { + "version": "2.0.10", + "resolved": "https://registry.npmjs.org/@smithy/config-resolver/-/config-resolver-2.0.10.tgz", + "integrity": "sha512-MwToDsCltHjumkCuRn883qoNeJUawc2b8sX9caSn5vLz6J5crU1IklklNxWCaMO2z2nDL91Po4b/aI1eHv5PfA==", + "dependencies": { + "@smithy/node-config-provider": "^2.0.12", + "@smithy/types": "^2.3.3", + "@smithy/util-config-provider": "^2.0.0", + "@smithy/util-middleware": "^2.0.2", + "tslib": "^2.5.0" + }, + "engines": { + "node": ">=14.0.0" + } + }, + "node_modules/@smithy/credential-provider-imds": { + "version": "2.0.12", + "resolved": "https://registry.npmjs.org/@smithy/credential-provider-imds/-/credential-provider-imds-2.0.12.tgz", + "integrity": "sha512-S3lUNe+2fEFwKcmiQniXGPXt69vaHvQCw8kYQOBL4OvJsgwfpkIYDZdroHbTshYi0M6WaKL26Mw+hvgma6dZqA==", + "dependencies": { + "@smithy/node-config-provider": "^2.0.12", + "@smithy/property-provider": "^2.0.10", + "@smithy/types": "^2.3.3", + "@smithy/url-parser": "^2.0.9", + "tslib": "^2.5.0" + }, + "engines": { + "node": ">=14.0.0" + } + }, + "node_modules/@smithy/eventstream-codec": { + "version": "2.0.9", + "resolved": "https://registry.npmjs.org/@smithy/eventstream-codec/-/eventstream-codec-2.0.9.tgz", + "integrity": "sha512-sy0pcbKnawt1iu+qCoSFbs/h9PAaUgvlJEO3lqkE1HFFj4p5RgL98vH+9CyDoj6YY82cG5XsorFmcLqQJHTOYw==", + "dependencies": { + "@aws-crypto/crc32": "3.0.0", + "@smithy/types": "^2.3.3", + "@smithy/util-hex-encoding": "^2.0.0", + "tslib": "^2.5.0" + } + }, + "node_modules/@smithy/eventstream-serde-browser": { + "version": "2.0.9", + "resolved": "https://registry.npmjs.org/@smithy/eventstream-serde-browser/-/eventstream-serde-browser-2.0.9.tgz", + "integrity": "sha512-g70enHZau2hGj1Uxedrn8AAjH9E7RnpHdwkuPKapagah53ztbwI7xaNeA5SLD4MjSjdrjathyQBCQKIzwXrR1g==", + "dependencies": { + "@smithy/eventstream-serde-universal": "^2.0.9", + "@smithy/types": "^2.3.3", + "tslib": "^2.5.0" + }, + "engines": { + "node": ">=14.0.0" + } + }, + "node_modules/@smithy/eventstream-serde-config-resolver": { + "version": "2.0.9", + "resolved": "https://registry.npmjs.org/@smithy/eventstream-serde-config-resolver/-/eventstream-serde-config-resolver-2.0.9.tgz", + "integrity": "sha512-+15GzIMtdSuRPyuCeGZ7gzgD94Ejv6eM1vKcqvipdzS+i36KTZ2A9aZsJk+gDw//OCD1EMx9SqpV6bUvMS4PWg==", + "dependencies": { + "@smithy/types": "^2.3.3", + "tslib": "^2.5.0" + }, + "engines": { + "node": ">=14.0.0" + } + }, + "node_modules/@smithy/eventstream-serde-node": { + "version": "2.0.9", + "resolved": "https://registry.npmjs.org/@smithy/eventstream-serde-node/-/eventstream-serde-node-2.0.9.tgz", + "integrity": "sha512-UEJcvN2WXXEjkewtFkj1S2HSZLbyCgzUnfoFPrTuKy4+xRfakO5dNx6ws2h1pvb8Vc7mTuBL+Webl1R5mnVsXA==", + "dependencies": { + "@smithy/eventstream-serde-universal": "^2.0.9", + "@smithy/types": "^2.3.3", + "tslib": "^2.5.0" + }, + "engines": { + "node": ">=14.0.0" + } + }, + "node_modules/@smithy/eventstream-serde-universal": { + "version": "2.0.9", + "resolved": "https://registry.npmjs.org/@smithy/eventstream-serde-universal/-/eventstream-serde-universal-2.0.9.tgz", + "integrity": "sha512-dAHQEYlK/1tjjieBE7jjXwpLQFgKdkvC4HSQf+/Jj4t34XbUmXWHbw92/EuLp9+vjNB/JQPvkwpMtN31jxIDeg==", + "dependencies": { + "@smithy/eventstream-codec": "^2.0.9", + "@smithy/types": "^2.3.3", + "tslib": "^2.5.0" + }, + "engines": { + "node": ">=14.0.0" + } + }, + "node_modules/@smithy/fetch-http-handler": { + "version": "2.1.5", + "resolved": "https://registry.npmjs.org/@smithy/fetch-http-handler/-/fetch-http-handler-2.1.5.tgz", + "integrity": "sha512-BIeCHGfr5JCGN+EMTwZK74ELvjPXOIrI7OLM5OhZJJ6AmZyRv2S9ANJk18AtLwht0TsSm+8WoXIEp8LuxNgUyA==", + "dependencies": { + "@smithy/protocol-http": "^3.0.5", + "@smithy/querystring-builder": "^2.0.9", + "@smithy/types": "^2.3.3", + "@smithy/util-base64": "^2.0.0", + "tslib": "^2.5.0" + } + }, + "node_modules/@smithy/hash-blob-browser": { + "version": "2.0.9", + "resolved": "https://registry.npmjs.org/@smithy/hash-blob-browser/-/hash-blob-browser-2.0.9.tgz", + "integrity": "sha512-JNWOV1ci9vIg4U82klNr07bZXsA6OCumqHugpvZdvvn6cNGwTa4rvpS5FpPcqKeh3Rdg1rr4h8g+X6zyOamnZw==", + "dependencies": { + "@smithy/chunked-blob-reader": "^2.0.0", + "@smithy/chunked-blob-reader-native": "^2.0.0", + "@smithy/types": "^2.3.3", + "tslib": "^2.5.0" + } + }, + "node_modules/@smithy/hash-node": { + "version": "2.0.9", + "resolved": "https://registry.npmjs.org/@smithy/hash-node/-/hash-node-2.0.9.tgz", + "integrity": "sha512-XP3yWd5wyCtiVmsY5Nuq/FUwyCEQ6YG7DsvRh7ThldNukGpCzyFdP8eivZJVjn4Fx7oYrrOnVoYZ0WEgpW1AvQ==", + "dependencies": { + "@smithy/types": "^2.3.3", + "@smithy/util-buffer-from": "^2.0.0", + "@smithy/util-utf8": "^2.0.0", + "tslib": "^2.5.0" + }, + "engines": { + "node": ">=14.0.0" + } + }, + "node_modules/@smithy/hash-stream-node": { + "version": "2.0.9", + "resolved": "https://registry.npmjs.org/@smithy/hash-stream-node/-/hash-stream-node-2.0.9.tgz", + "integrity": "sha512-3nrkMpiOrhsJvJS6K4OkP0qvA3U5r8PpseXULeGd1ZD1EbfcZ30Lvl72FGaaHskwWZyTPR4czr1d/RwLRCVHNA==", + "dependencies": { + "@smithy/types": "^2.3.3", + "@smithy/util-utf8": "^2.0.0", + "tslib": "^2.5.0" + }, + "engines": { + "node": ">=14.0.0" + } + }, + "node_modules/@smithy/invalid-dependency": { + "version": "2.0.9", + "resolved": "https://registry.npmjs.org/@smithy/invalid-dependency/-/invalid-dependency-2.0.9.tgz", + "integrity": "sha512-RuJqhYf8nViK96IIO9JbTtjDUuFItVfuuJhWw2yk7fv67yltQ7fZD6IQ2OsHHluoVmstnQJuCg5raXJR696Ubw==", + "dependencies": { + "@smithy/types": "^2.3.3", + "tslib": "^2.5.0" + } + }, + "node_modules/@smithy/is-array-buffer": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/@smithy/is-array-buffer/-/is-array-buffer-2.0.0.tgz", + "integrity": "sha512-z3PjFjMyZNI98JFRJi/U0nGoLWMSJlDjAW4QUX2WNZLas5C0CmVV6LJ01JI0k90l7FvpmixjWxPFmENSClQ7ug==", + "dependencies": { + "tslib": "^2.5.0" + }, + "engines": { + "node": ">=14.0.0" + } + }, + "node_modules/@smithy/md5-js": { + "version": "2.0.9", + "resolved": "https://registry.npmjs.org/@smithy/md5-js/-/md5-js-2.0.9.tgz", + "integrity": "sha512-ALHGoTZDgBXBbjCpQzVy6hpa6Rdr6e2jyEw51d6CQOUpHkUnFH7G96UWhVwUnkP0xozPCvmWy+3+j2QUX+oK9w==", + "dependencies": { + "@smithy/types": "^2.3.3", + "@smithy/util-utf8": "^2.0.0", + "tslib": "^2.5.0" + } + }, + "node_modules/@smithy/middleware-content-length": { + "version": "2.0.11", + "resolved": "https://registry.npmjs.org/@smithy/middleware-content-length/-/middleware-content-length-2.0.11.tgz", + "integrity": "sha512-Malj4voNTL4+a5ZL3a6+Ij7JTUMTa2R7c3ZIBzMxN5OUUgAspU7uFi1Q97f4B0afVh2joQBAWH5IQJUG25nl8g==", + "dependencies": { + "@smithy/protocol-http": "^3.0.5", + "@smithy/types": "^2.3.3", + "tslib": "^2.5.0" + }, + "engines": { + "node": ">=14.0.0" + } + }, + "node_modules/@smithy/middleware-endpoint": { + "version": "2.0.9", + "resolved": "https://registry.npmjs.org/@smithy/middleware-endpoint/-/middleware-endpoint-2.0.9.tgz", + "integrity": "sha512-72/o8R6AAO4+nyTI6h4z6PYGTSA4dr1M7tZz29U8DEUHuh1YkhC77js0P6RyF9G0wDLuYqxb+Yh0crI5WG2pJg==", + "dependencies": { + "@smithy/middleware-serde": "^2.0.9", + "@smithy/types": "^2.3.3", + "@smithy/url-parser": "^2.0.9", + "@smithy/util-middleware": "^2.0.2", + "tslib": "^2.5.0" + }, + "engines": { + "node": ">=14.0.0" + } + }, + "node_modules/@smithy/middleware-retry": { + "version": "2.0.12", + "resolved": "https://registry.npmjs.org/@smithy/middleware-retry/-/middleware-retry-2.0.12.tgz", + "integrity": "sha512-YQ/ufXX4/d9/+Jf1QQ4J+CVeupC7BW52qldBTvRV33PDX9vxndlAwkFwzBcmnUFC3Hjf1//HW6I77EItcjNSCA==", + "dependencies": { + "@smithy/node-config-provider": "^2.0.12", + "@smithy/protocol-http": "^3.0.5", + "@smithy/service-error-classification": "^2.0.2", + "@smithy/types": "^2.3.3", + "@smithy/util-middleware": "^2.0.2", + "@smithy/util-retry": "^2.0.2", + "tslib": "^2.5.0", + "uuid": "^8.3.2" + }, + "engines": { + "node": ">=14.0.0" + } + }, + "node_modules/@smithy/middleware-retry/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==", + "bin": { + "uuid": "dist/bin/uuid" + } + }, + "node_modules/@smithy/middleware-serde": { + "version": "2.0.9", + "resolved": "https://registry.npmjs.org/@smithy/middleware-serde/-/middleware-serde-2.0.9.tgz", + "integrity": "sha512-GVbauxrr6WmtCaesakktg3t5LR/yDbajpC7KkWc8rtCpddMI4ShAVO5Q6DqwX8MDFi4CLaY8H7eTGcxhl3jbLg==", + "dependencies": { + "@smithy/types": "^2.3.3", + "tslib": "^2.5.0" + }, + "engines": { + "node": ">=14.0.0" + } + }, + "node_modules/@smithy/middleware-stack": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/@smithy/middleware-stack/-/middleware-stack-2.0.3.tgz", + "integrity": "sha512-AlhPmbwpkC4lQBVaVHXczmjFvsAhDHhrakqLt038qFLotnJcvDLhmMzAtu23alBeOSkKxkTQq0LsAt2N0WpAbw==", + "dependencies": { + "@smithy/types": "^2.3.3", + "tslib": "^2.5.0" + }, + "engines": { + "node": ">=14.0.0" + } + }, + "node_modules/@smithy/node-config-provider": { + "version": "2.0.12", + "resolved": "https://registry.npmjs.org/@smithy/node-config-provider/-/node-config-provider-2.0.12.tgz", + "integrity": "sha512-df9y9ywv+JmS40Y60ZqJ4jfZiTCmyHQffwzIqjBjLJLJl0imf9F6DWBd+jiEWHvlohR+sFhyY+KL/qzKgnAq1A==", + "dependencies": { + "@smithy/property-provider": "^2.0.10", + "@smithy/shared-ini-file-loader": "^2.0.11", + "@smithy/types": "^2.3.3", + "tslib": "^2.5.0" + }, + "engines": { + "node": ">=14.0.0" + } + }, + "node_modules/@smithy/node-http-handler": { + "version": "2.1.5", + "resolved": "https://registry.npmjs.org/@smithy/node-http-handler/-/node-http-handler-2.1.5.tgz", + "integrity": "sha512-52uF+BrZaFiBh+NT/bADiVDCQO91T+OwDRsuaAeWZC1mlCXFjAPPQdxeQohtuYOe9m7mPP/xIMNiqbe8jvndHA==", + "dependencies": { + "@smithy/abort-controller": "^2.0.9", + "@smithy/protocol-http": "^3.0.5", + "@smithy/querystring-builder": "^2.0.9", + "@smithy/types": "^2.3.3", + "tslib": "^2.5.0" + }, + "engines": { + "node": ">=14.0.0" + } + }, + "node_modules/@smithy/property-provider": { + "version": "2.0.10", + "resolved": "https://registry.npmjs.org/@smithy/property-provider/-/property-provider-2.0.10.tgz", + "integrity": "sha512-YMBVfh0ZMmJtbsUn+WfSwR32iRljZPdRN0Tn2GAcdJ+ejX8WrBXD7Z0jIkQDrQZr8fEuuv5x8WxMIj+qVbsPQw==", + "dependencies": { + "@smithy/types": "^2.3.3", + "tslib": "^2.5.0" + }, + "engines": { + "node": ">=14.0.0" + } + }, + "node_modules/@smithy/protocol-http": { + "version": "3.0.5", + "resolved": "https://registry.npmjs.org/@smithy/protocol-http/-/protocol-http-3.0.5.tgz", + "integrity": "sha512-3t3fxj+ip4EPHRC2fQ0JimMxR/qCQ1LSQJjZZVZFgROnFLYWPDgUZqpoi7chr+EzatxJVXF/Rtoi5yLHOWCoZQ==", + "dependencies": { + "@smithy/types": "^2.3.3", + "tslib": "^2.5.0" + }, + "engines": { + "node": ">=14.0.0" + } + }, + "node_modules/@smithy/querystring-builder": { + "version": "2.0.9", + "resolved": "https://registry.npmjs.org/@smithy/querystring-builder/-/querystring-builder-2.0.9.tgz", + "integrity": "sha512-Yt6CPF4j3j1cuwod/DRflbuXxBFjJm7gAjy6W1RE21Rz5/kfGFqiZBXWmmXwGtnnhiLThYwoHK4S6/TQtnx0Fg==", + "dependencies": { + "@smithy/types": "^2.3.3", + "@smithy/util-uri-escape": "^2.0.0", + "tslib": "^2.5.0" + }, + "engines": { + "node": ">=14.0.0" + } + }, + "node_modules/@smithy/querystring-parser": { + "version": "2.0.9", + "resolved": "https://registry.npmjs.org/@smithy/querystring-parser/-/querystring-parser-2.0.9.tgz", + "integrity": "sha512-U6z4N743s4vrcxPW8p8+reLV0PjMCYEyb1/wtMVvv3VnbJ74gshdI8SR1sBnEh95cF8TxonmX5IxY25tS9qGfg==", + "dependencies": { + "@smithy/types": "^2.3.3", + "tslib": "^2.5.0" + }, + "engines": { + "node": ">=14.0.0" + } + }, + "node_modules/@smithy/service-error-classification": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/@smithy/service-error-classification/-/service-error-classification-2.0.2.tgz", + "integrity": "sha512-GTUd2j63gKy7A+ggvSdn2hc4sejG7LWfE+ZMF17vzWoNyqERWbRP7HTPS0d0Lwg1p6OQCAzvNigSrEIWVFt6iA==", + "dependencies": { + "@smithy/types": "^2.3.3" + }, + "engines": { + "node": ">=14.0.0" + } + }, + "node_modules/@smithy/shared-ini-file-loader": { + "version": "2.0.11", + "resolved": "https://registry.npmjs.org/@smithy/shared-ini-file-loader/-/shared-ini-file-loader-2.0.11.tgz", + "integrity": "sha512-Sf0u5C5px6eykXi6jImDTp+edvG3REtPjXnFWU/J+b7S2wkXwUqFXqBL5DdM4zC1F+M8u57ZT7NRqDwMOw7/Tw==", + "dependencies": { + "@smithy/types": "^2.3.3", + "tslib": "^2.5.0" + }, + "engines": { + "node": ">=14.0.0" + } + }, + "node_modules/@smithy/signature-v4": { + "version": "2.0.9", + "resolved": "https://registry.npmjs.org/@smithy/signature-v4/-/signature-v4-2.0.9.tgz", + "integrity": "sha512-RkHP0joSI1j2EI+mU55sOi33/aMMkKdL9ZY+SWrPxsiCe1oyzzuy79Tpn8X7uT+t0ilNmQlwPpkP/jUy940pEA==", + "dependencies": { + "@smithy/eventstream-codec": "^2.0.9", + "@smithy/is-array-buffer": "^2.0.0", + "@smithy/types": "^2.3.3", + "@smithy/util-hex-encoding": "^2.0.0", + "@smithy/util-middleware": "^2.0.2", + "@smithy/util-uri-escape": "^2.0.0", + "@smithy/util-utf8": "^2.0.0", + "tslib": "^2.5.0" + }, + "engines": { + "node": ">=14.0.0" + } + }, + "node_modules/@smithy/smithy-client": { + "version": "2.1.7", + "resolved": "https://registry.npmjs.org/@smithy/smithy-client/-/smithy-client-2.1.7.tgz", + "integrity": "sha512-r6T/oiBQ8vCbGqObH4/h0YqD0jFB1hAS9KFRmuTfaNJueu/L2hjmjqFjv3PV5lkbNHTgUYraSv4cFQ1naxiELQ==", + "dependencies": { + "@smithy/middleware-stack": "^2.0.3", + "@smithy/types": "^2.3.3", + "@smithy/util-stream": "^2.0.12", "tslib": "^2.5.0" }, "engines": { @@ -6175,9 +5959,9 @@ } }, "node_modules/@smithy/types": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/@smithy/types/-/types-1.1.0.tgz", - "integrity": "sha512-KzmvisMmuwD2jZXuC9e65JrgsZM97y5NpDU7g347oB+Q+xQLU6hQZ5zFNNbEfwwOJHoOvEVTna+dk1h/lW7alw==", + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/@smithy/types/-/types-2.3.3.tgz", + "integrity": "sha512-zTdIPR9PvFVNRdIKMQu4M5oyTaycIbUqLheQqaOi9rTWPkgjGO2wDBxMA1rBHQB81aqAEv+DbSS4jfKyQMnXRA==", "dependencies": { "tslib": "^2.5.0" }, @@ -6185,22 +5969,218 @@ "node": ">=14.0.0" } }, - "node_modules/@tootallnate/once": { + "node_modules/@smithy/url-parser": { + "version": "2.0.9", + "resolved": "https://registry.npmjs.org/@smithy/url-parser/-/url-parser-2.0.9.tgz", + "integrity": "sha512-NBnJ0NiY8z6E82Xd5VYUFQfKwK/wA/+QkKmpYUYP+cpH3aCzE6g2gvixd9vQKYjsIdRfNPCf+SFAozt8ljozOw==", + "dependencies": { + "@smithy/querystring-parser": "^2.0.9", + "@smithy/types": "^2.3.3", + "tslib": "^2.5.0" + } + }, + "node_modules/@smithy/util-base64": { "version": "2.0.0", - "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-2.0.0.tgz", - "integrity": "sha512-XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A==", + "resolved": "https://registry.npmjs.org/@smithy/util-base64/-/util-base64-2.0.0.tgz", + "integrity": "sha512-Zb1E4xx+m5Lud8bbeYi5FkcMJMnn+1WUnJF3qD7rAdXpaL7UjkFQLdmW5fHadoKbdHpwH9vSR8EyTJFHJs++tA==", + "dependencies": { + "@smithy/util-buffer-from": "^2.0.0", + "tslib": "^2.5.0" + }, + "engines": { + "node": ">=14.0.0" + } + }, + "node_modules/@smithy/util-body-length-browser": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/@smithy/util-body-length-browser/-/util-body-length-browser-2.0.0.tgz", + "integrity": "sha512-JdDuS4ircJt+FDnaQj88TzZY3+njZ6O+D3uakS32f2VNnDo3vyEuNdBOh/oFd8Df1zSZOuH1HEChk2AOYDezZg==", + "dependencies": { + "tslib": "^2.5.0" + } + }, + "node_modules/@smithy/util-body-length-node": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/@smithy/util-body-length-node/-/util-body-length-node-2.1.0.tgz", + "integrity": "sha512-/li0/kj/y3fQ3vyzn36NTLGmUwAICb7Jbe/CsWCktW363gh1MOcpEcSO3mJ344Gv2dqz8YJCLQpb6hju/0qOWw==", + "dependencies": { + "tslib": "^2.5.0" + }, + "engines": { + "node": ">=14.0.0" + } + }, + "node_modules/@smithy/util-buffer-from": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/@smithy/util-buffer-from/-/util-buffer-from-2.0.0.tgz", + "integrity": "sha512-/YNnLoHsR+4W4Vf2wL5lGv0ksg8Bmk3GEGxn2vEQt52AQaPSCuaO5PM5VM7lP1K9qHRKHwrPGktqVoAHKWHxzw==", + "dependencies": { + "@smithy/is-array-buffer": "^2.0.0", + "tslib": "^2.5.0" + }, + "engines": { + "node": ">=14.0.0" + } + }, + "node_modules/@smithy/util-config-provider": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/@smithy/util-config-provider/-/util-config-provider-2.0.0.tgz", + "integrity": "sha512-xCQ6UapcIWKxXHEU4Mcs2s7LcFQRiU3XEluM2WcCjjBtQkUN71Tb+ydGmJFPxMUrW/GWMgQEEGipLym4XG0jZg==", + "dependencies": { + "tslib": "^2.5.0" + }, + "engines": { + "node": ">=14.0.0" + } + }, + "node_modules/@smithy/util-defaults-mode-browser": { + "version": "2.0.11", + "resolved": "https://registry.npmjs.org/@smithy/util-defaults-mode-browser/-/util-defaults-mode-browser-2.0.11.tgz", + "integrity": "sha512-0syV1Mz/mCQ7CG/MHKQfH+w86xq59jpD0EOXv5oe0WBXLmq2lWPpVHl2Y6+jQ+/9fYzyZ5NF+NC/WEIuiv690A==", + "dependencies": { + "@smithy/property-provider": "^2.0.10", + "@smithy/smithy-client": "^2.1.7", + "@smithy/types": "^2.3.3", + "bowser": "^2.11.0", + "tslib": "^2.5.0" + }, + "engines": { + "node": ">= 10.0.0" + } + }, + "node_modules/@smithy/util-defaults-mode-node": { + "version": "2.0.13", + "resolved": "https://registry.npmjs.org/@smithy/util-defaults-mode-node/-/util-defaults-mode-node-2.0.13.tgz", + "integrity": "sha512-6BtCHYdw5Z8r6KpW8tRCc3yURgvcQwfIEeHhR70BeSOfx8T/TXPPjb8A+K45+KASspa3fzrsSxeIwB0sAeMoHA==", + "dependencies": { + "@smithy/config-resolver": "^2.0.10", + "@smithy/credential-provider-imds": "^2.0.12", + "@smithy/node-config-provider": "^2.0.12", + "@smithy/property-provider": "^2.0.10", + "@smithy/smithy-client": "^2.1.7", + "@smithy/types": "^2.3.3", + "tslib": "^2.5.0" + }, + "engines": { + "node": ">= 10.0.0" + } + }, + "node_modules/@smithy/util-hex-encoding": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/@smithy/util-hex-encoding/-/util-hex-encoding-2.0.0.tgz", + "integrity": "sha512-c5xY+NUnFqG6d7HFh1IFfrm3mGl29lC+vF+geHv4ToiuJCBmIfzx6IeHLg+OgRdPFKDXIw6pvi+p3CsscaMcMA==", + "dependencies": { + "tslib": "^2.5.0" + }, + "engines": { + "node": ">=14.0.0" + } + }, + "node_modules/@smithy/util-middleware": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/@smithy/util-middleware/-/util-middleware-2.0.2.tgz", + "integrity": "sha512-UGPZM+Ja/vke5pc/S8G0LNiHpVirtjppsXO+GK9m9wbzRGzPJTfnZA/gERUUN/AfxEy/8SL7U1kd7u4t2X8K1w==", + "dependencies": { + "@smithy/types": "^2.3.3", + "tslib": "^2.5.0" + }, + "engines": { + "node": ">=14.0.0" + } + }, + "node_modules/@smithy/util-retry": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/@smithy/util-retry/-/util-retry-2.0.2.tgz", + "integrity": "sha512-ovWiayUB38moZcLhSFFfUgB2IMb7R1JfojU20qSahjxAgfOZvDWme3eOYUMtAVnouZ9kYJiFgHLy27qRH4NeeA==", + "dependencies": { + "@smithy/service-error-classification": "^2.0.2", + "@smithy/types": "^2.3.3", + "tslib": "^2.5.0" + }, + "engines": { + "node": ">= 14.0.0" + } + }, + "node_modules/@smithy/util-stream": { + "version": "2.0.12", + "resolved": "https://registry.npmjs.org/@smithy/util-stream/-/util-stream-2.0.12.tgz", + "integrity": "sha512-FOCpRLaj6gvSyUC5mJAACT+sPMPmp9sD1o+hVbUH/QxwZfulypA3ZIFdAg/59/IY0d/1Q4CTztsiHEB5LgjN4g==", + "dependencies": { + "@smithy/fetch-http-handler": "^2.1.5", + "@smithy/node-http-handler": "^2.1.5", + "@smithy/types": "^2.3.3", + "@smithy/util-base64": "^2.0.0", + "@smithy/util-buffer-from": "^2.0.0", + "@smithy/util-hex-encoding": "^2.0.0", + "@smithy/util-utf8": "^2.0.0", + "tslib": "^2.5.0" + }, + "engines": { + "node": ">=14.0.0" + } + }, + "node_modules/@smithy/util-uri-escape": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/@smithy/util-uri-escape/-/util-uri-escape-2.0.0.tgz", + "integrity": "sha512-ebkxsqinSdEooQduuk9CbKcI+wheijxEb3utGXkCoYQkJnwTnLbH1JXGimJtUkQwNQbsbuYwG2+aFVyZf5TLaw==", + "dependencies": { + "tslib": "^2.5.0" + }, + "engines": { + "node": ">=14.0.0" + } + }, + "node_modules/@smithy/util-utf8": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/@smithy/util-utf8/-/util-utf8-2.0.0.tgz", + "integrity": "sha512-rctU1VkziY84n5OXe3bPNpKR001ZCME2JCaBBFgtiM2hfKbHFudc/BkMuPab8hRbLd0j3vbnBTTZ1igBf0wgiQ==", + "dependencies": { + "@smithy/util-buffer-from": "^2.0.0", + "tslib": "^2.5.0" + }, + "engines": { + "node": ">=14.0.0" + } + }, + "node_modules/@smithy/util-waiter": { + "version": "2.0.9", + "resolved": "https://registry.npmjs.org/@smithy/util-waiter/-/util-waiter-2.0.9.tgz", + "integrity": "sha512-Hy9Cs0FtIacC1aVFk98bm/7CYqim9fnHAPRnV/SB2mj02ExYs/9Dn5SrNQmtTBTLCn65KqYnNVBNS8GuGpZOOw==", + "dependencies": { + "@smithy/abort-controller": "^2.0.9", + "@smithy/types": "^2.3.3", + "tslib": "^2.5.0" + }, + "engines": { + "node": ">=14.0.0" + } + }, + "node_modules/@tootallnate/once": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-1.1.2.tgz", + "integrity": "sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw==", "dev": true, "engines": { - "node": ">= 10" + "node": ">= 6" + } + }, + "node_modules/@tufjs/canonical-json": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/@tufjs/canonical-json/-/canonical-json-1.0.0.tgz", + "integrity": "sha512-QTnf++uxunWvG2z3UFNzAoQPHxnSXOwtaI3iJ+AohhV+5vONuArPjJE7aPXPVXfXJsqrVbZBu9b81AJoSd09IQ==", + "dev": true, + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" } }, "node_modules/@tufjs/models": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/@tufjs/models/-/models-1.0.1.tgz", - "integrity": "sha512-AY0VoG/AXdlSOocuREfPoEW4SNhOPp/7fw6mpAxfVIny1uZ+0fEtMoCi7NhELSlqQIRLMu7RgfKhkxT+AJ+EXg==", + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/@tufjs/models/-/models-1.0.4.tgz", + "integrity": "sha512-qaGV9ltJP0EO25YfFUPhxRVK0evXFIAGicsVXuRim4Ed9cjPxYhNnNJ49SFmbeLgtxpslIkX317IgpfcHPVj/A==", "dev": true, "dependencies": { - "minimatch": "^7.4.2" + "@tufjs/canonical-json": "1.0.0", + "minimatch": "^9.0.0" }, "engines": { "node": "^14.17.0 || ^16.13.0 || >=18.0.0" @@ -6216,24 +6196,24 @@ } }, "node_modules/@tufjs/models/node_modules/minimatch": { - "version": "7.4.6", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-7.4.6.tgz", - "integrity": "sha512-sBz8G/YjVniEz6lKPNpKxXwazJe4c19fEfV2GDMX6AjFz+MX9uDWIZW8XreVhkFW3fkIdTv/gxWr/Kks5FFAVw==", + "version": "9.0.3", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.3.tgz", + "integrity": "sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg==", "dev": true, "dependencies": { "brace-expansion": "^2.0.1" }, "engines": { - "node": ">=10" + "node": ">=16 || 14 >=14.17" }, "funding": { "url": "https://github.com/sponsors/isaacs" } }, "node_modules/@types/body-parser": { - "version": "1.19.2", - "resolved": "https://registry.npmjs.org/@types/body-parser/-/body-parser-1.19.2.tgz", - "integrity": "sha512-ALYone6pm6QmwZoAgeyNksccT9Q4AWZQ6PvfwR37GT6r6FWUPguq6sUmNGSMV2Wr761oQoBxwGGa6DR5o1DC9g==", + "version": "1.19.3", + "resolved": "https://registry.npmjs.org/@types/body-parser/-/body-parser-1.19.3.tgz", + "integrity": "sha512-oyl4jvAfTGX9Bt6Or4H9ni1Z447/tQuxnZsytsCaExKlmJiU8sFgnIBRzJUpKwB5eWn9HuBYlUlVA74q/yN0eQ==", "dev": true, "dependencies": { "@types/connect": "*", @@ -6241,27 +6221,27 @@ } }, "node_modules/@types/bonjour": { - "version": "3.5.10", - "resolved": "https://registry.npmjs.org/@types/bonjour/-/bonjour-3.5.10.tgz", - "integrity": "sha512-p7ienRMiS41Nu2/igbJxxLDWrSZ0WxM8UQgCeO9KhoVF7cOVFkrKsiDr1EsJIla8vV3oEEjGcz11jc5yimhzZw==", + "version": "3.5.11", + "resolved": "https://registry.npmjs.org/@types/bonjour/-/bonjour-3.5.11.tgz", + "integrity": "sha512-isGhjmBtLIxdHBDl2xGwUzEM8AOyOvWsADWq7rqirdi/ZQoHnLWErHvsThcEzTX8juDRiZtzp2Qkv5bgNh6mAg==", "dev": true, "dependencies": { "@types/node": "*" } }, "node_modules/@types/connect": { - "version": "3.4.35", - "resolved": "https://registry.npmjs.org/@types/connect/-/connect-3.4.35.tgz", - "integrity": "sha512-cdeYyv4KWoEgpBISTxWvqYsVy444DOqehiF3fM3ne10AmJ62RSyNkUnxMJXHQWRQQX2eR94m5y1IZyDwBjV9FQ==", + "version": "3.4.36", + "resolved": "https://registry.npmjs.org/@types/connect/-/connect-3.4.36.tgz", + "integrity": "sha512-P63Zd/JUGq+PdrM1lv0Wv5SBYeA2+CORvbrXbngriYY0jzLUWfQMQQxOhjONEz/wlHOAxOdY7CY65rgQdTjq2w==", "dev": true, "dependencies": { "@types/node": "*" } }, "node_modules/@types/connect-history-api-fallback": { - "version": "1.3.5", - "resolved": "https://registry.npmjs.org/@types/connect-history-api-fallback/-/connect-history-api-fallback-1.3.5.tgz", - "integrity": "sha512-h8QJa8xSb1WD4fpKBDcATDNGXghFj6/3GRWG6dhmRcu0RX1Ubasur2Uvx5aeEwlf0MwblEC2bMzzMQntxnw/Cw==", + "version": "1.5.1", + "resolved": "https://registry.npmjs.org/@types/connect-history-api-fallback/-/connect-history-api-fallback-1.5.1.tgz", + "integrity": "sha512-iaQslNbARe8fctL5Lk+DsmgWOM83lM+7FzP0eQUJs1jd3kBE8NWqBTIT2S8SqQOJjxvt2eyIjpOuYeRXq2AdMw==", "dev": true, "dependencies": { "@types/express-serve-static-core": "*", @@ -6275,9 +6255,9 @@ "dev": true }, "node_modules/@types/eslint": { - "version": "8.4.1", - "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-8.4.1.tgz", - "integrity": "sha512-GE44+DNEyxxh2Kc6ro/VkIj+9ma0pO0bwv9+uHSyBrikYOHr8zYcdPvnBOp1aw8s+CjRvuSx7CyWqRrNFQ59mA==", + "version": "8.44.3", + "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-8.44.3.tgz", + "integrity": "sha512-iM/WfkwAhwmPff3wZuPLYiHX18HI24jU8k1ZSH7P8FHwxTjZ2P6CoX2wnF43oprR+YXJM6UUxATkNvyv/JHd+g==", "dev": true, "dependencies": { "@types/estree": "*", @@ -6285,9 +6265,9 @@ } }, "node_modules/@types/eslint-scope": { - "version": "3.7.3", - "resolved": "https://registry.npmjs.org/@types/eslint-scope/-/eslint-scope-3.7.3.tgz", - "integrity": "sha512-PB3ldyrcnAicT35TWPs5IcwKD8S333HMaa2VVv4+wdvebJkjWuW/xESoB8IwRcog8HYVYamb1g/R31Qv5Bx03g==", + "version": "3.7.5", + "resolved": "https://registry.npmjs.org/@types/eslint-scope/-/eslint-scope-3.7.5.tgz", + "integrity": "sha512-JNvhIEyxVW6EoMIFIvj93ZOywYFatlpu9deeH6eSx6PE3WHYvHaQtmHmQeNw7aA81bYGBPPQqdtBm6b1SsQMmA==", "dev": true, "dependencies": { "@types/eslint": "*", @@ -6295,15 +6275,15 @@ } }, "node_modules/@types/estree": { - "version": "0.0.51", - "resolved": "https://registry.npmjs.org/@types/estree/-/estree-0.0.51.tgz", - "integrity": "sha512-CuPgU6f3eT/XgKKPqKd/gLZV1Xmvf1a2R5POBOGQa6uv82xpls89HU5zKeVoyR8XzHd1RGNOlQlvUe3CFkjWNQ==", + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.2.tgz", + "integrity": "sha512-VeiPZ9MMwXjO32/Xu7+OwflfmeoRwkE/qzndw42gGtgJwZopBnzy2gD//NN1+go1mADzkDcqf/KnFRSjTJ8xJA==", "dev": true }, "node_modules/@types/express": { - "version": "4.17.17", - "resolved": "https://registry.npmjs.org/@types/express/-/express-4.17.17.tgz", - "integrity": "sha512-Q4FmmuLGBG58btUnfS1c1r/NQdlp3DMfGDGig8WhfpA2YRUtEkxAjkZb0yvplJGYdF1fsQ81iMDcH24sSCNC/Q==", + "version": "4.17.18", + "resolved": "https://registry.npmjs.org/@types/express/-/express-4.17.18.tgz", + "integrity": "sha512-Sxv8BSLLgsBYmcnGdGjjEjqET2U+AKAdCRODmMiq02FgjwuV75Ut85DRpvFjyw/Mk0vgUOliGRU0UUmuuZHByQ==", "dev": true, "dependencies": { "@types/body-parser": "*", @@ -6313,35 +6293,42 @@ } }, "node_modules/@types/express-serve-static-core": { - "version": "4.17.33", - "resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.33.tgz", - "integrity": "sha512-TPBqmR/HRYI3eC2E5hmiivIzv+bidAfXofM+sbonAGvyDhySGw9/PQZFt2BLOrjUUR++4eJVpx6KnLQK1Fk9tA==", + "version": "4.17.37", + "resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.37.tgz", + "integrity": "sha512-ZohaCYTgGFcOP7u6aJOhY9uIZQgZ2vxC2yWoArY+FeDXlqeH66ZVBjgvg+RLVAS/DWNq4Ap9ZXu1+SUQiiWYMg==", "dev": true, "dependencies": { "@types/node": "*", "@types/qs": "*", - "@types/range-parser": "*" + "@types/range-parser": "*", + "@types/send": "*" } }, + "node_modules/@types/http-errors": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/@types/http-errors/-/http-errors-2.0.2.tgz", + "integrity": "sha512-lPG6KlZs88gef6aD85z3HNkztpj7w2R7HmR3gygjfXCQmsLloWNARFkMuzKiiY8FGdh1XDpgBdrSf4aKDiA7Kg==", + "dev": true + }, "node_modules/@types/http-proxy": { - "version": "1.17.10", - "resolved": "https://registry.npmjs.org/@types/http-proxy/-/http-proxy-1.17.10.tgz", - "integrity": "sha512-Qs5aULi+zV1bwKAg5z1PWnDXWmsn+LxIvUGv6E2+OOMYhclZMO+OXd9pYVf2gLykf2I7IV2u7oTHwChPNsvJ7g==", + "version": "1.17.12", + "resolved": "https://registry.npmjs.org/@types/http-proxy/-/http-proxy-1.17.12.tgz", + "integrity": "sha512-kQtujO08dVtQ2wXAuSFfk9ASy3sug4+ogFR8Kd8UgP8PEuc1/G/8yjYRmp//PcDNJEUKOza/MrQu15bouEUCiw==", "dev": true, "dependencies": { "@types/node": "*" } }, "node_modules/@types/json-schema": { - "version": "7.0.9", - "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.9.tgz", - "integrity": "sha512-qcUXuemtEu+E5wZSJHNxUXeCZhAfXKQ41D+duX+VYPde7xyEVZci+/oXKJL13tnRs9lR2pr4fod59GT6/X1/yQ==", + "version": "7.0.13", + "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.13.tgz", + "integrity": "sha512-RbSSoHliUbnXj3ny0CNFOoxrIDV6SUGyStHsvDqosw6CkdPV8TtWGlfecuK4ToyMEAql6pzNxgCFKanovUzlgQ==", "dev": true }, "node_modules/@types/json5": { "version": "0.0.29", "resolved": "https://registry.npmjs.org/@types/json5/-/json5-0.0.29.tgz", - "integrity": "sha1-7ihweulOEdK4J7y+UnC86n8+ce4=", + "integrity": "sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ==", "dev": true }, "node_modules/@types/lodash": { @@ -6351,18 +6338,18 @@ "dev": true }, "node_modules/@types/lodash-es": { - "version": "4.17.7", - "resolved": "https://registry.npmjs.org/@types/lodash-es/-/lodash-es-4.17.7.tgz", - "integrity": "sha512-z0ptr6UI10VlU6l5MYhGwS4mC8DZyYer2mCoyysZtSF7p26zOX8UpbrV0YpNYLGS8K4PUFIyEr62IMFFjveSiQ==", + "version": "4.17.9", + "resolved": "https://registry.npmjs.org/@types/lodash-es/-/lodash-es-4.17.9.tgz", + "integrity": "sha512-ZTcmhiI3NNU7dEvWLZJkzG6ao49zOIjEgIE0RgV7wbPxU0f2xT3VSAHw2gmst8swH6V0YkLRGp4qPlX/6I90MQ==", "dev": true, "dependencies": { "@types/lodash": "*" } }, "node_modules/@types/mime": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/@types/mime/-/mime-3.0.1.tgz", - "integrity": "sha512-Y4XFY5VJAuw0FgAqPNd6NNoV44jbq9Bz2L7Rh/J6jLTiHBSBJa9fxqQIvkIld4GsoDOcCbvzOUAbLPsSKKg+uA==", + "version": "1.3.2", + "resolved": "https://registry.npmjs.org/@types/mime/-/mime-1.3.2.tgz", + "integrity": "sha512-YATxVxgRqNH6nHEIsvg6k2Boc1JHI9ZbH5iWFFv/MTkchz3b1ieGDa5T0a9RznNdI0KhVbdbWSN+KWWrQZRxTw==", "dev": true }, "node_modules/@types/node": { @@ -6371,22 +6358,16 @@ "integrity": "sha512-BsAaKhB+7X+H4GnSjGhJG9Qi8Tw+inU9nJDwmD5CgOmBLEI6ArdhikpLX7DjbjDRDTbqZzU2LSQNZg8WGPiSZQ==", "dev": true }, - "node_modules/@types/parse-json": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/@types/parse-json/-/parse-json-4.0.0.tgz", - "integrity": "sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA==", - "dev": true - }, "node_modules/@types/plotly.js": { - "version": "2.12.18", - "resolved": "https://registry.npmjs.org/@types/plotly.js/-/plotly.js-2.12.18.tgz", - "integrity": "sha512-ff+CIEWnqZNjZqHtQZvkEAVuLs9fkm1f54QnPVmgoET7wMHdSqUka2hasVN4e5yfHD05YwGjsAtCseewJh/BMw==", + "version": "2.12.27", + "resolved": "https://registry.npmjs.org/@types/plotly.js/-/plotly.js-2.12.27.tgz", + "integrity": "sha512-Ah7XuePFNxu2XAHG79GeKN/Ky8dZ0k6hzy49da6AeZFrTqO5wDbtJovp3co3C+iRitp8tA6rIxkltiJ3cjsQWw==", "dev": true }, "node_modules/@types/qs": { - "version": "6.9.7", - "resolved": "https://registry.npmjs.org/@types/qs/-/qs-6.9.7.tgz", - "integrity": "sha512-FGa1F62FT09qcrueBA6qYTrJPVDzah9a+493+o2PCXsesWHIn27G98TsSMs3WPNbZIEj4+VJf6saSFpvD+3Zsw==", + "version": "6.9.8", + "resolved": "https://registry.npmjs.org/@types/qs/-/qs-6.9.8.tgz", + "integrity": "sha512-u95svzDlTysU5xecFNTgfFG5RUWu1A9P0VzgpcIiGZA9iraHOdSzcxMxQ55DyeRaGCSxQi7LxXDI4rzq/MYfdg==", "dev": true }, "node_modules/@types/range-parser": { @@ -6402,39 +6383,56 @@ "dev": true }, "node_modules/@types/semver": { - "version": "7.3.13", - "resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.3.13.tgz", - "integrity": "sha512-21cFJr9z3g5dW8B0CVI9g2O9beqaThGQ6ZFBqHfwhzLDKUxaqTIy3vnfah/UPkfOiF2pLq+tGz+W8RyCskuslw==", + "version": "7.5.3", + "resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.5.3.tgz", + "integrity": "sha512-OxepLK9EuNEIPxWNME+C6WwbRAOOI2o2BaQEGzz5Lu2e4Z5eDnEo+/aVEDMIXywoJitJ7xWd641wrGLZdtwRyw==", "dev": true }, + "node_modules/@types/send": { + "version": "0.17.2", + "resolved": "https://registry.npmjs.org/@types/send/-/send-0.17.2.tgz", + "integrity": "sha512-aAG6yRf6r0wQ29bkS+x97BIs64ZLxeE/ARwyS6wrldMm3C1MdKwCcnnEwMC1slI8wuxJOpiUH9MioC0A0i+GJw==", + "dev": true, + "dependencies": { + "@types/mime": "^1", + "@types/node": "*" + } + }, "node_modules/@types/serve-index": { - "version": "1.9.1", - "resolved": "https://registry.npmjs.org/@types/serve-index/-/serve-index-1.9.1.tgz", - "integrity": "sha512-d/Hs3nWDxNL2xAczmOVZNj92YZCS6RGxfBPjKzuu/XirCgXdpKEb88dYNbrYGint6IVWLNP+yonwVAuRC0T2Dg==", + "version": "1.9.2", + "resolved": "https://registry.npmjs.org/@types/serve-index/-/serve-index-1.9.2.tgz", + "integrity": "sha512-asaEIoc6J+DbBKXtO7p2shWUpKacZOoMBEGBgPG91P8xhO53ohzHWGCs4ScZo5pQMf5ukQzVT9fhX1WzpHihig==", "dev": true, "dependencies": { "@types/express": "*" } }, "node_modules/@types/serve-static": { - "version": "1.15.1", - "resolved": "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.15.1.tgz", - "integrity": "sha512-NUo5XNiAdULrJENtJXZZ3fHtfMolzZwczzBbnAeBbqBwG+LaG6YaJtuwzwGSQZ2wsCrxjEhNNjAkKigy3n8teQ==", + "version": "1.15.3", + "resolved": "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.15.3.tgz", + "integrity": "sha512-yVRvFsEMrv7s0lGhzrggJjNOSmZCdgCjw9xWrPr/kNNLp6FaDfMC1KaYl3TSJ0c58bECwNBMoQrZJ8hA8E1eFg==", "dev": true, "dependencies": { + "@types/http-errors": "*", "@types/mime": "*", "@types/node": "*" } }, "node_modules/@types/sockjs": { - "version": "0.3.33", - "resolved": "https://registry.npmjs.org/@types/sockjs/-/sockjs-0.3.33.tgz", - "integrity": "sha512-f0KEEe05NvUnat+boPTZ0dgaLZ4SfSouXUgv5noUiefG2ajgKjmETo9ZJyuqsl7dfl2aHlLJUiki6B4ZYldiiw==", + "version": "0.3.34", + "resolved": "https://registry.npmjs.org/@types/sockjs/-/sockjs-0.3.34.tgz", + "integrity": "sha512-R+n7qBFnm/6jinlteC9DBL5dGiDGjWAvjo4viUanpnc/dG1y7uDoacXPIQ/PQEg1fI912SMHIa014ZjRpvDw4g==", "dev": true, "dependencies": { "@types/node": "*" } }, + "node_modules/@types/tinycolor2": { + "version": "1.4.4", + "resolved": "https://registry.npmjs.org/@types/tinycolor2/-/tinycolor2-1.4.4.tgz", + "integrity": "sha512-FYK4mlLxUUajo/mblv7EUDHku20qT6ThYNsGZsTHilcHRvIkF8WXqtZO+DVTYkpHWCaAT97LueV59H/5Ve3bGA==", + "dev": true + }, "node_modules/@types/uuid": { "version": "9.0.2", "resolved": "https://registry.npmjs.org/@types/uuid/-/uuid-9.0.2.tgz", @@ -6442,46 +6440,62 @@ "dev": true }, "node_modules/@types/ws": { - "version": "8.5.4", - "resolved": "https://registry.npmjs.org/@types/ws/-/ws-8.5.4.tgz", - "integrity": "sha512-zdQDHKUgcX/zBc4GrwsE/7dVdAD8JR4EuiAXiiUhhfyIJXXb2+PrGshFyeXWQPMmmZ2XxgaqclgpIC7eTXc1mg==", + "version": "8.5.6", + "resolved": "https://registry.npmjs.org/@types/ws/-/ws-8.5.6.tgz", + "integrity": "sha512-8B5EO9jLVCy+B58PLHvLDuOD8DRVMgQzq8d55SjLCOn9kqGyqOvy27exVaTio1q1nX5zLu8/6N0n2ThSxOM6tg==", "dev": true, "dependencies": { "@types/node": "*" } }, + "node_modules/@types/yargs": { + "version": "17.0.25", + "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.25.tgz", + "integrity": "sha512-gy7iPgwnzNvxgAEi2bXOHWCVOG6f7xsprVJH4MjlAWeBmJ7vh/Y1kwMtUrs64ztf24zVIRCpr3n/z6gm9QIkgg==", + "dev": true, + "dependencies": { + "@types/yargs-parser": "*" + } + }, + "node_modules/@types/yargs-parser": { + "version": "21.0.1", + "resolved": "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-21.0.1.tgz", + "integrity": "sha512-axdPBuLuEJt0c4yI5OZssC19K2Mq1uKdrfZBzuxLvaztgqUtFYZUNw7lETExPYJR9jdEoIg4mb7RQKRQzOkeGQ==", + "dev": true + }, "node_modules/@types/youtube": { "version": "0.0.42", "resolved": "https://registry.npmjs.org/@types/youtube/-/youtube-0.0.42.tgz", "integrity": "sha512-Nqo3HMPFPcNyZ7HNFZJjpH+N4yXqpxBItG+41e7nL9zednovMRZMXWj36CctSznbBcbj6ucvkJDo5iZ8SKqLIw==" }, "node_modules/@typescript-eslint/eslint-plugin": { - "version": "5.59.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.59.1.tgz", - "integrity": "sha512-AVi0uazY5quFB9hlp2Xv+ogpfpk77xzsgsIEWyVS7uK/c7MZ5tw7ZPbapa0SbfkqE0fsAMkz5UwtgMLVk2BQAg==", + "version": "6.7.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-6.7.0.tgz", + "integrity": "sha512-gUqtknHm0TDs1LhY12K2NA3Rmlmp88jK9Tx8vGZMfHeNMLE3GH2e9TRub+y+SOjuYgtOmok+wt1AyDPZqxbNag==", "dev": true, "dependencies": { - "@eslint-community/regexpp": "^4.4.0", - "@typescript-eslint/scope-manager": "5.59.1", - "@typescript-eslint/type-utils": "5.59.1", - "@typescript-eslint/utils": "5.59.1", + "@eslint-community/regexpp": "^4.5.1", + "@typescript-eslint/scope-manager": "6.7.0", + "@typescript-eslint/type-utils": "6.7.0", + "@typescript-eslint/utils": "6.7.0", + "@typescript-eslint/visitor-keys": "6.7.0", "debug": "^4.3.4", - "grapheme-splitter": "^1.0.4", - "ignore": "^5.2.0", - "natural-compare-lite": "^1.4.0", - "semver": "^7.3.7", - "tsutils": "^3.21.0" + "graphemer": "^1.4.0", + "ignore": "^5.2.4", + "natural-compare": "^1.4.0", + "semver": "^7.5.4", + "ts-api-utils": "^1.0.1" }, "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + "node": "^16.0.0 || >=18.0.0" }, "funding": { "type": "opencollective", "url": "https://opencollective.com/typescript-eslint" }, "peerDependencies": { - "@typescript-eslint/parser": "^5.0.0", - "eslint": "^6.0.0 || ^7.0.0 || ^8.0.0" + "@typescript-eslint/parser": "^6.0.0 || ^6.0.0-alpha", + "eslint": "^7.0.0 || ^8.0.0" }, "peerDependenciesMeta": { "typescript": { @@ -6489,16 +6503,80 @@ } } }, - "node_modules/@typescript-eslint/parser": { - "version": "5.59.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.59.1.tgz", - "integrity": "sha512-nzjFAN8WEu6yPRDizIFyzAfgK7nybPodMNFGNH0M9tei2gYnYszRDqVA0xlnRjkl7Hkx2vYrEdb6fP2a21cG1g==", + "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/type-utils": { + "version": "6.7.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-6.7.0.tgz", + "integrity": "sha512-f/QabJgDAlpSz3qduCyQT0Fw7hHpmhOzY/Rv6zO3yO+HVIdPfIWhrQoAyG+uZVtWAIS85zAyzgAFfyEr+MgBpg==", "dev": true, "dependencies": { - "@typescript-eslint/scope-manager": "5.59.1", - "@typescript-eslint/types": "5.59.1", - "@typescript-eslint/typescript-estree": "5.59.1", - "debug": "^4.3.4" + "@typescript-eslint/typescript-estree": "6.7.0", + "@typescript-eslint/utils": "6.7.0", + "debug": "^4.3.4", + "ts-api-utils": "^1.0.1" + }, + "engines": { + "node": "^16.0.0 || >=18.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + }, + "peerDependencies": { + "eslint": "^7.0.0 || ^8.0.0" + }, + "peerDependenciesMeta": { + "typescript": { + "optional": true + } + } + }, + "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/utils": { + "version": "6.7.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-6.7.0.tgz", + "integrity": "sha512-MfCq3cM0vh2slSikQYqK2Gq52gvOhe57vD2RM3V4gQRZYX4rDPnKLu5p6cm89+LJiGlwEXU8hkYxhqqEC/V3qA==", + "dev": true, + "dependencies": { + "@eslint-community/eslint-utils": "^4.4.0", + "@types/json-schema": "^7.0.12", + "@types/semver": "^7.5.0", + "@typescript-eslint/scope-manager": "6.7.0", + "@typescript-eslint/types": "6.7.0", + "@typescript-eslint/typescript-estree": "6.7.0", + "semver": "^7.5.4" + }, + "engines": { + "node": "^16.0.0 || >=18.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + }, + "peerDependencies": { + "eslint": "^7.0.0 || ^8.0.0" + } + }, + "node_modules/@typescript-eslint/eslint-plugin/node_modules/semver": { + "version": "7.5.4", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz", + "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==", + "dev": true, + "dependencies": { + "lru-cache": "^6.0.0" + }, + "bin": { + "semver": "bin/semver.js" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/@typescript-eslint/experimental-utils": { + "version": "5.62.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-5.62.0.tgz", + "integrity": "sha512-RTXpeB3eMkpoclG3ZHft6vG/Z30azNHuqY6wKPBHlVMZFuEvrtlEDe8gMqDb+SO+9hjC/pLekeSCryf9vMZlCw==", + "dev": true, + "dependencies": { + "@typescript-eslint/utils": "5.62.0" }, "engines": { "node": "^12.22.0 || ^14.17.0 || >=16.0.0" @@ -6509,6 +6587,29 @@ }, "peerDependencies": { "eslint": "^6.0.0 || ^7.0.0 || ^8.0.0" + } + }, + "node_modules/@typescript-eslint/parser": { + "version": "6.7.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-6.7.0.tgz", + "integrity": "sha512-jZKYwqNpNm5kzPVP5z1JXAuxjtl2uG+5NpaMocFPTNC2EdYIgbXIPImObOkhbONxtFTTdoZstLZefbaK+wXZng==", + "dev": true, + "dependencies": { + "@typescript-eslint/scope-manager": "6.7.0", + "@typescript-eslint/types": "6.7.0", + "@typescript-eslint/typescript-estree": "6.7.0", + "@typescript-eslint/visitor-keys": "6.7.0", + "debug": "^4.3.4" + }, + "engines": { + "node": "^16.0.0 || >=18.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + }, + "peerDependencies": { + "eslint": "^7.0.0 || ^8.0.0" }, "peerDependenciesMeta": { "typescript": { @@ -6517,16 +6618,16 @@ } }, "node_modules/@typescript-eslint/scope-manager": { - "version": "5.59.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.59.1.tgz", - "integrity": "sha512-mau0waO5frJctPuAzcxiNWqJR5Z8V0190FTSqRw1Q4Euop6+zTwHAf8YIXNwDOT29tyUDrQ65jSg9aTU/H0omA==", + "version": "6.7.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-6.7.0.tgz", + "integrity": "sha512-lAT1Uau20lQyjoLUQ5FUMSX/dS07qux9rYd5FGzKz/Kf8W8ccuvMyldb8hadHdK/qOI7aikvQWqulnEq2nCEYA==", "dev": true, "dependencies": { - "@typescript-eslint/types": "5.59.1", - "@typescript-eslint/visitor-keys": "5.59.1" + "@typescript-eslint/types": "6.7.0", + "@typescript-eslint/visitor-keys": "6.7.0" }, "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + "node": "^16.0.0 || >=18.0.0" }, "funding": { "type": "opencollective", @@ -6534,13 +6635,13 @@ } }, "node_modules/@typescript-eslint/type-utils": { - "version": "5.59.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.59.1.tgz", - "integrity": "sha512-ZMWQ+Oh82jWqWzvM3xU+9y5U7MEMVv6GLioM3R5NJk6uvP47kZ7YvlgSHJ7ERD6bOY7Q4uxWm25c76HKEwIjZw==", + "version": "5.62.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.62.0.tgz", + "integrity": "sha512-xsSQreu+VnfbqQpW5vnCJdq1Z3Q0U31qiWmRhr98ONQmcp/yhiPJFPq8MXiJVLiksmOKSjIldZzkebzHuCGzew==", "dev": true, "dependencies": { - "@typescript-eslint/typescript-estree": "5.59.1", - "@typescript-eslint/utils": "5.59.1", + "@typescript-eslint/typescript-estree": "5.62.0", + "@typescript-eslint/utils": "5.62.0", "debug": "^4.3.4", "tsutils": "^3.21.0" }, @@ -6560,10 +6661,10 @@ } } }, - "node_modules/@typescript-eslint/types": { - "version": "5.59.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.59.1.tgz", - "integrity": "sha512-dg0ICB+RZwHlysIy/Dh1SP+gnXNzwd/KS0JprD3Lmgmdq+dJAJnUPe1gNG34p0U19HvRlGX733d/KqscrGC1Pg==", + "node_modules/@typescript-eslint/type-utils/node_modules/@typescript-eslint/types": { + "version": "5.62.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.62.0.tgz", + "integrity": "sha512-87NVngcbVXUahrRTqIK27gD2t5Cu1yuCXxbLcFtCzZGlfyVWWh8mLHkoxzjsB6DDNnvdL+fW8MiwPEJyGJQDgQ==", "dev": true, "engines": { "node": "^12.22.0 || ^14.17.0 || >=16.0.0" @@ -6573,14 +6674,14 @@ "url": "https://opencollective.com/typescript-eslint" } }, - "node_modules/@typescript-eslint/typescript-estree": { - "version": "5.59.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.59.1.tgz", - "integrity": "sha512-lYLBBOCsFltFy7XVqzX0Ju+Lh3WPIAWxYpmH/Q7ZoqzbscLiCW00LeYCdsUnnfnj29/s1WovXKh2gwCoinHNGA==", + "node_modules/@typescript-eslint/type-utils/node_modules/@typescript-eslint/typescript-estree": { + "version": "5.62.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.62.0.tgz", + "integrity": "sha512-CmcQ6uY7b9y694lKdRB8FEel7JbU/40iSAPomu++SjLMntB+2Leay2LO6i8VnJk58MtE9/nQSFIH6jpyRWyYzA==", "dev": true, "dependencies": { - "@typescript-eslint/types": "5.59.1", - "@typescript-eslint/visitor-keys": "5.59.1", + "@typescript-eslint/types": "5.62.0", + "@typescript-eslint/visitor-keys": "5.62.0", "debug": "^4.3.4", "globby": "^11.1.0", "is-glob": "^4.0.3", @@ -6600,18 +6701,90 @@ } } }, + "node_modules/@typescript-eslint/type-utils/node_modules/@typescript-eslint/visitor-keys": { + "version": "5.62.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.62.0.tgz", + "integrity": "sha512-07ny+LHRzQXepkGg6w0mFY41fVUNBrL2Roj/++7V1txKugfjm/Ci/qSND03r2RhlJhJYMcTn9AhhSSqQp0Ysyw==", + "dev": true, + "dependencies": { + "@typescript-eslint/types": "5.62.0", + "eslint-visitor-keys": "^3.3.0" + }, + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + } + }, + "node_modules/@typescript-eslint/types": { + "version": "6.7.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-6.7.0.tgz", + "integrity": "sha512-ihPfvOp7pOcN/ysoj0RpBPOx3HQTJTrIN8UZK+WFd3/iDeFHHqeyYxa4hQk4rMhsz9H9mXpR61IzwlBVGXtl9Q==", + "dev": true, + "engines": { + "node": "^16.0.0 || >=18.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + } + }, + "node_modules/@typescript-eslint/typescript-estree": { + "version": "6.7.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-6.7.0.tgz", + "integrity": "sha512-dPvkXj3n6e9yd/0LfojNU8VMUGHWiLuBZvbM6V6QYD+2qxqInE7J+J/ieY2iGwR9ivf/R/haWGkIj04WVUeiSQ==", + "dev": true, + "dependencies": { + "@typescript-eslint/types": "6.7.0", + "@typescript-eslint/visitor-keys": "6.7.0", + "debug": "^4.3.4", + "globby": "^11.1.0", + "is-glob": "^4.0.3", + "semver": "^7.5.4", + "ts-api-utils": "^1.0.1" + }, + "engines": { + "node": "^16.0.0 || >=18.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + }, + "peerDependenciesMeta": { + "typescript": { + "optional": true + } + } + }, + "node_modules/@typescript-eslint/typescript-estree/node_modules/semver": { + "version": "7.5.4", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz", + "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==", + "dev": true, + "dependencies": { + "lru-cache": "^6.0.0" + }, + "bin": { + "semver": "bin/semver.js" + }, + "engines": { + "node": ">=10" + } + }, "node_modules/@typescript-eslint/utils": { - "version": "5.59.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.59.1.tgz", - "integrity": "sha512-MkTe7FE+K1/GxZkP5gRj3rCztg45bEhsd8HYjczBuYm+qFHP5vtZmjx3B0yUCDotceQ4sHgTyz60Ycl225njmA==", + "version": "5.62.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.62.0.tgz", + "integrity": "sha512-n8oxjeb5aIbPFEtmQxQYOLI0i9n5ySBEY/ZEHHZqKQSFnxio1rv6dthascc9dLuwrL0RC5mPCxB7vnAVGAYWAQ==", "dev": true, "dependencies": { "@eslint-community/eslint-utils": "^4.2.0", "@types/json-schema": "^7.0.9", "@types/semver": "^7.3.12", - "@typescript-eslint/scope-manager": "5.59.1", - "@typescript-eslint/types": "5.59.1", - "@typescript-eslint/typescript-estree": "5.59.1", + "@typescript-eslint/scope-manager": "5.62.0", + "@typescript-eslint/types": "5.62.0", + "@typescript-eslint/typescript-estree": "5.62.0", "eslint-scope": "^5.1.1", "semver": "^7.3.7" }, @@ -6626,13 +6799,70 @@ "eslint": "^6.0.0 || ^7.0.0 || ^8.0.0" } }, - "node_modules/@typescript-eslint/visitor-keys": { - "version": "5.59.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.59.1.tgz", - "integrity": "sha512-6waEYwBTCWryx0VJmP7JaM4FpipLsFl9CvYf2foAE8Qh/Y0s+bxWysciwOs0LTBED4JCaNxTZ5rGadB14M6dwA==", + "node_modules/@typescript-eslint/utils/node_modules/@typescript-eslint/scope-manager": { + "version": "5.62.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.62.0.tgz", + "integrity": "sha512-VXuvVvZeQCQb5Zgf4HAxc04q5j+WrNAtNh9OwCsCgpKqESMTu3tF/jhZ3xG6T4NZwWl65Bg8KuS2uEvhSfLl0w==", "dev": true, "dependencies": { - "@typescript-eslint/types": "5.59.1", + "@typescript-eslint/types": "5.62.0", + "@typescript-eslint/visitor-keys": "5.62.0" + }, + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + } + }, + "node_modules/@typescript-eslint/utils/node_modules/@typescript-eslint/types": { + "version": "5.62.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.62.0.tgz", + "integrity": "sha512-87NVngcbVXUahrRTqIK27gD2t5Cu1yuCXxbLcFtCzZGlfyVWWh8mLHkoxzjsB6DDNnvdL+fW8MiwPEJyGJQDgQ==", + "dev": true, + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + } + }, + "node_modules/@typescript-eslint/utils/node_modules/@typescript-eslint/typescript-estree": { + "version": "5.62.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.62.0.tgz", + "integrity": "sha512-CmcQ6uY7b9y694lKdRB8FEel7JbU/40iSAPomu++SjLMntB+2Leay2LO6i8VnJk58MtE9/nQSFIH6jpyRWyYzA==", + "dev": true, + "dependencies": { + "@typescript-eslint/types": "5.62.0", + "@typescript-eslint/visitor-keys": "5.62.0", + "debug": "^4.3.4", + "globby": "^11.1.0", + "is-glob": "^4.0.3", + "semver": "^7.3.7", + "tsutils": "^3.21.0" + }, + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + }, + "peerDependenciesMeta": { + "typescript": { + "optional": true + } + } + }, + "node_modules/@typescript-eslint/utils/node_modules/@typescript-eslint/visitor-keys": { + "version": "5.62.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.62.0.tgz", + "integrity": "sha512-07ny+LHRzQXepkGg6w0mFY41fVUNBrL2Roj/++7V1txKugfjm/Ci/qSND03r2RhlJhJYMcTn9AhhSSqQp0Ysyw==", + "dev": true, + "dependencies": { + "@typescript-eslint/types": "5.62.0", "eslint-visitor-keys": "^3.3.0" }, "engines": { @@ -6643,152 +6873,274 @@ "url": "https://opencollective.com/typescript-eslint" } }, - "node_modules/@webassemblyjs/ast": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.11.1.tgz", - "integrity": "sha512-ukBh14qFLjxTQNTXocdyksN5QdM28S1CxHt2rdskFyL+xFV7VremuBLVbmCePj+URalXBENx/9Lm7lnhihtCSw==", + "node_modules/@typescript-eslint/visitor-keys": { + "version": "6.7.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-6.7.0.tgz", + "integrity": "sha512-/C1RVgKFDmGMcVGeD8HjKv2bd72oI1KxQDeY8uc66gw9R0OK0eMq48cA+jv9/2Ag6cdrsUGySm1yzYmfz0hxwQ==", "dev": true, "dependencies": { - "@webassemblyjs/helper-numbers": "1.11.1", - "@webassemblyjs/helper-wasm-bytecode": "1.11.1" + "@typescript-eslint/types": "6.7.0", + "eslint-visitor-keys": "^3.4.1" + }, + "engines": { + "node": "^16.0.0 || >=18.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + } + }, + "node_modules/@vitejs/plugin-basic-ssl": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/@vitejs/plugin-basic-ssl/-/plugin-basic-ssl-1.0.1.tgz", + "integrity": "sha512-pcub+YbFtFhaGRTo1832FQHQSHvMrlb43974e2eS8EKleR3p1cDdkJFPci1UhwkEf1J9Bz+wKBSzqpKp7nNj2A==", + "dev": true, + "engines": { + "node": ">=14.6.0" + }, + "peerDependencies": { + "vite": "^3.0.0 || ^4.0.0" + } + }, + "node_modules/@webassemblyjs/ast": { + "version": "1.11.6", + "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.11.6.tgz", + "integrity": "sha512-IN1xI7PwOvLPgjcf180gC1bqn3q/QaOCwYUahIOhbYUu8KA/3tw2RT/T0Gidi1l7Hhj5D/INhJxiICObqpMu4Q==", + "dev": true, + "dependencies": { + "@webassemblyjs/helper-numbers": "1.11.6", + "@webassemblyjs/helper-wasm-bytecode": "1.11.6" } }, "node_modules/@webassemblyjs/floating-point-hex-parser": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.1.tgz", - "integrity": "sha512-iGRfyc5Bq+NnNuX8b5hwBrRjzf0ocrJPI6GWFodBFzmFnyvrQ83SHKhmilCU/8Jv67i4GJZBMhEzltxzcNagtQ==", + "version": "1.11.6", + "resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.6.tgz", + "integrity": "sha512-ejAj9hfRJ2XMsNHk/v6Fu2dGS+i4UaXBXGemOfQ/JfQ6mdQg/WXtwleQRLLS4OvfDhv8rYnVwH27YJLMyYsxhw==", "dev": true }, "node_modules/@webassemblyjs/helper-api-error": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.1.tgz", - "integrity": "sha512-RlhS8CBCXfRUR/cwo2ho9bkheSXG0+NwooXcc3PAILALf2QLdFyj7KGsKRbVc95hZnhnERon4kW/D3SZpp6Tcg==", + "version": "1.11.6", + "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.6.tgz", + "integrity": "sha512-o0YkoP4pVu4rN8aTJgAyj9hC2Sv5UlkzCHhxqWj8butaLvnpdc2jOwh4ewE6CX0txSfLn/UYaV/pheS2Txg//Q==", "dev": true }, "node_modules/@webassemblyjs/helper-buffer": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.11.1.tgz", - "integrity": "sha512-gwikF65aDNeeXa8JxXa2BAk+REjSyhrNC9ZwdT0f8jc4dQQeDQ7G4m0f2QCLPJiMTTO6wfDmRmj/pW0PsUvIcA==", + "version": "1.11.6", + "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.11.6.tgz", + "integrity": "sha512-z3nFzdcp1mb8nEOFFk8DrYLpHvhKC3grJD2ardfKOzmbmJvEf/tPIqCY+sNcwZIY8ZD7IkB2l7/pqhUhqm7hLA==", "dev": true }, "node_modules/@webassemblyjs/helper-numbers": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.1.tgz", - "integrity": "sha512-vDkbxiB8zfnPdNK9Rajcey5C0w+QJugEglN0of+kmO8l7lDb77AnlKYQF7aarZuCrv+l0UvqL+68gSDr3k9LPQ==", + "version": "1.11.6", + "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.6.tgz", + "integrity": "sha512-vUIhZ8LZoIWHBohiEObxVm6hwP034jwmc9kuq5GdHZH0wiLVLIPcMCdpJzG4C11cHoQ25TFIQj9kaVADVX7N3g==", "dev": true, "dependencies": { - "@webassemblyjs/floating-point-hex-parser": "1.11.1", - "@webassemblyjs/helper-api-error": "1.11.1", + "@webassemblyjs/floating-point-hex-parser": "1.11.6", + "@webassemblyjs/helper-api-error": "1.11.6", "@xtuc/long": "4.2.2" } }, "node_modules/@webassemblyjs/helper-wasm-bytecode": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.1.tgz", - "integrity": "sha512-PvpoOGiJwXeTrSf/qfudJhwlvDQxFgelbMqtq52WWiXC6Xgg1IREdngmPN3bs4RoO83PnL/nFrxucXj1+BX62Q==", + "version": "1.11.6", + "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.6.tgz", + "integrity": "sha512-sFFHKwcmBprO9e7Icf0+gddyWYDViL8bpPjJJl0WHxCdETktXdmtWLGVzoHbqUcY4Be1LkNfwTmXOJUFZYSJdA==", "dev": true }, "node_modules/@webassemblyjs/helper-wasm-section": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.11.1.tgz", - "integrity": "sha512-10P9No29rYX1j7F3EVPX3JvGPQPae+AomuSTPiF9eBQeChHI6iqjMIwR9JmOJXwpnn/oVGDk7I5IlskuMwU/pg==", + "version": "1.11.6", + "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.11.6.tgz", + "integrity": "sha512-LPpZbSOwTpEC2cgn4hTydySy1Ke+XEu+ETXuoyvuyezHO3Kjdu90KK95Sh9xTbmjrCsUwvWwCOQQNta37VrS9g==", "dev": true, "dependencies": { - "@webassemblyjs/ast": "1.11.1", - "@webassemblyjs/helper-buffer": "1.11.1", - "@webassemblyjs/helper-wasm-bytecode": "1.11.1", - "@webassemblyjs/wasm-gen": "1.11.1" + "@webassemblyjs/ast": "1.11.6", + "@webassemblyjs/helper-buffer": "1.11.6", + "@webassemblyjs/helper-wasm-bytecode": "1.11.6", + "@webassemblyjs/wasm-gen": "1.11.6" } }, "node_modules/@webassemblyjs/ieee754": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.11.1.tgz", - "integrity": "sha512-hJ87QIPtAMKbFq6CGTkZYJivEwZDbQUgYd3qKSadTNOhVY7p+gfP6Sr0lLRVTaG1JjFj+r3YchoqRYxNH3M0GQ==", + "version": "1.11.6", + "resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.11.6.tgz", + "integrity": "sha512-LM4p2csPNvbij6U1f19v6WR56QZ8JcHg3QIJTlSwzFcmx6WSORicYj6I63f9yU1kEUtrpG+kjkiIAkevHpDXrg==", "dev": true, "dependencies": { "@xtuc/ieee754": "^1.2.0" } }, "node_modules/@webassemblyjs/leb128": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.11.1.tgz", - "integrity": "sha512-BJ2P0hNZ0u+Th1YZXJpzW6miwqQUGcIHT1G/sf72gLVD9DZ5AdYTqPNbHZh6K1M5VmKvFXwGSWZADz+qBWxeRw==", + "version": "1.11.6", + "resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.11.6.tgz", + "integrity": "sha512-m7a0FhE67DQXgouf1tbN5XQcdWoNgaAuoULHIfGFIEVKA6tu/edls6XnIlkmS6FrXAquJRPni3ZZKjw6FSPjPQ==", "dev": true, "dependencies": { "@xtuc/long": "4.2.2" } }, "node_modules/@webassemblyjs/utf8": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.11.1.tgz", - "integrity": "sha512-9kqcxAEdMhiwQkHpkNiorZzqpGrodQQ2IGrHHxCy+Ozng0ofyMA0lTqiLkVs1uzTRejX+/O0EOT7KxqVPuXosQ==", + "version": "1.11.6", + "resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.11.6.tgz", + "integrity": "sha512-vtXf2wTQ3+up9Zsg8sa2yWiQpzSsMyXj0qViVP6xKGCUT8p8YJ6HqI7l5eCnWx1T/FYdsv07HQs2wTFbbof/RA==", "dev": true }, "node_modules/@webassemblyjs/wasm-edit": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.11.1.tgz", - "integrity": "sha512-g+RsupUC1aTHfR8CDgnsVRVZFJqdkFHpsHMfJuWQzWU3tvnLC07UqHICfP+4XyL2tnr1amvl1Sdp06TnYCmVkA==", + "version": "1.11.6", + "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.11.6.tgz", + "integrity": "sha512-Ybn2I6fnfIGuCR+Faaz7YcvtBKxvoLV3Lebn1tM4o/IAJzmi9AWYIPWpyBfU8cC+JxAO57bk4+zdsTjJR+VTOw==", "dev": true, "dependencies": { - "@webassemblyjs/ast": "1.11.1", - "@webassemblyjs/helper-buffer": "1.11.1", - "@webassemblyjs/helper-wasm-bytecode": "1.11.1", - "@webassemblyjs/helper-wasm-section": "1.11.1", - "@webassemblyjs/wasm-gen": "1.11.1", - "@webassemblyjs/wasm-opt": "1.11.1", - "@webassemblyjs/wasm-parser": "1.11.1", - "@webassemblyjs/wast-printer": "1.11.1" + "@webassemblyjs/ast": "1.11.6", + "@webassemblyjs/helper-buffer": "1.11.6", + "@webassemblyjs/helper-wasm-bytecode": "1.11.6", + "@webassemblyjs/helper-wasm-section": "1.11.6", + "@webassemblyjs/wasm-gen": "1.11.6", + "@webassemblyjs/wasm-opt": "1.11.6", + "@webassemblyjs/wasm-parser": "1.11.6", + "@webassemblyjs/wast-printer": "1.11.6" } }, "node_modules/@webassemblyjs/wasm-gen": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.11.1.tgz", - "integrity": "sha512-F7QqKXwwNlMmsulj6+O7r4mmtAlCWfO/0HdgOxSklZfQcDu0TpLiD1mRt/zF25Bk59FIjEuGAIyn5ei4yMfLhA==", + "version": "1.11.6", + "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.11.6.tgz", + "integrity": "sha512-3XOqkZP/y6B4F0PBAXvI1/bky7GryoogUtfwExeP/v7Nzwo1QLcq5oQmpKlftZLbT+ERUOAZVQjuNVak6UXjPA==", "dev": true, "dependencies": { - "@webassemblyjs/ast": "1.11.1", - "@webassemblyjs/helper-wasm-bytecode": "1.11.1", - "@webassemblyjs/ieee754": "1.11.1", - "@webassemblyjs/leb128": "1.11.1", - "@webassemblyjs/utf8": "1.11.1" + "@webassemblyjs/ast": "1.11.6", + "@webassemblyjs/helper-wasm-bytecode": "1.11.6", + "@webassemblyjs/ieee754": "1.11.6", + "@webassemblyjs/leb128": "1.11.6", + "@webassemblyjs/utf8": "1.11.6" } }, "node_modules/@webassemblyjs/wasm-opt": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.11.1.tgz", - "integrity": "sha512-VqnkNqnZlU5EB64pp1l7hdm3hmQw7Vgqa0KF/KCNO9sIpI6Fk6brDEiX+iCOYrvMuBWDws0NkTOxYEb85XQHHw==", + "version": "1.11.6", + "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.11.6.tgz", + "integrity": "sha512-cOrKuLRE7PCe6AsOVl7WasYf3wbSo4CeOk6PkrjS7g57MFfVUF9u6ysQBBODX0LdgSvQqRiGz3CXvIDKcPNy4g==", "dev": true, "dependencies": { - "@webassemblyjs/ast": "1.11.1", - "@webassemblyjs/helper-buffer": "1.11.1", - "@webassemblyjs/wasm-gen": "1.11.1", - "@webassemblyjs/wasm-parser": "1.11.1" + "@webassemblyjs/ast": "1.11.6", + "@webassemblyjs/helper-buffer": "1.11.6", + "@webassemblyjs/wasm-gen": "1.11.6", + "@webassemblyjs/wasm-parser": "1.11.6" } }, "node_modules/@webassemblyjs/wasm-parser": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.11.1.tgz", - "integrity": "sha512-rrBujw+dJu32gYB7/Lup6UhdkPx9S9SnobZzRVL7VcBH9Bt9bCBLEuX/YXOOtBsOZ4NQrRykKhffRWHvigQvOA==", + "version": "1.11.6", + "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.11.6.tgz", + "integrity": "sha512-6ZwPeGzMJM3Dqp3hCsLgESxBGtT/OeCvCZ4TA1JUPYgmhAx38tTPR9JaKy0S5H3evQpO/h2uWs2j6Yc/fjkpTQ==", "dev": true, "dependencies": { - "@webassemblyjs/ast": "1.11.1", - "@webassemblyjs/helper-api-error": "1.11.1", - "@webassemblyjs/helper-wasm-bytecode": "1.11.1", - "@webassemblyjs/ieee754": "1.11.1", - "@webassemblyjs/leb128": "1.11.1", - "@webassemblyjs/utf8": "1.11.1" + "@webassemblyjs/ast": "1.11.6", + "@webassemblyjs/helper-api-error": "1.11.6", + "@webassemblyjs/helper-wasm-bytecode": "1.11.6", + "@webassemblyjs/ieee754": "1.11.6", + "@webassemblyjs/leb128": "1.11.6", + "@webassemblyjs/utf8": "1.11.6" } }, "node_modules/@webassemblyjs/wast-printer": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.11.1.tgz", - "integrity": "sha512-IQboUWM4eKzWW+N/jij2sRatKMh99QEelo3Eb2q0qXkvPRISAj8Qxtmw5itwqK+TTkBuUIE45AxYPToqPtL5gg==", + "version": "1.11.6", + "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.11.6.tgz", + "integrity": "sha512-JM7AhRcE+yW2GWYaKeHL5vt4xqee5N2WcezptmgyhNS+ScggqcT1OtXykhAb13Sn5Yas0j2uv9tHgrjwvzAP4A==", "dev": true, "dependencies": { - "@webassemblyjs/ast": "1.11.1", + "@webassemblyjs/ast": "1.11.6", "@xtuc/long": "4.2.2" } }, + "node_modules/@wessberg/ts-evaluator": { + "version": "0.0.27", + "resolved": "https://registry.npmjs.org/@wessberg/ts-evaluator/-/ts-evaluator-0.0.27.tgz", + "integrity": "sha512-7gOpVm3yYojUp/Yn7F4ZybJRxyqfMNf0LXK5KJiawbPfL0XTsJV+0mgrEDjOIR6Bi0OYk2Cyg4tjFu1r8MCZaA==", + "deprecated": "this package has been renamed to ts-evaluator. Please install ts-evaluator instead", + "dev": true, + "dependencies": { + "chalk": "^4.1.0", + "jsdom": "^16.4.0", + "object-path": "^0.11.5", + "tslib": "^2.0.3" + }, + "engines": { + "node": ">=10.1.0" + }, + "funding": { + "type": "github", + "url": "https://github.com/wessberg/ts-evaluator?sponsor=1" + }, + "peerDependencies": { + "typescript": ">=3.2.x || >= 4.x" + } + }, + "node_modules/@wessberg/ts-evaluator/node_modules/ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "dev": true, + "dependencies": { + "color-convert": "^2.0.1" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" + } + }, + "node_modules/@wessberg/ts-evaluator/node_modules/chalk": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", + "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", + "dev": true, + "dependencies": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/chalk?sponsor=1" + } + }, + "node_modules/@wessberg/ts-evaluator/node_modules/color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "dependencies": { + "color-name": "~1.1.4" + }, + "engines": { + "node": ">=7.0.0" + } + }, + "node_modules/@wessberg/ts-evaluator/node_modules/color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true + }, + "node_modules/@wessberg/ts-evaluator/node_modules/has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/@wessberg/ts-evaluator/node_modules/supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "dev": true, + "dependencies": { + "has-flag": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, "node_modules/@xtuc/ieee754": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/@xtuc/ieee754/-/ieee754-1.2.0.tgz", @@ -6807,6 +7159,37 @@ "integrity": "sha512-GpSwvyXOcOOlV70vbnzjj4fW5xW/FdUF6nQEt1ENy7m4ZCczi1+/buVUPAqmGfqznsORNFzUMjctTIp8a9tuCQ==", "dev": true }, + "node_modules/@yarnpkg/parsers": { + "version": "3.0.0-rc.46", + "resolved": "https://registry.npmjs.org/@yarnpkg/parsers/-/parsers-3.0.0-rc.46.tgz", + "integrity": "sha512-aiATs7pSutzda/rq8fnuPwTglyVwjM22bNnK2ZgjrpAjQHSSl3lztd2f9evst1W/qnC58DRz7T7QndUDumAR4Q==", + "dev": true, + "dependencies": { + "js-yaml": "^3.10.0", + "tslib": "^2.4.0" + }, + "engines": { + "node": ">=14.15.0" + } + }, + "node_modules/@zkochan/js-yaml": { + "version": "0.0.6", + "resolved": "https://registry.npmjs.org/@zkochan/js-yaml/-/js-yaml-0.0.6.tgz", + "integrity": "sha512-nzvgl3VfhcELQ8LyVrYOru+UtAy1nrygk2+AGbTm8a5YcO6o8lSjAT+pfg3vJWxIoZKOUhrK6UU7xW/+00kQrg==", + "dev": true, + "dependencies": { + "argparse": "^2.0.1" + }, + "bin": { + "js-yaml": "bin/js-yaml.js" + } + }, + "node_modules/@zkochan/js-yaml/node_modules/argparse": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz", + "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==", + "dev": true + }, "node_modules/abab": { "version": "2.0.6", "resolved": "https://registry.npmjs.org/abab/-/abab-2.0.6.tgz", @@ -6833,14 +7216,36 @@ } }, "node_modules/ace-builds": { - "version": "1.18.0", - "resolved": "https://registry.npmjs.org/ace-builds/-/ace-builds-1.18.0.tgz", - "integrity": "sha512-ETLeQ3X1XvcWckOZFR+KvTectZyEwDm2p+CckWazS+xsK3THHVxn/PkfkPr37OTNKVY/yJRx29JGERV77YQYXw==" + "version": "1.28.0", + "resolved": "https://registry.npmjs.org/ace-builds/-/ace-builds-1.28.0.tgz", + "integrity": "sha512-wkJp+Wz8MRHtCVdt65L/jPFLAQ0iqJZ2EeD2XWOvKGbIi4mZNwHlpHRLRB8ZnQ07VoiB0TLFWwIjjm2FL9gUcQ==" }, "node_modules/acorn": { - "version": "8.8.1", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.8.1.tgz", - "integrity": "sha512-7zFpHzhnqYKrkYdUjF1HI1bzd0VygEGX8lFk4k5zVMqHEoES+P+7TKI+EvLO9WVMJ8eekdO0aDEK044xTXwPPA==", + "version": "8.10.0", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.10.0.tgz", + "integrity": "sha512-F0SAmZ8iUtS//m8DmCTA0jlh6TDKkHQyK6xc6V4KDTyZKA9dnvX9/3sRTVQrWm79glUAZbnmmNcdYwUIHWVybw==", + "dev": true, + "bin": { + "acorn": "bin/acorn" + }, + "engines": { + "node": ">=0.4.0" + } + }, + "node_modules/acorn-globals": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/acorn-globals/-/acorn-globals-6.0.0.tgz", + "integrity": "sha512-ZQl7LOWaF5ePqqcX4hLuv/bLXYQNfNWw2c0/yX/TsPRKamzHcTGQnlCjHT3TsmkOUVEPS3crCxiPfdzE/Trlhg==", + "dev": true, + "dependencies": { + "acorn": "^7.1.1", + "acorn-walk": "^7.1.1" + } + }, + "node_modules/acorn-globals/node_modules/acorn": { + "version": "7.4.1", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz", + "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==", "dev": true, "bin": { "acorn": "bin/acorn" @@ -6850,9 +7255,9 @@ } }, "node_modules/acorn-import-assertions": { - "version": "1.8.0", - "resolved": "https://registry.npmjs.org/acorn-import-assertions/-/acorn-import-assertions-1.8.0.tgz", - "integrity": "sha512-m7VZ3jwz4eK6A4Vtt8Ew1/mNbP24u0FhdyfA7fSvnJR6LMdfOYnmuIrrJAgrYfYJ10F/otaHTtrtrtmHdMNzEw==", + "version": "1.9.0", + "resolved": "https://registry.npmjs.org/acorn-import-assertions/-/acorn-import-assertions-1.9.0.tgz", + "integrity": "sha512-cmMwop9x+8KFhxvKrKfPYmN6/pKTYYHBqLa0DfvVZcKMJWNyWLnaqND7dx/qn66R7ewM1UX5XMaDVP5wlVTaVA==", "dev": true, "peerDependencies": { "acorn": "^8" @@ -6867,6 +7272,15 @@ "acorn": "^6.0.0 || ^7.0.0 || ^8.0.0" } }, + "node_modules/acorn-walk": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-7.2.0.tgz", + "integrity": "sha512-OPdCF6GsMIP+Az+aWfAAOEt2/+iVDKE7oy6lJ098aoe59oAmK76qV6Gw60SbZ8jHuG2wH058GF4pLFbYamYrVA==", + "dev": true, + "engines": { + "node": ">=0.4.0" + } + }, "node_modules/adjust-sourcemap-loader": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/adjust-sourcemap-loader/-/adjust-sourcemap-loader-4.0.0.tgz", @@ -6907,13 +7321,11 @@ } }, "node_modules/agentkeepalive": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/agentkeepalive/-/agentkeepalive-4.3.0.tgz", - "integrity": "sha512-7Epl1Blf4Sy37j4v9f9FjICCh4+KAQOyXgHEwlyBiAQLbhKdq/i2QQU3amQalS/wPhdPzDXPL5DMR5bkn+YeWg==", + "version": "4.5.0", + "resolved": "https://registry.npmjs.org/agentkeepalive/-/agentkeepalive-4.5.0.tgz", + "integrity": "sha512-5GG/5IbQQpC9FpkRGsSvZI5QYeSCzlJHdpBQntCsuTOxhKD8lqKhrleg2Yi7yvMIf82Ycmmqln9U8V9qwEiJew==", "dev": true, "dependencies": { - "debug": "^4.1.0", - "depd": "^2.0.0", "humanize-ms": "^1.2.1" }, "engines": { @@ -6978,18 +7390,6 @@ "ajv": "^8.8.2" } }, - "node_modules/angular-google-tag-manager": { - "version": "1.7.0", - "resolved": "https://registry.npmjs.org/angular-google-tag-manager/-/angular-google-tag-manager-1.7.0.tgz", - "integrity": "sha512-0lUOP7KYH0d1SV3mT/nSPL0WIuoT6fNBFod0JQ61OKsBAEMjmWfpkqMPVHaR3g+/RWs2Zy9St+PgbUGKRlye1g==", - "dependencies": { - "tslib": "^2.4.1" - }, - "peerDependencies": { - "@angular/common": "^15.0.0", - "@angular/compiler": "^15.0.0" - } - }, "node_modules/angular-resizable-element": { "version": "7.0.2", "resolved": "https://registry.npmjs.org/angular-resizable-element/-/angular-resizable-element-7.0.2.tgz", @@ -7014,23 +7414,6 @@ "rxjs": ">=6.0.0" } }, - "node_modules/angular2-csv": { - "version": "0.2.9", - "resolved": "https://registry.npmjs.org/angular2-csv/-/angular2-csv-0.2.9.tgz", - "integrity": "sha512-RmVpaT2DSLJikPIxXfvhNHT/a03g+jM7Wsx0x+kNmCTuTqA1MAIPVhZPNgFvoSvZM898ACgcTSV6vvsDLdt1BA==", - "dependencies": { - "tslib": "^1.9.0" - }, - "peerDependencies": { - "@angular/common": "^6.0.0-rc.0 || ^6.0.0", - "@angular/core": "^6.0.0-rc.0 || ^6.0.0" - } - }, - "node_modules/angular2-csv/node_modules/tslib": { - "version": "1.14.1", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", - "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==" - }, "node_modules/ansi-colors": { "version": "4.1.3", "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.3.tgz", @@ -7117,15 +7500,6 @@ "node": ">= 8" } }, - "node_modules/app-root-path": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/app-root-path/-/app-root-path-3.1.0.tgz", - "integrity": "sha512-biN3PwB2gUtjaYy/isrU3aNWI5w+fAfvHkSvCKeQGxhmYpwKFUxudR3Yya+KqVRHBmEDYh+/lTozYCFbmzX4nA==", - "dev": true, - "engines": { - "node": ">= 6.0.0" - } - }, "node_modules/aproba": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/aproba/-/aproba-2.0.0.tgz", @@ -7170,12 +7544,25 @@ "dev": true }, "node_modules/aria-query": { - "version": "5.1.3", - "resolved": "https://registry.npmjs.org/aria-query/-/aria-query-5.1.3.tgz", - "integrity": "sha512-R5iJ5lkuHybztUfuOAznmboyjWq8O6sqNqtK7CLOqdydi54VNbORp49mb14KbWgG1QD3JFO9hJdZ+y4KutfdOQ==", + "version": "5.3.0", + "resolved": "https://registry.npmjs.org/aria-query/-/aria-query-5.3.0.tgz", + "integrity": "sha512-b0P0sZPKtyu8HkeRAfCq0IfURZK+SuwMjY1UXGBU27wpAiTwQAIlq56IbIO+ytk/JjS1fMR14ee5WBBfKi5J6A==", "dev": true, "dependencies": { - "deep-equal": "^2.0.5" + "dequal": "^2.0.3" + } + }, + "node_modules/array-buffer-byte-length": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/array-buffer-byte-length/-/array-buffer-byte-length-1.0.0.tgz", + "integrity": "sha512-LPuwb2P+NrQw3XhxGc36+XSvuBPopovXYTR9Ew++Du9Yb/bx5AzBfrIsBoj0EZUifjQU+sHL21sseZ3jerWO/A==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.2", + "is-array-buffer": "^3.0.1" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" } }, "node_modules/array-flatten": { @@ -7212,6 +7599,25 @@ "node": ">=8" } }, + "node_modules/array.prototype.findlastindex": { + "version": "1.2.3", + "resolved": "https://registry.npmjs.org/array.prototype.findlastindex/-/array.prototype.findlastindex-1.2.3.tgz", + "integrity": "sha512-LzLoiOMAxvy+Gd3BAq3B7VeIgPdo+Q8hthvKtXybMvRV0jrXfJM/t8mw7nNlpEcVlVUnCnM2KSX4XU5HmpodOA==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.2", + "define-properties": "^1.2.0", + "es-abstract": "^1.22.1", + "es-shim-unscopables": "^1.0.0", + "get-intrinsic": "^1.2.1" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/array.prototype.flat": { "version": "1.3.1", "resolved": "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.3.1.tgz", @@ -7248,16 +7654,43 @@ "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/ast-types-flow": { - "version": "0.0.7", - "resolved": "https://registry.npmjs.org/ast-types-flow/-/ast-types-flow-0.0.7.tgz", - "integrity": "sha512-eBvWn1lvIApYMhzQMsu9ciLfkBY499mFZlNqG+/9WR7PVlroQw0vG30cOQQbaKz3sCEc44TAOu2ykzqXSNnwag==", + "node_modules/arraybuffer.prototype.slice": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/arraybuffer.prototype.slice/-/arraybuffer.prototype.slice-1.0.2.tgz", + "integrity": "sha512-yMBKppFur/fbHu9/6USUe03bZ4knMYiwFBcyiaXB8Go0qNehwX6inYPzK9U0NeQvGxKthcmHcaR8P5MStSRBAw==", + "dev": true, + "dependencies": { + "array-buffer-byte-length": "^1.0.0", + "call-bind": "^1.0.2", + "define-properties": "^1.2.0", + "es-abstract": "^1.22.1", + "get-intrinsic": "^1.2.1", + "is-array-buffer": "^3.0.2", + "is-shared-array-buffer": "^1.0.2" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/async": { + "version": "3.2.4", + "resolved": "https://registry.npmjs.org/async/-/async-3.2.4.tgz", + "integrity": "sha512-iAB+JbDEGXhyIUavoDl9WP/Jj106Kz9DEn1DPgYw5ruDn0e3Wgi3sKFm55sASdGBNOQB8F59d9qQ7deqrHA8wQ==", + "dev": true + }, + "node_modules/asynckit": { + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz", + "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==", "dev": true }, "node_modules/autoprefixer": { - "version": "10.4.13", - "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.4.13.tgz", - "integrity": "sha512-49vKpMqcZYsJjwotvt4+h/BCjJVnhGwcLpDt5xkcaOG3eLrG/HUYLagrihYsQ+qrIBgIzX1Rw7a6L8I/ZA1Atg==", + "version": "10.4.14", + "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.4.14.tgz", + "integrity": "sha512-FQzyfOsTlwVzjHxKEqRIAdJx9niO6VCBCoEwax/VLSoQF29ggECcPuBqUMZ+u8jCZOPSy8b8/8KnuFbp0SaFZQ==", "dev": true, "funding": [ { @@ -7270,8 +7703,8 @@ } ], "dependencies": { - "browserslist": "^4.21.4", - "caniuse-lite": "^1.0.30001426", + "browserslist": "^4.21.5", + "caniuse-lite": "^1.0.30001464", "fraction.js": "^4.2.0", "normalize-range": "^0.1.2", "picocolors": "^1.0.0", @@ -7299,6 +7732,31 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/axios": { + "version": "1.5.1", + "resolved": "https://registry.npmjs.org/axios/-/axios-1.5.1.tgz", + "integrity": "sha512-Q28iYCWzNHjAm+yEAot5QaAMxhMghWLFVf7rRdwhUI+c2jix2DUXjAHXVi+s1ibs3mjPO/cCgbA++3BjD0vP/A==", + "dev": true, + "dependencies": { + "follow-redirects": "^1.15.0", + "form-data": "^4.0.0", + "proxy-from-env": "^1.1.0" + } + }, + "node_modules/axios/node_modules/form-data": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz", + "integrity": "sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==", + "dev": true, + "dependencies": { + "asynckit": "^0.4.0", + "combined-stream": "^1.0.8", + "mime-types": "^2.1.12" + }, + "engines": { + "node": ">= 6" + } + }, "node_modules/axobject-query": { "version": "3.1.1", "resolved": "https://registry.npmjs.org/axobject-query/-/axobject-query-3.1.1.tgz", @@ -7309,12 +7767,12 @@ } }, "node_modules/babel-loader": { - "version": "9.1.2", - "resolved": "https://registry.npmjs.org/babel-loader/-/babel-loader-9.1.2.tgz", - "integrity": "sha512-mN14niXW43tddohGl8HPu5yfQq70iUThvFL/4QzESA7GcZoC0eVOhvWdQ8+3UlSjaDE9MVtsW9mxDY07W7VpVA==", + "version": "9.1.3", + "resolved": "https://registry.npmjs.org/babel-loader/-/babel-loader-9.1.3.tgz", + "integrity": "sha512-xG3ST4DglodGf8qSwv0MdeWLhrDsw/32QMdTO5T1ZIp9gQur0HkCyFs7Awskr10JKXFXwpAhiCuYX5oGXnRGbw==", "dev": true, "dependencies": { - "find-cache-dir": "^3.3.2", + "find-cache-dir": "^4.0.0", "schema-utils": "^4.0.0" }, "engines": { @@ -7342,51 +7800,51 @@ } }, "node_modules/babel-plugin-polyfill-corejs2": { - "version": "0.3.3", - "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.3.3.tgz", - "integrity": "sha512-8hOdmFYFSZhqg2C/JgLUQ+t52o5nirNwaWM2B9LWteozwIvM14VSwdsCAUET10qT+kmySAlseadmfeeSWFCy+Q==", + "version": "0.4.5", + "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.4.5.tgz", + "integrity": "sha512-19hwUH5FKl49JEsvyTcoHakh6BE0wgXLLptIyKZ3PijHc/Ci521wygORCUCCred+E/twuqRyAkE02BAWPmsHOg==", "dev": true, "dependencies": { - "@babel/compat-data": "^7.17.7", - "@babel/helper-define-polyfill-provider": "^0.3.3", - "semver": "^6.1.1" + "@babel/compat-data": "^7.22.6", + "@babel/helper-define-polyfill-provider": "^0.4.2", + "semver": "^6.3.1" }, "peerDependencies": { - "@babel/core": "^7.0.0-0" + "@babel/core": "^7.4.0 || ^8.0.0-0 <8.0.0" } }, "node_modules/babel-plugin-polyfill-corejs2/node_modules/semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", + "version": "6.3.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", + "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", "dev": true, "bin": { "semver": "bin/semver.js" } }, "node_modules/babel-plugin-polyfill-corejs3": { - "version": "0.6.0", - "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.6.0.tgz", - "integrity": "sha512-+eHqR6OPcBhJOGgsIar7xoAB1GcSwVUA3XjAd7HJNzOXT4wv6/H7KIdA/Nc60cvUlDbKApmqNvD1B1bzOt4nyA==", + "version": "0.8.4", + "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.8.4.tgz", + "integrity": "sha512-9l//BZZsPR+5XjyJMPtZSK4jv0BsTO1zDac2GC6ygx9WLGlcsnRd1Co0B2zT5fF5Ic6BZy+9m3HNZ3QcOeDKfg==", "dev": true, "dependencies": { - "@babel/helper-define-polyfill-provider": "^0.3.3", - "core-js-compat": "^3.25.1" + "@babel/helper-define-polyfill-provider": "^0.4.2", + "core-js-compat": "^3.32.2" }, "peerDependencies": { - "@babel/core": "^7.0.0-0" + "@babel/core": "^7.4.0 || ^8.0.0-0 <8.0.0" } }, "node_modules/babel-plugin-polyfill-regenerator": { - "version": "0.4.1", - "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.4.1.tgz", - "integrity": "sha512-NtQGmyQDXjQqQ+IzRkBVwEOz9lQ4zxAQZgoAYEtU9dJjnl1Oc98qnN7jcp+bE7O7aYzVpavXE3/VKXNzUbh7aw==", + "version": "0.5.2", + "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.5.2.tgz", + "integrity": "sha512-tAlOptU0Xj34V1Y2PNTL4Y0FOJMDB6bZmoW39FeCQIhigGLkqu3Fj6uiXpxIf6Ij274ENdYx64y6Au+ZKlb1IA==", "dev": true, "dependencies": { - "@babel/helper-define-polyfill-provider": "^0.3.3" + "@babel/helper-define-polyfill-provider": "^0.4.2" }, "peerDependencies": { - "@babel/core": "^7.0.0-0" + "@babel/core": "^7.4.0 || ^8.0.0-0 <8.0.0" } }, "node_modules/balanced-match": { @@ -7503,6 +7961,21 @@ "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==", "dev": true }, + "node_modules/body-parser/node_modules/qs": { + "version": "6.11.0", + "resolved": "https://registry.npmjs.org/qs/-/qs-6.11.0.tgz", + "integrity": "sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==", + "dev": true, + "dependencies": { + "side-channel": "^1.0.4" + }, + "engines": { + "node": ">=0.6" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/bonjour-service": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/bonjour-service/-/bonjour-service-1.1.1.tgz", @@ -7518,13 +7991,13 @@ "node_modules/boolbase": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz", - "integrity": "sha1-aN/1++YMUes3cl6p4+0xDcwed24=", + "integrity": "sha512-JZOSA7Mo9sNGB8+UjSgzdLtokWAky1zbztM3WRLCbZ70/3cTANmQmOdR7y2g+J0e2WXywy1yS468tY+IruqEww==", "dev": true }, "node_modules/bootstrap": { - "version": "5.2.3", - "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-5.2.3.tgz", - "integrity": "sha512-cEKPM+fwb3cT8NzQZYEu4HilJ3anCrWqh3CHAok1p9jXqMPsPTBhU25fBckEJHJ/p+tTxTFTsFQGM+gaHpi3QQ==", + "version": "5.3.2", + "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-5.3.2.tgz", + "integrity": "sha512-D32nmNWiQHo94BKHLmOrdjlL05q1c8oxbtBphQFb9Z5to6eGRDCm0QgeaZ4zFBHzfg2++rqa2JkqCcxDy0sH0g==", "funding": [ { "type": "github", @@ -7536,7 +8009,7 @@ } ], "peerDependencies": { - "@popperjs/core": "^2.11.6" + "@popperjs/core": "^2.11.8" } }, "node_modules/bowser": { @@ -7616,10 +8089,16 @@ "d3-transition": "1" } }, + "node_modules/browser-process-hrtime": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/browser-process-hrtime/-/browser-process-hrtime-1.0.0.tgz", + "integrity": "sha512-9o5UecI3GhkpM6DrXr69PblIuWxPKk9Y0jHBRhdocZ2y7YECBFCsHm79Pr3OyR2AvjhDkabFJaDJMYRazHgsow==", + "dev": true + }, "node_modules/browserslist": { - "version": "4.21.5", - "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.21.5.tgz", - "integrity": "sha512-tUkiguQGW7S3IhB7N+c2MV/HZPSCPAAiYBZXLsBhFB/PCy6ZKKsZrmBayHV9fdGV/ARIfJ14NkxKzRDjvp7L6w==", + "version": "4.21.11", + "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.21.11.tgz", + "integrity": "sha512-xn1UXOKUz7DjdGlg9RrUr0GGiWzI97UQJnugHtH0OLDfJB7jMgoIkYvRIEO1l9EeEERVqeqLYOcFBW9ldjypbQ==", "dev": true, "funding": [ { @@ -7629,13 +8108,17 @@ { "type": "tidelift", "url": "https://tidelift.com/funding/github/npm/browserslist" + }, + { + "type": "github", + "url": "https://github.com/sponsors/ai" } ], "dependencies": { - "caniuse-lite": "^1.0.30001449", - "electron-to-chromium": "^1.4.284", - "node-releases": "^2.0.8", - "update-browserslist-db": "^1.0.10" + "caniuse-lite": "^1.0.30001538", + "electron-to-chromium": "^1.4.526", + "node-releases": "^2.0.13", + "update-browserslist-db": "^1.0.13" }, "bin": { "browserslist": "cli.js" @@ -7674,6 +8157,18 @@ "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==", "dev": true }, + "node_modules/builtin-modules": { + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-3.3.0.tgz", + "integrity": "sha512-zhaCDicdLuWN5UbN5IMnFqNMhNfo919sH85y2/ea+5Yg9TsTkeZxpL+JLbp6cgYFS4sRLp3YV4S6yDuqVWHYOw==", + "dev": true, + "engines": { + "node": ">=6" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, "node_modules/builtins": { "version": "5.0.1", "resolved": "https://registry.npmjs.org/builtins/-/builtins-5.0.1.tgz", @@ -7693,21 +8188,20 @@ } }, "node_modules/cacache": { - "version": "17.0.4", - "resolved": "https://registry.npmjs.org/cacache/-/cacache-17.0.4.tgz", - "integrity": "sha512-Z/nL3gU+zTUjz5pCA5vVjYM8pmaw2kxM7JEiE0fv3w77Wj+sFbi70CrBruUWH0uNcEdvLDixFpgA2JM4F4DBjA==", + "version": "17.1.4", + "resolved": "https://registry.npmjs.org/cacache/-/cacache-17.1.4.tgz", + "integrity": "sha512-/aJwG2l3ZMJ1xNAnqbMpA40of9dj/pIH3QfiuQSqjfPJF747VR0J/bHn+/KdNnHKc6XQcWt/AfRSBft82W1d2A==", "dev": true, "dependencies": { "@npmcli/fs": "^3.1.0", "fs-minipass": "^3.0.0", - "glob": "^8.0.1", + "glob": "^10.2.2", "lru-cache": "^7.7.1", - "minipass": "^4.0.0", + "minipass": "^7.0.3", "minipass-collect": "^1.0.2", "minipass-flush": "^1.0.5", "minipass-pipeline": "^1.2.4", "p-map": "^4.0.0", - "promise-inflight": "^1.0.1", "ssri": "^10.0.0", "tar": "^6.1.11", "unique-filename": "^3.0.0" @@ -7726,50 +8220,64 @@ } }, "node_modules/cacache/node_modules/glob": { - "version": "8.1.0", - "resolved": "https://registry.npmjs.org/glob/-/glob-8.1.0.tgz", - "integrity": "sha512-r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ==", + "version": "10.3.9", + "resolved": "https://registry.npmjs.org/glob/-/glob-10.3.9.tgz", + "integrity": "sha512-2tU/LKevAQvDVuVJ9pg9Yv9xcbSh+TqHuTaXTNbQwf+0kDl9Fm6bMovi4Nm5c8TVvfxo2LLcqCGtmO9KoJaGWg==", "dev": true, "dependencies": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^5.0.1", - "once": "^1.3.0" + "foreground-child": "^3.1.0", + "jackspeak": "^2.3.5", + "minimatch": "^9.0.1", + "minipass": "^5.0.0 || ^6.0.2 || ^7.0.0", + "path-scurry": "^1.10.1" + }, + "bin": { + "glob": "dist/esm/bin.mjs" }, "engines": { - "node": ">=12" + "node": ">=16 || 14 >=14.17" }, "funding": { "url": "https://github.com/sponsors/isaacs" } }, "node_modules/cacache/node_modules/lru-cache": { - "version": "7.14.1", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.14.1.tgz", - "integrity": "sha512-ysxwsnTKdAx96aTRdhDOCQfDgbHnt8SK0KY8SEjO0wHinhWOFTESbjVCMPbU1uGXg/ch4lifqx0wfjOawU2+WA==", + "version": "7.18.3", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.18.3.tgz", + "integrity": "sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA==", "dev": true, "engines": { "node": ">=12" } }, "node_modules/cacache/node_modules/minimatch": { - "version": "5.1.6", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz", - "integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==", + "version": "9.0.3", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.3.tgz", + "integrity": "sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg==", "dev": true, "dependencies": { "brace-expansion": "^2.0.1" }, "engines": { - "node": ">=10" + "node": ">=16 || 14 >=14.17" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/cacache/node_modules/minipass": { + "version": "7.0.3", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.0.3.tgz", + "integrity": "sha512-LhbbwCfz3vsb12j/WkWQPZfKTsgqIe1Nf/ti1pKjYESGLHIVjWU96G9/ljLH4F9mWNVhlQOm0VySdAWzf05dpg==", + "dev": true, + "engines": { + "node": ">=16 || 14 >=14.17" } }, "node_modules/call-bind": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz", "integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==", - "dev": true, "dependencies": { "function-bind": "^1.1.1", "get-intrinsic": "^1.0.2" @@ -7797,9 +8305,9 @@ } }, "node_modules/caniuse-lite": { - "version": "1.0.30001477", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001477.tgz", - "integrity": "sha512-lZim4iUHhGcy5p+Ri/G7m84hJwncj+Kz7S5aD4hoQfslKZJgt0tHc/hafVbqHC5bbhHb+mrW2JOUHkI5KH7toQ==", + "version": "1.0.30001539", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001539.tgz", + "integrity": "sha512-hfS5tE8bnNiNvEOEkm8HElUHroYwlqMMENEzELymy77+tJ6m+gA2krtHl5hxJaj71OlpC2cHZbdSMX1/YEqEkA==", "dev": true, "funding": [ { @@ -7960,105 +8468,6 @@ "node": ">=6" } }, - "node_modules/codelyzer": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/codelyzer/-/codelyzer-6.0.2.tgz", - "integrity": "sha512-v3+E0Ucu2xWJMOJ2fA/q9pDT/hlxHftHGPUay1/1cTgyPV5JTHFdO9hqo837Sx2s9vKBMTt5gO+lhF95PO6J+g==", - "dev": true, - "dependencies": { - "@angular/compiler": "9.0.0", - "@angular/core": "9.0.0", - "app-root-path": "^3.0.0", - "aria-query": "^3.0.0", - "axobject-query": "2.0.2", - "css-selector-tokenizer": "^0.7.1", - "cssauron": "^1.4.0", - "damerau-levenshtein": "^1.0.4", - "rxjs": "^6.5.3", - "semver-dsl": "^1.0.1", - "source-map": "^0.5.7", - "sprintf-js": "^1.1.2", - "tslib": "^1.10.0", - "zone.js": "~0.10.3" - }, - "peerDependencies": { - "@angular/compiler": ">=2.3.1 <13.0.0 || ^12.0.0-next || ^12.1.0-next || ^12.2.0-next", - "@angular/core": ">=2.3.1 <13.0.0 || ^12.0.0-next || ^12.1.0-next || ^12.2.0-next", - "tslint": "^5.0.0 || ^6.0.0" - } - }, - "node_modules/codelyzer/node_modules/@angular/compiler": { - "version": "9.0.0", - "resolved": "https://registry.npmjs.org/@angular/compiler/-/compiler-9.0.0.tgz", - "integrity": "sha512-ctjwuntPfZZT2mNj2NDIVu51t9cvbhl/16epc5xEwyzyDt76pX9UgwvY+MbXrf/C/FWwdtmNtfP698BKI+9leQ==", - "dev": true, - "peerDependencies": { - "tslib": "^1.10.0" - } - }, - "node_modules/codelyzer/node_modules/@angular/core": { - "version": "9.0.0", - "resolved": "https://registry.npmjs.org/@angular/core/-/core-9.0.0.tgz", - "integrity": "sha512-6Pxgsrf0qF9iFFqmIcWmjJGkkCaCm6V5QNnxMy2KloO3SDq6QuMVRbN9RtC8Urmo25LP+eZ6ZgYqFYpdD8Hd9w==", - "dev": true, - "peerDependencies": { - "rxjs": "^6.5.3", - "tslib": "^1.10.0", - "zone.js": "~0.10.2" - } - }, - "node_modules/codelyzer/node_modules/aria-query": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/aria-query/-/aria-query-3.0.0.tgz", - "integrity": "sha512-majUxHgLehQTeSA+hClx+DY09OVUqG3GtezWkF1krgLGNdlDu9l9V8DaqNMWbq4Eddc8wsyDA0hpDUtnYxQEXw==", - "dev": true, - "dependencies": { - "ast-types-flow": "0.0.7", - "commander": "^2.11.0" - } - }, - "node_modules/codelyzer/node_modules/axobject-query": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/axobject-query/-/axobject-query-2.0.2.tgz", - "integrity": "sha512-MCeek8ZH7hKyO1rWUbKNQBbl4l2eY0ntk7OGi+q0RlafrCnfPxC06WZA+uebCfmYp4mNU9jRBP1AhGyf8+W3ww==", - "dev": true, - "dependencies": { - "ast-types-flow": "0.0.7" - } - }, - "node_modules/codelyzer/node_modules/rxjs": { - "version": "6.6.7", - "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.7.tgz", - "integrity": "sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==", - "dev": true, - "dependencies": { - "tslib": "^1.9.0" - }, - "engines": { - "npm": ">=2.0.0" - } - }, - "node_modules/codelyzer/node_modules/source-map": { - "version": "0.5.7", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", - "integrity": "sha512-LbrmJOMUSdEVxIKvdcJzQC+nQhe8FUZQTXQy6+I75skNgn3OoQ0DZA8YnFa7gp8tqtL3KPf1kmo0R5DoApeSGQ==", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/codelyzer/node_modules/tslib": { - "version": "1.14.1", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", - "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==", - "dev": true - }, - "node_modules/codelyzer/node_modules/zone.js": { - "version": "0.10.3", - "resolved": "https://registry.npmjs.org/zone.js/-/zone.js-0.10.3.tgz", - "integrity": "sha512-LXVLVEq0NNOqK/fLJo3d0kfzd4sxwn2/h67/02pjCjfKDxgx1i9QqpvtHD8CrBnSSwMw5+dy11O7FRX5mkO7Cg==", - "dev": true - }, "node_modules/color-convert": { "version": "1.9.3", "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz", @@ -8084,9 +8493,9 @@ } }, "node_modules/colorette": { - "version": "2.0.19", - "resolved": "https://registry.npmjs.org/colorette/-/colorette-2.0.19.tgz", - "integrity": "sha512-3tlv/dIP7FWvj3BsbHrGLJ6l/oKh1O3TcgBqMn+yyCagOxc23fyzDS6HypQbgxWbkpDnf52p1LuR4eWDQ/K9WQ==", + "version": "2.0.20", + "resolved": "https://registry.npmjs.org/colorette/-/colorette-2.0.20.tgz", + "integrity": "sha512-IfEDxwoWIjkeXL1eXcDiow4UbKjhLdq6/EuSVR9GMN7KVH3r9gQ83e73hsz1Nd1T3ijd5xv1wcWRYO+D6kCI2w==", "dev": true }, "node_modules/colornames": { @@ -8094,6 +8503,18 @@ "resolved": "https://registry.npmjs.org/colornames/-/colornames-1.1.1.tgz", "integrity": "sha1-+IiQMGhcfE/54qVZ9Qd+t2qBb5Y=" }, + "node_modules/combined-stream": { + "version": "1.0.8", + "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz", + "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==", + "dev": true, + "dependencies": { + "delayed-stream": "~1.0.0" + }, + "engines": { + "node": ">= 0.8" + } + }, "node_modules/commander": { "version": "2.20.3", "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz", @@ -8101,18 +8522,18 @@ "dev": true }, "node_modules/comment-parser": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/comment-parser/-/comment-parser-1.3.1.tgz", - "integrity": "sha512-B52sN2VNghyq5ofvUsqZjmk6YkihBX5vMSChmSK9v4ShjKf3Vk5Xcmgpw4o+iIgtrnM/u5FiMpz9VKb8lpBveA==", + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/comment-parser/-/comment-parser-1.4.0.tgz", + "integrity": "sha512-QLyTNiZ2KDOibvFPlZ6ZngVsZ/0gYnE6uTXi5aoDg8ed3AkJAz4sEje3Y8a29hQ1s6A99MZXe47fLAXQ1rTqaw==", "dev": true, "engines": { "node": ">= 12.0.0" } }, - "node_modules/commondir": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz", - "integrity": "sha512-W9pAhw0ja1Edb5GVdIF1mjZw/ASI0AlShXM83UUGe2DVr5TdAPEA1OA8m/g8zWp9x6On7gqufY+FatDbC3MDQg==", + "node_modules/common-path-prefix": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/common-path-prefix/-/common-path-prefix-3.0.0.tgz", + "integrity": "sha512-QE33hToZseCH3jS0qN96O/bSh3kaw/h+Tq7ngyY9eWDUnTlTNUyqfqvCXioLe5Na5jFsL78ra/wuBU4iuEgd4w==", "dev": true }, "node_modules/compressible": { @@ -8318,12 +8739,12 @@ } }, "node_modules/core-js-compat": { - "version": "3.27.2", - "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.27.2.tgz", - "integrity": "sha512-welaYuF7ZtbYKGrIy7y3eb40d37rG1FvzEOfe7hSLd2iD6duMDqUhRfSvCGyC46HhR6Y8JXXdZ2lnRUMkPBpvg==", + "version": "3.32.2", + "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.32.2.tgz", + "integrity": "sha512-+GjlguTDINOijtVRUxrQOv3kfu9rl+qPNdX2LTbJ/ZyVTuxK+ksVSAGX1nHstu4hrv1En/uPTtWgq2gI5wt4AQ==", "dev": true, "dependencies": { - "browserslist": "^4.21.4" + "browserslist": "^4.21.10" }, "funding": { "type": "opencollective", @@ -8337,32 +8758,61 @@ "dev": true }, "node_modules/cosmiconfig": { - "version": "7.1.0", - "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-7.1.0.tgz", - "integrity": "sha512-AdmX6xUzdNASswsFtmwSt7Vj8po9IuqXm0UXz7QKPuEUmPB4XyjGfaAr2PSuELMwkRMVH1EpIkX5bTZGRB3eCA==", + "version": "8.3.6", + "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-8.3.6.tgz", + "integrity": "sha512-kcZ6+W5QzcJ3P1Mt+83OUv/oHFqZHIx8DuxG6eZ5RGMERoLqp4BuGjhHLYGK+Kf5XVkQvqBSmAy/nGWN3qDgEA==", "dev": true, "dependencies": { - "@types/parse-json": "^4.0.0", - "import-fresh": "^3.2.1", - "parse-json": "^5.0.0", - "path-type": "^4.0.0", - "yaml": "^1.10.0" + "import-fresh": "^3.3.0", + "js-yaml": "^4.1.0", + "parse-json": "^5.2.0", + "path-type": "^4.0.0" }, "engines": { - "node": ">=10" + "node": ">=14" + }, + "funding": { + "url": "https://github.com/sponsors/d-fischer" + }, + "peerDependencies": { + "typescript": ">=4.9.5" + }, + "peerDependenciesMeta": { + "typescript": { + "optional": true + } + } + }, + "node_modules/cosmiconfig/node_modules/argparse": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz", + "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==", + "dev": true + }, + "node_modules/cosmiconfig/node_modules/js-yaml": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz", + "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==", + "dev": true, + "dependencies": { + "argparse": "^2.0.1" + }, + "bin": { + "js-yaml": "bin/js-yaml.js" } }, "node_modules/critters": { - "version": "0.0.16", - "resolved": "https://registry.npmjs.org/critters/-/critters-0.0.16.tgz", - "integrity": "sha512-JwjgmO6i3y6RWtLYmXwO5jMd+maZt8Tnfu7VVISmEWyQqfLpB8soBswf8/2bu6SBXxtKA68Al3c+qIG1ApT68A==", + "version": "0.0.20", + "resolved": "https://registry.npmjs.org/critters/-/critters-0.0.20.tgz", + "integrity": "sha512-CImNRorKOl5d8TWcnAz5n5izQ6HFsvz29k327/ELy6UFcmbiZNOsinaKvzv16WZR0P6etfSWYzE47C4/56B3Uw==", "dev": true, "dependencies": { "chalk": "^4.1.0", - "css-select": "^4.2.0", - "parse5": "^6.0.1", - "parse5-htmlparser2-tree-adapter": "^6.0.1", - "postcss": "^8.3.7", + "css-select": "^5.1.0", + "dom-serializer": "^2.0.0", + "domhandler": "^5.0.2", + "htmlparser2": "^8.0.2", + "postcss": "^8.4.23", "pretty-bytes": "^5.3.0" } }, @@ -8424,12 +8874,6 @@ "node": ">=8" } }, - "node_modules/critters/node_modules/parse5": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/parse5/-/parse5-6.0.1.tgz", - "integrity": "sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw==", - "dev": true - }, "node_modules/critters/node_modules/supports-color": { "version": "7.2.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", @@ -8457,15 +8901,15 @@ } }, "node_modules/css-loader": { - "version": "6.7.3", - "resolved": "https://registry.npmjs.org/css-loader/-/css-loader-6.7.3.tgz", - "integrity": "sha512-qhOH1KlBMnZP8FzRO6YCH9UHXQhVMcEGLyNdb7Hv2cpcmJbW0YrddO+tG1ab5nT41KpHIYGsbeHqxB9xPu1pKQ==", + "version": "6.8.1", + "resolved": "https://registry.npmjs.org/css-loader/-/css-loader-6.8.1.tgz", + "integrity": "sha512-xDAXtEVGlD0gJ07iclwWVkLoZOpEvAWaSyf6W18S2pOC//K8+qUDIx8IIT3D+HjnmkJPQeesOPv5aiUaJsCM2g==", "dev": true, "dependencies": { "icss-utils": "^5.1.0", - "postcss": "^8.4.19", + "postcss": "^8.4.21", "postcss-modules-extract-imports": "^3.0.0", - "postcss-modules-local-by-default": "^4.0.0", + "postcss-modules-local-by-default": "^4.0.3", "postcss-modules-scope": "^3.0.0", "postcss-modules-values": "^4.0.0", "postcss-value-parser": "^4.2.0", @@ -8483,35 +8927,25 @@ } }, "node_modules/css-select": { - "version": "4.2.1", - "resolved": "https://registry.npmjs.org/css-select/-/css-select-4.2.1.tgz", - "integrity": "sha512-/aUslKhzkTNCQUB2qTX84lVmfia9NyjP3WpDGtj/WxhwBzWBYUV3DgUpurHTme8UTPcPlAD1DJ+b0nN/t50zDQ==", + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/css-select/-/css-select-5.1.0.tgz", + "integrity": "sha512-nwoRF1rvRRnnCqqY7updORDsuqKzqYJ28+oSMaJMMgOauh3fvwHqMS7EZpIPqK8GL+g9mKxF1vP/ZjSeNjEVHg==", "dev": true, "dependencies": { "boolbase": "^1.0.0", - "css-what": "^5.1.0", - "domhandler": "^4.3.0", - "domutils": "^2.8.0", + "css-what": "^6.1.0", + "domhandler": "^5.0.2", + "domutils": "^3.0.1", "nth-check": "^2.0.1" }, "funding": { "url": "https://github.com/sponsors/fb55" } }, - "node_modules/css-selector-tokenizer": { - "version": "0.7.3", - "resolved": "https://registry.npmjs.org/css-selector-tokenizer/-/css-selector-tokenizer-0.7.3.tgz", - "integrity": "sha512-jWQv3oCEL5kMErj4wRnK/OPoBi0D+P1FR2cDCKYPaMeD2eW3/mttav8HT4hT1CKopiJI/psEULjkClhvJo4Lvg==", - "dev": true, - "dependencies": { - "cssesc": "^3.0.0", - "fastparse": "^1.1.2" - } - }, "node_modules/css-what": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/css-what/-/css-what-5.1.0.tgz", - "integrity": "sha512-arSMRWIIFY0hV8pIxZMEfmMI47Wj3R/aWpZDDxWYCPEiOMv6tfOrnpDtgxBYPEQD4V0Y/958+1TdC3iWTFcUPw==", + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/css-what/-/css-what-6.1.0.tgz", + "integrity": "sha512-HTUrgRJ7r4dsZKU6GjmpfRK1O76h97Z8MfS1G0FozR+oF2kG6Vfe8JE6zwrkbxigziPHinCJ+gCPjA9EaBDtRw==", "dev": true, "engines": { "node": ">= 6" @@ -8520,15 +8954,6 @@ "url": "https://github.com/sponsors/fb55" } }, - "node_modules/cssauron": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/cssauron/-/cssauron-1.4.0.tgz", - "integrity": "sha512-Ht70DcFBh+/ekjVrYS2PlDMdSQEl3OFNmjK6lcn49HptBgilXf/Zwg4uFh9Xn0pX3Q8YOkSjIFOfK2osvdqpBw==", - "dev": true, - "dependencies": { - "through": "X.X.X" - } - }, "node_modules/cssesc": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/cssesc/-/cssesc-3.0.0.tgz", @@ -8541,6 +8966,30 @@ "node": ">=4" } }, + "node_modules/cssom": { + "version": "0.4.4", + "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.4.4.tgz", + "integrity": "sha512-p3pvU7r1MyyqbTk+WbNJIgJjG2VmTIaB10rI93LzVPrmDJKkzKYMtxxyAvQXR/NS6otuzveI7+7BBq3SjBS2mw==", + "dev": true + }, + "node_modules/cssstyle": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/cssstyle/-/cssstyle-2.3.0.tgz", + "integrity": "sha512-AZL67abkUzIuvcHqk7c09cezpGNcxUxU4Ioi/05xHk4DQeTkWmGYftIE6ctU6AEt+Gn4n1lDStOtj7FKycP71A==", + "dev": true, + "dependencies": { + "cssom": "~0.3.6" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/cssstyle/node_modules/cssom": { + "version": "0.3.8", + "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.3.8.tgz", + "integrity": "sha512-b0tGHbfegbhPJpxpiBPU2sCkigAqtM9O121le6bbOlgyV+NyGyCmVfJ6QW9eRjz8CpNfWEOYBIMIGRYkLwsIYg==", + "dev": true + }, "node_modules/curved-arrows": { "version": "0.1.0", "resolved": "https://registry.npmjs.org/curved-arrows/-/curved-arrows-0.1.0.tgz", @@ -8748,11 +9197,19 @@ "node": ">=12" } }, - "node_modules/damerau-levenshtein": { - "version": "1.0.8", - "resolved": "https://registry.npmjs.org/damerau-levenshtein/-/damerau-levenshtein-1.0.8.tgz", - "integrity": "sha512-sdQSFB7+llfUcQHUQO3+B8ERRj0Oa4w9POWMI/puGtuf7gFywGmkaLCElnudfTiKZV+NvHqL0ifzdrI8Ro7ESA==", - "dev": true + "node_modules/data-urls": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/data-urls/-/data-urls-2.0.0.tgz", + "integrity": "sha512-X5eWTSXO/BJmpdIKCRuKUgSCgAN0OwliVK3yPKbwIWU1Tdw5BRajxlzMidvh+gwko9AfQ9zIj52pzF91Q3YAvQ==", + "dev": true, + "dependencies": { + "abab": "^2.0.3", + "whatwg-mimetype": "^2.3.0", + "whatwg-url": "^8.0.0" + }, + "engines": { + "node": ">=10" + } }, "node_modules/debug": { "version": "4.3.4", @@ -8771,6 +9228,12 @@ } } }, + "node_modules/decimal.js": { + "version": "10.4.3", + "resolved": "https://registry.npmjs.org/decimal.js/-/decimal.js-10.4.3.tgz", + "integrity": "sha512-VBBaLc1MgL5XpzgIP7ny5Z6Nx3UrRkIViUkPUdtl9aya5amy3De1gsUUSB1g3+3sExYNjCAsAznmukyxCb1GRA==", + "dev": true + }, "node_modules/deep-equal": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-2.1.0.tgz", @@ -8797,12 +9260,6 @@ "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/deep-equal/node_modules/isarray": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.5.tgz", - "integrity": "sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==", - "dev": true - }, "node_modules/deep-is": { "version": "0.1.4", "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz", @@ -8830,6 +9287,20 @@ "clone": "^1.0.2" } }, + "node_modules/define-data-property": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.0.tgz", + "integrity": "sha512-UzGwzcjyv3OtAvolTj1GoyNYzfFR+iqbGjcnBEENZVCpM4/Ng1yhGNvS3lR/xDS74Tb2wGG9WzNSNIOS9UVb2g==", + "dev": true, + "dependencies": { + "get-intrinsic": "^1.2.1", + "gopd": "^1.0.1", + "has-property-descriptors": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" + } + }, "node_modules/define-lazy-prop": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/define-lazy-prop/-/define-lazy-prop-2.0.0.tgz", @@ -8840,11 +9311,12 @@ } }, "node_modules/define-properties": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.4.tgz", - "integrity": "sha512-uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA==", + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.2.1.tgz", + "integrity": "sha512-8QmQKqEASLd5nx0U1B1okLElbUuuttJ/AnYmRXbbbGDWh6uS208EjD4Xqq/I9wK7u0v6O08XhTWnt5XtEbR6Dg==", "dev": true, "dependencies": { + "define-data-property": "^1.0.1", "has-property-descriptors": "^1.0.0", "object-keys": "^1.1.1" }, @@ -8855,6 +9327,15 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/delayed-stream": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz", + "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==", + "dev": true, + "engines": { + "node": ">=0.4.0" + } + }, "node_modules/delegates": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz", @@ -8870,13 +9351,13 @@ "node": ">= 0.8" } }, - "node_modules/dependency-graph": { - "version": "0.11.0", - "resolved": "https://registry.npmjs.org/dependency-graph/-/dependency-graph-0.11.0.tgz", - "integrity": "sha512-JeMq7fEshyepOWDfcfHK06N3MhyPhz++vtqWhMT5O9A3K42rdsEDpfdVqjaqaAhsw6a+ZqeDvQVtD0hFHQWrzg==", + "node_modules/dequal": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/dequal/-/dequal-2.0.3.tgz", + "integrity": "sha512-0je+qPKHEMohvfRTCEo3CrPG6cAzAYgmzKyxRiYSSDkS6eGJdyVJm7WaYA5ECaAD9wLB2T4EEeymA5aFVcYXCA==", "dev": true, "engines": { - "node": ">= 0.6.0" + "node": ">=6" } }, "node_modules/destroy": { @@ -8922,9 +9403,9 @@ "dev": true }, "node_modules/dns-packet": { - "version": "5.6.0", - "resolved": "https://registry.npmjs.org/dns-packet/-/dns-packet-5.6.0.tgz", - "integrity": "sha512-rza3UH1LwdHh9qyPXp8lkwpjSNk/AMD3dPytUoRoqnypDUhY0xvbdmVhWOfxO68frEfV9BU8V12Ez7ZsHGZpCQ==", + "version": "5.6.1", + "resolved": "https://registry.npmjs.org/dns-packet/-/dns-packet-5.6.1.tgz", + "integrity": "sha512-l4gcSouhcgIKRvyy99RNVOgxXiicE+2jZoNmaNmZ6JXiGajBOJAesk1OBlJuM5k2c+eudGdLxDqXuPCKIj6kpw==", "dev": true, "dependencies": { "@leichtgewicht/ip-codec": "^2.0.1" @@ -8946,28 +9427,40 @@ } }, "node_modules/dom-serializer": { - "version": "1.3.2", - "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-1.3.2.tgz", - "integrity": "sha512-5c54Bk5Dw4qAxNOI1pFEizPSjVsx5+bpJKmL2kPn8JhBUq2q09tTCa3mjijun2NfK78NMouDYNMBkOrPZiS+ig==", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-2.0.0.tgz", + "integrity": "sha512-wIkAryiqt/nV5EQKqQpo3SToSOV9J0DnbJqwK7Wv/Trc92zIAYZ4FlMu+JPFW1DfGFt81ZTCGgDEabffXeLyJg==", "dev": true, "dependencies": { - "domelementtype": "^2.0.1", - "domhandler": "^4.2.0", - "entities": "^2.0.0" + "domelementtype": "^2.3.0", + "domhandler": "^5.0.2", + "entities": "^4.2.0" }, "funding": { "url": "https://github.com/cheeriojs/dom-serializer?sponsor=1" } }, + "node_modules/dom-serializer/node_modules/entities": { + "version": "4.5.0", + "resolved": "https://registry.npmjs.org/entities/-/entities-4.5.0.tgz", + "integrity": "sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==", + "dev": true, + "engines": { + "node": ">=0.12" + }, + "funding": { + "url": "https://github.com/fb55/entities?sponsor=1" + } + }, "node_modules/dom-to-image": { "version": "2.6.0", "resolved": "https://registry.npmjs.org/dom-to-image/-/dom-to-image-2.6.0.tgz", "integrity": "sha512-Dt0QdaHmLpjURjU7Tnu3AgYSF2LuOmksSGsUcE6ItvJoCWTBEmiMXcqBdNSAm9+QbbwD7JMoVsuuKX6ZVQv1qA==" }, "node_modules/domelementtype": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.2.0.tgz", - "integrity": "sha512-DtBMo82pv1dFtUmHyr48beiuq792Sxohr+8Hm9zoxklYPfa6n0Z3Byjj2IV7bmr2IyqClnqEQhfgHJJ5QF0R5A==", + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.3.0.tgz", + "integrity": "sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw==", "dev": true, "funding": [ { @@ -8976,13 +9469,34 @@ } ] }, - "node_modules/domhandler": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-4.3.0.tgz", - "integrity": "sha512-fC0aXNQXqKSFTr2wDNZDhsEYjCiYsDWl3D01kwt25hm1YIPyDGHvvi3rw+PLqHAl/m71MaiF7d5zvBr0p5UB2g==", + "node_modules/domexception": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/domexception/-/domexception-2.0.1.tgz", + "integrity": "sha512-yxJ2mFy/sibVQlu5qHjOkf9J3K6zgmCxgJ94u2EdvDOV09H+32LtRswEcUsmUWN72pVLOEnTSRaIVVzVQgS0dg==", "dev": true, "dependencies": { - "domelementtype": "^2.2.0" + "webidl-conversions": "^5.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/domexception/node_modules/webidl-conversions": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-5.0.0.tgz", + "integrity": "sha512-VlZwKPCkYKxQgeSbH5EyngOmRp7Ww7I9rQLERETtf5ofd9pGeswWiOtogpEO850jziPRarreGxn5QIiTqpb2wA==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/domhandler": { + "version": "5.0.3", + "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-5.0.3.tgz", + "integrity": "sha512-cgwlv/1iFQiFnU96XXgROh8xTeetsnJiDsTc7TYCLFd9+/WNkIqPTxiM/8pSd8VIrhXGTf1Ny1q1hquVqDJB5w==", + "dev": true, + "dependencies": { + "domelementtype": "^2.3.0" }, "engines": { "node": ">= 4" @@ -8991,35 +9505,71 @@ "url": "https://github.com/fb55/domhandler?sponsor=1" } }, - "node_modules/domino": { - "version": "2.1.6", - "resolved": "https://registry.npmjs.org/domino/-/domino-2.1.6.tgz", - "integrity": "sha512-3VdM/SXBZX2omc9JF9nOPCtDaYQ67BGp5CoLpIQlO2KCAPETs8TcDHacF26jXadGbvUteZzRTeos2fhID5+ucQ==" + "node_modules/dompurify": { + "version": "3.0.6", + "resolved": "https://registry.npmjs.org/dompurify/-/dompurify-3.0.6.tgz", + "integrity": "sha512-ilkD8YEnnGh1zJ240uJsW7AzE+2qpbOUYjacomn3AvJ6J4JhKGSZ2nh4wUIXPZrEPppaCLx5jFe8T89Rk8tQ7w==" }, "node_modules/domutils": { - "version": "2.8.0", - "resolved": "https://registry.npmjs.org/domutils/-/domutils-2.8.0.tgz", - "integrity": "sha512-w96Cjofp72M5IIhpjgobBimYEfoPjx1Vx0BSX9P30WBdZW2WIKU0T1Bd0kz2eNZ9ikjKgHbEyKx8BB6H1L3h3A==", + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/domutils/-/domutils-3.1.0.tgz", + "integrity": "sha512-H78uMmQtI2AhgDJjWeQmHwJJ2bLPD3GMmO7Zja/ZZh84wkm+4ut+IUnUdRa8uCGX88DiVx1j6FRe1XfxEgjEZA==", "dev": true, "dependencies": { - "dom-serializer": "^1.0.1", - "domelementtype": "^2.2.0", - "domhandler": "^4.2.0" + "dom-serializer": "^2.0.0", + "domelementtype": "^2.3.0", + "domhandler": "^5.0.3" }, "funding": { "url": "https://github.com/fb55/domutils?sponsor=1" } }, + "node_modules/dotenv": { + "version": "10.0.0", + "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-10.0.0.tgz", + "integrity": "sha512-rlBi9d8jpv9Sf1klPjNfFAuWDjKLwTIJJ/VxtoTwIR6hnZxcEOQCZg2oIL3MWBYw5GpUDKOEnND7LXTbIpQ03Q==", + "dev": true, + "engines": { + "node": ">=10" + } + }, + "node_modules/duplexer": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/duplexer/-/duplexer-0.1.2.tgz", + "integrity": "sha512-jtD6YG370ZCIi/9GTaJKQxWTZD045+4R4hTk/x1UyoqadyJ9x9CgSi1RlVDQF8U2sxLLSnFkCaMihqljHIWgMg==", + "dev": true + }, + "node_modules/eastasianwidth": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/eastasianwidth/-/eastasianwidth-0.2.0.tgz", + "integrity": "sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==", + "dev": true + }, "node_modules/ee-first": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz", "integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==", "dev": true }, + "node_modules/ejs": { + "version": "3.1.9", + "resolved": "https://registry.npmjs.org/ejs/-/ejs-3.1.9.tgz", + "integrity": "sha512-rC+QVNMJWv+MtPgkt0y+0rVEIdbtxVADApW9JXrUVlzHetgcyczP/E7DJmWJ4fJCZF2cPcBk0laWO9ZHMG3DmQ==", + "dev": true, + "dependencies": { + "jake": "^10.8.5" + }, + "bin": { + "ejs": "bin/cli.js" + }, + "engines": { + "node": ">=0.10.0" + } + }, "node_modules/electron-to-chromium": { - "version": "1.4.284", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.284.tgz", - "integrity": "sha512-M8WEXFuKXMYMVr45fo8mq0wUrrJHheiKZf6BArTKk9ZBYCKJEOU5H8cdWgDT+qCVZf7Na4lVUaZsA+h6uA9+PA==", + "version": "1.4.530", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.530.tgz", + "integrity": "sha512-rsJ9O8SCI4etS8TBsXuRfHa2eZReJhnGf5MHZd3Vo05PukWHKXhk3VQGbHHnDLa8nZz9woPCpLCMQpLGgkGNRA==", "dev": true }, "node_modules/emoji-regex": { @@ -9069,10 +9619,19 @@ "node": ">=0.10.0" } }, + "node_modules/end-of-stream": { + "version": "1.4.4", + "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz", + "integrity": "sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==", + "dev": true, + "dependencies": { + "once": "^1.4.0" + } + }, "node_modules/enhanced-resolve": { - "version": "5.10.0", - "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.10.0.tgz", - "integrity": "sha512-T0yTFjdpldGY8PmuXXR0PyQ1ufZpEGiHVrp7zHKB7jdR4qlmZHhONVM5AQOAWXuF/w3dnHbEQVrNptJgt7F+cQ==", + "version": "5.15.0", + "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.15.0.tgz", + "integrity": "sha512-LXYT42KJ7lpIKECr2mAXIaMldcNCh/7E0KBKOu4KSfkHmP+mZmSs+8V5gBAqisWBy0OO4W5Oyys0GO1Y8KtdKg==", "dev": true, "dependencies": { "graceful-fs": "^4.2.4", @@ -9082,6 +9641,18 @@ "node": ">=10.13.0" } }, + "node_modules/enquirer": { + "version": "2.3.6", + "resolved": "https://registry.npmjs.org/enquirer/-/enquirer-2.3.6.tgz", + "integrity": "sha512-yjNnPr315/FjS4zIsUxYguYUPP2e1NK4d7E7ZOLiyYCcbFBiTMyID+2wvm2w6+pZ/odMA7cRkjhsPbltwBOrLg==", + "dev": true, + "dependencies": { + "ansi-colors": "^4.1.1" + }, + "engines": { + "node": ">=8.6" + } + }, "node_modules/entities": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/entities/-/entities-2.2.0.tgz", @@ -9128,18 +9699,19 @@ } }, "node_modules/es-abstract": { - "version": "1.21.1", - "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.21.1.tgz", - "integrity": "sha512-QudMsPOz86xYz/1dG1OuGBKOELjCh99IIWHLzy5znUB6j8xG2yMA7bfTV86VSqKF+Y/H08vQPR+9jyXpuC6hfg==", + "version": "1.22.2", + "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.22.2.tgz", + "integrity": "sha512-YoxfFcDmhjOgWPWsV13+2RNjq1F6UQnfs+8TftwNqtzlmFzEXvlUwdrNrYeaizfjQzRMxkZ6ElWMOJIFKdVqwA==", "dev": true, "dependencies": { + "array-buffer-byte-length": "^1.0.0", + "arraybuffer.prototype.slice": "^1.0.2", "available-typed-arrays": "^1.0.5", "call-bind": "^1.0.2", "es-set-tostringtag": "^2.0.1", "es-to-primitive": "^1.2.1", - "function-bind": "^1.1.1", - "function.prototype.name": "^1.1.5", - "get-intrinsic": "^1.1.3", + "function.prototype.name": "^1.1.6", + "get-intrinsic": "^1.2.1", "get-symbol-description": "^1.0.0", "globalthis": "^1.0.3", "gopd": "^1.0.1", @@ -9147,25 +9719,30 @@ "has-property-descriptors": "^1.0.0", "has-proto": "^1.0.1", "has-symbols": "^1.0.3", - "internal-slot": "^1.0.4", - "is-array-buffer": "^3.0.1", + "internal-slot": "^1.0.5", + "is-array-buffer": "^3.0.2", "is-callable": "^1.2.7", "is-negative-zero": "^2.0.2", "is-regex": "^1.1.4", "is-shared-array-buffer": "^1.0.2", "is-string": "^1.0.7", - "is-typed-array": "^1.1.10", + "is-typed-array": "^1.1.12", "is-weakref": "^1.0.2", - "object-inspect": "^1.12.2", + "object-inspect": "^1.12.3", "object-keys": "^1.1.1", "object.assign": "^4.1.4", - "regexp.prototype.flags": "^1.4.3", + "regexp.prototype.flags": "^1.5.1", + "safe-array-concat": "^1.0.1", "safe-regex-test": "^1.0.0", - "string.prototype.trimend": "^1.0.6", - "string.prototype.trimstart": "^1.0.6", + "string.prototype.trim": "^1.2.8", + "string.prototype.trimend": "^1.0.7", + "string.prototype.trimstart": "^1.0.7", + "typed-array-buffer": "^1.0.0", + "typed-array-byte-length": "^1.0.0", + "typed-array-byte-offset": "^1.0.0", "typed-array-length": "^1.0.4", "unbox-primitive": "^1.0.2", - "which-typed-array": "^1.1.9" + "which-typed-array": "^1.1.11" }, "engines": { "node": ">= 0.4" @@ -9193,16 +9770,10 @@ "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/es-get-iterator/node_modules/isarray": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.5.tgz", - "integrity": "sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==", - "dev": true - }, "node_modules/es-module-lexer": { - "version": "0.9.3", - "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-0.9.3.tgz", - "integrity": "sha512-1HQ2M2sPtxwnvOvT1ZClHyQDiggdNjURWpY2we6aMKCQiUVxTmVs2UYPLIrD84sS+kMdUwfBSylbJPwNnBrnHQ==", + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-1.3.1.tgz", + "integrity": "sha512-JUFAyicQV9mXc3YRxPnDlrfBKpqt6hUYzz9/boprUJHs4e4KVr3XwOF70doO6gwXUor6EWZJAyWAfKki84t20Q==", "dev": true }, "node_modules/es-set-tostringtag": { @@ -9246,12 +9817,11 @@ } }, "node_modules/esbuild": { - "version": "0.17.8", - "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.17.8.tgz", - "integrity": "sha512-g24ybC3fWhZddZK6R3uD2iF/RIPnRpwJAqLov6ouX3hMbY4+tKolP0VMF3zuIYCaXun+yHwS5IPQ91N2BT191g==", + "version": "0.18.17", + "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.18.17.tgz", + "integrity": "sha512-1GJtYnUxsJreHYA0Y+iQz2UEykonY66HNWOb0yXYZi9/kNrORUEHVg87eQsCtqh59PEJ5YVZJO98JHznMJSWjg==", "dev": true, "hasInstallScript": true, - "optional": true, "bin": { "esbuild": "bin/esbuild" }, @@ -9259,34 +9829,34 @@ "node": ">=12" }, "optionalDependencies": { - "@esbuild/android-arm": "0.17.8", - "@esbuild/android-arm64": "0.17.8", - "@esbuild/android-x64": "0.17.8", - "@esbuild/darwin-arm64": "0.17.8", - "@esbuild/darwin-x64": "0.17.8", - "@esbuild/freebsd-arm64": "0.17.8", - "@esbuild/freebsd-x64": "0.17.8", - "@esbuild/linux-arm": "0.17.8", - "@esbuild/linux-arm64": "0.17.8", - "@esbuild/linux-ia32": "0.17.8", - "@esbuild/linux-loong64": "0.17.8", - "@esbuild/linux-mips64el": "0.17.8", - "@esbuild/linux-ppc64": "0.17.8", - "@esbuild/linux-riscv64": "0.17.8", - "@esbuild/linux-s390x": "0.17.8", - "@esbuild/linux-x64": "0.17.8", - "@esbuild/netbsd-x64": "0.17.8", - "@esbuild/openbsd-x64": "0.17.8", - "@esbuild/sunos-x64": "0.17.8", - "@esbuild/win32-arm64": "0.17.8", - "@esbuild/win32-ia32": "0.17.8", - "@esbuild/win32-x64": "0.17.8" + "@esbuild/android-arm": "0.18.17", + "@esbuild/android-arm64": "0.18.17", + "@esbuild/android-x64": "0.18.17", + "@esbuild/darwin-arm64": "0.18.17", + "@esbuild/darwin-x64": "0.18.17", + "@esbuild/freebsd-arm64": "0.18.17", + "@esbuild/freebsd-x64": "0.18.17", + "@esbuild/linux-arm": "0.18.17", + "@esbuild/linux-arm64": "0.18.17", + "@esbuild/linux-ia32": "0.18.17", + "@esbuild/linux-loong64": "0.18.17", + "@esbuild/linux-mips64el": "0.18.17", + "@esbuild/linux-ppc64": "0.18.17", + "@esbuild/linux-riscv64": "0.18.17", + "@esbuild/linux-s390x": "0.18.17", + "@esbuild/linux-x64": "0.18.17", + "@esbuild/netbsd-x64": "0.18.17", + "@esbuild/openbsd-x64": "0.18.17", + "@esbuild/sunos-x64": "0.18.17", + "@esbuild/win32-arm64": "0.18.17", + "@esbuild/win32-ia32": "0.18.17", + "@esbuild/win32-x64": "0.18.17" } }, "node_modules/esbuild-wasm": { - "version": "0.17.8", - "resolved": "https://registry.npmjs.org/esbuild-wasm/-/esbuild-wasm-0.17.8.tgz", - "integrity": "sha512-zCmpxv95E0FuCmvdw1K836UHnj4EdiQnFfjTby35y3LAjRPtXMj3sbHDRHjbD8Mqg5lTwq3knacr/1qIFU51CQ==", + "version": "0.18.17", + "resolved": "https://registry.npmjs.org/esbuild-wasm/-/esbuild-wasm-0.18.17.tgz", + "integrity": "sha512-9OHGcuRzy+I8ziF9FzjfKLWAPbvi0e/metACVg9k6bK+SI4FFxeV6PcZsz8RIVaMD4YNehw+qj6UMR3+qj/EuQ==", "dev": true, "bin": { "esbuild": "bin/esbuild" @@ -9319,28 +9889,68 @@ "node": ">=0.8.0" } }, + "node_modules/escodegen": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-2.1.0.tgz", + "integrity": "sha512-2NlIDTwUWJN0mRPQOdtQBzbUHvdGY2P1VXSyU83Q3xKxM7WHX2Ql8dKq782Q9TgQUNOLEzEYu9bzLNj1q88I5w==", + "dev": true, + "dependencies": { + "esprima": "^4.0.1", + "estraverse": "^5.2.0", + "esutils": "^2.0.2" + }, + "bin": { + "escodegen": "bin/escodegen.js", + "esgenerate": "bin/esgenerate.js" + }, + "engines": { + "node": ">=6.0" + }, + "optionalDependencies": { + "source-map": "~0.6.1" + } + }, + "node_modules/escodegen/node_modules/estraverse": { + "version": "5.3.0", + "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz", + "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==", + "dev": true, + "engines": { + "node": ">=4.0" + } + }, + "node_modules/escodegen/node_modules/source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true, + "optional": true, + "engines": { + "node": ">=0.10.0" + } + }, "node_modules/eslint": { - "version": "8.39.0", - "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.39.0.tgz", - "integrity": "sha512-mwiok6cy7KTW7rBpo05k6+p4YVZByLNjAZ/ACB9DRCu4YDRwjXI01tWHp6KAUWelsBetTxKK/2sHB0vdS8Z2Og==", + "version": "8.50.0", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.50.0.tgz", + "integrity": "sha512-FOnOGSuFuFLv/Sa+FDVRZl4GGVAAFFi8LecRsI5a1tMO5HIE8nCm4ivAlzt4dT3ol/PaaGC0rJEEXQmHJBGoOg==", "dev": true, "dependencies": { "@eslint-community/eslint-utils": "^4.2.0", - "@eslint-community/regexpp": "^4.4.0", - "@eslint/eslintrc": "^2.0.2", - "@eslint/js": "8.39.0", - "@humanwhocodes/config-array": "^0.11.8", + "@eslint-community/regexpp": "^4.6.1", + "@eslint/eslintrc": "^2.1.2", + "@eslint/js": "8.50.0", + "@humanwhocodes/config-array": "^0.11.11", "@humanwhocodes/module-importer": "^1.0.1", "@nodelib/fs.walk": "^1.2.8", - "ajv": "^6.10.0", + "ajv": "^6.12.4", "chalk": "^4.0.0", "cross-spawn": "^7.0.2", "debug": "^4.3.2", "doctrine": "^3.0.0", "escape-string-regexp": "^4.0.0", - "eslint-scope": "^7.2.0", - "eslint-visitor-keys": "^3.4.0", - "espree": "^9.5.1", + "eslint-scope": "^7.2.2", + "eslint-visitor-keys": "^3.4.3", + "espree": "^9.6.1", "esquery": "^1.4.2", "esutils": "^2.0.2", "fast-deep-equal": "^3.1.3", @@ -9348,22 +9958,19 @@ "find-up": "^5.0.0", "glob-parent": "^6.0.2", "globals": "^13.19.0", - "grapheme-splitter": "^1.0.4", + "graphemer": "^1.4.0", "ignore": "^5.2.0", - "import-fresh": "^3.0.0", "imurmurhash": "^0.1.4", "is-glob": "^4.0.0", "is-path-inside": "^3.0.3", - "js-sdsl": "^4.1.4", "js-yaml": "^4.1.0", "json-stable-stringify-without-jsonify": "^1.0.1", "levn": "^0.4.1", "lodash.merge": "^4.6.2", "minimatch": "^3.1.2", "natural-compare": "^1.4.0", - "optionator": "^0.9.1", + "optionator": "^0.9.3", "strip-ansi": "^6.0.1", - "strip-json-comments": "^3.1.0", "text-table": "^0.2.0" }, "bin": { @@ -9376,6 +9983,21 @@ "url": "https://opencollective.com/eslint" } }, + "node_modules/eslint-etc": { + "version": "5.2.1", + "resolved": "https://registry.npmjs.org/eslint-etc/-/eslint-etc-5.2.1.tgz", + "integrity": "sha512-lFJBSiIURdqQKq9xJhvSJFyPA+VeTh5xvk24e8pxVL7bwLBtGF60C/KRkLTMrvCZ6DA3kbPuYhLWY0TZMlqTsg==", + "dev": true, + "dependencies": { + "@typescript-eslint/experimental-utils": "^5.0.0", + "tsutils": "^3.17.1", + "tsutils-etc": "^1.4.1" + }, + "peerDependencies": { + "eslint": "^8.0.0", + "typescript": ">=4.0.0" + } + }, "node_modules/eslint-import-resolver-node": { "version": "0.3.7", "resolved": "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.7.tgz", @@ -9397,9 +10019,9 @@ } }, "node_modules/eslint-module-utils": { - "version": "2.7.4", - "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.7.4.tgz", - "integrity": "sha512-j4GT+rqzCoRKHwURX7pddtIPGySnX9Si/cgMI5ztrcqOPtk5dDEeZ34CQVPphnqkJytlc97Vuk05Um2mJ3gEQA==", + "version": "2.8.0", + "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.8.0.tgz", + "integrity": "sha512-aWajIYfsqCKRDgUfjEXNN/JlrzauMuSEy5sbd7WXbtW3EH6A6MpwEh42c7qD+MqQo9QMJ6fWLAeIJynx0g6OAw==", "dev": true, "dependencies": { "debug": "^3.2.7" @@ -9423,26 +10045,28 @@ } }, "node_modules/eslint-plugin-import": { - "version": "2.27.5", - "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.27.5.tgz", - "integrity": "sha512-LmEt3GVofgiGuiE+ORpnvP+kAm3h6MLZJ4Q5HCyHADofsb4VzXFsRiWj3c0OFiV+3DWFh0qg3v9gcPlfc3zRow==", + "version": "2.28.1", + "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.28.1.tgz", + "integrity": "sha512-9I9hFlITvOV55alzoKBI+K9q74kv0iKMeY6av5+umsNwayt59fz692daGyjR+oStBQgx6nwR9rXldDev3Clw+A==", "dev": true, "dependencies": { "array-includes": "^3.1.6", + "array.prototype.findlastindex": "^1.2.2", "array.prototype.flat": "^1.3.1", "array.prototype.flatmap": "^1.3.1", "debug": "^3.2.7", "doctrine": "^2.1.0", "eslint-import-resolver-node": "^0.3.7", - "eslint-module-utils": "^2.7.4", + "eslint-module-utils": "^2.8.0", "has": "^1.0.3", - "is-core-module": "^2.11.0", + "is-core-module": "^2.13.0", "is-glob": "^4.0.3", "minimatch": "^3.1.2", + "object.fromentries": "^2.0.6", + "object.groupby": "^1.0.0", "object.values": "^1.1.6", - "resolve": "^1.22.1", - "semver": "^6.3.0", - "tsconfig-paths": "^3.14.1" + "semver": "^6.3.1", + "tsconfig-paths": "^3.14.2" }, "engines": { "node": ">=4" @@ -9473,31 +10097,32 @@ } }, "node_modules/eslint-plugin-import/node_modules/semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", + "version": "6.3.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", + "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", "dev": true, "bin": { "semver": "bin/semver.js" } }, "node_modules/eslint-plugin-jsdoc": { - "version": "41.1.2", - "resolved": "https://registry.npmjs.org/eslint-plugin-jsdoc/-/eslint-plugin-jsdoc-41.1.2.tgz", - "integrity": "sha512-MePJXdGiPW7AG06CU5GbKzYtKpoHwTq1lKijjq+RwL/cQkZtBZ59Zbv5Ep0RVxSMnq6242249/n+w4XrTZ1Afg==", + "version": "46.8.2", + "resolved": "https://registry.npmjs.org/eslint-plugin-jsdoc/-/eslint-plugin-jsdoc-46.8.2.tgz", + "integrity": "sha512-5TSnD018f3tUJNne4s4gDWQflbsgOycIKEUBoCLn6XtBMgNHxQFmV8vVxUtiPxAQq8lrX85OaSG/2gnctxw9uQ==", "dev": true, "dependencies": { - "@es-joy/jsdoccomment": "~0.37.0", + "@es-joy/jsdoccomment": "~0.40.1", "are-docs-informative": "^0.0.2", - "comment-parser": "1.3.1", + "comment-parser": "1.4.0", "debug": "^4.3.4", "escape-string-regexp": "^4.0.0", "esquery": "^1.5.0", - "semver": "^7.3.8", + "is-builtin-module": "^3.2.1", + "semver": "^7.5.4", "spdx-expression-parse": "^3.0.1" }, "engines": { - "node": "^14 || ^16 || ^17 || ^18 || ^19" + "node": ">=16" }, "peerDependencies": { "eslint": "^7.0.0 || ^8.0.0" @@ -9515,6 +10140,21 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/eslint-plugin-jsdoc/node_modules/semver": { + "version": "7.5.4", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz", + "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==", + "dev": true, + "dependencies": { + "lru-cache": "^6.0.0" + }, + "bin": { + "semver": "bin/semver.js" + }, + "engines": { + "node": ">=10" + } + }, "node_modules/eslint-plugin-prefer-arrow": { "version": "1.2.3", "resolved": "https://registry.npmjs.org/eslint-plugin-prefer-arrow/-/eslint-plugin-prefer-arrow-1.2.3.tgz", @@ -9537,37 +10177,10 @@ "node": ">=8.0.0" } }, - "node_modules/eslint-utils": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-3.0.0.tgz", - "integrity": "sha512-uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA==", - "dev": true, - "dependencies": { - "eslint-visitor-keys": "^2.0.0" - }, - "engines": { - "node": "^10.0.0 || ^12.0.0 || >= 14.0.0" - }, - "funding": { - "url": "https://github.com/sponsors/mysticatea" - }, - "peerDependencies": { - "eslint": ">=5" - } - }, - "node_modules/eslint-utils/node_modules/eslint-visitor-keys": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz", - "integrity": "sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==", - "dev": true, - "engines": { - "node": ">=10" - } - }, "node_modules/eslint-visitor-keys": { - "version": "3.4.0", - "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.0.tgz", - "integrity": "sha512-HPpKPUBQcAsZOsHAFwTtIKcYlCje62XB7SEAcxjtmW6TD1WVpkS6i6/hOVtTZIl4zGj/mBqpFVGvaDneik+VoQ==", + "version": "3.4.3", + "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz", + "integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==", "dev": true, "engines": { "node": "^12.22.0 || ^14.17.0 || >=16.0.0" @@ -9660,9 +10273,9 @@ } }, "node_modules/eslint/node_modules/eslint-scope": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.2.0.tgz", - "integrity": "sha512-DYj5deGlHBfMt15J7rdtyKNq/Nqlv5KfU4iodrQ019XESsRnwXH9KAE0y3cwtUHDo2ob7CypAnCqefh6vioWRw==", + "version": "7.2.2", + "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.2.2.tgz", + "integrity": "sha512-dOt21O7lTMhDM+X9mB4GX+DZrZtCUJPL/wlcTqxyrx5IvO0IYtILdtrQGQp+8n5S0gwSVmOf9NQrjMOgfQZlIg==", "dev": true, "dependencies": { "esrecurse": "^4.3.0", @@ -9824,14 +10437,14 @@ } }, "node_modules/espree": { - "version": "9.5.1", - "resolved": "https://registry.npmjs.org/espree/-/espree-9.5.1.tgz", - "integrity": "sha512-5yxtHSZXRSW5pvv3hAlXM5+/Oswi1AUFqBmbibKb5s6bp3rGIDkyXU6xCoyuuLhijr4SFwPrXRoZjz0AZDN9tg==", + "version": "9.6.1", + "resolved": "https://registry.npmjs.org/espree/-/espree-9.6.1.tgz", + "integrity": "sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ==", "dev": true, "dependencies": { - "acorn": "^8.8.0", + "acorn": "^8.9.0", "acorn-jsx": "^5.3.2", - "eslint-visitor-keys": "^3.4.0" + "eslint-visitor-keys": "^3.4.1" }, "engines": { "node": "^12.22.0 || ^14.17.0 || >=16.0.0" @@ -9966,6 +10579,17 @@ "url": "https://github.com/sindresorhus/execa?sponsor=1" } }, + "node_modules/exponential-backoff": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/exponential-backoff/-/exponential-backoff-3.1.1.tgz", + "integrity": "sha512-dX7e/LHVJ6W3DE1MHWi9S1EYzDESENfLrYohG2G++ovZrYOkm4Knwa0mc1cn84xJOR4KEU0WSchhLbd0UklbHw==", + "dev": true + }, + "node_modules/export-to-csv": { + "version": "0.2.2", + "resolved": "https://registry.npmjs.org/export-to-csv/-/export-to-csv-0.2.2.tgz", + "integrity": "sha512-KHExLOjF2yvo8JU8Sv+5RuJAHzP1TpFvUgnWn8ex7zBrv1ZsABJAOpvG1RNRRWr1spYpDJmBBaR5/cV/8aBQSw==" + }, "node_modules/express": { "version": "4.18.2", "resolved": "https://registry.npmjs.org/express/-/express-4.18.2.tgz", @@ -10029,6 +10653,21 @@ "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==", "dev": true }, + "node_modules/express/node_modules/qs": { + "version": "6.11.0", + "resolved": "https://registry.npmjs.org/qs/-/qs-6.11.0.tgz", + "integrity": "sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==", + "dev": true, + "dependencies": { + "side-channel": "^1.0.4" + }, + "engines": { + "node": ">=0.6" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/external-editor": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/external-editor/-/external-editor-3.1.0.tgz", @@ -10062,9 +10701,9 @@ "dev": true }, "node_modules/fast-glob": { - "version": "3.2.11", - "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.11.tgz", - "integrity": "sha512-xrO3+1bxSo3ZVHAnqzyuewYT6aMFHRAd4Kcs92MAonjwQZLsK9d0SF1IyQ3k5PoirxTW0Oe/RqFgMQ6TcNE5Ew==", + "version": "3.3.1", + "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.1.tgz", + "integrity": "sha512-kNFPyjhh5cKjrUltxs+wFx+ZkbRaxxmZ+X0ZU31SOsxCEtP9VPgtq2teZw1DebupL5GmDaNQ6yKMMVcM41iqDg==", "dev": true, "dependencies": { "@nodelib/fs.stat": "^2.0.2", @@ -10086,7 +10725,7 @@ "node_modules/fast-levenshtein": { "version": "2.0.6", "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz", - "integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=", + "integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==", "dev": true }, "node_modules/fast-xml-parser": { @@ -10110,12 +10749,6 @@ "fxparser": "src/cli/cli.js" } }, - "node_modules/fastparse": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/fastparse/-/fastparse-1.1.2.tgz", - "integrity": "sha512-483XLLxTVIwWK3QTrMGRqUfUpoOs/0hbQrl2oz4J0pAcm3A3bu84wxTFqGqkJzewCLdME38xJLJAxBABfQT8sQ==", - "dev": true - }, "node_modules/fastq": { "version": "1.13.0", "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.13.0.tgz", @@ -10164,6 +10797,36 @@ "node": "^10.12.0 || >=12.0.0" } }, + "node_modules/filelist": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/filelist/-/filelist-1.0.4.tgz", + "integrity": "sha512-w1cEuf3S+DrLCQL7ET6kz+gmlJdbq9J7yXCSjK/OZCPA+qEN1WyF4ZAf0YYJa4/shHJra2t/d/r8SV4Ji+x+8Q==", + "dev": true, + "dependencies": { + "minimatch": "^5.0.1" + } + }, + "node_modules/filelist/node_modules/brace-expansion": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", + "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", + "dev": true, + "dependencies": { + "balanced-match": "^1.0.0" + } + }, + "node_modules/filelist/node_modules/minimatch": { + "version": "5.1.6", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz", + "integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==", + "dev": true, + "dependencies": { + "brace-expansion": "^2.0.1" + }, + "engines": { + "node": ">=10" + } + }, "node_modules/filesize": { "version": "10.0.7", "resolved": "https://registry.npmjs.org/filesize/-/filesize-10.0.7.tgz", @@ -10218,20 +10881,19 @@ "dev": true }, "node_modules/find-cache-dir": { - "version": "3.3.2", - "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-3.3.2.tgz", - "integrity": "sha512-wXZV5emFEjrridIgED11OoUKLxiYjAcqot/NJdAkOhlJ+vGzwhOAfcG5OX1jP+S0PcjEn8bdMJv+g2jwQ3Onig==", + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-4.0.0.tgz", + "integrity": "sha512-9ZonPT4ZAK4a+1pUPVPZJapbi7O5qbbJPdYw/NOQWZZbVLdDTYM3A4R9z/DpAM08IDaFGsvPgiGZ82WEwUDWjg==", "dev": true, "dependencies": { - "commondir": "^1.0.1", - "make-dir": "^3.0.2", - "pkg-dir": "^4.1.0" + "common-path-prefix": "^3.0.0", + "pkg-dir": "^7.0.0" }, "engines": { - "node": ">=8" + "node": ">=14.16" }, "funding": { - "url": "https://github.com/avajs/find-cache-dir?sponsor=1" + "url": "https://github.com/sponsors/sindresorhus" } }, "node_modules/find-up": { @@ -10247,6 +10909,15 @@ "node": ">=8" } }, + "node_modules/flat": { + "version": "5.0.2", + "resolved": "https://registry.npmjs.org/flat/-/flat-5.0.2.tgz", + "integrity": "sha512-b6suED+5/3rTpUBdG1gupIl8MPFCAMA0QXwmljLhvCUKcUvdE4gWky9zpuGCcXHOsz4J9wPGNWq6OKpmIzz3hQ==", + "dev": true, + "bin": { + "flat": "cli.js" + } + }, "node_modules/flat-cache": { "version": "3.0.4", "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.0.4.tgz", @@ -10267,9 +10938,9 @@ "dev": true }, "node_modules/follow-redirects": { - "version": "1.15.2", - "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.2.tgz", - "integrity": "sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA==", + "version": "1.15.3", + "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.3.tgz", + "integrity": "sha512-1VzOtuEM8pC9SFU1E+8KfTjZyMztRsgEfwQl44z8A25uy13jSzTj6dyK2Df52iV0vgHCfBwLhDWevLn95w5v6Q==", "dev": true, "funding": [ { @@ -10295,6 +10966,48 @@ "is-callable": "^1.1.3" } }, + "node_modules/foreground-child": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-3.1.1.tgz", + "integrity": "sha512-TMKDUnIte6bfb5nWv7V/caI169OHgvwjb7V4WkeUvbQQdjr5rWKqHFiKWb/fcOwB+CzBT+qbWjvj+DVwRskpIg==", + "dev": true, + "dependencies": { + "cross-spawn": "^7.0.0", + "signal-exit": "^4.0.1" + }, + "engines": { + "node": ">=14" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/foreground-child/node_modules/signal-exit": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz", + "integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==", + "dev": true, + "engines": { + "node": ">=14" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/form-data": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/form-data/-/form-data-3.0.1.tgz", + "integrity": "sha512-RHkBKtLWUVwd7SqRIvCZMEvAMoGUp0XU+seQiZejj0COz3RI3hWP4sCv3gZWWLjJTd7rGwcsF5eKZGii0r/hbg==", + "dev": true, + "dependencies": { + "asynckit": "^0.4.0", + "combined-stream": "^1.0.8", + "mime-types": "^2.1.12" + }, + "engines": { + "node": ">= 6" + } + }, "node_modules/forwarded": { "version": "0.2.0", "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.2.0.tgz", @@ -10305,16 +11018,16 @@ } }, "node_modules/fraction.js": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/fraction.js/-/fraction.js-4.2.0.tgz", - "integrity": "sha512-MhLuK+2gUcnZe8ZHlaaINnQLl0xRIGRfcGk2yl8xoQAfHrSsL3rYu6FCmBdkdbhc9EPlwyGHewaRsvwRMJtAlA==", + "version": "4.3.6", + "resolved": "https://registry.npmjs.org/fraction.js/-/fraction.js-4.3.6.tgz", + "integrity": "sha512-n2aZ9tNfYDwaHhvFTkhFErqOMIb8uyzSQ+vGJBjZyanAKZVbGUQ1sngfk9FdkBw7G26O7AgNjLcecLffD1c7eg==", "dev": true, "engines": { "node": "*" }, "funding": { "type": "patreon", - "url": "https://www.patreon.com/infusion" + "url": "https://github.com/sponsors/rawify" } }, "node_modules/fresh": { @@ -10326,22 +11039,51 @@ "node": ">= 0.6" } }, - "node_modules/fs-minipass": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-3.0.1.tgz", - "integrity": "sha512-MhaJDcFRTuLidHrIttu0RDGyyXs/IYHVmlcxfLAEFIWjc1vdLAkdwT7Ace2u7DbitWC0toKMl5eJZRYNVreIMw==", + "node_modules/fs-constants": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/fs-constants/-/fs-constants-1.0.0.tgz", + "integrity": "sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==", + "dev": true + }, + "node_modules/fs-extra": { + "version": "11.1.1", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-11.1.1.tgz", + "integrity": "sha512-MGIE4HOvQCeUCzmlHs0vXpih4ysz4wg9qiSAu6cd42lVwPbTM1TjV7RusoyQqMmk/95gdQZX72u+YW+c3eEpFQ==", "dev": true, "dependencies": { - "minipass": "^4.0.0" + "graceful-fs": "^4.2.0", + "jsonfile": "^6.0.1", + "universalify": "^2.0.0" + }, + "engines": { + "node": ">=14.14" + } + }, + "node_modules/fs-minipass": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-3.0.3.tgz", + "integrity": "sha512-XUBA9XClHbnJWSfBzjkm6RvPsyg3sryZt06BEQoXcF7EK/xpGaQYJgQKDJSUH5SGZ76Y7pFx1QBnXz09rU5Fbw==", + "dev": true, + "dependencies": { + "minipass": "^7.0.3" }, "engines": { "node": "^14.17.0 || ^16.13.0 || >=18.0.0" } }, + "node_modules/fs-minipass/node_modules/minipass": { + "version": "7.0.3", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.0.3.tgz", + "integrity": "sha512-LhbbwCfz3vsb12j/WkWQPZfKTsgqIe1Nf/ti1pKjYESGLHIVjWU96G9/ljLH4F9mWNVhlQOm0VySdAWzf05dpg==", + "dev": true, + "engines": { + "node": ">=16 || 14 >=14.17" + } + }, "node_modules/fs-monkey": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/fs-monkey/-/fs-monkey-1.0.3.tgz", - "integrity": "sha512-cybjIfiiE+pTWicSCLFHSrXZ6EilF30oh91FDP9S2B051prEa7QWfrVTQm10/dDpswBDXZugPa1Ogu8Yh+HV0Q==", + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/fs-monkey/-/fs-monkey-1.0.5.tgz", + "integrity": "sha512-8uMbBjrhzW76TYgEV27Y5E//W2f/lTFmx78P2w19FZSxarhI/798APGQyuGCwmkNxgwGRhrLfvWyLBvNtuOmew==", "dev": true }, "node_modules/fs.realpath": { @@ -10367,19 +11109,18 @@ "node_modules/function-bind": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz", - "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==", - "dev": true + "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==" }, "node_modules/function.prototype.name": { - "version": "1.1.5", - "resolved": "https://registry.npmjs.org/function.prototype.name/-/function.prototype.name-1.1.5.tgz", - "integrity": "sha512-uN7m/BzVKQnCUF/iW8jYea67v++2u7m5UgENbHRtdDVclOUP+FMPlCNdmk0h/ysGyo2tavMJEDqJAkJdRa1vMA==", + "version": "1.1.6", + "resolved": "https://registry.npmjs.org/function.prototype.name/-/function.prototype.name-1.1.6.tgz", + "integrity": "sha512-Z5kx79swU5P27WEayXM1tBi5Ze/lbIyiNgU3qyXUOf9b2rgXYyF9Dy9Cx+IQv/Lc8WCG6L82zwUPpSS9hGehIg==", "dev": true, "dependencies": { "call-bind": "^1.0.2", - "define-properties": "^1.1.3", - "es-abstract": "^1.19.0", - "functions-have-names": "^1.2.2" + "define-properties": "^1.2.0", + "es-abstract": "^1.22.1", + "functions-have-names": "^1.2.3" }, "engines": { "node": ">= 0.4" @@ -10435,13 +11176,13 @@ } }, "node_modules/get-intrinsic": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.3.tgz", - "integrity": "sha512-QJVz1Tj7MS099PevUG5jvnt9tSkXN8K14dxQlikJuPt4uD9hHAHjLyLBiLR5zELelBdD9QNRAXZzsJx0WaDL9A==", - "dev": true, + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.1.tgz", + "integrity": "sha512-2DcsyfABl+gVHEfCOaTrWgyt+tb6MSEGmKq+kI5HwLbIYgjgmMcV8KQ41uaKz1xxUcn9tJtgFbQUEVcEbd0FYw==", "dependencies": { "function-bind": "^1.1.1", "has": "^1.0.3", + "has-proto": "^1.0.1", "has-symbols": "^1.0.3" }, "funding": { @@ -10585,12 +11326,24 @@ "integrity": "sha512-NtNxqUcXgpW2iMrfqSfR73Glt39K+BLwWsPs94yR63v45T0Wbej7eRmL5cWfwEgqXnmjQp3zaJTshdRW/qC2ZQ==", "dev": true }, - "node_modules/grapheme-splitter": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/grapheme-splitter/-/grapheme-splitter-1.0.4.tgz", - "integrity": "sha512-bzh50DW9kTPM00T8y4o8vQg89Di9oLJVLW/KaOGIXJWP/iqCN6WKYkbNOF04vFLJhwcpYUh9ydh/+5vpOqV4YQ==", + "node_modules/graphemer": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/graphemer/-/graphemer-1.4.0.tgz", + "integrity": "sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==", "dev": true }, + "node_modules/guess-parser": { + "version": "0.4.22", + "resolved": "https://registry.npmjs.org/guess-parser/-/guess-parser-0.4.22.tgz", + "integrity": "sha512-KcUWZ5ACGaBM69SbqwVIuWGoSAgD+9iJnchR9j/IarVI1jHVeXv+bUXBIMeqVMSKt3zrn0Dgf9UpcOEpPBLbSg==", + "dev": true, + "dependencies": { + "@wessberg/ts-evaluator": "0.0.27" + }, + "peerDependencies": { + "typescript": ">=3.7.5" + } + }, "node_modules/handle-thing": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/handle-thing/-/handle-thing-2.0.1.tgz", @@ -10601,7 +11354,6 @@ "version": "1.0.3", "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz", "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==", - "dev": true, "dependencies": { "function-bind": "^1.1.1" }, @@ -10657,7 +11409,6 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.0.1.tgz", "integrity": "sha512-7qE+iP+O+bgF9clE5+UoBFzE65mlBiVj3tKCrlNQ0Ogwm0BjpT/gK4SlLYDMybDh5I3TCTKnPPa0oMG7JDYrhg==", - "dev": true, "engines": { "node": ">= 0.4" }, @@ -10669,7 +11420,6 @@ "version": "1.0.3", "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz", "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==", - "dev": true, "engines": { "node": ">= 0.4" }, @@ -10764,6 +11514,12 @@ "wbuf": "^1.1.0" } }, + "node_modules/hpack.js/node_modules/isarray": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", + "integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==", + "dev": true + }, "node_modules/hpack.js/node_modules/readable-stream": { "version": "2.3.8", "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz", @@ -10785,11 +11541,64 @@ "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==", "dev": true }, + "node_modules/html-encoding-sniffer": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/html-encoding-sniffer/-/html-encoding-sniffer-2.0.1.tgz", + "integrity": "sha512-D5JbOMBIR/TVZkubHT+OyT2705QvogUW4IBn6nHd756OwieSF9aDYFj4dv6HHEVGYbHaLETa3WggZYWWMyy3ZQ==", + "dev": true, + "dependencies": { + "whatwg-encoding": "^1.0.5" + }, + "engines": { + "node": ">=10" + } + }, "node_modules/html-entities": { - "version": "2.3.3", - "resolved": "https://registry.npmjs.org/html-entities/-/html-entities-2.3.3.tgz", - "integrity": "sha512-DV5Ln36z34NNTDgnz0EWGBLZENelNAtkiFA4kyNOG2tDI6Mz1uSWiq1wAKdyjnJwyDiDO7Fa2SO1CTxPXL8VxA==", - "dev": true + "version": "2.4.0", + "resolved": "https://registry.npmjs.org/html-entities/-/html-entities-2.4.0.tgz", + "integrity": "sha512-igBTJcNNNhvZFRtm8uA6xMY6xYleeDwn3PeBCkDz7tHttv4F2hsDI2aPgNERWzvRcNYHNT3ymRaQzllmXj4YsQ==", + "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/mdevils" + }, + { + "type": "patreon", + "url": "https://patreon.com/mdevils" + } + ] + }, + "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" + } + ], + "dependencies": { + "domelementtype": "^2.3.0", + "domhandler": "^5.0.3", + "domutils": "^3.0.1", + "entities": "^4.4.0" + } + }, + "node_modules/htmlparser2/node_modules/entities": { + "version": "4.5.0", + "resolved": "https://registry.npmjs.org/entities/-/entities-4.5.0.tgz", + "integrity": "sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==", + "dev": true, + "engines": { + "node": ">=0.12" + }, + "funding": { + "url": "https://github.com/fb55/entities?sponsor=1" + } }, "node_modules/http-cache-semantics": { "version": "4.1.1", @@ -10840,12 +11649,12 @@ } }, "node_modules/http-proxy-agent": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-5.0.0.tgz", - "integrity": "sha512-n2hY8YdoRE1i7r6M0w9DIw5GgZN0G25P8zLCRQ8rjXtTU3vsNFBI/vWK/UIeE6g5MUUz6avwAPXmL6Fy9D/90w==", + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-4.0.1.tgz", + "integrity": "sha512-k0zdNgqWTGA6aeIRVpvfVob4fL52dTfaehylg0Y4UvSySvOq/Y+BOyPrgpUrA7HylqvU8vIZGsRuXmspskV0Tg==", "dev": true, "dependencies": { - "@tootallnate/once": "2", + "@tootallnate/once": "1", "agent-base": "6", "debug": "4" }, @@ -10962,12 +11771,12 @@ } }, "node_modules/ignore-walk": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/ignore-walk/-/ignore-walk-6.0.2.tgz", - "integrity": "sha512-ezmQ1Dg2b3jVZh2Dh+ar6Eu2MqNSTkyb32HU2MAQQQX9tKM3q/UQ/9lf03lQ5hW+fOeoMnwxwkleZ0xcNp0/qg==", + "version": "6.0.3", + "resolved": "https://registry.npmjs.org/ignore-walk/-/ignore-walk-6.0.3.tgz", + "integrity": "sha512-C7FfFoTA+bI10qfeydT8aZbvr91vAEU+2W5BZUlzPec47oNb07SsOfwYrtxuvOYdUApPP/Qlh4DtAO51Ekk2QA==", "dev": true, "dependencies": { - "minimatch": "^7.4.2" + "minimatch": "^9.0.0" }, "engines": { "node": "^14.17.0 || ^16.13.0 || >=18.0.0" @@ -10983,15 +11792,15 @@ } }, "node_modules/ignore-walk/node_modules/minimatch": { - "version": "7.4.6", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-7.4.6.tgz", - "integrity": "sha512-sBz8G/YjVniEz6lKPNpKxXwazJe4c19fEfV2GDMX6AjFz+MX9uDWIZW8XreVhkFW3fkIdTv/gxWr/Kks5FFAVw==", + "version": "9.0.3", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.3.tgz", + "integrity": "sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg==", "dev": true, "dependencies": { "brace-expansion": "^2.0.1" }, "engines": { - "node": ">=10" + "node": ">=16 || 14 >=14.17" }, "funding": { "url": "https://github.com/sponsors/isaacs" @@ -11016,9 +11825,9 @@ "integrity": "sha512-XXOFtyqDjNDAQxVfYxuF7g9Il/IbWmmlQg2MYKOH8ExIT1qg6xc4zyS3HaEEATgs1btfzxq15ciUiY7gjSXRGQ==" }, "node_modules/immutable": { - "version": "4.2.4", - "resolved": "https://registry.npmjs.org/immutable/-/immutable-4.2.4.tgz", - "integrity": "sha512-WDxL3Hheb1JkRN3sQkyujNlL/xRjAo3rJtaU5xeufUauG66JdMr32bLj4gF+vWl84DIA3Zxw7tiAjneYzRRw+w==", + "version": "4.3.4", + "resolved": "https://registry.npmjs.org/immutable/-/immutable-4.3.4.tgz", + "integrity": "sha512-fsXeu4J4i6WNWSikpI88v/PcVflZz+6kMhUfIwc5SY+poQRPnaf5V7qds6SUyUN3cVxEzuCab7QIoLOQ+DQ1wA==", "dev": true }, "node_modules/import-fresh": { @@ -11064,12 +11873,6 @@ "node": ">=8" } }, - "node_modules/infer-owner": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/infer-owner/-/infer-owner-1.0.4.tgz", - "integrity": "sha512-IClj+Xz94+d7irH5qRyfJonOdfTzuDaifE6ZPWfx0N0+/ATZCbuTPq2prFl526urkQd90WyUKIh1DfBQ2hMz9A==", - "dev": true - }, "node_modules/inflight": { "version": "1.0.6", "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", @@ -11087,12 +11890,12 @@ "dev": true }, "node_modules/ini": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/ini/-/ini-3.0.1.tgz", - "integrity": "sha512-it4HyVAUTKBc6m8e1iXWvXSTdndF7HbdN713+kvLrymxTaU4AUBWrJ4vEooP+V7fexnVD3LKcBshjGGPefSMUQ==", + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/ini/-/ini-4.1.1.tgz", + "integrity": "sha512-QQnnxNyfvmHFIsj7gkPcYymR8Jdw/o7mp5ZFihxn6h8Ci6fh3Dx4E1gPjpQEpIuPo9XVNY/ZUwh4BPMjGyL01g==", "dev": true, "engines": { - "node": "^12.13.0 || ^14.15.0 || >=16.0.0" + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" } }, "node_modules/inquirer": { @@ -11192,12 +11995,12 @@ } }, "node_modules/internal-slot": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.4.tgz", - "integrity": "sha512-tA8URYccNzMo94s5MQZgH8NB/XTa6HsOo0MLfXTKKEnHVVdegzaQoFZ7Jp44bdvLvY2waT5dc+j5ICEswhi7UQ==", + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.5.tgz", + "integrity": "sha512-Y+R5hJrzs52QCG2laLn4udYVnxsfny9CpOhNhUvk/SSSVyF6T27FzRbF0sroPidSu3X8oEAkOn2K804mjpt6UQ==", "dev": true, "dependencies": { - "get-intrinsic": "^1.1.3", + "get-intrinsic": "^1.2.0", "has": "^1.0.3", "side-channel": "^1.0.4" }, @@ -11217,9 +12020,9 @@ "dev": true }, "node_modules/ipaddr.js": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-2.0.1.tgz", - "integrity": "sha512-1qTgH9NG+IIJ4yfKs2e6Pp1bZg8wbDbKHT21HrLIeYBTRLgMYKnMTPAuI3Lcs61nfx5h1xlXnbJtH1kX5/d/ng==", + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-2.1.0.tgz", + "integrity": "sha512-LlbxQ7xKzfBusov6UMi4MFpEg0m+mAm9xyNGEduwXMEDuf4WfzB/RZwMVYEd7IKGvh4IUkEXYxtAVu9T3OelJQ==", "dev": true, "engines": { "node": ">= 10" @@ -11242,13 +12045,13 @@ } }, "node_modules/is-array-buffer": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/is-array-buffer/-/is-array-buffer-3.0.1.tgz", - "integrity": "sha512-ASfLknmY8Xa2XtB4wmbz13Wu202baeA18cJBCeCy0wXUHZF0IPyVEXqKEcd+t2fNSLLL1vC6k7lxZEojNbISXQ==", + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/is-array-buffer/-/is-array-buffer-3.0.2.tgz", + "integrity": "sha512-y+FyyR/w8vfIRq4eQcM1EYgSTnmHXPqaF+IgzgraytCFq5Xh8lllDVmAZolPJiZttZLeFSINPYMaEJ7/vWUa1w==", "dev": true, "dependencies": { "call-bind": "^1.0.2", - "get-intrinsic": "^1.1.3", + "get-intrinsic": "^1.2.0", "is-typed-array": "^1.1.10" }, "funding": { @@ -11301,6 +12104,21 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/is-builtin-module": { + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/is-builtin-module/-/is-builtin-module-3.2.1.tgz", + "integrity": "sha512-BSLE3HnV2syZ0FK0iMA/yUGplUeMmNz4AW5fnTunbCIqZi4vG3WjJT9FHMy5D69xmAYBHXQhJdALdpwVxV501A==", + "dev": true, + "dependencies": { + "builtin-modules": "^3.3.0" + }, + "engines": { + "node": ">=6" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, "node_modules/is-callable": { "version": "1.2.7", "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.7.tgz", @@ -11314,9 +12132,9 @@ } }, "node_modules/is-core-module": { - "version": "2.11.0", - "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.11.0.tgz", - "integrity": "sha512-RRjxlvLDkD1YJwDbroBHMb+cukurkDWNyHx7D3oNB5x9rb5ogcksMC5wHCadcXoo67gVr/+3GFySh3134zi6rw==", + "version": "2.13.0", + "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.13.0.tgz", + "integrity": "sha512-Z7dk6Qo8pOCp3l4tsX2C5ZVas4V+UxwQodwZhLopL91TX8UyyHEXafPcyoeeWuLrwzHcr3igO78wNLwHJHsMCQ==", "dev": true, "dependencies": { "has": "^1.0.3" @@ -11478,6 +12296,12 @@ "node": ">=0.10.0" } }, + "node_modules/is-potential-custom-element-name": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.1.tgz", + "integrity": "sha512-bCYeRA2rVibKZd+s2625gGnGF/t7DSqDs4dP7CrLA1m7jKWz6pps0LpYLJN8Q64HtmPKJ1hrN3nzPNKFEKOUiQ==", + "dev": true + }, "node_modules/is-regex": { "version": "1.1.4", "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz", @@ -11558,16 +12382,12 @@ } }, "node_modules/is-typed-array": { - "version": "1.1.10", - "resolved": "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.10.tgz", - "integrity": "sha512-PJqgEHiWZvMpaFZ3uTc8kHPM4+4ADTlDniuQL7cU/UDA0Ql7F70yGfHph3cLNe+c9toaigv+DFzTJKhc2CtO6A==", + "version": "1.1.12", + "resolved": "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.12.tgz", + "integrity": "sha512-Z14TF2JNG8Lss5/HMqt0//T9JeHXttXy5pH/DBU4vi98ozO2btxzq9MwYDZYnKwU8nRsz/+GVFVRDq3DkVuSPg==", "dev": true, "dependencies": { - "available-typed-arrays": "^1.0.5", - "call-bind": "^1.0.2", - "for-each": "^0.3.3", - "gopd": "^1.0.1", - "has-tostringtag": "^1.0.0" + "which-typed-array": "^1.1.11" }, "engines": { "node": ">= 0.4" @@ -11641,9 +12461,9 @@ } }, "node_modules/isarray": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", - "integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==", + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.5.tgz", + "integrity": "sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==", "dev": true }, "node_modules/isexe": { @@ -11655,7 +12475,7 @@ "node_modules/isobject": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz", - "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=", + "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==", "dev": true, "engines": { "node": ">=0.10.0" @@ -11695,6 +12515,112 @@ "semver": "bin/semver.js" } }, + "node_modules/jackspeak": { + "version": "2.3.5", + "resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-2.3.5.tgz", + "integrity": "sha512-Ratx+B8WeXLAtRJn26hrhY8S1+Jz6pxPMrkrdkgb/NstTNiqMhX0/oFVu5wX+g5n6JlEu2LPsDJmY8nRP4+alw==", + "dev": true, + "dependencies": { + "@isaacs/cliui": "^8.0.2" + }, + "engines": { + "node": ">=14" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + }, + "optionalDependencies": { + "@pkgjs/parseargs": "^0.11.0" + } + }, + "node_modules/jake": { + "version": "10.8.7", + "resolved": "https://registry.npmjs.org/jake/-/jake-10.8.7.tgz", + "integrity": "sha512-ZDi3aP+fG/LchyBzUM804VjddnwfSfsdeYkwt8NcbKRvo4rFkjhs456iLFn3k2ZUWvNe4i48WACDbza8fhq2+w==", + "dev": true, + "dependencies": { + "async": "^3.2.3", + "chalk": "^4.0.2", + "filelist": "^1.0.4", + "minimatch": "^3.1.2" + }, + "bin": { + "jake": "bin/cli.js" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/jake/node_modules/ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "dev": true, + "dependencies": { + "color-convert": "^2.0.1" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" + } + }, + "node_modules/jake/node_modules/chalk": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", + "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", + "dev": true, + "dependencies": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/chalk?sponsor=1" + } + }, + "node_modules/jake/node_modules/color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "dependencies": { + "color-name": "~1.1.4" + }, + "engines": { + "node": ">=7.0.0" + } + }, + "node_modules/jake/node_modules/color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true + }, + "node_modules/jake/node_modules/has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/jake/node_modules/supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "dev": true, + "dependencies": { + "has-flag": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, "node_modules/jest-worker": { "version": "27.5.1", "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-27.5.1.tgz", @@ -11733,11 +12659,14 @@ "url": "https://github.com/chalk/supports-color?sponsor=1" } }, - "node_modules/js-sdsl": { - "version": "4.1.5", - "resolved": "https://registry.npmjs.org/js-sdsl/-/js-sdsl-4.1.5.tgz", - "integrity": "sha512-08bOAKweV2NUC1wqTtf3qZlnpOX/R2DU9ikpjOHs0H+ibQv3zpncVQg6um4uYtRtrwIX8M4Nh3ytK4HGlYAq7Q==", - "dev": true + "node_modules/jiti": { + "version": "1.20.0", + "resolved": "https://registry.npmjs.org/jiti/-/jiti-1.20.0.tgz", + "integrity": "sha512-3TV69ZbrvV6U5DfQimop50jE9Dl6J8O1ja1dvBbMba/sZ3YBEQqJ2VZRoQPVnhlzjNtU1vaXRZVrVjU4qtm8yA==", + "dev": true, + "bin": { + "jiti": "bin/jiti.js" + } }, "node_modules/js-tokens": { "version": "4.0.0", @@ -11767,6 +12696,58 @@ "node": ">=12.0.0" } }, + "node_modules/jsdom": { + "version": "16.7.0", + "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-16.7.0.tgz", + "integrity": "sha512-u9Smc2G1USStM+s/x1ru5Sxrl6mPYCbByG1U/hUmqaVsm4tbNyS7CicOSRyuGQYZhTu0h84qkZZQ/I+dzizSVw==", + "dev": true, + "dependencies": { + "abab": "^2.0.5", + "acorn": "^8.2.4", + "acorn-globals": "^6.0.0", + "cssom": "^0.4.4", + "cssstyle": "^2.3.0", + "data-urls": "^2.0.0", + "decimal.js": "^10.2.1", + "domexception": "^2.0.1", + "escodegen": "^2.0.0", + "form-data": "^3.0.0", + "html-encoding-sniffer": "^2.0.1", + "http-proxy-agent": "^4.0.1", + "https-proxy-agent": "^5.0.0", + "is-potential-custom-element-name": "^1.0.1", + "nwsapi": "^2.2.0", + "parse5": "6.0.1", + "saxes": "^5.0.1", + "symbol-tree": "^3.2.4", + "tough-cookie": "^4.0.0", + "w3c-hr-time": "^1.0.2", + "w3c-xmlserializer": "^2.0.0", + "webidl-conversions": "^6.1.0", + "whatwg-encoding": "^1.0.5", + "whatwg-mimetype": "^2.3.0", + "whatwg-url": "^8.5.0", + "ws": "^7.4.6", + "xml-name-validator": "^3.0.0" + }, + "engines": { + "node": ">=10" + }, + "peerDependencies": { + "canvas": "^2.5.0" + }, + "peerDependenciesMeta": { + "canvas": { + "optional": true + } + } + }, + "node_modules/jsdom/node_modules/parse5": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/parse5/-/parse5-6.0.1.tgz", + "integrity": "sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw==", + "dev": true + }, "node_modules/jsesc": { "version": "2.5.2", "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz", @@ -11815,6 +12796,18 @@ "integrity": "sha512-gfFQZrcTc8CnKXp6Y4/CBT3fTc0OVuDofpre4aEeEpSBPV5X5v4+Vmx+8snU7RLPrNHPKSgLxGo9YuQzz20o+w==", "dev": true }, + "node_modules/jsonfile": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz", + "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==", + "dev": true, + "dependencies": { + "universalify": "^2.0.0" + }, + "optionalDependencies": { + "graceful-fs": "^4.1.6" + } + }, "node_modules/jsonparse": { "version": "1.3.1", "resolved": "https://registry.npmjs.org/jsonparse/-/jsonparse-1.3.1.tgz", @@ -11856,6 +12849,16 @@ "node": ">= 8" } }, + "node_modules/launch-editor": { + "version": "2.6.0", + "resolved": "https://registry.npmjs.org/launch-editor/-/launch-editor-2.6.0.tgz", + "integrity": "sha512-JpDCcQnyAAzZZaZ7vEiSqL690w7dAEyLao+KC96zBplnYbJS7TYNjvM3M7y3dGz+v7aIsJk3hllWuc0kWAjyRQ==", + "dev": true, + "dependencies": { + "picocolors": "^1.0.0", + "shell-quote": "^1.7.3" + } + }, "node_modules/less": { "version": "4.1.3", "resolved": "https://registry.npmjs.org/less/-/less-4.1.3.tgz", @@ -11975,15 +12978,18 @@ } }, "node_modules/lines-and-columns": { - "version": "1.2.4", - "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.2.4.tgz", - "integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==", - "dev": true + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-2.0.3.tgz", + "integrity": "sha512-cNOjgCnLB+FnvWWtyRTzmB3POJ+cXxTA81LoW7u8JdmhfXzriropYwpjShnz1QLLWsQwY7nIxoDmcPTwphDK9w==", + "dev": true, + "engines": { + "node": "^12.20.0 || ^14.13.1 || >=16.0.0" + } }, "node_modules/loader-runner": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-4.2.0.tgz", - "integrity": "sha512-92+huvxMvYlMzMt0iIOukcwYBFpkYJdpl2xsZ7LrlayO7E8SOv+JJUEK17B/dJIHAOLMfh2dZZ/Y18WgmGtYNw==", + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-4.3.0.tgz", + "integrity": "sha512-3R/1M+yS3j5ou80Me59j7F9IMs4PXs3VqRrm0TU3AbKPxlmpoY1TNscJV/oGJXo8qCatFGTfDbY6W6ipGOYXfg==", "dev": true, "engines": { "node": ">=6.11.5" @@ -12160,148 +13166,70 @@ "integrity": "sha512-l0qCX+pgXEZh/7sYQNG+vzhOIFRPjlJJkQ/irk9n7Ak3d+1MrU6F7IV31KILwFkUn153oLK8a2AIt48DzLdVPg==" }, "node_modules/magic-string": { - "version": "0.29.0", - "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.29.0.tgz", - "integrity": "sha512-WcfidHrDjMY+eLjlU+8OvwREqHwpgCeKVBUpQ3OhYYuvfaYCUgcbuBzappNzZvg/v8onU3oQj+BYpkOJe9Iw4Q==", + "version": "0.30.1", + "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.1.tgz", + "integrity": "sha512-mbVKXPmS0z0G4XqFDCTllmDQ6coZzn94aMlb0o/A4HEHJCKcanlDZwYJgwnkmgD3jyWhUgj9VsPrfd972yPffA==", "dev": true, "dependencies": { - "@jridgewell/sourcemap-codec": "^1.4.13" + "@jridgewell/sourcemap-codec": "^1.4.15" }, "engines": { "node": ">=12" } }, - "node_modules/make-dir": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz", - "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==", - "dev": true, - "dependencies": { - "semver": "^6.0.0" - }, - "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/make-dir/node_modules/semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", - "dev": true, - "bin": { - "semver": "bin/semver.js" - } + "node_modules/magic-string/node_modules/@jridgewell/sourcemap-codec": { + "version": "1.4.15", + "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz", + "integrity": "sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg==", + "dev": true }, "node_modules/make-fetch-happen": { - "version": "10.2.1", - "resolved": "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-10.2.1.tgz", - "integrity": "sha512-NgOPbRiaQM10DYXvN3/hhGVI2M5MtITFryzBGxHM5p4wnFxsVCbxkrBrDsk+EZ5OB4jEOT7AjDxtdF+KVEFT7w==", + "version": "11.1.1", + "resolved": "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-11.1.1.tgz", + "integrity": "sha512-rLWS7GCSTcEujjVBs2YqG7Y4643u8ucvCJeSRqiLYhesrDuzeuFIk37xREzAsfQaqzl8b9rNCE4m6J8tvX4Q8w==", "dev": true, "dependencies": { "agentkeepalive": "^4.2.1", - "cacache": "^16.1.0", - "http-cache-semantics": "^4.1.0", + "cacache": "^17.0.0", + "http-cache-semantics": "^4.1.1", "http-proxy-agent": "^5.0.0", "https-proxy-agent": "^5.0.0", "is-lambda": "^1.0.1", "lru-cache": "^7.7.1", - "minipass": "^3.1.6", - "minipass-collect": "^1.0.2", - "minipass-fetch": "^2.0.3", + "minipass": "^5.0.0", + "minipass-fetch": "^3.0.0", "minipass-flush": "^1.0.5", "minipass-pipeline": "^1.2.4", "negotiator": "^0.6.3", "promise-retry": "^2.0.1", "socks-proxy-agent": "^7.0.0", - "ssri": "^9.0.0" + "ssri": "^10.0.0" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || >=16.0.0" + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" } }, - "node_modules/make-fetch-happen/node_modules/@npmcli/fs": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/@npmcli/fs/-/fs-2.1.2.tgz", - "integrity": "sha512-yOJKRvohFOaLqipNtwYB9WugyZKhC/DZC4VYPmpaCzDBrA8YpK3qHZ8/HGscMnE4GqbkLNuVcCnxkeQEdGt6LQ==", + "node_modules/make-fetch-happen/node_modules/@tootallnate/once": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-2.0.0.tgz", + "integrity": "sha512-XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A==", + "dev": true, + "engines": { + "node": ">= 10" + } + }, + "node_modules/make-fetch-happen/node_modules/http-proxy-agent": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-5.0.0.tgz", + "integrity": "sha512-n2hY8YdoRE1i7r6M0w9DIw5GgZN0G25P8zLCRQ8rjXtTU3vsNFBI/vWK/UIeE6g5MUUz6avwAPXmL6Fy9D/90w==", "dev": true, "dependencies": { - "@gar/promisify": "^1.1.3", - "semver": "^7.3.5" + "@tootallnate/once": "2", + "agent-base": "6", + "debug": "4" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || >=16.0.0" - } - }, - "node_modules/make-fetch-happen/node_modules/brace-expansion": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", - "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", - "dev": true, - "dependencies": { - "balanced-match": "^1.0.0" - } - }, - "node_modules/make-fetch-happen/node_modules/cacache": { - "version": "16.1.3", - "resolved": "https://registry.npmjs.org/cacache/-/cacache-16.1.3.tgz", - "integrity": "sha512-/+Emcj9DAXxX4cwlLmRI9c166RuL3w30zp4R7Joiv2cQTtTtA+jeuCAjH3ZlGnYS3tKENSrKhAzVVP9GVyzeYQ==", - "dev": true, - "dependencies": { - "@npmcli/fs": "^2.1.0", - "@npmcli/move-file": "^2.0.0", - "chownr": "^2.0.0", - "fs-minipass": "^2.1.0", - "glob": "^8.0.1", - "infer-owner": "^1.0.4", - "lru-cache": "^7.7.1", - "minipass": "^3.1.6", - "minipass-collect": "^1.0.2", - "minipass-flush": "^1.0.5", - "minipass-pipeline": "^1.2.4", - "mkdirp": "^1.0.4", - "p-map": "^4.0.0", - "promise-inflight": "^1.0.1", - "rimraf": "^3.0.2", - "ssri": "^9.0.0", - "tar": "^6.1.11", - "unique-filename": "^2.0.0" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || >=16.0.0" - } - }, - "node_modules/make-fetch-happen/node_modules/fs-minipass": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-2.1.0.tgz", - "integrity": "sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==", - "dev": true, - "dependencies": { - "minipass": "^3.0.0" - }, - "engines": { - "node": ">= 8" - } - }, - "node_modules/make-fetch-happen/node_modules/glob": { - "version": "8.1.0", - "resolved": "https://registry.npmjs.org/glob/-/glob-8.1.0.tgz", - "integrity": "sha512-r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ==", - "dev": true, - "dependencies": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^5.0.1", - "once": "^1.3.0" - }, - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" + "node": ">= 6" } }, "node_modules/make-fetch-happen/node_modules/lru-cache": { @@ -12313,64 +13241,15 @@ "node": ">=12" } }, - "node_modules/make-fetch-happen/node_modules/minimatch": { - "version": "5.1.6", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz", - "integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==", - "dev": true, - "dependencies": { - "brace-expansion": "^2.0.1" + "node_modules/marked": { + "version": "7.0.5", + "resolved": "https://registry.npmjs.org/marked/-/marked-7.0.5.tgz", + "integrity": "sha512-lwNAFTfXgqpt/XvK17a/8wY9/q6fcSPZT1aP6QW0u74VwaJF/Z9KbRcX23sWE4tODM+AolJNcUtErTkgOeFP/Q==", + "bin": { + "marked": "bin/marked.js" }, "engines": { - "node": ">=10" - } - }, - "node_modules/make-fetch-happen/node_modules/minipass": { - "version": "3.3.6", - "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz", - "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==", - "dev": true, - "dependencies": { - "yallist": "^4.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/make-fetch-happen/node_modules/ssri": { - "version": "9.0.1", - "resolved": "https://registry.npmjs.org/ssri/-/ssri-9.0.1.tgz", - "integrity": "sha512-o57Wcn66jMQvfHG1FlYbWeZWW/dHZhJXjpIcTfXldXEk5nz5lStPo3mK0OJQfGR3RbZUlbISexbljkJzuEj/8Q==", - "dev": true, - "dependencies": { - "minipass": "^3.1.1" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || >=16.0.0" - } - }, - "node_modules/make-fetch-happen/node_modules/unique-filename": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/unique-filename/-/unique-filename-2.0.1.tgz", - "integrity": "sha512-ODWHtkkdx3IAR+veKxFV+VBkUMcN+FaqzUUd7IZzt+0zhDZFPFxhlqwPF3YQvMHx1TD0tdgYl+kuPnJ8E6ql7A==", - "dev": true, - "dependencies": { - "unique-slug": "^3.0.0" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || >=16.0.0" - } - }, - "node_modules/make-fetch-happen/node_modules/unique-slug": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/unique-slug/-/unique-slug-3.0.0.tgz", - "integrity": "sha512-8EyMynh679x/0gqE9fT9oilG+qEt+ibFyqjuVTsZn1+CMxH+XLlpvr2UZx4nVcCwTpx81nICr2JQFkM+HPLq4w==", - "dev": true, - "dependencies": { - "imurmurhash": "^0.1.4" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || >=16.0.0" + "node": ">= 16" } }, "node_modules/media-typer": { @@ -12383,12 +13262,12 @@ } }, "node_modules/memfs": { - "version": "3.4.13", - "resolved": "https://registry.npmjs.org/memfs/-/memfs-3.4.13.tgz", - "integrity": "sha512-omTM41g3Skpvx5dSYeZIbXKcXoAVc/AoMNwn9TKx++L/gaen/+4TTttmu8ZSch5vfVJ8uJvGbroTsIlslRg6lg==", + "version": "3.5.3", + "resolved": "https://registry.npmjs.org/memfs/-/memfs-3.5.3.tgz", + "integrity": "sha512-UERzLsxzllchadvbPs5aolHh65ISpKpM+ccLbOJ8/vvpBKmAWf+la7dXFy7Mr0ySHbdHrFv5kGFCUHHe6GFEmw==", "dev": true, "dependencies": { - "fs-monkey": "^1.0.3" + "fs-monkey": "^1.0.4" }, "engines": { "node": ">= 4.0.0" @@ -12450,21 +13329,21 @@ } }, "node_modules/mime-db": { - "version": "1.51.0", - "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.51.0.tgz", - "integrity": "sha512-5y8A56jg7XVQx2mbv1lu49NR4dokRnhZYTtL+KGfaa27uq4pSTXkwQkFJl4pkRMyNFz/EtYDSkiiEHx3F7UN6g==", + "version": "1.52.0", + "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz", + "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==", "dev": true, "engines": { "node": ">= 0.6" } }, "node_modules/mime-types": { - "version": "2.1.34", - "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.34.tgz", - "integrity": "sha512-6cP692WwGIs9XXdOO4++N+7qjqv0rqxxVvJ3VHPh/Sc9mVZcQP+ZGhkKiTvWMQRr2tbHkJP/Yn7Y0npb3ZBs4A==", + "version": "2.1.35", + "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz", + "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==", "dev": true, "dependencies": { - "mime-db": "1.51.0" + "mime-db": "1.52.0" }, "engines": { "node": ">= 0.6" @@ -12480,9 +13359,9 @@ } }, "node_modules/mini-css-extract-plugin": { - "version": "2.7.2", - "resolved": "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-2.7.2.tgz", - "integrity": "sha512-EdlUizq13o0Pd+uCp+WO/JpkLvHRVGt97RqfeGhXqAcorYo1ypJSpkV+WDT0vY/kmh/p7wRdJNJtuyK540PXDw==", + "version": "2.7.6", + "resolved": "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-2.7.6.tgz", + "integrity": "sha512-Qk7HcgaPkGG6eD77mLvZS1nmxlao3j+9PkrT9Uc7HAE1id3F41+DdBRYRYkbyfNRGzm8/YWtzhw7nVPmwhqTQw==", "dev": true, "dependencies": { "schema-utils": "^4.0.0" @@ -12517,15 +13396,18 @@ } }, "node_modules/minimist": { - "version": "1.2.6", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.6.tgz", - "integrity": "sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==", - "dev": true + "version": "1.2.8", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz", + "integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==", + "dev": true, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } }, "node_modules/minipass": { - "version": "4.2.7", - "resolved": "https://registry.npmjs.org/minipass/-/minipass-4.2.7.tgz", - "integrity": "sha512-ScVIgqHcXRMyfflqHmEW0bm8z8rb5McHyOY3ewX9JBgZaR77G7nxq9L/mtV96/QbAAwtbCAHVVLzD1kkyfFQEw==", + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-5.0.0.tgz", + "integrity": "sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ==", "dev": true, "engines": { "node": ">=8" @@ -12556,32 +13438,29 @@ } }, "node_modules/minipass-fetch": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/minipass-fetch/-/minipass-fetch-2.1.2.tgz", - "integrity": "sha512-LT49Zi2/WMROHYoqGgdlQIZh8mLPZmOrN2NdJjMXxYe4nkN6FUyuPuOAOedNJDrx0IRGg9+4guZewtp8hE6TxA==", + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/minipass-fetch/-/minipass-fetch-3.0.4.tgz", + "integrity": "sha512-jHAqnA728uUpIaFm7NWsCnqKT6UqZz7GcI/bDpPATuwYyKwJwW0remxSCxUlKiEty+eopHGa3oc8WxgQ1FFJqg==", "dev": true, "dependencies": { - "minipass": "^3.1.6", + "minipass": "^7.0.3", "minipass-sized": "^1.0.3", "minizlib": "^2.1.2" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || >=16.0.0" + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" }, "optionalDependencies": { "encoding": "^0.1.13" } }, "node_modules/minipass-fetch/node_modules/minipass": { - "version": "3.3.6", - "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz", - "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==", + "version": "7.0.3", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.0.3.tgz", + "integrity": "sha512-LhbbwCfz3vsb12j/WkWQPZfKTsgqIe1Nf/ti1pKjYESGLHIVjWU96G9/ljLH4F9mWNVhlQOm0VySdAWzf05dpg==", "dev": true, - "dependencies": { - "yallist": "^4.0.0" - }, "engines": { - "node": ">=8" + "node": ">=16 || 14 >=14.17" } }, "node_modules/minipass-flush": { @@ -12715,6 +13594,15 @@ "node": ">=10" } }, + "node_modules/mrmime": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/mrmime/-/mrmime-1.0.1.tgz", + "integrity": "sha512-hzzEagAgDyoU1Q6yg5uI+AorQgdvMCur3FcKf7NhMKWsaYg+RnbTyHRa/9IlLF9rf455MOCtcqqrQQ83pPP7Uw==", + "dev": true, + "engines": { + "node": ">=10" + } + }, "node_modules/ms": { "version": "2.1.2", "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", @@ -12741,10 +13629,16 @@ "dev": true }, "node_modules/nanoid": { - "version": "3.3.4", - "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.4.tgz", - "integrity": "sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw==", + "version": "3.3.6", + "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.6.tgz", + "integrity": "sha512-BGcqMMJuToF7i1rt+2PWSNVnWIkGCU78jBG3RxO/bZlnZPK2Cmi2QaffxGO/2RvWi9sL+FAiRiXMgsyxQ1DIDA==", "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/ai" + } + ], "bin": { "nanoid": "bin/nanoid.cjs" }, @@ -12758,12 +13652,6 @@ "integrity": "sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=", "dev": true }, - "node_modules/natural-compare-lite": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/natural-compare-lite/-/natural-compare-lite-1.4.0.tgz", - "integrity": "sha512-Tj+HTDSJJKaZnfiuw+iaF9skdPpTo2GtEly5JHnWV/hfv2Qj/9RKsGISQtLh2ox3l5EAGw487hnBee0sIJ6v2g==", - "dev": true - }, "node_modules/needle": { "version": "3.2.0", "resolved": "https://registry.npmjs.org/needle/-/needle-3.2.0.tgz", @@ -12847,15 +13735,15 @@ } }, "node_modules/ngx-device-detector": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/ngx-device-detector/-/ngx-device-detector-5.0.1.tgz", - "integrity": "sha512-hVKaGzyXzy6zeliYyN7runz3eOOsh3tmZ8A6P5MSpHIjVjSx3pUJcobFTKNyHGn/zGS4JFWuhSSb7QmNwmqK9w==", + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/ngx-device-detector/-/ngx-device-detector-6.0.2.tgz", + "integrity": "sha512-+zaYUYGepNE4vMBA/6kyc1rhuUm5uU4cwbvFEEy0gAY4OarId15zwcb1iyvQbyrLCXhZW0DrPZTBoQxzp7dyVw==", "dependencies": { "tslib": "^2.0.0" }, "peerDependencies": { - "@angular/common": "^15.0.0", - "@angular/core": "^15.0.0" + "@angular/common": "^16.0.0", + "@angular/core": "^16.0.0" } }, "node_modules/ngx-markdown-editor": { @@ -12913,8 +13801,7 @@ "version": "3.2.1", "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-3.2.1.tgz", "integrity": "sha512-mmcei9JghVNDYydghQmeDX8KoAm0FAiYyIcUt/N4nhyAipB17pllZQDOJD2fotxABnt4Mdz+dKTO7eftLg4d0A==", - "dev": true, - "optional": true + "dev": true }, "node_modules/node-forge": { "version": "1.3.1", @@ -12926,15 +13813,16 @@ } }, "node_modules/node-gyp": { - "version": "9.3.1", - "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-9.3.1.tgz", - "integrity": "sha512-4Q16ZCqq3g8awk6UplT7AuxQ35XN4R/yf/+wSAwcBUAjg7l58RTactWaP8fIDTi0FzI7YcVLujwExakZlfWkXg==", + "version": "9.4.0", + "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-9.4.0.tgz", + "integrity": "sha512-dMXsYP6gc9rRbejLXmTbVRYjAHw7ppswsKyMxuxJxxOHzluIO1rGp9TOQgjFJ+2MCqcOcQTOPB/8Xwhr+7s4Eg==", "dev": true, "dependencies": { "env-paths": "^2.2.0", + "exponential-backoff": "^3.1.1", "glob": "^7.1.4", "graceful-fs": "^4.2.6", - "make-fetch-happen": "^10.0.3", + "make-fetch-happen": "^11.0.3", "nopt": "^6.0.0", "npmlog": "^6.0.0", "rimraf": "^3.0.2", @@ -12950,11 +13838,10 @@ } }, "node_modules/node-gyp-build": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-4.3.0.tgz", - "integrity": "sha512-iWjXZvmboq0ja1pUGULQBexmxq8CV4xBhX7VDOTbL7ZR4FOowwY/VOtRxBN/yKxmdGoIp4j5ysNT4u3S2pDQ3Q==", + "version": "4.6.1", + "resolved": "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-4.6.1.tgz", + "integrity": "sha512-24vnklJmyRS8ViBNI8KbtK/r/DmXQMRiOMXTNz2nrTnAYUwjmEEbnnpB/+kt+yWRv73bPsSPRFddrcIbAxSiMQ==", "dev": true, - "optional": true, "bin": { "node-gyp-build": "bin.js", "node-gyp-build-optional": "optional.js", @@ -12962,9 +13849,9 @@ } }, "node_modules/node-releases": { - "version": "2.0.10", - "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.10.tgz", - "integrity": "sha512-5GFldHPXVG/YZmFzJvKK2zDSzPKhEp0+ZR5SVaoSag9fsL5YgHbUHDfnG5494ISANDcK4KwPXAx2xqVEydmd7w==", + "version": "2.0.13", + "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.13.tgz", + "integrity": "sha512-uYr7J37ae/ORWdZeQ1xxMJe3NtdmqMC/JZK+geofDrkLUApKRHPd18/TxtBOJ4A0/+uUIliorNrfYV6s1b02eQ==", "dev": true }, "node_modules/nopt": { @@ -13028,9 +13915,9 @@ } }, "node_modules/npm-install-checks": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/npm-install-checks/-/npm-install-checks-6.1.0.tgz", - "integrity": "sha512-udSGENih/5xKh3Ex+L0PtZcOt0Pa+6ppDLnpG5D49/EhMja3LupaY9E/DtJTxyFBwE09ot7Fc+H4DywnZNWTVA==", + "version": "6.2.0", + "resolved": "https://registry.npmjs.org/npm-install-checks/-/npm-install-checks-6.2.0.tgz", + "integrity": "sha512-744wat5wAAHsxa4590mWO0tJ8PKxR8ORZsH9wGpQc3nWTzozMAgBN/XyqYw7mg3yqLM8dLwEnwSfKMmXAjF69g==", "dev": true, "dependencies": { "semver": "^7.1.1" @@ -13040,9 +13927,9 @@ } }, "node_modules/npm-normalize-package-bin": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/npm-normalize-package-bin/-/npm-normalize-package-bin-3.0.0.tgz", - "integrity": "sha512-g+DPQSkusnk7HYXr75NtzkIP4+N81i3RPsGFidF3DzHd9MT9wWngmqoeg/fnHFz5MNdtG4w03s+QnhewSLTT2Q==", + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/npm-normalize-package-bin/-/npm-normalize-package-bin-3.0.1.tgz", + "integrity": "sha512-dMxCf+zZ+3zeQZXKxmyuCKlIDPGuv8EF940xbkC4kQVDTtqoh6rJFO+JTKSA6/Rwi0getWmtuy4Itup0AMcaDQ==", "dev": true, "engines": { "node": "^14.17.0 || ^16.13.0 || >=18.0.0" @@ -13091,13 +13978,13 @@ } }, "node_modules/npm-registry-fetch": { - "version": "14.0.3", - "resolved": "https://registry.npmjs.org/npm-registry-fetch/-/npm-registry-fetch-14.0.3.tgz", - "integrity": "sha512-YaeRbVNpnWvsGOjX2wk5s85XJ7l1qQBGAp724h8e2CZFFhMSuw9enom7K1mWVUtvXO1uUSFIAPofQK0pPN0ZcA==", + "version": "14.0.5", + "resolved": "https://registry.npmjs.org/npm-registry-fetch/-/npm-registry-fetch-14.0.5.tgz", + "integrity": "sha512-kIDMIo4aBm6xg7jOttupWZamsZRkAqMqwqqbVXnUqstY5+tapvv6bkH/qMR76jdgV+YljEUCyWx3hRYMrJiAgA==", "dev": true, "dependencies": { "make-fetch-happen": "^11.0.0", - "minipass": "^4.0.0", + "minipass": "^5.0.0", "minipass-fetch": "^3.0.0", "minipass-json-stream": "^1.0.1", "minizlib": "^2.1.2", @@ -13108,58 +13995,6 @@ "node": "^14.17.0 || ^16.13.0 || >=18.0.0" } }, - "node_modules/npm-registry-fetch/node_modules/lru-cache": { - "version": "7.18.3", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.18.3.tgz", - "integrity": "sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA==", - "dev": true, - "engines": { - "node": ">=12" - } - }, - "node_modules/npm-registry-fetch/node_modules/make-fetch-happen": { - "version": "11.0.3", - "resolved": "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-11.0.3.tgz", - "integrity": "sha512-oPLh5m10lRNNZDjJ2kP8UpboUx2uFXVaVweVe/lWut4iHWcQEmfqSVJt2ihZsFI8HbpwyyocaXbCAWf0g1ukIA==", - "dev": true, - "dependencies": { - "agentkeepalive": "^4.2.1", - "cacache": "^17.0.0", - "http-cache-semantics": "^4.1.1", - "http-proxy-agent": "^5.0.0", - "https-proxy-agent": "^5.0.0", - "is-lambda": "^1.0.1", - "lru-cache": "^7.7.1", - "minipass": "^4.0.0", - "minipass-fetch": "^3.0.0", - "minipass-flush": "^1.0.5", - "minipass-pipeline": "^1.2.4", - "negotiator": "^0.6.3", - "promise-retry": "^2.0.1", - "socks-proxy-agent": "^7.0.0", - "ssri": "^10.0.0" - }, - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } - }, - "node_modules/npm-registry-fetch/node_modules/minipass-fetch": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/minipass-fetch/-/minipass-fetch-3.0.1.tgz", - "integrity": "sha512-t9/wowtf7DYkwz8cfMSt0rMwiyNIBXf5CKZ3S5ZMqRqMYT0oLTp0x1WorMI9WTwvaPg21r1JbFxJMum8JrLGfw==", - "dev": true, - "dependencies": { - "minipass": "^4.0.0", - "minipass-sized": "^1.0.3", - "minizlib": "^2.1.2" - }, - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - }, - "optionalDependencies": { - "encoding": "^0.1.13" - } - }, "node_modules/npm-run-path": { "version": "4.0.1", "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz", @@ -13188,9 +14023,9 @@ } }, "node_modules/nth-check": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-2.0.1.tgz", - "integrity": "sha512-it1vE95zF6dTT9lBsYbxvqh0Soy4SPowchj0UBGj/V6cTPnXXtQOPUbhZ6CmGzAD/rW22LQK6E96pcdJXk4A4w==", + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-2.1.1.tgz", + "integrity": "sha512-lqjrjmaOoAnWfMmBPL+XNnynZh2+swxiX3WUE0s4yEHI6m+AwrK2UZOimIRl3X/4QctVqS8AiZjFqyOGrMXb/w==", "dev": true, "dependencies": { "boolbase": "^1.0.0" @@ -13199,6 +14034,240 @@ "url": "https://github.com/fb55/nth-check?sponsor=1" } }, + "node_modules/nwsapi": { + "version": "2.2.7", + "resolved": "https://registry.npmjs.org/nwsapi/-/nwsapi-2.2.7.tgz", + "integrity": "sha512-ub5E4+FBPKwAZx0UwIQOjYWGHTEq5sPqHQNRN8Z9e4A7u3Tj1weLJsL59yH9vmvqEtBHaOmT6cYQKIZOxp35FQ==", + "dev": true + }, + "node_modules/nx": { + "version": "16.5.1", + "resolved": "https://registry.npmjs.org/nx/-/nx-16.5.1.tgz", + "integrity": "sha512-I3hJRE4hG7JWAtncWwDEO3GVeGPpN0TtM8xH5ArZXyDuVeTth/i3TtJzdDzqXO1HHtIoAQN0xeq4n9cLuMil5g==", + "dev": true, + "hasInstallScript": true, + "dependencies": { + "@nrwl/tao": "16.5.1", + "@parcel/watcher": "2.0.4", + "@yarnpkg/lockfile": "^1.1.0", + "@yarnpkg/parsers": "3.0.0-rc.46", + "@zkochan/js-yaml": "0.0.6", + "axios": "^1.0.0", + "chalk": "^4.1.0", + "cli-cursor": "3.1.0", + "cli-spinners": "2.6.1", + "cliui": "^7.0.2", + "dotenv": "~10.0.0", + "enquirer": "~2.3.6", + "fast-glob": "3.2.7", + "figures": "3.2.0", + "flat": "^5.0.2", + "fs-extra": "^11.1.0", + "glob": "7.1.4", + "ignore": "^5.0.4", + "js-yaml": "4.1.0", + "jsonc-parser": "3.2.0", + "lines-and-columns": "~2.0.3", + "minimatch": "3.0.5", + "npm-run-path": "^4.0.1", + "open": "^8.4.0", + "semver": "7.5.3", + "string-width": "^4.2.3", + "strong-log-transformer": "^2.1.0", + "tar-stream": "~2.2.0", + "tmp": "~0.2.1", + "tsconfig-paths": "^4.1.2", + "tslib": "^2.3.0", + "v8-compile-cache": "2.3.0", + "yargs": "^17.6.2", + "yargs-parser": "21.1.1" + }, + "bin": { + "nx": "bin/nx.js" + }, + "optionalDependencies": { + "@nx/nx-darwin-arm64": "16.5.1", + "@nx/nx-darwin-x64": "16.5.1", + "@nx/nx-freebsd-x64": "16.5.1", + "@nx/nx-linux-arm-gnueabihf": "16.5.1", + "@nx/nx-linux-arm64-gnu": "16.5.1", + "@nx/nx-linux-arm64-musl": "16.5.1", + "@nx/nx-linux-x64-gnu": "16.5.1", + "@nx/nx-linux-x64-musl": "16.5.1", + "@nx/nx-win32-arm64-msvc": "16.5.1", + "@nx/nx-win32-x64-msvc": "16.5.1" + }, + "peerDependencies": { + "@swc-node/register": "^1.4.2", + "@swc/core": "^1.2.173" + }, + "peerDependenciesMeta": { + "@swc-node/register": { + "optional": true + }, + "@swc/core": { + "optional": true + } + } + }, + "node_modules/nx/node_modules/ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "dev": true, + "dependencies": { + "color-convert": "^2.0.1" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" + } + }, + "node_modules/nx/node_modules/argparse": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz", + "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==", + "dev": true + }, + "node_modules/nx/node_modules/chalk": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", + "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", + "dev": true, + "dependencies": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/chalk?sponsor=1" + } + }, + "node_modules/nx/node_modules/cliui": { + "version": "7.0.4", + "resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz", + "integrity": "sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==", + "dev": true, + "dependencies": { + "string-width": "^4.2.0", + "strip-ansi": "^6.0.0", + "wrap-ansi": "^7.0.0" + } + }, + "node_modules/nx/node_modules/color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "dependencies": { + "color-name": "~1.1.4" + }, + "engines": { + "node": ">=7.0.0" + } + }, + "node_modules/nx/node_modules/color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true + }, + "node_modules/nx/node_modules/fast-glob": { + "version": "3.2.7", + "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.7.tgz", + "integrity": "sha512-rYGMRwip6lUMvYD3BTScMwT1HtAs2d71SMv66Vrxs0IekGZEjhM0pcMfjQPnknBt2zeCwQMEupiN02ZP4DiT1Q==", + "dev": true, + "dependencies": { + "@nodelib/fs.stat": "^2.0.2", + "@nodelib/fs.walk": "^1.2.3", + "glob-parent": "^5.1.2", + "merge2": "^1.3.0", + "micromatch": "^4.0.4" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/nx/node_modules/glob": { + "version": "7.1.4", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.4.tgz", + "integrity": "sha512-hkLPepehmnKk41pUGm3sYxoFs/umurYfYJCerbXEyFIWcAzvpipAgVkBqqT9RBKMGjnq6kMuyYwha6csxbiM1A==", + "dev": true, + "dependencies": { + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^3.0.4", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" + }, + "engines": { + "node": "*" + } + }, + "node_modules/nx/node_modules/has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/nx/node_modules/js-yaml": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz", + "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==", + "dev": true, + "dependencies": { + "argparse": "^2.0.1" + }, + "bin": { + "js-yaml": "bin/js-yaml.js" + } + }, + "node_modules/nx/node_modules/minimatch": { + "version": "3.0.5", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.5.tgz", + "integrity": "sha512-tUpxzX0VAzJHjLu0xUfFv1gwVp9ba3IOuRAVH2EGuRW8a5emA2FlACLqiT/lDVtS1W+TGNwqz3sWaNyLgDJWuw==", + "dev": true, + "dependencies": { + "brace-expansion": "^1.1.7" + }, + "engines": { + "node": "*" + } + }, + "node_modules/nx/node_modules/supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "dev": true, + "dependencies": { + "has-flag": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/nx/node_modules/tsconfig-paths": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-4.2.0.tgz", + "integrity": "sha512-NoZ4roiN7LnbKn9QqE1amc9DJfzvZXxF4xDavcOWt1BPkdx+m+0gJuPM+S0vCe7zTJMYUP0R8pO2XMr+Y8oLIg==", + "dev": true, + "dependencies": { + "json5": "^2.2.2", + "minimist": "^1.2.6", + "strip-bom": "^3.0.0" + }, + "engines": { + "node": ">=6" + } + }, "node_modules/object-hash": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/object-hash/-/object-hash-3.0.0.tgz", @@ -13211,7 +14280,6 @@ "version": "1.12.3", "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.3.tgz", "integrity": "sha512-geUvdk7c+eizMNUDkRpW1wJwgfOiOeHbxBR/hLXK1aT6zmVSO0jsQcs7fj6MGw89jC/cjGfLcNOrtMYtGqm81g==", - "dev": true, "funding": { "url": "https://github.com/sponsors/ljharb" } @@ -13241,6 +14309,15 @@ "node": ">= 0.4" } }, + "node_modules/object-path": { + "version": "0.11.8", + "resolved": "https://registry.npmjs.org/object-path/-/object-path-0.11.8.tgz", + "integrity": "sha512-YJjNZrlXJFM42wTBn6zgOJVar9KFJvzx6sTWDte8sWZF//cnjl0BxHNpfZx+ZffXX63A9q0b1zsFiBX4g4X5KA==", + "dev": true, + "engines": { + "node": ">= 10.12.0" + } + }, "node_modules/object.assign": { "version": "4.1.4", "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.4.tgz", @@ -13259,6 +14336,35 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/object.fromentries": { + "version": "2.0.7", + "resolved": "https://registry.npmjs.org/object.fromentries/-/object.fromentries-2.0.7.tgz", + "integrity": "sha512-UPbPHML6sL8PI/mOqPwsH4G6iyXcCGzLin8KvEPenOZN5lpCNBZZQ+V62vdjB1mQHrmqGQt5/OJzemUA+KJmEA==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.2", + "define-properties": "^1.2.0", + "es-abstract": "^1.22.1" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/object.groupby": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/object.groupby/-/object.groupby-1.0.1.tgz", + "integrity": "sha512-HqaQtqLnp/8Bn4GL16cj+CUYbnpe1bh0TtEaWvybszDG4tgxCJuRpV8VGuvNaI1fAnI4lUJzDG55MXcOH4JZcQ==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.2", + "define-properties": "^1.2.0", + "es-abstract": "^1.22.1", + "get-intrinsic": "^1.2.1" + } + }, "node_modules/object.values": { "version": "1.1.6", "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.1.6.tgz", @@ -13328,9 +14434,9 @@ } }, "node_modules/open": { - "version": "8.4.1", - "resolved": "https://registry.npmjs.org/open/-/open-8.4.1.tgz", - "integrity": "sha512-/4b7qZNhv6Uhd7jjnREh1NjnPxlTq+XNWPG88Ydkj5AILcA5m3ajvcg57pB24EQjKv0dK62XnDqk9c/hkIG5Kg==", + "version": "8.4.2", + "resolved": "https://registry.npmjs.org/open/-/open-8.4.2.tgz", + "integrity": "sha512-7x81NCL719oNbsq/3mh+hVrAWmFuEYUqrq/Iw3kUzH8ReypT9QQ0BLoJS7/G9k6N81XjW4qHWtjWwe/9eLy1EQ==", "dev": true, "dependencies": { "define-lazy-prop": "^2.0.0", @@ -13345,17 +14451,17 @@ } }, "node_modules/optionator": { - "version": "0.9.1", - "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.1.tgz", - "integrity": "sha512-74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw==", + "version": "0.9.3", + "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.3.tgz", + "integrity": "sha512-JjCoypp+jKn1ttEFExxhetCKeJt9zhAgAve5FXHixTvFDW/5aEktX9bufBKLRRMdU7bNtpLfcGu94B3cdEJgjg==", "dev": true, "dependencies": { + "@aashutoshrathi/word-wrap": "^1.2.3", "deep-is": "^0.1.3", "fast-levenshtein": "^2.0.6", "levn": "^0.4.1", "prelude-ls": "^1.2.1", - "type-check": "^0.4.0", - "word-wrap": "^1.2.3" + "type-check": "^0.4.0" }, "engines": { "node": ">= 0.8.0" @@ -13537,9 +14643,9 @@ } }, "node_modules/pacote": { - "version": "15.1.0", - "resolved": "https://registry.npmjs.org/pacote/-/pacote-15.1.0.tgz", - "integrity": "sha512-FFcjtIl+BQNfeliSm7MZz5cpdohvUV1yjGnqgVM4UnVF7JslRY0ImXAygdaCDV0jjUADEWu4y5xsDV8brtrTLg==", + "version": "15.2.0", + "resolved": "https://registry.npmjs.org/pacote/-/pacote-15.2.0.tgz", + "integrity": "sha512-rJVZeIwHTUta23sIZgEIM62WYwbmGbThdbnkt81ravBplQv+HjyroqnLRNH2+sLJHcGZmLRmhPwACqhfTcOmnA==", "dev": true, "dependencies": { "@npmcli/git": "^4.0.0", @@ -13548,7 +14654,7 @@ "@npmcli/run-script": "^6.0.0", "cacache": "^17.0.0", "fs-minipass": "^3.0.0", - "minipass": "^4.0.0", + "minipass": "^5.0.0", "npm-package-arg": "^10.0.0", "npm-packlist": "^7.0.0", "npm-pick-manifest": "^8.0.0", @@ -13557,7 +14663,7 @@ "promise-retry": "^2.0.1", "read-package-json": "^6.0.0", "read-package-json-fast": "^3.0.0", - "sigstore": "^1.0.0", + "sigstore": "^1.3.0", "ssri": "^10.0.0", "tar": "^6.1.11" }, @@ -13604,6 +14710,12 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/parse-json/node_modules/lines-and-columns": { + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.2.4.tgz", + "integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==", + "dev": true + }, "node_modules/parse-node-version": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/parse-node-version/-/parse-node-version-1.0.1.tgz", @@ -13651,21 +14763,6 @@ "url": "https://github.com/fb55/entities?sponsor=1" } }, - "node_modules/parse5-htmlparser2-tree-adapter": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/parse5-htmlparser2-tree-adapter/-/parse5-htmlparser2-tree-adapter-6.0.1.tgz", - "integrity": "sha512-qPuWvbLgvDGilKc5BoicRovlT4MtYT6JfJyBOMDsKoiT+GiuP5qyrPCnR9HcPECIJJmZh5jRndyNThnhhb/vlA==", - "dev": true, - "dependencies": { - "parse5": "^6.0.1" - } - }, - "node_modules/parse5-htmlparser2-tree-adapter/node_modules/parse5": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/parse5/-/parse5-6.0.1.tgz", - "integrity": "sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw==", - "dev": true - }, "node_modules/parse5-sax-parser": { "version": "7.0.0", "resolved": "https://registry.npmjs.org/parse5-sax-parser/-/parse5-sax-parser-7.0.0.tgz", @@ -13733,13 +14830,13 @@ "dev": true }, "node_modules/path-scurry": { - "version": "1.6.4", - "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-1.6.4.tgz", - "integrity": "sha512-Qp/9IHkdNiXJ3/Kon++At2nVpnhRiPq/aSvQN+H3U1WZbvNRK0RIQK/o4HMqPoXjpuGJUEWpHSs6Mnjxqh3TQg==", + "version": "1.10.1", + "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-1.10.1.tgz", + "integrity": "sha512-MkhCqzzBEpPvxxQ71Md0b1Kk51W01lrYvlMzSUaIzNsODdd7mqhiimSZlr+VegAz5Z6Vzt9Xg2ttE//XBhH3EQ==", "dev": true, "dependencies": { - "lru-cache": "^9.0.0", - "minipass": "^5.0.0" + "lru-cache": "^9.1.1 || ^10.0.0", + "minipass": "^5.0.0 || ^6.0.2 || ^7.0.0" }, "engines": { "node": ">=16 || 14 >=14.17" @@ -13749,21 +14846,12 @@ } }, "node_modules/path-scurry/node_modules/lru-cache": { - "version": "9.0.0", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-9.0.0.tgz", - "integrity": "sha512-9AEKXzvOZc4BMacFnYiTOlDH/197LNnQIK9wZ6iMB5NXPzuv4bWR/Msv7iUMplkiMQ1qQL+KSv/JF1mZAB5Lrg==", + "version": "10.0.1", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.0.1.tgz", + "integrity": "sha512-IJ4uwUTi2qCccrioU6g9g/5rvvVl13bsdczUUcqbciD9iLr095yj8DQKdObriEvuNSx325N1rV1O0sJFszx75g==", "dev": true, "engines": { - "node": ">=16.14" - } - }, - "node_modules/path-scurry/node_modules/minipass": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/minipass/-/minipass-5.0.0.tgz", - "integrity": "sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ==", - "dev": true, - "engines": { - "node": ">=8" + "node": "14 || >=16.14" } }, "node_modules/path-to-regexp": { @@ -13810,9 +14898,9 @@ } }, "node_modules/piscina": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/piscina/-/piscina-3.2.0.tgz", - "integrity": "sha512-yn/jMdHRw+q2ZJhFhyqsmANcbF6V2QwmD84c6xRau+QpQOmtrBCoRGdvTfeuFDYXB5W2m6MfLkjkvQa9lUSmIA==", + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/piscina/-/piscina-4.0.0.tgz", + "integrity": "sha512-641nAmJS4k4iqpNUqfggqUBUMmlw0ZoM5VZKdQkV2e970Inn3Tk9kroCc1wpsYLD07vCwpys5iY0d3xI/9WkTg==", "dev": true, "dependencies": { "eventemitter-asyncresource": "^1.0.0", @@ -13824,21 +14912,106 @@ } }, "node_modules/pkg-dir": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz", - "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==", + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-7.0.0.tgz", + "integrity": "sha512-Ie9z/WINcxxLp27BKOCHGde4ITq9UklYKDzVo1nhk5sqGEXU3FpkwP5GM2voTGJkGd9B3Otl+Q4uwSOeSUtOBA==", "dev": true, "dependencies": { - "find-up": "^4.0.0" + "find-up": "^6.3.0" }, "engines": { - "node": ">=8" + "node": ">=14.16" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/pkg-dir/node_modules/find-up": { + "version": "6.3.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-6.3.0.tgz", + "integrity": "sha512-v2ZsoEuVHYy8ZIlYqwPe/39Cy+cFDzp4dXPaxNvkEuouymu+2Jbz0PxpKarJHYJTmv2HWT3O382qY8l4jMWthw==", + "dev": true, + "dependencies": { + "locate-path": "^7.1.0", + "path-exists": "^5.0.0" + }, + "engines": { + "node": "^12.20.0 || ^14.13.1 || >=16.0.0" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/pkg-dir/node_modules/locate-path": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-7.2.0.tgz", + "integrity": "sha512-gvVijfZvn7R+2qyPX8mAuKcFGDf6Nc61GdvGafQsHL0sBIxfKzA+usWn4GFC/bk+QdwPUD4kWFJLhElipq+0VA==", + "dev": true, + "dependencies": { + "p-locate": "^6.0.0" + }, + "engines": { + "node": "^12.20.0 || ^14.13.1 || >=16.0.0" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/pkg-dir/node_modules/p-limit": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-4.0.0.tgz", + "integrity": "sha512-5b0R4txpzjPWVw/cXXUResoD4hb6U/x9BH08L7nw+GN1sezDzPdxeRvpc9c433fZhBan/wusjbCsqwqm4EIBIQ==", + "dev": true, + "dependencies": { + "yocto-queue": "^1.0.0" + }, + "engines": { + "node": "^12.20.0 || ^14.13.1 || >=16.0.0" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/pkg-dir/node_modules/p-locate": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-6.0.0.tgz", + "integrity": "sha512-wPrq66Llhl7/4AGC6I+cqxT07LhXvWL08LNXz1fENOw0Ap4sRZZ/gZpTTJ5jpurzzzfS2W/Ge9BY3LgLjCShcw==", + "dev": true, + "dependencies": { + "p-limit": "^4.0.0" + }, + "engines": { + "node": "^12.20.0 || ^14.13.1 || >=16.0.0" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/pkg-dir/node_modules/path-exists": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-5.0.0.tgz", + "integrity": "sha512-RjhtfwJOxzcFmNOi6ltcbcu4Iu+FL3zEj83dk4kAS+fVpTxXLO1b38RvJgT/0QwvV/L3aY9TAnyv0EOqW4GoMQ==", + "dev": true, + "engines": { + "node": "^12.20.0 || ^14.13.1 || >=16.0.0" + } + }, + "node_modules/pkg-dir/node_modules/yocto-queue": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-1.0.0.tgz", + "integrity": "sha512-9bnSc/HEW2uRy67wc+T8UwauLuPJVn28jb+GtJY16iiKWyvmYJRXVT4UamsAEGQfPohgr2q4Tq0sQbQlxTfi1g==", + "dev": true, + "engines": { + "node": ">=12.20" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" } }, "node_modules/postcss": { - "version": "8.4.21", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.21.tgz", - "integrity": "sha512-tP7u/Sn/dVxK2NnruI4H9BG+x+Wxz6oeZ1cJ8P6G/PZY0IKk4k/63TDsQf2kQq3+qoJeLm2kIBUNlZe3zgb4Zg==", + "version": "8.4.27", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.27.tgz", + "integrity": "sha512-gY/ACJtJPSmUFPDCHtX78+01fHa64FaU4zaaWfuh1MhGJISufJAH4cun6k/8fwsHYeK4UQmENQK+tRLCFJE8JQ==", "dev": true, "funding": [ { @@ -13848,10 +15021,14 @@ { "type": "tidelift", "url": "https://tidelift.com/funding/github/npm/postcss" + }, + { + "type": "github", + "url": "https://github.com/sponsors/ai" } ], "dependencies": { - "nanoid": "^3.3.4", + "nanoid": "^3.3.6", "picocolors": "^1.0.0", "source-map-js": "^1.0.2" }, @@ -13860,13 +15037,13 @@ } }, "node_modules/postcss-loader": { - "version": "7.0.2", - "resolved": "https://registry.npmjs.org/postcss-loader/-/postcss-loader-7.0.2.tgz", - "integrity": "sha512-fUJzV/QH7NXUAqV8dWJ9Lg4aTkDCezpTS5HgJ2DvqznexTbSTxgi/dTECvTZ15BwKTtk8G/bqI/QTu2HPd3ZCg==", + "version": "7.3.3", + "resolved": "https://registry.npmjs.org/postcss-loader/-/postcss-loader-7.3.3.tgz", + "integrity": "sha512-YgO/yhtevGO/vJePCQmTxiaEwER94LABZN0ZMT4A0vsak9TpO+RvKRs7EmJ8peIlB9xfXCsS7M8LjqncsUZ5HA==", "dev": true, "dependencies": { - "cosmiconfig": "^7.0.0", - "klona": "^2.0.5", + "cosmiconfig": "^8.2.0", + "jiti": "^1.18.2", "semver": "^7.3.8" }, "engines": { @@ -13894,9 +15071,9 @@ } }, "node_modules/postcss-modules-local-by-default": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/postcss-modules-local-by-default/-/postcss-modules-local-by-default-4.0.0.tgz", - "integrity": "sha512-sT7ihtmGSF9yhm6ggikHdV0hlziDTX7oFoXtuVWeDd3hHObNkcHRo9V3yg7vCAY7cONyxJC/XXCmmiHHcvX7bQ==", + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/postcss-modules-local-by-default/-/postcss-modules-local-by-default-4.0.3.tgz", + "integrity": "sha512-2/u2zraspoACtrbFRnTijMiQtb4GW4BvatjaG/bCjYQo8kLTdevCUlwuBHx2sCnSyrI3x3qj4ZK1j5LQBgzmwA==", "dev": true, "dependencies": { "icss-utils": "^5.0.0", @@ -13941,9 +15118,9 @@ } }, "node_modules/postcss-selector-parser": { - "version": "6.0.11", - "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.11.tgz", - "integrity": "sha512-zbARubNdogI9j7WY4nQJBiNqQf3sLS3wCP4WfOidu+p28LofJqDH1tcXypGrcmMHhDk2t9wGhCsYe/+szLTy1g==", + "version": "6.0.13", + "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.13.tgz", + "integrity": "sha512-EaV1Gl4mUEV4ddhDnv/xtj7sxwrwxdetHdWUGnT4VJQf+4d05v6lHYZr8N573k5Z0BViss7BDhfWtKS3+sfAqQ==", "dev": true, "dependencies": { "cssesc": "^3.0.0", @@ -13986,18 +15163,18 @@ "integrity": "sha512-KDeO94CbWI4pKsPnYpA1FPjo79EsY9I+M8ywoPBSf9XMXoe/0crjbUK7jcQEDHuc0ZMRIZsxH3TYLv4TUtHmAA==" }, "node_modules/primeng": { - "version": "15.4.1", - "resolved": "https://registry.npmjs.org/primeng/-/primeng-15.4.1.tgz", - "integrity": "sha512-j2unOQZk6756l6SgkzcmlHF6JlawF0bIjKTgAPWwT+S5RYeWEjpCPg/ABV8TylwW7CTNQX2oCHbyqCAuhtr++w==", + "version": "16.4.0", + "resolved": "https://registry.npmjs.org/primeng/-/primeng-16.4.0.tgz", + "integrity": "sha512-36Iux0sXy39V0RptuBx30ED1oHCesZOGIU7HNn2ZEXqKgE3mgCk57oQ7OK60xHufWqfRsWcuZgLJDmJPUeLCXA==", "dependencies": { "tslib": "^2.3.0" }, "peerDependencies": { - "@angular/common": "^15.2.1", - "@angular/core": "^15.2.1", - "@angular/forms": "^15.2.1", - "rxjs": "^6.0.0 || ^7.5.0", - "zone.js": "^0.10.2 || ^0.11.0 || ^0.12.0 || ^0.13.0" + "@angular/common": "^16.2.0", + "@angular/core": "^16.2.0", + "@angular/forms": "^16.2.0", + "rxjs": "^6.0.0 || ^7.8.1", + "zone.js": "~0.13.0" } }, "node_modules/proc-log": { @@ -14064,6 +15241,12 @@ "node": ">= 0.10" } }, + "node_modules/proxy-from-env": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz", + "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==", + "dev": true + }, "node_modules/prr": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/prr/-/prr-1.0.1.tgz", @@ -14071,6 +15254,12 @@ "dev": true, "optional": true }, + "node_modules/psl": { + "version": "1.9.0", + "resolved": "https://registry.npmjs.org/psl/-/psl-1.9.0.tgz", + "integrity": "sha512-E/ZsdU4HLs/68gYzgGTkMicWTLPdAftJLfJFlLUAAKZGkStNU72sZjT66SnMDVOfOWY/YAoiD7Jxa9iHvngcag==", + "dev": true + }, "node_modules/punycode": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz", @@ -14081,10 +15270,9 @@ } }, "node_modules/qs": { - "version": "6.11.0", - "resolved": "https://registry.npmjs.org/qs/-/qs-6.11.0.tgz", - "integrity": "sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==", - "dev": true, + "version": "6.11.2", + "resolved": "https://registry.npmjs.org/qs/-/qs-6.11.2.tgz", + "integrity": "sha512-tDNIz22aBzCDxLtVH++VnTfzxlfeK5CbqohpSqpJgj1Wg/cQbStNAz3NuqCs5vV+pjBsK4x4pN9HlVh7rcYRiA==", "dependencies": { "side-channel": "^1.0.4" }, @@ -14095,14 +15283,11 @@ "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/querystring": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/querystring/-/querystring-0.2.0.tgz", - "integrity": "sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA=", - "deprecated": "The querystring API is considered Legacy. new code should use the URLSearchParams API instead.", - "engines": { - "node": ">=0.4.x" - } + "node_modules/querystringify": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/querystringify/-/querystringify-2.2.0.tgz", + "integrity": "sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ==", + "dev": true }, "node_modules/queue-microtask": { "version": "1.2.3", @@ -14167,12 +15352,12 @@ } }, "node_modules/read-package-json": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/read-package-json/-/read-package-json-6.0.1.tgz", - "integrity": "sha512-AaHqXxfAVa+fNL07x8iAghfKOds/XXsu7zoouIVsbm7PEbQ3nMWXlvjcbrNLjElnUHWQtAo4QEa0RXuvD4XlpA==", + "version": "6.0.4", + "resolved": "https://registry.npmjs.org/read-package-json/-/read-package-json-6.0.4.tgz", + "integrity": "sha512-AEtWXYfopBj2z5N5PbkAOeNHRPUg5q+Nen7QLxV8M2zJq1ym6/lCz3fYNTCXe19puu2d06jfHhrP7v/S2PtMMw==", "dev": true, "dependencies": { - "glob": "^9.3.0", + "glob": "^10.2.2", "json-parse-even-better-errors": "^3.0.0", "normalize-package-data": "^5.0.0", "npm-normalize-package-bin": "^3.0.0" @@ -14213,15 +15398,19 @@ } }, "node_modules/read-package-json/node_modules/glob": { - "version": "9.3.5", - "resolved": "https://registry.npmjs.org/glob/-/glob-9.3.5.tgz", - "integrity": "sha512-e1LleDykUz2Iu+MTYdkSsuWX8lvAjAcs0Xef0lNIu0S2wOAzuTxCJtcd9S3cijlwYF18EsU3rzb8jPVobxDh9Q==", + "version": "10.3.9", + "resolved": "https://registry.npmjs.org/glob/-/glob-10.3.9.tgz", + "integrity": "sha512-2tU/LKevAQvDVuVJ9pg9Yv9xcbSh+TqHuTaXTNbQwf+0kDl9Fm6bMovi4Nm5c8TVvfxo2LLcqCGtmO9KoJaGWg==", "dev": true, "dependencies": { - "fs.realpath": "^1.0.0", - "minimatch": "^8.0.2", - "minipass": "^4.2.4", - "path-scurry": "^1.6.1" + "foreground-child": "^3.1.0", + "jackspeak": "^2.3.5", + "minimatch": "^9.0.1", + "minipass": "^5.0.0 || ^6.0.2 || ^7.0.0", + "path-scurry": "^1.10.1" + }, + "bin": { + "glob": "dist/esm/bin.mjs" }, "engines": { "node": ">=16 || 14 >=14.17" @@ -14240,9 +15429,9 @@ } }, "node_modules/read-package-json/node_modules/minimatch": { - "version": "8.0.4", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-8.0.4.tgz", - "integrity": "sha512-W0Wvr9HyFXZRGIDgCicunpQ299OKXs9RgZfaukz4qAW/pJhcpUfupc9c+OObPOFueNy8VSrZgEmDtk6Kh4WzDA==", + "version": "9.0.3", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.3.tgz", + "integrity": "sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg==", "dev": true, "dependencies": { "brace-expansion": "^2.0.1" @@ -14293,9 +15482,9 @@ "dev": true }, "node_modules/regenerate-unicode-properties": { - "version": "10.1.0", - "resolved": "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-10.1.0.tgz", - "integrity": "sha512-d1VudCLoIGitcU/hEg2QqvyGZQmdC0Lf8BqdOMXGFSvJP4bNV1+XqbPQeHHLD51Jh4QJJ225dlIFvY4Ly6MXmQ==", + "version": "10.1.1", + "resolved": "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-10.1.1.tgz", + "integrity": "sha512-X007RyZLsCJVVrjgEFVpLUTZwyOZk3oiL75ZcuYjlIWd6rNJtOjkBwQc5AsRrpbKVkxN6sklw/k/9m2jJYOf8Q==", "dev": true, "dependencies": { "regenerate": "^1.4.2" @@ -14311,9 +15500,9 @@ "dev": true }, "node_modules/regenerator-transform": { - "version": "0.15.1", - "resolved": "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.15.1.tgz", - "integrity": "sha512-knzmNAcuyxV+gQCufkYcvOqX/qIIfHLv0u5x79kRxuGojfYVky1f15TzZEu2Avte8QGepvUNTnLskf8E6X6Vyg==", + "version": "0.15.2", + "resolved": "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.15.2.tgz", + "integrity": "sha512-hfMp2BoF0qOk3uc5V20ALGDS2ddjQaLrdl7xrGXvAIow7qeWRM2VA2HuCHkUKk9slq3VwEwLNK3DFBqDfPGYtg==", "dev": true, "dependencies": { "@babel/runtime": "^7.8.4" @@ -14326,14 +15515,14 @@ "dev": true }, "node_modules/regexp.prototype.flags": { - "version": "1.4.3", - "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.4.3.tgz", - "integrity": "sha512-fjggEOO3slI6Wvgjwflkc4NFRCTZAu5CnNfBd5qOMYhWdn67nJBBu34/TkD++eeFmd8C9r9jfXJ27+nSiRkSUA==", + "version": "1.5.1", + "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.5.1.tgz", + "integrity": "sha512-sy6TXMN+hnP/wMy+ISxg3krXx7BAtWVO4UouuCN/ziM9UEne0euamVNafDfvC83bRNr95y0V5iijeDQFUNpvrg==", "dev": true, "dependencies": { "call-bind": "^1.0.2", - "define-properties": "^1.1.3", - "functions-have-names": "^1.2.2" + "define-properties": "^1.2.0", + "set-function-name": "^2.0.0" }, "engines": { "node": ">= 0.4" @@ -14343,14 +15532,14 @@ } }, "node_modules/regexpu-core": { - "version": "5.2.2", - "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-5.2.2.tgz", - "integrity": "sha512-T0+1Zp2wjF/juXMrMxHxidqGYn8U4R+zleSJhX9tQ1PUsS8a9UtYfbsF9LdiVgNX3kiX8RNaKM42nfSgvFJjmw==", + "version": "5.3.2", + "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-5.3.2.tgz", + "integrity": "sha512-RAM5FlZz+Lhmo7db9L298p2vHP5ZywrVXmVXpmAD9GuL5MPH6t9ROw1iA/wfHkQ76Qe7AaPF0nGuim96/IrQMQ==", "dev": true, "dependencies": { + "@babel/regjsgen": "^0.8.0", "regenerate": "^1.4.2", "regenerate-unicode-properties": "^10.1.0", - "regjsgen": "^0.7.1", "regjsparser": "^0.9.1", "unicode-match-property-ecmascript": "^2.0.0", "unicode-match-property-value-ecmascript": "^2.1.0" @@ -14359,12 +15548,6 @@ "node": ">=4" } }, - "node_modules/regjsgen": { - "version": "0.7.1", - "resolved": "https://registry.npmjs.org/regjsgen/-/regjsgen-0.7.1.tgz", - "integrity": "sha512-RAt+8H2ZEzHeYWxZ3H2z6tF18zyyOnlcdaafLrm21Bguj7uZy6ULibiAFdXEtKQY4Sy7wDTwDiOazasMLc4KPA==", - "dev": true - }, "node_modules/regjsparser": { "version": "0.9.1", "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.9.1.tgz", @@ -14411,12 +15594,12 @@ "dev": true }, "node_modules/resolve": { - "version": "1.22.1", - "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.1.tgz", - "integrity": "sha512-nBpuuYuY5jFsli/JIs1oldw6fOQCBioohqWZg/2hiaOybXOft4lonv85uDOKXdf8rhyK159cxU5cDcK/NKk8zw==", + "version": "1.22.2", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.2.tgz", + "integrity": "sha512-Sb+mjNHOULsBv818T40qSPeRiuWLyaGMa5ewydRLFimneixmVy2zdivRl+AF6jaYPC8ERxGDmFSiqui6SfPd+g==", "dev": true, "dependencies": { - "is-core-module": "^2.9.0", + "is-core-module": "^2.11.0", "path-parse": "^1.0.7", "supports-preserve-symlinks-flag": "^1.0.0" }, @@ -14530,6 +15713,22 @@ "url": "https://github.com/sponsors/isaacs" } }, + "node_modules/rollup": { + "version": "3.29.3", + "resolved": "https://registry.npmjs.org/rollup/-/rollup-3.29.3.tgz", + "integrity": "sha512-T7du6Hum8jOkSWetjRgbwpM6Sy0nECYrYRSmZjayFcOddtKJWU4d17AC3HNUk7HRuqy4p+G7aEZclSHytqUmEg==", + "dev": true, + "bin": { + "rollup": "dist/bin/rollup" + }, + "engines": { + "node": ">=14.18.0", + "npm": ">=8.0.0" + }, + "optionalDependencies": { + "fsevents": "~2.3.2" + } + }, "node_modules/run-async": { "version": "2.4.1", "resolved": "https://registry.npmjs.org/run-async/-/run-async-2.4.1.tgz", @@ -14563,13 +15762,31 @@ } }, "node_modules/rxjs": { - "version": "7.8.0", - "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.8.0.tgz", - "integrity": "sha512-F2+gxDshqmIub1KdvZkaEfGDwLNpPvk9Fs6LD/MyQxNgMds/WH9OdDDXOmxUZpME+iSK3rQCctkL0DYyytUqMg==", + "version": "7.8.1", + "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.8.1.tgz", + "integrity": "sha512-AA3TVj+0A2iuIoQkWEK/tqFjBq2j+6PO6Y0zJcvzLAFhEFIO3HL0vls9hWLncZbAAbK0mar7oZ4V079I/qPMxg==", "dependencies": { "tslib": "^2.1.0" } }, + "node_modules/safe-array-concat": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/safe-array-concat/-/safe-array-concat-1.0.1.tgz", + "integrity": "sha512-6XbUAseYE2KtOuGueyeobCySj9L4+66Tn6KQMOPQJrAJEowYKW/YR/MGJZl7FdydUdaFu4LYyDZjxf4/Nmo23Q==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.2", + "get-intrinsic": "^1.2.1", + "has-symbols": "^1.0.3", + "isarray": "^2.0.5" + }, + "engines": { + "node": ">=0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/safe-buffer": { "version": "5.2.1", "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", @@ -14616,9 +15833,9 @@ "integrity": "sha512-LRneZZRXNgjzwG4bDQdOTSbze3fHm1EAKN/8bePxnlEZiBmkYEDggaHbuvHI9/hoqHbGfsEA7tWS9GhYHZBBsw==" }, "node_modules/sass": { - "version": "1.58.1", - "resolved": "https://registry.npmjs.org/sass/-/sass-1.58.1.tgz", - "integrity": "sha512-bnINi6nPXbP1XNRaranMFEBZWUfdW/AF16Ql5+ypRxfTvCRTTKrLsMIakyDcayUt2t/RZotmL4kgJwNH5xO+bg==", + "version": "1.64.1", + "resolved": "https://registry.npmjs.org/sass/-/sass-1.64.1.tgz", + "integrity": "sha512-16rRACSOFEE8VN7SCgBu1MpYCyN7urj9At898tyzdXFhC+a+yOX5dXwAR7L8/IdPJ1NB8OYoXmD55DM30B2kEQ==", "dev": true, "dependencies": { "chokidar": ">=3.0.0 <4.0.0", @@ -14629,16 +15846,15 @@ "sass": "sass.js" }, "engines": { - "node": ">=12.0.0" + "node": ">=14.0.0" } }, "node_modules/sass-loader": { - "version": "13.2.0", - "resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-13.2.0.tgz", - "integrity": "sha512-JWEp48djQA4nbZxmgC02/Wh0eroSUutulROUusYJO9P9zltRbNN80JCBHqRGzjd4cmZCa/r88xgfkjGD0TXsHg==", + "version": "13.3.2", + "resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-13.3.2.tgz", + "integrity": "sha512-CQbKl57kdEv+KDLquhC+gE3pXt74LEAzm+tzywcA0/aHZuub8wTErbjAoNI57rPUWRYRNC5WUnNl8eGJNbDdwg==", "dev": true, "dependencies": { - "klona": "^2.0.4", "neo-async": "^2.6.2" }, "engines": { @@ -14650,7 +15866,7 @@ }, "peerDependencies": { "fibers": ">= 3.1.0", - "node-sass": "^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0", + "node-sass": "^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0 || ^9.0.0", "sass": "^1.3.0", "sass-embedded": "*", "webpack": "^5.0.0" @@ -14677,6 +15893,18 @@ "dev": true, "optional": true }, + "node_modules/saxes": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/saxes/-/saxes-5.0.1.tgz", + "integrity": "sha512-5LBh1Tls8c9xgGjw3QrMwETmTMVk0oFgvrFSvWx62llR2hcEInrKNZ2GZCCuuy2lvWrdl5jhbpeqc5hRYKFOcw==", + "dev": true, + "dependencies": { + "xmlchars": "^2.2.0" + }, + "engines": { + "node": ">=10" + } + }, "node_modules/schema-utils": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.0.0.tgz", @@ -14715,9 +15943,9 @@ } }, "node_modules/semver": { - "version": "7.3.8", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz", - "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==", + "version": "7.5.3", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.3.tgz", + "integrity": "sha512-QBlUtyVk/5EeHbi7X0fw6liDZc7BBmEaSYn01fMU1OUYbf6GPsbTtd8WmnqbI20SeycoHSeiybkE/q1Q+qlThQ==", "dev": true, "dependencies": { "lru-cache": "^6.0.0" @@ -14729,24 +15957,6 @@ "node": ">=10" } }, - "node_modules/semver-dsl": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/semver-dsl/-/semver-dsl-1.0.1.tgz", - "integrity": "sha512-e8BOaTo007E3dMuQQTnPdalbKTABKNS7UxoBIDnwOqRa+QwMrCPjynB8zAlPF6xlqUfdLPPLIJ13hJNmhtq8Ng==", - "dev": true, - "dependencies": { - "semver": "^5.3.0" - } - }, - "node_modules/semver-dsl/node_modules/semver": { - "version": "5.7.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", - "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==", - "dev": true, - "bin": { - "semver": "bin/semver" - } - }, "node_modules/send": { "version": "0.18.0", "resolved": "https://registry.npmjs.org/send/-/send-0.18.0.tgz", @@ -14793,9 +16003,9 @@ "dev": true }, "node_modules/serialize-javascript": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.0.tgz", - "integrity": "sha512-Qr3TosvguFt8ePWqsvRfrKyQXIiW+nGbYpy8XK24NQHE83caxWt+mIymTT19DGFbNWNLfEwsrkSmN64lVWB9ag==", + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.1.tgz", + "integrity": "sha512-owoXEFjWRllis8/M1Q+Cw5k8ZH40e3zhp/ovX+Xr/vi1qj6QesbyXXViFbpNvWvPNAD62SutwEXavefrLJWj7w==", "dev": true, "dependencies": { "randombytes": "^2.1.0" @@ -14900,6 +16110,20 @@ "integrity": "sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw==", "dev": true }, + "node_modules/set-function-name": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/set-function-name/-/set-function-name-2.0.1.tgz", + "integrity": "sha512-tMNCiqYVkXIZgc2Hnoy2IvC/f8ezc5koaRFkCjrpWzGpCd3qbZXPzVy9MAZzK1ch/X0jvSkojys3oqJN0qCmdA==", + "dev": true, + "dependencies": { + "define-data-property": "^1.0.1", + "functions-have-names": "^1.2.3", + "has-property-descriptors": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" + } + }, "node_modules/setprototypeof": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz", @@ -14939,11 +16163,19 @@ "node": ">=8" } }, + "node_modules/shell-quote": { + "version": "1.8.1", + "resolved": "https://registry.npmjs.org/shell-quote/-/shell-quote-1.8.1.tgz", + "integrity": "sha512-6j1W9l1iAs/4xYBI1SYOVZyFcCis9b4KCLQ8fgAGG07QvzaRLVVRQvAy85yNmmZSjYjg4MWh4gNvlPujU/5LpA==", + "dev": true, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/side-channel": { "version": "1.0.4", "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz", "integrity": "sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==", - "dev": true, "dependencies": { "call-bind": "^1.0.0", "get-intrinsic": "^1.0.2", @@ -14960,14 +16192,16 @@ "dev": true }, "node_modules/sigstore": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/sigstore/-/sigstore-1.2.0.tgz", - "integrity": "sha512-Fr9+W1nkBSIZCkJQR7jDn/zI0UXNsVpp+7mDQkCnZOIxG9p6yNXBx9xntHsfUyYHE55XDkkVV3+rYbrkzAeesA==", + "version": "1.9.0", + "resolved": "https://registry.npmjs.org/sigstore/-/sigstore-1.9.0.tgz", + "integrity": "sha512-0Zjz0oe37d08VeOtBIuB6cRriqXse2e8w+7yIy2XSXjshRKxbc2KkhXjL229jXSxEm7UbcjS76wcJDGQddVI9A==", "dev": true, "dependencies": { - "@sigstore/protobuf-specs": "^0.1.0", - "make-fetch-happen": "^11.0.1", - "tuf-js": "^1.0.0" + "@sigstore/bundle": "^1.1.0", + "@sigstore/protobuf-specs": "^0.2.0", + "@sigstore/sign": "^1.0.0", + "@sigstore/tuf": "^1.0.3", + "make-fetch-happen": "^11.0.1" }, "bin": { "sigstore": "bin/sigstore.js" @@ -14976,58 +16210,6 @@ "node": "^14.17.0 || ^16.13.0 || >=18.0.0" } }, - "node_modules/sigstore/node_modules/lru-cache": { - "version": "7.18.3", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.18.3.tgz", - "integrity": "sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA==", - "dev": true, - "engines": { - "node": ">=12" - } - }, - "node_modules/sigstore/node_modules/make-fetch-happen": { - "version": "11.0.3", - "resolved": "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-11.0.3.tgz", - "integrity": "sha512-oPLh5m10lRNNZDjJ2kP8UpboUx2uFXVaVweVe/lWut4iHWcQEmfqSVJt2ihZsFI8HbpwyyocaXbCAWf0g1ukIA==", - "dev": true, - "dependencies": { - "agentkeepalive": "^4.2.1", - "cacache": "^17.0.0", - "http-cache-semantics": "^4.1.1", - "http-proxy-agent": "^5.0.0", - "https-proxy-agent": "^5.0.0", - "is-lambda": "^1.0.1", - "lru-cache": "^7.7.1", - "minipass": "^4.0.0", - "minipass-fetch": "^3.0.0", - "minipass-flush": "^1.0.5", - "minipass-pipeline": "^1.2.4", - "negotiator": "^0.6.3", - "promise-retry": "^2.0.1", - "socks-proxy-agent": "^7.0.0", - "ssri": "^10.0.0" - }, - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } - }, - "node_modules/sigstore/node_modules/minipass-fetch": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/minipass-fetch/-/minipass-fetch-3.0.1.tgz", - "integrity": "sha512-t9/wowtf7DYkwz8cfMSt0rMwiyNIBXf5CKZ3S5ZMqRqMYT0oLTp0x1WorMI9WTwvaPg21r1JbFxJMum8JrLGfw==", - "dev": true, - "dependencies": { - "minipass": "^4.0.0", - "minipass-sized": "^1.0.3", - "minizlib": "^2.1.2" - }, - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - }, - "optionalDependencies": { - "encoding": "^0.1.13" - } - }, "node_modules/slash": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz", @@ -15227,24 +16409,27 @@ "wbuf": "^1.7.3" } }, - "node_modules/sprintf-js": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.1.2.tgz", - "integrity": "sha512-VE0SOVEHCk7Qc8ulkWw3ntAzXuqf7S2lvwQaDLRnUeIEaKNQJzV6BwmLKhOqT61aGhfUMrXeaBk+oDGCzvhcug==", - "dev": true - }, "node_modules/ssri": { - "version": "10.0.1", - "resolved": "https://registry.npmjs.org/ssri/-/ssri-10.0.1.tgz", - "integrity": "sha512-WVy6di9DlPOeBWEjMScpNipeSX2jIZBGEn5Uuo8Q7aIuFEuDX0pw8RxcOjlD1TWP4obi24ki7m/13+nFpcbXrw==", + "version": "10.0.5", + "resolved": "https://registry.npmjs.org/ssri/-/ssri-10.0.5.tgz", + "integrity": "sha512-bSf16tAFkGeRlUNDjXu8FzaMQt6g2HZJrun7mtMbIPOddxt3GLMSz5VWUWcqTJUPfLEaDIepGxv+bYQW49596A==", "dev": true, "dependencies": { - "minipass": "^4.0.0" + "minipass": "^7.0.3" }, "engines": { "node": "^14.17.0 || ^16.13.0 || >=18.0.0" } }, + "node_modules/ssri/node_modules/minipass": { + "version": "7.0.3", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.0.3.tgz", + "integrity": "sha512-LhbbwCfz3vsb12j/WkWQPZfKTsgqIe1Nf/ti1pKjYESGLHIVjWU96G9/ljLH4F9mWNVhlQOm0VySdAWzf05dpg==", + "dev": true, + "engines": { + "node": ">=16 || 14 >=14.17" + } + }, "node_modules/statuses": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz", @@ -15296,29 +16481,61 @@ "node": ">=8" } }, - "node_modules/string.prototype.trimend": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.6.tgz", - "integrity": "sha512-JySq+4mrPf9EsDBEDYMOb/lM7XQLulwg5R/m1r0PXEFqrV0qHvl58sdTilSXtKOflCsK2E8jxf+GKC0T07RWwQ==", + "node_modules/string-width-cjs": { + "name": "string-width", + "version": "4.2.3", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", + "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", + "dev": true, + "dependencies": { + "emoji-regex": "^8.0.0", + "is-fullwidth-code-point": "^3.0.0", + "strip-ansi": "^6.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/string.prototype.trim": { + "version": "1.2.8", + "resolved": "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.2.8.tgz", + "integrity": "sha512-lfjY4HcixfQXOfaqCvcBuOIapyaroTXhbkfJN3gcB1OtyupngWK4sEET9Knd0cXd28kTUqu/kHoV4HKSJdnjiQ==", "dev": true, "dependencies": { "call-bind": "^1.0.2", - "define-properties": "^1.1.4", - "es-abstract": "^1.20.4" + "define-properties": "^1.2.0", + "es-abstract": "^1.22.1" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/string.prototype.trimend": { + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.7.tgz", + "integrity": "sha512-Ni79DqeB72ZFq1uH/L6zJ+DKZTkOtPIHovb3YZHQViE+HDouuU4mBrLOLDn5Dde3RF8qw5qVETEjhu9locMLvA==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.2", + "define-properties": "^1.2.0", + "es-abstract": "^1.22.1" }, "funding": { "url": "https://github.com/sponsors/ljharb" } }, "node_modules/string.prototype.trimstart": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.6.tgz", - "integrity": "sha512-omqjMDaY92pbn5HOX7f9IccLA+U1tA9GvtU4JrodiXFfYB7jPzzHpRzpglLAjtUV6bB557zwClJezTqnAiYnQA==", + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.7.tgz", + "integrity": "sha512-NGhtDFu3jCEm7B4Fy0DpLewdJQOZcQ0rGbwQ/+stjnrp2i+rlKeCvos9hOIeCmqwratM47OBxY7uFZzjxHXmrg==", "dev": true, "dependencies": { "call-bind": "^1.0.2", - "define-properties": "^1.1.4", - "es-abstract": "^1.20.4" + "define-properties": "^1.2.0", + "es-abstract": "^1.22.1" }, "funding": { "url": "https://github.com/sponsors/ljharb" @@ -15336,6 +16553,28 @@ "node": ">=8" } }, + "node_modules/strip-ansi-cjs": { + "name": "strip-ansi", + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", + "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", + "dev": true, + "dependencies": { + "ansi-regex": "^5.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/strip-ansi-cjs/node_modules/ansi-regex": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", + "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", + "dev": true, + "engines": { + "node": ">=8" + } + }, "node_modules/strip-ansi/node_modules/ansi-regex": { "version": "5.0.1", "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", @@ -15348,7 +16587,7 @@ "node_modules/strip-bom": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz", - "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=", + "integrity": "sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA==", "dev": true, "engines": { "node": ">=4" @@ -15380,6 +16619,23 @@ "resolved": "https://registry.npmjs.org/strnum/-/strnum-1.0.5.tgz", "integrity": "sha512-J8bbNyKKXl5qYcR36TIO8W3mVGVHrmmxsd5PAItGkmyzwJvybiw2IVq5nqd0i4LSNSkB/sx9VHllbfFdr9k1JA==" }, + "node_modules/strong-log-transformer": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/strong-log-transformer/-/strong-log-transformer-2.1.0.tgz", + "integrity": "sha512-B3Hgul+z0L9a236FAUC9iZsL+nVHgoCJnqCbN588DjYxvGXaXaaFbfmQ/JhvKjZwsOukuR72XbHv71Qkug0HxA==", + "dev": true, + "dependencies": { + "duplexer": "^0.1.1", + "minimist": "^1.2.0", + "through": "^2.3.4" + }, + "bin": { + "sl-log-transformer": "bin/sl-log-transformer.js" + }, + "engines": { + "node": ">=4" + } + }, "node_modules/supports-color": { "version": "5.5.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", @@ -15413,6 +16669,12 @@ "node": ">=0.10" } }, + "node_modules/symbol-tree": { + "version": "3.2.4", + "resolved": "https://registry.npmjs.org/symbol-tree/-/symbol-tree-3.2.4.tgz", + "integrity": "sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==", + "dev": true + }, "node_modules/taira": { "version": "3.2.2", "resolved": "https://registry.npmjs.org/taira/-/taira-3.2.2.tgz", @@ -15431,14 +16693,14 @@ } }, "node_modules/tar": { - "version": "6.1.13", - "resolved": "https://registry.npmjs.org/tar/-/tar-6.1.13.tgz", - "integrity": "sha512-jdIBIN6LTIe2jqzay/2vtYLlBHa3JF42ot3h1dW8Q0PaAG4v8rm0cvpVePtau5C6OKXGGcgO9q2AMNSWxiLqKw==", + "version": "6.2.0", + "resolved": "https://registry.npmjs.org/tar/-/tar-6.2.0.tgz", + "integrity": "sha512-/Wo7DcT0u5HUV486xg675HtjNd3BXZ6xDbzsCUZPt5iw8bTQ63bP0Raut3mvro9u+CUyq7YQd8Cx55fsZXxqLQ==", "dev": true, "dependencies": { "chownr": "^2.0.0", "fs-minipass": "^2.0.0", - "minipass": "^4.0.0", + "minipass": "^5.0.0", "minizlib": "^2.1.1", "mkdirp": "^1.0.3", "yallist": "^4.0.0" @@ -15447,6 +16709,22 @@ "node": ">=10" } }, + "node_modules/tar-stream": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-2.2.0.tgz", + "integrity": "sha512-ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ==", + "dev": true, + "dependencies": { + "bl": "^4.0.3", + "end-of-stream": "^1.4.1", + "fs-constants": "^1.0.0", + "inherits": "^2.0.3", + "readable-stream": "^3.1.1" + }, + "engines": { + "node": ">=6" + } + }, "node_modules/tar/node_modules/fs-minipass": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-2.1.0.tgz", @@ -15472,13 +16750,13 @@ } }, "node_modules/terser": { - "version": "5.16.3", - "resolved": "https://registry.npmjs.org/terser/-/terser-5.16.3.tgz", - "integrity": "sha512-v8wWLaS/xt3nE9dgKEWhNUFP6q4kngO5B8eYFUuebsu7Dw/UNAnpUod6UHo04jSSkv8TzKHjZDSd7EXdDQAl8Q==", + "version": "5.19.2", + "resolved": "https://registry.npmjs.org/terser/-/terser-5.19.2.tgz", + "integrity": "sha512-qC5+dmecKJA4cpYxRa5aVkKehYsQKc+AHeKl0Oe62aYjBL8ZA33tTljktDHJSaxxMnbI5ZYw+o/S2DxxLu8OfA==", "dev": true, "dependencies": { - "@jridgewell/source-map": "^0.3.2", - "acorn": "^8.5.0", + "@jridgewell/source-map": "^0.3.3", + "acorn": "^8.8.2", "commander": "^2.20.0", "source-map-support": "~0.5.20" }, @@ -15490,16 +16768,16 @@ } }, "node_modules/terser-webpack-plugin": { - "version": "5.3.1", - "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.3.1.tgz", - "integrity": "sha512-GvlZdT6wPQKbDNW/GDQzZFg/j4vKU96yl2q6mcUkzKOgW4gwf1Z8cZToUCrz31XHlPWH8MVb1r2tFtdDtTGJ7g==", + "version": "5.3.9", + "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.3.9.tgz", + "integrity": "sha512-ZuXsqE07EcggTWQjXUj+Aot/OMcD0bMKGgF63f7UxYcu5/AJF53aIpK1YoP5xR9l6s/Hy2b+t1AM0bLNPRuhwA==", "dev": true, "dependencies": { + "@jridgewell/trace-mapping": "^0.3.17", "jest-worker": "^27.4.5", "schema-utils": "^3.1.1", - "serialize-javascript": "^6.0.0", - "source-map": "^0.6.1", - "terser": "^5.7.2" + "serialize-javascript": "^6.0.1", + "terser": "^5.16.8" }, "engines": { "node": ">= 10.13.0" @@ -15555,9 +16833,9 @@ "dev": true }, "node_modules/terser-webpack-plugin/node_modules/schema-utils": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.1.tgz", - "integrity": "sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==", + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.3.0.tgz", + "integrity": "sha512-pN/yOAvcC+5rQ5nERGuwrjLlYvLTbCibnZ1I7B1LaiAz9BRBlE9GMgE/eqV30P7aJQUf7Ddimy/RsbYO/GrVGg==", "dev": true, "dependencies": { "@types/json-schema": "^7.0.8", @@ -15572,15 +16850,6 @@ "url": "https://opencollective.com/webpack" } }, - "node_modules/terser-webpack-plugin/node_modules/source-map": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", - "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, "node_modules/test-exclude": { "version": "6.0.0", "resolved": "https://registry.npmjs.org/test-exclude/-/test-exclude-6.0.0.tgz", @@ -15613,11 +16882,6 @@ "integrity": "sha512-eHY7nBftgThBqOyHGVN+l8gF0BucP09fMo0oO/Lb0w1OF80dJv+lDVpXG60WMQvkcxAkNybKsrEIE3ZtKGmPrA==", "dev": true }, - "node_modules/tinycolor2": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/tinycolor2/-/tinycolor2-1.6.0.tgz", - "integrity": "sha512-XPaBkWQJdsf3pLKJV9p4qN/S+fm2Oj8AIPo1BTUhg5oxkvm9+SVEGFdhyOz7tTdUTfvxMiAs4sp6/eZO2Ew+pw==" - }, "node_modules/tmp": { "version": "0.2.1", "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.2.1.tgz", @@ -15660,6 +16924,42 @@ "node": ">=0.6" } }, + "node_modules/tough-cookie": { + "version": "4.1.3", + "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.1.3.tgz", + "integrity": "sha512-aX/y5pVRkfRnfmuX+OdbSdXvPe6ieKX/G2s7e98f4poJHnqH3281gDPm/metm6E/WRamfx7WC4HUqkWHfQHprw==", + "dev": true, + "dependencies": { + "psl": "^1.1.33", + "punycode": "^2.1.1", + "universalify": "^0.2.0", + "url-parse": "^1.5.3" + }, + "engines": { + "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, + "engines": { + "node": ">= 4.0.0" + } + }, + "node_modules/tr46": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/tr46/-/tr46-2.1.0.tgz", + "integrity": "sha512-15Ih7phfcdP5YxqiB+iDtLoaTz4Nd35+IiAv0kQ5FNKHzXgdWqPoTIqEDDJmXceQt4JZk6lVPT8lnDlPpGDppw==", + "dev": true, + "dependencies": { + "punycode": "^2.1.1" + }, + "engines": { + "node": ">=8" + } + }, "node_modules/tree-kill": { "version": "1.2.2", "resolved": "https://registry.npmjs.org/tree-kill/-/tree-kill-1.2.2.tgz", @@ -15669,14 +16969,26 @@ "tree-kill": "cli.js" } }, + "node_modules/ts-api-utils": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/ts-api-utils/-/ts-api-utils-1.0.3.tgz", + "integrity": "sha512-wNMeqtMz5NtwpT/UZGY5alT+VoKdSsOOP/kqHFcUW1P/VRhH2wJ48+DN2WwUliNbQ976ETwDL0Ifd2VVvgonvg==", + "dev": true, + "engines": { + "node": ">=16.13.0" + }, + "peerDependencies": { + "typescript": ">=4.2.0" + } + }, "node_modules/tsconfig-paths": { - "version": "3.14.1", - "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.14.1.tgz", - "integrity": "sha512-fxDhWnFSLt3VuTwtvJt5fpwxBHg5AdKWMsgcPOOIilyjymcYVZoCQF8fvFRezCNfblEXmi+PcM1eYHeOAgXCOQ==", + "version": "3.14.2", + "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.14.2.tgz", + "integrity": "sha512-o/9iXgCYc5L/JxCHPe3Hvh8Q/2xm5Z+p18PESBU6Ff33695QnCHBEjcytY2q19ua7Mbl/DavtBOLq+oG0RCL+g==", "dev": true, "dependencies": { "@types/json5": "^0.0.29", - "json5": "^1.0.1", + "json5": "^1.0.2", "minimist": "^1.2.6", "strip-bom": "^3.0.0" } @@ -15694,9 +17006,9 @@ } }, "node_modules/tslib": { - "version": "2.5.0", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.5.0.tgz", - "integrity": "sha512-336iVw3rtn2BUK7ORdIAHTyxHGRIHVReokCR3XjbckJMK7ms8FysBfhLR8IXnAgy7T0PTPNBWKiH514FOW/WSg==" + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz", + "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==" }, "node_modules/tsutils": { "version": "3.21.0", @@ -15713,6 +17025,24 @@ "typescript": ">=2.8.0 || >= 3.2.0-dev || >= 3.3.0-dev || >= 3.4.0-dev || >= 3.5.0-dev || >= 3.6.0-dev || >= 3.6.0-beta || >= 3.7.0-dev || >= 3.7.0-beta" } }, + "node_modules/tsutils-etc": { + "version": "1.4.2", + "resolved": "https://registry.npmjs.org/tsutils-etc/-/tsutils-etc-1.4.2.tgz", + "integrity": "sha512-2Dn5SxTDOu6YWDNKcx1xu2YUy6PUeKrWZB/x2cQ8vY2+iz3JRembKn/iZ0JLT1ZudGNwQQvtFX9AwvRHbXuPUg==", + "dev": true, + "dependencies": { + "@types/yargs": "^17.0.0", + "yargs": "^17.0.0" + }, + "bin": { + "ts-flags": "bin/ts-flags", + "ts-kind": "bin/ts-kind" + }, + "peerDependencies": { + "tsutils": "^3.0.0", + "typescript": ">=4.0.0" + } + }, "node_modules/tsutils/node_modules/tslib": { "version": "1.14.1", "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", @@ -15720,70 +17050,19 @@ "dev": true }, "node_modules/tuf-js": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/tuf-js/-/tuf-js-1.1.2.tgz", - "integrity": "sha512-gBfbnS6khluxjvoFCpRV0fhWT265xNfpiNXOcBX0Ze6HGbPhe93UG5V5DdKcgm/aXsMadnY76l/h6j63GmJS5g==", + "version": "1.1.7", + "resolved": "https://registry.npmjs.org/tuf-js/-/tuf-js-1.1.7.tgz", + "integrity": "sha512-i3P9Kgw3ytjELUfpuKVDNBJvk4u5bXL6gskv572mcevPbSKCV3zt3djhmlEQ65yERjIbOSncy7U4cQJaB1CBCg==", "dev": true, "dependencies": { - "@tufjs/models": "1.0.1", - "make-fetch-happen": "^11.0.1" + "@tufjs/models": "1.0.4", + "debug": "^4.3.4", + "make-fetch-happen": "^11.1.1" }, "engines": { "node": "^14.17.0 || ^16.13.0 || >=18.0.0" } }, - "node_modules/tuf-js/node_modules/lru-cache": { - "version": "7.18.3", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.18.3.tgz", - "integrity": "sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA==", - "dev": true, - "engines": { - "node": ">=12" - } - }, - "node_modules/tuf-js/node_modules/make-fetch-happen": { - "version": "11.0.3", - "resolved": "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-11.0.3.tgz", - "integrity": "sha512-oPLh5m10lRNNZDjJ2kP8UpboUx2uFXVaVweVe/lWut4iHWcQEmfqSVJt2ihZsFI8HbpwyyocaXbCAWf0g1ukIA==", - "dev": true, - "dependencies": { - "agentkeepalive": "^4.2.1", - "cacache": "^17.0.0", - "http-cache-semantics": "^4.1.1", - "http-proxy-agent": "^5.0.0", - "https-proxy-agent": "^5.0.0", - "is-lambda": "^1.0.1", - "lru-cache": "^7.7.1", - "minipass": "^4.0.0", - "minipass-fetch": "^3.0.0", - "minipass-flush": "^1.0.5", - "minipass-pipeline": "^1.2.4", - "negotiator": "^0.6.3", - "promise-retry": "^2.0.1", - "socks-proxy-agent": "^7.0.0", - "ssri": "^10.0.0" - }, - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } - }, - "node_modules/tuf-js/node_modules/minipass-fetch": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/minipass-fetch/-/minipass-fetch-3.0.1.tgz", - "integrity": "sha512-t9/wowtf7DYkwz8cfMSt0rMwiyNIBXf5CKZ3S5ZMqRqMYT0oLTp0x1WorMI9WTwvaPg21r1JbFxJMum8JrLGfw==", - "dev": true, - "dependencies": { - "minipass": "^4.0.0", - "minipass-sized": "^1.0.3", - "minizlib": "^2.1.2" - }, - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - }, - "optionalDependencies": { - "encoding": "^0.1.13" - } - }, "node_modules/type-check": { "version": "0.4.0", "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz", @@ -15821,6 +17100,57 @@ "node": ">= 0.6" } }, + "node_modules/typed-array-buffer": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/typed-array-buffer/-/typed-array-buffer-1.0.0.tgz", + "integrity": "sha512-Y8KTSIglk9OZEr8zywiIHG/kmQ7KWyjseXs1CbSo8vC42w7hg2HgYTxSWwP0+is7bWDc1H+Fo026CpHFwm8tkw==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.2", + "get-intrinsic": "^1.2.1", + "is-typed-array": "^1.1.10" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/typed-array-byte-length": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/typed-array-byte-length/-/typed-array-byte-length-1.0.0.tgz", + "integrity": "sha512-Or/+kvLxNpeQ9DtSydonMxCx+9ZXOswtwJn17SNLvhptaXYDJvkFFP5zbfU/uLmvnBJlI4yrnXRxpdWH/M5tNA==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.2", + "for-each": "^0.3.3", + "has-proto": "^1.0.1", + "is-typed-array": "^1.1.10" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/typed-array-byte-offset": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/typed-array-byte-offset/-/typed-array-byte-offset-1.0.0.tgz", + "integrity": "sha512-RD97prjEt9EL8YgAgpOkf3O4IF9lhJFr9g0htQkm0rchFp/Vx7LW5Q8fSXXub7BXAODyUQohRMyOc3faCPd0hg==", + "dev": true, + "dependencies": { + "available-typed-arrays": "^1.0.5", + "call-bind": "^1.0.2", + "for-each": "^0.3.3", + "has-proto": "^1.0.1", + "is-typed-array": "^1.1.10" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/typed-array-length": { "version": "1.0.4", "resolved": "https://registry.npmjs.org/typed-array-length/-/typed-array-length-1.0.4.tgz", @@ -15842,16 +17172,16 @@ "dev": true }, "node_modules/typescript": { - "version": "4.9.5", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.9.5.tgz", - "integrity": "sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g==", + "version": "5.1.6", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.1.6.tgz", + "integrity": "sha512-zaWCozRZ6DLEWAWFrVDz1H6FVXzUSfTy5FUMWsQlU8Ym5JP9eO4xkTIROFCQvhQf61z6O/G6ugw3SgAnvvm+HA==", "dev": true, "bin": { "tsc": "bin/tsc", "tsserver": "bin/tsserver" }, "engines": { - "node": ">=4.2.0" + "node": ">=14.17" } }, "node_modules/unbox-primitive": { @@ -15933,6 +17263,15 @@ "node": "^14.17.0 || ^16.13.0 || >=18.0.0" } }, + "node_modules/universalify": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz", + "integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==", + "dev": true, + "engines": { + "node": ">= 10.0.0" + } + }, "node_modules/unpipe": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz", @@ -15943,9 +17282,9 @@ } }, "node_modules/update-browserslist-db": { - "version": "1.0.10", - "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.10.tgz", - "integrity": "sha512-OztqDenkfFkbSG+tRxBeAnCVPckDBcvibKd35yDONx6OU8N7sqgwc7rCbkJ/WcYtVRZ4ba68d6byhC21GFh7sQ==", + "version": "1.0.13", + "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.13.tgz", + "integrity": "sha512-xebP81SNcPuNpPP3uzeW1NYXxI3rxyJzF3pD6sH4jE7o/IX+WtSpwnVU+qIsDPyk0d3hmFQ7mjqc6AtV604hbg==", "dev": true, "funding": [ { @@ -15955,6 +17294,10 @@ { "type": "tidelift", "url": "https://tidelift.com/funding/github/npm/browserslist" + }, + { + "type": "github", + "url": "https://github.com/sponsors/ai" } ], "dependencies": { @@ -15962,7 +17305,7 @@ "picocolors": "^1.0.0" }, "bin": { - "browserslist-lint": "cli.js" + "update-browserslist-db": "cli.js" }, "peerDependencies": { "browserslist": ">= 4.21.0" @@ -15978,18 +17321,28 @@ } }, "node_modules/url": { - "version": "0.11.0", - "resolved": "https://registry.npmjs.org/url/-/url-0.11.0.tgz", - "integrity": "sha1-ODjpfPxgUh63PFJajlW/3Z4uKPE=", + "version": "0.11.3", + "resolved": "https://registry.npmjs.org/url/-/url-0.11.3.tgz", + "integrity": "sha512-6hxOLGfZASQK/cijlZnZJTq8OXAkt/3YGfQX45vvMYXpZoo8NdWZcY73K108Jf759lS1Bv/8wXnHDTSz17dSRw==", "dependencies": { - "punycode": "1.3.2", - "querystring": "0.2.0" + "punycode": "^1.4.1", + "qs": "^6.11.2" + } + }, + "node_modules/url-parse": { + "version": "1.5.10", + "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.5.10.tgz", + "integrity": "sha512-WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ==", + "dev": true, + "dependencies": { + "querystringify": "^2.1.1", + "requires-port": "^1.0.0" } }, "node_modules/url/node_modules/punycode": { - "version": "1.3.2", - "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz", - "integrity": "sha1-llOgNvt8HuQjQvIyXM7v6jkmxI0=" + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz", + "integrity": "sha512-jmYNElW7yvO7TV33CjSmvSiE2yco3bV2czu/OzDKdMNVZQWfxCblURLhf+47syQRBntjfLdd/H0egrzIG+oaFQ==" }, "node_modules/util-deprecate": { "version": "1.0.2", @@ -16014,6 +17367,12 @@ "uuid": "dist/bin/uuid" } }, + "node_modules/v8-compile-cache": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz", + "integrity": "sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA==", + "dev": true + }, "node_modules/validate-npm-package-license": { "version": "3.0.4", "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz", @@ -16045,6 +17404,83 @@ "node": ">= 0.8" } }, + "node_modules/vite": { + "version": "4.4.7", + "resolved": "https://registry.npmjs.org/vite/-/vite-4.4.7.tgz", + "integrity": "sha512-6pYf9QJ1mHylfVh39HpuSfMPojPSKVxZvnclX1K1FyZ1PXDOcLBibdq5t1qxJSnL63ca8Wf4zts6mD8u8oc9Fw==", + "dev": true, + "dependencies": { + "esbuild": "^0.18.10", + "postcss": "^8.4.26", + "rollup": "^3.25.2" + }, + "bin": { + "vite": "bin/vite.js" + }, + "engines": { + "node": "^14.18.0 || >=16.0.0" + }, + "funding": { + "url": "https://github.com/vitejs/vite?sponsor=1" + }, + "optionalDependencies": { + "fsevents": "~2.3.2" + }, + "peerDependencies": { + "@types/node": ">= 14", + "less": "*", + "lightningcss": "^1.21.0", + "sass": "*", + "stylus": "*", + "sugarss": "*", + "terser": "^5.4.0" + }, + "peerDependenciesMeta": { + "@types/node": { + "optional": true + }, + "less": { + "optional": true + }, + "lightningcss": { + "optional": true + }, + "sass": { + "optional": true + }, + "stylus": { + "optional": true + }, + "sugarss": { + "optional": true + }, + "terser": { + "optional": true + } + } + }, + "node_modules/w3c-hr-time": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/w3c-hr-time/-/w3c-hr-time-1.0.2.tgz", + "integrity": "sha512-z8P5DvDNjKDoFIHK7q8r8lackT6l+jo/Ye3HOle7l9nICP9lf1Ci25fy9vHd0JOWewkIFzXIEig3TdKT7JQ5fQ==", + "deprecated": "Use your platform's native performance.now() and performance.timeOrigin.", + "dev": true, + "dependencies": { + "browser-process-hrtime": "^1.0.0" + } + }, + "node_modules/w3c-xmlserializer": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/w3c-xmlserializer/-/w3c-xmlserializer-2.0.0.tgz", + "integrity": "sha512-4tzD0mF8iSiMiNs30BiLO3EpfGLZUT2MSX/G+o7ZywDzliWQ3OPtTZ0PTC3B3ca1UAf4cJMHB+2Bf56EriJuRA==", + "dev": true, + "dependencies": { + "xml-name-validator": "^3.0.0" + }, + "engines": { + "node": ">=10" + } + }, "node_modules/watchpack": { "version": "2.4.0", "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.4.0.tgz", @@ -16076,23 +17512,32 @@ "defaults": "^1.0.3" } }, + "node_modules/webidl-conversions": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-6.1.0.tgz", + "integrity": "sha512-qBIvFLGiBpLjfwmYAaHPXsn+ho5xZnGvyGvsarywGNc8VyQJUMHJ8OBKGGrPER0okBeMDaan4mNBlgBROxuI8w==", + "dev": true, + "engines": { + "node": ">=10.4" + } + }, "node_modules/webpack": { - "version": "5.76.1", - "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.76.1.tgz", - "integrity": "sha512-4+YIK4Abzv8172/SGqObnUjaIHjLEuUasz9EwQj/9xmPPkYJy2Mh03Q/lJfSD3YLzbxy5FeTq5Uw0323Oh6SJQ==", + "version": "5.88.2", + "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.88.2.tgz", + "integrity": "sha512-JmcgNZ1iKj+aiR0OvTYtWQqJwq37Pf683dY9bVORwVbUrDhLhdn/PlO2sHsFHPkj7sHNQF3JwaAkp49V+Sq1tQ==", "dev": true, "dependencies": { "@types/eslint-scope": "^3.7.3", - "@types/estree": "^0.0.51", - "@webassemblyjs/ast": "1.11.1", - "@webassemblyjs/wasm-edit": "1.11.1", - "@webassemblyjs/wasm-parser": "1.11.1", + "@types/estree": "^1.0.0", + "@webassemblyjs/ast": "^1.11.5", + "@webassemblyjs/wasm-edit": "^1.11.5", + "@webassemblyjs/wasm-parser": "^1.11.5", "acorn": "^8.7.1", - "acorn-import-assertions": "^1.7.6", + "acorn-import-assertions": "^1.9.0", "browserslist": "^4.14.5", "chrome-trace-event": "^1.0.2", - "enhanced-resolve": "^5.10.0", - "es-module-lexer": "^0.9.0", + "enhanced-resolve": "^5.15.0", + "es-module-lexer": "^1.2.1", "eslint-scope": "5.1.1", "events": "^3.2.0", "glob-to-regexp": "^0.4.1", @@ -16101,9 +17546,9 @@ "loader-runner": "^4.2.0", "mime-types": "^2.1.27", "neo-async": "^2.6.2", - "schema-utils": "^3.1.0", + "schema-utils": "^3.2.0", "tapable": "^2.1.1", - "terser-webpack-plugin": "^5.1.3", + "terser-webpack-plugin": "^5.3.7", "watchpack": "^2.4.0", "webpack-sources": "^3.2.3" }, @@ -16124,9 +17569,9 @@ } }, "node_modules/webpack-dev-middleware": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-6.0.1.tgz", - "integrity": "sha512-PZPZ6jFinmqVPJZbisfggDiC+2EeGZ1ZByyMP5sOFJcPPWSexalISz+cvm+j+oYPT7FIJyxT76esjnw9DhE5sw==", + "version": "6.1.1", + "resolved": "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-6.1.1.tgz", + "integrity": "sha512-y51HrHaFeeWir0YO4f0g+9GwZawuigzcAdRNon6jErXy/SqV/+O6eaVAzDqE6t3e3NpGeR5CS+cCDaTC+V3yEQ==", "dev": true, "dependencies": { "colorette": "^2.0.10", @@ -16144,12 +17589,17 @@ }, "peerDependencies": { "webpack": "^5.0.0" + }, + "peerDependenciesMeta": { + "webpack": { + "optional": true + } } }, "node_modules/webpack-dev-server": { - "version": "4.11.1", - "resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-4.11.1.tgz", - "integrity": "sha512-lILVz9tAUy1zGFwieuaQtYiadImb5M3d+H+L1zDYalYoDl0cksAB1UNyuE5MMWJrG6zR1tXkCP2fitl7yoUJiw==", + "version": "4.15.1", + "resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-4.15.1.tgz", + "integrity": "sha512-5hbAst3h3C3L8w6W4P96L5vaV0PxSmJhxZvWKYIdgxOQm8pNZ5dEOmmSLBVpP85ReeyRt6AS1QJNyo/oFFPeVA==", "dev": true, "dependencies": { "@types/bonjour": "^3.5.9", @@ -16158,7 +17608,7 @@ "@types/serve-index": "^1.9.1", "@types/serve-static": "^1.13.10", "@types/sockjs": "^0.3.33", - "@types/ws": "^8.5.1", + "@types/ws": "^8.5.5", "ansi-html-community": "^0.0.8", "bonjour-service": "^1.0.11", "chokidar": "^3.5.3", @@ -16171,6 +17621,7 @@ "html-entities": "^2.3.2", "http-proxy-middleware": "^2.0.3", "ipaddr.js": "^2.0.1", + "launch-editor": "^2.6.0", "open": "^8.0.9", "p-retry": "^4.5.0", "rimraf": "^3.0.2", @@ -16180,7 +17631,7 @@ "sockjs": "^0.3.24", "spdy": "^4.0.2", "webpack-dev-middleware": "^5.3.1", - "ws": "^8.4.2" + "ws": "^8.13.0" }, "bin": { "webpack-dev-server": "bin/webpack-dev-server.js" @@ -16196,6 +17647,9 @@ "webpack": "^4.37.0 || ^5.0.0" }, "peerDependenciesMeta": { + "webpack": { + "optional": true + }, "webpack-cli": { "optional": true } @@ -16224,10 +17678,31 @@ "webpack": "^4.0.0 || ^5.0.0" } }, + "node_modules/webpack-dev-server/node_modules/ws": { + "version": "8.14.2", + "resolved": "https://registry.npmjs.org/ws/-/ws-8.14.2.tgz", + "integrity": "sha512-wEBG1ftX4jcglPxgFCMJmZ2PLtSbJ2Peg6TmpJFTbe9GZYOQCDPdMYu/Tm0/bGZkw8paZnJY45J4K2PZrLYq8g==", + "dev": true, + "engines": { + "node": ">=10.0.0" + }, + "peerDependencies": { + "bufferutil": "^4.0.1", + "utf-8-validate": ">=5.0.2" + }, + "peerDependenciesMeta": { + "bufferutil": { + "optional": true + }, + "utf-8-validate": { + "optional": true + } + } + }, "node_modules/webpack-merge": { - "version": "5.8.0", - "resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-5.8.0.tgz", - "integrity": "sha512-/SaI7xY0831XwP6kzuwhKWVKDP9t1QY1h65lAFLbZqMPIuYcD9QAW4u9STIbU9kaJbPBB/geU/gLr1wDjOhQ+Q==", + "version": "5.9.0", + "resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-5.9.0.tgz", + "integrity": "sha512-6NbRQw4+Sy50vYNTw7EyOn41OZItPiXB8GNv3INSoe3PSFaHJEz3SHTrYVaRm2LilNGnFUzh0FAwqPEmU/CwDg==", "dev": true, "dependencies": { "clone-deep": "^4.0.1", @@ -16299,9 +17774,9 @@ "dev": true }, "node_modules/webpack/node_modules/schema-utils": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.1.tgz", - "integrity": "sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==", + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.3.0.tgz", + "integrity": "sha512-pN/yOAvcC+5rQ5nERGuwrjLlYvLTbCibnZ1I7B1LaiAz9BRBlE9GMgE/eqV30P7aJQUf7Ddimy/RsbYO/GrVGg==", "dev": true, "dependencies": { "@types/json-schema": "^7.0.8", @@ -16339,6 +17814,35 @@ "node": ">=0.8.0" } }, + "node_modules/whatwg-encoding": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/whatwg-encoding/-/whatwg-encoding-1.0.5.tgz", + "integrity": "sha512-b5lim54JOPN9HtzvK9HFXvBma/rnfFeqsic0hSpjtDbVxR3dJKLc+KB4V6GgiGOvl7CY/KNh8rxSo9DKQrnUEw==", + "dev": true, + "dependencies": { + "iconv-lite": "0.4.24" + } + }, + "node_modules/whatwg-mimetype": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/whatwg-mimetype/-/whatwg-mimetype-2.3.0.tgz", + "integrity": "sha512-M4yMwr6mAnQz76TbJm914+gPpB/nCwvZbJU28cUD6dR004SAxDLOOSUaB1JDRqLtaOV/vi0IC5lEAGFgrjGv/g==", + "dev": true + }, + "node_modules/whatwg-url": { + "version": "8.7.0", + "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-8.7.0.tgz", + "integrity": "sha512-gAojqb/m9Q8a5IV96E3fHJM70AzCkgt4uXYX2O7EmuyOnLrViCQlsEBmF9UQIu3/aeAIp2U17rtbpZWNntQqdg==", + "dev": true, + "dependencies": { + "lodash": "^4.7.0", + "tr46": "^2.1.0", + "webidl-conversions": "^6.1.0" + }, + "engines": { + "node": ">=10" + } + }, "node_modules/which": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", @@ -16386,17 +17890,16 @@ } }, "node_modules/which-typed-array": { - "version": "1.1.9", - "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.9.tgz", - "integrity": "sha512-w9c4xkx6mPidwp7180ckYWfMmvxpjlZuIudNtDf4N/tTAUB8VJbX25qZoAsrtGuYNnGw3pa0AXgbGKRB8/EceA==", + "version": "1.1.11", + "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.11.tgz", + "integrity": "sha512-qe9UWWpkeG5yzZ0tNYxDmd7vo58HDBc39mZ0xWWpolAGADdFOzkfamWLDxkOWcvHQKVmdTyQdLD4NOfjLWTKew==", "dev": true, "dependencies": { "available-typed-arrays": "^1.0.5", "call-bind": "^1.0.2", "for-each": "^0.3.3", "gopd": "^1.0.1", - "has-tostringtag": "^1.0.0", - "is-typed-array": "^1.1.10" + "has-tostringtag": "^1.0.0" }, "engines": { "node": ">= 0.4" @@ -16415,20 +17918,11 @@ } }, "node_modules/wildcard": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/wildcard/-/wildcard-2.0.0.tgz", - "integrity": "sha512-JcKqAHLPxcdb9KM49dufGXn2x3ssnfjbcaQdLlfZsL9rH9wgDQjUtDxbo8NE0F6SFvydeu1VhZe7hZuHsB2/pw==", + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/wildcard/-/wildcard-2.0.1.tgz", + "integrity": "sha512-CC1bOL87PIWSBhDcTrdeLo6eGT7mCFtrg0uIJtqJUFyK+eJnzl8A1niH56uu7KMa5XFrtiV+AQuHO3n7DsHnLQ==", "dev": true }, - "node_modules/word-wrap": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz", - "integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, "node_modules/wrap-ansi": { "version": "7.0.0", "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", @@ -16446,6 +17940,57 @@ "url": "https://github.com/chalk/wrap-ansi?sponsor=1" } }, + "node_modules/wrap-ansi-cjs": { + "name": "wrap-ansi", + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", + "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==", + "dev": true, + "dependencies": { + "ansi-styles": "^4.0.0", + "string-width": "^4.1.0", + "strip-ansi": "^6.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/wrap-ansi?sponsor=1" + } + }, + "node_modules/wrap-ansi-cjs/node_modules/ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "dev": true, + "dependencies": { + "color-convert": "^2.0.1" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" + } + }, + "node_modules/wrap-ansi-cjs/node_modules/color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "dependencies": { + "color-name": "~1.1.4" + }, + "engines": { + "node": ">=7.0.0" + } + }, + "node_modules/wrap-ansi-cjs/node_modules/color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true + }, "node_modules/wrap-ansi/node_modules/ansi-styles": { "version": "4.3.0", "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", @@ -16486,16 +18031,16 @@ "dev": true }, "node_modules/ws": { - "version": "8.13.0", - "resolved": "https://registry.npmjs.org/ws/-/ws-8.13.0.tgz", - "integrity": "sha512-x9vcZYTrFPC7aSIbj7sRCYo7L/Xb8Iy+pW0ng0wt2vCJv7M9HOMy0UoN3rr+IFC7hb7vXoqS+P9ktyLLLhO+LA==", + "version": "7.5.9", + "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.9.tgz", + "integrity": "sha512-F+P9Jil7UiSKSkppIiD94dN07AwvFixvLIj1Og1Rl9GGMuNipJnV9JzjD6XuqmAeiswGvUmNLjr5cFuXwNS77Q==", "dev": true, "engines": { - "node": ">=10.0.0" + "node": ">=8.3.0" }, "peerDependencies": { "bufferutil": "^4.0.1", - "utf-8-validate": ">=5.0.2" + "utf-8-validate": "^5.0.2" }, "peerDependenciesMeta": { "bufferutil": { @@ -16514,6 +18059,18 @@ "node": ">= 6" } }, + "node_modules/xml-name-validator": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-3.0.0.tgz", + "integrity": "sha512-A5CUptxDsvxKJEU3yO6DuWBSJz/qizqzJKOMIfUJHETbBw/sFaDxgd6fxm1ewUaM0jZ444Fc5vC5ROYurg/4Pw==", + "dev": true + }, + "node_modules/xmlchars": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/xmlchars/-/xmlchars-2.2.0.tgz", + "integrity": "sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw==", + "dev": true + }, "node_modules/y18n": { "version": "5.0.8", "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz", @@ -16529,19 +18086,10 @@ "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", "dev": true }, - "node_modules/yaml": { - "version": "1.10.2", - "resolved": "https://registry.npmjs.org/yaml/-/yaml-1.10.2.tgz", - "integrity": "sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==", - "dev": true, - "engines": { - "node": ">= 6" - } - }, "node_modules/yargs": { - "version": "17.6.2", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.6.2.tgz", - "integrity": "sha512-1/9UrdHjDZc0eOU0HxOHoS78C69UD3JRMvzlJ7S79S2nTaWRA/whGCTV8o9e/N/1Va9YIV7Q4sOxD8VV4pCWOw==", + "version": "17.7.2", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.2.tgz", + "integrity": "sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==", "dev": true, "dependencies": { "cliui": "^8.0.1", @@ -16578,87 +18126,77 @@ } }, "node_modules/zone.js": { - "version": "0.12.0", - "resolved": "https://registry.npmjs.org/zone.js/-/zone.js-0.12.0.tgz", - "integrity": "sha512-XtC+I5dXU14HrzidAKBNMqneIVUykLEAA1x+v4KVrd6AUPWlwYORF8KgsVqvgdHiKZ4BkxxjvYi/ksEixTPR0Q==", + "version": "0.13.3", + "resolved": "https://registry.npmjs.org/zone.js/-/zone.js-0.13.3.tgz", + "integrity": "sha512-MKPbmZie6fASC/ps4dkmIhaT5eonHkEt6eAy80K42tAm0G2W+AahLJjbfi6X9NPdciOE9GRFTTM8u2IiF6O3ww==", "dependencies": { "tslib": "^2.3.0" } } }, "dependencies": { + "@aashutoshrathi/word-wrap": { + "version": "1.2.6", + "resolved": "https://registry.npmjs.org/@aashutoshrathi/word-wrap/-/word-wrap-1.2.6.tgz", + "integrity": "sha512-1Yjs2SvM8TflER/OD3cOjhWWOZb58A2t7wpE2S9XfBYTiIl+XFhQG2bjy4Pu1I+EAlCNUzRDYDdFwFYUKvXcIA==", + "dev": true + }, "@ampproject/remapping": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.2.0.tgz", - "integrity": "sha512-qRmjj8nj9qmLTQXXmaR1cck3UXSRMPrbsLJAasZpF+t3riI71BXed5ebIOYwQntykeZuhjsdweEc9BxH5Jc26w==", + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.2.1.tgz", + "integrity": "sha512-lFMjJTrFL3j7L9yBxwYfCq2k6qqwHyzuUl/XBnif78PWTJYyL/dfowQHWE3sp6U6ZzqWiiIZnpTMO96zhkjwtg==", "dev": true, "requires": { - "@jridgewell/gen-mapping": "^0.1.0", + "@jridgewell/gen-mapping": "^0.3.0", "@jridgewell/trace-mapping": "^0.3.9" } }, "@angular-devkit/architect": { - "version": "0.1502.8", - "resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1502.8.tgz", - "integrity": "sha512-rTltw2ABHrcKc8EGimALvXmrDTP5hlNbEy6nYolJoXEI9EwHgriWrVLVPs3OEF+/ed47dbJi9EGOXUOgzgpB5A==", + "version": "0.1602.3", + "resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1602.3.tgz", + "integrity": "sha512-7f4U5LzAYRcQcOvRJwunSwLd5/nwbNxY/E4jTgwFxCNvCBSMysNJBi3g9v0t8zm2XYOv4ok5eYqIwriXVypRBg==", "dev": true, "requires": { - "@angular-devkit/core": "15.2.8", - "rxjs": "6.6.7" - }, - "dependencies": { - "rxjs": { - "version": "6.6.7", - "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.7.tgz", - "integrity": "sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==", - "dev": true, - "requires": { - "tslib": "^1.9.0" - } - }, - "tslib": { - "version": "1.14.1", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", - "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==", - "dev": true - } + "@angular-devkit/core": "16.2.3", + "rxjs": "7.8.1" } }, "@angular-devkit/build-angular": { - "version": "15.2.8", - "resolved": "https://registry.npmjs.org/@angular-devkit/build-angular/-/build-angular-15.2.8.tgz", - "integrity": "sha512-TGDnXhhOG6h6TOrWWzfnkha7wYBOXi7iJc1o1w1VKCayE3T6TZZdF847aK66vL9KG7AKYVdGhWEGw2WBHUBUpg==", + "version": "16.2.3", + "resolved": "https://registry.npmjs.org/@angular-devkit/build-angular/-/build-angular-16.2.3.tgz", + "integrity": "sha512-GQo14ui3jGBa3ORslO9AcNLCmLuV6EohFk7KbHMTpTY1267z3kdkJfUXhwPKTYQX4ZvQZK2lHLMrSjpFQ5vtOQ==", "dev": true, "requires": { - "@ampproject/remapping": "2.2.0", - "@angular-devkit/architect": "0.1502.8", - "@angular-devkit/build-webpack": "0.1502.8", - "@angular-devkit/core": "15.2.8", - "@babel/core": "7.20.12", - "@babel/generator": "7.20.14", - "@babel/helper-annotate-as-pure": "7.18.6", - "@babel/helper-split-export-declaration": "7.18.6", + "@ampproject/remapping": "2.2.1", + "@angular-devkit/architect": "0.1602.3", + "@angular-devkit/build-webpack": "0.1602.3", + "@angular-devkit/core": "16.2.3", + "@babel/core": "7.22.9", + "@babel/generator": "7.22.9", + "@babel/helper-annotate-as-pure": "7.22.5", + "@babel/helper-split-export-declaration": "7.22.6", "@babel/plugin-proposal-async-generator-functions": "7.20.7", - "@babel/plugin-transform-async-to-generator": "7.20.7", - "@babel/plugin-transform-runtime": "7.19.6", - "@babel/preset-env": "7.20.2", - "@babel/runtime": "7.20.13", - "@babel/template": "7.20.7", + "@babel/plugin-transform-async-to-generator": "7.22.5", + "@babel/plugin-transform-runtime": "7.22.9", + "@babel/preset-env": "7.22.9", + "@babel/runtime": "7.22.6", + "@babel/template": "7.22.5", "@discoveryjs/json-ext": "0.5.7", - "@ngtools/webpack": "15.2.8", + "@ngtools/webpack": "16.2.3", + "@vitejs/plugin-basic-ssl": "1.0.1", "ansi-colors": "4.1.3", - "autoprefixer": "10.4.13", - "babel-loader": "9.1.2", + "autoprefixer": "10.4.14", + "babel-loader": "9.1.3", "babel-plugin-istanbul": "6.1.1", - "browserslist": "4.21.5", - "cacache": "17.0.4", + "browserslist": "^4.21.5", "chokidar": "3.5.3", "copy-webpack-plugin": "11.0.0", - "critters": "0.0.16", - "css-loader": "6.7.3", - "esbuild": "0.17.8", - "esbuild-wasm": "0.17.8", - "glob": "8.1.0", + "critters": "0.0.20", + "css-loader": "6.8.1", + "esbuild": "0.18.17", + "esbuild-wasm": "0.18.17", + "fast-glob": "3.3.1", + "guess-parser": "0.4.22", "https-proxy-agent": "5.0.1", "inquirer": "8.2.4", "jsonc-parser": "3.2.0", @@ -16667,446 +18205,205 @@ "less-loader": "11.1.0", "license-webpack-plugin": "4.0.2", "loader-utils": "3.2.1", - "magic-string": "0.29.0", - "mini-css-extract-plugin": "2.7.2", - "open": "8.4.1", + "magic-string": "0.30.1", + "mini-css-extract-plugin": "2.7.6", + "mrmime": "1.0.1", + "open": "8.4.2", "ora": "5.4.1", "parse5-html-rewriting-stream": "7.0.0", - "piscina": "3.2.0", - "postcss": "8.4.21", - "postcss-loader": "7.0.2", + "picomatch": "2.3.1", + "piscina": "4.0.0", + "postcss": "8.4.27", + "postcss-loader": "7.3.3", "resolve-url-loader": "5.0.0", - "rxjs": "6.6.7", - "sass": "1.58.1", - "sass-loader": "13.2.0", - "semver": "7.3.8", + "rxjs": "7.8.1", + "sass": "1.64.1", + "sass-loader": "13.3.2", + "semver": "7.5.4", "source-map-loader": "4.0.1", "source-map-support": "0.5.21", - "terser": "5.16.3", + "terser": "5.19.2", "text-table": "0.2.0", "tree-kill": "1.2.2", - "tslib": "2.5.0", - "webpack": "5.76.1", - "webpack-dev-middleware": "6.0.1", - "webpack-dev-server": "4.11.1", - "webpack-merge": "5.8.0", + "tslib": "2.6.1", + "vite": "4.4.7", + "webpack": "5.88.2", + "webpack-dev-middleware": "6.1.1", + "webpack-dev-server": "4.15.1", + "webpack-merge": "5.9.0", "webpack-subresource-integrity": "5.1.0" }, "dependencies": { "@babel/core": { - "version": "7.20.12", - "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.20.12.tgz", - "integrity": "sha512-XsMfHovsUYHFMdrIHkZphTN/2Hzzi78R08NuHfDBehym2VsPDL6Zn/JAD/JQdnRvbSsbQc4mVaU1m6JgtTEElg==", + "version": "7.22.9", + "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.22.9.tgz", + "integrity": "sha512-G2EgeufBcYw27U4hhoIwFcgc1XU7TlXJ3mv04oOv1WCuo900U/anZSPzEqNjwdjgffkk2Gs0AN0dW1CKVLcG7w==", "dev": true, "requires": { - "@ampproject/remapping": "^2.1.0", - "@babel/code-frame": "^7.18.6", - "@babel/generator": "^7.20.7", - "@babel/helper-compilation-targets": "^7.20.7", - "@babel/helper-module-transforms": "^7.20.11", - "@babel/helpers": "^7.20.7", - "@babel/parser": "^7.20.7", - "@babel/template": "^7.20.7", - "@babel/traverse": "^7.20.12", - "@babel/types": "^7.20.7", + "@ampproject/remapping": "^2.2.0", + "@babel/code-frame": "^7.22.5", + "@babel/generator": "^7.22.9", + "@babel/helper-compilation-targets": "^7.22.9", + "@babel/helper-module-transforms": "^7.22.9", + "@babel/helpers": "^7.22.6", + "@babel/parser": "^7.22.7", + "@babel/template": "^7.22.5", + "@babel/traverse": "^7.22.8", + "@babel/types": "^7.22.5", "convert-source-map": "^1.7.0", "debug": "^4.1.0", "gensync": "^1.0.0-beta.2", "json5": "^2.2.2", - "semver": "^6.3.0" + "semver": "^6.3.1" }, "dependencies": { "semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", + "version": "6.3.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", + "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", "dev": true } } }, - "brace-expansion": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", - "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", + "semver": { + "version": "7.5.4", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz", + "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==", "dev": true, "requires": { - "balanced-match": "^1.0.0" - } - }, - "glob": { - "version": "8.1.0", - "resolved": "https://registry.npmjs.org/glob/-/glob-8.1.0.tgz", - "integrity": "sha512-r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ==", - "dev": true, - "requires": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^5.0.1", - "once": "^1.3.0" - } - }, - "minimatch": { - "version": "5.1.6", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz", - "integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==", - "dev": true, - "requires": { - "brace-expansion": "^2.0.1" - } - }, - "rxjs": { - "version": "6.6.7", - "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.7.tgz", - "integrity": "sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==", - "dev": true, - "requires": { - "tslib": "^1.9.0" - }, - "dependencies": { - "tslib": { - "version": "1.14.1", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", - "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==", - "dev": true - } - } - } - } - }, - "@angular-devkit/build-webpack": { - "version": "0.1502.8", - "resolved": "https://registry.npmjs.org/@angular-devkit/build-webpack/-/build-webpack-0.1502.8.tgz", - "integrity": "sha512-jWtNv+S03FFLDe/C8SPCcRvkz3bSb2R+919IT086Q9axIPQ1VowOEwzt2k3qXPSSrC7GSYuASM+X92dB47NTQQ==", - "dev": true, - "requires": { - "@angular-devkit/architect": "0.1502.8", - "rxjs": "6.6.7" - }, - "dependencies": { - "rxjs": { - "version": "6.6.7", - "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.7.tgz", - "integrity": "sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==", - "dev": true, - "requires": { - "tslib": "^1.9.0" + "lru-cache": "^6.0.0" } }, "tslib": { - "version": "1.14.1", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", - "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==", + "version": "2.6.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.1.tgz", + "integrity": "sha512-t0hLfiEKfMUoqhG+U1oid7Pva4bbDPHYfJNiB7BiIjRkj1pyC++4N3huJfqY6aRH6VTB0rvtzQwjM4K6qpfOig==", "dev": true } } }, + "@angular-devkit/build-webpack": { + "version": "0.1602.3", + "resolved": "https://registry.npmjs.org/@angular-devkit/build-webpack/-/build-webpack-0.1602.3.tgz", + "integrity": "sha512-ls2aC7UvM748f/UqCDNsz9apWb4ArAKHtJ1Jwxx1DUQo+qT4c9/8WpiqxgTNkZTjCZbZZG1Ojub/rviw9Y88lA==", + "dev": true, + "requires": { + "@angular-devkit/architect": "0.1602.3", + "rxjs": "7.8.1" + } + }, "@angular-devkit/core": { - "version": "15.2.8", - "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-15.2.8.tgz", - "integrity": "sha512-Lo4XrbDMtXarKnMrFgWLmQdSX+3QPNAg4otG8cmp/U4jJyjV4dAYKEAsb1sCNGUSM4h4v09EQU/5ugVjDU29lQ==", + "version": "16.2.3", + "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-16.2.3.tgz", + "integrity": "sha512-oZLdg2XTx7likYAXRj1CU0XmrsCfe5f2grj3iwuI3OB1LXwwpdbHBztruj03y3yHES+TnO+dIbkvRnvMXs7uAA==", "dev": true, "requires": { "ajv": "8.12.0", "ajv-formats": "2.1.1", "jsonc-parser": "3.2.0", - "rxjs": "6.6.7", + "picomatch": "2.3.1", + "rxjs": "7.8.1", "source-map": "0.7.4" - }, - "dependencies": { - "rxjs": { - "version": "6.6.7", - "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.7.tgz", - "integrity": "sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==", - "dev": true, - "requires": { - "tslib": "^1.9.0" - } - }, - "tslib": { - "version": "1.14.1", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", - "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==", - "dev": true - } } }, "@angular-devkit/schematics": { - "version": "15.2.8", - "resolved": "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-15.2.8.tgz", - "integrity": "sha512-w6EUGC96kVsH9f8sEzajzbONMawezyVBiSo+JYp5r25rQArAz/a+KZntbuETWHQ0rQOEsKmUNKxwmr11BaptSQ==", + "version": "16.2.3", + "resolved": "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-16.2.3.tgz", + "integrity": "sha512-+lBiHxi/C9HCfiCbtW25DldwvJDXXXv5oWw+Tg4s18BO/lYZLveGUEaZWu9ZJ5VIJ8GliUi2LohxhDxBkh4Oxg==", "dev": true, "requires": { - "@angular-devkit/core": "15.2.8", + "@angular-devkit/core": "16.2.3", "jsonc-parser": "3.2.0", - "magic-string": "0.29.0", + "magic-string": "0.30.1", "ora": "5.4.1", - "rxjs": "6.6.7" - }, - "dependencies": { - "rxjs": { - "version": "6.6.7", - "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.7.tgz", - "integrity": "sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==", - "dev": true, - "requires": { - "tslib": "^1.9.0" - } - }, - "tslib": { - "version": "1.14.1", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", - "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==", - "dev": true - } + "rxjs": "7.8.1" } }, "@angular-devkit/schematics-cli": { - "version": "15.2.5", - "resolved": "https://registry.npmjs.org/@angular-devkit/schematics-cli/-/schematics-cli-15.2.5.tgz", - "integrity": "sha512-MOmdYMCT4Bbl8B9L4zDqbJwakYpECb0K9guERxUqMwpufi9GqOa/GNhIsbHcc4J8qn6ykG2y3BZQf8Q14/eRZQ==", + "version": "16.2.3", + "resolved": "https://registry.npmjs.org/@angular-devkit/schematics-cli/-/schematics-cli-16.2.3.tgz", + "integrity": "sha512-5YQCbQmY9Kc03a9Io4XHOrxGXjnzcVveUuUO64R1m5x2aA5I+mVR8NVvxuoGRAeoI1FWusAKRe9hH8nRCLrelA==", "dev": true, "requires": { - "@angular-devkit/core": "15.2.5", - "@angular-devkit/schematics": "15.2.5", + "@angular-devkit/core": "16.2.3", + "@angular-devkit/schematics": "16.2.3", "ansi-colors": "4.1.3", "inquirer": "8.2.4", "symbol-observable": "4.0.0", "yargs-parser": "21.1.1" - }, - "dependencies": { - "@angular-devkit/core": { - "version": "15.2.5", - "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-15.2.5.tgz", - "integrity": "sha512-ZfjEkAe2yYeekc3xjZ/U4pK9nb+w6BFwAEjou6mE8PWZH7iYskm0YCCXkmu+B+zViEcCLhAkJAxu9MwX4efd8g==", - "dev": true, - "requires": { - "ajv": "8.12.0", - "ajv-formats": "2.1.1", - "jsonc-parser": "3.2.0", - "rxjs": "6.6.7", - "source-map": "0.7.4" - } - }, - "@angular-devkit/schematics": { - "version": "15.2.5", - "resolved": "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-15.2.5.tgz", - "integrity": "sha512-zm7chQRQtPXQzzSAvK/mbZ+RJ3eP7hlU53yyJ/i6kjWAh3Y5uiSHNYGmqhhAHFuzw4Jhb4OC2S9iycxrqmI8TA==", - "dev": true, - "requires": { - "@angular-devkit/core": "15.2.5", - "jsonc-parser": "3.2.0", - "magic-string": "0.29.0", - "ora": "5.4.1", - "rxjs": "6.6.7" - } - }, - "rxjs": { - "version": "6.6.7", - "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.7.tgz", - "integrity": "sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==", - "dev": true, - "requires": { - "tslib": "^1.9.0" - } - }, - "tslib": { - "version": "1.14.1", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", - "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==", - "dev": true - } } }, "@angular-eslint/builder": { - "version": "15.2.1", - "resolved": "https://registry.npmjs.org/@angular-eslint/builder/-/builder-15.2.1.tgz", - "integrity": "sha512-7x2DANebLRl997Mj4DhZrnz5+vnSjavGGveJ0mBuU7CEsL0ZYLftdRqL0e0HtU3ksseS7xpchD6OM08nkNgySw==", - "dev": true + "version": "16.1.2", + "resolved": "https://registry.npmjs.org/@angular-eslint/builder/-/builder-16.1.2.tgz", + "integrity": "sha512-Y95IBEWqzWA7SyIh5nlPuFasw/4lOILrAdY5Ji6tOpIJgNFoiR9K1UcH46i34r3384ApN8GEQJ7FlK6D6qCOJA==", + "dev": true, + "requires": { + "@nx/devkit": "16.5.1", + "nx": "16.5.1" + } }, "@angular-eslint/bundled-angular-compiler": { - "version": "15.2.1", - "resolved": "https://registry.npmjs.org/@angular-eslint/bundled-angular-compiler/-/bundled-angular-compiler-15.2.1.tgz", - "integrity": "sha512-LO7Am8eVCr7oh6a0VmKSL7K03CnQEQhFO7Wt/YtbfYOxVjrbwmYLwJn+wZPOT7A02t/BttOD/WXuDrOWtSMQ/Q==", + "version": "16.1.2", + "resolved": "https://registry.npmjs.org/@angular-eslint/bundled-angular-compiler/-/bundled-angular-compiler-16.1.2.tgz", + "integrity": "sha512-wDiHPFsKTijMcQUPNcoHOJ5kezIPCCbmDK6LHH7hAdAC/eDY9NHL5e4zQ2Xkf3/r1PFuwVLGTwwreEHlmeENDw==", "dev": true }, "@angular-eslint/eslint-plugin": { - "version": "15.2.1", - "resolved": "https://registry.npmjs.org/@angular-eslint/eslint-plugin/-/eslint-plugin-15.2.1.tgz", - "integrity": "sha512-OM7b1kS4E4CkXjkaWN+lEzawh4VxY6l7FO1Cuk4s7iv3/YpZG3rJxIZBqnFLTixwrBuqw8y4FNBzF3eDgmFAUw==", + "version": "16.1.2", + "resolved": "https://registry.npmjs.org/@angular-eslint/eslint-plugin/-/eslint-plugin-16.1.2.tgz", + "integrity": "sha512-lYVvoKUIOg/ez15yfN4zY2A++vnIeJe1xh2ADNTmmjSh2PFV24K9YOgrTbgrY3Ul9kzGDTBkvYqslq+IvMGdIw==", "dev": true, "requires": { - "@angular-eslint/utils": "15.2.1", - "@typescript-eslint/utils": "5.48.2" - }, - "dependencies": { - "@typescript-eslint/scope-manager": { - "version": "5.48.2", - "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.48.2.tgz", - "integrity": "sha512-zEUFfonQid5KRDKoI3O+uP1GnrFd4tIHlvs+sTJXiWuypUWMuDaottkJuR612wQfOkjYbsaskSIURV9xo4f+Fw==", - "dev": true, - "requires": { - "@typescript-eslint/types": "5.48.2", - "@typescript-eslint/visitor-keys": "5.48.2" - } - }, - "@typescript-eslint/types": { - "version": "5.48.2", - "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.48.2.tgz", - "integrity": "sha512-hE7dA77xxu7ByBc6KCzikgfRyBCTst6dZQpwaTy25iMYOnbNljDT4hjhrGEJJ0QoMjrfqrx+j1l1B9/LtKeuqA==", - "dev": true - }, - "@typescript-eslint/typescript-estree": { - "version": "5.48.2", - "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.48.2.tgz", - "integrity": "sha512-bibvD3z6ilnoVxUBFEgkO0k0aFvUc4Cttt0dAreEr+nrAHhWzkO83PEVVuieK3DqcgL6VAK5dkzK8XUVja5Zcg==", - "dev": true, - "requires": { - "@typescript-eslint/types": "5.48.2", - "@typescript-eslint/visitor-keys": "5.48.2", - "debug": "^4.3.4", - "globby": "^11.1.0", - "is-glob": "^4.0.3", - "semver": "^7.3.7", - "tsutils": "^3.21.0" - } - }, - "@typescript-eslint/utils": { - "version": "5.48.2", - "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.48.2.tgz", - "integrity": "sha512-2h18c0d7jgkw6tdKTlNaM7wyopbLRBiit8oAxoP89YnuBOzCZ8g8aBCaCqq7h208qUTroL7Whgzam7UY3HVLow==", - "dev": true, - "requires": { - "@types/json-schema": "^7.0.9", - "@types/semver": "^7.3.12", - "@typescript-eslint/scope-manager": "5.48.2", - "@typescript-eslint/types": "5.48.2", - "@typescript-eslint/typescript-estree": "5.48.2", - "eslint-scope": "^5.1.1", - "eslint-utils": "^3.0.0", - "semver": "^7.3.7" - } - }, - "@typescript-eslint/visitor-keys": { - "version": "5.48.2", - "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.48.2.tgz", - "integrity": "sha512-z9njZLSkwmjFWUelGEwEbdf4NwKvfHxvGC0OcGN1Hp/XNDIcJ7D5DpPNPv6x6/mFvc1tQHsaWmpD/a4gOvvCJQ==", - "dev": true, - "requires": { - "@typescript-eslint/types": "5.48.2", - "eslint-visitor-keys": "^3.3.0" - } - } + "@angular-eslint/utils": "16.1.2", + "@typescript-eslint/utils": "5.62.0" } }, "@angular-eslint/eslint-plugin-template": { - "version": "15.2.1", - "resolved": "https://registry.npmjs.org/@angular-eslint/eslint-plugin-template/-/eslint-plugin-template-15.2.1.tgz", - "integrity": "sha512-IeiSLk6YxapFdH2z5o/O3R7VwtBd2T6fWmhLFPwDYMDknrwegnOjwswCdBplOccpUp0wqlCeGUx7LTsuzwaz7w==", + "version": "16.1.2", + "resolved": "https://registry.npmjs.org/@angular-eslint/eslint-plugin-template/-/eslint-plugin-template-16.1.2.tgz", + "integrity": "sha512-2qsoUgPg9Qp4EVUJRwWcJ+8JMxBb0ma3pNBjFmY6LOd59igRYorJKfWep4Nln1EicYRDRsCLzeLHO976+b1yaQ==", "dev": true, "requires": { - "@angular-eslint/bundled-angular-compiler": "15.2.1", - "@angular-eslint/utils": "15.2.1", - "@typescript-eslint/type-utils": "5.48.2", - "@typescript-eslint/utils": "5.48.2", - "aria-query": "5.1.3", + "@angular-eslint/bundled-angular-compiler": "16.1.2", + "@angular-eslint/utils": "16.1.2", + "@typescript-eslint/type-utils": "5.62.0", + "@typescript-eslint/utils": "5.62.0", + "aria-query": "5.3.0", "axobject-query": "3.1.1" - }, - "dependencies": { - "@typescript-eslint/scope-manager": { - "version": "5.48.2", - "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.48.2.tgz", - "integrity": "sha512-zEUFfonQid5KRDKoI3O+uP1GnrFd4tIHlvs+sTJXiWuypUWMuDaottkJuR612wQfOkjYbsaskSIURV9xo4f+Fw==", - "dev": true, - "requires": { - "@typescript-eslint/types": "5.48.2", - "@typescript-eslint/visitor-keys": "5.48.2" - } - }, - "@typescript-eslint/type-utils": { - "version": "5.48.2", - "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.48.2.tgz", - "integrity": "sha512-QVWx7J5sPMRiOMJp5dYshPxABRoZV1xbRirqSk8yuIIsu0nvMTZesKErEA3Oix1k+uvsk8Cs8TGJ6kQ0ndAcew==", - "dev": true, - "requires": { - "@typescript-eslint/typescript-estree": "5.48.2", - "@typescript-eslint/utils": "5.48.2", - "debug": "^4.3.4", - "tsutils": "^3.21.0" - } - }, - "@typescript-eslint/types": { - "version": "5.48.2", - "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.48.2.tgz", - "integrity": "sha512-hE7dA77xxu7ByBc6KCzikgfRyBCTst6dZQpwaTy25iMYOnbNljDT4hjhrGEJJ0QoMjrfqrx+j1l1B9/LtKeuqA==", - "dev": true - }, - "@typescript-eslint/typescript-estree": { - "version": "5.48.2", - "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.48.2.tgz", - "integrity": "sha512-bibvD3z6ilnoVxUBFEgkO0k0aFvUc4Cttt0dAreEr+nrAHhWzkO83PEVVuieK3DqcgL6VAK5dkzK8XUVja5Zcg==", - "dev": true, - "requires": { - "@typescript-eslint/types": "5.48.2", - "@typescript-eslint/visitor-keys": "5.48.2", - "debug": "^4.3.4", - "globby": "^11.1.0", - "is-glob": "^4.0.3", - "semver": "^7.3.7", - "tsutils": "^3.21.0" - } - }, - "@typescript-eslint/utils": { - "version": "5.48.2", - "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.48.2.tgz", - "integrity": "sha512-2h18c0d7jgkw6tdKTlNaM7wyopbLRBiit8oAxoP89YnuBOzCZ8g8aBCaCqq7h208qUTroL7Whgzam7UY3HVLow==", - "dev": true, - "requires": { - "@types/json-schema": "^7.0.9", - "@types/semver": "^7.3.12", - "@typescript-eslint/scope-manager": "5.48.2", - "@typescript-eslint/types": "5.48.2", - "@typescript-eslint/typescript-estree": "5.48.2", - "eslint-scope": "^5.1.1", - "eslint-utils": "^3.0.0", - "semver": "^7.3.7" - } - }, - "@typescript-eslint/visitor-keys": { - "version": "5.48.2", - "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.48.2.tgz", - "integrity": "sha512-z9njZLSkwmjFWUelGEwEbdf4NwKvfHxvGC0OcGN1Hp/XNDIcJ7D5DpPNPv6x6/mFvc1tQHsaWmpD/a4gOvvCJQ==", - "dev": true, - "requires": { - "@typescript-eslint/types": "5.48.2", - "eslint-visitor-keys": "^3.3.0" - } - } } }, "@angular-eslint/schematics": { - "version": "15.2.1", - "resolved": "https://registry.npmjs.org/@angular-eslint/schematics/-/schematics-15.2.1.tgz", - "integrity": "sha512-0ZfBCejHWIcgy3J5kFs9sS/jqi8i5AptxggOwFySOlCLJ+CzNrktjD4jff1Zy8K/VLzY0Ci0BSZXvgWfP0k9Rg==", + "version": "16.1.2", + "resolved": "https://registry.npmjs.org/@angular-eslint/schematics/-/schematics-16.1.2.tgz", + "integrity": "sha512-319i47NU6nfaAaQTQYN7k320proTIBCueWGt+fbT11210CMqQriFmD+B85AatCwQgMgLd8Rhs1/F7YL2OOhegA==", "dev": true, "requires": { - "@angular-eslint/eslint-plugin": "15.2.1", - "@angular-eslint/eslint-plugin-template": "15.2.1", + "@angular-eslint/eslint-plugin": "16.1.2", + "@angular-eslint/eslint-plugin-template": "16.1.2", + "@nx/devkit": "16.5.1", "ignore": "5.2.4", + "nx": "16.5.1", "strip-json-comments": "3.1.1", "tmp": "0.2.1" } }, "@angular-eslint/template-parser": { - "version": "15.2.1", - "resolved": "https://registry.npmjs.org/@angular-eslint/template-parser/-/template-parser-15.2.1.tgz", - "integrity": "sha512-ViCi79gC2aKJecmYLkOT+QlT5WMRNXeYz0Dr9Pr8qXzIbY0oAWE7nOT5jkXwQ9oUk+ybtGCWHma5JVJWVJsIog==", + "version": "16.2.0", + "resolved": "https://registry.npmjs.org/@angular-eslint/template-parser/-/template-parser-16.2.0.tgz", + "integrity": "sha512-v2jVKTy2wN7iM9nHpBkxLn2wfL8jSl4IlPrXThIqj8No2VHtpLQZPKuXbGPUXQX05VS2Mj5feScQ36ZVGS8Rbw==", "dev": true, "requires": { - "@angular-eslint/bundled-angular-compiler": "15.2.1", + "@angular-eslint/bundled-angular-compiler": "16.2.0", "eslint-scope": "^7.0.0" }, "dependencies": { + "@angular-eslint/bundled-angular-compiler": { + "version": "16.2.0", + "resolved": "https://registry.npmjs.org/@angular-eslint/bundled-angular-compiler/-/bundled-angular-compiler-16.2.0.tgz", + "integrity": "sha512-ct9orDYxkMl2+uvM7UBfgV28Dq57V4dEs+Drh7cD673JIMa6sXbgmd0QEtm8W3cmyK/jcTzmuoufxbH7hOxd6g==", + "dev": true + }, "eslint-scope": { "version": "7.1.1", "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.1.1.tgz", @@ -17126,285 +18423,223 @@ } }, "@angular-eslint/utils": { - "version": "15.2.1", - "resolved": "https://registry.npmjs.org/@angular-eslint/utils/-/utils-15.2.1.tgz", - "integrity": "sha512-++FneAJHxJqcSu0igVN6uOkSoHxlzgLoMBswuovYJy3UKwm33/T6WFku8++753Ca/JucIoR1gdUfO7SoSspMDg==", + "version": "16.1.2", + "resolved": "https://registry.npmjs.org/@angular-eslint/utils/-/utils-16.1.2.tgz", + "integrity": "sha512-2yfEK3BPSJsUhP4JCz0EB6ktu4E4+/zc9qdtZvPWNF/eww2J/oYVPjY47C/HVg4MXpjJTI8vbdkvcnxrICIkfw==", "dev": true, "requires": { - "@angular-eslint/bundled-angular-compiler": "15.2.1", - "@typescript-eslint/utils": "5.48.2" - }, - "dependencies": { - "@typescript-eslint/scope-manager": { - "version": "5.48.2", - "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.48.2.tgz", - "integrity": "sha512-zEUFfonQid5KRDKoI3O+uP1GnrFd4tIHlvs+sTJXiWuypUWMuDaottkJuR612wQfOkjYbsaskSIURV9xo4f+Fw==", - "dev": true, - "requires": { - "@typescript-eslint/types": "5.48.2", - "@typescript-eslint/visitor-keys": "5.48.2" - } - }, - "@typescript-eslint/types": { - "version": "5.48.2", - "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.48.2.tgz", - "integrity": "sha512-hE7dA77xxu7ByBc6KCzikgfRyBCTst6dZQpwaTy25iMYOnbNljDT4hjhrGEJJ0QoMjrfqrx+j1l1B9/LtKeuqA==", - "dev": true - }, - "@typescript-eslint/typescript-estree": { - "version": "5.48.2", - "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.48.2.tgz", - "integrity": "sha512-bibvD3z6ilnoVxUBFEgkO0k0aFvUc4Cttt0dAreEr+nrAHhWzkO83PEVVuieK3DqcgL6VAK5dkzK8XUVja5Zcg==", - "dev": true, - "requires": { - "@typescript-eslint/types": "5.48.2", - "@typescript-eslint/visitor-keys": "5.48.2", - "debug": "^4.3.4", - "globby": "^11.1.0", - "is-glob": "^4.0.3", - "semver": "^7.3.7", - "tsutils": "^3.21.0" - } - }, - "@typescript-eslint/utils": { - "version": "5.48.2", - "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.48.2.tgz", - "integrity": "sha512-2h18c0d7jgkw6tdKTlNaM7wyopbLRBiit8oAxoP89YnuBOzCZ8g8aBCaCqq7h208qUTroL7Whgzam7UY3HVLow==", - "dev": true, - "requires": { - "@types/json-schema": "^7.0.9", - "@types/semver": "^7.3.12", - "@typescript-eslint/scope-manager": "5.48.2", - "@typescript-eslint/types": "5.48.2", - "@typescript-eslint/typescript-estree": "5.48.2", - "eslint-scope": "^5.1.1", - "eslint-utils": "^3.0.0", - "semver": "^7.3.7" - } - }, - "@typescript-eslint/visitor-keys": { - "version": "5.48.2", - "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.48.2.tgz", - "integrity": "sha512-z9njZLSkwmjFWUelGEwEbdf4NwKvfHxvGC0OcGN1Hp/XNDIcJ7D5DpPNPv6x6/mFvc1tQHsaWmpD/a4gOvvCJQ==", - "dev": true, - "requires": { - "@typescript-eslint/types": "5.48.2", - "eslint-visitor-keys": "^3.3.0" - } - } + "@angular-eslint/bundled-angular-compiler": "16.1.2", + "@typescript-eslint/utils": "5.62.0" } }, "@angular/animations": { - "version": "15.2.8", - "resolved": "https://registry.npmjs.org/@angular/animations/-/animations-15.2.8.tgz", - "integrity": "sha512-I3xh8EASQ04s3qXQYpIORI0jFiFmvBQERBqS70TieTCIML7banOf9R3K7sAWB9frG5J0CEUwr+wtF47DCs/7eQ==", + "version": "16.2.6", + "resolved": "https://registry.npmjs.org/@angular/animations/-/animations-16.2.6.tgz", + "integrity": "sha512-NHnHdZFKLr1PB8RhscjsE/DMSVHhtjCqc3bhtOiOMYfAgm4nYrSFvp6nAaT5OoMTeAWuM0n8/HvAiFweEQgVQA==", "requires": { "tslib": "^2.3.0" } }, "@angular/cdk": { - "version": "15.2.8", - "resolved": "https://registry.npmjs.org/@angular/cdk/-/cdk-15.2.8.tgz", - "integrity": "sha512-jiCoxfBFMH29IZIiPmVUzIWetfUNpMIvC20xYVF8RMM819vPogoObzwK4DN/sXcp/6oVbBzZFaYdijhhIt9soQ==", + "version": "16.1.5", + "resolved": "https://registry.npmjs.org/@angular/cdk/-/cdk-16.1.5.tgz", + "integrity": "sha512-8wjYhLwW9bWicBYSdDXuN71SBP7NbJmXs+XiWiRkaFUkVDeU9z8Qkitogl+qqsSXvsOmi+12MowrbJ3tPizaLw==", "requires": { "parse5": "^7.1.2", "tslib": "^2.3.0" } }, "@angular/cli": { - "version": "15.2.8", - "resolved": "https://registry.npmjs.org/@angular/cli/-/cli-15.2.8.tgz", - "integrity": "sha512-3VlTfm6DUZfFHBY43vQSAaqmFTxy3VtRd/iDBCHcEPhHwYLWBvNwReJuJfNja8O105QQ6DBiYVBExEBtPmjQ4w==", + "version": "16.2.3", + "resolved": "https://registry.npmjs.org/@angular/cli/-/cli-16.2.3.tgz", + "integrity": "sha512-XYewIme6CPxgyK9A4aBDUOwv88h8RHwCeLxuBQcOYY2kVhWIiQjFwdkODQPG0WZkRZxtwXk6wErIO80Nz1K8BA==", "dev": true, "requires": { - "@angular-devkit/architect": "0.1502.8", - "@angular-devkit/core": "15.2.8", - "@angular-devkit/schematics": "15.2.8", - "@schematics/angular": "15.2.8", + "@angular-devkit/architect": "0.1602.3", + "@angular-devkit/core": "16.2.3", + "@angular-devkit/schematics": "16.2.3", + "@schematics/angular": "16.2.3", "@yarnpkg/lockfile": "1.1.0", "ansi-colors": "4.1.3", - "ini": "3.0.1", + "ini": "4.1.1", "inquirer": "8.2.4", "jsonc-parser": "3.2.0", "npm-package-arg": "10.1.0", "npm-pick-manifest": "8.0.1", - "open": "8.4.1", + "open": "8.4.2", "ora": "5.4.1", - "pacote": "15.1.0", - "resolve": "1.22.1", - "semver": "7.3.8", + "pacote": "15.2.0", + "resolve": "1.22.2", + "semver": "7.5.4", "symbol-observable": "4.0.0", - "yargs": "17.6.2" + "yargs": "17.7.2" + }, + "dependencies": { + "semver": { + "version": "7.5.4", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz", + "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==", + "dev": true, + "requires": { + "lru-cache": "^6.0.0" + } + } } }, "@angular/common": { - "version": "15.2.8", - "resolved": "https://registry.npmjs.org/@angular/common/-/common-15.2.8.tgz", - "integrity": "sha512-yLDQihiRcVl38HrWMPbqgzOaSUw85AQH5BsGdjbS6BpoBQj3EXOpccCMFsuxOKxPG4toatgawNqrEnK0Jpv9Mw==", + "version": "16.2.6", + "resolved": "https://registry.npmjs.org/@angular/common/-/common-16.2.6.tgz", + "integrity": "sha512-BjnahvtJHh2zXfCZjpWit+zMkggl/PrgUtPd02egzLmEKyXIMmQLYNpDZ+Pqgpb7eefU8yBPhL7WA2oKFjHjSg==", "requires": { "tslib": "^2.3.0" } }, "@angular/compiler": { - "version": "15.2.8", - "resolved": "https://registry.npmjs.org/@angular/compiler/-/compiler-15.2.8.tgz", - "integrity": "sha512-+dvspIDvuGoYqdL7r/3o9ojkR3fH1zevgC0ISJivcIrMi+WcJ0FV2JmJdnm8V52oNsHy+sMF9eEZGEbCbACE/A==", + "version": "16.2.6", + "resolved": "https://registry.npmjs.org/@angular/compiler/-/compiler-16.2.6.tgz", + "integrity": "sha512-FKv9isn8BdM9TydyhdqcFhFD8nn11+fGqg3qbIQnOlnLb0ryYign93zBmlx/qFu46PvPtTmhsa4saE2NwvrSbg==", "requires": { "tslib": "^2.3.0" } }, "@angular/compiler-cli": { - "version": "15.2.9", - "resolved": "https://registry.npmjs.org/@angular/compiler-cli/-/compiler-cli-15.2.9.tgz", - "integrity": "sha512-zsbI8G2xHOeYWI0hjFzrI//ZhZV9il/uQW5dAimfwJp06KZDeXZ3PdwY9JQslf6F+saLwOObxy6QMrIVvfjy9w==", + "version": "16.2.6", + "resolved": "https://registry.npmjs.org/@angular/compiler-cli/-/compiler-cli-16.2.6.tgz", + "integrity": "sha512-rzyI4dKVj8T9dCnZCIffoxZ2PplYLmC9yd65VoaKxOQFxf/95/hgIRdt5kafjnZvzFN1qUbQuEfyviY+KFdQKg==", "dev": true, "requires": { - "@babel/core": "7.19.3", + "@babel/core": "7.22.5", "@jridgewell/sourcemap-codec": "^1.4.14", "chokidar": "^3.0.0", "convert-source-map": "^1.5.1", - "dependency-graph": "^0.11.0", - "magic-string": "^0.27.0", "reflect-metadata": "^0.1.2", "semver": "^7.0.0", "tslib": "^2.3.0", "yargs": "^17.2.1" - }, - "dependencies": { - "magic-string": { - "version": "0.27.0", - "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.27.0.tgz", - "integrity": "sha512-8UnnX2PeRAPZuN12svgR9j7M1uWMovg/CEnIwIG0LFkXSJJe4PdfUGiTGl8V9bsBHFUtfVINcSyYxd7q+kx9fA==", - "dev": true, - "requires": { - "@jridgewell/sourcemap-codec": "^1.4.13" - } - } } }, "@angular/core": { - "version": "15.2.8", - "resolved": "https://registry.npmjs.org/@angular/core/-/core-15.2.8.tgz", - "integrity": "sha512-NDs+g4uM4EhyCvluf8a0YBCFXsDAEfCMHOD5cS00Bl+liTQ7JwtmepkWXMyjLB92irC9JaR79kdy4BoIKOh8WA==", + "version": "16.2.6", + "resolved": "https://registry.npmjs.org/@angular/core/-/core-16.2.6.tgz", + "integrity": "sha512-F7kJbkVHLupdVQbwjjEuWp5rtxmfnL571VtqRN/8OJZAI2OjZjnSbL+FRZGEZHDmOZ2cNgPKpYt/d3nbK8hpSw==", "requires": { "tslib": "^2.3.0" } }, "@angular/forms": { - "version": "15.2.8", - "resolved": "https://registry.npmjs.org/@angular/forms/-/forms-15.2.8.tgz", - "integrity": "sha512-VyevVj20DdQWjAQUyiFTe+DAzqG9GqfAOWn376Y/lhPcwxAojXePTGNgtQud566/urDrNrP5haaLD6O36/3n+w==", + "version": "16.2.6", + "resolved": "https://registry.npmjs.org/@angular/forms/-/forms-16.2.6.tgz", + "integrity": "sha512-TsSpV6Oh0Z5WlCmRB6jEsChLA8ChBn8CY1uOkTh4YQEzdMCwvBvc1Q2DugER5iGvZU/hRNgjyHX7VR3ysB3JlQ==", "requires": { "tslib": "^2.3.0" } }, "@angular/language-service": { - "version": "15.2.8", - "resolved": "https://registry.npmjs.org/@angular/language-service/-/language-service-15.2.8.tgz", - "integrity": "sha512-3wlaJrpxe8ZLe7ZGIOs/Z++kgJMOHZCUvdXLyp/4t1ejULgUgW9yi7nGsemWnSzsUCjf7595BP1Cp1gA/J/1QQ==", + "version": "16.2.6", + "resolved": "https://registry.npmjs.org/@angular/language-service/-/language-service-16.2.6.tgz", + "integrity": "sha512-CfGAPLTfYluyMdmYGIK/9hvHDZffLbKc+YZYVE5obgdVszeAJhjC60corbzNu30oTx5a994Q2OtdiKBgAJJ+Kg==", "dev": true }, "@angular/material": { - "version": "15.2.8", - "resolved": "https://registry.npmjs.org/@angular/material/-/material-15.2.8.tgz", - "integrity": "sha512-bk0dv8PSJGFDgAv3CU3+jfvnOO0ah/L9JUyvw73kjiKezgjW/O8Lgq/dwkDTQ1dF3zCF+JWNqhEJmgi0GVW/cQ==", + "version": "16.1.5", + "resolved": "https://registry.npmjs.org/@angular/material/-/material-16.1.5.tgz", + "integrity": "sha512-l11mH/WWBmfiBhrf4/0hCihhLxK4Ldu7+fP8zucHO3X2TiLlpsgJZpcYwJkZf0Ai0rDqIzqCVnks7L9jiuTGCQ==", "requires": { - "@material/animation": "15.0.0-canary.684e33d25.0", - "@material/auto-init": "15.0.0-canary.684e33d25.0", - "@material/banner": "15.0.0-canary.684e33d25.0", - "@material/base": "15.0.0-canary.684e33d25.0", - "@material/button": "15.0.0-canary.684e33d25.0", - "@material/card": "15.0.0-canary.684e33d25.0", - "@material/checkbox": "15.0.0-canary.684e33d25.0", - "@material/chips": "15.0.0-canary.684e33d25.0", - "@material/circular-progress": "15.0.0-canary.684e33d25.0", - "@material/data-table": "15.0.0-canary.684e33d25.0", - "@material/density": "15.0.0-canary.684e33d25.0", - "@material/dialog": "15.0.0-canary.684e33d25.0", - "@material/dom": "15.0.0-canary.684e33d25.0", - "@material/drawer": "15.0.0-canary.684e33d25.0", - "@material/elevation": "15.0.0-canary.684e33d25.0", - "@material/fab": "15.0.0-canary.684e33d25.0", - "@material/feature-targeting": "15.0.0-canary.684e33d25.0", - "@material/floating-label": "15.0.0-canary.684e33d25.0", - "@material/form-field": "15.0.0-canary.684e33d25.0", - "@material/icon-button": "15.0.0-canary.684e33d25.0", - "@material/image-list": "15.0.0-canary.684e33d25.0", - "@material/layout-grid": "15.0.0-canary.684e33d25.0", - "@material/line-ripple": "15.0.0-canary.684e33d25.0", - "@material/linear-progress": "15.0.0-canary.684e33d25.0", - "@material/list": "15.0.0-canary.684e33d25.0", - "@material/menu": "15.0.0-canary.684e33d25.0", - "@material/menu-surface": "15.0.0-canary.684e33d25.0", - "@material/notched-outline": "15.0.0-canary.684e33d25.0", - "@material/radio": "15.0.0-canary.684e33d25.0", - "@material/ripple": "15.0.0-canary.684e33d25.0", - "@material/rtl": "15.0.0-canary.684e33d25.0", - "@material/segmented-button": "15.0.0-canary.684e33d25.0", - "@material/select": "15.0.0-canary.684e33d25.0", - "@material/shape": "15.0.0-canary.684e33d25.0", - "@material/slider": "15.0.0-canary.684e33d25.0", - "@material/snackbar": "15.0.0-canary.684e33d25.0", - "@material/switch": "15.0.0-canary.684e33d25.0", - "@material/tab": "15.0.0-canary.684e33d25.0", - "@material/tab-bar": "15.0.0-canary.684e33d25.0", - "@material/tab-indicator": "15.0.0-canary.684e33d25.0", - "@material/tab-scroller": "15.0.0-canary.684e33d25.0", - "@material/textfield": "15.0.0-canary.684e33d25.0", - "@material/theme": "15.0.0-canary.684e33d25.0", - "@material/tooltip": "15.0.0-canary.684e33d25.0", - "@material/top-app-bar": "15.0.0-canary.684e33d25.0", - "@material/touch-target": "15.0.0-canary.684e33d25.0", - "@material/typography": "15.0.0-canary.684e33d25.0", + "@material/animation": "15.0.0-canary.b994146f6.0", + "@material/auto-init": "15.0.0-canary.b994146f6.0", + "@material/banner": "15.0.0-canary.b994146f6.0", + "@material/base": "15.0.0-canary.b994146f6.0", + "@material/button": "15.0.0-canary.b994146f6.0", + "@material/card": "15.0.0-canary.b994146f6.0", + "@material/checkbox": "15.0.0-canary.b994146f6.0", + "@material/chips": "15.0.0-canary.b994146f6.0", + "@material/circular-progress": "15.0.0-canary.b994146f6.0", + "@material/data-table": "15.0.0-canary.b994146f6.0", + "@material/density": "15.0.0-canary.b994146f6.0", + "@material/dialog": "15.0.0-canary.b994146f6.0", + "@material/dom": "15.0.0-canary.b994146f6.0", + "@material/drawer": "15.0.0-canary.b994146f6.0", + "@material/elevation": "15.0.0-canary.b994146f6.0", + "@material/fab": "15.0.0-canary.b994146f6.0", + "@material/feature-targeting": "15.0.0-canary.b994146f6.0", + "@material/floating-label": "15.0.0-canary.b994146f6.0", + "@material/form-field": "15.0.0-canary.b994146f6.0", + "@material/icon-button": "15.0.0-canary.b994146f6.0", + "@material/image-list": "15.0.0-canary.b994146f6.0", + "@material/layout-grid": "15.0.0-canary.b994146f6.0", + "@material/line-ripple": "15.0.0-canary.b994146f6.0", + "@material/linear-progress": "15.0.0-canary.b994146f6.0", + "@material/list": "15.0.0-canary.b994146f6.0", + "@material/menu": "15.0.0-canary.b994146f6.0", + "@material/menu-surface": "15.0.0-canary.b994146f6.0", + "@material/notched-outline": "15.0.0-canary.b994146f6.0", + "@material/radio": "15.0.0-canary.b994146f6.0", + "@material/ripple": "15.0.0-canary.b994146f6.0", + "@material/rtl": "15.0.0-canary.b994146f6.0", + "@material/segmented-button": "15.0.0-canary.b994146f6.0", + "@material/select": "15.0.0-canary.b994146f6.0", + "@material/shape": "15.0.0-canary.b994146f6.0", + "@material/slider": "15.0.0-canary.b994146f6.0", + "@material/snackbar": "15.0.0-canary.b994146f6.0", + "@material/switch": "15.0.0-canary.b994146f6.0", + "@material/tab": "15.0.0-canary.b994146f6.0", + "@material/tab-bar": "15.0.0-canary.b994146f6.0", + "@material/tab-indicator": "15.0.0-canary.b994146f6.0", + "@material/tab-scroller": "15.0.0-canary.b994146f6.0", + "@material/textfield": "15.0.0-canary.b994146f6.0", + "@material/theme": "15.0.0-canary.b994146f6.0", + "@material/tooltip": "15.0.0-canary.b994146f6.0", + "@material/top-app-bar": "15.0.0-canary.b994146f6.0", + "@material/touch-target": "15.0.0-canary.b994146f6.0", + "@material/typography": "15.0.0-canary.b994146f6.0", "tslib": "^2.3.0" } }, "@angular/platform-browser": { - "version": "15.2.8", - "resolved": "https://registry.npmjs.org/@angular/platform-browser/-/platform-browser-15.2.8.tgz", - "integrity": "sha512-8sKFUld54inj0FnQ1ydhFxnDgsbbf43W9FALye/5uEtLgwwE/ZvkNYMaQ7hq1JPuQRMDj3gJkFqaLeFjplpHDA==", + "version": "16.2.6", + "resolved": "https://registry.npmjs.org/@angular/platform-browser/-/platform-browser-16.2.6.tgz", + "integrity": "sha512-jXtarSZ/n6ytZQ9+Y0aDuazz5POz4UmLN3GxIWtc4kqPOQp4o3DCM16Ig4ioSm53Z/WSDASVaMwtRWN5SXCKfw==", "requires": { "tslib": "^2.3.0" } }, "@angular/platform-browser-dynamic": { - "version": "15.2.8", - "resolved": "https://registry.npmjs.org/@angular/platform-browser-dynamic/-/platform-browser-dynamic-15.2.8.tgz", - "integrity": "sha512-75HyoZNibA3u/FvdK4Aw5KMzUmS/nDk5N8s7gfM09fe1resSPgFiW8JJEkr1xiUdA2WtSRbHs34y5rHLDe7n1Q==", + "version": "16.2.6", + "resolved": "https://registry.npmjs.org/@angular/platform-browser-dynamic/-/platform-browser-dynamic-16.2.6.tgz", + "integrity": "sha512-i3prfdjnOMMemQMLk7vywGueDsjRIcug+jNf4ZdSb4AEaAhv86mzt5z3iNNSSA3bec7oJfrxOayMz3o6zq3QXA==", "requires": { "tslib": "^2.3.0" } }, "@angular/platform-server": { - "version": "15.2.8", - "resolved": "https://registry.npmjs.org/@angular/platform-server/-/platform-server-15.2.8.tgz", - "integrity": "sha512-YfPAoK2zp3mTO6ubDe0C9Vzg9Vi4BxXkxHCPG0k8IM3Ivjedkv5PZ+vC0a+GjV2xR/0YqiVE3FCwXk4X6m6LuQ==", + "version": "16.2.6", + "resolved": "https://registry.npmjs.org/@angular/platform-server/-/platform-server-16.2.6.tgz", + "integrity": "sha512-cobq32X6P21CAVrvhCe9COlqwsdJcqhkJaGe6fl3yVh6CfrojBT6a9vsjgNKH6etVXEaGlLY+lh6hCfyJmZ72A==", "requires": { - "domino": "^2.1.2", "tslib": "^2.3.0", "xhr2": "^0.2.0" } }, "@angular/router": { - "version": "15.2.8", - "resolved": "https://registry.npmjs.org/@angular/router/-/router-15.2.8.tgz", - "integrity": "sha512-C62QBEeJSBTNTrQHZiklPrxwJwuENoZzWX22MMJ7dxl+7VjRgnmj8J7mcX9fLjHlL+mC3RvesMlX7sGZRQV1cg==", + "version": "16.2.6", + "resolved": "https://registry.npmjs.org/@angular/router/-/router-16.2.6.tgz", + "integrity": "sha512-huORA6D1UriaswbvVgfxpYQJofZ3hSDdJYRMI4lDcu1n6CaCoYnj8E3rqaU5U1Va0OeFmxzOuXG+3WyL+YfZgg==", "requires": { "tslib": "^2.3.0" } }, "@angular/service-worker": { - "version": "15.2.8", - "resolved": "https://registry.npmjs.org/@angular/service-worker/-/service-worker-15.2.8.tgz", - "integrity": "sha512-iD3qsqN/N2014uCuCka77pu0tqPPsLcP9rUZgAJEM01o/A/ez+E3TmWW2PYvSq2zLZQnZZ40a7dWonIAclJq3Q==", + "version": "16.2.6", + "resolved": "https://registry.npmjs.org/@angular/service-worker/-/service-worker-16.2.6.tgz", + "integrity": "sha512-kLs+kQYI2w7OPi7B1F/YFwJiFos8+RJiHI7tDux3IVe5KeWr5XN9U8CEpTS2qL+CktXtWb6I9q3fFqcaaTQdDQ==", "requires": { "tslib": "^2.3.0" } }, "@angular/youtube-player": { - "version": "15.2.8", - "resolved": "https://registry.npmjs.org/@angular/youtube-player/-/youtube-player-15.2.8.tgz", - "integrity": "sha512-yo5C48spbYF3S8iMg7XCgXEapA2azOhUqiEsFv38DMCKcd8UyvUEtoNaW85J3JTsb/oB66hjtxcF8xyZbWdaBQ==", + "version": "16.2.5", + "resolved": "https://registry.npmjs.org/@angular/youtube-player/-/youtube-player-16.2.5.tgz", + "integrity": "sha512-4RzjKIdTmY0/XFAKuSpaTyp9wYdBV90E5FqyfBwcEOpzoX3rv24N23zrpY9g2xyF2q5AKbvKxBctsLXf1iDToA==", "requires": { "@types/youtube": "^0.0.42", "tslib": "^2.3.0" @@ -17557,769 +18792,466 @@ } } }, - "@aws-sdk/abort-controller": { - "version": "3.357.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/abort-controller/-/abort-controller-3.357.0.tgz", - "integrity": "sha512-nQYDJon87quPwt2JZJwUN2GFKJnvE5kWb6tZP4xb5biSGUKBqDQo06oYed7yokatCuCMouIXV462aN0fWODtOw==", - "requires": { - "@aws-sdk/types": "3.357.0", - "tslib": "^2.5.0" - } - }, - "@aws-sdk/chunked-blob-reader": { - "version": "3.310.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/chunked-blob-reader/-/chunked-blob-reader-3.310.0.tgz", - "integrity": "sha512-CrJS3exo4mWaLnWxfCH+w88Ou0IcAZSIkk4QbmxiHl/5Dq705OLoxf4385MVyExpqpeVJYOYQ2WaD8i/pQZ2fg==", - "requires": { - "tslib": "^2.5.0" - } - }, "@aws-sdk/client-s3": { - "version": "3.360.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/client-s3/-/client-s3-3.360.0.tgz", - "integrity": "sha512-6URI0ZWk5ar0atJ8xTxD2u/oLWwBlosLTyqNpsMe7DKvZQ5DgUfLw3BHeC2d4FQID1I74rkGCdHLtRe4MOiIfA==", + "version": "3.418.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/client-s3/-/client-s3-3.418.0.tgz", + "integrity": "sha512-VdDM9xS84t8W1B2/QJTK6mYVCnf7Hovg8Aum9NHm+bD7F0Ni2NTLVjm8+qq9STi4YSeXAy3Pe+FBUP9Wthw7Iw==", "requires": { "@aws-crypto/sha1-browser": "3.0.0", "@aws-crypto/sha256-browser": "3.0.0", "@aws-crypto/sha256-js": "3.0.0", - "@aws-sdk/client-sts": "3.360.0", - "@aws-sdk/config-resolver": "3.357.0", - "@aws-sdk/credential-provider-node": "3.360.0", - "@aws-sdk/eventstream-serde-browser": "3.357.0", - "@aws-sdk/eventstream-serde-config-resolver": "3.357.0", - "@aws-sdk/eventstream-serde-node": "3.357.0", - "@aws-sdk/fetch-http-handler": "3.357.0", - "@aws-sdk/hash-blob-browser": "3.357.0", - "@aws-sdk/hash-node": "3.357.0", - "@aws-sdk/hash-stream-node": "3.357.0", - "@aws-sdk/invalid-dependency": "3.357.0", - "@aws-sdk/md5-js": "3.357.0", - "@aws-sdk/middleware-bucket-endpoint": "3.357.0", - "@aws-sdk/middleware-content-length": "3.357.0", - "@aws-sdk/middleware-endpoint": "3.357.0", - "@aws-sdk/middleware-expect-continue": "3.357.0", - "@aws-sdk/middleware-flexible-checksums": "3.357.0", - "@aws-sdk/middleware-host-header": "3.357.0", - "@aws-sdk/middleware-location-constraint": "3.357.0", - "@aws-sdk/middleware-logger": "3.357.0", - "@aws-sdk/middleware-recursion-detection": "3.357.0", - "@aws-sdk/middleware-retry": "3.357.0", - "@aws-sdk/middleware-sdk-s3": "3.357.0", - "@aws-sdk/middleware-serde": "3.357.0", - "@aws-sdk/middleware-signing": "3.357.0", - "@aws-sdk/middleware-ssec": "3.357.0", - "@aws-sdk/middleware-stack": "3.357.0", - "@aws-sdk/middleware-user-agent": "3.357.0", - "@aws-sdk/node-config-provider": "3.357.0", - "@aws-sdk/node-http-handler": "3.360.0", - "@aws-sdk/signature-v4-multi-region": "3.357.0", - "@aws-sdk/smithy-client": "3.360.0", - "@aws-sdk/types": "3.357.0", - "@aws-sdk/url-parser": "3.357.0", - "@aws-sdk/util-base64": "3.310.0", - "@aws-sdk/util-body-length-browser": "3.310.0", - "@aws-sdk/util-body-length-node": "3.310.0", - "@aws-sdk/util-defaults-mode-browser": "3.360.0", - "@aws-sdk/util-defaults-mode-node": "3.360.0", - "@aws-sdk/util-endpoints": "3.357.0", - "@aws-sdk/util-retry": "3.357.0", - "@aws-sdk/util-stream": "3.360.0", - "@aws-sdk/util-user-agent-browser": "3.357.0", - "@aws-sdk/util-user-agent-node": "3.357.0", - "@aws-sdk/util-utf8": "3.310.0", - "@aws-sdk/util-waiter": "3.357.0", + "@aws-sdk/client-sts": "3.418.0", + "@aws-sdk/credential-provider-node": "3.418.0", + "@aws-sdk/middleware-bucket-endpoint": "3.418.0", + "@aws-sdk/middleware-expect-continue": "3.418.0", + "@aws-sdk/middleware-flexible-checksums": "3.418.0", + "@aws-sdk/middleware-host-header": "3.418.0", + "@aws-sdk/middleware-location-constraint": "3.418.0", + "@aws-sdk/middleware-logger": "3.418.0", + "@aws-sdk/middleware-recursion-detection": "3.418.0", + "@aws-sdk/middleware-sdk-s3": "3.418.0", + "@aws-sdk/middleware-signing": "3.418.0", + "@aws-sdk/middleware-ssec": "3.418.0", + "@aws-sdk/middleware-user-agent": "3.418.0", + "@aws-sdk/region-config-resolver": "3.418.0", + "@aws-sdk/signature-v4-multi-region": "3.418.0", + "@aws-sdk/types": "3.418.0", + "@aws-sdk/util-endpoints": "3.418.0", + "@aws-sdk/util-user-agent-browser": "3.418.0", + "@aws-sdk/util-user-agent-node": "3.418.0", "@aws-sdk/xml-builder": "3.310.0", - "@smithy/protocol-http": "^1.0.1", - "@smithy/types": "^1.0.0", + "@smithy/config-resolver": "^2.0.10", + "@smithy/eventstream-serde-browser": "^2.0.9", + "@smithy/eventstream-serde-config-resolver": "^2.0.9", + "@smithy/eventstream-serde-node": "^2.0.9", + "@smithy/fetch-http-handler": "^2.1.5", + "@smithy/hash-blob-browser": "^2.0.9", + "@smithy/hash-node": "^2.0.9", + "@smithy/hash-stream-node": "^2.0.9", + "@smithy/invalid-dependency": "^2.0.9", + "@smithy/md5-js": "^2.0.9", + "@smithy/middleware-content-length": "^2.0.11", + "@smithy/middleware-endpoint": "^2.0.9", + "@smithy/middleware-retry": "^2.0.12", + "@smithy/middleware-serde": "^2.0.9", + "@smithy/middleware-stack": "^2.0.2", + "@smithy/node-config-provider": "^2.0.12", + "@smithy/node-http-handler": "^2.1.5", + "@smithy/protocol-http": "^3.0.5", + "@smithy/smithy-client": "^2.1.6", + "@smithy/types": "^2.3.3", + "@smithy/url-parser": "^2.0.9", + "@smithy/util-base64": "^2.0.0", + "@smithy/util-body-length-browser": "^2.0.0", + "@smithy/util-body-length-node": "^2.1.0", + "@smithy/util-defaults-mode-browser": "^2.0.10", + "@smithy/util-defaults-mode-node": "^2.0.12", + "@smithy/util-retry": "^2.0.2", + "@smithy/util-stream": "^2.0.12", + "@smithy/util-utf8": "^2.0.0", + "@smithy/util-waiter": "^2.0.9", "fast-xml-parser": "4.2.5", "tslib": "^2.5.0" } }, "@aws-sdk/client-sso": { - "version": "3.360.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/client-sso/-/client-sso-3.360.0.tgz", - "integrity": "sha512-0f6eG+6XFbDxrma5xxNGg/FJxh/OHC6h8AkfNms9Lv1gBoQSagpcTor+ax0z9F6lypOjaelX6k4DpeKAp4PZeA==", + "version": "3.418.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/client-sso/-/client-sso-3.418.0.tgz", + "integrity": "sha512-fakz3YeSW/kCAOJ5w4ObrrQBxsYO8sU8i6WHLv6iWAsYZKAws2Mqa8g89P61+GitSH4z9waksdLouS6ep78/5A==", "requires": { "@aws-crypto/sha256-browser": "3.0.0", "@aws-crypto/sha256-js": "3.0.0", - "@aws-sdk/config-resolver": "3.357.0", - "@aws-sdk/fetch-http-handler": "3.357.0", - "@aws-sdk/hash-node": "3.357.0", - "@aws-sdk/invalid-dependency": "3.357.0", - "@aws-sdk/middleware-content-length": "3.357.0", - "@aws-sdk/middleware-endpoint": "3.357.0", - "@aws-sdk/middleware-host-header": "3.357.0", - "@aws-sdk/middleware-logger": "3.357.0", - "@aws-sdk/middleware-recursion-detection": "3.357.0", - "@aws-sdk/middleware-retry": "3.357.0", - "@aws-sdk/middleware-serde": "3.357.0", - "@aws-sdk/middleware-stack": "3.357.0", - "@aws-sdk/middleware-user-agent": "3.357.0", - "@aws-sdk/node-config-provider": "3.357.0", - "@aws-sdk/node-http-handler": "3.360.0", - "@aws-sdk/smithy-client": "3.360.0", - "@aws-sdk/types": "3.357.0", - "@aws-sdk/url-parser": "3.357.0", - "@aws-sdk/util-base64": "3.310.0", - "@aws-sdk/util-body-length-browser": "3.310.0", - "@aws-sdk/util-body-length-node": "3.310.0", - "@aws-sdk/util-defaults-mode-browser": "3.360.0", - "@aws-sdk/util-defaults-mode-node": "3.360.0", - "@aws-sdk/util-endpoints": "3.357.0", - "@aws-sdk/util-retry": "3.357.0", - "@aws-sdk/util-user-agent-browser": "3.357.0", - "@aws-sdk/util-user-agent-node": "3.357.0", - "@aws-sdk/util-utf8": "3.310.0", - "@smithy/protocol-http": "^1.0.1", - "@smithy/types": "^1.0.0", - "tslib": "^2.5.0" - } - }, - "@aws-sdk/client-sso-oidc": { - "version": "3.360.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/client-sso-oidc/-/client-sso-oidc-3.360.0.tgz", - "integrity": "sha512-czIpPt75fS3gH3vgFz76+WTaKcvPxC/DnPuqVyHdihMmP0UuwGPU9jn+Xx9RdUw7Yay3+rJRe3AYgBn4Xb220g==", - "requires": { - "@aws-crypto/sha256-browser": "3.0.0", - "@aws-crypto/sha256-js": "3.0.0", - "@aws-sdk/config-resolver": "3.357.0", - "@aws-sdk/fetch-http-handler": "3.357.0", - "@aws-sdk/hash-node": "3.357.0", - "@aws-sdk/invalid-dependency": "3.357.0", - "@aws-sdk/middleware-content-length": "3.357.0", - "@aws-sdk/middleware-endpoint": "3.357.0", - "@aws-sdk/middleware-host-header": "3.357.0", - "@aws-sdk/middleware-logger": "3.357.0", - "@aws-sdk/middleware-recursion-detection": "3.357.0", - "@aws-sdk/middleware-retry": "3.357.0", - "@aws-sdk/middleware-serde": "3.357.0", - "@aws-sdk/middleware-stack": "3.357.0", - "@aws-sdk/middleware-user-agent": "3.357.0", - "@aws-sdk/node-config-provider": "3.357.0", - "@aws-sdk/node-http-handler": "3.360.0", - "@aws-sdk/smithy-client": "3.360.0", - "@aws-sdk/types": "3.357.0", - "@aws-sdk/url-parser": "3.357.0", - "@aws-sdk/util-base64": "3.310.0", - "@aws-sdk/util-body-length-browser": "3.310.0", - "@aws-sdk/util-body-length-node": "3.310.0", - "@aws-sdk/util-defaults-mode-browser": "3.360.0", - "@aws-sdk/util-defaults-mode-node": "3.360.0", - "@aws-sdk/util-endpoints": "3.357.0", - "@aws-sdk/util-retry": "3.357.0", - "@aws-sdk/util-user-agent-browser": "3.357.0", - "@aws-sdk/util-user-agent-node": "3.357.0", - "@aws-sdk/util-utf8": "3.310.0", - "@smithy/protocol-http": "^1.0.1", - "@smithy/types": "^1.0.0", + "@aws-sdk/middleware-host-header": "3.418.0", + "@aws-sdk/middleware-logger": "3.418.0", + "@aws-sdk/middleware-recursion-detection": "3.418.0", + "@aws-sdk/middleware-user-agent": "3.418.0", + "@aws-sdk/region-config-resolver": "3.418.0", + "@aws-sdk/types": "3.418.0", + "@aws-sdk/util-endpoints": "3.418.0", + "@aws-sdk/util-user-agent-browser": "3.418.0", + "@aws-sdk/util-user-agent-node": "3.418.0", + "@smithy/config-resolver": "^2.0.10", + "@smithy/fetch-http-handler": "^2.1.5", + "@smithy/hash-node": "^2.0.9", + "@smithy/invalid-dependency": "^2.0.9", + "@smithy/middleware-content-length": "^2.0.11", + "@smithy/middleware-endpoint": "^2.0.9", + "@smithy/middleware-retry": "^2.0.12", + "@smithy/middleware-serde": "^2.0.9", + "@smithy/middleware-stack": "^2.0.2", + "@smithy/node-config-provider": "^2.0.12", + "@smithy/node-http-handler": "^2.1.5", + "@smithy/protocol-http": "^3.0.5", + "@smithy/smithy-client": "^2.1.6", + "@smithy/types": "^2.3.3", + "@smithy/url-parser": "^2.0.9", + "@smithy/util-base64": "^2.0.0", + "@smithy/util-body-length-browser": "^2.0.0", + "@smithy/util-body-length-node": "^2.1.0", + "@smithy/util-defaults-mode-browser": "^2.0.10", + "@smithy/util-defaults-mode-node": "^2.0.12", + "@smithy/util-retry": "^2.0.2", + "@smithy/util-utf8": "^2.0.0", "tslib": "^2.5.0" } }, "@aws-sdk/client-sts": { - "version": "3.360.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/client-sts/-/client-sts-3.360.0.tgz", - "integrity": "sha512-ORRwSdwlSYGHfhQCXKtr1eJeTjI14l5IZRJbRDgXs46y4/GQj/rt/2Q6WGjVMfM1ZRRiEII2/vK7mU7IJcWkFw==", + "version": "3.418.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/client-sts/-/client-sts-3.418.0.tgz", + "integrity": "sha512-L0n0Hw+Pm+BhXTN1bYZ0y4JAMArYgazdHf1nUSlEHndgZicCCuQtlMLxfo3i/IbtWi0dzfZcZ9d/MdAM8p4Jyw==", "requires": { "@aws-crypto/sha256-browser": "3.0.0", "@aws-crypto/sha256-js": "3.0.0", - "@aws-sdk/config-resolver": "3.357.0", - "@aws-sdk/credential-provider-node": "3.360.0", - "@aws-sdk/fetch-http-handler": "3.357.0", - "@aws-sdk/hash-node": "3.357.0", - "@aws-sdk/invalid-dependency": "3.357.0", - "@aws-sdk/middleware-content-length": "3.357.0", - "@aws-sdk/middleware-endpoint": "3.357.0", - "@aws-sdk/middleware-host-header": "3.357.0", - "@aws-sdk/middleware-logger": "3.357.0", - "@aws-sdk/middleware-recursion-detection": "3.357.0", - "@aws-sdk/middleware-retry": "3.357.0", - "@aws-sdk/middleware-sdk-sts": "3.357.0", - "@aws-sdk/middleware-serde": "3.357.0", - "@aws-sdk/middleware-signing": "3.357.0", - "@aws-sdk/middleware-stack": "3.357.0", - "@aws-sdk/middleware-user-agent": "3.357.0", - "@aws-sdk/node-config-provider": "3.357.0", - "@aws-sdk/node-http-handler": "3.360.0", - "@aws-sdk/smithy-client": "3.360.0", - "@aws-sdk/types": "3.357.0", - "@aws-sdk/url-parser": "3.357.0", - "@aws-sdk/util-base64": "3.310.0", - "@aws-sdk/util-body-length-browser": "3.310.0", - "@aws-sdk/util-body-length-node": "3.310.0", - "@aws-sdk/util-defaults-mode-browser": "3.360.0", - "@aws-sdk/util-defaults-mode-node": "3.360.0", - "@aws-sdk/util-endpoints": "3.357.0", - "@aws-sdk/util-retry": "3.357.0", - "@aws-sdk/util-user-agent-browser": "3.357.0", - "@aws-sdk/util-user-agent-node": "3.357.0", - "@aws-sdk/util-utf8": "3.310.0", - "@smithy/protocol-http": "^1.0.1", - "@smithy/types": "^1.0.0", + "@aws-sdk/credential-provider-node": "3.418.0", + "@aws-sdk/middleware-host-header": "3.418.0", + "@aws-sdk/middleware-logger": "3.418.0", + "@aws-sdk/middleware-recursion-detection": "3.418.0", + "@aws-sdk/middleware-sdk-sts": "3.418.0", + "@aws-sdk/middleware-signing": "3.418.0", + "@aws-sdk/middleware-user-agent": "3.418.0", + "@aws-sdk/region-config-resolver": "3.418.0", + "@aws-sdk/types": "3.418.0", + "@aws-sdk/util-endpoints": "3.418.0", + "@aws-sdk/util-user-agent-browser": "3.418.0", + "@aws-sdk/util-user-agent-node": "3.418.0", + "@smithy/config-resolver": "^2.0.10", + "@smithy/fetch-http-handler": "^2.1.5", + "@smithy/hash-node": "^2.0.9", + "@smithy/invalid-dependency": "^2.0.9", + "@smithy/middleware-content-length": "^2.0.11", + "@smithy/middleware-endpoint": "^2.0.9", + "@smithy/middleware-retry": "^2.0.12", + "@smithy/middleware-serde": "^2.0.9", + "@smithy/middleware-stack": "^2.0.2", + "@smithy/node-config-provider": "^2.0.12", + "@smithy/node-http-handler": "^2.1.5", + "@smithy/protocol-http": "^3.0.5", + "@smithy/smithy-client": "^2.1.6", + "@smithy/types": "^2.3.3", + "@smithy/url-parser": "^2.0.9", + "@smithy/util-base64": "^2.0.0", + "@smithy/util-body-length-browser": "^2.0.0", + "@smithy/util-body-length-node": "^2.1.0", + "@smithy/util-defaults-mode-browser": "^2.0.10", + "@smithy/util-defaults-mode-node": "^2.0.12", + "@smithy/util-retry": "^2.0.2", + "@smithy/util-utf8": "^2.0.0", "fast-xml-parser": "4.2.5", "tslib": "^2.5.0" } }, - "@aws-sdk/config-resolver": { - "version": "3.357.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/config-resolver/-/config-resolver-3.357.0.tgz", - "integrity": "sha512-cukfg0nX7Tzx/xFyH5F4Eyb8DA1ITCGtSQv4vnEjgUop+bkzckuGLKEeBcBhyZY+aw+2C9CVwIHwIMhRm0ul5w==", - "requires": { - "@aws-sdk/types": "3.357.0", - "@aws-sdk/util-config-provider": "3.310.0", - "@aws-sdk/util-middleware": "3.357.0", - "tslib": "^2.5.0" - } - }, "@aws-sdk/credential-provider-env": { - "version": "3.357.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-env/-/credential-provider-env-3.357.0.tgz", - "integrity": "sha512-UOecwfqvXgJVqhfWSZ2S44v2Nq2oceW0PQVQp0JAa9opc2rxSVIfyOhPr0yMoPmpyNcP22rgeg6ce70KULYwiA==", + "version": "3.418.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-env/-/credential-provider-env-3.418.0.tgz", + "integrity": "sha512-e74sS+x63EZUBO+HaI8zor886YdtmULzwKdctsZp5/37Xho1CVUNtEC+fYa69nigBD9afoiH33I4JggaHgrekQ==", "requires": { - "@aws-sdk/property-provider": "3.357.0", - "@aws-sdk/types": "3.357.0", - "tslib": "^2.5.0" - } - }, - "@aws-sdk/credential-provider-imds": { - "version": "3.357.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-imds/-/credential-provider-imds-3.357.0.tgz", - "integrity": "sha512-upw/bfsl7/WydT6gM0lBuR4Ipp4fzYm/E3ObFr0Mg5OkgVPt5ZJE+eeFTvwCpDdBSTKs4JfrK6/iEK8A23Q1jQ==", - "requires": { - "@aws-sdk/node-config-provider": "3.357.0", - "@aws-sdk/property-provider": "3.357.0", - "@aws-sdk/types": "3.357.0", - "@aws-sdk/url-parser": "3.357.0", + "@aws-sdk/types": "3.418.0", + "@smithy/property-provider": "^2.0.0", + "@smithy/types": "^2.3.3", "tslib": "^2.5.0" } }, "@aws-sdk/credential-provider-ini": { - "version": "3.360.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-ini/-/credential-provider-ini-3.360.0.tgz", - "integrity": "sha512-pWuLTq+yjSFssPGhDJ8oxvZsu7/F1KissGRt65G4qrfxHhoiMRcLF1GtFJueDQpitZ1i3mZXHVn/OSv4LPQ1Lw==", + "version": "3.418.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-ini/-/credential-provider-ini-3.418.0.tgz", + "integrity": "sha512-LTAeKKV85unlSqGNIeqEZ4N9gufaSoH+670n5YTUEk564zHCkUQW0PJomzLF5jKBco6Yfzv6rPBTukd+x9XWqw==", "requires": { - "@aws-sdk/credential-provider-env": "3.357.0", - "@aws-sdk/credential-provider-imds": "3.357.0", - "@aws-sdk/credential-provider-process": "3.357.0", - "@aws-sdk/credential-provider-sso": "3.360.0", - "@aws-sdk/credential-provider-web-identity": "3.357.0", - "@aws-sdk/property-provider": "3.357.0", - "@aws-sdk/shared-ini-file-loader": "3.357.0", - "@aws-sdk/types": "3.357.0", + "@aws-sdk/credential-provider-env": "3.418.0", + "@aws-sdk/credential-provider-process": "3.418.0", + "@aws-sdk/credential-provider-sso": "3.418.0", + "@aws-sdk/credential-provider-web-identity": "3.418.0", + "@aws-sdk/types": "3.418.0", + "@smithy/credential-provider-imds": "^2.0.0", + "@smithy/property-provider": "^2.0.0", + "@smithy/shared-ini-file-loader": "^2.0.6", + "@smithy/types": "^2.3.3", "tslib": "^2.5.0" } }, "@aws-sdk/credential-provider-node": { - "version": "3.360.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-node/-/credential-provider-node-3.360.0.tgz", - "integrity": "sha512-j4Lu5vXkdzz/L6fGKKxnL0vcwAGHlwFHjTg9nRagMn1lvaVjtktXeM30duHTBQq9i+ejdFxpVNWYrmHGaWPNdg==", + "version": "3.418.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-node/-/credential-provider-node-3.418.0.tgz", + "integrity": "sha512-VveTjtSC6m8YXj3fQDkMKEZuHv+CR2Z4u/NAN51Fi4xOtIWUtOBj5rfZ8HmBYoBjRF0DtRlPXuMiNnXAzTctfQ==", "requires": { - "@aws-sdk/credential-provider-env": "3.357.0", - "@aws-sdk/credential-provider-imds": "3.357.0", - "@aws-sdk/credential-provider-ini": "3.360.0", - "@aws-sdk/credential-provider-process": "3.357.0", - "@aws-sdk/credential-provider-sso": "3.360.0", - "@aws-sdk/credential-provider-web-identity": "3.357.0", - "@aws-sdk/property-provider": "3.357.0", - "@aws-sdk/shared-ini-file-loader": "3.357.0", - "@aws-sdk/types": "3.357.0", + "@aws-sdk/credential-provider-env": "3.418.0", + "@aws-sdk/credential-provider-ini": "3.418.0", + "@aws-sdk/credential-provider-process": "3.418.0", + "@aws-sdk/credential-provider-sso": "3.418.0", + "@aws-sdk/credential-provider-web-identity": "3.418.0", + "@aws-sdk/types": "3.418.0", + "@smithy/credential-provider-imds": "^2.0.0", + "@smithy/property-provider": "^2.0.0", + "@smithy/shared-ini-file-loader": "^2.0.6", + "@smithy/types": "^2.3.3", "tslib": "^2.5.0" } }, "@aws-sdk/credential-provider-process": { - "version": "3.357.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-process/-/credential-provider-process-3.357.0.tgz", - "integrity": "sha512-qFWWilFPsc2hR7O0KIhwcE78w+pVIK+uQR6MQMfdRyxUndgiuCorJwVjedc3yZtmnoELHF34j+m8whTBXv9E7Q==", + "version": "3.418.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-process/-/credential-provider-process-3.418.0.tgz", + "integrity": "sha512-xPbdm2WKz1oH6pTkrJoUmr3OLuqvvcPYTQX0IIlc31tmDwDWPQjXGGFD/vwZGIZIkKaFpFxVMgAzfFScxox7dw==", "requires": { - "@aws-sdk/property-provider": "3.357.0", - "@aws-sdk/shared-ini-file-loader": "3.357.0", - "@aws-sdk/types": "3.357.0", + "@aws-sdk/types": "3.418.0", + "@smithy/property-provider": "^2.0.0", + "@smithy/shared-ini-file-loader": "^2.0.6", + "@smithy/types": "^2.3.3", "tslib": "^2.5.0" } }, "@aws-sdk/credential-provider-sso": { - "version": "3.360.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-sso/-/credential-provider-sso-3.360.0.tgz", - "integrity": "sha512-kW0FR8AbMQrJxADxIqYSjHVN2RXwHmA5DzogYm1AjOkYRMN9JHDVOMQP2K2M6FCynZqTYsKW5lzjPOjS0fu8Dw==", + "version": "3.418.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-sso/-/credential-provider-sso-3.418.0.tgz", + "integrity": "sha512-tUF5Hg/HfaU5t+E7IuvohYlodSIlBXa28xAJPPFxhKrUnvP6AIoW6JLazOtCIQjQgJYEUILV29XX+ojUuITcaw==", "requires": { - "@aws-sdk/client-sso": "3.360.0", - "@aws-sdk/property-provider": "3.357.0", - "@aws-sdk/shared-ini-file-loader": "3.357.0", - "@aws-sdk/token-providers": "3.360.0", - "@aws-sdk/types": "3.357.0", + "@aws-sdk/client-sso": "3.418.0", + "@aws-sdk/token-providers": "3.418.0", + "@aws-sdk/types": "3.418.0", + "@smithy/property-provider": "^2.0.0", + "@smithy/shared-ini-file-loader": "^2.0.6", + "@smithy/types": "^2.3.3", "tslib": "^2.5.0" } }, "@aws-sdk/credential-provider-web-identity": { - "version": "3.357.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-web-identity/-/credential-provider-web-identity-3.357.0.tgz", - "integrity": "sha512-0KRRAFrXy5HJe2vqnCWCoCS+fQw7IoIj3KQsuURJMW4F+ifisxCgEsh3brJ2LQlN4ElWTRJhlrDHNZ/pd61D4w==", + "version": "3.418.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-web-identity/-/credential-provider-web-identity-3.418.0.tgz", + "integrity": "sha512-do7ang565n9p3dS1JdsQY01rUfRx8vkxQqz5M8OlcEHBNiCdi2PvSjNwcBdrv/FKkyIxZb0TImOfBSt40hVdxQ==", "requires": { - "@aws-sdk/property-provider": "3.357.0", - "@aws-sdk/types": "3.357.0", - "tslib": "^2.5.0" - } - }, - "@aws-sdk/eventstream-codec": { - "version": "3.357.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/eventstream-codec/-/eventstream-codec-3.357.0.tgz", - "integrity": "sha512-bqenTHG6GH6aCk/Il+ooWXVVAZuc8lOgVEy9bE2hI49oVqT8zSuXxQB+w1WWyZoAOPcelsjayB1wfPub8VDBxQ==", - "requires": { - "@aws-crypto/crc32": "3.0.0", - "@aws-sdk/types": "3.357.0", - "@aws-sdk/util-hex-encoding": "3.310.0", - "tslib": "^2.5.0" - } - }, - "@aws-sdk/eventstream-serde-browser": { - "version": "3.357.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/eventstream-serde-browser/-/eventstream-serde-browser-3.357.0.tgz", - "integrity": "sha512-hBabtmwuspVHGSKnUccDiSIbg+IVoBThx6wYt6i4edbWAITHF3ADVKXy7icV400CAyG0XTZgxjE6FKpiDxj9rQ==", - "requires": { - "@aws-sdk/eventstream-serde-universal": "3.357.0", - "@aws-sdk/types": "3.357.0", - "tslib": "^2.5.0" - } - }, - "@aws-sdk/eventstream-serde-config-resolver": { - "version": "3.357.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/eventstream-serde-config-resolver/-/eventstream-serde-config-resolver-3.357.0.tgz", - "integrity": "sha512-E6rwk+1KFXhKmJ+v7JW5Uyyda1yN5XRVupCnCrtFsHFmhVGQxFacoUZIee3bfuCpC58dLSyESggxGpUd3XOSsw==", - "requires": { - "@aws-sdk/types": "3.357.0", - "tslib": "^2.5.0" - } - }, - "@aws-sdk/eventstream-serde-node": { - "version": "3.357.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/eventstream-serde-node/-/eventstream-serde-node-3.357.0.tgz", - "integrity": "sha512-boXDy+JWcPfHc9OIKV6I4Bh2XrLcg+eac+/LldNZFcDIB33/gHIM2CJw8u565Iebdz1NKEkP/QPPZbk2y+abPA==", - "requires": { - "@aws-sdk/eventstream-serde-universal": "3.357.0", - "@aws-sdk/types": "3.357.0", - "tslib": "^2.5.0" - } - }, - "@aws-sdk/eventstream-serde-universal": { - "version": "3.357.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/eventstream-serde-universal/-/eventstream-serde-universal-3.357.0.tgz", - "integrity": "sha512-9/Wcdxx38XQAturqOAGYNCaLOzFVnW+xwxd4af9eNOfZfZ5PP5PRKBIpvKDsN26e3l4f3GodHx7MS1WB7BBc2w==", - "requires": { - "@aws-sdk/eventstream-codec": "3.357.0", - "@aws-sdk/types": "3.357.0", - "tslib": "^2.5.0" - } - }, - "@aws-sdk/fetch-http-handler": { - "version": "3.357.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/fetch-http-handler/-/fetch-http-handler-3.357.0.tgz", - "integrity": "sha512-5sPloTO8y8fAnS/6/Sfp/aVoL9zuhzkLdWBORNzMazdynVNEzWKWCPZ27RQpgkaCDHiXjqUY4kfuFXAGkvFfDQ==", - "requires": { - "@aws-sdk/protocol-http": "3.357.0", - "@aws-sdk/querystring-builder": "3.357.0", - "@aws-sdk/types": "3.357.0", - "@aws-sdk/util-base64": "3.310.0", - "tslib": "^2.5.0" - } - }, - "@aws-sdk/hash-blob-browser": { - "version": "3.357.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/hash-blob-browser/-/hash-blob-browser-3.357.0.tgz", - "integrity": "sha512-RDd6UgrGHDmleTnXM9LRSSVa69euSAG2mlNhZMEDWk3OFseXVYqBDaqroVbQ01rM2UAe8MeBFchlV9OmxuVgvw==", - "requires": { - "@aws-sdk/chunked-blob-reader": "3.310.0", - "@aws-sdk/types": "3.357.0", - "tslib": "^2.5.0" - } - }, - "@aws-sdk/hash-node": { - "version": "3.357.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/hash-node/-/hash-node-3.357.0.tgz", - "integrity": "sha512-fq3LS9AxHKb7dTZkm6iM1TrGk6XOTZz96iEZPME1+vjiSEXGWuebHt87q92n+KozVGRypn9MId3lHOPBBjygNQ==", - "requires": { - "@aws-sdk/types": "3.357.0", - "@aws-sdk/util-buffer-from": "3.310.0", - "@aws-sdk/util-utf8": "3.310.0", - "tslib": "^2.5.0" - } - }, - "@aws-sdk/hash-stream-node": { - "version": "3.357.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/hash-stream-node/-/hash-stream-node-3.357.0.tgz", - "integrity": "sha512-KZjN1VAw1KHNp+xKVOWBGS+MpaYQTjZFD5f+7QQqW4TfbAkFFwIAEYIHq5Q8Gw+jVh0h61OrV/LyW3J2PVzc+w==", - "requires": { - "@aws-sdk/types": "3.357.0", - "@aws-sdk/util-utf8": "3.310.0", - "tslib": "^2.5.0" - } - }, - "@aws-sdk/invalid-dependency": { - "version": "3.357.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/invalid-dependency/-/invalid-dependency-3.357.0.tgz", - "integrity": "sha512-HnCYZczf0VdyxMVMMxmA3QJAyyPSFbcMtZzgKbxVTWTG7GKpQe0psWZu/7O2Nk31mKg6vEUdiP1FylqLBsgMOA==", - "requires": { - "@aws-sdk/types": "3.357.0", - "tslib": "^2.5.0" - } - }, - "@aws-sdk/is-array-buffer": { - "version": "3.310.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/is-array-buffer/-/is-array-buffer-3.310.0.tgz", - "integrity": "sha512-urnbcCR+h9NWUnmOtet/s4ghvzsidFmspfhYaHAmSRdy9yDjdjBJMFjjsn85A1ODUktztm+cVncXjQ38WCMjMQ==", - "requires": { - "tslib": "^2.5.0" - } - }, - "@aws-sdk/md5-js": { - "version": "3.357.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/md5-js/-/md5-js-3.357.0.tgz", - "integrity": "sha512-to42sFAL7KgV/X9X40LLfEaNMHMGQL6/7mPMVCL/W2BZf3zw5OTl3lAaNyjXA+gO5Uo4lFEiQKAQVKNbr8b8Nw==", - "requires": { - "@aws-sdk/types": "3.357.0", - "@aws-sdk/util-utf8": "3.310.0", + "@aws-sdk/types": "3.418.0", + "@smithy/property-provider": "^2.0.0", + "@smithy/types": "^2.3.3", "tslib": "^2.5.0" } }, "@aws-sdk/middleware-bucket-endpoint": { - "version": "3.357.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-bucket-endpoint/-/middleware-bucket-endpoint-3.357.0.tgz", - "integrity": "sha512-ep2T0FJXRDl6nffLqiVZUYfDocZ3B72wvHeozckkLVRX0TK91WEpzv4Zz2vdeBp6CGkM3g8oGjbb6ZqllUZ6TA==", + "version": "3.418.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-bucket-endpoint/-/middleware-bucket-endpoint-3.418.0.tgz", + "integrity": "sha512-gj/mj1UfbKkGbQ1N4YUvjTTp8BVs5fO1QAL2AjFJ+jfJOToLReX72aNEkm7sPGbHML0TqOY4cQbJuWYy+zdD5g==", "requires": { - "@aws-sdk/protocol-http": "3.357.0", - "@aws-sdk/types": "3.357.0", + "@aws-sdk/types": "3.418.0", "@aws-sdk/util-arn-parser": "3.310.0", - "@aws-sdk/util-config-provider": "3.310.0", - "tslib": "^2.5.0" - } - }, - "@aws-sdk/middleware-content-length": { - "version": "3.357.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-content-length/-/middleware-content-length-3.357.0.tgz", - "integrity": "sha512-zQOFEyzOXAgN4M54tYNWGxKxnyzY0WwYDTFzh9riJRmxN1hTEKHUKmze4nILIf5rkQmOG4kTf1qmfazjkvZAhw==", - "requires": { - "@aws-sdk/protocol-http": "3.357.0", - "@aws-sdk/types": "3.357.0", - "tslib": "^2.5.0" - } - }, - "@aws-sdk/middleware-endpoint": { - "version": "3.357.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-endpoint/-/middleware-endpoint-3.357.0.tgz", - "integrity": "sha512-ScJi0SL8X/Lyi0Fp5blg0QN/Z6PoRwV/ZJXd8dQkXSznkbSvJHfqPP0xk/w3GcQ1TKsu5YEPfeYy8ejcq+7Pgg==", - "requires": { - "@aws-sdk/middleware-serde": "3.357.0", - "@aws-sdk/types": "3.357.0", - "@aws-sdk/url-parser": "3.357.0", - "@aws-sdk/util-middleware": "3.357.0", + "@smithy/node-config-provider": "^2.0.12", + "@smithy/protocol-http": "^3.0.5", + "@smithy/types": "^2.3.3", + "@smithy/util-config-provider": "^2.0.0", "tslib": "^2.5.0" } }, "@aws-sdk/middleware-expect-continue": { - "version": "3.357.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-expect-continue/-/middleware-expect-continue-3.357.0.tgz", - "integrity": "sha512-KeizuiiDmdLeAbiNsJt/rZENY5iJo4wCTl7h81htDC60wSwVwFG03IdgvZlFH6jktYRh4mUDD/6Oljme6yPNxw==", + "version": "3.418.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-expect-continue/-/middleware-expect-continue-3.418.0.tgz", + "integrity": "sha512-6x4rcIj685EmqDLQkbWoCur3Dg5DRClHMen6nHXmD3CR5Xyt3z1Gk/+jmZICxyJo9c6M4AeZht8o95BopkmYAQ==", "requires": { - "@aws-sdk/protocol-http": "3.357.0", - "@aws-sdk/types": "3.357.0", + "@aws-sdk/types": "3.418.0", + "@smithy/protocol-http": "^3.0.5", + "@smithy/types": "^2.3.3", "tslib": "^2.5.0" } }, "@aws-sdk/middleware-flexible-checksums": { - "version": "3.357.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-flexible-checksums/-/middleware-flexible-checksums-3.357.0.tgz", - "integrity": "sha512-NNQ/iPN6YyzqgVaV8AeYQMZ8y1OmUW27vmt0R66UUw5H5THGc6X9QXoKfie7OHn80Qv1S8P5jw8z5MpvDtjSnQ==", + "version": "3.418.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-flexible-checksums/-/middleware-flexible-checksums-3.418.0.tgz", + "integrity": "sha512-3O203dqS2JU5P1TAAbo7p1qplXQh59pevw9nqzPVb3EG8B+mSucVf2kKmF7kGHqKSk+nK/mB/4XGSsZBzGt6Wg==", "requires": { "@aws-crypto/crc32": "3.0.0", "@aws-crypto/crc32c": "3.0.0", - "@aws-sdk/is-array-buffer": "3.310.0", - "@aws-sdk/protocol-http": "3.357.0", - "@aws-sdk/types": "3.357.0", - "@aws-sdk/util-utf8": "3.310.0", + "@aws-sdk/types": "3.418.0", + "@smithy/is-array-buffer": "^2.0.0", + "@smithy/protocol-http": "^3.0.5", + "@smithy/types": "^2.3.3", + "@smithy/util-utf8": "^2.0.0", "tslib": "^2.5.0" } }, "@aws-sdk/middleware-host-header": { - "version": "3.357.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-host-header/-/middleware-host-header-3.357.0.tgz", - "integrity": "sha512-HuGLcP7JP1qJ5wGT9GSlEknDaTSnOzHY4T6IPFuvFjAy3PvY5siQNm6+VRqdVS+n6/kzpL3JP5sAVM3aoxHT6Q==", + "version": "3.418.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-host-header/-/middleware-host-header-3.418.0.tgz", + "integrity": "sha512-LrMTdzalkPw/1ujLCKPLwCGvPMCmT4P+vOZQRbSEVZPnlZk+Aj++aL/RaHou0jL4kJH3zl8iQepriBt4a7UvXQ==", "requires": { - "@aws-sdk/protocol-http": "3.357.0", - "@aws-sdk/types": "3.357.0", + "@aws-sdk/types": "3.418.0", + "@smithy/protocol-http": "^3.0.5", + "@smithy/types": "^2.3.3", "tslib": "^2.5.0" } }, "@aws-sdk/middleware-location-constraint": { - "version": "3.357.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-location-constraint/-/middleware-location-constraint-3.357.0.tgz", - "integrity": "sha512-4IsIHhwZ2/o7yjLI1XtGMkJ442cbIN5/NtI/Ml0G5UHYviUm8sqvH2vldFBMK5bPuVdk6GpqXpy6wYc9rLJj2w==", + "version": "3.418.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-location-constraint/-/middleware-location-constraint-3.418.0.tgz", + "integrity": "sha512-cc8M3VEaESHJhDsDV8tTpt2QYUprDWhvAVVSlcL43cTdZ54Quc0W+toDiaVOUlwrAZz2Y7g5NDj22ibJGFbOvw==", "requires": { - "@aws-sdk/types": "3.357.0", + "@aws-sdk/types": "3.418.0", + "@smithy/types": "^2.3.3", "tslib": "^2.5.0" } }, "@aws-sdk/middleware-logger": { - "version": "3.357.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-logger/-/middleware-logger-3.357.0.tgz", - "integrity": "sha512-dncT3tr+lZ9+duZo52rASgO6AKVwRcsc2/T93gmaYVrJqI6WWAwQ7yML5s72l9ZjQ5LZ+4jjrgtlufavAS0eCg==", + "version": "3.418.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-logger/-/middleware-logger-3.418.0.tgz", + "integrity": "sha512-StKGmyPVfoO/wdNTtKemYwoJsqIl4l7oqarQY7VSf2Mp3mqaa+njLViHsQbirYpyqpgUEusOnuTlH5utxJ1NsQ==", "requires": { - "@aws-sdk/types": "3.357.0", + "@aws-sdk/types": "3.418.0", + "@smithy/types": "^2.3.3", "tslib": "^2.5.0" } }, "@aws-sdk/middleware-recursion-detection": { - "version": "3.357.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-recursion-detection/-/middleware-recursion-detection-3.357.0.tgz", - "integrity": "sha512-AXC54IeDS3jC1dbbkYHML4STvBPcKZ4IJTWdjEK1RCOgqXd0Ze1cE1e21wyj1tM6prF03zLyvpBd+3TS++nqfA==", + "version": "3.418.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-recursion-detection/-/middleware-recursion-detection-3.418.0.tgz", + "integrity": "sha512-kKFrIQglBLUFPbHSDy1+bbe3Na2Kd70JSUC3QLMbUHmqipXN8KeXRfAj7vTv97zXl0WzG0buV++WcNwOm1rFjg==", "requires": { - "@aws-sdk/protocol-http": "3.357.0", - "@aws-sdk/types": "3.357.0", + "@aws-sdk/types": "3.418.0", + "@smithy/protocol-http": "^3.0.5", + "@smithy/types": "^2.3.3", "tslib": "^2.5.0" } }, - "@aws-sdk/middleware-retry": { - "version": "3.357.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-retry/-/middleware-retry-3.357.0.tgz", - "integrity": "sha512-ZCbXCYv3nglQqwREYxxpclrnR9MYPAnHlLcC8e9PbApqxGnaZdhoywxoqbgqT3hf/RM7kput4vEHDl1fyymcRQ==", - "requires": { - "@aws-sdk/protocol-http": "3.357.0", - "@aws-sdk/service-error-classification": "3.357.0", - "@aws-sdk/types": "3.357.0", - "@aws-sdk/util-middleware": "3.357.0", - "@aws-sdk/util-retry": "3.357.0", - "tslib": "^2.5.0", - "uuid": "^8.3.2" - }, - "dependencies": { - "uuid": { - "version": "8.3.2", - "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz", - "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==" - } - } - }, "@aws-sdk/middleware-sdk-s3": { - "version": "3.357.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-sdk-s3/-/middleware-sdk-s3-3.357.0.tgz", - "integrity": "sha512-EFQaPD8SoXcK7RiEOZz0zIX9owQW6txu8vrOOVva9xMts36z/3E7b4FVsgEJ53Ixa1x38ddPJxp4U8EIaf+pvQ==", + "version": "3.418.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-sdk-s3/-/middleware-sdk-s3-3.418.0.tgz", + "integrity": "sha512-rei32LF45SyqL3NlWDjEOfMwAca9A5F4QgUyXJqvASc43oWC1tJnLIhiCxNh8qkWAiRyRzFpcanTeqyaRSsZpA==", "requires": { - "@aws-sdk/protocol-http": "3.357.0", - "@aws-sdk/types": "3.357.0", + "@aws-sdk/types": "3.418.0", "@aws-sdk/util-arn-parser": "3.310.0", + "@smithy/protocol-http": "^3.0.5", + "@smithy/smithy-client": "^2.1.6", + "@smithy/types": "^2.3.3", "tslib": "^2.5.0" } }, "@aws-sdk/middleware-sdk-sts": { - "version": "3.357.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-sdk-sts/-/middleware-sdk-sts-3.357.0.tgz", - "integrity": "sha512-Ng2VjLrPiL02QOcs1qs9jG2boO4Gn+v3VIbOJLG4zXcfbSq55iIWtlmr2ljfw9vP5aLhWtcODfmKHS5Bp+019Q==", + "version": "3.418.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-sdk-sts/-/middleware-sdk-sts-3.418.0.tgz", + "integrity": "sha512-cW8ijrCTP+mgihvcq4+TbhAcE/we5lFl4ydRqvTdtcSnYQAVQADg47rnTScQiFsPFEB3NKq7BGeyTJF9MKolPA==", "requires": { - "@aws-sdk/middleware-signing": "3.357.0", - "@aws-sdk/types": "3.357.0", - "tslib": "^2.5.0" - } - }, - "@aws-sdk/middleware-serde": { - "version": "3.357.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-serde/-/middleware-serde-3.357.0.tgz", - "integrity": "sha512-bGI4kYuuEsFjlANbyJLyy4AovETnyf/SukgLOG7Qjbua+ZGuzvRhMsk21mBKKGrnsTO4PmtieJo6xClThGAN8g==", - "requires": { - "@aws-sdk/types": "3.357.0", + "@aws-sdk/middleware-signing": "3.418.0", + "@aws-sdk/types": "3.418.0", + "@smithy/types": "^2.3.3", "tslib": "^2.5.0" } }, "@aws-sdk/middleware-signing": { - "version": "3.357.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-signing/-/middleware-signing-3.357.0.tgz", - "integrity": "sha512-yB9ewEqI6Fw1OrmKFrUypbCqN5ijk06UGPochybamMuPxxkwMT3bnrm7eezsCA+TZbJyKhpffpyobwuv+xGNrA==", + "version": "3.418.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-signing/-/middleware-signing-3.418.0.tgz", + "integrity": "sha512-onvs5KoYQE8OlOE740RxWBGtsUyVIgAo0CzRKOQO63ZEYqpL1Os+MS1CGzdNhvQnJgJruE1WW+Ix8fjN30zKPA==", "requires": { - "@aws-sdk/property-provider": "3.357.0", - "@aws-sdk/protocol-http": "3.357.0", - "@aws-sdk/signature-v4": "3.357.0", - "@aws-sdk/types": "3.357.0", - "@aws-sdk/util-middleware": "3.357.0", + "@aws-sdk/types": "3.418.0", + "@smithy/property-provider": "^2.0.0", + "@smithy/protocol-http": "^3.0.5", + "@smithy/signature-v4": "^2.0.0", + "@smithy/types": "^2.3.3", + "@smithy/util-middleware": "^2.0.2", "tslib": "^2.5.0" } }, "@aws-sdk/middleware-ssec": { - "version": "3.357.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-ssec/-/middleware-ssec-3.357.0.tgz", - "integrity": "sha512-uE3nNvJclcY7SgGoOgDCUgfc7ElXQmWVpks8AZzAjJj7bG5j6Bv3FOOYtGtvtxUzTHaOdn+yQwjssV1cZ6GTQw==", - "requires": { - "@aws-sdk/types": "3.357.0", - "tslib": "^2.5.0" - } - }, - "@aws-sdk/middleware-stack": { - "version": "3.357.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-stack/-/middleware-stack-3.357.0.tgz", - "integrity": "sha512-nNV+jfwGwmbOGZujAY/U8AW3EbVlxa9DJDLz3TPp/39o6Vu5KEzHJyDDNreo2k9V/TMvV+nOzHafufgPdagv7w==", + "version": "3.418.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-ssec/-/middleware-ssec-3.418.0.tgz", + "integrity": "sha512-J7K+5h6aP7IYMlu/NwHEIjb0+WDu1eFvO8TCPo6j1H9xYRi8B/6h+6pa9Rk9IgRUzFnrdlDu9FazG8Tp0KKLyg==", "requires": { + "@aws-sdk/types": "3.418.0", + "@smithy/types": "^2.3.3", "tslib": "^2.5.0" } }, "@aws-sdk/middleware-user-agent": { - "version": "3.357.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-user-agent/-/middleware-user-agent-3.357.0.tgz", - "integrity": "sha512-M/CsAXjGblZS4rEbMb0Dn9IXbfq4EjVaTHBfvuILU/dKRppWvjnm2lRtqCZ+LIT3ATbAjA3/dY7dWsjxQWwijA==", + "version": "3.418.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-user-agent/-/middleware-user-agent-3.418.0.tgz", + "integrity": "sha512-Jdcztg9Tal9SEAL0dKRrnpKrm6LFlWmAhvuwv0dQ7bNTJxIxyEFbpqdgy7mpQHsLVZgq1Aad/7gT/72c9igyZw==", "requires": { - "@aws-sdk/protocol-http": "3.357.0", - "@aws-sdk/types": "3.357.0", - "@aws-sdk/util-endpoints": "3.357.0", + "@aws-sdk/types": "3.418.0", + "@aws-sdk/util-endpoints": "3.418.0", + "@smithy/protocol-http": "^3.0.5", + "@smithy/types": "^2.3.3", "tslib": "^2.5.0" } }, - "@aws-sdk/node-config-provider": { - "version": "3.357.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/node-config-provider/-/node-config-provider-3.357.0.tgz", - "integrity": "sha512-kwBIzKCaW3UWqLdELhy7TcN8itNMOjbzga530nalFILMvn2IxrkdKQhNgxGBXy6QK6kCOtH6OmcrG3/oZkLwig==", + "@aws-sdk/region-config-resolver": { + "version": "3.418.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/region-config-resolver/-/region-config-resolver-3.418.0.tgz", + "integrity": "sha512-lJRZ/9TjZU6yLz+mAwxJkcJZ6BmyYoIJVo1p5+BN//EFdEmC8/c0c9gXMRzfISV/mqWSttdtccpAyN4/goHTYA==", "requires": { - "@aws-sdk/property-provider": "3.357.0", - "@aws-sdk/shared-ini-file-loader": "3.357.0", - "@aws-sdk/types": "3.357.0", - "tslib": "^2.5.0" - } - }, - "@aws-sdk/node-http-handler": { - "version": "3.360.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/node-http-handler/-/node-http-handler-3.360.0.tgz", - "integrity": "sha512-oMsXdMmNwHpUbebETO44bq0N4SocEMGfPjYNUTRs8md7ita5fuFd2qFuvf+ZRt6iVcGWluIqmF8DidD+b7d+TA==", - "requires": { - "@aws-sdk/abort-controller": "3.357.0", - "@aws-sdk/protocol-http": "3.357.0", - "@aws-sdk/querystring-builder": "3.357.0", - "@aws-sdk/types": "3.357.0", - "tslib": "^2.5.0" - } - }, - "@aws-sdk/property-provider": { - "version": "3.357.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/property-provider/-/property-provider-3.357.0.tgz", - "integrity": "sha512-im4W0u8WaYxG7J7ko4Xl3OEzK3Mrm1Rz6/txTGe6hTIHlyUISu1ekOQJXK6XYPqNMn8v1G3BiQREoRXUEJFbHg==", - "requires": { - "@aws-sdk/types": "3.357.0", - "tslib": "^2.5.0" - } - }, - "@aws-sdk/protocol-http": { - "version": "3.357.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/protocol-http/-/protocol-http-3.357.0.tgz", - "integrity": "sha512-w1JHiI50VEea7duDeAspUiKJmmdIQblvRyjVMOqWA6FIQAyDVuEiPX7/MdQr0ScxhtRQxHbP0I4MFyl7ctRQvA==", - "requires": { - "@aws-sdk/types": "3.357.0", - "tslib": "^2.5.0" - } - }, - "@aws-sdk/querystring-builder": { - "version": "3.357.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/querystring-builder/-/querystring-builder-3.357.0.tgz", - "integrity": "sha512-aQcicqB6Y2cNaXPPwunz612a01SMiQQPsdz632F/3Lzn0ua82BJKobHOtaiTUlmVJ5Q4/EAeNfwZgL7tTUNtDQ==", - "requires": { - "@aws-sdk/types": "3.357.0", - "@aws-sdk/util-uri-escape": "3.310.0", - "tslib": "^2.5.0" - } - }, - "@aws-sdk/querystring-parser": { - "version": "3.357.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/querystring-parser/-/querystring-parser-3.357.0.tgz", - "integrity": "sha512-Svvq+atRNP9s2VxiklcUNgCzmt3T5kfs7X2C+yjmxHvOQTPjLNaNGbfC/vhjOK7aoXw0h+lBac48r5ymx1PbQA==", - "requires": { - "@aws-sdk/types": "3.357.0", + "@smithy/node-config-provider": "^2.0.12", + "@smithy/types": "^2.3.3", + "@smithy/util-config-provider": "^2.0.0", + "@smithy/util-middleware": "^2.0.2", "tslib": "^2.5.0" } }, "@aws-sdk/s3-request-presigner": { - "version": "3.360.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/s3-request-presigner/-/s3-request-presigner-3.360.0.tgz", - "integrity": "sha512-SWfRyyEbGKnrllKRWHsFfS4xbfM1YHYsaO2PJRo49vYIZvsj10vs0HZX8fF0v4md1XW99E7wBanxkoMo3mYVvg==", + "version": "3.418.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/s3-request-presigner/-/s3-request-presigner-3.418.0.tgz", + "integrity": "sha512-fR/46jnNW2tpebUH5dSv0teZ1dXXgf/QjSxqnhmWFSs3CAxMNd6W54QqgbOMPdRBGFsVJH/OBu7bl7EhEBbY4w==", "requires": { - "@aws-sdk/middleware-endpoint": "3.357.0", - "@aws-sdk/protocol-http": "3.357.0", - "@aws-sdk/signature-v4-multi-region": "3.357.0", - "@aws-sdk/smithy-client": "3.360.0", - "@aws-sdk/types": "3.357.0", - "@aws-sdk/util-format-url": "3.357.0", - "tslib": "^2.5.0" - } - }, - "@aws-sdk/service-error-classification": { - "version": "3.357.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/service-error-classification/-/service-error-classification-3.357.0.tgz", - "integrity": "sha512-VuXeL4g5vKO9HjgCZlxmH8Uv1FcqUSjmbPpQkbNtYIDck6u0qzM0rG+n0/1EjyQbPSr3MhW/pkWs5nx2Nljlyg==" - }, - "@aws-sdk/shared-ini-file-loader": { - "version": "3.357.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/shared-ini-file-loader/-/shared-ini-file-loader-3.357.0.tgz", - "integrity": "sha512-ceyqM4XxQe0Plb/oQAD2t1UOV2Iy4PFe1oAGM8dfJzYrRKu7zvMwru7/WaB3NYq+/mIY6RU+jjhRmjQ3GySVqA==", - "requires": { - "@aws-sdk/types": "3.357.0", - "tslib": "^2.5.0" - } - }, - "@aws-sdk/signature-v4": { - "version": "3.357.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/signature-v4/-/signature-v4-3.357.0.tgz", - "integrity": "sha512-itt4/Jh9FqnzK30qIjXFBvM4J7zN4S/AAqsRMnaX7U4f/MV+1YxQHmzimpdMnsCXXs2jqFqKVRu6DewxJ3nbxg==", - "requires": { - "@aws-sdk/eventstream-codec": "3.357.0", - "@aws-sdk/is-array-buffer": "3.310.0", - "@aws-sdk/types": "3.357.0", - "@aws-sdk/util-hex-encoding": "3.310.0", - "@aws-sdk/util-middleware": "3.357.0", - "@aws-sdk/util-uri-escape": "3.310.0", - "@aws-sdk/util-utf8": "3.310.0", + "@aws-sdk/signature-v4-multi-region": "3.418.0", + "@aws-sdk/types": "3.418.0", + "@aws-sdk/util-format-url": "3.418.0", + "@smithy/middleware-endpoint": "^2.0.9", + "@smithy/protocol-http": "^3.0.5", + "@smithy/smithy-client": "^2.1.6", + "@smithy/types": "^2.3.3", "tslib": "^2.5.0" } }, "@aws-sdk/signature-v4-multi-region": { - "version": "3.357.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/signature-v4-multi-region/-/signature-v4-multi-region-3.357.0.tgz", - "integrity": "sha512-eyO3GibYLNCPZ/YxM/ZVDh1fTMKvIUj4fpVo0bxQTKNlqNkVumAIOVLoH5um1A9FN7nDdz+40a7jwYSPlkxW6A==", + "version": "3.418.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/signature-v4-multi-region/-/signature-v4-multi-region-3.418.0.tgz", + "integrity": "sha512-LeVYMZeUQUURFqDf4yZxTEv016g64hi0LqYBjU0mjwd8aPc0k6hckwvshezc80jCNbuLyjNfQclvlg3iFliItQ==", "requires": { - "@aws-sdk/protocol-http": "3.357.0", - "@aws-sdk/signature-v4": "3.357.0", - "@aws-sdk/types": "3.357.0", - "tslib": "^2.5.0" - } - }, - "@aws-sdk/smithy-client": { - "version": "3.360.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/smithy-client/-/smithy-client-3.360.0.tgz", - "integrity": "sha512-R7wbT2SkgWNEAxMekOTNcPcvBszabW2+qHjrcelbbVJNjx/2yK+MbpZI4WRSncByQMeeoW+aSUP+JgsbpiOWfw==", - "requires": { - "@aws-sdk/middleware-stack": "3.357.0", - "@aws-sdk/types": "3.357.0", - "@aws-sdk/util-stream": "3.360.0", - "@smithy/types": "^1.0.0", + "@aws-sdk/types": "3.418.0", + "@smithy/protocol-http": "^3.0.5", + "@smithy/signature-v4": "^2.0.0", + "@smithy/types": "^2.3.3", "tslib": "^2.5.0" } }, "@aws-sdk/token-providers": { - "version": "3.360.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/token-providers/-/token-providers-3.360.0.tgz", - "integrity": "sha512-gtnCmn2NL7uSwadqQPeU74Wo7Wf1NMJtui+KSWPYpc3joRZqIYj0kL5w0IT2S9tPQwCFerWVfhkvRkSGJ4nZ/g==", + "version": "3.418.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/token-providers/-/token-providers-3.418.0.tgz", + "integrity": "sha512-9P7Q0VN0hEzTngy3Sz5eya2qEOEf0Q8qf1vB3um0gE6ID6EVAdz/nc/DztfN32MFxk8FeVBrCP5vWdoOzmd72g==", "requires": { - "@aws-sdk/client-sso-oidc": "3.360.0", - "@aws-sdk/property-provider": "3.357.0", - "@aws-sdk/shared-ini-file-loader": "3.357.0", - "@aws-sdk/types": "3.357.0", + "@aws-crypto/sha256-browser": "3.0.0", + "@aws-crypto/sha256-js": "3.0.0", + "@aws-sdk/middleware-host-header": "3.418.0", + "@aws-sdk/middleware-logger": "3.418.0", + "@aws-sdk/middleware-recursion-detection": "3.418.0", + "@aws-sdk/middleware-user-agent": "3.418.0", + "@aws-sdk/types": "3.418.0", + "@aws-sdk/util-endpoints": "3.418.0", + "@aws-sdk/util-user-agent-browser": "3.418.0", + "@aws-sdk/util-user-agent-node": "3.418.0", + "@smithy/config-resolver": "^2.0.10", + "@smithy/fetch-http-handler": "^2.1.5", + "@smithy/hash-node": "^2.0.9", + "@smithy/invalid-dependency": "^2.0.9", + "@smithy/middleware-content-length": "^2.0.11", + "@smithy/middleware-endpoint": "^2.0.9", + "@smithy/middleware-retry": "^2.0.12", + "@smithy/middleware-serde": "^2.0.9", + "@smithy/middleware-stack": "^2.0.2", + "@smithy/node-config-provider": "^2.0.12", + "@smithy/node-http-handler": "^2.1.5", + "@smithy/property-provider": "^2.0.0", + "@smithy/protocol-http": "^3.0.5", + "@smithy/shared-ini-file-loader": "^2.0.6", + "@smithy/smithy-client": "^2.1.6", + "@smithy/types": "^2.3.3", + "@smithy/url-parser": "^2.0.9", + "@smithy/util-base64": "^2.0.0", + "@smithy/util-body-length-browser": "^2.0.0", + "@smithy/util-body-length-node": "^2.1.0", + "@smithy/util-defaults-mode-browser": "^2.0.10", + "@smithy/util-defaults-mode-node": "^2.0.12", + "@smithy/util-retry": "^2.0.2", + "@smithy/util-utf8": "^2.0.0", "tslib": "^2.5.0" } }, "@aws-sdk/types": { - "version": "3.357.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/types/-/types-3.357.0.tgz", - "integrity": "sha512-/riCRaXg3p71BeWnShrai0y0QTdXcouPSM0Cn1olZbzTf7s71aLEewrc96qFrL70XhY4XvnxMpqQh+r43XIL3g==", + "version": "3.418.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/types/-/types-3.418.0.tgz", + "integrity": "sha512-y4PQSH+ulfFLY0+FYkaK4qbIaQI9IJNMO2xsxukW6/aNoApNymN1D2FSi2la8Qbp/iPjNDKsG8suNPm9NtsWXQ==", "requires": { - "tslib": "^2.5.0" - } - }, - "@aws-sdk/url-parser": { - "version": "3.357.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/url-parser/-/url-parser-3.357.0.tgz", - "integrity": "sha512-fAaU6cFsaAba01lCRsRJiYR/LfXvX2wudyEyutBVglE4dWSoSeu3QJNxImIzTBULfbiFhz59++NQ1JUVx88IVg==", - "requires": { - "@aws-sdk/querystring-parser": "3.357.0", - "@aws-sdk/types": "3.357.0", + "@smithy/types": "^2.3.3", "tslib": "^2.5.0" } }, @@ -18331,96 +19263,23 @@ "tslib": "^2.5.0" } }, - "@aws-sdk/util-base64": { - "version": "3.310.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/util-base64/-/util-base64-3.310.0.tgz", - "integrity": "sha512-v3+HBKQvqgdzcbL+pFswlx5HQsd9L6ZTlyPVL2LS9nNXnCcR3XgGz9jRskikRUuUvUXtkSG1J88GAOnJ/apTPg==", - "requires": { - "@aws-sdk/util-buffer-from": "3.310.0", - "tslib": "^2.5.0" - } - }, - "@aws-sdk/util-body-length-browser": { - "version": "3.310.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/util-body-length-browser/-/util-body-length-browser-3.310.0.tgz", - "integrity": "sha512-sxsC3lPBGfpHtNTUoGXMQXLwjmR0zVpx0rSvzTPAuoVILVsp5AU/w5FphNPxD5OVIjNbZv9KsKTuvNTiZjDp9g==", - "requires": { - "tslib": "^2.5.0" - } - }, - "@aws-sdk/util-body-length-node": { - "version": "3.310.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/util-body-length-node/-/util-body-length-node-3.310.0.tgz", - "integrity": "sha512-2tqGXdyKhyA6w4zz7UPoS8Ip+7sayOg9BwHNidiGm2ikbDxm1YrCfYXvCBdwaJxa4hJfRVz+aL9e+d3GqPI9pQ==", - "requires": { - "tslib": "^2.5.0" - } - }, - "@aws-sdk/util-buffer-from": { - "version": "3.310.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/util-buffer-from/-/util-buffer-from-3.310.0.tgz", - "integrity": "sha512-i6LVeXFtGih5Zs8enLrt+ExXY92QV25jtEnTKHsmlFqFAuL3VBeod6boeMXkN2p9lbSVVQ1sAOOYZOHYbYkntw==", - "requires": { - "@aws-sdk/is-array-buffer": "3.310.0", - "tslib": "^2.5.0" - } - }, - "@aws-sdk/util-config-provider": { - "version": "3.310.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/util-config-provider/-/util-config-provider-3.310.0.tgz", - "integrity": "sha512-xIBaYo8dwiojCw8vnUcIL4Z5tyfb1v3yjqyJKJWV/dqKUFOOS0U591plmXbM+M/QkXyML3ypon1f8+BoaDExrg==", - "requires": { - "tslib": "^2.5.0" - } - }, - "@aws-sdk/util-defaults-mode-browser": { - "version": "3.360.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/util-defaults-mode-browser/-/util-defaults-mode-browser-3.360.0.tgz", - "integrity": "sha512-/GR8VlK9xo1Q5WbVYuNaZ+XfoCFdWNb4z4mpoEgvEgBH4R0GjqiAqLftUA8Ykq1tJuDAKPYVzUNzK8DC0pt7/g==", - "requires": { - "@aws-sdk/property-provider": "3.357.0", - "@aws-sdk/types": "3.357.0", - "bowser": "^2.11.0", - "tslib": "^2.5.0" - } - }, - "@aws-sdk/util-defaults-mode-node": { - "version": "3.360.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/util-defaults-mode-node/-/util-defaults-mode-node-3.360.0.tgz", - "integrity": "sha512-gR3Ctqpyl7SgStDJ1Jlq6qQDuw/rS9AgbAXx+s3wsmm3fm8lHKkXkDPYVvNDqd6dVXRO6q8MRx00lwkGI4qrpQ==", - "requires": { - "@aws-sdk/config-resolver": "3.357.0", - "@aws-sdk/credential-provider-imds": "3.357.0", - "@aws-sdk/node-config-provider": "3.357.0", - "@aws-sdk/property-provider": "3.357.0", - "@aws-sdk/types": "3.357.0", - "tslib": "^2.5.0" - } - }, "@aws-sdk/util-endpoints": { - "version": "3.357.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/util-endpoints/-/util-endpoints-3.357.0.tgz", - "integrity": "sha512-XHKyS5JClT9su9hDif715jpZiWHQF9gKZXER8tW0gOizU3R9cyWc9EsJ2BRhFNhi7nt/JF/CLUEc5qDx3ETbUw==", + "version": "3.418.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/util-endpoints/-/util-endpoints-3.418.0.tgz", + "integrity": "sha512-sYSDwRTl7yE7LhHkPzemGzmIXFVHSsi3AQ1KeNEk84eBqxMHHcCc2kqklaBk2roXWe50QDgRMy1ikZUxvtzNHQ==", "requires": { - "@aws-sdk/types": "3.357.0", + "@aws-sdk/types": "3.418.0", "tslib": "^2.5.0" } }, "@aws-sdk/util-format-url": { - "version": "3.357.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/util-format-url/-/util-format-url-3.357.0.tgz", - "integrity": "sha512-mdTO210Nkraw+gY/KxJN9wvX8brIT5+d5tLtLSNKx4K8Fx+qbIug9VeOaVVlv9S1tX5lUvG1l9SEIwq3RCserg==", - "requires": { - "@aws-sdk/querystring-builder": "3.357.0", - "@aws-sdk/types": "3.357.0", - "tslib": "^2.5.0" - } - }, - "@aws-sdk/util-hex-encoding": { - "version": "3.310.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/util-hex-encoding/-/util-hex-encoding-3.310.0.tgz", - "integrity": "sha512-sVN7mcCCDSJ67pI1ZMtk84SKGqyix6/0A1Ab163YKn+lFBQRMKexleZzpYzNGxYzmQS6VanP/cfU7NiLQOaSfA==", + "version": "3.418.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/util-format-url/-/util-format-url-3.418.0.tgz", + "integrity": "sha512-7/Xy+8J1txuOYOKsez6vpKTIkHYIIX4c7anjp/aQgUQL23FDwkPisj56cIlevJ7useGugnYw1rUR6fMULGzQ/g==", "requires": { + "@aws-sdk/types": "3.418.0", + "@smithy/querystring-builder": "^2.0.9", + "@smithy/types": "^2.3.3", "tslib": "^2.5.0" } }, @@ -18432,72 +19291,25 @@ "tslib": "^2.3.1" } }, - "@aws-sdk/util-middleware": { - "version": "3.357.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/util-middleware/-/util-middleware-3.357.0.tgz", - "integrity": "sha512-pV1krjZs7BdahZBfsCJMatE8kcor7GFsBOWrQgQDm9T0We5b5xPpOO2vxAD0RytBpY8Ky2ELs/+qXMv7l5fWIA==", - "requires": { - "tslib": "^2.5.0" - } - }, - "@aws-sdk/util-retry": { - "version": "3.357.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/util-retry/-/util-retry-3.357.0.tgz", - "integrity": "sha512-SUqYJE9msbuOVq+vnUy+t0LH7XuYNFz66dSF8q6tedsbJK4j8tgya0I1Ct3m06ynGrXDJMaj39I7AXCyW9bjtw==", - "requires": { - "@aws-sdk/service-error-classification": "3.357.0", - "tslib": "^2.5.0" - } - }, - "@aws-sdk/util-stream": { - "version": "3.360.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/util-stream/-/util-stream-3.360.0.tgz", - "integrity": "sha512-t3naBfNesXwLis29pzSfLx2ifCn2180GiPjRaIsQP14IiVCBOeT1xaU6Dpyk7WeR/jW4cu7wGl+kbeyfNF6QmQ==", - "requires": { - "@aws-sdk/fetch-http-handler": "3.357.0", - "@aws-sdk/node-http-handler": "3.360.0", - "@aws-sdk/types": "3.357.0", - "@aws-sdk/util-base64": "3.310.0", - "@aws-sdk/util-buffer-from": "3.310.0", - "@aws-sdk/util-hex-encoding": "3.310.0", - "@aws-sdk/util-utf8": "3.310.0", - "tslib": "^2.5.0" - } - }, - "@aws-sdk/util-uri-escape": { - "version": "3.310.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/util-uri-escape/-/util-uri-escape-3.310.0.tgz", - "integrity": "sha512-drzt+aB2qo2LgtDoiy/3sVG8w63cgLkqFIa2NFlGpUgHFWTXkqtbgf4L5QdjRGKWhmZsnqkbtL7vkSWEcYDJ4Q==", - "requires": { - "tslib": "^2.5.0" - } - }, "@aws-sdk/util-user-agent-browser": { - "version": "3.357.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/util-user-agent-browser/-/util-user-agent-browser-3.357.0.tgz", - "integrity": "sha512-JHaWlNIUkPNvXkqeDOrqFzAlAgdwZK5mZw7FQnCRvf8tdSogpGZSkuyb9Z6rLD9gC40Srbc2nepO1cFpeMsDkA==", + "version": "3.418.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/util-user-agent-browser/-/util-user-agent-browser-3.418.0.tgz", + "integrity": "sha512-c4p4mc0VV/jIeNH0lsXzhJ1MpWRLuboGtNEpqE4s1Vl9ck2amv9VdUUZUmHbg+bVxlMgRQ4nmiovA4qIrqGuyg==", "requires": { - "@aws-sdk/types": "3.357.0", + "@aws-sdk/types": "3.418.0", + "@smithy/types": "^2.3.3", "bowser": "^2.11.0", "tslib": "^2.5.0" } }, "@aws-sdk/util-user-agent-node": { - "version": "3.357.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/util-user-agent-node/-/util-user-agent-node-3.357.0.tgz", - "integrity": "sha512-RdpQoaJWQvcS99TVgSbT451iGrlH4qpWUWFA9U1IRhxOSsmC1hz8ME7xc8nci9SREx/ZlfT3ai6LpoAzAtIEMA==", + "version": "3.418.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/util-user-agent-node/-/util-user-agent-node-3.418.0.tgz", + "integrity": "sha512-BXMskXFtg+dmzSCgmnWOffokxIbPr1lFqa1D9kvM3l3IFRiFGx2IyDg+8MAhq11aPDLvoa/BDuQ0Yqma5izOhg==", "requires": { - "@aws-sdk/node-config-provider": "3.357.0", - "@aws-sdk/types": "3.357.0", - "tslib": "^2.5.0" - } - }, - "@aws-sdk/util-utf8": { - "version": "3.310.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/util-utf8/-/util-utf8-3.310.0.tgz", - "integrity": "sha512-DnLfFT8uCO22uOJc0pt0DsSNau1GTisngBCDw8jQuWT5CqogMJu4b/uXmwEqfj8B3GX6Xsz8zOd6JpRlPftQoA==", - "requires": { - "@aws-sdk/util-buffer-from": "3.310.0", + "@aws-sdk/types": "3.418.0", + "@smithy/node-config-provider": "^2.0.12", + "@smithy/types": "^2.3.3", "tslib": "^2.5.0" } }, @@ -18509,16 +19321,6 @@ "tslib": "^2.3.1" } }, - "@aws-sdk/util-waiter": { - "version": "3.357.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/util-waiter/-/util-waiter-3.357.0.tgz", - "integrity": "sha512-jQQGA5G8bm0JP5C4U85VzMpkFHdeeT7fOSUncXLG9Sh8Ambzi4XTud8m5/dA7aNJkvPwZeIF9QdgWCOzpkp1xA==", - "requires": { - "@aws-sdk/abort-controller": "3.357.0", - "@aws-sdk/types": "3.357.0", - "tslib": "^2.5.0" - } - }, "@aws-sdk/xml-builder": { "version": "3.310.0", "resolved": "https://registry.npmjs.org/@aws-sdk/xml-builder/-/xml-builder-3.310.0.tgz", @@ -18528,40 +19330,41 @@ } }, "@babel/code-frame": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.22.5.tgz", - "integrity": "sha512-Xmwn266vad+6DAqEB2A6V/CcZVp62BbwVmcOJc2RPuwih1kw02TjQvWVWlcKGbBPd+8/0V5DEkOcizRGYsspYQ==", + "version": "7.22.13", + "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.22.13.tgz", + "integrity": "sha512-XktuhWlJ5g+3TJXc5upd9Ks1HutSArik6jf2eAjYFyIOf4ej3RN+184cZbzDvbPnuTJIUhPKKJE3cIsYTiAT3w==", "dev": true, "requires": { - "@babel/highlight": "^7.22.5" + "@babel/highlight": "^7.22.13", + "chalk": "^2.4.2" } }, "@babel/compat-data": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.22.5.tgz", - "integrity": "sha512-4Jc/YuIaYqKnDDz892kPIledykKg12Aw1PYX5i/TY28anJtacvM1Rrr8wbieB9GfEJwlzqT0hUEao0CxEebiDA==", + "version": "7.22.20", + "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.22.20.tgz", + "integrity": "sha512-BQYjKbpXjoXwFW5jGqiizJQQT/aC7pFm9Ok1OWssonuguICi264lbgMzRp2ZMmRSlfkX6DsWDDcsrctK8Rwfiw==", "dev": true }, "@babel/core": { - "version": "7.19.3", - "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.19.3.tgz", - "integrity": "sha512-WneDJxdsjEvyKtXKsaBGbDeiyOjR5vYq4HcShxnIbG0qixpoHjI3MqeZM9NDvsojNCEBItQE4juOo/bU6e72gQ==", + "version": "7.22.5", + "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.22.5.tgz", + "integrity": "sha512-SBuTAjg91A3eKOvD+bPEz3LlhHZRNu1nFOVts9lzDJTXshHTjII0BAtDS3Y2DAkdZdDKWVZGVwkDfc4Clxn1dg==", "dev": true, "requires": { - "@ampproject/remapping": "^2.1.0", - "@babel/code-frame": "^7.18.6", - "@babel/generator": "^7.19.3", - "@babel/helper-compilation-targets": "^7.19.3", - "@babel/helper-module-transforms": "^7.19.0", - "@babel/helpers": "^7.19.0", - "@babel/parser": "^7.19.3", - "@babel/template": "^7.18.10", - "@babel/traverse": "^7.19.3", - "@babel/types": "^7.19.3", + "@ampproject/remapping": "^2.2.0", + "@babel/code-frame": "^7.22.5", + "@babel/generator": "^7.22.5", + "@babel/helper-compilation-targets": "^7.22.5", + "@babel/helper-module-transforms": "^7.22.5", + "@babel/helpers": "^7.22.5", + "@babel/parser": "^7.22.5", + "@babel/template": "^7.22.5", + "@babel/traverse": "^7.22.5", + "@babel/types": "^7.22.5", "convert-source-map": "^1.7.0", "debug": "^4.1.0", "gensync": "^1.0.0-beta.2", - "json5": "^2.2.1", + "json5": "^2.2.2", "semver": "^6.3.0" }, "dependencies": { @@ -18574,59 +19377,46 @@ } }, "@babel/generator": { - "version": "7.20.14", - "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.20.14.tgz", - "integrity": "sha512-AEmuXHdcD3A52HHXxaTmYlb8q/xMEhoRP67B3T4Oq7lbmSoqroMZzjnGj3+i1io3pdnF8iBYVu4Ilj+c4hBxYg==", + "version": "7.22.9", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.22.9.tgz", + "integrity": "sha512-KtLMbmicyuK2Ak/FTCJVbDnkN1SlT8/kceFTiuDiiRUUSMnHMidxSCdG4ndkTOHHpoomWe/4xkvHkEOncwjYIw==", "dev": true, "requires": { - "@babel/types": "^7.20.7", + "@babel/types": "^7.22.5", "@jridgewell/gen-mapping": "^0.3.2", + "@jridgewell/trace-mapping": "^0.3.17", "jsesc": "^2.5.1" - }, - "dependencies": { - "@jridgewell/gen-mapping": { - "version": "0.3.2", - "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.2.tgz", - "integrity": "sha512-mh65xKQAzI6iBcFzwv28KVWSmCkdRBWoOh+bYQGW3+6OZvbbN3TqMGo5hqYxQniRcH9F2VZIoJCm4pa3BPDK/A==", - "dev": true, - "requires": { - "@jridgewell/set-array": "^1.0.1", - "@jridgewell/sourcemap-codec": "^1.4.10", - "@jridgewell/trace-mapping": "^0.3.9" - } - } } }, "@babel/helper-annotate-as-pure": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.18.6.tgz", - "integrity": "sha512-duORpUiYrEpzKIop6iNbjnwKLAKnJ47csTyRACyEmWj0QdUrm5aqNJGHSSEQSUAvNW0ojX0dOmK9dZduvkfeXA==", + "version": "7.22.5", + "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.22.5.tgz", + "integrity": "sha512-LvBTxu8bQSQkcyKOU+a1btnNFQ1dMAd0R6PyW3arXes06F6QLWLIrd681bxRPIXlrMGR3XYnW9JyML7dP3qgxg==", "dev": true, "requires": { - "@babel/types": "^7.18.6" + "@babel/types": "^7.22.5" } }, "@babel/helper-builder-binary-assignment-operator-visitor": { - "version": "7.18.9", - "resolved": "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.18.9.tgz", - "integrity": "sha512-yFQ0YCHoIqarl8BCRwBL8ulYUaZpz3bNsA7oFepAzee+8/+ImtADXNOmO5vJvsPff3qi+hvpkY/NYBTrBQgdNw==", + "version": "7.22.15", + "resolved": "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.22.15.tgz", + "integrity": "sha512-QkBXwGgaoC2GtGZRoma6kv7Szfv06khvhFav67ZExau2RaXzy8MpHSMO2PNoP2XtmQphJQRHFfg77Bq731Yizw==", "dev": true, "requires": { - "@babel/helper-explode-assignable-expression": "^7.18.6", - "@babel/types": "^7.18.9" + "@babel/types": "^7.22.15" } }, "@babel/helper-compilation-targets": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.22.5.tgz", - "integrity": "sha512-Ji+ywpHeuqxB8WDxraCiqR0xfhYjiDE/e6k7FuIaANnoOFxAHskHChz4vA1mJC9Lbm01s1PVAGhQY4FUKSkGZw==", + "version": "7.22.15", + "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.22.15.tgz", + "integrity": "sha512-y6EEzULok0Qvz8yyLkCvVX+02ic+By2UdOhylwUOvOn9dvYc9mKICJuuU1n1XBI02YWsNsnrY1kc6DVbjcXbtw==", "dev": true, "requires": { - "@babel/compat-data": "^7.22.5", - "@babel/helper-validator-option": "^7.22.5", - "browserslist": "^4.21.3", + "@babel/compat-data": "^7.22.9", + "@babel/helper-validator-option": "^7.22.15", + "browserslist": "^4.21.9", "lru-cache": "^5.1.1", - "semver": "^6.3.0" + "semver": "^6.3.1" }, "dependencies": { "lru-cache": { @@ -18639,9 +19429,9 @@ } }, "semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", + "version": "6.3.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", + "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", "dev": true }, "yallist": { @@ -18653,87 +19443,87 @@ } }, "@babel/helper-create-class-features-plugin": { - "version": "7.20.12", - "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.20.12.tgz", - "integrity": "sha512-9OunRkbT0JQcednL0UFvbfXpAsUXiGjUk0a7sN8fUXX7Mue79cUSMjHGDRRi/Vz9vYlpIhLV5fMD5dKoMhhsNQ==", + "version": "7.22.15", + "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.22.15.tgz", + "integrity": "sha512-jKkwA59IXcvSaiK2UN45kKwSC9o+KuoXsBDvHvU/7BecYIp8GQ2UwrVvFgJASUT+hBnwJx6MhvMCuMzwZZ7jlg==", "dev": true, "requires": { - "@babel/helper-annotate-as-pure": "^7.18.6", - "@babel/helper-environment-visitor": "^7.18.9", - "@babel/helper-function-name": "^7.19.0", - "@babel/helper-member-expression-to-functions": "^7.20.7", - "@babel/helper-optimise-call-expression": "^7.18.6", - "@babel/helper-replace-supers": "^7.20.7", - "@babel/helper-skip-transparent-expression-wrappers": "^7.20.0", - "@babel/helper-split-export-declaration": "^7.18.6" - } - }, - "@babel/helper-create-regexp-features-plugin": { - "version": "7.20.5", - "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.20.5.tgz", - "integrity": "sha512-m68B1lkg3XDGX5yCvGO0kPx3v9WIYLnzjKfPcQiwntEQa5ZeRkPmo2X/ISJc8qxWGfwUr+kvZAeEzAwLec2r2w==", - "dev": true, - "requires": { - "@babel/helper-annotate-as-pure": "^7.18.6", - "regexpu-core": "^5.2.1" - } - }, - "@babel/helper-define-polyfill-provider": { - "version": "0.3.3", - "resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.3.3.tgz", - "integrity": "sha512-z5aQKU4IzbqCC1XH0nAqfsFLMVSo22SBKUc0BxGrLkolTdPTructy0ToNnlO2zA4j9Q/7pjMZf0DSY+DSTYzww==", - "dev": true, - "requires": { - "@babel/helper-compilation-targets": "^7.17.7", - "@babel/helper-plugin-utils": "^7.16.7", - "debug": "^4.1.1", - "lodash.debounce": "^4.0.8", - "resolve": "^1.14.2", - "semver": "^6.1.2" + "@babel/helper-annotate-as-pure": "^7.22.5", + "@babel/helper-environment-visitor": "^7.22.5", + "@babel/helper-function-name": "^7.22.5", + "@babel/helper-member-expression-to-functions": "^7.22.15", + "@babel/helper-optimise-call-expression": "^7.22.5", + "@babel/helper-replace-supers": "^7.22.9", + "@babel/helper-skip-transparent-expression-wrappers": "^7.22.5", + "@babel/helper-split-export-declaration": "^7.22.6", + "semver": "^6.3.1" }, "dependencies": { "semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", + "version": "6.3.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", + "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", "dev": true } } }, - "@babel/helper-environment-visitor": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.22.5.tgz", - "integrity": "sha512-XGmhECfVA/5sAt+H+xpSg0mfrHq6FzNr9Oxh7PSEBBRUb/mL7Kz3NICXb194rCqAEdxkhPT1a88teizAFyvk8Q==", - "dev": true - }, - "@babel/helper-explode-assignable-expression": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.18.6.tgz", - "integrity": "sha512-eyAYAsQmB80jNfg4baAtLeWAQHfHFiR483rzFK+BhETlGZaQC9bsfrugfXDCbRHLQbIA7U5NxhhOxN7p/dWIcg==", + "@babel/helper-create-regexp-features-plugin": { + "version": "7.22.15", + "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.22.15.tgz", + "integrity": "sha512-29FkPLFjn4TPEa3RE7GpW+qbE8tlsu3jntNYNfcGsc49LphF1PQIiD+vMZ1z1xVOKt+93khA9tc2JBs3kBjA7w==", "dev": true, "requires": { - "@babel/types": "^7.18.6" + "@babel/helper-annotate-as-pure": "^7.22.5", + "regexpu-core": "^5.3.1", + "semver": "^6.3.1" + }, + "dependencies": { + "semver": { + "version": "6.3.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", + "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", + "dev": true + } } }, - "@babel/helper-function-name": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.22.5.tgz", - "integrity": "sha512-wtHSq6jMRE3uF2otvfuD3DIvVhOsSNshQl0Qrd7qC9oQJzHvOL4qQXlQn2916+CXGywIjpGuIkoyZRRxHPiNQQ==", + "@babel/helper-define-polyfill-provider": { + "version": "0.4.2", + "resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.4.2.tgz", + "integrity": "sha512-k0qnnOqHn5dK9pZpfD5XXZ9SojAITdCKRn2Lp6rnDGzIbaP0rHyMPk/4wsSxVBVz4RfN0q6VpXWP2pDGIoQ7hw==", "dev": true, "requires": { - "@babel/template": "^7.22.5", - "@babel/types": "^7.22.5" + "@babel/helper-compilation-targets": "^7.22.6", + "@babel/helper-plugin-utils": "^7.22.5", + "debug": "^4.1.1", + "lodash.debounce": "^4.0.8", + "resolve": "^1.14.2" + } + }, + "@babel/helper-environment-visitor": { + "version": "7.22.20", + "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.22.20.tgz", + "integrity": "sha512-zfedSIzFhat/gFhWfHtgWvlec0nqB9YEIVrpuwjruLlXfUSnA8cJB0miHKwqDnQ7d32aKo2xt88/xZptwxbfhA==", + "dev": true + }, + "@babel/helper-function-name": { + "version": "7.23.0", + "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.23.0.tgz", + "integrity": "sha512-OErEqsrxjZTJciZ4Oo+eoZqeW9UIiOcuYKRJA4ZAgV9myA+pOXhhmpfNCKjEH/auVfEYVFJ6y1Tc4r0eIApqiw==", + "dev": true, + "requires": { + "@babel/template": "^7.22.15", + "@babel/types": "^7.23.0" }, "dependencies": { "@babel/template": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.22.5.tgz", - "integrity": "sha512-X7yV7eiwAxdj9k94NEylvbVHLiVG1nvzCV2EAowhxLTwODV1jl9UzZ48leOC0sH7OnuHrIkllaBgneUykIcZaw==", + "version": "7.22.15", + "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.22.15.tgz", + "integrity": "sha512-QPErUVm4uyJa60rkI73qneDacvdvzxshT3kksGqlGWYdOTIUOwJ7RDUL8sGqslY1uXWSL6xMFKEXDS3ox2uF0w==", "dev": true, "requires": { - "@babel/code-frame": "^7.22.5", - "@babel/parser": "^7.22.5", - "@babel/types": "^7.22.5" + "@babel/code-frame": "^7.22.13", + "@babel/parser": "^7.22.15", + "@babel/types": "^7.22.15" } } } @@ -18748,37 +19538,34 @@ } }, "@babel/helper-member-expression-to-functions": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.22.5.tgz", - "integrity": "sha512-aBiH1NKMG0H2cGZqspNvsaBe6wNGjbJjuLy29aU+eDZjSbbN53BaxlpB02xm9v34pLTZ1nIQPFYn2qMZoa5BQQ==", + "version": "7.23.0", + "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.23.0.tgz", + "integrity": "sha512-6gfrPwh7OuT6gZyJZvd6WbTfrqAo7vm4xCzAXOusKqq/vWdKXphTpj5klHKNmRUU6/QRGlBsyU9mAIPaWHlqJA==", "dev": true, "requires": { - "@babel/types": "^7.22.5" + "@babel/types": "^7.23.0" } }, "@babel/helper-module-imports": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.18.6.tgz", - "integrity": "sha512-0NFvs3VkuSYbFi1x2Vd6tKrywq+z/cLeYC/RJNFrIX/30Bf5aiGYbtvGXolEktzJH8o5E5KJ3tT+nkxuuZFVlA==", + "version": "7.22.15", + "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.22.15.tgz", + "integrity": "sha512-0pYVBnDKZO2fnSPCrgM/6WMc7eS20Fbok+0r88fp+YtWVLZrp4CkafFGIp+W0VKw4a22sgebPT99y+FDNMdP4w==", "dev": true, "requires": { - "@babel/types": "^7.18.6" + "@babel/types": "^7.22.15" } }, "@babel/helper-module-transforms": { - "version": "7.20.11", - "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.20.11.tgz", - "integrity": "sha512-uRy78kN4psmji1s2QtbtcCSaj/LILFDp0f/ymhpQH5QY3nljUZCaNWz9X1dEj/8MBdBEFECs7yRhKn8i7NjZgg==", + "version": "7.23.0", + "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.23.0.tgz", + "integrity": "sha512-WhDWw1tdrlT0gMgUJSlX0IQvoO1eN279zrAUbVB+KpV2c3Tylz8+GnKOLllCS6Z/iZQEyVYxhZVUdPTqs2YYPw==", "dev": true, "requires": { - "@babel/helper-environment-visitor": "^7.18.9", - "@babel/helper-module-imports": "^7.18.6", - "@babel/helper-simple-access": "^7.20.2", - "@babel/helper-split-export-declaration": "^7.18.6", - "@babel/helper-validator-identifier": "^7.19.1", - "@babel/template": "^7.20.7", - "@babel/traverse": "^7.20.10", - "@babel/types": "^7.20.7" + "@babel/helper-environment-visitor": "^7.22.20", + "@babel/helper-module-imports": "^7.22.15", + "@babel/helper-simple-access": "^7.22.5", + "@babel/helper-split-export-declaration": "^7.22.6", + "@babel/helper-validator-identifier": "^7.22.20" } }, "@babel/helper-optimise-call-expression": { @@ -18797,69 +19584,52 @@ "dev": true }, "@babel/helper-remap-async-to-generator": { - "version": "7.18.9", - "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.18.9.tgz", - "integrity": "sha512-dI7q50YKd8BAv3VEfgg7PS7yD3Rtbi2J1XMXaalXO0W0164hYLnh8zpjRS0mte9MfVp/tltvr/cfdXPvJr1opA==", + "version": "7.22.20", + "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.22.20.tgz", + "integrity": "sha512-pBGyV4uBqOns+0UvhsTO8qgl8hO89PmiDYv+/COyp1aeMcmfrfruz+/nCMFiYyFF/Knn0yfrC85ZzNFjembFTw==", "dev": true, "requires": { - "@babel/helper-annotate-as-pure": "^7.18.6", - "@babel/helper-environment-visitor": "^7.18.9", - "@babel/helper-wrap-function": "^7.18.9", - "@babel/types": "^7.18.9" + "@babel/helper-annotate-as-pure": "^7.22.5", + "@babel/helper-environment-visitor": "^7.22.20", + "@babel/helper-wrap-function": "^7.22.20" } }, "@babel/helper-replace-supers": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.22.5.tgz", - "integrity": "sha512-aLdNM5I3kdI/V9xGNyKSF3X/gTyMUBohTZ+/3QdQKAA9vxIiy12E+8E2HoOP1/DjeqU+g6as35QHJNMDDYpuCg==", + "version": "7.22.20", + "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.22.20.tgz", + "integrity": "sha512-qsW0In3dbwQUbK8kejJ4R7IHVGwHJlV6lpG6UA7a9hSa2YEiAib+N1T2kr6PEeUT+Fl7najmSOS6SmAwCHK6Tw==", "dev": true, "requires": { - "@babel/helper-environment-visitor": "^7.22.5", - "@babel/helper-member-expression-to-functions": "^7.22.5", - "@babel/helper-optimise-call-expression": "^7.22.5", - "@babel/template": "^7.22.5", - "@babel/traverse": "^7.22.5", - "@babel/types": "^7.22.5" - }, - "dependencies": { - "@babel/template": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.22.5.tgz", - "integrity": "sha512-X7yV7eiwAxdj9k94NEylvbVHLiVG1nvzCV2EAowhxLTwODV1jl9UzZ48leOC0sH7OnuHrIkllaBgneUykIcZaw==", - "dev": true, - "requires": { - "@babel/code-frame": "^7.22.5", - "@babel/parser": "^7.22.5", - "@babel/types": "^7.22.5" - } - } + "@babel/helper-environment-visitor": "^7.22.20", + "@babel/helper-member-expression-to-functions": "^7.22.15", + "@babel/helper-optimise-call-expression": "^7.22.5" } }, "@babel/helper-simple-access": { - "version": "7.20.2", - "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.20.2.tgz", - "integrity": "sha512-+0woI/WPq59IrqDYbVGfshjT5Dmk/nnbdpcF8SnMhhXObpTq2KNBdLFRFrkVdbDOyUmHBCxzm5FHV1rACIkIbA==", + "version": "7.22.5", + "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.22.5.tgz", + "integrity": "sha512-n0H99E/K+Bika3++WNL17POvo4rKWZ7lZEp1Q+fStVbUi8nxPQEBOlTmCOxW/0JsS56SKKQ+ojAe2pHKJHN35w==", "dev": true, "requires": { - "@babel/types": "^7.20.2" + "@babel/types": "^7.22.5" } }, "@babel/helper-skip-transparent-expression-wrappers": { - "version": "7.20.0", - "resolved": "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.20.0.tgz", - "integrity": "sha512-5y1JYeNKfvnT8sZcK9DVRtpTbGiomYIHviSP3OQWmDPU3DeH4a1ZlT/N2lyQ5P8egjcRaT/Y9aNqUxK0WsnIIg==", + "version": "7.22.5", + "resolved": "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.22.5.tgz", + "integrity": "sha512-tK14r66JZKiC43p8Ki33yLBVJKlQDFoA8GYN67lWCDCqoL6EMMSuM9b+Iff2jHaM/RRFYl7K+iiru7hbRqNx8Q==", "dev": true, "requires": { - "@babel/types": "^7.20.0" + "@babel/types": "^7.22.5" } }, "@babel/helper-split-export-declaration": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.18.6.tgz", - "integrity": "sha512-bde1etTx6ZyTmobl9LLMMQsaizFVZrquTEHOqKeQESMKo4PlObf+8+JA25ZsIpZhT/WEd39+vOdLXAFG/nELpA==", + "version": "7.22.6", + "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.22.6.tgz", + "integrity": "sha512-AsUnxuLhRYsisFiaJwvp1QF+I3KjD5FOxut14q/GzovUe6orHLesW2C7d754kRm53h5gqrz6sFl6sxc4BVtE/g==", "dev": true, "requires": { - "@babel/types": "^7.18.6" + "@babel/types": "^7.22.5" } }, "@babel/helper-string-parser": { @@ -18869,75 +19639,100 @@ "dev": true }, "@babel/helper-validator-identifier": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.5.tgz", - "integrity": "sha512-aJXu+6lErq8ltp+JhkJUfk1MTGyuA4v7f3pA+BJ5HLfNC6nAQ0Cpi9uOquUj8Hehg0aUiHzWQbOVJGao6ztBAQ==", + "version": "7.22.20", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.20.tgz", + "integrity": "sha512-Y4OZ+ytlatR8AI+8KZfKuL5urKp7qey08ha31L8b3BwewJAoJamTzyvxPR/5D+KkdJCGPq/+8TukHBlY10FX9A==", "dev": true }, "@babel/helper-validator-option": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.22.5.tgz", - "integrity": "sha512-R3oB6xlIVKUnxNUxbmgq7pKjxpru24zlimpE8WK47fACIlM0II/Hm1RS8IaOI7NgCr6LNS+jl5l75m20npAziw==", + "version": "7.22.15", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.22.15.tgz", + "integrity": "sha512-bMn7RmyFjY/mdECUbgn9eoSY4vqvacUnS9i9vGAGttgFWesO6B4CYWA7XlpbWgBt71iv/hfbPlynohStqnu5hA==", "dev": true }, "@babel/helper-wrap-function": { - "version": "7.20.5", - "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.20.5.tgz", - "integrity": "sha512-bYMxIWK5mh+TgXGVqAtnu5Yn1un+v8DDZtqyzKRLUzrh70Eal2O3aZ7aPYiMADO4uKlkzOiRiZ6GX5q3qxvW9Q==", + "version": "7.22.20", + "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.22.20.tgz", + "integrity": "sha512-pms/UwkOpnQe/PDAEdV/d7dVCoBbB+R4FvYoHGZz+4VPcg7RtYy2KP7S2lbuWM6FCSgob5wshfGESbC/hzNXZw==", "dev": true, "requires": { - "@babel/helper-function-name": "^7.19.0", - "@babel/template": "^7.18.10", - "@babel/traverse": "^7.20.5", - "@babel/types": "^7.20.5" + "@babel/helper-function-name": "^7.22.5", + "@babel/template": "^7.22.15", + "@babel/types": "^7.22.19" + }, + "dependencies": { + "@babel/template": { + "version": "7.22.15", + "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.22.15.tgz", + "integrity": "sha512-QPErUVm4uyJa60rkI73qneDacvdvzxshT3kksGqlGWYdOTIUOwJ7RDUL8sGqslY1uXWSL6xMFKEXDS3ox2uF0w==", + "dev": true, + "requires": { + "@babel/code-frame": "^7.22.13", + "@babel/parser": "^7.22.15", + "@babel/types": "^7.22.15" + } + } } }, "@babel/helpers": { - "version": "7.20.13", - "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.20.13.tgz", - "integrity": "sha512-nzJ0DWCL3gB5RCXbUO3KIMMsBY2Eqbx8mBpKGE/02PgyRQFcPQLbkQ1vyy596mZLaP+dAfD+R4ckASzNVmW3jg==", + "version": "7.23.1", + "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.23.1.tgz", + "integrity": "sha512-chNpneuK18yW5Oxsr+t553UZzzAs3aZnFm4bxhebsNTeshrC95yA7l5yl7GBAG+JG1rF0F7zzD2EixK9mWSDoA==", "dev": true, "requires": { - "@babel/template": "^7.20.7", - "@babel/traverse": "^7.20.13", - "@babel/types": "^7.20.7" + "@babel/template": "^7.22.15", + "@babel/traverse": "^7.23.0", + "@babel/types": "^7.23.0" + }, + "dependencies": { + "@babel/template": { + "version": "7.22.15", + "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.22.15.tgz", + "integrity": "sha512-QPErUVm4uyJa60rkI73qneDacvdvzxshT3kksGqlGWYdOTIUOwJ7RDUL8sGqslY1uXWSL6xMFKEXDS3ox2uF0w==", + "dev": true, + "requires": { + "@babel/code-frame": "^7.22.13", + "@babel/parser": "^7.22.15", + "@babel/types": "^7.22.15" + } + } } }, "@babel/highlight": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.22.5.tgz", - "integrity": "sha512-BSKlD1hgnedS5XRnGOljZawtag7H1yPfQp0tdNJCHoH6AZ+Pcm9VvkrK59/Yy593Ypg0zMxH2BxD1VPYUQ7UIw==", + "version": "7.22.20", + "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.22.20.tgz", + "integrity": "sha512-dkdMCN3py0+ksCgYmGG8jKeGA/8Tk+gJwSYYlFGxG5lmhfKNoAy004YpLxpS1W2J8m/EK2Ew+yOs9pVRwO89mg==", "dev": true, "requires": { - "@babel/helper-validator-identifier": "^7.22.5", - "chalk": "^2.0.0", + "@babel/helper-validator-identifier": "^7.22.20", + "chalk": "^2.4.2", "js-tokens": "^4.0.0" } }, "@babel/parser": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.22.5.tgz", - "integrity": "sha512-DFZMC9LJUG9PLOclRC32G63UXwzqS2koQC8dkx+PLdmt1xSePYpbT/NbsrJy8Q/muXz7o/h/d4A7Fuyixm559Q==", + "version": "7.23.0", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.23.0.tgz", + "integrity": "sha512-vvPKKdMemU85V9WE/l5wZEmImpCtLqbnTvqDS2U1fJ96KrxoW7KrXhNsNCblQlg8Ck4b85yxdTyelsMUgFUXiw==", "dev": true }, "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.18.6.tgz", - "integrity": "sha512-Dgxsyg54Fx1d4Nge8UnvTrED63vrwOdPmyvPzlNN/boaliRP54pm3pGzZD1SJUwrBA+Cs/xdG8kXX6Mn/RfISQ==", + "version": "7.22.15", + "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.22.15.tgz", + "integrity": "sha512-FB9iYlz7rURmRJyXRKEnalYPPdn87H5no108cyuQQyMwlpJ2SJtpIUBI27kdTin956pz+LPypkPVPUTlxOmrsg==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "^7.18.6" + "@babel/helper-plugin-utils": "^7.22.5" } }, "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": { - "version": "7.20.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.20.7.tgz", - "integrity": "sha512-sbr9+wNE5aXMBBFBICk01tt7sBf2Oc9ikRFEcem/ZORup9IMUdNhW7/wVLEbbtlWOsEubJet46mHAL2C8+2jKQ==", + "version": "7.22.15", + "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.22.15.tgz", + "integrity": "sha512-Hyph9LseGvAeeXzikV88bczhsrLrIZqDPxO+sSmAunMPaGrBGhfMWzCPYTtiW9t+HzSE2wtV8e5cc5P6r1xMDQ==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "^7.20.2", - "@babel/helper-skip-transparent-expression-wrappers": "^7.20.0", - "@babel/plugin-proposal-optional-chaining": "^7.20.7" + "@babel/helper-plugin-utils": "^7.22.5", + "@babel/helper-skip-transparent-expression-wrappers": "^7.22.5", + "@babel/plugin-transform-optional-chaining": "^7.22.15" } }, "@babel/plugin-proposal-async-generator-functions": { @@ -18952,142 +19747,11 @@ "@babel/plugin-syntax-async-generators": "^7.8.4" } }, - "@babel/plugin-proposal-class-properties": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.18.6.tgz", - "integrity": "sha512-cumfXOF0+nzZrrN8Rf0t7M+tF6sZc7vhQwYQck9q1/5w2OExlD+b4v4RpMJFaV1Z7WcDRgO6FqvxqxGlwo+RHQ==", - "dev": true, - "requires": { - "@babel/helper-create-class-features-plugin": "^7.18.6", - "@babel/helper-plugin-utils": "^7.18.6" - } - }, - "@babel/plugin-proposal-class-static-block": { - "version": "7.20.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-class-static-block/-/plugin-proposal-class-static-block-7.20.7.tgz", - "integrity": "sha512-AveGOoi9DAjUYYuUAG//Ig69GlazLnoyzMw68VCDux+c1tsnnH/OkYcpz/5xzMkEFC6UxjR5Gw1c+iY2wOGVeQ==", - "dev": true, - "requires": { - "@babel/helper-create-class-features-plugin": "^7.20.7", - "@babel/helper-plugin-utils": "^7.20.2", - "@babel/plugin-syntax-class-static-block": "^7.14.5" - } - }, - "@babel/plugin-proposal-dynamic-import": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.18.6.tgz", - "integrity": "sha512-1auuwmK+Rz13SJj36R+jqFPMJWyKEDd7lLSdOj4oJK0UTgGueSAtkrCvz9ewmgyU/P941Rv2fQwZJN8s6QruXw==", - "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.18.6", - "@babel/plugin-syntax-dynamic-import": "^7.8.3" - } - }, - "@babel/plugin-proposal-export-namespace-from": { - "version": "7.18.9", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.18.9.tgz", - "integrity": "sha512-k1NtHyOMvlDDFeb9G5PhUXuGj8m/wiwojgQVEhJ/fsVsMCpLyOP4h0uGEjYJKrRI+EVPlb5Jk+Gt9P97lOGwtA==", - "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.18.9", - "@babel/plugin-syntax-export-namespace-from": "^7.8.3" - } - }, - "@babel/plugin-proposal-json-strings": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.18.6.tgz", - "integrity": "sha512-lr1peyn9kOdbYc0xr0OdHTZ5FMqS6Di+H0Fz2I/JwMzGmzJETNeOFq2pBySw6X/KFL5EWDjlJuMsUGRFb8fQgQ==", - "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.18.6", - "@babel/plugin-syntax-json-strings": "^7.8.3" - } - }, - "@babel/plugin-proposal-logical-assignment-operators": { - "version": "7.20.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.20.7.tgz", - "integrity": "sha512-y7C7cZgpMIjWlKE5T7eJwp+tnRYM89HmRvWM5EQuB5BoHEONjmQ8lSNmBUwOyy/GFRsohJED51YBF79hE1djug==", - "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.20.2", - "@babel/plugin-syntax-logical-assignment-operators": "^7.10.4" - } - }, - "@babel/plugin-proposal-nullish-coalescing-operator": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.18.6.tgz", - "integrity": "sha512-wQxQzxYeJqHcfppzBDnm1yAY0jSRkUXR2z8RePZYrKwMKgMlE8+Z6LUno+bd6LvbGh8Gltvy74+9pIYkr+XkKA==", - "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.18.6", - "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3" - } - }, - "@babel/plugin-proposal-numeric-separator": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.18.6.tgz", - "integrity": "sha512-ozlZFogPqoLm8WBr5Z8UckIoE4YQ5KESVcNudyXOR8uqIkliTEgJ3RoketfG6pmzLdeZF0H/wjE9/cCEitBl7Q==", - "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.18.6", - "@babel/plugin-syntax-numeric-separator": "^7.10.4" - } - }, - "@babel/plugin-proposal-object-rest-spread": { - "version": "7.20.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.20.7.tgz", - "integrity": "sha512-d2S98yCiLxDVmBmE8UjGcfPvNEUbA1U5q5WxaWFUGRzJSVAZqm5W6MbPct0jxnegUZ0niLeNX+IOzEs7wYg9Dg==", - "dev": true, - "requires": { - "@babel/compat-data": "^7.20.5", - "@babel/helper-compilation-targets": "^7.20.7", - "@babel/helper-plugin-utils": "^7.20.2", - "@babel/plugin-syntax-object-rest-spread": "^7.8.3", - "@babel/plugin-transform-parameters": "^7.20.7" - } - }, - "@babel/plugin-proposal-optional-catch-binding": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.18.6.tgz", - "integrity": "sha512-Q40HEhs9DJQyaZfUjjn6vE8Cv4GmMHCYuMGIWUnlxH6400VGxOuwWsPt4FxXxJkC/5eOzgn0z21M9gMT4MOhbw==", - "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.18.6", - "@babel/plugin-syntax-optional-catch-binding": "^7.8.3" - } - }, - "@babel/plugin-proposal-optional-chaining": { - "version": "7.20.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.20.7.tgz", - "integrity": "sha512-T+A7b1kfjtRM51ssoOfS1+wbyCVqorfyZhT99TvxxLMirPShD8CzKMRepMlCBGM5RpHMbn8s+5MMHnPstJH6mQ==", - "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.20.2", - "@babel/helper-skip-transparent-expression-wrappers": "^7.20.0", - "@babel/plugin-syntax-optional-chaining": "^7.8.3" - } - }, - "@babel/plugin-proposal-private-methods": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.18.6.tgz", - "integrity": "sha512-nutsvktDItsNn4rpGItSNV2sz1XwS+nfU0Rg8aCx3W3NOKVzdMjJRu0O5OkgDp3ZGICSTbgRpxZoWsxoKRvbeA==", - "dev": true, - "requires": { - "@babel/helper-create-class-features-plugin": "^7.18.6", - "@babel/helper-plugin-utils": "^7.18.6" - } - }, "@babel/plugin-proposal-private-property-in-object": { - "version": "7.20.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.20.5.tgz", - "integrity": "sha512-Vq7b9dUA12ByzB4EjQTPo25sFhY+08pQDBSZRtUAkj7lb7jahaHR5igera16QZ+3my1nYR4dKsNdYj5IjPHilQ==", - "dev": true, - "requires": { - "@babel/helper-annotate-as-pure": "^7.18.6", - "@babel/helper-create-class-features-plugin": "^7.20.5", - "@babel/helper-plugin-utils": "^7.20.2", - "@babel/plugin-syntax-private-property-in-object": "^7.14.5" - } + "version": "7.21.0-placeholder-for-preset-env.2", + "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.21.0-placeholder-for-preset-env.2.tgz", + "integrity": "sha512-SOSkfJDddaM7mak6cPEpswyTRnuRltl429hMraQEglW+OkovnCzsiszTmsrlY//qLFjCpQDFRvjdm2wA5pPm9w==", + "dev": true }, "@babel/plugin-proposal-unicode-property-regex": { "version": "7.18.6", @@ -19145,12 +19809,30 @@ } }, "@babel/plugin-syntax-import-assertions": { - "version": "7.20.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.20.0.tgz", - "integrity": "sha512-IUh1vakzNoWalR8ch/areW7qFopR2AEw03JlG7BbrDqmQ4X3q9uuipQwSGrUn7oGiemKjtSLDhNtQHzMHr1JdQ==", + "version": "7.22.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.22.5.tgz", + "integrity": "sha512-rdV97N7KqsRzeNGoWUOK6yUsWarLjE5Su/Snk9IYPU9CwkWHs4t+rTGOvffTR8XGkJMTAdLfO0xVnXm8wugIJg==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "^7.19.0" + "@babel/helper-plugin-utils": "^7.22.5" + } + }, + "@babel/plugin-syntax-import-attributes": { + "version": "7.22.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-attributes/-/plugin-syntax-import-attributes-7.22.5.tgz", + "integrity": "sha512-KwvoWDeNKPETmozyFE0P2rOLqh39EoQHNjqizrI5B8Vt0ZNS7M56s7dAiAqbYfiAYOuIzIh96z3iR2ktgu3tEg==", + "dev": true, + "requires": { + "@babel/helper-plugin-utils": "^7.22.5" + } + }, + "@babel/plugin-syntax-import-meta": { + "version": "7.10.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-meta/-/plugin-syntax-import-meta-7.10.4.tgz", + "integrity": "sha512-Yqfm+XDx0+Prh3VSeEQCPU81yC+JWZ2pDPFSS4ZdpfZhp4MkFMaDC1UqseovEKwSUpnIL7+vK+Clp7bfh0iD7g==", + "dev": true, + "requires": { + "@babel/helper-plugin-utils": "^7.10.4" } }, "@babel/plugin-syntax-json-strings": { @@ -19234,136 +19916,179 @@ "@babel/helper-plugin-utils": "^7.14.5" } }, - "@babel/plugin-transform-arrow-functions": { - "version": "7.20.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.20.7.tgz", - "integrity": "sha512-3poA5E7dzDomxj9WXWwuD6A5F3kc7VXwIJO+E+J8qtDtS+pXPAhrgEyh+9GBwBgPq1Z+bB+/JD60lp5jsN7JPQ==", - "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.20.2" - } - }, - "@babel/plugin-transform-async-to-generator": { - "version": "7.20.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.20.7.tgz", - "integrity": "sha512-Uo5gwHPT9vgnSXQxqGtpdufUiWp96gk7yiP4Mp5bm1QMkEmLXBO7PAGYbKoJ6DhAwiNkcHFBol/x5zZZkL/t0Q==", - "dev": true, - "requires": { - "@babel/helper-module-imports": "^7.18.6", - "@babel/helper-plugin-utils": "^7.20.2", - "@babel/helper-remap-async-to-generator": "^7.18.9" - } - }, - "@babel/plugin-transform-block-scoped-functions": { + "@babel/plugin-syntax-unicode-sets-regex": { "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.18.6.tgz", - "integrity": "sha512-ExUcOqpPWnliRcPqves5HJcJOvHvIIWfuS4sroBUenPuMdmW+SMHDakmtS7qOo13sVppmUijqeTv7qqGsvURpQ==", - "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.18.6" - } - }, - "@babel/plugin-transform-block-scoping": { - "version": "7.20.15", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.20.15.tgz", - "integrity": "sha512-Vv4DMZ6MiNOhu/LdaZsT/bsLRxgL94d269Mv4R/9sp6+Mp++X/JqypZYypJXLlM4mlL352/Egzbzr98iABH1CA==", - "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.20.2" - } - }, - "@babel/plugin-transform-classes": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.22.5.tgz", - "integrity": "sha512-2edQhLfibpWpsVBx2n/GKOz6JdGQvLruZQfGr9l1qes2KQaWswjBzhQF7UDUZMNaMMQeYnQzxwOMPsbYF7wqPQ==", - "dev": true, - "requires": { - "@babel/helper-annotate-as-pure": "^7.22.5", - "@babel/helper-compilation-targets": "^7.22.5", - "@babel/helper-environment-visitor": "^7.22.5", - "@babel/helper-function-name": "^7.22.5", - "@babel/helper-optimise-call-expression": "^7.22.5", - "@babel/helper-plugin-utils": "^7.22.5", - "@babel/helper-replace-supers": "^7.22.5", - "@babel/helper-split-export-declaration": "^7.22.5", - "globals": "^11.1.0" - }, - "dependencies": { - "@babel/helper-annotate-as-pure": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.22.5.tgz", - "integrity": "sha512-LvBTxu8bQSQkcyKOU+a1btnNFQ1dMAd0R6PyW3arXes06F6QLWLIrd681bxRPIXlrMGR3XYnW9JyML7dP3qgxg==", - "dev": true, - "requires": { - "@babel/types": "^7.22.5" - } - }, - "@babel/helper-split-export-declaration": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.22.5.tgz", - "integrity": "sha512-thqK5QFghPKWLhAV321lxF95yCg2K3Ob5yw+M3VHWfdia0IkPXUtoLH8x/6Fh486QUvzhb8YOWHChTVen2/PoQ==", - "dev": true, - "requires": { - "@babel/types": "^7.22.5" - } - } - } - }, - "@babel/plugin-transform-computed-properties": { - "version": "7.20.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.20.7.tgz", - "integrity": "sha512-Lz7MvBK6DTjElHAmfu6bfANzKcxpyNPeYBGEafyA6E5HtRpjpZwU+u7Qrgz/2OR0z+5TvKYbPdphfSaAcZBrYQ==", - "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.20.2", - "@babel/template": "^7.20.7" - } - }, - "@babel/plugin-transform-destructuring": { - "version": "7.20.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.20.7.tgz", - "integrity": "sha512-Xwg403sRrZb81IVB79ZPqNQME23yhugYVqgTxAhT99h485F4f+GMELFhhOsscDUB7HCswepKeCKLn/GZvUKoBA==", - "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.20.2" - } - }, - "@babel/plugin-transform-dotall-regex": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.18.6.tgz", - "integrity": "sha512-6S3jpun1eEbAxq7TdjLotAsl4WpQI9DxfkycRcKrjhQYzU87qpXdknpBg/e+TdcMehqGnLFi7tnFUBR02Vq6wg==", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-unicode-sets-regex/-/plugin-syntax-unicode-sets-regex-7.18.6.tgz", + "integrity": "sha512-727YkEAPwSIQTv5im8QHz3upqp92JTWhidIC81Tdx4VJYIte/VndKf1qKrfnnhPLiPghStWfvC/iFaMCQu7Nqg==", "dev": true, "requires": { "@babel/helper-create-regexp-features-plugin": "^7.18.6", "@babel/helper-plugin-utils": "^7.18.6" } }, - "@babel/plugin-transform-duplicate-keys": { - "version": "7.18.9", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.18.9.tgz", - "integrity": "sha512-d2bmXCtZXYc59/0SanQKbiWINadaJXqtvIQIzd4+hNwkWBgyCd5F/2t1kXoUdvPMrxzPvhK6EMQRROxsue+mfw==", + "@babel/plugin-transform-arrow-functions": { + "version": "7.22.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.22.5.tgz", + "integrity": "sha512-26lTNXoVRdAnsaDXPpvCNUq+OVWEVC6bx7Vvz9rC53F2bagUWW4u4ii2+h8Fejfh7RYqPxn+libeFBBck9muEw==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "^7.18.9" + "@babel/helper-plugin-utils": "^7.22.5" + } + }, + "@babel/plugin-transform-async-generator-functions": { + "version": "7.22.15", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-generator-functions/-/plugin-transform-async-generator-functions-7.22.15.tgz", + "integrity": "sha512-jBm1Es25Y+tVoTi5rfd5t1KLmL8ogLKpXszboWOTTtGFGz2RKnQe2yn7HbZ+kb/B8N0FVSGQo874NSlOU1T4+w==", + "dev": true, + "requires": { + "@babel/helper-environment-visitor": "^7.22.5", + "@babel/helper-plugin-utils": "^7.22.5", + "@babel/helper-remap-async-to-generator": "^7.22.9", + "@babel/plugin-syntax-async-generators": "^7.8.4" + } + }, + "@babel/plugin-transform-async-to-generator": { + "version": "7.22.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.22.5.tgz", + "integrity": "sha512-b1A8D8ZzE/VhNDoV1MSJTnpKkCG5bJo+19R4o4oy03zM7ws8yEMK755j61Dc3EyvdysbqH5BOOTquJ7ZX9C6vQ==", + "dev": true, + "requires": { + "@babel/helper-module-imports": "^7.22.5", + "@babel/helper-plugin-utils": "^7.22.5", + "@babel/helper-remap-async-to-generator": "^7.22.5" + } + }, + "@babel/plugin-transform-block-scoped-functions": { + "version": "7.22.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.22.5.tgz", + "integrity": "sha512-tdXZ2UdknEKQWKJP1KMNmuF5Lx3MymtMN/pvA+p/VEkhK8jVcQ1fzSy8KM9qRYhAf2/lV33hoMPKI/xaI9sADA==", + "dev": true, + "requires": { + "@babel/helper-plugin-utils": "^7.22.5" + } + }, + "@babel/plugin-transform-block-scoping": { + "version": "7.23.0", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.23.0.tgz", + "integrity": "sha512-cOsrbmIOXmf+5YbL99/S49Y3j46k/T16b9ml8bm9lP6N9US5iQ2yBK7gpui1pg0V/WMcXdkfKbTb7HXq9u+v4g==", + "dev": true, + "requires": { + "@babel/helper-plugin-utils": "^7.22.5" + } + }, + "@babel/plugin-transform-class-properties": { + "version": "7.22.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-class-properties/-/plugin-transform-class-properties-7.22.5.tgz", + "integrity": "sha512-nDkQ0NfkOhPTq8YCLiWNxp1+f9fCobEjCb0n8WdbNUBc4IB5V7P1QnX9IjpSoquKrXF5SKojHleVNs2vGeHCHQ==", + "dev": true, + "requires": { + "@babel/helper-create-class-features-plugin": "^7.22.5", + "@babel/helper-plugin-utils": "^7.22.5" + } + }, + "@babel/plugin-transform-class-static-block": { + "version": "7.22.11", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-class-static-block/-/plugin-transform-class-static-block-7.22.11.tgz", + "integrity": "sha512-GMM8gGmqI7guS/llMFk1bJDkKfn3v3C4KHK9Yg1ey5qcHcOlKb0QvcMrgzvxo+T03/4szNh5lghY+fEC98Kq9g==", + "dev": true, + "requires": { + "@babel/helper-create-class-features-plugin": "^7.22.11", + "@babel/helper-plugin-utils": "^7.22.5", + "@babel/plugin-syntax-class-static-block": "^7.14.5" + } + }, + "@babel/plugin-transform-classes": { + "version": "7.22.15", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.22.15.tgz", + "integrity": "sha512-VbbC3PGjBdE0wAWDdHM9G8Gm977pnYI0XpqMd6LrKISj8/DJXEsWqgRuTYaNE9Bv0JGhTZUzHDlMk18IpOuoqw==", + "dev": true, + "requires": { + "@babel/helper-annotate-as-pure": "^7.22.5", + "@babel/helper-compilation-targets": "^7.22.15", + "@babel/helper-environment-visitor": "^7.22.5", + "@babel/helper-function-name": "^7.22.5", + "@babel/helper-optimise-call-expression": "^7.22.5", + "@babel/helper-plugin-utils": "^7.22.5", + "@babel/helper-replace-supers": "^7.22.9", + "@babel/helper-split-export-declaration": "^7.22.6", + "globals": "^11.1.0" + } + }, + "@babel/plugin-transform-computed-properties": { + "version": "7.22.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.22.5.tgz", + "integrity": "sha512-4GHWBgRf0krxPX+AaPtgBAlTgTeZmqDynokHOX7aqqAB4tHs3U2Y02zH6ETFdLZGcg9UQSD1WCmkVrE9ErHeOg==", + "dev": true, + "requires": { + "@babel/helper-plugin-utils": "^7.22.5", + "@babel/template": "^7.22.5" + } + }, + "@babel/plugin-transform-destructuring": { + "version": "7.23.0", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.23.0.tgz", + "integrity": "sha512-vaMdgNXFkYrB+8lbgniSYWHsgqK5gjaMNcc84bMIOMRLH0L9AqYq3hwMdvnyqj1OPqea8UtjPEuS/DCenah1wg==", + "dev": true, + "requires": { + "@babel/helper-plugin-utils": "^7.22.5" + } + }, + "@babel/plugin-transform-dotall-regex": { + "version": "7.22.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.22.5.tgz", + "integrity": "sha512-5/Yk9QxCQCl+sOIB1WelKnVRxTJDSAIxtJLL2/pqL14ZVlbH0fUQUZa/T5/UnQtBNgghR7mfB8ERBKyKPCi7Vw==", + "dev": true, + "requires": { + "@babel/helper-create-regexp-features-plugin": "^7.22.5", + "@babel/helper-plugin-utils": "^7.22.5" + } + }, + "@babel/plugin-transform-duplicate-keys": { + "version": "7.22.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.22.5.tgz", + "integrity": "sha512-dEnYD+9BBgld5VBXHnF/DbYGp3fqGMsyxKbtD1mDyIA7AkTSpKXFhCVuj/oQVOoALfBs77DudA0BE4d5mcpmqw==", + "dev": true, + "requires": { + "@babel/helper-plugin-utils": "^7.22.5" + } + }, + "@babel/plugin-transform-dynamic-import": { + "version": "7.22.11", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dynamic-import/-/plugin-transform-dynamic-import-7.22.11.tgz", + "integrity": "sha512-g/21plo58sfteWjaO0ZNVb+uEOkJNjAaHhbejrnBmu011l/eNDScmkbjCC3l4FKb10ViaGU4aOkFznSu2zRHgA==", + "dev": true, + "requires": { + "@babel/helper-plugin-utils": "^7.22.5", + "@babel/plugin-syntax-dynamic-import": "^7.8.3" } }, "@babel/plugin-transform-exponentiation-operator": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.18.6.tgz", - "integrity": "sha512-wzEtc0+2c88FVR34aQmiz56dxEkxr2g8DQb/KfaFa1JYXOFVsbhvAonFN6PwVWj++fKmku8NP80plJ5Et4wqHw==", + "version": "7.22.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.22.5.tgz", + "integrity": "sha512-vIpJFNM/FjZ4rh1myqIya9jXwrwwgFRHPjT3DkUA9ZLHuzox8jiXkOLvwm1H+PQIP3CqfC++WPKeuDi0Sjdj1g==", "dev": true, "requires": { - "@babel/helper-builder-binary-assignment-operator-visitor": "^7.18.6", - "@babel/helper-plugin-utils": "^7.18.6" + "@babel/helper-builder-binary-assignment-operator-visitor": "^7.22.5", + "@babel/helper-plugin-utils": "^7.22.5" + } + }, + "@babel/plugin-transform-export-namespace-from": { + "version": "7.22.11", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-export-namespace-from/-/plugin-transform-export-namespace-from-7.22.11.tgz", + "integrity": "sha512-xa7aad7q7OiT8oNZ1mU7NrISjlSkVdMbNxn9IuLZyL9AJEhs1Apba3I+u5riX1dIkdptP5EKDG5XDPByWxtehw==", + "dev": true, + "requires": { + "@babel/helper-plugin-utils": "^7.22.5", + "@babel/plugin-syntax-export-namespace-from": "^7.8.3" } }, "@babel/plugin-transform-for-of": { - "version": "7.18.8", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.18.8.tgz", - "integrity": "sha512-yEfTRnjuskWYo0k1mHUqrVWaZwrdq8AYbfrpqULOJOaucGSp4mNMVps+YtA8byoevxS/urwU75vyhQIxcCgiBQ==", + "version": "7.22.15", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.22.15.tgz", + "integrity": "sha512-me6VGeHsx30+xh9fbDLLPi0J1HzmeIIyenoOQHuw2D4m2SAU3NrspX5XxJLBpqn5yrLzrlw2Iy3RA//Bx27iOA==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "^7.18.6" + "@babel/helper-plugin-utils": "^7.22.5" } }, "@babel/plugin-transform-function-name": { @@ -19377,253 +20102,357 @@ "@babel/helper-plugin-utils": "^7.22.5" } }, - "@babel/plugin-transform-literals": { - "version": "7.18.9", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.18.9.tgz", - "integrity": "sha512-IFQDSRoTPnrAIrI5zoZv73IFeZu2dhu6irxQjY9rNjTT53VmKg9fenjvoiOWOkJ6mm4jKVPtdMzBY98Fp4Z4cg==", + "@babel/plugin-transform-json-strings": { + "version": "7.22.11", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-json-strings/-/plugin-transform-json-strings-7.22.11.tgz", + "integrity": "sha512-CxT5tCqpA9/jXFlme9xIBCc5RPtdDq3JpkkhgHQqtDdiTnTI0jtZ0QzXhr5DILeYifDPp2wvY2ad+7+hLMW5Pw==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "^7.18.9" + "@babel/helper-plugin-utils": "^7.22.5", + "@babel/plugin-syntax-json-strings": "^7.8.3" + } + }, + "@babel/plugin-transform-literals": { + "version": "7.22.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.22.5.tgz", + "integrity": "sha512-fTLj4D79M+mepcw3dgFBTIDYpbcB9Sm0bpm4ppXPaO+U+PKFFyV9MGRvS0gvGw62sd10kT5lRMKXAADb9pWy8g==", + "dev": true, + "requires": { + "@babel/helper-plugin-utils": "^7.22.5" + } + }, + "@babel/plugin-transform-logical-assignment-operators": { + "version": "7.22.11", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-logical-assignment-operators/-/plugin-transform-logical-assignment-operators-7.22.11.tgz", + "integrity": "sha512-qQwRTP4+6xFCDV5k7gZBF3C31K34ut0tbEcTKxlX/0KXxm9GLcO14p570aWxFvVzx6QAfPgq7gaeIHXJC8LswQ==", + "dev": true, + "requires": { + "@babel/helper-plugin-utils": "^7.22.5", + "@babel/plugin-syntax-logical-assignment-operators": "^7.10.4" } }, "@babel/plugin-transform-member-expression-literals": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.18.6.tgz", - "integrity": "sha512-qSF1ihLGO3q+/g48k85tUjD033C29TNTVB2paCwZPVmOsjn9pClvYYrM2VeJpBY2bcNkuny0YUyTNRyRxJ54KA==", + "version": "7.22.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.22.5.tgz", + "integrity": "sha512-RZEdkNtzzYCFl9SE9ATaUMTj2hqMb4StarOJLrZRbqqU4HSBE7UlBw9WBWQiDzrJZJdUWiMTVDI6Gv/8DPvfew==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "^7.18.6" + "@babel/helper-plugin-utils": "^7.22.5" } }, "@babel/plugin-transform-modules-amd": { - "version": "7.20.11", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.20.11.tgz", - "integrity": "sha512-NuzCt5IIYOW0O30UvqktzHYR2ud5bOWbY0yaxWZ6G+aFzOMJvrs5YHNikrbdaT15+KNO31nPOy5Fim3ku6Zb5g==", + "version": "7.23.0", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.23.0.tgz", + "integrity": "sha512-xWT5gefv2HGSm4QHtgc1sYPbseOyf+FFDo2JbpE25GWl5BqTGO9IMwTYJRoIdjsF85GE+VegHxSCUt5EvoYTAw==", "dev": true, "requires": { - "@babel/helper-module-transforms": "^7.20.11", - "@babel/helper-plugin-utils": "^7.20.2" + "@babel/helper-module-transforms": "^7.23.0", + "@babel/helper-plugin-utils": "^7.22.5" } }, "@babel/plugin-transform-modules-commonjs": { - "version": "7.20.11", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.20.11.tgz", - "integrity": "sha512-S8e1f7WQ7cimJQ51JkAaDrEtohVEitXjgCGAS2N8S31Y42E+kWwfSz83LYz57QdBm7q9diARVqanIaH2oVgQnw==", + "version": "7.23.0", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.23.0.tgz", + "integrity": "sha512-32Xzss14/UVc7k9g775yMIvkVK8xwKE0DPdP5JTapr3+Z9w4tzeOuLNY6BXDQR6BdnzIlXnCGAzsk/ICHBLVWQ==", "dev": true, "requires": { - "@babel/helper-module-transforms": "^7.20.11", - "@babel/helper-plugin-utils": "^7.20.2", - "@babel/helper-simple-access": "^7.20.2" + "@babel/helper-module-transforms": "^7.23.0", + "@babel/helper-plugin-utils": "^7.22.5", + "@babel/helper-simple-access": "^7.22.5" } }, "@babel/plugin-transform-modules-systemjs": { - "version": "7.20.11", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.20.11.tgz", - "integrity": "sha512-vVu5g9BPQKSFEmvt2TA4Da5N+QVS66EX21d8uoOihC+OCpUoGvzVsXeqFdtAEfVa5BILAeFt+U7yVmLbQnAJmw==", + "version": "7.23.0", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.23.0.tgz", + "integrity": "sha512-qBej6ctXZD2f+DhlOC9yO47yEYgUh5CZNz/aBoH4j/3NOlRfJXJbY7xDQCqQVf9KbrqGzIWER1f23doHGrIHFg==", "dev": true, "requires": { - "@babel/helper-hoist-variables": "^7.18.6", - "@babel/helper-module-transforms": "^7.20.11", - "@babel/helper-plugin-utils": "^7.20.2", - "@babel/helper-validator-identifier": "^7.19.1" + "@babel/helper-hoist-variables": "^7.22.5", + "@babel/helper-module-transforms": "^7.23.0", + "@babel/helper-plugin-utils": "^7.22.5", + "@babel/helper-validator-identifier": "^7.22.20" } }, "@babel/plugin-transform-modules-umd": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.18.6.tgz", - "integrity": "sha512-dcegErExVeXcRqNtkRU/z8WlBLnvD4MRnHgNs3MytRO1Mn1sHRyhbcpYbVMGclAqOjdW+9cfkdZno9dFdfKLfQ==", + "version": "7.22.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.22.5.tgz", + "integrity": "sha512-+S6kzefN/E1vkSsKx8kmQuqeQsvCKCd1fraCM7zXm4SFoggI099Tr4G8U81+5gtMdUeMQ4ipdQffbKLX0/7dBQ==", "dev": true, "requires": { - "@babel/helper-module-transforms": "^7.18.6", - "@babel/helper-plugin-utils": "^7.18.6" + "@babel/helper-module-transforms": "^7.22.5", + "@babel/helper-plugin-utils": "^7.22.5" } }, "@babel/plugin-transform-named-capturing-groups-regex": { - "version": "7.20.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.20.5.tgz", - "integrity": "sha512-mOW4tTzi5iTLnw+78iEq3gr8Aoq4WNRGpmSlrogqaiCBoR1HFhpU4JkpQFOHfeYx3ReVIFWOQJS4aZBRvuZ6mA==", + "version": "7.22.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.22.5.tgz", + "integrity": "sha512-YgLLKmS3aUBhHaxp5hi1WJTgOUb/NCuDHzGT9z9WTt3YG+CPRhJs6nprbStx6DnWM4dh6gt7SU3sZodbZ08adQ==", "dev": true, "requires": { - "@babel/helper-create-regexp-features-plugin": "^7.20.5", - "@babel/helper-plugin-utils": "^7.20.2" + "@babel/helper-create-regexp-features-plugin": "^7.22.5", + "@babel/helper-plugin-utils": "^7.22.5" } }, "@babel/plugin-transform-new-target": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.18.6.tgz", - "integrity": "sha512-DjwFA/9Iu3Z+vrAn+8pBUGcjhxKguSMlsFqeCKbhb9BAV756v0krzVK04CRDi/4aqmk8BsHb4a/gFcaA5joXRw==", + "version": "7.22.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.22.5.tgz", + "integrity": "sha512-AsF7K0Fx/cNKVyk3a+DW0JLo+Ua598/NxMRvxDnkpCIGFh43+h/v2xyhRUYf6oD8gE4QtL83C7zZVghMjHd+iw==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "^7.18.6" + "@babel/helper-plugin-utils": "^7.22.5" + } + }, + "@babel/plugin-transform-nullish-coalescing-operator": { + "version": "7.22.11", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-nullish-coalescing-operator/-/plugin-transform-nullish-coalescing-operator-7.22.11.tgz", + "integrity": "sha512-YZWOw4HxXrotb5xsjMJUDlLgcDXSfO9eCmdl1bgW4+/lAGdkjaEvOnQ4p5WKKdUgSzO39dgPl0pTnfxm0OAXcg==", + "dev": true, + "requires": { + "@babel/helper-plugin-utils": "^7.22.5", + "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3" + } + }, + "@babel/plugin-transform-numeric-separator": { + "version": "7.22.11", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-numeric-separator/-/plugin-transform-numeric-separator-7.22.11.tgz", + "integrity": "sha512-3dzU4QGPsILdJbASKhF/V2TVP+gJya1PsueQCxIPCEcerqF21oEcrob4mzjsp2Py/1nLfF5m+xYNMDpmA8vffg==", + "dev": true, + "requires": { + "@babel/helper-plugin-utils": "^7.22.5", + "@babel/plugin-syntax-numeric-separator": "^7.10.4" + } + }, + "@babel/plugin-transform-object-rest-spread": { + "version": "7.22.15", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-rest-spread/-/plugin-transform-object-rest-spread-7.22.15.tgz", + "integrity": "sha512-fEB+I1+gAmfAyxZcX1+ZUwLeAuuf8VIg67CTznZE0MqVFumWkh8xWtn58I4dxdVf080wn7gzWoF8vndOViJe9Q==", + "dev": true, + "requires": { + "@babel/compat-data": "^7.22.9", + "@babel/helper-compilation-targets": "^7.22.15", + "@babel/helper-plugin-utils": "^7.22.5", + "@babel/plugin-syntax-object-rest-spread": "^7.8.3", + "@babel/plugin-transform-parameters": "^7.22.15" } }, "@babel/plugin-transform-object-super": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.18.6.tgz", - "integrity": "sha512-uvGz6zk+pZoS1aTZrOvrbj6Pp/kK2mp45t2B+bTDre2UgsZZ8EZLSJtUg7m/no0zOJUWgFONpB7Zv9W2tSaFlA==", + "version": "7.22.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.22.5.tgz", + "integrity": "sha512-klXqyaT9trSjIUrcsYIfETAzmOEZL3cBYqOYLJxBHfMFFggmXOv+NYSX/Jbs9mzMVESw/WycLFPRx8ba/b2Ipw==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "^7.18.6", - "@babel/helper-replace-supers": "^7.18.6" + "@babel/helper-plugin-utils": "^7.22.5", + "@babel/helper-replace-supers": "^7.22.5" + } + }, + "@babel/plugin-transform-optional-catch-binding": { + "version": "7.22.11", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-catch-binding/-/plugin-transform-optional-catch-binding-7.22.11.tgz", + "integrity": "sha512-rli0WxesXUeCJnMYhzAglEjLWVDF6ahb45HuprcmQuLidBJFWjNnOzssk2kuc6e33FlLaiZhG/kUIzUMWdBKaQ==", + "dev": true, + "requires": { + "@babel/helper-plugin-utils": "^7.22.5", + "@babel/plugin-syntax-optional-catch-binding": "^7.8.3" + } + }, + "@babel/plugin-transform-optional-chaining": { + "version": "7.23.0", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-chaining/-/plugin-transform-optional-chaining-7.23.0.tgz", + "integrity": "sha512-sBBGXbLJjxTzLBF5rFWaikMnOGOk/BmK6vVByIdEggZ7Vn6CvWXZyRkkLFK6WE0IF8jSliyOkUN6SScFgzCM0g==", + "dev": true, + "requires": { + "@babel/helper-plugin-utils": "^7.22.5", + "@babel/helper-skip-transparent-expression-wrappers": "^7.22.5", + "@babel/plugin-syntax-optional-chaining": "^7.8.3" } }, "@babel/plugin-transform-parameters": { - "version": "7.20.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.20.7.tgz", - "integrity": "sha512-WiWBIkeHKVOSYPO0pWkxGPfKeWrCJyD3NJ53+Lrp/QMSZbsVPovrVl2aWZ19D/LTVnaDv5Ap7GJ/B2CTOZdrfA==", + "version": "7.22.15", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.22.15.tgz", + "integrity": "sha512-hjk7qKIqhyzhhUvRT683TYQOFa/4cQKwQy7ALvTpODswN40MljzNDa0YldevS6tGbxwaEKVn502JmY0dP7qEtQ==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "^7.20.2" + "@babel/helper-plugin-utils": "^7.22.5" + } + }, + "@babel/plugin-transform-private-methods": { + "version": "7.22.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-private-methods/-/plugin-transform-private-methods-7.22.5.tgz", + "integrity": "sha512-PPjh4gyrQnGe97JTalgRGMuU4icsZFnWkzicB/fUtzlKUqvsWBKEpPPfr5a2JiyirZkHxnAqkQMO5Z5B2kK3fA==", + "dev": true, + "requires": { + "@babel/helper-create-class-features-plugin": "^7.22.5", + "@babel/helper-plugin-utils": "^7.22.5" + } + }, + "@babel/plugin-transform-private-property-in-object": { + "version": "7.22.11", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-private-property-in-object/-/plugin-transform-private-property-in-object-7.22.11.tgz", + "integrity": "sha512-sSCbqZDBKHetvjSwpyWzhuHkmW5RummxJBVbYLkGkaiTOWGxml7SXt0iWa03bzxFIx7wOj3g/ILRd0RcJKBeSQ==", + "dev": true, + "requires": { + "@babel/helper-annotate-as-pure": "^7.22.5", + "@babel/helper-create-class-features-plugin": "^7.22.11", + "@babel/helper-plugin-utils": "^7.22.5", + "@babel/plugin-syntax-private-property-in-object": "^7.14.5" } }, "@babel/plugin-transform-property-literals": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.18.6.tgz", - "integrity": "sha512-cYcs6qlgafTud3PAzrrRNbQtfpQ8+y/+M5tKmksS9+M1ckbH6kzY8MrexEM9mcA6JDsukE19iIRvAyYl463sMg==", + "version": "7.22.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.22.5.tgz", + "integrity": "sha512-TiOArgddK3mK/x1Qwf5hay2pxI6wCZnvQqrFSqbtg1GLl2JcNMitVH/YnqjP+M31pLUeTfzY1HAXFDnUBV30rQ==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "^7.18.6" + "@babel/helper-plugin-utils": "^7.22.5" } }, "@babel/plugin-transform-regenerator": { - "version": "7.20.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.20.5.tgz", - "integrity": "sha512-kW/oO7HPBtntbsahzQ0qSE3tFvkFwnbozz3NWFhLGqH75vLEg+sCGngLlhVkePlCs3Jv0dBBHDzCHxNiFAQKCQ==", + "version": "7.22.10", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.22.10.tgz", + "integrity": "sha512-F28b1mDt8KcT5bUyJc/U9nwzw6cV+UmTeRlXYIl2TNqMMJif0Jeey9/RQ3C4NOd2zp0/TRsDns9ttj2L523rsw==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "^7.20.2", - "regenerator-transform": "^0.15.1" + "@babel/helper-plugin-utils": "^7.22.5", + "regenerator-transform": "^0.15.2" } }, "@babel/plugin-transform-reserved-words": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.18.6.tgz", - "integrity": "sha512-oX/4MyMoypzHjFrT1CdivfKZ+XvIPMFXwwxHp/r0Ddy2Vuomt4HDFGmft1TAY2yiTKiNSsh3kjBAzcM8kSdsjA==", + "version": "7.22.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.22.5.tgz", + "integrity": "sha512-DTtGKFRQUDm8svigJzZHzb/2xatPc6TzNvAIJ5GqOKDsGFYgAskjRulbR/vGsPKq3OPqtexnz327qYpP57RFyA==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "^7.18.6" + "@babel/helper-plugin-utils": "^7.22.5" } }, "@babel/plugin-transform-runtime": { - "version": "7.19.6", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.19.6.tgz", - "integrity": "sha512-PRH37lz4JU156lYFW1p8OxE5i7d6Sl/zV58ooyr+q1J1lnQPyg5tIiXlIwNVhJaY4W3TmOtdc8jqdXQcB1v5Yw==", + "version": "7.22.9", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.22.9.tgz", + "integrity": "sha512-9KjBH61AGJetCPYp/IEyLEp47SyybZb0nDRpBvmtEkm+rUIwxdlKpyNHI1TmsGkeuLclJdleQHRZ8XLBnnh8CQ==", "dev": true, "requires": { - "@babel/helper-module-imports": "^7.18.6", - "@babel/helper-plugin-utils": "^7.19.0", - "babel-plugin-polyfill-corejs2": "^0.3.3", - "babel-plugin-polyfill-corejs3": "^0.6.0", - "babel-plugin-polyfill-regenerator": "^0.4.1", - "semver": "^6.3.0" + "@babel/helper-module-imports": "^7.22.5", + "@babel/helper-plugin-utils": "^7.22.5", + "babel-plugin-polyfill-corejs2": "^0.4.4", + "babel-plugin-polyfill-corejs3": "^0.8.2", + "babel-plugin-polyfill-regenerator": "^0.5.1", + "semver": "^6.3.1" }, "dependencies": { "semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", + "version": "6.3.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", + "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", "dev": true } } }, "@babel/plugin-transform-shorthand-properties": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.18.6.tgz", - "integrity": "sha512-eCLXXJqv8okzg86ywZJbRn19YJHU4XUa55oz2wbHhaQVn/MM+XhukiT7SYqp/7o00dg52Rj51Ny+Ecw4oyoygw==", + "version": "7.22.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.22.5.tgz", + "integrity": "sha512-vM4fq9IXHscXVKzDv5itkO1X52SmdFBFcMIBZ2FRn2nqVYqw6dBexUgMvAjHW+KXpPPViD/Yo3GrDEBaRC0QYA==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "^7.18.6" + "@babel/helper-plugin-utils": "^7.22.5" } }, "@babel/plugin-transform-spread": { - "version": "7.20.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.20.7.tgz", - "integrity": "sha512-ewBbHQ+1U/VnH1fxltbJqDeWBU1oNLG8Dj11uIv3xVf7nrQu0bPGe5Rf716r7K5Qz+SqtAOVswoVunoiBtGhxw==", + "version": "7.22.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.22.5.tgz", + "integrity": "sha512-5ZzDQIGyvN4w8+dMmpohL6MBo+l2G7tfC/O2Dg7/hjpgeWvUx8FzfeOKxGog9IimPa4YekaQ9PlDqTLOljkcxg==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "^7.20.2", - "@babel/helper-skip-transparent-expression-wrappers": "^7.20.0" + "@babel/helper-plugin-utils": "^7.22.5", + "@babel/helper-skip-transparent-expression-wrappers": "^7.22.5" } }, "@babel/plugin-transform-sticky-regex": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.18.6.tgz", - "integrity": "sha512-kfiDrDQ+PBsQDO85yj1icueWMfGfJFKN1KCkndygtu/C9+XUfydLC8Iv5UYJqRwy4zk8EcplRxEOeLyjq1gm6Q==", + "version": "7.22.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.22.5.tgz", + "integrity": "sha512-zf7LuNpHG0iEeiyCNwX4j3gDg1jgt1k3ZdXBKbZSoA3BbGQGvMiSvfbZRR3Dr3aeJe3ooWFZxOOG3IRStYp2Bw==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "^7.18.6" + "@babel/helper-plugin-utils": "^7.22.5" } }, "@babel/plugin-transform-template-literals": { - "version": "7.18.9", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.18.9.tgz", - "integrity": "sha512-S8cOWfT82gTezpYOiVaGHrCbhlHgKhQt8XH5ES46P2XWmX92yisoZywf5km75wv5sYcXDUCLMmMxOLCtthDgMA==", + "version": "7.22.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.22.5.tgz", + "integrity": "sha512-5ciOehRNf+EyUeewo8NkbQiUs4d6ZxiHo6BcBcnFlgiJfu16q0bQUw9Jvo0b0gBKFG1SMhDSjeKXSYuJLeFSMA==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "^7.18.9" + "@babel/helper-plugin-utils": "^7.22.5" } }, "@babel/plugin-transform-typeof-symbol": { - "version": "7.18.9", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.18.9.tgz", - "integrity": "sha512-SRfwTtF11G2aemAZWivL7PD+C9z52v9EvMqH9BuYbabyPuKUvSWks3oCg6041pT925L4zVFqaVBeECwsmlguEw==", + "version": "7.22.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.22.5.tgz", + "integrity": "sha512-bYkI5lMzL4kPii4HHEEChkD0rkc+nvnlR6+o/qdqR6zrm0Sv/nodmyLhlq2DO0YKLUNd2VePmPRjJXSBh9OIdA==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "^7.18.9" + "@babel/helper-plugin-utils": "^7.22.5" } }, "@babel/plugin-transform-unicode-escapes": { - "version": "7.18.10", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.18.10.tgz", - "integrity": "sha512-kKAdAI+YzPgGY/ftStBFXTI1LZFju38rYThnfMykS+IXy8BVx+res7s2fxf1l8I35DV2T97ezo6+SGrXz6B3iQ==", + "version": "7.22.10", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.22.10.tgz", + "integrity": "sha512-lRfaRKGZCBqDlRU3UIFovdp9c9mEvlylmpod0/OatICsSfuQ9YFthRo1tpTkGsklEefZdqlEFdY4A2dwTb6ohg==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "^7.18.9" + "@babel/helper-plugin-utils": "^7.22.5" + } + }, + "@babel/plugin-transform-unicode-property-regex": { + "version": "7.22.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-property-regex/-/plugin-transform-unicode-property-regex-7.22.5.tgz", + "integrity": "sha512-HCCIb+CbJIAE6sXn5CjFQXMwkCClcOfPCzTlilJ8cUatfzwHlWQkbtV0zD338u9dZskwvuOYTuuaMaA8J5EI5A==", + "dev": true, + "requires": { + "@babel/helper-create-regexp-features-plugin": "^7.22.5", + "@babel/helper-plugin-utils": "^7.22.5" } }, "@babel/plugin-transform-unicode-regex": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.18.6.tgz", - "integrity": "sha512-gE7A6Lt7YLnNOL3Pb9BNeZvi+d8l7tcRrG4+pwJjK9hD2xX4mEvjlQW60G9EEmfXVYRPv9VRQcyegIVHCql/AA==", + "version": "7.22.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.22.5.tgz", + "integrity": "sha512-028laaOKptN5vHJf9/Arr/HiJekMd41hOEZYvNsrsXqJ7YPYuX2bQxh31fkZzGmq3YqHRJzYFFAVYvKfMPKqyg==", "dev": true, "requires": { - "@babel/helper-create-regexp-features-plugin": "^7.18.6", - "@babel/helper-plugin-utils": "^7.18.6" + "@babel/helper-create-regexp-features-plugin": "^7.22.5", + "@babel/helper-plugin-utils": "^7.22.5" + } + }, + "@babel/plugin-transform-unicode-sets-regex": { + "version": "7.22.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-sets-regex/-/plugin-transform-unicode-sets-regex-7.22.5.tgz", + "integrity": "sha512-lhMfi4FC15j13eKrh3DnYHjpGj6UKQHtNKTbtc1igvAhRy4+kLhV07OpLcsN0VgDEw/MjAvJO4BdMJsHwMhzCg==", + "dev": true, + "requires": { + "@babel/helper-create-regexp-features-plugin": "^7.22.5", + "@babel/helper-plugin-utils": "^7.22.5" } }, "@babel/preset-env": { - "version": "7.20.2", - "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.20.2.tgz", - "integrity": "sha512-1G0efQEWR1EHkKvKHqbG+IN/QdgwfByUpM5V5QroDzGV2t3S/WXNQd693cHiHTlCFMpr9B6FkPFXDA2lQcKoDg==", + "version": "7.22.9", + "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.22.9.tgz", + "integrity": "sha512-wNi5H/Emkhll/bqPjsjQorSykrlfY5OWakd6AulLvMEytpKasMVUpVy8RL4qBIBs5Ac6/5i0/Rv0b/Fg6Eag/g==", "dev": true, "requires": { - "@babel/compat-data": "^7.20.1", - "@babel/helper-compilation-targets": "^7.20.0", - "@babel/helper-plugin-utils": "^7.20.2", - "@babel/helper-validator-option": "^7.18.6", - "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": "^7.18.6", - "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "^7.18.9", - "@babel/plugin-proposal-async-generator-functions": "^7.20.1", - "@babel/plugin-proposal-class-properties": "^7.18.6", - "@babel/plugin-proposal-class-static-block": "^7.18.6", - "@babel/plugin-proposal-dynamic-import": "^7.18.6", - "@babel/plugin-proposal-export-namespace-from": "^7.18.9", - "@babel/plugin-proposal-json-strings": "^7.18.6", - "@babel/plugin-proposal-logical-assignment-operators": "^7.18.9", - "@babel/plugin-proposal-nullish-coalescing-operator": "^7.18.6", - "@babel/plugin-proposal-numeric-separator": "^7.18.6", - "@babel/plugin-proposal-object-rest-spread": "^7.20.2", - "@babel/plugin-proposal-optional-catch-binding": "^7.18.6", - "@babel/plugin-proposal-optional-chaining": "^7.18.9", - "@babel/plugin-proposal-private-methods": "^7.18.6", - "@babel/plugin-proposal-private-property-in-object": "^7.18.6", - "@babel/plugin-proposal-unicode-property-regex": "^7.18.6", + "@babel/compat-data": "^7.22.9", + "@babel/helper-compilation-targets": "^7.22.9", + "@babel/helper-plugin-utils": "^7.22.5", + "@babel/helper-validator-option": "^7.22.5", + "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": "^7.22.5", + "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "^7.22.5", + "@babel/plugin-proposal-private-property-in-object": "7.21.0-placeholder-for-preset-env.2", "@babel/plugin-syntax-async-generators": "^7.8.4", "@babel/plugin-syntax-class-properties": "^7.12.13", "@babel/plugin-syntax-class-static-block": "^7.14.5", "@babel/plugin-syntax-dynamic-import": "^7.8.3", "@babel/plugin-syntax-export-namespace-from": "^7.8.3", - "@babel/plugin-syntax-import-assertions": "^7.20.0", + "@babel/plugin-syntax-import-assertions": "^7.22.5", + "@babel/plugin-syntax-import-attributes": "^7.22.5", + "@babel/plugin-syntax-import-meta": "^7.10.4", "@babel/plugin-syntax-json-strings": "^7.8.3", "@babel/plugin-syntax-logical-assignment-operators": "^7.10.4", "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3", @@ -19633,59 +20462,76 @@ "@babel/plugin-syntax-optional-chaining": "^7.8.3", "@babel/plugin-syntax-private-property-in-object": "^7.14.5", "@babel/plugin-syntax-top-level-await": "^7.14.5", - "@babel/plugin-transform-arrow-functions": "^7.18.6", - "@babel/plugin-transform-async-to-generator": "^7.18.6", - "@babel/plugin-transform-block-scoped-functions": "^7.18.6", - "@babel/plugin-transform-block-scoping": "^7.20.2", - "@babel/plugin-transform-classes": "^7.20.2", - "@babel/plugin-transform-computed-properties": "^7.18.9", - "@babel/plugin-transform-destructuring": "^7.20.2", - "@babel/plugin-transform-dotall-regex": "^7.18.6", - "@babel/plugin-transform-duplicate-keys": "^7.18.9", - "@babel/plugin-transform-exponentiation-operator": "^7.18.6", - "@babel/plugin-transform-for-of": "^7.18.8", - "@babel/plugin-transform-function-name": "^7.18.9", - "@babel/plugin-transform-literals": "^7.18.9", - "@babel/plugin-transform-member-expression-literals": "^7.18.6", - "@babel/plugin-transform-modules-amd": "^7.19.6", - "@babel/plugin-transform-modules-commonjs": "^7.19.6", - "@babel/plugin-transform-modules-systemjs": "^7.19.6", - "@babel/plugin-transform-modules-umd": "^7.18.6", - "@babel/plugin-transform-named-capturing-groups-regex": "^7.19.1", - "@babel/plugin-transform-new-target": "^7.18.6", - "@babel/plugin-transform-object-super": "^7.18.6", - "@babel/plugin-transform-parameters": "^7.20.1", - "@babel/plugin-transform-property-literals": "^7.18.6", - "@babel/plugin-transform-regenerator": "^7.18.6", - "@babel/plugin-transform-reserved-words": "^7.18.6", - "@babel/plugin-transform-shorthand-properties": "^7.18.6", - "@babel/plugin-transform-spread": "^7.19.0", - "@babel/plugin-transform-sticky-regex": "^7.18.6", - "@babel/plugin-transform-template-literals": "^7.18.9", - "@babel/plugin-transform-typeof-symbol": "^7.18.9", - "@babel/plugin-transform-unicode-escapes": "^7.18.10", - "@babel/plugin-transform-unicode-regex": "^7.18.6", + "@babel/plugin-syntax-unicode-sets-regex": "^7.18.6", + "@babel/plugin-transform-arrow-functions": "^7.22.5", + "@babel/plugin-transform-async-generator-functions": "^7.22.7", + "@babel/plugin-transform-async-to-generator": "^7.22.5", + "@babel/plugin-transform-block-scoped-functions": "^7.22.5", + "@babel/plugin-transform-block-scoping": "^7.22.5", + "@babel/plugin-transform-class-properties": "^7.22.5", + "@babel/plugin-transform-class-static-block": "^7.22.5", + "@babel/plugin-transform-classes": "^7.22.6", + "@babel/plugin-transform-computed-properties": "^7.22.5", + "@babel/plugin-transform-destructuring": "^7.22.5", + "@babel/plugin-transform-dotall-regex": "^7.22.5", + "@babel/plugin-transform-duplicate-keys": "^7.22.5", + "@babel/plugin-transform-dynamic-import": "^7.22.5", + "@babel/plugin-transform-exponentiation-operator": "^7.22.5", + "@babel/plugin-transform-export-namespace-from": "^7.22.5", + "@babel/plugin-transform-for-of": "^7.22.5", + "@babel/plugin-transform-function-name": "^7.22.5", + "@babel/plugin-transform-json-strings": "^7.22.5", + "@babel/plugin-transform-literals": "^7.22.5", + "@babel/plugin-transform-logical-assignment-operators": "^7.22.5", + "@babel/plugin-transform-member-expression-literals": "^7.22.5", + "@babel/plugin-transform-modules-amd": "^7.22.5", + "@babel/plugin-transform-modules-commonjs": "^7.22.5", + "@babel/plugin-transform-modules-systemjs": "^7.22.5", + "@babel/plugin-transform-modules-umd": "^7.22.5", + "@babel/plugin-transform-named-capturing-groups-regex": "^7.22.5", + "@babel/plugin-transform-new-target": "^7.22.5", + "@babel/plugin-transform-nullish-coalescing-operator": "^7.22.5", + "@babel/plugin-transform-numeric-separator": "^7.22.5", + "@babel/plugin-transform-object-rest-spread": "^7.22.5", + "@babel/plugin-transform-object-super": "^7.22.5", + "@babel/plugin-transform-optional-catch-binding": "^7.22.5", + "@babel/plugin-transform-optional-chaining": "^7.22.6", + "@babel/plugin-transform-parameters": "^7.22.5", + "@babel/plugin-transform-private-methods": "^7.22.5", + "@babel/plugin-transform-private-property-in-object": "^7.22.5", + "@babel/plugin-transform-property-literals": "^7.22.5", + "@babel/plugin-transform-regenerator": "^7.22.5", + "@babel/plugin-transform-reserved-words": "^7.22.5", + "@babel/plugin-transform-shorthand-properties": "^7.22.5", + "@babel/plugin-transform-spread": "^7.22.5", + "@babel/plugin-transform-sticky-regex": "^7.22.5", + "@babel/plugin-transform-template-literals": "^7.22.5", + "@babel/plugin-transform-typeof-symbol": "^7.22.5", + "@babel/plugin-transform-unicode-escapes": "^7.22.5", + "@babel/plugin-transform-unicode-property-regex": "^7.22.5", + "@babel/plugin-transform-unicode-regex": "^7.22.5", + "@babel/plugin-transform-unicode-sets-regex": "^7.22.5", "@babel/preset-modules": "^0.1.5", - "@babel/types": "^7.20.2", - "babel-plugin-polyfill-corejs2": "^0.3.3", - "babel-plugin-polyfill-corejs3": "^0.6.0", - "babel-plugin-polyfill-regenerator": "^0.4.1", - "core-js-compat": "^3.25.1", - "semver": "^6.3.0" + "@babel/types": "^7.22.5", + "babel-plugin-polyfill-corejs2": "^0.4.4", + "babel-plugin-polyfill-corejs3": "^0.8.2", + "babel-plugin-polyfill-regenerator": "^0.5.1", + "core-js-compat": "^3.31.0", + "semver": "^6.3.1" }, "dependencies": { "semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", + "version": "6.3.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", + "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", "dev": true } } }, "@babel/preset-modules": { - "version": "0.1.5", - "resolved": "https://registry.npmjs.org/@babel/preset-modules/-/preset-modules-0.1.5.tgz", - "integrity": "sha512-A57th6YRG7oR3cq/yt/Y84MvGgE0eJG2F1JLhKuyG+jFxEgrd/HAMJatiFtmOiZurz+0DkrvbheCLaV5f2JfjA==", + "version": "0.1.6", + "resolved": "https://registry.npmjs.org/@babel/preset-modules/-/preset-modules-0.1.6.tgz", + "integrity": "sha512-ID2yj6K/4lKfhuU3+EX4UvNbIt7eACFbHmNUjzA+ep+B5971CknnA/9DEWKbRokfbbtblxxxXFJJrH47UEAMVg==", "dev": true, "requires": { "@babel/helper-plugin-utils": "^7.0.0", @@ -19695,97 +20541,88 @@ "esutils": "^2.0.2" } }, + "@babel/regjsgen": { + "version": "0.8.0", + "resolved": "https://registry.npmjs.org/@babel/regjsgen/-/regjsgen-0.8.0.tgz", + "integrity": "sha512-x/rqGMdzj+fWZvCOYForTghzbtqPDZ5gPwaoNGHdgDfF2QA/XZbCBp4Moo5scrkAMPhB7z26XM/AaHuIJdgauA==", + "dev": true + }, "@babel/runtime": { - "version": "7.20.13", - "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.20.13.tgz", - "integrity": "sha512-gt3PKXs0DBoL9xCvOIIZ2NEqAGZqHjAnmVbfQtB620V0uReIQutpel14KcneZuer7UioY8ALKZ7iocavvzTNFA==", + "version": "7.22.6", + "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.22.6.tgz", + "integrity": "sha512-wDb5pWm4WDdF6LFUde3Jl8WzPA+3ZbxYqkC6xAXuD3irdEHN1k0NfTRrJD8ZD378SJ61miMLCqIOXYhd8x+AJQ==", "dev": true, "requires": { "regenerator-runtime": "^0.13.11" } }, "@babel/template": { - "version": "7.20.7", - "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.20.7.tgz", - "integrity": "sha512-8SegXApWe6VoNw0r9JHpSteLKTpTiLZ4rMlGIm9JQ18KiCtyQiAMEazujAHrUS5flrcqYZa75ukev3P6QmUwUw==", - "dev": true, - "requires": { - "@babel/code-frame": "^7.18.6", - "@babel/parser": "^7.20.7", - "@babel/types": "^7.20.7" - } - }, - "@babel/traverse": { "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.22.5.tgz", - "integrity": "sha512-7DuIjPgERaNo6r+PZwItpjCZEa5vyw4eJGufeLxrPdBXBoLcCJCIasvK6pK/9DVNrLZTLFhUGqaC6X/PA007TQ==", + "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.22.5.tgz", + "integrity": "sha512-X7yV7eiwAxdj9k94NEylvbVHLiVG1nvzCV2EAowhxLTwODV1jl9UzZ48leOC0sH7OnuHrIkllaBgneUykIcZaw==", "dev": true, "requires": { "@babel/code-frame": "^7.22.5", - "@babel/generator": "^7.22.5", - "@babel/helper-environment-visitor": "^7.22.5", - "@babel/helper-function-name": "^7.22.5", - "@babel/helper-hoist-variables": "^7.22.5", - "@babel/helper-split-export-declaration": "^7.22.5", "@babel/parser": "^7.22.5", - "@babel/types": "^7.22.5", + "@babel/types": "^7.22.5" + } + }, + "@babel/traverse": { + "version": "7.23.0", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.23.0.tgz", + "integrity": "sha512-t/QaEvyIoIkwzpiZ7aoSKK8kObQYeF7T2v+dazAYCb8SXtp58zEVkWW7zAnju8FNKNdr4ScAOEDmMItbyOmEYw==", + "dev": true, + "requires": { + "@babel/code-frame": "^7.22.13", + "@babel/generator": "^7.23.0", + "@babel/helper-environment-visitor": "^7.22.20", + "@babel/helper-function-name": "^7.23.0", + "@babel/helper-hoist-variables": "^7.22.5", + "@babel/helper-split-export-declaration": "^7.22.6", + "@babel/parser": "^7.23.0", + "@babel/types": "^7.23.0", "debug": "^4.1.0", "globals": "^11.1.0" }, "dependencies": { "@babel/generator": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.22.5.tgz", - "integrity": "sha512-+lcUbnTRhd0jOewtFSedLyiPsD5tswKkbgcezOqqWFUVNEwoUTlpPOBmvhG7OXWLR4jMdv0czPGH5XbflnD1EA==", + "version": "7.23.0", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.23.0.tgz", + "integrity": "sha512-lN85QRR+5IbYrMWM6Y4pE/noaQtg4pNiqeNGX60eqOfo6gtEj6uw/JagelB8vVztSd7R6M5n1+PQkDbHbBRU4g==", "dev": true, "requires": { - "@babel/types": "^7.22.5", + "@babel/types": "^7.23.0", "@jridgewell/gen-mapping": "^0.3.2", "@jridgewell/trace-mapping": "^0.3.17", "jsesc": "^2.5.1" } - }, - "@babel/helper-split-export-declaration": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.22.5.tgz", - "integrity": "sha512-thqK5QFghPKWLhAV321lxF95yCg2K3Ob5yw+M3VHWfdia0IkPXUtoLH8x/6Fh486QUvzhb8YOWHChTVen2/PoQ==", - "dev": true, - "requires": { - "@babel/types": "^7.22.5" - } - }, - "@jridgewell/gen-mapping": { - "version": "0.3.3", - "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.3.tgz", - "integrity": "sha512-HLhSWOLRi875zjjMG/r+Nv0oCW8umGb0BgEhyX3dDX3egwZtB8PqLnjz3yedt8R5StBrzcg4aBpnh8UA9D1BoQ==", - "dev": true, - "requires": { - "@jridgewell/set-array": "^1.0.1", - "@jridgewell/sourcemap-codec": "^1.4.10", - "@jridgewell/trace-mapping": "^0.3.9" - } } } }, "@babel/types": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.22.5.tgz", - "integrity": "sha512-zo3MIHGOkPOfoRXitsgHLjEXmlDaD/5KU1Uzuc9GNiZPhSqVxVRtxuPaSBZDsYZ9qV88AjtMtWW7ww98loJ9KA==", + "version": "7.23.0", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.23.0.tgz", + "integrity": "sha512-0oIyUfKoI3mSqMvsxBdclDwxXKXAUA8v/apZbc+iSyARYou1o8ZGDxbUYyLFoW2arqS2jDGqJuZvv1d/io1axg==", "dev": true, "requires": { "@babel/helper-string-parser": "^7.22.5", - "@babel/helper-validator-identifier": "^7.22.5", + "@babel/helper-validator-identifier": "^7.22.20", "to-fast-properties": "^2.0.0" } }, "@ctrl/ngx-github-buttons": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/@ctrl/ngx-github-buttons/-/ngx-github-buttons-8.0.0.tgz", - "integrity": "sha512-0YOT7DbC+Yu0BfxRQAvq2S56Q30fCzv/aUbU1taw65cbzD3XAR/c1BzaU29JVQnQMHjpddXacf4qH2oiN1TeTw==", + "version": "9.0.0", + "resolved": "https://registry.npmjs.org/@ctrl/ngx-github-buttons/-/ngx-github-buttons-9.0.0.tgz", + "integrity": "sha512-GNcDw5DCUW8r2ctCS82yLgUgOJ3NEN8DKk2MCZbvdfQLiOEb2FLTqLojdrC2oc7Tppm0/uztrN8EP5qRLMW0wA==", "requires": { "tslib": "^2.3.0" } }, + "@ctrl/tinycolor": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/@ctrl/tinycolor/-/tinycolor-4.0.2.tgz", + "integrity": "sha512-fKQinXE9pJ83J1n+C3rDl2xNLJwfoYNvXLRy5cYZA9hBJJw2q+sbb/AOSNKmLxnTWyNTmy4994dueSwP4opi5g==" + }, "@discoveryjs/json-ext": { "version": "0.5.7", "resolved": "https://registry.npmjs.org/@discoveryjs/json-ext/-/json-ext-0.5.7.tgz", @@ -19793,167 +20630,167 @@ "dev": true }, "@es-joy/jsdoccomment": { - "version": "0.37.0", - "resolved": "https://registry.npmjs.org/@es-joy/jsdoccomment/-/jsdoccomment-0.37.0.tgz", - "integrity": "sha512-hjK0wnsPCYLlF+HHB4R/RbUjOWeLW2SlarB67+Do5WsKILOkmIZvvPJFbtWSmbypxcjpoECLAMzoao0D4Bg5ZQ==", + "version": "0.40.1", + "resolved": "https://registry.npmjs.org/@es-joy/jsdoccomment/-/jsdoccomment-0.40.1.tgz", + "integrity": "sha512-YORCdZSusAlBrFpZ77pJjc5r1bQs5caPWtAu+WWmiSo+8XaUzseapVrfAtiRFbQWnrBxxLLEwF6f6ZG/UgCQCg==", "dev": true, "requires": { - "comment-parser": "1.3.1", - "esquery": "^1.4.0", + "comment-parser": "1.4.0", + "esquery": "^1.5.0", "jsdoc-type-pratt-parser": "~4.0.0" } }, "@esbuild/android-arm": { - "version": "0.17.8", - "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.17.8.tgz", - "integrity": "sha512-0/rb91GYKhrtbeglJXOhAv9RuYimgI8h623TplY2X+vA4EXnk3Zj1fXZreJ0J3OJJu1bwmb0W7g+2cT/d8/l/w==", + "version": "0.18.17", + "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.18.17.tgz", + "integrity": "sha512-wHsmJG/dnL3OkpAcwbgoBTTMHVi4Uyou3F5mf58ZtmUyIKfcdA7TROav/6tCzET4A3QW2Q2FC+eFneMU+iyOxg==", "dev": true, "optional": true }, "@esbuild/android-arm64": { - "version": "0.17.8", - "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.17.8.tgz", - "integrity": "sha512-oa/N5j6v1svZQs7EIRPqR8f+Bf8g6HBDjD/xHC02radE/NjKHK7oQmtmLxPs1iVwYyvE+Kolo6lbpfEQ9xnhxQ==", + "version": "0.18.17", + "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.18.17.tgz", + "integrity": "sha512-9np+YYdNDed5+Jgr1TdWBsozZ85U1Oa3xW0c7TWqH0y2aGghXtZsuT8nYRbzOMcl0bXZXjOGbksoTtVOlWrRZg==", "dev": true, "optional": true }, "@esbuild/android-x64": { - "version": "0.17.8", - "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.17.8.tgz", - "integrity": "sha512-bTliMLqD7pTOoPg4zZkXqCDuzIUguEWLpeqkNfC41ODBHwoUgZ2w5JBeYimv4oP6TDVocoYmEhZrCLQTrH89bg==", + "version": "0.18.17", + "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.18.17.tgz", + "integrity": "sha512-O+FeWB/+xya0aLg23hHEM2E3hbfwZzjqumKMSIqcHbNvDa+dza2D0yLuymRBQQnC34CWrsJUXyH2MG5VnLd6uw==", "dev": true, "optional": true }, "@esbuild/darwin-arm64": { - "version": "0.17.8", - "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.17.8.tgz", - "integrity": "sha512-ghAbV3ia2zybEefXRRm7+lx8J/rnupZT0gp9CaGy/3iolEXkJ6LYRq4IpQVI9zR97ID80KJVoUlo3LSeA/sMAg==", + "version": "0.18.17", + "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.18.17.tgz", + "integrity": "sha512-M9uJ9VSB1oli2BE/dJs3zVr9kcCBBsE883prage1NWz6pBS++1oNn/7soPNS3+1DGj0FrkSvnED4Bmlu1VAE9g==", "dev": true, "optional": true }, "@esbuild/darwin-x64": { - "version": "0.17.8", - "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.17.8.tgz", - "integrity": "sha512-n5WOpyvZ9TIdv2V1K3/iIkkJeKmUpKaCTdun9buhGRWfH//osmUjlv4Z5mmWdPWind/VGcVxTHtLfLCOohsOXw==", + "version": "0.18.17", + "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.18.17.tgz", + "integrity": "sha512-XDre+J5YeIJDMfp3n0279DFNrGCXlxOuGsWIkRb1NThMZ0BsrWXoTg23Jer7fEXQ9Ye5QjrvXpxnhzl3bHtk0g==", "dev": true, "optional": true }, "@esbuild/freebsd-arm64": { - "version": "0.17.8", - "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.17.8.tgz", - "integrity": "sha512-a/SATTaOhPIPFWvHZDoZYgxaZRVHn0/LX1fHLGfZ6C13JqFUZ3K6SMD6/HCtwOQ8HnsNaEeokdiDSFLuizqv5A==", + "version": "0.18.17", + "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.18.17.tgz", + "integrity": "sha512-cjTzGa3QlNfERa0+ptykyxs5A6FEUQQF0MuilYXYBGdBxD3vxJcKnzDlhDCa1VAJCmAxed6mYhA2KaJIbtiNuQ==", "dev": true, "optional": true }, "@esbuild/freebsd-x64": { - "version": "0.17.8", - "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.17.8.tgz", - "integrity": "sha512-xpFJb08dfXr5+rZc4E+ooZmayBW6R3q59daCpKZ/cDU96/kvDM+vkYzNeTJCGd8rtO6fHWMq5Rcv/1cY6p6/0Q==", + "version": "0.18.17", + "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.18.17.tgz", + "integrity": "sha512-sOxEvR8d7V7Kw8QqzxWc7bFfnWnGdaFBut1dRUYtu+EIRXefBc/eIsiUiShnW0hM3FmQ5Zf27suDuHsKgZ5QrA==", "dev": true, "optional": true }, "@esbuild/linux-arm": { - "version": "0.17.8", - "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.17.8.tgz", - "integrity": "sha512-6Ij8gfuGszcEwZpi5jQIJCVIACLS8Tz2chnEBfYjlmMzVsfqBP1iGmHQPp7JSnZg5xxK9tjCc+pJ2WtAmPRFVA==", + "version": "0.18.17", + "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.18.17.tgz", + "integrity": "sha512-2d3Lw6wkwgSLC2fIvXKoMNGVaeY8qdN0IC3rfuVxJp89CRfA3e3VqWifGDfuakPmp90+ZirmTfye1n4ncjv2lg==", "dev": true, "optional": true }, "@esbuild/linux-arm64": { - "version": "0.17.8", - "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.17.8.tgz", - "integrity": "sha512-v3iwDQuDljLTxpsqQDl3fl/yihjPAyOguxuloON9kFHYwopeJEf1BkDXODzYyXEI19gisEsQlG1bM65YqKSIww==", + "version": "0.18.17", + "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.18.17.tgz", + "integrity": "sha512-c9w3tE7qA3CYWjT+M3BMbwMt+0JYOp3vCMKgVBrCl1nwjAlOMYzEo+gG7QaZ9AtqZFj5MbUc885wuBBmu6aADQ==", "dev": true, "optional": true }, "@esbuild/linux-ia32": { - "version": "0.17.8", - "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.17.8.tgz", - "integrity": "sha512-8svILYKhE5XetuFk/B6raFYIyIqydQi+GngEXJgdPdI7OMKUbSd7uzR02wSY4kb53xBrClLkhH4Xs8P61Q2BaA==", + "version": "0.18.17", + "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.18.17.tgz", + "integrity": "sha512-1DS9F966pn5pPnqXYz16dQqWIB0dmDfAQZd6jSSpiT9eX1NzKh07J6VKR3AoXXXEk6CqZMojiVDSZi1SlmKVdg==", "dev": true, "optional": true }, "@esbuild/linux-loong64": { - "version": "0.17.8", - "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.17.8.tgz", - "integrity": "sha512-B6FyMeRJeV0NpyEOYlm5qtQfxbdlgmiGdD+QsipzKfFky0K5HW5Td6dyK3L3ypu1eY4kOmo7wW0o94SBqlqBSA==", + "version": "0.18.17", + "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.18.17.tgz", + "integrity": "sha512-EvLsxCk6ZF0fpCB6w6eOI2Fc8KW5N6sHlIovNe8uOFObL2O+Mr0bflPHyHwLT6rwMg9r77WOAWb2FqCQrVnwFg==", "dev": true, "optional": true }, "@esbuild/linux-mips64el": { - "version": "0.17.8", - "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.17.8.tgz", - "integrity": "sha512-CCb67RKahNobjm/eeEqeD/oJfJlrWyw29fgiyB6vcgyq97YAf3gCOuP6qMShYSPXgnlZe/i4a8WFHBw6N8bYAA==", + "version": "0.18.17", + "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.18.17.tgz", + "integrity": "sha512-e0bIdHA5p6l+lwqTE36NAW5hHtw2tNRmHlGBygZC14QObsA3bD4C6sXLJjvnDIjSKhW1/0S3eDy+QmX/uZWEYQ==", "dev": true, "optional": true }, "@esbuild/linux-ppc64": { - "version": "0.17.8", - "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.17.8.tgz", - "integrity": "sha512-bytLJOi55y55+mGSdgwZ5qBm0K9WOCh0rx+vavVPx+gqLLhxtSFU0XbeYy/dsAAD6xECGEv4IQeFILaSS2auXw==", + "version": "0.18.17", + "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.18.17.tgz", + "integrity": "sha512-BAAilJ0M5O2uMxHYGjFKn4nJKF6fNCdP1E0o5t5fvMYYzeIqy2JdAP88Az5LHt9qBoUa4tDaRpfWt21ep5/WqQ==", "dev": true, "optional": true }, "@esbuild/linux-riscv64": { - "version": "0.17.8", - "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.17.8.tgz", - "integrity": "sha512-2YpRyQJmKVBEHSBLa8kBAtbhucaclb6ex4wchfY0Tj3Kg39kpjeJ9vhRU7x4mUpq8ISLXRXH1L0dBYjAeqzZAw==", + "version": "0.18.17", + "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.18.17.tgz", + "integrity": "sha512-Wh/HW2MPnC3b8BqRSIme/9Zhab36PPH+3zam5pqGRH4pE+4xTrVLx2+XdGp6fVS3L2x+DrsIcsbMleex8fbE6g==", "dev": true, "optional": true }, "@esbuild/linux-s390x": { - "version": "0.17.8", - "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.17.8.tgz", - "integrity": "sha512-QgbNY/V3IFXvNf11SS6exkpVcX0LJcob+0RWCgV9OiDAmVElnxciHIisoSix9uzYzScPmS6dJFbZULdSAEkQVw==", + "version": "0.18.17", + "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.18.17.tgz", + "integrity": "sha512-j/34jAl3ul3PNcK3pfI0NSlBANduT2UO5kZ7FCaK33XFv3chDhICLY8wJJWIhiQ+YNdQ9dxqQctRg2bvrMlYgg==", "dev": true, "optional": true }, "@esbuild/linux-x64": { - "version": "0.17.8", - "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.17.8.tgz", - "integrity": "sha512-mM/9S0SbAFDBc4OPoyP6SEOo5324LpUxdpeIUUSrSTOfhHU9hEfqRngmKgqILqwx/0DVJBzeNW7HmLEWp9vcOA==", + "version": "0.18.17", + "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.18.17.tgz", + "integrity": "sha512-QM50vJ/y+8I60qEmFxMoxIx4de03pGo2HwxdBeFd4nMh364X6TIBZ6VQ5UQmPbQWUVWHWws5MmJXlHAXvJEmpQ==", "dev": true, "optional": true }, "@esbuild/netbsd-x64": { - "version": "0.17.8", - "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.17.8.tgz", - "integrity": "sha512-eKUYcWaWTaYr9zbj8GertdVtlt1DTS1gNBWov+iQfWuWyuu59YN6gSEJvFzC5ESJ4kMcKR0uqWThKUn5o8We6Q==", + "version": "0.18.17", + "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.18.17.tgz", + "integrity": "sha512-/jGlhWR7Sj9JPZHzXyyMZ1RFMkNPjC6QIAan0sDOtIo2TYk3tZn5UDrkE0XgsTQCxWTTOcMPf9p6Rh2hXtl5TQ==", "dev": true, "optional": true }, "@esbuild/openbsd-x64": { - "version": "0.17.8", - "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.17.8.tgz", - "integrity": "sha512-Vc9J4dXOboDyMXKD0eCeW0SIeEzr8K9oTHJU+Ci1mZc5njPfhKAqkRt3B/fUNU7dP+mRyralPu8QUkiaQn7iIg==", + "version": "0.18.17", + "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.18.17.tgz", + "integrity": "sha512-rSEeYaGgyGGf4qZM2NonMhMOP/5EHp4u9ehFiBrg7stH6BYEEjlkVREuDEcQ0LfIl53OXLxNbfuIj7mr5m29TA==", "dev": true, "optional": true }, "@esbuild/sunos-x64": { - "version": "0.17.8", - "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.17.8.tgz", - "integrity": "sha512-0xvOTNuPXI7ft1LYUgiaXtpCEjp90RuBBYovdd2lqAFxje4sEucurg30M1WIm03+3jxByd3mfo+VUmPtRSVuOw==", + "version": "0.18.17", + "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.18.17.tgz", + "integrity": "sha512-Y7ZBbkLqlSgn4+zot4KUNYst0bFoO68tRgI6mY2FIM+b7ZbyNVtNbDP5y8qlu4/knZZ73fgJDlXID+ohY5zt5g==", "dev": true, "optional": true }, "@esbuild/win32-arm64": { - "version": "0.17.8", - "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.17.8.tgz", - "integrity": "sha512-G0JQwUI5WdEFEnYNKzklxtBheCPkuDdu1YrtRrjuQv30WsYbkkoixKxLLv8qhJmNI+ATEWquZe/N0d0rpr55Mg==", + "version": "0.18.17", + "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.18.17.tgz", + "integrity": "sha512-bwPmTJsEQcbZk26oYpc4c/8PvTY3J5/QK8jM19DVlEsAB41M39aWovWoHtNm78sd6ip6prilxeHosPADXtEJFw==", "dev": true, "optional": true }, "@esbuild/win32-ia32": { - "version": "0.17.8", - "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.17.8.tgz", - "integrity": "sha512-Fqy63515xl20OHGFykjJsMnoIWS+38fqfg88ClvPXyDbLtgXal2DTlhb1TfTX34qWi3u4I7Cq563QcHpqgLx8w==", + "version": "0.18.17", + "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.18.17.tgz", + "integrity": "sha512-H/XaPtPKli2MhW+3CQueo6Ni3Avggi6hP/YvgkEe1aSaxw+AeO8MFjq8DlgfTd9Iz4Yih3QCZI6YLMoyccnPRg==", "dev": true, "optional": true }, "@esbuild/win32-x64": { - "version": "0.17.8", - "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.17.8.tgz", - "integrity": "sha512-1iuezdyDNngPnz8rLRDO2C/ZZ/emJLb72OsZeqQ6gL6Avko/XCXZw+NuxBSNhBAP13Hie418V7VMt9et1FMvpg==", + "version": "0.18.17", + "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.18.17.tgz", + "integrity": "sha512-fGEb8f2BSA3CW7riJVurug65ACLuQAzKq0SSqkY2b2yHHH0MzDfbLyKIGzHwOI/gkHcxM/leuSW6D5w/LMNitA==", "dev": true, "optional": true }, @@ -19967,20 +20804,20 @@ } }, "@eslint-community/regexpp": { - "version": "4.5.0", - "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.5.0.tgz", - "integrity": "sha512-vITaYzIcNmjn5tF5uxcZ/ft7/RXGrMUIS9HalWckEOF6ESiwXKoMzAQf2UW0aVd6rnOeExTJVd5hmWXucBKGXQ==", + "version": "4.8.2", + "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.8.2.tgz", + "integrity": "sha512-0MGxAVt1m/ZK+LTJp/j0qF7Hz97D9O/FH9Ms3ltnyIdDD57cbb1ACIQTkbHvNXtWDv5TPq7w5Kq56+cNukbo7g==", "dev": true }, "@eslint/eslintrc": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.0.2.tgz", - "integrity": "sha512-3W4f5tDUra+pA+FzgugqL2pRimUTDJWKr7BINqOpkZrC0uYI0NIc0/JFgBROCU07HR6GieA5m3/rsPIhDmCXTQ==", + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.1.2.tgz", + "integrity": "sha512-+wvgpDsrB1YqAMdEUCcnTlpfVBH7Vqn6A/NT3D8WVXFIaKMlErPIZT3oCIAVCOtarRpMtelZLqJeU3t7WY6X6g==", "dev": true, "requires": { "ajv": "^6.12.4", "debug": "^4.3.2", - "espree": "^9.5.1", + "espree": "^9.6.0", "globals": "^13.19.0", "ignore": "^5.2.0", "import-fresh": "^3.2.1", @@ -20008,9 +20845,9 @@ "dev": true }, "globals": { - "version": "13.20.0", - "resolved": "https://registry.npmjs.org/globals/-/globals-13.20.0.tgz", - "integrity": "sha512-Qg5QtVkCy/kv3FUSlu4ukeZDVf9ee0iXLAUYX13gbR17bnejFTzr4iS9bY7kwCf1NztRNm1t91fjOiyx4CSwPQ==", + "version": "13.22.0", + "resolved": "https://registry.npmjs.org/globals/-/globals-13.22.0.tgz", + "integrity": "sha512-H1Ddc/PbZHTDVJSnj8kWptIRSD6AM3pK+mKytuIVF4uoBV7rshFlhhvA58ceJ5wp3Er58w6zj7bykMpYXt3ETw==", "dev": true, "requires": { "type-fest": "^0.20.2" @@ -20040,9 +20877,9 @@ } }, "@eslint/js": { - "version": "8.39.0", - "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.39.0.tgz", - "integrity": "sha512-kf9RB0Fg7NZfap83B3QOqOGg9QmD9yBudqQXzzOtn3i4y7ZUXe5ONeW34Gwi+TxhH4mvj72R1Zc300KUMa9Bng==", + "version": "8.50.0", + "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.50.0.tgz", + "integrity": "sha512-NCC3zz2+nvYd+Ckfh87rA47zfu2QsQpvc6k1yzTk+b9KzRj0wkGa8LSoGOXN6Zv4lRf/EIoZ80biDh9HOI+RNQ==", "dev": true }, "@fortawesome/fontawesome-free": { @@ -20051,16 +20888,10 @@ "integrity": "sha512-0NyytTlPJwB/BF5LtRV8rrABDbe3TdTXqNB3PdZ+UUUZAEIrdOJdmABqKjt4AXwIoJNaRVVZEXxpNrqvE1GAYQ==", "dev": true }, - "@gar/promisify": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/@gar/promisify/-/promisify-1.1.3.tgz", - "integrity": "sha512-k2Ty1JcVojjJFwrg/ThKi2ujJ7XNLYaFGNB/bWT9wGR+oSMJHMa5w+CUq6p/pVrKeNNgA7pCqEcjSnHVoqJQFw==", - "dev": true - }, "@humanwhocodes/config-array": { - "version": "0.11.8", - "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.8.tgz", - "integrity": "sha512-UybHIJzJnR5Qc/MsD9Kr+RpO2h+/P1GhOwdiLPXK5TWk5sgTdu88bTD9UP+CKbPPh5Rni1u0GjAdYQLemG8g+g==", + "version": "0.11.11", + "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.11.tgz", + "integrity": "sha512-N2brEuAadi0CcdeMXUkhbZB84eskAc8MEX1By6qEchoVywSgXPIjou4rYsl0V3Hj0ZnuGycGCjdNgockbzeWNA==", "dev": true, "requires": { "@humanwhocodes/object-schema": "^1.2.1", @@ -20080,6 +20911,65 @@ "integrity": "sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==", "dev": true }, + "@isaacs/cliui": { + "version": "8.0.2", + "resolved": "https://registry.npmjs.org/@isaacs/cliui/-/cliui-8.0.2.tgz", + "integrity": "sha512-O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA==", + "dev": true, + "requires": { + "string-width": "^5.1.2", + "string-width-cjs": "npm:string-width@^4.2.0", + "strip-ansi": "^7.0.1", + "strip-ansi-cjs": "npm:strip-ansi@^6.0.1", + "wrap-ansi": "^8.1.0", + "wrap-ansi-cjs": "npm:wrap-ansi@^7.0.0" + }, + "dependencies": { + "ansi-styles": { + "version": "6.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.1.tgz", + "integrity": "sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==", + "dev": true + }, + "emoji-regex": { + "version": "9.2.2", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz", + "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==", + "dev": true + }, + "string-width": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-5.1.2.tgz", + "integrity": "sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==", + "dev": true, + "requires": { + "eastasianwidth": "^0.2.0", + "emoji-regex": "^9.2.2", + "strip-ansi": "^7.0.1" + } + }, + "strip-ansi": { + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz", + "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==", + "dev": true, + "requires": { + "ansi-regex": "^6.0.1" + } + }, + "wrap-ansi": { + "version": "8.1.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-8.1.0.tgz", + "integrity": "sha512-si7QWI6zUMq56bESFvagtmzMdGOtoxfR+Sez11Mobfc7tm+VkUckk9bW2UeffTGVUbOksxmSw0AA2gs8g71NCQ==", + "dev": true, + "requires": { + "ansi-styles": "^6.1.0", + "string-width": "^5.0.1", + "strip-ansi": "^7.0.1" + } + } + } + }, "@istanbuljs/load-nyc-config": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz", @@ -20100,13 +20990,14 @@ "dev": true }, "@jridgewell/gen-mapping": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.1.1.tgz", - "integrity": "sha512-sQXCasFk+U8lWYEe66WxRDOE9PjVz4vSM51fTu3Hw+ClTpUSQb718772vH3pyS5pShp6lvQM7SxgIDXXXmOX7w==", + "version": "0.3.3", + "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.3.tgz", + "integrity": "sha512-HLhSWOLRi875zjjMG/r+Nv0oCW8umGb0BgEhyX3dDX3egwZtB8PqLnjz3yedt8R5StBrzcg4aBpnh8UA9D1BoQ==", "dev": true, "requires": { - "@jridgewell/set-array": "^1.0.0", - "@jridgewell/sourcemap-codec": "^1.4.10" + "@jridgewell/set-array": "^1.0.1", + "@jridgewell/sourcemap-codec": "^1.4.10", + "@jridgewell/trace-mapping": "^0.3.9" } }, "@jridgewell/resolve-uri": { @@ -20122,26 +21013,13 @@ "dev": true }, "@jridgewell/source-map": { - "version": "0.3.2", - "resolved": "https://registry.npmjs.org/@jridgewell/source-map/-/source-map-0.3.2.tgz", - "integrity": "sha512-m7O9o2uR8k2ObDysZYzdfhb08VuEml5oWGiosa1VdaPZ/A6QyPkAJuwN0Q1lhULOf6B7MtQmHENS743hWtCrgw==", + "version": "0.3.5", + "resolved": "https://registry.npmjs.org/@jridgewell/source-map/-/source-map-0.3.5.tgz", + "integrity": "sha512-UTYAUj/wviwdsMfzoSJspJxbkH5o1snzwX0//0ENX1u/55kkZZkcTZP6u9bwKGkv+dkk9at4m1Cpt0uY80kcpQ==", "dev": true, "requires": { "@jridgewell/gen-mapping": "^0.3.0", "@jridgewell/trace-mapping": "^0.3.9" - }, - "dependencies": { - "@jridgewell/gen-mapping": { - "version": "0.3.2", - "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.2.tgz", - "integrity": "sha512-mh65xKQAzI6iBcFzwv28KVWSmCkdRBWoOh+bYQGW3+6OZvbbN3TqMGo5hqYxQniRcH9F2VZIoJCm4pa3BPDK/A==", - "dev": true, - "requires": { - "@jridgewell/set-array": "^1.0.1", - "@jridgewell/sourcemap-codec": "^1.4.10", - "@jridgewell/trace-mapping": "^0.3.9" - } - } } }, "@jridgewell/sourcemap-codec": { @@ -20167,753 +21045,754 @@ "dev": true }, "@material/animation": { - "version": "15.0.0-canary.684e33d25.0", - "resolved": "https://registry.npmjs.org/@material/animation/-/animation-15.0.0-canary.684e33d25.0.tgz", - "integrity": "sha512-5osi1z4JQIXcklPALbH/zTfOm2pDzHt9Fxm7ZyURy250xIZj6QjULRzPTnzOhC2ropfix9ra2Cfggbf0dcRbEQ==", + "version": "15.0.0-canary.b994146f6.0", + "resolved": "https://registry.npmjs.org/@material/animation/-/animation-15.0.0-canary.b994146f6.0.tgz", + "integrity": "sha512-kqqzG54tabYJ5VsBur5k1bqCFQCEpaW3hmLRMiSVVxRY7XgTt7qkuOOz48gs+MPqR6P8VIi6gFpuscV1+DWDhw==", "requires": { "tslib": "^2.1.0" } }, "@material/auto-init": { - "version": "15.0.0-canary.684e33d25.0", - "resolved": "https://registry.npmjs.org/@material/auto-init/-/auto-init-15.0.0-canary.684e33d25.0.tgz", - "integrity": "sha512-OigQTmrVzkcGvxNjOaIe5oItTFPgrO9xLewvharDI6m6yvO1z7OBnkcW+sFN6ggLNYNxd0O1u9v64vMsmeDABQ==", + "version": "15.0.0-canary.b994146f6.0", + "resolved": "https://registry.npmjs.org/@material/auto-init/-/auto-init-15.0.0-canary.b994146f6.0.tgz", + "integrity": "sha512-8nLe/XeueJg5yyYx5e4UxWQXpTDyUhibKfyroGwnRKc8pdpOCOulHSOj/fIVGJAIbxkEJoebwMadWUNCjUhc9A==", "requires": { - "@material/base": "15.0.0-canary.684e33d25.0", + "@material/base": "15.0.0-canary.b994146f6.0", "tslib": "^2.1.0" } }, "@material/banner": { - "version": "15.0.0-canary.684e33d25.0", - "resolved": "https://registry.npmjs.org/@material/banner/-/banner-15.0.0-canary.684e33d25.0.tgz", - "integrity": "sha512-PqtGp3KWzdu58rWv/DIvSfe38m5YKOBbAAbBinSvgadBb/da+IE1t5F7YPNKE1T5lJsQBGVUYx6QBIeXm+aI/A==", + "version": "15.0.0-canary.b994146f6.0", + "resolved": "https://registry.npmjs.org/@material/banner/-/banner-15.0.0-canary.b994146f6.0.tgz", + "integrity": "sha512-gJ4/VdP4dJgHP72Kdjy2f/UjHB45J4CuxoGvI0NIQYUjOSsr4kQiQHsjVgyEPZR/5wa7kBhM7/0mJ+zF7Ghv2A==", "requires": { - "@material/base": "15.0.0-canary.684e33d25.0", - "@material/button": "15.0.0-canary.684e33d25.0", - "@material/dom": "15.0.0-canary.684e33d25.0", - "@material/elevation": "15.0.0-canary.684e33d25.0", - "@material/feature-targeting": "15.0.0-canary.684e33d25.0", - "@material/ripple": "15.0.0-canary.684e33d25.0", - "@material/rtl": "15.0.0-canary.684e33d25.0", - "@material/shape": "15.0.0-canary.684e33d25.0", - "@material/theme": "15.0.0-canary.684e33d25.0", - "@material/tokens": "15.0.0-canary.684e33d25.0", - "@material/typography": "15.0.0-canary.684e33d25.0", + "@material/base": "15.0.0-canary.b994146f6.0", + "@material/button": "15.0.0-canary.b994146f6.0", + "@material/dom": "15.0.0-canary.b994146f6.0", + "@material/elevation": "15.0.0-canary.b994146f6.0", + "@material/feature-targeting": "15.0.0-canary.b994146f6.0", + "@material/ripple": "15.0.0-canary.b994146f6.0", + "@material/rtl": "15.0.0-canary.b994146f6.0", + "@material/shape": "15.0.0-canary.b994146f6.0", + "@material/theme": "15.0.0-canary.b994146f6.0", + "@material/tokens": "15.0.0-canary.b994146f6.0", + "@material/typography": "15.0.0-canary.b994146f6.0", "tslib": "^2.1.0" } }, "@material/base": { - "version": "15.0.0-canary.684e33d25.0", - "resolved": "https://registry.npmjs.org/@material/base/-/base-15.0.0-canary.684e33d25.0.tgz", - "integrity": "sha512-oOaqb/SfjWwTKsdJUZmeh/Qrs41nIJI0N+zELsxnvbGjSIN1ZMAKYZFPMahqvC68OJ6+5CvJM8PoTNs5l+B8IQ==", + "version": "15.0.0-canary.b994146f6.0", + "resolved": "https://registry.npmjs.org/@material/base/-/base-15.0.0-canary.b994146f6.0.tgz", + "integrity": "sha512-rW2upYD5YjRFBL6DzYn3SCRhtvpEDkwplDS810e3vt71uLMRyqXyw4OQJH+Nab/t+32TFDtKNUphXIzwICXGDQ==", "requires": { "tslib": "^2.1.0" } }, "@material/button": { - "version": "15.0.0-canary.684e33d25.0", - "resolved": "https://registry.npmjs.org/@material/button/-/button-15.0.0-canary.684e33d25.0.tgz", - "integrity": "sha512-Nkekk4edeX+ObVOa7UlwavaHdmckPV5wU4SAJf3iA3R61cmz+KsgAgpzfcwv5WfNhIlc2nLu8QYEecpHdo9d/w==", + "version": "15.0.0-canary.b994146f6.0", + "resolved": "https://registry.npmjs.org/@material/button/-/button-15.0.0-canary.b994146f6.0.tgz", + "integrity": "sha512-SMyqtsvJuCqpXBz2JgciuR6wddNJSGpTXUFxmLbGluBy5/hHm06JWlOFcUOxGDv46OdRGGrRfkg6A9JtvtsJsw==", "requires": { - "@material/density": "15.0.0-canary.684e33d25.0", - "@material/dom": "15.0.0-canary.684e33d25.0", - "@material/elevation": "15.0.0-canary.684e33d25.0", - "@material/feature-targeting": "15.0.0-canary.684e33d25.0", - "@material/focus-ring": "15.0.0-canary.684e33d25.0", - "@material/ripple": "15.0.0-canary.684e33d25.0", - "@material/rtl": "15.0.0-canary.684e33d25.0", - "@material/shape": "15.0.0-canary.684e33d25.0", - "@material/theme": "15.0.0-canary.684e33d25.0", - "@material/tokens": "15.0.0-canary.684e33d25.0", - "@material/touch-target": "15.0.0-canary.684e33d25.0", - "@material/typography": "15.0.0-canary.684e33d25.0", + "@material/density": "15.0.0-canary.b994146f6.0", + "@material/dom": "15.0.0-canary.b994146f6.0", + "@material/elevation": "15.0.0-canary.b994146f6.0", + "@material/feature-targeting": "15.0.0-canary.b994146f6.0", + "@material/focus-ring": "15.0.0-canary.b994146f6.0", + "@material/ripple": "15.0.0-canary.b994146f6.0", + "@material/rtl": "15.0.0-canary.b994146f6.0", + "@material/shape": "15.0.0-canary.b994146f6.0", + "@material/theme": "15.0.0-canary.b994146f6.0", + "@material/tokens": "15.0.0-canary.b994146f6.0", + "@material/touch-target": "15.0.0-canary.b994146f6.0", + "@material/typography": "15.0.0-canary.b994146f6.0", "tslib": "^2.1.0" } }, "@material/card": { - "version": "15.0.0-canary.684e33d25.0", - "resolved": "https://registry.npmjs.org/@material/card/-/card-15.0.0-canary.684e33d25.0.tgz", - "integrity": "sha512-xhyB7XX5KkEiCEqwSPkl58ZGYL6xFdnY62zimyBXJRG/Eaa0Swj3kW20hVCpt4f7c9Zmp8Se27rg8vnKmhvO3g==", + "version": "15.0.0-canary.b994146f6.0", + "resolved": "https://registry.npmjs.org/@material/card/-/card-15.0.0-canary.b994146f6.0.tgz", + "integrity": "sha512-WSggGon91HcDhJyatnYLFkoM9glkkeJjyjFDWrcJkwN1rdrPJU+GH+PNjvmArz5hGv9WkmjDjhOdAuPnL4Mb7g==", "requires": { - "@material/dom": "15.0.0-canary.684e33d25.0", - "@material/elevation": "15.0.0-canary.684e33d25.0", - "@material/feature-targeting": "15.0.0-canary.684e33d25.0", - "@material/ripple": "15.0.0-canary.684e33d25.0", - "@material/rtl": "15.0.0-canary.684e33d25.0", - "@material/shape": "15.0.0-canary.684e33d25.0", - "@material/theme": "15.0.0-canary.684e33d25.0", - "@material/tokens": "15.0.0-canary.684e33d25.0", + "@material/dom": "15.0.0-canary.b994146f6.0", + "@material/elevation": "15.0.0-canary.b994146f6.0", + "@material/feature-targeting": "15.0.0-canary.b994146f6.0", + "@material/ripple": "15.0.0-canary.b994146f6.0", + "@material/rtl": "15.0.0-canary.b994146f6.0", + "@material/shape": "15.0.0-canary.b994146f6.0", + "@material/theme": "15.0.0-canary.b994146f6.0", + "@material/tokens": "15.0.0-canary.b994146f6.0", "tslib": "^2.1.0" } }, "@material/checkbox": { - "version": "15.0.0-canary.684e33d25.0", - "resolved": "https://registry.npmjs.org/@material/checkbox/-/checkbox-15.0.0-canary.684e33d25.0.tgz", - "integrity": "sha512-NFpM3TS924PmVsk2KQLNU95OYCf8ZwYgzeqfnAexU0bEfjUJXINBun2Go0AaeOUMjuvWUe+byjrXgv8SFYbMUA==", + "version": "15.0.0-canary.b994146f6.0", + "resolved": "https://registry.npmjs.org/@material/checkbox/-/checkbox-15.0.0-canary.b994146f6.0.tgz", + "integrity": "sha512-pulRiwG9S/dS6WBG+GteODBltddFiL0Sb7HAqdzF2BTKNKv25q1ZIR3ftoEa09TNeWM88AOzTJ4aBHiADfJn2w==", "requires": { - "@material/animation": "15.0.0-canary.684e33d25.0", - "@material/base": "15.0.0-canary.684e33d25.0", - "@material/density": "15.0.0-canary.684e33d25.0", - "@material/dom": "15.0.0-canary.684e33d25.0", - "@material/feature-targeting": "15.0.0-canary.684e33d25.0", - "@material/focus-ring": "15.0.0-canary.684e33d25.0", - "@material/ripple": "15.0.0-canary.684e33d25.0", - "@material/theme": "15.0.0-canary.684e33d25.0", - "@material/touch-target": "15.0.0-canary.684e33d25.0", + "@material/animation": "15.0.0-canary.b994146f6.0", + "@material/base": "15.0.0-canary.b994146f6.0", + "@material/density": "15.0.0-canary.b994146f6.0", + "@material/dom": "15.0.0-canary.b994146f6.0", + "@material/feature-targeting": "15.0.0-canary.b994146f6.0", + "@material/focus-ring": "15.0.0-canary.b994146f6.0", + "@material/ripple": "15.0.0-canary.b994146f6.0", + "@material/rtl": "15.0.0-canary.b994146f6.0", + "@material/theme": "15.0.0-canary.b994146f6.0", + "@material/touch-target": "15.0.0-canary.b994146f6.0", "tslib": "^2.1.0" } }, "@material/chips": { - "version": "15.0.0-canary.684e33d25.0", - "resolved": "https://registry.npmjs.org/@material/chips/-/chips-15.0.0-canary.684e33d25.0.tgz", - "integrity": "sha512-z4ajQ4NnsAQ/Si9tZ4xmxzjj2Qb+vW++4QjCjjjwAGIZbCe0xglAnMh2t66XLJUxt7RoKZuZVEO7ZqcFZpvJFQ==", + "version": "15.0.0-canary.b994146f6.0", + "resolved": "https://registry.npmjs.org/@material/chips/-/chips-15.0.0-canary.b994146f6.0.tgz", + "integrity": "sha512-3yJPj7x+eKLA4LMKG7aTWI+itAnKRVGOcniuR6aiXVy0OKr5asNuWNeZc9J0/VErjjxF3tdybDzDSPo01qPy9w==", "requires": { - "@material/animation": "15.0.0-canary.684e33d25.0", - "@material/base": "15.0.0-canary.684e33d25.0", - "@material/checkbox": "15.0.0-canary.684e33d25.0", - "@material/density": "15.0.0-canary.684e33d25.0", - "@material/dom": "15.0.0-canary.684e33d25.0", - "@material/elevation": "15.0.0-canary.684e33d25.0", - "@material/feature-targeting": "15.0.0-canary.684e33d25.0", - "@material/focus-ring": "15.0.0-canary.684e33d25.0", - "@material/ripple": "15.0.0-canary.684e33d25.0", - "@material/rtl": "15.0.0-canary.684e33d25.0", - "@material/shape": "15.0.0-canary.684e33d25.0", - "@material/theme": "15.0.0-canary.684e33d25.0", - "@material/tokens": "15.0.0-canary.684e33d25.0", - "@material/touch-target": "15.0.0-canary.684e33d25.0", - "@material/typography": "15.0.0-canary.684e33d25.0", + "@material/animation": "15.0.0-canary.b994146f6.0", + "@material/base": "15.0.0-canary.b994146f6.0", + "@material/checkbox": "15.0.0-canary.b994146f6.0", + "@material/density": "15.0.0-canary.b994146f6.0", + "@material/dom": "15.0.0-canary.b994146f6.0", + "@material/elevation": "15.0.0-canary.b994146f6.0", + "@material/feature-targeting": "15.0.0-canary.b994146f6.0", + "@material/focus-ring": "15.0.0-canary.b994146f6.0", + "@material/ripple": "15.0.0-canary.b994146f6.0", + "@material/rtl": "15.0.0-canary.b994146f6.0", + "@material/shape": "15.0.0-canary.b994146f6.0", + "@material/theme": "15.0.0-canary.b994146f6.0", + "@material/tokens": "15.0.0-canary.b994146f6.0", + "@material/touch-target": "15.0.0-canary.b994146f6.0", + "@material/typography": "15.0.0-canary.b994146f6.0", "safevalues": "^0.3.4", "tslib": "^2.1.0" } }, "@material/circular-progress": { - "version": "15.0.0-canary.684e33d25.0", - "resolved": "https://registry.npmjs.org/@material/circular-progress/-/circular-progress-15.0.0-canary.684e33d25.0.tgz", - "integrity": "sha512-G6qD0nGNtEUwWnAMJuA9INYFpZoKtx7KFjBaPF4Ol2YLHtmShALNAYyn54TMAK8AZ2IpW08PXjGS7Ye88vrdEQ==", + "version": "15.0.0-canary.b994146f6.0", + "resolved": "https://registry.npmjs.org/@material/circular-progress/-/circular-progress-15.0.0-canary.b994146f6.0.tgz", + "integrity": "sha512-6YUvGXdtZKJoE7AuovR4xk1aiWp/EDZ6j2U3TOeynd1assQQCg5XT4abqAoHtpJrRPaCFgUAp836HyiDVVuYug==", "requires": { - "@material/animation": "15.0.0-canary.684e33d25.0", - "@material/base": "15.0.0-canary.684e33d25.0", - "@material/dom": "15.0.0-canary.684e33d25.0", - "@material/feature-targeting": "15.0.0-canary.684e33d25.0", - "@material/progress-indicator": "15.0.0-canary.684e33d25.0", - "@material/rtl": "15.0.0-canary.684e33d25.0", - "@material/theme": "15.0.0-canary.684e33d25.0", + "@material/animation": "15.0.0-canary.b994146f6.0", + "@material/base": "15.0.0-canary.b994146f6.0", + "@material/dom": "15.0.0-canary.b994146f6.0", + "@material/feature-targeting": "15.0.0-canary.b994146f6.0", + "@material/progress-indicator": "15.0.0-canary.b994146f6.0", + "@material/rtl": "15.0.0-canary.b994146f6.0", + "@material/theme": "15.0.0-canary.b994146f6.0", "tslib": "^2.1.0" } }, "@material/data-table": { - "version": "15.0.0-canary.684e33d25.0", - "resolved": "https://registry.npmjs.org/@material/data-table/-/data-table-15.0.0-canary.684e33d25.0.tgz", - "integrity": "sha512-+wDw1DDDFfAsKAMzs84f/5GCjux39zjNfW8tL4wFbkWNwewmQrG9zaQMJhBpVOtLCrM8Gj6SOgOANqgqoCjvGg==", + "version": "15.0.0-canary.b994146f6.0", + "resolved": "https://registry.npmjs.org/@material/data-table/-/data-table-15.0.0-canary.b994146f6.0.tgz", + "integrity": "sha512-v4hIduIe/wzyibuL/RPM/ErYrt8XpB7fxyQqtV+0JsMpFa8E81QYyvMCS9EJj9m4YdkrQnZgA+vXQlOkhWvmdQ==", "requires": { - "@material/animation": "15.0.0-canary.684e33d25.0", - "@material/base": "15.0.0-canary.684e33d25.0", - "@material/checkbox": "15.0.0-canary.684e33d25.0", - "@material/density": "15.0.0-canary.684e33d25.0", - "@material/dom": "15.0.0-canary.684e33d25.0", - "@material/elevation": "15.0.0-canary.684e33d25.0", - "@material/feature-targeting": "15.0.0-canary.684e33d25.0", - "@material/icon-button": "15.0.0-canary.684e33d25.0", - "@material/linear-progress": "15.0.0-canary.684e33d25.0", - "@material/list": "15.0.0-canary.684e33d25.0", - "@material/menu": "15.0.0-canary.684e33d25.0", - "@material/rtl": "15.0.0-canary.684e33d25.0", - "@material/select": "15.0.0-canary.684e33d25.0", - "@material/shape": "15.0.0-canary.684e33d25.0", - "@material/theme": "15.0.0-canary.684e33d25.0", - "@material/tokens": "15.0.0-canary.684e33d25.0", - "@material/touch-target": "15.0.0-canary.684e33d25.0", - "@material/typography": "15.0.0-canary.684e33d25.0", + "@material/animation": "15.0.0-canary.b994146f6.0", + "@material/base": "15.0.0-canary.b994146f6.0", + "@material/checkbox": "15.0.0-canary.b994146f6.0", + "@material/density": "15.0.0-canary.b994146f6.0", + "@material/dom": "15.0.0-canary.b994146f6.0", + "@material/elevation": "15.0.0-canary.b994146f6.0", + "@material/feature-targeting": "15.0.0-canary.b994146f6.0", + "@material/icon-button": "15.0.0-canary.b994146f6.0", + "@material/linear-progress": "15.0.0-canary.b994146f6.0", + "@material/list": "15.0.0-canary.b994146f6.0", + "@material/menu": "15.0.0-canary.b994146f6.0", + "@material/rtl": "15.0.0-canary.b994146f6.0", + "@material/select": "15.0.0-canary.b994146f6.0", + "@material/shape": "15.0.0-canary.b994146f6.0", + "@material/theme": "15.0.0-canary.b994146f6.0", + "@material/tokens": "15.0.0-canary.b994146f6.0", + "@material/touch-target": "15.0.0-canary.b994146f6.0", + "@material/typography": "15.0.0-canary.b994146f6.0", "tslib": "^2.1.0" } }, "@material/density": { - "version": "15.0.0-canary.684e33d25.0", - "resolved": "https://registry.npmjs.org/@material/density/-/density-15.0.0-canary.684e33d25.0.tgz", - "integrity": "sha512-661yEVRMGrlq6S6WuSbPRO+ZwpdUOg2glCc7y96doM6itSLOa3UEAldjOLfsYZVB74GnKCiuDp//QmfoRyYTfA==", + "version": "15.0.0-canary.b994146f6.0", + "resolved": "https://registry.npmjs.org/@material/density/-/density-15.0.0-canary.b994146f6.0.tgz", + "integrity": "sha512-m8l0vuoWSoAPItBpWp5eZDvitUcB2JWoO8V486hLgdveVcKgXG09xWM43ScH+PLXAWjzr5olDEuJ2tvfkN3SpQ==", "requires": { "tslib": "^2.1.0" } }, "@material/dialog": { - "version": "15.0.0-canary.684e33d25.0", - "resolved": "https://registry.npmjs.org/@material/dialog/-/dialog-15.0.0-canary.684e33d25.0.tgz", - "integrity": "sha512-szn0dHnfeQTSOC6SSRSGAzX6Tnx+4NnSMUwNkXm+3bwjds8ZVK26+DXwLrP5f3ID5F1K5sFsRf2INo5/TNTHyQ==", + "version": "15.0.0-canary.b994146f6.0", + "resolved": "https://registry.npmjs.org/@material/dialog/-/dialog-15.0.0-canary.b994146f6.0.tgz", + "integrity": "sha512-JucU92yh8cfZQpyRBunHr6uohacePLYmhcPaGpkAGQ1b+zCznEsNs55tjhaVQNoj91XA9rrBqtL6Otg+fxFJtQ==", "requires": { - "@material/animation": "15.0.0-canary.684e33d25.0", - "@material/base": "15.0.0-canary.684e33d25.0", - "@material/button": "15.0.0-canary.684e33d25.0", - "@material/dom": "15.0.0-canary.684e33d25.0", - "@material/elevation": "15.0.0-canary.684e33d25.0", - "@material/feature-targeting": "15.0.0-canary.684e33d25.0", - "@material/icon-button": "15.0.0-canary.684e33d25.0", - "@material/ripple": "15.0.0-canary.684e33d25.0", - "@material/rtl": "15.0.0-canary.684e33d25.0", - "@material/shape": "15.0.0-canary.684e33d25.0", - "@material/theme": "15.0.0-canary.684e33d25.0", - "@material/tokens": "15.0.0-canary.684e33d25.0", - "@material/touch-target": "15.0.0-canary.684e33d25.0", - "@material/typography": "15.0.0-canary.684e33d25.0", + "@material/animation": "15.0.0-canary.b994146f6.0", + "@material/base": "15.0.0-canary.b994146f6.0", + "@material/button": "15.0.0-canary.b994146f6.0", + "@material/dom": "15.0.0-canary.b994146f6.0", + "@material/elevation": "15.0.0-canary.b994146f6.0", + "@material/feature-targeting": "15.0.0-canary.b994146f6.0", + "@material/icon-button": "15.0.0-canary.b994146f6.0", + "@material/ripple": "15.0.0-canary.b994146f6.0", + "@material/rtl": "15.0.0-canary.b994146f6.0", + "@material/shape": "15.0.0-canary.b994146f6.0", + "@material/theme": "15.0.0-canary.b994146f6.0", + "@material/tokens": "15.0.0-canary.b994146f6.0", + "@material/touch-target": "15.0.0-canary.b994146f6.0", + "@material/typography": "15.0.0-canary.b994146f6.0", "tslib": "^2.1.0" } }, "@material/dom": { - "version": "15.0.0-canary.684e33d25.0", - "resolved": "https://registry.npmjs.org/@material/dom/-/dom-15.0.0-canary.684e33d25.0.tgz", - "integrity": "sha512-7pEJLYov+tGgfuD8mZxoVU6rWtPI8ppjTAhz+F27Hz9FG0JETMWTKpDPBXLnKvX7vhIxL83GvZ9geNHCe8Hfog==", + "version": "15.0.0-canary.b994146f6.0", + "resolved": "https://registry.npmjs.org/@material/dom/-/dom-15.0.0-canary.b994146f6.0.tgz", + "integrity": "sha512-DiUsTezrCi4iytjIn7xXoXZSNFvuTrVVZgc7cR9cW8yu2Hpz8bPf87PacVn4IP9OsNwy/dCDMk1Kcq/DMh7gXQ==", "requires": { - "@material/feature-targeting": "15.0.0-canary.684e33d25.0", - "@material/rtl": "15.0.0-canary.684e33d25.0", + "@material/feature-targeting": "15.0.0-canary.b994146f6.0", + "@material/rtl": "15.0.0-canary.b994146f6.0", "tslib": "^2.1.0" } }, "@material/drawer": { - "version": "15.0.0-canary.684e33d25.0", - "resolved": "https://registry.npmjs.org/@material/drawer/-/drawer-15.0.0-canary.684e33d25.0.tgz", - "integrity": "sha512-/KMckLf1PYU/H3PXnS4e0aFl03qG3JlSv4LGgX6juJufcONqGTl/m63EMO/L/eUy6H1CRrXmVDjik/jzHLyDhg==", + "version": "15.0.0-canary.b994146f6.0", + "resolved": "https://registry.npmjs.org/@material/drawer/-/drawer-15.0.0-canary.b994146f6.0.tgz", + "integrity": "sha512-Kbuf32V0eX69amvCVbAjNSabNDerZWyG8ip466EfQHRh0OUZwvsbhLp9FZOB7AyR+/bQiHf3mVLcombOdmdkcQ==", "requires": { - "@material/animation": "15.0.0-canary.684e33d25.0", - "@material/base": "15.0.0-canary.684e33d25.0", - "@material/dom": "15.0.0-canary.684e33d25.0", - "@material/elevation": "15.0.0-canary.684e33d25.0", - "@material/feature-targeting": "15.0.0-canary.684e33d25.0", - "@material/list": "15.0.0-canary.684e33d25.0", - "@material/ripple": "15.0.0-canary.684e33d25.0", - "@material/rtl": "15.0.0-canary.684e33d25.0", - "@material/shape": "15.0.0-canary.684e33d25.0", - "@material/theme": "15.0.0-canary.684e33d25.0", - "@material/typography": "15.0.0-canary.684e33d25.0", + "@material/animation": "15.0.0-canary.b994146f6.0", + "@material/base": "15.0.0-canary.b994146f6.0", + "@material/dom": "15.0.0-canary.b994146f6.0", + "@material/elevation": "15.0.0-canary.b994146f6.0", + "@material/feature-targeting": "15.0.0-canary.b994146f6.0", + "@material/list": "15.0.0-canary.b994146f6.0", + "@material/ripple": "15.0.0-canary.b994146f6.0", + "@material/rtl": "15.0.0-canary.b994146f6.0", + "@material/shape": "15.0.0-canary.b994146f6.0", + "@material/theme": "15.0.0-canary.b994146f6.0", + "@material/typography": "15.0.0-canary.b994146f6.0", "tslib": "^2.1.0" } }, "@material/elevation": { - "version": "15.0.0-canary.684e33d25.0", - "resolved": "https://registry.npmjs.org/@material/elevation/-/elevation-15.0.0-canary.684e33d25.0.tgz", - "integrity": "sha512-WDF8SsRtq3rXUbVVbd9K4DUijIPH0bUFSOreVYxudpuxAfTlDS5+aeS1EK9UIBFYLuba4u5wVT2tDv6e1RTfrQ==", + "version": "15.0.0-canary.b994146f6.0", + "resolved": "https://registry.npmjs.org/@material/elevation/-/elevation-15.0.0-canary.b994146f6.0.tgz", + "integrity": "sha512-l2YDNgBajSI6oA2l6gaeYCTGHRao657syqQ/tv95/Hkcee9900A4RrsxCwSxOqqAs5pZZDEJ33kFJjj27nqZDw==", "requires": { - "@material/animation": "15.0.0-canary.684e33d25.0", - "@material/base": "15.0.0-canary.684e33d25.0", - "@material/feature-targeting": "15.0.0-canary.684e33d25.0", - "@material/rtl": "15.0.0-canary.684e33d25.0", - "@material/theme": "15.0.0-canary.684e33d25.0", + "@material/animation": "15.0.0-canary.b994146f6.0", + "@material/base": "15.0.0-canary.b994146f6.0", + "@material/feature-targeting": "15.0.0-canary.b994146f6.0", + "@material/rtl": "15.0.0-canary.b994146f6.0", + "@material/theme": "15.0.0-canary.b994146f6.0", "tslib": "^2.1.0" } }, "@material/fab": { - "version": "15.0.0-canary.684e33d25.0", - "resolved": "https://registry.npmjs.org/@material/fab/-/fab-15.0.0-canary.684e33d25.0.tgz", - "integrity": "sha512-KCu87rWOKEAe9vZcAm6K8XazYSWPNjMG+OhrbPjHW6bCO7as1YCgtmkBkhff7csY/rFmcVpIy884xtUfLmSudQ==", + "version": "15.0.0-canary.b994146f6.0", + "resolved": "https://registry.npmjs.org/@material/fab/-/fab-15.0.0-canary.b994146f6.0.tgz", + "integrity": "sha512-ExyDVkNWINpns41Ahj4u8I/OhiVkqI0nmcqjFRtgTJMmKEd4NhlvqIxE7gakAlyS68riJu5UleqTSTVmt8mv2Q==", "requires": { - "@material/animation": "15.0.0-canary.684e33d25.0", - "@material/dom": "15.0.0-canary.684e33d25.0", - "@material/elevation": "15.0.0-canary.684e33d25.0", - "@material/feature-targeting": "15.0.0-canary.684e33d25.0", - "@material/focus-ring": "15.0.0-canary.684e33d25.0", - "@material/ripple": "15.0.0-canary.684e33d25.0", - "@material/rtl": "15.0.0-canary.684e33d25.0", - "@material/shape": "15.0.0-canary.684e33d25.0", - "@material/theme": "15.0.0-canary.684e33d25.0", - "@material/tokens": "15.0.0-canary.684e33d25.0", - "@material/touch-target": "15.0.0-canary.684e33d25.0", - "@material/typography": "15.0.0-canary.684e33d25.0", + "@material/animation": "15.0.0-canary.b994146f6.0", + "@material/dom": "15.0.0-canary.b994146f6.0", + "@material/elevation": "15.0.0-canary.b994146f6.0", + "@material/feature-targeting": "15.0.0-canary.b994146f6.0", + "@material/focus-ring": "15.0.0-canary.b994146f6.0", + "@material/ripple": "15.0.0-canary.b994146f6.0", + "@material/rtl": "15.0.0-canary.b994146f6.0", + "@material/shape": "15.0.0-canary.b994146f6.0", + "@material/theme": "15.0.0-canary.b994146f6.0", + "@material/tokens": "15.0.0-canary.b994146f6.0", + "@material/touch-target": "15.0.0-canary.b994146f6.0", + "@material/typography": "15.0.0-canary.b994146f6.0", "tslib": "^2.1.0" } }, "@material/feature-targeting": { - "version": "15.0.0-canary.684e33d25.0", - "resolved": "https://registry.npmjs.org/@material/feature-targeting/-/feature-targeting-15.0.0-canary.684e33d25.0.tgz", - "integrity": "sha512-HyH1erNTSjS63sigNSUMaCd0nJhTNdDFeC+myrxwtDaQm+uYJ8troCNtQM3g6mx0XATNtX5aTOoPmrM6yVVi1A==", + "version": "15.0.0-canary.b994146f6.0", + "resolved": "https://registry.npmjs.org/@material/feature-targeting/-/feature-targeting-15.0.0-canary.b994146f6.0.tgz", + "integrity": "sha512-HR/FjSQmza98B1DF80MRjODyfOI9r7wXkPSts/cLQsYkpwZ5uJmxhvQKjDCeYVpMV0lQuvuvVOQo7uD44TdWEg==", "requires": { "tslib": "^2.1.0" } }, "@material/floating-label": { - "version": "15.0.0-canary.684e33d25.0", - "resolved": "https://registry.npmjs.org/@material/floating-label/-/floating-label-15.0.0-canary.684e33d25.0.tgz", - "integrity": "sha512-f7TPp6bKpGvV3sYYiZHSGlrixXKkXXITW3Esp7KB9jRq42c0H82novmdwvY0eTef4ootmA2JEysr78KQfHBUPg==", + "version": "15.0.0-canary.b994146f6.0", + "resolved": "https://registry.npmjs.org/@material/floating-label/-/floating-label-15.0.0-canary.b994146f6.0.tgz", + "integrity": "sha512-g64talBNWCS0FUfLWal0uB637gUciSIqYxFzSW//LglTtbZLGK2J4+9gAEswQGnKeO4ux08EN2n1ZcMDYQ58ow==", "requires": { - "@material/animation": "15.0.0-canary.684e33d25.0", - "@material/base": "15.0.0-canary.684e33d25.0", - "@material/dom": "15.0.0-canary.684e33d25.0", - "@material/feature-targeting": "15.0.0-canary.684e33d25.0", - "@material/rtl": "15.0.0-canary.684e33d25.0", - "@material/theme": "15.0.0-canary.684e33d25.0", - "@material/typography": "15.0.0-canary.684e33d25.0", + "@material/animation": "15.0.0-canary.b994146f6.0", + "@material/base": "15.0.0-canary.b994146f6.0", + "@material/dom": "15.0.0-canary.b994146f6.0", + "@material/feature-targeting": "15.0.0-canary.b994146f6.0", + "@material/rtl": "15.0.0-canary.b994146f6.0", + "@material/theme": "15.0.0-canary.b994146f6.0", + "@material/typography": "15.0.0-canary.b994146f6.0", "tslib": "^2.1.0" } }, "@material/focus-ring": { - "version": "15.0.0-canary.684e33d25.0", - "resolved": "https://registry.npmjs.org/@material/focus-ring/-/focus-ring-15.0.0-canary.684e33d25.0.tgz", - "integrity": "sha512-ikw2RVUfgzXChpWIzPH1VzRvTjYb5ZKj4H+CZf7jqPUXMstFOZg90Bp7ARLZHqYiyNMuUq3zUTHozS6iHorSqg==", + "version": "15.0.0-canary.b994146f6.0", + "resolved": "https://registry.npmjs.org/@material/focus-ring/-/focus-ring-15.0.0-canary.b994146f6.0.tgz", + "integrity": "sha512-87qEMuXsCvlQfTiimnzJUZoebnIXWcMtRZevNLymN9Y0t9jGckQxZPmrI0llRkpyiR/Ewhec5SI/JGrFlYHnsA==", "requires": { - "@material/dom": "15.0.0-canary.684e33d25.0", - "@material/feature-targeting": "15.0.0-canary.684e33d25.0", - "@material/rtl": "15.0.0-canary.684e33d25.0" + "@material/dom": "15.0.0-canary.b994146f6.0", + "@material/feature-targeting": "15.0.0-canary.b994146f6.0", + "@material/rtl": "15.0.0-canary.b994146f6.0" } }, "@material/form-field": { - "version": "15.0.0-canary.684e33d25.0", - "resolved": "https://registry.npmjs.org/@material/form-field/-/form-field-15.0.0-canary.684e33d25.0.tgz", - "integrity": "sha512-vpF9N/uq5no/7+8GAbEH0868FhOuBgxAWRr1Sfb+jthKfBr8OS/wPU/AHzZHdHdAm7PQynbeOXfDsX2dI//PDA==", + "version": "15.0.0-canary.b994146f6.0", + "resolved": "https://registry.npmjs.org/@material/form-field/-/form-field-15.0.0-canary.b994146f6.0.tgz", + "integrity": "sha512-Tg1SQQaopvXMyDEYxGTWnhCWQmNcWVIoKMLmle9P/gi2p8ulcj0iOCPYf+3ECqUBVozOmTPKlYOOiRwtKStAeA==", "requires": { - "@material/base": "15.0.0-canary.684e33d25.0", - "@material/feature-targeting": "15.0.0-canary.684e33d25.0", - "@material/ripple": "15.0.0-canary.684e33d25.0", - "@material/rtl": "15.0.0-canary.684e33d25.0", - "@material/theme": "15.0.0-canary.684e33d25.0", - "@material/typography": "15.0.0-canary.684e33d25.0", + "@material/base": "15.0.0-canary.b994146f6.0", + "@material/feature-targeting": "15.0.0-canary.b994146f6.0", + "@material/ripple": "15.0.0-canary.b994146f6.0", + "@material/rtl": "15.0.0-canary.b994146f6.0", + "@material/theme": "15.0.0-canary.b994146f6.0", + "@material/typography": "15.0.0-canary.b994146f6.0", "tslib": "^2.1.0" } }, "@material/icon-button": { - "version": "15.0.0-canary.684e33d25.0", - "resolved": "https://registry.npmjs.org/@material/icon-button/-/icon-button-15.0.0-canary.684e33d25.0.tgz", - "integrity": "sha512-wMI+XGzmIN/o2ePBKg2hLyx7H4pXCRAyyIKMQS1FMp1UKa2tYmiHVX/V8skhKwCqxg3i6Ls/LxMjfPxTR18WvQ==", + "version": "15.0.0-canary.b994146f6.0", + "resolved": "https://registry.npmjs.org/@material/icon-button/-/icon-button-15.0.0-canary.b994146f6.0.tgz", + "integrity": "sha512-X6DvOv4jpymHUjI7ZAbO946nDgGYKDwPZfkRzBE84gv2XEr2qfMuABhojxkYubRbt03oauBdcJVVMFCXkVhArQ==", "requires": { - "@material/base": "15.0.0-canary.684e33d25.0", - "@material/density": "15.0.0-canary.684e33d25.0", - "@material/dom": "15.0.0-canary.684e33d25.0", - "@material/elevation": "15.0.0-canary.684e33d25.0", - "@material/feature-targeting": "15.0.0-canary.684e33d25.0", - "@material/focus-ring": "15.0.0-canary.684e33d25.0", - "@material/ripple": "15.0.0-canary.684e33d25.0", - "@material/rtl": "15.0.0-canary.684e33d25.0", - "@material/theme": "15.0.0-canary.684e33d25.0", - "@material/touch-target": "15.0.0-canary.684e33d25.0", + "@material/base": "15.0.0-canary.b994146f6.0", + "@material/density": "15.0.0-canary.b994146f6.0", + "@material/dom": "15.0.0-canary.b994146f6.0", + "@material/elevation": "15.0.0-canary.b994146f6.0", + "@material/feature-targeting": "15.0.0-canary.b994146f6.0", + "@material/focus-ring": "15.0.0-canary.b994146f6.0", + "@material/ripple": "15.0.0-canary.b994146f6.0", + "@material/rtl": "15.0.0-canary.b994146f6.0", + "@material/theme": "15.0.0-canary.b994146f6.0", + "@material/touch-target": "15.0.0-canary.b994146f6.0", "tslib": "^2.1.0" } }, "@material/image-list": { - "version": "15.0.0-canary.684e33d25.0", - "resolved": "https://registry.npmjs.org/@material/image-list/-/image-list-15.0.0-canary.684e33d25.0.tgz", - "integrity": "sha512-Ol+uaHYBe5R/cgzlfh5ONnMVX0wO6fV74JMUcQCQlxP6lXau/edARo4tkRc7A7UJUkU3VRv0EpEjLoCRNUPGaA==", + "version": "15.0.0-canary.b994146f6.0", + "resolved": "https://registry.npmjs.org/@material/image-list/-/image-list-15.0.0-canary.b994146f6.0.tgz", + "integrity": "sha512-kf903XFF1P+V5ZPXCt+7R6c55g4UyQE1ZHkTViCIJfd52gU40bHODMhTQy/ywBkwDeJfNk8uf1V1IM24WQYpxA==", "requires": { - "@material/feature-targeting": "15.0.0-canary.684e33d25.0", - "@material/shape": "15.0.0-canary.684e33d25.0", - "@material/theme": "15.0.0-canary.684e33d25.0", - "@material/typography": "15.0.0-canary.684e33d25.0", + "@material/feature-targeting": "15.0.0-canary.b994146f6.0", + "@material/shape": "15.0.0-canary.b994146f6.0", + "@material/theme": "15.0.0-canary.b994146f6.0", + "@material/typography": "15.0.0-canary.b994146f6.0", "tslib": "^2.1.0" } }, "@material/layout-grid": { - "version": "15.0.0-canary.684e33d25.0", - "resolved": "https://registry.npmjs.org/@material/layout-grid/-/layout-grid-15.0.0-canary.684e33d25.0.tgz", - "integrity": "sha512-ALXE1mqFNb/RB2lVRQ3/r1Aufw2mFZnOjRE+boYDVepmAG/xWyPCyaGoavELJF5l4GAb0tXi8wA/8HeGbLOpuA==", + "version": "15.0.0-canary.b994146f6.0", + "resolved": "https://registry.npmjs.org/@material/layout-grid/-/layout-grid-15.0.0-canary.b994146f6.0.tgz", + "integrity": "sha512-OALBSGue8g1/mEwLYYi2d950dJFpNYKW87jPS9/KM65JKMyxoU7tU2d4An1BuyqK0r9sopGq6Pn/zhill0iLaw==", "requires": { "tslib": "^2.1.0" } }, "@material/line-ripple": { - "version": "15.0.0-canary.684e33d25.0", - "resolved": "https://registry.npmjs.org/@material/line-ripple/-/line-ripple-15.0.0-canary.684e33d25.0.tgz", - "integrity": "sha512-7hRx8C/e9i0P6pgQpNOMfTwSS2r1fwEvBL72QDVGLtLuoKKwsjjgP6Z0Jat/GeHJe87u9LQvGBoD4upt+of/HA==", + "version": "15.0.0-canary.b994146f6.0", + "resolved": "https://registry.npmjs.org/@material/line-ripple/-/line-ripple-15.0.0-canary.b994146f6.0.tgz", + "integrity": "sha512-evjZxCu4iodiKtW8N0xjY8ACRXm3sY+4rAmq3vV5BmHWAJ3BobjbFYslDMZQ+4mu3HmwMatbJehKxHegahitNg==", "requires": { - "@material/animation": "15.0.0-canary.684e33d25.0", - "@material/base": "15.0.0-canary.684e33d25.0", - "@material/feature-targeting": "15.0.0-canary.684e33d25.0", - "@material/theme": "15.0.0-canary.684e33d25.0", + "@material/animation": "15.0.0-canary.b994146f6.0", + "@material/base": "15.0.0-canary.b994146f6.0", + "@material/feature-targeting": "15.0.0-canary.b994146f6.0", + "@material/theme": "15.0.0-canary.b994146f6.0", "tslib": "^2.1.0" } }, "@material/linear-progress": { - "version": "15.0.0-canary.684e33d25.0", - "resolved": "https://registry.npmjs.org/@material/linear-progress/-/linear-progress-15.0.0-canary.684e33d25.0.tgz", - "integrity": "sha512-iJclt7mKmcMk6pqD7ocXKfCWZhqBoODp7N593jYlxVpTJuEz2wiVAjZUDn/YGj/Uz3CRH+2YFfOiLr9pwWjhDg==", + "version": "15.0.0-canary.b994146f6.0", + "resolved": "https://registry.npmjs.org/@material/linear-progress/-/linear-progress-15.0.0-canary.b994146f6.0.tgz", + "integrity": "sha512-jlXh+tIj+/o0Ks7fHdC/24fH6IXCAl2vF52U6NwT39ESrlwmlLhp3gtag5GSBHN5E7Z09nK871Yo1G/b1F+COg==", "requires": { - "@material/animation": "15.0.0-canary.684e33d25.0", - "@material/base": "15.0.0-canary.684e33d25.0", - "@material/dom": "15.0.0-canary.684e33d25.0", - "@material/feature-targeting": "15.0.0-canary.684e33d25.0", - "@material/progress-indicator": "15.0.0-canary.684e33d25.0", - "@material/rtl": "15.0.0-canary.684e33d25.0", - "@material/theme": "15.0.0-canary.684e33d25.0", + "@material/animation": "15.0.0-canary.b994146f6.0", + "@material/base": "15.0.0-canary.b994146f6.0", + "@material/dom": "15.0.0-canary.b994146f6.0", + "@material/feature-targeting": "15.0.0-canary.b994146f6.0", + "@material/progress-indicator": "15.0.0-canary.b994146f6.0", + "@material/rtl": "15.0.0-canary.b994146f6.0", + "@material/theme": "15.0.0-canary.b994146f6.0", "tslib": "^2.1.0" } }, "@material/list": { - "version": "15.0.0-canary.684e33d25.0", - "resolved": "https://registry.npmjs.org/@material/list/-/list-15.0.0-canary.684e33d25.0.tgz", - "integrity": "sha512-rQ+FCSdzmwTcT00IYE0uRV3CS4oGSccKFl9hkcF+aHFW61L7ORh/SCGUDPrEfQFrFkMn5f8qroVJjpUAMXBz4g==", + "version": "15.0.0-canary.b994146f6.0", + "resolved": "https://registry.npmjs.org/@material/list/-/list-15.0.0-canary.b994146f6.0.tgz", + "integrity": "sha512-kY/i6VvFBb/W3VvCPvWRMzWvu7mvNFJ+R8ijfawDoAXiv4fj42GO4iFyTcFXaUevEPKp791pN/09BMJQ6jYEvA==", "requires": { - "@material/base": "15.0.0-canary.684e33d25.0", - "@material/density": "15.0.0-canary.684e33d25.0", - "@material/dom": "15.0.0-canary.684e33d25.0", - "@material/feature-targeting": "15.0.0-canary.684e33d25.0", - "@material/ripple": "15.0.0-canary.684e33d25.0", - "@material/rtl": "15.0.0-canary.684e33d25.0", - "@material/shape": "15.0.0-canary.684e33d25.0", - "@material/theme": "15.0.0-canary.684e33d25.0", - "@material/tokens": "15.0.0-canary.684e33d25.0", - "@material/typography": "15.0.0-canary.684e33d25.0", + "@material/base": "15.0.0-canary.b994146f6.0", + "@material/density": "15.0.0-canary.b994146f6.0", + "@material/dom": "15.0.0-canary.b994146f6.0", + "@material/feature-targeting": "15.0.0-canary.b994146f6.0", + "@material/ripple": "15.0.0-canary.b994146f6.0", + "@material/rtl": "15.0.0-canary.b994146f6.0", + "@material/shape": "15.0.0-canary.b994146f6.0", + "@material/theme": "15.0.0-canary.b994146f6.0", + "@material/tokens": "15.0.0-canary.b994146f6.0", + "@material/typography": "15.0.0-canary.b994146f6.0", "tslib": "^2.1.0" } }, "@material/menu": { - "version": "15.0.0-canary.684e33d25.0", - "resolved": "https://registry.npmjs.org/@material/menu/-/menu-15.0.0-canary.684e33d25.0.tgz", - "integrity": "sha512-r7wzDLSGSI9629/mfpvsMzkVxpmV75kcD3IrW0Pcu6/Bv/1xi0EvjcUXzNJJoQlwN4Zj35Ymz/PCjZkIDIz68Q==", + "version": "15.0.0-canary.b994146f6.0", + "resolved": "https://registry.npmjs.org/@material/menu/-/menu-15.0.0-canary.b994146f6.0.tgz", + "integrity": "sha512-y6smNmLJ+U0DoXWbyqzW+VW/uWDuklhdGHc5MbZrTOhsKkhvoTVNMSOa+NFPU4gTwrplvUjaUvnIsQ0wygwD3g==", "requires": { - "@material/base": "15.0.0-canary.684e33d25.0", - "@material/dom": "15.0.0-canary.684e33d25.0", - "@material/elevation": "15.0.0-canary.684e33d25.0", - "@material/feature-targeting": "15.0.0-canary.684e33d25.0", - "@material/list": "15.0.0-canary.684e33d25.0", - "@material/menu-surface": "15.0.0-canary.684e33d25.0", - "@material/ripple": "15.0.0-canary.684e33d25.0", - "@material/rtl": "15.0.0-canary.684e33d25.0", - "@material/shape": "15.0.0-canary.684e33d25.0", - "@material/theme": "15.0.0-canary.684e33d25.0", - "@material/tokens": "15.0.0-canary.684e33d25.0", + "@material/base": "15.0.0-canary.b994146f6.0", + "@material/dom": "15.0.0-canary.b994146f6.0", + "@material/elevation": "15.0.0-canary.b994146f6.0", + "@material/feature-targeting": "15.0.0-canary.b994146f6.0", + "@material/list": "15.0.0-canary.b994146f6.0", + "@material/menu-surface": "15.0.0-canary.b994146f6.0", + "@material/ripple": "15.0.0-canary.b994146f6.0", + "@material/rtl": "15.0.0-canary.b994146f6.0", + "@material/shape": "15.0.0-canary.b994146f6.0", + "@material/theme": "15.0.0-canary.b994146f6.0", + "@material/tokens": "15.0.0-canary.b994146f6.0", "tslib": "^2.1.0" } }, "@material/menu-surface": { - "version": "15.0.0-canary.684e33d25.0", - "resolved": "https://registry.npmjs.org/@material/menu-surface/-/menu-surface-15.0.0-canary.684e33d25.0.tgz", - "integrity": "sha512-RVO5GAYcfWPaKwxsF/NhUAmrYXQCQBKvRQW0TIlbmAJz6lcFeTs6YZqF3u1C7qrL3ZQGz+sur/7ywj6QU0oMow==", + "version": "15.0.0-canary.b994146f6.0", + "resolved": "https://registry.npmjs.org/@material/menu-surface/-/menu-surface-15.0.0-canary.b994146f6.0.tgz", + "integrity": "sha512-StmM3lrRn1iMEZfq532jpMNppqyBBy68FbPurKEsHuP/3q+CscfnwjrS9ym+JcHqXKMHnQXbL/49ymffRGX2AQ==", "requires": { - "@material/animation": "15.0.0-canary.684e33d25.0", - "@material/base": "15.0.0-canary.684e33d25.0", - "@material/elevation": "15.0.0-canary.684e33d25.0", - "@material/feature-targeting": "15.0.0-canary.684e33d25.0", - "@material/rtl": "15.0.0-canary.684e33d25.0", - "@material/shape": "15.0.0-canary.684e33d25.0", - "@material/theme": "15.0.0-canary.684e33d25.0", + "@material/animation": "15.0.0-canary.b994146f6.0", + "@material/base": "15.0.0-canary.b994146f6.0", + "@material/elevation": "15.0.0-canary.b994146f6.0", + "@material/feature-targeting": "15.0.0-canary.b994146f6.0", + "@material/rtl": "15.0.0-canary.b994146f6.0", + "@material/shape": "15.0.0-canary.b994146f6.0", + "@material/theme": "15.0.0-canary.b994146f6.0", "tslib": "^2.1.0" } }, "@material/notched-outline": { - "version": "15.0.0-canary.684e33d25.0", - "resolved": "https://registry.npmjs.org/@material/notched-outline/-/notched-outline-15.0.0-canary.684e33d25.0.tgz", - "integrity": "sha512-9YHcBkvJLPVYzkHcWoTpBZAFrEd+j1hjhGxLhh0LuNrZe8VroUkZD1TTnUAPHRG3os6EqEWWaKb0RN+aPIF2yQ==", + "version": "15.0.0-canary.b994146f6.0", + "resolved": "https://registry.npmjs.org/@material/notched-outline/-/notched-outline-15.0.0-canary.b994146f6.0.tgz", + "integrity": "sha512-UZxU8jXM2t/bk/CiO0K+TSPspuJRZIyrYlIS0gd+qq/u8Gi2DpALBlLAh9Jeu46IUg4YGlPsNWYfe8p3QAVyoA==", "requires": { - "@material/base": "15.0.0-canary.684e33d25.0", - "@material/feature-targeting": "15.0.0-canary.684e33d25.0", - "@material/floating-label": "15.0.0-canary.684e33d25.0", - "@material/rtl": "15.0.0-canary.684e33d25.0", - "@material/shape": "15.0.0-canary.684e33d25.0", - "@material/theme": "15.0.0-canary.684e33d25.0", + "@material/base": "15.0.0-canary.b994146f6.0", + "@material/feature-targeting": "15.0.0-canary.b994146f6.0", + "@material/floating-label": "15.0.0-canary.b994146f6.0", + "@material/rtl": "15.0.0-canary.b994146f6.0", + "@material/shape": "15.0.0-canary.b994146f6.0", + "@material/theme": "15.0.0-canary.b994146f6.0", "tslib": "^2.1.0" } }, "@material/progress-indicator": { - "version": "15.0.0-canary.684e33d25.0", - "resolved": "https://registry.npmjs.org/@material/progress-indicator/-/progress-indicator-15.0.0-canary.684e33d25.0.tgz", - "integrity": "sha512-c0icji4faeNWUoqGENGC7Hav0Puxh0RwXIDVizffaUxKIGbajpIp5+4Zop73fK/xFLGMB/npg7TbP+aCGjQ3fw==", + "version": "15.0.0-canary.b994146f6.0", + "resolved": "https://registry.npmjs.org/@material/progress-indicator/-/progress-indicator-15.0.0-canary.b994146f6.0.tgz", + "integrity": "sha512-VT+mOQhohaM+pBX1rknbVOI6JCGKg9NiOHBoYljIvnexNeILE+mW9g6mtQ0ZCJPz0oMmiSAMLcuxMIcBXx84Xw==", "requires": { "tslib": "^2.1.0" } }, "@material/radio": { - "version": "15.0.0-canary.684e33d25.0", - "resolved": "https://registry.npmjs.org/@material/radio/-/radio-15.0.0-canary.684e33d25.0.tgz", - "integrity": "sha512-U3Eh8sNUA8trDla1Bq8Bo02foxYvtoewaKeF8A8tAju81XZ4jRiftfOsOWZDZEHCVbbCB2QwvutvFlnay5n+Aw==", + "version": "15.0.0-canary.b994146f6.0", + "resolved": "https://registry.npmjs.org/@material/radio/-/radio-15.0.0-canary.b994146f6.0.tgz", + "integrity": "sha512-U/RR2lVNWwEO2+kJtGz9XzvnOF0gAZn1krMY0z/eU9Wnl0OgPZbqQrxXMoVNv1pzKYSEwZQEGado/rv8qp7piA==", "requires": { - "@material/animation": "15.0.0-canary.684e33d25.0", - "@material/base": "15.0.0-canary.684e33d25.0", - "@material/density": "15.0.0-canary.684e33d25.0", - "@material/dom": "15.0.0-canary.684e33d25.0", - "@material/feature-targeting": "15.0.0-canary.684e33d25.0", - "@material/focus-ring": "15.0.0-canary.684e33d25.0", - "@material/ripple": "15.0.0-canary.684e33d25.0", - "@material/theme": "15.0.0-canary.684e33d25.0", - "@material/touch-target": "15.0.0-canary.684e33d25.0", + "@material/animation": "15.0.0-canary.b994146f6.0", + "@material/base": "15.0.0-canary.b994146f6.0", + "@material/density": "15.0.0-canary.b994146f6.0", + "@material/dom": "15.0.0-canary.b994146f6.0", + "@material/feature-targeting": "15.0.0-canary.b994146f6.0", + "@material/focus-ring": "15.0.0-canary.b994146f6.0", + "@material/ripple": "15.0.0-canary.b994146f6.0", + "@material/theme": "15.0.0-canary.b994146f6.0", + "@material/touch-target": "15.0.0-canary.b994146f6.0", "tslib": "^2.1.0" } }, "@material/ripple": { - "version": "15.0.0-canary.684e33d25.0", - "resolved": "https://registry.npmjs.org/@material/ripple/-/ripple-15.0.0-canary.684e33d25.0.tgz", - "integrity": "sha512-RyePu7SjIm/OuyyEieZ/gxiPYkNZOZHeid72WRcN9ofdlljj2pifcdPvcfZA+v/DMS33xo5GjG2L/Qj6ClWrKw==", + "version": "15.0.0-canary.b994146f6.0", + "resolved": "https://registry.npmjs.org/@material/ripple/-/ripple-15.0.0-canary.b994146f6.0.tgz", + "integrity": "sha512-WzIbc8wYTzMOczqGXVCBPdNcv/73Ef8FwcQYsscGMaqCzgVsdpoqilTfsx7Ryyz6dQbyfmJqp7s+YpPujcezOA==", "requires": { - "@material/animation": "15.0.0-canary.684e33d25.0", - "@material/base": "15.0.0-canary.684e33d25.0", - "@material/dom": "15.0.0-canary.684e33d25.0", - "@material/feature-targeting": "15.0.0-canary.684e33d25.0", - "@material/rtl": "15.0.0-canary.684e33d25.0", - "@material/theme": "15.0.0-canary.684e33d25.0", + "@material/animation": "15.0.0-canary.b994146f6.0", + "@material/base": "15.0.0-canary.b994146f6.0", + "@material/dom": "15.0.0-canary.b994146f6.0", + "@material/feature-targeting": "15.0.0-canary.b994146f6.0", + "@material/rtl": "15.0.0-canary.b994146f6.0", + "@material/theme": "15.0.0-canary.b994146f6.0", "tslib": "^2.1.0" } }, "@material/rtl": { - "version": "15.0.0-canary.684e33d25.0", - "resolved": "https://registry.npmjs.org/@material/rtl/-/rtl-15.0.0-canary.684e33d25.0.tgz", - "integrity": "sha512-NqdJl8Ayupp1Th+vCNCpVQHbUFOuF7TCte9LD1norTIBUF/QizIxWby2W5uUEiPbnh5j9PmE1CJtfLwKun3pcw==", + "version": "15.0.0-canary.b994146f6.0", + "resolved": "https://registry.npmjs.org/@material/rtl/-/rtl-15.0.0-canary.b994146f6.0.tgz", + "integrity": "sha512-H/W6BVn4Ygfkrf/FgSrNhbu1uY7PST2wlsjEYQt06EfAM0CDHEwSL1MwV4FmpQA/r40Q0PqoLN6moDrtCe5S8g==", "requires": { - "@material/theme": "15.0.0-canary.684e33d25.0", + "@material/theme": "15.0.0-canary.b994146f6.0", "tslib": "^2.1.0" } }, "@material/segmented-button": { - "version": "15.0.0-canary.684e33d25.0", - "resolved": "https://registry.npmjs.org/@material/segmented-button/-/segmented-button-15.0.0-canary.684e33d25.0.tgz", - "integrity": "sha512-bEGgg8vgXNLyukyV8HRjFMuQ6t6nm5LQ4Pgm22um61Yc8qyi0BOqV41OR4SVdUrUqZxh1aVD+p+4NN03+LfQXw==", + "version": "15.0.0-canary.b994146f6.0", + "resolved": "https://registry.npmjs.org/@material/segmented-button/-/segmented-button-15.0.0-canary.b994146f6.0.tgz", + "integrity": "sha512-jd+f4BTnU0tghxBpAM/XdVmruDXSoQ88TYSFWbrhulS+/c/ooCZURWvVC4mHNej+QR/fODkx4adbqkBiwwCtMw==", "requires": { - "@material/base": "15.0.0-canary.684e33d25.0", - "@material/elevation": "15.0.0-canary.684e33d25.0", - "@material/feature-targeting": "15.0.0-canary.684e33d25.0", - "@material/ripple": "15.0.0-canary.684e33d25.0", - "@material/theme": "15.0.0-canary.684e33d25.0", - "@material/touch-target": "15.0.0-canary.684e33d25.0", - "@material/typography": "15.0.0-canary.684e33d25.0", + "@material/base": "15.0.0-canary.b994146f6.0", + "@material/elevation": "15.0.0-canary.b994146f6.0", + "@material/feature-targeting": "15.0.0-canary.b994146f6.0", + "@material/ripple": "15.0.0-canary.b994146f6.0", + "@material/theme": "15.0.0-canary.b994146f6.0", + "@material/touch-target": "15.0.0-canary.b994146f6.0", + "@material/typography": "15.0.0-canary.b994146f6.0", "tslib": "^2.1.0" } }, "@material/select": { - "version": "15.0.0-canary.684e33d25.0", - "resolved": "https://registry.npmjs.org/@material/select/-/select-15.0.0-canary.684e33d25.0.tgz", - "integrity": "sha512-kf178/2TeEinTv0mgmSBcmmExQ2h7a7dtR1E3WuqQgisJ/R6+zVLMkC2CnfIyzxYX2vkuUTG0ue3Reh/6XiqSg==", + "version": "15.0.0-canary.b994146f6.0", + "resolved": "https://registry.npmjs.org/@material/select/-/select-15.0.0-canary.b994146f6.0.tgz", + "integrity": "sha512-5thEQS+B17JSm3I8D+mqQe2G3ArVnXJALTEEE9FmMUKwKYkrsLplm3FYuEXERZGJnYeTRdkdmhYY/YeocfZoyA==", "requires": { - "@material/animation": "15.0.0-canary.684e33d25.0", - "@material/base": "15.0.0-canary.684e33d25.0", - "@material/density": "15.0.0-canary.684e33d25.0", - "@material/dom": "15.0.0-canary.684e33d25.0", - "@material/elevation": "15.0.0-canary.684e33d25.0", - "@material/feature-targeting": "15.0.0-canary.684e33d25.0", - "@material/floating-label": "15.0.0-canary.684e33d25.0", - "@material/line-ripple": "15.0.0-canary.684e33d25.0", - "@material/list": "15.0.0-canary.684e33d25.0", - "@material/menu": "15.0.0-canary.684e33d25.0", - "@material/menu-surface": "15.0.0-canary.684e33d25.0", - "@material/notched-outline": "15.0.0-canary.684e33d25.0", - "@material/ripple": "15.0.0-canary.684e33d25.0", - "@material/rtl": "15.0.0-canary.684e33d25.0", - "@material/shape": "15.0.0-canary.684e33d25.0", - "@material/theme": "15.0.0-canary.684e33d25.0", - "@material/tokens": "15.0.0-canary.684e33d25.0", - "@material/typography": "15.0.0-canary.684e33d25.0", + "@material/animation": "15.0.0-canary.b994146f6.0", + "@material/base": "15.0.0-canary.b994146f6.0", + "@material/density": "15.0.0-canary.b994146f6.0", + "@material/dom": "15.0.0-canary.b994146f6.0", + "@material/elevation": "15.0.0-canary.b994146f6.0", + "@material/feature-targeting": "15.0.0-canary.b994146f6.0", + "@material/floating-label": "15.0.0-canary.b994146f6.0", + "@material/line-ripple": "15.0.0-canary.b994146f6.0", + "@material/list": "15.0.0-canary.b994146f6.0", + "@material/menu": "15.0.0-canary.b994146f6.0", + "@material/menu-surface": "15.0.0-canary.b994146f6.0", + "@material/notched-outline": "15.0.0-canary.b994146f6.0", + "@material/ripple": "15.0.0-canary.b994146f6.0", + "@material/rtl": "15.0.0-canary.b994146f6.0", + "@material/shape": "15.0.0-canary.b994146f6.0", + "@material/theme": "15.0.0-canary.b994146f6.0", + "@material/tokens": "15.0.0-canary.b994146f6.0", + "@material/typography": "15.0.0-canary.b994146f6.0", "tslib": "^2.1.0" } }, "@material/shape": { - "version": "15.0.0-canary.684e33d25.0", - "resolved": "https://registry.npmjs.org/@material/shape/-/shape-15.0.0-canary.684e33d25.0.tgz", - "integrity": "sha512-aEelpaTFmpnCji3TUGP9bVCS/bRVjUmLTHBPZtuu1gOrUVVtJ6kYOg73dZNJF+XOoNL2yOX/LRcKwsop29tptA==", + "version": "15.0.0-canary.b994146f6.0", + "resolved": "https://registry.npmjs.org/@material/shape/-/shape-15.0.0-canary.b994146f6.0.tgz", + "integrity": "sha512-sINM3gr3aLgdvqZVfqfXV5EB77owLLJjy+2NqchJ8ZPqucCJ+F/BsCBfLA2Wu3O4Sc9IpAEn/o1hzYm/CWAFAw==", "requires": { - "@material/feature-targeting": "15.0.0-canary.684e33d25.0", - "@material/rtl": "15.0.0-canary.684e33d25.0", - "@material/theme": "15.0.0-canary.684e33d25.0", + "@material/feature-targeting": "15.0.0-canary.b994146f6.0", + "@material/rtl": "15.0.0-canary.b994146f6.0", + "@material/theme": "15.0.0-canary.b994146f6.0", "tslib": "^2.1.0" } }, "@material/slider": { - "version": "15.0.0-canary.684e33d25.0", - "resolved": "https://registry.npmjs.org/@material/slider/-/slider-15.0.0-canary.684e33d25.0.tgz", - "integrity": "sha512-WVyK+2pSNSZmj07M2K/a3TADoQ9FBCndfNC/vE7/wGIg4dddJJK5KvQ+yruf9R2cSzTL/S1sZ5WpyyeM8E9HTw==", + "version": "15.0.0-canary.b994146f6.0", + "resolved": "https://registry.npmjs.org/@material/slider/-/slider-15.0.0-canary.b994146f6.0.tgz", + "integrity": "sha512-dyT72+Kp//AEajJxDUVoMoizUjf2uggVMGXOaQ7FhpGHuf7LC3EyEjrrJ15efFzYgTjdJUU1YQkCwGmdt6CQsA==", "requires": { - "@material/animation": "15.0.0-canary.684e33d25.0", - "@material/base": "15.0.0-canary.684e33d25.0", - "@material/dom": "15.0.0-canary.684e33d25.0", - "@material/elevation": "15.0.0-canary.684e33d25.0", - "@material/feature-targeting": "15.0.0-canary.684e33d25.0", - "@material/ripple": "15.0.0-canary.684e33d25.0", - "@material/rtl": "15.0.0-canary.684e33d25.0", - "@material/theme": "15.0.0-canary.684e33d25.0", - "@material/tokens": "15.0.0-canary.684e33d25.0", - "@material/typography": "15.0.0-canary.684e33d25.0", + "@material/animation": "15.0.0-canary.b994146f6.0", + "@material/base": "15.0.0-canary.b994146f6.0", + "@material/dom": "15.0.0-canary.b994146f6.0", + "@material/elevation": "15.0.0-canary.b994146f6.0", + "@material/feature-targeting": "15.0.0-canary.b994146f6.0", + "@material/ripple": "15.0.0-canary.b994146f6.0", + "@material/rtl": "15.0.0-canary.b994146f6.0", + "@material/theme": "15.0.0-canary.b994146f6.0", + "@material/tokens": "15.0.0-canary.b994146f6.0", + "@material/typography": "15.0.0-canary.b994146f6.0", "tslib": "^2.1.0" } }, "@material/snackbar": { - "version": "15.0.0-canary.684e33d25.0", - "resolved": "https://registry.npmjs.org/@material/snackbar/-/snackbar-15.0.0-canary.684e33d25.0.tgz", - "integrity": "sha512-itO+DCkOannZzR1/cCHcqAm7ifhuFvXmDItNoA8qLEcAyJDJJRkhpwj3XQ01yuo9gBFcSctp7Txt7e+Hncm/Jg==", + "version": "15.0.0-canary.b994146f6.0", + "resolved": "https://registry.npmjs.org/@material/snackbar/-/snackbar-15.0.0-canary.b994146f6.0.tgz", + "integrity": "sha512-fEhPASJossScNpcrNYrrH8uU+rUf6+kw7/ZMrpUzzz1lVXliL28jTNEmU1nFpcDI4M2GXH+Z64f7vl2hiMDG8g==", "requires": { - "@material/animation": "15.0.0-canary.684e33d25.0", - "@material/base": "15.0.0-canary.684e33d25.0", - "@material/button": "15.0.0-canary.684e33d25.0", - "@material/dom": "15.0.0-canary.684e33d25.0", - "@material/elevation": "15.0.0-canary.684e33d25.0", - "@material/feature-targeting": "15.0.0-canary.684e33d25.0", - "@material/icon-button": "15.0.0-canary.684e33d25.0", - "@material/ripple": "15.0.0-canary.684e33d25.0", - "@material/rtl": "15.0.0-canary.684e33d25.0", - "@material/shape": "15.0.0-canary.684e33d25.0", - "@material/theme": "15.0.0-canary.684e33d25.0", - "@material/tokens": "15.0.0-canary.684e33d25.0", - "@material/typography": "15.0.0-canary.684e33d25.0", + "@material/animation": "15.0.0-canary.b994146f6.0", + "@material/base": "15.0.0-canary.b994146f6.0", + "@material/button": "15.0.0-canary.b994146f6.0", + "@material/dom": "15.0.0-canary.b994146f6.0", + "@material/elevation": "15.0.0-canary.b994146f6.0", + "@material/feature-targeting": "15.0.0-canary.b994146f6.0", + "@material/icon-button": "15.0.0-canary.b994146f6.0", + "@material/ripple": "15.0.0-canary.b994146f6.0", + "@material/rtl": "15.0.0-canary.b994146f6.0", + "@material/shape": "15.0.0-canary.b994146f6.0", + "@material/theme": "15.0.0-canary.b994146f6.0", + "@material/tokens": "15.0.0-canary.b994146f6.0", + "@material/typography": "15.0.0-canary.b994146f6.0", "tslib": "^2.1.0" } }, "@material/switch": { - "version": "15.0.0-canary.684e33d25.0", - "resolved": "https://registry.npmjs.org/@material/switch/-/switch-15.0.0-canary.684e33d25.0.tgz", - "integrity": "sha512-Jxi0gl92yvvZZsAPxvVHzXx2ga+T/djMow98jvEczmpUorWnAhgiCr9CsSSRoosahWyRB8NLZOxUQrACxvffjw==", + "version": "15.0.0-canary.b994146f6.0", + "resolved": "https://registry.npmjs.org/@material/switch/-/switch-15.0.0-canary.b994146f6.0.tgz", + "integrity": "sha512-czCXTUa30ILIf1J3exiuSVIRcodGATHexd3eWDq4sfHo4iMh4rBMaIxcqkmnb2iwE/mMTNyVfoauijx2QiNKrA==", "requires": { - "@material/animation": "15.0.0-canary.684e33d25.0", - "@material/base": "15.0.0-canary.684e33d25.0", - "@material/density": "15.0.0-canary.684e33d25.0", - "@material/dom": "15.0.0-canary.684e33d25.0", - "@material/elevation": "15.0.0-canary.684e33d25.0", - "@material/feature-targeting": "15.0.0-canary.684e33d25.0", - "@material/focus-ring": "15.0.0-canary.684e33d25.0", - "@material/ripple": "15.0.0-canary.684e33d25.0", - "@material/rtl": "15.0.0-canary.684e33d25.0", - "@material/shape": "15.0.0-canary.684e33d25.0", - "@material/theme": "15.0.0-canary.684e33d25.0", - "@material/tokens": "15.0.0-canary.684e33d25.0", + "@material/animation": "15.0.0-canary.b994146f6.0", + "@material/base": "15.0.0-canary.b994146f6.0", + "@material/density": "15.0.0-canary.b994146f6.0", + "@material/dom": "15.0.0-canary.b994146f6.0", + "@material/elevation": "15.0.0-canary.b994146f6.0", + "@material/feature-targeting": "15.0.0-canary.b994146f6.0", + "@material/focus-ring": "15.0.0-canary.b994146f6.0", + "@material/ripple": "15.0.0-canary.b994146f6.0", + "@material/rtl": "15.0.0-canary.b994146f6.0", + "@material/shape": "15.0.0-canary.b994146f6.0", + "@material/theme": "15.0.0-canary.b994146f6.0", + "@material/tokens": "15.0.0-canary.b994146f6.0", "safevalues": "^0.3.4", "tslib": "^2.1.0" } }, "@material/tab": { - "version": "15.0.0-canary.684e33d25.0", - "resolved": "https://registry.npmjs.org/@material/tab/-/tab-15.0.0-canary.684e33d25.0.tgz", - "integrity": "sha512-WQL3wj9syHNcfe8KbgGGUcA34M8C/xZ+n0Fkkh8Kk6puVwaU+xqUNihsxPY6YzKpmh4PZ4oJaBdiN8zvFT1zqQ==", + "version": "15.0.0-canary.b994146f6.0", + "resolved": "https://registry.npmjs.org/@material/tab/-/tab-15.0.0-canary.b994146f6.0.tgz", + "integrity": "sha512-ygswooiNdBNNDnQdbPX0nzDQu7oQlHo8vWZ0/xL4IPVEXabY5zCzsEbGNZw2u/syo56c/NHPyMsUmXDGRSXOvQ==", "requires": { - "@material/base": "15.0.0-canary.684e33d25.0", - "@material/elevation": "15.0.0-canary.684e33d25.0", - "@material/feature-targeting": "15.0.0-canary.684e33d25.0", - "@material/focus-ring": "15.0.0-canary.684e33d25.0", - "@material/ripple": "15.0.0-canary.684e33d25.0", - "@material/rtl": "15.0.0-canary.684e33d25.0", - "@material/tab-indicator": "15.0.0-canary.684e33d25.0", - "@material/theme": "15.0.0-canary.684e33d25.0", - "@material/tokens": "15.0.0-canary.684e33d25.0", - "@material/typography": "15.0.0-canary.684e33d25.0", + "@material/base": "15.0.0-canary.b994146f6.0", + "@material/elevation": "15.0.0-canary.b994146f6.0", + "@material/feature-targeting": "15.0.0-canary.b994146f6.0", + "@material/focus-ring": "15.0.0-canary.b994146f6.0", + "@material/ripple": "15.0.0-canary.b994146f6.0", + "@material/rtl": "15.0.0-canary.b994146f6.0", + "@material/tab-indicator": "15.0.0-canary.b994146f6.0", + "@material/theme": "15.0.0-canary.b994146f6.0", + "@material/tokens": "15.0.0-canary.b994146f6.0", + "@material/typography": "15.0.0-canary.b994146f6.0", "tslib": "^2.1.0" } }, "@material/tab-bar": { - "version": "15.0.0-canary.684e33d25.0", - "resolved": "https://registry.npmjs.org/@material/tab-bar/-/tab-bar-15.0.0-canary.684e33d25.0.tgz", - "integrity": "sha512-SW/cMaDsIGGkM1ag3A7GJRlmr8eXmObWsvitQJzh6Azr5zzZtSI+GQygkMesAEE1gbpqOVN8d40rh3H7VVIAcA==", + "version": "15.0.0-canary.b994146f6.0", + "resolved": "https://registry.npmjs.org/@material/tab-bar/-/tab-bar-15.0.0-canary.b994146f6.0.tgz", + "integrity": "sha512-F9NegACnFEWMu1pAAypV4Jd7qROeffkvEgVO28Xxk/CvzZxFz8kAjYJZ+rI6RUhPX3BhXzwsz/AlLwsJMT2tnA==", "requires": { - "@material/animation": "15.0.0-canary.684e33d25.0", - "@material/base": "15.0.0-canary.684e33d25.0", - "@material/density": "15.0.0-canary.684e33d25.0", - "@material/elevation": "15.0.0-canary.684e33d25.0", - "@material/feature-targeting": "15.0.0-canary.684e33d25.0", - "@material/tab": "15.0.0-canary.684e33d25.0", - "@material/tab-indicator": "15.0.0-canary.684e33d25.0", - "@material/tab-scroller": "15.0.0-canary.684e33d25.0", - "@material/theme": "15.0.0-canary.684e33d25.0", - "@material/tokens": "15.0.0-canary.684e33d25.0", - "@material/typography": "15.0.0-canary.684e33d25.0", + "@material/animation": "15.0.0-canary.b994146f6.0", + "@material/base": "15.0.0-canary.b994146f6.0", + "@material/density": "15.0.0-canary.b994146f6.0", + "@material/elevation": "15.0.0-canary.b994146f6.0", + "@material/feature-targeting": "15.0.0-canary.b994146f6.0", + "@material/tab": "15.0.0-canary.b994146f6.0", + "@material/tab-indicator": "15.0.0-canary.b994146f6.0", + "@material/tab-scroller": "15.0.0-canary.b994146f6.0", + "@material/theme": "15.0.0-canary.b994146f6.0", + "@material/tokens": "15.0.0-canary.b994146f6.0", + "@material/typography": "15.0.0-canary.b994146f6.0", "tslib": "^2.1.0" } }, "@material/tab-indicator": { - "version": "15.0.0-canary.684e33d25.0", - "resolved": "https://registry.npmjs.org/@material/tab-indicator/-/tab-indicator-15.0.0-canary.684e33d25.0.tgz", - "integrity": "sha512-kKICqSPqOlaf0lzaFFCmuOqPXJC+cK48Qmsc+m5o6fJhkmuZRCYpIwB2JeP+uZSOq/bTH+SrPtCtnVlgWg6ksA==", + "version": "15.0.0-canary.b994146f6.0", + "resolved": "https://registry.npmjs.org/@material/tab-indicator/-/tab-indicator-15.0.0-canary.b994146f6.0.tgz", + "integrity": "sha512-8IH/DmwlZhQlw/2Y3aKrEvjEhZB+qbKUiyaij3BkTAexvyFeDBh5cLNjRpYkUJSGeSPhS6yu4SYzMHPmQEwQmA==", "requires": { - "@material/animation": "15.0.0-canary.684e33d25.0", - "@material/base": "15.0.0-canary.684e33d25.0", - "@material/feature-targeting": "15.0.0-canary.684e33d25.0", - "@material/theme": "15.0.0-canary.684e33d25.0", + "@material/animation": "15.0.0-canary.b994146f6.0", + "@material/base": "15.0.0-canary.b994146f6.0", + "@material/feature-targeting": "15.0.0-canary.b994146f6.0", + "@material/theme": "15.0.0-canary.b994146f6.0", "tslib": "^2.1.0" } }, "@material/tab-scroller": { - "version": "15.0.0-canary.684e33d25.0", - "resolved": "https://registry.npmjs.org/@material/tab-scroller/-/tab-scroller-15.0.0-canary.684e33d25.0.tgz", - "integrity": "sha512-H6EU/TSiK/M2DyyORX5GEtXD9rKYxTMHC2VxsNWARPMFJGzgeW2ugYkFv+rKI1/c0bs0CJ4e+qFnOlBsQXZvyQ==", + "version": "15.0.0-canary.b994146f6.0", + "resolved": "https://registry.npmjs.org/@material/tab-scroller/-/tab-scroller-15.0.0-canary.b994146f6.0.tgz", + "integrity": "sha512-1MeWkr62OICfTv8oqhIZe6jFo0dKeMlUfB+/WcgnpoeMBszCOSlx5tQ4pedxUkuR3I+Z7rsTfSN0LavgF8bATA==", "requires": { - "@material/animation": "15.0.0-canary.684e33d25.0", - "@material/base": "15.0.0-canary.684e33d25.0", - "@material/dom": "15.0.0-canary.684e33d25.0", - "@material/feature-targeting": "15.0.0-canary.684e33d25.0", - "@material/tab": "15.0.0-canary.684e33d25.0", + "@material/animation": "15.0.0-canary.b994146f6.0", + "@material/base": "15.0.0-canary.b994146f6.0", + "@material/dom": "15.0.0-canary.b994146f6.0", + "@material/feature-targeting": "15.0.0-canary.b994146f6.0", + "@material/tab": "15.0.0-canary.b994146f6.0", "tslib": "^2.1.0" } }, "@material/textfield": { - "version": "15.0.0-canary.684e33d25.0", - "resolved": "https://registry.npmjs.org/@material/textfield/-/textfield-15.0.0-canary.684e33d25.0.tgz", - "integrity": "sha512-OvgpDXjvpyJTtAWskO69IDybFvDNzr9w2PN/Fk7yFm+uNVupaWz1Ew8lZ4gGslaTNSVmh2XcsvmzxcLINSiiNg==", + "version": "15.0.0-canary.b994146f6.0", + "resolved": "https://registry.npmjs.org/@material/textfield/-/textfield-15.0.0-canary.b994146f6.0.tgz", + "integrity": "sha512-Kxb3DoJ5o8u3Y1gRMHKmWrDl1TirVxuf/UFrxPFiCE3J1SqiE2VQpakiD1emZwp+LSKtbRsQ/iILYLB/h7Wuvw==", "requires": { - "@material/animation": "15.0.0-canary.684e33d25.0", - "@material/base": "15.0.0-canary.684e33d25.0", - "@material/density": "15.0.0-canary.684e33d25.0", - "@material/dom": "15.0.0-canary.684e33d25.0", - "@material/feature-targeting": "15.0.0-canary.684e33d25.0", - "@material/floating-label": "15.0.0-canary.684e33d25.0", - "@material/line-ripple": "15.0.0-canary.684e33d25.0", - "@material/notched-outline": "15.0.0-canary.684e33d25.0", - "@material/ripple": "15.0.0-canary.684e33d25.0", - "@material/rtl": "15.0.0-canary.684e33d25.0", - "@material/shape": "15.0.0-canary.684e33d25.0", - "@material/theme": "15.0.0-canary.684e33d25.0", - "@material/tokens": "15.0.0-canary.684e33d25.0", - "@material/typography": "15.0.0-canary.684e33d25.0", + "@material/animation": "15.0.0-canary.b994146f6.0", + "@material/base": "15.0.0-canary.b994146f6.0", + "@material/density": "15.0.0-canary.b994146f6.0", + "@material/dom": "15.0.0-canary.b994146f6.0", + "@material/feature-targeting": "15.0.0-canary.b994146f6.0", + "@material/floating-label": "15.0.0-canary.b994146f6.0", + "@material/line-ripple": "15.0.0-canary.b994146f6.0", + "@material/notched-outline": "15.0.0-canary.b994146f6.0", + "@material/ripple": "15.0.0-canary.b994146f6.0", + "@material/rtl": "15.0.0-canary.b994146f6.0", + "@material/shape": "15.0.0-canary.b994146f6.0", + "@material/theme": "15.0.0-canary.b994146f6.0", + "@material/tokens": "15.0.0-canary.b994146f6.0", + "@material/typography": "15.0.0-canary.b994146f6.0", "tslib": "^2.1.0" } }, "@material/theme": { - "version": "15.0.0-canary.684e33d25.0", - "resolved": "https://registry.npmjs.org/@material/theme/-/theme-15.0.0-canary.684e33d25.0.tgz", - "integrity": "sha512-AZxaXXAvRKzAi20RlMxzt2U5UmkCWyv7DMWEBXsxtG5Tk54mi1HsbVUp3fxDPTlmL7Pq8p1/DESg/o7TgRCVlw==", + "version": "15.0.0-canary.b994146f6.0", + "resolved": "https://registry.npmjs.org/@material/theme/-/theme-15.0.0-canary.b994146f6.0.tgz", + "integrity": "sha512-5tsZ92dAeUcZ9g9CrIkqX/GYc0M5DIfsydtI1PAidaBzr1Uokuh4rTZVQZBv7gyglF0yDua59lkb0I6wI9vxXg==", "requires": { - "@material/feature-targeting": "15.0.0-canary.684e33d25.0", + "@material/feature-targeting": "15.0.0-canary.b994146f6.0", "tslib": "^2.1.0" } }, "@material/tokens": { - "version": "15.0.0-canary.684e33d25.0", - "resolved": "https://registry.npmjs.org/@material/tokens/-/tokens-15.0.0-canary.684e33d25.0.tgz", - "integrity": "sha512-wVwbQOTCXDPKYPdHQHLr026y36MMFelID1CmbfRk6mSol4O8yE9U0fXcShfRDW8Qo5E3X31w9c2A6T3neJY7wQ==", + "version": "15.0.0-canary.b994146f6.0", + "resolved": "https://registry.npmjs.org/@material/tokens/-/tokens-15.0.0-canary.b994146f6.0.tgz", + "integrity": "sha512-jFqU7PtvGkrP8b8i2soCrYQInTrnZ1/rIPDi+Xm3sa/qSghCNwFrdJEqwcwtv1fPlJIOtzkIuVRYRmAP9rXQIQ==", "requires": { - "@material/elevation": "15.0.0-canary.684e33d25.0" + "@material/elevation": "15.0.0-canary.b994146f6.0" } }, "@material/tooltip": { - "version": "15.0.0-canary.684e33d25.0", - "resolved": "https://registry.npmjs.org/@material/tooltip/-/tooltip-15.0.0-canary.684e33d25.0.tgz", - "integrity": "sha512-dtm26QjxyQdinc8btgz6yys07b7bUW4FZgNF2EBPeGrICrPg7jf+JEvDziz5g8VMaTBQLOQRSCGy0MKuRlOjLw==", + "version": "15.0.0-canary.b994146f6.0", + "resolved": "https://registry.npmjs.org/@material/tooltip/-/tooltip-15.0.0-canary.b994146f6.0.tgz", + "integrity": "sha512-bVzydXGn3fauHJ8pkh32DsdyRJXleeFQ4t7jZ/rcRik+n4G1BvYiblfuu3Z/OCC0m3TJDyMdJhd+sLqRDqLUUg==", "requires": { - "@material/animation": "15.0.0-canary.684e33d25.0", - "@material/base": "15.0.0-canary.684e33d25.0", - "@material/button": "15.0.0-canary.684e33d25.0", - "@material/dom": "15.0.0-canary.684e33d25.0", - "@material/elevation": "15.0.0-canary.684e33d25.0", - "@material/feature-targeting": "15.0.0-canary.684e33d25.0", - "@material/rtl": "15.0.0-canary.684e33d25.0", - "@material/shape": "15.0.0-canary.684e33d25.0", - "@material/theme": "15.0.0-canary.684e33d25.0", - "@material/tokens": "15.0.0-canary.684e33d25.0", - "@material/typography": "15.0.0-canary.684e33d25.0", + "@material/animation": "15.0.0-canary.b994146f6.0", + "@material/base": "15.0.0-canary.b994146f6.0", + "@material/button": "15.0.0-canary.b994146f6.0", + "@material/dom": "15.0.0-canary.b994146f6.0", + "@material/elevation": "15.0.0-canary.b994146f6.0", + "@material/feature-targeting": "15.0.0-canary.b994146f6.0", + "@material/rtl": "15.0.0-canary.b994146f6.0", + "@material/shape": "15.0.0-canary.b994146f6.0", + "@material/theme": "15.0.0-canary.b994146f6.0", + "@material/tokens": "15.0.0-canary.b994146f6.0", + "@material/typography": "15.0.0-canary.b994146f6.0", "safevalues": "^0.3.4", "tslib": "^2.1.0" } }, "@material/top-app-bar": { - "version": "15.0.0-canary.684e33d25.0", - "resolved": "https://registry.npmjs.org/@material/top-app-bar/-/top-app-bar-15.0.0-canary.684e33d25.0.tgz", - "integrity": "sha512-1M+oupUxflfW7u81P1XlxoLZB8bLzwtpKofIfDNRbEsiKhlLTERJR3Yak3BGE9xakNMysAaBHlkb5MrN5bNPFw==", + "version": "15.0.0-canary.b994146f6.0", + "resolved": "https://registry.npmjs.org/@material/top-app-bar/-/top-app-bar-15.0.0-canary.b994146f6.0.tgz", + "integrity": "sha512-VHq0wX3OJE1TKvjO8Qtlu+rv5EGoqAhNLBcEjpUUGoqHH/gpd356FEuIqJId4pUh5jaWf8T4ZU9xVbQGMtntzw==", "requires": { - "@material/animation": "15.0.0-canary.684e33d25.0", - "@material/base": "15.0.0-canary.684e33d25.0", - "@material/elevation": "15.0.0-canary.684e33d25.0", - "@material/ripple": "15.0.0-canary.684e33d25.0", - "@material/rtl": "15.0.0-canary.684e33d25.0", - "@material/shape": "15.0.0-canary.684e33d25.0", - "@material/theme": "15.0.0-canary.684e33d25.0", - "@material/typography": "15.0.0-canary.684e33d25.0", + "@material/animation": "15.0.0-canary.b994146f6.0", + "@material/base": "15.0.0-canary.b994146f6.0", + "@material/elevation": "15.0.0-canary.b994146f6.0", + "@material/ripple": "15.0.0-canary.b994146f6.0", + "@material/rtl": "15.0.0-canary.b994146f6.0", + "@material/shape": "15.0.0-canary.b994146f6.0", + "@material/theme": "15.0.0-canary.b994146f6.0", + "@material/typography": "15.0.0-canary.b994146f6.0", "tslib": "^2.1.0" } }, "@material/touch-target": { - "version": "15.0.0-canary.684e33d25.0", - "resolved": "https://registry.npmjs.org/@material/touch-target/-/touch-target-15.0.0-canary.684e33d25.0.tgz", - "integrity": "sha512-zdE69Slg8+T7sTn1OwqZ6H7WBYac9mxJ/JlJqfTqthzIjZRcCxBSYymQJcDHjsrPnUojOtr9U4Tpm5YZ96TEkQ==", + "version": "15.0.0-canary.b994146f6.0", + "resolved": "https://registry.npmjs.org/@material/touch-target/-/touch-target-15.0.0-canary.b994146f6.0.tgz", + "integrity": "sha512-X26Y9OWvIqYOHo+sC2VMvOoeQWlUR3/yb7uPdfq92Y44zlQ4Vexgq7nEUblEiXQ8Fj+d0T9rIhRh1y9PP3Z2dw==", "requires": { - "@material/base": "15.0.0-canary.684e33d25.0", - "@material/feature-targeting": "15.0.0-canary.684e33d25.0", - "@material/rtl": "15.0.0-canary.684e33d25.0", - "@material/theme": "15.0.0-canary.684e33d25.0", + "@material/base": "15.0.0-canary.b994146f6.0", + "@material/feature-targeting": "15.0.0-canary.b994146f6.0", + "@material/rtl": "15.0.0-canary.b994146f6.0", + "@material/theme": "15.0.0-canary.b994146f6.0", "tslib": "^2.1.0" } }, "@material/typography": { - "version": "15.0.0-canary.684e33d25.0", - "resolved": "https://registry.npmjs.org/@material/typography/-/typography-15.0.0-canary.684e33d25.0.tgz", - "integrity": "sha512-aVnvgMwcfNa/K4wujzpKDIxjGl2hbkEL+m+OKDSQqWYjKcP9QrbzCXJruJBqxrBoPRHLbqo47k5f9uT8raSgjw==", + "version": "15.0.0-canary.b994146f6.0", + "resolved": "https://registry.npmjs.org/@material/typography/-/typography-15.0.0-canary.b994146f6.0.tgz", + "integrity": "sha512-sWU5W30WWqdw5P6bsRx9AbvMNcz/QvQg56Syr06V6nfgSztpeuo7TfPk2J+N0ArRALo1mUrkAPk66iWYQ2p/QA==", "requires": { - "@material/feature-targeting": "15.0.0-canary.684e33d25.0", - "@material/theme": "15.0.0-canary.684e33d25.0", + "@material/feature-targeting": "15.0.0-canary.b994146f6.0", + "@material/theme": "15.0.0-canary.b994146f6.0", "tslib": "^2.1.0" } }, @@ -20926,56 +21805,68 @@ } }, "@ngrx/effects": { - "version": "15.4.0", - "resolved": "https://registry.npmjs.org/@ngrx/effects/-/effects-15.4.0.tgz", - "integrity": "sha512-/8gHhOM9aeGaw8OG2LLwi4I4p84xzG0EU9TqWrvQcW74wn8sFZONjLvUte5YOzJ5502PPFFrfXSOc+lHnVAJUA==", + "version": "16.2.0", + "resolved": "https://registry.npmjs.org/@ngrx/effects/-/effects-16.2.0.tgz", + "integrity": "sha512-zZfq47LNoiRK+uS66Xm36mN07zm11AER1D9lTalX/G6jrV0bywgnAaukNNav9E33ZRrPEnCD8uu9BXZoboEYgA==", "requires": { "tslib": "^2.0.0" } }, "@ngrx/entity": { - "version": "15.4.0", - "resolved": "https://registry.npmjs.org/@ngrx/entity/-/entity-15.4.0.tgz", - "integrity": "sha512-DmfbbasV5bth9APAiwH9ovDwJ/rtEUm4pJvTd6Eds/kOJ6Ime9MZwEhtglXlk2jMwe7f08pl1jzFhYIjI277aQ==", + "version": "16.2.0", + "resolved": "https://registry.npmjs.org/@ngrx/entity/-/entity-16.2.0.tgz", + "integrity": "sha512-n8Vsz48/u14R8S7akLO7TWmqXGcvCYacCIS106hC3FVkOwAOflhcstGYu6oShbqOVuu0Vcw7s/amc2oAJV4YkQ==", "requires": { "tslib": "^2.0.0" } }, + "@ngrx/eslint-plugin": { + "version": "16.2.0", + "resolved": "https://registry.npmjs.org/@ngrx/eslint-plugin/-/eslint-plugin-16.2.0.tgz", + "integrity": "sha512-BeCBRLQge0OIUTS1bCNfXB0WjAdXvHl8RgdrkQ4n4gsvvfzO8zetNmQREcHJsvpyMz3YjJuiOueuaiBRdbZfMA==", + "dev": true, + "requires": { + "@typescript-eslint/experimental-utils": "^5.4.0", + "eslint-etc": "^5.1.0", + "semver": "^7.3.5", + "strip-json-comments": "3.1.1" + } + }, "@ngrx/router-store": { - "version": "15.4.0", - "resolved": "https://registry.npmjs.org/@ngrx/router-store/-/router-store-15.4.0.tgz", - "integrity": "sha512-uc8gx+SMr2gyly+WSBmGnpHTPsMVhenUG6skH3Qk67hrwdVG3SABjw3qdP4GibbfwwajMQ67sLaLY8PQZ5Sb2g==", + "version": "16.2.0", + "resolved": "https://registry.npmjs.org/@ngrx/router-store/-/router-store-16.2.0.tgz", + "integrity": "sha512-nVqIKWqJnE7pKpcTg6vUpWZtjIwnh66LhJ3hcNLpWRTAzyhQh6EZuYvZX3XSVmdR9XIUltlBCFGCrmTRkeWrTg==", "requires": { "tslib": "^2.0.0" } }, "@ngrx/schematics": { - "version": "15.4.0", - "resolved": "https://registry.npmjs.org/@ngrx/schematics/-/schematics-15.4.0.tgz", - "integrity": "sha512-vOio2+0BNuzgde8OtIR5Gbzn/+59V0V2TyDyrxxpOi8v7FuaKCPh+o525ekjU/PfVi3ZiMVRjbmrTAR4wzBmug==", + "version": "16.2.0", + "resolved": "https://registry.npmjs.org/@ngrx/schematics/-/schematics-16.2.0.tgz", + "integrity": "sha512-AfRgSCYhrg9+b3KjcLNS1BTuRKcf8XR2GkplBLZK5NFK8nQc9/JtmLk4PoUtKTL8BFAhDmXBPziAWKMwupjzlw==", "dev": true }, "@ngrx/store": { - "version": "15.4.0", - "resolved": "https://registry.npmjs.org/@ngrx/store/-/store-15.4.0.tgz", - "integrity": "sha512-OvCuNBHL8mAUnRTS6QSFm+IunspsYNu2cCwDovBNn7EGhxRuGihBeNoX47jCqWPHBFtokj4BlatDfpJ/yCh4xQ==", + "version": "16.2.0", + "resolved": "https://registry.npmjs.org/@ngrx/store/-/store-16.2.0.tgz", + "integrity": "sha512-C7oIUC87xXV+1dTGUwYG/L4p0IZdYv/Ou1nTL/LffyAHllmmygTA5gzLB87abLOhucAxlFIQMQ8t/GSxdk/+QA==", "requires": { "tslib": "^2.0.0" } }, "@ngrx/store-devtools": { - "version": "15.4.0", - "resolved": "https://registry.npmjs.org/@ngrx/store-devtools/-/store-devtools-15.4.0.tgz", - "integrity": "sha512-AqWRprSyS3u/vZlpsBOPMW1/0TZS2LE13/KpZedEY+RMCW+mi53esqgrdNGOB3Wr4vrI82Ar9fgaIm4TQO6LPg==", + "version": "16.2.0", + "resolved": "https://registry.npmjs.org/@ngrx/store-devtools/-/store-devtools-16.2.0.tgz", + "integrity": "sha512-m7mkNpIIp8fA8yNG5T0ZKm1RCP2fE0IVBEtcbj2Z/88fW4vyvobVBdBqha6zgYTuA5X4m28npMra9GPNPsuDLA==", "dev": true, "requires": { "tslib": "^2.0.0" } }, "@ngtools/webpack": { - "version": "15.2.8", - "resolved": "https://registry.npmjs.org/@ngtools/webpack/-/webpack-15.2.8.tgz", - "integrity": "sha512-BJexeT4FxMtToVBGa3wdl6rrkYXgilP0kkSH4Qzu4MPlLPbeBSr4XQalQriewlpC2uzG0r2SJfrAe2eDhtSykA==", + "version": "16.2.3", + "resolved": "https://registry.npmjs.org/@ngtools/webpack/-/webpack-16.2.3.tgz", + "integrity": "sha512-GkMGYMXL2tyxjjh7plKOFptJJPU2arzxLsYZs706InOJKmM9pE9prz//LohSdcXiPAw+S3Qfsc27k/VqNdKJxA==", "dev": true }, "@nodelib/fs.scandir": { @@ -21014,9 +21905,9 @@ } }, "@npmcli/git": { - "version": "4.0.4", - "resolved": "https://registry.npmjs.org/@npmcli/git/-/git-4.0.4.tgz", - "integrity": "sha512-5yZghx+u5M47LghaybLCkdSyFzV/w4OuH12d96HO389Ik9CDsLaDZJVynSGGVJOLn6gy/k7Dz5XYcplM3uxXRg==", + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/@npmcli/git/-/git-4.1.0.tgz", + "integrity": "sha512-9hwoB3gStVfa0N31ymBmrX+GuDGdVA/QWShZVqE0HK2Af+7QGGrCTbZia/SW0ImUTjTne7SP91qxDmtXvDHRPQ==", "dev": true, "requires": { "@npmcli/promise-spawn": "^6.0.0", @@ -21036,9 +21927,9 @@ "dev": true }, "which": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/which/-/which-3.0.0.tgz", - "integrity": "sha512-nla//68K9NU6yRiwDY/Q8aU6siKlSs64aEC7+IV56QoAuyQT2ovsJcgGYGyqMOmI/CGN1BOR6mM5EN0FBO+zyQ==", + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/which/-/which-3.0.1.tgz", + "integrity": "sha512-XA1b62dzQzLfaEOSQFTCOd5KFf/1VSzZo7/7TUjnya6u0vGGKzU96UQBZTAThCb2j4/xjBAyii1OhRLJEivHvg==", "dev": true, "requires": { "isexe": "^2.0.0" @@ -21056,16 +21947,6 @@ "npm-normalize-package-bin": "^3.0.0" } }, - "@npmcli/move-file": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/@npmcli/move-file/-/move-file-2.0.1.tgz", - "integrity": "sha512-mJd2Z5TjYWq/ttPLLGqArdtnC74J6bOzg4rMDnN+p1xTacZ2yPRCk2y0oSWQtygLR9YVQXgOcONrwtnk3JupxQ==", - "dev": true, - "requires": { - "mkdirp": "^1.0.4", - "rimraf": "^3.0.2" - } - }, "@npmcli/node-gyp": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/@npmcli/node-gyp/-/node-gyp-3.0.0.tgz", @@ -21082,9 +21963,9 @@ }, "dependencies": { "which": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/which/-/which-3.0.0.tgz", - "integrity": "sha512-nla//68K9NU6yRiwDY/Q8aU6siKlSs64aEC7+IV56QoAuyQT2ovsJcgGYGyqMOmI/CGN1BOR6mM5EN0FBO+zyQ==", + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/which/-/which-3.0.1.tgz", + "integrity": "sha512-XA1b62dzQzLfaEOSQFTCOd5KFf/1VSzZo7/7TUjnya6u0vGGKzU96UQBZTAThCb2j4/xjBAyii1OhRLJEivHvg==", "dev": true, "requires": { "isexe": "^2.0.0" @@ -21093,9 +21974,9 @@ } }, "@npmcli/run-script": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/@npmcli/run-script/-/run-script-6.0.0.tgz", - "integrity": "sha512-ql+AbRur1TeOdl1FY+RAwGW9fcr4ZwiVKabdvm93mujGREVuVLbdkXRJDrkTXSdCjaxYydr1wlA2v67jxWG5BQ==", + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/@npmcli/run-script/-/run-script-6.0.2.tgz", + "integrity": "sha512-NCcr1uQo1k5U+SYlnIrbAh3cxy+OQT1VtqiAbxdymSlptbzBb62AjH2xXgjNCoP073hoa1CfCAcwoZ8k96C4nA==", "dev": true, "requires": { "@npmcli/node-gyp": "^3.0.0", @@ -21106,9 +21987,9 @@ }, "dependencies": { "which": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/which/-/which-3.0.0.tgz", - "integrity": "sha512-nla//68K9NU6yRiwDY/Q8aU6siKlSs64aEC7+IV56QoAuyQT2ovsJcgGYGyqMOmI/CGN1BOR6mM5EN0FBO+zyQ==", + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/which/-/which-3.0.1.tgz", + "integrity": "sha512-XA1b62dzQzLfaEOSQFTCOd5KFf/1VSzZo7/7TUjnya6u0vGGKzU96UQBZTAThCb2j4/xjBAyii1OhRLJEivHvg==", "dev": true, "requires": { "isexe": "^2.0.0" @@ -21116,53 +21997,683 @@ } } }, - "@schematics/angular": { - "version": "15.2.8", - "resolved": "https://registry.npmjs.org/@schematics/angular/-/angular-15.2.8.tgz", - "integrity": "sha512-F49IEzCFxQlpaMIgTO/wF1l/CLQKif7VaiDdyiTKOeT22IMmyd61FUmWDyZYfCBqMlvBmvDGx64HaHWes1HYCg==", + "@nrwl/devkit": { + "version": "16.5.1", + "resolved": "https://registry.npmjs.org/@nrwl/devkit/-/devkit-16.5.1.tgz", + "integrity": "sha512-NB+DE/+AFJ7lKH/WBFyatJEhcZGj25F24ncDkwjZ6MzEiSOGOJS0LaV/R+VUsmS5EHTPXYOpn3zHWWAcJhyOmA==", "dev": true, "requires": { - "@angular-devkit/core": "15.2.8", - "@angular-devkit/schematics": "15.2.8", + "@nx/devkit": "16.5.1" + } + }, + "@nrwl/tao": { + "version": "16.5.1", + "resolved": "https://registry.npmjs.org/@nrwl/tao/-/tao-16.5.1.tgz", + "integrity": "sha512-x+gi/fKdM6uQNIti9exFlm3V5LBP3Y8vOEziO42HdOigyrXa0S0HD2WMpccmp6PclYKhwEDUjKJ39xh5sdh4Ig==", + "dev": true, + "requires": { + "nx": "16.5.1" + } + }, + "@nx/devkit": { + "version": "16.5.1", + "resolved": "https://registry.npmjs.org/@nx/devkit/-/devkit-16.5.1.tgz", + "integrity": "sha512-T1acZrVVmJw/sJ4PIGidCBYBiBqlg/jT9e8nIGXLSDS20xcLvfo4zBQf8UZLrmHglnwwpDpOWuVJCp2rYA5aDg==", + "dev": true, + "requires": { + "@nrwl/devkit": "16.5.1", + "ejs": "^3.1.7", + "ignore": "^5.0.4", + "semver": "7.5.3", + "tmp": "~0.2.1", + "tslib": "^2.3.0" + } + }, + "@nx/nx-darwin-arm64": { + "version": "16.5.1", + "resolved": "https://registry.npmjs.org/@nx/nx-darwin-arm64/-/nx-darwin-arm64-16.5.1.tgz", + "integrity": "sha512-q98TFI4B/9N9PmKUr1jcbtD4yAFs1HfYd9jUXXTQOlfO9SbDjnrYJgZ4Fp9rMNfrBhgIQ4x1qx0AukZccKmH9Q==", + "dev": true, + "optional": true + }, + "@nx/nx-darwin-x64": { + "version": "16.5.1", + "resolved": "https://registry.npmjs.org/@nx/nx-darwin-x64/-/nx-darwin-x64-16.5.1.tgz", + "integrity": "sha512-j9HmL1l8k7EVJ3eOM5y8COF93gqrydpxCDoz23ZEtsY+JHY77VAiRQsmqBgEx9GGA2dXi9VEdS67B0+1vKariw==", + "dev": true, + "optional": true + }, + "@nx/nx-freebsd-x64": { + "version": "16.5.1", + "resolved": "https://registry.npmjs.org/@nx/nx-freebsd-x64/-/nx-freebsd-x64-16.5.1.tgz", + "integrity": "sha512-CXSPT01aVS869tvCCF2tZ7LnCa8l41wJ3mTVtWBkjmRde68E5Up093hklRMyXb3kfiDYlfIKWGwrV4r0eH6x1A==", + "dev": true, + "optional": true + }, + "@nx/nx-linux-arm-gnueabihf": { + "version": "16.5.1", + "resolved": "https://registry.npmjs.org/@nx/nx-linux-arm-gnueabihf/-/nx-linux-arm-gnueabihf-16.5.1.tgz", + "integrity": "sha512-BhrumqJSZCWFfLFUKl4CAUwR0Y0G2H5EfFVGKivVecEQbb+INAek1aa6c89evg2/OvetQYsJ+51QknskwqvLsA==", + "dev": true, + "optional": true + }, + "@nx/nx-linux-arm64-gnu": { + "version": "16.5.1", + "resolved": "https://registry.npmjs.org/@nx/nx-linux-arm64-gnu/-/nx-linux-arm64-gnu-16.5.1.tgz", + "integrity": "sha512-x7MsSG0W+X43WVv7JhiSq2eKvH2suNKdlUHEG09Yt0vm3z0bhtym1UCMUg3IUAK7jy9hhLeDaFVFkC6zo+H/XQ==", + "dev": true, + "optional": true + }, + "@nx/nx-linux-arm64-musl": { + "version": "16.5.1", + "resolved": "https://registry.npmjs.org/@nx/nx-linux-arm64-musl/-/nx-linux-arm64-musl-16.5.1.tgz", + "integrity": "sha512-J+/v/mFjOm74I0PNtH5Ka+fDd+/dWbKhpcZ2R1/6b9agzZk+Ff/SrwJcSYFXXWKbPX+uQ4RcJoytT06Zs3s0ow==", + "dev": true, + "optional": true + }, + "@nx/nx-linux-x64-gnu": { + "version": "16.5.1", + "resolved": "https://registry.npmjs.org/@nx/nx-linux-x64-gnu/-/nx-linux-x64-gnu-16.5.1.tgz", + "integrity": "sha512-igooWJ5YxQ94Zft7IqgL+Lw0qHaY15Btw4gfK756g/YTYLZEt4tTvR1y6RnK/wdpE3sa68bFTLVBNCGTyiTiDQ==", + "dev": true, + "optional": true + }, + "@nx/nx-linux-x64-musl": { + "version": "16.5.1", + "resolved": "https://registry.npmjs.org/@nx/nx-linux-x64-musl/-/nx-linux-x64-musl-16.5.1.tgz", + "integrity": "sha512-zF/exnPqFYbrLAduGhTmZ7zNEyADid2bzNQiIjJkh8Y6NpDwrQIwVIyvIxqynsjMrIs51kBH+8TUjKjj2Jgf5A==", + "dev": true, + "optional": true + }, + "@nx/nx-win32-arm64-msvc": { + "version": "16.5.1", + "resolved": "https://registry.npmjs.org/@nx/nx-win32-arm64-msvc/-/nx-win32-arm64-msvc-16.5.1.tgz", + "integrity": "sha512-qtqiLS9Y9TYyAbbpq58kRoOroko4ZXg5oWVqIWFHoxc5bGPweQSJCROEqd1AOl2ZDC6BxfuVHfhDDop1kK05WA==", + "dev": true, + "optional": true + }, + "@nx/nx-win32-x64-msvc": { + "version": "16.5.1", + "resolved": "https://registry.npmjs.org/@nx/nx-win32-x64-msvc/-/nx-win32-x64-msvc-16.5.1.tgz", + "integrity": "sha512-kUJBLakK7iyA9WfsGGQBVennA4jwf5XIgm0lu35oMOphtZIluvzItMt0EYBmylEROpmpEIhHq0P6J9FA+WH0Rg==", + "dev": true, + "optional": true + }, + "@parcel/watcher": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/@parcel/watcher/-/watcher-2.0.4.tgz", + "integrity": "sha512-cTDi+FUDBIUOBKEtj+nhiJ71AZVlkAsQFuGQTun5tV9mwQBQgZvhCzG+URPQc8myeN32yRVZEfVAPCs1RW+Jvg==", + "dev": true, + "requires": { + "node-addon-api": "^3.2.1", + "node-gyp-build": "^4.3.0" + } + }, + "@pkgjs/parseargs": { + "version": "0.11.0", + "resolved": "https://registry.npmjs.org/@pkgjs/parseargs/-/parseargs-0.11.0.tgz", + "integrity": "sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==", + "dev": true, + "optional": true + }, + "@schematics/angular": { + "version": "16.2.3", + "resolved": "https://registry.npmjs.org/@schematics/angular/-/angular-16.2.3.tgz", + "integrity": "sha512-QZOh6iH3BQo4azmqGIoydW95KuxTGezTXl+cfekr4ru5IJ7FqCwrg4wQKWD8/3FkxakXjAFdqsWhlxn1kGtyqw==", + "dev": true, + "requires": { + "@angular-devkit/core": "16.2.3", + "@angular-devkit/schematics": "16.2.3", "jsonc-parser": "3.2.0" } }, + "@sigstore/bundle": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@sigstore/bundle/-/bundle-1.1.0.tgz", + "integrity": "sha512-PFutXEy0SmQxYI4texPw3dd2KewuNqv7OuK1ZFtY2fM754yhvG2KdgwIhRnoEE2uHdtdGNQ8s0lb94dW9sELog==", + "dev": true, + "requires": { + "@sigstore/protobuf-specs": "^0.2.0" + } + }, "@sigstore/protobuf-specs": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/@sigstore/protobuf-specs/-/protobuf-specs-0.1.0.tgz", - "integrity": "sha512-a31EnjuIDSX8IXBUib3cYLDRlPMU36AWX4xS8ysLaNu4ZzUesDiPt83pgrW2X1YLMe5L2HbDyaKK5BrL4cNKaQ==", + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/@sigstore/protobuf-specs/-/protobuf-specs-0.2.1.tgz", + "integrity": "sha512-XTWVxnWJu+c1oCshMLwnKvz8ZQJJDVOlciMfgpJBQbThVjKTCG8dwyhgLngBD2KN0ap9F/gOV8rFDEx8uh7R2A==", "dev": true }, - "@smithy/protocol-http": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/@smithy/protocol-http/-/protocol-http-1.1.0.tgz", - "integrity": "sha512-H5y/kZOqfJSqRkwtcAoVbqONmhdXwSgYNJ1Glk5Ry8qlhVVy5qUzD9EklaCH8/XLnoCsLO/F/Giee8MIvaBRkg==", + "@sigstore/sign": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/@sigstore/sign/-/sign-1.0.0.tgz", + "integrity": "sha512-INxFVNQteLtcfGmcoldzV6Je0sbbfh9I16DM4yJPw3j5+TFP8X6uIiA18mvpEa9yyeycAKgPmOA3X9hVdVTPUA==", + "dev": true, "requires": { - "@smithy/types": "^1.1.0", + "@sigstore/bundle": "^1.1.0", + "@sigstore/protobuf-specs": "^0.2.0", + "make-fetch-happen": "^11.0.1" + } + }, + "@sigstore/tuf": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/@sigstore/tuf/-/tuf-1.0.3.tgz", + "integrity": "sha512-2bRovzs0nJZFlCN3rXirE4gwxCn97JNjMmwpecqlbgV9WcxX7WRuIrgzx/X7Ib7MYRbyUTpBYE0s2x6AmZXnlg==", + "dev": true, + "requires": { + "@sigstore/protobuf-specs": "^0.2.0", + "tuf-js": "^1.1.7" + } + }, + "@smithy/abort-controller": { + "version": "2.0.9", + "resolved": "https://registry.npmjs.org/@smithy/abort-controller/-/abort-controller-2.0.9.tgz", + "integrity": "sha512-8liHOEbx99xcy4VndeQNQhyA0LS+e7UqsuRnDTSIA26IKBv/7vA9w09KOd4fgNULrvX0r3WpA6cwsQTRJpSWkg==", + "requires": { + "@smithy/types": "^2.3.3", + "tslib": "^2.5.0" + } + }, + "@smithy/chunked-blob-reader": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/@smithy/chunked-blob-reader/-/chunked-blob-reader-2.0.0.tgz", + "integrity": "sha512-k+J4GHJsMSAIQPChGBrjEmGS+WbPonCXesoqP9fynIqjn7rdOThdH8FAeCmokP9mxTYKQAKoHCLPzNlm6gh7Wg==", + "requires": { + "tslib": "^2.5.0" + } + }, + "@smithy/chunked-blob-reader-native": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/@smithy/chunked-blob-reader-native/-/chunked-blob-reader-native-2.0.0.tgz", + "integrity": "sha512-HM8V2Rp1y8+1343tkZUKZllFhEQPNmpNdgFAncbTsxkZ18/gqjk23XXv3qGyXWp412f3o43ZZ1UZHVcHrpRnCQ==", + "requires": { + "@smithy/util-base64": "^2.0.0", + "tslib": "^2.5.0" + } + }, + "@smithy/config-resolver": { + "version": "2.0.10", + "resolved": "https://registry.npmjs.org/@smithy/config-resolver/-/config-resolver-2.0.10.tgz", + "integrity": "sha512-MwToDsCltHjumkCuRn883qoNeJUawc2b8sX9caSn5vLz6J5crU1IklklNxWCaMO2z2nDL91Po4b/aI1eHv5PfA==", + "requires": { + "@smithy/node-config-provider": "^2.0.12", + "@smithy/types": "^2.3.3", + "@smithy/util-config-provider": "^2.0.0", + "@smithy/util-middleware": "^2.0.2", + "tslib": "^2.5.0" + } + }, + "@smithy/credential-provider-imds": { + "version": "2.0.12", + "resolved": "https://registry.npmjs.org/@smithy/credential-provider-imds/-/credential-provider-imds-2.0.12.tgz", + "integrity": "sha512-S3lUNe+2fEFwKcmiQniXGPXt69vaHvQCw8kYQOBL4OvJsgwfpkIYDZdroHbTshYi0M6WaKL26Mw+hvgma6dZqA==", + "requires": { + "@smithy/node-config-provider": "^2.0.12", + "@smithy/property-provider": "^2.0.10", + "@smithy/types": "^2.3.3", + "@smithy/url-parser": "^2.0.9", + "tslib": "^2.5.0" + } + }, + "@smithy/eventstream-codec": { + "version": "2.0.9", + "resolved": "https://registry.npmjs.org/@smithy/eventstream-codec/-/eventstream-codec-2.0.9.tgz", + "integrity": "sha512-sy0pcbKnawt1iu+qCoSFbs/h9PAaUgvlJEO3lqkE1HFFj4p5RgL98vH+9CyDoj6YY82cG5XsorFmcLqQJHTOYw==", + "requires": { + "@aws-crypto/crc32": "3.0.0", + "@smithy/types": "^2.3.3", + "@smithy/util-hex-encoding": "^2.0.0", + "tslib": "^2.5.0" + } + }, + "@smithy/eventstream-serde-browser": { + "version": "2.0.9", + "resolved": "https://registry.npmjs.org/@smithy/eventstream-serde-browser/-/eventstream-serde-browser-2.0.9.tgz", + "integrity": "sha512-g70enHZau2hGj1Uxedrn8AAjH9E7RnpHdwkuPKapagah53ztbwI7xaNeA5SLD4MjSjdrjathyQBCQKIzwXrR1g==", + "requires": { + "@smithy/eventstream-serde-universal": "^2.0.9", + "@smithy/types": "^2.3.3", + "tslib": "^2.5.0" + } + }, + "@smithy/eventstream-serde-config-resolver": { + "version": "2.0.9", + "resolved": "https://registry.npmjs.org/@smithy/eventstream-serde-config-resolver/-/eventstream-serde-config-resolver-2.0.9.tgz", + "integrity": "sha512-+15GzIMtdSuRPyuCeGZ7gzgD94Ejv6eM1vKcqvipdzS+i36KTZ2A9aZsJk+gDw//OCD1EMx9SqpV6bUvMS4PWg==", + "requires": { + "@smithy/types": "^2.3.3", + "tslib": "^2.5.0" + } + }, + "@smithy/eventstream-serde-node": { + "version": "2.0.9", + "resolved": "https://registry.npmjs.org/@smithy/eventstream-serde-node/-/eventstream-serde-node-2.0.9.tgz", + "integrity": "sha512-UEJcvN2WXXEjkewtFkj1S2HSZLbyCgzUnfoFPrTuKy4+xRfakO5dNx6ws2h1pvb8Vc7mTuBL+Webl1R5mnVsXA==", + "requires": { + "@smithy/eventstream-serde-universal": "^2.0.9", + "@smithy/types": "^2.3.3", + "tslib": "^2.5.0" + } + }, + "@smithy/eventstream-serde-universal": { + "version": "2.0.9", + "resolved": "https://registry.npmjs.org/@smithy/eventstream-serde-universal/-/eventstream-serde-universal-2.0.9.tgz", + "integrity": "sha512-dAHQEYlK/1tjjieBE7jjXwpLQFgKdkvC4HSQf+/Jj4t34XbUmXWHbw92/EuLp9+vjNB/JQPvkwpMtN31jxIDeg==", + "requires": { + "@smithy/eventstream-codec": "^2.0.9", + "@smithy/types": "^2.3.3", + "tslib": "^2.5.0" + } + }, + "@smithy/fetch-http-handler": { + "version": "2.1.5", + "resolved": "https://registry.npmjs.org/@smithy/fetch-http-handler/-/fetch-http-handler-2.1.5.tgz", + "integrity": "sha512-BIeCHGfr5JCGN+EMTwZK74ELvjPXOIrI7OLM5OhZJJ6AmZyRv2S9ANJk18AtLwht0TsSm+8WoXIEp8LuxNgUyA==", + "requires": { + "@smithy/protocol-http": "^3.0.5", + "@smithy/querystring-builder": "^2.0.9", + "@smithy/types": "^2.3.3", + "@smithy/util-base64": "^2.0.0", + "tslib": "^2.5.0" + } + }, + "@smithy/hash-blob-browser": { + "version": "2.0.9", + "resolved": "https://registry.npmjs.org/@smithy/hash-blob-browser/-/hash-blob-browser-2.0.9.tgz", + "integrity": "sha512-JNWOV1ci9vIg4U82klNr07bZXsA6OCumqHugpvZdvvn6cNGwTa4rvpS5FpPcqKeh3Rdg1rr4h8g+X6zyOamnZw==", + "requires": { + "@smithy/chunked-blob-reader": "^2.0.0", + "@smithy/chunked-blob-reader-native": "^2.0.0", + "@smithy/types": "^2.3.3", + "tslib": "^2.5.0" + } + }, + "@smithy/hash-node": { + "version": "2.0.9", + "resolved": "https://registry.npmjs.org/@smithy/hash-node/-/hash-node-2.0.9.tgz", + "integrity": "sha512-XP3yWd5wyCtiVmsY5Nuq/FUwyCEQ6YG7DsvRh7ThldNukGpCzyFdP8eivZJVjn4Fx7oYrrOnVoYZ0WEgpW1AvQ==", + "requires": { + "@smithy/types": "^2.3.3", + "@smithy/util-buffer-from": "^2.0.0", + "@smithy/util-utf8": "^2.0.0", + "tslib": "^2.5.0" + } + }, + "@smithy/hash-stream-node": { + "version": "2.0.9", + "resolved": "https://registry.npmjs.org/@smithy/hash-stream-node/-/hash-stream-node-2.0.9.tgz", + "integrity": "sha512-3nrkMpiOrhsJvJS6K4OkP0qvA3U5r8PpseXULeGd1ZD1EbfcZ30Lvl72FGaaHskwWZyTPR4czr1d/RwLRCVHNA==", + "requires": { + "@smithy/types": "^2.3.3", + "@smithy/util-utf8": "^2.0.0", + "tslib": "^2.5.0" + } + }, + "@smithy/invalid-dependency": { + "version": "2.0.9", + "resolved": "https://registry.npmjs.org/@smithy/invalid-dependency/-/invalid-dependency-2.0.9.tgz", + "integrity": "sha512-RuJqhYf8nViK96IIO9JbTtjDUuFItVfuuJhWw2yk7fv67yltQ7fZD6IQ2OsHHluoVmstnQJuCg5raXJR696Ubw==", + "requires": { + "@smithy/types": "^2.3.3", + "tslib": "^2.5.0" + } + }, + "@smithy/is-array-buffer": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/@smithy/is-array-buffer/-/is-array-buffer-2.0.0.tgz", + "integrity": "sha512-z3PjFjMyZNI98JFRJi/U0nGoLWMSJlDjAW4QUX2WNZLas5C0CmVV6LJ01JI0k90l7FvpmixjWxPFmENSClQ7ug==", + "requires": { + "tslib": "^2.5.0" + } + }, + "@smithy/md5-js": { + "version": "2.0.9", + "resolved": "https://registry.npmjs.org/@smithy/md5-js/-/md5-js-2.0.9.tgz", + "integrity": "sha512-ALHGoTZDgBXBbjCpQzVy6hpa6Rdr6e2jyEw51d6CQOUpHkUnFH7G96UWhVwUnkP0xozPCvmWy+3+j2QUX+oK9w==", + "requires": { + "@smithy/types": "^2.3.3", + "@smithy/util-utf8": "^2.0.0", + "tslib": "^2.5.0" + } + }, + "@smithy/middleware-content-length": { + "version": "2.0.11", + "resolved": "https://registry.npmjs.org/@smithy/middleware-content-length/-/middleware-content-length-2.0.11.tgz", + "integrity": "sha512-Malj4voNTL4+a5ZL3a6+Ij7JTUMTa2R7c3ZIBzMxN5OUUgAspU7uFi1Q97f4B0afVh2joQBAWH5IQJUG25nl8g==", + "requires": { + "@smithy/protocol-http": "^3.0.5", + "@smithy/types": "^2.3.3", + "tslib": "^2.5.0" + } + }, + "@smithy/middleware-endpoint": { + "version": "2.0.9", + "resolved": "https://registry.npmjs.org/@smithy/middleware-endpoint/-/middleware-endpoint-2.0.9.tgz", + "integrity": "sha512-72/o8R6AAO4+nyTI6h4z6PYGTSA4dr1M7tZz29U8DEUHuh1YkhC77js0P6RyF9G0wDLuYqxb+Yh0crI5WG2pJg==", + "requires": { + "@smithy/middleware-serde": "^2.0.9", + "@smithy/types": "^2.3.3", + "@smithy/url-parser": "^2.0.9", + "@smithy/util-middleware": "^2.0.2", + "tslib": "^2.5.0" + } + }, + "@smithy/middleware-retry": { + "version": "2.0.12", + "resolved": "https://registry.npmjs.org/@smithy/middleware-retry/-/middleware-retry-2.0.12.tgz", + "integrity": "sha512-YQ/ufXX4/d9/+Jf1QQ4J+CVeupC7BW52qldBTvRV33PDX9vxndlAwkFwzBcmnUFC3Hjf1//HW6I77EItcjNSCA==", + "requires": { + "@smithy/node-config-provider": "^2.0.12", + "@smithy/protocol-http": "^3.0.5", + "@smithy/service-error-classification": "^2.0.2", + "@smithy/types": "^2.3.3", + "@smithy/util-middleware": "^2.0.2", + "@smithy/util-retry": "^2.0.2", + "tslib": "^2.5.0", + "uuid": "^8.3.2" + }, + "dependencies": { + "uuid": { + "version": "8.3.2", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz", + "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==" + } + } + }, + "@smithy/middleware-serde": { + "version": "2.0.9", + "resolved": "https://registry.npmjs.org/@smithy/middleware-serde/-/middleware-serde-2.0.9.tgz", + "integrity": "sha512-GVbauxrr6WmtCaesakktg3t5LR/yDbajpC7KkWc8rtCpddMI4ShAVO5Q6DqwX8MDFi4CLaY8H7eTGcxhl3jbLg==", + "requires": { + "@smithy/types": "^2.3.3", + "tslib": "^2.5.0" + } + }, + "@smithy/middleware-stack": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/@smithy/middleware-stack/-/middleware-stack-2.0.3.tgz", + "integrity": "sha512-AlhPmbwpkC4lQBVaVHXczmjFvsAhDHhrakqLt038qFLotnJcvDLhmMzAtu23alBeOSkKxkTQq0LsAt2N0WpAbw==", + "requires": { + "@smithy/types": "^2.3.3", + "tslib": "^2.5.0" + } + }, + "@smithy/node-config-provider": { + "version": "2.0.12", + "resolved": "https://registry.npmjs.org/@smithy/node-config-provider/-/node-config-provider-2.0.12.tgz", + "integrity": "sha512-df9y9ywv+JmS40Y60ZqJ4jfZiTCmyHQffwzIqjBjLJLJl0imf9F6DWBd+jiEWHvlohR+sFhyY+KL/qzKgnAq1A==", + "requires": { + "@smithy/property-provider": "^2.0.10", + "@smithy/shared-ini-file-loader": "^2.0.11", + "@smithy/types": "^2.3.3", + "tslib": "^2.5.0" + } + }, + "@smithy/node-http-handler": { + "version": "2.1.5", + "resolved": "https://registry.npmjs.org/@smithy/node-http-handler/-/node-http-handler-2.1.5.tgz", + "integrity": "sha512-52uF+BrZaFiBh+NT/bADiVDCQO91T+OwDRsuaAeWZC1mlCXFjAPPQdxeQohtuYOe9m7mPP/xIMNiqbe8jvndHA==", + "requires": { + "@smithy/abort-controller": "^2.0.9", + "@smithy/protocol-http": "^3.0.5", + "@smithy/querystring-builder": "^2.0.9", + "@smithy/types": "^2.3.3", + "tslib": "^2.5.0" + } + }, + "@smithy/property-provider": { + "version": "2.0.10", + "resolved": "https://registry.npmjs.org/@smithy/property-provider/-/property-provider-2.0.10.tgz", + "integrity": "sha512-YMBVfh0ZMmJtbsUn+WfSwR32iRljZPdRN0Tn2GAcdJ+ejX8WrBXD7Z0jIkQDrQZr8fEuuv5x8WxMIj+qVbsPQw==", + "requires": { + "@smithy/types": "^2.3.3", + "tslib": "^2.5.0" + } + }, + "@smithy/protocol-http": { + "version": "3.0.5", + "resolved": "https://registry.npmjs.org/@smithy/protocol-http/-/protocol-http-3.0.5.tgz", + "integrity": "sha512-3t3fxj+ip4EPHRC2fQ0JimMxR/qCQ1LSQJjZZVZFgROnFLYWPDgUZqpoi7chr+EzatxJVXF/Rtoi5yLHOWCoZQ==", + "requires": { + "@smithy/types": "^2.3.3", + "tslib": "^2.5.0" + } + }, + "@smithy/querystring-builder": { + "version": "2.0.9", + "resolved": "https://registry.npmjs.org/@smithy/querystring-builder/-/querystring-builder-2.0.9.tgz", + "integrity": "sha512-Yt6CPF4j3j1cuwod/DRflbuXxBFjJm7gAjy6W1RE21Rz5/kfGFqiZBXWmmXwGtnnhiLThYwoHK4S6/TQtnx0Fg==", + "requires": { + "@smithy/types": "^2.3.3", + "@smithy/util-uri-escape": "^2.0.0", + "tslib": "^2.5.0" + } + }, + "@smithy/querystring-parser": { + "version": "2.0.9", + "resolved": "https://registry.npmjs.org/@smithy/querystring-parser/-/querystring-parser-2.0.9.tgz", + "integrity": "sha512-U6z4N743s4vrcxPW8p8+reLV0PjMCYEyb1/wtMVvv3VnbJ74gshdI8SR1sBnEh95cF8TxonmX5IxY25tS9qGfg==", + "requires": { + "@smithy/types": "^2.3.3", + "tslib": "^2.5.0" + } + }, + "@smithy/service-error-classification": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/@smithy/service-error-classification/-/service-error-classification-2.0.2.tgz", + "integrity": "sha512-GTUd2j63gKy7A+ggvSdn2hc4sejG7LWfE+ZMF17vzWoNyqERWbRP7HTPS0d0Lwg1p6OQCAzvNigSrEIWVFt6iA==", + "requires": { + "@smithy/types": "^2.3.3" + } + }, + "@smithy/shared-ini-file-loader": { + "version": "2.0.11", + "resolved": "https://registry.npmjs.org/@smithy/shared-ini-file-loader/-/shared-ini-file-loader-2.0.11.tgz", + "integrity": "sha512-Sf0u5C5px6eykXi6jImDTp+edvG3REtPjXnFWU/J+b7S2wkXwUqFXqBL5DdM4zC1F+M8u57ZT7NRqDwMOw7/Tw==", + "requires": { + "@smithy/types": "^2.3.3", + "tslib": "^2.5.0" + } + }, + "@smithy/signature-v4": { + "version": "2.0.9", + "resolved": "https://registry.npmjs.org/@smithy/signature-v4/-/signature-v4-2.0.9.tgz", + "integrity": "sha512-RkHP0joSI1j2EI+mU55sOi33/aMMkKdL9ZY+SWrPxsiCe1oyzzuy79Tpn8X7uT+t0ilNmQlwPpkP/jUy940pEA==", + "requires": { + "@smithy/eventstream-codec": "^2.0.9", + "@smithy/is-array-buffer": "^2.0.0", + "@smithy/types": "^2.3.3", + "@smithy/util-hex-encoding": "^2.0.0", + "@smithy/util-middleware": "^2.0.2", + "@smithy/util-uri-escape": "^2.0.0", + "@smithy/util-utf8": "^2.0.0", + "tslib": "^2.5.0" + } + }, + "@smithy/smithy-client": { + "version": "2.1.7", + "resolved": "https://registry.npmjs.org/@smithy/smithy-client/-/smithy-client-2.1.7.tgz", + "integrity": "sha512-r6T/oiBQ8vCbGqObH4/h0YqD0jFB1hAS9KFRmuTfaNJueu/L2hjmjqFjv3PV5lkbNHTgUYraSv4cFQ1naxiELQ==", + "requires": { + "@smithy/middleware-stack": "^2.0.3", + "@smithy/types": "^2.3.3", + "@smithy/util-stream": "^2.0.12", "tslib": "^2.5.0" } }, "@smithy/types": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/@smithy/types/-/types-1.1.0.tgz", - "integrity": "sha512-KzmvisMmuwD2jZXuC9e65JrgsZM97y5NpDU7g347oB+Q+xQLU6hQZ5zFNNbEfwwOJHoOvEVTna+dk1h/lW7alw==", + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/@smithy/types/-/types-2.3.3.tgz", + "integrity": "sha512-zTdIPR9PvFVNRdIKMQu4M5oyTaycIbUqLheQqaOi9rTWPkgjGO2wDBxMA1rBHQB81aqAEv+DbSS4jfKyQMnXRA==", "requires": { "tslib": "^2.5.0" } }, - "@tootallnate/once": { + "@smithy/url-parser": { + "version": "2.0.9", + "resolved": "https://registry.npmjs.org/@smithy/url-parser/-/url-parser-2.0.9.tgz", + "integrity": "sha512-NBnJ0NiY8z6E82Xd5VYUFQfKwK/wA/+QkKmpYUYP+cpH3aCzE6g2gvixd9vQKYjsIdRfNPCf+SFAozt8ljozOw==", + "requires": { + "@smithy/querystring-parser": "^2.0.9", + "@smithy/types": "^2.3.3", + "tslib": "^2.5.0" + } + }, + "@smithy/util-base64": { "version": "2.0.0", - "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-2.0.0.tgz", - "integrity": "sha512-XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A==", + "resolved": "https://registry.npmjs.org/@smithy/util-base64/-/util-base64-2.0.0.tgz", + "integrity": "sha512-Zb1E4xx+m5Lud8bbeYi5FkcMJMnn+1WUnJF3qD7rAdXpaL7UjkFQLdmW5fHadoKbdHpwH9vSR8EyTJFHJs++tA==", + "requires": { + "@smithy/util-buffer-from": "^2.0.0", + "tslib": "^2.5.0" + } + }, + "@smithy/util-body-length-browser": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/@smithy/util-body-length-browser/-/util-body-length-browser-2.0.0.tgz", + "integrity": "sha512-JdDuS4ircJt+FDnaQj88TzZY3+njZ6O+D3uakS32f2VNnDo3vyEuNdBOh/oFd8Df1zSZOuH1HEChk2AOYDezZg==", + "requires": { + "tslib": "^2.5.0" + } + }, + "@smithy/util-body-length-node": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/@smithy/util-body-length-node/-/util-body-length-node-2.1.0.tgz", + "integrity": "sha512-/li0/kj/y3fQ3vyzn36NTLGmUwAICb7Jbe/CsWCktW363gh1MOcpEcSO3mJ344Gv2dqz8YJCLQpb6hju/0qOWw==", + "requires": { + "tslib": "^2.5.0" + } + }, + "@smithy/util-buffer-from": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/@smithy/util-buffer-from/-/util-buffer-from-2.0.0.tgz", + "integrity": "sha512-/YNnLoHsR+4W4Vf2wL5lGv0ksg8Bmk3GEGxn2vEQt52AQaPSCuaO5PM5VM7lP1K9qHRKHwrPGktqVoAHKWHxzw==", + "requires": { + "@smithy/is-array-buffer": "^2.0.0", + "tslib": "^2.5.0" + } + }, + "@smithy/util-config-provider": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/@smithy/util-config-provider/-/util-config-provider-2.0.0.tgz", + "integrity": "sha512-xCQ6UapcIWKxXHEU4Mcs2s7LcFQRiU3XEluM2WcCjjBtQkUN71Tb+ydGmJFPxMUrW/GWMgQEEGipLym4XG0jZg==", + "requires": { + "tslib": "^2.5.0" + } + }, + "@smithy/util-defaults-mode-browser": { + "version": "2.0.11", + "resolved": "https://registry.npmjs.org/@smithy/util-defaults-mode-browser/-/util-defaults-mode-browser-2.0.11.tgz", + "integrity": "sha512-0syV1Mz/mCQ7CG/MHKQfH+w86xq59jpD0EOXv5oe0WBXLmq2lWPpVHl2Y6+jQ+/9fYzyZ5NF+NC/WEIuiv690A==", + "requires": { + "@smithy/property-provider": "^2.0.10", + "@smithy/smithy-client": "^2.1.7", + "@smithy/types": "^2.3.3", + "bowser": "^2.11.0", + "tslib": "^2.5.0" + } + }, + "@smithy/util-defaults-mode-node": { + "version": "2.0.13", + "resolved": "https://registry.npmjs.org/@smithy/util-defaults-mode-node/-/util-defaults-mode-node-2.0.13.tgz", + "integrity": "sha512-6BtCHYdw5Z8r6KpW8tRCc3yURgvcQwfIEeHhR70BeSOfx8T/TXPPjb8A+K45+KASspa3fzrsSxeIwB0sAeMoHA==", + "requires": { + "@smithy/config-resolver": "^2.0.10", + "@smithy/credential-provider-imds": "^2.0.12", + "@smithy/node-config-provider": "^2.0.12", + "@smithy/property-provider": "^2.0.10", + "@smithy/smithy-client": "^2.1.7", + "@smithy/types": "^2.3.3", + "tslib": "^2.5.0" + } + }, + "@smithy/util-hex-encoding": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/@smithy/util-hex-encoding/-/util-hex-encoding-2.0.0.tgz", + "integrity": "sha512-c5xY+NUnFqG6d7HFh1IFfrm3mGl29lC+vF+geHv4ToiuJCBmIfzx6IeHLg+OgRdPFKDXIw6pvi+p3CsscaMcMA==", + "requires": { + "tslib": "^2.5.0" + } + }, + "@smithy/util-middleware": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/@smithy/util-middleware/-/util-middleware-2.0.2.tgz", + "integrity": "sha512-UGPZM+Ja/vke5pc/S8G0LNiHpVirtjppsXO+GK9m9wbzRGzPJTfnZA/gERUUN/AfxEy/8SL7U1kd7u4t2X8K1w==", + "requires": { + "@smithy/types": "^2.3.3", + "tslib": "^2.5.0" + } + }, + "@smithy/util-retry": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/@smithy/util-retry/-/util-retry-2.0.2.tgz", + "integrity": "sha512-ovWiayUB38moZcLhSFFfUgB2IMb7R1JfojU20qSahjxAgfOZvDWme3eOYUMtAVnouZ9kYJiFgHLy27qRH4NeeA==", + "requires": { + "@smithy/service-error-classification": "^2.0.2", + "@smithy/types": "^2.3.3", + "tslib": "^2.5.0" + } + }, + "@smithy/util-stream": { + "version": "2.0.12", + "resolved": "https://registry.npmjs.org/@smithy/util-stream/-/util-stream-2.0.12.tgz", + "integrity": "sha512-FOCpRLaj6gvSyUC5mJAACT+sPMPmp9sD1o+hVbUH/QxwZfulypA3ZIFdAg/59/IY0d/1Q4CTztsiHEB5LgjN4g==", + "requires": { + "@smithy/fetch-http-handler": "^2.1.5", + "@smithy/node-http-handler": "^2.1.5", + "@smithy/types": "^2.3.3", + "@smithy/util-base64": "^2.0.0", + "@smithy/util-buffer-from": "^2.0.0", + "@smithy/util-hex-encoding": "^2.0.0", + "@smithy/util-utf8": "^2.0.0", + "tslib": "^2.5.0" + } + }, + "@smithy/util-uri-escape": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/@smithy/util-uri-escape/-/util-uri-escape-2.0.0.tgz", + "integrity": "sha512-ebkxsqinSdEooQduuk9CbKcI+wheijxEb3utGXkCoYQkJnwTnLbH1JXGimJtUkQwNQbsbuYwG2+aFVyZf5TLaw==", + "requires": { + "tslib": "^2.5.0" + } + }, + "@smithy/util-utf8": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/@smithy/util-utf8/-/util-utf8-2.0.0.tgz", + "integrity": "sha512-rctU1VkziY84n5OXe3bPNpKR001ZCME2JCaBBFgtiM2hfKbHFudc/BkMuPab8hRbLd0j3vbnBTTZ1igBf0wgiQ==", + "requires": { + "@smithy/util-buffer-from": "^2.0.0", + "tslib": "^2.5.0" + } + }, + "@smithy/util-waiter": { + "version": "2.0.9", + "resolved": "https://registry.npmjs.org/@smithy/util-waiter/-/util-waiter-2.0.9.tgz", + "integrity": "sha512-Hy9Cs0FtIacC1aVFk98bm/7CYqim9fnHAPRnV/SB2mj02ExYs/9Dn5SrNQmtTBTLCn65KqYnNVBNS8GuGpZOOw==", + "requires": { + "@smithy/abort-controller": "^2.0.9", + "@smithy/types": "^2.3.3", + "tslib": "^2.5.0" + } + }, + "@tootallnate/once": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-1.1.2.tgz", + "integrity": "sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw==", + "dev": true + }, + "@tufjs/canonical-json": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/@tufjs/canonical-json/-/canonical-json-1.0.0.tgz", + "integrity": "sha512-QTnf++uxunWvG2z3UFNzAoQPHxnSXOwtaI3iJ+AohhV+5vONuArPjJE7aPXPVXfXJsqrVbZBu9b81AJoSd09IQ==", "dev": true }, "@tufjs/models": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/@tufjs/models/-/models-1.0.1.tgz", - "integrity": "sha512-AY0VoG/AXdlSOocuREfPoEW4SNhOPp/7fw6mpAxfVIny1uZ+0fEtMoCi7NhELSlqQIRLMu7RgfKhkxT+AJ+EXg==", + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/@tufjs/models/-/models-1.0.4.tgz", + "integrity": "sha512-qaGV9ltJP0EO25YfFUPhxRVK0evXFIAGicsVXuRim4Ed9cjPxYhNnNJ49SFmbeLgtxpslIkX317IgpfcHPVj/A==", "dev": true, "requires": { - "minimatch": "^7.4.2" + "@tufjs/canonical-json": "1.0.0", + "minimatch": "^9.0.0" }, "dependencies": { "brace-expansion": { @@ -21175,9 +22686,9 @@ } }, "minimatch": { - "version": "7.4.6", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-7.4.6.tgz", - "integrity": "sha512-sBz8G/YjVniEz6lKPNpKxXwazJe4c19fEfV2GDMX6AjFz+MX9uDWIZW8XreVhkFW3fkIdTv/gxWr/Kks5FFAVw==", + "version": "9.0.3", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.3.tgz", + "integrity": "sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg==", "dev": true, "requires": { "brace-expansion": "^2.0.1" @@ -21186,9 +22697,9 @@ } }, "@types/body-parser": { - "version": "1.19.2", - "resolved": "https://registry.npmjs.org/@types/body-parser/-/body-parser-1.19.2.tgz", - "integrity": "sha512-ALYone6pm6QmwZoAgeyNksccT9Q4AWZQ6PvfwR37GT6r6FWUPguq6sUmNGSMV2Wr761oQoBxwGGa6DR5o1DC9g==", + "version": "1.19.3", + "resolved": "https://registry.npmjs.org/@types/body-parser/-/body-parser-1.19.3.tgz", + "integrity": "sha512-oyl4jvAfTGX9Bt6Or4H9ni1Z447/tQuxnZsytsCaExKlmJiU8sFgnIBRzJUpKwB5eWn9HuBYlUlVA74q/yN0eQ==", "dev": true, "requires": { "@types/connect": "*", @@ -21196,27 +22707,27 @@ } }, "@types/bonjour": { - "version": "3.5.10", - "resolved": "https://registry.npmjs.org/@types/bonjour/-/bonjour-3.5.10.tgz", - "integrity": "sha512-p7ienRMiS41Nu2/igbJxxLDWrSZ0WxM8UQgCeO9KhoVF7cOVFkrKsiDr1EsJIla8vV3oEEjGcz11jc5yimhzZw==", + "version": "3.5.11", + "resolved": "https://registry.npmjs.org/@types/bonjour/-/bonjour-3.5.11.tgz", + "integrity": "sha512-isGhjmBtLIxdHBDl2xGwUzEM8AOyOvWsADWq7rqirdi/ZQoHnLWErHvsThcEzTX8juDRiZtzp2Qkv5bgNh6mAg==", "dev": true, "requires": { "@types/node": "*" } }, "@types/connect": { - "version": "3.4.35", - "resolved": "https://registry.npmjs.org/@types/connect/-/connect-3.4.35.tgz", - "integrity": "sha512-cdeYyv4KWoEgpBISTxWvqYsVy444DOqehiF3fM3ne10AmJ62RSyNkUnxMJXHQWRQQX2eR94m5y1IZyDwBjV9FQ==", + "version": "3.4.36", + "resolved": "https://registry.npmjs.org/@types/connect/-/connect-3.4.36.tgz", + "integrity": "sha512-P63Zd/JUGq+PdrM1lv0Wv5SBYeA2+CORvbrXbngriYY0jzLUWfQMQQxOhjONEz/wlHOAxOdY7CY65rgQdTjq2w==", "dev": true, "requires": { "@types/node": "*" } }, "@types/connect-history-api-fallback": { - "version": "1.3.5", - "resolved": "https://registry.npmjs.org/@types/connect-history-api-fallback/-/connect-history-api-fallback-1.3.5.tgz", - "integrity": "sha512-h8QJa8xSb1WD4fpKBDcATDNGXghFj6/3GRWG6dhmRcu0RX1Ubasur2Uvx5aeEwlf0MwblEC2bMzzMQntxnw/Cw==", + "version": "1.5.1", + "resolved": "https://registry.npmjs.org/@types/connect-history-api-fallback/-/connect-history-api-fallback-1.5.1.tgz", + "integrity": "sha512-iaQslNbARe8fctL5Lk+DsmgWOM83lM+7FzP0eQUJs1jd3kBE8NWqBTIT2S8SqQOJjxvt2eyIjpOuYeRXq2AdMw==", "dev": true, "requires": { "@types/express-serve-static-core": "*", @@ -21230,9 +22741,9 @@ "dev": true }, "@types/eslint": { - "version": "8.4.1", - "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-8.4.1.tgz", - "integrity": "sha512-GE44+DNEyxxh2Kc6ro/VkIj+9ma0pO0bwv9+uHSyBrikYOHr8zYcdPvnBOp1aw8s+CjRvuSx7CyWqRrNFQ59mA==", + "version": "8.44.3", + "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-8.44.3.tgz", + "integrity": "sha512-iM/WfkwAhwmPff3wZuPLYiHX18HI24jU8k1ZSH7P8FHwxTjZ2P6CoX2wnF43oprR+YXJM6UUxATkNvyv/JHd+g==", "dev": true, "requires": { "@types/estree": "*", @@ -21240,9 +22751,9 @@ } }, "@types/eslint-scope": { - "version": "3.7.3", - "resolved": "https://registry.npmjs.org/@types/eslint-scope/-/eslint-scope-3.7.3.tgz", - "integrity": "sha512-PB3ldyrcnAicT35TWPs5IcwKD8S333HMaa2VVv4+wdvebJkjWuW/xESoB8IwRcog8HYVYamb1g/R31Qv5Bx03g==", + "version": "3.7.5", + "resolved": "https://registry.npmjs.org/@types/eslint-scope/-/eslint-scope-3.7.5.tgz", + "integrity": "sha512-JNvhIEyxVW6EoMIFIvj93ZOywYFatlpu9deeH6eSx6PE3WHYvHaQtmHmQeNw7aA81bYGBPPQqdtBm6b1SsQMmA==", "dev": true, "requires": { "@types/eslint": "*", @@ -21250,15 +22761,15 @@ } }, "@types/estree": { - "version": "0.0.51", - "resolved": "https://registry.npmjs.org/@types/estree/-/estree-0.0.51.tgz", - "integrity": "sha512-CuPgU6f3eT/XgKKPqKd/gLZV1Xmvf1a2R5POBOGQa6uv82xpls89HU5zKeVoyR8XzHd1RGNOlQlvUe3CFkjWNQ==", + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.2.tgz", + "integrity": "sha512-VeiPZ9MMwXjO32/Xu7+OwflfmeoRwkE/qzndw42gGtgJwZopBnzy2gD//NN1+go1mADzkDcqf/KnFRSjTJ8xJA==", "dev": true }, "@types/express": { - "version": "4.17.17", - "resolved": "https://registry.npmjs.org/@types/express/-/express-4.17.17.tgz", - "integrity": "sha512-Q4FmmuLGBG58btUnfS1c1r/NQdlp3DMfGDGig8WhfpA2YRUtEkxAjkZb0yvplJGYdF1fsQ81iMDcH24sSCNC/Q==", + "version": "4.17.18", + "resolved": "https://registry.npmjs.org/@types/express/-/express-4.17.18.tgz", + "integrity": "sha512-Sxv8BSLLgsBYmcnGdGjjEjqET2U+AKAdCRODmMiq02FgjwuV75Ut85DRpvFjyw/Mk0vgUOliGRU0UUmuuZHByQ==", "dev": true, "requires": { "@types/body-parser": "*", @@ -21268,35 +22779,42 @@ } }, "@types/express-serve-static-core": { - "version": "4.17.33", - "resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.33.tgz", - "integrity": "sha512-TPBqmR/HRYI3eC2E5hmiivIzv+bidAfXofM+sbonAGvyDhySGw9/PQZFt2BLOrjUUR++4eJVpx6KnLQK1Fk9tA==", + "version": "4.17.37", + "resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.37.tgz", + "integrity": "sha512-ZohaCYTgGFcOP7u6aJOhY9uIZQgZ2vxC2yWoArY+FeDXlqeH66ZVBjgvg+RLVAS/DWNq4Ap9ZXu1+SUQiiWYMg==", "dev": true, "requires": { "@types/node": "*", "@types/qs": "*", - "@types/range-parser": "*" + "@types/range-parser": "*", + "@types/send": "*" } }, + "@types/http-errors": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/@types/http-errors/-/http-errors-2.0.2.tgz", + "integrity": "sha512-lPG6KlZs88gef6aD85z3HNkztpj7w2R7HmR3gygjfXCQmsLloWNARFkMuzKiiY8FGdh1XDpgBdrSf4aKDiA7Kg==", + "dev": true + }, "@types/http-proxy": { - "version": "1.17.10", - "resolved": "https://registry.npmjs.org/@types/http-proxy/-/http-proxy-1.17.10.tgz", - "integrity": "sha512-Qs5aULi+zV1bwKAg5z1PWnDXWmsn+LxIvUGv6E2+OOMYhclZMO+OXd9pYVf2gLykf2I7IV2u7oTHwChPNsvJ7g==", + "version": "1.17.12", + "resolved": "https://registry.npmjs.org/@types/http-proxy/-/http-proxy-1.17.12.tgz", + "integrity": "sha512-kQtujO08dVtQ2wXAuSFfk9ASy3sug4+ogFR8Kd8UgP8PEuc1/G/8yjYRmp//PcDNJEUKOza/MrQu15bouEUCiw==", "dev": true, "requires": { "@types/node": "*" } }, "@types/json-schema": { - "version": "7.0.9", - "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.9.tgz", - "integrity": "sha512-qcUXuemtEu+E5wZSJHNxUXeCZhAfXKQ41D+duX+VYPde7xyEVZci+/oXKJL13tnRs9lR2pr4fod59GT6/X1/yQ==", + "version": "7.0.13", + "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.13.tgz", + "integrity": "sha512-RbSSoHliUbnXj3ny0CNFOoxrIDV6SUGyStHsvDqosw6CkdPV8TtWGlfecuK4ToyMEAql6pzNxgCFKanovUzlgQ==", "dev": true }, "@types/json5": { "version": "0.0.29", "resolved": "https://registry.npmjs.org/@types/json5/-/json5-0.0.29.tgz", - "integrity": "sha1-7ihweulOEdK4J7y+UnC86n8+ce4=", + "integrity": "sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ==", "dev": true }, "@types/lodash": { @@ -21306,18 +22824,18 @@ "dev": true }, "@types/lodash-es": { - "version": "4.17.7", - "resolved": "https://registry.npmjs.org/@types/lodash-es/-/lodash-es-4.17.7.tgz", - "integrity": "sha512-z0ptr6UI10VlU6l5MYhGwS4mC8DZyYer2mCoyysZtSF7p26zOX8UpbrV0YpNYLGS8K4PUFIyEr62IMFFjveSiQ==", + "version": "4.17.9", + "resolved": "https://registry.npmjs.org/@types/lodash-es/-/lodash-es-4.17.9.tgz", + "integrity": "sha512-ZTcmhiI3NNU7dEvWLZJkzG6ao49zOIjEgIE0RgV7wbPxU0f2xT3VSAHw2gmst8swH6V0YkLRGp4qPlX/6I90MQ==", "dev": true, "requires": { "@types/lodash": "*" } }, "@types/mime": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/@types/mime/-/mime-3.0.1.tgz", - "integrity": "sha512-Y4XFY5VJAuw0FgAqPNd6NNoV44jbq9Bz2L7Rh/J6jLTiHBSBJa9fxqQIvkIld4GsoDOcCbvzOUAbLPsSKKg+uA==", + "version": "1.3.2", + "resolved": "https://registry.npmjs.org/@types/mime/-/mime-1.3.2.tgz", + "integrity": "sha512-YATxVxgRqNH6nHEIsvg6k2Boc1JHI9ZbH5iWFFv/MTkchz3b1ieGDa5T0a9RznNdI0KhVbdbWSN+KWWrQZRxTw==", "dev": true }, "@types/node": { @@ -21326,22 +22844,16 @@ "integrity": "sha512-BsAaKhB+7X+H4GnSjGhJG9Qi8Tw+inU9nJDwmD5CgOmBLEI6ArdhikpLX7DjbjDRDTbqZzU2LSQNZg8WGPiSZQ==", "dev": true }, - "@types/parse-json": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/@types/parse-json/-/parse-json-4.0.0.tgz", - "integrity": "sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA==", - "dev": true - }, "@types/plotly.js": { - "version": "2.12.18", - "resolved": "https://registry.npmjs.org/@types/plotly.js/-/plotly.js-2.12.18.tgz", - "integrity": "sha512-ff+CIEWnqZNjZqHtQZvkEAVuLs9fkm1f54QnPVmgoET7wMHdSqUka2hasVN4e5yfHD05YwGjsAtCseewJh/BMw==", + "version": "2.12.27", + "resolved": "https://registry.npmjs.org/@types/plotly.js/-/plotly.js-2.12.27.tgz", + "integrity": "sha512-Ah7XuePFNxu2XAHG79GeKN/Ky8dZ0k6hzy49da6AeZFrTqO5wDbtJovp3co3C+iRitp8tA6rIxkltiJ3cjsQWw==", "dev": true }, "@types/qs": { - "version": "6.9.7", - "resolved": "https://registry.npmjs.org/@types/qs/-/qs-6.9.7.tgz", - "integrity": "sha512-FGa1F62FT09qcrueBA6qYTrJPVDzah9a+493+o2PCXsesWHIn27G98TsSMs3WPNbZIEj4+VJf6saSFpvD+3Zsw==", + "version": "6.9.8", + "resolved": "https://registry.npmjs.org/@types/qs/-/qs-6.9.8.tgz", + "integrity": "sha512-u95svzDlTysU5xecFNTgfFG5RUWu1A9P0VzgpcIiGZA9iraHOdSzcxMxQ55DyeRaGCSxQi7LxXDI4rzq/MYfdg==", "dev": true }, "@types/range-parser": { @@ -21357,39 +22869,56 @@ "dev": true }, "@types/semver": { - "version": "7.3.13", - "resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.3.13.tgz", - "integrity": "sha512-21cFJr9z3g5dW8B0CVI9g2O9beqaThGQ6ZFBqHfwhzLDKUxaqTIy3vnfah/UPkfOiF2pLq+tGz+W8RyCskuslw==", + "version": "7.5.3", + "resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.5.3.tgz", + "integrity": "sha512-OxepLK9EuNEIPxWNME+C6WwbRAOOI2o2BaQEGzz5Lu2e4Z5eDnEo+/aVEDMIXywoJitJ7xWd641wrGLZdtwRyw==", "dev": true }, + "@types/send": { + "version": "0.17.2", + "resolved": "https://registry.npmjs.org/@types/send/-/send-0.17.2.tgz", + "integrity": "sha512-aAG6yRf6r0wQ29bkS+x97BIs64ZLxeE/ARwyS6wrldMm3C1MdKwCcnnEwMC1slI8wuxJOpiUH9MioC0A0i+GJw==", + "dev": true, + "requires": { + "@types/mime": "^1", + "@types/node": "*" + } + }, "@types/serve-index": { - "version": "1.9.1", - "resolved": "https://registry.npmjs.org/@types/serve-index/-/serve-index-1.9.1.tgz", - "integrity": "sha512-d/Hs3nWDxNL2xAczmOVZNj92YZCS6RGxfBPjKzuu/XirCgXdpKEb88dYNbrYGint6IVWLNP+yonwVAuRC0T2Dg==", + "version": "1.9.2", + "resolved": "https://registry.npmjs.org/@types/serve-index/-/serve-index-1.9.2.tgz", + "integrity": "sha512-asaEIoc6J+DbBKXtO7p2shWUpKacZOoMBEGBgPG91P8xhO53ohzHWGCs4ScZo5pQMf5ukQzVT9fhX1WzpHihig==", "dev": true, "requires": { "@types/express": "*" } }, "@types/serve-static": { - "version": "1.15.1", - "resolved": "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.15.1.tgz", - "integrity": "sha512-NUo5XNiAdULrJENtJXZZ3fHtfMolzZwczzBbnAeBbqBwG+LaG6YaJtuwzwGSQZ2wsCrxjEhNNjAkKigy3n8teQ==", + "version": "1.15.3", + "resolved": "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.15.3.tgz", + "integrity": "sha512-yVRvFsEMrv7s0lGhzrggJjNOSmZCdgCjw9xWrPr/kNNLp6FaDfMC1KaYl3TSJ0c58bECwNBMoQrZJ8hA8E1eFg==", "dev": true, "requires": { + "@types/http-errors": "*", "@types/mime": "*", "@types/node": "*" } }, "@types/sockjs": { - "version": "0.3.33", - "resolved": "https://registry.npmjs.org/@types/sockjs/-/sockjs-0.3.33.tgz", - "integrity": "sha512-f0KEEe05NvUnat+boPTZ0dgaLZ4SfSouXUgv5noUiefG2ajgKjmETo9ZJyuqsl7dfl2aHlLJUiki6B4ZYldiiw==", + "version": "0.3.34", + "resolved": "https://registry.npmjs.org/@types/sockjs/-/sockjs-0.3.34.tgz", + "integrity": "sha512-R+n7qBFnm/6jinlteC9DBL5dGiDGjWAvjo4viUanpnc/dG1y7uDoacXPIQ/PQEg1fI912SMHIa014ZjRpvDw4g==", "dev": true, "requires": { "@types/node": "*" } }, + "@types/tinycolor2": { + "version": "1.4.4", + "resolved": "https://registry.npmjs.org/@types/tinycolor2/-/tinycolor2-1.4.4.tgz", + "integrity": "sha512-FYK4mlLxUUajo/mblv7EUDHku20qT6ThYNsGZsTHilcHRvIkF8WXqtZO+DVTYkpHWCaAT97LueV59H/5Ve3bGA==", + "dev": true + }, "@types/uuid": { "version": "9.0.2", "resolved": "https://registry.npmjs.org/@types/uuid/-/uuid-9.0.2.tgz", @@ -21397,264 +22926,484 @@ "dev": true }, "@types/ws": { - "version": "8.5.4", - "resolved": "https://registry.npmjs.org/@types/ws/-/ws-8.5.4.tgz", - "integrity": "sha512-zdQDHKUgcX/zBc4GrwsE/7dVdAD8JR4EuiAXiiUhhfyIJXXb2+PrGshFyeXWQPMmmZ2XxgaqclgpIC7eTXc1mg==", + "version": "8.5.6", + "resolved": "https://registry.npmjs.org/@types/ws/-/ws-8.5.6.tgz", + "integrity": "sha512-8B5EO9jLVCy+B58PLHvLDuOD8DRVMgQzq8d55SjLCOn9kqGyqOvy27exVaTio1q1nX5zLu8/6N0n2ThSxOM6tg==", "dev": true, "requires": { "@types/node": "*" } }, + "@types/yargs": { + "version": "17.0.25", + "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.25.tgz", + "integrity": "sha512-gy7iPgwnzNvxgAEi2bXOHWCVOG6f7xsprVJH4MjlAWeBmJ7vh/Y1kwMtUrs64ztf24zVIRCpr3n/z6gm9QIkgg==", + "dev": true, + "requires": { + "@types/yargs-parser": "*" + } + }, + "@types/yargs-parser": { + "version": "21.0.1", + "resolved": "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-21.0.1.tgz", + "integrity": "sha512-axdPBuLuEJt0c4yI5OZssC19K2Mq1uKdrfZBzuxLvaztgqUtFYZUNw7lETExPYJR9jdEoIg4mb7RQKRQzOkeGQ==", + "dev": true + }, "@types/youtube": { "version": "0.0.42", "resolved": "https://registry.npmjs.org/@types/youtube/-/youtube-0.0.42.tgz", "integrity": "sha512-Nqo3HMPFPcNyZ7HNFZJjpH+N4yXqpxBItG+41e7nL9zednovMRZMXWj36CctSznbBcbj6ucvkJDo5iZ8SKqLIw==" }, "@typescript-eslint/eslint-plugin": { - "version": "5.59.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.59.1.tgz", - "integrity": "sha512-AVi0uazY5quFB9hlp2Xv+ogpfpk77xzsgsIEWyVS7uK/c7MZ5tw7ZPbapa0SbfkqE0fsAMkz5UwtgMLVk2BQAg==", + "version": "6.7.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-6.7.0.tgz", + "integrity": "sha512-gUqtknHm0TDs1LhY12K2NA3Rmlmp88jK9Tx8vGZMfHeNMLE3GH2e9TRub+y+SOjuYgtOmok+wt1AyDPZqxbNag==", "dev": true, "requires": { - "@eslint-community/regexpp": "^4.4.0", - "@typescript-eslint/scope-manager": "5.59.1", - "@typescript-eslint/type-utils": "5.59.1", - "@typescript-eslint/utils": "5.59.1", + "@eslint-community/regexpp": "^4.5.1", + "@typescript-eslint/scope-manager": "6.7.0", + "@typescript-eslint/type-utils": "6.7.0", + "@typescript-eslint/utils": "6.7.0", + "@typescript-eslint/visitor-keys": "6.7.0", "debug": "^4.3.4", - "grapheme-splitter": "^1.0.4", - "ignore": "^5.2.0", - "natural-compare-lite": "^1.4.0", - "semver": "^7.3.7", - "tsutils": "^3.21.0" + "graphemer": "^1.4.0", + "ignore": "^5.2.4", + "natural-compare": "^1.4.0", + "semver": "^7.5.4", + "ts-api-utils": "^1.0.1" + }, + "dependencies": { + "@typescript-eslint/type-utils": { + "version": "6.7.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-6.7.0.tgz", + "integrity": "sha512-f/QabJgDAlpSz3qduCyQT0Fw7hHpmhOzY/Rv6zO3yO+HVIdPfIWhrQoAyG+uZVtWAIS85zAyzgAFfyEr+MgBpg==", + "dev": true, + "requires": { + "@typescript-eslint/typescript-estree": "6.7.0", + "@typescript-eslint/utils": "6.7.0", + "debug": "^4.3.4", + "ts-api-utils": "^1.0.1" + } + }, + "@typescript-eslint/utils": { + "version": "6.7.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-6.7.0.tgz", + "integrity": "sha512-MfCq3cM0vh2slSikQYqK2Gq52gvOhe57vD2RM3V4gQRZYX4rDPnKLu5p6cm89+LJiGlwEXU8hkYxhqqEC/V3qA==", + "dev": true, + "requires": { + "@eslint-community/eslint-utils": "^4.4.0", + "@types/json-schema": "^7.0.12", + "@types/semver": "^7.5.0", + "@typescript-eslint/scope-manager": "6.7.0", + "@typescript-eslint/types": "6.7.0", + "@typescript-eslint/typescript-estree": "6.7.0", + "semver": "^7.5.4" + } + }, + "semver": { + "version": "7.5.4", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz", + "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==", + "dev": true, + "requires": { + "lru-cache": "^6.0.0" + } + } + } + }, + "@typescript-eslint/experimental-utils": { + "version": "5.62.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-5.62.0.tgz", + "integrity": "sha512-RTXpeB3eMkpoclG3ZHft6vG/Z30azNHuqY6wKPBHlVMZFuEvrtlEDe8gMqDb+SO+9hjC/pLekeSCryf9vMZlCw==", + "dev": true, + "requires": { + "@typescript-eslint/utils": "5.62.0" } }, "@typescript-eslint/parser": { - "version": "5.59.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.59.1.tgz", - "integrity": "sha512-nzjFAN8WEu6yPRDizIFyzAfgK7nybPodMNFGNH0M9tei2gYnYszRDqVA0xlnRjkl7Hkx2vYrEdb6fP2a21cG1g==", + "version": "6.7.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-6.7.0.tgz", + "integrity": "sha512-jZKYwqNpNm5kzPVP5z1JXAuxjtl2uG+5NpaMocFPTNC2EdYIgbXIPImObOkhbONxtFTTdoZstLZefbaK+wXZng==", "dev": true, "requires": { - "@typescript-eslint/scope-manager": "5.59.1", - "@typescript-eslint/types": "5.59.1", - "@typescript-eslint/typescript-estree": "5.59.1", + "@typescript-eslint/scope-manager": "6.7.0", + "@typescript-eslint/types": "6.7.0", + "@typescript-eslint/typescript-estree": "6.7.0", + "@typescript-eslint/visitor-keys": "6.7.0", "debug": "^4.3.4" } }, "@typescript-eslint/scope-manager": { - "version": "5.59.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.59.1.tgz", - "integrity": "sha512-mau0waO5frJctPuAzcxiNWqJR5Z8V0190FTSqRw1Q4Euop6+zTwHAf8YIXNwDOT29tyUDrQ65jSg9aTU/H0omA==", + "version": "6.7.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-6.7.0.tgz", + "integrity": "sha512-lAT1Uau20lQyjoLUQ5FUMSX/dS07qux9rYd5FGzKz/Kf8W8ccuvMyldb8hadHdK/qOI7aikvQWqulnEq2nCEYA==", "dev": true, "requires": { - "@typescript-eslint/types": "5.59.1", - "@typescript-eslint/visitor-keys": "5.59.1" + "@typescript-eslint/types": "6.7.0", + "@typescript-eslint/visitor-keys": "6.7.0" } }, "@typescript-eslint/type-utils": { - "version": "5.59.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.59.1.tgz", - "integrity": "sha512-ZMWQ+Oh82jWqWzvM3xU+9y5U7MEMVv6GLioM3R5NJk6uvP47kZ7YvlgSHJ7ERD6bOY7Q4uxWm25c76HKEwIjZw==", + "version": "5.62.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.62.0.tgz", + "integrity": "sha512-xsSQreu+VnfbqQpW5vnCJdq1Z3Q0U31qiWmRhr98ONQmcp/yhiPJFPq8MXiJVLiksmOKSjIldZzkebzHuCGzew==", "dev": true, "requires": { - "@typescript-eslint/typescript-estree": "5.59.1", - "@typescript-eslint/utils": "5.59.1", + "@typescript-eslint/typescript-estree": "5.62.0", + "@typescript-eslint/utils": "5.62.0", "debug": "^4.3.4", "tsutils": "^3.21.0" + }, + "dependencies": { + "@typescript-eslint/types": { + "version": "5.62.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.62.0.tgz", + "integrity": "sha512-87NVngcbVXUahrRTqIK27gD2t5Cu1yuCXxbLcFtCzZGlfyVWWh8mLHkoxzjsB6DDNnvdL+fW8MiwPEJyGJQDgQ==", + "dev": true + }, + "@typescript-eslint/typescript-estree": { + "version": "5.62.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.62.0.tgz", + "integrity": "sha512-CmcQ6uY7b9y694lKdRB8FEel7JbU/40iSAPomu++SjLMntB+2Leay2LO6i8VnJk58MtE9/nQSFIH6jpyRWyYzA==", + "dev": true, + "requires": { + "@typescript-eslint/types": "5.62.0", + "@typescript-eslint/visitor-keys": "5.62.0", + "debug": "^4.3.4", + "globby": "^11.1.0", + "is-glob": "^4.0.3", + "semver": "^7.3.7", + "tsutils": "^3.21.0" + } + }, + "@typescript-eslint/visitor-keys": { + "version": "5.62.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.62.0.tgz", + "integrity": "sha512-07ny+LHRzQXepkGg6w0mFY41fVUNBrL2Roj/++7V1txKugfjm/Ci/qSND03r2RhlJhJYMcTn9AhhSSqQp0Ysyw==", + "dev": true, + "requires": { + "@typescript-eslint/types": "5.62.0", + "eslint-visitor-keys": "^3.3.0" + } + } } }, "@typescript-eslint/types": { - "version": "5.59.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.59.1.tgz", - "integrity": "sha512-dg0ICB+RZwHlysIy/Dh1SP+gnXNzwd/KS0JprD3Lmgmdq+dJAJnUPe1gNG34p0U19HvRlGX733d/KqscrGC1Pg==", + "version": "6.7.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-6.7.0.tgz", + "integrity": "sha512-ihPfvOp7pOcN/ysoj0RpBPOx3HQTJTrIN8UZK+WFd3/iDeFHHqeyYxa4hQk4rMhsz9H9mXpR61IzwlBVGXtl9Q==", "dev": true }, "@typescript-eslint/typescript-estree": { - "version": "5.59.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.59.1.tgz", - "integrity": "sha512-lYLBBOCsFltFy7XVqzX0Ju+Lh3WPIAWxYpmH/Q7ZoqzbscLiCW00LeYCdsUnnfnj29/s1WovXKh2gwCoinHNGA==", + "version": "6.7.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-6.7.0.tgz", + "integrity": "sha512-dPvkXj3n6e9yd/0LfojNU8VMUGHWiLuBZvbM6V6QYD+2qxqInE7J+J/ieY2iGwR9ivf/R/haWGkIj04WVUeiSQ==", "dev": true, "requires": { - "@typescript-eslint/types": "5.59.1", - "@typescript-eslint/visitor-keys": "5.59.1", + "@typescript-eslint/types": "6.7.0", + "@typescript-eslint/visitor-keys": "6.7.0", "debug": "^4.3.4", "globby": "^11.1.0", "is-glob": "^4.0.3", - "semver": "^7.3.7", - "tsutils": "^3.21.0" + "semver": "^7.5.4", + "ts-api-utils": "^1.0.1" + }, + "dependencies": { + "semver": { + "version": "7.5.4", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz", + "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==", + "dev": true, + "requires": { + "lru-cache": "^6.0.0" + } + } } }, "@typescript-eslint/utils": { - "version": "5.59.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.59.1.tgz", - "integrity": "sha512-MkTe7FE+K1/GxZkP5gRj3rCztg45bEhsd8HYjczBuYm+qFHP5vtZmjx3B0yUCDotceQ4sHgTyz60Ycl225njmA==", + "version": "5.62.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.62.0.tgz", + "integrity": "sha512-n8oxjeb5aIbPFEtmQxQYOLI0i9n5ySBEY/ZEHHZqKQSFnxio1rv6dthascc9dLuwrL0RC5mPCxB7vnAVGAYWAQ==", "dev": true, "requires": { "@eslint-community/eslint-utils": "^4.2.0", "@types/json-schema": "^7.0.9", "@types/semver": "^7.3.12", - "@typescript-eslint/scope-manager": "5.59.1", - "@typescript-eslint/types": "5.59.1", - "@typescript-eslint/typescript-estree": "5.59.1", + "@typescript-eslint/scope-manager": "5.62.0", + "@typescript-eslint/types": "5.62.0", + "@typescript-eslint/typescript-estree": "5.62.0", "eslint-scope": "^5.1.1", "semver": "^7.3.7" + }, + "dependencies": { + "@typescript-eslint/scope-manager": { + "version": "5.62.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.62.0.tgz", + "integrity": "sha512-VXuvVvZeQCQb5Zgf4HAxc04q5j+WrNAtNh9OwCsCgpKqESMTu3tF/jhZ3xG6T4NZwWl65Bg8KuS2uEvhSfLl0w==", + "dev": true, + "requires": { + "@typescript-eslint/types": "5.62.0", + "@typescript-eslint/visitor-keys": "5.62.0" + } + }, + "@typescript-eslint/types": { + "version": "5.62.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.62.0.tgz", + "integrity": "sha512-87NVngcbVXUahrRTqIK27gD2t5Cu1yuCXxbLcFtCzZGlfyVWWh8mLHkoxzjsB6DDNnvdL+fW8MiwPEJyGJQDgQ==", + "dev": true + }, + "@typescript-eslint/typescript-estree": { + "version": "5.62.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.62.0.tgz", + "integrity": "sha512-CmcQ6uY7b9y694lKdRB8FEel7JbU/40iSAPomu++SjLMntB+2Leay2LO6i8VnJk58MtE9/nQSFIH6jpyRWyYzA==", + "dev": true, + "requires": { + "@typescript-eslint/types": "5.62.0", + "@typescript-eslint/visitor-keys": "5.62.0", + "debug": "^4.3.4", + "globby": "^11.1.0", + "is-glob": "^4.0.3", + "semver": "^7.3.7", + "tsutils": "^3.21.0" + } + }, + "@typescript-eslint/visitor-keys": { + "version": "5.62.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.62.0.tgz", + "integrity": "sha512-07ny+LHRzQXepkGg6w0mFY41fVUNBrL2Roj/++7V1txKugfjm/Ci/qSND03r2RhlJhJYMcTn9AhhSSqQp0Ysyw==", + "dev": true, + "requires": { + "@typescript-eslint/types": "5.62.0", + "eslint-visitor-keys": "^3.3.0" + } + } } }, "@typescript-eslint/visitor-keys": { - "version": "5.59.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.59.1.tgz", - "integrity": "sha512-6waEYwBTCWryx0VJmP7JaM4FpipLsFl9CvYf2foAE8Qh/Y0s+bxWysciwOs0LTBED4JCaNxTZ5rGadB14M6dwA==", + "version": "6.7.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-6.7.0.tgz", + "integrity": "sha512-/C1RVgKFDmGMcVGeD8HjKv2bd72oI1KxQDeY8uc66gw9R0OK0eMq48cA+jv9/2Ag6cdrsUGySm1yzYmfz0hxwQ==", "dev": true, "requires": { - "@typescript-eslint/types": "5.59.1", - "eslint-visitor-keys": "^3.3.0" + "@typescript-eslint/types": "6.7.0", + "eslint-visitor-keys": "^3.4.1" } }, + "@vitejs/plugin-basic-ssl": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/@vitejs/plugin-basic-ssl/-/plugin-basic-ssl-1.0.1.tgz", + "integrity": "sha512-pcub+YbFtFhaGRTo1832FQHQSHvMrlb43974e2eS8EKleR3p1cDdkJFPci1UhwkEf1J9Bz+wKBSzqpKp7nNj2A==", + "dev": true + }, "@webassemblyjs/ast": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.11.1.tgz", - "integrity": "sha512-ukBh14qFLjxTQNTXocdyksN5QdM28S1CxHt2rdskFyL+xFV7VremuBLVbmCePj+URalXBENx/9Lm7lnhihtCSw==", + "version": "1.11.6", + "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.11.6.tgz", + "integrity": "sha512-IN1xI7PwOvLPgjcf180gC1bqn3q/QaOCwYUahIOhbYUu8KA/3tw2RT/T0Gidi1l7Hhj5D/INhJxiICObqpMu4Q==", "dev": true, "requires": { - "@webassemblyjs/helper-numbers": "1.11.1", - "@webassemblyjs/helper-wasm-bytecode": "1.11.1" + "@webassemblyjs/helper-numbers": "1.11.6", + "@webassemblyjs/helper-wasm-bytecode": "1.11.6" } }, "@webassemblyjs/floating-point-hex-parser": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.1.tgz", - "integrity": "sha512-iGRfyc5Bq+NnNuX8b5hwBrRjzf0ocrJPI6GWFodBFzmFnyvrQ83SHKhmilCU/8Jv67i4GJZBMhEzltxzcNagtQ==", + "version": "1.11.6", + "resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.6.tgz", + "integrity": "sha512-ejAj9hfRJ2XMsNHk/v6Fu2dGS+i4UaXBXGemOfQ/JfQ6mdQg/WXtwleQRLLS4OvfDhv8rYnVwH27YJLMyYsxhw==", "dev": true }, "@webassemblyjs/helper-api-error": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.1.tgz", - "integrity": "sha512-RlhS8CBCXfRUR/cwo2ho9bkheSXG0+NwooXcc3PAILALf2QLdFyj7KGsKRbVc95hZnhnERon4kW/D3SZpp6Tcg==", + "version": "1.11.6", + "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.6.tgz", + "integrity": "sha512-o0YkoP4pVu4rN8aTJgAyj9hC2Sv5UlkzCHhxqWj8butaLvnpdc2jOwh4ewE6CX0txSfLn/UYaV/pheS2Txg//Q==", "dev": true }, "@webassemblyjs/helper-buffer": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.11.1.tgz", - "integrity": "sha512-gwikF65aDNeeXa8JxXa2BAk+REjSyhrNC9ZwdT0f8jc4dQQeDQ7G4m0f2QCLPJiMTTO6wfDmRmj/pW0PsUvIcA==", + "version": "1.11.6", + "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.11.6.tgz", + "integrity": "sha512-z3nFzdcp1mb8nEOFFk8DrYLpHvhKC3grJD2ardfKOzmbmJvEf/tPIqCY+sNcwZIY8ZD7IkB2l7/pqhUhqm7hLA==", "dev": true }, "@webassemblyjs/helper-numbers": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.1.tgz", - "integrity": "sha512-vDkbxiB8zfnPdNK9Rajcey5C0w+QJugEglN0of+kmO8l7lDb77AnlKYQF7aarZuCrv+l0UvqL+68gSDr3k9LPQ==", + "version": "1.11.6", + "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.6.tgz", + "integrity": "sha512-vUIhZ8LZoIWHBohiEObxVm6hwP034jwmc9kuq5GdHZH0wiLVLIPcMCdpJzG4C11cHoQ25TFIQj9kaVADVX7N3g==", "dev": true, "requires": { - "@webassemblyjs/floating-point-hex-parser": "1.11.1", - "@webassemblyjs/helper-api-error": "1.11.1", + "@webassemblyjs/floating-point-hex-parser": "1.11.6", + "@webassemblyjs/helper-api-error": "1.11.6", "@xtuc/long": "4.2.2" } }, "@webassemblyjs/helper-wasm-bytecode": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.1.tgz", - "integrity": "sha512-PvpoOGiJwXeTrSf/qfudJhwlvDQxFgelbMqtq52WWiXC6Xgg1IREdngmPN3bs4RoO83PnL/nFrxucXj1+BX62Q==", + "version": "1.11.6", + "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.6.tgz", + "integrity": "sha512-sFFHKwcmBprO9e7Icf0+gddyWYDViL8bpPjJJl0WHxCdETktXdmtWLGVzoHbqUcY4Be1LkNfwTmXOJUFZYSJdA==", "dev": true }, "@webassemblyjs/helper-wasm-section": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.11.1.tgz", - "integrity": "sha512-10P9No29rYX1j7F3EVPX3JvGPQPae+AomuSTPiF9eBQeChHI6iqjMIwR9JmOJXwpnn/oVGDk7I5IlskuMwU/pg==", + "version": "1.11.6", + "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.11.6.tgz", + "integrity": "sha512-LPpZbSOwTpEC2cgn4hTydySy1Ke+XEu+ETXuoyvuyezHO3Kjdu90KK95Sh9xTbmjrCsUwvWwCOQQNta37VrS9g==", "dev": true, "requires": { - "@webassemblyjs/ast": "1.11.1", - "@webassemblyjs/helper-buffer": "1.11.1", - "@webassemblyjs/helper-wasm-bytecode": "1.11.1", - "@webassemblyjs/wasm-gen": "1.11.1" + "@webassemblyjs/ast": "1.11.6", + "@webassemblyjs/helper-buffer": "1.11.6", + "@webassemblyjs/helper-wasm-bytecode": "1.11.6", + "@webassemblyjs/wasm-gen": "1.11.6" } }, "@webassemblyjs/ieee754": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.11.1.tgz", - "integrity": "sha512-hJ87QIPtAMKbFq6CGTkZYJivEwZDbQUgYd3qKSadTNOhVY7p+gfP6Sr0lLRVTaG1JjFj+r3YchoqRYxNH3M0GQ==", + "version": "1.11.6", + "resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.11.6.tgz", + "integrity": "sha512-LM4p2csPNvbij6U1f19v6WR56QZ8JcHg3QIJTlSwzFcmx6WSORicYj6I63f9yU1kEUtrpG+kjkiIAkevHpDXrg==", "dev": true, "requires": { "@xtuc/ieee754": "^1.2.0" } }, "@webassemblyjs/leb128": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.11.1.tgz", - "integrity": "sha512-BJ2P0hNZ0u+Th1YZXJpzW6miwqQUGcIHT1G/sf72gLVD9DZ5AdYTqPNbHZh6K1M5VmKvFXwGSWZADz+qBWxeRw==", + "version": "1.11.6", + "resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.11.6.tgz", + "integrity": "sha512-m7a0FhE67DQXgouf1tbN5XQcdWoNgaAuoULHIfGFIEVKA6tu/edls6XnIlkmS6FrXAquJRPni3ZZKjw6FSPjPQ==", "dev": true, "requires": { "@xtuc/long": "4.2.2" } }, "@webassemblyjs/utf8": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.11.1.tgz", - "integrity": "sha512-9kqcxAEdMhiwQkHpkNiorZzqpGrodQQ2IGrHHxCy+Ozng0ofyMA0lTqiLkVs1uzTRejX+/O0EOT7KxqVPuXosQ==", + "version": "1.11.6", + "resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.11.6.tgz", + "integrity": "sha512-vtXf2wTQ3+up9Zsg8sa2yWiQpzSsMyXj0qViVP6xKGCUT8p8YJ6HqI7l5eCnWx1T/FYdsv07HQs2wTFbbof/RA==", "dev": true }, "@webassemblyjs/wasm-edit": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.11.1.tgz", - "integrity": "sha512-g+RsupUC1aTHfR8CDgnsVRVZFJqdkFHpsHMfJuWQzWU3tvnLC07UqHICfP+4XyL2tnr1amvl1Sdp06TnYCmVkA==", + "version": "1.11.6", + "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.11.6.tgz", + "integrity": "sha512-Ybn2I6fnfIGuCR+Faaz7YcvtBKxvoLV3Lebn1tM4o/IAJzmi9AWYIPWpyBfU8cC+JxAO57bk4+zdsTjJR+VTOw==", "dev": true, "requires": { - "@webassemblyjs/ast": "1.11.1", - "@webassemblyjs/helper-buffer": "1.11.1", - "@webassemblyjs/helper-wasm-bytecode": "1.11.1", - "@webassemblyjs/helper-wasm-section": "1.11.1", - "@webassemblyjs/wasm-gen": "1.11.1", - "@webassemblyjs/wasm-opt": "1.11.1", - "@webassemblyjs/wasm-parser": "1.11.1", - "@webassemblyjs/wast-printer": "1.11.1" + "@webassemblyjs/ast": "1.11.6", + "@webassemblyjs/helper-buffer": "1.11.6", + "@webassemblyjs/helper-wasm-bytecode": "1.11.6", + "@webassemblyjs/helper-wasm-section": "1.11.6", + "@webassemblyjs/wasm-gen": "1.11.6", + "@webassemblyjs/wasm-opt": "1.11.6", + "@webassemblyjs/wasm-parser": "1.11.6", + "@webassemblyjs/wast-printer": "1.11.6" } }, "@webassemblyjs/wasm-gen": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.11.1.tgz", - "integrity": "sha512-F7QqKXwwNlMmsulj6+O7r4mmtAlCWfO/0HdgOxSklZfQcDu0TpLiD1mRt/zF25Bk59FIjEuGAIyn5ei4yMfLhA==", + "version": "1.11.6", + "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.11.6.tgz", + "integrity": "sha512-3XOqkZP/y6B4F0PBAXvI1/bky7GryoogUtfwExeP/v7Nzwo1QLcq5oQmpKlftZLbT+ERUOAZVQjuNVak6UXjPA==", "dev": true, "requires": { - "@webassemblyjs/ast": "1.11.1", - "@webassemblyjs/helper-wasm-bytecode": "1.11.1", - "@webassemblyjs/ieee754": "1.11.1", - "@webassemblyjs/leb128": "1.11.1", - "@webassemblyjs/utf8": "1.11.1" + "@webassemblyjs/ast": "1.11.6", + "@webassemblyjs/helper-wasm-bytecode": "1.11.6", + "@webassemblyjs/ieee754": "1.11.6", + "@webassemblyjs/leb128": "1.11.6", + "@webassemblyjs/utf8": "1.11.6" } }, "@webassemblyjs/wasm-opt": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.11.1.tgz", - "integrity": "sha512-VqnkNqnZlU5EB64pp1l7hdm3hmQw7Vgqa0KF/KCNO9sIpI6Fk6brDEiX+iCOYrvMuBWDws0NkTOxYEb85XQHHw==", + "version": "1.11.6", + "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.11.6.tgz", + "integrity": "sha512-cOrKuLRE7PCe6AsOVl7WasYf3wbSo4CeOk6PkrjS7g57MFfVUF9u6ysQBBODX0LdgSvQqRiGz3CXvIDKcPNy4g==", "dev": true, "requires": { - "@webassemblyjs/ast": "1.11.1", - "@webassemblyjs/helper-buffer": "1.11.1", - "@webassemblyjs/wasm-gen": "1.11.1", - "@webassemblyjs/wasm-parser": "1.11.1" + "@webassemblyjs/ast": "1.11.6", + "@webassemblyjs/helper-buffer": "1.11.6", + "@webassemblyjs/wasm-gen": "1.11.6", + "@webassemblyjs/wasm-parser": "1.11.6" } }, "@webassemblyjs/wasm-parser": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.11.1.tgz", - "integrity": "sha512-rrBujw+dJu32gYB7/Lup6UhdkPx9S9SnobZzRVL7VcBH9Bt9bCBLEuX/YXOOtBsOZ4NQrRykKhffRWHvigQvOA==", + "version": "1.11.6", + "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.11.6.tgz", + "integrity": "sha512-6ZwPeGzMJM3Dqp3hCsLgESxBGtT/OeCvCZ4TA1JUPYgmhAx38tTPR9JaKy0S5H3evQpO/h2uWs2j6Yc/fjkpTQ==", "dev": true, "requires": { - "@webassemblyjs/ast": "1.11.1", - "@webassemblyjs/helper-api-error": "1.11.1", - "@webassemblyjs/helper-wasm-bytecode": "1.11.1", - "@webassemblyjs/ieee754": "1.11.1", - "@webassemblyjs/leb128": "1.11.1", - "@webassemblyjs/utf8": "1.11.1" + "@webassemblyjs/ast": "1.11.6", + "@webassemblyjs/helper-api-error": "1.11.6", + "@webassemblyjs/helper-wasm-bytecode": "1.11.6", + "@webassemblyjs/ieee754": "1.11.6", + "@webassemblyjs/leb128": "1.11.6", + "@webassemblyjs/utf8": "1.11.6" } }, "@webassemblyjs/wast-printer": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.11.1.tgz", - "integrity": "sha512-IQboUWM4eKzWW+N/jij2sRatKMh99QEelo3Eb2q0qXkvPRISAj8Qxtmw5itwqK+TTkBuUIE45AxYPToqPtL5gg==", + "version": "1.11.6", + "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.11.6.tgz", + "integrity": "sha512-JM7AhRcE+yW2GWYaKeHL5vt4xqee5N2WcezptmgyhNS+ScggqcT1OtXykhAb13Sn5Yas0j2uv9tHgrjwvzAP4A==", "dev": true, "requires": { - "@webassemblyjs/ast": "1.11.1", + "@webassemblyjs/ast": "1.11.6", "@xtuc/long": "4.2.2" } }, + "@wessberg/ts-evaluator": { + "version": "0.0.27", + "resolved": "https://registry.npmjs.org/@wessberg/ts-evaluator/-/ts-evaluator-0.0.27.tgz", + "integrity": "sha512-7gOpVm3yYojUp/Yn7F4ZybJRxyqfMNf0LXK5KJiawbPfL0XTsJV+0mgrEDjOIR6Bi0OYk2Cyg4tjFu1r8MCZaA==", + "dev": true, + "requires": { + "chalk": "^4.1.0", + "jsdom": "^16.4.0", + "object-path": "^0.11.5", + "tslib": "^2.0.3" + }, + "dependencies": { + "ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "dev": true, + "requires": { + "color-convert": "^2.0.1" + } + }, + "chalk": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", + "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", + "dev": true, + "requires": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + } + }, + "color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "requires": { + "color-name": "~1.1.4" + } + }, + "color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true + }, + "has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true + }, + "supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "dev": true, + "requires": { + "has-flag": "^4.0.0" + } + } + } + }, "@xtuc/ieee754": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/@xtuc/ieee754/-/ieee754-1.2.0.tgz", @@ -21673,6 +23422,33 @@ "integrity": "sha512-GpSwvyXOcOOlV70vbnzjj4fW5xW/FdUF6nQEt1ENy7m4ZCczi1+/buVUPAqmGfqznsORNFzUMjctTIp8a9tuCQ==", "dev": true }, + "@yarnpkg/parsers": { + "version": "3.0.0-rc.46", + "resolved": "https://registry.npmjs.org/@yarnpkg/parsers/-/parsers-3.0.0-rc.46.tgz", + "integrity": "sha512-aiATs7pSutzda/rq8fnuPwTglyVwjM22bNnK2ZgjrpAjQHSSl3lztd2f9evst1W/qnC58DRz7T7QndUDumAR4Q==", + "dev": true, + "requires": { + "js-yaml": "^3.10.0", + "tslib": "^2.4.0" + } + }, + "@zkochan/js-yaml": { + "version": "0.0.6", + "resolved": "https://registry.npmjs.org/@zkochan/js-yaml/-/js-yaml-0.0.6.tgz", + "integrity": "sha512-nzvgl3VfhcELQ8LyVrYOru+UtAy1nrygk2+AGbTm8a5YcO6o8lSjAT+pfg3vJWxIoZKOUhrK6UU7xW/+00kQrg==", + "dev": true, + "requires": { + "argparse": "^2.0.1" + }, + "dependencies": { + "argparse": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz", + "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==", + "dev": true + } + } + }, "abab": { "version": "2.0.6", "resolved": "https://registry.npmjs.org/abab/-/abab-2.0.6.tgz", @@ -21696,20 +23472,38 @@ } }, "ace-builds": { - "version": "1.18.0", - "resolved": "https://registry.npmjs.org/ace-builds/-/ace-builds-1.18.0.tgz", - "integrity": "sha512-ETLeQ3X1XvcWckOZFR+KvTectZyEwDm2p+CckWazS+xsK3THHVxn/PkfkPr37OTNKVY/yJRx29JGERV77YQYXw==" + "version": "1.28.0", + "resolved": "https://registry.npmjs.org/ace-builds/-/ace-builds-1.28.0.tgz", + "integrity": "sha512-wkJp+Wz8MRHtCVdt65L/jPFLAQ0iqJZ2EeD2XWOvKGbIi4mZNwHlpHRLRB8ZnQ07VoiB0TLFWwIjjm2FL9gUcQ==" }, "acorn": { - "version": "8.8.1", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.8.1.tgz", - "integrity": "sha512-7zFpHzhnqYKrkYdUjF1HI1bzd0VygEGX8lFk4k5zVMqHEoES+P+7TKI+EvLO9WVMJ8eekdO0aDEK044xTXwPPA==", + "version": "8.10.0", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.10.0.tgz", + "integrity": "sha512-F0SAmZ8iUtS//m8DmCTA0jlh6TDKkHQyK6xc6V4KDTyZKA9dnvX9/3sRTVQrWm79glUAZbnmmNcdYwUIHWVybw==", "dev": true }, + "acorn-globals": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/acorn-globals/-/acorn-globals-6.0.0.tgz", + "integrity": "sha512-ZQl7LOWaF5ePqqcX4hLuv/bLXYQNfNWw2c0/yX/TsPRKamzHcTGQnlCjHT3TsmkOUVEPS3crCxiPfdzE/Trlhg==", + "dev": true, + "requires": { + "acorn": "^7.1.1", + "acorn-walk": "^7.1.1" + }, + "dependencies": { + "acorn": { + "version": "7.4.1", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz", + "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==", + "dev": true + } + } + }, "acorn-import-assertions": { - "version": "1.8.0", - "resolved": "https://registry.npmjs.org/acorn-import-assertions/-/acorn-import-assertions-1.8.0.tgz", - "integrity": "sha512-m7VZ3jwz4eK6A4Vtt8Ew1/mNbP24u0FhdyfA7fSvnJR6LMdfOYnmuIrrJAgrYfYJ10F/otaHTtrtrtmHdMNzEw==", + "version": "1.9.0", + "resolved": "https://registry.npmjs.org/acorn-import-assertions/-/acorn-import-assertions-1.9.0.tgz", + "integrity": "sha512-cmMwop9x+8KFhxvKrKfPYmN6/pKTYYHBqLa0DfvVZcKMJWNyWLnaqND7dx/qn66R7ewM1UX5XMaDVP5wlVTaVA==", "dev": true }, "acorn-jsx": { @@ -21718,6 +23512,12 @@ "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==", "dev": true }, + "acorn-walk": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-7.2.0.tgz", + "integrity": "sha512-OPdCF6GsMIP+Az+aWfAAOEt2/+iVDKE7oy6lJ098aoe59oAmK76qV6Gw60SbZ8jHuG2wH058GF4pLFbYamYrVA==", + "dev": true + }, "adjust-sourcemap-loader": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/adjust-sourcemap-loader/-/adjust-sourcemap-loader-4.0.0.tgz", @@ -21751,13 +23551,11 @@ } }, "agentkeepalive": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/agentkeepalive/-/agentkeepalive-4.3.0.tgz", - "integrity": "sha512-7Epl1Blf4Sy37j4v9f9FjICCh4+KAQOyXgHEwlyBiAQLbhKdq/i2QQU3amQalS/wPhdPzDXPL5DMR5bkn+YeWg==", + "version": "4.5.0", + "resolved": "https://registry.npmjs.org/agentkeepalive/-/agentkeepalive-4.5.0.tgz", + "integrity": "sha512-5GG/5IbQQpC9FpkRGsSvZI5QYeSCzlJHdpBQntCsuTOxhKD8lqKhrleg2Yi7yvMIf82Ycmmqln9U8V9qwEiJew==", "dev": true, "requires": { - "debug": "^4.1.0", - "depd": "^2.0.0", "humanize-ms": "^1.2.1" } }, @@ -21801,14 +23599,6 @@ "fast-deep-equal": "^3.1.3" } }, - "angular-google-tag-manager": { - "version": "1.7.0", - "resolved": "https://registry.npmjs.org/angular-google-tag-manager/-/angular-google-tag-manager-1.7.0.tgz", - "integrity": "sha512-0lUOP7KYH0d1SV3mT/nSPL0WIuoT6fNBFod0JQ61OKsBAEMjmWfpkqMPVHaR3g+/RWs2Zy9St+PgbUGKRlye1g==", - "requires": { - "tslib": "^2.4.1" - } - }, "angular-resizable-element": { "version": "7.0.2", "resolved": "https://registry.npmjs.org/angular-resizable-element/-/angular-resizable-element-7.0.2.tgz", @@ -21825,21 +23615,6 @@ "tslib": "^2.0.0" } }, - "angular2-csv": { - "version": "0.2.9", - "resolved": "https://registry.npmjs.org/angular2-csv/-/angular2-csv-0.2.9.tgz", - "integrity": "sha512-RmVpaT2DSLJikPIxXfvhNHT/a03g+jM7Wsx0x+kNmCTuTqA1MAIPVhZPNgFvoSvZM898ACgcTSV6vvsDLdt1BA==", - "requires": { - "tslib": "^1.9.0" - }, - "dependencies": { - "tslib": { - "version": "1.14.1", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", - "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==" - } - } - }, "ansi-colors": { "version": "4.1.3", "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.3.tgz", @@ -21893,12 +23668,6 @@ "picomatch": "^2.0.4" } }, - "app-root-path": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/app-root-path/-/app-root-path-3.1.0.tgz", - "integrity": "sha512-biN3PwB2gUtjaYy/isrU3aNWI5w+fAfvHkSvCKeQGxhmYpwKFUxudR3Yya+KqVRHBmEDYh+/lTozYCFbmzX4nA==", - "dev": true - }, "aproba": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/aproba/-/aproba-2.0.0.tgz", @@ -21939,12 +23708,22 @@ } }, "aria-query": { - "version": "5.1.3", - "resolved": "https://registry.npmjs.org/aria-query/-/aria-query-5.1.3.tgz", - "integrity": "sha512-R5iJ5lkuHybztUfuOAznmboyjWq8O6sqNqtK7CLOqdydi54VNbORp49mb14KbWgG1QD3JFO9hJdZ+y4KutfdOQ==", + "version": "5.3.0", + "resolved": "https://registry.npmjs.org/aria-query/-/aria-query-5.3.0.tgz", + "integrity": "sha512-b0P0sZPKtyu8HkeRAfCq0IfURZK+SuwMjY1UXGBU27wpAiTwQAIlq56IbIO+ytk/JjS1fMR14ee5WBBfKi5J6A==", "dev": true, "requires": { - "deep-equal": "^2.0.5" + "dequal": "^2.0.3" + } + }, + "array-buffer-byte-length": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/array-buffer-byte-length/-/array-buffer-byte-length-1.0.0.tgz", + "integrity": "sha512-LPuwb2P+NrQw3XhxGc36+XSvuBPopovXYTR9Ew++Du9Yb/bx5AzBfrIsBoj0EZUifjQU+sHL21sseZ3jerWO/A==", + "dev": true, + "requires": { + "call-bind": "^1.0.2", + "is-array-buffer": "^3.0.1" } }, "array-flatten": { @@ -21972,6 +23751,19 @@ "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==", "dev": true }, + "array.prototype.findlastindex": { + "version": "1.2.3", + "resolved": "https://registry.npmjs.org/array.prototype.findlastindex/-/array.prototype.findlastindex-1.2.3.tgz", + "integrity": "sha512-LzLoiOMAxvy+Gd3BAq3B7VeIgPdo+Q8hthvKtXybMvRV0jrXfJM/t8mw7nNlpEcVlVUnCnM2KSX4XU5HmpodOA==", + "dev": true, + "requires": { + "call-bind": "^1.0.2", + "define-properties": "^1.2.0", + "es-abstract": "^1.22.1", + "es-shim-unscopables": "^1.0.0", + "get-intrinsic": "^1.2.1" + } + }, "array.prototype.flat": { "version": "1.3.1", "resolved": "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.3.1.tgz", @@ -21996,20 +23788,41 @@ "es-shim-unscopables": "^1.0.0" } }, - "ast-types-flow": { - "version": "0.0.7", - "resolved": "https://registry.npmjs.org/ast-types-flow/-/ast-types-flow-0.0.7.tgz", - "integrity": "sha512-eBvWn1lvIApYMhzQMsu9ciLfkBY499mFZlNqG+/9WR7PVlroQw0vG30cOQQbaKz3sCEc44TAOu2ykzqXSNnwag==", + "arraybuffer.prototype.slice": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/arraybuffer.prototype.slice/-/arraybuffer.prototype.slice-1.0.2.tgz", + "integrity": "sha512-yMBKppFur/fbHu9/6USUe03bZ4knMYiwFBcyiaXB8Go0qNehwX6inYPzK9U0NeQvGxKthcmHcaR8P5MStSRBAw==", + "dev": true, + "requires": { + "array-buffer-byte-length": "^1.0.0", + "call-bind": "^1.0.2", + "define-properties": "^1.2.0", + "es-abstract": "^1.22.1", + "get-intrinsic": "^1.2.1", + "is-array-buffer": "^3.0.2", + "is-shared-array-buffer": "^1.0.2" + } + }, + "async": { + "version": "3.2.4", + "resolved": "https://registry.npmjs.org/async/-/async-3.2.4.tgz", + "integrity": "sha512-iAB+JbDEGXhyIUavoDl9WP/Jj106Kz9DEn1DPgYw5ruDn0e3Wgi3sKFm55sASdGBNOQB8F59d9qQ7deqrHA8wQ==", + "dev": true + }, + "asynckit": { + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz", + "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==", "dev": true }, "autoprefixer": { - "version": "10.4.13", - "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.4.13.tgz", - "integrity": "sha512-49vKpMqcZYsJjwotvt4+h/BCjJVnhGwcLpDt5xkcaOG3eLrG/HUYLagrihYsQ+qrIBgIzX1Rw7a6L8I/ZA1Atg==", + "version": "10.4.14", + "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.4.14.tgz", + "integrity": "sha512-FQzyfOsTlwVzjHxKEqRIAdJx9niO6VCBCoEwax/VLSoQF29ggECcPuBqUMZ+u8jCZOPSy8b8/8KnuFbp0SaFZQ==", "dev": true, "requires": { - "browserslist": "^4.21.4", - "caniuse-lite": "^1.0.30001426", + "browserslist": "^4.21.5", + "caniuse-lite": "^1.0.30001464", "fraction.js": "^4.2.0", "normalize-range": "^0.1.2", "picocolors": "^1.0.0", @@ -22022,6 +23835,30 @@ "integrity": "sha512-DMD0KiN46eipeziST1LPP/STfDU0sufISXmjSgvVsoU2tqxctQeASejWcfNtxYKqETM1UxQ8sp2OrSBWpHY6sw==", "dev": true }, + "axios": { + "version": "1.5.1", + "resolved": "https://registry.npmjs.org/axios/-/axios-1.5.1.tgz", + "integrity": "sha512-Q28iYCWzNHjAm+yEAot5QaAMxhMghWLFVf7rRdwhUI+c2jix2DUXjAHXVi+s1ibs3mjPO/cCgbA++3BjD0vP/A==", + "dev": true, + "requires": { + "follow-redirects": "^1.15.0", + "form-data": "^4.0.0", + "proxy-from-env": "^1.1.0" + }, + "dependencies": { + "form-data": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz", + "integrity": "sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==", + "dev": true, + "requires": { + "asynckit": "^0.4.0", + "combined-stream": "^1.0.8", + "mime-types": "^2.1.12" + } + } + } + }, "axobject-query": { "version": "3.1.1", "resolved": "https://registry.npmjs.org/axobject-query/-/axobject-query-3.1.1.tgz", @@ -22032,12 +23869,12 @@ } }, "babel-loader": { - "version": "9.1.2", - "resolved": "https://registry.npmjs.org/babel-loader/-/babel-loader-9.1.2.tgz", - "integrity": "sha512-mN14niXW43tddohGl8HPu5yfQq70iUThvFL/4QzESA7GcZoC0eVOhvWdQ8+3UlSjaDE9MVtsW9mxDY07W7VpVA==", + "version": "9.1.3", + "resolved": "https://registry.npmjs.org/babel-loader/-/babel-loader-9.1.3.tgz", + "integrity": "sha512-xG3ST4DglodGf8qSwv0MdeWLhrDsw/32QMdTO5T1ZIp9gQur0HkCyFs7Awskr10JKXFXwpAhiCuYX5oGXnRGbw==", "dev": true, "requires": { - "find-cache-dir": "^3.3.2", + "find-cache-dir": "^4.0.0", "schema-utils": "^4.0.0" } }, @@ -22055,41 +23892,41 @@ } }, "babel-plugin-polyfill-corejs2": { - "version": "0.3.3", - "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.3.3.tgz", - "integrity": "sha512-8hOdmFYFSZhqg2C/JgLUQ+t52o5nirNwaWM2B9LWteozwIvM14VSwdsCAUET10qT+kmySAlseadmfeeSWFCy+Q==", + "version": "0.4.5", + "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.4.5.tgz", + "integrity": "sha512-19hwUH5FKl49JEsvyTcoHakh6BE0wgXLLptIyKZ3PijHc/Ci521wygORCUCCred+E/twuqRyAkE02BAWPmsHOg==", "dev": true, "requires": { - "@babel/compat-data": "^7.17.7", - "@babel/helper-define-polyfill-provider": "^0.3.3", - "semver": "^6.1.1" + "@babel/compat-data": "^7.22.6", + "@babel/helper-define-polyfill-provider": "^0.4.2", + "semver": "^6.3.1" }, "dependencies": { "semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", + "version": "6.3.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", + "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", "dev": true } } }, "babel-plugin-polyfill-corejs3": { - "version": "0.6.0", - "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.6.0.tgz", - "integrity": "sha512-+eHqR6OPcBhJOGgsIar7xoAB1GcSwVUA3XjAd7HJNzOXT4wv6/H7KIdA/Nc60cvUlDbKApmqNvD1B1bzOt4nyA==", + "version": "0.8.4", + "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.8.4.tgz", + "integrity": "sha512-9l//BZZsPR+5XjyJMPtZSK4jv0BsTO1zDac2GC6ygx9WLGlcsnRd1Co0B2zT5fF5Ic6BZy+9m3HNZ3QcOeDKfg==", "dev": true, "requires": { - "@babel/helper-define-polyfill-provider": "^0.3.3", - "core-js-compat": "^3.25.1" + "@babel/helper-define-polyfill-provider": "^0.4.2", + "core-js-compat": "^3.32.2" } }, "babel-plugin-polyfill-regenerator": { - "version": "0.4.1", - "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.4.1.tgz", - "integrity": "sha512-NtQGmyQDXjQqQ+IzRkBVwEOz9lQ4zxAQZgoAYEtU9dJjnl1Oc98qnN7jcp+bE7O7aYzVpavXE3/VKXNzUbh7aw==", + "version": "0.5.2", + "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.5.2.tgz", + "integrity": "sha512-tAlOptU0Xj34V1Y2PNTL4Y0FOJMDB6bZmoW39FeCQIhigGLkqu3Fj6uiXpxIf6Ij274ENdYx64y6Au+ZKlb1IA==", "dev": true, "requires": { - "@babel/helper-define-polyfill-provider": "^0.3.3" + "@babel/helper-define-polyfill-provider": "^0.4.2" } }, "balanced-match": { @@ -22178,6 +24015,15 @@ "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==", "dev": true + }, + "qs": { + "version": "6.11.0", + "resolved": "https://registry.npmjs.org/qs/-/qs-6.11.0.tgz", + "integrity": "sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==", + "dev": true, + "requires": { + "side-channel": "^1.0.4" + } } } }, @@ -22196,13 +24042,13 @@ "boolbase": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz", - "integrity": "sha1-aN/1++YMUes3cl6p4+0xDcwed24=", + "integrity": "sha512-JZOSA7Mo9sNGB8+UjSgzdLtokWAky1zbztM3WRLCbZ70/3cTANmQmOdR7y2g+J0e2WXywy1yS468tY+IruqEww==", "dev": true }, "bootstrap": { - "version": "5.2.3", - "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-5.2.3.tgz", - "integrity": "sha512-cEKPM+fwb3cT8NzQZYEu4HilJ3anCrWqh3CHAok1p9jXqMPsPTBhU25fBckEJHJ/p+tTxTFTsFQGM+gaHpi3QQ==" + "version": "5.3.2", + "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-5.3.2.tgz", + "integrity": "sha512-D32nmNWiQHo94BKHLmOrdjlL05q1c8oxbtBphQFb9Z5to6eGRDCm0QgeaZ4zFBHzfg2++rqa2JkqCcxDy0sH0g==" }, "bowser": { "version": "2.11.0", @@ -22280,16 +24126,22 @@ } } }, + "browser-process-hrtime": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/browser-process-hrtime/-/browser-process-hrtime-1.0.0.tgz", + "integrity": "sha512-9o5UecI3GhkpM6DrXr69PblIuWxPKk9Y0jHBRhdocZ2y7YECBFCsHm79Pr3OyR2AvjhDkabFJaDJMYRazHgsow==", + "dev": true + }, "browserslist": { - "version": "4.21.5", - "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.21.5.tgz", - "integrity": "sha512-tUkiguQGW7S3IhB7N+c2MV/HZPSCPAAiYBZXLsBhFB/PCy6ZKKsZrmBayHV9fdGV/ARIfJ14NkxKzRDjvp7L6w==", + "version": "4.21.11", + "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.21.11.tgz", + "integrity": "sha512-xn1UXOKUz7DjdGlg9RrUr0GGiWzI97UQJnugHtH0OLDfJB7jMgoIkYvRIEO1l9EeEERVqeqLYOcFBW9ldjypbQ==", "dev": true, "requires": { - "caniuse-lite": "^1.0.30001449", - "electron-to-chromium": "^1.4.284", - "node-releases": "^2.0.8", - "update-browserslist-db": "^1.0.10" + "caniuse-lite": "^1.0.30001538", + "electron-to-chromium": "^1.4.526", + "node-releases": "^2.0.13", + "update-browserslist-db": "^1.0.13" } }, "buffer": { @@ -22308,6 +24160,12 @@ "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==", "dev": true }, + "builtin-modules": { + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-3.3.0.tgz", + "integrity": "sha512-zhaCDicdLuWN5UbN5IMnFqNMhNfo919sH85y2/ea+5Yg9TsTkeZxpL+JLbp6cgYFS4sRLp3YV4S6yDuqVWHYOw==", + "dev": true + }, "builtins": { "version": "5.0.1", "resolved": "https://registry.npmjs.org/builtins/-/builtins-5.0.1.tgz", @@ -22324,21 +24182,20 @@ "dev": true }, "cacache": { - "version": "17.0.4", - "resolved": "https://registry.npmjs.org/cacache/-/cacache-17.0.4.tgz", - "integrity": "sha512-Z/nL3gU+zTUjz5pCA5vVjYM8pmaw2kxM7JEiE0fv3w77Wj+sFbi70CrBruUWH0uNcEdvLDixFpgA2JM4F4DBjA==", + "version": "17.1.4", + "resolved": "https://registry.npmjs.org/cacache/-/cacache-17.1.4.tgz", + "integrity": "sha512-/aJwG2l3ZMJ1xNAnqbMpA40of9dj/pIH3QfiuQSqjfPJF747VR0J/bHn+/KdNnHKc6XQcWt/AfRSBft82W1d2A==", "dev": true, "requires": { "@npmcli/fs": "^3.1.0", "fs-minipass": "^3.0.0", - "glob": "^8.0.1", + "glob": "^10.2.2", "lru-cache": "^7.7.1", - "minipass": "^4.0.0", + "minipass": "^7.0.3", "minipass-collect": "^1.0.2", "minipass-flush": "^1.0.5", "minipass-pipeline": "^1.2.4", "p-map": "^4.0.0", - "promise-inflight": "^1.0.1", "ssri": "^10.0.0", "tar": "^6.1.11", "unique-filename": "^3.0.0" @@ -22354,32 +24211,38 @@ } }, "glob": { - "version": "8.1.0", - "resolved": "https://registry.npmjs.org/glob/-/glob-8.1.0.tgz", - "integrity": "sha512-r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ==", + "version": "10.3.9", + "resolved": "https://registry.npmjs.org/glob/-/glob-10.3.9.tgz", + "integrity": "sha512-2tU/LKevAQvDVuVJ9pg9Yv9xcbSh+TqHuTaXTNbQwf+0kDl9Fm6bMovi4Nm5c8TVvfxo2LLcqCGtmO9KoJaGWg==", "dev": true, "requires": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^5.0.1", - "once": "^1.3.0" + "foreground-child": "^3.1.0", + "jackspeak": "^2.3.5", + "minimatch": "^9.0.1", + "minipass": "^5.0.0 || ^6.0.2 || ^7.0.0", + "path-scurry": "^1.10.1" } }, "lru-cache": { - "version": "7.14.1", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.14.1.tgz", - "integrity": "sha512-ysxwsnTKdAx96aTRdhDOCQfDgbHnt8SK0KY8SEjO0wHinhWOFTESbjVCMPbU1uGXg/ch4lifqx0wfjOawU2+WA==", + "version": "7.18.3", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.18.3.tgz", + "integrity": "sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA==", "dev": true }, "minimatch": { - "version": "5.1.6", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz", - "integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==", + "version": "9.0.3", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.3.tgz", + "integrity": "sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg==", "dev": true, "requires": { "brace-expansion": "^2.0.1" } + }, + "minipass": { + "version": "7.0.3", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.0.3.tgz", + "integrity": "sha512-LhbbwCfz3vsb12j/WkWQPZfKTsgqIe1Nf/ti1pKjYESGLHIVjWU96G9/ljLH4F9mWNVhlQOm0VySdAWzf05dpg==", + "dev": true } } }, @@ -22387,7 +24250,6 @@ "version": "1.0.2", "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz", "integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==", - "dev": true, "requires": { "function-bind": "^1.1.1", "get-intrinsic": "^1.0.2" @@ -22406,9 +24268,9 @@ "dev": true }, "caniuse-lite": { - "version": "1.0.30001477", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001477.tgz", - "integrity": "sha512-lZim4iUHhGcy5p+Ri/G7m84hJwncj+Kz7S5aD4hoQfslKZJgt0tHc/hafVbqHC5bbhHb+mrW2JOUHkI5KH7toQ==", + "version": "1.0.30001539", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001539.tgz", + "integrity": "sha512-hfS5tE8bnNiNvEOEkm8HElUHroYwlqMMENEzELymy77+tJ6m+gA2krtHl5hxJaj71OlpC2cHZbdSMX1/YEqEkA==", "dev": true }, "chalk": { @@ -22511,88 +24373,6 @@ "shallow-clone": "^3.0.0" } }, - "codelyzer": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/codelyzer/-/codelyzer-6.0.2.tgz", - "integrity": "sha512-v3+E0Ucu2xWJMOJ2fA/q9pDT/hlxHftHGPUay1/1cTgyPV5JTHFdO9hqo837Sx2s9vKBMTt5gO+lhF95PO6J+g==", - "dev": true, - "requires": { - "@angular/compiler": "9.0.0", - "@angular/core": "9.0.0", - "app-root-path": "^3.0.0", - "aria-query": "^3.0.0", - "axobject-query": "2.0.2", - "css-selector-tokenizer": "^0.7.1", - "cssauron": "^1.4.0", - "damerau-levenshtein": "^1.0.4", - "rxjs": "^6.5.3", - "semver-dsl": "^1.0.1", - "source-map": "^0.5.7", - "sprintf-js": "^1.1.2", - "tslib": "^1.10.0", - "zone.js": "~0.10.3" - }, - "dependencies": { - "@angular/compiler": { - "version": "9.0.0", - "resolved": "https://registry.npmjs.org/@angular/compiler/-/compiler-9.0.0.tgz", - "integrity": "sha512-ctjwuntPfZZT2mNj2NDIVu51t9cvbhl/16epc5xEwyzyDt76pX9UgwvY+MbXrf/C/FWwdtmNtfP698BKI+9leQ==", - "dev": true - }, - "@angular/core": { - "version": "9.0.0", - "resolved": "https://registry.npmjs.org/@angular/core/-/core-9.0.0.tgz", - "integrity": "sha512-6Pxgsrf0qF9iFFqmIcWmjJGkkCaCm6V5QNnxMy2KloO3SDq6QuMVRbN9RtC8Urmo25LP+eZ6ZgYqFYpdD8Hd9w==", - "dev": true - }, - "aria-query": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/aria-query/-/aria-query-3.0.0.tgz", - "integrity": "sha512-majUxHgLehQTeSA+hClx+DY09OVUqG3GtezWkF1krgLGNdlDu9l9V8DaqNMWbq4Eddc8wsyDA0hpDUtnYxQEXw==", - "dev": true, - "requires": { - "ast-types-flow": "0.0.7", - "commander": "^2.11.0" - } - }, - "axobject-query": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/axobject-query/-/axobject-query-2.0.2.tgz", - "integrity": "sha512-MCeek8ZH7hKyO1rWUbKNQBbl4l2eY0ntk7OGi+q0RlafrCnfPxC06WZA+uebCfmYp4mNU9jRBP1AhGyf8+W3ww==", - "dev": true, - "requires": { - "ast-types-flow": "0.0.7" - } - }, - "rxjs": { - "version": "6.6.7", - "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.7.tgz", - "integrity": "sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==", - "dev": true, - "requires": { - "tslib": "^1.9.0" - } - }, - "source-map": { - "version": "0.5.7", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", - "integrity": "sha512-LbrmJOMUSdEVxIKvdcJzQC+nQhe8FUZQTXQy6+I75skNgn3OoQ0DZA8YnFa7gp8tqtL3KPf1kmo0R5DoApeSGQ==", - "dev": true - }, - "tslib": { - "version": "1.14.1", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", - "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==", - "dev": true - }, - "zone.js": { - "version": "0.10.3", - "resolved": "https://registry.npmjs.org/zone.js/-/zone.js-0.10.3.tgz", - "integrity": "sha512-LXVLVEq0NNOqK/fLJo3d0kfzd4sxwn2/h67/02pjCjfKDxgx1i9QqpvtHD8CrBnSSwMw5+dy11O7FRX5mkO7Cg==", - "dev": true - } - } - }, "color-convert": { "version": "1.9.3", "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz", @@ -22615,9 +24395,9 @@ "dev": true }, "colorette": { - "version": "2.0.19", - "resolved": "https://registry.npmjs.org/colorette/-/colorette-2.0.19.tgz", - "integrity": "sha512-3tlv/dIP7FWvj3BsbHrGLJ6l/oKh1O3TcgBqMn+yyCagOxc23fyzDS6HypQbgxWbkpDnf52p1LuR4eWDQ/K9WQ==", + "version": "2.0.20", + "resolved": "https://registry.npmjs.org/colorette/-/colorette-2.0.20.tgz", + "integrity": "sha512-IfEDxwoWIjkeXL1eXcDiow4UbKjhLdq6/EuSVR9GMN7KVH3r9gQ83e73hsz1Nd1T3ijd5xv1wcWRYO+D6kCI2w==", "dev": true }, "colornames": { @@ -22625,6 +24405,15 @@ "resolved": "https://registry.npmjs.org/colornames/-/colornames-1.1.1.tgz", "integrity": "sha1-+IiQMGhcfE/54qVZ9Qd+t2qBb5Y=" }, + "combined-stream": { + "version": "1.0.8", + "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz", + "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==", + "dev": true, + "requires": { + "delayed-stream": "~1.0.0" + } + }, "commander": { "version": "2.20.3", "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz", @@ -22632,15 +24421,15 @@ "dev": true }, "comment-parser": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/comment-parser/-/comment-parser-1.3.1.tgz", - "integrity": "sha512-B52sN2VNghyq5ofvUsqZjmk6YkihBX5vMSChmSK9v4ShjKf3Vk5Xcmgpw4o+iIgtrnM/u5FiMpz9VKb8lpBveA==", + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/comment-parser/-/comment-parser-1.4.0.tgz", + "integrity": "sha512-QLyTNiZ2KDOibvFPlZ6ZngVsZ/0gYnE6uTXi5aoDg8ed3AkJAz4sEje3Y8a29hQ1s6A99MZXe47fLAXQ1rTqaw==", "dev": true }, - "commondir": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz", - "integrity": "sha512-W9pAhw0ja1Edb5GVdIF1mjZw/ASI0AlShXM83UUGe2DVr5TdAPEA1OA8m/g8zWp9x6On7gqufY+FatDbC3MDQg==", + "common-path-prefix": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/common-path-prefix/-/common-path-prefix-3.0.0.tgz", + "integrity": "sha512-QE33hToZseCH3jS0qN96O/bSh3kaw/h+Tq7ngyY9eWDUnTlTNUyqfqvCXioLe5Na5jFsL78ra/wuBU4iuEgd4w==", "dev": true }, "compressible": { @@ -22806,12 +24595,12 @@ } }, "core-js-compat": { - "version": "3.27.2", - "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.27.2.tgz", - "integrity": "sha512-welaYuF7ZtbYKGrIy7y3eb40d37rG1FvzEOfe7hSLd2iD6duMDqUhRfSvCGyC46HhR6Y8JXXdZ2lnRUMkPBpvg==", + "version": "3.32.2", + "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.32.2.tgz", + "integrity": "sha512-+GjlguTDINOijtVRUxrQOv3kfu9rl+qPNdX2LTbJ/ZyVTuxK+ksVSAGX1nHstu4hrv1En/uPTtWgq2gI5wt4AQ==", "dev": true, "requires": { - "browserslist": "^4.21.4" + "browserslist": "^4.21.10" } }, "core-util-is": { @@ -22821,29 +24610,46 @@ "dev": true }, "cosmiconfig": { - "version": "7.1.0", - "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-7.1.0.tgz", - "integrity": "sha512-AdmX6xUzdNASswsFtmwSt7Vj8po9IuqXm0UXz7QKPuEUmPB4XyjGfaAr2PSuELMwkRMVH1EpIkX5bTZGRB3eCA==", + "version": "8.3.6", + "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-8.3.6.tgz", + "integrity": "sha512-kcZ6+W5QzcJ3P1Mt+83OUv/oHFqZHIx8DuxG6eZ5RGMERoLqp4BuGjhHLYGK+Kf5XVkQvqBSmAy/nGWN3qDgEA==", "dev": true, "requires": { - "@types/parse-json": "^4.0.0", - "import-fresh": "^3.2.1", - "parse-json": "^5.0.0", - "path-type": "^4.0.0", - "yaml": "^1.10.0" + "import-fresh": "^3.3.0", + "js-yaml": "^4.1.0", + "parse-json": "^5.2.0", + "path-type": "^4.0.0" + }, + "dependencies": { + "argparse": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz", + "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==", + "dev": true + }, + "js-yaml": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz", + "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==", + "dev": true, + "requires": { + "argparse": "^2.0.1" + } + } } }, "critters": { - "version": "0.0.16", - "resolved": "https://registry.npmjs.org/critters/-/critters-0.0.16.tgz", - "integrity": "sha512-JwjgmO6i3y6RWtLYmXwO5jMd+maZt8Tnfu7VVISmEWyQqfLpB8soBswf8/2bu6SBXxtKA68Al3c+qIG1ApT68A==", + "version": "0.0.20", + "resolved": "https://registry.npmjs.org/critters/-/critters-0.0.20.tgz", + "integrity": "sha512-CImNRorKOl5d8TWcnAz5n5izQ6HFsvz29k327/ELy6UFcmbiZNOsinaKvzv16WZR0P6etfSWYzE47C4/56B3Uw==", "dev": true, "requires": { "chalk": "^4.1.0", - "css-select": "^4.2.0", - "parse5": "^6.0.1", - "parse5-htmlparser2-tree-adapter": "^6.0.1", - "postcss": "^8.3.7", + "css-select": "^5.1.0", + "dom-serializer": "^2.0.0", + "domhandler": "^5.0.2", + "htmlparser2": "^8.0.2", + "postcss": "^8.4.23", "pretty-bytes": "^5.3.0" }, "dependencies": { @@ -22887,12 +24693,6 @@ "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", "dev": true }, - "parse5": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/parse5/-/parse5-6.0.1.tgz", - "integrity": "sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw==", - "dev": true - }, "supports-color": { "version": "7.2.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", @@ -22916,15 +24716,15 @@ } }, "css-loader": { - "version": "6.7.3", - "resolved": "https://registry.npmjs.org/css-loader/-/css-loader-6.7.3.tgz", - "integrity": "sha512-qhOH1KlBMnZP8FzRO6YCH9UHXQhVMcEGLyNdb7Hv2cpcmJbW0YrddO+tG1ab5nT41KpHIYGsbeHqxB9xPu1pKQ==", + "version": "6.8.1", + "resolved": "https://registry.npmjs.org/css-loader/-/css-loader-6.8.1.tgz", + "integrity": "sha512-xDAXtEVGlD0gJ07iclwWVkLoZOpEvAWaSyf6W18S2pOC//K8+qUDIx8IIT3D+HjnmkJPQeesOPv5aiUaJsCM2g==", "dev": true, "requires": { "icss-utils": "^5.1.0", - "postcss": "^8.4.19", + "postcss": "^8.4.21", "postcss-modules-extract-imports": "^3.0.0", - "postcss-modules-local-by-default": "^4.0.0", + "postcss-modules-local-by-default": "^4.0.3", "postcss-modules-scope": "^3.0.0", "postcss-modules-values": "^4.0.0", "postcss-value-parser": "^4.2.0", @@ -22932,49 +24732,53 @@ } }, "css-select": { - "version": "4.2.1", - "resolved": "https://registry.npmjs.org/css-select/-/css-select-4.2.1.tgz", - "integrity": "sha512-/aUslKhzkTNCQUB2qTX84lVmfia9NyjP3WpDGtj/WxhwBzWBYUV3DgUpurHTme8UTPcPlAD1DJ+b0nN/t50zDQ==", + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/css-select/-/css-select-5.1.0.tgz", + "integrity": "sha512-nwoRF1rvRRnnCqqY7updORDsuqKzqYJ28+oSMaJMMgOauh3fvwHqMS7EZpIPqK8GL+g9mKxF1vP/ZjSeNjEVHg==", "dev": true, "requires": { "boolbase": "^1.0.0", - "css-what": "^5.1.0", - "domhandler": "^4.3.0", - "domutils": "^2.8.0", + "css-what": "^6.1.0", + "domhandler": "^5.0.2", + "domutils": "^3.0.1", "nth-check": "^2.0.1" } }, - "css-selector-tokenizer": { - "version": "0.7.3", - "resolved": "https://registry.npmjs.org/css-selector-tokenizer/-/css-selector-tokenizer-0.7.3.tgz", - "integrity": "sha512-jWQv3oCEL5kMErj4wRnK/OPoBi0D+P1FR2cDCKYPaMeD2eW3/mttav8HT4hT1CKopiJI/psEULjkClhvJo4Lvg==", - "dev": true, - "requires": { - "cssesc": "^3.0.0", - "fastparse": "^1.1.2" - } - }, "css-what": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/css-what/-/css-what-5.1.0.tgz", - "integrity": "sha512-arSMRWIIFY0hV8pIxZMEfmMI47Wj3R/aWpZDDxWYCPEiOMv6tfOrnpDtgxBYPEQD4V0Y/958+1TdC3iWTFcUPw==", + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/css-what/-/css-what-6.1.0.tgz", + "integrity": "sha512-HTUrgRJ7r4dsZKU6GjmpfRK1O76h97Z8MfS1G0FozR+oF2kG6Vfe8JE6zwrkbxigziPHinCJ+gCPjA9EaBDtRw==", "dev": true }, - "cssauron": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/cssauron/-/cssauron-1.4.0.tgz", - "integrity": "sha512-Ht70DcFBh+/ekjVrYS2PlDMdSQEl3OFNmjK6lcn49HptBgilXf/Zwg4uFh9Xn0pX3Q8YOkSjIFOfK2osvdqpBw==", - "dev": true, - "requires": { - "through": "X.X.X" - } - }, "cssesc": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/cssesc/-/cssesc-3.0.0.tgz", "integrity": "sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==", "dev": true }, + "cssom": { + "version": "0.4.4", + "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.4.4.tgz", + "integrity": "sha512-p3pvU7r1MyyqbTk+WbNJIgJjG2VmTIaB10rI93LzVPrmDJKkzKYMtxxyAvQXR/NS6otuzveI7+7BBq3SjBS2mw==", + "dev": true + }, + "cssstyle": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/cssstyle/-/cssstyle-2.3.0.tgz", + "integrity": "sha512-AZL67abkUzIuvcHqk7c09cezpGNcxUxU4Ioi/05xHk4DQeTkWmGYftIE6ctU6AEt+Gn4n1lDStOtj7FKycP71A==", + "dev": true, + "requires": { + "cssom": "~0.3.6" + }, + "dependencies": { + "cssom": { + "version": "0.3.8", + "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.3.8.tgz", + "integrity": "sha512-b0tGHbfegbhPJpxpiBPU2sCkigAqtM9O121le6bbOlgyV+NyGyCmVfJ6QW9eRjz8CpNfWEOYBIMIGRYkLwsIYg==", + "dev": true + } + } + }, "curved-arrows": { "version": "0.1.0", "resolved": "https://registry.npmjs.org/curved-arrows/-/curved-arrows-0.1.0.tgz", @@ -23172,11 +24976,16 @@ } } }, - "damerau-levenshtein": { - "version": "1.0.8", - "resolved": "https://registry.npmjs.org/damerau-levenshtein/-/damerau-levenshtein-1.0.8.tgz", - "integrity": "sha512-sdQSFB7+llfUcQHUQO3+B8ERRj0Oa4w9POWMI/puGtuf7gFywGmkaLCElnudfTiKZV+NvHqL0ifzdrI8Ro7ESA==", - "dev": true + "data-urls": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/data-urls/-/data-urls-2.0.0.tgz", + "integrity": "sha512-X5eWTSXO/BJmpdIKCRuKUgSCgAN0OwliVK3yPKbwIWU1Tdw5BRajxlzMidvh+gwko9AfQ9zIj52pzF91Q3YAvQ==", + "dev": true, + "requires": { + "abab": "^2.0.3", + "whatwg-mimetype": "^2.3.0", + "whatwg-url": "^8.0.0" + } }, "debug": { "version": "4.3.4", @@ -23187,6 +24996,12 @@ "ms": "2.1.2" } }, + "decimal.js": { + "version": "10.4.3", + "resolved": "https://registry.npmjs.org/decimal.js/-/decimal.js-10.4.3.tgz", + "integrity": "sha512-VBBaLc1MgL5XpzgIP7ny5Z6Nx3UrRkIViUkPUdtl9aya5amy3De1gsUUSB1g3+3sExYNjCAsAznmukyxCb1GRA==", + "dev": true + }, "deep-equal": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-2.1.0.tgz", @@ -23208,14 +25023,6 @@ "which-boxed-primitive": "^1.0.2", "which-collection": "^1.0.1", "which-typed-array": "^1.1.8" - }, - "dependencies": { - "isarray": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.5.tgz", - "integrity": "sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==", - "dev": true - } } }, "deep-is": { @@ -23242,6 +25049,17 @@ "clone": "^1.0.2" } }, + "define-data-property": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.0.tgz", + "integrity": "sha512-UzGwzcjyv3OtAvolTj1GoyNYzfFR+iqbGjcnBEENZVCpM4/Ng1yhGNvS3lR/xDS74Tb2wGG9WzNSNIOS9UVb2g==", + "dev": true, + "requires": { + "get-intrinsic": "^1.2.1", + "gopd": "^1.0.1", + "has-property-descriptors": "^1.0.0" + } + }, "define-lazy-prop": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/define-lazy-prop/-/define-lazy-prop-2.0.0.tgz", @@ -23249,15 +25067,22 @@ "dev": true }, "define-properties": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.4.tgz", - "integrity": "sha512-uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA==", + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.2.1.tgz", + "integrity": "sha512-8QmQKqEASLd5nx0U1B1okLElbUuuttJ/AnYmRXbbbGDWh6uS208EjD4Xqq/I9wK7u0v6O08XhTWnt5XtEbR6Dg==", "dev": true, "requires": { + "define-data-property": "^1.0.1", "has-property-descriptors": "^1.0.0", "object-keys": "^1.1.1" } }, + "delayed-stream": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz", + "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==", + "dev": true + }, "delegates": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz", @@ -23270,10 +25095,10 @@ "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==", "dev": true }, - "dependency-graph": { - "version": "0.11.0", - "resolved": "https://registry.npmjs.org/dependency-graph/-/dependency-graph-0.11.0.tgz", - "integrity": "sha512-JeMq7fEshyepOWDfcfHK06N3MhyPhz++vtqWhMT5O9A3K42rdsEDpfdVqjaqaAhsw6a+ZqeDvQVtD0hFHQWrzg==", + "dequal": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/dequal/-/dequal-2.0.3.tgz", + "integrity": "sha512-0je+qPKHEMohvfRTCEo3CrPG6cAzAYgmzKyxRiYSSDkS6eGJdyVJm7WaYA5ECaAD9wLB2T4EEeymA5aFVcYXCA==", "dev": true }, "destroy": { @@ -23309,9 +25134,9 @@ "dev": true }, "dns-packet": { - "version": "5.6.0", - "resolved": "https://registry.npmjs.org/dns-packet/-/dns-packet-5.6.0.tgz", - "integrity": "sha512-rza3UH1LwdHh9qyPXp8lkwpjSNk/AMD3dPytUoRoqnypDUhY0xvbdmVhWOfxO68frEfV9BU8V12Ez7ZsHGZpCQ==", + "version": "5.6.1", + "resolved": "https://registry.npmjs.org/dns-packet/-/dns-packet-5.6.1.tgz", + "integrity": "sha512-l4gcSouhcgIKRvyy99RNVOgxXiicE+2jZoNmaNmZ6JXiGajBOJAesk1OBlJuM5k2c+eudGdLxDqXuPCKIj6kpw==", "dev": true, "requires": { "@leichtgewicht/ip-codec": "^2.0.1" @@ -23327,14 +25152,22 @@ } }, "dom-serializer": { - "version": "1.3.2", - "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-1.3.2.tgz", - "integrity": "sha512-5c54Bk5Dw4qAxNOI1pFEizPSjVsx5+bpJKmL2kPn8JhBUq2q09tTCa3mjijun2NfK78NMouDYNMBkOrPZiS+ig==", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-2.0.0.tgz", + "integrity": "sha512-wIkAryiqt/nV5EQKqQpo3SToSOV9J0DnbJqwK7Wv/Trc92zIAYZ4FlMu+JPFW1DfGFt81ZTCGgDEabffXeLyJg==", "dev": true, "requires": { - "domelementtype": "^2.0.1", - "domhandler": "^4.2.0", - "entities": "^2.0.0" + "domelementtype": "^2.3.0", + "domhandler": "^5.0.2", + "entities": "^4.2.0" + }, + "dependencies": { + "entities": { + "version": "4.5.0", + "resolved": "https://registry.npmjs.org/entities/-/entities-4.5.0.tgz", + "integrity": "sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==", + "dev": true + } } }, "dom-to-image": { @@ -23343,46 +25176,90 @@ "integrity": "sha512-Dt0QdaHmLpjURjU7Tnu3AgYSF2LuOmksSGsUcE6ItvJoCWTBEmiMXcqBdNSAm9+QbbwD7JMoVsuuKX6ZVQv1qA==" }, "domelementtype": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.2.0.tgz", - "integrity": "sha512-DtBMo82pv1dFtUmHyr48beiuq792Sxohr+8Hm9zoxklYPfa6n0Z3Byjj2IV7bmr2IyqClnqEQhfgHJJ5QF0R5A==", + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.3.0.tgz", + "integrity": "sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw==", "dev": true }, - "domhandler": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-4.3.0.tgz", - "integrity": "sha512-fC0aXNQXqKSFTr2wDNZDhsEYjCiYsDWl3D01kwt25hm1YIPyDGHvvi3rw+PLqHAl/m71MaiF7d5zvBr0p5UB2g==", + "domexception": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/domexception/-/domexception-2.0.1.tgz", + "integrity": "sha512-yxJ2mFy/sibVQlu5qHjOkf9J3K6zgmCxgJ94u2EdvDOV09H+32LtRswEcUsmUWN72pVLOEnTSRaIVVzVQgS0dg==", "dev": true, "requires": { - "domelementtype": "^2.2.0" + "webidl-conversions": "^5.0.0" + }, + "dependencies": { + "webidl-conversions": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-5.0.0.tgz", + "integrity": "sha512-VlZwKPCkYKxQgeSbH5EyngOmRp7Ww7I9rQLERETtf5ofd9pGeswWiOtogpEO850jziPRarreGxn5QIiTqpb2wA==", + "dev": true + } } }, - "domino": { - "version": "2.1.6", - "resolved": "https://registry.npmjs.org/domino/-/domino-2.1.6.tgz", - "integrity": "sha512-3VdM/SXBZX2omc9JF9nOPCtDaYQ67BGp5CoLpIQlO2KCAPETs8TcDHacF26jXadGbvUteZzRTeos2fhID5+ucQ==" + "domhandler": { + "version": "5.0.3", + "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-5.0.3.tgz", + "integrity": "sha512-cgwlv/1iFQiFnU96XXgROh8xTeetsnJiDsTc7TYCLFd9+/WNkIqPTxiM/8pSd8VIrhXGTf1Ny1q1hquVqDJB5w==", + "dev": true, + "requires": { + "domelementtype": "^2.3.0" + } + }, + "dompurify": { + "version": "3.0.6", + "resolved": "https://registry.npmjs.org/dompurify/-/dompurify-3.0.6.tgz", + "integrity": "sha512-ilkD8YEnnGh1zJ240uJsW7AzE+2qpbOUYjacomn3AvJ6J4JhKGSZ2nh4wUIXPZrEPppaCLx5jFe8T89Rk8tQ7w==" }, "domutils": { - "version": "2.8.0", - "resolved": "https://registry.npmjs.org/domutils/-/domutils-2.8.0.tgz", - "integrity": "sha512-w96Cjofp72M5IIhpjgobBimYEfoPjx1Vx0BSX9P30WBdZW2WIKU0T1Bd0kz2eNZ9ikjKgHbEyKx8BB6H1L3h3A==", + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/domutils/-/domutils-3.1.0.tgz", + "integrity": "sha512-H78uMmQtI2AhgDJjWeQmHwJJ2bLPD3GMmO7Zja/ZZh84wkm+4ut+IUnUdRa8uCGX88DiVx1j6FRe1XfxEgjEZA==", "dev": true, "requires": { - "dom-serializer": "^1.0.1", - "domelementtype": "^2.2.0", - "domhandler": "^4.2.0" + "dom-serializer": "^2.0.0", + "domelementtype": "^2.3.0", + "domhandler": "^5.0.3" } }, + "dotenv": { + "version": "10.0.0", + "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-10.0.0.tgz", + "integrity": "sha512-rlBi9d8jpv9Sf1klPjNfFAuWDjKLwTIJJ/VxtoTwIR6hnZxcEOQCZg2oIL3MWBYw5GpUDKOEnND7LXTbIpQ03Q==", + "dev": true + }, + "duplexer": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/duplexer/-/duplexer-0.1.2.tgz", + "integrity": "sha512-jtD6YG370ZCIi/9GTaJKQxWTZD045+4R4hTk/x1UyoqadyJ9x9CgSi1RlVDQF8U2sxLLSnFkCaMihqljHIWgMg==", + "dev": true + }, + "eastasianwidth": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/eastasianwidth/-/eastasianwidth-0.2.0.tgz", + "integrity": "sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==", + "dev": true + }, "ee-first": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz", "integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==", "dev": true }, + "ejs": { + "version": "3.1.9", + "resolved": "https://registry.npmjs.org/ejs/-/ejs-3.1.9.tgz", + "integrity": "sha512-rC+QVNMJWv+MtPgkt0y+0rVEIdbtxVADApW9JXrUVlzHetgcyczP/E7DJmWJ4fJCZF2cPcBk0laWO9ZHMG3DmQ==", + "dev": true, + "requires": { + "jake": "^10.8.5" + } + }, "electron-to-chromium": { - "version": "1.4.284", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.284.tgz", - "integrity": "sha512-M8WEXFuKXMYMVr45fo8mq0wUrrJHheiKZf6BArTKk9ZBYCKJEOU5H8cdWgDT+qCVZf7Na4lVUaZsA+h6uA9+PA==", + "version": "1.4.530", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.530.tgz", + "integrity": "sha512-rsJ9O8SCI4etS8TBsXuRfHa2eZReJhnGf5MHZd3Vo05PukWHKXhk3VQGbHHnDLa8nZz9woPCpLCMQpLGgkGNRA==", "dev": true }, "emoji-regex": { @@ -23425,16 +25302,34 @@ } } }, + "end-of-stream": { + "version": "1.4.4", + "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz", + "integrity": "sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==", + "dev": true, + "requires": { + "once": "^1.4.0" + } + }, "enhanced-resolve": { - "version": "5.10.0", - "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.10.0.tgz", - "integrity": "sha512-T0yTFjdpldGY8PmuXXR0PyQ1ufZpEGiHVrp7zHKB7jdR4qlmZHhONVM5AQOAWXuF/w3dnHbEQVrNptJgt7F+cQ==", + "version": "5.15.0", + "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.15.0.tgz", + "integrity": "sha512-LXYT42KJ7lpIKECr2mAXIaMldcNCh/7E0KBKOu4KSfkHmP+mZmSs+8V5gBAqisWBy0OO4W5Oyys0GO1Y8KtdKg==", "dev": true, "requires": { "graceful-fs": "^4.2.4", "tapable": "^2.2.0" } }, + "enquirer": { + "version": "2.3.6", + "resolved": "https://registry.npmjs.org/enquirer/-/enquirer-2.3.6.tgz", + "integrity": "sha512-yjNnPr315/FjS4zIsUxYguYUPP2e1NK4d7E7ZOLiyYCcbFBiTMyID+2wvm2w6+pZ/odMA7cRkjhsPbltwBOrLg==", + "dev": true, + "requires": { + "ansi-colors": "^4.1.1" + } + }, "entities": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/entities/-/entities-2.2.0.tgz", @@ -23472,18 +25367,19 @@ } }, "es-abstract": { - "version": "1.21.1", - "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.21.1.tgz", - "integrity": "sha512-QudMsPOz86xYz/1dG1OuGBKOELjCh99IIWHLzy5znUB6j8xG2yMA7bfTV86VSqKF+Y/H08vQPR+9jyXpuC6hfg==", + "version": "1.22.2", + "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.22.2.tgz", + "integrity": "sha512-YoxfFcDmhjOgWPWsV13+2RNjq1F6UQnfs+8TftwNqtzlmFzEXvlUwdrNrYeaizfjQzRMxkZ6ElWMOJIFKdVqwA==", "dev": true, "requires": { + "array-buffer-byte-length": "^1.0.0", + "arraybuffer.prototype.slice": "^1.0.2", "available-typed-arrays": "^1.0.5", "call-bind": "^1.0.2", "es-set-tostringtag": "^2.0.1", "es-to-primitive": "^1.2.1", - "function-bind": "^1.1.1", - "function.prototype.name": "^1.1.5", - "get-intrinsic": "^1.1.3", + "function.prototype.name": "^1.1.6", + "get-intrinsic": "^1.2.1", "get-symbol-description": "^1.0.0", "globalthis": "^1.0.3", "gopd": "^1.0.1", @@ -23491,25 +25387,30 @@ "has-property-descriptors": "^1.0.0", "has-proto": "^1.0.1", "has-symbols": "^1.0.3", - "internal-slot": "^1.0.4", - "is-array-buffer": "^3.0.1", + "internal-slot": "^1.0.5", + "is-array-buffer": "^3.0.2", "is-callable": "^1.2.7", "is-negative-zero": "^2.0.2", "is-regex": "^1.1.4", "is-shared-array-buffer": "^1.0.2", "is-string": "^1.0.7", - "is-typed-array": "^1.1.10", + "is-typed-array": "^1.1.12", "is-weakref": "^1.0.2", - "object-inspect": "^1.12.2", + "object-inspect": "^1.12.3", "object-keys": "^1.1.1", "object.assign": "^4.1.4", - "regexp.prototype.flags": "^1.4.3", + "regexp.prototype.flags": "^1.5.1", + "safe-array-concat": "^1.0.1", "safe-regex-test": "^1.0.0", - "string.prototype.trimend": "^1.0.6", - "string.prototype.trimstart": "^1.0.6", + "string.prototype.trim": "^1.2.8", + "string.prototype.trimend": "^1.0.7", + "string.prototype.trimstart": "^1.0.7", + "typed-array-buffer": "^1.0.0", + "typed-array-byte-length": "^1.0.0", + "typed-array-byte-offset": "^1.0.0", "typed-array-length": "^1.0.4", "unbox-primitive": "^1.0.2", - "which-typed-array": "^1.1.9" + "which-typed-array": "^1.1.11" } }, "es-get-iterator": { @@ -23526,20 +25427,12 @@ "is-set": "^2.0.2", "is-string": "^1.0.5", "isarray": "^2.0.5" - }, - "dependencies": { - "isarray": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.5.tgz", - "integrity": "sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==", - "dev": true - } } }, "es-module-lexer": { - "version": "0.9.3", - "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-0.9.3.tgz", - "integrity": "sha512-1HQ2M2sPtxwnvOvT1ZClHyQDiggdNjURWpY2we6aMKCQiUVxTmVs2UYPLIrD84sS+kMdUwfBSylbJPwNnBrnHQ==", + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-1.3.1.tgz", + "integrity": "sha512-JUFAyicQV9mXc3YRxPnDlrfBKpqt6hUYzz9/boprUJHs4e4KVr3XwOF70doO6gwXUor6EWZJAyWAfKki84t20Q==", "dev": true }, "es-set-tostringtag": { @@ -23574,40 +25467,39 @@ } }, "esbuild": { - "version": "0.17.8", - "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.17.8.tgz", - "integrity": "sha512-g24ybC3fWhZddZK6R3uD2iF/RIPnRpwJAqLov6ouX3hMbY4+tKolP0VMF3zuIYCaXun+yHwS5IPQ91N2BT191g==", + "version": "0.18.17", + "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.18.17.tgz", + "integrity": "sha512-1GJtYnUxsJreHYA0Y+iQz2UEykonY66HNWOb0yXYZi9/kNrORUEHVg87eQsCtqh59PEJ5YVZJO98JHznMJSWjg==", "dev": true, - "optional": true, "requires": { - "@esbuild/android-arm": "0.17.8", - "@esbuild/android-arm64": "0.17.8", - "@esbuild/android-x64": "0.17.8", - "@esbuild/darwin-arm64": "0.17.8", - "@esbuild/darwin-x64": "0.17.8", - "@esbuild/freebsd-arm64": "0.17.8", - "@esbuild/freebsd-x64": "0.17.8", - "@esbuild/linux-arm": "0.17.8", - "@esbuild/linux-arm64": "0.17.8", - "@esbuild/linux-ia32": "0.17.8", - "@esbuild/linux-loong64": "0.17.8", - "@esbuild/linux-mips64el": "0.17.8", - "@esbuild/linux-ppc64": "0.17.8", - "@esbuild/linux-riscv64": "0.17.8", - "@esbuild/linux-s390x": "0.17.8", - "@esbuild/linux-x64": "0.17.8", - "@esbuild/netbsd-x64": "0.17.8", - "@esbuild/openbsd-x64": "0.17.8", - "@esbuild/sunos-x64": "0.17.8", - "@esbuild/win32-arm64": "0.17.8", - "@esbuild/win32-ia32": "0.17.8", - "@esbuild/win32-x64": "0.17.8" + "@esbuild/android-arm": "0.18.17", + "@esbuild/android-arm64": "0.18.17", + "@esbuild/android-x64": "0.18.17", + "@esbuild/darwin-arm64": "0.18.17", + "@esbuild/darwin-x64": "0.18.17", + "@esbuild/freebsd-arm64": "0.18.17", + "@esbuild/freebsd-x64": "0.18.17", + "@esbuild/linux-arm": "0.18.17", + "@esbuild/linux-arm64": "0.18.17", + "@esbuild/linux-ia32": "0.18.17", + "@esbuild/linux-loong64": "0.18.17", + "@esbuild/linux-mips64el": "0.18.17", + "@esbuild/linux-ppc64": "0.18.17", + "@esbuild/linux-riscv64": "0.18.17", + "@esbuild/linux-s390x": "0.18.17", + "@esbuild/linux-x64": "0.18.17", + "@esbuild/netbsd-x64": "0.18.17", + "@esbuild/openbsd-x64": "0.18.17", + "@esbuild/sunos-x64": "0.18.17", + "@esbuild/win32-arm64": "0.18.17", + "@esbuild/win32-ia32": "0.18.17", + "@esbuild/win32-x64": "0.18.17" } }, "esbuild-wasm": { - "version": "0.17.8", - "resolved": "https://registry.npmjs.org/esbuild-wasm/-/esbuild-wasm-0.17.8.tgz", - "integrity": "sha512-zCmpxv95E0FuCmvdw1K836UHnj4EdiQnFfjTby35y3LAjRPtXMj3sbHDRHjbD8Mqg5lTwq3knacr/1qIFU51CQ==", + "version": "0.18.17", + "resolved": "https://registry.npmjs.org/esbuild-wasm/-/esbuild-wasm-0.18.17.tgz", + "integrity": "sha512-9OHGcuRzy+I8ziF9FzjfKLWAPbvi0e/metACVg9k6bK+SI4FFxeV6PcZsz8RIVaMD4YNehw+qj6UMR3+qj/EuQ==", "dev": true }, "escalade": { @@ -23628,28 +25520,55 @@ "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=", "dev": true }, + "escodegen": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-2.1.0.tgz", + "integrity": "sha512-2NlIDTwUWJN0mRPQOdtQBzbUHvdGY2P1VXSyU83Q3xKxM7WHX2Ql8dKq782Q9TgQUNOLEzEYu9bzLNj1q88I5w==", + "dev": true, + "requires": { + "esprima": "^4.0.1", + "estraverse": "^5.2.0", + "esutils": "^2.0.2", + "source-map": "~0.6.1" + }, + "dependencies": { + "estraverse": { + "version": "5.3.0", + "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz", + "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==", + "dev": true + }, + "source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true, + "optional": true + } + } + }, "eslint": { - "version": "8.39.0", - "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.39.0.tgz", - "integrity": "sha512-mwiok6cy7KTW7rBpo05k6+p4YVZByLNjAZ/ACB9DRCu4YDRwjXI01tWHp6KAUWelsBetTxKK/2sHB0vdS8Z2Og==", + "version": "8.50.0", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.50.0.tgz", + "integrity": "sha512-FOnOGSuFuFLv/Sa+FDVRZl4GGVAAFFi8LecRsI5a1tMO5HIE8nCm4ivAlzt4dT3ol/PaaGC0rJEEXQmHJBGoOg==", "dev": true, "requires": { "@eslint-community/eslint-utils": "^4.2.0", - "@eslint-community/regexpp": "^4.4.0", - "@eslint/eslintrc": "^2.0.2", - "@eslint/js": "8.39.0", - "@humanwhocodes/config-array": "^0.11.8", + "@eslint-community/regexpp": "^4.6.1", + "@eslint/eslintrc": "^2.1.2", + "@eslint/js": "8.50.0", + "@humanwhocodes/config-array": "^0.11.11", "@humanwhocodes/module-importer": "^1.0.1", "@nodelib/fs.walk": "^1.2.8", - "ajv": "^6.10.0", + "ajv": "^6.12.4", "chalk": "^4.0.0", "cross-spawn": "^7.0.2", "debug": "^4.3.2", "doctrine": "^3.0.0", "escape-string-regexp": "^4.0.0", - "eslint-scope": "^7.2.0", - "eslint-visitor-keys": "^3.4.0", - "espree": "^9.5.1", + "eslint-scope": "^7.2.2", + "eslint-visitor-keys": "^3.4.3", + "espree": "^9.6.1", "esquery": "^1.4.2", "esutils": "^2.0.2", "fast-deep-equal": "^3.1.3", @@ -23657,22 +25576,19 @@ "find-up": "^5.0.0", "glob-parent": "^6.0.2", "globals": "^13.19.0", - "grapheme-splitter": "^1.0.4", + "graphemer": "^1.4.0", "ignore": "^5.2.0", - "import-fresh": "^3.0.0", "imurmurhash": "^0.1.4", "is-glob": "^4.0.0", "is-path-inside": "^3.0.3", - "js-sdsl": "^4.1.4", "js-yaml": "^4.1.0", "json-stable-stringify-without-jsonify": "^1.0.1", "levn": "^0.4.1", "lodash.merge": "^4.6.2", "minimatch": "^3.1.2", "natural-compare": "^1.4.0", - "optionator": "^0.9.1", + "optionator": "^0.9.3", "strip-ansi": "^6.0.1", - "strip-json-comments": "^3.1.0", "text-table": "^0.2.0" }, "dependencies": { @@ -23735,9 +25651,9 @@ "dev": true }, "eslint-scope": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.2.0.tgz", - "integrity": "sha512-DYj5deGlHBfMt15J7rdtyKNq/Nqlv5KfU4iodrQ019XESsRnwXH9KAE0y3cwtUHDo2ob7CypAnCqefh6vioWRw==", + "version": "7.2.2", + "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.2.2.tgz", + "integrity": "sha512-dOt21O7lTMhDM+X9mB4GX+DZrZtCUJPL/wlcTqxyrx5IvO0IYtILdtrQGQp+8n5S0gwSVmOf9NQrjMOgfQZlIg==", "dev": true, "requires": { "esrecurse": "^4.3.0", @@ -23843,6 +25759,17 @@ } } }, + "eslint-etc": { + "version": "5.2.1", + "resolved": "https://registry.npmjs.org/eslint-etc/-/eslint-etc-5.2.1.tgz", + "integrity": "sha512-lFJBSiIURdqQKq9xJhvSJFyPA+VeTh5xvk24e8pxVL7bwLBtGF60C/KRkLTMrvCZ6DA3kbPuYhLWY0TZMlqTsg==", + "dev": true, + "requires": { + "@typescript-eslint/experimental-utils": "^5.0.0", + "tsutils": "^3.17.1", + "tsutils-etc": "^1.4.1" + } + }, "eslint-import-resolver-node": { "version": "0.3.7", "resolved": "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.7.tgz", @@ -23866,9 +25793,9 @@ } }, "eslint-module-utils": { - "version": "2.7.4", - "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.7.4.tgz", - "integrity": "sha512-j4GT+rqzCoRKHwURX7pddtIPGySnX9Si/cgMI5ztrcqOPtk5dDEeZ34CQVPphnqkJytlc97Vuk05Um2mJ3gEQA==", + "version": "2.8.0", + "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.8.0.tgz", + "integrity": "sha512-aWajIYfsqCKRDgUfjEXNN/JlrzauMuSEy5sbd7WXbtW3EH6A6MpwEh42c7qD+MqQo9QMJ6fWLAeIJynx0g6OAw==", "dev": true, "requires": { "debug": "^3.2.7" @@ -23886,26 +25813,28 @@ } }, "eslint-plugin-import": { - "version": "2.27.5", - "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.27.5.tgz", - "integrity": "sha512-LmEt3GVofgiGuiE+ORpnvP+kAm3h6MLZJ4Q5HCyHADofsb4VzXFsRiWj3c0OFiV+3DWFh0qg3v9gcPlfc3zRow==", + "version": "2.28.1", + "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.28.1.tgz", + "integrity": "sha512-9I9hFlITvOV55alzoKBI+K9q74kv0iKMeY6av5+umsNwayt59fz692daGyjR+oStBQgx6nwR9rXldDev3Clw+A==", "dev": true, "requires": { "array-includes": "^3.1.6", + "array.prototype.findlastindex": "^1.2.2", "array.prototype.flat": "^1.3.1", "array.prototype.flatmap": "^1.3.1", "debug": "^3.2.7", "doctrine": "^2.1.0", "eslint-import-resolver-node": "^0.3.7", - "eslint-module-utils": "^2.7.4", + "eslint-module-utils": "^2.8.0", "has": "^1.0.3", - "is-core-module": "^2.11.0", + "is-core-module": "^2.13.0", "is-glob": "^4.0.3", "minimatch": "^3.1.2", + "object.fromentries": "^2.0.6", + "object.groupby": "^1.0.0", "object.values": "^1.1.6", - "resolve": "^1.22.1", - "semver": "^6.3.0", - "tsconfig-paths": "^3.14.1" + "semver": "^6.3.1", + "tsconfig-paths": "^3.14.2" }, "dependencies": { "debug": { @@ -23927,26 +25856,27 @@ } }, "semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", + "version": "6.3.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", + "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", "dev": true } } }, "eslint-plugin-jsdoc": { - "version": "41.1.2", - "resolved": "https://registry.npmjs.org/eslint-plugin-jsdoc/-/eslint-plugin-jsdoc-41.1.2.tgz", - "integrity": "sha512-MePJXdGiPW7AG06CU5GbKzYtKpoHwTq1lKijjq+RwL/cQkZtBZ59Zbv5Ep0RVxSMnq6242249/n+w4XrTZ1Afg==", + "version": "46.8.2", + "resolved": "https://registry.npmjs.org/eslint-plugin-jsdoc/-/eslint-plugin-jsdoc-46.8.2.tgz", + "integrity": "sha512-5TSnD018f3tUJNne4s4gDWQflbsgOycIKEUBoCLn6XtBMgNHxQFmV8vVxUtiPxAQq8lrX85OaSG/2gnctxw9uQ==", "dev": true, "requires": { - "@es-joy/jsdoccomment": "~0.37.0", + "@es-joy/jsdoccomment": "~0.40.1", "are-docs-informative": "^0.0.2", - "comment-parser": "1.3.1", + "comment-parser": "1.4.0", "debug": "^4.3.4", "escape-string-regexp": "^4.0.0", "esquery": "^1.5.0", - "semver": "^7.3.8", + "is-builtin-module": "^3.2.1", + "semver": "^7.5.4", "spdx-expression-parse": "^3.0.1" }, "dependencies": { @@ -23955,6 +25885,15 @@ "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz", "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==", "dev": true + }, + "semver": { + "version": "7.5.4", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz", + "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==", + "dev": true, + "requires": { + "lru-cache": "^6.0.0" + } } } }, @@ -23974,38 +25913,21 @@ "estraverse": "^4.1.1" } }, - "eslint-utils": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-3.0.0.tgz", - "integrity": "sha512-uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA==", - "dev": true, - "requires": { - "eslint-visitor-keys": "^2.0.0" - }, - "dependencies": { - "eslint-visitor-keys": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz", - "integrity": "sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==", - "dev": true - } - } - }, "eslint-visitor-keys": { - "version": "3.4.0", - "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.0.tgz", - "integrity": "sha512-HPpKPUBQcAsZOsHAFwTtIKcYlCje62XB7SEAcxjtmW6TD1WVpkS6i6/hOVtTZIl4zGj/mBqpFVGvaDneik+VoQ==", + "version": "3.4.3", + "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz", + "integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==", "dev": true }, "espree": { - "version": "9.5.1", - "resolved": "https://registry.npmjs.org/espree/-/espree-9.5.1.tgz", - "integrity": "sha512-5yxtHSZXRSW5pvv3hAlXM5+/Oswi1AUFqBmbibKb5s6bp3rGIDkyXU6xCoyuuLhijr4SFwPrXRoZjz0AZDN9tg==", + "version": "9.6.1", + "resolved": "https://registry.npmjs.org/espree/-/espree-9.6.1.tgz", + "integrity": "sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ==", "dev": true, "requires": { - "acorn": "^8.8.0", + "acorn": "^8.9.0", "acorn-jsx": "^5.3.2", - "eslint-visitor-keys": "^3.4.0" + "eslint-visitor-keys": "^3.4.1" } }, "esprima": { @@ -24101,6 +26023,17 @@ "strip-final-newline": "^2.0.0" } }, + "exponential-backoff": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/exponential-backoff/-/exponential-backoff-3.1.1.tgz", + "integrity": "sha512-dX7e/LHVJ6W3DE1MHWi9S1EYzDESENfLrYohG2G++ovZrYOkm4Knwa0mc1cn84xJOR4KEU0WSchhLbd0UklbHw==", + "dev": true + }, + "export-to-csv": { + "version": "0.2.2", + "resolved": "https://registry.npmjs.org/export-to-csv/-/export-to-csv-0.2.2.tgz", + "integrity": "sha512-KHExLOjF2yvo8JU8Sv+5RuJAHzP1TpFvUgnWn8ex7zBrv1ZsABJAOpvG1RNRRWr1spYpDJmBBaR5/cV/8aBQSw==" + }, "express": { "version": "4.18.2", "resolved": "https://registry.npmjs.org/express/-/express-4.18.2.tgz", @@ -24160,6 +26093,15 @@ "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==", "dev": true + }, + "qs": { + "version": "6.11.0", + "resolved": "https://registry.npmjs.org/qs/-/qs-6.11.0.tgz", + "integrity": "sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==", + "dev": true, + "requires": { + "side-channel": "^1.0.4" + } } } }, @@ -24192,9 +26134,9 @@ "dev": true }, "fast-glob": { - "version": "3.2.11", - "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.11.tgz", - "integrity": "sha512-xrO3+1bxSo3ZVHAnqzyuewYT6aMFHRAd4Kcs92MAonjwQZLsK9d0SF1IyQ3k5PoirxTW0Oe/RqFgMQ6TcNE5Ew==", + "version": "3.3.1", + "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.1.tgz", + "integrity": "sha512-kNFPyjhh5cKjrUltxs+wFx+ZkbRaxxmZ+X0ZU31SOsxCEtP9VPgtq2teZw1DebupL5GmDaNQ6yKMMVcM41iqDg==", "dev": true, "requires": { "@nodelib/fs.stat": "^2.0.2", @@ -24213,7 +26155,7 @@ "fast-levenshtein": { "version": "2.0.6", "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz", - "integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=", + "integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==", "dev": true }, "fast-xml-parser": { @@ -24224,12 +26166,6 @@ "strnum": "^1.0.5" } }, - "fastparse": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/fastparse/-/fastparse-1.1.2.tgz", - "integrity": "sha512-483XLLxTVIwWK3QTrMGRqUfUpoOs/0hbQrl2oz4J0pAcm3A3bu84wxTFqGqkJzewCLdME38xJLJAxBABfQT8sQ==", - "dev": true - }, "fastq": { "version": "1.13.0", "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.13.0.tgz", @@ -24266,6 +26202,35 @@ "flat-cache": "^3.0.4" } }, + "filelist": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/filelist/-/filelist-1.0.4.tgz", + "integrity": "sha512-w1cEuf3S+DrLCQL7ET6kz+gmlJdbq9J7yXCSjK/OZCPA+qEN1WyF4ZAf0YYJa4/shHJra2t/d/r8SV4Ji+x+8Q==", + "dev": true, + "requires": { + "minimatch": "^5.0.1" + }, + "dependencies": { + "brace-expansion": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", + "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", + "dev": true, + "requires": { + "balanced-match": "^1.0.0" + } + }, + "minimatch": { + "version": "5.1.6", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz", + "integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==", + "dev": true, + "requires": { + "brace-expansion": "^2.0.1" + } + } + } + }, "filesize": { "version": "10.0.7", "resolved": "https://registry.npmjs.org/filesize/-/filesize-10.0.7.tgz", @@ -24313,14 +26278,13 @@ } }, "find-cache-dir": { - "version": "3.3.2", - "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-3.3.2.tgz", - "integrity": "sha512-wXZV5emFEjrridIgED11OoUKLxiYjAcqot/NJdAkOhlJ+vGzwhOAfcG5OX1jP+S0PcjEn8bdMJv+g2jwQ3Onig==", + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-4.0.0.tgz", + "integrity": "sha512-9ZonPT4ZAK4a+1pUPVPZJapbi7O5qbbJPdYw/NOQWZZbVLdDTYM3A4R9z/DpAM08IDaFGsvPgiGZ82WEwUDWjg==", "dev": true, "requires": { - "commondir": "^1.0.1", - "make-dir": "^3.0.2", - "pkg-dir": "^4.1.0" + "common-path-prefix": "^3.0.0", + "pkg-dir": "^7.0.0" } }, "find-up": { @@ -24333,6 +26297,12 @@ "path-exists": "^4.0.0" } }, + "flat": { + "version": "5.0.2", + "resolved": "https://registry.npmjs.org/flat/-/flat-5.0.2.tgz", + "integrity": "sha512-b6suED+5/3rTpUBdG1gupIl8MPFCAMA0QXwmljLhvCUKcUvdE4gWky9zpuGCcXHOsz4J9wPGNWq6OKpmIzz3hQ==", + "dev": true + }, "flat-cache": { "version": "3.0.4", "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.0.4.tgz", @@ -24350,9 +26320,9 @@ "dev": true }, "follow-redirects": { - "version": "1.15.2", - "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.2.tgz", - "integrity": "sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA==", + "version": "1.15.3", + "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.3.tgz", + "integrity": "sha512-1VzOtuEM8pC9SFU1E+8KfTjZyMztRsgEfwQl44z8A25uy13jSzTj6dyK2Df52iV0vgHCfBwLhDWevLn95w5v6Q==", "dev": true }, "for-each": { @@ -24364,6 +26334,35 @@ "is-callable": "^1.1.3" } }, + "foreground-child": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-3.1.1.tgz", + "integrity": "sha512-TMKDUnIte6bfb5nWv7V/caI169OHgvwjb7V4WkeUvbQQdjr5rWKqHFiKWb/fcOwB+CzBT+qbWjvj+DVwRskpIg==", + "dev": true, + "requires": { + "cross-spawn": "^7.0.0", + "signal-exit": "^4.0.1" + }, + "dependencies": { + "signal-exit": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz", + "integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==", + "dev": true + } + } + }, + "form-data": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/form-data/-/form-data-3.0.1.tgz", + "integrity": "sha512-RHkBKtLWUVwd7SqRIvCZMEvAMoGUp0XU+seQiZejj0COz3RI3hWP4sCv3gZWWLjJTd7rGwcsF5eKZGii0r/hbg==", + "dev": true, + "requires": { + "asynckit": "^0.4.0", + "combined-stream": "^1.0.8", + "mime-types": "^2.1.12" + } + }, "forwarded": { "version": "0.2.0", "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.2.0.tgz", @@ -24371,9 +26370,9 @@ "dev": true }, "fraction.js": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/fraction.js/-/fraction.js-4.2.0.tgz", - "integrity": "sha512-MhLuK+2gUcnZe8ZHlaaINnQLl0xRIGRfcGk2yl8xoQAfHrSsL3rYu6FCmBdkdbhc9EPlwyGHewaRsvwRMJtAlA==", + "version": "4.3.6", + "resolved": "https://registry.npmjs.org/fraction.js/-/fraction.js-4.3.6.tgz", + "integrity": "sha512-n2aZ9tNfYDwaHhvFTkhFErqOMIb8uyzSQ+vGJBjZyanAKZVbGUQ1sngfk9FdkBw7G26O7AgNjLcecLffD1c7eg==", "dev": true }, "fresh": { @@ -24382,19 +26381,44 @@ "integrity": "sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q==", "dev": true }, - "fs-minipass": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-3.0.1.tgz", - "integrity": "sha512-MhaJDcFRTuLidHrIttu0RDGyyXs/IYHVmlcxfLAEFIWjc1vdLAkdwT7Ace2u7DbitWC0toKMl5eJZRYNVreIMw==", + "fs-constants": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/fs-constants/-/fs-constants-1.0.0.tgz", + "integrity": "sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==", + "dev": true + }, + "fs-extra": { + "version": "11.1.1", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-11.1.1.tgz", + "integrity": "sha512-MGIE4HOvQCeUCzmlHs0vXpih4ysz4wg9qiSAu6cd42lVwPbTM1TjV7RusoyQqMmk/95gdQZX72u+YW+c3eEpFQ==", "dev": true, "requires": { - "minipass": "^4.0.0" + "graceful-fs": "^4.2.0", + "jsonfile": "^6.0.1", + "universalify": "^2.0.0" + } + }, + "fs-minipass": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-3.0.3.tgz", + "integrity": "sha512-XUBA9XClHbnJWSfBzjkm6RvPsyg3sryZt06BEQoXcF7EK/xpGaQYJgQKDJSUH5SGZ76Y7pFx1QBnXz09rU5Fbw==", + "dev": true, + "requires": { + "minipass": "^7.0.3" + }, + "dependencies": { + "minipass": { + "version": "7.0.3", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.0.3.tgz", + "integrity": "sha512-LhbbwCfz3vsb12j/WkWQPZfKTsgqIe1Nf/ti1pKjYESGLHIVjWU96G9/ljLH4F9mWNVhlQOm0VySdAWzf05dpg==", + "dev": true + } } }, "fs-monkey": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/fs-monkey/-/fs-monkey-1.0.3.tgz", - "integrity": "sha512-cybjIfiiE+pTWicSCLFHSrXZ6EilF30oh91FDP9S2B051prEa7QWfrVTQm10/dDpswBDXZugPa1Ogu8Yh+HV0Q==", + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/fs-monkey/-/fs-monkey-1.0.5.tgz", + "integrity": "sha512-8uMbBjrhzW76TYgEV27Y5E//W2f/lTFmx78P2w19FZSxarhI/798APGQyuGCwmkNxgwGRhrLfvWyLBvNtuOmew==", "dev": true }, "fs.realpath": { @@ -24413,19 +26437,18 @@ "function-bind": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz", - "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==", - "dev": true + "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==" }, "function.prototype.name": { - "version": "1.1.5", - "resolved": "https://registry.npmjs.org/function.prototype.name/-/function.prototype.name-1.1.5.tgz", - "integrity": "sha512-uN7m/BzVKQnCUF/iW8jYea67v++2u7m5UgENbHRtdDVclOUP+FMPlCNdmk0h/ysGyo2tavMJEDqJAkJdRa1vMA==", + "version": "1.1.6", + "resolved": "https://registry.npmjs.org/function.prototype.name/-/function.prototype.name-1.1.6.tgz", + "integrity": "sha512-Z5kx79swU5P27WEayXM1tBi5Ze/lbIyiNgU3qyXUOf9b2rgXYyF9Dy9Cx+IQv/Lc8WCG6L82zwUPpSS9hGehIg==", "dev": true, "requires": { "call-bind": "^1.0.2", - "define-properties": "^1.1.3", - "es-abstract": "^1.19.0", - "functions-have-names": "^1.2.2" + "define-properties": "^1.2.0", + "es-abstract": "^1.22.1", + "functions-have-names": "^1.2.3" } }, "functions-have-names": { @@ -24463,13 +26486,13 @@ "dev": true }, "get-intrinsic": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.3.tgz", - "integrity": "sha512-QJVz1Tj7MS099PevUG5jvnt9tSkXN8K14dxQlikJuPt4uD9hHAHjLyLBiLR5zELelBdD9QNRAXZzsJx0WaDL9A==", - "dev": true, + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.1.tgz", + "integrity": "sha512-2DcsyfABl+gVHEfCOaTrWgyt+tb6MSEGmKq+kI5HwLbIYgjgmMcV8KQ41uaKz1xxUcn9tJtgFbQUEVcEbd0FYw==", "requires": { "function-bind": "^1.1.1", "has": "^1.0.3", + "has-proto": "^1.0.1", "has-symbols": "^1.0.3" } }, @@ -24568,12 +26591,21 @@ "integrity": "sha512-NtNxqUcXgpW2iMrfqSfR73Glt39K+BLwWsPs94yR63v45T0Wbej7eRmL5cWfwEgqXnmjQp3zaJTshdRW/qC2ZQ==", "dev": true }, - "grapheme-splitter": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/grapheme-splitter/-/grapheme-splitter-1.0.4.tgz", - "integrity": "sha512-bzh50DW9kTPM00T8y4o8vQg89Di9oLJVLW/KaOGIXJWP/iqCN6WKYkbNOF04vFLJhwcpYUh9ydh/+5vpOqV4YQ==", + "graphemer": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/graphemer/-/graphemer-1.4.0.tgz", + "integrity": "sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==", "dev": true }, + "guess-parser": { + "version": "0.4.22", + "resolved": "https://registry.npmjs.org/guess-parser/-/guess-parser-0.4.22.tgz", + "integrity": "sha512-KcUWZ5ACGaBM69SbqwVIuWGoSAgD+9iJnchR9j/IarVI1jHVeXv+bUXBIMeqVMSKt3zrn0Dgf9UpcOEpPBLbSg==", + "dev": true, + "requires": { + "@wessberg/ts-evaluator": "0.0.27" + } + }, "handle-thing": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/handle-thing/-/handle-thing-2.0.1.tgz", @@ -24584,7 +26616,6 @@ "version": "1.0.3", "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz", "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==", - "dev": true, "requires": { "function-bind": "^1.1.1" } @@ -24621,14 +26652,12 @@ "has-proto": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.0.1.tgz", - "integrity": "sha512-7qE+iP+O+bgF9clE5+UoBFzE65mlBiVj3tKCrlNQ0Ogwm0BjpT/gK4SlLYDMybDh5I3TCTKnPPa0oMG7JDYrhg==", - "dev": true + "integrity": "sha512-7qE+iP+O+bgF9clE5+UoBFzE65mlBiVj3tKCrlNQ0Ogwm0BjpT/gK4SlLYDMybDh5I3TCTKnPPa0oMG7JDYrhg==" }, "has-symbols": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz", - "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==", - "dev": true + "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==" }, "has-tostringtag": { "version": "1.0.0", @@ -24701,6 +26730,12 @@ "wbuf": "^1.1.0" }, "dependencies": { + "isarray": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", + "integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==", + "dev": true + }, "readable-stream": { "version": "2.3.8", "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz", @@ -24724,12 +26759,41 @@ } } }, + "html-encoding-sniffer": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/html-encoding-sniffer/-/html-encoding-sniffer-2.0.1.tgz", + "integrity": "sha512-D5JbOMBIR/TVZkubHT+OyT2705QvogUW4IBn6nHd756OwieSF9aDYFj4dv6HHEVGYbHaLETa3WggZYWWMyy3ZQ==", + "dev": true, + "requires": { + "whatwg-encoding": "^1.0.5" + } + }, "html-entities": { - "version": "2.3.3", - "resolved": "https://registry.npmjs.org/html-entities/-/html-entities-2.3.3.tgz", - "integrity": "sha512-DV5Ln36z34NNTDgnz0EWGBLZENelNAtkiFA4kyNOG2tDI6Mz1uSWiq1wAKdyjnJwyDiDO7Fa2SO1CTxPXL8VxA==", + "version": "2.4.0", + "resolved": "https://registry.npmjs.org/html-entities/-/html-entities-2.4.0.tgz", + "integrity": "sha512-igBTJcNNNhvZFRtm8uA6xMY6xYleeDwn3PeBCkDz7tHttv4F2hsDI2aPgNERWzvRcNYHNT3ymRaQzllmXj4YsQ==", "dev": true }, + "htmlparser2": { + "version": "8.0.2", + "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-8.0.2.tgz", + "integrity": "sha512-GYdjWKDkbRLkZ5geuHs5NY1puJ+PXwP7+fHPRz06Eirsb9ugf6d8kkXav6ADhcODhFFPMIXyxkxSuMf3D6NCFA==", + "dev": true, + "requires": { + "domelementtype": "^2.3.0", + "domhandler": "^5.0.3", + "domutils": "^3.0.1", + "entities": "^4.4.0" + }, + "dependencies": { + "entities": { + "version": "4.5.0", + "resolved": "https://registry.npmjs.org/entities/-/entities-4.5.0.tgz", + "integrity": "sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==", + "dev": true + } + } + }, "http-cache-semantics": { "version": "4.1.1", "resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.1.1.tgz", @@ -24773,12 +26837,12 @@ } }, "http-proxy-agent": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-5.0.0.tgz", - "integrity": "sha512-n2hY8YdoRE1i7r6M0w9DIw5GgZN0G25P8zLCRQ8rjXtTU3vsNFBI/vWK/UIeE6g5MUUz6avwAPXmL6Fy9D/90w==", + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-4.0.1.tgz", + "integrity": "sha512-k0zdNgqWTGA6aeIRVpvfVob4fL52dTfaehylg0Y4UvSySvOq/Y+BOyPrgpUrA7HylqvU8vIZGsRuXmspskV0Tg==", "dev": true, "requires": { - "@tootallnate/once": "2", + "@tootallnate/once": "1", "agent-base": "6", "debug": "4" } @@ -24849,12 +26913,12 @@ "dev": true }, "ignore-walk": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/ignore-walk/-/ignore-walk-6.0.2.tgz", - "integrity": "sha512-ezmQ1Dg2b3jVZh2Dh+ar6Eu2MqNSTkyb32HU2MAQQQX9tKM3q/UQ/9lf03lQ5hW+fOeoMnwxwkleZ0xcNp0/qg==", + "version": "6.0.3", + "resolved": "https://registry.npmjs.org/ignore-walk/-/ignore-walk-6.0.3.tgz", + "integrity": "sha512-C7FfFoTA+bI10qfeydT8aZbvr91vAEU+2W5BZUlzPec47oNb07SsOfwYrtxuvOYdUApPP/Qlh4DtAO51Ekk2QA==", "dev": true, "requires": { - "minimatch": "^7.4.2" + "minimatch": "^9.0.0" }, "dependencies": { "brace-expansion": { @@ -24867,9 +26931,9 @@ } }, "minimatch": { - "version": "7.4.6", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-7.4.6.tgz", - "integrity": "sha512-sBz8G/YjVniEz6lKPNpKxXwazJe4c19fEfV2GDMX6AjFz+MX9uDWIZW8XreVhkFW3fkIdTv/gxWr/Kks5FFAVw==", + "version": "9.0.3", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.3.tgz", + "integrity": "sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg==", "dev": true, "requires": { "brace-expansion": "^2.0.1" @@ -24890,9 +26954,9 @@ "integrity": "sha512-XXOFtyqDjNDAQxVfYxuF7g9Il/IbWmmlQg2MYKOH8ExIT1qg6xc4zyS3HaEEATgs1btfzxq15ciUiY7gjSXRGQ==" }, "immutable": { - "version": "4.2.4", - "resolved": "https://registry.npmjs.org/immutable/-/immutable-4.2.4.tgz", - "integrity": "sha512-WDxL3Hheb1JkRN3sQkyujNlL/xRjAo3rJtaU5xeufUauG66JdMr32bLj4gF+vWl84DIA3Zxw7tiAjneYzRRw+w==", + "version": "4.3.4", + "resolved": "https://registry.npmjs.org/immutable/-/immutable-4.3.4.tgz", + "integrity": "sha512-fsXeu4J4i6WNWSikpI88v/PcVflZz+6kMhUfIwc5SY+poQRPnaf5V7qds6SUyUN3cVxEzuCab7QIoLOQ+DQ1wA==", "dev": true }, "import-fresh": { @@ -24925,12 +26989,6 @@ "integrity": "sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==", "dev": true }, - "infer-owner": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/infer-owner/-/infer-owner-1.0.4.tgz", - "integrity": "sha512-IClj+Xz94+d7irH5qRyfJonOdfTzuDaifE6ZPWfx0N0+/ATZCbuTPq2prFl526urkQd90WyUKIh1DfBQ2hMz9A==", - "dev": true - }, "inflight": { "version": "1.0.6", "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", @@ -24948,9 +27006,9 @@ "dev": true }, "ini": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/ini/-/ini-3.0.1.tgz", - "integrity": "sha512-it4HyVAUTKBc6m8e1iXWvXSTdndF7HbdN713+kvLrymxTaU4AUBWrJ4vEooP+V7fexnVD3LKcBshjGGPefSMUQ==", + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/ini/-/ini-4.1.1.tgz", + "integrity": "sha512-QQnnxNyfvmHFIsj7gkPcYymR8Jdw/o7mp5ZFihxn6h8Ci6fh3Dx4E1gPjpQEpIuPo9XVNY/ZUwh4BPMjGyL01g==", "dev": true }, "inquirer": { @@ -25028,12 +27086,12 @@ } }, "internal-slot": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.4.tgz", - "integrity": "sha512-tA8URYccNzMo94s5MQZgH8NB/XTa6HsOo0MLfXTKKEnHVVdegzaQoFZ7Jp44bdvLvY2waT5dc+j5ICEswhi7UQ==", + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.5.tgz", + "integrity": "sha512-Y+R5hJrzs52QCG2laLn4udYVnxsfny9CpOhNhUvk/SSSVyF6T27FzRbF0sroPidSu3X8oEAkOn2K804mjpt6UQ==", "dev": true, "requires": { - "get-intrinsic": "^1.1.3", + "get-intrinsic": "^1.2.0", "has": "^1.0.3", "side-channel": "^1.0.4" } @@ -25050,9 +27108,9 @@ "dev": true }, "ipaddr.js": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-2.0.1.tgz", - "integrity": "sha512-1qTgH9NG+IIJ4yfKs2e6Pp1bZg8wbDbKHT21HrLIeYBTRLgMYKnMTPAuI3Lcs61nfx5h1xlXnbJtH1kX5/d/ng==", + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-2.1.0.tgz", + "integrity": "sha512-LlbxQ7xKzfBusov6UMi4MFpEg0m+mAm9xyNGEduwXMEDuf4WfzB/RZwMVYEd7IKGvh4IUkEXYxtAVu9T3OelJQ==", "dev": true }, "is-arguments": { @@ -25066,13 +27124,13 @@ } }, "is-array-buffer": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/is-array-buffer/-/is-array-buffer-3.0.1.tgz", - "integrity": "sha512-ASfLknmY8Xa2XtB4wmbz13Wu202baeA18cJBCeCy0wXUHZF0IPyVEXqKEcd+t2fNSLLL1vC6k7lxZEojNbISXQ==", + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/is-array-buffer/-/is-array-buffer-3.0.2.tgz", + "integrity": "sha512-y+FyyR/w8vfIRq4eQcM1EYgSTnmHXPqaF+IgzgraytCFq5Xh8lllDVmAZolPJiZttZLeFSINPYMaEJ7/vWUa1w==", "dev": true, "requires": { "call-bind": "^1.0.2", - "get-intrinsic": "^1.1.3", + "get-intrinsic": "^1.2.0", "is-typed-array": "^1.1.10" } }, @@ -25110,6 +27168,15 @@ "has-tostringtag": "^1.0.0" } }, + "is-builtin-module": { + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/is-builtin-module/-/is-builtin-module-3.2.1.tgz", + "integrity": "sha512-BSLE3HnV2syZ0FK0iMA/yUGplUeMmNz4AW5fnTunbCIqZi4vG3WjJT9FHMy5D69xmAYBHXQhJdALdpwVxV501A==", + "dev": true, + "requires": { + "builtin-modules": "^3.3.0" + } + }, "is-callable": { "version": "1.2.7", "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.7.tgz", @@ -25117,9 +27184,9 @@ "dev": true }, "is-core-module": { - "version": "2.11.0", - "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.11.0.tgz", - "integrity": "sha512-RRjxlvLDkD1YJwDbroBHMb+cukurkDWNyHx7D3oNB5x9rb5ogcksMC5wHCadcXoo67gVr/+3GFySh3134zi6rw==", + "version": "2.13.0", + "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.13.0.tgz", + "integrity": "sha512-Z7dk6Qo8pOCp3l4tsX2C5ZVas4V+UxwQodwZhLopL91TX8UyyHEXafPcyoeeWuLrwzHcr3igO78wNLwHJHsMCQ==", "dev": true, "requires": { "has": "^1.0.3" @@ -25221,6 +27288,12 @@ "isobject": "^3.0.1" } }, + "is-potential-custom-element-name": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.1.tgz", + "integrity": "sha512-bCYeRA2rVibKZd+s2625gGnGF/t7DSqDs4dP7CrLA1m7jKWz6pps0LpYLJN8Q64HtmPKJ1hrN3nzPNKFEKOUiQ==", + "dev": true + }, "is-regex": { "version": "1.1.4", "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz", @@ -25271,16 +27344,12 @@ } }, "is-typed-array": { - "version": "1.1.10", - "resolved": "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.10.tgz", - "integrity": "sha512-PJqgEHiWZvMpaFZ3uTc8kHPM4+4ADTlDniuQL7cU/UDA0Ql7F70yGfHph3cLNe+c9toaigv+DFzTJKhc2CtO6A==", + "version": "1.1.12", + "resolved": "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.12.tgz", + "integrity": "sha512-Z14TF2JNG8Lss5/HMqt0//T9JeHXttXy5pH/DBU4vi98ozO2btxzq9MwYDZYnKwU8nRsz/+GVFVRDq3DkVuSPg==", "dev": true, "requires": { - "available-typed-arrays": "^1.0.5", - "call-bind": "^1.0.2", - "for-each": "^0.3.3", - "gopd": "^1.0.1", - "has-tostringtag": "^1.0.0" + "which-typed-array": "^1.1.11" } }, "is-unicode-supported": { @@ -25330,9 +27399,9 @@ } }, "isarray": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", - "integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==", + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.5.tgz", + "integrity": "sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==", "dev": true }, "isexe": { @@ -25344,7 +27413,7 @@ "isobject": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz", - "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=", + "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==", "dev": true }, "istanbul-lib-coverage": { @@ -25374,6 +27443,79 @@ } } }, + "jackspeak": { + "version": "2.3.5", + "resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-2.3.5.tgz", + "integrity": "sha512-Ratx+B8WeXLAtRJn26hrhY8S1+Jz6pxPMrkrdkgb/NstTNiqMhX0/oFVu5wX+g5n6JlEu2LPsDJmY8nRP4+alw==", + "dev": true, + "requires": { + "@isaacs/cliui": "^8.0.2", + "@pkgjs/parseargs": "^0.11.0" + } + }, + "jake": { + "version": "10.8.7", + "resolved": "https://registry.npmjs.org/jake/-/jake-10.8.7.tgz", + "integrity": "sha512-ZDi3aP+fG/LchyBzUM804VjddnwfSfsdeYkwt8NcbKRvo4rFkjhs456iLFn3k2ZUWvNe4i48WACDbza8fhq2+w==", + "dev": true, + "requires": { + "async": "^3.2.3", + "chalk": "^4.0.2", + "filelist": "^1.0.4", + "minimatch": "^3.1.2" + }, + "dependencies": { + "ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "dev": true, + "requires": { + "color-convert": "^2.0.1" + } + }, + "chalk": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", + "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", + "dev": true, + "requires": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + } + }, + "color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "requires": { + "color-name": "~1.1.4" + } + }, + "color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true + }, + "has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true + }, + "supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "dev": true, + "requires": { + "has-flag": "^4.0.0" + } + } + } + }, "jest-worker": { "version": "27.5.1", "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-27.5.1.tgz", @@ -25402,10 +27544,10 @@ } } }, - "js-sdsl": { - "version": "4.1.5", - "resolved": "https://registry.npmjs.org/js-sdsl/-/js-sdsl-4.1.5.tgz", - "integrity": "sha512-08bOAKweV2NUC1wqTtf3qZlnpOX/R2DU9ikpjOHs0H+ibQv3zpncVQg6um4uYtRtrwIX8M4Nh3ytK4HGlYAq7Q==", + "jiti": { + "version": "1.20.0", + "resolved": "https://registry.npmjs.org/jiti/-/jiti-1.20.0.tgz", + "integrity": "sha512-3TV69ZbrvV6U5DfQimop50jE9Dl6J8O1ja1dvBbMba/sZ3YBEQqJ2VZRoQPVnhlzjNtU1vaXRZVrVjU4qtm8yA==", "dev": true }, "js-tokens": { @@ -25430,6 +27572,49 @@ "integrity": "sha512-YtOli5Cmzy3q4dP26GraSOeAhqecewG04hoO8DY56CH4KJ9Fvv5qKWUCCo3HZob7esJQHCv6/+bnTy72xZZaVQ==", "dev": true }, + "jsdom": { + "version": "16.7.0", + "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-16.7.0.tgz", + "integrity": "sha512-u9Smc2G1USStM+s/x1ru5Sxrl6mPYCbByG1U/hUmqaVsm4tbNyS7CicOSRyuGQYZhTu0h84qkZZQ/I+dzizSVw==", + "dev": true, + "requires": { + "abab": "^2.0.5", + "acorn": "^8.2.4", + "acorn-globals": "^6.0.0", + "cssom": "^0.4.4", + "cssstyle": "^2.3.0", + "data-urls": "^2.0.0", + "decimal.js": "^10.2.1", + "domexception": "^2.0.1", + "escodegen": "^2.0.0", + "form-data": "^3.0.0", + "html-encoding-sniffer": "^2.0.1", + "http-proxy-agent": "^4.0.1", + "https-proxy-agent": "^5.0.0", + "is-potential-custom-element-name": "^1.0.1", + "nwsapi": "^2.2.0", + "parse5": "6.0.1", + "saxes": "^5.0.1", + "symbol-tree": "^3.2.4", + "tough-cookie": "^4.0.0", + "w3c-hr-time": "^1.0.2", + "w3c-xmlserializer": "^2.0.0", + "webidl-conversions": "^6.1.0", + "whatwg-encoding": "^1.0.5", + "whatwg-mimetype": "^2.3.0", + "whatwg-url": "^8.5.0", + "ws": "^7.4.6", + "xml-name-validator": "^3.0.0" + }, + "dependencies": { + "parse5": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/parse5/-/parse5-6.0.1.tgz", + "integrity": "sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw==", + "dev": true + } + } + }, "jsesc": { "version": "2.5.2", "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz", @@ -25466,6 +27651,16 @@ "integrity": "sha512-gfFQZrcTc8CnKXp6Y4/CBT3fTc0OVuDofpre4aEeEpSBPV5X5v4+Vmx+8snU7RLPrNHPKSgLxGo9YuQzz20o+w==", "dev": true }, + "jsonfile": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz", + "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==", + "dev": true, + "requires": { + "graceful-fs": "^4.1.6", + "universalify": "^2.0.0" + } + }, "jsonparse": { "version": "1.3.1", "resolved": "https://registry.npmjs.org/jsonparse/-/jsonparse-1.3.1.tgz", @@ -25498,6 +27693,16 @@ "integrity": "sha512-dhG34DXATL5hSxJbIexCft8FChFXtmskoZYnoPWjXQuebWYCNkVeV3KkGegCK9CP1oswI/vQibS2GY7Em/sJJA==", "dev": true }, + "launch-editor": { + "version": "2.6.0", + "resolved": "https://registry.npmjs.org/launch-editor/-/launch-editor-2.6.0.tgz", + "integrity": "sha512-JpDCcQnyAAzZZaZ7vEiSqL690w7dAEyLao+KC96zBplnYbJS7TYNjvM3M7y3dGz+v7aIsJk3hllWuc0kWAjyRQ==", + "dev": true, + "requires": { + "picocolors": "^1.0.0", + "shell-quote": "^1.7.3" + } + }, "less": { "version": "4.1.3", "resolved": "https://registry.npmjs.org/less/-/less-4.1.3.tgz", @@ -25580,15 +27785,15 @@ } }, "lines-and-columns": { - "version": "1.2.4", - "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.2.4.tgz", - "integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==", + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-2.0.3.tgz", + "integrity": "sha512-cNOjgCnLB+FnvWWtyRTzmB3POJ+cXxTA81LoW7u8JdmhfXzriropYwpjShnz1QLLWsQwY7nIxoDmcPTwphDK9w==", "dev": true }, "loader-runner": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-4.2.0.tgz", - "integrity": "sha512-92+huvxMvYlMzMt0iIOukcwYBFpkYJdpl2xsZ7LrlayO7E8SOv+JJUEK17B/dJIHAOLMfh2dZZ/Y18WgmGtYNw==", + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-4.3.0.tgz", + "integrity": "sha512-3R/1M+yS3j5ou80Me59j7F9IMs4PXs3VqRrm0TU3AbKPxlmpoY1TNscJV/oGJXo8qCatFGTfDbY6W6ipGOYXfg==", "dev": true }, "loader-utils": { @@ -25728,120 +27933,60 @@ "integrity": "sha512-l0qCX+pgXEZh/7sYQNG+vzhOIFRPjlJJkQ/irk9n7Ak3d+1MrU6F7IV31KILwFkUn153oLK8a2AIt48DzLdVPg==" }, "magic-string": { - "version": "0.29.0", - "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.29.0.tgz", - "integrity": "sha512-WcfidHrDjMY+eLjlU+8OvwREqHwpgCeKVBUpQ3OhYYuvfaYCUgcbuBzappNzZvg/v8onU3oQj+BYpkOJe9Iw4Q==", + "version": "0.30.1", + "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.1.tgz", + "integrity": "sha512-mbVKXPmS0z0G4XqFDCTllmDQ6coZzn94aMlb0o/A4HEHJCKcanlDZwYJgwnkmgD3jyWhUgj9VsPrfd972yPffA==", "dev": true, "requires": { - "@jridgewell/sourcemap-codec": "^1.4.13" - } - }, - "make-dir": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz", - "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==", - "dev": true, - "requires": { - "semver": "^6.0.0" + "@jridgewell/sourcemap-codec": "^1.4.15" }, "dependencies": { - "semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", + "@jridgewell/sourcemap-codec": { + "version": "1.4.15", + "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz", + "integrity": "sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg==", "dev": true } } }, "make-fetch-happen": { - "version": "10.2.1", - "resolved": "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-10.2.1.tgz", - "integrity": "sha512-NgOPbRiaQM10DYXvN3/hhGVI2M5MtITFryzBGxHM5p4wnFxsVCbxkrBrDsk+EZ5OB4jEOT7AjDxtdF+KVEFT7w==", + "version": "11.1.1", + "resolved": "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-11.1.1.tgz", + "integrity": "sha512-rLWS7GCSTcEujjVBs2YqG7Y4643u8ucvCJeSRqiLYhesrDuzeuFIk37xREzAsfQaqzl8b9rNCE4m6J8tvX4Q8w==", "dev": true, "requires": { "agentkeepalive": "^4.2.1", - "cacache": "^16.1.0", - "http-cache-semantics": "^4.1.0", + "cacache": "^17.0.0", + "http-cache-semantics": "^4.1.1", "http-proxy-agent": "^5.0.0", "https-proxy-agent": "^5.0.0", "is-lambda": "^1.0.1", "lru-cache": "^7.7.1", - "minipass": "^3.1.6", - "minipass-collect": "^1.0.2", - "minipass-fetch": "^2.0.3", + "minipass": "^5.0.0", + "minipass-fetch": "^3.0.0", "minipass-flush": "^1.0.5", "minipass-pipeline": "^1.2.4", "negotiator": "^0.6.3", "promise-retry": "^2.0.1", "socks-proxy-agent": "^7.0.0", - "ssri": "^9.0.0" + "ssri": "^10.0.0" }, "dependencies": { - "@npmcli/fs": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/@npmcli/fs/-/fs-2.1.2.tgz", - "integrity": "sha512-yOJKRvohFOaLqipNtwYB9WugyZKhC/DZC4VYPmpaCzDBrA8YpK3qHZ8/HGscMnE4GqbkLNuVcCnxkeQEdGt6LQ==", - "dev": true, - "requires": { - "@gar/promisify": "^1.1.3", - "semver": "^7.3.5" - } + "@tootallnate/once": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-2.0.0.tgz", + "integrity": "sha512-XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A==", + "dev": true }, - "brace-expansion": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", - "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", + "http-proxy-agent": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-5.0.0.tgz", + "integrity": "sha512-n2hY8YdoRE1i7r6M0w9DIw5GgZN0G25P8zLCRQ8rjXtTU3vsNFBI/vWK/UIeE6g5MUUz6avwAPXmL6Fy9D/90w==", "dev": true, "requires": { - "balanced-match": "^1.0.0" - } - }, - "cacache": { - "version": "16.1.3", - "resolved": "https://registry.npmjs.org/cacache/-/cacache-16.1.3.tgz", - "integrity": "sha512-/+Emcj9DAXxX4cwlLmRI9c166RuL3w30zp4R7Joiv2cQTtTtA+jeuCAjH3ZlGnYS3tKENSrKhAzVVP9GVyzeYQ==", - "dev": true, - "requires": { - "@npmcli/fs": "^2.1.0", - "@npmcli/move-file": "^2.0.0", - "chownr": "^2.0.0", - "fs-minipass": "^2.1.0", - "glob": "^8.0.1", - "infer-owner": "^1.0.4", - "lru-cache": "^7.7.1", - "minipass": "^3.1.6", - "minipass-collect": "^1.0.2", - "minipass-flush": "^1.0.5", - "minipass-pipeline": "^1.2.4", - "mkdirp": "^1.0.4", - "p-map": "^4.0.0", - "promise-inflight": "^1.0.1", - "rimraf": "^3.0.2", - "ssri": "^9.0.0", - "tar": "^6.1.11", - "unique-filename": "^2.0.0" - } - }, - "fs-minipass": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-2.1.0.tgz", - "integrity": "sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==", - "dev": true, - "requires": { - "minipass": "^3.0.0" - } - }, - "glob": { - "version": "8.1.0", - "resolved": "https://registry.npmjs.org/glob/-/glob-8.1.0.tgz", - "integrity": "sha512-r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ==", - "dev": true, - "requires": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^5.0.1", - "once": "^1.3.0" + "@tootallnate/once": "2", + "agent-base": "6", + "debug": "4" } }, "lru-cache": { @@ -25849,54 +27994,14 @@ "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.18.3.tgz", "integrity": "sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA==", "dev": true - }, - "minimatch": { - "version": "5.1.6", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz", - "integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==", - "dev": true, - "requires": { - "brace-expansion": "^2.0.1" - } - }, - "minipass": { - "version": "3.3.6", - "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz", - "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==", - "dev": true, - "requires": { - "yallist": "^4.0.0" - } - }, - "ssri": { - "version": "9.0.1", - "resolved": "https://registry.npmjs.org/ssri/-/ssri-9.0.1.tgz", - "integrity": "sha512-o57Wcn66jMQvfHG1FlYbWeZWW/dHZhJXjpIcTfXldXEk5nz5lStPo3mK0OJQfGR3RbZUlbISexbljkJzuEj/8Q==", - "dev": true, - "requires": { - "minipass": "^3.1.1" - } - }, - "unique-filename": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/unique-filename/-/unique-filename-2.0.1.tgz", - "integrity": "sha512-ODWHtkkdx3IAR+veKxFV+VBkUMcN+FaqzUUd7IZzt+0zhDZFPFxhlqwPF3YQvMHx1TD0tdgYl+kuPnJ8E6ql7A==", - "dev": true, - "requires": { - "unique-slug": "^3.0.0" - } - }, - "unique-slug": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/unique-slug/-/unique-slug-3.0.0.tgz", - "integrity": "sha512-8EyMynh679x/0gqE9fT9oilG+qEt+ibFyqjuVTsZn1+CMxH+XLlpvr2UZx4nVcCwTpx81nICr2JQFkM+HPLq4w==", - "dev": true, - "requires": { - "imurmurhash": "^0.1.4" - } } } }, + "marked": { + "version": "7.0.5", + "resolved": "https://registry.npmjs.org/marked/-/marked-7.0.5.tgz", + "integrity": "sha512-lwNAFTfXgqpt/XvK17a/8wY9/q6fcSPZT1aP6QW0u74VwaJF/Z9KbRcX23sWE4tODM+AolJNcUtErTkgOeFP/Q==" + }, "media-typer": { "version": "0.3.0", "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz", @@ -25904,12 +28009,12 @@ "dev": true }, "memfs": { - "version": "3.4.13", - "resolved": "https://registry.npmjs.org/memfs/-/memfs-3.4.13.tgz", - "integrity": "sha512-omTM41g3Skpvx5dSYeZIbXKcXoAVc/AoMNwn9TKx++L/gaen/+4TTttmu8ZSch5vfVJ8uJvGbroTsIlslRg6lg==", + "version": "3.5.3", + "resolved": "https://registry.npmjs.org/memfs/-/memfs-3.5.3.tgz", + "integrity": "sha512-UERzLsxzllchadvbPs5aolHh65ISpKpM+ccLbOJ8/vvpBKmAWf+la7dXFy7Mr0ySHbdHrFv5kGFCUHHe6GFEmw==", "dev": true, "requires": { - "fs-monkey": "^1.0.3" + "fs-monkey": "^1.0.4" } }, "merge-descriptors": { @@ -25953,18 +28058,18 @@ "dev": true }, "mime-db": { - "version": "1.51.0", - "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.51.0.tgz", - "integrity": "sha512-5y8A56jg7XVQx2mbv1lu49NR4dokRnhZYTtL+KGfaa27uq4pSTXkwQkFJl4pkRMyNFz/EtYDSkiiEHx3F7UN6g==", + "version": "1.52.0", + "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz", + "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==", "dev": true }, "mime-types": { - "version": "2.1.34", - "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.34.tgz", - "integrity": "sha512-6cP692WwGIs9XXdOO4++N+7qjqv0rqxxVvJ3VHPh/Sc9mVZcQP+ZGhkKiTvWMQRr2tbHkJP/Yn7Y0npb3ZBs4A==", + "version": "2.1.35", + "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz", + "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==", "dev": true, "requires": { - "mime-db": "1.51.0" + "mime-db": "1.52.0" } }, "mimic-fn": { @@ -25974,9 +28079,9 @@ "dev": true }, "mini-css-extract-plugin": { - "version": "2.7.2", - "resolved": "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-2.7.2.tgz", - "integrity": "sha512-EdlUizq13o0Pd+uCp+WO/JpkLvHRVGt97RqfeGhXqAcorYo1ypJSpkV+WDT0vY/kmh/p7wRdJNJtuyK540PXDw==", + "version": "2.7.6", + "resolved": "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-2.7.6.tgz", + "integrity": "sha512-Qk7HcgaPkGG6eD77mLvZS1nmxlao3j+9PkrT9Uc7HAE1id3F41+DdBRYRYkbyfNRGzm8/YWtzhw7nVPmwhqTQw==", "dev": true, "requires": { "schema-utils": "^4.0.0" @@ -25998,15 +28103,15 @@ } }, "minimist": { - "version": "1.2.6", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.6.tgz", - "integrity": "sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==", + "version": "1.2.8", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz", + "integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==", "dev": true }, "minipass": { - "version": "4.2.7", - "resolved": "https://registry.npmjs.org/minipass/-/minipass-4.2.7.tgz", - "integrity": "sha512-ScVIgqHcXRMyfflqHmEW0bm8z8rb5McHyOY3ewX9JBgZaR77G7nxq9L/mtV96/QbAAwtbCAHVVLzD1kkyfFQEw==", + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-5.0.0.tgz", + "integrity": "sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ==", "dev": true }, "minipass-collect": { @@ -26030,25 +28135,22 @@ } }, "minipass-fetch": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/minipass-fetch/-/minipass-fetch-2.1.2.tgz", - "integrity": "sha512-LT49Zi2/WMROHYoqGgdlQIZh8mLPZmOrN2NdJjMXxYe4nkN6FUyuPuOAOedNJDrx0IRGg9+4guZewtp8hE6TxA==", + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/minipass-fetch/-/minipass-fetch-3.0.4.tgz", + "integrity": "sha512-jHAqnA728uUpIaFm7NWsCnqKT6UqZz7GcI/bDpPATuwYyKwJwW0remxSCxUlKiEty+eopHGa3oc8WxgQ1FFJqg==", "dev": true, "requires": { "encoding": "^0.1.13", - "minipass": "^3.1.6", + "minipass": "^7.0.3", "minipass-sized": "^1.0.3", "minizlib": "^2.1.2" }, "dependencies": { "minipass": { - "version": "3.3.6", - "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz", - "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==", - "dev": true, - "requires": { - "yallist": "^4.0.0" - } + "version": "7.0.3", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.0.3.tgz", + "integrity": "sha512-LhbbwCfz3vsb12j/WkWQPZfKTsgqIe1Nf/ti1pKjYESGLHIVjWU96G9/ljLH4F9mWNVhlQOm0VySdAWzf05dpg==", + "dev": true } } }, @@ -26160,6 +28262,12 @@ "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==", "dev": true }, + "mrmime": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/mrmime/-/mrmime-1.0.1.tgz", + "integrity": "sha512-hzzEagAgDyoU1Q6yg5uI+AorQgdvMCur3FcKf7NhMKWsaYg+RnbTyHRa/9IlLF9rf455MOCtcqqrQQ83pPP7Uw==", + "dev": true + }, "ms": { "version": "2.1.2", "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", @@ -26183,9 +28291,9 @@ "dev": true }, "nanoid": { - "version": "3.3.4", - "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.4.tgz", - "integrity": "sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw==", + "version": "3.3.6", + "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.6.tgz", + "integrity": "sha512-BGcqMMJuToF7i1rt+2PWSNVnWIkGCU78jBG3RxO/bZlnZPK2Cmi2QaffxGO/2RvWi9sL+FAiRiXMgsyxQ1DIDA==", "dev": true }, "natural-compare": { @@ -26194,12 +28302,6 @@ "integrity": "sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=", "dev": true }, - "natural-compare-lite": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/natural-compare-lite/-/natural-compare-lite-1.4.0.tgz", - "integrity": "sha512-Tj+HTDSJJKaZnfiuw+iaF9skdPpTo2GtEly5JHnWV/hfv2Qj/9RKsGISQtLh2ox3l5EAGw487hnBee0sIJ6v2g==", - "dev": true - }, "needle": { "version": "3.2.0", "resolved": "https://registry.npmjs.org/needle/-/needle-3.2.0.tgz", @@ -26264,9 +28366,9 @@ } }, "ngx-device-detector": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/ngx-device-detector/-/ngx-device-detector-5.0.1.tgz", - "integrity": "sha512-hVKaGzyXzy6zeliYyN7runz3eOOsh3tmZ8A6P5MSpHIjVjSx3pUJcobFTKNyHGn/zGS4JFWuhSSb7QmNwmqK9w==", + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/ngx-device-detector/-/ngx-device-detector-6.0.2.tgz", + "integrity": "sha512-+zaYUYGepNE4vMBA/6kyc1rhuUm5uU4cwbvFEEy0gAY4OarId15zwcb1iyvQbyrLCXhZW0DrPZTBoQxzp7dyVw==", "requires": { "tslib": "^2.0.0" } @@ -26310,8 +28412,7 @@ "version": "3.2.1", "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-3.2.1.tgz", "integrity": "sha512-mmcei9JghVNDYydghQmeDX8KoAm0FAiYyIcUt/N4nhyAipB17pllZQDOJD2fotxABnt4Mdz+dKTO7eftLg4d0A==", - "dev": true, - "optional": true + "dev": true }, "node-forge": { "version": "1.3.1", @@ -26320,15 +28421,16 @@ "dev": true }, "node-gyp": { - "version": "9.3.1", - "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-9.3.1.tgz", - "integrity": "sha512-4Q16ZCqq3g8awk6UplT7AuxQ35XN4R/yf/+wSAwcBUAjg7l58RTactWaP8fIDTi0FzI7YcVLujwExakZlfWkXg==", + "version": "9.4.0", + "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-9.4.0.tgz", + "integrity": "sha512-dMXsYP6gc9rRbejLXmTbVRYjAHw7ppswsKyMxuxJxxOHzluIO1rGp9TOQgjFJ+2MCqcOcQTOPB/8Xwhr+7s4Eg==", "dev": true, "requires": { "env-paths": "^2.2.0", + "exponential-backoff": "^3.1.1", "glob": "^7.1.4", "graceful-fs": "^4.2.6", - "make-fetch-happen": "^10.0.3", + "make-fetch-happen": "^11.0.3", "nopt": "^6.0.0", "npmlog": "^6.0.0", "rimraf": "^3.0.2", @@ -26338,16 +28440,15 @@ } }, "node-gyp-build": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-4.3.0.tgz", - "integrity": "sha512-iWjXZvmboq0ja1pUGULQBexmxq8CV4xBhX7VDOTbL7ZR4FOowwY/VOtRxBN/yKxmdGoIp4j5ysNT4u3S2pDQ3Q==", - "dev": true, - "optional": true + "version": "4.6.1", + "resolved": "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-4.6.1.tgz", + "integrity": "sha512-24vnklJmyRS8ViBNI8KbtK/r/DmXQMRiOMXTNz2nrTnAYUwjmEEbnnpB/+kt+yWRv73bPsSPRFddrcIbAxSiMQ==", + "dev": true }, "node-releases": { - "version": "2.0.10", - "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.10.tgz", - "integrity": "sha512-5GFldHPXVG/YZmFzJvKK2zDSzPKhEp0+ZR5SVaoSag9fsL5YgHbUHDfnG5494ISANDcK4KwPXAx2xqVEydmd7w==", + "version": "2.0.13", + "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.13.tgz", + "integrity": "sha512-uYr7J37ae/ORWdZeQ1xxMJe3NtdmqMC/JZK+geofDrkLUApKRHPd18/TxtBOJ4A0/+uUIliorNrfYV6s1b02eQ==", "dev": true }, "nopt": { @@ -26393,18 +28494,18 @@ } }, "npm-install-checks": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/npm-install-checks/-/npm-install-checks-6.1.0.tgz", - "integrity": "sha512-udSGENih/5xKh3Ex+L0PtZcOt0Pa+6ppDLnpG5D49/EhMja3LupaY9E/DtJTxyFBwE09ot7Fc+H4DywnZNWTVA==", + "version": "6.2.0", + "resolved": "https://registry.npmjs.org/npm-install-checks/-/npm-install-checks-6.2.0.tgz", + "integrity": "sha512-744wat5wAAHsxa4590mWO0tJ8PKxR8ORZsH9wGpQc3nWTzozMAgBN/XyqYw7mg3yqLM8dLwEnwSfKMmXAjF69g==", "dev": true, "requires": { "semver": "^7.1.1" } }, "npm-normalize-package-bin": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/npm-normalize-package-bin/-/npm-normalize-package-bin-3.0.0.tgz", - "integrity": "sha512-g+DPQSkusnk7HYXr75NtzkIP4+N81i3RPsGFidF3DzHd9MT9wWngmqoeg/fnHFz5MNdtG4w03s+QnhewSLTT2Q==", + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/npm-normalize-package-bin/-/npm-normalize-package-bin-3.0.1.tgz", + "integrity": "sha512-dMxCf+zZ+3zeQZXKxmyuCKlIDPGuv8EF940xbkC4kQVDTtqoh6rJFO+JTKSA6/Rwi0getWmtuy4Itup0AMcaDQ==", "dev": true }, "npm-package-arg": { @@ -26441,61 +28542,18 @@ } }, "npm-registry-fetch": { - "version": "14.0.3", - "resolved": "https://registry.npmjs.org/npm-registry-fetch/-/npm-registry-fetch-14.0.3.tgz", - "integrity": "sha512-YaeRbVNpnWvsGOjX2wk5s85XJ7l1qQBGAp724h8e2CZFFhMSuw9enom7K1mWVUtvXO1uUSFIAPofQK0pPN0ZcA==", + "version": "14.0.5", + "resolved": "https://registry.npmjs.org/npm-registry-fetch/-/npm-registry-fetch-14.0.5.tgz", + "integrity": "sha512-kIDMIo4aBm6xg7jOttupWZamsZRkAqMqwqqbVXnUqstY5+tapvv6bkH/qMR76jdgV+YljEUCyWx3hRYMrJiAgA==", "dev": true, "requires": { "make-fetch-happen": "^11.0.0", - "minipass": "^4.0.0", + "minipass": "^5.0.0", "minipass-fetch": "^3.0.0", "minipass-json-stream": "^1.0.1", "minizlib": "^2.1.2", "npm-package-arg": "^10.0.0", "proc-log": "^3.0.0" - }, - "dependencies": { - "lru-cache": { - "version": "7.18.3", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.18.3.tgz", - "integrity": "sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA==", - "dev": true - }, - "make-fetch-happen": { - "version": "11.0.3", - "resolved": "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-11.0.3.tgz", - "integrity": "sha512-oPLh5m10lRNNZDjJ2kP8UpboUx2uFXVaVweVe/lWut4iHWcQEmfqSVJt2ihZsFI8HbpwyyocaXbCAWf0g1ukIA==", - "dev": true, - "requires": { - "agentkeepalive": "^4.2.1", - "cacache": "^17.0.0", - "http-cache-semantics": "^4.1.1", - "http-proxy-agent": "^5.0.0", - "https-proxy-agent": "^5.0.0", - "is-lambda": "^1.0.1", - "lru-cache": "^7.7.1", - "minipass": "^4.0.0", - "minipass-fetch": "^3.0.0", - "minipass-flush": "^1.0.5", - "minipass-pipeline": "^1.2.4", - "negotiator": "^0.6.3", - "promise-retry": "^2.0.1", - "socks-proxy-agent": "^7.0.0", - "ssri": "^10.0.0" - } - }, - "minipass-fetch": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/minipass-fetch/-/minipass-fetch-3.0.1.tgz", - "integrity": "sha512-t9/wowtf7DYkwz8cfMSt0rMwiyNIBXf5CKZ3S5ZMqRqMYT0oLTp0x1WorMI9WTwvaPg21r1JbFxJMum8JrLGfw==", - "dev": true, - "requires": { - "encoding": "^0.1.13", - "minipass": "^4.0.0", - "minipass-sized": "^1.0.3", - "minizlib": "^2.1.2" - } - } } }, "npm-run-path": { @@ -26520,14 +28578,196 @@ } }, "nth-check": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-2.0.1.tgz", - "integrity": "sha512-it1vE95zF6dTT9lBsYbxvqh0Soy4SPowchj0UBGj/V6cTPnXXtQOPUbhZ6CmGzAD/rW22LQK6E96pcdJXk4A4w==", + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-2.1.1.tgz", + "integrity": "sha512-lqjrjmaOoAnWfMmBPL+XNnynZh2+swxiX3WUE0s4yEHI6m+AwrK2UZOimIRl3X/4QctVqS8AiZjFqyOGrMXb/w==", "dev": true, "requires": { "boolbase": "^1.0.0" } }, + "nwsapi": { + "version": "2.2.7", + "resolved": "https://registry.npmjs.org/nwsapi/-/nwsapi-2.2.7.tgz", + "integrity": "sha512-ub5E4+FBPKwAZx0UwIQOjYWGHTEq5sPqHQNRN8Z9e4A7u3Tj1weLJsL59yH9vmvqEtBHaOmT6cYQKIZOxp35FQ==", + "dev": true + }, + "nx": { + "version": "16.5.1", + "resolved": "https://registry.npmjs.org/nx/-/nx-16.5.1.tgz", + "integrity": "sha512-I3hJRE4hG7JWAtncWwDEO3GVeGPpN0TtM8xH5ArZXyDuVeTth/i3TtJzdDzqXO1HHtIoAQN0xeq4n9cLuMil5g==", + "dev": true, + "requires": { + "@nrwl/tao": "16.5.1", + "@nx/nx-darwin-arm64": "16.5.1", + "@nx/nx-darwin-x64": "16.5.1", + "@nx/nx-freebsd-x64": "16.5.1", + "@nx/nx-linux-arm-gnueabihf": "16.5.1", + "@nx/nx-linux-arm64-gnu": "16.5.1", + "@nx/nx-linux-arm64-musl": "16.5.1", + "@nx/nx-linux-x64-gnu": "16.5.1", + "@nx/nx-linux-x64-musl": "16.5.1", + "@nx/nx-win32-arm64-msvc": "16.5.1", + "@nx/nx-win32-x64-msvc": "16.5.1", + "@parcel/watcher": "2.0.4", + "@yarnpkg/lockfile": "^1.1.0", + "@yarnpkg/parsers": "3.0.0-rc.46", + "@zkochan/js-yaml": "0.0.6", + "axios": "^1.0.0", + "chalk": "^4.1.0", + "cli-cursor": "3.1.0", + "cli-spinners": "2.6.1", + "cliui": "^7.0.2", + "dotenv": "~10.0.0", + "enquirer": "~2.3.6", + "fast-glob": "3.2.7", + "figures": "3.2.0", + "flat": "^5.0.2", + "fs-extra": "^11.1.0", + "glob": "7.1.4", + "ignore": "^5.0.4", + "js-yaml": "4.1.0", + "jsonc-parser": "3.2.0", + "lines-and-columns": "~2.0.3", + "minimatch": "3.0.5", + "npm-run-path": "^4.0.1", + "open": "^8.4.0", + "semver": "7.5.3", + "string-width": "^4.2.3", + "strong-log-transformer": "^2.1.0", + "tar-stream": "~2.2.0", + "tmp": "~0.2.1", + "tsconfig-paths": "^4.1.2", + "tslib": "^2.3.0", + "v8-compile-cache": "2.3.0", + "yargs": "^17.6.2", + "yargs-parser": "21.1.1" + }, + "dependencies": { + "ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "dev": true, + "requires": { + "color-convert": "^2.0.1" + } + }, + "argparse": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz", + "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==", + "dev": true + }, + "chalk": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", + "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", + "dev": true, + "requires": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + } + }, + "cliui": { + "version": "7.0.4", + "resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz", + "integrity": "sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==", + "dev": true, + "requires": { + "string-width": "^4.2.0", + "strip-ansi": "^6.0.0", + "wrap-ansi": "^7.0.0" + } + }, + "color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "requires": { + "color-name": "~1.1.4" + } + }, + "color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true + }, + "fast-glob": { + "version": "3.2.7", + "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.7.tgz", + "integrity": "sha512-rYGMRwip6lUMvYD3BTScMwT1HtAs2d71SMv66Vrxs0IekGZEjhM0pcMfjQPnknBt2zeCwQMEupiN02ZP4DiT1Q==", + "dev": true, + "requires": { + "@nodelib/fs.stat": "^2.0.2", + "@nodelib/fs.walk": "^1.2.3", + "glob-parent": "^5.1.2", + "merge2": "^1.3.0", + "micromatch": "^4.0.4" + } + }, + "glob": { + "version": "7.1.4", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.4.tgz", + "integrity": "sha512-hkLPepehmnKk41pUGm3sYxoFs/umurYfYJCerbXEyFIWcAzvpipAgVkBqqT9RBKMGjnq6kMuyYwha6csxbiM1A==", + "dev": true, + "requires": { + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^3.0.4", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" + } + }, + "has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true + }, + "js-yaml": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz", + "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==", + "dev": true, + "requires": { + "argparse": "^2.0.1" + } + }, + "minimatch": { + "version": "3.0.5", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.5.tgz", + "integrity": "sha512-tUpxzX0VAzJHjLu0xUfFv1gwVp9ba3IOuRAVH2EGuRW8a5emA2FlACLqiT/lDVtS1W+TGNwqz3sWaNyLgDJWuw==", + "dev": true, + "requires": { + "brace-expansion": "^1.1.7" + } + }, + "supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "dev": true, + "requires": { + "has-flag": "^4.0.0" + } + }, + "tsconfig-paths": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-4.2.0.tgz", + "integrity": "sha512-NoZ4roiN7LnbKn9QqE1amc9DJfzvZXxF4xDavcOWt1BPkdx+m+0gJuPM+S0vCe7zTJMYUP0R8pO2XMr+Y8oLIg==", + "dev": true, + "requires": { + "json5": "^2.2.2", + "minimist": "^1.2.6", + "strip-bom": "^3.0.0" + } + } + } + }, "object-hash": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/object-hash/-/object-hash-3.0.0.tgz", @@ -26536,8 +28776,7 @@ "object-inspect": { "version": "1.12.3", "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.3.tgz", - "integrity": "sha512-geUvdk7c+eizMNUDkRpW1wJwgfOiOeHbxBR/hLXK1aT6zmVSO0jsQcs7fj6MGw89jC/cjGfLcNOrtMYtGqm81g==", - "dev": true + "integrity": "sha512-geUvdk7c+eizMNUDkRpW1wJwgfOiOeHbxBR/hLXK1aT6zmVSO0jsQcs7fj6MGw89jC/cjGfLcNOrtMYtGqm81g==" }, "object-is": { "version": "1.1.5", @@ -26555,6 +28794,12 @@ "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==", "dev": true }, + "object-path": { + "version": "0.11.8", + "resolved": "https://registry.npmjs.org/object-path/-/object-path-0.11.8.tgz", + "integrity": "sha512-YJjNZrlXJFM42wTBn6zgOJVar9KFJvzx6sTWDte8sWZF//cnjl0BxHNpfZx+ZffXX63A9q0b1zsFiBX4g4X5KA==", + "dev": true + }, "object.assign": { "version": "4.1.4", "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.4.tgz", @@ -26567,6 +28812,29 @@ "object-keys": "^1.1.1" } }, + "object.fromentries": { + "version": "2.0.7", + "resolved": "https://registry.npmjs.org/object.fromentries/-/object.fromentries-2.0.7.tgz", + "integrity": "sha512-UPbPHML6sL8PI/mOqPwsH4G6iyXcCGzLin8KvEPenOZN5lpCNBZZQ+V62vdjB1mQHrmqGQt5/OJzemUA+KJmEA==", + "dev": true, + "requires": { + "call-bind": "^1.0.2", + "define-properties": "^1.2.0", + "es-abstract": "^1.22.1" + } + }, + "object.groupby": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/object.groupby/-/object.groupby-1.0.1.tgz", + "integrity": "sha512-HqaQtqLnp/8Bn4GL16cj+CUYbnpe1bh0TtEaWvybszDG4tgxCJuRpV8VGuvNaI1fAnI4lUJzDG55MXcOH4JZcQ==", + "dev": true, + "requires": { + "call-bind": "^1.0.2", + "define-properties": "^1.2.0", + "es-abstract": "^1.22.1", + "get-intrinsic": "^1.2.1" + } + }, "object.values": { "version": "1.1.6", "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.1.6.tgz", @@ -26618,9 +28886,9 @@ } }, "open": { - "version": "8.4.1", - "resolved": "https://registry.npmjs.org/open/-/open-8.4.1.tgz", - "integrity": "sha512-/4b7qZNhv6Uhd7jjnREh1NjnPxlTq+XNWPG88Ydkj5AILcA5m3ajvcg57pB24EQjKv0dK62XnDqk9c/hkIG5Kg==", + "version": "8.4.2", + "resolved": "https://registry.npmjs.org/open/-/open-8.4.2.tgz", + "integrity": "sha512-7x81NCL719oNbsq/3mh+hVrAWmFuEYUqrq/Iw3kUzH8ReypT9QQ0BLoJS7/G9k6N81XjW4qHWtjWwe/9eLy1EQ==", "dev": true, "requires": { "define-lazy-prop": "^2.0.0", @@ -26629,17 +28897,17 @@ } }, "optionator": { - "version": "0.9.1", - "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.1.tgz", - "integrity": "sha512-74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw==", + "version": "0.9.3", + "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.3.tgz", + "integrity": "sha512-JjCoypp+jKn1ttEFExxhetCKeJt9zhAgAve5FXHixTvFDW/5aEktX9bufBKLRRMdU7bNtpLfcGu94B3cdEJgjg==", "dev": true, "requires": { + "@aashutoshrathi/word-wrap": "^1.2.3", "deep-is": "^0.1.3", "fast-levenshtein": "^2.0.6", "levn": "^0.4.1", "prelude-ls": "^1.2.1", - "type-check": "^0.4.0", - "word-wrap": "^1.2.3" + "type-check": "^0.4.0" } }, "ora": { @@ -26768,9 +29036,9 @@ "dev": true }, "pacote": { - "version": "15.1.0", - "resolved": "https://registry.npmjs.org/pacote/-/pacote-15.1.0.tgz", - "integrity": "sha512-FFcjtIl+BQNfeliSm7MZz5cpdohvUV1yjGnqgVM4UnVF7JslRY0ImXAygdaCDV0jjUADEWu4y5xsDV8brtrTLg==", + "version": "15.2.0", + "resolved": "https://registry.npmjs.org/pacote/-/pacote-15.2.0.tgz", + "integrity": "sha512-rJVZeIwHTUta23sIZgEIM62WYwbmGbThdbnkt81ravBplQv+HjyroqnLRNH2+sLJHcGZmLRmhPwACqhfTcOmnA==", "dev": true, "requires": { "@npmcli/git": "^4.0.0", @@ -26779,7 +29047,7 @@ "@npmcli/run-script": "^6.0.0", "cacache": "^17.0.0", "fs-minipass": "^3.0.0", - "minipass": "^4.0.0", + "minipass": "^5.0.0", "npm-package-arg": "^10.0.0", "npm-packlist": "^7.0.0", "npm-pick-manifest": "^8.0.0", @@ -26788,7 +29056,7 @@ "promise-retry": "^2.0.1", "read-package-json": "^6.0.0", "read-package-json-fast": "^3.0.0", - "sigstore": "^1.0.0", + "sigstore": "^1.3.0", "ssri": "^10.0.0", "tar": "^6.1.11" } @@ -26818,6 +29086,14 @@ "error-ex": "^1.3.1", "json-parse-even-better-errors": "^2.3.0", "lines-and-columns": "^1.1.6" + }, + "dependencies": { + "lines-and-columns": { + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.2.4.tgz", + "integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==", + "dev": true + } } }, "parse-node-version": { @@ -26862,23 +29138,6 @@ } } }, - "parse5-htmlparser2-tree-adapter": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/parse5-htmlparser2-tree-adapter/-/parse5-htmlparser2-tree-adapter-6.0.1.tgz", - "integrity": "sha512-qPuWvbLgvDGilKc5BoicRovlT4MtYT6JfJyBOMDsKoiT+GiuP5qyrPCnR9HcPECIJJmZh5jRndyNThnhhb/vlA==", - "dev": true, - "requires": { - "parse5": "^6.0.1" - }, - "dependencies": { - "parse5": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/parse5/-/parse5-6.0.1.tgz", - "integrity": "sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw==", - "dev": true - } - } - }, "parse5-sax-parser": { "version": "7.0.0", "resolved": "https://registry.npmjs.org/parse5-sax-parser/-/parse5-sax-parser-7.0.0.tgz", @@ -26919,25 +29178,19 @@ "dev": true }, "path-scurry": { - "version": "1.6.4", - "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-1.6.4.tgz", - "integrity": "sha512-Qp/9IHkdNiXJ3/Kon++At2nVpnhRiPq/aSvQN+H3U1WZbvNRK0RIQK/o4HMqPoXjpuGJUEWpHSs6Mnjxqh3TQg==", + "version": "1.10.1", + "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-1.10.1.tgz", + "integrity": "sha512-MkhCqzzBEpPvxxQ71Md0b1Kk51W01lrYvlMzSUaIzNsODdd7mqhiimSZlr+VegAz5Z6Vzt9Xg2ttE//XBhH3EQ==", "dev": true, "requires": { - "lru-cache": "^9.0.0", - "minipass": "^5.0.0" + "lru-cache": "^9.1.1 || ^10.0.0", + "minipass": "^5.0.0 || ^6.0.2 || ^7.0.0" }, "dependencies": { "lru-cache": { - "version": "9.0.0", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-9.0.0.tgz", - "integrity": "sha512-9AEKXzvOZc4BMacFnYiTOlDH/197LNnQIK9wZ6iMB5NXPzuv4bWR/Msv7iUMplkiMQ1qQL+KSv/JF1mZAB5Lrg==", - "dev": true - }, - "minipass": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/minipass/-/minipass-5.0.0.tgz", - "integrity": "sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ==", + "version": "10.0.1", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.0.1.tgz", + "integrity": "sha512-IJ4uwUTi2qCccrioU6g9g/5rvvVl13bsdczUUcqbciD9iLr095yj8DQKdObriEvuNSx325N1rV1O0sJFszx75g==", "dev": true } } @@ -26974,9 +29227,9 @@ "optional": true }, "piscina": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/piscina/-/piscina-3.2.0.tgz", - "integrity": "sha512-yn/jMdHRw+q2ZJhFhyqsmANcbF6V2QwmD84c6xRau+QpQOmtrBCoRGdvTfeuFDYXB5W2m6MfLkjkvQa9lUSmIA==", + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/piscina/-/piscina-4.0.0.tgz", + "integrity": "sha512-641nAmJS4k4iqpNUqfggqUBUMmlw0ZoM5VZKdQkV2e970Inn3Tk9kroCc1wpsYLD07vCwpys5iY0d3xI/9WkTg==", "dev": true, "requires": { "eventemitter-asyncresource": "^1.0.0", @@ -26986,33 +29239,84 @@ } }, "pkg-dir": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz", - "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==", + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-7.0.0.tgz", + "integrity": "sha512-Ie9z/WINcxxLp27BKOCHGde4ITq9UklYKDzVo1nhk5sqGEXU3FpkwP5GM2voTGJkGd9B3Otl+Q4uwSOeSUtOBA==", "dev": true, "requires": { - "find-up": "^4.0.0" + "find-up": "^6.3.0" + }, + "dependencies": { + "find-up": { + "version": "6.3.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-6.3.0.tgz", + "integrity": "sha512-v2ZsoEuVHYy8ZIlYqwPe/39Cy+cFDzp4dXPaxNvkEuouymu+2Jbz0PxpKarJHYJTmv2HWT3O382qY8l4jMWthw==", + "dev": true, + "requires": { + "locate-path": "^7.1.0", + "path-exists": "^5.0.0" + } + }, + "locate-path": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-7.2.0.tgz", + "integrity": "sha512-gvVijfZvn7R+2qyPX8mAuKcFGDf6Nc61GdvGafQsHL0sBIxfKzA+usWn4GFC/bk+QdwPUD4kWFJLhElipq+0VA==", + "dev": true, + "requires": { + "p-locate": "^6.0.0" + } + }, + "p-limit": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-4.0.0.tgz", + "integrity": "sha512-5b0R4txpzjPWVw/cXXUResoD4hb6U/x9BH08L7nw+GN1sezDzPdxeRvpc9c433fZhBan/wusjbCsqwqm4EIBIQ==", + "dev": true, + "requires": { + "yocto-queue": "^1.0.0" + } + }, + "p-locate": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-6.0.0.tgz", + "integrity": "sha512-wPrq66Llhl7/4AGC6I+cqxT07LhXvWL08LNXz1fENOw0Ap4sRZZ/gZpTTJ5jpurzzzfS2W/Ge9BY3LgLjCShcw==", + "dev": true, + "requires": { + "p-limit": "^4.0.0" + } + }, + "path-exists": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-5.0.0.tgz", + "integrity": "sha512-RjhtfwJOxzcFmNOi6ltcbcu4Iu+FL3zEj83dk4kAS+fVpTxXLO1b38RvJgT/0QwvV/L3aY9TAnyv0EOqW4GoMQ==", + "dev": true + }, + "yocto-queue": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-1.0.0.tgz", + "integrity": "sha512-9bnSc/HEW2uRy67wc+T8UwauLuPJVn28jb+GtJY16iiKWyvmYJRXVT4UamsAEGQfPohgr2q4Tq0sQbQlxTfi1g==", + "dev": true + } } }, "postcss": { - "version": "8.4.21", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.21.tgz", - "integrity": "sha512-tP7u/Sn/dVxK2NnruI4H9BG+x+Wxz6oeZ1cJ8P6G/PZY0IKk4k/63TDsQf2kQq3+qoJeLm2kIBUNlZe3zgb4Zg==", + "version": "8.4.27", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.27.tgz", + "integrity": "sha512-gY/ACJtJPSmUFPDCHtX78+01fHa64FaU4zaaWfuh1MhGJISufJAH4cun6k/8fwsHYeK4UQmENQK+tRLCFJE8JQ==", "dev": true, "requires": { - "nanoid": "^3.3.4", + "nanoid": "^3.3.6", "picocolors": "^1.0.0", "source-map-js": "^1.0.2" } }, "postcss-loader": { - "version": "7.0.2", - "resolved": "https://registry.npmjs.org/postcss-loader/-/postcss-loader-7.0.2.tgz", - "integrity": "sha512-fUJzV/QH7NXUAqV8dWJ9Lg4aTkDCezpTS5HgJ2DvqznexTbSTxgi/dTECvTZ15BwKTtk8G/bqI/QTu2HPd3ZCg==", + "version": "7.3.3", + "resolved": "https://registry.npmjs.org/postcss-loader/-/postcss-loader-7.3.3.tgz", + "integrity": "sha512-YgO/yhtevGO/vJePCQmTxiaEwER94LABZN0ZMT4A0vsak9TpO+RvKRs7EmJ8peIlB9xfXCsS7M8LjqncsUZ5HA==", "dev": true, "requires": { - "cosmiconfig": "^7.0.0", - "klona": "^2.0.5", + "cosmiconfig": "^8.2.0", + "jiti": "^1.18.2", "semver": "^7.3.8" } }, @@ -27023,9 +29327,9 @@ "dev": true }, "postcss-modules-local-by-default": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/postcss-modules-local-by-default/-/postcss-modules-local-by-default-4.0.0.tgz", - "integrity": "sha512-sT7ihtmGSF9yhm6ggikHdV0hlziDTX7oFoXtuVWeDd3hHObNkcHRo9V3yg7vCAY7cONyxJC/XXCmmiHHcvX7bQ==", + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/postcss-modules-local-by-default/-/postcss-modules-local-by-default-4.0.3.tgz", + "integrity": "sha512-2/u2zraspoACtrbFRnTijMiQtb4GW4BvatjaG/bCjYQo8kLTdevCUlwuBHx2sCnSyrI3x3qj4ZK1j5LQBgzmwA==", "dev": true, "requires": { "icss-utils": "^5.0.0", @@ -27052,9 +29356,9 @@ } }, "postcss-selector-parser": { - "version": "6.0.11", - "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.11.tgz", - "integrity": "sha512-zbARubNdogI9j7WY4nQJBiNqQf3sLS3wCP4WfOidu+p28LofJqDH1tcXypGrcmMHhDk2t9wGhCsYe/+szLTy1g==", + "version": "6.0.13", + "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.13.tgz", + "integrity": "sha512-EaV1Gl4mUEV4ddhDnv/xtj7sxwrwxdetHdWUGnT4VJQf+4d05v6lHYZr8N573k5Z0BViss7BDhfWtKS3+sfAqQ==", "dev": true, "requires": { "cssesc": "^3.0.0", @@ -27085,9 +29389,9 @@ "integrity": "sha512-KDeO94CbWI4pKsPnYpA1FPjo79EsY9I+M8ywoPBSf9XMXoe/0crjbUK7jcQEDHuc0ZMRIZsxH3TYLv4TUtHmAA==" }, "primeng": { - "version": "15.4.1", - "resolved": "https://registry.npmjs.org/primeng/-/primeng-15.4.1.tgz", - "integrity": "sha512-j2unOQZk6756l6SgkzcmlHF6JlawF0bIjKTgAPWwT+S5RYeWEjpCPg/ABV8TylwW7CTNQX2oCHbyqCAuhtr++w==", + "version": "16.4.0", + "resolved": "https://registry.npmjs.org/primeng/-/primeng-16.4.0.tgz", + "integrity": "sha512-36Iux0sXy39V0RptuBx30ED1oHCesZOGIU7HNn2ZEXqKgE3mgCk57oQ7OK60xHufWqfRsWcuZgLJDmJPUeLCXA==", "requires": { "tslib": "^2.3.0" } @@ -27143,6 +29447,12 @@ } } }, + "proxy-from-env": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz", + "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==", + "dev": true + }, "prr": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/prr/-/prr-1.0.1.tgz", @@ -27150,6 +29460,12 @@ "dev": true, "optional": true }, + "psl": { + "version": "1.9.0", + "resolved": "https://registry.npmjs.org/psl/-/psl-1.9.0.tgz", + "integrity": "sha512-E/ZsdU4HLs/68gYzgGTkMicWTLPdAftJLfJFlLUAAKZGkStNU72sZjT66SnMDVOfOWY/YAoiD7Jxa9iHvngcag==", + "dev": true + }, "punycode": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz", @@ -27157,18 +29473,18 @@ "dev": true }, "qs": { - "version": "6.11.0", - "resolved": "https://registry.npmjs.org/qs/-/qs-6.11.0.tgz", - "integrity": "sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==", - "dev": true, + "version": "6.11.2", + "resolved": "https://registry.npmjs.org/qs/-/qs-6.11.2.tgz", + "integrity": "sha512-tDNIz22aBzCDxLtVH++VnTfzxlfeK5CbqohpSqpJgj1Wg/cQbStNAz3NuqCs5vV+pjBsK4x4pN9HlVh7rcYRiA==", "requires": { "side-channel": "^1.0.4" } }, - "querystring": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/querystring/-/querystring-0.2.0.tgz", - "integrity": "sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA=" + "querystringify": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/querystringify/-/querystringify-2.2.0.tgz", + "integrity": "sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ==", + "dev": true }, "queue-microtask": { "version": "1.2.3", @@ -27212,12 +29528,12 @@ } }, "read-package-json": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/read-package-json/-/read-package-json-6.0.1.tgz", - "integrity": "sha512-AaHqXxfAVa+fNL07x8iAghfKOds/XXsu7zoouIVsbm7PEbQ3nMWXlvjcbrNLjElnUHWQtAo4QEa0RXuvD4XlpA==", + "version": "6.0.4", + "resolved": "https://registry.npmjs.org/read-package-json/-/read-package-json-6.0.4.tgz", + "integrity": "sha512-AEtWXYfopBj2z5N5PbkAOeNHRPUg5q+Nen7QLxV8M2zJq1ym6/lCz3fYNTCXe19puu2d06jfHhrP7v/S2PtMMw==", "dev": true, "requires": { - "glob": "^9.3.0", + "glob": "^10.2.2", "json-parse-even-better-errors": "^3.0.0", "normalize-package-data": "^5.0.0", "npm-normalize-package-bin": "^3.0.0" @@ -27233,15 +29549,16 @@ } }, "glob": { - "version": "9.3.5", - "resolved": "https://registry.npmjs.org/glob/-/glob-9.3.5.tgz", - "integrity": "sha512-e1LleDykUz2Iu+MTYdkSsuWX8lvAjAcs0Xef0lNIu0S2wOAzuTxCJtcd9S3cijlwYF18EsU3rzb8jPVobxDh9Q==", + "version": "10.3.9", + "resolved": "https://registry.npmjs.org/glob/-/glob-10.3.9.tgz", + "integrity": "sha512-2tU/LKevAQvDVuVJ9pg9Yv9xcbSh+TqHuTaXTNbQwf+0kDl9Fm6bMovi4Nm5c8TVvfxo2LLcqCGtmO9KoJaGWg==", "dev": true, "requires": { - "fs.realpath": "^1.0.0", - "minimatch": "^8.0.2", - "minipass": "^4.2.4", - "path-scurry": "^1.6.1" + "foreground-child": "^3.1.0", + "jackspeak": "^2.3.5", + "minimatch": "^9.0.1", + "minipass": "^5.0.0 || ^6.0.2 || ^7.0.0", + "path-scurry": "^1.10.1" } }, "json-parse-even-better-errors": { @@ -27251,9 +29568,9 @@ "dev": true }, "minimatch": { - "version": "8.0.4", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-8.0.4.tgz", - "integrity": "sha512-W0Wvr9HyFXZRGIDgCicunpQ299OKXs9RgZfaukz4qAW/pJhcpUfupc9c+OObPOFueNy8VSrZgEmDtk6Kh4WzDA==", + "version": "9.0.3", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.3.tgz", + "integrity": "sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg==", "dev": true, "requires": { "brace-expansion": "^2.0.1" @@ -27312,9 +29629,9 @@ "dev": true }, "regenerate-unicode-properties": { - "version": "10.1.0", - "resolved": "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-10.1.0.tgz", - "integrity": "sha512-d1VudCLoIGitcU/hEg2QqvyGZQmdC0Lf8BqdOMXGFSvJP4bNV1+XqbPQeHHLD51Jh4QJJ225dlIFvY4Ly6MXmQ==", + "version": "10.1.1", + "resolved": "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-10.1.1.tgz", + "integrity": "sha512-X007RyZLsCJVVrjgEFVpLUTZwyOZk3oiL75ZcuYjlIWd6rNJtOjkBwQc5AsRrpbKVkxN6sklw/k/9m2jJYOf8Q==", "dev": true, "requires": { "regenerate": "^1.4.2" @@ -27327,9 +29644,9 @@ "dev": true }, "regenerator-transform": { - "version": "0.15.1", - "resolved": "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.15.1.tgz", - "integrity": "sha512-knzmNAcuyxV+gQCufkYcvOqX/qIIfHLv0u5x79kRxuGojfYVky1f15TzZEu2Avte8QGepvUNTnLskf8E6X6Vyg==", + "version": "0.15.2", + "resolved": "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.15.2.tgz", + "integrity": "sha512-hfMp2BoF0qOk3uc5V20ALGDS2ddjQaLrdl7xrGXvAIow7qeWRM2VA2HuCHkUKk9slq3VwEwLNK3DFBqDfPGYtg==", "dev": true, "requires": { "@babel/runtime": "^7.8.4" @@ -27342,36 +29659,30 @@ "dev": true }, "regexp.prototype.flags": { - "version": "1.4.3", - "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.4.3.tgz", - "integrity": "sha512-fjggEOO3slI6Wvgjwflkc4NFRCTZAu5CnNfBd5qOMYhWdn67nJBBu34/TkD++eeFmd8C9r9jfXJ27+nSiRkSUA==", + "version": "1.5.1", + "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.5.1.tgz", + "integrity": "sha512-sy6TXMN+hnP/wMy+ISxg3krXx7BAtWVO4UouuCN/ziM9UEne0euamVNafDfvC83bRNr95y0V5iijeDQFUNpvrg==", "dev": true, "requires": { "call-bind": "^1.0.2", - "define-properties": "^1.1.3", - "functions-have-names": "^1.2.2" + "define-properties": "^1.2.0", + "set-function-name": "^2.0.0" } }, "regexpu-core": { - "version": "5.2.2", - "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-5.2.2.tgz", - "integrity": "sha512-T0+1Zp2wjF/juXMrMxHxidqGYn8U4R+zleSJhX9tQ1PUsS8a9UtYfbsF9LdiVgNX3kiX8RNaKM42nfSgvFJjmw==", + "version": "5.3.2", + "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-5.3.2.tgz", + "integrity": "sha512-RAM5FlZz+Lhmo7db9L298p2vHP5ZywrVXmVXpmAD9GuL5MPH6t9ROw1iA/wfHkQ76Qe7AaPF0nGuim96/IrQMQ==", "dev": true, "requires": { + "@babel/regjsgen": "^0.8.0", "regenerate": "^1.4.2", "regenerate-unicode-properties": "^10.1.0", - "regjsgen": "^0.7.1", "regjsparser": "^0.9.1", "unicode-match-property-ecmascript": "^2.0.0", "unicode-match-property-value-ecmascript": "^2.1.0" } }, - "regjsgen": { - "version": "0.7.1", - "resolved": "https://registry.npmjs.org/regjsgen/-/regjsgen-0.7.1.tgz", - "integrity": "sha512-RAt+8H2ZEzHeYWxZ3H2z6tF18zyyOnlcdaafLrm21Bguj7uZy6ULibiAFdXEtKQY4Sy7wDTwDiOazasMLc4KPA==", - "dev": true - }, "regjsparser": { "version": "0.9.1", "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.9.1.tgz", @@ -27408,12 +29719,12 @@ "dev": true }, "resolve": { - "version": "1.22.1", - "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.1.tgz", - "integrity": "sha512-nBpuuYuY5jFsli/JIs1oldw6fOQCBioohqWZg/2hiaOybXOft4lonv85uDOKXdf8rhyK159cxU5cDcK/NKk8zw==", + "version": "1.22.2", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.2.tgz", + "integrity": "sha512-Sb+mjNHOULsBv818T40qSPeRiuWLyaGMa5ewydRLFimneixmVy2zdivRl+AF6jaYPC8ERxGDmFSiqui6SfPd+g==", "dev": true, "requires": { - "is-core-module": "^2.9.0", + "is-core-module": "^2.11.0", "path-parse": "^1.0.7", "supports-preserve-symlinks-flag": "^1.0.0" } @@ -27492,6 +29803,15 @@ "glob": "^7.1.3" } }, + "rollup": { + "version": "3.29.3", + "resolved": "https://registry.npmjs.org/rollup/-/rollup-3.29.3.tgz", + "integrity": "sha512-T7du6Hum8jOkSWetjRgbwpM6Sy0nECYrYRSmZjayFcOddtKJWU4d17AC3HNUk7HRuqy4p+G7aEZclSHytqUmEg==", + "dev": true, + "requires": { + "fsevents": "~2.3.2" + } + }, "run-async": { "version": "2.4.1", "resolved": "https://registry.npmjs.org/run-async/-/run-async-2.4.1.tgz", @@ -27508,13 +29828,25 @@ } }, "rxjs": { - "version": "7.8.0", - "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.8.0.tgz", - "integrity": "sha512-F2+gxDshqmIub1KdvZkaEfGDwLNpPvk9Fs6LD/MyQxNgMds/WH9OdDDXOmxUZpME+iSK3rQCctkL0DYyytUqMg==", + "version": "7.8.1", + "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.8.1.tgz", + "integrity": "sha512-AA3TVj+0A2iuIoQkWEK/tqFjBq2j+6PO6Y0zJcvzLAFhEFIO3HL0vls9hWLncZbAAbK0mar7oZ4V079I/qPMxg==", "requires": { "tslib": "^2.1.0" } }, + "safe-array-concat": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/safe-array-concat/-/safe-array-concat-1.0.1.tgz", + "integrity": "sha512-6XbUAseYE2KtOuGueyeobCySj9L4+66Tn6KQMOPQJrAJEowYKW/YR/MGJZl7FdydUdaFu4LYyDZjxf4/Nmo23Q==", + "dev": true, + "requires": { + "call-bind": "^1.0.2", + "get-intrinsic": "^1.2.1", + "has-symbols": "^1.0.3", + "isarray": "^2.0.5" + } + }, "safe-buffer": { "version": "5.2.1", "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", @@ -27544,9 +29876,9 @@ "integrity": "sha512-LRneZZRXNgjzwG4bDQdOTSbze3fHm1EAKN/8bePxnlEZiBmkYEDggaHbuvHI9/hoqHbGfsEA7tWS9GhYHZBBsw==" }, "sass": { - "version": "1.58.1", - "resolved": "https://registry.npmjs.org/sass/-/sass-1.58.1.tgz", - "integrity": "sha512-bnINi6nPXbP1XNRaranMFEBZWUfdW/AF16Ql5+ypRxfTvCRTTKrLsMIakyDcayUt2t/RZotmL4kgJwNH5xO+bg==", + "version": "1.64.1", + "resolved": "https://registry.npmjs.org/sass/-/sass-1.64.1.tgz", + "integrity": "sha512-16rRACSOFEE8VN7SCgBu1MpYCyN7urj9At898tyzdXFhC+a+yOX5dXwAR7L8/IdPJ1NB8OYoXmD55DM30B2kEQ==", "dev": true, "requires": { "chokidar": ">=3.0.0 <4.0.0", @@ -27555,12 +29887,11 @@ } }, "sass-loader": { - "version": "13.2.0", - "resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-13.2.0.tgz", - "integrity": "sha512-JWEp48djQA4nbZxmgC02/Wh0eroSUutulROUusYJO9P9zltRbNN80JCBHqRGzjd4cmZCa/r88xgfkjGD0TXsHg==", + "version": "13.3.2", + "resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-13.3.2.tgz", + "integrity": "sha512-CQbKl57kdEv+KDLquhC+gE3pXt74LEAzm+tzywcA0/aHZuub8wTErbjAoNI57rPUWRYRNC5WUnNl8eGJNbDdwg==", "dev": true, "requires": { - "klona": "^2.0.4", "neo-async": "^2.6.2" } }, @@ -27571,6 +29902,15 @@ "dev": true, "optional": true }, + "saxes": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/saxes/-/saxes-5.0.1.tgz", + "integrity": "sha512-5LBh1Tls8c9xgGjw3QrMwETmTMVk0oFgvrFSvWx62llR2hcEInrKNZ2GZCCuuy2lvWrdl5jhbpeqc5hRYKFOcw==", + "dev": true, + "requires": { + "xmlchars": "^2.2.0" + } + }, "schema-utils": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.0.0.tgz", @@ -27599,31 +29939,14 @@ } }, "semver": { - "version": "7.3.8", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz", - "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==", + "version": "7.5.3", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.3.tgz", + "integrity": "sha512-QBlUtyVk/5EeHbi7X0fw6liDZc7BBmEaSYn01fMU1OUYbf6GPsbTtd8WmnqbI20SeycoHSeiybkE/q1Q+qlThQ==", "dev": true, "requires": { "lru-cache": "^6.0.0" } }, - "semver-dsl": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/semver-dsl/-/semver-dsl-1.0.1.tgz", - "integrity": "sha512-e8BOaTo007E3dMuQQTnPdalbKTABKNS7UxoBIDnwOqRa+QwMrCPjynB8zAlPF6xlqUfdLPPLIJ13hJNmhtq8Ng==", - "dev": true, - "requires": { - "semver": "^5.3.0" - }, - "dependencies": { - "semver": { - "version": "5.7.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", - "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==", - "dev": true - } - } - }, "send": { "version": "0.18.0", "resolved": "https://registry.npmjs.org/send/-/send-0.18.0.tgz", @@ -27671,9 +29994,9 @@ } }, "serialize-javascript": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.0.tgz", - "integrity": "sha512-Qr3TosvguFt8ePWqsvRfrKyQXIiW+nGbYpy8XK24NQHE83caxWt+mIymTT19DGFbNWNLfEwsrkSmN64lVWB9ag==", + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.1.tgz", + "integrity": "sha512-owoXEFjWRllis8/M1Q+Cw5k8ZH40e3zhp/ovX+Xr/vi1qj6QesbyXXViFbpNvWvPNAD62SutwEXavefrLJWj7w==", "dev": true, "requires": { "randombytes": "^2.1.0" @@ -27765,6 +30088,17 @@ "integrity": "sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw==", "dev": true }, + "set-function-name": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/set-function-name/-/set-function-name-2.0.1.tgz", + "integrity": "sha512-tMNCiqYVkXIZgc2Hnoy2IvC/f8ezc5koaRFkCjrpWzGpCd3qbZXPzVy9MAZzK1ch/X0jvSkojys3oqJN0qCmdA==", + "dev": true, + "requires": { + "define-data-property": "^1.0.1", + "functions-have-names": "^1.2.3", + "has-property-descriptors": "^1.0.0" + } + }, "setprototypeof": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz", @@ -27795,11 +30129,16 @@ "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==", "dev": true }, + "shell-quote": { + "version": "1.8.1", + "resolved": "https://registry.npmjs.org/shell-quote/-/shell-quote-1.8.1.tgz", + "integrity": "sha512-6j1W9l1iAs/4xYBI1SYOVZyFcCis9b4KCLQ8fgAGG07QvzaRLVVRQvAy85yNmmZSjYjg4MWh4gNvlPujU/5LpA==", + "dev": true + }, "side-channel": { "version": "1.0.4", "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz", "integrity": "sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==", - "dev": true, "requires": { "call-bind": "^1.0.0", "get-intrinsic": "^1.0.2", @@ -27813,57 +30152,16 @@ "dev": true }, "sigstore": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/sigstore/-/sigstore-1.2.0.tgz", - "integrity": "sha512-Fr9+W1nkBSIZCkJQR7jDn/zI0UXNsVpp+7mDQkCnZOIxG9p6yNXBx9xntHsfUyYHE55XDkkVV3+rYbrkzAeesA==", + "version": "1.9.0", + "resolved": "https://registry.npmjs.org/sigstore/-/sigstore-1.9.0.tgz", + "integrity": "sha512-0Zjz0oe37d08VeOtBIuB6cRriqXse2e8w+7yIy2XSXjshRKxbc2KkhXjL229jXSxEm7UbcjS76wcJDGQddVI9A==", "dev": true, "requires": { - "@sigstore/protobuf-specs": "^0.1.0", - "make-fetch-happen": "^11.0.1", - "tuf-js": "^1.0.0" - }, - "dependencies": { - "lru-cache": { - "version": "7.18.3", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.18.3.tgz", - "integrity": "sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA==", - "dev": true - }, - "make-fetch-happen": { - "version": "11.0.3", - "resolved": "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-11.0.3.tgz", - "integrity": "sha512-oPLh5m10lRNNZDjJ2kP8UpboUx2uFXVaVweVe/lWut4iHWcQEmfqSVJt2ihZsFI8HbpwyyocaXbCAWf0g1ukIA==", - "dev": true, - "requires": { - "agentkeepalive": "^4.2.1", - "cacache": "^17.0.0", - "http-cache-semantics": "^4.1.1", - "http-proxy-agent": "^5.0.0", - "https-proxy-agent": "^5.0.0", - "is-lambda": "^1.0.1", - "lru-cache": "^7.7.1", - "minipass": "^4.0.0", - "minipass-fetch": "^3.0.0", - "minipass-flush": "^1.0.5", - "minipass-pipeline": "^1.2.4", - "negotiator": "^0.6.3", - "promise-retry": "^2.0.1", - "socks-proxy-agent": "^7.0.0", - "ssri": "^10.0.0" - } - }, - "minipass-fetch": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/minipass-fetch/-/minipass-fetch-3.0.1.tgz", - "integrity": "sha512-t9/wowtf7DYkwz8cfMSt0rMwiyNIBXf5CKZ3S5ZMqRqMYT0oLTp0x1WorMI9WTwvaPg21r1JbFxJMum8JrLGfw==", - "dev": true, - "requires": { - "encoding": "^0.1.13", - "minipass": "^4.0.0", - "minipass-sized": "^1.0.3", - "minizlib": "^2.1.2" - } - } + "@sigstore/bundle": "^1.1.0", + "@sigstore/protobuf-specs": "^0.2.0", + "@sigstore/sign": "^1.0.0", + "@sigstore/tuf": "^1.0.3", + "make-fetch-happen": "^11.0.1" } }, "slash": { @@ -28029,19 +30327,21 @@ "wbuf": "^1.7.3" } }, - "sprintf-js": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.1.2.tgz", - "integrity": "sha512-VE0SOVEHCk7Qc8ulkWw3ntAzXuqf7S2lvwQaDLRnUeIEaKNQJzV6BwmLKhOqT61aGhfUMrXeaBk+oDGCzvhcug==", - "dev": true - }, "ssri": { - "version": "10.0.1", - "resolved": "https://registry.npmjs.org/ssri/-/ssri-10.0.1.tgz", - "integrity": "sha512-WVy6di9DlPOeBWEjMScpNipeSX2jIZBGEn5Uuo8Q7aIuFEuDX0pw8RxcOjlD1TWP4obi24ki7m/13+nFpcbXrw==", + "version": "10.0.5", + "resolved": "https://registry.npmjs.org/ssri/-/ssri-10.0.5.tgz", + "integrity": "sha512-bSf16tAFkGeRlUNDjXu8FzaMQt6g2HZJrun7mtMbIPOddxt3GLMSz5VWUWcqTJUPfLEaDIepGxv+bYQW49596A==", "dev": true, "requires": { - "minipass": "^4.0.0" + "minipass": "^7.0.3" + }, + "dependencies": { + "minipass": { + "version": "7.0.3", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.0.3.tgz", + "integrity": "sha512-LhbbwCfz3vsb12j/WkWQPZfKTsgqIe1Nf/ti1pKjYESGLHIVjWU96G9/ljLH4F9mWNVhlQOm0VySdAWzf05dpg==", + "dev": true + } } }, "statuses": { @@ -28091,26 +30391,48 @@ "strip-ansi": "^6.0.1" } }, - "string.prototype.trimend": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.6.tgz", - "integrity": "sha512-JySq+4mrPf9EsDBEDYMOb/lM7XQLulwg5R/m1r0PXEFqrV0qHvl58sdTilSXtKOflCsK2E8jxf+GKC0T07RWwQ==", + "string-width-cjs": { + "version": "npm:string-width@4.2.3", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", + "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", + "dev": true, + "requires": { + "emoji-regex": "^8.0.0", + "is-fullwidth-code-point": "^3.0.0", + "strip-ansi": "^6.0.1" + } + }, + "string.prototype.trim": { + "version": "1.2.8", + "resolved": "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.2.8.tgz", + "integrity": "sha512-lfjY4HcixfQXOfaqCvcBuOIapyaroTXhbkfJN3gcB1OtyupngWK4sEET9Knd0cXd28kTUqu/kHoV4HKSJdnjiQ==", "dev": true, "requires": { "call-bind": "^1.0.2", - "define-properties": "^1.1.4", - "es-abstract": "^1.20.4" + "define-properties": "^1.2.0", + "es-abstract": "^1.22.1" + } + }, + "string.prototype.trimend": { + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.7.tgz", + "integrity": "sha512-Ni79DqeB72ZFq1uH/L6zJ+DKZTkOtPIHovb3YZHQViE+HDouuU4mBrLOLDn5Dde3RF8qw5qVETEjhu9locMLvA==", + "dev": true, + "requires": { + "call-bind": "^1.0.2", + "define-properties": "^1.2.0", + "es-abstract": "^1.22.1" } }, "string.prototype.trimstart": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.6.tgz", - "integrity": "sha512-omqjMDaY92pbn5HOX7f9IccLA+U1tA9GvtU4JrodiXFfYB7jPzzHpRzpglLAjtUV6bB557zwClJezTqnAiYnQA==", + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.7.tgz", + "integrity": "sha512-NGhtDFu3jCEm7B4Fy0DpLewdJQOZcQ0rGbwQ/+stjnrp2i+rlKeCvos9hOIeCmqwratM47OBxY7uFZzjxHXmrg==", "dev": true, "requires": { "call-bind": "^1.0.2", - "define-properties": "^1.1.4", - "es-abstract": "^1.20.4" + "define-properties": "^1.2.0", + "es-abstract": "^1.22.1" } }, "strip-ansi": { @@ -28130,10 +30452,27 @@ } } }, + "strip-ansi-cjs": { + "version": "npm:strip-ansi@6.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", + "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", + "dev": true, + "requires": { + "ansi-regex": "^5.0.1" + }, + "dependencies": { + "ansi-regex": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", + "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", + "dev": true + } + } + }, "strip-bom": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz", - "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=", + "integrity": "sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA==", "dev": true }, "strip-final-newline": { @@ -28153,6 +30492,17 @@ "resolved": "https://registry.npmjs.org/strnum/-/strnum-1.0.5.tgz", "integrity": "sha512-J8bbNyKKXl5qYcR36TIO8W3mVGVHrmmxsd5PAItGkmyzwJvybiw2IVq5nqd0i4LSNSkB/sx9VHllbfFdr9k1JA==" }, + "strong-log-transformer": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/strong-log-transformer/-/strong-log-transformer-2.1.0.tgz", + "integrity": "sha512-B3Hgul+z0L9a236FAUC9iZsL+nVHgoCJnqCbN588DjYxvGXaXaaFbfmQ/JhvKjZwsOukuR72XbHv71Qkug0HxA==", + "dev": true, + "requires": { + "duplexer": "^0.1.1", + "minimist": "^1.2.0", + "through": "^2.3.4" + } + }, "supports-color": { "version": "5.5.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", @@ -28174,6 +30524,12 @@ "integrity": "sha512-b19dMThMV4HVFynSAM1++gBHAbk2Tc/osgLIBZMKsyqh34jb2e8Os7T6ZW/Bt3pJFdBTd2JwAnAAEQV7rSNvcQ==", "dev": true }, + "symbol-tree": { + "version": "3.2.4", + "resolved": "https://registry.npmjs.org/symbol-tree/-/symbol-tree-3.2.4.tgz", + "integrity": "sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==", + "dev": true + }, "taira": { "version": "3.2.2", "resolved": "https://registry.npmjs.org/taira/-/taira-3.2.2.tgz", @@ -28186,14 +30542,14 @@ "dev": true }, "tar": { - "version": "6.1.13", - "resolved": "https://registry.npmjs.org/tar/-/tar-6.1.13.tgz", - "integrity": "sha512-jdIBIN6LTIe2jqzay/2vtYLlBHa3JF42ot3h1dW8Q0PaAG4v8rm0cvpVePtau5C6OKXGGcgO9q2AMNSWxiLqKw==", + "version": "6.2.0", + "resolved": "https://registry.npmjs.org/tar/-/tar-6.2.0.tgz", + "integrity": "sha512-/Wo7DcT0u5HUV486xg675HtjNd3BXZ6xDbzsCUZPt5iw8bTQ63bP0Raut3mvro9u+CUyq7YQd8Cx55fsZXxqLQ==", "dev": true, "requires": { "chownr": "^2.0.0", "fs-minipass": "^2.0.0", - "minipass": "^4.0.0", + "minipass": "^5.0.0", "minizlib": "^2.1.1", "mkdirp": "^1.0.3", "yallist": "^4.0.0" @@ -28221,29 +30577,42 @@ } } }, - "terser": { - "version": "5.16.3", - "resolved": "https://registry.npmjs.org/terser/-/terser-5.16.3.tgz", - "integrity": "sha512-v8wWLaS/xt3nE9dgKEWhNUFP6q4kngO5B8eYFUuebsu7Dw/UNAnpUod6UHo04jSSkv8TzKHjZDSd7EXdDQAl8Q==", + "tar-stream": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-2.2.0.tgz", + "integrity": "sha512-ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ==", "dev": true, "requires": { - "@jridgewell/source-map": "^0.3.2", - "acorn": "^8.5.0", + "bl": "^4.0.3", + "end-of-stream": "^1.4.1", + "fs-constants": "^1.0.0", + "inherits": "^2.0.3", + "readable-stream": "^3.1.1" + } + }, + "terser": { + "version": "5.19.2", + "resolved": "https://registry.npmjs.org/terser/-/terser-5.19.2.tgz", + "integrity": "sha512-qC5+dmecKJA4cpYxRa5aVkKehYsQKc+AHeKl0Oe62aYjBL8ZA33tTljktDHJSaxxMnbI5ZYw+o/S2DxxLu8OfA==", + "dev": true, + "requires": { + "@jridgewell/source-map": "^0.3.3", + "acorn": "^8.8.2", "commander": "^2.20.0", "source-map-support": "~0.5.20" } }, "terser-webpack-plugin": { - "version": "5.3.1", - "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.3.1.tgz", - "integrity": "sha512-GvlZdT6wPQKbDNW/GDQzZFg/j4vKU96yl2q6mcUkzKOgW4gwf1Z8cZToUCrz31XHlPWH8MVb1r2tFtdDtTGJ7g==", + "version": "5.3.9", + "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.3.9.tgz", + "integrity": "sha512-ZuXsqE07EcggTWQjXUj+Aot/OMcD0bMKGgF63f7UxYcu5/AJF53aIpK1YoP5xR9l6s/Hy2b+t1AM0bLNPRuhwA==", "dev": true, "requires": { + "@jridgewell/trace-mapping": "^0.3.17", "jest-worker": "^27.4.5", "schema-utils": "^3.1.1", - "serialize-javascript": "^6.0.0", - "source-map": "^0.6.1", - "terser": "^5.7.2" + "serialize-javascript": "^6.0.1", + "terser": "^5.16.8" }, "dependencies": { "ajv": { @@ -28271,21 +30640,15 @@ "dev": true }, "schema-utils": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.1.tgz", - "integrity": "sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==", + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.3.0.tgz", + "integrity": "sha512-pN/yOAvcC+5rQ5nERGuwrjLlYvLTbCibnZ1I7B1LaiAz9BRBlE9GMgE/eqV30P7aJQUf7Ddimy/RsbYO/GrVGg==", "dev": true, "requires": { "@types/json-schema": "^7.0.8", "ajv": "^6.12.5", "ajv-keywords": "^3.5.2" } - }, - "source-map": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", - "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", - "dev": true } } }, @@ -28318,11 +30681,6 @@ "integrity": "sha512-eHY7nBftgThBqOyHGVN+l8gF0BucP09fMo0oO/Lb0w1OF80dJv+lDVpXG60WMQvkcxAkNybKsrEIE3ZtKGmPrA==", "dev": true }, - "tinycolor2": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/tinycolor2/-/tinycolor2-1.6.0.tgz", - "integrity": "sha512-XPaBkWQJdsf3pLKJV9p4qN/S+fm2Oj8AIPo1BTUhg5oxkvm9+SVEGFdhyOz7tTdUTfvxMiAs4sp6/eZO2Ew+pw==" - }, "tmp": { "version": "0.2.1", "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.2.1.tgz", @@ -28353,20 +30711,55 @@ "integrity": "sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==", "dev": true }, + "tough-cookie": { + "version": "4.1.3", + "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.1.3.tgz", + "integrity": "sha512-aX/y5pVRkfRnfmuX+OdbSdXvPe6ieKX/G2s7e98f4poJHnqH3281gDPm/metm6E/WRamfx7WC4HUqkWHfQHprw==", + "dev": true, + "requires": { + "psl": "^1.1.33", + "punycode": "^2.1.1", + "universalify": "^0.2.0", + "url-parse": "^1.5.3" + }, + "dependencies": { + "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 + } + } + }, + "tr46": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/tr46/-/tr46-2.1.0.tgz", + "integrity": "sha512-15Ih7phfcdP5YxqiB+iDtLoaTz4Nd35+IiAv0kQ5FNKHzXgdWqPoTIqEDDJmXceQt4JZk6lVPT8lnDlPpGDppw==", + "dev": true, + "requires": { + "punycode": "^2.1.1" + } + }, "tree-kill": { "version": "1.2.2", "resolved": "https://registry.npmjs.org/tree-kill/-/tree-kill-1.2.2.tgz", "integrity": "sha512-L0Orpi8qGpRG//Nd+H90vFB+3iHnue1zSSGmNOOCh1GLJ7rUKVwV2HvijphGQS2UmhUZewS9VgvxYIdgr+fG1A==", "dev": true }, + "ts-api-utils": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/ts-api-utils/-/ts-api-utils-1.0.3.tgz", + "integrity": "sha512-wNMeqtMz5NtwpT/UZGY5alT+VoKdSsOOP/kqHFcUW1P/VRhH2wJ48+DN2WwUliNbQ976ETwDL0Ifd2VVvgonvg==", + "dev": true + }, "tsconfig-paths": { - "version": "3.14.1", - "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.14.1.tgz", - "integrity": "sha512-fxDhWnFSLt3VuTwtvJt5fpwxBHg5AdKWMsgcPOOIilyjymcYVZoCQF8fvFRezCNfblEXmi+PcM1eYHeOAgXCOQ==", + "version": "3.14.2", + "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.14.2.tgz", + "integrity": "sha512-o/9iXgCYc5L/JxCHPe3Hvh8Q/2xm5Z+p18PESBU6Ff33695QnCHBEjcytY2q19ua7Mbl/DavtBOLq+oG0RCL+g==", "dev": true, "requires": { "@types/json5": "^0.0.29", - "json5": "^1.0.1", + "json5": "^1.0.2", "minimist": "^1.2.6", "strip-bom": "^3.0.0" }, @@ -28383,9 +30776,9 @@ } }, "tslib": { - "version": "2.5.0", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.5.0.tgz", - "integrity": "sha512-336iVw3rtn2BUK7ORdIAHTyxHGRIHVReokCR3XjbckJMK7ms8FysBfhLR8IXnAgy7T0PTPNBWKiH514FOW/WSg==" + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz", + "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==" }, "tsutils": { "version": "3.21.0", @@ -28404,57 +30797,25 @@ } } }, - "tuf-js": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/tuf-js/-/tuf-js-1.1.2.tgz", - "integrity": "sha512-gBfbnS6khluxjvoFCpRV0fhWT265xNfpiNXOcBX0Ze6HGbPhe93UG5V5DdKcgm/aXsMadnY76l/h6j63GmJS5g==", + "tsutils-etc": { + "version": "1.4.2", + "resolved": "https://registry.npmjs.org/tsutils-etc/-/tsutils-etc-1.4.2.tgz", + "integrity": "sha512-2Dn5SxTDOu6YWDNKcx1xu2YUy6PUeKrWZB/x2cQ8vY2+iz3JRembKn/iZ0JLT1ZudGNwQQvtFX9AwvRHbXuPUg==", "dev": true, "requires": { - "@tufjs/models": "1.0.1", - "make-fetch-happen": "^11.0.1" - }, - "dependencies": { - "lru-cache": { - "version": "7.18.3", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.18.3.tgz", - "integrity": "sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA==", - "dev": true - }, - "make-fetch-happen": { - "version": "11.0.3", - "resolved": "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-11.0.3.tgz", - "integrity": "sha512-oPLh5m10lRNNZDjJ2kP8UpboUx2uFXVaVweVe/lWut4iHWcQEmfqSVJt2ihZsFI8HbpwyyocaXbCAWf0g1ukIA==", - "dev": true, - "requires": { - "agentkeepalive": "^4.2.1", - "cacache": "^17.0.0", - "http-cache-semantics": "^4.1.1", - "http-proxy-agent": "^5.0.0", - "https-proxy-agent": "^5.0.0", - "is-lambda": "^1.0.1", - "lru-cache": "^7.7.1", - "minipass": "^4.0.0", - "minipass-fetch": "^3.0.0", - "minipass-flush": "^1.0.5", - "minipass-pipeline": "^1.2.4", - "negotiator": "^0.6.3", - "promise-retry": "^2.0.1", - "socks-proxy-agent": "^7.0.0", - "ssri": "^10.0.0" - } - }, - "minipass-fetch": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/minipass-fetch/-/minipass-fetch-3.0.1.tgz", - "integrity": "sha512-t9/wowtf7DYkwz8cfMSt0rMwiyNIBXf5CKZ3S5ZMqRqMYT0oLTp0x1WorMI9WTwvaPg21r1JbFxJMum8JrLGfw==", - "dev": true, - "requires": { - "encoding": "^0.1.13", - "minipass": "^4.0.0", - "minipass-sized": "^1.0.3", - "minizlib": "^2.1.2" - } - } + "@types/yargs": "^17.0.0", + "yargs": "^17.0.0" + } + }, + "tuf-js": { + "version": "1.1.7", + "resolved": "https://registry.npmjs.org/tuf-js/-/tuf-js-1.1.7.tgz", + "integrity": "sha512-i3P9Kgw3ytjELUfpuKVDNBJvk4u5bXL6gskv572mcevPbSKCV3zt3djhmlEQ65yERjIbOSncy7U4cQJaB1CBCg==", + "dev": true, + "requires": { + "@tufjs/models": "1.0.4", + "debug": "^4.3.4", + "make-fetch-happen": "^11.1.1" } }, "type-check": { @@ -28482,6 +30843,42 @@ "mime-types": "~2.1.24" } }, + "typed-array-buffer": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/typed-array-buffer/-/typed-array-buffer-1.0.0.tgz", + "integrity": "sha512-Y8KTSIglk9OZEr8zywiIHG/kmQ7KWyjseXs1CbSo8vC42w7hg2HgYTxSWwP0+is7bWDc1H+Fo026CpHFwm8tkw==", + "dev": true, + "requires": { + "call-bind": "^1.0.2", + "get-intrinsic": "^1.2.1", + "is-typed-array": "^1.1.10" + } + }, + "typed-array-byte-length": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/typed-array-byte-length/-/typed-array-byte-length-1.0.0.tgz", + "integrity": "sha512-Or/+kvLxNpeQ9DtSydonMxCx+9ZXOswtwJn17SNLvhptaXYDJvkFFP5zbfU/uLmvnBJlI4yrnXRxpdWH/M5tNA==", + "dev": true, + "requires": { + "call-bind": "^1.0.2", + "for-each": "^0.3.3", + "has-proto": "^1.0.1", + "is-typed-array": "^1.1.10" + } + }, + "typed-array-byte-offset": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/typed-array-byte-offset/-/typed-array-byte-offset-1.0.0.tgz", + "integrity": "sha512-RD97prjEt9EL8YgAgpOkf3O4IF9lhJFr9g0htQkm0rchFp/Vx7LW5Q8fSXXub7BXAODyUQohRMyOc3faCPd0hg==", + "dev": true, + "requires": { + "available-typed-arrays": "^1.0.5", + "call-bind": "^1.0.2", + "for-each": "^0.3.3", + "has-proto": "^1.0.1", + "is-typed-array": "^1.1.10" + } + }, "typed-array-length": { "version": "1.0.4", "resolved": "https://registry.npmjs.org/typed-array-length/-/typed-array-length-1.0.4.tgz", @@ -28500,9 +30897,9 @@ "dev": true }, "typescript": { - "version": "4.9.5", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.9.5.tgz", - "integrity": "sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g==", + "version": "5.1.6", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.1.6.tgz", + "integrity": "sha512-zaWCozRZ6DLEWAWFrVDz1H6FVXzUSfTy5FUMWsQlU8Ym5JP9eO4xkTIROFCQvhQf61z6O/G6ugw3SgAnvvm+HA==", "dev": true }, "unbox-primitive": { @@ -28563,6 +30960,12 @@ "imurmurhash": "^0.1.4" } }, + "universalify": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz", + "integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==", + "dev": true + }, "unpipe": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz", @@ -28570,9 +30973,9 @@ "dev": true }, "update-browserslist-db": { - "version": "1.0.10", - "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.10.tgz", - "integrity": "sha512-OztqDenkfFkbSG+tRxBeAnCVPckDBcvibKd35yDONx6OU8N7sqgwc7rCbkJ/WcYtVRZ4ba68d6byhC21GFh7sQ==", + "version": "1.0.13", + "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.13.tgz", + "integrity": "sha512-xebP81SNcPuNpPP3uzeW1NYXxI3rxyJzF3pD6sH4jE7o/IX+WtSpwnVU+qIsDPyk0d3hmFQ7mjqc6AtV604hbg==", "dev": true, "requires": { "escalade": "^3.1.1", @@ -28589,21 +30992,31 @@ } }, "url": { - "version": "0.11.0", - "resolved": "https://registry.npmjs.org/url/-/url-0.11.0.tgz", - "integrity": "sha1-ODjpfPxgUh63PFJajlW/3Z4uKPE=", + "version": "0.11.3", + "resolved": "https://registry.npmjs.org/url/-/url-0.11.3.tgz", + "integrity": "sha512-6hxOLGfZASQK/cijlZnZJTq8OXAkt/3YGfQX45vvMYXpZoo8NdWZcY73K108Jf759lS1Bv/8wXnHDTSz17dSRw==", "requires": { - "punycode": "1.3.2", - "querystring": "0.2.0" + "punycode": "^1.4.1", + "qs": "^6.11.2" }, "dependencies": { "punycode": { - "version": "1.3.2", - "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz", - "integrity": "sha1-llOgNvt8HuQjQvIyXM7v6jkmxI0=" + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz", + "integrity": "sha512-jmYNElW7yvO7TV33CjSmvSiE2yco3bV2czu/OzDKdMNVZQWfxCblURLhf+47syQRBntjfLdd/H0egrzIG+oaFQ==" } } }, + "url-parse": { + "version": "1.5.10", + "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.5.10.tgz", + "integrity": "sha512-WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ==", + "dev": true, + "requires": { + "querystringify": "^2.1.1", + "requires-port": "^1.0.0" + } + }, "util-deprecate": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", @@ -28621,6 +31034,12 @@ "resolved": "https://registry.npmjs.org/uuid/-/uuid-9.0.0.tgz", "integrity": "sha512-MXcSTerfPa4uqyzStbRoTgt5XIe3x5+42+q1sDuy3R5MDk66URdLMOZe5aPX/SQd+kuYAh0FdP/pO28IkQyTeg==" }, + "v8-compile-cache": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz", + "integrity": "sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA==", + "dev": true + }, "validate-npm-package-license": { "version": "3.0.4", "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz", @@ -28646,6 +31065,36 @@ "integrity": "sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg==", "dev": true }, + "vite": { + "version": "4.4.7", + "resolved": "https://registry.npmjs.org/vite/-/vite-4.4.7.tgz", + "integrity": "sha512-6pYf9QJ1mHylfVh39HpuSfMPojPSKVxZvnclX1K1FyZ1PXDOcLBibdq5t1qxJSnL63ca8Wf4zts6mD8u8oc9Fw==", + "dev": true, + "requires": { + "esbuild": "^0.18.10", + "fsevents": "~2.3.2", + "postcss": "^8.4.26", + "rollup": "^3.25.2" + } + }, + "w3c-hr-time": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/w3c-hr-time/-/w3c-hr-time-1.0.2.tgz", + "integrity": "sha512-z8P5DvDNjKDoFIHK7q8r8lackT6l+jo/Ye3HOle7l9nICP9lf1Ci25fy9vHd0JOWewkIFzXIEig3TdKT7JQ5fQ==", + "dev": true, + "requires": { + "browser-process-hrtime": "^1.0.0" + } + }, + "w3c-xmlserializer": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/w3c-xmlserializer/-/w3c-xmlserializer-2.0.0.tgz", + "integrity": "sha512-4tzD0mF8iSiMiNs30BiLO3EpfGLZUT2MSX/G+o7ZywDzliWQ3OPtTZ0PTC3B3ca1UAf4cJMHB+2Bf56EriJuRA==", + "dev": true, + "requires": { + "xml-name-validator": "^3.0.0" + } + }, "watchpack": { "version": "2.4.0", "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.4.0.tgz", @@ -28674,23 +31123,29 @@ "defaults": "^1.0.3" } }, + "webidl-conversions": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-6.1.0.tgz", + "integrity": "sha512-qBIvFLGiBpLjfwmYAaHPXsn+ho5xZnGvyGvsarywGNc8VyQJUMHJ8OBKGGrPER0okBeMDaan4mNBlgBROxuI8w==", + "dev": true + }, "webpack": { - "version": "5.76.1", - "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.76.1.tgz", - "integrity": "sha512-4+YIK4Abzv8172/SGqObnUjaIHjLEuUasz9EwQj/9xmPPkYJy2Mh03Q/lJfSD3YLzbxy5FeTq5Uw0323Oh6SJQ==", + "version": "5.88.2", + "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.88.2.tgz", + "integrity": "sha512-JmcgNZ1iKj+aiR0OvTYtWQqJwq37Pf683dY9bVORwVbUrDhLhdn/PlO2sHsFHPkj7sHNQF3JwaAkp49V+Sq1tQ==", "dev": true, "requires": { "@types/eslint-scope": "^3.7.3", - "@types/estree": "^0.0.51", - "@webassemblyjs/ast": "1.11.1", - "@webassemblyjs/wasm-edit": "1.11.1", - "@webassemblyjs/wasm-parser": "1.11.1", + "@types/estree": "^1.0.0", + "@webassemblyjs/ast": "^1.11.5", + "@webassemblyjs/wasm-edit": "^1.11.5", + "@webassemblyjs/wasm-parser": "^1.11.5", "acorn": "^8.7.1", - "acorn-import-assertions": "^1.7.6", + "acorn-import-assertions": "^1.9.0", "browserslist": "^4.14.5", "chrome-trace-event": "^1.0.2", - "enhanced-resolve": "^5.10.0", - "es-module-lexer": "^0.9.0", + "enhanced-resolve": "^5.15.0", + "es-module-lexer": "^1.2.1", "eslint-scope": "5.1.1", "events": "^3.2.0", "glob-to-regexp": "^0.4.1", @@ -28699,9 +31154,9 @@ "loader-runner": "^4.2.0", "mime-types": "^2.1.27", "neo-async": "^2.6.2", - "schema-utils": "^3.1.0", + "schema-utils": "^3.2.0", "tapable": "^2.1.1", - "terser-webpack-plugin": "^5.1.3", + "terser-webpack-plugin": "^5.3.7", "watchpack": "^2.4.0", "webpack-sources": "^3.2.3" }, @@ -28731,9 +31186,9 @@ "dev": true }, "schema-utils": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.1.tgz", - "integrity": "sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==", + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.3.0.tgz", + "integrity": "sha512-pN/yOAvcC+5rQ5nERGuwrjLlYvLTbCibnZ1I7B1LaiAz9BRBlE9GMgE/eqV30P7aJQUf7Ddimy/RsbYO/GrVGg==", "dev": true, "requires": { "@types/json-schema": "^7.0.8", @@ -28744,9 +31199,9 @@ } }, "webpack-dev-middleware": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-6.0.1.tgz", - "integrity": "sha512-PZPZ6jFinmqVPJZbisfggDiC+2EeGZ1ZByyMP5sOFJcPPWSexalISz+cvm+j+oYPT7FIJyxT76esjnw9DhE5sw==", + "version": "6.1.1", + "resolved": "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-6.1.1.tgz", + "integrity": "sha512-y51HrHaFeeWir0YO4f0g+9GwZawuigzcAdRNon6jErXy/SqV/+O6eaVAzDqE6t3e3NpGeR5CS+cCDaTC+V3yEQ==", "dev": true, "requires": { "colorette": "^2.0.10", @@ -28757,9 +31212,9 @@ } }, "webpack-dev-server": { - "version": "4.11.1", - "resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-4.11.1.tgz", - "integrity": "sha512-lILVz9tAUy1zGFwieuaQtYiadImb5M3d+H+L1zDYalYoDl0cksAB1UNyuE5MMWJrG6zR1tXkCP2fitl7yoUJiw==", + "version": "4.15.1", + "resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-4.15.1.tgz", + "integrity": "sha512-5hbAst3h3C3L8w6W4P96L5vaV0PxSmJhxZvWKYIdgxOQm8pNZ5dEOmmSLBVpP85ReeyRt6AS1QJNyo/oFFPeVA==", "dev": true, "requires": { "@types/bonjour": "^3.5.9", @@ -28768,7 +31223,7 @@ "@types/serve-index": "^1.9.1", "@types/serve-static": "^1.13.10", "@types/sockjs": "^0.3.33", - "@types/ws": "^8.5.1", + "@types/ws": "^8.5.5", "ansi-html-community": "^0.0.8", "bonjour-service": "^1.0.11", "chokidar": "^3.5.3", @@ -28781,6 +31236,7 @@ "html-entities": "^2.3.2", "http-proxy-middleware": "^2.0.3", "ipaddr.js": "^2.0.1", + "launch-editor": "^2.6.0", "open": "^8.0.9", "p-retry": "^4.5.0", "rimraf": "^3.0.2", @@ -28790,7 +31246,7 @@ "sockjs": "^0.3.24", "spdy": "^4.0.2", "webpack-dev-middleware": "^5.3.1", - "ws": "^8.4.2" + "ws": "^8.13.0" }, "dependencies": { "webpack-dev-middleware": { @@ -28805,13 +31261,19 @@ "range-parser": "^1.2.1", "schema-utils": "^4.0.0" } + }, + "ws": { + "version": "8.14.2", + "resolved": "https://registry.npmjs.org/ws/-/ws-8.14.2.tgz", + "integrity": "sha512-wEBG1ftX4jcglPxgFCMJmZ2PLtSbJ2Peg6TmpJFTbe9GZYOQCDPdMYu/Tm0/bGZkw8paZnJY45J4K2PZrLYq8g==", + "dev": true } } }, "webpack-merge": { - "version": "5.8.0", - "resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-5.8.0.tgz", - "integrity": "sha512-/SaI7xY0831XwP6kzuwhKWVKDP9t1QY1h65lAFLbZqMPIuYcD9QAW4u9STIbU9kaJbPBB/geU/gLr1wDjOhQ+Q==", + "version": "5.9.0", + "resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-5.9.0.tgz", + "integrity": "sha512-6NbRQw4+Sy50vYNTw7EyOn41OZItPiXB8GNv3INSoe3PSFaHJEz3SHTrYVaRm2LilNGnFUzh0FAwqPEmU/CwDg==", "dev": true, "requires": { "clone-deep": "^4.0.1", @@ -28850,6 +31312,32 @@ "integrity": "sha512-OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg==", "dev": true }, + "whatwg-encoding": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/whatwg-encoding/-/whatwg-encoding-1.0.5.tgz", + "integrity": "sha512-b5lim54JOPN9HtzvK9HFXvBma/rnfFeqsic0hSpjtDbVxR3dJKLc+KB4V6GgiGOvl7CY/KNh8rxSo9DKQrnUEw==", + "dev": true, + "requires": { + "iconv-lite": "0.4.24" + } + }, + "whatwg-mimetype": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/whatwg-mimetype/-/whatwg-mimetype-2.3.0.tgz", + "integrity": "sha512-M4yMwr6mAnQz76TbJm914+gPpB/nCwvZbJU28cUD6dR004SAxDLOOSUaB1JDRqLtaOV/vi0IC5lEAGFgrjGv/g==", + "dev": true + }, + "whatwg-url": { + "version": "8.7.0", + "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-8.7.0.tgz", + "integrity": "sha512-gAojqb/m9Q8a5IV96E3fHJM70AzCkgt4uXYX2O7EmuyOnLrViCQlsEBmF9UQIu3/aeAIp2U17rtbpZWNntQqdg==", + "dev": true, + "requires": { + "lodash": "^4.7.0", + "tr46": "^2.1.0", + "webidl-conversions": "^6.1.0" + } + }, "which": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", @@ -28885,17 +31373,16 @@ } }, "which-typed-array": { - "version": "1.1.9", - "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.9.tgz", - "integrity": "sha512-w9c4xkx6mPidwp7180ckYWfMmvxpjlZuIudNtDf4N/tTAUB8VJbX25qZoAsrtGuYNnGw3pa0AXgbGKRB8/EceA==", + "version": "1.1.11", + "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.11.tgz", + "integrity": "sha512-qe9UWWpkeG5yzZ0tNYxDmd7vo58HDBc39mZ0xWWpolAGADdFOzkfamWLDxkOWcvHQKVmdTyQdLD4NOfjLWTKew==", "dev": true, "requires": { "available-typed-arrays": "^1.0.5", "call-bind": "^1.0.2", "for-each": "^0.3.3", "gopd": "^1.0.1", - "has-tostringtag": "^1.0.0", - "is-typed-array": "^1.1.10" + "has-tostringtag": "^1.0.0" } }, "wide-align": { @@ -28908,15 +31395,9 @@ } }, "wildcard": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/wildcard/-/wildcard-2.0.0.tgz", - "integrity": "sha512-JcKqAHLPxcdb9KM49dufGXn2x3ssnfjbcaQdLlfZsL9rH9wgDQjUtDxbo8NE0F6SFvydeu1VhZe7hZuHsB2/pw==", - "dev": true - }, - "word-wrap": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz", - "integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==", + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/wildcard/-/wildcard-2.0.1.tgz", + "integrity": "sha512-CC1bOL87PIWSBhDcTrdeLo6eGT7mCFtrg0uIJtqJUFyK+eJnzl8A1niH56uu7KMa5XFrtiV+AQuHO3n7DsHnLQ==", "dev": true }, "wrap-ansi": { @@ -28956,6 +31437,43 @@ } } }, + "wrap-ansi-cjs": { + "version": "npm:wrap-ansi@7.0.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", + "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==", + "dev": true, + "requires": { + "ansi-styles": "^4.0.0", + "string-width": "^4.1.0", + "strip-ansi": "^6.0.0" + }, + "dependencies": { + "ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "dev": true, + "requires": { + "color-convert": "^2.0.1" + } + }, + "color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "requires": { + "color-name": "~1.1.4" + } + }, + "color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true + } + } + }, "wrappy": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", @@ -28963,9 +31481,9 @@ "dev": true }, "ws": { - "version": "8.13.0", - "resolved": "https://registry.npmjs.org/ws/-/ws-8.13.0.tgz", - "integrity": "sha512-x9vcZYTrFPC7aSIbj7sRCYo7L/Xb8Iy+pW0ng0wt2vCJv7M9HOMy0UoN3rr+IFC7hb7vXoqS+P9ktyLLLhO+LA==", + "version": "7.5.9", + "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.9.tgz", + "integrity": "sha512-F+P9Jil7UiSKSkppIiD94dN07AwvFixvLIj1Og1Rl9GGMuNipJnV9JzjD6XuqmAeiswGvUmNLjr5cFuXwNS77Q==", "dev": true }, "xhr2": { @@ -28973,6 +31491,18 @@ "resolved": "https://registry.npmjs.org/xhr2/-/xhr2-0.2.1.tgz", "integrity": "sha512-sID0rrVCqkVNUn8t6xuv9+6FViXjUVXq8H5rWOH2rz9fDNQEd4g0EA2XlcEdJXRz5BMEn4O1pJFdT+z4YHhoWw==" }, + "xml-name-validator": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-3.0.0.tgz", + "integrity": "sha512-A5CUptxDsvxKJEU3yO6DuWBSJz/qizqzJKOMIfUJHETbBw/sFaDxgd6fxm1ewUaM0jZ444Fc5vC5ROYurg/4Pw==", + "dev": true + }, + "xmlchars": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/xmlchars/-/xmlchars-2.2.0.tgz", + "integrity": "sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw==", + "dev": true + }, "y18n": { "version": "5.0.8", "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz", @@ -28985,16 +31515,10 @@ "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", "dev": true }, - "yaml": { - "version": "1.10.2", - "resolved": "https://registry.npmjs.org/yaml/-/yaml-1.10.2.tgz", - "integrity": "sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==", - "dev": true - }, "yargs": { - "version": "17.6.2", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.6.2.tgz", - "integrity": "sha512-1/9UrdHjDZc0eOU0HxOHoS78C69UD3JRMvzlJ7S79S2nTaWRA/whGCTV8o9e/N/1Va9YIV7Q4sOxD8VV4pCWOw==", + "version": "17.7.2", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.2.tgz", + "integrity": "sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==", "dev": true, "requires": { "cliui": "^8.0.1", @@ -29019,9 +31543,9 @@ "dev": true }, "zone.js": { - "version": "0.12.0", - "resolved": "https://registry.npmjs.org/zone.js/-/zone.js-0.12.0.tgz", - "integrity": "sha512-XtC+I5dXU14HrzidAKBNMqneIVUykLEAA1x+v4KVrd6AUPWlwYORF8KgsVqvgdHiKZ4BkxxjvYi/ksEixTPR0Q==", + "version": "0.13.3", + "resolved": "https://registry.npmjs.org/zone.js/-/zone.js-0.13.3.tgz", + "integrity": "sha512-MKPbmZie6fASC/ps4dkmIhaT5eonHkEt6eAy80K42tAm0G2W+AahLJjbfi6X9NPdciOE9GRFTTM8u2IiF6O3ww==", "requires": { "tslib": "^2.3.0" } diff --git a/package.json b/package.json index 1f0bafa6..1274ad0a 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "clearml-webapp", - "version": "1.12.0", + "version": "1.13.0", "license": "", "scripts": { "ng": "ng", @@ -19,34 +19,33 @@ }, "private": true, "dependencies": { - "@angular/animations": "^15.2.8", - "@angular/cdk": "^15.2.8", - "@angular/common": "^15.2.8", - "@angular/compiler": "^15.2.8", - "@angular/core": "^15.2.8", - "@angular/forms": "^15.2.8", - "@angular/material": "^15.2.8", - "@angular/platform-browser": "^15.2.8", - "@angular/platform-browser-dynamic": "^15.2.8", - "@angular/platform-server": "^15.2.8", - "@angular/router": "^15.2.8", - "@angular/service-worker": "^15.2.8", - "@angular/youtube-player": "^15.2.8", - "@aws-sdk/client-s3": "^3.360.0", - "@aws-sdk/s3-request-presigner": "^3.360.0", - "@ctrl/ngx-github-buttons": "^8.0.0", + "@angular/animations": "^16.1.5", + "@angular/cdk": "16.1.5", + "@angular/common": "^16.1.5", + "@angular/compiler": "^16.1.5", + "@angular/core": "^16.1.5", + "@angular/forms": "^16.1.5", + "@angular/material": "16.1.5", + "@angular/platform-browser": "^16.1.5", + "@angular/platform-browser-dynamic": "^16.1.5", + "@angular/platform-server": "^16.1.5", + "@angular/router": "^16.1.5", + "@angular/service-worker": "^16.1.5", + "@angular/youtube-player": "^16.1.5", + "@aws-sdk/client-s3": "^3.370.0", + "@aws-sdk/s3-request-presigner": "^3.370.0", + "@ctrl/ngx-github-buttons": "^9.0.0", + "@ctrl/tinycolor": "^4.0.1", "@ngneat/dag": "^2.0.0", - "@ngrx/effects": "^15.4.0", - "@ngrx/entity": "^15.4.0", - "@ngrx/router-store": "^15.4.0", - "@ngrx/store": "^15.4.0", - "ace-builds": "^1.18.0", - "angular-google-tag-manager": "^1.7.0", + "@ngrx/effects": "^16.1.0", + "@ngrx/entity": "^16.1.0", + "@ngrx/router-store": "^16.1.0", + "@ngrx/store": "^16.1.0", + "ace-builds": "^1.23.4", "angular-resizable-element": "^7.0.2", "angular-split": "^15.0.0", - "angular2-csv": "^0.2.9", "ansi-to-html": "^0.7.2", - "bootstrap": "^5.2.3", + "bootstrap": "^5.3.0", "britecharts": "^3.0.0-alpha-6.1.6", "curved-arrows": "^0.1.0", "d3-selection": "^3.0.0", @@ -54,6 +53,8 @@ "d3-zoom": "^3.0.0", "diff": "^5.1.0", "dom-to-image": "^2.6.0", + "dompurify": "^3.0.6", + "export-to-csv": "^0.2.1", "filesize": "^10.0.7", "has-ansi": "^5.0.1", "hocon-parser": "^1.0.1", @@ -61,53 +62,54 @@ "localforage": "^1.10.0", "lodash-es": "^4.17.21", "lucene": "^2.1.1", + "marked": "^7.0.5", "ngx-clipboard": "^16.0.0", "ngx-color-picker": "^14.0.0", - "ngx-device-detector": "^5.0.1", + "ngx-device-detector": "^6.0.2", "ngx-markdown-editor": "^5.3.1", "ngx-print": "^1.3.1", "ngx-window-token": "^7.0.0", "object-hash": "^3.0.0", "primeicons": "^6.0.1", - "primeng": "^15.4.1", + "primeng": "^16.2.0", "process": "^0.11.10", - "rxjs": "^7.8.0", + "rxjs": "^7.8.1", "string-to-color": "^2.2.2", "taira": "^3.2.2", - "tinycolor2": "^1.6.0", - "tslib": "^2.5.0", - "url": "^0.11.0", + "tslib": "^2.6.0", + "url": "^0.11.1", "uuid": "^9.0.0", - "zone.js": "^0.12.0" + "zone.js": "~0.13.1" }, "devDependencies": { - "@angular-devkit/build-angular": "^15.2.6", - "@angular-devkit/core": "^15.2.6", - "@angular-devkit/schematics": "^15.2.6", - "@angular-devkit/schematics-cli": "^15.2.5", - "@angular-eslint/builder": "^15.2.1", - "@angular-eslint/eslint-plugin": "^15.2.1", - "@angular-eslint/eslint-plugin-template": "^15.2.1", - "@angular-eslint/schematics": "15.2.1", - "@angular-eslint/template-parser": "^15.2.1", - "@angular/cli": "^15.2.6", - "@angular/compiler-cli": "^15.2.8", - "@angular/language-service": "^15.2.8", + "@angular-devkit/build-angular": "^16.1.4", + "@angular-devkit/core": "^16.1.4", + "@angular-devkit/schematics": "^16.1.4", + "@angular-devkit/schematics-cli": "^16.1.4", + "@angular-eslint/builder": "16.1.2", + "@angular-eslint/eslint-plugin": "16.1.2", + "@angular-eslint/eslint-plugin-template": "16.1.2", + "@angular-eslint/schematics": "16.1.2", + "@angular-eslint/template-parser": "^16.1.2", + "@angular/cli": "^16.1.4", + "@angular/compiler-cli": "^16.1.5", + "@angular/language-service": "^16.1.5", "@fortawesome/fontawesome-free": "^6.4.0", - "@ngrx/schematics": "^15.4.0", - "@ngrx/store-devtools": "^15.4.0", + "@ngrx/eslint-plugin": "^16.2.0", + "@ngrx/schematics": "^16.1.0", + "@ngrx/store-devtools": "^16.1.0", "@types/d3-selection": "^3.0.5", - "@types/lodash-es": "^4.17.7", + "@types/lodash-es": "^4.17.8", "@types/node": "^18.16.0", - "@types/plotly.js": "^2.12.18", + "@types/plotly.js": "^2.12.24", + "@types/tinycolor2": "^1.4.3", "@types/uuid": "^9.0.2", - "@typescript-eslint/eslint-plugin": "^5.59.1", - "@typescript-eslint/parser": "^5.59.1", - "codelyzer": "^6.0.2", - "eslint": "^8.39.0", - "eslint-plugin-import": "2.27.5", - "eslint-plugin-jsdoc": "41.1.2", - "eslint-plugin-prefer-arrow": "1.2.3", - "typescript": "~4.9.5" + "@typescript-eslint/eslint-plugin": "6.7.0", + "@typescript-eslint/parser": "6.7.0", + "eslint": "^8.49.0", + "eslint-plugin-import": "^2.28.1", + "eslint-plugin-jsdoc": "^46.6.0", + "eslint-plugin-prefer-arrow": "^1.2.3", + "typescript": "~5.1.6" } } diff --git a/src/app/app.component.ts b/src/app/app.component.ts index b2736c22..97cb2825 100755 --- a/src/app/app.component.ts +++ b/src/app/app.component.ts @@ -1,7 +1,7 @@ import {ApiUsersService} from './business-logic/api-services/users.service'; import {selectCurrentUser} from '@common/core/reducers/users-reducer'; import {Component, OnDestroy, OnInit, ViewEncapsulation, HostListener, Renderer2, Injector} from '@angular/core'; -import {ActivatedRoute, NavigationEnd, Router, Params, RouterEvent} from '@angular/router'; +import {ActivatedRoute, NavigationEnd, Router} from '@angular/router'; import {Title} from '@angular/platform-browser'; import {selectBreadcrumbs, selectLoggedOut} from '@common/core/reducers/view.reducer'; import {Store} from '@ngrx/store'; @@ -9,11 +9,11 @@ import {selectRouterParams, selectRouterUrl} from '@common/core/reducers/router- import {ApiProjectsService} from './business-logic/api-services/projects.service'; import {Project} from './business-logic/model/projects/project'; import {getAllSystemProjects, setSelectedProjectId, updateProject} from '@common/core/actions/projects.actions'; -import {selectSelectedProject} from '@common/core/reducers/projects.reducer'; +import {selectRouterProjectId, selectSelectedProject} from '@common/core/reducers/projects.reducer'; import {MatDialog} from '@angular/material/dialog'; import {getTutorialBucketCredentials} from '@common/core/actions/common-auth.actions'; import {termsOfUseAccepted} from '@common/core/actions/users.actions'; -import {distinctUntilChanged, filter, map, tap} from 'rxjs/operators'; +import {distinctUntilChanged, filter, tap} from 'rxjs/operators'; import * as routerActions from './webapp-common/core/actions/router.actions'; import {combineLatest, Observable, Subscription} from 'rxjs'; import {ServerUpdatesService} from '@common/shared/services/server-updates.service'; @@ -24,14 +24,13 @@ import {UiUpdatesService} from '@common/shared/services/ui-updates.service'; import {UsageStatsService} from './core/services/usage-stats.service'; import {dismissSurvey} from './core/actions/layout.actions'; import {getScaleFactor} from '@common/shared/utils/shared-utils'; -import {User} from './business-logic/model/users/user'; import {ConfigurationService} from '@common/shared/services/configuration.service'; -import {GoogleTagManagerService} from 'angular-google-tag-manager'; import {selectIsSharedAndNotOwner} from './features/experiments/reducers'; import {TipsService} from '@common/shared/services/tips.service'; import {USER_PREFERENCES_KEY} from '@common/user-preferences'; import {Environment} from '../environments/base'; import {loadExternalLibrary} from '@common/shared/utils/load-external-library'; +import {User} from '~/business-logic/model/users/user'; @Component({ selector: 'sm-root', @@ -40,17 +39,14 @@ import {loadExternalLibrary} from '@common/shared/utils/load-external-library'; encapsulation: ViewEncapsulation.None }) export class AppComponent implements OnInit, OnDestroy { - public loggedOut$: Observable; - public activeFeature: string; + public loggedOut$: Observable; private urlSubscription: Subscription; public selectedProject$: Observable; public projectId: string; public isWorkersContext: boolean; - public updatesAvailable$: Observable; - private selectedProjectFromUrl$: Observable; + public updatesAvailable$: Observable; private breadcrumbsSubscription: Subscription; private selectedCurrentUserSubscription: Subscription; - private selectedCurrentUser$: Observable; public showNotification: boolean = true; public demo = ConfigurationService.globalEnvironment.demo; public isLoginContext: boolean; @@ -77,7 +73,7 @@ export class AppComponent implements OnInit, OnDestroy { private router: Router, private route: ActivatedRoute, private titleService: Title, - private store: Store, + private store: Store, private projectsApi: ApiProjectsService, private userService: ApiUsersService, public serverUpdatesService: ServerUpdatesService, @@ -93,16 +89,6 @@ export class AppComponent implements OnInit, OnDestroy { this.isSharedAndNotOwner$ = this.store.select(selectIsSharedAndNotOwner); this.selectedProject$ = this.store.select(selectSelectedProject); this.updatesAvailable$ = this.store.select(selectAvailableUpdates); - this.selectedCurrentUser$ = this.store.select(selectCurrentUser); - this.selectedProjectFromUrl$ = this.store.select(selectRouterParams) - .pipe( - filter((params: Params) => !!params), - map(params => params?.projectId || null) - ); - - if (ConfigurationService.globalEnvironment.GTM_ID) { - this.gtmService = injector.get(GoogleTagManagerService); - } } ngOnInit(): void { @@ -129,7 +115,7 @@ export class AppComponent implements OnInit, OnDestroy { this.router.events .pipe(filter(event => event instanceof NavigationEnd)) .subscribe( - (item: RouterEvent) => { + (item: NavigationEnd) => { const gtmTag = { event: 'page', pageName: item.url @@ -138,8 +124,8 @@ export class AppComponent implements OnInit, OnDestroy { this.store.dispatch(routerActions.navigationEnd()); }); - this.selectedCurrentUserSubscription = this.selectedCurrentUser$.pipe( - tap(user => this.currentUser = user), // should not be filtered + this.selectedCurrentUserSubscription = this.store.select(selectCurrentUser).pipe( + tap(user => this.currentUser = user as unknown as User), filter(user => !!user?.id), distinctUntilChanged((prev, next) => prev?.id === next?.id) ) @@ -158,27 +144,23 @@ export class AppComponent implements OnInit, OnDestroy { } }); - this.selectedProjectFromUrl$.subscribe((projectId: string) => { + this.store.select(selectRouterProjectId).subscribe((projectId: string) => { this.store.dispatch(setSelectedProjectId({projectId})); }); - this.urlSubscription = combineLatest([this.store.select(selectRouterUrl), this.store.select(selectRouterParams)]) + this.urlSubscription = combineLatest([ + this.store.select(selectRouterUrl), + this.store.select(selectRouterParams) + ]) .subscribe(([url, params]) => { this.projectId = params?.projectId; this.isLoginContext = url && url.includes('login'); this.isWorkersContext = url && url.includes('workers-and-queues'); - if (this.projectId) { - try { // TODO: refactor to a better solution after all navbar are declared... - this.activeFeature = url.split(this.projectId)[1].split('/')[1]; - } catch (e) { - - } - } }); this.breadcrumbsSubscription = this.store.select(selectBreadcrumbs).subscribe(breadcrumbs => { - const crumbs = breadcrumbs.flat().map(breadcrumb=> breadcrumb.name); - this.titleService.setTitle(`${this.title ? this.title + '-' : ''} ${crumbs.join(' / ')}`); + const crumbs = breadcrumbs.flat().filter((breadcrumb => !!breadcrumb?.name)).map(breadcrumb => breadcrumb.name); + crumbs.length> 0 && this.titleService.setTitle(`${this.title ? this.title + '-' : ''} ${crumbs.join(' / ')}`); }); if (window.localStorage.getItem('disableHidpi') !== 'true') { diff --git a/src/app/app.module.ts b/src/app/app.module.ts index 53fa089d..f511040e 100755 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -12,7 +12,7 @@ import {CommonLayoutModule} from '@common/layout/layout.module'; import {HTTP_INTERCEPTORS} from '@angular/common/http'; import {WebappInterceptor} from '@common/core/interceptors/webapp-interceptor'; import {CustomReuseStrategy} from '@common/core/router-reuse-strategy'; -import {loadUserAndPreferences, UserPreferences} from '@common/user-preferences'; +import {UserPreferences} from '@common/user-preferences'; import {AngularSplitModule} from 'angular-split'; import {NotifierModule} from '@common/angular-notifier'; import {LayoutModule} from './layout/layout.module'; @@ -23,6 +23,8 @@ import {ProjectsSharedModule} from './features/projects/shared/projects-shared.m import {MAT_FORM_FIELD_DEFAULT_OPTIONS} from '@angular/material/form-field'; import {LoginService} from '~/shared/services/login.service'; import {ExperimentSharedModule} from '~/features/experiments/shared/experiment-shared.module'; +import {loadUserAndPreferences} from '~/core/app-init'; +import {MAT_TOOLTIP_DEFAULT_OPTIONS, MatTooltipDefaultOptions} from '@angular/material/tooltip'; @NgModule({ declarations : [AppComponent], @@ -69,11 +71,9 @@ import {ExperimentSharedModule} from '~/features/experiments/shared/experiment-s {provide: HTTP_INTERCEPTORS, useClass: WebappInterceptor, multi: true}, {provide: RouteReuseStrategy, useClass: CustomReuseStrategy}, { - provide: 'googleTagManagerId', - deps: [ConfigurationService], - useFactory: (confService: ConfigurationService) => - confService.getStaticEnvironment().GTM_ID - }, + provide: MAT_TOOLTIP_DEFAULT_OPTIONS, + useValue: {position: 'above'} as MatTooltipDefaultOptions + } ], bootstrap : [AppComponent], exports : [] diff --git a/src/app/business-logic/api-services/models.service.ts b/src/app/business-logic/api-services/models.service.ts index 009f9384..c75d15ee 100644 --- a/src/app/business-logic/api-services/models.service.ts +++ b/src/app/business-logic/api-services/models.service.ts @@ -66,6 +66,8 @@ import { ModelsUpdateResponse } from '../model/models/modelsUpdateResponse'; import { BASE_PATH, COLLECTION_FORMATS } from '../variables'; import { Configuration } from '../configuration'; +import {ModelsUpdateTagsRequest} from '~/business-logic/model/models/modelsUpdateTagsRequest'; +import {ModelsUpdateTagsResponse} from '~/business-logic/model/models/modelsUpdateTagsResponse'; @Injectable() @@ -101,7 +103,7 @@ export class ApiModelsService { /** - * + * * Add or update model metadata * @param request request body * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body. @@ -146,7 +148,7 @@ export class ApiModelsService { } /** - * + * * Archive models * @param request request body * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body. @@ -191,7 +193,7 @@ export class ApiModelsService { } /** - * + * * Create a new model not associated with a task * @param request request body * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body. @@ -236,7 +238,7 @@ export class ApiModelsService { } /** - * + * * Delete a model. * @param request request body * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body. @@ -281,7 +283,7 @@ export class ApiModelsService { } /** - * + * * Delete models * @param request request body * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body. @@ -326,7 +328,7 @@ export class ApiModelsService { } /** - * + * * Delete metadata from model * @param request request body * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body. @@ -371,7 +373,7 @@ export class ApiModelsService { } /** - * + * * Edit an existing model * @param request request body * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body. @@ -416,7 +418,7 @@ export class ApiModelsService { } /** - * + * * Get all models * @param request request body * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body. @@ -461,7 +463,7 @@ export class ApiModelsService { } /** - * + * * Get all models * @param request request body * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body. @@ -506,7 +508,7 @@ export class ApiModelsService { } /** - * + * * Gets model information * @param request request body * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body. @@ -551,7 +553,7 @@ export class ApiModelsService { } /** - * + * * Get all models * @param request request body * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body. @@ -596,7 +598,7 @@ export class ApiModelsService { } /** - * + * * Gets model information * @param request request body * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body. @@ -641,7 +643,7 @@ export class ApiModelsService { } /** - * + * * Get the list of frameworks used in the company models * @param request request body * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body. @@ -686,7 +688,7 @@ export class ApiModelsService { } /** - * + * * Convert public models to private * @param request request body * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body. @@ -731,7 +733,7 @@ export class ApiModelsService { } /** - * + * * Convert company models to public * @param request request body * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body. @@ -776,7 +778,7 @@ export class ApiModelsService { } /** - * + * * Move models to a project * @param request request body * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body. @@ -821,7 +823,7 @@ export class ApiModelsService { } /** - * + * * Publish models * @param request request body * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body. @@ -866,7 +868,7 @@ export class ApiModelsService { } /** - * + * * Set the model ready flag to True. If the model is an output model of a task then try to publish the task. * @param request request body * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body. @@ -911,7 +913,7 @@ export class ApiModelsService { } /** - * + * * Unarchive models * @param request request body * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body. @@ -956,7 +958,7 @@ export class ApiModelsService { } /** - * + * * Update a model * @param request request body * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body. @@ -1001,7 +1003,7 @@ export class ApiModelsService { } /** - * + * * Create or update a new model for a task * @param request request body * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body. @@ -1045,4 +1047,48 @@ export class ApiModelsService { ); } + /** + * + * Add/Remove multiple tags from multiple models + * @param request request body + * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body. + * @param reportProgress flag to report request and response progress. + */ + public modelsUpdateTags(request: ModelsUpdateTagsRequest, options?: any, observe: any = 'body', reportProgress: boolean = false ): Observable { + if (request === null || request === undefined) { + throw new Error('Required parameter request was null or undefined when calling modelsUpdateTags.'); + } + + let headers = this.defaultHeaders; + if (options && options.async_enable) { + headers = headers.set(this.configuration.asyncHeader, '1'); + } + + // to determine the Accept header + const httpHeaderAccepts: string[] = [ + 'application/json' + ]; + const httpHeaderAcceptSelected: string | undefined = this.configuration.selectHeaderAccept(httpHeaderAccepts); + if (httpHeaderAcceptSelected != undefined) { + headers = headers.set("Accept", httpHeaderAcceptSelected); + } + + // to determine the Content-Type header + const consumes: string[] = [ + ]; + const httpContentTypeSelected:string | undefined = this.configuration.selectHeaderContentType(consumes); + if (httpContentTypeSelected != undefined) { + headers = headers.set("Content-Type", httpContentTypeSelected); + } + + return this.apiRequest.post(`${this.basePath}/models.update_tags`, + request, + { + withCredentials: this.configuration.withCredentials, + headers: headers, + observe: observe, + reportProgress: reportProgress + } + ); + } } diff --git a/src/app/business-logic/api-services/tasks.service.ts b/src/app/business-logic/api-services/tasks.service.ts index 10703232..47288b29 100644 --- a/src/app/business-logic/api-services/tasks.service.ts +++ b/src/app/business-logic/api-services/tasks.service.ts @@ -115,6 +115,8 @@ import { TasksValidateRequest } from '../model/tasks/tasksValidateRequest'; import { BASE_PATH, COLLECTION_FORMATS } from '../variables'; import { Configuration } from '../configuration'; +import {TasksUpdateTagsResponse} from '~/business-logic/model/tasks/tasksUpdateTagsResponse'; +import {TasksUpdateTagsRequest} from '~/business-logic/model/tasks/tasksUpdateTagsRequest'; @Injectable() @@ -150,7 +152,7 @@ export class ApiTasksService { /** - * + * * Update existing artifacts (search by key/mode) and add new ones * @param request request body * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body. @@ -195,7 +197,7 @@ export class ApiTasksService { } /** - * + * * Add or update task model * @param request request body * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body. @@ -240,7 +242,7 @@ export class ApiTasksService { } /** - * + * * Archive tasks. If a task is queued it will first be dequeued and then archived. * @param request request body * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body. @@ -285,7 +287,7 @@ export class ApiTasksService { } /** - * + * * Archive tasks * @param request request body * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body. @@ -330,7 +332,7 @@ export class ApiTasksService { } /** - * + * * Clone an existing task * @param request request body * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body. @@ -375,7 +377,7 @@ export class ApiTasksService { } /** - * + * * Indicates that task is closed * @param request request body * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body. @@ -420,7 +422,7 @@ export class ApiTasksService { } /** - * + * * Signal a task has completed * @param request request body * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body. @@ -465,7 +467,7 @@ export class ApiTasksService { } /** - * + * * Create a new task * @param request request body * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body. @@ -510,7 +512,7 @@ export class ApiTasksService { } /** - * + * * Delete a task along with any information stored for it (statistics, frame updates etc.) Unless Force flag is provided, operation will fail if task has objects associated with it - i.e. children tasks and projects. Models that refer to the deleted task will be updated with a task ID indicating a deleted task. * @param request request body * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body. @@ -555,7 +557,7 @@ export class ApiTasksService { } /** - * + * * Delete existing artifacts (search by key/mode) * @param request request body * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body. @@ -600,7 +602,7 @@ export class ApiTasksService { } /** - * + * * Delete task configuration items * @param request request body * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body. @@ -645,7 +647,7 @@ export class ApiTasksService { } /** - * + * * Delete task hyper parameters * @param request request body * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body. @@ -690,7 +692,7 @@ export class ApiTasksService { } /** - * + * * Delete tasks * @param request request body * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body. @@ -735,7 +737,7 @@ export class ApiTasksService { } /** - * + * * Delete models from task * @param request request body * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body. @@ -780,7 +782,7 @@ export class ApiTasksService { } /** - * + * * Remove a task from its queue. Fails if task status is not queued. * @param request request body * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body. @@ -825,7 +827,7 @@ export class ApiTasksService { } /** - * + * * Dequeue tasks * @param request request body * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body. @@ -870,7 +872,7 @@ export class ApiTasksService { } /** - * + * * Edit task\'s details. * @param request request body * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body. @@ -915,7 +917,7 @@ export class ApiTasksService { } /** - * + * * Add or update task configuration * @param request request body * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body. @@ -960,7 +962,7 @@ export class ApiTasksService { } /** - * + * * Add or update task hyper parameters * @param request request body * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body. @@ -1005,7 +1007,7 @@ export class ApiTasksService { } /** - * + * * Adds a task into a queue. Fails if task state is not \'created\'. Fails if the following parameters in the task were not filled: * execution.script.repository * execution.script.entrypoint * @param request request body * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body. @@ -1050,7 +1052,7 @@ export class ApiTasksService { } /** - * + * * Enqueue tasks * @param request request body * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body. @@ -1095,7 +1097,7 @@ export class ApiTasksService { } /** - * + * * Indicates that task has failed * @param request request body * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body. @@ -1140,7 +1142,7 @@ export class ApiTasksService { } /** - * + * * Get all the company\'s tasks and all public tasks * @param request request body * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body. @@ -1185,7 +1187,7 @@ export class ApiTasksService { } /** - * + * * Get all the company\'s tasks and all public tasks * @param request request body * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body. @@ -1230,7 +1232,7 @@ export class ApiTasksService { } /** - * + * * Gets task information * @param request request body * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body. @@ -1275,7 +1277,7 @@ export class ApiTasksService { } /** - * + * * Get all the company\'s tasks and all public tasks * @param request request body * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body. @@ -1320,7 +1322,7 @@ export class ApiTasksService { } /** - * + * * Get the list of task configuration items names * @param request request body * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body. @@ -1365,7 +1367,7 @@ export class ApiTasksService { } /** - * + * * Get the list of task configurations * @param request request body * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body. @@ -1410,7 +1412,7 @@ export class ApiTasksService { } /** - * + * * Get the list of task hyper parameters * @param request request body * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body. @@ -1455,7 +1457,7 @@ export class ApiTasksService { } /** - * + * * Get the list of task types used in the specified projects * @param request request body * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body. @@ -1500,7 +1502,7 @@ export class ApiTasksService { } /** - * + * * Convert public tasks to private * @param request request body * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body. @@ -1545,7 +1547,7 @@ export class ApiTasksService { } /** - * + * * Convert company tasks to public * @param request request body * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body. @@ -1590,7 +1592,7 @@ export class ApiTasksService { } /** - * + * * Move tasks to a project * @param request request body * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body. @@ -1635,7 +1637,7 @@ export class ApiTasksService { } /** - * + * * Refresh the task\'s last update time * @param request request body * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body. @@ -1680,7 +1682,7 @@ export class ApiTasksService { } /** - * + * * Mark a task status as published. For Annotation tasks - if any changes were committed by this task, a new version in the dataset together with an output view are created. For Training tasks - if a model was created, it should be set to ready. * @param request request body * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body. @@ -1725,7 +1727,7 @@ export class ApiTasksService { } /** - * + * * Publish tasks * @param request request body * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body. @@ -1770,7 +1772,7 @@ export class ApiTasksService { } /** - * + * * Reset a task to its initial state, along with any information stored for it (statistics, frame updates etc.). * @param request request body * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body. @@ -1815,7 +1817,7 @@ export class ApiTasksService { } /** - * + * * Reset tasks * @param request request body * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body. @@ -1860,7 +1862,7 @@ export class ApiTasksService { } /** - * + * * Set the script requirements for a task * @param request request body * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body. @@ -1905,7 +1907,7 @@ export class ApiTasksService { } /** - * + * * Mark a task status as in_progress. Optionally allows to set the task\'s execution progress. * @param request request body * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body. @@ -1950,7 +1952,7 @@ export class ApiTasksService { } /** - * + * * Request to stop a running task * @param request request body * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body. @@ -1995,7 +1997,7 @@ export class ApiTasksService { } /** - * + * * Request to stop running tasks * @param request request body * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body. @@ -2040,7 +2042,7 @@ export class ApiTasksService { } /** - * + * * Signal a task has stopped * @param request request body * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body. @@ -2085,7 +2087,7 @@ export class ApiTasksService { } /** - * + * * Unarchive tasks * @param request request body * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body. @@ -2130,7 +2132,7 @@ export class ApiTasksService { } /** - * + * * Update task\'s runtime parameters * @param request request body * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body. @@ -2175,7 +2177,7 @@ export class ApiTasksService { } /** - * + * * Updates a batch of tasks. Headers Content type should be \'application/json- lines\'. * @param requests Json encoded newline-terminated lines, each representing an event in the batch and uses the same parameters used for tasks.update * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body. @@ -2220,7 +2222,7 @@ export class ApiTasksService { } /** - * + * * Validate task properties (before create) * @param request request body * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body. @@ -2264,4 +2266,48 @@ export class ApiTasksService { ); } + /** + * + * Add/Remove multiple tags from multiple tasks + * @param request request body + * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body. + * @param reportProgress flag to report request and response progress. + */ + public tasksUpdateTags(request: TasksUpdateTagsRequest, options?: any, observe: any = 'body', reportProgress: boolean = false ): Observable { + if (request === null || request === undefined) { + throw new Error('Required parameter request was null or undefined when calling tasksUpdateTags.'); + } + + let headers = this.defaultHeaders; + if (options && options.async_enable) { + headers = headers.set(this.configuration.asyncHeader, '1'); + } + + // to determine the Accept header + const httpHeaderAccepts: string[] = [ + 'application/json' + ]; + const httpHeaderAcceptSelected: string | undefined = this.configuration.selectHeaderAccept(httpHeaderAccepts); + if (httpHeaderAcceptSelected != undefined) { + headers = headers.set("Accept", httpHeaderAcceptSelected); + } + + // to determine the Content-Type header + const consumes: string[] = [ + ]; + const httpContentTypeSelected:string | undefined = this.configuration.selectHeaderContentType(consumes); + if (httpContentTypeSelected != undefined) { + headers = headers.set("Content-Type", httpContentTypeSelected); + } + + return this.apiRequest.post(`${this.basePath}/tasks.update_tags`, + request, + { + withCredentials: this.configuration.withCredentials, + headers: headers, + observe: observe, + reportProgress: reportProgress + } + ); + } } diff --git a/src/app/business-logic/encoder.ts b/src/app/business-logic/encoder.ts index f1c6b78c..4999a794 100755 --- a/src/app/business-logic/encoder.ts +++ b/src/app/business-logic/encoder.ts @@ -6,11 +6,12 @@ * See: https://github.com/angular/angular/issues/11058#issuecomment-247367318 */ export class CustomHttpUrlEncodingCodec extends HttpUrlEncodingCodec { - encodeKey(k: string): string { + override encodeKey(k: string): string { k = super.encodeKey(k); return k.replace(/\+/gi, '%2B'); } - encodeValue(v: string): string { + + override encodeValue(v: string): string { v = super.encodeValue(v); return v.replace(/\+/gi, '%2B'); } diff --git a/src/app/business-logic/model/events/debugImagesResponseIterations.ts b/src/app/business-logic/model/events/debugImagesResponseIterations.ts index 6bed185e..21b2a992 100644 --- a/src/app/business-logic/model/events/debugImagesResponseIterations.ts +++ b/src/app/business-logic/model/events/debugImagesResponseIterations.ts @@ -17,5 +17,5 @@ export interface DebugImagesResponseIterations { * Iteration number */ iter?: number; - events?: Array; + events?: Array; } diff --git a/src/app/business-logic/model/events/eventsGetTaskSingleValueMetricsRequest.ts b/src/app/business-logic/model/events/eventsGetTaskSingleValueMetricsRequest.ts index 34494486..e6831e72 100644 --- a/src/app/business-logic/model/events/eventsGetTaskSingleValueMetricsRequest.ts +++ b/src/app/business-logic/model/events/eventsGetTaskSingleValueMetricsRequest.ts @@ -17,4 +17,5 @@ export interface EventsGetTaskSingleValueMetricsRequest { * List of task Task IDs */ tasks: Array; + model_events: boolean; } diff --git a/src/app/business-logic/model/events/eventsGetTaskSingleValueMetricsResponseTasks.ts b/src/app/business-logic/model/events/eventsGetTaskSingleValueMetricsResponseTasks.ts index 97742019..5781aa5e 100644 --- a/src/app/business-logic/model/events/eventsGetTaskSingleValueMetricsResponseTasks.ts +++ b/src/app/business-logic/model/events/eventsGetTaskSingleValueMetricsResponseTasks.ts @@ -18,5 +18,6 @@ export interface EventsGetTaskSingleValueMetricsResponseTasks { * Task ID */ task?: string; - values?: Array; + task_name?: string; + values?: Array; } diff --git a/src/app/business-logic/model/models/model.ts b/src/app/business-logic/model/models/model.ts index ec84c967..55ff9386 100644 --- a/src/app/business-logic/model/models/model.ts +++ b/src/app/business-logic/model/models/model.ts @@ -39,7 +39,8 @@ export interface Model { /** * Model last update time */ - last_update?: string; + last_update?: Date; + last_change?: Date; /** * Task ID of task in which the model was created */ diff --git a/src/app/business-logic/model/models/modelsUpdateTagsRequest.ts b/src/app/business-logic/model/models/modelsUpdateTagsRequest.ts new file mode 100644 index 00000000..6bc3a595 --- /dev/null +++ b/src/app/business-logic/model/models/modelsUpdateTagsRequest.ts @@ -0,0 +1,28 @@ +/** + * models + * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) + * + * OpenAPI spec version: 999.0 + * + * + * NOTE: This class is auto generated by the swagger code generator program. + * https://github.com/swagger-api/swagger-codegen.git + * Do not edit the class manually. + */ + + + +export interface ModelsUpdateTagsRequest { + /** + * IDs of the models to update + */ + ids?: Array; + /** + * User tags to add + */ + add_tags?: Array; + /** + * User tags to remove + */ + remove_tags?: Array; +} diff --git a/src/app/business-logic/model/models/modelsUpdateTagsResponse.ts b/src/app/business-logic/model/models/modelsUpdateTagsResponse.ts new file mode 100644 index 00000000..372a978f --- /dev/null +++ b/src/app/business-logic/model/models/modelsUpdateTagsResponse.ts @@ -0,0 +1,20 @@ +/** + * models + * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) + * + * OpenAPI spec version: 999.0 + * + * + * NOTE: This class is auto generated by the swagger code generator program. + * https://github.com/swagger-api/swagger-codegen.git + * Do not edit the class manually. + */ + + + +export interface ModelsUpdateTagsResponse { + /** + * The number of updated models + */ + updated?: number; +} diff --git a/src/app/business-logic/model/projects/projectsGetHyperparamValuesRequest.ts b/src/app/business-logic/model/projects/projectsGetHyperparamValuesRequest.ts index a0161473..7494c7cc 100644 --- a/src/app/business-logic/model/projects/projectsGetHyperparamValuesRequest.ts +++ b/src/app/business-logic/model/projects/projectsGetHyperparamValuesRequest.ts @@ -33,4 +33,13 @@ export interface ProjectsGetHyperparamValuesRequest { * If set to \'true\' and the project field is set then the result includes hyper parameters values from the subproject tasks */ include_subprojects?: boolean; + /** + * Page number + */ + page?: number; + /** + * Page size + */ + page_size?: number; + pattern?: string; } diff --git a/src/app/business-logic/model/tasks/tasksGetAllExRequestAll.ts b/src/app/business-logic/model/tasks/tasksGetAllExRequestAll.ts new file mode 100644 index 00000000..9ec97bfb --- /dev/null +++ b/src/app/business-logic/model/tasks/tasksGetAllExRequestAll.ts @@ -0,0 +1,21 @@ +/** + * tasks + * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) + * + * OpenAPI spec version: 999.0 + * + * + * NOTE: This class is auto generated by the swagger code generator program. + * https://github.com/swagger-api/swagger-codegen.git + * Do not edit the class manually. + */ + + + +/** + * All the terms in \'all\' condition are combined with \'and\' operation + */ +export interface TasksGetAllExRequestAll { + include?: Array; + exclude?: Array; +} diff --git a/src/app/business-logic/model/tasks/tasksGetAllExRequestAny.ts b/src/app/business-logic/model/tasks/tasksGetAllExRequestAny.ts new file mode 100644 index 00000000..1e80898d --- /dev/null +++ b/src/app/business-logic/model/tasks/tasksGetAllExRequestAny.ts @@ -0,0 +1,21 @@ +/** + * tasks + * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) + * + * OpenAPI spec version: 999.0 + * + * + * NOTE: This class is auto generated by the swagger code generator program. + * https://github.com/swagger-api/swagger-codegen.git + * Do not edit the class manually. + */ + + + +/** + * All the terms in \'any\' condition are combined with \'or\' operation + */ +export interface TasksGetAllExRequestAny { + include?: Array; + exclude?: Array; +} diff --git a/src/app/business-logic/model/tasks/tasksGetAllExRequestFilters.ts b/src/app/business-logic/model/tasks/tasksGetAllExRequestFilters.ts new file mode 100644 index 00000000..f7682cb5 --- /dev/null +++ b/src/app/business-logic/model/tasks/tasksGetAllExRequestFilters.ts @@ -0,0 +1,34 @@ +/** + * tasks + * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) + * + * OpenAPI spec version: 999.0 + * + * + * NOTE: This class is auto generated by the swagger code generator program. + * https://github.com/swagger-api/swagger-codegen.git + * Do not edit the class manually. + */ + +import { TasksGetAllExRequestAll } from '././tasksGetAllExRequestAll'; +import { TasksGetAllExRequestAny } from '././tasksGetAllExRequestAny'; + + +/** + * Filter on a field that includes combination of \'any\' or \'all\' included and excluded terms + */ +export interface TasksGetAllExRequestFilters { + any?: TasksGetAllExRequestAny; + all?: TasksGetAllExRequestAll; + /** + * The operation between \'any\' and \'all\' parts of the filter if both are provided + */ + op?: TasksGetAllExRequestFilters.OpEnum; +} +export namespace TasksGetAllExRequestFilters { + export type OpEnum = 'and' | 'or'; + export const OpEnum = { + And: 'and' as OpEnum, + Or: 'or' as OpEnum + } +} diff --git a/src/app/business-logic/model/tasks/tasksUpdateTagsRequest.ts b/src/app/business-logic/model/tasks/tasksUpdateTagsRequest.ts new file mode 100644 index 00000000..19645831 --- /dev/null +++ b/src/app/business-logic/model/tasks/tasksUpdateTagsRequest.ts @@ -0,0 +1,28 @@ +/** + * tasks + * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) + * + * OpenAPI spec version: 999.0 + * + * + * NOTE: This class is auto generated by the swagger code generator program. + * https://github.com/swagger-api/swagger-codegen.git + * Do not edit the class manually. + */ + + + +export interface TasksUpdateTagsRequest { + /** + * IDs of the tasks to update + */ + ids?: Array; + /** + * User tags to add + */ + add_tags?: Array; + /** + * User tags to remove + */ + remove_tags?: Array; +} diff --git a/src/app/business-logic/model/tasks/tasksUpdateTagsResponse.ts b/src/app/business-logic/model/tasks/tasksUpdateTagsResponse.ts new file mode 100644 index 00000000..5b3540d1 --- /dev/null +++ b/src/app/business-logic/model/tasks/tasksUpdateTagsResponse.ts @@ -0,0 +1,20 @@ +/** + * tasks + * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) + * + * OpenAPI spec version: 999.0 + * + * + * NOTE: This class is auto generated by the swagger code generator program. + * https://github.com/swagger-api/swagger-codegen.git + * Do not edit the class manually. + */ + + + +export interface TasksUpdateTagsResponse { + /** + * The number of updated tasks + */ + updated?: number; +} diff --git a/src/app/business-logic/model/users/getCurrentUserResponseUserObjectCompany.ts b/src/app/business-logic/model/users/getCurrentUserResponseUserObjectCompany.ts index 25d3f7e3..e5f5d75a 100644 --- a/src/app/business-logic/model/users/getCurrentUserResponseUserObjectCompany.ts +++ b/src/app/business-logic/model/users/getCurrentUserResponseUserObjectCompany.ts @@ -15,4 +15,6 @@ export interface GetCurrentUserResponseUserObjectCompany { id?: string; name?: string; + tier?: any; + } diff --git a/src/app/business-logic/model/users/usersGetInvitesResponseInvites.ts b/src/app/business-logic/model/users/usersGetInvitesResponseInvites.ts new file mode 100644 index 00000000..8b8072d1 --- /dev/null +++ b/src/app/business-logic/model/users/usersGetInvitesResponseInvites.ts @@ -0,0 +1,40 @@ +/** + * users + * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) + * + * OpenAPI spec version: 999.0 + * + * + * NOTE: This class is auto generated by the swagger code generator program. + * https://github.com/swagger-api/swagger-codegen.git + * Do not edit the class manually. + */ + + + +export interface UsersGetInvitesResponseInvites { + /** + * Invite id + */ + id?: string; + /** + * Company id + */ + company?: string; + /** + * Company name + */ + company_name?: string; + /** + * Invite creation time (UTC) + */ + created?: string; + /** + * Invite expiration time (UTC) + */ + expires?: string; + /** + * Invited emails + */ + emails?: Array; +} diff --git a/src/app/core/app-init.ts b/src/app/core/app-init.ts new file mode 100644 index 00000000..06df9402 --- /dev/null +++ b/src/app/core/app-init.ts @@ -0,0 +1,11 @@ +import {LoginService} from '~/shared/services/login.service'; +import {ConfigurationService} from '@common/shared/services/configuration.service'; + +export const loadUserAndPreferences = ( + loginService: LoginService, + confService: ConfigurationService, +): () => Promise => (): Promise => new Promise((resolve) => { + confService.initConfigurationService().subscribe(() => + loginService.initCredentials().subscribe(() => loginService.loginFlow(resolve)) + ); +}); diff --git a/src/app/core/core.module.ts b/src/app/core/core.module.ts index 235e5cbc..190e3324 100755 --- a/src/app/core/core.module.ts +++ b/src/app/core/core.module.ts @@ -61,6 +61,8 @@ const syncedKeys = [ 'projects.selectedProject', 'rootProjects.showHidden', 'rootProjects.hideExamples', + 'rootProjects.mainPageTagsFilter', + 'rootProjects.mainPageTagsFilterMatchMode', 'rootProjects.defaultNestedModeForFeature', 'views.availableUpdates', 'views.showSurvey', @@ -92,7 +94,7 @@ export const localStorageReducer = (reducer: ActionReducer): ActionReducer< return nextState; }; -const userPrefMetaFactory = (userPreferences: UserPreferences): MetaReducer[] => [ +const userPrefMetaFactory = (userPreferences: UserPreferences): MetaReducer[] => [ (reducer: ActionReducer) => createUserPrefReducer('users', ['activeWorkspace', 'showOnlyUserWork'], [USERS_PREFIX], userPreferences, reducer), (reducer: ActionReducer) => diff --git a/src/app/core/effects/projects.effects.ts b/src/app/core/effects/projects.effects.ts index d31af3f0..60188c5a 100644 --- a/src/app/core/effects/projects.effects.ts +++ b/src/app/core/effects/projects.effects.ts @@ -1,9 +1,9 @@ import {Injectable} from '@angular/core'; -import {Actions, createEffect, ofType} from '@ngrx/effects'; +import {Actions, concatLatestFrom, createEffect, ofType} from '@ngrx/effects'; import * as actions from '../../webapp-common/core/actions/projects.actions'; import {Store} from '@ngrx/store'; import {selectSelectedProjectId, selectShowHidden} from '@common/core/reducers/projects.reducer'; -import {catchError, finalize, mergeMap, switchMap, withLatestFrom} from 'rxjs/operators'; +import {catchError, finalize, mergeMap, switchMap} from 'rxjs/operators'; import {deactivateLoader} from '@common/core/actions/layout.actions'; import {ALL_PROJECTS_OBJECT} from '@common/core/effects/projects.effects'; import {requestFailed} from '@common/core/actions/http.actions'; @@ -26,15 +26,14 @@ export class ProjectsEffects { getSelectedProject = createEffect(() => this.actions$.pipe( ofType(actions.setSelectedProjectId), - withLatestFrom( + concatLatestFrom(() => [ this.store.select(selectSelectedProjectId), this.store.select(selectCurrentUser), this.store.select(selectShowOnlyUserWork), this.store.select(selectShowHidden), this.store.select(selectRouterConfig), - ), + ]), switchMap(([action, selectedProjectId, user, showOnlyUserWork, showHidden, conf]) => { - const customProjectType = conf[0] !== 'projects'; if (!action.projectId) { return [ deactivateLoader(action.type), @@ -51,6 +50,7 @@ export class ProjectsEffects { actions.getCompanyTags(), deactivateLoader(action.type)]; } else { + const customProjectType = conf?.[0] !== 'projects'; this.fetchingExampleExperiment = action.example && action.projectId; return this.projectsApi.projectsGetAllEx({ /* eslint-disable @typescript-eslint/naming-convention */ diff --git a/src/app/features/datasets/nested-datasets-page/nested-datasets-page.component.ts b/src/app/features/datasets/nested-datasets-page/nested-datasets-page.component.ts index b5194fab..ae31900e 100644 --- a/src/app/features/datasets/nested-datasets-page/nested-datasets-page.component.ts +++ b/src/app/features/datasets/nested-datasets-page/nested-datasets-page.component.ts @@ -28,7 +28,7 @@ export class NestedDatasetsPageComponent extends CommonProjectsPageComponent { hideMenu = false; entityType = ProjectTypeEnum.datasets; - projectCardClicked(data: { hasSubProjects: boolean; id: string; name: string }) { + override projectCardClicked(data: { hasSubProjects: boolean; id: string; name: string }) { if (data.hasSubProjects) { this.router.navigate(['simple', data.id, 'projects'], {relativeTo: this.route.parent?.parent}); } else { @@ -50,7 +50,7 @@ export class NestedDatasetsPageComponent extends CommonProjectsPageComponent { } // eslint-disable-next-line @typescript-eslint/no-unused-vars - protected getExtraProjects(selectedProjectId, selectedProject) { + protected override getExtraProjects(selectedProjectId, selectedProject) { return []; } diff --git a/src/app/features/experiments/shared/experiment-info.model.ts b/src/app/features/experiments/shared/experiment-info.model.ts index eaccad82..49aabfa4 100755 --- a/src/app/features/experiments/shared/experiment-info.model.ts +++ b/src/app/features/experiments/shared/experiment-info.model.ts @@ -17,6 +17,7 @@ import {ConfigurationItem} from '../../../business-logic/model/tasks/configurati import {GetCurrentUserResponseUserObjectCompany} from '../../../business-logic/model/users/getCurrentUserResponseUserObjectCompany'; import {Queue} from '../../../business-logic/model/queues/queue'; import {Container} from '../../../business-logic/model/tasks/container'; +import {Output} from '~/business-logic/model/tasks/output'; /** * an extended object of task that includes projection, will come from the server as an api response. @@ -57,7 +58,7 @@ export interface ISelectedExperiment { /** * an object that will transfrom from the ISelectedExperiment response to more comfortable object to display. */ -export interface IExperimentInfo extends Omit { +export interface IExperimentInfo extends Omit { id?: string; model?: IExperimentModelInfo; execution?: IExecutionForm; @@ -70,9 +71,10 @@ export interface IExperimentInfo extends Omit { destination?: string; model?: { id: Model['id']; diff --git a/src/app/features/workers-and-queues/orchestration.component.html b/src/app/features/workers-and-queues/orchestration.component.html index c30637dc..cc9b2a38 100644 --- a/src/app/features/workers-and-queues/orchestration.component.html +++ b/src/app/features/workers-and-queues/orchestration.component.html @@ -16,4 +16,6 @@ - +
+ +
diff --git a/src/app/shared/utils/url.ts b/src/app/shared/utils/url.ts index cae87240..991d8091 100644 --- a/src/app/shared/utils/url.ts +++ b/src/app/shared/utils/url.ts @@ -1,7 +1,7 @@ import {HTTP} from '~/app.constants'; export const isFileserverUrl = (url: string) => - url.startsWith(HTTP.FILE_BASE_URL); + url?.startsWith(HTTP.FILE_BASE_URL); export const convertToReverseProxy = (url: string) => { try { diff --git a/src/app/webapp-common/angular-notifier/src/components/notifier-container.component.ts b/src/app/webapp-common/angular-notifier/src/components/notifier-container.component.ts index 63dbbf07..f7b4e1c4 100644 --- a/src/app/webapp-common/angular-notifier/src/components/notifier-container.component.ts +++ b/src/app/webapp-common/angular-notifier/src/components/notifier-container.component.ts @@ -262,7 +262,10 @@ export class NotifierContainerComponent implements OnDestroy, OnInit { } Promise.all(stepPromises).then(() => { - if (numberOfNotifications > this.config.behaviour.stacking) { + if (typeof this.config.behaviour.stacking === 'number' ? + numberOfNotifications > this.config.behaviour.stacking : + !this.config.behaviour.stacking + ) { this.removeNotificationFromList(this.notifications[0]); } this.tempPromiseResolver(null); diff --git a/src/app/webapp-common/assets/fonts/trains-icons.scss b/src/app/webapp-common/assets/fonts/trains-icons.scss index 3b32b6c9..9039a2a6 100644 --- a/src/app/webapp-common/assets/fonts/trains-icons.scss +++ b/src/app/webapp-common/assets/fonts/trains-icons.scss @@ -3,7 +3,7 @@ @font-face { font-family: '#{$icomoon-font-family}'; - src: url('./#{$icomoon-font-family}.ttf?n9hc0z') format('truetype'); + src: url('./#{$icomoon-font-family}.ttf?wj7mzq') format('truetype'); font-weight: normal; font-style: normal; font-display: block; @@ -23,20 +23,45 @@ -webkit-font-smoothing: antialiased; -moz-osx-font-smoothing: grayscale; } +.al-ico-tune { + &:before { + content: $al-ico-tune; + } +} +.al-ico-equal-outline { + &:before { + content: $al-ico-equal-outline; + } +} +.al-ico-maximize { + &:before { + content: $al-ico-maximize; + } +} +.al-ico-gpu-card { + &:before { + content: $al-ico-gpu-card; + } +} +.al-ico-legend { + &:before { + content: $al-ico-legend; + } +} .al-ico-model-filled { &:before { - content: $al-ico-model-filled; + content: $al-ico-model-filled; } } .al-ico-type-report { &:before { - content: $al-ico-type-report; + content: $al-ico-type-report; } } .al-ico-info-circle-outline { &:before { - content: $al-ico-info-circle-outline; + content: $al-ico-info-circle-outline; } } .al-ico-ghost { diff --git a/src/app/webapp-common/assets/fonts/trains.ttf b/src/app/webapp-common/assets/fonts/trains.ttf index 50eed6a4..a693e946 100644 Binary files a/src/app/webapp-common/assets/fonts/trains.ttf and b/src/app/webapp-common/assets/fonts/trains.ttf differ diff --git a/src/app/webapp-common/assets/fonts/variables.scss b/src/app/webapp-common/assets/fonts/variables.scss index 967d5ea8..0072c274 100755 --- a/src/app/webapp-common/assets/fonts/variables.scss +++ b/src/app/webapp-common/assets/fonts/variables.scss @@ -1,6 +1,11 @@ $icomoon-font-family: "trains" !default; $icomoon-font-path: "fonts" !default; +$al-ico-tune: "\e9f8"; +$al-ico-equal-outline: "\e9f7"; +$al-ico-maximize: "\e9f6"; +$al-ico-gpu-card: "\e9f4"; +$al-ico-legend: "\e9f3"; $al-ico-model-filled: "\e9f2"; $al-ico-type-report: "\e9f1"; $al-ico-info-circle-outline: "\e9f0"; diff --git a/src/app/webapp-common/assets/icons/failed-sm.svg b/src/app/webapp-common/assets/icons/failed-sm.svg new file mode 100644 index 00000000..271918be --- /dev/null +++ b/src/app/webapp-common/assets/icons/failed-sm.svg @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/src/app/webapp-common/assets/icons/no-table-data.svg b/src/app/webapp-common/assets/icons/no-table-data.svg new file mode 100644 index 00000000..f5a7a6c9 --- /dev/null +++ b/src/app/webapp-common/assets/icons/no-table-data.svg @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/src/app/webapp-common/assets/icons/running-notify-grey.svg b/src/app/webapp-common/assets/icons/running-notify-grey.svg new file mode 100644 index 00000000..6a6cd84e --- /dev/null +++ b/src/app/webapp-common/assets/icons/running-notify-grey.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/app/webapp-common/assets/icons/running-notify.svg b/src/app/webapp-common/assets/icons/running-notify.svg new file mode 100644 index 00000000..dd5ca12f --- /dev/null +++ b/src/app/webapp-common/assets/icons/running-notify.svg @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/src/app/webapp-common/clearml-applications/report-widgets/src/app/app.actions.ts b/src/app/webapp-common/clearml-applications/report-widgets/src/app/app.actions.ts index d08bdcf7..bbfbf4d3 100644 --- a/src/app/webapp-common/clearml-applications/report-widgets/src/app/app.actions.ts +++ b/src/app/webapp-common/clearml-applications/report-widgets/src/app/app.actions.ts @@ -50,7 +50,7 @@ export const getSingleValues = createAction('[App] getSingleValues', props<{ export const setPlotData = createAction('[App] setPlot', props<{ data: ReportsApiMultiplotsResponse }>()); export const setScalarData = createAction('[App] setScalar', props<{ data: ExtFrame[] }>()); export const setSampleData = createAction('[App] setSample', props<{ data: DebugSample }>()); -export const setSingleValues = createAction('[App] setSingleValues', props<{ data: SingleValueTaskMetrics }>()); +export const setSingleValues = createAction('[App] setSingleValues', props<{ data: SingleValueTaskMetrics[] }>()); export const setParallelCoordinateExperiments = createAction('[App] setParcoor', props<{ data: Task[] }>()); export const reportsPlotlyReady = createAction('[App] plotly ready'); diff --git a/src/app/webapp-common/clearml-applications/report-widgets/src/app/app.component.html b/src/app/webapp-common/clearml-applications/report-widgets/src/app/app.component.html index 8668b937..1a2d4282 100644 --- a/src/app/webapp-common/clearml-applications/report-widgets/src/app/app.component.html +++ b/src/app/webapp-common/clearml-applications/report-widgets/src/app/app.component.html @@ -4,7 +4,7 @@ - + View original resource @@ -53,14 +53,14 @@ > - +
- + > +
diff --git a/src/app/webapp-common/clearml-applications/report-widgets/src/app/app.component.scss b/src/app/webapp-common/clearml-applications/report-widgets/src/app/app.component.scss index b091bc2a..5dc645ae 100644 --- a/src/app/webapp-common/clearml-applications/report-widgets/src/app/app.component.scss +++ b/src/app/webapp-common/clearml-applications/report-widgets/src/app/app.component.scss @@ -11,7 +11,18 @@ font-size: 14px; } +.single-value-summary-section { + display: flex; + height: 100%; + width: 100%; + align-items: center; + justify-content: center; + padding: 0 12px; + sm-single-value-summary-table { + max-width: 100%; + } +} .show-text { cursor: pointer; diff --git a/src/app/webapp-common/clearml-applications/report-widgets/src/app/app.component.ts b/src/app/webapp-common/clearml-applications/report-widgets/src/app/app.component.ts index 7d9cc551..98a57c50 100644 --- a/src/app/webapp-common/clearml-applications/report-widgets/src/app/app.component.ts +++ b/src/app/webapp-common/clearml-applications/report-widgets/src/app/app.component.ts @@ -20,7 +20,7 @@ import {ExtFrame} from '@common/shared/single-graph/plotly-graph-base'; import {DebugSample} from '@common/shared/debug-sample/debug-sample.reducer'; import {getSignedUrl, setS3Credentials} from '@common/core/actions/common-auth.actions'; import {ConfigurationService} from '@common/shared/services/configuration.service'; -import {_mergeVariants, convertMultiPlots, mergeMultiMetricsGroupedVariant, prepareMultiPlots, tryParseJson} from '@common/tasks/tasks.utils'; +import {_mergeVariants, convertMultiPlots, createMultiSingleValuesChart, mergeMultiMetricsGroupedVariant, prepareGraph, prepareMultiPlots, tryParseJson} from '@common/tasks/tasks.utils'; import {selectSignedUrl} from '@common/core/reducers/common-auth-reducer'; import {loadExternalLibrary} from '@common/shared/utils/load-external-library'; import {ImageViewerComponent} from '@common/shared/debug-sample/image-viewer/image-viewer.component'; @@ -47,7 +47,6 @@ export class AppComponent implements OnInit { title = 'report-widgets'; public plotData: ExtFrame; public frame: DebugSample; - public parcoords: any; public plotLoaded: boolean; private environment: Environment; public activated: boolean = false; @@ -193,8 +192,8 @@ export class AppComponent implements OnInit { const newGraphs = convertMultiPlots(merged); const originalObject = this.searchParams.get('objects'); const series = this.searchParams.get('series'); - this.plotData = Object.values(newGraphs)[0]?.find(a => originalObject === (a.task ?? a.data[0].task)) ?? - Object.values(newGraphs)[0].find(a => (a.data[0] as any).seriesName === series) ?? + this.plotData = series ? Object.values(newGraphs)[0].find(a => (a.data[0] as any).seriesName === series) : + Object.values(newGraphs)[0]?.find(a => originalObject === (a.task ?? a.data[0].task)) ?? Object.values(newGraphs)[0]?.[0]; } @@ -297,7 +296,14 @@ export class AppComponent implements OnInit { filter(singleValueData => !!singleValueData), take(1) ).subscribe(singleValueData => { - this.singleValueData = singleValueData.values; + const objects = this.searchParams.getAll('objects'); + if (objects.length > 1) { + this.type = 'scalar'; + const singleValuesData = createMultiSingleValuesChart(singleValueData); + this.plotData = prepareGraph(singleValuesData.data, singleValuesData.layout, {}, {type: 'singleValue'}); + } else { + this.singleValueData = singleValueData[0].values; + } this.cdr.detectChanges(); }); } @@ -306,9 +312,11 @@ export class AppComponent implements OnInit { this.activated = true; await this.waitForVisibility(); this.singleGraphHeight = window.innerHeight; - !['sample', 'single'].includes(this.type) && loadExternalLibrary(this.store, this.environment.plotlyURL, reportsPlotlyReady); const models = this.searchParams.has('models') || this.searchParams.get('objectType') === 'model'; const objects = this.searchParams.getAll('objects'); + if ((!['sample', 'single'].includes(this.type) || objects.length > 1)) { + loadExternalLibrary(this.store, this.environment.plotlyURL, reportsPlotlyReady); + } const queryParams = { tasks: objects.length > 0 ? objects : this.searchParams.getAll('tasks'), metrics: this.searchParams.getAll('metrics'), @@ -400,7 +408,7 @@ export class AppComponent implements OnInit { const isCompare = entityIds.length > 1; let url = `${window.location.origin.replace('4201', '4200')}/projects/${project ?? '*'}/`; if (isCompare) { - url += `${isModels ? 'compare-models;ids=' : 'compare-experiments;ids='}${entityIds.join(',')}/ + url += `${isModels ? 'compare-models;ids=' : 'compare-experiments;ids='}${entityIds.filter(id => !!id).join(',')}/ ${this.getComparePath(this.type)}?metricPath=${metricPath}&metricName=lala${variants.map(par => `¶ms=${par}`).join('')}`; } else { url += `${isModels ? 'models/' : 'experiments/'}${entityIds}/${this.getOutputPath(isModels, this.type)}`; @@ -428,6 +436,7 @@ ${this.getComparePath(this.type)}?metricPath=${metricPath}&metricName=lala${vari return 'info-output/debugImages'; } } + return ''; } private getComparePath(type: WidgetTypes) { diff --git a/src/app/webapp-common/clearml-applications/report-widgets/src/app/app.effects.ts b/src/app/webapp-common/clearml-applications/report-widgets/src/app/app.effects.ts index a2b454a6..2582e6f5 100644 --- a/src/app/webapp-common/clearml-applications/report-widgets/src/app/app.effects.ts +++ b/src/app/webapp-common/clearml-applications/report-widgets/src/app/app.effects.ts @@ -145,7 +145,7 @@ export class AppEffects { }) ), mergeMap((res: { data: ReportsGetTaskDataResponse }) => [ - setSingleValues({data: res.data.single_value_metrics[0]}), + setSingleValues({data: res.data.single_value_metrics}), setTaskData({sourceProject: (res.data.tasks[0]?.project as any).id, sourceTasks: res.data.tasks.map(t => t.id)}) ] ) diff --git a/src/app/webapp-common/clearml-applications/report-widgets/src/app/app.reducer.ts b/src/app/webapp-common/clearml-applications/report-widgets/src/app/app.reducer.ts index 6cabe0b8..81078500 100644 --- a/src/app/webapp-common/clearml-applications/report-widgets/src/app/app.reducer.ts +++ b/src/app/webapp-common/clearml-applications/report-widgets/src/app/app.reducer.ts @@ -31,7 +31,7 @@ export const appFeatureKey = 'app'; export interface State { plotData: MetricsPlotEvent[] | ReportsApiMultiplotsResponse; sampleData: DebugSample; - singleValuesData: SingleValueTaskMetrics; + singleValuesData: SingleValueTaskMetrics[]; parallelCoordinateData: Task[]; scaleFactor: number; plotlyReady: boolean; diff --git a/src/app/webapp-common/clearml-applications/report-widgets/src/environments/environment.ts b/src/app/webapp-common/clearml-applications/report-widgets/src/environments/environment.ts index cd3d25cf..e5772124 100644 --- a/src/app/webapp-common/clearml-applications/report-widgets/src/environments/environment.ts +++ b/src/app/webapp-common/clearml-applications/report-widgets/src/environments/environment.ts @@ -1,30 +1,23 @@ import {BASE_ENV, Environment} from './base'; /* - 1 https://api1.rnd.dev2.allegro.ai (community) - 2 https://api2.rnd.dev2.allegro.ai (enterprise) - 3 https://api.qa.hosted.allegro.ai - 4 https://api.allegro-master.hosted.allegro.ai - 5 https://api.allegro.ai - 6 https://api2.qa.hosted.allegro.ai - 7 https://api1.testing2.dev2.allegro.ai - 8 https://api2.testing2.dev2.allegro.ai - 9 https://api.vimeo.hosted.allegro.ai - 10 https://api.maxq.hosted.allegro.ai - 11 https://api.community-master.hosted.allegro.ai - 12 https://api.dev.hosted.allegro.ai - 13 https://api.staging.hosted.allegro.ai - 14 https://api.clear.ml - 15 https://api.dev.hosted.clear.ml - 16 https://api.deloitte.hosted.allegro.ai - 17 https://api.trains-master.hosted.allegro.ai - */ + 'https://api.allegro-master.hosted.allegro.ai', // 1 + 'https://api.community-master.hosted.allegro.ai', // 2 + 'https://api.allegro.ai', // 3 + 'https://api.clear.ml', // 4 + 'https://api1.rnd.dev2.allegro.ai', // 5 + 'https://api2.rnd.dev2.allegro.ai', // 6 + 'https://api.dev.hosted.allegro.ai', // 7 + 'https://api.dev.hosted.clear.ml', // 8 + 'https://api.staging.hosted.allegro.ai', // 9 + 'https://api.neuralguard.hosted.allegro.ai', // 10 +*/ export const environment = { ...BASE_ENV, production: false, baseUrl: 'localhost:4200', autoLogin: false, - apiBaseUrl: 'service/4/api', + apiBaseUrl: 'service/1/api', // communityServer: true, accountAdministration: true, fileBaseUrl: 'https://files.allegro.ai', diff --git a/src/app/webapp-common/clearml-applications/report-widgets/src/styles.scss b/src/app/webapp-common/clearml-applications/report-widgets/src/styles.scss index d1794439..a259a92c 100644 --- a/src/app/webapp-common/clearml-applications/report-widgets/src/styles.scss +++ b/src/app/webapp-common/clearml-applications/report-widgets/src/styles.scss @@ -128,6 +128,7 @@ $sm-dark-theme: mat.define-dark-theme(( @include mat.dialog-theme($theme); @include mat.slider-theme($sm-neon-theme); @include mat.form-field-theme($theme); +@include mat.tooltip-theme($theme); @include mat.select-theme($sm-dark-theme); @@ -142,6 +143,7 @@ $sm-dark-theme: mat.define-dark-theme(( html, body { height: 100%; overflow: hidden; + --mat-select-trigger-text-size: 14px; } body { @@ -167,6 +169,13 @@ body { } } +.ellipsis { + display: block; + overflow: hidden; + white-space: nowrap; + text-overflow: ellipsis; +} + .mat-mdc-dialog-container { padding: 0 !important; } @@ -289,6 +298,7 @@ sm-debug-image-snippet { .image-var { top: 8px; bottom: unset; + line-height: 20px; } } @@ -320,6 +330,9 @@ sm-debug-image-snippet { .mat-mdc-select-panel { padding: 0; font-size: 14px; + --mdc-typography-body1-font-size: 14px; + --mdc-typography-body1-line-height: 16px; + --mat-select-trigger-text-size: 14px; &.light-theme { --mdc-theme-surface: white; @@ -329,6 +342,8 @@ sm-debug-image-snippet { &.dark, &.black, &.dark-theme { --mdc-theme-surface: #000; border: 1px solid $blue-500; + --mat-select-panel-background-color: #000; + --mat-option-label-text-color: #{$blue-200}; .mat-mdc-option { --mdc-theme-text-primary-on-background: #{$blue-200}; @@ -337,7 +352,7 @@ sm-debug-image-snippet { .mat-mdc-option { --mdc-typography-body1-line-height: 36px; - --mdc-typography-body1-font-size: 14px; + --mat-menu-item-label-text-size: 14px; min-height: 36px; } @@ -372,8 +387,8 @@ sm-debug-image-snippet { .dark-theme, .light-theme { .mat-mdc-form-field { - --mdc-typography-body1-font-size: 14px; - --mdc-typography-body1-line-height: 16px; + --mat-menu-item-label-text-line-height: 16; + --mat-menu-item-label-text-size: 14px; &.mat-form-field-appearance-outline { &.black { @@ -511,3 +526,26 @@ input[type=number] { ::-webkit-scrollbar-corner { background-color: transparent } + +.mat-mdc-tooltip { + &.sm-tooltip { + --mdc-plain-tooltip-container-color: #{$purple}; + + .mdc-tooltip__surface { + max-width: 400px; + font-size: 11px; + line-height: 1.55; + letter-spacing: 0.3px; + } + + &.break-line { + .mdc-tooltip__surface { + white-space: pre-line; + } + } + } + + &.parameter-tooltip { + margin: 6px auto 6px -74px; + } +} diff --git a/src/app/webapp-common/common-search/common-search.reducer.ts b/src/app/webapp-common/common-search/common-search.reducer.ts index 2d579170..7970a1bd 100644 --- a/src/app/webapp-common/common-search/common-search.reducer.ts +++ b/src/app/webapp-common/common-search/common-search.reducer.ts @@ -7,27 +7,32 @@ export interface SearchState { searchQuery: {query: string; regExp?: boolean; original?: string}; placeholder: string; active: boolean; + initiated: boolean; } -// Todo remove selectedProjectId const searchInitState: SearchState = { isSearching: false, searchQuery: null, placeholder: null, - active : false + active : false, + initiated : false }; export const searchReducer = createReducer( searchInitState, - on(setSearching, (state, action) => ({...state, isSearching: action.payload})), - on(setSearchQuery, (state, action) => ({...state, searchQuery: action})), - on(initSearch, (state, action) => ({...searchInitState, placeholder: action.payload || 'Search'})), - on(resetSearch, () => ({...searchInitState, placeholder: 'Search'})), + on(setSearching, (state, action): SearchState => ({...state, isSearching: action.payload})), + on(setSearchQuery, (state, action): SearchState => ({...state, searchQuery: action})), + on(initSearch, (state, action): SearchState => ({ + ...state, + placeholder: action.payload || 'Search', + initiated: true + })), + on(resetSearch, (): SearchState => ({...searchInitState, placeholder: 'Search'})), ); export const selectCommonSearch = createFeatureSelector('commonSearch'); export const selectIsSearching = createSelector(selectCommonSearch, (state: SearchState): boolean => state ? state.isSearching : false); -export const selectSearchQuery = createSelector(selectCommonSearch, (state: SearchState) => state?.searchQuery || searchInitState.searchQuery); -export const selectPlaceholder = createSelector(selectCommonSearch, (state: SearchState): string => state ? state.placeholder : ''); +export const selectSearchQuery = createSelector(selectCommonSearch, (state: SearchState) => state ? state.searchQuery : searchInitState.searchQuery); +export const selectPlaceholder = createSelector(selectCommonSearch, (state: SearchState) => state ? state.placeholder : ''); diff --git a/src/app/webapp-common/common-search/containers/common-search/common-search.component.html b/src/app/webapp-common/common-search/containers/common-search/common-search.component.html index 51f9dd7b..65d4ea56 100644 --- a/src/app/webapp-common/common-search/containers/common-search/common-search.component.html +++ b/src/app/webapp-common/common-search/containers/common-search/common-search.component.html @@ -1,6 +1,6 @@ + (click)="toggleRegExp(); searchComponent.searchBarInput.nativeElement.focus();"> diff --git a/src/app/webapp-common/common-search/containers/common-search/common-search.component.ts b/src/app/webapp-common/common-search/containers/common-search/common-search.component.ts index f11d66e9..d503c6e7 100644 --- a/src/app/webapp-common/common-search/containers/common-search/common-search.component.ts +++ b/src/app/webapp-common/common-search/containers/common-search/common-search.component.ts @@ -4,7 +4,7 @@ import {Store} from '@ngrx/store'; import {setSearching, setSearchQuery} from '../../common-search.actions'; import {SearchState, selectIsSearching, selectPlaceholder, selectSearchQuery} from '../../common-search.reducer'; import {Observable} from 'rxjs'; -import {debounceTime, filter, tap} from 'rxjs/operators'; +import {debounceTime, distinctUntilChanged, filter, tap} from 'rxjs/operators'; import {SearchComponent} from '@common/shared/ui-components/inputs/search/search.component'; @Component({ @@ -23,11 +23,40 @@ export class CommonSearchComponent implements OnInit { @ViewChild(SearchComponent) searchElem: SearchComponent; public regExp: boolean = false; private closeTimer: number; - private queryString: string; minChars = 3; public regexError: boolean; constructor(private store: Store, private router: Router, private route: ActivatedRoute, private cdr: ChangeDetectorRef) { + this.router.events + .pipe( + filter(event => event instanceof NavigationEnd), + distinctUntilChanged((pe: NavigationEnd, ce: NavigationEnd) => pe.url?.split('?')[1] === ce.url?.split('?')[1]) + ).subscribe(() => { + const query = this.route.snapshot.queryParams?.q ?? ''; + const qregex = this.route.snapshot.queryParams?.qreg === 'true'; + this.store.dispatch(setSearchQuery({ + query: qregex ? query : query.trim(), + regExp: qregex, + original: query + })); + if (query) { + this.openSearch(); + } else { + if (document.activeElement !== this.searchElem.searchBarInput.nativeElement) { + this.store.dispatch(setSearching({payload: false})) + } + } + }) + if( this.route.snapshot.queryParams.q) { + const query = this.route.snapshot.queryParams?.q ?? ''; + const qregex = this.route.snapshot.queryParams?.qreg ?? false; + this.store.dispatch(setSearchQuery({ + query: qregex ? query : query.trim(), + regExp: qregex, + original: query + })); + setTimeout( () => this.openSearch()); + } } ngOnInit() { @@ -41,23 +70,23 @@ export class CommonSearchComponent implements OnInit { setTimeout(this.setSearchActive.bind(this)); } - onSearchValueChanged(query: string) { - this.queryString = query; - this.search(); - this.cdr.detectChanges(); - } - private search() { + + public search(query: string) { try { if (this.regExp) { - new RegExp(this.queryString); + new RegExp(query); } this.regexError = null; - this.store.dispatch(setSearchQuery({ - query: this.regExp ? this.queryString : this.queryString.trim(), - regExp: this.regExp, - original: this.queryString - })); + this.router.navigate([], { + relativeTo: this.route, + replaceUrl: true, + queryParamsHandling: "merge", + queryParams: { + q: query || undefined + } + }) + } catch (e) { this.regexError = e.message?.replace(/:.+:/, ':'); } @@ -92,13 +121,17 @@ export class CommonSearchComponent implements OnInit { this.searchElem.clear(); this.store.dispatch(setSearching({payload: false})); document.body.focus(); + setTimeout( () =>this.searchElem.searchBarInput.nativeElement.blur(), 100); } toggleRegExp() { this.regExp = !this.regExp; - window.clearTimeout(this.closeTimer); - if (this.queryString?.length >= this.minChars) { - this.search(); - } + this.router.navigate([], { + relativeTo: this.route, + replaceUrl: true, + queryParamsHandling: "merge", + queryParams: { + qreg: this.regExp ? this.regExp : undefined} + }) } } diff --git a/src/app/webapp-common/common-styles.scss b/src/app/webapp-common/common-styles.scss index ec351bb0..c4135f84 100644 --- a/src/app/webapp-common/common-styles.scss +++ b/src/app/webapp-common/common-styles.scss @@ -94,6 +94,9 @@ $sm-neon-theme: mat.define-dark-theme(( --mdc-typography-body1-letter-spacing: 0; --mdc-typography-button-letter-spacing: 0; + .mat-mdc-slide-toggle{ + --mdc-switch-state-layer-size: 24px; + } .mat-mdc-checkbox .mdc-checkbox { --mdc-checkbox-selected-icon-color: #{$purple}; @@ -101,8 +104,8 @@ $sm-neon-theme: mat.define-dark-theme(( --mdc-checkbox-selected-focus-icon-color: #{$purple}; } - .mat-expansion-panel-header-description, .mat-expansion-indicator:after { - color: $white; + .mat-expansion-panel-header-description, .mat-expansion-indicator { + --mat-expansion-header-indicator-color: #{$blue-300}; } .link { @@ -131,6 +134,9 @@ $sm-neon-theme: mat.define-dark-theme(( --mdc-typography-body1-letter-spacing: 0; --mdc-typography-button-letter-spacing: 0; + --mdc-switch-state-layer-size: 24px; + + --bs-border-width: 1px #{$blue-300}; mat-progress-bar { border-radius: 4px; @@ -174,7 +180,7 @@ html, body { height: 100%; margin: 0; padding: 0; - font-family: $font-family-base, sans-serif; + font-family: $font-family-base; font-size: 14px; overflow: hidden; } @@ -279,7 +285,7 @@ hr { //} mat-expansion-panel { - box-shadow: unset; + box-shadow: unset !important; .mat-expansion-panel-header { margin-bottom: 0; @@ -388,6 +394,8 @@ button { .empty-menu { height: 100px; + font-size: 14px; + --mat-menu-item-label-text-tracking: 0; } .capital-case { @@ -597,9 +605,11 @@ html { &.cdk-keyboard-focused, &.cdk-program-focused { color: rgba(0, 0, 0, 0.87); } + &.mat-mdc-focus-indicator { - --mdc-list-list-item-hover-label-text-color: rgba(0, 0, 0, 0.87); + --mat-menu-item-hover-state-layer-color: #{$blue-50}; } + .mdc-list-item__primary-text { --mdc-list-list-item-label-text-color: rgba(0, 0, 0, 0.87); } @@ -615,14 +625,13 @@ html { width: calc(100% - 8px); height: 40px; min-height: 40px; - --mdc-typography-body1-line-height: 20px; - font-size: 14px; - --mdc-typography-body1-font-size: 14px; + --mat-menu-item-label-text-line-height: 20px; + --mat-menu-item-label-text-size: 14px; padding: 0 32px 0 12px; border-radius: 4px; .mdc-list-item__primary-text { - --mdc-typography-body1-line-height: 20px; + --mat-menu-item-label-text-tracking: 0; display: flex; align-items: center; gap: 0 12px; @@ -630,10 +639,6 @@ html { overflow: hidden; text-overflow: ellipsis; } - - &.mat-mdc-menu-item { - - } } hr { @@ -859,7 +864,7 @@ button.btn.button-outline-dark { .ace_placeholder { font-family: SFMono-Regular, Menlo, Monaco, Consolas, Liberation Mono, Courier New, monospace; - color: $blue-grey !important; + color: $blue-300 !important; } .modebar-btn[data-attr="plotly-embedded-modebar-button"] { diff --git a/src/app/webapp-common/constants.ts b/src/app/webapp-common/constants.ts index 7bec6d19..0facb8e3 100644 --- a/src/app/webapp-common/constants.ts +++ b/src/app/webapp-common/constants.ts @@ -1,3 +1,6 @@ +import {IOption} from '@common/shared/ui-components/inputs/select-autocomplete-with-chips/select-autocomplete-with-chips.component'; +import {TIME_INTERVALS} from '@common/workers-and-queues/workers-and-queues.consts'; + export type TableSelectionState = 'All' | 'Partial' | 'None'; export const TIME_FORMAT_STRING = 'MMM d yyyy H:mm'; @@ -110,3 +113,13 @@ export const MESSAGES_SEVERITY = { }; export const rootProjectsPageSize = 50; + +export const timeFrameOptions: IOption[] = [ + {label: '3 Hours', value: (3 * TIME_INTERVALS.HOUR).toString()}, + {label: '6 Hours', value: (6 * TIME_INTERVALS.HOUR).toString()}, + {label: '12 Hours', value: (12 * TIME_INTERVALS.HOUR).toString()}, + {label: '1 Day', value: (TIME_INTERVALS.DAY).toString()}, + {label: '1 Week', value: (TIME_INTERVALS.WEEK).toString()}, + {label: '1 Month', value: (TIME_INTERVALS.MONTH).toString()} +]; + diff --git a/src/app/webapp-common/core/actions/common-auth.actions.ts b/src/app/webapp-common/core/actions/common-auth.actions.ts index cd4dcc88..3b095a94 100755 --- a/src/app/webapp-common/core/actions/common-auth.actions.ts +++ b/src/app/webapp-common/core/actions/common-auth.actions.ts @@ -48,7 +48,7 @@ export const resetDontShowAgainForBucketEndpoint = createAction(AUTH_PREFIX + 'R export const resetShowS3Popup = createAction(AUTH_PREFIX + 'RESET_SHOW_S3_POPUP'); export const showS3PopUp = createAction( AUTH_PREFIX + 'SHOW_S3_POPUP', - props<{credentials: Credentials; credentialsError: string; isAzure: boolean}>() + props<{credentials: Credentials; credentialsError: string; provider: 's3' | 'azure' | 'gcs'}>() ); export const getTutorialBucketCredentials = createAction(AUTH_PREFIX + 'GET_TUTORIAL_BUCKET_CREDENTIALS'); export const showLocalFilePopUp = createAction( diff --git a/src/app/webapp-common/core/actions/layout.actions.ts b/src/app/webapp-common/core/actions/layout.actions.ts index 777d035d..209b21eb 100755 --- a/src/app/webapp-common/core/actions/layout.actions.ts +++ b/src/app/webapp-common/core/actions/layout.actions.ts @@ -1,5 +1,5 @@ import {VIEW_PREFIX} from '~/app.constants'; -import {createAction, props} from '@ngrx/store'; +import {Action, createAction, props} from '@ngrx/store'; import {omit} from 'lodash-es'; import {HttpErrorResponse} from '@angular/common/http'; import {Ace} from 'ace-builds'; @@ -69,7 +69,7 @@ export const resetAceCaretsPositions = createAction(VIEW_PREFIX + '[reset ace ca export const addMessage = createAction( VIEW_PREFIX + '[add message]', - (severity: MessageSeverityEnum, msg: string, userActions?: { actions: any[]; name: string }[], suppressNextMessages?: boolean) => + (severity: MessageSeverityEnum, msg: string, userActions?: { actions: Action[]; name: string }[], suppressNextMessages?: boolean) => ({severity, msg, userActions, suppressNextMessages}) ); @@ -95,8 +95,6 @@ export const setRedactedArguments = createAction(VIEW_PREFIX + 'SET_REDACTED_ARG export const setHideRedactedArguments = createAction(VIEW_PREFIX + 'SET_SHOW_REDACTED_ARGUMENTS', props<{ hide: boolean }>()); export const plotlyReady = createAction(VIEW_PREFIX + '[plotly ready]'); export const aceReady = createAction(VIEW_PREFIX + '[ace ready]'); -export const openAppsAwarenessDialog = createAction(VIEW_PREFIX + '[apps awareness dialog]', - props<{ appsYouTubeIntroVideoId }>() -); +export const openAppsAwarenessDialog = createAction(VIEW_PREFIX + '[apps awareness dialog]' ); diff --git a/src/app/webapp-common/core/actions/projects.actions.ts b/src/app/webapp-common/core/actions/projects.actions.ts index b5762d68..7f5caa79 100755 --- a/src/app/webapp-common/core/actions/projects.actions.ts +++ b/src/app/webapp-common/core/actions/projects.actions.ts @@ -116,6 +116,11 @@ export const setCompanyTags = createAction( props<{ tags: string[]; systemTags: string[] }>() ); +export const addCompanyTag = createAction( + PROJECTS_PREFIX + '[add company tag]', + props<{tag: string}>() +); + export const setMainPageTagsFilter = createAction( PROJECTS_PREFIX + '[set main page tags filters]', props<{ tags?: string[]; feature: string}>() @@ -222,7 +227,7 @@ export const resetTablesFilterProjectsOptions = createAction( export const getTablesFilterProjectsOptions = createAction( PROJECTS_PREFIX + ' [get tables filter projects options]', - props<{ searchString: string; loadMore: boolean}>() + props<{ searchString: string; loadMore: boolean; allowPublic?: boolean}>() ); export const setTablesFilterProjectsOptions = createAction( diff --git a/src/app/webapp-common/core/actions/router.actions.ts b/src/app/webapp-common/core/actions/router.actions.ts index 82c018a2..c5dd8770 100755 --- a/src/app/webapp-common/core/actions/router.actions.ts +++ b/src/app/webapp-common/core/actions/router.actions.ts @@ -31,6 +31,7 @@ export const setURLParams = createAction( isDeep?: boolean; update?: boolean; version?: string; + others?: {[key: string]: string}; }>() ); diff --git a/src/app/webapp-common/core/effects/common-auth.effects.ts b/src/app/webapp-common/core/effects/common-auth.effects.ts index 2d461d9f..20a819a4 100644 --- a/src/app/webapp-common/core/effects/common-auth.effects.ts +++ b/src/app/webapp-common/core/effects/common-auth.effects.ts @@ -1,18 +1,21 @@ import {Injectable} from '@angular/core'; -import {Actions, createEffect, ofType} from '@ngrx/effects'; +import {Actions, concatLatestFrom, createEffect, ofType} from '@ngrx/effects'; import {ApiAuthService} from '~/business-logic/api-services/auth.service'; import * as authActions from '../actions/common-auth.actions'; import {requestFailed} from '../actions/http.actions'; import {activeLoader, deactivateLoader, setServerError} from '../actions/layout.actions'; import {catchError, filter, finalize, map, mergeMap, switchMap, throttleTime, withLatestFrom} from 'rxjs/operators'; import {AuthGetCredentialsResponse} from '~/business-logic/model/auth/authGetCredentialsResponse'; -import {select, Store} from '@ngrx/store'; +import {Store} from '@ngrx/store'; import {selectCurrentUser} from '../reducers/users-reducer'; import {GetCurrentUserResponseUserObject} from '~/business-logic/model/users/getCurrentUserResponseUserObject'; import {AdminService} from '~/shared/services/admin.service'; import {selectDontShowAgainForBucketEndpoint, selectS3BucketCredentialsBucketCredentials, selectSignedUrl} from '@common/core/reducers/common-auth-reducer'; import {EMPTY, of} from 'rxjs'; -import {S3AccessResolverComponent} from '@common/layout/s3-access-resolver/s3-access-resolver.component'; +import { + S3AccessDialogData, + S3AccessResolverComponent +} from '@common/layout/s3-access-resolver/s3-access-resolver.component'; import {MatDialog} from '@angular/material/dialog'; import {setCredentialLabel} from '../actions/common-auth.actions'; import {SignResponse} from '@common/settings/admin/base-admin-utils'; @@ -38,7 +41,7 @@ export class CommonAuthEffects { getAllCredentialsEffect = createEffect(() => this.actions.pipe( ofType(authActions.getAllCredentials), switchMap(action => this.credentialsApi.authGetCredentials({}).pipe( - withLatestFrom(this.store.select(selectCurrentUser)), + concatLatestFrom(() => this.store.select(selectCurrentUser)), mergeMap(([res, user]: [AuthGetCredentialsResponse, GetCurrentUserResponseUserObject]) => [ authActions.updateAllCredentials({credentials: res.credentials, extra: res?.['additional_credentials'], workspace: user.company.id}), deactivateLoader(action.type) @@ -103,7 +106,7 @@ export class CommonAuthEffects { filter(action => !!action.url), mergeMap(action => of(action).pipe( - withLatestFrom( + concatLatestFrom(() => this.store.select(state => selectSignedUrl(action.url)(state)) ), switchMap(([, signedUrl]) => @@ -115,7 +118,7 @@ export class CommonAuthEffects { switch (res.type) { case 'popup': this.signAfterPopup.push(action); - return [authActions.showS3PopUp({credentials: res.bucket, isAzure: res.azure, credentialsError: null})]; + return [authActions.showS3PopUp({credentials: res.bucket, provider: res.provider, credentialsError: null})]; case 'sign': return [authActions.setSignedUrl({url: action.url, signed: res.signed, expires: res.expires})]; default: @@ -129,9 +132,7 @@ export class CommonAuthEffects { s3popup = createEffect(() => this.actions.pipe( ofType(authActions.showS3PopUp), - withLatestFrom( - this.store.select(selectDontShowAgainForBucketEndpoint) - ), + concatLatestFrom(() => this.store.select(selectDontShowAgainForBucketEndpoint)), throttleTime(500), filter(([action, dontShowAgain]) => action?.credentials?.Bucket + action?.credentials?.Endpoint !== dontShowAgain && @@ -141,10 +142,8 @@ export class CommonAuthEffects { if (action?.credentials?.Bucket) { this.openPopup[action.credentials.Bucket] = true; } - return this.matDialog.open(S3AccessResolverComponent, {data: action, maxWidth: 700}).afterClosed().pipe( - withLatestFrom( - this.store.pipe(select(selectS3BucketCredentialsBucketCredentials)), - ), + return this.matDialog.open(S3AccessResolverComponent, {data: action as S3AccessDialogData, maxWidth: 700}).afterClosed().pipe( + concatLatestFrom(() => this.store.select(selectS3BucketCredentialsBucketCredentials)), switchMap(([data, bucketCredentials]) => { window.setTimeout(() => this.signAfterPopup = []); if (data) { diff --git a/src/app/webapp-common/core/effects/projects.effects.ts b/src/app/webapp-common/core/effects/projects.effects.ts index f57666cf..c66a0099 100755 --- a/src/app/webapp-common/core/effects/projects.effects.ts +++ b/src/app/webapp-common/core/effects/projects.effects.ts @@ -43,7 +43,7 @@ import { OperationErrorDialogComponent } from '@common/shared/ui-components/overlay/operation-error-dialog/operation-error-dialog.component'; import {ApiTasksService} from '~/business-logic/api-services/tasks.service'; -import {createMetricColumn} from '@common/shared/utils/tableParamEncode'; +import {createMetricColumn, excludedKey} from '@common/shared/utils/tableParamEncode'; import {ITask} from '~/business-logic/model/al-task'; import {TasksGetAllExRequest} from '~/business-logic/model/tasks/tasksGetAllExRequest'; import {setSelectedExperiments} from '../../experiments/actions/common-experiments-view.actions'; @@ -102,6 +102,7 @@ export class ProjectsEffects { switchMap(([action, showHidden, scrollId, filters]) => forkJoin([ this.projectsApi.projectsGetAllEx({ /* eslint-disable @typescript-eslint/naming-convention */ + allow_public: action.allowPublic, page_size: rootProjectsPageSize, size: rootProjectsPageSize, order_by: ['name'], @@ -190,7 +191,10 @@ export class ProjectsEffects { resetProjectSelections$ = createEffect(() => this.actions$.pipe( ofType(actions.resetProjectSelection), - mergeMap(() => [setSelectedExperiments({experiments: []}), setSelectedModels({models: []})]) + mergeMap(() => [ + setSelectedExperiments({experiments: []}), + setSelectedModels({models: []}) + ]) )); updateProject$ = createEffect(() => this.actions$.pipe( @@ -307,7 +311,7 @@ export class ProjectsEffects { started: ['2000-01-01T00:00:00', null], status: ['-draft'], order_by: ['-started'], - type: ['__$not', 'annotation_manual', '__$not', 'annotation', '__$not', 'dataset_import'], + type: [excludedKey, 'annotation_manual', excludedKey, 'annotation', excludedKey, 'dataset_import'], system_tags: ['-archived'], scroll_id: null, size: 1000 diff --git a/src/app/webapp-common/core/effects/router.effects.ts b/src/app/webapp-common/core/effects/router.effects.ts index 7f89783f..897e7cf9 100755 --- a/src/app/webapp-common/core/effects/router.effects.ts +++ b/src/app/webapp-common/core/effects/router.effects.ts @@ -41,7 +41,8 @@ export class RouterEffects { ...(action.filters && {filter: encodeFilters(action.filters)}), ...(action.isArchived !== undefined && {archive: action.isArchived ? 'true' : null}), ...(action.isDeep && {deep: true}), - ...(action.version && {version: action.version}) + ...(action.version && {version: action.version}), + ...(action.others && action.others) } } as NavigationExtras; this.router.navigate([], extra); diff --git a/src/app/webapp-common/core/effects/users.effects.ts b/src/app/webapp-common/core/effects/users.effects.ts index d7ab039e..36b9078b 100755 --- a/src/app/webapp-common/core/effects/users.effects.ts +++ b/src/app/webapp-common/core/effects/users.effects.ts @@ -77,11 +77,7 @@ ${this.errorService.getErrorMsg(err?.error)}`)]) updateCurrentUser = createEffect(() => this.actions.pipe( ofType(updateCurrentUser), mergeMap(({user}) => this.userService.usersUpdate({...user}).pipe( - mergeMap((res: UsersUpdateResponse) => { - if (res.updated) { - return [setCurrentUserName({name: user.name})]; - } - }) + mergeMap((res: UsersUpdateResponse) => res.updated ? [setCurrentUserName({name: user.name})] : []) )), catchError(err => [addMessage(MESSAGES_SEVERITY.ERROR, `Update User Failed ${this.errorService.getErrorMsg(err?.error)}`)]) )); diff --git a/src/app/webapp-common/core/interceptors/webapp-interceptor.ts b/src/app/webapp-common/core/interceptors/webapp-interceptor.ts index 89504f0f..7ab5a1ef 100644 --- a/src/app/webapp-common/core/interceptors/webapp-interceptor.ts +++ b/src/app/webapp-common/core/interceptors/webapp-interceptor.ts @@ -1,4 +1,4 @@ -import {Injectable} from '@angular/core'; +import {inject, Injectable} from '@angular/core'; import { HttpInterceptor, HttpRequest, HttpHandler, HttpEvent, HttpErrorResponse } from '@angular/common/http'; import { Observable, throwError } from 'rxjs'; import { environment } from '../../../../environments/environment'; @@ -12,8 +12,12 @@ import {setCurrentUser} from '~/core/actions/users.action'; @Injectable() export class WebappInterceptor implements HttpInterceptor { protected user: GetCurrentUserResponseUserObject; + protected router: Router; + protected store: Store; - constructor(protected router: Router, protected store: Store) { + constructor() { + this.router = inject(Router); + this.store = inject(Store); this.store.select(selectCurrentUser).subscribe(user => this.user = user); } @@ -47,9 +51,9 @@ export class WebappInterceptor implements HttpInterceptor { this.store.dispatch(setCurrentUser({user: null, terms_of_use: null})); this.router.navigate(['login'], {queryParams: {redirect: redirectUrl}, replaceUrl: true}); } - return throwError(err); + return throwError(() => err); } else { - return throwError(err); + return throwError(() => err); } } } diff --git a/src/app/webapp-common/core/reducers/common-auth-reducer.ts b/src/app/webapp-common/core/reducers/common-auth-reducer.ts index 63c8a2f4..c0e8242f 100755 --- a/src/app/webapp-common/core/reducers/common-auth-reducer.ts +++ b/src/app/webapp-common/core/reducers/common-auth-reducer.ts @@ -149,5 +149,9 @@ export const commonAuthReducer = [ credentials: {[action.credentials[0]?.company || action.workspace]: action.credentials, ...action.extra}, revokeSucceed: false })), on(setSignedUrl, (state, action) => ({...state, signedUrls: {...state.signedUrls, [action.url]: {signed: action.signed, expires: action.expires}}})), - on(removeSignedUrl, (state, action) => ({...state, signedUrls: {...state.signedUrls, [action.url]: null}})), + on(removeSignedUrl, (state, action) => { + // eslint-disable-next-line @typescript-eslint/no-unused-vars + const {[action.url]: remove, ...rest} = state.signedUrls; + return {...state, signedUrls: rest}; + }), ] as ReducerTypes[]; diff --git a/src/app/webapp-common/core/reducers/projects.reducer.ts b/src/app/webapp-common/core/reducers/projects.reducer.ts index 325922a1..8f49eed0 100755 --- a/src/app/webapp-common/core/reducers/projects.reducer.ts +++ b/src/app/webapp-common/core/reducers/projects.reducer.ts @@ -178,6 +178,7 @@ export const projectsReducer = createReducer( companyTags: action.tags, systemTags: action.systemTags })), + on(projectsActions.addCompanyTag, (state, action): RootProjects => ({...state, companyTags: Array.from(new Set(state.companyTags.concat(action.tag))).sort()})), on(projectsActions.addProjectTags, (state, action): RootProjects => ({ ...state, projectTags: Array.from(new Set(state.projectTags.concat(action.tags))).sort() diff --git a/src/app/webapp-common/core/reducers/users-reducer.ts b/src/app/webapp-common/core/reducers/users-reducer.ts index 31a2f79a..c8244fb7 100755 --- a/src/app/webapp-common/core/reducers/users-reducer.ts +++ b/src/app/webapp-common/core/reducers/users-reducer.ts @@ -39,16 +39,24 @@ export const initUsers: UsersState = { }; export const users = state => state.users as UsersState; -export const selectSettings = createSelector(users, (state): any => state?.settings); +export const selectSettings = createSelector(users, (state) => state?.settings); export const selectMaxDownloadItems = createSelector(selectSettings, (state): number => state?.max_download_items ?? 1000); export const selectCurrentUser = createSelector(users, state => state.currentUser); export const selectActiveWorkspace = createSelector(users, state => state.activeWorkspace); +export const selectActiveWorkspaceTier = createSelector(selectActiveWorkspace, workspace => workspace?.tier); export const selectUserWorkspaces = createSelector(users, state => state.userWorkspaces); export const selectSelectedWorkspaceTab = createSelector(users, state => state.selectedWorkspaceTab); export const selectWorkspaces = createSelector(users, state => state.workspaces); export const selectShowOnlyUserWork = createSelector(users, state => state.showOnlyUserWork); export const selectServerVersions = createSelector(users, state => state.serverVersions); export const selectGettingStarted = createSelector(users, state => state.gettingStarted); +export const selectWorkspaceOwner = createSelector(selectActiveWorkspace, selectUserWorkspaces, (active, workspaces) => { + if (workspaces && active) { + const activeWs = workspaces.find(ws => ws.id === active.id); + return activeWs?.owners?.[0]?.name || ''; + } + return null; +}); export const usersReducerFunctions = [ on(fetchCurrentUser, state => ({...state})), diff --git a/src/app/webapp-common/dashboard-search/dashboard-search.actions.ts b/src/app/webapp-common/dashboard-search/dashboard-search.actions.ts index a2f1ec4e..97f1fda6 100644 --- a/src/app/webapp-common/dashboard-search/dashboard-search.actions.ts +++ b/src/app/webapp-common/dashboard-search/dashboard-search.actions.ts @@ -15,7 +15,7 @@ export const searchSetTerm = createAction( export const searchStart = createAction( SEARCH_PREFIX + 'SEARCH_START', - props<{ query: string; regExp?: boolean; force?: boolean; activeLink: ActiveSearchLink }>() + props<{ query: string; regExp?: boolean }>() ); export const searchClear = createAction(SEARCH_PREFIX + 'SEARCH_CLEAR'); diff --git a/src/app/webapp-common/dashboard-search/dashboard-search.effects.ts b/src/app/webapp-common/dashboard-search/dashboard-search.effects.ts index 33e731bd..cd7247b1 100644 --- a/src/app/webapp-common/dashboard-search/dashboard-search.effects.ts +++ b/src/app/webapp-common/dashboard-search/dashboard-search.effects.ts @@ -1,5 +1,5 @@ import {Injectable} from '@angular/core'; -import {Actions, createEffect, ofType} from '@ngrx/effects'; +import {Actions, concatLatestFrom, createEffect, ofType} from '@ngrx/effects'; import {activeLoader, deactivateLoader} from '../core/actions/layout.actions'; import { getCurrentPageResults, @@ -26,7 +26,7 @@ import {selectActiveSearch, selectSearchScrollIds, selectSearchTerm} from './das import {ProjectsGetAllExRequest} from '~/business-logic/model/projects/projectsGetAllExRequest'; import {ApiTasksService} from '~/business-logic/api-services/tasks.service'; import {ApiModelsService} from '~/business-logic/api-services/models.service'; -import {catchError, mergeMap, map, switchMap, withLatestFrom} from 'rxjs/operators'; +import {catchError, mergeMap, map, switchMap} from 'rxjs/operators'; import {isEqual} from 'lodash-es'; import {activeSearchLink} from '~/features/dashboard-search/dashboard-search.consts'; import {emptyAction} from '~/app.constants'; @@ -35,6 +35,7 @@ import {selectCurrentUser, selectShowOnlyUserWork} from '@common/core/reducers/u import {selectHideExamples, selectShowHidden} from '@common/core/reducers/projects.reducer'; import {ApiReportsService} from '~/business-logic/api-services/reports.service'; import {Report} from '~/business-logic/model/reports/report'; +import {excludedKey} from '@common/shared/utils/tableParamEncode'; export const getEntityStatQuery = (action, searchHidden) => ({ /* eslint-disable @typescript-eslint/naming-convention */ @@ -52,7 +53,7 @@ export const getEntityStatQuery = (action, searchHidden) => ({ fields: ['name', 'id'] }, search_hidden: searchHidden, - type: ['__$not', 'annotation_manual', '__$not', 'annotation', '__$not', 'dataset_import'], + type: [excludedKey, 'annotation_manual', excludedKey, 'annotation', excludedKey, 'dataset_import'], system_tags: ['-archived', '-pipeline', '-dataset'], }, models: { @@ -92,6 +93,9 @@ export const getEntityStatQuery = (action, searchHidden) => ({ /* eslint-enable @typescript-eslint/naming-convention */ }); +export const orderBy = ['-last_update']; + + @Injectable() export class DashboardSearchEffects { constructor( @@ -100,7 +104,7 @@ export class DashboardSearchEffects { public modelsApi: ApiModelsService, public experimentsApi: ApiTasksService, public reportsApi: ApiReportsService, - private store: Store + private store: Store ) { } @@ -111,29 +115,26 @@ export class DashboardSearchEffects { startSearch = createEffect(() => this.actions.pipe( ofType(searchStart), - withLatestFrom( + concatLatestFrom(() => [ this.store.select(selectActiveSearch), this.store.select(selectSearchTerm) - ), + ]), mergeMap(([action, active, term]) => { const actionsToFire = []; if (!active) { actionsToFire.push(searchClear()); actionsToFire.push(searchActivate()); } - if (!isEqual(term, action)) { - actionsToFire.push(getResultsCount(action)); - actionsToFire.push(searchSetTerm(action)); - } + actionsToFire.push(getResultsCount(term)); return actionsToFire; }) )); getCurrentPageResults = createEffect(() => this.actions.pipe( ofType(getCurrentPageResults), - withLatestFrom( + concatLatestFrom(() => [ this.store.select(selectSearchTerm) - ), + ]), map(([action, term]) => { switch (action.activeLink) { case activeSearchLink.experiments: @@ -156,13 +157,13 @@ export class DashboardSearchEffects { searchProjects = createEffect(() => this.actions.pipe( ofType(searchProjects), - withLatestFrom( + concatLatestFrom(() => [ this.store.select(selectSearchScrollIds), this.store.select(selectShowOnlyUserWork), this.store.select(selectCurrentUser), this.store.select(selectHideExamples), this.store.select(selectShowHidden), - ), + ]), switchMap(([action, scrollIds, userFocus, user, hideExamples, showHidden]) => this.projectsApi.projectsGetAllEx({ _any_: { ...(action.query && {pattern: action.regExp ? action.query : escapeRegex(action.query)}), @@ -178,7 +179,8 @@ export class DashboardSearchEffects { ...(userFocus && {active_users: [user.id]}), ...(hideExamples && {allow_public: false}), include_stats: true, - only_fields: ['name', 'company', 'user', 'created', 'default_output_destination', 'basename'] + only_fields: ['name', 'company', 'user', 'created', 'default_output_destination', 'basename'], + order_by: orderBy, /* eslint-enable @typescript-eslint/naming-convention */ }).pipe( mergeMap(res => [setProjectsResults({ @@ -190,12 +192,12 @@ export class DashboardSearchEffects { searchPipelines = createEffect(() => this.actions.pipe( ofType(searchPipelines), - withLatestFrom( + concatLatestFrom(() => [ this.store.select(selectSearchScrollIds), this.store.select(selectShowOnlyUserWork), this.store.select(selectCurrentUser), this.store.select(selectHideExamples), - ), + ]), switchMap(([action, scrollIds, userFocus, user, hideExamples]) => this.projectsApi.projectsGetAllEx({ _any_: { ...(action.query && {pattern: action.regExp ? action.query : escapeRegex(action.query)}), @@ -211,7 +213,8 @@ export class DashboardSearchEffects { size: SEARCH_PAGE_SIZE, ...(userFocus && {active_users: [user.id]}), include_stats: true, - only_fields: ['name', 'company', 'user', 'created', 'default_output_destination', 'tags', 'system_tags', 'basename'] + only_fields: ['name', 'company', 'user', 'created', 'default_output_destination', 'tags', 'system_tags', 'basename'], + order_by: orderBy, /* eslint-enable @typescript-eslint/naming-convention */ }).pipe( mergeMap(res => [setPipelinesResults({ @@ -223,12 +226,12 @@ export class DashboardSearchEffects { searchOpenDatasets = createEffect(() => this.actions.pipe( ofType(searchOpenDatasets), - withLatestFrom( + concatLatestFrom(() => [ this.store.select(selectSearchScrollIds), this.store.select(selectShowOnlyUserWork), this.store.select(selectCurrentUser), this.store.select(selectHideExamples), - ), + ]), switchMap(([action, scrollIds, userFocus, user, hideExamples]) => this.projectsApi.projectsGetAllEx({ /* eslint-disable @typescript-eslint/naming-convention */ _any_: { @@ -247,7 +250,8 @@ export class DashboardSearchEffects { include_dataset_stats: true, stats_with_children: false, include_stats: true, - only_fields: ['name', 'company', 'user', 'created', 'default_output_destination', 'tags', 'system_tags', 'basename'] + only_fields: ['name', 'company', 'user', 'created', 'default_output_destination', 'tags', 'system_tags', 'basename'], + order_by: orderBy, /* eslint-enable @typescript-eslint/naming-convention */ }).pipe( mergeMap(res => [setOpenDatasetsResults({ @@ -260,12 +264,12 @@ export class DashboardSearchEffects { searchModels = createEffect(() => this.actions.pipe( ofType(searchModels), - withLatestFrom( + concatLatestFrom(() => [ this.store.select(selectSearchScrollIds), this.store.select(selectShowOnlyUserWork), this.store.select(selectCurrentUser), this.store.select(selectHideExamples), - ), + ]), switchMap(([action, scrollIds, userFocus, user, hideExamples]) => this.modelsApi.modelsGetAllEx({ /* eslint-disable @typescript-eslint/naming-convention */ _any_: { @@ -278,7 +282,8 @@ export class DashboardSearchEffects { ...(hideExamples && {allow_public: false}), system_tags: ['-archived'], include_stats: true, - only_fields: ['ready', 'created', 'framework', 'user.name', 'name', 'parent.name', 'task.name', 'id', 'company'] + only_fields: ['ready', 'created', 'framework', 'user.name', 'name', 'parent.name', 'task.name', 'id', 'company'], + order_by: orderBy, /* eslint-enable @typescript-eslint/naming-convention */ }).pipe( mergeMap(res => [setModelsResults({models: res.models, scrollId: res.scroll_id}), deactivateLoader(action.type)]), @@ -287,13 +292,13 @@ export class DashboardSearchEffects { searchExperiments = createEffect(() => this.actions.pipe( ofType(searchExperiments), - withLatestFrom( + concatLatestFrom(() => [ this.store.select(selectSearchScrollIds), this.store.select(selectShowOnlyUserWork), this.store.select(selectCurrentUser), this.store.select(selectHideExamples), this.store.select(selectShowHidden), - ), + ]), switchMap(([action, scrollIds, userFocus, user, hideExamples, showHidden]) => this.experimentsApi.tasksGetAllEx({ /* eslint-disable @typescript-eslint/naming-convention */ _any_: { @@ -305,7 +310,8 @@ export class DashboardSearchEffects { ...(userFocus && {user: [user.id]}), ...(hideExamples && {allow_public: false}), only_fields: EXPERIMENT_SEARCH_ONLY_FIELDS, - type: ['__$not', 'annotation_manual', '__$not', 'annotation', '__$not', 'dataset_import'], + order_by: orderBy, + type: [excludedKey, 'annotation_manual', excludedKey, 'annotation', excludedKey, 'dataset_import'], system_tags: ['-archived', '-pipeline', '-dataset'], search_hidden: showHidden, /* eslint-enable @typescript-eslint/naming-convention */ @@ -319,12 +325,12 @@ export class DashboardSearchEffects { searchReports = createEffect(() => this.actions.pipe( ofType(searchReports), - withLatestFrom( + concatLatestFrom(() => [ this.store.select(selectSearchScrollIds), this.store.select(selectShowOnlyUserWork), this.store.select(selectCurrentUser), this.store.select(selectHideExamples), - ), + ]), switchMap(([action, scrollIds, userFocus, user, hideExamples]) => this.reportsApi.reportsGetAllEx({ _any_: { ...(action.query && {pattern: action.regExp ? action.query : escapeRegex(action.query)}), @@ -337,6 +343,7 @@ export class DashboardSearchEffects { ...(userFocus && {user: [user.id]}), system_tags: ['-archived'], only_fields: ['name', 'comment', 'company', 'tags', 'report', 'project.name', 'user.name', 'status', 'last_update', 'system_tags'] as (keyof Report)[], + order_by: orderBy, }).pipe( mergeMap(res => [setReportsResults({ reports: res.tasks, diff --git a/src/app/webapp-common/dashboard/common-dashboard.effects.ts b/src/app/webapp-common/dashboard/common-dashboard.effects.ts index c0ce79c9..e48d312c 100755 --- a/src/app/webapp-common/dashboard/common-dashboard.effects.ts +++ b/src/app/webapp-common/dashboard/common-dashboard.effects.ts @@ -18,6 +18,7 @@ import {Store} from '@ngrx/store'; import {ErrorService} from '../shared/services/error.service'; import {selectCurrentUser, selectShowOnlyUserWork} from '../core/reducers/users-reducer'; import {selectHideExamples, selectShowHidden} from '@common/core/reducers/projects.reducer'; +import {excludedKey} from '@common/shared/utils/tableParamEncode'; @Injectable() export class CommonDashboardEffects { @@ -72,7 +73,7 @@ export class CommonDashboardEffects { page_size: 5, order_by: ['-last_update'], status: ['published', 'closed', 'failed', 'stopped', 'in_progress', 'completed'], - type: ['__$not', 'annotation_manual', '__$not', 'annotation', '__$not', 'dataset_import'], + type: [excludedKey, 'annotation_manual', excludedKey, 'annotation', excludedKey, 'dataset_import'], only_fields: ['type', 'status', 'created', 'name', 'id', 'last_update', 'started', 'project.name'], system_tags: ['-archived', '-pipeline'], user: showOnlyUserWork ? [user.id] : null, diff --git a/src/app/webapp-common/dashboard/common-dashboard.reducer.ts b/src/app/webapp-common/dashboard/common-dashboard.reducer.ts index b0a81366..f2aeaf36 100755 --- a/src/app/webapp-common/dashboard/common-dashboard.reducer.ts +++ b/src/app/webapp-common/dashboard/common-dashboard.reducer.ts @@ -5,7 +5,7 @@ import {User} from '~/business-logic/model/users/user'; import {setRecentExperiments, setRecentProjects} from './common-dashboard.actions'; export interface IRecentTask { - id?: Task['id']; + id: Task['id']; name?: Task['name']; user?: User; type?: Task['type']; diff --git a/src/app/webapp-common/dashboard/dashboard-search.component.base.ts b/src/app/webapp-common/dashboard/dashboard-search.component.base.ts index cdf30274..eadf8f29 100644 --- a/src/app/webapp-common/dashboard/dashboard-search.component.base.ts +++ b/src/app/webapp-common/dashboard/dashboard-search.component.base.ts @@ -1,7 +1,7 @@ import {initSearch, resetSearch} from '../common-search/common-search.actions'; -import {filter, skip} from 'rxjs/operators'; +import {distinctUntilChanged, distinctUntilKeyChanged, filter} from 'rxjs/operators'; import {Model} from '~/business-logic/model/models/model'; -import {clearSearchResults, getCurrentPageResults, searchClear, searchDeactivate, searchStart} from '../dashboard-search/dashboard-search.actions'; +import {clearSearchResults, getCurrentPageResults, searchClear, searchDeactivate, searchSetTerm, searchStart} from '../dashboard-search/dashboard-search.actions'; import {IRecentTask} from './common-dashboard.reducer'; import {ITask} from '~/business-logic/model/al-task'; import {combineLatest, Observable, Subscription} from 'rxjs'; @@ -23,10 +23,11 @@ import {Project} from '~/business-logic/model/projects/project'; import {setSelectedProjectId} from '../core/actions/projects.actions'; import {isExample} from '../shared/utils/shared-utils'; import {activeLinksList, ActiveSearchLink, activeSearchLink} from '~/features/dashboard-search/dashboard-search.consts'; -import {Component, OnDestroy, OnInit} from '@angular/core'; -import {Router} from '@angular/router'; +import {ChangeDetectorRef, Component, inject, OnDestroy, OnInit} from '@angular/core'; +import {ActivatedRoute, Router} from '@angular/router'; import { selectShowOnlyUserWork } from '@common/core/reducers/users-reducer'; import {IReport} from '@common/reports/reports.consts'; +import {isEqual} from "lodash-es"; @Component({ selector: 'sm-dashboard-search-base', @@ -36,7 +37,7 @@ import {IReport} from '@common/reports/reports.consts'; (experimentSelected)="taskSelected($event)" (modelSelected)="modelSelected($event)" (pipelineSelected)="pipelineSelected($event)" - (activeLinkChanged)="activeLinkChanged($event)" + (activeLinkChanged)="changeActiveLink($event)" (reportSelected)="reportSelected($event)" (openDatasetSelected)="openDatasetCardClicked($event)" (loadMoreClicked)="loadMore()" @@ -53,7 +54,6 @@ import {IReport} from '@common/reports/reports.consts'; export class DashboardSearchBaseComponent implements OnInit, OnDestroy{ public activeLink = 'projects' as ActiveSearchLink; private searchSubs; - private allResultsSubscription: Subscription; public searchQuery$: Observable; public activeSearch$: Observable; public modelsResults$: Observable>; @@ -65,32 +65,54 @@ export class DashboardSearchBaseComponent implements OnInit, OnDestroy{ private scrollIds: Map; public resultsCount$: Observable>; public reportsResults$: Observable>; - - constructor(public store: Store, public router: Router){ - this.searchQuery$ = store.select(selectSearchQuery); - this.activeSearch$ = store.select(selectActiveSearch); - this.modelsResults$ = store.select(selectModelsResults); - this.reportsResults$ = store.select(selectReportsResults); - this.pipelinesResults$ = store.select(selectPipelinesResults); - this.datasetsResults$ = store.select(selectDatasetsResults); - this.projectsResults$ = store.select(selectProjectsResults); - this.experimentsResults$ = store.select(selectExperimentsResults); - this.searchTerm$ = store.select(selectSearchTerm); - this.resultsCount$ = store.select(selectResultsCount); + public store = inject(Store); + public router = inject(Router); + public route = inject(ActivatedRoute); + private subs = new Subscription(); + private cdr: ChangeDetectorRef; + constructor() { + this.cdr = inject(ChangeDetectorRef); + this.searchQuery$ = this.store.select(selectSearchQuery); + this.activeSearch$ = this.store.select(selectActiveSearch); + this.modelsResults$ = this.store.select(selectModelsResults); + this.reportsResults$ = this.store.select(selectReportsResults); + this.pipelinesResults$ = this.store.select(selectPipelinesResults); + this.datasetsResults$ = this.store.select(selectDatasetsResults); + this.projectsResults$ = this.store.select(selectProjectsResults); + this.experimentsResults$ = this.store.select(selectExperimentsResults); + this.searchTerm$ = this.store.select(selectSearchTerm); + this.resultsCount$ = this.store.select(selectResultsCount); this.syncAppSearch(); } public ngOnInit(): void { - this.allResultsSubscription = this.resultsCount$.pipe( + this.subs.add(this.resultsCount$.pipe( filter(resultsCount => !!resultsCount), - ).subscribe((resultsCount) => this.setFirstActiveLink(resultsCount)); + distinctUntilChanged() + ).subscribe((resultsCount) => this.setFirstActiveLink(resultsCount))); + + this.subs.add(this.route.queryParams.pipe(distinctUntilKeyChanged('tab')) + .subscribe(params => { + if (params.tab && activeLinksList.find( link => link.name === params.tab)) { + this.activeLink = params.tab; + this.activeLinkChanged(this.activeLink) + this.cdr.markForCheck(); + } + })); + + this.subs.add(this.searchQuery$.pipe( + distinctUntilChanged((previous, current) => isEqual(previous, current))) + .subscribe(query => { + this.store.dispatch(searchSetTerm(query)); + })); } ngOnDestroy(): void { this.store.dispatch(searchClear()); this.searchTermChanged(''); this.stopSyncSearch(); - this.allResultsSubscription.unsubscribe(); + this.subs.unsubscribe(); + this.searchSubs.unsubscribe(); } stopSyncSearch() { @@ -102,10 +124,9 @@ export class DashboardSearchBaseComponent implements OnInit, OnDestroy{ this.store.dispatch(initSearch({payload: 'Search for all'})); this.searchSubs = combineLatest([ - this.searchQuery$, + this.searchTerm$, this.store.select(selectShowOnlyUserWork), ]) - .pipe(skip(1)) .subscribe(([query]) => this.searchTermChanged(query?.query, query?.regExp)); this.searchSubs.add(this.store.select(selectSearchScrollIds).subscribe(scrollIds => this.scrollIds = scrollIds)); @@ -119,7 +140,7 @@ export class DashboardSearchBaseComponent implements OnInit, OnDestroy{ public searchTermChanged(term: string, regExp?: boolean) { if (term && term.length > 0) { - this.store.dispatch(searchStart({query:term, regExp, force: term.length < 3, activeLink: this.activeLink})); + this.store.dispatch(searchStart({query:term, regExp})); } else { this.activeLink = activeSearchLink.projects; this.store.dispatch(searchDeactivate()); @@ -153,7 +174,6 @@ export class DashboardSearchBaseComponent implements OnInit, OnDestroy{ public activeLinkChanged(activeLink) { - this.activeLink = activeLink; if (!this.scrollIds?.[activeLink]) { this.store.dispatch(getCurrentPageResults({activeLink})); } @@ -162,11 +182,13 @@ export class DashboardSearchBaseComponent implements OnInit, OnDestroy{ setFirstActiveLink(resultsCount) { if (resultsCount[this.activeLink] > 0) { - this.activeLinkChanged(this.activeLink); + this.router.navigate([], {queryParams: {tab: this.activeLink}, queryParamsHandling: "merge", replaceUrl: true}) + this.store.dispatch(getCurrentPageResults({activeLink: this.activeLink})); } else { const firstTabIndex = activeLinksList.findIndex(activeLink => resultsCount[activeLink.name] > 0); if (firstTabIndex > -1) { - this.activeLinkChanged(activeLinksList[firstTabIndex].name); + this.router.navigate([], {queryParams: {tab: activeLinksList[firstTabIndex].name}, queryParamsHandling: "merge"}) + this.store.dispatch(getCurrentPageResults({activeLink: activeLinksList[firstTabIndex].name as ActiveSearchLink})); } else { this.store.dispatch(clearSearchResults()); } @@ -176,4 +198,8 @@ export class DashboardSearchBaseComponent implements OnInit, OnDestroy{ loadMore() { this.store.dispatch(getCurrentPageResults({activeLink: this.activeLink})); } + + changeActiveLink(tab: string) { + this.router.navigate([], {queryParams: {tab}, queryParamsHandling: "merge"}) + } } diff --git a/src/app/webapp-common/dataset-version/dataset-version-step/dataset-version-step.component.scss b/src/app/webapp-common/dataset-version/dataset-version-step/dataset-version-step.component.scss index ffaefdaf..8269c2da 100644 --- a/src/app/webapp-common/dataset-version/dataset-version-step/dataset-version-step.component.scss +++ b/src/app/webapp-common/dataset-version/dataset-version-step/dataset-version-step.component.scss @@ -1,4 +1,4 @@ -@import "src/app/webapp-common/shared/ui-components/styles/variables"; +@import "variables"; :host { flex: 0 0 220px; diff --git a/src/app/webapp-common/dataset-version/dataset-version-step/dataset-version-step.component.ts b/src/app/webapp-common/dataset-version/dataset-version-step/dataset-version-step.component.ts index 63bc3a9d..39d41030 100644 --- a/src/app/webapp-common/dataset-version/dataset-version-step/dataset-version-step.component.ts +++ b/src/app/webapp-common/dataset-version/dataset-version-step/dataset-version-step.component.ts @@ -1,14 +1,43 @@ -import { Component} from '@angular/core'; -import { - PipelineControllerStepComponent -} from '@common/pipelines-controller/pipeline-controller-step/pipeline-controller-step.component'; -import { fileSizeConfigStorage } from '@common/shared/pipes/filesize.pipe'; +import {ChangeDetectorRef, Component, EventEmitter, Input, Output} from '@angular/core'; +import {DagModelItem} from '@ngneat/dag'; +import {StepStatusEnum} from '@common/pipelines-controller/pipeline-controller-info/pipeline-controller-info.component'; +import {fileSizeConfigStorage} from '@common/shared/pipes/filesize.pipe'; + +export interface TreeVersion { + name: string; + version: string; + job_id: string; + status: StepStatusEnum, + last_update: number, + parents: string[], + job_size: number +} + +export interface VersionItem extends DagModelItem { + name: string; + id: string; + data: TreeVersion; +} @Component({ selector: 'sm-dataset-version-step', templateUrl: './dataset-version-step.component.html', styleUrls: ['../../pipelines-controller/pipeline-controller-step/pipeline-controller-step.component.scss', './dataset-version-step.component.scss'] }) -export class DatasetVersionStepComponent extends PipelineControllerStepComponent{ - fileSizeConfigStorage = fileSizeConfigStorage; +export class DatasetVersionStepComponent { + protected _step: VersionItem; + protected readonly fileSizeConfigStorage = fileSizeConfigStorage; + + constructor(private cdr: ChangeDetectorRef) { } + + @Input() set step(step: VersionItem) { + this._step = {...step, data: {...step.data, status: step.data?.status || StepStatusEnum.pending}}; + } + + get step() { + return this._step; + } + @Input() selected: boolean; + @Output() openConsole = new EventEmitter(); + } diff --git a/src/app/webapp-common/dataset-version/simple-dataset-version-content/simple-dataset-version-content.component.html b/src/app/webapp-common/dataset-version/simple-dataset-version-content/simple-dataset-version-content.component.html index 9a0077eb..827f1f74 100644 --- a/src/app/webapp-common/dataset-version/simple-dataset-version-content/simple-dataset-version-content.component.html +++ b/src/app/webapp-common/dataset-version/simple-dataset-version-content/simple-dataset-version-content.component.html @@ -6,14 +6,15 @@ [action]="'leave'" (smHesitate)="menu.closed.emit();" > -

{{command}}

-
+

{{command}}

+
+
Copy command
+ >Copy command
@@ -23,30 +24,32 @@ [delay]="1000" [action]="'leave'" (smHesitate)="menuHesitate.hesitateStatus && menu.closed.emit()" > - + - + [scrollable]="true" + [resizableColumns]="true" + (columnResized)="resizeCol($event)" +> -
- - {{row[0]}} +
+ + {{line.name}} -
{{row[col.id]}}
+
{{line[col.id]}}
diff --git a/src/app/webapp-common/dataset-version/simple-dataset-version-content/simple-dataset-version-content.component.scss b/src/app/webapp-common/dataset-version/simple-dataset-version-content/simple-dataset-version-content.component.scss index dfb7c810..e235884b 100644 --- a/src/app/webapp-common/dataset-version/simple-dataset-version-content/simple-dataset-version-content.component.scss +++ b/src/app/webapp-common/dataset-version/simple-dataset-version-content/simple-dataset-version-content.component.scss @@ -1,4 +1,5 @@ -@import 'src/app/webapp-common/shared/ui-components/styles/variables'; +@import 'variables'; +@import "../../../webapp-common/assets/fonts/variables.scss"; :host { display: block; @@ -25,7 +26,7 @@ [filetype]::before { content: "\e9d3"; // fallback icon (file) color: #596c71; - font-family: 'trains'; + font-family: #{$icomoon-font-family}; font-size: 24px; margin-right: 12px; vertical-align: middle; diff --git a/src/app/webapp-common/dataset-version/simple-dataset-version-content/simple-dataset-version-content.component.ts b/src/app/webapp-common/dataset-version/simple-dataset-version-content/simple-dataset-version-content.component.ts index c9ae511b..312c6d53 100644 --- a/src/app/webapp-common/dataset-version/simple-dataset-version-content/simple-dataset-version-content.component.ts +++ b/src/app/webapp-common/dataset-version/simple-dataset-version-content/simple-dataset-version-content.component.ts @@ -1,8 +1,17 @@ -import {ChangeDetectionStrategy, Component, Input, ViewChild} from '@angular/core'; +import {ChangeDetectionStrategy, Component, ElementRef, Input, ViewChild} from '@angular/core'; import {MatMenuTrigger} from '@angular/material/menu'; import {ISmCol} from '@common/shared/ui-components/data/table/table.consts'; import {fileSizeConfigStorage, FileSizePipe} from '@common/shared/pipes/filesize.pipe'; + +const columnIds = ['name', 'size', 'hash']; + +type Row = { [K in typeof columnIds[number]]: string } + +interface RowData extends Row { + id: string +} + @Component({ selector: 'sm-simple-dataset-version-content', templateUrl: './simple-dataset-version-content.component.html', @@ -11,12 +20,13 @@ import {fileSizeConfigStorage, FileSizePipe} from '@common/shared/pipes/filesize }) export class SimpleDatasetVersionContentComponent { public columns: ISmCol[]; - public tableData: string[][]; + public tableData: RowData[]; public command: string; private ngFile = new FileSizePipe(); @ViewChild(MatMenuTrigger) trigger: MatMenuTrigger; copySuccess: boolean; + private colSizes = {} as { [colId: string]: number }; @Input() set id(id: string) { this.command = `clearml-data get --id ${id}`; @@ -24,21 +34,43 @@ export class SimpleDatasetVersionContentComponent { } @Input() set data(csv: string) { - const lines = csv?.split('\n') ?? []; + const lines = csv?.trimEnd().split('\n') ?? []; const header = lines.splice(0, 1)[0] ?? ''; - this.columns = header.split(/, ?/).map((caption, index) => ({ - id: `${index}`, - header: caption, - style: {width: index === 1 ? '5px' : '300px'} - })); - const tableData = lines.map(line => line.split(/, ?/)); - if (Number(tableData[0]?.[1]) && this.columns[1]?.header?.includes('ize')) { - tableData.forEach( line => line[1] = this.ngFile.transform(parseInt(line[1], 10) || 0, fileSizeConfigStorage) as string); + const colWidth = (this.ref.nativeElement.getBoundingClientRect().width - 150) / 2 ?? 300; + this.columns = header.split(/, ?/) + .map((caption, index) => { + const width = this.colSizes?.[columnIds[index]] ? `${this.colSizes[columnIds[index]]}px` : null; + return { + id: columnIds[index], + header: caption, + style: index === 1 ? + {width: width ?? '150px'} : + { + // maxWidth: width ?? `${colWidth}px`, + width: width ?? `${colWidth}px`, + } + }; + }); + const tableData = lines.map((line, index) => ({ + ...line.split(/, ?/).reduce((acc, val, i) => { + acc[columnIds[i]] = val; + return acc; + }, {} as Row), + id: `${index}` + } as RowData)); + if (Number(tableData[0]?.size) && this.columns[1]?.header?.includes('ize')) { + this.tableData = tableData.map( line => ({ + ...line, + size: this.ngFile.transform(parseInt(line.size, 10) || 0, fileSizeConfigStorage) as string + })); + } else { + this.tableData = tableData; } - this.tableData = tableData; } + constructor(private readonly ref: ElementRef){} + openMenu() { this.trigger.openMenu(); } @@ -47,4 +79,9 @@ export class SimpleDatasetVersionContentComponent { this.copySuccess = true; window.setTimeout(() => this.copySuccess = false, 3000); } + + resizeCol({columnId, widthPx}: {columnId: string, widthPx: number}) { + this.colSizes[columnId] = widthPx; + this.columns = this.columns.map(col => col.id === columnId ? {...col, style: {width: widthPx + 'px'}} : col); + } } diff --git a/src/app/webapp-common/dataset-version/simple-dataset-version-details/simple-dataset-version-details.component.html b/src/app/webapp-common/dataset-version/simple-dataset-version-details/simple-dataset-version-details.component.html index 4604ebdd..3ba0082f 100644 --- a/src/app/webapp-common/dataset-version/simple-dataset-version-details/simple-dataset-version-details.component.html +++ b/src/app/webapp-common/dataset-version/simple-dataset-version-details/simple-dataset-version-details.component.html @@ -77,7 +77,7 @@
-
DESCRIPTION
+
DESCRIPTION
{{entity?.comment}}
diff --git a/src/app/webapp-common/dataset-version/simple-dataset-version-details/simple-dataset-version-details.component.ts b/src/app/webapp-common/dataset-version/simple-dataset-version-details/simple-dataset-version-details.component.ts index c04cffd8..af33fd79 100644 --- a/src/app/webapp-common/dataset-version/simple-dataset-version-details/simple-dataset-version-details.component.ts +++ b/src/app/webapp-common/dataset-version/simple-dataset-version-details/simple-dataset-version-details.component.ts @@ -2,7 +2,7 @@ import {Component, EventEmitter, Output} from '@angular/core'; import {PipelineInfoComponent} from '@common/pipelines-controller/pipeline-details/pipeline-info.component'; import { fileSizeConfigStorage } from '@common/shared/pipes/filesize.pipe'; import {DATASETS_STATUS_LABEL, EXPERIMENTS_STATUS_LABELS} from '~/features/experiments/shared/experiments.const'; -import {Task} from '~/business-logic/model/tasks/task'; +import {IExperimentInfo} from '~/features/experiments/shared/experiment-info.model'; @Component({ selector: 'sm-simple-dataset-version-details', @@ -10,10 +10,10 @@ import {Task} from '~/business-logic/model/tasks/task'; styleUrls: ['./simple-dataset-version-details.component.scss', '../../pipelines-controller/pipeline-details/pipeline-info.component.scss'] }) export class SimpleDatasetVersionDetailsComponent extends PipelineInfoComponent { - public fileSizeConfigStorage = fileSizeConfigStorage; + public override fileSizeConfigStorage = fileSizeConfigStorage; public convertStatusMap = DATASETS_STATUS_LABEL; public convertStatusMapBase = EXPERIMENTS_STATUS_LABELS; - @Output() editDescription = new EventEmitter(); + @Output() editDescription = new EventEmitter(); } diff --git a/src/app/webapp-common/dataset-version/simple-dataset-version-info/simple-dataset-version-info.component.ts b/src/app/webapp-common/dataset-version/simple-dataset-version-info/simple-dataset-version-info.component.ts index 53f7a226..3f377a3f 100644 --- a/src/app/webapp-common/dataset-version/simple-dataset-version-info/simple-dataset-version-info.component.ts +++ b/src/app/webapp-common/dataset-version/simple-dataset-version-info/simple-dataset-version-info.component.ts @@ -1,14 +1,14 @@ -import {ChangeDetectorRef, Component, NgZone} from '@angular/core'; +import {Component} from '@angular/core'; import {PipelineControllerInfoComponent, PipelineItem, StatusOption} from '@common/pipelines-controller/pipeline-controller-info/pipeline-controller-info.component'; import {DagManagerUnsortedService} from '@common/shared/services/dag-manager-unsorted.service'; import {experimentDetailsUpdated, getSelectedPipelineStep, setSelectedPipelineStep} from '@common/experiments/actions/common-experiments-info.actions'; import {last} from 'lodash-es'; -import {Store} from '@ngrx/store'; import {MatDialog} from '@angular/material/dialog'; import {EditJsonComponent, EditJsonData} from '@common/shared/ui-components/overlay/edit-json/edit-json.component'; -import {Task} from '~/business-logic/model/tasks/task'; import {CommonExperimentsInfoEffects} from '@common/experiments/effects/common-experiments-info.effects'; import {tap} from 'rxjs/operators'; +import {TaskStatusEnum} from '~/business-logic/model/tasks/taskStatusEnum'; +import {IExperimentInfo} from '~/features/experiments/shared/experiment-info.model'; @Component({ selector: 'sm-simple-dataset-version-info', @@ -20,22 +20,17 @@ import {tap} from 'rxjs/operators'; providers: [DagManagerUnsortedService] }) export class SimpleDatasetVersionInfoComponent extends PipelineControllerInfoComponent { - detailsPanelMode = StatusOption.content; - defaultDetailsMode = StatusOption.content; - public maximizeResults: boolean; constructor( - protected _dagManager: DagManagerUnsortedService, - protected store: Store, - protected cdr: ChangeDetectorRef, - protected zone: NgZone, private dialog: MatDialog, private commonExperimentsInfoEffects: CommonExperimentsInfoEffects ) { - super(_dagManager, store, cdr, zone); + super(); + this.detailsPanelMode = StatusOption.content; + this.defaultDetailsMode = StatusOption.content; } - convertPipelineToDagModel(pipeline): PipelineItem[] { + override convertPipelineToDagModel(pipeline): PipelineItem[] { const res = super.convertPipelineToDagModel(pipeline); if (res?.length > 0) { window.setTimeout(() => this.selectStep(last(res)), 1000); @@ -45,15 +40,15 @@ export class SimpleDatasetVersionInfoComponent extends PipelineControllerInfoCom return res; } - getEntityId(params) { + override getEntityId(params) { return params?.versionId; } - protected getTreeObject(task) { + protected override getTreeObject(task) { return task?.configuration?.['Dataset Struct']?.value; } - toggleResultSize() { + override toggleResultSize() { this.maximizeResults = ! this.maximizeResults; if (this.detailsPanelMode === StatusOption.content) { this.detailsPanelMode = null; @@ -64,13 +59,13 @@ export class SimpleDatasetVersionInfoComponent extends PipelineControllerInfoCom } } - selectStep(step?: PipelineItem) { + override selectStep(step?: PipelineItem) { if (step) { const id = step?.data?.job_id; if (id) { this.store.dispatch(getSelectedPipelineStep({id})); } else { - this.store.dispatch(setSelectedPipelineStep({step: {id, type: step.data.job_type, status: step.data.status, name: step.name}})); + this.store.dispatch(setSelectedPipelineStep({step: {id, type: step.data.job_type, status: step.data.status as unknown as TaskStatusEnum, name: step.name}})); this.showLog = false; } this.selectedEntity = step; @@ -82,13 +77,15 @@ export class SimpleDatasetVersionInfoComponent extends PipelineControllerInfoCom this.showLog = !this.showLog; } - protected getPanelMode() { + protected override getPanelMode() { return this.detailsPanelMode; } - protected resetUninitializedRunningFields() {} + protected override resetUninitializedRunningFields() { - editDescription(dataset: Task) { + } + + editDescription(dataset: IExperimentInfo) { const editJsonComponent = this.dialog.open(EditJsonComponent, { data: { textData: dataset.comment, diff --git a/src/app/webapp-common/dataset-version/simple-dataset-versions/simple-dataset-versions.component.html b/src/app/webapp-common/dataset-version/simple-dataset-versions/simple-dataset-versions.component.html index 3f7f20cd..15cb3acd 100644 --- a/src/app/webapp-common/dataset-version/simple-dataset-versions/simple-dataset-versions.component.html +++ b/src/app/webapp-common/dataset-version/simple-dataset-versions/simple-dataset-versions.component.html @@ -45,7 +45,7 @@ selectionMode="single" [initialColumns]="tableCols" [colsOrder]="(tableColsOrder$ | async)" - [tableCols]="tableCols$| async" + [tableCols]="tableCols$ | async" [experiments]="experiments$ | async" [users]="users$ | async" [hyperParamsOptions]="hyperParamsOptions$ | async" @@ -105,14 +105,15 @@ #contextMenu [experiment]="contextExperiment" [selectedExperiment]="selectedExperiment$ | async" - [selectedExperiments]="singleRowContext ? [contextExperiment] : selectedExperiments" + [selectedExperiments]="singleRowContext ? (selectedExperiment$ | async) ? [(selectedExperiment$ | async)] : undefined : selectedExperiments" [selectedDisableAvailableIsMultiple]="!singleRowContext" - [selectedDisableAvailable]="singleRowContext ? getSingleSelectedDisableAvailable(contextExperiment) : (selectedExperimentsDisableAvailable$ | async)" + [selectedDisableAvailable]="singleRowContext ? getSingleSelectedDisableAvailable((selectedExperiment$ | async) || contextExperiment ) : (selectedExperimentsDisableAvailable$ | async)" [numSelected]="singleRowContext ? 1 : selectedExperiments.length" [tagsFilterByProject]="tagsFilterByProject$ | async" [projectTags]="tags$ | async" [companyTags]="companyTags$ | async" [activateFromMenuButton]="false" + [useCurrentEntity]="singleRowContext" [minimizedView]="true" [tableMode]="!minimizedView" [backdrop]="menuBackdrop" diff --git a/src/app/webapp-common/dataset-version/simple-dataset-versions/simple-dataset-versions.component.ts b/src/app/webapp-common/dataset-version/simple-dataset-versions/simple-dataset-versions.component.ts index 4ba67a8d..4b7793de 100644 --- a/src/app/webapp-common/dataset-version/simple-dataset-versions/simple-dataset-versions.component.ts +++ b/src/app/webapp-common/dataset-version/simple-dataset-versions/simple-dataset-versions.component.ts @@ -6,10 +6,6 @@ import {CountAvailableAndIsDisableSelectedFiltered} from '@common/shared/entity- import * as experimentsActions from '@common/experiments/actions/common-experiments-view.actions'; import {INITIAL_CONTROLLER_TABLE_COLS} from '@common/pipelines-controller/controllers.consts'; import {EXPERIMENTS_TABLE_COL_FIELDS} from '~/features/experiments/shared/experiments.const'; -import {Store} from '@ngrx/store'; -import {ActivatedRoute, Router} from '@angular/router'; -import {MatDialog} from '@angular/material/dialog'; -import {RefreshService} from '@common/core/services/refresh.service'; import {take, withLatestFrom} from 'rxjs/operators'; import {selectDefaultNestedModeForFeature} from '@common/core/reducers/projects.reducer'; import {setBreadcrumbsOptions} from '@common/core/actions/projects.actions'; @@ -20,26 +16,20 @@ import {setBreadcrumbsOptions} from '@common/core/actions/projects.actions'; styleUrls: ['./simple-dataset-versions.component.scss', '../../pipelines-controller/controllers.component.scss'] }) export class SimpleDatasetVersionsComponent extends ControllersComponent implements OnInit { - entityType = EntityTypeEnum.dataset; - public shouldOpenDetails = true; isArchived: boolean; - protected getParamId(params) { + protected override getParamId(params) { return params?.versionId; } - constructor(protected store: Store, - protected route: ActivatedRoute, - protected router: Router, - protected dialog: MatDialog, - protected refresh: RefreshService - ) { - super(store, route, router, dialog, refresh); + constructor() { + super(); + this.entityType = EntityTypeEnum.dataset; this.tableCols = INITIAL_CONTROLLER_TABLE_COLS.map((col) => col.id === EXPERIMENTS_TABLE_COL_FIELDS.NAME ? {...col, header: 'VERSION NAME'} : col); } - ngOnInit() { + override ngOnInit() { super.ngOnInit(); this.experiments$ .pipe(take(1)) @@ -57,7 +47,7 @@ export class SimpleDatasetVersionsComponent extends ControllersComponent impleme }); } - createFooterItems(config: { + override createFooterItems(config: { entitiesType: EntityTypeEnum; selected$: Observable>; showAllSelectedIsActive$: Observable; @@ -71,10 +61,10 @@ export class SimpleDatasetVersionsComponent extends ControllersComponent impleme this.footerItems.splice(5, 1); } - downloadTableAsCSV() { + override downloadTableAsCSV() { this.table.table.downloadTableAsCSV(`ClearML ${this.selectedProject.id === '*'? 'All': this.selectedProject?.basename?.substring(0,60)} Datasets`); } - setupBreadcrumbsOptions() { + override setupBreadcrumbsOptions() { this.sub.add(this.selectedProject$.pipe( withLatestFrom(this.store.select(selectDefaultNestedModeForFeature)) ).subscribe(([selectedProject, defaultNestedModeForFeature]) => { diff --git a/src/app/webapp-common/datasets/dataset-empty/dataset-empty.component.html b/src/app/webapp-common/datasets/dataset-empty/dataset-empty.component.html index 843e2350..9236c2c6 100644 --- a/src/app/webapp-common/datasets/dataset-empty/dataset-empty.component.html +++ b/src/app/webapp-common/datasets/dataset-empty/dataset-empty.component.html @@ -1,10 +1,6 @@ - - - -
diff --git a/src/app/webapp-common/datasets/dataset-empty/dataset-empty.component.scss b/src/app/webapp-common/datasets/dataset-empty/dataset-empty.component.scss index 5e3b8df8..7380a036 100644 --- a/src/app/webapp-common/datasets/dataset-empty/dataset-empty.component.scss +++ b/src/app/webapp-common/datasets/dataset-empty/dataset-empty.component.scss @@ -1,3 +1,5 @@ +@import "variables"; + .content { width: 100%; display: flex; @@ -16,8 +18,15 @@ flex: 1; flex-direction: column; - a.dark { - color: white; + a { + color: $purple; + &.dark { + color: white; + } + + &:hover { + text-decoration: underline; + } } sm-code-editor { diff --git a/src/app/webapp-common/datasets/nested-simple-datasets-page/nested-simple-datasets-page.component.html b/src/app/webapp-common/datasets/nested-simple-datasets-page/nested-simple-datasets-page.component.html index 19869802..fea98ecf 100644 --- a/src/app/webapp-common/datasets/nested-simple-datasets-page/nested-simple-datasets-page.component.html +++ b/src/app/webapp-common/datasets/nested-simple-datasets-page/nested-simple-datasets-page.component.html @@ -23,7 +23,7 @@ NEW DATASET -
+
NO DATASETS TO SHOW
Run your first dataset to see it displayed here diff --git a/src/app/webapp-common/datasets/nested-simple-datasets-page/nested-simple-datasets-page.component.ts b/src/app/webapp-common/datasets/nested-simple-datasets-page/nested-simple-datasets-page.component.ts index 6859fb16..6927093b 100644 --- a/src/app/webapp-common/datasets/nested-simple-datasets-page/nested-simple-datasets-page.component.ts +++ b/src/app/webapp-common/datasets/nested-simple-datasets-page/nested-simple-datasets-page.component.ts @@ -19,16 +19,13 @@ import { selectProjectTags } from '@common/core/reducers/projects.reducer'; import {combineLatest, Observable, Subscription} from 'rxjs'; -import {debounceTime, withLatestFrom} from 'rxjs/operators'; +import {debounceTime, skip, withLatestFrom} from 'rxjs/operators'; import {getAllProjectsPageProjects, resetProjects} from '@common/projects/common-projects.actions'; @Component({ selector: 'sm-nested-simple-datasets-page', templateUrl: './nested-simple-datasets-page.component.html', - styleUrls: [ - '../../../webapp-common/nested-project-view/nested-project-view-page/nested-project-view-page.component.scss', - '../../../webapp-common/datasets/simple-datasets/empty.scss' - ], + styleUrls: ['../../../webapp-common/nested-project-view/nested-project-view-page/nested-project-view-page.component.scss'], imports: [ ProjectsSharedModule, SMSharedModule, @@ -45,7 +42,7 @@ export class NestedSimpleDatasetsPageComponent extends CommonProjectsPageCompone projectsTags$: Observable; private mainPageFilterSub: Subscription; - projectCardClicked(data: { hasSubProjects: boolean; id: string; name: string }) { + override projectCardClicked(data: { hasSubProjects: boolean; id: string; name: string }) { if (data.hasSubProjects) { this.router.navigate(['simple', data.id, 'projects'], {relativeTo: this.route.parent?.parent}); } else { @@ -68,11 +65,11 @@ export class NestedSimpleDatasetsPageComponent extends CommonProjectsPageCompone } // eslint-disable-next-line @typescript-eslint/no-unused-vars - protected getExtraProjects(selectedProjectId, selectedProject) { + protected override getExtraProjects(selectedProjectId, selectedProject) { return []; } - ngOnInit() { + override ngOnInit() { super.ngOnInit(); this.projectsTags$ = this.store.select(selectProjectTags); this.store.dispatch(getProjectsTags({entity: 'dataset'})); @@ -80,28 +77,28 @@ export class NestedSimpleDatasetsPageComponent extends CommonProjectsPageCompone this.mainPageFilterSub = combineLatest([ this.store.select(selectMainPageTagsFilter), this.store.select(selectMainPageTagsFilterMatchMode) - ]).pipe(debounceTime(0)) + ]).pipe(debounceTime(0), skip(1)) .subscribe(() => { this.store.dispatch(resetProjects()); this.store.dispatch(getAllProjectsPageProjects()); }); } - noProjectsReRoute() { + override noProjectsReRoute() { return this.router.navigate(['..', 'datasets'], {relativeTo: this.route}); } - shouldReRoute(selectedProject, config) { + override shouldReRoute(selectedProject, config) { const relevantSubProjects = selectedProject?.sub_projects?.filter(proj => proj.name.includes('.datasets')); return config[3] === 'projects' && selectedProject.id !== '*' && (relevantSubProjects?.every(subProject => subProject.name.startsWith(selectedProject.name + '/.'))); - }; + } - ngOnDestroy() { + override ngOnDestroy() { super.ngOnDestroy(); this.mainPageFilterSub.unsubscribe(); this.store.dispatch(setTags({tags: []})); } - setupBreadcrumbsOptions() { + override setupBreadcrumbsOptions() { this.subs.add(this.selectedProject$.pipe( withLatestFrom(this.store.select(selectDefaultNestedModeForFeature)) ).subscribe(([selectedProject, defaultNestedModeForFeature]) => { diff --git a/src/app/webapp-common/datasets/simple-dataset-card/simple-dataset-card.component.html b/src/app/webapp-common/datasets/simple-dataset-card/simple-dataset-card.component.html index e9024496..6d82aaea 100644 --- a/src/app/webapp-common/datasets/simple-dataset-card/simple-dataset-card.component.html +++ b/src/app/webapp-common/datasets/simple-dataset-card/simple-dataset-card.component.html @@ -38,9 +38,14 @@ (delete)="delete.emit()" >
-
Updated {{project.last_update | timeAgo}}
+ Updated {{project.last_update | timeAgo}} -
+
diff --git a/src/app/webapp-common/datasets/simple-datasets/empty.scss b/src/app/webapp-common/datasets/simple-datasets/empty.scss deleted file mode 100644 index 593cecc6..00000000 --- a/src/app/webapp-common/datasets/simple-datasets/empty.scss +++ /dev/null @@ -1,33 +0,0 @@ -@import "variables"; - -.empty-datasets { - width: 100%; - grid-column: 1/-1; - display: flex; - flex-direction: column; - max-width: map-get($grid-max-widths, xl); - margin: 0 auto; - - .title-icon { - color: $blue-600; - text-align: center; - margin-bottom: 24px; - } - .title { - font-size: 20px; - font-weight: 500; - color: $blue-100; - margin-bottom: 6px; - text-align: center; - } - - .sub-title { - text-align: center; - margin-bottom: 64px; - - .link { - color: $neon-yellow; - } - } - -} diff --git a/src/app/webapp-common/datasets/simple-datasets/simple-datasets.component.html b/src/app/webapp-common/datasets/simple-datasets/simple-datasets.component.html index b14fc099..f7e1672e 100644 --- a/src/app/webapp-common/datasets/simple-datasets/simple-datasets.component.html +++ b/src/app/webapp-common/datasets/simple-datasets/simple-datasets.component.html @@ -43,7 +43,7 @@
-
+
NO DATASETS TO SHOW
Run your first dataset to see it displayed here diff --git a/src/app/webapp-common/datasets/simple-datasets/simple-datasets.component.scss b/src/app/webapp-common/datasets/simple-datasets/simple-datasets.component.scss index 2777b31f..c22b27d3 100644 --- a/src/app/webapp-common/datasets/simple-datasets/simple-datasets.component.scss +++ b/src/app/webapp-common/datasets/simple-datasets/simple-datasets.component.scss @@ -1,13 +1,14 @@ @import "variables"; -@import "./empty"; +@import "empty"; :host { - .sm-card-list-layout{ - &.in-empty-state{ + .sm-card-list-layout { + &.in-empty-state { height: 100%; grid-template-rows: 64px 1fr; } } + display: block; height: 100%; overflow-y: scroll; @@ -22,6 +23,5 @@ background-color: $blue-800; margin-bottom: -12px; } + @include empty-card-mixin(); } - - diff --git a/src/app/webapp-common/datasets/simple-datasets/simple-datasets.component.ts b/src/app/webapp-common/datasets/simple-datasets/simple-datasets.component.ts index 72e0b395..0b987c1f 100644 --- a/src/app/webapp-common/datasets/simple-datasets/simple-datasets.component.ts +++ b/src/app/webapp-common/datasets/simple-datasets/simple-datasets.component.ts @@ -20,19 +20,23 @@ import {selectDefaultNestedModeForFeature} from '@common/core/reducers/projects. }) export class SimpleDatasetsComponent extends PipelinesPageComponent implements OnInit { - public projectCardClicked(project: ProjectsGetAllResponseSingle) { + public override projectCardClicked(project: ProjectsGetAllResponseSingle) { this.router.navigate(['simple', project.id, 'experiments'], {relativeTo: this.projectId? this.route.parent.parent: this.route}); this.store.dispatch(setSelectedProjectId({projectId: project.id, example: this.isExample(project)})); } - protected getName() { + protected override getName() { return EntityTypeEnum.simpleDataset; } - protected getDeletePopupEntitiesList() { + protected override getDeletePopupEntitiesList() { return 'version'; } + override noProjectsReRoute() { + return this.router.navigate(['..', 'datasets'], {relativeTo: this.route}); + } + createDataset() { this.dialog.open(DatasetEmptyComponent, { maxWidth: '95vw', @@ -40,14 +44,14 @@ export class SimpleDatasetsComponent extends PipelinesPageComponent implements O }); } - public createExamples() { + public override createExamples() { this.store.dispatch(showExampleDatasets()); } - ngOnInit() { + override ngOnInit() { super.ngOnInit(); this.showExamples$ = this.store.select(selectShowDatasetExamples); } - toggleNestedView(nested: boolean) { + override toggleNestedView(nested: boolean) { this.store.dispatch(setDefaultNestedModeForFeature({feature: 'datasets', isNested: nested})); if (nested) { @@ -57,7 +61,7 @@ export class SimpleDatasetsComponent extends PipelinesPageComponent implements O } } - setupBreadcrumbsOptions() { + override setupBreadcrumbsOptions() { this.subs.add(this.selectedProject$.pipe( withLatestFrom(this.store.select(selectDefaultNestedModeForFeature)) ).subscribe(([selectedProject, defaultNestedModeForFeature]) => { diff --git a/src/app/webapp-common/debug-images/debug-images-actions.ts b/src/app/webapp-common/debug-images/debug-images-actions.ts index 0a7964c3..f592324d 100644 --- a/src/app/webapp-common/debug-images/debug-images-actions.ts +++ b/src/app/webapp-common/debug-images/debug-images-actions.ts @@ -3,64 +3,61 @@ import {Task} from '~/business-logic/model/tasks/task'; import {TaskMetric} from '~/business-logic/model/events/taskMetric'; import {EventsDebugImagesResponse} from '~/business-logic/model/events/eventsDebugImagesResponse'; -export const DEBUG_IMAGES_PREFIX = 'DEBUG_IMAGES_'; +export const DEBUG_IMAGES_PREFIX = '[DEBUG IMAGES] '; -export const resetDebugImages = createAction(DEBUG_IMAGES_PREFIX + 'RESET_DEBUG_IMAGES'); +export const resetDebugImages = createAction(DEBUG_IMAGES_PREFIX + 'reset debug images'); export const setDebugImages = createAction( - DEBUG_IMAGES_PREFIX + 'SET_DEBUG_IMAGES', + DEBUG_IMAGES_PREFIX + 'set debug images', props<{ res: EventsDebugImagesResponse; task: string }>() ); export const getDebugImagesMetrics = createAction( - DEBUG_IMAGES_PREFIX + 'GET_DEBUG_IMAGES_METRICS', + DEBUG_IMAGES_PREFIX + 'get debug images metrics', props<{ tasks: string[] }>() ); export const refreshDebugImagesMetrics = createAction( - DEBUG_IMAGES_PREFIX + 'REFRESH_DEBUG_IMAGES_METRICS', + DEBUG_IMAGES_PREFIX + 'refresh_debug_images_metrics', props<{ tasks: string[]; autoRefresh?: boolean }>() ); export const fetchExperiments = createAction( - DEBUG_IMAGES_PREFIX + 'FETCH_EXPERIMENTS', + DEBUG_IMAGES_PREFIX + 'fetch experiments', props<{ tasks: string[] }>() ); export const setExperimentsNames = createAction( - DEBUG_IMAGES_PREFIX + 'SET_EXPERIMENTS_NAMES', + DEBUG_IMAGES_PREFIX + 'set experiments names', props<{ tasks: Partial[] }>() ); export const setMetrics = createAction( - DEBUG_IMAGES_PREFIX + 'SET_DEBUG_IMAGES_METRICS', + DEBUG_IMAGES_PREFIX + 'set debug images metrics', props<{ metrics: any[] }>() ); export const setSelectedMetric = createAction( - DEBUG_IMAGES_PREFIX + 'SET_DEBUG_IMAGES_SELECTED_METRIC', + DEBUG_IMAGES_PREFIX + 'set debug images selected metric', props<{ payload: TaskMetric }>() ); export const refreshMetric = createAction( - DEBUG_IMAGES_PREFIX + 'REFRESH_IMAGES_SELECTED_METRIC', + DEBUG_IMAGES_PREFIX + 'refresh images selected metric', props<{ payload: TaskMetric; autoRefresh?: boolean }>() ); export const getNextBatch= createAction( - DEBUG_IMAGES_PREFIX + 'GET_NEXT_DEBUG_IMAGES_BATCH', + DEBUG_IMAGES_PREFIX + 'get next debug images batch', props<{ payload: TaskMetric }>() ); export const getPreviousBatch= createAction( - DEBUG_IMAGES_PREFIX + 'GET_PREVIOUS_DEBUG_IMAGES_BATCH', + DEBUG_IMAGES_PREFIX + 'get previous debug images batch', props<{ payload: TaskMetric }>() ); export const setTimeIsNow = createAction( - DEBUG_IMAGES_PREFIX + 'SET_TIME_IS_NOW', + DEBUG_IMAGES_PREFIX + 'set time is now', props<{ task: string; timeIsNow: boolean }>() ); - - - diff --git a/src/app/webapp-common/debug-images/debug-images-effects.ts b/src/app/webapp-common/debug-images/debug-images-effects.ts index 388c484d..5483ae85 100644 --- a/src/app/webapp-common/debug-images/debug-images-effects.ts +++ b/src/app/webapp-common/debug-images/debug-images-effects.ts @@ -1,6 +1,6 @@ import {Injectable} from '@angular/core'; -import {Actions, createEffect, ofType} from '@ngrx/effects'; -import {catchError, mergeMap, map, switchMap, withLatestFrom, filter} from 'rxjs/operators'; +import {Actions, concatLatestFrom, createEffect, ofType} from '@ngrx/effects'; +import {catchError, mergeMap, map, switchMap, filter} from 'rxjs/operators'; import * as debugActions from './debug-images-actions'; import {activeLoader, deactivateLoader} from '../core/actions/layout.actions'; import {ApiTasksService} from '~/business-logic/api-services/tasks.service'; @@ -8,7 +8,7 @@ import {ApiEventsService} from '~/business-logic/api-services/events.service'; import {requestFailed} from '../core/actions/http.actions'; import {refreshExperiments} from '../experiments/actions/common-experiments-view.actions'; import {Action, Store} from '@ngrx/store'; -import {selectDebugImages} from './debug-images-reducer'; +import {selectDebugImages, selectSelectedMetricForTask} from './debug-images-reducer'; import {EventsDebugImagesResponse} from '~/business-logic/model/events/eventsDebugImagesResponse'; import {EventsGetTaskMetricsResponse} from '~/business-logic/model/events/eventsGetTaskMetricsResponse'; import {COMPARE_DEBUG_IMAGES_ONLY_FIELDS} from '../experiments-compare/experiments-compare.constants'; @@ -17,8 +17,10 @@ import {setBeginningOfTime} from '@common/shared/debug-sample/debug-sample.actio export const ALL_IMAGES = '-- All --'; -export const removeAllImagesFromPayload = (payload) => - ({...payload, metric: payload.metric === ALL_IMAGES ? null : payload.metric}); +export const removeAllImagesFromPayload = (payload, selectedMetric?: string ) => { + const metric = selectedMetric ?? payload.metric + return ({...payload, metric: metric === ALL_IMAGES ? null : metric}); +} // interface Image { @@ -40,7 +42,7 @@ export class DebugImagesEffects { constructor( private actions$: Actions, private apiTasks: ApiTasksService, - private eventsApi: ApiEventsService, private store: Store + private eventsApi: ApiEventsService, private store: Store ) { } @@ -53,11 +55,11 @@ export class DebugImagesEffects { fetchDebugImages$ = createEffect(() => this.actions$.pipe( ofType(debugActions.setSelectedMetric, debugActions.getNextBatch, debugActions.getPreviousBatch, debugActions.refreshMetric), - withLatestFrom(this.store.select(selectDebugImages)), - mergeMap(([action, debugImages]) => - this.eventsApi.eventsDebugImages({ + concatLatestFrom(() => [this.store.select(selectDebugImages), this.store.select(selectSelectedMetricForTask)]), + mergeMap(([action, debugImages, selectedMetricForTask ]) => + this.eventsApi.eventsDebugImages({ /* eslint-disable @typescript-eslint/naming-convention */ - metrics: [removeAllImagesFromPayload(action.payload)], + metrics: [removeAllImagesFromPayload(action.payload, selectedMetricForTask[action.payload.task])], iters: 3, scroll_id: (action.type !== debugActions.setSelectedMetric.type && debugImages?.[action.payload.task]) ? debugImages[action.payload.task].scroll_id : @@ -126,9 +128,11 @@ export class DebugImagesEffects { fetchMetrics$ = createEffect(() => this.actions$.pipe( ofType(debugActions.getDebugImagesMetrics, debugActions.refreshDebugImagesMetrics), - switchMap((action) => this.store.select(selectActiveWorkspaceReady).pipe( - filter(ready => ready), - map(() => action))), + switchMap((action) => this.store.select(selectActiveWorkspaceReady) + .pipe( + filter(ready => ready), + map(() => action)) + ), switchMap((action) => this.eventsApi.eventsGetTaskMetrics({ /* eslint-disable @typescript-eslint/naming-convention */ tasks: action.tasks, @@ -136,7 +140,11 @@ export class DebugImagesEffects { /* eslint-enable @typescript-eslint/naming-convention */ }) .pipe( - mergeMap((res: EventsGetTaskMetricsResponse) => [debugActions.setMetrics({metrics: res.metrics}), deactivateLoader(action.type)]), + mergeMap((res: EventsGetTaskMetricsResponse) => [ + debugActions.setMetrics({metrics: res.metrics}), + deactivateLoader(debugActions.getDebugImagesMetrics.type), + deactivateLoader(debugActions.refreshDebugImagesMetrics.type), + ]), catchError(error => [requestFailed(error), deactivateLoader(action.type)]) ) ) diff --git a/src/app/webapp-common/debug-images/debug-images-reducer.ts b/src/app/webapp-common/debug-images/debug-images-reducer.ts index 365c6d65..80c5e211 100644 --- a/src/app/webapp-common/debug-images/debug-images-reducer.ts +++ b/src/app/webapp-common/debug-images/debug-images-reducer.ts @@ -1,5 +1,11 @@ import { - fetchExperiments, getDebugImagesMetrics, resetDebugImages, setDebugImages, setExperimentsNames, setMetrics, setTimeIsNow + fetchExperiments, + getDebugImagesMetrics, + resetDebugImages, + setDebugImages, + setExperimentsNames, + setMetrics, setSelectedMetric, + setTimeIsNow } from './debug-images-actions'; import {Task} from '~/business-logic/model/tasks/task'; import {createFeatureSelector, createReducer, createSelector, on} from '@ngrx/store'; @@ -7,14 +13,14 @@ import {EventsDebugImagesResponse} from '~/business-logic/model/events/eventsDeb export interface IDebugImagesState { - debugImages: {[taskId: string]: EventsDebugImagesResponse}; + debugImages: { [taskId: string]: EventsDebugImagesResponse }; settingsList: Array; tasks: Array>; optionalMetrics: Array; + selectedMetricsForTask: { [taskId: string]: string }; searchTerm: string; scrollId: any; noMore: boolean; - selectedMetric: any; timeIsNow: any; } @@ -37,7 +43,7 @@ export const initialState: IDebugImagesState = { optionalMetrics: [], scrollId: {}, noMore: true, - selectedMetric: null, + selectedMetricsForTask: {}, timeIsNow: {} } ; @@ -47,6 +53,7 @@ export const selectDebugImages = createSelector(debugImages, (state) => state.de export const selectTaskNames = createSelector(debugImages, (state) => state.tasks); export const selectNoMore = createSelector(debugImages, (state) => state.noMore); export const selectOptionalMetrics = createSelector(debugImages, (state) => state.optionalMetrics); +export const selectSelectedMetricForTask = createSelector(debugImages, (state) => state.selectedMetricsForTask); export const selectTimeIsNow = createSelector(debugImages, (state) => state.timeIsNow); @@ -61,8 +68,8 @@ export const debugSamplesReducer = createReducer( on(setDebugImages, (state, action) => ({...state, debugImages: {...state.debugImages, [action.task]: action.res}})), on(setExperimentsNames, (state, action) => ({...state, tasks: action.tasks})), on(setMetrics, (state, action) => ({...state, optionalMetrics: action.metrics})), + on(setSelectedMetric, (state, action) => ({...state, selectedMetricsForTask: {...state.selectedMetricsForTask, [action.payload.task]: action.payload.metric}})), on(getDebugImagesMetrics, state => ({...state, optionalMetrics: initialState.optionalMetrics, debugImages: initialState.debugImages})), - on(setTimeIsNow, (state, action) => ({...state, timeIsNow: {...state.timeIsNow, [action.task]: action.timeIsNow}})), on(fetchExperiments, () => ({...initialState})), // eslint-disable-next-line @typescript-eslint/naming-convention diff --git a/src/app/webapp-common/debug-images/debug-images-types.ts b/src/app/webapp-common/debug-images/debug-images-types.ts new file mode 100644 index 00000000..e6926105 --- /dev/null +++ b/src/app/webapp-common/debug-images/debug-images-types.ts @@ -0,0 +1,26 @@ +export interface DebugSampleEvent { + timestamp: number; + type?: string; + task?: string; + iter?: number; + metric?: string; + variant?: string; + key?: string; + url?: string; + // eslint-disable-next-line @typescript-eslint/naming-convention + '@timestamp'?: string; + worker?: string; + variantAndMetric?: string; +} + +export interface Iteration { + events: DebugSampleEvent[]; + iter: number; +} + +export interface DebugSamples { + metrics: string[]; + metric: string; + scrollId: string; + data: Iteration[]; +} diff --git a/src/app/webapp-common/debug-images/debug-images-view/debug-images-view.component.ts b/src/app/webapp-common/debug-images/debug-images-view/debug-images-view.component.ts index 27c8e283..06c5e9c5 100755 --- a/src/app/webapp-common/debug-images/debug-images-view/debug-images-view.component.ts +++ b/src/app/webapp-common/debug-images/debug-images-view/debug-images-view.component.ts @@ -1,7 +1,7 @@ import {Component, Input, Output} from '@angular/core'; import {EventEmitter} from '@angular/core'; -import {Iteration, Event} from '@common/debug-images/debug-images.component'; import {ThemeEnum} from '@common/constants'; +import {DebugSampleEvent, Iteration} from '@common/debug-images/debug-images-types'; @Component({ selector: 'sm-debug-images-view', @@ -23,9 +23,9 @@ export class DebugImagesViewComponent { @Output() imageClicked = new EventEmitter(); @Output() refreshClicked = new EventEmitter(); @Output() createEmbedCode = new EventEmitter<{metrics?: string[]; variants?: string[]; domRect: DOMRect}>(); - @Output() urlError = new EventEmitter(); + @Output() urlError = new EventEmitter<{ frame: DebugSampleEvent; experimentId: string }>(); - public imageUrlError(data: { frame: Event; experimentId: string }) { + public imageUrlError(data: { frame: DebugSampleEvent; experimentId: string }) { this.urlError.emit(data); } } diff --git a/src/app/webapp-common/debug-images/debug-images.component.html b/src/app/webapp-common/debug-images/debug-images.component.html index 5adce43e..fc361979 100644 --- a/src/app/webapp-common/debug-images/debug-images.component.html +++ b/src/app/webapp-common/debug-images/debug-images.component.html @@ -1,6 +1,6 @@
@@ -9,15 +9,14 @@ [experiment]="experiments | itemById: experimentId" [tags]="(experiments | itemById: experimentId)?.tags" (copyIdClicked)="copyIdToClipboard()" - > - + >
-
-
+ +
@@ -34,7 +33,7 @@ -
@@ -43,23 +42,23 @@
{{debugImages?.[experimentId]?.data?.[0].iter}} -
-
- + -

NO DEBUG SAMPLES

+

NO DEBUG SAMPLES

- + >
diff --git a/src/app/webapp-common/debug-images/debug-images.component.scss b/src/app/webapp-common/debug-images/debug-images.component.scss index 7e777b37..a5a57698 100644 --- a/src/app/webapp-common/debug-images/debug-images.component.scss +++ b/src/app/webapp-common/debug-images/debug-images.component.scss @@ -110,9 +110,9 @@ sm-debug-images-view { left: 50%; transform: translateY(-50%) translateX(-50%); display: block; - color: $cloudy-blue-two; - font-weight: 500; + color: $blue-100; line-height: 1.2; + h4 {color: $blue-100;} &.dark { color: $blue-250; diff --git a/src/app/webapp-common/debug-images/debug-images.component.ts b/src/app/webapp-common/debug-images/debug-images.component.ts index ac31c078..0acdc2dd 100644 --- a/src/app/webapp-common/debug-images/debug-images.component.ts +++ b/src/app/webapp-common/debug-images/debug-images.component.ts @@ -1,18 +1,6 @@ -import { - ChangeDetectorRef, - Component, - ElementRef, - EventEmitter, - Input, - OnChanges, - OnDestroy, - OnInit, - Output, - SimpleChanges -} from '@angular/core'; +import {ChangeDetectorRef, Component, ElementRef, EventEmitter, Input, OnChanges, OnDestroy, OnInit, Output, SimpleChanges} from '@angular/core'; import {combineLatest, Observable, Subscription} from 'rxjs'; import {Store} from '@ngrx/store'; -import {AdminService} from '~/shared/services/admin.service'; import {selectS3BucketCredentials} from '../core/reducers/common-auth-reducer'; import {MatDialog} from '@angular/material/dialog'; import * as debugActions from './debug-images-actions'; @@ -22,51 +10,30 @@ import { selectDebugImages, selectNoMore, selectOptionalMetrics, + selectSelectedMetricForTask, selectTaskNames, selectTimeIsNow } from './debug-images-reducer'; import {selectRouterParams} from '../core/reducers/router-reducer'; import {distinctUntilChanged, filter, map, withLatestFrom} from 'rxjs/operators'; import {Task} from '~/business-logic/model/tasks/task'; -import {ActivatedRoute} from '@angular/router'; +import {ActivatedRoute, Params} from '@angular/router'; import {TaskStatusEnum} from '~/business-logic/model/tasks/taskStatusEnum'; import {ImageViewerComponent} from '../shared/debug-sample/image-viewer/image-viewer.component'; import {selectSelectedExperiment} from '~/features/experiments/reducers'; import {TaskMetric} from '~/business-logic/model/events/taskMetric'; import {isEqual} from 'lodash-es'; import {ALL_IMAGES} from './debug-images-effects'; -import {getSignedUrl} from '../core/actions/common-auth.actions'; +import {getSignedUrl, removeSignedUrl} from '../core/actions/common-auth.actions'; import {addMessage} from '../core/actions/layout.actions'; import {RefreshService} from '@common/core/services/refresh.service'; import {selectBeginningOfTime} from '@common/shared/debug-sample/debug-sample.reducer'; import {LIMITED_VIEW_LIMIT} from '@common/experiments-compare/experiments-compare.constants'; import {ReportCodeEmbedService} from '~/shared/services/report-code-embed.service'; - -export interface Event { - timestamp: number; - type?: string; - task?: string; - iter?: number; - metric?: string; - variant?: string; - key?: string; - url?: string; - // eslint-disable-next-line @typescript-eslint/naming-convention - '@timestamp'?: string; - worker?: string; -} - -export interface Iteration { - events: Event[]; - iter: number; -} - -interface DebugSamples { - metrics: string[]; - metric: string; - scrollId: string; - data: Iteration[]; -} +import {EventsDebugImagesResponse} from '~/business-logic/model/events/eventsDebugImagesResponse'; +import {DebugSampleEvent, DebugSamples} from '@common/debug-images/debug-images-types'; +import {concatLatestFrom} from '@ngrx/effects'; +import {isGoogleCloudUrl} from '@common/settings/admin/base-admin-utils'; @Component({ selector: 'sm-debug-images', @@ -87,11 +54,10 @@ export class DebugImagesComponent implements OnInit, OnDestroy, OnChanges { private refreshingSubscription: Subscription; private optionalMetricsSubscription: Subscription; - public debugImages$: Observable; - private routerParams$: Observable; + private routerParams$: Observable; private tasks$: Observable[]>; - public timeIsNow$: Observable; - public beginningOfTime$: Observable; + public timeIsNow$: Observable; + public beginningOfTime$: Observable; public mergeIterations: boolean; public debugImages: { [experimentId: string]: DebugSamples } = null; @@ -103,9 +69,9 @@ export class DebugImagesComponent implements OnInit, OnDestroy, OnChanges { public optionalMetrics$: Observable; public optionalMetrics: { [experimentId: string]: string }; public selectedMetrics: { [taskId: string]: string } = {}; - public beginningOfTime: any; + public beginningOfTime: boolean; private beginningOfTimeSubscription: Subscription; - public timeIsNow: any; + public timeIsNow: boolean; private timeIsNowSubscription: Subscription; minimized: boolean; readonly allImages = ALL_IMAGES; @@ -118,7 +84,6 @@ export class DebugImagesComponent implements OnInit, OnDestroy, OnChanges { constructor( private store: Store, - private adminService: AdminService, private dialog: MatDialog, private changeDetection: ChangeDetectorRef, private activeRoute: ActivatedRoute, @@ -135,10 +100,11 @@ export class DebugImagesComponent implements OnInit, OnDestroy, OnChanges { this.debugImagesSubscription = combineLatest([ store.select(selectS3BucketCredentials), - store.select(selectDebugImages) + store.select(selectDebugImages), + store.select(selectSelectedMetricForTask) ]) .pipe( - map(([, debugImages]) => !debugImages ? {} : Object.entries(debugImages).reduce(((acc, val: any) => { + map(([, debugImages, metricForTask]) => !debugImages ? {} : Object.entries(debugImages).reduce(((acc, val: [string, EventsDebugImagesResponse]) => { const id = val[0]; const iterations = val[1].metrics.find(m => m.task === id).iterations; if (iterations?.length === 0) { @@ -152,12 +118,12 @@ export class DebugImagesComponent implements OnInit, OnDestroy, OnChanges { return { ...event, url: event.url, - variantAndMetric: this.selectedMetric === ALL_IMAGES ? `${event.metric}/${event.variant}` : '' + variantAndMetric: (this.selectedMetric === ALL_IMAGES || metricForTask[id] === ALL_IMAGES ) ? `${event.metric}/${event.variant}` : '' }; }) })) }; - acc[id].metrics = val[1].metrics.map(metric => metric.metric || metric.iterations[0].events[0].metric); + acc[id].metrics = val[1].metrics.map((metric: any) => metric.metric || metric.iterations[0].events[0].metric); acc[id].metric = acc[id].metrics[0]; acc[id].scrollId = val[1].scroll_id; return acc; @@ -205,6 +171,7 @@ export class DebugImagesComponent implements OnInit, OnDestroy, OnChanges { if (multipleExperiments) { this.routerParamsSubscription = this.routerParams$ .subscribe(params => { + this.selectedMetric = null; this.experimentIds = (params.ids ? params.ids.split(',') : params.experimentId.split(',')); this.store.dispatch(getDebugImagesMetrics({tasks: this.experimentIds.slice(0, LIMITED_VIEW_LIMIT)})); this.store.dispatch(fetchExperiments({tasks: this.experimentIds.slice(0, LIMITED_VIEW_LIMIT)})); @@ -234,10 +201,13 @@ export class DebugImagesComponent implements OnInit, OnDestroy, OnChanges { this.selectedExperimentSubscription = this.store.select(selectSelectedExperiment) .pipe( filter(experiment => !!experiment && !this.disableStatusRefreshFilter), - distinctUntilChanged((previous, current) => previous?.id === current?.id) - ).subscribe(experiment => { + distinctUntilChanged((previous, current) => previous?.id === current?.id), + withLatestFrom(this.store.select(selectSelectedMetricForTask)) + ).subscribe(([experiment, metricForTask]) => { + this.selectedMetric = null; this.experimentNames = {[experiment.id]: experiment.name}; this.experimentIds = [experiment.id]; + this.selectedMetrics[experiment.id] = metricForTask[experiment.id] ; this.store.dispatch(getDebugImagesMetrics({tasks: this.experimentIds})); }); } @@ -245,19 +215,16 @@ export class DebugImagesComponent implements OnInit, OnDestroy, OnChanges { this.refreshingSubscription = this.refresh.tick .pipe( - filter(auto => - auto !== null && (!this.disableStatusRefreshFilter || this.selected.status === TaskStatusEnum.InProgress) - ), - withLatestFrom( - this.store.select(selectTimeIsNow), - ) + filter(auto => auto !== null && !this.disableStatusRefreshFilter), + concatLatestFrom(() => this.store.select(selectTimeIsNow)) ) .subscribe(([auto, timeIsNow]) => { if (multipleExperiments) { this.store.dispatch(debugActions.refreshDebugImagesMetrics({tasks: this.experimentIds, autoRefresh: auto})); } + this.store.dispatch(getDebugImagesMetrics({tasks: this.experimentIds})); this.experimentIds.forEach(experimentId => { - if (experimentId && timeIsNow?.[experimentId] && this.debugImages[experimentId] && this.elRef.nativeElement.scrollTop < 40) { + if (experimentId && !(timeIsNow?.[experimentId] === false) && this.elRef.nativeElement.scrollTop < 40) { this.store.dispatch(debugActions.refreshMetric({ payload: { task: experimentId, @@ -269,19 +236,22 @@ export class DebugImagesComponent implements OnInit, OnDestroy, OnChanges { }); }); - this.optionalMetricsSubscription = this.optionalMetrics$.subscribe(optionalMetrics => { + this.optionalMetricsSubscription = this.optionalMetrics$.pipe(concatLatestFrom(()=> [this.store.select(selectSelectedMetricForTask)])) + .subscribe(([optionalMetrics, selectedMetricForTask ]) => { const optionalMetricsDic = {}; optionalMetrics.forEach(experimentMetrics => optionalMetricsDic[experimentMetrics.task] = experimentMetrics.metrics); if ((!isEqual(this.optionalMetrics, optionalMetricsDic)) && optionalMetrics.length > 0) { this.optionalMetrics = optionalMetricsDic; - optionalMetrics.forEach(optionalMetric => { - optionalMetric.metrics[0] && this.store.dispatch(debugActions.setSelectedMetric({ - payload: { - task: optionalMetric.task, - metric: optionalMetric.metrics[0] - } - })); - }); + if (!this.selectedMetric || !optionalMetrics?.[0].metrics.includes(this.selectedMetric)) { + optionalMetrics.forEach(optionalMetric => { + optionalMetric.metrics[0] && this.store.dispatch(debugActions.setSelectedMetric({ + payload: { + task: optionalMetric.task, + metric: selectedMetricForTask[optionalMetric.task] ?? optionalMetric.metrics[0] + } + })); + }); + } this.changeDetection.detectChanges(); } }); @@ -300,7 +270,12 @@ export class DebugImagesComponent implements OnInit, OnDestroy, OnChanges { this.store.dispatch(resetDebugImages()); } - public urlError(/*{frame}*/) { + public urlError({frame}: { frame: DebugSampleEvent; experimentId: string }) { + const url = frame.url; + if (isGoogleCloudUrl(url)) { + this.store.dispatch(removeSignedUrl({url})); + this.store.dispatch(getSignedUrl({url})); + } // this.adminService.checkImgUrl(frame.oldSrc || frame.src); } @@ -331,7 +306,7 @@ export class DebugImagesComponent implements OnInit, OnDestroy, OnChanges { return experimentID; } - selectMetric(change: any, task) { + selectMetric(change: {value: string}, taskId) { this.selectedMetric = change.value; if (this.bindNavigationMode) { this.experimentIds.forEach(experimentId => { @@ -339,8 +314,8 @@ export class DebugImagesComponent implements OnInit, OnDestroy, OnChanges { this.store.dispatch(debugActions.setSelectedMetric({payload: {task: experimentId, metric: change.value}})); }); } else { - this.selectedMetrics[task] = change.value; - this.store.dispatch(debugActions.setSelectedMetric({payload: {task, metric: change.value}})); + this.selectedMetrics[taskId] = change.value; + this.store.dispatch(debugActions.setSelectedMetric({payload: {task: taskId, metric: change.value}})); } } @@ -394,16 +369,16 @@ export class DebugImagesComponent implements OnInit, OnDestroy, OnChanges { } - thereAreNoMetrics(experiment) { - return !(this.optionalMetrics && this.optionalMetrics[experiment] && this.optionalMetrics[experiment].length > 0); + thereAreNoMetrics(experiment: string) { + return !(this.optionalMetrics?.[experiment]?.length > 0); } - thereAreNoDebugImages(experiment) { - return !(this.debugImages && this.debugImages[experiment] && this.debugImages[experiment].data?.length > 0); + thereAreNoDebugImages(experiment: string) { + return !(this.debugImages?.[experiment]?.data?.length > 0); } shouldShowNoImagesForExperiment(experiment: string) { - return (this.thereAreNoMetrics(experiment) && this.optionalMetrics && this.optionalMetrics[experiment]) || (this.thereAreNoDebugImages(experiment) && this.debugImages && this.debugImages[experiment]); + return this.thereAreNoMetrics(experiment) && this.thereAreNoDebugImages(experiment); } copyIdToClipboard() { diff --git a/src/app/webapp-common/experiments-compare/actions/compare-header.actions.ts b/src/app/webapp-common/experiments-compare/actions/compare-header.actions.ts index 44f89a58..b8922b5b 100644 --- a/src/app/webapp-common/experiments-compare/actions/compare-header.actions.ts +++ b/src/app/webapp-common/experiments-compare/actions/compare-header.actions.ts @@ -1,10 +1,10 @@ import {createAction, props} from '@ngrx/store'; -import {Task} from '~/business-logic/model/tasks/task'; import {Params} from '@angular/router'; import {ISmCol} from '../../shared/ui-components/data/table/table.consts'; import {SortMeta} from 'primeng/api'; import {TableFilter} from '../../shared/utils/tableParamEncode'; import {EntityTypeEnum} from '~/shared/constants/non-common-consts'; +import {ITableExperiment} from '@common/experiments/shared/common-experiment-model.model'; export const EXPERIMENTS_COMPARE_SELECT_EXPERIMENT_ = 'EXPERIMENTS_COMPARE_SELECT_EXPERIMENT_'; @@ -14,6 +14,8 @@ export const SET_SELECT_EXPERIMENTS_FOR_COMPARE = EXPERIMENTS_COMPARE_SELECT_EXP export const RESET_SELECT_EXPERIMENT_FOR_COMPARE = EXPERIMENTS_COMPARE_SELECT_EXPERIMENT_ + 'RESET_SELECT_EXPERIMENT_FOR_COMPARE'; export const TOGGLE_SHOW_SACLARS_OPTIONS = EXPERIMENTS_COMPARE_SELECT_EXPERIMENT_ + 'TOGGLE_SHOW_SACLARS_OPTIONS'; export const SET_HIDE_IDENTICAL_ROWS = EXPERIMENTS_COMPARE_SELECT_EXPERIMENT_ + 'SET_HIDE_IDENTICAL_ROWS'; +export const SET_SHOW_ROW_EXTREMES = EXPERIMENTS_COMPARE_SELECT_EXPERIMENT_ + 'SET_SHOW_ROW_EXTREMES'; +export const SET_SHOW_GLOBAL_LEGEND = EXPERIMENTS_COMPARE_SELECT_EXPERIMENT_ + 'SET_SHOW_GLOBAL_LEGEND'; export const SET_REFRESHING = EXPERIMENTS_COMPARE_SELECT_EXPERIMENT_ + 'SET_REFRESHING'; export const SET_EXPERIMENTS_UPDATE_TIME = EXPERIMENTS_COMPARE_SELECT_EXPERIMENT_ + 'SET_EXPERIMENTS_UPDATE_TIME'; export const REFRESH_IF_NEEDED = EXPERIMENTS_COMPARE_SELECT_EXPERIMENT_ + 'REFRESH_IF_NEEDED'; @@ -22,10 +24,12 @@ export const SET_NAVIGATION_PREFERENCES = EXPERIMENTS_COMPARE_SELECT_EXPERIMENT_ export const setHideIdenticalFields = createAction(SET_HIDE_IDENTICAL_ROWS, props<{payload: boolean}>()); +export const setShowRowExtremes = createAction(SET_SHOW_ROW_EXTREMES, props<{payload: boolean}>()); +export const setShowGlobalLegend = createAction(SET_SHOW_GLOBAL_LEGEND); export const setExperimentsUpdateTime = createAction(SET_EXPERIMENTS_UPDATE_TIME, props<{ payload: {[key: string]: Date}}>()); export const refreshIfNeeded = createAction(REFRESH_IF_NEEDED, props<{ payload: boolean; autoRefresh?: boolean; entityType: string }>()); export const toggleShowScalarOptions = createAction(TOGGLE_SHOW_SACLARS_OPTIONS); -export const setSearchExperimentsForCompareResults = createAction(SET_SELECT_EXPERIMENTS_FOR_COMPARE, props<{ payload: Array }>()); +export const setSearchExperimentsForCompareResults = createAction(SET_SELECT_EXPERIMENTS_FOR_COMPARE, props<{ payload: ITableExperiment[] }>()); export const setShowSearchExperimentsForCompare = createAction(SET_SHOW_SEARCH_EXPERIMENTS_FOR_COMPARE, props<{ payload: boolean }>()); export const resetSelectCompareHeader = createAction(RESET_SELECT_EXPERIMENT_FOR_COMPARE, props<{fullReset?: boolean}>()); export const getSelectedExperimentsForCompareAddDialog = createAction(GET_SELECTED_EXPERIMENTS_FOR_COMPARE, props<{tasksIds?: string[]}>()); @@ -52,8 +56,12 @@ export const compareAddDialogSetTableSort = createAction( props<{ orders: SortMeta[]; projectId: string; colIds: string[] }>() ); export const refetchExperimentRequested = createAction(REFETCH_EXPERIMENT_REQUESTED, props<{ autoRefresh: boolean; entity: EntityTypeEnum }>()); -export const setNavigationPreferences = createAction(SET_NAVIGATION_PREFERENCES, props<{ navigationPreferences: Params }>()); export const setAddTableViewArchived = createAction( EXPERIMENTS_COMPARE_SELECT_EXPERIMENT_ + '[show archived in add table]', props<{show: boolean}>() ); + +export const setExportTable = createAction( + EXPERIMENTS_COMPARE_SELECT_EXPERIMENT_ + '[set export table]', + props<{export: boolean}>() +); diff --git a/src/app/webapp-common/experiments-compare/actions/experiments-compare-charts.actions.ts b/src/app/webapp-common/experiments-compare/actions/experiments-compare-charts.actions.ts index 40f73798..64692fb4 100644 --- a/src/app/webapp-common/experiments-compare/actions/experiments-compare-charts.actions.ts +++ b/src/app/webapp-common/experiments-compare/actions/experiments-compare-charts.actions.ts @@ -3,18 +3,22 @@ import {ScalarKeyEnum} from '~/business-logic/model/events/scalarKeyEnum'; import {EventsGetMultiTaskPlotsResponse} from '~/business-logic/model/events/eventsGetMultiTaskPlotsResponse'; import {ExperimentCompareSettings} from '@common/experiments-compare/reducers/experiments-compare-charts.reducer'; import {EntityTypeEnum} from '~/shared/constants/non-common-consts'; +import {EventsGetTaskSingleValueMetricsResponse} from '~/business-logic/model/events/eventsGetTaskSingleValueMetricsResponse'; +import {EXPERIMENTS_COMPARE_SELECT_EXPERIMENT_} from '@common/experiments-compare/actions/compare-header.actions'; +import {ChartHoverModeEnum} from "@common/experiments/shared/common-experiments.const"; export const EXPERIMENTS_COMPARE_METRICS_CHARTS_ = 'EXPERIMENTS_COMPARE_METRICS_CHARTS_'; -// COMMANDS: export const SET_EXPERIMENT_PLOTS = EXPERIMENTS_COMPARE_METRICS_CHARTS_ + 'SET_EXPERIMENT_PLOTS'; -// EVENTS: - - export const getMultiScalarCharts = createAction( EXPERIMENTS_COMPARE_METRICS_CHARTS_ + 'GET_MULTI_SCALAR_CHARTS', + props<{ taskIds: string[]; entity: EntityTypeEnum; autoRefresh?: boolean; xAxisType: ScalarKeyEnum }>() +); + +export const getMultiSinleScalars = createAction( + EXPERIMENTS_COMPARE_METRICS_CHARTS_ + 'GET_MULTI_SINGLE_SCALAR_CHARTS', props<{ taskIds: string[]; entity: EntityTypeEnum; autoRefresh?: boolean; cached?: boolean }>() ); @@ -23,6 +27,11 @@ export const getMultiPlotCharts = createAction( props<{ taskIds: Array; entity: EntityTypeEnum; autoRefresh?: boolean }>() ); +export const setExperimentMultiScalarSingleValue = createAction( + EXPERIMENTS_COMPARE_METRICS_CHARTS_ + 'SET_MULTI_SINGLE_SCALAR_CHARTS', + props() +); + export const setSelectedExperiments = createAction( EXPERIMENTS_COMPARE_METRICS_CHARTS_ + 'SET_SELECTED_EXPERIMENTS', props<{selectedExperiments: string[]}>() @@ -54,3 +63,17 @@ export const setExperimentMetricsSearchTerm = createAction( ); export const resetExperimentMetrics = createAction(EXPERIMENTS_COMPARE_METRICS_CHARTS_ + 'RESET_EXPERIMENT_METRICS'); + +export const getGlobalLegendData = createAction( + EXPERIMENTS_COMPARE_SELECT_EXPERIMENT_ + '[get global legend data]', + props<{ids: string[], entity: EntityTypeEnum}>() +); +export const setGlobalLegendData = createAction( + EXPERIMENTS_COMPARE_SELECT_EXPERIMENT_ + '[set global legend data]', + props<{data: {name: string, tags: string[], systemTags: string[], id: string, project: {id: string}}[]}>() +); + +export const setScalarsHoverMode = createAction( + EXPERIMENTS_COMPARE_SELECT_EXPERIMENT_ + 'SET SCALARS HOVER MODE', + props<{ hoverMode: ChartHoverModeEnum }>() +); diff --git a/src/app/webapp-common/experiments-compare/actions/experiments-compare-params.actions.ts b/src/app/webapp-common/experiments-compare/actions/experiments-compare-params.actions.ts index e746817e..c8d1da00 100644 --- a/src/app/webapp-common/experiments-compare/actions/experiments-compare-params.actions.ts +++ b/src/app/webapp-common/experiments-compare/actions/experiments-compare-params.actions.ts @@ -1,7 +1,16 @@ -import {createAction, props} from '@ngrx/store'; +import {createActionGroup, props, emptyProps} from '@ngrx/store'; import {ExperimentParams} from '../shared/experiments-compare-details.model'; import {EntityTypeEnum} from '~/shared/constants/non-common-consts'; -export const resetState = createAction('[experiment compare params] RESET_STATE'); -export const setExperiments = createAction('[experiment compare params] SET_EXPERIMENTS', props<{experiments: ExperimentParams[]}>()); -export const experimentListUpdated = createAction('[experiment compare params] EXPERIMENT_LIST_UPDATED', props<{ids: string[]; entity: EntityTypeEnum}>()); +export const paramsActions = createActionGroup({ + source: 'experiment compare params', + events: { + 'reset state': emptyProps(), + 'set experiments': props<{experiments: ExperimentParams[]}>(), + 'experiment list updated': props<{ids: string[]; entity: EntityTypeEnum}>(), + 'set view': props<{primary: string; secondary: string}>() + } +}) +// export const resetState = createAction('[experiment compare params] RESET_STATE'); +// export const setExperiments = createAction('[experiment compare params] SET_EXPERIMENTS', props<{experiments: ExperimentParams[]}>()); +// export const experimentListUpdated = createAction('[experiment compare params] EXPERIMENT_LIST_UPDATED', props<{ids: string[]; entity: EntityTypeEnum}>()); diff --git a/src/app/webapp-common/experiments-compare/compare-navigation.guard.ts b/src/app/webapp-common/experiments-compare/compare-navigation.guard.ts new file mode 100644 index 00000000..b563d4aa --- /dev/null +++ b/src/app/webapp-common/experiments-compare/compare-navigation.guard.ts @@ -0,0 +1,15 @@ +import {CanActivateFn, createUrlTreeFromSnapshot} from '@angular/router'; +import {inject} from '@angular/core'; +import {Store} from '@ngrx/store'; +import {selectViewMode} from '@common/experiments-compare/reducers'; +import {map} from 'rxjs/operators'; + +export const compareNavigationGuard: CanActivateFn = route => { + const store = inject(Store); + const currentPage = route?.url?.[0]?.path; + + return store.select(selectViewMode(currentPage)) + .pipe( + map(mode => createUrlTreeFromSnapshot(route, [mode])) + ); +}; diff --git a/src/app/webapp-common/experiments-compare/containers/experiment-compare-base.component.scss b/src/app/webapp-common/experiments-compare/containers/experiment-compare-base.component.scss index 25004039..966773c5 100644 --- a/src/app/webapp-common/experiments-compare/containers/experiment-compare-base.component.scss +++ b/src/app/webapp-common/experiments-compare/containers/experiment-compare-base.component.scss @@ -116,7 +116,7 @@ $extra-header-min-height: 50px; } .node-item-container { - margin-bottom: 1px; + //margin-bottom: 1px; height: 28px; .full-width { diff --git a/src/app/webapp-common/experiments-compare/containers/experiment-compare-base.ts b/src/app/webapp-common/experiments-compare/containers/experiment-compare-base.ts index e31cb3e1..a63be26f 100644 --- a/src/app/webapp-common/experiments-compare/containers/experiment-compare-base.ts +++ b/src/app/webapp-common/experiments-compare/containers/experiment-compare-base.ts @@ -1,17 +1,30 @@ import * as detailsActions from '../actions/experiments-compare-details.actions'; -import * as paramsActions from '../actions/experiments-compare-params.actions'; -import {ExperimentCompareTree, ExperimentCompareTreeSection, IExperimentDetail} from '~/features/experiments-compare/experiments-compare-models'; +import {paramsActions} from '../actions/experiments-compare-params.actions'; +import { + ExperimentCompareTree, + ExperimentCompareTreeSection, + IExperimentDetail +} from '~/features/experiments-compare/experiments-compare-models'; import {get, has, isEmpty, isEqual} from 'lodash-es'; import {treeBuilderService} from '../services/tree-builder.service'; import {isArrayOrderNotImportant} from '../jsonToDiffConvertor'; import {ExperimentParams, TreeNode, TreeNodeMetadata} from '../shared/experiments-compare-details.model'; import {MatTreeFlatDataSource, MatTreeFlattener} from '@angular/material/tree'; import {activeLoader, addMessage, deactivateLoader} from '../../core/actions/layout.actions'; -import {AfterViewInit, ChangeDetectorRef, Directive, ElementRef, HostListener, OnDestroy, QueryList, ViewChildren} from '@angular/core'; +import { + AfterViewInit, + ChangeDetectorRef, + Directive, + ElementRef, + HostListener, + inject, + OnDestroy, + QueryList, + ViewChildren +} from '@angular/core'; import {ExperimentCompareDetailsBase} from '~/features/experiments-compare/experiments-compare-details.base'; import {ActivatedRoute, Router} from '@angular/router'; import {select, Store} from '@ngrx/store'; -import {ExperimentInfoState} from '~/features/experiments/reducers/experiment-info.reducer'; import {Observable, Subscription} from 'rxjs'; import {FlatTreeControl} from '@angular/cdk/tree'; import {CdkVirtualScrollViewport} from '@angular/cdk/scrolling'; @@ -24,6 +37,8 @@ import {selectHasDataFeature} from '~/core/reducers/users.reducer'; import {ListRange} from '@angular/cdk/collections'; import {RefreshService} from '@common/core/services/refresh.service'; import {EntityTypeEnum} from '~/shared/constants/non-common-consts'; +import {getSignedUrl} from '@common/core/actions/common-auth.actions'; +import {selectSignedUrl} from '@common/core/reducers/common-auth-reducer'; export type NextDiffDirectionEnum = 'down' | 'up'; @@ -63,7 +78,9 @@ export abstract class ExperimentCompareBase extends ExperimentCompareDetailsBase public allPaths: any = {}; public calculatingTree: boolean; public hideIdenticalFields = false; - public experimentsDataControl: { [key: string]: [MatTreeFlatDataSource, FlatNode>, FlatTreeControl, FlatNode[]] } = {}; + public experimentsDataControl: { + [key: string]: [MatTreeFlatDataSource, FlatNode>, FlatTreeControl, FlatNode[]] + } = {}; public compareTabPage: string; public foundPaths: string[] = []; public foundIndex: number = 0; @@ -75,7 +92,15 @@ export abstract class ExperimentCompareBase extends ExperimentCompareDetailsBase private originalScrolledElement: EventTarget; private treeCardBody: HTMLDivElement; protected entityType = EntityTypeEnum.experiment; + protected router: Router; + protected store: Store; + protected changeDetection: ChangeDetectorRef; + protected activeRoute: ActivatedRoute; + protected refresh: RefreshService; + public cdr: ChangeDetectorRef; @ViewChildren('treeCardBody') treeCardBodies: QueryList>; + private prevIndex : number = 0; + private prevOffset: number = 0; get baseExperiment(): IExperimentDetail { return this.experiments?.[0]; @@ -91,15 +116,14 @@ export abstract class ExperimentCompareBase extends ExperimentCompareDetailsBase }); } - constructor( - protected router: Router, - protected store: Store, - protected changeDetection: ChangeDetectorRef, - protected activeRoute: ActivatedRoute, - protected refresh: RefreshService, - public cdr: ChangeDetectorRef - ) { + constructor() { super(); + this.router = inject(Router); + this.store = inject(Store); + this.changeDetection = inject(ChangeDetectorRef); + this.activeRoute = inject(ActivatedRoute); + this.refresh = inject(RefreshService); + this.cdr = inject(ChangeDetectorRef); this.hasDataFeature$ = this.store.pipe(select(selectHasDataFeature)); this.taskIds$ = this.store.pipe( select(selectRouterParams), @@ -168,7 +192,11 @@ export abstract class ExperimentCompareBase extends ExperimentCompareDetailsBase this.getNodeChildren ); const expandedsPaths = this.getExpandedPath(experimentTrees); - + this.prevOffset = this.virtualScrollRef.first ? this.virtualScrollRef.first.measureScrollOffset('top') : 0; + if (Object.values(this.experimentsDataControl)[0]) { + const [, , flatNodes] = Object.values(this.experimentsDataControl)[0]; + this.prevIndex = this.findRealIndex(flatNodes); + } Object.keys(experimentTrees).forEach(experimentID => { const sectionTree = experimentTrees[experimentID]; let root = Object.keys(sectionTree).map((section: string) => sectionTree[section].children[0]); @@ -187,7 +215,7 @@ export abstract class ExperimentCompareBase extends ExperimentCompareDetailsBase this.experimentsDataSources[experimentID] = {all: root, onlyDiffs: rootOnlyDiffs}; dataSource.data = this.experimentsDataSources[experimentID][this.hideIdenticalFields ? 'onlyDiffs' : 'all']; this.setExpandedPaths(expandedsPaths, treeControl); - this.selectedPath && window.setTimeout(() => this.exapndAndScrollToPath()); + window.setTimeout(() => this.exapndAndScrollToPath(false)); }); this.calculatingTree = false; this.store.dispatch(deactivateLoader('CALCULATING_DIFF_TREE')); @@ -236,14 +264,11 @@ export abstract class ExperimentCompareBase extends ExperimentCompareDetailsBase } getExpandedPath(experimentTrees: ExperimentCompareTree) { - let expandedsPaths = []; - Object.keys(experimentTrees).some(experimentID => { - if (this.experimentsDataControl[experimentID]) { - expandedsPaths = this.experimentsDataControl[experimentID][1].expansionModel.selected.map(node => node.data.path); - return expandedsPaths.length > 0; - } - }); - return expandedsPaths; + const id = Object.keys(experimentTrees).find(experimentID => this.experimentsDataControl[experimentID]); + if (id) { + return this.experimentsDataControl[id][1].expansionModel.selected.map(node => node.data.path); + } + return []; } syncScrollSubscription() { @@ -280,7 +305,7 @@ export abstract class ExperimentCompareBase extends ExperimentCompareDetailsBase this.exapndAndScrollToPath(); } - exapndAndScrollToPath() { + exapndAndScrollToPath(jumpToSelected = true) { const openPaths = []; let pathPartial = ''; const selectedPath = this.selectedPath ? this.selectedPath.split(',') : []; @@ -309,15 +334,11 @@ export abstract class ExperimentCompareBase extends ExperimentCompareDetailsBase this.previousOpenPaths = openPaths.slice(0, openPaths.length - 1); const [, , flatNodes] = Object.values(this.experimentsDataControl)[0]; const selectedNodeIndex = this.findRealIndex(flatNodes); - const scrollToInPixels = (selectedNodeIndex + 1) * 28 - this.virtualScrollRef.first.getViewportSize() / 2; - if (nodeGotExpanded) { - // Hack to make multiple scroll work with cdk. Don't change - window.setTimeout(() => this.virtualScrollRef.forEach(vs => vs.elementRef.nativeElement.scrollTo({top: scrollToInPixels})), 200); - window.setTimeout(() => this.virtualScrollRef.forEach(vs => vs.elementRef.nativeElement.scrollTo({top: scrollToInPixels})), 300); - } else { - this.virtualScrollRef.forEach(vs => vs.elementRef.nativeElement.scrollTo({top: scrollToInPixels})); - window.setTimeout(() => this.virtualScrollRef.forEach(vs => vs.elementRef.nativeElement.scrollTo({top: scrollToInPixels})), 0); - // window.setTimeout(() => this.virtualScrollRef.forEach(vs => vs.elementRef.nativeElement.scrollTo({top: scrollToInPixels})), 100); + const scrollToInPixels = jumpToSelected ? + (selectedNodeIndex + 1) * 28 - this.virtualScrollRef.first.getViewportSize() / 2 : + this.prevOffset + (selectedNodeIndex - this.prevIndex) * 28; + if (jumpToSelected || selectedNodeIndex !== this.prevIndex) { + this.virtualScrollRef.forEach(vs => vs.scrollTo({top: scrollToInPixels})); } } @@ -354,6 +375,7 @@ export abstract class ExperimentCompareBase extends ExperimentCompareDetailsBase } else if (keyWithoutHash.includes(text) || (node.data.value !== undefined && JSON.stringify(node.data.value).toLowerCase().includes(text))) { return {path: node.data.path, index}; } + return null; }) .filter(i => i) ); @@ -431,6 +453,7 @@ export abstract class ExperimentCompareBase extends ExperimentCompareDetailsBase existOnOrigin, existOnCompared, value: comparedData, + // link: getLinkHref(fullPathJoined), isValueEqualToOrigin: (originExperiment === comparedExperiment) || (isEquals && (existOnOrigin === existOnCompared)), isArray: isArrayOrderNotImportant(comparedExperiment, key), classStyle: `${(originExperiment === comparedExperiment || isEquals) ? '' : 'al-danger '}${isEmptyObject ? 'al-empty-collapse ' : ''}${existOnCompared ? '' : 'hide-field'}`, @@ -441,7 +464,7 @@ export abstract class ExperimentCompareBase extends ExperimentCompareDetailsBase metaDataTransformer = (): TreeNodeMetadata => null; isPrimitive(obj) { - return (typeof obj === 'string' || typeof obj === 'boolean' || typeof obj === 'number'); + return (typeof obj === 'string' || typeof obj === 'boolean' || typeof obj === 'number' || obj?.dataDictionary); } private setPathDif(fullPath, isEquals, undefinedOriginFirstRun) { @@ -557,4 +580,19 @@ export abstract class ExperimentCompareBase extends ExperimentCompareDetailsBase getNodeChildren(node: TreeNode) { return node.children; } + + linkClicked(url: string) { + this.signUrl(url) + .subscribe(signedUrl => window.open(signedUrl, '_blank')); + } + + protected signUrl(url: string) { + this.store.dispatch(getSignedUrl({url})); + return this.store.select(selectSignedUrl(url)) + .pipe( + map((res => res?.signed)), + filter(signedUrl => !!signedUrl), + take(1) + ); + } } diff --git a/src/app/webapp-common/experiments-compare/containers/experiment-compare-details/experiment-compare-details.component.html b/src/app/webapp-common/experiments-compare/containers/experiment-compare-details/experiment-compare-details.component.html index 6662c22c..eaf1eda3 100644 --- a/src/app/webapp-common/experiments-compare/containers/experiment-compare-details/experiment-compare-details.component.html +++ b/src/app/webapp-common/experiments-compare/containers/experiment-compare-details/experiment-compare-details.component.html @@ -38,12 +38,11 @@ [class.hovered]="checkIfHoveredPath(node.data)" [class.identical-row]="!allPaths[node.data.path]"> + [ngClass]="treeControl.isExpanded(node) ? 'fa-chevron-down' : 'fa-chevron-right'" data-id="expandDetailTab"> + }" data-id="selectedRowHighlighter"> 
{{node.data.key | hideHash}}{{node.data.value}}
+                         [style.width.px]="showEllipsis ? nativeWidth - 55 - node.level * 20 : null" data-id="diffDataRow"
+                    >{{node.data.key |
+                      hideHash}}{{node.data.value.dataValue}}
+                      {{node.data.key | hideHash}}{{node.data.value}} 
+
@@ -96,11 +103,11 @@ - - diff --git a/src/app/webapp-common/experiments-compare/containers/experiment-compare-details/experiment-compare-details.component.scss b/src/app/webapp-common/experiments-compare/containers/experiment-compare-details/experiment-compare-details.component.scss index fe0237c5..4bb00465 100644 --- a/src/app/webapp-common/experiments-compare/containers/experiment-compare-details/experiment-compare-details.component.scss +++ b/src/app/webapp-common/experiments-compare/containers/experiment-compare-details/experiment-compare-details.component.scss @@ -5,6 +5,10 @@ height: 100%; padding-top: 12px; + .link { + color: $purple; + } + .section { pre { display: inline-block; diff --git a/src/app/webapp-common/experiments-compare/containers/experiment-compare-details/experiment-compare-details.component.ts b/src/app/webapp-common/experiments-compare/containers/experiment-compare-details/experiment-compare-details.component.ts index a7f740be..8f34bf9e 100644 --- a/src/app/webapp-common/experiments-compare/containers/experiment-compare-details/experiment-compare-details.component.ts +++ b/src/app/webapp-common/experiments-compare/containers/experiment-compare-details/experiment-compare-details.component.ts @@ -1,5 +1,4 @@ -import {AfterViewInit, ChangeDetectionStrategy, ChangeDetectorRef, Component, OnInit} from '@angular/core'; -import {select, Store} from '@ngrx/store'; +import {AfterViewInit, ChangeDetectionStrategy, Component, OnInit} from '@angular/core'; import {experimentListUpdated} from '../../actions/experiments-compare-details.actions'; import {selectExperimentsDetails} from '../../reducers'; import {filter, tap} from 'rxjs/operators'; @@ -8,10 +7,7 @@ import { convertConfigurationFromExperiments, convertContainerScriptFromExperiments, convertExperimentsArrays, convertNetworkDesignFromExperiments, getAllKeysEmptyObject, isDetailsConverted } from '../../jsonToDiffConvertor'; import {ExperimentCompareBase} from '../experiment-compare-base'; -import {ActivatedRoute, Router} from '@angular/router'; -import {ExperimentInfoState} from '~/features/experiments/reducers/experiment-info.reducer'; import {ConfigurationItem} from '~/business-logic/model/tasks/configurationItem'; -import {RefreshService} from '@common/core/services/refresh.service'; import {LIMITED_VIEW_LIMIT} from '@common/experiments-compare/experiments-compare.constants'; import {EntityTypeEnum} from '~/shared/constants/non-common-consts'; @@ -22,20 +18,14 @@ import {EntityTypeEnum} from '~/shared/constants/non-common-consts'; changeDetection: ChangeDetectionStrategy.OnPush }) export class ExperimentCompareDetailsComponent extends ExperimentCompareBase implements OnInit, AfterViewInit { - public showEllipsis: boolean = true; + public showEllipsis= true; constructor( - public router: Router, - public store: Store, - public changeDetection: ChangeDetectorRef, - public activeRoute: ActivatedRoute, - public cdr: ChangeDetectorRef, - public refresh: RefreshService ) { - super(router, store, changeDetection, activeRoute, refresh, cdr); + super(); + this.experiments$ = this.store.select(selectExperimentsDetails); } - experiments$ = this.store.pipe(select(selectExperimentsDetails)); ngOnInit() { this.onInit(); diff --git a/src/app/webapp-common/experiments-compare/containers/experiment-compare-hyper-params-graph/experiment-compare-hyper-params-graph.component.html b/src/app/webapp-common/experiments-compare/containers/experiment-compare-hyper-params-graph/experiment-compare-hyper-params-graph.component.html index 3fe6e2ac..8c3417c5 100644 --- a/src/app/webapp-common/experiments-compare/containers/experiment-compare-hyper-params-graph/experiment-compare-hyper-params-graph.component.html +++ b/src/app/webapp-common/experiments-compare/containers/experiment-compare-hyper-params-graph/experiment-compare-hyper-params-graph.component.html @@ -1,7 +1,7 @@
-
+
Performance Metric
LAST @@ -77,13 +77,13 @@ [experiments]="experiments$ | async" [parameters]="selectedHyperParams" [metric]="selectedMetric" - [metricValueType]="metricValueType$ | async" + [metricValueType]="valueType" (createEmbedCode)="createEmbedCode($event)" >
-
No data to show
+

NO DATA TO SHOW

Please select parameters & metric
 diff --git a/src/app/webapp-common/experiments-compare/containers/experiment-compare-hyper-params-graph/experiment-compare-hyper-params-graph.component.scss b/src/app/webapp-common/experiments-compare/containers/experiment-compare-hyper-params-graph/experiment-compare-hyper-params-graph.component.scss index c2971b6f..dbec0b01 100644 --- a/src/app/webapp-common/experiments-compare/containers/experiment-compare-hyper-params-graph/experiment-compare-hyper-params-graph.component.scss +++ b/src/app/webapp-common/experiments-compare/containers/experiment-compare-hyper-params-graph/experiment-compare-hyper-params-graph.component.scss @@ -2,7 +2,8 @@ :host { display: flex; - height: 100%; + height: 50%; + flex-grow: 1; ::ng-deep .mat-expansion-panel-header.mat-expansion-toggle-indicator-before { .mat-expansion-indicator { @@ -173,15 +174,15 @@ font-weight: 400; .no-data-title { - font-size: 16px; + color: $blue-100; } } .al-ico-no-data-graph { - font-size: 240px; - width: 240px; - height: 240px; - color: #e5e5e5; + font-size: 140px; + width: 140px; + height: auto; + color: rgba(0,0,0,0.1); } sm-grouped-checked-filter-list { diff --git a/src/app/webapp-common/experiments-compare/containers/experiment-compare-hyper-params-graph/experiment-compare-hyper-params-graph.component.ts b/src/app/webapp-common/experiments-compare/containers/experiment-compare-hyper-params-graph/experiment-compare-hyper-params-graph.component.ts index cbf9af6c..d91e3d38 100644 --- a/src/app/webapp-common/experiments-compare/containers/experiment-compare-hyper-params-graph/experiment-compare-hyper-params-graph.component.ts +++ b/src/app/webapp-common/experiments-compare/containers/experiment-compare-hyper-params-graph/experiment-compare-hyper-params-graph.component.ts @@ -1,23 +1,22 @@ import {ChangeDetectorRef, Component, ElementRef, HostListener, OnDestroy, OnInit, ViewChild} from '@angular/core'; import {combineLatest, Observable, Subscription} from 'rxjs'; import {select, Store} from '@ngrx/store'; -import {debounceTime, distinctUntilChanged, filter, map, withLatestFrom} from 'rxjs/operators'; +import {debounceTime, distinctUntilChanged, filter, map, take, withLatestFrom} from 'rxjs/operators'; import {selectRouterParams, selectRouterQueryParams} from '@common/core/reducers/router-reducer'; import {has} from 'lodash-es'; import {setExperimentSettings, setSelectedExperiments} from '../../actions/experiments-compare-charts.actions'; import { - selectMetricValueType, selectScalarsGraphHyperParams, selectScalarsGraphMetrics, selectScalarsGraphShowIdenticalHyperParams, selectScalarsGraphTasks, selectSelectedSettingsHyperParams, - selectSelectedSettingsMetric + selectSelectedSettingsMetric, + selectSelectedSettingsValueType } from '../../reducers'; import { getExperimentsHyperParams, setShowIdenticalHyperParams, - setvalueType } from '../../actions/experiments-compare-scalars-graph.actions'; import { GroupedHyperParams, @@ -68,6 +67,7 @@ export class ExperimentCompareHyperParamsGraphComponent implements OnInit, OnDes private taskIds: string[]; public metricValueType$: Observable; + public valueType: "min_value" | "max_value" | "value"; public selectedItemsListMapper(data) { return data; @@ -82,6 +82,10 @@ export class ExperimentCompareHyperParamsGraphComponent implements OnInit, OnDes } } + @HostListener("window:beforeunload", ["$event"]) unloadHandler() { + this.saveSettingsState(); + } + constructor(private store: Store, private route: ActivatedRoute, private router: Router, @@ -94,18 +98,11 @@ export class ExperimentCompareHyperParamsGraphComponent implements OnInit, OnDes this.selectedMetric$ = this.store.pipe(select(selectSelectedSettingsMetric)); this.selectShowIdenticalHyperParams$ = this.store.pipe(select(selectScalarsGraphShowIdenticalHyperParams)); this.experiments$ = this.store.pipe(select(selectScalarsGraphTasks)); - this.metricValueType$ = this.store.pipe(select(selectMetricValueType)); + this.metricValueType$ = this.store.pipe(select(selectSelectedSettingsValueType)); } ngOnInit() { - this.subs.add(this.selectedMetric$.pipe( - distinctUntilChanged((x, y) => x?.path === y?.path) - ).subscribe((selectedMetric: SelectedMetric) => { - this.selectedMetric = selectedMetric?.path ? {...selectedMetric} : null; - this.cdr.detectChanges(); - })); - this.subs.add(this.metrics$.pipe( filter(metrics => !!metrics) ).subscribe((metrics) => { @@ -113,11 +110,11 @@ export class ExperimentCompareHyperParamsGraphComponent implements OnInit, OnDes this.metricsOptions = [...metrics]; })); - this.subs.add(combineLatest([this.selectedHyperParams$, this.hyperParams$, this.selectShowIdenticalHyperParams$]) + this.subs.add(combineLatest([this.hyperParams$, this.selectShowIdenticalHyperParams$]) .pipe( - filter(([, allParams]) => !!allParams), + filter(([allParams]) => !!allParams), ) - .subscribe(([selectedParams, allParams, showIdentical]) => { + .subscribe(([allParams, showIdentical]) => { this.showIdenticalParamsActive = showIdentical; this.hyperParams = Object.entries(allParams) .reduce((acc, [sectionKey, params]) => { @@ -134,7 +131,8 @@ export class ExperimentCompareHyperParamsGraphComponent implements OnInit, OnDes } return acc; }, {}); - this.selectedHyperParams = selectedParams?.filter(selectedParam => has(this.hyperParams, selectedParam)); + const selectedHyperParams = this.selectedHyperParams?.filter(selectedParam => has(this.hyperParams, selectedParam)); + selectedHyperParams && this.updateServer(this.selectedMetric, selectedHyperParams, this.valueType) this.cdr.detectChanges(); })); @@ -146,7 +144,7 @@ export class ExperimentCompareHyperParamsGraphComponent implements OnInit, OnDes if (queryParams.metricPath) { const selectedMetric = metircs.map(a => a.variants).flat(2).find(variant => variant.value.path === queryParams.metricPath)?.value ?? null; const params = Array.isArray(queryParams.params) ? queryParams.params : [queryParams.params]; - this.updateServer(selectedMetric, params, true); + this.updateServer(selectedMetric, params, queryParams.valueType, true); this.listOpen = false; this.cdr.detectChanges(); } @@ -160,7 +158,7 @@ export class ExperimentCompareHyperParamsGraphComponent implements OnInit, OnDes ) .subscribe((ids) => { this.taskIds = ids.split(','); - this.store.dispatch(setSelectedExperiments({selectedExperiments: ['hyper-param-graph']})); + this.store.dispatch(setSelectedExperiments({selectedExperiments: ['hyper-param-graph'].concat(this.taskIds)})); this.store.dispatch(getExperimentsHyperParams({experimentsIds: this.taskIds})); })); @@ -170,15 +168,26 @@ export class ExperimentCompareHyperParamsGraphComponent implements OnInit, OnDes this.store.dispatch(getExperimentsHyperParams({experimentsIds: this.taskIds, autoRefresh})) )); - this.listOpen = true; - window.setTimeout(() => { - this.searchMetricRef.nativeElement.focus(); - this.initView = false; - this.cdr.detectChanges(); - }, 200); + this.subs.add(this.metricValueType$.pipe(take(1)) + .subscribe(valueType => this.valueType = valueType)); + this.subs.add(this.selectedHyperParams$.pipe(take(1)) + .subscribe(p => this.selectedHyperParams = p)); + this.subs.add(this.selectedMetric$.pipe(take(1)) + .subscribe(selectedMetric => this.selectedMetric = selectedMetric?.path ? {...selectedMetric} : null)); + + this.listOpen = false; + if (!this.selectedMetric) { + this.listOpen = true; + window.setTimeout(() => { + this.searchMetricRef.nativeElement.focus(); + this.initView = false; + this.cdr.detectChanges(); + }, 200); + } } ngOnDestroy() { + this.saveSettingsState(); this.subs.unsubscribe(); } @@ -193,36 +202,37 @@ export class ExperimentCompareHyperParamsGraphComponent implements OnInit, OnDes } metricSelected(metric: VariantOption) { - this.updateServer(metric.value, this.selectedHyperParams); + this.updateServer(metric.value, this.selectedHyperParams, this.valueType); this.listOpen = false; } selectedParamsChanged({param}) { const newSelectedParamsList = this.selectedHyperParams.includes(param) ? this.selectedHyperParams.filter(i => i !== param) : [...this.selectedHyperParams, param]; - this.updateServer(this.selectedMetric, newSelectedParamsList); + this.updateServer(this.selectedMetric, newSelectedParamsList, this.valueType); } clearSelection() { - this.updateServer(this.selectedMetric, []); + this.updateServer(this.selectedMetric, [], this.valueType); } showIdenticalParamsToggled() { this.store.dispatch(setShowIdenticalHyperParams()); } - updateServer(selectedMetric: SelectedMetric, selectedParams: string[], skipNavigation?: boolean) { + updateServer(selectedMetric: SelectedMetric, selectedParams: string[], valueType, skipNavigation?: boolean) { !skipNavigation && this.router.navigate([], { queryParams: { metricPath: selectedMetric?.path || undefined, metricName: selectedMetric?.name || undefined, - params: selectedParams + params: selectedParams, + valueType: valueType || 'value' }, - queryParamsHandling: 'merge' + queryParamsHandling: 'merge', + replaceUrl: true }); - this.store.dispatch(setExperimentSettings({ - id: ['hyper-param-graph'], - changes: {selectedMetric, selectedHyperParams: selectedParams} - })); + this.selectedMetric = selectedMetric; + this.selectedHyperParams = selectedParams; + this.valueType = valueType; } updateMetricsList(event: Event) { @@ -230,7 +240,7 @@ export class ExperimentCompareHyperParamsGraphComponent implements OnInit, OnDes } clearMetricSearchAndSelected() { - this.updateServer(null, this.selectedHyperParams); + this.updateServer(null, this.selectedHyperParams, this.valueType); this.selectedMetric = null; this.metricsOptions = this._filterGroup(''); } @@ -253,7 +263,8 @@ export class ExperimentCompareHyperParamsGraphComponent implements OnInit, OnDes } valueTypeChange($event: MatRadioChange) { - this.store.dispatch(setvalueType({valueType: $event.value})); + this.valueType = $event.value; + this.updateServer(this.selectedMetric, this.selectedHyperParams, $event.value, false); } createEmbedCode(event: { tasks: string[]; valueType: MetricValueType; metrics?: string[]; variants?: string[]; domRect: DOMRect }) { @@ -264,4 +275,15 @@ export class ExperimentCompareHyperParamsGraphComponent implements OnInit, OnDes ...event }); } + + saveSettingsState() { + this.store.dispatch(setExperimentSettings({ + id: ['hyper-param-graph'].concat(this.taskIds), + changes: { + selectedMetric: this.selectedMetric, + selectedHyperParams: this.selectedHyperParams, + valueType: this.valueType + } + })); + } } diff --git a/src/app/webapp-common/experiments-compare/containers/experiment-compare-metric-charts/experiment-compare-scalar-charts.component.html b/src/app/webapp-common/experiments-compare/containers/experiment-compare-metric-charts/experiment-compare-scalar-charts.component.html index 4fa102d9..4da3c2a7 100644 --- a/src/app/webapp-common/experiments-compare/containers/experiment-compare-metric-charts/experiment-compare-scalar-charts.component.html +++ b/src/app/webapp-common/experiments-compare/containers/experiment-compare-metric-charts/experiment-compare-scalar-charts.component.html @@ -2,45 +2,46 @@
diff --git a/src/app/webapp-common/experiments-compare/containers/experiment-compare-metric-charts/experiment-compare-scalar-charts.component.scss b/src/app/webapp-common/experiments-compare/containers/experiment-compare-metric-charts/experiment-compare-scalar-charts.component.scss index 4e7b801b..e87c20d8 100644 --- a/src/app/webapp-common/experiments-compare/containers/experiment-compare-metric-charts/experiment-compare-scalar-charts.component.scss +++ b/src/app/webapp-common/experiments-compare/containers/experiment-compare-metric-charts/experiment-compare-scalar-charts.component.scss @@ -4,7 +4,9 @@ $list-width: 360px; :host { display: flex; - height: 100%; + flex-direction: column; + height: 50%; + flex-grow: 1; mat-drawer { background-color: $white; @@ -12,7 +14,9 @@ $list-width: 360px; mat-drawer-container { width: 100%; + flex: 1; } + .mat-drawer-side { border-color: #efefef; } diff --git a/src/app/webapp-common/experiments-compare/containers/experiment-compare-metric-charts/experiment-compare-scalar-charts.component.ts b/src/app/webapp-common/experiments-compare/containers/experiment-compare-metric-charts/experiment-compare-scalar-charts.component.ts index 69e30f76..b9348393 100644 --- a/src/app/webapp-common/experiments-compare/containers/experiment-compare-metric-charts/experiment-compare-scalar-charts.component.ts +++ b/src/app/webapp-common/experiments-compare/containers/experiment-compare-metric-charts/experiment-compare-scalar-charts.component.ts @@ -1,14 +1,11 @@ -import {AfterViewInit, ChangeDetectorRef, Component, OnDestroy, OnInit, ViewChild} from '@angular/core'; -import {Observable, Subscription} from 'rxjs'; +import {ChangeDetectorRef, Component, HostListener, OnDestroy, OnInit, ViewChild} from '@angular/core'; +import {combineLatest, Observable, Subscription} from 'rxjs'; import {Store} from '@ngrx/store'; -import {debounceTime, distinctUntilChanged, filter, map} from 'rxjs/operators'; +import {distinctUntilChanged, filter, take} from 'rxjs/operators'; import {isEqual} from 'lodash-es'; -import {GroupedList, mergeMultiMetrics, mergeMultiMetricsGroupedVariant} from '@common/tasks/tasks.utils'; -import {getMultiScalarCharts, resetExperimentMetrics, setExperimentMetricsSearchTerm, setExperimentSettings, setSelectedExperiments} from '../../actions/experiments-compare-charts.actions'; -import { - selectCompareSelectedSettingsGroupBy, selectCompareSelectedSettingsSmoothWeight, selectCompareSelectedSettingsxAxisType, selectCompareTasksScalarCharts, selectExperimentMetricsSearchTerm, - selectSelectedExperimentSettings, selectSelectedSettingsHiddenScalar, selectSelectedSettingsSmoothType -} from '../../reducers'; +import {createMultiSingleValuesChart, GroupedList, mergeMultiMetrics, mergeMultiMetricsGroupedVariant, prepareGraph} from '@common/tasks/tasks.utils'; +import {getMultiScalarCharts, getMultiSinleScalars, resetExperimentMetrics, setExperimentMetricsSearchTerm, setExperimentSettings, setScalarsHoverMode, setSelectedExperiments} from '../../actions/experiments-compare-charts.actions'; +import {selectCompareTasksScalarCharts, selectExperimentMetricsSearchTerm, selectMultiSingleValues, selectScalarsHoverMode, selectSelectedExperimentSettings} from '../../reducers'; import {ScalarKeyEnum} from '~/business-logic/model/events/scalarKeyEnum'; import {toggleShowScalarOptions} from '../../actions/compare-header.actions'; import {GroupByCharts, groupByCharts} from '@common/experiments/reducers/experiment-output.reducer'; @@ -16,46 +13,33 @@ import {ExtFrame} from '@common/shared/single-graph/plotly-graph-base'; import {RefreshService} from '@common/core/services/refresh.service'; import {selectRouterParams} from '@common/core/reducers/router-reducer'; import {ExperimentGraphsComponent} from '@common/shared/experiment-graphs/experiment-graphs.component'; -import {selectScalarsHoverMode} from '@common/experiments/reducers'; -import {setScalarsHoverMode} from '@common/experiments/actions/common-experiment-output.actions'; -import {ChartHoverModeEnum} from '@common/experiments/shared/common-experiments.const'; +import {ChartHoverModeEnum, singleValueChartTitle} from '@common/experiments/shared/common-experiments.const'; import {ReportCodeEmbedService} from '~/shared/services/report-code-embed.service'; -import {ActivatedRoute} from '@angular/router'; +import {ActivatedRoute, Params} from '@angular/router'; import {EntityTypeEnum} from '~/shared/constants/non-common-consts'; -import {SmoothTypeEnum} from '@common/shared/single-graph/single-graph.utils'; +import {smoothTypeEnum, SmoothTypeEnum} from '@common/shared/single-graph/single-graph.utils'; +import {EventsGetTaskSingleValueMetricsResponseTasks} from '~/business-logic/model/events/eventsGetTaskSingleValueMetricsResponseTasks'; +import {ExperimentCompareSettings} from "@common/experiments-compare/reducers/experiments-compare-charts.reducer"; @Component({ selector: 'sm-experiment-compare-scalar-charts', templateUrl: './experiment-compare-scalar-charts.component.html', - styleUrls: ['./experiment-compare-scalar-charts.component.scss'] + styleUrls: ['./experiment-compare-scalar-charts.component.scss'], }) -export class ExperimentCompareScalarChartsComponent implements OnInit, OnDestroy, AfterViewInit { +export class ExperimentCompareScalarChartsComponent implements OnInit, OnDestroy { - public smoothWeight$: Observable; - public smoothWeightDelayed$: Observable; - public xAxisType$: Observable; - public groupBy$: Observable; - private routerParams$: Observable; + private routerParams$: Observable; public metrics$: Observable; - public experimentSettings$: Observable; public searchTerm$: Observable; - public listOfHidden: Observable>; - private metricsSubscription: Subscription; - private settingsSubscription: Subscription; - private routerParamsSubscription: Subscription; - private refreshingSubscription: Subscription; - private xAxisSub: Subscription; - private groupBySub: Subscription; + private subs = new Subscription(); public graphList: GroupedList = {}; - public selectedGraph: string = null; private taskIds: Array; public graphs: { [key: string]: ExtFrame[] }; public groupBy: GroupByCharts; private metrics: GroupedList; - groupByOptions = [ { name: 'Metric', @@ -70,8 +54,23 @@ export class ExperimentCompareScalarChartsComponent implements OnInit, OnDestroy @ViewChild(ExperimentGraphsComponent) graphsComponent: ExperimentGraphsComponent; public hoverMode$: Observable; private entityType: EntityTypeEnum; - public smoothType$: Observable; public modelsFeature: boolean; + private singleValues$: Observable; + public singleValues: ExtFrame; + private settings$: Observable; + public settings: ExperimentCompareSettings = {} as ExperimentCompareSettings; + private initialSettings = { + groupBy: 'none', + smoothWeight: 0, + smoothType: smoothTypeEnum.exponential, + xAxisType: ScalarKeyEnum.Iter, + hiddenMetricsScalar: [] + } + private originalSettings: ExperimentCompareSettings; + + @HostListener("window:beforeunload", ["$event"]) unloadHandler() { + this.saveSettingsState(); + } constructor( private store: Store, @@ -81,71 +80,73 @@ export class ExperimentCompareScalarChartsComponent implements OnInit, OnDestroy private reportEmbed: ReportCodeEmbedService, ) { this.modelsFeature = this.route.snapshot?.parent.data?.setAllProject; - this.listOfHidden = this.store.select(selectSelectedSettingsHiddenScalar) - .pipe(distinctUntilChanged(isEqual)); + this.settings$ = this.store.select(selectSelectedExperimentSettings); this.searchTerm$ = this.store.select(selectExperimentMetricsSearchTerm); - this.smoothWeight$ = this.store.select(selectCompareSelectedSettingsSmoothWeight); - this.smoothWeightDelayed$ = this.store.select(selectCompareSelectedSettingsSmoothWeight).pipe(debounceTime(75)); - this.smoothType$ = this.store.select(selectSelectedSettingsSmoothType); - this.xAxisType$ = this.store.select(selectCompareSelectedSettingsxAxisType); - this.hoverMode$ = this.store.select(selectScalarsHoverMode); - this.groupBy$ = this.store.select(selectCompareSelectedSettingsGroupBy); + this.hoverMode$ = this.store.select(selectScalarsHoverMode).pipe( + filter(h => !!h), + distinctUntilChanged()); + this.singleValues$ = this.store.select(selectMultiSingleValues); this.metrics$ = this.store.select(selectCompareTasksScalarCharts).pipe( filter(metrics => !!metrics), distinctUntilChanged() ); - this.experimentSettings$ = this.store.select(selectSelectedExperimentSettings).pipe( - - filter(settings => !!settings), - map(settings => settings ? settings.selectedScalar : null), - filter(selectedPlot => selectedPlot !== undefined), - distinctUntilChanged() - ); - this.routerParams$ = this.store.select(selectRouterParams).pipe( - filter(params => !!params.ids), distinctUntilChanged() ); - this.xAxisSub = this.xAxisType$ - .pipe(filter(axis => !!axis && this.taskIds?.length > 0)) - .subscribe(() => this.store.dispatch(getMultiScalarCharts({taskIds: this.taskIds, entity: this.entityType, cached: true}))); - - this.groupBySub = this.groupBy$ - .subscribe(groupBy => { - this.groupBy = groupBy; - this.prepareGraphsAndUpdate(this.metrics); - }); } ngOnInit() { this.entityType = this.route.snapshot.parent.parent.data.entityType; - this.metricsSubscription = this.metrics$ - .subscribe((metricsWrapped) => { + this.subs.add(combineLatest([this.metrics$, this.singleValues$]) + .subscribe(([metricsWrapped, singleValues]) => { const metrics = metricsWrapped.metrics || {}; + + if (singleValues) { + const visibles = this.graphsComponent.singleValueGraph.first?.chart.data.reduce((curr, data) => { + curr[data.task] = data.visible + return curr; + }, {}) ?? {}; + const singleValuesData = createMultiSingleValuesChart(singleValues, visibles); + this.singleValues = prepareGraph(singleValuesData.data, singleValuesData.layout, {}, {type: 'singleValue'}); + } this.metrics = metrics; - this.prepareGraphsAndUpdate(metrics); - }); + this.prepareGraphsAndUpdate(metrics, this.singleValues); + })); - this.routerParamsSubscription = this.routerParams$ - .subscribe((params) => { - if (!this.taskIds || this.taskIds.join(',') !== params.ids) { - this.taskIds = params.ids.split(','); - this.store.dispatch(setSelectedExperiments({selectedExperiments: this.taskIds})); - this.store.dispatch(getMultiScalarCharts({taskIds: this.taskIds, entity: this.entityType})); - } - }); + this.subs.add(this.routerParams$.subscribe((params) => { + if (!this.taskIds || this.taskIds.join(',') !== params.ids) { + this.taskIds = params.ids.split(','); + this.store.dispatch(setSelectedExperiments({selectedExperiments: this.taskIds})); - this.refreshingSubscription = this.refresh.tick + window.setTimeout(() => { // Waiting for this.settings to be updated. + this.store.dispatch(getMultiScalarCharts({taskIds: this.taskIds, entity: this.entityType, xAxisType: this.settings.xAxisType})); + this.store.dispatch(getMultiSinleScalars({taskIds: this.taskIds, entity: this.entityType})); + }) + } + })); + + this.subs.add(this.refresh.tick .pipe(filter(auto => auto !== null && this.graphs !== null)) - .subscribe(autoRefresh => this.store.dispatch(getMultiScalarCharts({taskIds: this.taskIds, entity: this.entityType, autoRefresh}))); + .subscribe(autoRefresh => { + this.store.dispatch(getMultiScalarCharts({taskIds: this.taskIds, entity: this.entityType, xAxisType: this.settings.xAxisType})); + this.store.dispatch(getMultiSinleScalars({taskIds: this.taskIds, entity: this.entityType, autoRefresh})); + })); + + this.subs.add(this.settings$.pipe(take(1)).subscribe(settings => { + this.originalSettings = settings; + this.settings = settings ? {...this.initialSettings, ...settings} : {...this.initialSettings} as ExperimentCompareSettings; + })); } - private prepareGraphsAndUpdate(metrics) { - if (metrics) { - const merged = this.groupBy === 'metric' ? mergeMultiMetricsGroupedVariant(metrics) : mergeMultiMetrics(metrics); - this.graphList = this.groupBy === 'metric' ? this.buildNestedListWithoutChildren(merged) : metrics; + private prepareGraphsAndUpdate(metrics, singleValues) { + if (metrics || singleValues) { + let merged = {}; + if (metrics) { + merged = this.settings.groupBy === 'metric' ? mergeMultiMetricsGroupedVariant(metrics) : mergeMultiMetrics(metrics); + } + this.graphList = {...(this.settings.groupBy === 'metric' ? this.buildNestedListWithoutChildren(merged) : metrics), ...(singleValues?.data.length > 0 && {[singleValueChartTitle]: {}})}; if (!this.graphs || !isEqual(merged, this.graphs)) { this.graphs = merged; } @@ -161,20 +162,17 @@ export class ExperimentCompareScalarChartsComponent implements OnInit, OnDestroy } ngOnDestroy() { - this.metricsSubscription?.unsubscribe(); - this.settingsSubscription?.unsubscribe(); - this.routerParamsSubscription?.unsubscribe(); - this.xAxisSub?.unsubscribe(); - this.refreshingSubscription?.unsubscribe(); + this.saveSettingsState(); + this.subs.unsubscribe(); this.resetMetrics(); } metricSelected(id) { - this.store.dispatch(setExperimentSettings({id: this.taskIds, changes: {selectedScalar: id}})); + this.graphsComponent.scrollToGraph(id); } hiddenListChanged(hiddenList) { - this.store.dispatch(setExperimentSettings({id: this.taskIds, changes: {hiddenMetricsScalar: hiddenList}})); + this.settings = {...this.settings, hiddenMetricsScalar: hiddenList ?? []}; } searchTermChanged(searchTerm: string) { @@ -185,20 +183,22 @@ export class ExperimentCompareScalarChartsComponent implements OnInit, OnDestroy this.store.dispatch(resetExperimentMetrics()); } - changeSmoothness($event: any) { - this.store.dispatch(setExperimentSettings({id: this.taskIds, changes: {smoothWeight: $event}})); + changeSmoothness($event: number) { + this.settings = {...this.settings, smoothWeight: $event}; } changeSmoothType($event: SmoothTypeEnum) { - this.store.dispatch(setExperimentSettings({id: this.taskIds, changes: {smoothType: $event}})); + this.settings = {...this.settings, smoothType: $event}; } changeXAxisType($event: ScalarKeyEnum) { - this.store.dispatch(setExperimentSettings({id: this.taskIds, changes: {xAxisType: $event}})); + this.settings = {...this.settings, xAxisType: $event}; + this.store.dispatch(getMultiScalarCharts({taskIds: this.taskIds, entity: this.entityType, xAxisType: this.settings.xAxisType})); } changeGroupBy($event: GroupByCharts) { - this.store.dispatch(setExperimentSettings({id: this.taskIds, changes: {groupBy: $event}})); + this.settings = {...this.settings, groupBy: $event}; + this.prepareGraphsAndUpdate(this.metrics, this.singleValues); } toggleSettingsBar() { @@ -212,20 +212,18 @@ export class ExperimentCompareScalarChartsComponent implements OnInit, OnDestroy createEmbedCode(event: { metrics?: string[]; variants?: string[]; domRect: DOMRect }) { const entityType = this.entityType === EntityTypeEnum.model ? 'model' : 'task'; this.reportEmbed.createCode({ - type: 'scalar', - objects: this.taskIds, + type: event.metrics ? 'scalar' : 'single', + objects: (!!event.metrics || this.taskIds.length > 1) ? this.taskIds : [...this.taskIds, ''], objectType: entityType, ...event }); } - ngAfterViewInit(): void { - this.settingsSubscription = this.experimentSettings$ - .pipe(filter(metric => !!metric)) - .subscribe(selectedMetric => { - this.selectedGraph = selectedMetric; - this.graphsComponent.scrollToGraph(selectedMetric); - this.store.dispatch(setExperimentSettings({id: this.taskIds, changes: {selectedScalar: undefined}})); - }); + private saveSettingsState() { + // eslint-disable-next-line @typescript-eslint/no-unused-vars + const {id, lastModified, hiddenMetricsPlot, ...cleanSettings} = this.settings; + if (!isEqual(cleanSettings, this.originalSettings)) { + this.store.dispatch(setExperimentSettings({id: this.taskIds, changes: cleanSettings})); + } } } diff --git a/src/app/webapp-common/experiments-compare/containers/experiment-compare-metric-values/experiment-compare-metric-values.component.html b/src/app/webapp-common/experiments-compare/containers/experiment-compare-metric-values/experiment-compare-metric-values.component.html index e7c4acb0..f352119d 100644 --- a/src/app/webapp-common/experiments-compare/containers/experiment-compare-metric-values/experiment-compare-metric-values.component.html +++ b/src/app/webapp-common/experiments-compare/containers/experiment-compare-metric-values/experiment-compare-metric-values.component.html @@ -1,43 +1,100 @@ - -
- - -
-
-
-
- - {{node.data.key}} -
- + + +
+ - - {{metricValue}} - - +
-
- + + + + +
+ +

NO METRICS

+
+ +
+ All metrics hidden. Clear filters + +
+ + + + + +
+ + + + + + + +
+ + + + {{exp.name}} + + + + + + + {{metricVariant.firstMetricRow ? metricVariant.metric : ''}} + + +
+ {{metricVariant.variant}} + +
+ + +
+ {{metricVariant.values[exp.id]?.[valuesMode.key]}} + + MAX + MIN + +
+ + + + + + + diff --git a/src/app/webapp-common/experiments-compare/containers/experiment-compare-metric-values/experiment-compare-metric-values.component.scss b/src/app/webapp-common/experiments-compare/containers/experiment-compare-metric-values/experiment-compare-metric-values.component.scss index c1bc5752..d862ac66 100644 --- a/src/app/webapp-common/experiments-compare/containers/experiment-compare-metric-values/experiment-compare-metric-values.component.scss +++ b/src/app/webapp-common/experiments-compare/containers/experiment-compare-metric-values/experiment-compare-metric-values.component.scss @@ -1,80 +1,422 @@ @import "variables"; -.no-metric { - background-color: #f2f3f6; -} +////// Default prime theme /////// +$primaryColor: #fff; + +$emphasis-high: rgba(0, 0, 0, .87) !default; +$emphasis-medium: rgba(0, 0, 0, .60) !default; + +//global +$fontWeight: normal !default; +$textColor: $emphasis-high !default; +$textSecondaryColor: $emphasis-medium !default; +$listItemTransition: none !default; +$inlineSpacing: .5rem !default; +$loadingIconFontSize: 2rem !default; + +//selected state +$highlightBg: rgba($primaryColor, .12) !default; +$highlightTextColor: $primaryColor !default; + +//focus +$focusOutlineColor: transparent !default; +$focusOutline: 0 none !default; + +//table +$tableHeaderBorder: 1px solid #e4e4e4 !default; +$tableHeaderBorderWidth: 0 0 1px 0 !default; +$tableHeaderBg: #ffffff !default; +$tableHeaderTextColor: $textColor !default; +$tableHeaderFontWeight: 500 !default; +$tableHeaderPadding: 5px 16px !default; + +$tableHeaderCellPadding: 5px 16px !default; +$tableHeaderCellBg: $blue-25 !default; +$tableHeaderCellTextColor: $textColor !default; +$tableHeaderCellFontWeight: 500 !default; +$tableHeaderCellBorder: 1px solid #e4e4e4 !default; +$tableHeaderCellBorderWidth: 0 1px 1px 0 !default; + +$tableBodyRowBg: #ffffff !default; +$tableBodyRowTextColor: $textColor !default; +$tableBodyRowHoverBg: $blue-50 !default; +$tableBodyCellBorder: 1px solid $cloudy-blue !default; +$tableBodyCellPadding: 14px 1rem !default; + +$tableResizerHelperBg: $primaryColor !default; + +$tableCellContentAlignment: left !default; +$tableTopPaginatorBorderWidth: 0 0 1px 0 !default; +$tableBottomPaginatorBorderWidth: 0 0 1px 0 !default; :host { display: block; + height: 50%; + flex-grow: 1; + --cell-width: 220px; + + .experiment-header { + width: var(--cell-width); + min-width: var(--cell-width); + max-width: var(--cell-width); + white-space: nowrap; + + .experiment-color { + display: inline-block; + width: 10px; + height: 10px; + margin-right: 6px; + cursor: pointer; + } + + .experiment-name { + display: inline-block; + width: calc(100% - 20px); + } + } + + .value-cell { + max-width: var(--cell-width); + } +} + +.mat-drawer { + width: 434px; + background-color: #fff; +} + +.filter-header-cell { + border-right: $tableBodyCellBorder !important; + overflow: unset; + + i { + color: $blue-400; + margin-left: 8px; + + &:hover { + color: $blue-300; + } + } +} + +.filter-header { + display: flex; + width: 401px; + align-items: center; + gap: 12px; + + mat-form-field { + flex-grow: 1; + } + + .al-ico-filter-on, + .al-ico-filter-off { + .path2:before { + color: $blue-400; + } + + .path1:before { + color: $purple; + } + } +} + +.freeze-divider::after { + content: ""; + position: absolute; + top: 0; + right: -10px; height: 100%; - padding-top: 12px; + width: 1px; + box-shadow: -6px 0 4px rgba(0, 0, 0, 0.4); +} - .tree-card-body { - padding: 20px 15px 0 15px; - height: 100%; - overflow: auto; +.metrics-column { + width: 200px; + max-width: 200px; + overflow: hidden; + border-top: 1px solid transparent !important; + border-right: $tableBodyCellBorder; + border-left-width: 0px; + color: $blue-600; + font-weight: 500; + padding-left: 24px !important; + left: 0 !important; +} - .node { - min-height: 28px; - margin-bottom: 1px; +.variants-column { + width: 200px; + max-width: 200px; + border-right: 1px solid $cloudy-blue !important; + border-left-width: 0px; + color: $blue-400; + font-weight: 500; + left: 217px !important; +} - .content { - cursor: pointer; - font-size: 13px; - font-weight: 500; - color: $blue-500; +.variant-cell { + display: flex; + align-items: center; +} - .fas { - margin-left: 6px; - font-size: 11px; - width: 16px; - height: 28px; - display: inline-flex; - line-height: 28px; - align-items: center; - justify-content: center; - } - } +.variant-name { + flex: 1; +} - &.key-not-exists { - position: relative; - display: block; +.row-info-icon { + color: $blue-300; +} - .content { - background: #f2f3f6; - pointer-events: none; +tr:hover { + background-color: $blue-50; +} - .node-key, .node-chevron { - visibility: hidden; +tr.first-row { + td { + border-top-color: $blue-300 !important; + } + + &:first-child td { + border-top-color: transparent !important; + } +} + +.value-text { + text-overflow: ellipsis; + overflow: hidden; +} + +.value { + line-height: 1; + display: flex; + align-items: center; +} + +.tag { + display: inline-flex; + align-items: center; + justify-content: center; + font-family: system-ui, sans-serif; + font-size: 11px; + font-weight: 500; + text-align: center; + border-radius: 2px; + margin-left: 6px; + padding: 2px 4px; + + &.tag-max { + color: white; + background-color: $blue-400; + } + + &.tag-min { + color: $blue-400; + border: 1px solid $blue-400; + background-color: white; + } +} + +.close { + cursor: pointer; + position: absolute; + right: 10px; + top: 10px; + z-index: 1; +} + +:host ::ng-deep p-table { + + &.no-rows { + table { + table-layout: fixed !important; + } + } + .p-datatable { + table { + border-collapse: separate !important; + } + + .p-paginator-bottom { + border-width: $tableBottomPaginatorBorderWidth; + border-radius: 0; + } + + .p-datatable-header { + background: $tableHeaderBg; + color: $tableHeaderTextColor; + border: $tableHeaderBorder; + border-width: $tableHeaderBorderWidth; + padding: $tableHeaderPadding; + font-weight: $tableHeaderFontWeight; + } + + + .p-datatable-thead > tr > th { + text-align: $tableCellContentAlignment; + padding: $tableHeaderCellPadding; + border: $tableHeaderCellBorder; + border-width: $tableHeaderCellBorderWidth; + font-weight: $tableHeaderCellFontWeight; + color: $tableHeaderCellTextColor; + background: $tableHeaderCellBg; + transition: $listItemTransition; + } + + .p-datatable-tbody { + > tr { + background: $tableBodyRowBg; + color: $tableBodyRowTextColor; + transition: $listItemTransition; + + > td { + text-align: $tableCellContentAlignment; + border-top: $tableBodyCellBorder; + padding: $tableBodyCellPadding; + + .p-row-editor-save { + margin-right: $inlineSpacing; } } - al-table-diff { - display: block; - position: relative; - pointer-events: none; + &:hover { + background: $tableBodyRowHoverBg; + } - &:after { - position: absolute; - content: " "; - width: 100%; - height: 100%; - top: 0; - left: 0; - background: #f2f3f6; + &:hover .metrics-column { + background: #fff; + } + + &:focus { + outline: 0.15rem solid $focusOutlineColor; + outline-offset: 0.15rem; + } + + &:last-child td { + border-bottom: 1px solid $blue-300; + } + } + } + + .p-column-resizer-helper { + background: $tableResizerHelperBg; + } + + .p-datatable-scrollable-header, + .p-datatable-scrollable-footer { + background: #fff; + } + + &.p-datatable-scrollable > .p-datatable-wrapper > .p-datatable-table, + &.p-datatable-scrollable > .p-datatable-wrapper > .p-scroller-viewport > .p-scroller > .p-datatable-table { + > .p-datatable-thead, + > .p-datatable-tfoot { + background-color: $tableHeaderCellBg; + } + } + + .p-datatable-loading-icon { + font-size: $loadingIconFontSize; + } + + &.p-datatable-gridlines { + .p-datatable-header { + border-width: 1px 1px 0 1px; + } + + .p-datatable-footer { + border-width: 0 1px 1px 1px; + } + + .p-paginator-top { + border-width: 0 1px 0 1px; + } + + .p-paginator-bottom { + border-width: 0 1px 1px 1px; + } + + .p-datatable-thead { + > tr { + > th { + border-width: 1px 0 1px 1px; + + &:last-child { + border-width: 1px; + } } } } - &.hovered { - .content, &:after { - box-shadow: 0 0 0 1px $blue-250 inset; + .p-datatable-tbody { + > tr { + > td { + border-width: 1px 0 0 1px; - &.diff-row { - box-shadow: 0 0 0 1px lighten($strong-red, 20%) inset, 0 0 0 2px white inset; + &:last-child { + border-width: 1px 1px 0 1px; + } + } + + &:last-child { + > td { + border-width: 1px 0 1px 1px; + + &:last-child { + border-width: 1px; + } + } + } + } + } + + &:has(.p-datatable-thead):has(.p-datatable-tbody) .p-datatable-tbody { + > tr { + > td { + border-width: 0 0 1px 1px; + + &:last-child { + border-width: 0 1px 1px 1px; + } } } } } + + .p-scroller { + height: 100% !important; + } + } + + th { + overflow: hidden; + } + + tr th:first-child { + width: 500px; + max-width: 500px; + } + + tr td:last-child, + tr th:last-child { + width: auto !important; + max-width: none !important; } } + +.empty-state {pointer-events: none;} +.no-output { + color: $blue-100; + z-index: 1; + + &.all-filtered-message { + color: $blue-400; + .link { + color: $purple; + } + } +} +.i-no-table-data { + width: 150px; + height: 100px; + margin-bottom: 10px; +} diff --git a/src/app/webapp-common/experiments-compare/containers/experiment-compare-metric-values/experiment-compare-metric-values.component.ts b/src/app/webapp-common/experiments-compare/containers/experiment-compare-metric-values/experiment-compare-metric-values.component.ts index 3aefc499..77aab488 100644 --- a/src/app/webapp-common/experiments-compare/containers/experiment-compare-metric-values/experiment-compare-metric-values.component.ts +++ b/src/app/webapp-common/experiments-compare/containers/experiment-compare-metric-values/experiment-compare-metric-values.component.ts @@ -1,25 +1,40 @@ -import {ChangeDetectorRef, Component, OnDestroy, OnInit} from '@angular/core'; -import {selectRouterParams, selectRouterQueryParams} from '@common/core/reducers/router-reducer'; -import {select, Store} from '@ngrx/store'; -import {distinctUntilChanged, filter, map, tap} from 'rxjs/operators'; -import {has} from 'lodash-es'; -import {Observable, Subscription} from 'rxjs'; +import {ChangeDetectionStrategy, ChangeDetectorRef, Component, HostListener, OnDestroy, OnInit, QueryList, ViewChildren} from '@angular/core'; +import {selectRouterConfig, selectRouterParams} from '@common/core/reducers/router-reducer'; +import {Store} from '@ngrx/store'; +import {combineLatestWith, distinctUntilChanged, distinctUntilKeyChanged, filter, map, take, tap, throttleTime} from 'rxjs/operators'; +import {isEqual, mergeWith} from 'lodash-es'; +import {fromEvent, Observable, startWith, Subscription} from 'rxjs'; import * as metricsValuesActions from '../../actions/experiments-compare-metrics-values.actions'; -import {selectCompareMetricsValuesExperiments, selectCompareMetricsValuesSortConfig} from '../../reducers'; +import {selectCompareMetricsValuesExperiments, selectExportTable, selectSelectedSettingsHiddenScalar, selectShowRowExtremes} from '../../reducers'; import {ActivatedRoute, Router} from '@angular/router'; -import {addMessage} from '@common/core/actions/layout.actions'; -import {TreeNode} from '../../shared/experiments-compare-details.model'; -import {createDiffObjectScalars, getAllKeysEmptyObject} from '../../jsonToDiffConvertor'; import {RefreshService} from '@common/core/services/refresh.service'; -import {LIMITED_VIEW_LIMIT} from '@common/experiments-compare/experiments-compare.constants'; import {EntityTypeEnum} from '~/shared/constants/non-common-consts'; +import {Task} from '~/business-logic/model/tasks/task'; +import {FormControl} from '@angular/forms'; +import {setExperimentSettings, setSelectedExperiments} from '@common/experiments-compare/actions/experiments-compare-charts.actions'; +import {GroupedList} from '@common/tasks/tasks.utils'; +import {ColorHashService} from '@common/shared/services/color-hash/color-hash.service'; +import {rgbList2Hex} from '@common/shared/services/color-hash/color-hash.utils'; +import {trackById} from '@common/shared/utils/forms-track-by'; +import {ExportToCsv, Options} from 'export-to-csv'; +import {setExportTable} from '@common/experiments-compare/actions/compare-header.actions'; +import {Table} from 'primeng/table'; +import {ExperimentCompareSettings} from "@common/experiments-compare/reducers/experiments-compare-charts.reducer"; interface ValueMode { key: string; name: string; } -const VALUE_MODES: { [mode: string]: ValueMode } = { +interface ValueModes { + // eslint-disable-next-line @typescript-eslint/naming-convention + min_values: ValueMode, + // eslint-disable-next-line @typescript-eslint/naming-convention + max_values: ValueMode, + values: ValueMode, +} + +const VALUE_MODES: ValueModes = { // eslint-disable-next-line @typescript-eslint/naming-convention min_values: { key: 'min_value', @@ -36,191 +51,262 @@ const VALUE_MODES: { [mode: string]: ValueMode } = { }, }; + +interface tableRow { + metricId: string; + variantId: string; + metric: string; + variant: string; + firstMetricRow: boolean; + values: { [expId: string]: Task['last_metrics'] }; +} + +interface ExtTask extends Task { + orgName?: string; +} + @Component({ selector: 'sm-experiment-compare-metric-values', templateUrl: './experiment-compare-metric-values.component.html', - styleUrls: ['./experiment-compare-metric-values.component.scss', '../../cdk-drag.scss'] + styleUrls: ['./experiment-compare-metric-values.component.scss', '../../cdk-drag.scss'], + changeDetection: ChangeDetectionStrategy.OnPush }) export class ExperimentCompareMetricValuesComponent implements OnInit, OnDestroy { - public sortOrder$: Observable; - public comparedTasks$: Observable; + protected readonly trackById = trackById; - private comparedTasksSubscription: Subscription; - private refreshingSubscription: Subscription; - private paramsSubscription: Subscription; - private queryParamsSubscription: Subscription; - - public comparedTasks: TreeNode; - public allKeysEmptyObject = {}; - public refreshDisabled: boolean = false; - private paths = []; - public experiments = []; + public experiments: Array = []; public taskIds: string[]; public valuesMode: ValueMode; - public hoveredRow: string; - public hoveredTable: string; - public experimentTags: { [experimentId: string]: string[] } = {}; private entityType: EntityTypeEnum; + private comparedTasks$: Observable>; + public dataTable: tableRow[]; + public dataTableFiltered: tableRow[]; + public variantFilter = new FormControl(''); + public selectShowRowExtremes$: Observable; + public listSearchTerm: string; + public metricVariantList: GroupedList; + public listOfHidden$: Observable; + public filterOpen: boolean; + public experimentsColor: { [name: string]: string }; + + private subs = new Subscription(); + private selectExportTable$: Observable; + + @ViewChildren(Table) public tableComp: QueryList; + private scrollContainer: HTMLDivElement; + public scrolled: boolean; + private filterValue: string; + public settings: ExperimentCompareSettings = {} as ExperimentCompareSettings; + private initialSettings = { + hiddenMetricsScalar: [] + } as ExperimentCompareSettings + private originalSettings: string[]; + + @HostListener("window:beforeunload", ["$event"]) unloadHandler() { + this.saveSettingsState(); + } constructor( private router: Router, private route: ActivatedRoute, public store: Store, private changeDetection: ChangeDetectorRef, - private refresh: RefreshService + private refresh: RefreshService, + private colorHash: ColorHashService ) { - this.comparedTasks$ = this.store.pipe(select(selectCompareMetricsValuesExperiments)); - this.sortOrder$ = this.store.pipe(select(selectCompareMetricsValuesSortConfig)); + this.comparedTasks$ = this.store.select(selectCompareMetricsValuesExperiments); + this.selectShowRowExtremes$ = this.store.select(selectShowRowExtremes); + this.selectExportTable$ = this.store.select(selectExportTable).pipe(filter(e => !!e)); + this.listOfHidden$ = this.store.select(selectSelectedSettingsHiddenScalar).pipe(distinctUntilChanged(isEqual)); } ngOnInit() { this.entityType = this.route.snapshot.parent.parent.data.entityType; - this.queryParamsSubscription = this.store.pipe( - select(selectRouterQueryParams), - map(params => params?.scalars), + this.subs.add(this.store.select(selectRouterConfig).pipe( + map(params => params?.at(-1).replace('-', '_')), distinctUntilChanged() ).subscribe((valuesMode) => { this.valuesMode = VALUE_MODES[valuesMode] || VALUE_MODES['values']; - this.convertExperimentsToNodes(this.experiments.map(exp => exp.last_metrics)); - }); + this.changeDetection.detectChanges(); + })); - this.paramsSubscription = this.store.pipe( - select(selectRouterParams), + this.subs.add(this.store.select(selectRouterParams).pipe( + distinctUntilKeyChanged('ids'), map(params => params?.ids?.split(',')), tap(taskIds => this.taskIds = taskIds), - filter(taskIds => !!taskIds && taskIds !== this.getExperimentIdsParams(this.experiments)) + filter(taskIds => !!taskIds && taskIds?.join(',') !== this.getExperimentIdsParams(this.experiments)) ) .subscribe((experimentIds: string[]) => { + this.store.dispatch(setSelectedExperiments({selectedExperiments: this.taskIds})); this.store.dispatch(metricsValuesActions.getComparedExperimentsMetricsValues({ - taskIds: experimentIds.slice(0, LIMITED_VIEW_LIMIT), + taskIds: experimentIds, entity: this.entityType })); - }); + })); - this.comparedTasksSubscription = this.comparedTasks$ + this.subs.add(this.comparedTasks$ .pipe( filter(exp => !!exp), - tap(experiments => this.experiments = experiments), + distinctUntilChanged(), tap(experiments => { - this.extractTags(experiments); - }), - map(experiments => experiments.map(exp => exp.last_metrics))) - .subscribe(experimentsLastMetrics => { - this.refreshDisabled = false; - this.convertExperimentsToNodes(experimentsLastMetrics); + const nameRepetitions = experiments.reduce((acc, exp) => { + acc[exp.name] = (acc[exp.name] ?? 0) + 1; + return acc; + }, {}); + this.experiments = experiments.map(exp => nameRepetitions[exp.name] > 1 ? {...exp, orgName: exp.name, name: `${exp.name}.${exp.id.substring(0, 6)}`} : exp); + this.experimentsColor = experiments.reduce((acc, exp) => { + acc[exp.id] = rgbList2Hex(this.colorHash.initColor(`${exp.name}-${exp.id}`)); + return acc; + }, {} as { [name: string]: string }); + }) + ) + .subscribe(experiments => { + this.buildTableData(experiments); this.changeDetection.detectChanges(); - }); + this.startTableScrollListener(); + })); - this.refreshingSubscription = this.refresh.tick + this.subs.add(this.refresh.tick .pipe(filter(auto => auto !== null)) .subscribe((autoRefresh) => this.store.dispatch( metricsValuesActions.getComparedExperimentsMetricsValues({taskIds: this.taskIds, entity: this.entityType, autoRefresh}) - )); - } + ))); - ngOnDestroy(): void { - this.store.dispatch(metricsValuesActions.resetState()); - this.paramsSubscription.unsubscribe(); - this.queryParamsSubscription.unsubscribe(); - this.comparedTasksSubscription.unsubscribe(); - this.refreshingSubscription.unsubscribe(); - } + this.listOfHidden$.pipe(combineLatestWith(this.variantFilter.valueChanges.pipe(startWith('')))).subscribe(([, variantFilter]) => { + this.filterValue = variantFilter; + this.filter(this.filterValue); + }); - convertExperimentsToNodes(experiments) { - if (experiments) { - experiments = experiments.map(experiment => { - if (experiment) { - const convertedExperiment = {}; - Object.keys(experiment).map(key => { - convertedExperiment[Object.values(experiment[key])[0]['metric']] = experiment[key]; - }); - return convertedExperiment; - } - }); - this.allKeysEmptyObject = getAllKeysEmptyObject(experiments); - this.comparedTasks = experiments.map(experiment => createDiffObjectScalars(this.allKeysEmptyObject, experiments[0], experiment, this.metaDataTransformer, ''),); - } - } + this.subs.add(this.colorHash.getColorsObservable().pipe( + ).subscribe(() => { + this.experimentsColor = this.experiments?.reduce((acc, exp) => { + acc[exp.id] = rgbList2Hex(this.colorHash.initColor(`${exp.orgName ?? exp.name}-${exp.id}`)); + return acc; + }, {} as { [name: string]: string }); + this.changeDetection.detectChanges(); + })); - public metaDataTransformer = (data, key, path, extraParams) => { - const fullPath = path.concat([key]); - const keyExists = has(extraParams.comparedObject, fullPath); - return { - classStyle: keyExists ? 'key-exists' : 'key-not-exists', - }; - }; + this.subs.add(this.selectExportTable$.subscribe(() => { + this.dataTableFiltered.length && this.exportToCSV(); + this.store.dispatch(setExportTable({export: false})); + })); - trackByFn(index, item) { - return item.id; - } - - realIsNodeOpen(node) { - return this.paths.includes(node.data.key); - } - - collapsedToggled(node) { - if (!this.realIsNodeOpen(node)) { - this.paths.push(node.data.key); - } else { - this.paths = this.paths.filter(path => path !== node.data.key); - } - this.hoveredRow = node.data.key; - } - - metricSortChanged(event, nodeData) { - const orderedKeys = (this.sortByKeyOrValue(event.keyOrValue, event.keyValueArray, event.order)).map(keyValue => keyValue.key); - this.store.dispatch(metricsValuesActions.setMetricValuesSortBy({ - metric: nodeData.key, - keyOrValue: event.keyOrValue, - order: event.order, - keyOrder: orderedKeys + this.subs.add(this.listOfHidden$.pipe(take(1)).subscribe(hiddenScalars => { + this.originalSettings = hiddenScalars; + this.settings = hiddenScalars ? {...this.initialSettings, hiddenMetricsScalar: hiddenScalars} : {...this.initialSettings} as ExperimentCompareSettings; })); } - sortByKeyOrValue(sortBy, keyValueArray, order) { - if (sortBy === 'key') { - return keyValueArray.sort((a, b) => { - if (order === 'asc') { - return a.key.toLowerCase().localeCompare(b.key.toLowerCase()); - } else { - return b.key.toLowerCase().localeCompare(a.key.toLowerCase()); - } - }); - } else { - return keyValueArray.sort((a, b) => { - if (order === 'asc') { - return a.value - b.value; - } else { - return b.value - a.value; - } + private startTableScrollListener() { + this.scrollContainer = this.tableComp?.first?.el.nativeElement.getElementsByClassName('p-scroller')[0] ?? this.tableComp?.first?.el.nativeElement.getElementsByClassName('p-datatable-wrapper')[0] as HTMLDivElement; + if (this.scrollContainer) { + fromEvent(this.scrollContainer, 'scroll').pipe(throttleTime(150, undefined, {leading: true, trailing: true})).subscribe((e: Event) => { + this.scrolled = (e.target as HTMLDivElement).scrollLeft > 10; + this.changeDetection.detectChanges(); }); } } - public syncUrl(experiments: Array) { - const newParams = this.getExperimentIdsParams(experiments); - this.router.navigateByUrl(this.router.url.replace(this.taskIds.toString(), newParams)); + ngOnDestroy(): void { + this.saveSettingsState(); + this.store.dispatch(metricsValuesActions.resetState()); + this.subs.unsubscribe(); } - private getExperimentIdsParams(experiments: Array): string { + buildTableData(experiments: Task[]) { + if (experiments?.length > 0) { + const lastMetrics = experiments.map(exp => exp.last_metrics); + let allMetricsVariants: Task['last_metrics'] = {}; + allMetricsVariants = mergeWith(allMetricsVariants, ...lastMetrics); + + this.metricVariantList = {}; + const dataTable = Object.entries(allMetricsVariants).map(([metricId, metricsVar]) => Object.keys(metricsVar).map(variantId => { + let metric, variant; + return { + metricId, + variantId, + ...experiments.reduce((acc, exp) => { + acc.values[exp.id] = exp.last_metrics[metricId]?.[variantId] as Task['last_metrics']; + if (!metric && !variant && exp.last_metrics[metricId]?.[variantId]) { + metric = metric ?? exp.last_metrics[metricId][variantId].metric; + variant = variant ?? exp.last_metrics[metricId][variantId].variant; + } + if (metric) { + if (this.metricVariantList[metric]) { + this.metricVariantList[metric][variant] = {}; + } else { + this.metricVariantList[metric] = {[variant]: {}}; + } + } + return { + metric, + variant, + values: acc.values, + firstMetricRow: false, + min: acc.min ? Math.min(acc.min, exp.last_metrics[metricId]?.[variantId]?.[this.valuesMode.key] ?? acc.min) : exp.last_metrics[metricId]?.[variantId]?.[this.valuesMode.key], + max: acc.max ? Math.max(acc.max, exp.last_metrics[metricId]?.[variantId]?.[this.valuesMode.key] ?? acc.max) : exp.last_metrics[metricId]?.[variantId]?.[this.valuesMode.key] + }; + }, {values: {}} as { metric, variant, firstMetricRow: boolean, min: number, max: number, values: { [expId: string]: Task['last_metrics'] } }) + }; + })).flat(1); + this.dataTable = dataTable.sort((a) => a.metric.startsWith(':') ? 1 : -1); + this.filter(this.filterValue); + } + } + + filter = (value: string) => { + if (!this.dataTable) { + return; + } + this.dataTableFiltered = this.dataTable.filter(row => !this.settings.hiddenMetricsScalar?.includes(`${row.metric}${row.variant}`)).filter(row => row.metric.includes(value) || row.variant.includes(value)); + let previousMetric: string; + this.dataTableFiltered.forEach(row => { + row.firstMetricRow = row.metric !== previousMetric; + previousMetric = row.metric; + }); + }; + + private getExperimentIdsParams(experiments: Array<{ id?: string }>): string { return experiments ? experiments.map(e => e.id).toString() : ''; } - copyIdToClipboard() { - this.store.dispatch(addMessage('success', 'Copied to clipboard')); + clear() { + this.variantFilter.reset(''); } - onRowHovered(tableKey: string, tableName: string) { - this.hoveredRow = tableKey; - this.hoveredTable = tableName; + searchTermChanged(searchTerm: string) { + this.listSearchTerm = searchTerm; } - public extractTags(experiments) { - experiments.map(({tags, ...experiment}) => { - if (tags - ?.length || !this.experimentTags[experiment.id]?.length) { - this.experimentTags[experiment.id] = tags; - } - }); + hiddenListChanged(hiddenList: string[]) { + this.settings = {...this.settings, hiddenMetricsScalar: hiddenList}; + this.filter(this.filterValue); + } + + exportToCSV() { + const options: Options = { + filename: `Scalars compare table`, + showLabels: true, + headers: ['Metric', 'Variant'].concat(this.experiments.map(ex => ex.name)) + }; + const csvExporter = new ExportToCsv(options); + csvExporter.generateCsv(this.dataTableFiltered.map(row => { + return [row.metric, row.variant, ...Object.values(row.values).map(value => value?.[this.valuesMode.key] ?? '')]; + })); + } + + trackByFunction(index: number, item) { + return item?.id || item?.name || index; + } + + showAll() { + this.settings = {...this.settings, hiddenMetricsScalar: []}; + this.filter(this.filterValue); + } + + private saveSettingsState() { + if (!isEqual(this.settings.hiddenMetricsScalar, this.originalSettings)) { + this.store.dispatch(setExperimentSettings({id: this.taskIds, changes: {hiddenMetricsScalar: this.settings.hiddenMetricsScalar}})); + } } } diff --git a/src/app/webapp-common/experiments-compare/containers/experiment-compare-params/experiment-compare-params.component.html b/src/app/webapp-common/experiments-compare/containers/experiment-compare-params/experiment-compare-params.component.html index 42182aa9..10f5579f 100644 --- a/src/app/webapp-common/experiments-compare/containers/experiment-compare-params/experiment-compare-params.component.html +++ b/src/app/webapp-common/experiments-compare/containers/experiment-compare-params/experiment-compare-params.component.html @@ -58,7 +58,7 @@ }">
- 
{{node.data.key}}{{node.data.value}}{{node.data.value}}
@@ -99,7 +99,7 @@ - diff --git a/src/app/webapp-common/experiments-compare/containers/experiment-compare-params/experiment-compare-params.component.ts b/src/app/webapp-common/experiments-compare/containers/experiment-compare-params/experiment-compare-params.component.ts index ff64d1dd..6354e65e 100644 --- a/src/app/webapp-common/experiments-compare/containers/experiment-compare-params/experiment-compare-params.component.ts +++ b/src/app/webapp-common/experiments-compare/containers/experiment-compare-params/experiment-compare-params.component.ts @@ -1,15 +1,11 @@ -import {ChangeDetectionStrategy, ChangeDetectorRef, Component, OnInit} from '@angular/core'; -import {select, Store} from '@ngrx/store'; +import {ChangeDetectionStrategy, Component, OnInit} from '@angular/core'; import {selectExperimentsParams} from '../../reducers'; import {filter, tap} from 'rxjs/operators'; import {ExperimentCompareTree, IExperimentDetail} from '~/features/experiments-compare/experiments-compare-models'; import {ExperimentParams} from '../../shared/experiments-compare-details.model'; import {convertExperimentsArraysParams, getAllKeysEmptyObject, isParamsConverted} from '../../jsonToDiffConvertor'; import {ExperimentCompareBase} from '../experiment-compare-base'; -import {ActivatedRoute, Router} from '@angular/router'; -import {ExperimentInfoState} from '~/features/experiments/reducers/experiment-info.reducer'; -import {experimentListUpdated} from '../../actions/experiments-compare-params.actions'; -import {RefreshService} from '@common/core/services/refresh.service'; +import {paramsActions} from '../../actions/experiments-compare-params.actions'; import {LIMITED_VIEW_LIMIT} from '@common/experiments-compare/experiments-compare.constants'; import {EntityTypeEnum} from '~/shared/constants/non-common-consts'; @@ -20,21 +16,14 @@ import {EntityTypeEnum} from '~/shared/constants/non-common-consts'; changeDetection: ChangeDetectionStrategy.OnPush }) export class ExperimentCompareParamsComponent extends ExperimentCompareBase implements OnInit { - public showEllipsis: boolean = true; - protected entityType: EntityTypeEnum; + public showEllipsis = true; constructor( - public router: Router, - public store: Store, - public changeDetection: ChangeDetectorRef, - public activeRoute: ActivatedRoute, - public refresh: RefreshService, - public cdr: ChangeDetectorRef ) { - super(router, store, changeDetection, activeRoute, refresh, cdr); + super(); + this.experiments$ = this.store.select(selectExperimentsParams); } - experiments$ = this.store.pipe(select(selectExperimentsParams)); ngOnInit() { this.entityType = this.activeRoute.snapshot.parent.parent.data.entityType; @@ -42,7 +31,7 @@ export class ExperimentCompareParamsComponent extends ExperimentCompareBase impl this.compareTabPage = this.activeRoute?.snapshot?.routeConfig?.data?.mode; this.routerParamsSubscription = this.taskIds$.subscribe( (experimentIds) => { - this.store.dispatch(experimentListUpdated({ids: experimentIds.slice(0, LIMITED_VIEW_LIMIT), entity: this.entityType})); + this.store.dispatch(paramsActions.experimentListUpdated({ids: experimentIds.slice(0, LIMITED_VIEW_LIMIT), entity: this.entityType})); }); this.experimentsSubscription = this.experiments$.pipe( diff --git a/src/app/webapp-common/experiments-compare/containers/experiment-compare-plots/experiment-compare-plots.component.html b/src/app/webapp-common/experiments-compare/containers/experiment-compare-plots/experiment-compare-plots.component.html index c83fb27d..4475de12 100644 --- a/src/app/webapp-common/experiments-compare/containers/experiment-compare-plots/experiment-compare-plots.component.html +++ b/src/app/webapp-common/experiments-compare/containers/experiment-compare-plots/experiment-compare-plots.component.html @@ -4,8 +4,7 @@ checkAllIcon="al-ico-show" placeholder="Find plots" [list]="graphList" - [selected]="selectedGraph" - [checkedList]="listOfHidden | async" + [checkedList]="settings.hiddenMetricsPlot" [searchTerm]="searchTerm$ | async" (itemSelect)="metricSelected($event)" (hiddenChanged)="hiddenListChanged($event)" @@ -18,7 +17,7 @@ [metrics]="graphs" [isCompare]="true" [isGroupGraphs]="true" - [hiddenList]="listOfHidden | async" + [hiddenList]="settings.hiddenMetricsPlot" [exportForReport]="!modelsFeature" (createEmbedCode)="createEmbedCode($event)" (resetGraphs)="resetMetrics()" diff --git a/src/app/webapp-common/experiments-compare/containers/experiment-compare-plots/experiment-compare-plots.component.scss b/src/app/webapp-common/experiments-compare/containers/experiment-compare-plots/experiment-compare-plots.component.scss index 5d3a5300..4736ffdf 100644 --- a/src/app/webapp-common/experiments-compare/containers/experiment-compare-plots/experiment-compare-plots.component.scss +++ b/src/app/webapp-common/experiments-compare/containers/experiment-compare-plots/experiment-compare-plots.component.scss @@ -1,4 +1,7 @@ :host { + height: 50%; + flex-grow: 1; + .toggle-all { font-size: 10px; padding-right: 2px; diff --git a/src/app/webapp-common/experiments-compare/containers/experiment-compare-plots/experiment-compare-plots.component.ts b/src/app/webapp-common/experiments-compare/containers/experiment-compare-plots/experiment-compare-plots.component.ts index acbaa61e..6bc10379 100644 --- a/src/app/webapp-common/experiments-compare/containers/experiment-compare-plots/experiment-compare-plots.component.ts +++ b/src/app/webapp-common/experiments-compare/containers/experiment-compare-plots/experiment-compare-plots.component.ts @@ -1,9 +1,9 @@ -import {ChangeDetectorRef, Component, OnDestroy, OnInit, ViewChild} from '@angular/core'; +import {ChangeDetectorRef, Component, HostListener, OnDestroy, OnInit, ViewChild} from '@angular/core'; import {SelectableListItem} from '@common/shared/ui-components/data/selectable-list/selectable-list.model'; import {Observable, Subscription} from 'rxjs'; import {select, Store} from '@ngrx/store'; -import {ExperimentInfoState} from '~/features/experiments/reducers/experiment-info.reducer'; -import {distinctUntilChanged, filter, map, tap} from 'rxjs/operators'; +import {distinctUntilChanged, filter, take, tap} from 'rxjs/operators'; +import {combineLatest} from 'rxjs'; import {selectRouterParams} from '@common/core/reducers/router-reducer'; import {convertMultiPlots, prepareMultiPlots, sortMetricsList} from '@common/tasks/tasks.utils'; import {isEqual} from 'lodash-es'; @@ -17,8 +17,8 @@ import { import { selectCompareTasksPlotCharts, selectExperimentMetricsSearchTerm, - selectSelectedExperimentSettings, - selectSelectedSettingsHiddenPlot + selectGlobalLegendData, + selectSelectedSettingsHiddenPlot, } from '../../reducers'; import {ExtFrame} from '@common/shared/single-graph/plotly-graph-base'; import {RefreshService} from '@common/core/services/refresh.service'; @@ -27,6 +27,7 @@ import {ExperimentGraphsComponent} from '@common/shared/experiment-graphs/experi import { ReportCodeEmbedService } from '~/shared/services/report-code-embed.service'; import {ActivatedRoute} from '@angular/router'; import {EntityTypeEnum} from '~/shared/constants/non-common-consts'; +import {ExperimentCompareSettings} from "@common/experiments-compare/reducers/experiments-compare-charts.reducer"; @Component({ selector: 'sm-experiment-compare-plots', @@ -36,18 +37,13 @@ import {EntityTypeEnum} from '~/shared/constants/non-common-consts'; export class ExperimentComparePlotsComponent implements OnInit, OnDestroy { private routerParams$: Observable; - public listOfHidden: Observable>; + private listOfHidden$: Observable; public plots$: Observable; - public experimentSettings$: Observable; public searchTerm$: Observable; - private plotsSubscription: Subscription; - private settingsSubscription: Subscription; - private routerParamsSubscription: Subscription; - private refreshingSubscription: Subscription; + private subs = new Subscription(); public graphList: SelectableListItem[] = []; - public selectedGraph: string = null; private taskIds: Array; public graphs: { [key: string]: ExtFrame[] }; public refreshDisabled: boolean; @@ -55,7 +51,15 @@ export class ExperimentComparePlotsComponent implements OnInit, OnDestroy { @ViewChild(ExperimentGraphsComponent) graphsComponent: ExperimentGraphsComponent; private entityType: EntityTypeEnum; public modelsFeature: boolean; + public settings: ExperimentCompareSettings = {} as ExperimentCompareSettings; + private initialSettings = { + hiddenMetricsPlot: [] + } as ExperimentCompareSettings; + private originalSettings: any[]; + @HostListener("window:beforeunload", ["$event"]) unloadHandler() { + this.saveSettingsState(); + } constructor( private store: Store, private changeDetection: ChangeDetectorRef, @@ -64,20 +68,13 @@ export class ExperimentComparePlotsComponent implements OnInit, OnDestroy { private reportEmbed: ReportCodeEmbedService, ) { this.modelsFeature = this.route.snapshot?.parent.data?.setAllProject; - this.listOfHidden = this.store.pipe(select(selectSelectedSettingsHiddenPlot)); + this.listOfHidden$ = this.store.pipe(select(selectSelectedSettingsHiddenPlot)); this.searchTerm$ = this.store.pipe(select(selectExperimentMetricsSearchTerm)); this.plots$ = this.store.pipe( select(selectCompareTasksPlotCharts), filter(metrics => !!metrics), distinctUntilChanged() ); - this.experimentSettings$ = this.store.pipe( - select(selectSelectedExperimentSettings), - filter(settings => !!settings), - map(settings => settings ? settings.selectedPlot : null), - filter(selectedPlot => selectedPlot !== undefined), - distinctUntilChanged() - ); this.routerParams$ = this.store.pipe( select(selectRouterParams), @@ -90,47 +87,47 @@ export class ExperimentComparePlotsComponent implements OnInit, OnDestroy { ngOnInit() { this.entityType = this.route.snapshot.parent.parent.data.entityType; - this.plotsSubscription = this.plots$ - .subscribe((metricsPlots) => { + this.subs.add(combineLatest([this.plots$, this.store.select(selectGlobalLegendData)]) + .subscribe(([metricsPlots, globalLegend]) => { this.refreshDisabled = false; - const {merged, parsingError} = prepareMultiPlots(metricsPlots); + const {merged, parsingError} = prepareMultiPlots(metricsPlots, globalLegend); this.graphList = this.prepareList(merged); - const newGraphs = convertMultiPlots(merged); + const tagsLists = globalLegend.reduce((acc, task) => { + acc[task.id] = task.tags ?? []; + return acc; + }, {} as {[id:string]: string[]}); + const newGraphs = convertMultiPlots(merged, tagsLists); if (!this.graphs || !isEqual(newGraphs, this.graphs)) { this.graphs = newGraphs; } this.changeDetection.detectChanges(); parsingError && this.store.dispatch(addMessage('warn', `Couldn't read all plots. Please make sure all plots are properly formatted (NaN & Inf aren't supported).`, [], true)); - }); + })); - this.settingsSubscription = this.experimentSettings$ - .subscribe((selectedPlot) => { - this.selectedGraph = selectedPlot; - this.graphsComponent?.scrollToGraph(selectedPlot); - this.store.dispatch(setExperimentSettings({id: this.taskIds, changes: {selectedPlot: null}})); - }); - - this.routerParamsSubscription = this.routerParams$ + this.subs.add(this.routerParams$ .subscribe((params) => { if (!this.taskIds || this.taskIds.join(',') !== params.ids) { this.taskIds = params.ids.split(','); this.store.dispatch(setSelectedExperiments({selectedExperiments: this.taskIds})); this.store.dispatch(getMultiPlotCharts({taskIds: this.taskIds, entity: this.entityType})); } - }); + })); - this.refreshingSubscription = this.refresh.tick + this.subs.add(this.refresh.tick .pipe(filter(auto => auto !== null)) .subscribe(autoRefresh => this.store.dispatch(getMultiPlotCharts({taskIds: this.taskIds, entity: this.entityType, autoRefresh})) - ); + )); + + this.subs.add(this.listOfHidden$.pipe(take(1)).subscribe(hiddenPlots => { + this.originalSettings = hiddenPlots; + this.settings = hiddenPlots ? {...this.initialSettings, hiddenMetricsPlot: hiddenPlots} : {...this.initialSettings} as ExperimentCompareSettings; + })); } ngOnDestroy() { - this.plotsSubscription.unsubscribe(); - this.settingsSubscription.unsubscribe(); - this.routerParamsSubscription.unsubscribe(); - this.refreshingSubscription.unsubscribe(); + this.saveSettingsState(); + this.subs.unsubscribe(); this.resetMetrics(); } @@ -141,11 +138,11 @@ export class ExperimentComparePlotsComponent implements OnInit, OnDestroy { } metricSelected(id) { - this.store.dispatch(setExperimentSettings({id: this.taskIds, changes: {selectedPlot: id}})); + this.graphsComponent?.scrollToGraph(id); } hiddenListChanged(hiddenList) { - this.store.dispatch(setExperimentSettings({id: this.taskIds, changes: {hiddenMetricsPlot: hiddenList}})); + this.settings = {...this.settings, hiddenMetricsPlot: hiddenList}; } @@ -167,4 +164,10 @@ export class ExperimentComparePlotsComponent implements OnInit, OnDestroy { ...event }); } + + private saveSettingsState() { + if (!isEqual(this.settings.hiddenMetricsPlot, this.originalSettings)) { + this.store.dispatch(setExperimentSettings({id: this.taskIds, changes: {hiddenMetricsPlot: this.settings.hiddenMetricsPlot}})); + } + } } diff --git a/src/app/webapp-common/experiments-compare/containers/model-compare-details/model-compare-details.component.html b/src/app/webapp-common/experiments-compare/containers/model-compare-details/model-compare-details.component.html index 6662c22c..4bb20e33 100644 --- a/src/app/webapp-common/experiments-compare/containers/model-compare-details/model-compare-details.component.html +++ b/src/app/webapp-common/experiments-compare/containers/model-compare-details/model-compare-details.component.html @@ -43,7 +43,6 @@ class="title-key" [smTooltip]="(renameMap[node.data.key] || node.data.key) | hideHashTitle" [matTooltipShowDelay]="500" - smShowTooltipIfEllipsis [class.ellipsis]="showEllipsis" [style.width.px]="showEllipsis ? nativeWidth - 65 - node.level * 20 : null" @@ -69,7 +68,12 @@ [class.no-ellipsis]="((node.data.key | hideHash) + node.data.value).length < 45" [class.with-ellipsis]="showEllipsis" [style.width.px]="showEllipsis ? nativeWidth - 55 - node.level * 20 : null" - >{{node.data.key | hideHash}}{{node.data.value}} + >{{node.data.key | + hideHash}}{{node.data.value.dataValue}}{{node.data.key | hideHash}}{{node.data.value}}
@@ -96,7 +100,7 @@ - diff --git a/src/app/webapp-common/experiments-compare/containers/model-compare-details/model-compare-details.component.scss b/src/app/webapp-common/experiments-compare/containers/model-compare-details/model-compare-details.component.scss index fe0237c5..f96da88c 100644 --- a/src/app/webapp-common/experiments-compare/containers/model-compare-details/model-compare-details.component.scss +++ b/src/app/webapp-common/experiments-compare/containers/model-compare-details/model-compare-details.component.scss @@ -10,6 +10,9 @@ display: inline-block; position: relative; overflow: visible; + .link { + color: $purple; + } &.with-ellipsis { overflow: hidden; diff --git a/src/app/webapp-common/experiments-compare/containers/model-compare-details/model-compare-details.component.ts b/src/app/webapp-common/experiments-compare/containers/model-compare-details/model-compare-details.component.ts index 13bb60ab..57d35f9e 100644 --- a/src/app/webapp-common/experiments-compare/containers/model-compare-details/model-compare-details.component.ts +++ b/src/app/webapp-common/experiments-compare/containers/model-compare-details/model-compare-details.component.ts @@ -20,21 +20,14 @@ import {ModelDetail} from '@common/experiments-compare/shared/experiments-compar changeDetection: ChangeDetectionStrategy.OnPush }) export class ModelCompareDetailsComponent extends ExperimentCompareBase implements OnInit, AfterViewInit { - public showEllipsis: boolean = true; + public showEllipsis = true; - constructor( - public router: Router, - public store: Store, - public changeDetection: ChangeDetectorRef, - public activeRoute: ActivatedRoute, - public cdr: ChangeDetectorRef, - public refresh: RefreshService - ) { - super(router, store, changeDetection, activeRoute, refresh, cdr); + constructor() { + super(); this.entityType = EntityTypeEnum.model; + this.experiments$ = this.store.select(selectModelsDetails); } - experiments$ = this.store.pipe(select(selectModelsDetails)); ngOnInit() { this.onInit(); @@ -74,7 +67,7 @@ export class ModelCompareDetailsComponent extends ExperimentCompareBase implemen this.showEllipsis = !this.showEllipsis; } - public buildExperimentTree(experiment, baseExperiment, mergedExperiment): any { + public override buildExperimentTree(experiment, baseExperiment, mergedExperiment): any { return { general: this.buildSectionTree(experiment, 'general', mergedExperiment), labels: this.buildSectionTree(experiment, 'labels', mergedExperiment), diff --git a/src/app/webapp-common/experiments-compare/containers/select-experiments-for-compare/select-experiments-for-compare.component.ts b/src/app/webapp-common/experiments-compare/containers/select-experiments-for-compare/select-experiments-for-compare.component.ts index 9dfd08fb..5098ee95 100644 --- a/src/app/webapp-common/experiments-compare/containers/select-experiments-for-compare/select-experiments-for-compare.component.ts +++ b/src/app/webapp-common/experiments-compare/containers/select-experiments-for-compare/select-experiments-for-compare.component.ts @@ -68,7 +68,7 @@ import {EXPERIMENTS_PAGE_SIZE} from '@common/experiments/shared/common-experimen import {setParents} from '@common/experiments/actions/common-experiments-view.actions'; import {INITIAL_CONTROLLER_TABLE_COLS} from '@common/pipelines-controller/controllers.consts'; import {EXPERIMENTS_TABLE_COL_FIELDS} from '~/features/experiments/shared/experiments.const'; -import {setTableCols} from '../../../experiments/actions/common-experiments-view.actions'; +import {hyperParamSelectedExperiments, hyperParamSelectedInfoExperiments, setHyperParamsFiltersPage, setTableCols} from '../../../experiments/actions/common-experiments-view.actions'; export const allowAddExperiment$ = (selectRouterParams$: Observable) => selectRouterParams$.pipe( distinctUntilKeyChanged('ids'), @@ -118,6 +118,8 @@ export class SelectExperimentsForCompareComponent implements OnInit, OnDestroy { @ViewChild('searchExperiments', {static: true}) searchExperiments; @ViewChild(ExperimentsTableComponent) table: ExperimentsTableComponent; private parents: ProjectsGetTaskParentsResponseParents[]; + private timer: number; + private previousExperimentsLength: number; constructor( private store: Store, @@ -135,10 +137,12 @@ export class SelectExperimentsForCompareComponent implements OnInit, OnDestroy { ]).pipe( map(([experiments, selectedExperiments]) => { const union = unionBy(selectedExperiments, experiments, 'id'); - if (experiments?.length >= EXPERIMENTS_PAGE_SIZE && (union.length - (selectedExperiments?.length ?? 0) < EXPERIMENTS_PAGE_SIZE * (this.loadMoreCount + 1))) { + if (this.previousExperimentsLength !== experiments?.length && experiments?.length >= EXPERIMENTS_PAGE_SIZE && (union.length - (selectedExperiments?.length ?? 0) < EXPERIMENTS_PAGE_SIZE * (this.loadMoreCount + 1))) { this.store.dispatch(experimentsActions.getNextExperiments()); + this.previousExperimentsLength = experiments?.length; } - return union; + // Simple hack to show 'archived' tag in select experiment table (without the table knows) + return union.map(e => ({...e, system_tags: e.system_tags?.map((t => t.replace('archive', ' archive')))})); }) ); this.searchTerm$ = this.store.pipe(select(selectExperimentsForCompareSearchTerm)); @@ -183,7 +187,9 @@ export class SelectExperimentsForCompareComponent implements OnInit, OnDestroy { } public searchTermChanged(term: string) { - this.store.dispatch(experimentsActions.globalFilterChanged({query: term})); + this.previousExperimentsLength = null; + clearTimeout(this.timer); + this.timer = window.setTimeout( () => this.store.dispatch(experimentsActions.globalFilterChanged({query: term})), 300); } public closeSearch() { @@ -211,6 +217,7 @@ export class SelectExperimentsForCompareComponent implements OnInit, OnDestroy { ngOnInit() { + this.previousExperimentsLength = null; this.store.dispatch(setTableCols({cols: this.initTableCols})); this.store.dispatch(setShowSearchExperimentsForCompare({payload: true})); this.store.dispatch(resetTablesFilterProjectsOptions()); @@ -268,11 +275,13 @@ export class SelectExperimentsForCompareComponent implements OnInit, OnDestroy { } sortedChanged(event: { isShift: boolean; colId: ISmCol['id'] }) { + this.previousExperimentsLength = null; this.syncSelectedExperiments(); this.store.dispatch(compareAddDialogTableSortChanged(event)); } filterChanged({col, value, andFilter}: { col: ISmCol; value: any; andFilter?: boolean }) { + this.previousExperimentsLength = null; this.syncSelectedExperiments(); this.store.dispatch(compareAddTableFilterChanged({ filter: { @@ -301,10 +310,12 @@ export class SelectExperimentsForCompareComponent implements OnInit, OnDestroy { } showArchived(event: MatSlideToggleChange) { + this.previousExperimentsLength = null; this.store.dispatch(setAddTableViewArchived({show: event.checked})); } filterSearchChanged({colId, value}: { colId: string; value: { value: string; loadMore?: boolean } }) { + this.previousExperimentsLength = null; switch (colId) { case 'project.name': if (this.projectId === '*' && !value.loadMore) { @@ -320,6 +331,13 @@ export class SelectExperimentsForCompareComponent implements OnInit, OnDestroy { this.store.dispatch(experimentsActions.getParents({searchValue: value.value || '', allProjects: true})); } } + if (colId.startsWith('hyperparams.')) { + if (!value.loadMore) { + this.store.dispatch(hyperParamSelectedInfoExperiments({col: {id: colId}, loadMore: false, values: null})); + this.store.dispatch(setHyperParamsFiltersPage({page: 0})); + } + this.store.dispatch(hyperParamSelectedExperiments({col: {id: colId, getter: `${colId}.value`}, searchValue: value.value || ''})); + } } private getInitTablesCols(entityType: EntityTypeEnum) { diff --git a/src/app/webapp-common/experiments-compare/dumbs/compare-card-list/compare-card-list.component.html b/src/app/webapp-common/experiments-compare/dumbs/compare-card-list/compare-card-list.component.html index 26091d92..9c61966d 100644 --- a/src/app/webapp-common/experiments-compare/dumbs/compare-card-list/compare-card-list.component.html +++ b/src/app/webapp-common/experiments-compare/dumbs/compare-card-list/compare-card-list.component.html @@ -30,15 +30,16 @@ + smTooltip="Remove from comparison" data-id="removeComparision"> + smTooltip="Set as baseline" data-id="setBaselineButton"> @@ -53,7 +54,7 @@
-
+
Only the first 10 experiments are available for this view...
diff --git a/src/app/webapp-common/experiments-compare/dumbs/compare-card-list/compare-card-list.component.scss b/src/app/webapp-common/experiments-compare/dumbs/compare-card-list/compare-card-list.component.scss index c946641b..e4ed16d5 100644 --- a/src/app/webapp-common/experiments-compare/dumbs/compare-card-list/compare-card-list.component.scss +++ b/src/app/webapp-common/experiments-compare/dumbs/compare-card-list/compare-card-list.component.scss @@ -46,8 +46,7 @@ #experiment-details-container { overflow: auto; height: 100%; - margin: 0 2px; - padding: 0 30px; + padding: 0 24px; max-width: 100%; min-height: 60px; display: flex; diff --git a/src/app/webapp-common/experiments-compare/dumbs/experiment-compare-general-data/experiment-compare-general-data.component.html b/src/app/webapp-common/experiments-compare/dumbs/experiment-compare-general-data/experiment-compare-general-data.component.html index 3953463f..1d28fb2b 100644 --- a/src/app/webapp-common/experiments-compare/dumbs/experiment-compare-general-data/experiment-compare-general-data.component.html +++ b/src/app/webapp-common/experiments-compare/dumbs/experiment-compare-general-data/experiment-compare-general-data.component.html @@ -1,13 +1,16 @@
-
{{experiment.project?.name}}
+
{{experiment.project?.name}}
-
{{experiment.name}} +
+ + {{experiment.name}} +
-
+
{{experimentsStatusLabels[experiment.status] ?? experiment.status}} diff --git a/src/app/webapp-common/experiments-compare/dumbs/experiment-compare-general-data/experiment-compare-general-data.component.scss b/src/app/webapp-common/experiments-compare/dumbs/experiment-compare-general-data/experiment-compare-general-data.component.scss index 2b67c648..cb208d03 100644 --- a/src/app/webapp-common/experiments-compare/dumbs/experiment-compare-general-data/experiment-compare-general-data.component.scss +++ b/src/app/webapp-common/experiments-compare/dumbs/experiment-compare-general-data/experiment-compare-general-data.component.scss @@ -5,6 +5,7 @@ .project { font-size: 12px; width: 330px; + min-height: 16px; line-height: 1.5; margin-bottom: 6px; } diff --git a/src/app/webapp-common/experiments-compare/dumbs/experiment-compare-header/experiment-compare-header.component.html b/src/app/webapp-common/experiments-compare/dumbs/experiment-compare-header/experiment-compare-header.component.html index 650c9456..4e3ffdb9 100644 --- a/src/app/webapp-common/experiments-compare/dumbs/experiment-compare-header/experiment-compare-header.component.html +++ b/src/app/webapp-common/experiments-compare/dumbs/experiment-compare-header/experiment-compare-header.component.html @@ -1,51 +1,56 @@
- + + + (click)="openAddExperimentSearch()" class="btn btn-secondary btn-add-experiment plus"> - - - - Parallel Coordinates - Graph - Last Values - {{(queryParamsViewMode$ | async) || viewMode | noUnderscore | titlecase}} - - + + + + Parallel Coordinates + Graph + Last Values + {{(queryParamsViewMode$ | async) || viewMode | noUnderscore | titlecase}} + + + - - {{currentPage === 'scalars' ? 'Last Values' : 'Values'}} + Last Values - + Min Values - + Max Values - - {{currentPage === 'hyper-params' ? 'Parallel Coordinates' : 'Graph'}} + + + + Values + + + {{currentPage === 'hyper-params' ? 'Parallel Coordinates' : 'Graph'}} + -
+
Hide Identical Fields + Show row extremes + +
- + + + + + + + ; + public selectShowRowExtremes$: Observable; public viewMode: string; public currentPage: string; @@ -33,26 +38,29 @@ export class ExperimentCompareHeaderComponent implements OnInit, OnDestroy { public queryParamsViewMode$: Observable; private autorRefreshSub: Subscription; private showMenuSub: Subscription; - private selectedIds: string; @Input() entityType: EntityTypeEnum; - @Output() selectionChanged = new EventEmitter(); constructor( private store: Store, private route: ActivatedRoute, private router: Router, private cdr: ChangeDetectorRef, - private dialog: MatDialog, - private refresh: RefreshService + private refresh: RefreshService, + private dialog: MatDialog ) { this.selectHideIdenticalFields$ = this.store.select(selectHideIdenticalFields); + this.selectShowRowExtremes$ = this.store.select(selectShowRowExtremes); this.queryParamsViewMode$ = this.store.select(selectRouterQueryParams) .pipe(map(params => params[this.currentPage])); + this.routerSubscription = this.store.select(selectRouterParams).subscribe((params) => { + this.selectedIds = params?.ids; + }) } ngOnInit() { + this.store.dispatch(setArchive({archive: false})); this.autorRefreshSub = this.refresh.tick .pipe(filter(auto => auto === null)) .subscribe(() => this.store.dispatch(refreshIfNeeded({payload: true, autoRefresh: true, entityType: this.entityType}))); @@ -60,13 +68,12 @@ export class ExperimentCompareHeaderComponent implements OnInit, OnDestroy { this.routerSubscription = this.store.select(selectRouterUrl).subscribe(() => { this.currentPage = this.route?.snapshot?.firstChild?.url?.[0]?.path; this.viewMode = this.route?.snapshot?.firstChild?.url?.[1]?.path; + if (this.currentPage && this.viewMode) { + this.store.dispatch(paramsActions.setView({primary: this.currentPage, secondary: this.viewMode})) + } this.cdr.detectChanges(); }); - this.routerSubscription = this.store.select(selectRouterParams).subscribe((params) => { - this.selectedIds = params.ids; - }) - this.allowAddExperiment$ = allowAddExperiment$(this.store.select(selectRouterParams)); } @@ -76,12 +83,9 @@ export class ExperimentCompareHeaderComponent implements OnInit, OnDestroy { this.showMenuSub?.unsubscribe(); } - changeView($event: MatSelectChange) { - const queryParam = {[this.currentPage]: $event.value}; - const page = $event.value.replace(/.*_/, ''); - this.store.dispatch(setNavigationPreferences({navigationPreferences: queryParam})); + changeView(event: MatSelectChange) { + const page = event.value.replace(/.*_/, ''); this.router.navigate([`./${this.currentPage}/${page}`], { - queryParams: queryParam, relativeTo: this.route, queryParamsHandling: 'merge' }); @@ -98,21 +102,34 @@ export class ExperimentCompareHeaderComponent implements OnInit, OnDestroy { height: '94vh', width: '98%', maxWidth: '100%' - }).afterClosed().pipe(filter(ids => !!ids)).subscribe(ids => this.selectionChanged.emit(ids)); + }).afterClosed().pipe(filter(ids => !!ids)).subscribe(ids => this.updateUrl(ids)); } else { this.dialog.open(SelectExperimentsForCompareComponent, { data: {entityType: this.entityType}, height: '94vh', width: '98%', maxWidth: '100%' - }).afterClosed().pipe(filter(ids => !!ids)).subscribe(ids => this.selectionChanged.emit(ids)); + }).afterClosed().pipe(filter(ids => !!ids)).subscribe(ids => this.updateUrl(ids)); } } + updateUrl(ids: string[]) { + this.router.navigate( + [{ids}, ...this.route.firstChild?.snapshot.url.map(segment => segment.path)], + { + queryParamsHandling: 'preserve', + relativeTo: this.route, + }); + } + hideIdenticalFieldsToggled(event: MatSlideToggleChange) { this.store.dispatch(setHideIdenticalFields({payload: event.checked})); } + showExtremesToggled(event: MatSlideToggleChange) { + this.store.dispatch(setShowRowExtremes({payload: event.checked})); + } + toggleSettings() { this.store.dispatch(toggleShowScalarOptions()); } @@ -124,4 +141,13 @@ export class ExperimentCompareHeaderComponent implements OnInit, OnDestroy { menuClosed() { this.store.dispatch(setShowSearchExperimentsForCompare({payload: false})); } + + exportCSV() { + this.store.dispatch(setExportTable({export: true})); + } + + showGlobalLegend() { + this.store.dispatch(setShowGlobalLegend()); + + } } diff --git a/src/app/webapp-common/experiments-compare/dumbs/parallel-coordinates-graph/parallel-coordinates-graph.component.ts b/src/app/webapp-common/experiments-compare/dumbs/parallel-coordinates-graph/parallel-coordinates-graph.component.ts index dbe2b699..7cbaff8c 100644 --- a/src/app/webapp-common/experiments-compare/dumbs/parallel-coordinates-graph/parallel-coordinates-graph.component.ts +++ b/src/app/webapp-common/experiments-compare/dumbs/parallel-coordinates-graph/parallel-coordinates-graph.component.ts @@ -1,4 +1,4 @@ -import {Component, ElementRef, EventEmitter, HostListener, Input, OnInit, Output, ViewChild} from '@angular/core'; +import {ChangeDetectorRef, Component, ElementRef, EventEmitter, HostListener, Input, OnInit, Output, ViewChild} from '@angular/core'; import { DARK_THEME_GRAPH_LINES_COLOR, DARK_THEME_GRAPH_TICK_COLOR, ExtData, @@ -7,7 +7,6 @@ import { PlotlyGraphBaseComponent } from '@common/shared/single-graph/plotly-graph-base'; import {NgForOf, NgIf, SlicePipe} from '@angular/common'; -import {Store} from '@ngrx/store'; import {debounceTime, filter, take} from 'rxjs/operators'; import {from} from 'rxjs'; import {cloneDeep, get, isEqual, max, min, uniq} from 'lodash-es'; @@ -158,10 +157,10 @@ export class ParallelCoordinatesGraphComponent extends PlotlyGraphBaseComponent constructor( private colorHash: ColorHashService, - protected store: Store, private dialog: MatDialog, + private cdr: ChangeDetectorRef ) { - super(store); + super(); } ngOnInit(): void { @@ -184,6 +183,7 @@ export class ParallelCoordinatesGraphComponent extends PlotlyGraphBaseComponent ) .subscribe(() => { this.prepareGraph(); + window.setTimeout(() => this.cdr.detectChanges()); }); } @@ -224,7 +224,7 @@ export class ParallelCoordinatesGraphComponent extends PlotlyGraphBaseComponent parameter = `${parameter}.value`; const allValuesIncludingNull = this.experiments.map(experiment => get(experiment.hyperparams, parameter)); const allValues = allValuesIncludingNull.filter(value => (value !== undefined)).filter(value => (value !== '')); - const textVal: any = {}; + const textVal = {} as {[key: string]: number}; let ticktext = this.naturalCompare(uniq(allValues).filter(text => text !== '')); (allValuesIncludingNull.length > allValues.length) && (ticktext = ['N/A'].concat(ticktext)); const tickvals = ticktext.map((text, index) => { @@ -348,12 +348,13 @@ export class ParallelCoordinatesGraphComponent extends PlotlyGraphBaseComponent if (this.parameters) { const graph = select(this.parallelGraph.nativeElement); this.graphWidth = graph.node().getBoundingClientRect().width; - graph.selectAll('.y-axis').each((d, index, element) => { - if ((d as any).key === this.metric.name) { - select(element[index]).attr('class', 'y-axis metric-column'); - } - }); - graph.selectAll('.axis-title').text((d: any) => this.wrap(d.key)).append('title').text(d => (d as any).key); + graph.selectAll('.y-axis') + .filter((d: {key: string}) => d.key === this.metric.name) + .classed('metric-column', true); + graph.selectAll('.axis-title') + .text((d: {key: string}) => this.wrap(d.key)) + .append('title') + .text(d => (d as {key: string}).key); graph.selectAll('.axis .tick text').text((d: string) => this.wrap(d)).append('title').text((d: string) => d); graph.selectAll('.axis .tick text').style('pointer-events', 'auto'); this.darkTheme && graph.selectAll('.dark-theme .axis .domain').style('stroke', DARK_THEME_GRAPH_LINES_COLOR).style('stroke-opacity', 1); @@ -370,8 +371,10 @@ export class ParallelCoordinatesGraphComponent extends PlotlyGraphBaseComponent wrap(key) { key = key.toString(); - const short = (key.slice(0, ((this.graphWidth / this.parameters.length) - 20) / 6)); - return short + (key.length > short.length ? '...' : ''); + if (key.length > 20) { + return `${key.slice(0, 18)}...`; + } + return key; } private naturalCompare(myArray) { diff --git a/src/app/webapp-common/experiments-compare/effects/experiments-compare-charts.effects.ts b/src/app/webapp-common/experiments-compare/effects/experiments-compare-charts.effects.ts index ca9f516f..6e6414ab 100644 --- a/src/app/webapp-common/experiments-compare/effects/experiments-compare-charts.effects.ts +++ b/src/app/webapp-common/experiments-compare/effects/experiments-compare-charts.effects.ts @@ -1,26 +1,39 @@ import {Injectable} from '@angular/core'; import {Actions, createEffect, ofType} from '@ngrx/effects'; import {Store} from '@ngrx/store'; -import {IExperimentCompareChartsState} from '../reducers/experiments-compare-charts.reducer'; import * as chartActions from '../actions/experiments-compare-charts.actions'; import {activeLoader, deactivateLoader, setServerError} from '../../core/actions/layout.actions'; -import {catchError, debounceTime, mergeMap, map, withLatestFrom, filter, switchMap} from 'rxjs/operators'; +import { + catchError, + debounceTime, + mergeMap, + map, + withLatestFrom, + filter, + switchMap, + expand, + reduce +} from 'rxjs/operators'; import {ApiTasksService} from '~/business-logic/api-services/tasks.service'; -import {ApiAuthService} from '~/business-logic/api-services/auth.service'; -import {BlTasksService} from '~/business-logic/services/tasks.service'; import {ApiEventsService} from '~/business-logic/api-services/events.service'; import {requestFailed} from '../../core/actions/http.actions'; -import {selectCompareHistogramCacheAxisType, selectCompareSelectedSettingsxAxisType} from '../reducers'; +import {selectCompareHistogramCacheAxisType} from '../reducers'; import {ScalarKeyEnum} from '~/business-logic/model/events/scalarKeyEnum'; import {selectActiveWorkspaceReady} from '~/core/reducers/view.reducer'; import {EntityTypeEnum} from '~/shared/constants/non-common-consts'; +import {EMPTY, iif} from 'rxjs'; +import {merge} from 'lodash-es'; +import {ApiModelsService} from '~/business-logic/api-services/models.service'; +import {setAxisCache, setGlobalLegendData} from '../actions/experiments-compare-charts.actions'; +import {EventsGetTaskPlotsResponse} from "~/business-logic/model/events/eventsGetTaskPlotsResponse"; +import {EventsGetMultiTaskPlotsResponse} from "~/business-logic/model/events/eventsGetMultiTaskPlotsResponse"; @Injectable() export class ExperimentsCompareChartsEffects { - constructor(private actions$: Actions, private store: Store, private apiTasks: ApiTasksService, - private authApi: ApiAuthService, private taskBl: BlTasksService, private eventsApi: ApiEventsService) { + constructor(private actions$: Actions, private store: Store, private tasksApi: ApiTasksService, + private eventsApi: ApiEventsService, private modelsApi: ApiModelsService) { } activeLoader = createEffect(() => this.actions$.pipe( @@ -29,29 +42,61 @@ export class ExperimentsCompareChartsEffects { map(action => activeLoader(action.type)) )); + getGlobalLegendData$ = createEffect(() => this.actions$.pipe( + ofType(chartActions.getGlobalLegendData), + switchMap(action => iif(() => action.entity === EntityTypeEnum.model, + this.modelsApi.modelsGetAllEx({ + id: action.ids, + only_fields: ['name', 'tags', 'project', 'system_tags'] + }), + this.tasksApi.tasksGetAllEx({ + id: action.ids, + only_fields: ['name', 'tags', 'project', 'system_tags'] + })).pipe( + map(res => { + const data = Object.values(res)[0] as {id: string, tags: string[], system_tags: string[], name: string, project: {id: string}}[] + const ordered = action.ids.map(id => data.find(exp => exp.id === id)).filter(exp => exp) + .map(exp => ({...exp, systemTags: exp.system_tags})); + return setGlobalLegendData({data: ordered }) + }) + ) + ) + )); + + fetchExperimentScalarSingleValue$ = createEffect(() => this.actions$.pipe( + ofType(chartActions.getMultiSinleScalars), + switchMap((action) => this.eventsApi.eventsGetTaskSingleValueMetrics({ + tasks: action.taskIds, + // eslint-disable-next-line @typescript-eslint/naming-convention + model_events: action.entity === EntityTypeEnum.model, + })), + mergeMap((res) => [chartActions.setExperimentMultiScalarSingleValue({tasks: res?.tasks})] + ) + )); + getMultiScalarCharts = createEffect(() => this.actions$.pipe( ofType(chartActions.getMultiScalarCharts), switchMap((action) => this.store.select(selectActiveWorkspaceReady).pipe( filter(ready => ready), map(() => action))), debounceTime(200), - withLatestFrom(this.store.select(selectCompareSelectedSettingsxAxisType), this.store.select(selectCompareHistogramCacheAxisType)), - mergeMap(([action, axisType, prevAxisType]) => { + withLatestFrom(this.store.select(selectCompareHistogramCacheAxisType)), + mergeMap(([action, prevAxisType]) => { if ([ScalarKeyEnum.IsoTime, ScalarKeyEnum.Timestamp].includes(prevAxisType) && - [ScalarKeyEnum.IsoTime, ScalarKeyEnum.Timestamp].includes(axisType) && - prevAxisType !== axisType + [ScalarKeyEnum.IsoTime, ScalarKeyEnum.Timestamp].includes(action.xAxisType) && + prevAxisType !== action.xAxisType ) { - return [deactivateLoader(action.type)]; + return [setAxisCache({axis: action.xAxisType}), deactivateLoader(action.type)]; } return this.eventsApi.eventsMultiTaskScalarMetricsIterHistogram({ tasks: action.taskIds, // eslint-disable-next-line @typescript-eslint/naming-convention model_events: action.entity === EntityTypeEnum.model, - key: !axisType || axisType === ScalarKeyEnum.IsoTime ? ScalarKeyEnum.Timestamp : axisType + key: !action.xAxisType || action.xAxisType === ScalarKeyEnum.IsoTime ? ScalarKeyEnum.Timestamp : action.xAxisType }).pipe( mergeMap(res => [ // also here - chartActions.setExperimentHistogram({payload: res, axisType}), + chartActions.setExperimentHistogram({payload: res, axisType: action.xAxisType}), deactivateLoader(action.type)] ), catchError(error => [ @@ -65,26 +110,37 @@ export class ExperimentsCompareChartsEffects { getMultiPlotCharts = createEffect(() => this.actions$.pipe( ofType(chartActions.getMultiPlotCharts), debounceTime(200), - mergeMap((action) => - this.eventsApi.eventsGetMultiTaskPlots({ - tasks: action.taskIds, - // eslint-disable-next-line @typescript-eslint/naming-convention - model_events: action.entity === EntityTypeEnum.model, - // eslint-disable-next-line @typescript-eslint/naming-convention - no_scroll: true, - iters: 1 - }) - .pipe( - map(res => res.plots), - mergeMap(plots => [ - chartActions.setExperimentPlots({plots}), - deactivateLoader(action.type)]), - catchError(error => [ - requestFailed(error), deactivateLoader(action.type), - setServerError(error, null, 'Failed to get Plot Charts', action.autoRefresh) - ]) - ) + switchMap(action => this.eventsApi.eventsGetMultiTaskPlots({ + tasks: action.taskIds, + // eslint-disable-next-line @typescript-eslint/naming-convention + model_events: action.entity === EntityTypeEnum.model, + iters: 1 + }).pipe( + map((res: EventsGetMultiTaskPlotsResponse) => [res.returned, res] as [number, EventsGetMultiTaskPlotsResponse]), + expand(([plotsLength, data]) => (data.total < 10000 && data.returned > 0) + // eslint-disable-next-line @typescript-eslint/naming-convention + ? this.eventsApi.eventsGetMultiTaskPlots({ + tasks: action.taskIds, + // eslint-disable-next-line @typescript-eslint/naming-convention + model_events: action.entity === EntityTypeEnum.model, + // eslint-disable-next-line @typescript-eslint/naming-convention + scroll_id: data.scroll_id, + iters: 1 + }).pipe( + map((res: EventsGetMultiTaskPlotsResponse) => [plotsLength + res.returned, res] as [number, EventsGetTaskPlotsResponse]) + ) + : EMPTY + ), + reduce((acc, [, data]) => merge(acc, data.plots), {}) + )), + mergeMap(plots => [ + chartActions.setExperimentPlots({plots}), + deactivateLoader(chartActions.getMultiPlotCharts.type)]), + catchError(error => [ + requestFailed(error), deactivateLoader(chartActions.getMultiPlotCharts.type), + // setServerError(error, null, 'Failed to get Plot Charts', action.autoRefresh) + ]) ) - )); + ); } diff --git a/src/app/webapp-common/experiments-compare/effects/experiments-compare-metrics-values.effects.ts b/src/app/webapp-common/experiments-compare/effects/experiments-compare-metrics-values.effects.ts index a74c187d..9df08b93 100644 --- a/src/app/webapp-common/experiments-compare/effects/experiments-compare-metrics-values.effects.ts +++ b/src/app/webapp-common/experiments-compare/effects/experiments-compare-metrics-values.effects.ts @@ -7,6 +7,7 @@ import {requestFailed} from '../../core/actions/http.actions'; import {ApiTasksService} from '~/business-logic/api-services/tasks.service'; import {EntityTypeEnum} from '~/shared/constants/non-common-consts'; import {ApiModelsService} from '~/business-logic/api-services/models.service'; +import {ModelsGetAllExResponse} from '~/business-logic/model/models/modelsGetAllExResponse'; @Injectable() @@ -24,7 +25,7 @@ export class ExperimentsCompareMetricsValuesEffects { ofType(metricsValuesActions.getComparedExperimentsMetricsValues), mergeMap((action) => this.fetchEntities$(action) .pipe( - map(res => action.taskIds.map(id => res[action.entity === EntityTypeEnum.model ? 'models' : 'tasks'].find(ex => ex.id === id))), + map(res => action.taskIds.map(id => res[action.entity === EntityTypeEnum.model ? 'models' : 'tasks'].find(ex => ex.id === id)).filter(ex => !!ex)), mergeMap(experiments => [ metricsValuesActions.setComparedExperiments({experiments}), deactivateLoader(action.type)]), @@ -38,14 +39,14 @@ export class ExperimentsCompareMetricsValuesEffects { fetchEntities$(action) { return action.entity === EntityTypeEnum.model ? this.modelsApi.modelsGetAllEx({ - id: action.taskIds, - // eslint-disable-next-line @typescript-eslint/naming-convention - only_fields: ['last_metrics', 'name', 'last_update', 'last_iteration', 'last_iteration', 'project.name', 'tags', 'ready'] - }).pipe(map(res => ({models: res.models.map( model => ({...model, status: model.ready? 'Ready' : 'Draft'}))}))) + id: action.taskIds, + // eslint-disable-next-line @typescript-eslint/naming-convention + only_fields: ['last_metrics', 'name', 'last_update', 'last_iteration', 'last_iteration', 'project.name', 'tags', 'ready'] + }).pipe(map((res: ModelsGetAllExResponse) => ({models: res.models.map(model => ({...model, status: model.ready ? 'Ready' : 'Draft'}))}))) : this.tasksApiService.tasksGetAllEx({ - id: action.taskIds, - // eslint-disable-next-line @typescript-eslint/naming-convention - only_fields: ['last_metrics', 'name', 'status', 'completed', 'last_update', 'last_iteration', 'project.name', 'tags'] - }); + id: action.taskIds, + // eslint-disable-next-line @typescript-eslint/naming-convention + only_fields: ['last_metrics', 'name', 'status', 'completed', 'last_update', 'last_iteration', 'project.name', 'tags'] + }); } } diff --git a/src/app/webapp-common/experiments-compare/effects/experiments-compare-params.effects.ts b/src/app/webapp-common/experiments-compare/effects/experiments-compare-params.effects.ts index 3b5a7866..4170d9ab 100644 --- a/src/app/webapp-common/experiments-compare/effects/experiments-compare-params.effects.ts +++ b/src/app/webapp-common/experiments-compare/effects/experiments-compare-params.effects.ts @@ -1,7 +1,6 @@ import {Injectable} from '@angular/core'; import {Actions, createEffect, ofType} from '@ngrx/effects'; import {select, Store} from '@ngrx/store'; -import * as paramsActions from '../actions/experiments-compare-params.actions'; import {activeLoader, deactivateLoader, setServerError} from '../../core/actions/layout.actions'; import {catchError, filter, map, mergeMap, switchMap, withLatestFrom} from 'rxjs/operators'; import {ApiTasksService} from '~/business-logic/api-services/tasks.service'; @@ -12,8 +11,7 @@ import {Observable, of} from 'rxjs'; import {COMPARE_PARAMS_ONLY_FIELDS} from '~/features/experiments-compare/experiments-compare-consts'; import {IExperimentDetail} from '~/features/experiments-compare/experiments-compare-models'; import {REFETCH_EXPERIMENT_REQUESTED, refetchExperimentRequested} from '../actions/compare-header.actions'; -import {ExperimentCompareParamsState} from '../reducers/experiments-compare-params.reducer'; -import {setExperiments} from '../actions/experiments-compare-params.actions'; +import {paramsActions} from '../actions/experiments-compare-params.actions'; import {ExperimentDetailBase, ExperimentParams} from '../shared/experiments-compare-details.model'; import {selectActiveWorkspaceReady} from '~/core/reducers/view.reducer'; import {ApiModelsService} from '~/business-logic/api-services/models.service'; @@ -54,7 +52,7 @@ export class ExperimentsCompareParamsEffects { map(experiments => action.ids.map(id => experiments.find(experiment => experiment.id === id))), mergeMap(experiments => [ deactivateLoader(action.type), - setExperiments({experiments}) + paramsActions.setExperiments({experiments}) ]), catchError(error => [ requestFailed(error), @@ -74,7 +72,7 @@ export class ExperimentsCompareParamsEffects { this.fetchEntity$(newExperimentIds, action.entity).pipe( mergeMap(experiments => [ deactivateLoader(action.type), - setExperiments({experiments: experiments as ExperimentParams[]}) + paramsActions.setExperiments({experiments: experiments as ExperimentParams[]}) ]), catchError(error => [ requestFailed(error), diff --git a/src/app/webapp-common/experiments-compare/experiment-compare-router-helper.guard.ts b/src/app/webapp-common/experiments-compare/experiment-compare-router-helper.guard.ts deleted file mode 100755 index db302017..00000000 --- a/src/app/webapp-common/experiments-compare/experiment-compare-router-helper.guard.ts +++ /dev/null @@ -1,20 +0,0 @@ -import {Injectable} from '@angular/core'; -import {Router, CanActivate, ActivatedRouteSnapshot, RouterStateSnapshot} from '@angular/router'; -import {Store} from '@ngrx/store'; - -@Injectable({providedIn: 'root'}) -export class RouterHelperGuard implements CanActivate { - - constructor(public router: Router, public store: Store) { - } - - canActivate(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): boolean { - const viewMode = (route.url[0] && route.queryParams[route.url[0].path] || 'values').replace(/.*_/, '') || 'values'; // i.e: graph, min_values - const defaultViewMode = route.url[1].path; // usually 'values' - if (viewMode !== defaultViewMode) { - this.router.navigateByUrl(state.url.replace(defaultViewMode, viewMode), /* Removed unsupported properties by Angular migration: queryParamsHandling. */ {}); - return false; - } - return true; - } -} diff --git a/src/app/webapp-common/experiments-compare/experiments-compare-routing.module.ts b/src/app/webapp-common/experiments-compare/experiments-compare-routing.module.ts index 80d5ff9c..1c5b404b 100755 --- a/src/app/webapp-common/experiments-compare/experiments-compare-routing.module.ts +++ b/src/app/webapp-common/experiments-compare/experiments-compare-routing.module.ts @@ -8,9 +8,9 @@ import {ExperimentCompareScalarChartsComponent} from './containers/experiment-co import {ExperimentComparePlotsComponent} from './containers/experiment-compare-plots/experiment-compare-plots.component'; import {DebugImagesComponent} from '../debug-images/debug-images.component'; import {ExperimentCompareHyperParamsGraphComponent} from './containers/experiment-compare-hyper-params-graph/experiment-compare-hyper-params-graph.component'; -import {RouterHelperGuard} from './experiment-compare-router-helper.guard'; import {ExperimentCompareParamsComponent} from './containers/experiment-compare-params/experiment-compare-params.component'; import {ModelCompareDetailsComponent} from '@common/experiments-compare/containers/model-compare-details/model-compare-details.component'; +import {compareNavigationGuard} from '@common/experiments-compare/compare-navigation.guard'; export const routes: Routes = [ @@ -25,9 +25,13 @@ export const routes: Routes = [ {path: 'details', component: ExperimentCompareDetailsComponent, data: {mode: 'details', limit: true}}, {path: 'models-details', component: ModelCompareDetailsComponent, data: {mode: 'details', limit: true}}, {path: 'network', component: ExperimentCompareParamsComponent, data: {mode: 'hyper-params', limit: true}}, - {path: 'hyper-params/values', component: ExperimentCompareParamsComponent, canActivate: [RouterHelperGuard], data: {mode: 'hyper-params', limit: true}}, + {path: 'hyper-params', component: ExperimentCompareParamsComponent, pathMatch: 'full', canActivate: [compareNavigationGuard]}, + {path: 'hyper-params/values', component: ExperimentCompareParamsComponent, data: {mode: 'hyper-params', limit: true}}, {path: 'hyper-params/graph', component: ExperimentCompareHyperParamsGraphComponent}, - {path: 'scalars/values', component: ExperimentCompareMetricValuesComponent, canActivate: [RouterHelperGuard], data: {limit: true}}, + {path: 'scalars', component: ExperimentCompareMetricValuesComponent, canActivate: [compareNavigationGuard]}, + {path: 'scalars/values', component: ExperimentCompareMetricValuesComponent, data: {limit: true}}, + {path: 'scalars/max-values', component: ExperimentCompareMetricValuesComponent, data: {limit: true}}, + {path: 'scalars/min-values', component: ExperimentCompareMetricValuesComponent, data: {limit: true}}, {path: 'scalars/graph', component: ExperimentCompareScalarChartsComponent}, {path: 'metrics-plots', component: ExperimentComparePlotsComponent}, {path: 'debug-images', component: DebugImagesComponent, data: {mergeIterations: true, multiple: true, limit: true}}, diff --git a/src/app/webapp-common/experiments-compare/experiments-compare.component.html b/src/app/webapp-common/experiments-compare/experiments-compare.component.html index eeb39454..519242d6 100644 --- a/src/app/webapp-common/experiments-compare/experiments-compare.component.html +++ b/src/app/webapp-common/experiments-compare/experiments-compare.component.html @@ -6,20 +6,21 @@ - - - - + + - - - - + + @@ -29,10 +30,31 @@
+ +
+
+
+ + + {{exp.name}} + + + +
+ +
+ +
+
diff --git a/src/app/webapp-common/experiments-compare/experiments-compare.component.scss b/src/app/webapp-common/experiments-compare/experiments-compare.component.scss index 722e41e1..0fad3c30 100644 --- a/src/app/webapp-common/experiments-compare/experiments-compare.component.scss +++ b/src/app/webapp-common/experiments-compare/experiments-compare.component.scss @@ -2,7 +2,7 @@ @import "../layout/layout"; $container-padding-top: 24px; -$nav-height: 65px; +$nav-height: 62px; $header-height: 60px; :host { @@ -20,7 +20,8 @@ $header-height: 60px; } nav { - height: $nav-height + height: $nav-height; + gap: 1px; } ::ng-deep nav { @@ -30,6 +31,8 @@ $header-height: 60px; .experiment-compare-body { padding: 0; height: calc(100% - #{$nav-height + $header-height}); + display: flex; + flex-direction: column; } } @@ -74,3 +77,104 @@ $header-height: 60px; border-radius: 0 6px 6px 0; } } + +.global-legend-container { + display: flex; + gap: 12px; + max-height: 0; + overflow: hidden; + flex-shrink: 0; + background: #f2f3f6; + width: 100%; + padding: 0 24px; + transition: max-height 300ms, padding 300ms; + + &.show { + max-height: 200px; + padding: 12px 24px; + border-bottom: 1px solid $cloudy-blue; + } + + ::-webkit-scrollbar-thumb { + background-color: $blue-500; + + &:hover { + background-color: $blue-300; + } + } +} + +.global-legend { + display: flex; + flex-grow: 1; + flex-wrap: wrap; + gap: 12px; + overflow: auto; + height: 100%; + padding: 0 10px 0 0; + max-height: 132px; + background: transparent; +} + +.legend-experiment { + display: flex; + align-items: center; + flex: 0 1 100px; + gap: 6px; + white-space: nowrap; + padding: 8px 12px; + border-radius: 4px; + border: solid 1px $cloudy-blue; + background-color: #ffffff; + + .experiment-color { + display: inline-block; + width: 10px; + height: 10px; + border-radius: 2px; + cursor: pointer; + &:hover { + box-shadow: 0 0 0 1px white, 0 0 0 2px $blue-300; + } + } + + .experiment-name { + display: inline-block; + font-size: 12px; + font-weight: 500; + color: $blue-800; + margin-right: 6px; + max-width: 300px; + > a:hover { + text-decoration: underline; + text-underline-offset: 4px; + text-decoration-color: $blue-300; + } + } + + sm-tag-list { + max-width: 300px; + } + + .remove-experiment { + margin-left: auto; + cursor: pointer; + + &:hover { + color: $blue-500; + } + } + &:last-child { + margin-right: 12px; + } +} + +.close-legend { + cursor: pointer; + padding-top: 4px; +} + +.legend-add { + border-radius: 4px; + height: 36px; +} diff --git a/src/app/webapp-common/experiments-compare/experiments-compare.component.ts b/src/app/webapp-common/experiments-compare/experiments-compare.component.ts index a2e95976..3322b864 100644 --- a/src/app/webapp-common/experiments-compare/experiments-compare.component.ts +++ b/src/app/webapp-common/experiments-compare/experiments-compare.component.ts @@ -1,11 +1,10 @@ -import {ChangeDetectionStrategy, Component, OnDestroy, OnInit} from '@angular/core'; +import {ChangeDetectionStrategy, ChangeDetectorRef, Component, OnDestroy, OnInit} from '@angular/core'; import {Store} from '@ngrx/store'; -import {selectRouterQueryParams} from '../core/reducers/router-reducer'; import {Observable, Subscription} from 'rxjs'; -import {ActivatedRoute, Params, Router} from '@angular/router'; -import {selectNavigationPreferences} from './reducers'; -import {debounceTime, filter, withLatestFrom} from 'rxjs/operators'; -import {resetSelectCompareHeader, setNavigationPreferences} from './actions/compare-header.actions'; +import {ActivatedRoute, Router} from '@angular/router'; +import {selectGlobalLegendData, selectShowGlobalLegend} from './reducers'; +import {combineLatestWith, distinctUntilChanged, filter, withLatestFrom} from 'rxjs/operators'; +import {resetSelectCompareHeader, setShowGlobalLegend} from './actions/compare-header.actions'; import {EntityTypeEnum} from '~/shared/constants/non-common-consts'; import {getCompanyTags, setBreadcrumbsOptions, setSelectedProject} from '@common/core/actions/projects.actions'; import {selectSelectedProject} from '@common/core/reducers/projects.reducer'; @@ -14,6 +13,14 @@ import {TitleCasePipe} from '@angular/common'; import {resetSelectModelState} from '@common/select-model/select-model.actions'; import {selectProjectType} from '~/core/reducers/view.reducer'; import {ALL_PROJECTS_OBJECT} from '@common/core/effects/projects.effects'; +import {trackById} from '@common/shared/utils/forms-track-by'; +import {selectRouterParams} from '@common/core/reducers/router-reducer'; +import {getGlobalLegendData} from '@common/experiments-compare/actions/experiments-compare-charts.actions'; +import {rgbList2Hex} from '@common/shared/services/color-hash/color-hash.utils'; +import {ColorHashService} from '@common/shared/services/color-hash/color-hash.service'; +import {SelectModelComponent} from '@common/select-model/select-model.component'; +import {SelectExperimentsForCompareComponent} from '@common/experiments-compare/containers/select-experiments-for-compare/select-experiments-for-compare.component'; +import {MatDialog} from '@angular/material/dialog'; @Component({ selector: 'sm-experiments-compare', @@ -22,18 +29,31 @@ import {ALL_PROJECTS_OBJECT} from '@common/core/effects/projects.effects'; changeDetection: ChangeDetectionStrategy.OnPush }) export class ExperimentsCompareComponent implements OnInit, OnDestroy { + protected readonly trackById = trackById; private subs = new Subscription(); - private queryParams: Params; public entityType: EntityTypeEnum; public entityTypeEnum = EntityTypeEnum; private selectedProject$: Observable; - private modelsFeature: boolean; + private readonly modelsFeature: boolean; + public showGlobalLegend$: Observable; + public globalLegendData$: Observable<{ name: string; tags: string[]; systemTags: string[]; id: string, project: {id: string} }[]>; + public experimentsColor: { [p: string]: string }; + private ids: string[]; + public duplicateNamesObject: {[name: string]: boolean}; - constructor(private store: Store, private router: Router, private activatedRoute: ActivatedRoute, private titleCasePipe: TitleCasePipe) { + constructor(private store: Store, + private router: Router, + private activatedRoute: ActivatedRoute, + private titleCasePipe: TitleCasePipe, + private colorHash: ColorHashService, + private dialog: MatDialog, + private cdr: ChangeDetectorRef) { // updating URL with store query params this.selectedProject$ = this.store.select(selectSelectedProject); this.entityType = this.activatedRoute.snapshot.data.entityType; this.modelsFeature = this.activatedRoute.snapshot.data?.setAllProject; + this.showGlobalLegend$ = this.store.select(selectShowGlobalLegend); + this.globalLegendData$ = this.store.select(selectGlobalLegendData); if (this.modelsFeature) { this.store.dispatch(getCompanyTags()); } @@ -46,31 +66,37 @@ export class ExperimentsCompareComponent implements OnInit, OnDestroy { } ngOnInit(): void { - // Update store with url query params on load this.subs.add(this.selectedProject$.pipe(filter(selectedProject => (this.modelsFeature && !selectedProject))).subscribe(() => this.store.dispatch(setSelectedProject({project: ALL_PROJECTS_OBJECT})) - )); - this.subs.add(this.store.select(selectNavigationPreferences).pipe(debounceTime(10)).subscribe((queryParams) => { - this.router.navigate( - [], - { - relativeTo: this.activatedRoute, - queryParams, - queryParamsHandling: 'merge' - }); + )); + + this.subs.add(this.store.select(selectRouterParams).pipe( + filter(params => !!params.ids), + distinctUntilChanged() + ).subscribe(params => { + this.ids = params.ids.split(','); + this.store.dispatch(getGlobalLegendData({ids: params.ids.split(','), entity: this.entityType})); })); - this.subs.add(this.store.select(selectRouterQueryParams).subscribe((queryParams) => this.queryParams = queryParams)); - this.store.dispatch(setNavigationPreferences({navigationPreferences: this.queryParams})); - this.setupBreadcrumbsOptions(); - } + this.subs.add(this.globalLegendData$.pipe( + combineLatestWith(this.colorHash.getColorsObservable()), + filter(([entities]) => !!entities), + distinctUntilChanged() + ).subscribe(([entities]) => { + this.experimentsColor = entities?.reduce((acc, exp) => { + acc[exp.id] = rgbList2Hex(this.colorHash.initColor(`${exp.name}-${exp.id}`)); + return acc; + }, {} as { [id: string]: string }); - updateUrl(ids: string[]) { - this.router.navigate( - [{ids}, ...this.activatedRoute.firstChild?.snapshot.url.map(segment => segment.path)], - { - relativeTo: this.activatedRoute, - }); + this.duplicateNamesObject = entities.reduce((acc, legendItem) => { + const experimentName = legendItem.name; + acc[experimentName] = acc[experimentName] !== undefined; + return acc; + }, {} as { [name: string]: boolean }); + this.cdr.detectChanges(); + })); + + this.setupBreadcrumbsOptions(); } setupBreadcrumbsOptions() { @@ -120,4 +146,55 @@ export class ExperimentsCompareComponent implements OnInit, OnDestroy { } })); } + + removeExperiment(exp: { name: string; tags: string[]; id: string }) { + const newParams = this.ids.filter(id => id !== exp.id).join(); + this.router.navigateByUrl(this.router.url.replace(this.ids.toString(), newParams)); + } + + closeLegend() { + this.store.dispatch(setShowGlobalLegend()); + } + + getExperimentNameForColor(experiment): string { + return `${experiment.name}-${experiment.id}`; + } + + openAddExperimentSearch() { + if (this.entityType === EntityTypeEnum.model) { + const selectedIds = this.ids ?? []; + this.dialog.open(SelectModelComponent, { + data: { + selectionMode: 'multiple', + selectedModels: selectedIds, + header: 'Select compared model' + }, + height: '94vh', + width: '98%', + maxWidth: '100%' + }).afterClosed().pipe(filter(ids => !!ids)).subscribe(ids => this.updateUrl(ids)); + } else { + this.dialog.open(SelectExperimentsForCompareComponent, { + data: {entityType: this.entityType}, + height: '94vh', + width: '98%', + maxWidth: '100%' + }).afterClosed().pipe(filter(ids => !!ids)).subscribe(ids => this.updateUrl(ids)); + } + } + + updateUrl(ids: string[]) { + this.router.navigate( + [{ids}, ...this.activatedRoute.firstChild?.snapshot.url.map(segment => segment.path)], + { + queryParamsHandling: 'preserve', + relativeTo: this.activatedRoute, + }); + } + + buildUrl(target: { name: string; tags: string[]; systemTags: string[], id: string, project: {id: string} }) { + const projectOrPipeline = this.activatedRoute.root.firstChild.routeConfig.path.replace('datasets', 'datasets/simple/'); + const targetEntity = this.activatedRoute.snapshot.parent.data.entityType === EntityTypeEnum.model ? EntityTypeEnum.model : EntityTypeEnum.experiment; + return [`/${projectOrPipeline}`, target.project?.id || '*', `${targetEntity}s`, target.id]; + } } diff --git a/src/app/webapp-common/experiments-compare/experiments-compare.constants.ts b/src/app/webapp-common/experiments-compare/experiments-compare.constants.ts index 21b85bce..741d837c 100644 --- a/src/app/webapp-common/experiments-compare/experiments-compare.constants.ts +++ b/src/app/webapp-common/experiments-compare/experiments-compare.constants.ts @@ -5,6 +5,12 @@ export interface SelectedMetric { path: string; } +export interface DataDictionary { + dataDictionary: boolean; + link: string; + dataValue: string; +} + export const RENAME_MAP = { 'network_design': 'Network Design', 'uncommitted_changes': 'Uncommitted Changes', diff --git a/src/app/webapp-common/experiments-compare/experiments-compare.module.ts b/src/app/webapp-common/experiments-compare/experiments-compare.module.ts index f1c97886..1ab1285c 100644 --- a/src/app/webapp-common/experiments-compare/experiments-compare.module.ts +++ b/src/app/webapp-common/experiments-compare/experiments-compare.module.ts @@ -53,7 +53,7 @@ import { ExperimentCompareParamsComponent } from './containers/experiment-compare-params/experiment-compare-params.component'; import {ExperimentsCompareParamsEffects} from './effects/experiments-compare-params.effects'; -import {FormsModule} from '@angular/forms'; +import {FormsModule, ReactiveFormsModule} from '@angular/forms'; import {UiComponentsModule} from '../shared/ui-components/ui-components.module'; import {SMMaterialModule} from '../shared/material/material.module'; import {SharedPipesModule} from '@common/shared/pipes/shared-pipes.module'; @@ -61,11 +61,14 @@ import {ModelCompareDetailsComponent} from '@common/experiments-compare/containe import {IExperimentCompareChartsState} from '@common/experiments-compare/reducers/experiments-compare-charts.reducer'; import {UserPreferences} from '@common/user-preferences'; import {merge, pick} from 'lodash-es'; -import {EXPERIMENTS_PREFIX, EXPERIMENTS_STORE_KEY} from '@common/experiments/experiment.consts'; +import {EXPERIMENTS_PREFIX} from '@common/experiments/experiment.consts'; import {createUserPrefFeatureReducer} from '@common/core/meta-reducers/user-pref-reducer'; import {EXPERIMENTS_COMPARE_METRICS_CHARTS_} from '@common/experiments-compare/actions/experiments-compare-charts.actions'; import {EXPERIMENTS_COMPARE_SELECT_EXPERIMENT_} from '@common/experiments-compare/actions/compare-header.actions'; +import {LabeledFormFieldDirective} from '@common/shared/directive/labeled-form-field.directive'; +import {EllipsisMiddleDirective} from '@common/shared/ui-components/directives/ellipsis-middle.directive'; +export const COMPARE_STORE_KEY = 'experimentsCompare'; export const COMPARE_CONFIG_TOKEN = new InjectionToken>('CompareConfigToken'); @@ -85,14 +88,14 @@ export const getCompareConfig = (userPreferences: UserPreferences) => ({ const savedState = JSON.parse(localStorage.getItem(localStorageKey)); return merge({}, nextState, savedState); } - if (action.type.startsWith(EXPERIMENTS_PREFIX)) { - localStorage.setItem(localStorageKey, JSON.stringify(pick(nextState, ['charts.settingsList']))); + if (action.type.startsWith('EXPERIMENTS_COMPARE_')) { + localStorage.setItem(localStorageKey, JSON.stringify(pick(nextState, ['charts.settingsList', 'charts.scalarsHoverMode']))); } return nextState; }; }, (reducer: ActionReducer) => - createUserPrefFeatureReducer(EXPERIMENTS_STORE_KEY, compareSyncedKeys, [EXPERIMENTS_COMPARE_METRICS_CHARTS_, EXPERIMENTS_COMPARE_SELECT_EXPERIMENT_], userPreferences, reducer), + createUserPrefFeatureReducer(COMPARE_STORE_KEY, compareSyncedKeys, [EXPERIMENTS_COMPARE_METRICS_CHARTS_, EXPERIMENTS_COMPARE_SELECT_EXPERIMENT_], userPreferences, reducer), ] }); @@ -132,7 +135,7 @@ export const getCompareConfig = (userPreferences: UserPreferences) => ({ ExperimentsCompareRoutingModule, ExperimentGraphsModule, ExperimentCompareSharedModule, - StoreModule.forFeature('experimentsCompare', experimentsCompareReducers, COMPARE_CONFIG_TOKEN), + StoreModule.forFeature(COMPARE_STORE_KEY, experimentsCompareReducers, COMPARE_CONFIG_TOKEN), EffectsModule.forFeature([ ExperimentsCompareDetailsEffects, ExperimentsCompareParamsEffects, @@ -145,6 +148,9 @@ export const getCompareConfig = (userPreferences: UserPreferences) => ({ FormsModule, ParallelCoordinatesGraphComponent, SharedPipesModule, + LabeledFormFieldDirective, + ReactiveFormsModule, + EllipsisMiddleDirective ], providers: [ {provide: COMPARE_CONFIG_TOKEN, useFactory: getCompareConfig, deps: [UserPreferences]}, diff --git a/src/app/webapp-common/experiments-compare/jsonToDiffConvertor.ts b/src/app/webapp-common/experiments-compare/jsonToDiffConvertor.ts index df07c3c3..651b44bc 100644 --- a/src/app/webapp-common/experiments-compare/jsonToDiffConvertor.ts +++ b/src/app/webapp-common/experiments-compare/jsonToDiffConvertor.ts @@ -184,7 +184,9 @@ function convertUncommittedChanges(diff: string[]): { [files: string]: string[] }, {}) : diff; } -function convertHyperParams(hyperParams: { [section: string]: { [name: string]: any } }, originHyperParams): { [section: string]: { [name: string]: any } } { +function convertHyperParams(hyperParams: { [section: string]: { [name: string]: any } }, originHyperParams): { + [section: string]: { [name: string]: any } +} { if (!hyperParams) { return {}; } @@ -203,7 +205,9 @@ function convertHyperParams(hyperParams: { [section: string]: { [name: string]: }, {}); } -function convertConfiguration(confParams: { [name: string]: ConfigurationItem }, originConfParams): { [name: string]: string | string[] } { +function convertConfiguration(confParams: { [name: string]: ConfigurationItem }, originConfParams): { + [name: string]: string | string[] +} { if (!confParams) { return {}; } @@ -368,7 +372,6 @@ export function convertContainerScriptFromExperiments(experiments: T[], originalExperiments: Record): T[] { const addValuesToNetworkDesign = (model: ' input models' | ' output models', key: string) => { - const modelNetworkDesignData = experiments.map(experiment => { const values = originalExperiments?.[experiment.id]?.artifacts?.[model]?.[key]?.network_design ?? []; return Array.isArray(values) ? values : []; @@ -384,6 +387,7 @@ export function convertNetworkDesignFromExperiments experiment.artifacts[model][key].network_design = inputModelNetworkDesignValues[index]; } }); + return experiments; }; const inputModelKeys = Array.from(new Set(Object.values(originalExperiments).map(exp => [...Object.keys(exp.artifacts[' input models'])]).flat())); @@ -412,7 +416,9 @@ export function convertExperimentsArrays(experiment, origin, experiments, path = convertedExperiment[key] = experiment[key]; break; case 'configuration': - convertedExperiment[key] = convertConfiguration(experiment[key], origin) as { [key: string]: ConfigurationItem }; + convertedExperiment[key] = convertConfiguration(experiment[key], origin) as { + [key: string]: ConfigurationItem + }; break; case 'setup_shell_script': convertedExperiment[key] = experiment[key]; @@ -493,7 +499,7 @@ export function isParamsConverted(hyperparams) { export function getAllKeysEmptyObject(jsons) { let obj = {}; - jsons.forEach(json => obj = mergeWith( obj, json, customMergeStrategyForArrays)); + jsons.forEach(json => obj = mergeWith(obj, json, customMergeStrategyForArrays)); const sortedObject = sortObject(obj, jsons[0], ''); return sortedObject; } @@ -505,8 +511,8 @@ export function createDiffObjectScalars(AllKeysObject, originObject?, comparedOb const comparedData = path.length === 0 ? comparedObject : get(comparedObject, path); const originPartial = get(originData, key); const comparedPartial = get(comparedData, key); - const existOnOrigin = originData && has(originData,key); - const existOnCompared = comparedData && has(comparedData,key); + const existOnOrigin = originData && has(originData, key); + const existOnCompared = comparedData && has(comparedData, key); return { key, diff --git a/src/app/webapp-common/experiments-compare/reducers/compare-header.reducer.ts b/src/app/webapp-common/experiments-compare/reducers/compare-header.reducer.ts index 4dfff9b0..239f6bb5 100644 --- a/src/app/webapp-common/experiments-compare/reducers/compare-header.reducer.ts +++ b/src/app/webapp-common/experiments-compare/reducers/compare-header.reducer.ts @@ -6,10 +6,9 @@ import { resetSelectCompareHeader, setExperimentsUpdateTime, setHideIdenticalFields, - setNavigationPreferences, setSearchExperimentsForCompareResults, setShowSearchExperimentsForCompare, - toggleShowScalarOptions + toggleShowScalarOptions, setShowRowExtremes, setExportTable, setShowGlobalLegend } from '../actions/compare-header.actions'; import {createReducer, on} from '@ngrx/store'; import {Params} from '@angular/router'; @@ -22,6 +21,8 @@ export interface CompareHeaderState { searchTerm: string; showSearch: boolean; hideIdenticalRows: boolean; + showRowExtremes: boolean; + showGlobalLegend: boolean; viewMode: string; showScalarOptions: boolean; autoRefresh: boolean; @@ -30,6 +31,7 @@ export interface CompareHeaderState { projectColumnsSortOrder: { [projectId: string]: SortMeta[] }; projectColumnFilters: { [projectId: string]: { [columnId: string]: FilterMetadata } }; viewArchived: boolean; + exportTable: boolean; } @@ -38,6 +40,8 @@ export const initialState: CompareHeaderState = { searchTerm: null, showSearch: false, hideIdenticalRows: false, + showRowExtremes: false, + showGlobalLegend: false, viewMode: 'values', showScalarOptions: false, autoRefresh: false, @@ -46,11 +50,14 @@ export const initialState: CompareHeaderState = { projectColumnsSortOrder: {}, projectColumnFilters: {}, viewArchived: false, + exportTable: false }; export const compareHeader = createReducer( initialState, on(setHideIdenticalFields, (state: CompareHeaderState, {payload}) => ({...state, hideIdenticalRows: payload})), + on(setShowRowExtremes, (state: CompareHeaderState, {payload}) => ({...state, showRowExtremes: payload})), + on(setShowGlobalLegend, (state: CompareHeaderState) => ({...state, showGlobalLegend: !state.showGlobalLegend})), on(setSearchExperimentsForCompareResults, (state: CompareHeaderState, {payload}) => ({ ...state, searchResultsExperiments: payload @@ -58,15 +65,15 @@ export const compareHeader = createReducer( on(setExperimentsUpdateTime, (state: CompareHeaderState, {payload}) => ({...state, experimentsUpdateTime: payload})), on(setShowSearchExperimentsForCompare, (state: CompareHeaderState, {payload}) => ({...state, showSearch: payload})), on(toggleShowScalarOptions, (state: CompareHeaderState) => ({...state, showScalarOptions: !state.showScalarOptions})), - on(setNavigationPreferences, (state: CompareHeaderState, {navigationPreferences}) => ({ - ...state, - navigationPreferences: {...state.navigationPreferences, ...navigationPreferences} - })), on(resetSelectCompareHeader, (state, action) => ({ ...initialState, - ...(!action.fullReset && {projectColumnFilters: state.projectColumnFilters, - viewArchived: state.viewArchived, - projectColumnsSortOrder: state.projectColumnsSortOrder}) + ...(!action.fullReset && { + projectColumnFilters: state.projectColumnFilters, + viewArchived: state.viewArchived, + showGlobalLegend: state.showGlobalLegend, + showRowExtremes: state.showRowExtremes, + projectColumnsSortOrder: state.projectColumnsSortOrder + }) })), on(compareAddDialogSetTableSort, (state, action) => { let orders = action.orders.filter(order => action.colIds.includes(order.field)); @@ -100,4 +107,5 @@ export const compareHeader = createReducer( } })), on(setAddTableViewArchived, (state, action) => ({...state, viewArchived: action.show})), + on(setExportTable, (state, action) => ({...state, exportTable: action.export})), ); diff --git a/src/app/webapp-common/experiments-compare/reducers/experiments-compare-charts.reducer.ts b/src/app/webapp-common/experiments-compare/reducers/experiments-compare-charts.reducer.ts index 319a7622..7ced7be6 100644 --- a/src/app/webapp-common/experiments-compare/reducers/experiments-compare-charts.reducer.ts +++ b/src/app/webapp-common/experiments-compare/reducers/experiments-compare-charts.reducer.ts @@ -5,6 +5,8 @@ import * as actions from '../actions/experiments-compare-charts.actions'; import {ExperimentSettings} from '../../experiments/reducers/experiment-output.reducer'; import {IMultiplot} from '@common/tasks/tasks.utils'; import {SelectedMetric} from '@common/experiments-compare/experiments-compare.constants'; +import {EventsGetTaskSingleValueMetricsResponseTasks} from '~/business-logic/model/events/eventsGetTaskSingleValueMetricsResponseTasks'; +import {ChartHoverModeEnum} from "@common/experiments/shared/common-experiments.const"; export interface GroupedHyperParams { [section: string]: HyperParams; @@ -27,12 +29,15 @@ export interface MetricOption { export interface IExperimentCompareChartsState { metricsMultiScalarsCharts: any; metricsHistogramCharts: any; + multiSingleValues: EventsGetTaskSingleValueMetricsResponseTasks[]; cachedAxisType: ScalarKeyEnum; metricsPlotsCharts: IMultiplot; settingsList: Array; searchTerm: string; showSettingsBar: boolean; selectedExperiments: Array; + globalLegendData: {name: string, tags: string[], systemTags: string[], id: string, project: {id: string}}[] + scalarsHoverMode: ChartHoverModeEnum } export interface ExperimentCompareSettings extends Omit { @@ -43,26 +48,31 @@ export interface ExperimentCompareSettings extends Omit ({...state, selectedExperiments: action.selectedExperiments})), + on(actions.setSelectedExperiments, (state, action) => ({...state, selectedExperiments: [...action.selectedExperiments].sort()})), on(actions.setExperimentMetricsSearchTerm, (state, action) => ({...state, searchTerm: action.searchTerm})), on(actions.setExperimentHistogram, (state, action) => ({...state, metricsHistogramCharts: action.payload, cachedAxisType: action.axisType})), + on(actions.setExperimentMultiScalarSingleValue, (state, action) => ({...state, multiSingleValues: action.tasks})), on(actions.setAxisCache, (state, action) => ({...state, cachedAxisType: (action as ReturnType).axis})), on(actions.setExperimentPlots, (state, action) => ({...state, metricsPlotsCharts: action.plots})), on(actions.setExperimentSettings, (state, action) => { let newSettings: ExperimentCompareSettings[]; - const changes = {...action.changes, id: action.id, lastModified: (new Date()).getTime()} as ExperimentCompareSettings; - const ids = action.id ? action.id.join() : ''; - const experimentExists = state.settingsList.find((setting) => setting.id.join() === ids); + const sortedIds = [...(action.id ?? [])].sort(); + const changes = {...action.changes, id: sortedIds, lastModified: (new Date()).getTime()} as ExperimentCompareSettings; + const ids = sortedIds.join(); + const experimentExists = state.settingsList.find((setting) => setting.id?.join() === ids); const discardBefore = new Date(); discardBefore.setMonth(discardBefore.getMonth() - 6); if (experimentExists) { @@ -72,7 +82,7 @@ export const experimentsCompareChartsReducer = createReducer( } else { newSettings = [ ...state.settingsList.filter(setting => discardBefore < new Date(setting.lastModified || 1648771200000)), - {id: action.id, ...changes} + {id: sortedIds, ...changes} ]; } return {...state, settingsList: newSettings}; @@ -84,4 +94,10 @@ export const experimentsCompareChartsReducer = createReducer( metricsPlotsCharts: initialState.metricsPlotsCharts, cachedAxisType: initialState.cachedAxisType })), + on(actions.setGlobalLegendData, (state, action) => ({ + ...state, + globalLegendData: action.data + })), + on(actions.setScalarsHoverMode, (state, action) => ({...state, scalarsHoverMode: action.hoverMode})), + ); diff --git a/src/app/webapp-common/experiments-compare/reducers/experiments-compare-params.reducer.ts b/src/app/webapp-common/experiments-compare/reducers/experiments-compare-params.reducer.ts index b4393d66..33b9703e 100644 --- a/src/app/webapp-common/experiments-compare/reducers/experiments-compare-params.reducer.ts +++ b/src/app/webapp-common/experiments-compare/reducers/experiments-compare-params.reducer.ts @@ -1,18 +1,24 @@ import {ExperimentParams} from '../shared/experiments-compare-details.model'; -import {resetState, setExperiments} from '../actions/experiments-compare-params.actions'; +import {paramsActions} from '../actions/experiments-compare-params.actions'; import {createReducer, on} from '@ngrx/store'; -export interface ExperimentCompareParamsState { +export interface CompareParamsState { experiments: Array; + viewMode: {[page: string]: string} } -export const initialState: ExperimentCompareParamsState = { - experiments: [] +export const initialState: CompareParamsState = { + experiments: [], + viewMode: {'hyper-params': 'values', scalars: 'graph'} }; export const experimentsCompareParamsReducer = createReducer(initialState, - on(setExperiments, (state: ExperimentCompareParamsState, {experiments}) => ({...state, experiments})), - on(resetState, () => ({...initialState})) + on(paramsActions.setExperiments, (state, {experiments}): CompareParamsState => + ({...state, experiments})), + on(paramsActions.resetState, (state): CompareParamsState => + ({...state, experiments: initialState.experiments})), + on(paramsActions.setView, (state, action): CompareParamsState => + ({...state, viewMode: {...state.viewMode, [action.primary]: action.secondary}})) ); diff --git a/src/app/webapp-common/experiments-compare/reducers/index.ts b/src/app/webapp-common/experiments-compare/reducers/index.ts index 81cdccb7..bcd6e462 100644 --- a/src/app/webapp-common/experiments-compare/reducers/index.ts +++ b/src/app/webapp-common/experiments-compare/reducers/index.ts @@ -12,18 +12,18 @@ import { IExperimentCompareMetricsValuesState, MetricSortBy } from './experiments-compare-metrics-values.reducer'; -import {Task} from '~/business-logic/model/tasks/task'; import {compareHeader, CompareHeaderState} from './compare-header.reducer'; import {IExperimentDetail} from '~/features/experiments-compare/experiments-compare-models'; import {ScalarKeyEnum} from '~/business-logic/model/events/scalarKeyEnum'; import {scalarsGraphReducer, ScalarsGraphState} from './experiments-compare-scalars-graph.reducer'; import {ExperimentParams, ModelDetail} from '../shared/experiments-compare-details.model'; -import {ExperimentCompareParamsState, experimentsCompareParamsReducer} from './experiments-compare-params.reducer'; +import {CompareParamsState, experimentsCompareParamsReducer} from './experiments-compare-params.reducer'; import {groupByCharts, GroupByCharts} from '../../experiments/reducers/experiment-output.reducer'; import {selectSelectedProjectId} from '../../core/reducers/projects.reducer'; import {selectRouterConfig} from '../../core/reducers/router-reducer'; import {MetricValueType} from '@common/experiments-compare/experiments-compare.constants'; -import {smoothTypeEnum, SmoothTypeEnum} from '@common/shared/single-graph/single-graph.utils'; +import {experimentOutput} from "~/features/experiments/reducers"; +import {ChartHoverModeEnum} from "@common/experiments/shared/common-experiments.const"; export const experimentsCompareReducers: ActionReducerMap = { details: experimentsCompareDetailsReducer, @@ -46,7 +46,7 @@ export const selectModelIdsDetails = createSelector(selectModelsDetails, (models): Array => models.map(model => model.id)); // Params -export const experimentsParams = createSelector(experimentsCompare, (state): ExperimentCompareParamsState => state ? state.params : {}); +export const experimentsParams = createSelector(experimentsCompare, (state): CompareParamsState => state ? state.params : {}); export const selectExperimentsParams = createSelector(experimentsParams, (state): Array => state.experiments); export const selectExperimentIdsParams = createSelector(selectExperimentsParams, (experiments): Array => experiments.map(exp => exp.id)); @@ -55,12 +55,12 @@ export const selectExperimentIdsParams = createSelector(selectExperimentsParams, // select experiments for compare and header export const selectCompareHeader = createSelector(experimentsCompare, state => (state?.compareHeader ?? {}) as CompareHeaderState); export const selectIsCompare = createSelector(selectRouterConfig, (config): boolean => config?.includes('compare-experiments')); -export const selectIsSelectModel = createSelector(selectRouterConfig, (config): boolean => config?.includes('compare-models') || config?.includes('input-model')); +// export const selectIsSelectModel = createSelector(selectRouterConfig, (config): boolean => config?.includes('compare-models') || config?.includes('input-model')); export const selectIsModels = createSelector(selectRouterConfig, (config): boolean => config?.includes('models')); export const selectIsPipelines = createSelector(selectRouterConfig, (config): boolean => config?.[0] === 'pipelines'); export const selectIsDatasets = createSelector(selectRouterConfig, (config): boolean => config?.[0] === 'datasets'); -export const selectSelectedFeature = createSelector(selectRouterConfig, (config): string => config?.[0]); -export const selectCustomProject = createSelector(selectRouterConfig, (config): boolean => ['pipelines', 'datasets'].includes(config?.[0])); +// export const selectSelectedFeature = createSelector(selectRouterConfig, (config): string => config?.[0]); +// export const selectCustomProject = createSelector(selectRouterConfig, (config): boolean => ['pipelines', 'datasets'].includes(config?.[0])); export const selectCompareAddTableSortFields = createSelector(selectCompareHeader, selectSelectedProjectId, (state, projectId) => state.projectColumnsSortOrder?.[projectId] || null); @@ -68,29 +68,32 @@ export const selectCompareAddTableFilters = createSelector(selectCompareHeader, (state, projectId) => state.projectColumnFilters?.[projectId] || {}); export const selectSelectedExperimentsForCompareAdd = createSelector(selectCompareHeader, state => state?.searchResultsExperiments); export const selectExperimentsForCompareSearchTerm = createSelector(selectCompareHeader, state => state?.searchTerm); -export const selectShowAddExperimentsForCompare = createSelector(selectCompareHeader, state => state?.showSearch); +// export const selectShowAddExperimentsForCompare = createSelector(selectCompareHeader, state => state?.showSearch); export const selectHideIdenticalFields = createSelector(selectCompareHeader, state => state?.hideIdenticalRows); -export const selectShowScalarsOptions = createSelector(selectCompareHeader, state => state?.showScalarOptions); +export const selectShowRowExtremes = createSelector(selectCompareHeader, state => state?.showRowExtremes); +export const selectShowGlobalLegend = createSelector(selectCompareHeader, state => state?.showGlobalLegend); +// export const selectShowScalarsOptions = createSelector(selectCompareHeader, state => state?.showScalarOptions); export const selectExperimentsUpdateTime = createSelector(selectCompareHeader, state => state ? state.experimentsUpdateTime : {}); -export const selectNavigationPreferences = createSelector(selectCompareHeader, state => state ? state.navigationPreferences : {}); export const selectViewArchivedInAddTable = createSelector(selectCompareHeader, state => state?.viewArchived); +export const selectExportTable = createSelector(selectCompareHeader, state => state?.exportTable); // Metric Values export const compareMetricsValues = createSelector(experimentsCompare, (state): IExperimentCompareMetricsValuesState => state ? state.metricsValues : {}); -export const selectCompareMetricsValuesExperiments = createSelector(compareMetricsValues, (state): Array => state.experiments); +export const selectCompareMetricsValuesExperiments = createSelector(compareMetricsValues, state => state.experiments); export const selectCompareMetricsValuesSortConfig = createSelector(compareMetricsValues, (state): MetricSortBy => state.metricSortBy); // Charts export const compareCharts = createSelector(experimentsCompare, (state): IExperimentCompareChartsState => state ? state.charts : {}); export const selectSelectedExperiments = createSelector(compareCharts, (state): Array => state ? state.selectedExperiments : []); +export const selectGlobalLegendData = createSelector(compareCharts, state => state.globalLegendData); export const selectCompareHistogramCacheAxisType = createSelector(compareCharts, state => state.cachedAxisType); export const selectCompareTasksPlotCharts = createSelector(compareCharts, state => state.metricsPlotsCharts); +export const selectMultiSingleValues = createSelector(compareCharts, state => state.multiSingleValues); + +export const selectScalarsHoverMode = createSelector(compareCharts, (state): ChartHoverModeEnum => state.scalarsHoverMode); export const selectSelectedExperimentSettings = createSelector(compareCharts, selectSelectedExperiments, - (output, currentExperiments): ExperimentCompareSettings => output.settingsList && output.settingsList.find((setting) => currentExperiments && setting.id?.join() === currentExperiments.join())); - -export const selectSelectedSettingsHiddenPlot = createSelector(selectSelectedExperimentSettings, - (settings): Array => settings?.hiddenMetricsPlot || []); + (output, currentExperiments): ExperimentCompareSettings => output.settingsList?.find(setting => setting?.id?.join() === currentExperiments?.join())); export const selectSelectedSettingsHyperParams = createSelector(selectSelectedExperimentSettings, (settings): Array => settings?.selectedHyperParams || []); @@ -98,14 +101,16 @@ export const selectSelectedSettingsHyperParams = createSelector(selectSelectedEx export const selectSelectedSettingsMetric = createSelector(selectSelectedExperimentSettings, (settings) => settings?.selectedMetric || null); +export const selectSelectedSettingsValueType = createSelector(selectSelectedExperimentSettings, + (settings) => settings?.valueType || 'value'); + export const selectSelectedSettingsHiddenScalar = createSelector(selectSelectedExperimentSettings, (settings): Array => settings?.hiddenMetricsScalar || []); +export const selectSelectedSettingsHiddenPlot = createSelector(selectSelectedExperimentSettings, + (settings): Array => settings?.hiddenMetricsPlot || []); + export const selectExperimentMetricsSearchTerm = createSelector(compareCharts, (state) => state.searchTerm); -export const selectCompareSelectedSettingsSmoothWeight = createSelector(selectSelectedExperimentSettings, - (settings): number => settings?.smoothWeight || 0); -export const selectSelectedSettingsSmoothType = createSelector(selectSelectedExperimentSettings, - (settings): SmoothTypeEnum => settings?.smoothType ?? smoothTypeEnum.exponential); export const selectCompareSelectedSettingsxAxisType = createSelector(selectSelectedExperimentSettings, settings => settings?.xAxisType ?? ScalarKeyEnum.Iter as ScalarKeyEnum); @@ -113,16 +118,16 @@ export const selectCompareSelectedSettingsxAxisType = createSelector(selectSelec export const selectCompareSelectedSettingsGroupBy = createSelector(selectSelectedExperimentSettings, (settings): GroupByCharts => settings?.groupBy || groupByCharts.none); +export const selectViewMode = (page: string) => createSelector(experimentsParams , state => state.viewMode[page]); export const selectScalarsGraph = createSelector(experimentsCompare, (state): ScalarsGraphState => state ? state.scalarsGraph : {}); export const selectScalarsGraphShowIdenticalHyperParams = createSelector(selectScalarsGraph, (state): boolean => state ? state.showIdenticalHyperParams : true); export const selectScalarsGraphMetrics = createSelector(selectScalarsGraph, (state): MetricOption[] => state.metrics); export const selectScalarsGraphHyperParams = createSelector(selectScalarsGraph, (state): GroupedHyperParams => state ? state.hyperParams : {}); export const selectScalarsGraphTasks = createSelector(selectScalarsGraph, (state): any[] => state ? state.tasks : []); -export const selectMetricValueType = createSelector(selectScalarsGraph, (state): MetricValueType => state ? state.valueType : 'value'); export const selectCompareTasksScalarCharts = createSelector( - selectCompareSelectedSettingsxAxisType, + selectCompareHistogramCacheAxisType, compareCharts, (axisType, state) => { if (state?.metricsHistogramCharts?.metrics && (!axisType || axisType === ScalarKeyEnum.IsoTime)) { diff --git a/src/app/webapp-common/experiments-compare/services/experiment-details-reverter.service.ts b/src/app/webapp-common/experiments-compare/services/experiment-details-reverter.service.ts index 1bab4a1d..cadb900d 100644 --- a/src/app/webapp-common/experiments-compare/services/experiment-details-reverter.service.ts +++ b/src/app/webapp-common/experiments-compare/services/experiment-details-reverter.service.ts @@ -9,7 +9,7 @@ import {ARTIFACTS_TYPES, TAGS} from '../../tasks/tasks.constants'; import {Artifact} from '~/business-logic/model/tasks/artifact'; import {crc32} from '../../shared/utils/shared-utils'; import {TaskModelItem} from '~/business-logic/model/tasks/taskModelItem'; -import {IModelInfo} from '../../experiments/shared/common-experiment-model.model'; +import {CompareIModelInfo} from '../../experiments/shared/common-experiment-model.model'; import {ITask} from '~/business-logic/model/al-task'; import {formatDate} from '@angular/common'; import {TIME_FORMAT_STRING} from '@common/constants'; @@ -23,7 +23,7 @@ export class ExperimentDetailsReverterService extends ExperimentDetailsReverterS private durationPipe: DurationPipe; - constructor(public experimentReverter: ExperimentReverterService, @Inject(LOCALE_ID) public locale: string) { + constructor(experimentReverter: ExperimentReverterService, @Inject(LOCALE_ID) public locale: string) { super(experimentReverter); this.durationPipe = new DurationPipe(); this.locale = locale; @@ -41,17 +41,17 @@ export class ExperimentDetailsReverterService extends ExperimentDetailsReverterS 'last update at': experiment.last_update && formatDate(experiment.last_update, TIME_FORMAT_STRING, this.locale) || NA, 'completed at': experiment.completed && formatDate(experiment.completed, TIME_FORMAT_STRING, this.locale) || NA, 'run time': this.durationPipe.transform(experiment.active_duration) || NA, - 'queue': experiment.execution.queue?.name || NA, + 'queue': experiment.execution.queue?.name || NA, 'worker': experiment.last_worker || NA, 'created by': experiment.user.name || NA, 'parent task': (experiment.parent as ITask)?.name || NA, 'project': experiment.project?.name || NA, - ...Object.entries(experiment.runtime || {}) - .filter(([key, ]) => !key.startsWith('_')) - .reduce((res, [key, val]) => { - res[key.replace(/_/g, ' ')] = val; - return res; - }, {}) + ...Object.entries(experiment.runtime || {}) + .filter(([key,]) => !key.startsWith('_')) + .reduce((res, [key, val]) => { + res[key.replace(/_/g, ' ')] = val; + return res; + }, {}) }; } @@ -79,10 +79,15 @@ export class ExperimentDetailsReverterService extends ExperimentDetailsReverterS ...restArtifact, 'file size': content_size, 'file hash': hash, + 'file path': { + dataDictionary: true, + link: uri, + dataValue: uri + } }; if (type_data) { - const preview = type_data.preview && type_data.preview.trim().split('\n') || []; + const preview = type_data.preview && type_data.preview.trim().split('\n') || []; result['content type'] = type_data['content_type'] || ''; result['preview'] = (preview.length < 3000 && preview[0]?.length < 3000) ? preview : [`** Content is too large to display. Hash: ${crc32(type_data.preview)}`]; result['data hash'] = type_data.data_hash || ''; @@ -136,11 +141,14 @@ export class ExperimentDetailsReverterService extends ExperimentDetailsReverterS } - public revertModelInput(model: TaskModelItem): IModelInfo { + public revertModelInput(model: TaskModelItem): CompareIModelInfo { return { - id: model?.model?.id, name: model?.model?.name, - uri: model?.model?.uri, + id: { + dataDictionary: true, + link: `/projects/${model?.model?.project?.id ? model?.model?.project?.id : '*'}/models/${model?.model?.id}`, + dataValue: model?.model?.id, + }, framework: model?.model?.framework || model?.model?.framework }; } diff --git a/src/app/webapp-common/experiments-compare/services/model-details-reverter.service.ts b/src/app/webapp-common/experiments-compare/services/model-details-reverter.service.ts index 4ba45f1f..f646f1ec 100644 --- a/src/app/webapp-common/experiments-compare/services/model-details-reverter.service.ts +++ b/src/app/webapp-common/experiments-compare/services/model-details-reverter.service.ts @@ -62,7 +62,11 @@ export class ModelDetailsReverterService { 'created at': model.created && formatDate(model.created, TIME_FORMAT_STRING, this.locale) || NA, 'update at': model.last_update && formatDate(model.last_update, TIME_FORMAT_STRING, this.locale) || NA, framework: model.framework, - 'model url': model.uri, + 'model url':{ + dataDictionary: true, + link: model.uri, + dataValue: model.uri, + }, user: model.user.name || NA, 'creating experiment': (model.parent as unknown as ITask)?.name || NA, archive: model.system_tags.includes(TAGS.HIDDEN) ? 'Yes' : 'No', diff --git a/src/app/webapp-common/experiments-compare/services/tree-builder.service.ts b/src/app/webapp-common/experiments-compare/services/tree-builder.service.ts index b7562e24..381fbbf9 100644 --- a/src/app/webapp-common/experiments-compare/services/tree-builder.service.ts +++ b/src/app/webapp-common/experiments-compare/services/tree-builder.service.ts @@ -19,7 +19,7 @@ export class TreeBuilderService { data : {}, metaData: {}, parent : null, - children: isObject(obj) ? + children: isObject(obj) && !obj.dataDictionary ? this.buildTreeFromJsonRec(obj, transformer, _metaTransformer, transformerExtraParams) : null }; @@ -42,7 +42,7 @@ export class TreeBuilderService { }; const value = obj[key]; if (value != null) { - if (typeof value === 'object' ) { + if (typeof value === 'object' && !value.dataDictionary) { node.children = this.buildTreeFromJsonRec( value, transformer, metaTransformer, transformerExtraParams, level + 1, node, _path ); diff --git a/src/app/webapp-common/experiments-compare/shared/experiments-compare-details.model.ts b/src/app/webapp-common/experiments-compare/shared/experiments-compare-details.model.ts index 9675bcdf..98b8c0df 100644 --- a/src/app/webapp-common/experiments-compare/shared/experiments-compare-details.model.ts +++ b/src/app/webapp-common/experiments-compare/shared/experiments-compare-details.model.ts @@ -4,6 +4,7 @@ import {Project} from '../../../business-logic/model/projects/project'; import {User} from '../../../business-logic/model/users/user'; import {ExperimentCompareTree} from '../../../features/experiments-compare/experiments-compare-models'; import {Artifact} from '../../../business-logic/model/tasks/artifact'; +import {DataDictionary} from '@common/experiments-compare/experiments-compare.constants'; export type ExperimentCompareTrees = Array; @@ -41,10 +42,10 @@ export interface ModelDetails { } export interface ModelDetailsInput { - id?: Model['id']; + id?: Model['id'] | DataDictionary; framework?: Model['framework']; uri?: Model['uri']; - name?: Model['name']; + name?: Model['name'] taskName?: string; } diff --git a/src/app/webapp-common/experiments/actions/common-experiment-output.actions.ts b/src/app/webapp-common/experiments/actions/common-experiment-output.actions.ts index c22b9a26..b8d0b29e 100644 --- a/src/app/webapp-common/experiments/actions/common-experiment-output.actions.ts +++ b/src/app/webapp-common/experiments/actions/common-experiment-output.actions.ts @@ -33,10 +33,6 @@ export const setHistogram = createAction( EXPERIMENTS_OUTPUT_PREFIX + 'SET_EXPERIMENT_HISTOGRAM', props<{histogram: HistogramCharts; axisType: ScalarKeyEnum}>() ); -export const setScalarsHoverMode = createAction( - EXPERIMENTS_OUTPUT_PREFIX + 'SET SCALARS HOVER MODE', - props<{ hoverMode: ChartHoverModeEnum }>() -); export const setExperimentPlots = createAction( EXPERIMENTS_OUTPUT_PREFIX + 'SET_EXPERIMENT_PLOTS', diff --git a/src/app/webapp-common/experiments/actions/common-experiments-info.actions.ts b/src/app/webapp-common/experiments/actions/common-experiments-info.actions.ts index 10d99fdd..46218751 100755 --- a/src/app/webapp-common/experiments/actions/common-experiments-info.actions.ts +++ b/src/app/webapp-common/experiments/actions/common-experiments-info.actions.ts @@ -1,6 +1,6 @@ import {createAction, props} from '@ngrx/store'; import {Task} from '~/business-logic/model/tasks/task'; -import {IExperimentInfo, ISelectedExperiment} from '~/features/experiments/shared/experiment-info.model'; +import {IExperimentInfo} from '~/features/experiments/shared/experiment-info.model'; import {IExperimentModelInfo, ITableExperiment} from '../shared/common-experiment-model.model'; import {ParamsItem} from '~/business-logic/model/tasks/paramsItem'; import {ConfigurationItem} from '~/business-logic/model/tasks/configurationItem'; @@ -23,7 +23,7 @@ export const autoRefreshExperimentInfo = createAction( export const setExperiment = createAction( EXPERIMENTS_INFO_PREFIX + 'SET_EXPERIMENT', - props<{experiment: ISelectedExperiment}>() + props<{experiment: IExperimentInfo}>() ); export const experimentUpdatedSuccessfully = createAction( diff --git a/src/app/webapp-common/experiments/actions/common-experiments-menu.actions.ts b/src/app/webapp-common/experiments/actions/common-experiments-menu.actions.ts index a38d6b4f..6640bc9e 100644 --- a/src/app/webapp-common/experiments/actions/common-experiments-menu.actions.ts +++ b/src/app/webapp-common/experiments/actions/common-experiments-menu.actions.ts @@ -6,41 +6,41 @@ import {CloneExperimentPayload, ITableExperiment} from '../shared/common-experim import {EntityTypeEnum} from '~/shared/constants/non-common-consts'; import { PipelinesStartPipelineRequest } from '~/business-logic/model/pipelines/pipelinesStartPipelineRequest'; -export const EXPERIMENTS_INFO_PREFIX = 'EXPERIMENTS_INFO_'; +export const EXPERIMENTS_INFO_PREFIX = '[EXPERIMENTS INFO] '; export const publishClicked = createAction( - EXPERIMENTS_INFO_PREFIX + '[publish experiments]', + EXPERIMENTS_INFO_PREFIX + 'publish experiments', props<{ selectedEntities: ISelectedExperiment[] }>() ); export const stopClicked = createAction( - EXPERIMENTS_INFO_PREFIX + '[stop experiments]', + EXPERIMENTS_INFO_PREFIX + 'stop experiments', props<{ selectedEntities: ISelectedExperiment[] }>() ); export const startPipeline = createAction( - EXPERIMENTS_INFO_PREFIX + '[start pipeline]', + EXPERIMENTS_INFO_PREFIX + 'start pipeline', props() ); export const getControllerForStartPipelineDialog = createAction( - EXPERIMENTS_INFO_PREFIX + '[Get Controller For Start Pipeline]', + EXPERIMENTS_INFO_PREFIX + 'Get Controller For Start Pipeline', props<{task: string}>() ); export const setControllerForStartPipelineDialog = createAction( - EXPERIMENTS_INFO_PREFIX + '[Set Controller For Start Pipeline]', + EXPERIMENTS_INFO_PREFIX + 'Set Controller For Start Pipeline', props<{task: IExperimentInfo}>() ); export const changeProjectRequested = createAction( - EXPERIMENTS_INFO_PREFIX + '[change project requested]', + EXPERIMENTS_INFO_PREFIX + 'change project requested', props<{ selectedEntities: ISelectedExperiment[]; project: Project }>() ); export const dequeueClicked = createAction( - EXPERIMENTS_INFO_PREFIX + '[dequeue experiments]', + EXPERIMENTS_INFO_PREFIX + 'dequeue experiments', props<{ selectedEntities: ISelectedExperiment[] }>() ); @@ -50,49 +50,44 @@ export const cloneExperimentClicked = createAction( ); export const addTag = createAction( - EXPERIMENTS_INFO_PREFIX + '[add tag to experiment]', + EXPERIMENTS_INFO_PREFIX + 'add tag to experiment', props<{ experiments: Partial[]; tag: string }>() ); export const abortAllChildren = createAction( - EXPERIMENTS_INFO_PREFIX + '[get all tasks children]', + EXPERIMENTS_INFO_PREFIX + 'get all tasks children', props<{ experiments: ISelectedExperiment[]}>() ); export const removeTag = createAction( - EXPERIMENTS_INFO_PREFIX + '[remove tag from experiment]', + EXPERIMENTS_INFO_PREFIX + 'remove tag from experiment', props<{ experiments: Partial[]; tag: string }>() ); export const shareSelectedExperiments = createAction( - EXPERIMENTS_INFO_PREFIX + '[share experiments]', + EXPERIMENTS_INFO_PREFIX + 'share experiments', props<{ share: boolean; task: string }>() ); export const navigateToQueue = createAction( - EXPERIMENTS_INFO_PREFIX + '[navigate to queue]', + EXPERIMENTS_INFO_PREFIX + 'navigate to queue', props<{ experimentId: string }>() ); -// export const resetClicked = createAction( -// EXPERIMENTS_INFO_PREFIX + '[reset experiments]', -// props<{ selectedEntities: ISelectedExperiment[] }>() -// ); - export const enqueueClicked = createAction( - EXPERIMENTS_INFO_PREFIX + '[enqueue experiments]', + EXPERIMENTS_INFO_PREFIX + 'enqueue experiments', props<{ selectedEntities: ISelectedExperiment[]; queue: Queue; verifyWatchers: boolean }>() ); export const openEmptyQueueMessage = createAction( - EXPERIMENTS_INFO_PREFIX + '[open empty queue message]', + EXPERIMENTS_INFO_PREFIX + 'open empty queue message', props<{ queue: Queue }>() ); export const archiveSelectedExperiments = createAction( - EXPERIMENTS_INFO_PREFIX + '[archive selected experiments]', + EXPERIMENTS_INFO_PREFIX + 'archive selected experiments', props<{ selectedEntities: ISelectedExperiment[]; skipUndo?: boolean; entityType?: EntityTypeEnum }>() ); export const restoreSelectedExperiments = createAction( - EXPERIMENTS_INFO_PREFIX + '[restore selected experiments]', + EXPERIMENTS_INFO_PREFIX + 'restore selected experiments', props<{ selectedEntities: ISelectedExperiment[]; skipUndo?: boolean; entityType?: EntityTypeEnum }>() ); diff --git a/src/app/webapp-common/experiments/actions/common-experiments-view.actions.ts b/src/app/webapp-common/experiments/actions/common-experiments-view.actions.ts index d539929b..24cc7273 100755 --- a/src/app/webapp-common/experiments/actions/common-experiments-view.actions.ts +++ b/src/app/webapp-common/experiments/actions/common-experiments-view.actions.ts @@ -12,7 +12,7 @@ import {EXPERIMENTS_PREFIX} from '@common/experiments/experiment.consts'; import { OrganizationPrepareDownloadForGetAllRequest } from '~/business-logic/model/organization/organizationPrepareDownloadForGetAllRequest'; -import {PROJECTS_PREFIX} from '@common/core/actions/projects.actions'; +import {ISelectedExperiment} from '~/features/experiments/shared/experiment-info.model'; // COMMANDS: export const getExperiments = createAction(EXPERIMENTS_PREFIX + ' [get experiments]'); @@ -20,7 +20,10 @@ export const selectNextExperiment = createAction(EXPERIMENTS_PREFIX + ' [select export const getExperimentsWithPageSize = createAction(EXPERIMENTS_PREFIX + ' [get experiments with size]', props<{ pageSize: number }>()); -export const getNextExperiments = createAction(EXPERIMENTS_PREFIX + '[get next experiments]'); +export const getNextExperiments = createAction( + EXPERIMENTS_PREFIX + '[get next experiments]', + (allProjects = false) => ({allProjects}) +); export const setTableCols = createAction( EXPERIMENTS_PREFIX + ' [set table cols]', @@ -72,7 +75,7 @@ export const updateManyExperiment = createAction( export const setSelectedExperiments = createAction( EXPERIMENTS_PREFIX + ' [set selected experiments]', - props<{ experiments: ITableExperiment[] }>() + props<{ experiments: ISelectedExperiment[] }>() ); export const updateUrlParams = createAction(EXPERIMENTS_PREFIX + '[update URL params from state]'); @@ -169,7 +172,10 @@ export const setCurrentScrollId = createAction( EXPERIMENTS_PREFIX + ' [set current scrollId]', props<{ scrollId: string }>() ); - +export const setHyperParamsFiltersPage = createAction( + EXPERIMENTS_PREFIX + ' [set hyper params filters page]', + props<{ page: number }>() +); export const resetExperiments = createAction(EXPERIMENTS_PREFIX + ' [reset experiments]'); export const getCustomMetrics = createAction(EXPERIMENTS_PREFIX + ' [get custom metrics]'); export const getCustomHyperParams = createAction(EXPERIMENTS_PREFIX + ' [get custom hyper parameter]'); @@ -185,7 +191,7 @@ export const setCustomHyperParams = createAction( export const setExtraColumns = createAction( EXPERIMENTS_PREFIX + 'SET_EXTRA_COLUMNS', - props<{ columns: any[]; projectId: string }>() + props<{ columns: ISmCol[]; projectId: string }>() ); export const addColumn = createAction( @@ -222,12 +228,12 @@ export const setSplitSize = createAction(EXPERIMENTS_PREFIX + 'SET_SPLIT_SIZE', export const hyperParamSelectedInfoExperiments = createAction( EXPERIMENTS_PREFIX + '[hyper param option add filter experiments]', - props<{ col: ISmCol; values: string[] }>() + props<{ col: ISmCol; values: string[]; loadMore: boolean }>() ); export const hyperParamSelectedExperiments = createAction( EXPERIMENTS_INFO_PREFIX + '[hyper param selected in the menu filter experiments]', - props<{ col: ISmCol }>() + props<{ col: ISmCol; searchValue: string }>() ); export const getTags = createAction(EXPERIMENTS_PREFIX + ' [get experiments tags]' , diff --git a/src/app/webapp-common/experiments/containers/experiment-info-aritfacts/experiment-info-aritfacts.component.scss b/src/app/webapp-common/experiments/containers/experiment-info-aritfacts/experiment-info-aritfacts.component.scss index 5ad7d6f4..0fe32251 100755 --- a/src/app/webapp-common/experiments/containers/experiment-info-aritfacts/experiment-info-aritfacts.component.scss +++ b/src/app/webapp-common/experiments/containers/experiment-info-aritfacts/experiment-info-aritfacts.component.scss @@ -15,18 +15,14 @@ transform: translateY(-50%) translateX(-50%); display: block; .i-no-data-artifacts{ - width: 200px; - height: 160px; + width: 150px; + height: 100px; } - h3 { - color: $cloudy-blue-two; + h4 { + color: $blue-100; } } - .col-6 { - padding: 0; - } - ::ng-deep sm-labeled-row { border-bottom: none !important; } diff --git a/src/app/webapp-common/experiments/containers/experiment-info-aritfacts/experiment-info-artifacts.component.html b/src/app/webapp-common/experiments/containers/experiment-info-aritfacts/experiment-info-artifacts.component.html index fba1030d..d8c1d0ae 100755 --- a/src/app/webapp-common/experiments/containers/experiment-info-aritfacts/experiment-info-artifacts.component.html +++ b/src/app/webapp-common/experiments/containers/experiment-info-aritfacts/experiment-info-artifacts.component.html @@ -29,7 +29,7 @@
-

NO ARTIFACTS RECORDED

+

NO ARTIFACTS RECORDED

diff --git a/src/app/webapp-common/experiments/containers/experiment-info-aritfacts/experiment-info-artifacts.component.ts b/src/app/webapp-common/experiments/containers/experiment-info-aritfacts/experiment-info-artifacts.component.ts index c9fa1901..5534e637 100755 --- a/src/app/webapp-common/experiments/containers/experiment-info-aritfacts/experiment-info-artifacts.component.ts +++ b/src/app/webapp-common/experiments/containers/experiment-info-aritfacts/experiment-info-artifacts.component.ts @@ -1,16 +1,21 @@ import {Component, OnDestroy} from '@angular/core'; +import {ActiveSectionEnum} from '@common/experiments/experiment.consts'; import {Store} from '@ngrx/store'; import {selectBackdropActive} from '@common/core/reducers/view.reducer'; import {combineLatest, Observable, pairwise, Subscription} from 'rxjs'; -import {ExperimentInfoState} from '~/features/experiments/reducers/experiment-info.reducer'; -import {selectCurrentArtifactExperimentId, selectExperimentModelInfoData} from '../../reducers'; +import { + selectArtifactId, + selectCurrentArtifactExperimentId, + selectExperimentModelInfoData, + selectSelectedExperimentFromRouter +} from '../../reducers'; import { selectExperimentInfoData, selectIsExperimentEditable, selectSelectedExperiment } from '~/features/experiments/reducers'; import {IExperimentInfo} from '~/features/experiments/shared/experiment-info.model'; -import {selectRouterConfig, selectRouterParams} from '@common/core/reducers/router-reducer'; +import {selectRouterConfig} from '@common/core/reducers/router-reducer'; import {debounceTime, distinctUntilChanged, filter, map, startWith} from 'rxjs/operators'; import {ActivatedRoute, Router} from '@angular/router'; import {IExperimentModelInfo} from '../../shared/common-experiment-model.model'; @@ -29,7 +34,7 @@ export class ExperimentInfoArtifactsComponent implements OnDestroy { public backdropActive$: Observable; public modelInfo$: Observable; public experimentInfo$: Observable; - public activeSection: any; + public activeSection: ActiveSectionEnum; public selectedId$: Observable; private experimentKey$: Observable; public routerConfig$: Observable; @@ -46,14 +51,13 @@ export class ExperimentInfoArtifactsComponent implements OnDestroy { this.modelInfo$ = this.store.select(selectExperimentModelInfoData); this.experimentInfo$ = this.store.select(selectExperimentInfoData); this.routerConfig$ = this.store.select(selectRouterConfig); - this.selectedId$ = this.store.select(selectRouterParams) - .pipe(map(params => decodeURIComponent(params?.artifactId || params?.modelId))); - this.experimentKey$ = this.store.select(selectRouterParams).pipe(map(params => params?.experimentId)); + this.selectedId$ = this.store.select(selectArtifactId) + this.experimentKey$ = this.store.select(selectSelectedExperimentFromRouter); this.sub.add(this.store.select(selectRouterConfig) .pipe(filter(rc => !!rc)) .subscribe((routerConfig: string[]) => { - this.activeSection = this.minimized ? routerConfig[5] : routerConfig[6]; + this.activeSection = (this.minimized ? routerConfig[5] : routerConfig[6]) as ActiveSectionEnum; }) ); @@ -106,24 +110,25 @@ export class ExperimentInfoArtifactsComponent implements OnDestroy { ); } - private navigateToTarget(target: string) { - if (target !== this.previousTarget || !this.route.firstChild) { - this.router.navigate([target], {relativeTo: this.route, queryParamsHandling: 'preserve'}); - this.previousTarget = target; + private navigateToTarget(target: string[]) { + const targetStr = target.join('/'); + if (targetStr !== this.previousTarget || !this.route.firstChild) { + this.previousTarget = targetStr; + this.router.navigate(target, {relativeTo: this.route, queryParamsHandling: 'preserve', replaceUrl: true}); } } private resetSelection(modelInfo): void { - let target: string; + let target: string[]; if (modelInfo.input?.length > 0) { - target = `../artifacts/input-model/${encodeURIComponent(modelInfo.input[0]?.id)}`; + target = ['..', 'artifacts', 'input-model', encodeURIComponent(modelInfo.input[0]?.id)]; } else if (modelInfo.output?.length > 0) { - target = `../artifacts/output-model/${encodeURIComponent(modelInfo.output[0]?.id)}/`; + target = ['..', 'artifacts', 'output-model', encodeURIComponent(modelInfo.output[0]?.id)]; } else if (modelInfo.artifacts.length > 0) { - target = `../artifacts/other/${encodeURIComponent(modelInfo.artifacts[0]?.key)}/${encodeURIComponent(modelInfo.artifacts[0]?.mode)}`; + target = ['..', 'artifacts', 'other', encodeURIComponent(modelInfo.artifacts[0]?.key), encodeURIComponent(modelInfo.artifacts[0]?.mode)]; } else { // no items - target = '../artifacts/input-model/input-model'; + target = ['..', 'artifacts', 'input-model', 'input-model']; } this.navigateToTarget(target); } diff --git a/src/app/webapp-common/experiments/containers/experiment-info-artifact-item/experiment-info-artifact-item.component.scss b/src/app/webapp-common/experiments/containers/experiment-info-artifact-item/experiment-info-artifact-item.component.scss index 27da0ae6..2b2bdd59 100755 --- a/src/app/webapp-common/experiments/containers/experiment-info-artifact-item/experiment-info-artifact-item.component.scss +++ b/src/app/webapp-common/experiments/containers/experiment-info-artifact-item/experiment-info-artifact-item.component.scss @@ -2,8 +2,4 @@ ::ng-deep sm-labeled-row .label-container { width: 175px !important; } - - .col-6{ - padding: 0px; - } } diff --git a/src/app/webapp-common/experiments/containers/experiment-info-artifact-item/experiment-info-artifact-item.component.ts b/src/app/webapp-common/experiments/containers/experiment-info-artifact-item/experiment-info-artifact-item.component.ts index 932d53fe..ede7c1f5 100755 --- a/src/app/webapp-common/experiments/containers/experiment-info-artifact-item/experiment-info-artifact-item.component.ts +++ b/src/app/webapp-common/experiments/containers/experiment-info-artifact-item/experiment-info-artifact-item.component.ts @@ -1,28 +1,27 @@ -import {Component, OnDestroy, OnInit} from '@angular/core'; -import {Store} from '@ngrx/store'; -import {selectExperimentModelInfoData} from '../../reducers'; -import {IExperimentModelInfo} from '../../shared/common-experiment-model.model'; -import {combineLatest, Observable, Subscription} from 'rxjs'; -import {ExperimentInfoState} from '~/features/experiments/reducers/experiment-info.reducer'; +import {ChangeDetectionStrategy, ChangeDetectorRef, Component, OnDestroy, OnInit} from '@angular/core'; import {selectRouterParams} from '@common/core/reducers/router-reducer'; +import {Store} from '@ngrx/store'; +import {combineLatest, Observable, Subscription} from 'rxjs'; import {distinctUntilChanged, filter, map} from 'rxjs/operators'; import {Artifact} from '~/business-logic/model/tasks/artifact'; +import {selectExperimentModelInfoData} from '../../reducers'; +import {IExperimentModelInfo} from '../../shared/common-experiment-model.model'; @Component({ selector: 'sm-experiment-info-artifact-item', templateUrl: './experiment-info-artifact-item.component.html', - styleUrls: ['./experiment-info-artifact-item.component.scss'] + styleUrls: ['./experiment-info-artifact-item.component.scss'], + changeDetection: ChangeDetectionStrategy.OnPush }) export class ExperimentInfoArtifactItemComponent implements OnInit, OnDestroy { public modelInfo$: Observable; public editable$: Observable; - public errors$: Observable; public saving$: Observable; private artifactSubscription: Subscription; public selectedArtifact: Artifact; - public artifactKey$: Observable; + public artifactKey$: Observable<{key: string; mode: string}>; - constructor(private store: Store) { + constructor(private store: Store, private cdr: ChangeDetectorRef) { this.modelInfo$ = this.store.select(selectExperimentModelInfoData); this.artifactKey$ = this.store.select(selectRouterParams) .pipe( @@ -37,12 +36,13 @@ export class ExperimentInfoArtifactItemComponent implements OnInit, OnDestroy { .pipe(filter(([artifactKey, modelInfo]) => !!(artifactKey && artifactKey.key) && !!modelInfo)) .subscribe(([artifactKey, modelInfo]) => { this.selectedArtifact = modelInfo.artifacts.find(artifact => (artifact.key === artifactKey.key && artifact.mode === artifactKey.mode)); + this.cdr.markForCheck(); }); } ngOnDestroy(): void { if (this.artifactSubscription) { - this.artifactSubscription.unsubscribe(); + this.artifactSubscription?.unsubscribe(); } } diff --git a/src/app/webapp-common/experiments/containers/experiment-info-model/experiment-info-model.component.html b/src/app/webapp-common/experiments/containers/experiment-info-model/experiment-info-model.component.html index 9e98d569..c63f0e89 100755 --- a/src/app/webapp-common/experiments/containers/experiment-info-model/experiment-info-model.component.html +++ b/src/app/webapp-common/experiments/containers/experiment-info-model/experiment-info-model.component.html @@ -8,6 +8,7 @@ [ngTemplateOutlet]="template" #template> diff --git a/src/app/webapp-common/experiments/containers/experiment-info-task-model/experiment-info-task-model.component.scss b/src/app/webapp-common/experiments/containers/experiment-info-task-model/experiment-info-task-model.component.scss index 53a3e934..0b41b14c 100755 --- a/src/app/webapp-common/experiments/containers/experiment-info-task-model/experiment-info-task-model.component.scss +++ b/src/app/webapp-common/experiments/containers/experiment-info-task-model/experiment-info-task-model.component.scss @@ -11,10 +11,6 @@ ::ng-deep sm-labeled-row .label-container { width: 175px !important; } - .col-6{ - padding: 0px; - } - .editable-design { flex: 1; min-height: 250px; diff --git a/src/app/webapp-common/experiments/containers/experiment-ouptut/base-experiment-output.component.ts b/src/app/webapp-common/experiments/containers/experiment-ouptut/base-experiment-output.component.ts index ba7ddc78..367523aa 100644 --- a/src/app/webapp-common/experiments/containers/experiment-ouptut/base-experiment-output.component.ts +++ b/src/app/webapp-common/experiments/containers/experiment-ouptut/base-experiment-output.component.ts @@ -1,12 +1,11 @@ import {Component, OnDestroy, OnInit} from '@angular/core'; import {selectRouterConfig, selectRouterParams} from '@common/core/reducers/router-reducer'; -import {select, Store} from '@ngrx/store'; +import {Store} from '@ngrx/store'; import {Observable, Subscription} from 'rxjs'; import {ActivatedRoute, Router} from '@angular/router'; import {distinctUntilChanged, filter, map, tap, withLatestFrom} from 'rxjs/operators'; import {Project} from '~/business-logic/model/projects/project'; import {IExperimentInfo} from '~/features/experiments/shared/experiment-info.model'; -import {ExperimentOutputState} from '@common/experiments/reducers/experiment-output.reducer'; import { selectExperimentInfoData, selectIsSharedAndNotOwner, @@ -79,8 +78,8 @@ export abstract class BaseExperimentOutputComponent implements OnInit, OnDestroy this.routerConfig = routerConfig; })); - this.subs.add(this.store.pipe( - select(selectRouterParams), + this.subs.add(this.store.select(selectRouterParams) + .pipe( tap((params) => this.projectId = params.projectId), map(params => params?.experimentId), filter(experimentId => !!experimentId), @@ -88,7 +87,7 @@ export abstract class BaseExperimentOutputComponent implements OnInit, OnDestroy distinctUntilChanged(), withLatestFrom(this.store.select(selectSelectedExperiments)) ).subscribe(([experimentId, selectedExperiments]) => { - this.selectedExperiment = selectedExperiments.find(experiment => experiment.id === experimentId); + this.selectedExperiment = selectedExperiments.find(experiment => experiment.id === experimentId) as unknown as IExperimentInfo; this.isExample = isReadOnly( this.selectedExperiment); this.isDevelopment = isDevelopment(this.selectedExperiment); this.store.dispatch(resetExperimentMetrics()); @@ -110,8 +109,8 @@ export abstract class BaseExperimentOutputComponent implements OnInit, OnDestroy }) ); - this.subs.add(this.store.pipe(select(selectSelectedExperiment), - filter(experiment => experiment?.id === this.experimentId)) + this.subs.add(this.store.select(selectSelectedExperiment) + .pipe(filter(experiment => experiment?.id === this.experimentId)) .subscribe(experiment => { this.selectedExperiment = experiment; this.isExample = isReadOnly( this.selectedExperiment); diff --git a/src/app/webapp-common/experiments/containers/experiment-output-log/experiment-output-log.component.html b/src/app/webapp-common/experiments/containers/experiment-output-log/experiment-output-log.component.html index d8a1b466..e4cb02a5 100755 --- a/src/app/webapp-common/experiments/containers/experiment-output-log/experiment-output-log.component.html +++ b/src/app/webapp-common/experiments/containers/experiment-output-log/experiment-output-log.component.html @@ -4,8 +4,8 @@ Hostname: {{creator}}
- Filter: @@ -19,7 +19,7 @@
-

NO LOG DATA

+

NO LOG DATA

; + public log$: Observable; public filter$: Observable; public fetching$: Observable; public logBeginning$: Observable; @@ -52,7 +51,7 @@ export class ExperimentOutputLogComponent implements OnInit, AfterViewInit, OnDe public disabled: boolean; public hasLog: boolean; private logRef: ExperimentLogInfoComponent; - private experiment$ = new BehaviorSubject(null); + private experiment$ = new BehaviorSubject(null); @ViewChildren(ExperimentLogInfoComponent) private logRefs: QueryList; constructor(private store: Store, private cdr: ChangeDetectorRef, private refresh: RefreshService) { @@ -67,7 +66,7 @@ export class ExperimentOutputLogComponent implements OnInit, AfterViewInit, OnDe this.experiment$ ]).pipe( debounceTime(0), - map(([selected, input]) => (input || selected) as ISelectedExperiment), + map(([selected, input]) => input ?? selected), filter(experiment => !!experiment?.id), ) .subscribe(experiment => { diff --git a/src/app/webapp-common/experiments/containers/experiment-output-plots/experiment-output-plots.component.html b/src/app/webapp-common/experiments/containers/experiment-output-plots/experiment-output-plots.component.html index 3098b60a..ba44f86d 100644 --- a/src/app/webapp-common/experiments/containers/experiment-output-plots/experiment-output-plots.component.html +++ b/src/app/webapp-common/experiments/containers/experiment-output-plots/experiment-output-plots.component.html @@ -1,5 +1,5 @@ - +
; - public selectedGraph: string = null; private experimentId: string; private routerParams$: Observable; public listOfHidden$: Observable>; - public experimentSettings$: Observable; public searchTerm$: Observable; public minimized: boolean = false; public graphs: { [key: string]: ExtFrame[] }; @@ -76,14 +73,6 @@ export class ExperimentOutputPlotsComponent implements OnInit, OnDestroy, OnChan this.subs.add(this.store.select(selectSelectedExperiment).subscribe(exp => this.experimentCompany = exp?.company?.id ?? null)); this.listOfHidden$ = this.store.select(selectSelectedSettingsHiddenPlot); - this.experimentSettings$ = this.store.select(selectSelectedExperimentSettings) - .pipe( - filter(settings => !!settings), - map(settings => settings ? settings.selectedPlot : null), - filter(selectedPlot => selectedPlot !== undefined), - distinctUntilChanged() - ); - this.routerParams$ = this.store.select(selectRouterParams) .pipe( filter(params => !!params.experimentId && !this.isDatasetVersionPreview), @@ -121,13 +110,6 @@ export class ExperimentOutputPlotsComponent implements OnInit, OnDestroy, OnChan this.changeDetection.detectChanges(); })); - this.subs.add(this.experimentSettings$ - .subscribe((selectedPlot) => { - this.selectedGraph = selectedPlot; - this.graphsComponent?.scrollToGraph(selectedPlot); - this.store.dispatch(setExperimentSettings({id: this.experimentId, changes: {selectedPlot: null}})); - })); - this.subs.add(this.routerParams$ .subscribe(params => { if (!this.experimentId || this.experimentId !== params.experimentId) { @@ -168,7 +150,7 @@ export class ExperimentOutputPlotsComponent implements OnInit, OnDestroy, OnChan } metricSelected(id: string) { - this.store.dispatch(setExperimentSettings({id: this.experimentId, changes: {selectedPlot: id}})); + this.graphsComponent?.scrollToGraph(id); } hiddenListChanged(hiddenList: string[]) { diff --git a/src/app/webapp-common/experiments/containers/experiment-output-scalars/experiment-output-scalars.component.html b/src/app/webapp-common/experiments/containers/experiment-output-scalars/experiment-output-scalars.component.html index 55711532..c97b51ce 100644 --- a/src/app/webapp-common/experiments/containers/experiment-output-scalars/experiment-output-scalars.component.html +++ b/src/app/webapp-common/experiments/containers/experiment-output-scalars/experiment-output-scalars.component.html @@ -1,5 +1,5 @@ - +
diff --git a/src/app/webapp-common/experiments/containers/experiment-output-scalars/experiment-output-scalars.component.ts b/src/app/webapp-common/experiments/containers/experiment-output-scalars/experiment-output-scalars.component.ts index b319af73..e486594c 100644 --- a/src/app/webapp-common/experiments/containers/experiment-output-scalars/experiment-output-scalars.component.ts +++ b/src/app/webapp-common/experiments/containers/experiment-output-scalars/experiment-output-scalars.component.ts @@ -1,11 +1,10 @@ -import {ChangeDetectorRef, Component, OnDestroy, OnInit, ViewChild} from '@angular/core'; +import {ChangeDetectorRef, Component, inject, OnDestroy, OnInit, ViewChild} from '@angular/core'; import {RefreshService} from '@common/core/services/refresh.service'; import { selectExperimentInfoHistograms, selectExperimentMetricsSearchTerm, selectIsExperimentInProgress, selectScalarSingleValue, - selectSelectedExperimentSettings, selectSelectedSettingsGroupBy, selectSelectedSettingsHiddenScalar, selectSelectedSettingsSmoothType, selectSelectedSettingsSmoothWeight, @@ -15,9 +14,9 @@ import { } from '../../reducers'; import {Observable, Subscription} from 'rxjs'; import {Store} from '@ngrx/store'; -import {debounceTime, distinctUntilChanged, distinctUntilKeyChanged, filter, map, tap} from 'rxjs/operators'; +import {debounceTime, distinctUntilChanged, distinctUntilKeyChanged, filter, tap} from 'rxjs/operators'; import {selectRouterParams} from '@common/core/reducers/router-reducer'; -import {ActivatedRoute, Router} from '@angular/router'; +import {ActivatedRoute, Params, Router} from '@angular/router'; import { experimentScalarRequested, resetExperimentMetrics, @@ -35,6 +34,7 @@ import {isEqual} from 'lodash-es'; import { EventsGetTaskSingleValueMetricsResponseValues } from '~/business-logic/model/events/eventsGetTaskSingleValueMetricsResponseValues'; import { ReportCodeEmbedService } from '~/shared/services/report-code-embed.service'; import {SmoothTypeEnum} from '@common/shared/single-graph/single-graph.utils'; +import {singleValueChartTitle} from '@common/experiments/shared/common-experiments.const'; export const prepareScalarList = (metricsScalar: GroupedList): GroupedList => Object.keys(metricsScalar || []).reduce((acc, curr) => { @@ -50,31 +50,28 @@ export const prepareScalarList = (metricsScalar: GroupedList): GroupedList => }) export class ExperimentOutputScalarsComponent implements OnInit, OnDestroy { public scalarList: GroupedList = {}; - public selectedGraph: string = null; private subs = new Subscription(); protected experimentId: string; - protected routerParams$: Observable; + protected routerParams$: Observable; public refreshDisabled: boolean; - public listOfHidden$: Observable>; - public scalars$: any; - public settings$: Observable; + public listOfHidden$: Observable>; + public scalars$: Observable; public searchTerm$: Observable; - public minimized: boolean = false; + public minimized = false; public graphs: { [key: string]: ExtFrame[] }; public selectIsExperimentPendingRunning: Observable; public smoothWeight$: Observable; public smoothWeightDelayed$: Observable; public smoothType$: Observable; - public showSettingsBar: boolean = false; + public showSettingsBar = false; public xAxisType$: Observable; public groupBy$: Observable; public splitSize$: Observable; public groupBy: GroupByCharts; - protected entitySelector = this.store.select(selectSelectedExperiment) as Observable<{id?: string; name?: string}>; protected entityType: 'task' | 'model' = 'task'; protected exportForReport = true; - private scalars: any; + private scalars: GroupedList; @ViewChild(ExperimentGraphsComponent) experimentGraphs; groupByOptions = [ @@ -90,31 +87,32 @@ export class ExperimentOutputScalarsComponent implements OnInit, OnDestroy { public singleValueData$: Observable>; public experimentName: string; private singleValueExists: boolean; + protected store: Store; + protected router: Router; + protected activeRoute: ActivatedRoute; + protected changeDetection: ChangeDetectorRef; + protected reportEmbed: ReportCodeEmbedService; + protected entitySelector: Observable<{ id?: string; name?: string }>; + protected refreshService: RefreshService; + + constructor() { + this.store = inject(Store); + this.router = inject(Router); + this.activeRoute = inject(ActivatedRoute); + this.changeDetection = inject(ChangeDetectorRef); + this.reportEmbed = inject(ReportCodeEmbedService); + this.refreshService = inject( RefreshService); - constructor( - protected store: Store, - protected router: Router, - protected activeRoute: ActivatedRoute, - protected changeDetection: ChangeDetectorRef, - protected reportEmbed: ReportCodeEmbedService, - protected refreshService: RefreshService - ) { this.searchTerm$ = this.store.select(selectExperimentMetricsSearchTerm); this.splitSize$ = this.store.select(selectSplitSize); + this.entitySelector = this.store.select(selectSelectedExperiment); this.scalars$ = this.store.select(selectExperimentInfoHistograms) .pipe( filter((metrics) => !!metrics), ); - this.settings$ = this.store.select(selectSelectedExperimentSettings) - .pipe( - filter(settings => !!settings), - map(settings => settings ? settings.selectedScalar : null), - distinctUntilChanged(), - filter(selectedPlot => selectedPlot !== undefined) - ); - this.smoothWeight$ = this.store.select(selectSelectedSettingsSmoothWeight); + this.smoothWeight$ = this.store.select(selectSelectedSettingsSmoothWeight).pipe(filter(smooth => smooth !== null)); this.smoothWeightDelayed$ = this.store.select(selectSelectedSettingsSmoothWeight).pipe(debounceTime(75)); this.smoothType$ = this.store.select(selectSelectedSettingsSmoothType); this.xAxisType$ = this.store.select(selectSelectedSettingsxAxisType(false)); @@ -180,14 +178,6 @@ export class ExperimentOutputScalarsComponent implements OnInit, OnDestroy { }) ); - this.subs.add(this.settings$ - .subscribe((selectedScalar) => { - this.selectedGraph = selectedScalar; - this.experimentGraphs?.scrollToGraph(selectedScalar); - this.store.dispatch(setExperimentSettings({id: this.experimentId, changes: {selectedScalar: undefined}})); - }) - ); - this.subs.add(this.routerParams$ .subscribe(params => { if (!this.experimentId || ![params.experimentId, params.modelId].includes(this.experimentId)) { @@ -204,7 +194,7 @@ export class ExperimentOutputScalarsComponent implements OnInit, OnDestroy { if (scalars) { const splittedScalars = this.groupBy === 'metric' ? scalars : this.splitScalars(scalars); // eslint-disable-next-line @typescript-eslint/naming-convention - this.scalarList = {...(this.singleValueExists && {Summary: {}}), ...prepareScalarList(splittedScalars)}; + this.scalarList = {...(this.singleValueExists && {[singleValueChartTitle]: {}}), ...prepareScalarList(splittedScalars)}; this.graphs = convertScalars(splittedScalars, this.experimentId); this.changeDetection.detectChanges(); } @@ -216,7 +206,7 @@ export class ExperimentOutputScalarsComponent implements OnInit, OnDestroy { } metricSelected(id) { - this.store.dispatch(setExperimentSettings({id: this.experimentId, changes: {selectedScalar: id}})); + this.experimentGraphs?.scrollToGraph(id); } @@ -239,7 +229,7 @@ export class ExperimentOutputScalarsComponent implements OnInit, OnDestroy { this.store.dispatch(resetExperimentMetrics()); } - changeSmoothness($event: any) { + changeSmoothness($event: number) { this.store.dispatch(setExperimentSettings({id: this.experimentId, changes: {smoothWeight: $event}})); } diff --git a/src/app/webapp-common/experiments/dumb/base-clickable-artifact.component.ts b/src/app/webapp-common/experiments/dumb/base-clickable-artifact.component.ts index c84f05d9..baae1b66 100644 --- a/src/app/webapp-common/experiments/dumb/base-clickable-artifact.component.ts +++ b/src/app/webapp-common/experiments/dumb/base-clickable-artifact.component.ts @@ -1,4 +1,4 @@ -import {Component} from '@angular/core'; +import {Component, inject} from '@angular/core'; import {Store} from '@ngrx/store'; import {filter, map, take} from 'rxjs/operators'; import {selectSignedUrl} from '../../core/reducers/common-auth-reducer'; @@ -11,8 +11,12 @@ import {getSignedUrl} from '../../core/actions/common-auth.actions'; }) export class BaseClickableArtifactComponent { protected timestamp: number; + protected adminService: AdminService; + protected store: Store; - constructor(protected adminService: AdminService, protected store: Store) { + constructor() { + this.adminService = inject(AdminService); + this.store = inject(Store); } artifactFilePathClicked(url: string) { diff --git a/src/app/webapp-common/experiments/dumb/experiment-artifact-item-view/experiment-artifact-item-view.component.html b/src/app/webapp-common/experiments/dumb/experiment-artifact-item-view/experiment-artifact-item-view.component.html index eb0b28ae..fcc94d98 100755 --- a/src/app/webapp-common/experiments/dumb/experiment-artifact-item-view/experiment-artifact-item-view.component.html +++ b/src/app/webapp-common/experiments/dumb/experiment-artifact-item-view/experiment-artifact-item-view.component.html @@ -4,7 +4,7 @@ {{artifact?.uri}} {{artifact?.uri}} { const a = document.createElement('a'); diff --git a/src/app/webapp-common/experiments/dumb/experiment-artifacts-navbar/experiment-artifacts-navbar.component.ts b/src/app/webapp-common/experiments/dumb/experiment-artifacts-navbar/experiment-artifacts-navbar.component.ts index 1787a10e..24df39d5 100644 --- a/src/app/webapp-common/experiments/dumb/experiment-artifacts-navbar/experiment-artifacts-navbar.component.ts +++ b/src/app/webapp-common/experiments/dumb/experiment-artifacts-navbar/experiment-artifacts-navbar.component.ts @@ -1,13 +1,8 @@ -import {Component, Input, OnChanges, SimpleChanges} from '@angular/core'; -import {Artifact} from '../../../../business-logic/model/tasks/artifact'; +import {Component, Input, OnChanges} from '@angular/core'; +import {ActiveSectionEnum} from '@common/experiments/experiment.consts'; +import {Artifact} from '~/business-logic/model/tasks/artifact'; import {IModelInfo} from '../../shared/common-experiment-model.model'; - enum ActiveSectionEnum { - 'input-model' = 'input-model', - 'output-model' = 'output-model', - 'artifact' = 'artifact', - 'other' = 'other', - } @Component({ selector : 'sm-experiment-artifacts-navbar', templateUrl: './experiment-artifacts-navbar.component.html', @@ -41,7 +36,7 @@ export class ExperimentArtifactsNavbarComponent implements OnChanges{ return (artifact.key + artifact.mode); } - ngOnChanges(changes: SimpleChanges): void { + ngOnChanges(): void { this.noItemsMode = this.outputModels?.length === 0 && this.inputModels?.length === 0 && this.dataAuditArtifacts?.length === 0 && this.otherArtifacts?.length === 0; } } diff --git a/src/app/webapp-common/experiments/dumb/experiment-execution-parameters/experiment-execution-parameters.component.html b/src/app/webapp-common/experiments/dumb/experiment-execution-parameters/experiment-execution-parameters.component.html index d2ada6a2..851bdd37 100755 --- a/src/app/webapp-common/experiments/dumb/experiment-execution-parameters/experiment-execution-parameters.component.html +++ b/src/app/webapp-common/experiments/dumb/experiment-execution-parameters/experiment-execution-parameters.component.html @@ -9,7 +9,9 @@ > -
- -
+
@@ -66,12 +69,25 @@ let-i="rowIndex" let-row="rowData"> - + - - {{part}}{{searchedText}} + + {{part}}{{searchedText}} diff --git a/src/app/webapp-common/experiments/dumb/experiment-execution-parameters/experiment-execution-parameters.component.scss b/src/app/webapp-common/experiments/dumb/experiment-execution-parameters/experiment-execution-parameters.component.scss index 7142231b..9eda8f33 100755 --- a/src/app/webapp-common/experiments/dumb/experiment-execution-parameters/experiment-execution-parameters.component.scss +++ b/src/app/webapp-common/experiments/dumb/experiment-execution-parameters/experiment-execution-parameters.component.scss @@ -41,8 +41,8 @@ //border-bottom: solid 1px #dee1e9; } - .remove-step { - line-height: 42px; + .remove-button { + margin-bottom: 22px; } .param-row { diff --git a/src/app/webapp-common/experiments/dumb/experiment-execution-parameters/experiment-execution-parameters.component.ts b/src/app/webapp-common/experiments/dumb/experiment-execution-parameters/experiment-execution-parameters.component.ts index 8236a98f..98e80c53 100755 --- a/src/app/webapp-common/experiments/dumb/experiment-execution-parameters/experiment-execution-parameters.component.ts +++ b/src/app/webapp-common/experiments/dumb/experiment-execution-parameters/experiment-execution-parameters.component.ts @@ -19,7 +19,16 @@ import {CdkVirtualScrollViewport} from '@angular/cdk/scrolling'; import {Subscription} from 'rxjs'; import {TableComponent} from '@common/shared/ui-components/data/table/table.component'; import {isEqual} from 'lodash-es'; +import {MatInput} from '@angular/material/input'; +export interface ExecutionParameter { + name?: string; + description?: string; + section?: string; + id: string; + type?: string; + value?: string; +} @Component({ selector: 'sm-experiment-execution-parameters', @@ -27,15 +36,15 @@ import {isEqual} from 'lodash-es'; styleUrls: ['./experiment-execution-parameters.component.scss'] }) export class ExperimentExecutionParametersComponent implements IExperimentInfoFormComponent, OnDestroy, AfterViewInit, OnChanges { - private _formData: { name?: string; description?: string; section?: string; id: string; type?: string; value?: string }[] = []; + private _formData = [] as ExecutionParameter[]; private formContainersSub: Subscription; private _editable: boolean; private formContainer: CdkVirtualScrollViewport; private clickedRow: number; - search: string = ''; + public search = ''; public searchIndexList: {index: number; col: string}[]; - public matchIndex: number = -1; + public matchIndex = -1; public cols = [ {id: 'name', style: {width: '300px'}}, {id: 'value', style: {width: '300px'}}, @@ -44,9 +53,10 @@ export class ExperimentExecutionParametersComponent implements IExperimentInfoFo @ViewChild('hyperParameters') hyperParameters: NgForm; - @ViewChild(TableComponent) executionParametersTable: TableComponent; + @ViewChild(TableComponent) executionParametersTable: TableComponent; @ViewChildren('formContainer') formContainers: QueryList; + @ViewChildren('row') rows: QueryList; @ViewChild(CdkVirtualScrollViewport) viewPort: CdkVirtualScrollViewport; @Output() formDataChanged = new EventEmitter<{ field: string; value: ParamsItem[] }>(); @Output() searchCounterChanged = new EventEmitter(); @@ -59,12 +69,12 @@ export class ExperimentExecutionParametersComponent implements IExperimentInfoFo this.executionParametersTable?.resize(); } - @Input() set formData(formData: { name?: string; description?: string; section?: string; id?: string; type?: string; value?: string }[]) { + @Input() set formData(formData) { this._originalData = formData; this._formData = cloneDeep(formData).map((row: ParamsItem) => ({...row, id: uuidV4()})); } - get formData(): { name?: string; description?: string; section?: string; id?: string; type?: string; value?: string }[] { + get formData() { return this._formData; } @@ -72,6 +82,7 @@ export class ExperimentExecutionParametersComponent implements IExperimentInfoFo @Input() set editable(editable: boolean) { this._editable = editable; this.executionParametersTable?.resize(); + editable && window.setTimeout(() => this.rows.first?.focus()); } get editable() { return this._editable; @@ -114,7 +125,7 @@ export class ExperimentExecutionParametersComponent implements IExperimentInfoFo this.formData.splice(index, 1); } - rowActivated({data}: { data: any; e: MouseEvent }) { + rowActivated({data}: { data: ExecutionParameter; e: MouseEvent }) { this.clickedRow = this.formData.findIndex(row => row.name === data.name); } @@ -165,4 +176,13 @@ export class ExperimentExecutionParametersComponent implements IExperimentInfoFo cancel() { this._formData = cloneDeep(this._originalData).map((row: ParamsItem) => ({...row, id: uuidV4()})); } + + nextRow(event: Event, index: number) { + event.stopPropagation(); + event.preventDefault(); + if (this.formData.length === index + 1) { + this.addRow(); + } + window.setTimeout(()=> this.rows.get(index + 1)?.focus()); + } } diff --git a/src/app/webapp-common/experiments/dumb/experiment-execution-source-code/experiment-execution-source-code.component.html b/src/app/webapp-common/experiments/dumb/experiment-execution-source-code/experiment-execution-source-code.component.html index ac265b59..f8e9adf6 100755 --- a/src/app/webapp-common/experiments/dumb/experiment-execution-source-code/experiment-execution-source-code.component.html +++ b/src/app/webapp-common/experiments/dumb/experiment-execution-source-code/experiment-execution-source-code.component.html @@ -2,7 +2,7 @@
{{formData?.repository}}
- + @@ -64,17 +64,16 @@
-
{{formData?.entry_point}}
- +
{{formData?.working_dir}}
- + diff --git a/src/app/webapp-common/experiments/dumb/experiment-execution-source-code/experiment-execution-source-code.component.ts b/src/app/webapp-common/experiments/dumb/experiment-execution-source-code/experiment-execution-source-code.component.ts index fa2929bc..69ed6aea 100755 --- a/src/app/webapp-common/experiments/dumb/experiment-execution-source-code/experiment-execution-source-code.component.ts +++ b/src/app/webapp-common/experiments/dumb/experiment-execution-source-code/experiment-execution-source-code.component.ts @@ -15,7 +15,7 @@ export class ExperimentExecutionSourceCodeComponent implements OnInit, IExperime @Input() formData: IExecutionForm['source']; @Input() editable: boolean; - @Output() formDataChanged = new EventEmitter<{ field: string; value: any }>(); + @Output() formDataChanged = new EventEmitter<{ field: string; value: IExecutionForm['source'] }>(); @ViewChild('sourceCodeForm', { static: true }) sourceCodeForm: NgForm; diff --git a/src/app/webapp-common/experiments/dumb/experiment-general-info/experiment-general-info.component.scss b/src/app/webapp-common/experiments/dumb/experiment-general-info/experiment-general-info.component.scss index 83f6ca93..ec0938cc 100755 --- a/src/app/webapp-common/experiments/dumb/experiment-general-info/experiment-general-info.component.scss +++ b/src/app/webapp-common/experiments/dumb/experiment-general-info/experiment-general-info.component.scss @@ -1,4 +1,6 @@ @import "variables"; +@import "mixins/link"; + :host { display: block; position: relative; @@ -6,6 +8,8 @@ .general-info { padding: 24px 24px 64px 24px; } + + @include link(); } textarea { diff --git a/src/app/webapp-common/experiments/dumb/experiment-header/experiment-header.component.html b/src/app/webapp-common/experiments/dumb/experiment-header/experiment-header.component.html index 1dbd0ebf..f983772e 100755 --- a/src/app/webapp-common/experiments/dumb/experiment-header/experiment-header.component.html +++ b/src/app/webapp-common/experiments/dumb/experiment-header/experiment-header.component.html @@ -32,7 +32,7 @@ (clearTableFilters)="clearTableFilters.emit(tableFilters)" > + [showCart]="false" smTooltip="Download table as CSV" [disabled]="noData" data-id="downloadCSV"> diff --git a/src/app/webapp-common/experiments/dumb/experiment-info-header/experiment-info-header.component.html b/src/app/webapp-common/experiments/dumb/experiment-info-header/experiment-info-header.component.html index ac279842..3684fa80 100644 --- a/src/app/webapp-common/experiments/dumb/experiment-info-header/experiment-info-header.component.html +++ b/src/app/webapp-common/experiments/dumb/experiment-info-header/experiment-info-header.component.html @@ -13,7 +13,7 @@ (inlineActiveStateChanged)="editExperimentName($event)" >
- {{experiment?.name}} + {{experiment?.name}}
diff --git a/src/app/webapp-common/experiments/dumb/experiment-log-info/experiment-log-info.component.html b/src/app/webapp-common/experiments/dumb/experiment-log-info/experiment-log-info.component.html index 1dbbcb6b..e6043073 100755 --- a/src/app/webapp-common/experiments/dumb/experiment-log-info/experiment-log-info.component.html +++ b/src/app/webapp-common/experiments/dumb/experiment-log-info/experiment-log-info.component.html @@ -8,5 +8,6 @@
- - + + + diff --git a/src/app/webapp-common/experiments/dumb/experiment-models-form-view/experiment-models-form-view.component.html b/src/app/webapp-common/experiments/dumb/experiment-models-form-view/experiment-models-form-view.component.html index 839a8ec8..bab0a82c 100755 --- a/src/app/webapp-common/experiments/dumb/experiment-models-form-view/experiment-models-form-view.component.html +++ b/src/app/webapp-common/experiments/dumb/experiment-models-form-view/experiment-models-form-view.component.html @@ -4,7 +4,7 @@
{{model?.name}} (); - constructor(private dialog: MatDialog, protected adminService: AdminService, protected store: Store) { - super(adminService, store); + constructor(private dialog: MatDialog) { + super(); } public chooseModel() { diff --git a/src/app/webapp-common/experiments/dumb/experiment-output-model-view/experiment-output-model-view.component.html b/src/app/webapp-common/experiments/dumb/experiment-output-model-view/experiment-output-model-view.component.html index ca0349ea..4113d541 100755 --- a/src/app/webapp-common/experiments/dumb/experiment-output-model-view/experiment-output-model-view.component.html +++ b/src/app/webapp-common/experiments/dumb/experiment-output-model-view/experiment-output-model-view.component.html @@ -4,7 +4,7 @@ {{model?.name}}
+ + {{experiment?.runtime?.version || experiment?.hyperparams?.properties?.version?.value}} + @@ -187,7 +192,6 @@
+ inputClassName="table-check-box table-body" + > diff --git a/src/app/webapp-common/experiments/dumb/experiments-table/experiments-table.component.scss b/src/app/webapp-common/experiments/dumb/experiments-table/experiments-table.component.scss index 10cee9d8..ecbe6c0d 100755 --- a/src/app/webapp-common/experiments/dumb/experiments-table/experiments-table.component.scss +++ b/src/app/webapp-common/experiments/dumb/experiments-table/experiments-table.component.scss @@ -40,9 +40,11 @@ .checkbox-col { display: block; + position: relative; + z-index: 1; float: left; padding: 13px 0 13px 26px; - margin-left: -8px; + margin-left: -12px; &:not(.header) { padding-right: 24px; @@ -62,6 +64,7 @@ .compact-columns-data { gap: 12px; color: $blue-250; + font-size: 12px; } } diff --git a/src/app/webapp-common/experiments/dumb/experiments-table/experiments-table.component.ts b/src/app/webapp-common/experiments/dumb/experiments-table/experiments-table.component.ts index e9c06ba0..e749ede4 100755 --- a/src/app/webapp-common/experiments/dumb/experiments-table/experiments-table.component.ts +++ b/src/app/webapp-common/experiments/dumb/experiments-table/experiments-table.component.ts @@ -32,11 +32,12 @@ import { IOption } from '@common/shared/ui-components/inputs/select-autocomplete-for-template-forms/select-autocomplete-for-template-forms.component'; import {CountAvailableAndIsDisableSelectedFiltered} from '@common/shared/entity-page/items.utils'; -import {hyperParamSelectedExperiments, selectAllExperiments} from '../../actions/common-experiments-view.actions'; +import {hyperParamSelectedExperiments, hyperParamSelectedInfoExperiments, selectAllExperiments, setHyperParamsFiltersPage} from '../../actions/common-experiments-view.actions'; import {createFiltersFromStore, excludedKey, uniqueFilterValueAndExcluded} from '@common/shared/utils/tableParamEncode'; import {getRoundedNumber} from '../../shared/common-experiments.utils'; import {EntityTypeEnum} from '~/shared/constants/non-common-consts'; import {MAT_TOOLTIP_DEFAULT_OPTIONS, MatTooltipDefaultOptions} from '@angular/material/tooltip'; +import {IExperimentInfo, ISelectedExperiment} from '~/features/experiments/shared/experiment-info.model'; @Component({ selector: 'sm-experiments-table', @@ -52,29 +53,20 @@ export class ExperimentsTableComponent extends BaseTableView implements OnInit, readonly experimentsTableColFields = EXPERIMENTS_TABLE_COL_FIELDS; readonly timeFormatString = TIME_FORMAT_STRING; - public filtersOptions: { [colId: string]: IOption[] } = { - [EXPERIMENTS_TABLE_COL_FIELDS.STATUS]: [], - [EXPERIMENTS_TABLE_COL_FIELDS.TYPE]: [], - [EXPERIMENTS_TABLE_COL_FIELDS.USER]: [], - [EXPERIMENTS_TABLE_COL_FIELDS.TAGS]: [], - [EXPERIMENTS_TABLE_COL_FIELDS.PARENT]: null, - [EXPERIMENTS_TABLE_COL_FIELDS.PROJECT]: null, - }; readonly getSystemTags = getSystemTags; public isDevelopment = isDevelopment; private _selectedExperiments: ITableExperiment[] = []; readonly colHeaderTypeEnum = ColHeaderTypeEnum; @Input() initialColumns = INITIAL_EXPERIMENT_TABLE_COLS; - @Input() contextMenuTemplate: TemplateRef = null; + @Input() contextMenuTemplate: TemplateRef<{$implicit: IExperimentInfo}> = null; @Input() tableCols: ISmCol[]; - private _experiments: Array = []; - private _selectedExperiment: ITableExperiment; - public searchValues: { [colId: string]: string } = {}; + private _experiments: IExperimentInfo[] = []; + private _selectedExperiment: IExperimentInfo; public roundedMetricValues: { [colId: string]: { [expId: string]: boolean } } = {}; private _tableFilters: { [p: string]: FilterMetadata }; - @Input() set experiments(experiments: Array) { + @Input() set experiments(experiments) { this._experiments = experiments; this.tableCols?.filter(tableCol => tableCol.id.startsWith('last_metrics')).forEach(col => experiments?.forEach(exp => { @@ -88,12 +80,11 @@ export class ExperimentsTableComponent extends BaseTableView implements OnInit, } } - get experiments(): Array { + get experiments() { return this._experiments; } - public contextExperiment: ITableExperiment; - public filtersValues: { [colId: string]: any } = {}; + public contextExperiment: IExperimentInfo | ISelectedExperiment; public filtersMatch: { [colId: string]: string } = {}; public filtersSubValues: { [colId: string]: any } = {}; private titleCasePipe = new TitleCasePipe(); @@ -111,7 +102,7 @@ export class ExperimentsTableComponent extends BaseTableView implements OnInit, @Input() set hyperParamsOptions(hyperParamsOptions: Record) { Object.entries(hyperParamsOptions).forEach(([id, values]) => { - this.filtersOptions[id] = [{label: '(No Value)', value: null}].concat(values.map(value => ({ + this.filtersOptions[id] = values === null ? null : [{label: '(No Value)', value: null}].concat(values.map(value => ({ label: value, value }))); @@ -145,14 +136,14 @@ export class ExperimentsTableComponent extends BaseTableView implements OnInit, return this._selectedExperiments; } - @Input() set selectedExperiment(experiment: ITableExperiment) { + @Input() set selectedExperiment(experiment: IExperimentInfo) { if (this._selectedExperiment?.id !== experiment?.id) { window.setTimeout(() => !this.contextMenuActive && this.table?.focusSelected()); } this._selectedExperiment = experiment; } - get selectedExperiment() { + get selectedExperiment(): IExperimentInfo { return this._selectedExperiment; } @@ -191,7 +182,7 @@ export class ExperimentsTableComponent extends BaseTableView implements OnInit, } @Input() systemTags = [] as string[]; - @Input() reorderableColumns: boolean = true; + @Input() reorderableColumns = true; @Input() selectionReachedLimit: boolean; get validSystemTags() { @@ -209,7 +200,7 @@ export class ExperimentsTableComponent extends BaseTableView implements OnInit, this.filtersSubValues[EXPERIMENTS_TABLE_COL_FIELDS.TAGS] = filters?.system_tags?.value ?? []; this.filtersValues[EXPERIMENTS_TABLE_COL_FIELDS.PARENT] = filters?.parent?.['name']?.value ?? []; this.filtersValues[EXPERIMENTS_TABLE_COL_FIELDS.PROJECT] = filters?.project?.['name']?.value ?? []; - this.filtersValues[EXPERIMENTS_TABLE_COL_FIELDS.VERSION] = filters?.hyperparams?.['properties']?.version?.value ?? []; + this.filtersValues[EXPERIMENTS_TABLE_COL_FIELDS.VERSION] = filters?.hyperparams?.['properties']?.version?.value ?? null; this.filtersValues[EXPERIMENTS_TABLE_COL_FIELDS.LAST_UPDATE] = filters?.[EXPERIMENTS_TABLE_COL_FIELDS.LAST_UPDATE]?.value ?? []; this.filtersValues[EXPERIMENTS_TABLE_COL_FIELDS.STARTED] = filters?.[EXPERIMENTS_TABLE_COL_FIELDS.STARTED]?.value ?? []; @@ -242,13 +233,21 @@ export class ExperimentsTableComponent extends BaseTableView implements OnInit, super(); this.entitiesKey = 'experiments'; this.selectedEntitiesKey = 'selectedExperiments'; + this.filtersOptions = { + [EXPERIMENTS_TABLE_COL_FIELDS.STATUS]: [], + [EXPERIMENTS_TABLE_COL_FIELDS.TYPE]: [], + [EXPERIMENTS_TABLE_COL_FIELDS.USER]: [], + [EXPERIMENTS_TABLE_COL_FIELDS.TAGS]: [], + [EXPERIMENTS_TABLE_COL_FIELDS.PARENT]: null, + [EXPERIMENTS_TABLE_COL_FIELDS.PROJECT]: null, + }; } ngOnInit() { this.filtersOptions[EXPERIMENTS_TABLE_COL_FIELDS.STATUS] = FILTERED_EXPERIMENTS_STATUS_OPTIONS(this.entityType === EntityTypeEnum.dataset); } - ngOnDestroy(): void { + override ngOnDestroy(): void { super.ngOnDestroy(); } @@ -263,10 +262,6 @@ export class ExperimentsTableComponent extends BaseTableView implements OnInit, }; } - scrollTableToTop() { - this.table?.table?.scrollTo({top: 0}); - } - onLoadMoreClicked() { this.loadMoreExperiments.emit(); } @@ -300,7 +295,7 @@ export class ExperimentsTableComponent extends BaseTableView implements OnInit, } - onContextMenu(data: { e: MouseEvent; rowData; single?: boolean; backdrop?: boolean }) { + onContextMenu(data: { e: Event; rowData; single?: boolean; backdrop?: boolean }) { if (!data?.single) { this.contextExperiment = this._experiments.find(experiment => experiment.id === data.rowData.id); if (!this.selectedExperiments.map(exp => exp.id).includes(this.contextExperiment.id)) { @@ -335,7 +330,9 @@ export class ExperimentsTableComponent extends BaseTableView implements OnInit, this.tagsMenuOpened.emit(); } } else if (col.id.includes('hyperparams')) { - this.store.dispatch(hyperParamSelectedExperiments({col})); + this.store.dispatch(hyperParamSelectedInfoExperiments({col: {id: col.id}, loadMore: false, values: null})); + this.store.dispatch(setHyperParamsFiltersPage({page: 0})); + this.store.dispatch(hyperParamSelectedExperiments({col, searchValue: ''})); } else if (col.id === EXPERIMENTS_TABLE_COL_FIELDS.PROJECT) { if (!this.filtersOptions[EXPERIMENTS_TABLE_COL_FIELDS.PROJECT]?.length) { this.filterSearchChanged.emit({colId: col.id, value: {value: ''}}); diff --git a/src/app/webapp-common/experiments/dumb/select-metric-for-custom-col/select-metric-for-custom-col.component.html b/src/app/webapp-common/experiments/dumb/select-metric-for-custom-col/select-metric-for-custom-col.component.html index 281e606c..a3977827 100644 --- a/src/app/webapp-common/experiments/dumb/select-metric-for-custom-col/select-metric-for-custom-col.component.html +++ b/src/app/webapp-common/experiments/dumb/select-metric-for-custom-col/select-metric-for-custom-col.component.html @@ -14,8 +14,8 @@ (valueChanged)="searchQ($event)" >
-
- +
+
No data to show
diff --git a/src/app/webapp-common/experiments/dumb/select-metric-for-custom-col/select-metric-for-custom-col.component.scss b/src/app/webapp-common/experiments/dumb/select-metric-for-custom-col/select-metric-for-custom-col.component.scss index f9cea61c..176f15d9 100644 --- a/src/app/webapp-common/experiments/dumb/select-metric-for-custom-col/select-metric-for-custom-col.component.scss +++ b/src/app/webapp-common/experiments/dumb/select-metric-for-custom-col/select-metric-for-custom-col.component.scss @@ -130,5 +130,6 @@ text-align: center; margin: auto; color: $blue-400; + font-size: 14px; } } diff --git a/src/app/webapp-common/experiments/effects/common-experiments-info.effects.ts b/src/app/webapp-common/experiments/effects/common-experiments-info.effects.ts index ac565ed0..37ea197c 100755 --- a/src/app/webapp-common/experiments/effects/common-experiments-info.effects.ts +++ b/src/app/webapp-common/experiments/effects/common-experiments-info.effects.ts @@ -41,9 +41,9 @@ import { selectExperimentConfiguration, selectExperimentHyperParamsSelectedSectionFromRoute, selectExperimentSelectedConfigObjectFromRoute, - selectExperimentsList, selectPipelineSelectedStep, selectSelectedExperimentFromRouter, + selectSelectedFromTable, selectSelectedTableExperiment } from '../reducers'; import {convertStopToComplete} from '../shared/common-experiments.utils'; @@ -97,7 +97,7 @@ export class CommonExperimentsInfoEffects { this.store.select(selectExperimentSelectedConfigObjectFromRoute) ), filter(([, experimentId]) => !!experimentId), - switchMap(([action, experimentId, configuration, selectedConfiguration]) => this.apiTasks.tasksGetConfigurationNames({tasks: [experimentId]}) + switchMap(([action, experimentId, configuration, selectedConfiguration]) => this.apiTasks.tasksGetConfigurationNames({tasks: [experimentId], skip_empty: false}) .pipe( mergeMap(res => { let configurations = cloneDeep(configuration); @@ -199,24 +199,23 @@ export class CommonExperimentsInfoEffects { withLatestFrom( this.store.select(selectSelectedTableExperiment), this.store.select(selectSelectedExperiment), - this.store.select(selectExperimentsList), + this.store.select(selectSelectedFromTable ), this.store.select(selectExperimentInfoData), this.store.select(selectAppVisible), this.store.select(selectRouterConfig).pipe(map(config => !!config?.includes('pipelines') || !!config?.includes('datasets'))) ), - switchMap(([action, tableSelected, selected, experiments, infoData, visible, customView]) => { + switchMap(([action, tableSelected, selected, + selectedExperimentFromTable, infoData, visible, customView]) => { const currentSelected = tableSelected || selected; if (this.previousSelectedId && currentSelected?.id != this.previousSelectedId) { this.previousSelectedLastUpdate = null; } this.previousSelectedId = currentSelected?.id; - if (!infoData || !currentSelected || !visible) { return of([action, null, tableSelected, selected, customView]); } - const listed = experiments?.find(e => e.id === currentSelected?.id); - return (listed ? of(listed) : + return (selectedExperimentFromTable ? of(selectedExperimentFromTable) : // eslint-disable-next-line @typescript-eslint/naming-convention this.apiTasks.tasksGetByIdEx({id: [selected.id], only_fields: ['last_change']}).pipe(map(res => res.tasks[0])) ).pipe(map(task => [action, task?.last_change ?? task?.last_update, task, selected, customView])); diff --git a/src/app/webapp-common/experiments/effects/common-experiments-menu.effects.ts b/src/app/webapp-common/experiments/effects/common-experiments-menu.effects.ts index 630582de..cf46e8f7 100644 --- a/src/app/webapp-common/experiments/effects/common-experiments-menu.effects.ts +++ b/src/app/webapp-common/experiments/effects/common-experiments-menu.effects.ts @@ -20,7 +20,7 @@ import {Observable, of} from 'rxjs'; import {requestFailed} from '../../core/actions/http.actions'; import {ExperimentConverterService} from '~/features/experiments/shared/services/experiment-converter.service'; import * as exSelectors from '../reducers'; -import {selectSelectedExperiments, selectTableMode} from '../reducers'; +import {selectExperimentsList, selectTableMode} from '../reducers'; import {selectSelectedExperiment} from '~/features/experiments/reducers'; import * as infoActions from '../actions/common-experiments-info.actions'; import {autoRefreshExperimentInfo, experimentDetailsUpdated} from '../actions/common-experiments-info.actions'; @@ -53,7 +53,12 @@ import {WelcomeMessageComponent} from '@common/layout/welcome-message/welcome-me import {selectNeverShowPopups} from '@common/core/reducers/view.reducer'; import {MESSAGES_SEVERITY} from '@common/constants'; import {TasksCloneResponse} from '~/business-logic/model/tasks/tasksCloneResponse'; +import {Task} from '~/business-logic/model/tasks/task'; +import {TasksUpdateTagsResponse} from '~/business-logic/model/tasks/tasksUpdateTagsResponse'; +import * as commonInfoActions from '@common/experiments/actions/common-experiments-info.actions'; import {addProjectsTag} from '../actions/common-experiments-view.actions'; +import {ITableExperiment} from '@common/experiments/shared/common-experiment-model.model'; +import * as projectsActions from '@common/core/actions/projects.actions'; export const getChildrenExperiments = (tasksApi, parents, filters?: { [key: string]: any }): Observable => tasksApi.tasksGetAllEx({ @@ -236,22 +241,6 @@ export class CommonExperimentsMenuEffects { ) )); - // resetExperiment$ = createEffect(() => this.actions$.pipe( - // ofType(menuActions.resetClicked), - // concatLatestFrom(() => this.store.select(selectSelectedExperiment)), - // switchMap( - // ([action, selectedExp]) => { - // const ids = action.selectedEntities.map(exp => exp.id); - // return this.apiTasks.tasksResetMany({ids}) - // .pipe( - // mergeMap((res: TasksResetManyResponse) => - // [resetOutput(), ...this.updateExperimentsSuccess(action, MenuItems.reset, ids, selectedExp, res)]), - // catchError(error => this.updateExperimentFailed(action.type, error)) - // ); - // } - // ) - // )); - publishExperiment$ = createEffect(() => this.actions$.pipe( ofType(menuActions.publishClicked), concatLatestFrom(() => this.store.select(selectSelectedExperiment)), @@ -354,32 +343,56 @@ export class CommonExperimentsMenuEffects { addTag$ = createEffect(() => this.actions$.pipe( ofType(menuActions.addTag), - concatLatestFrom(() => [ - this.store.select(selectSelectedExperiments), - this.store.select(selectSelectedExperiment) - ]), - switchMap(([action, selectedExperiments, selectedExperimentInfo]) => { - const experimentsFromState = selectedExperimentInfo ? selectedExperiments.concat(selectedExperimentInfo) as ISelectedExperiment[] : selectedExperiments; - return [...action.experiments.map(experiment => { - const experimentFromState = experimentsFromState.find(exp => exp.id === experiment.id); - return experimentDetailsUpdated({ - id: experiment.id, - changes: {tags: Array.from(new Set((experimentFromState?.tags || experiment.tags || []).concat([action.tag]))).sort()} - }); - }), addProjectsTag({tag: action.tag})]; - }) + switchMap(action => { + const ids = action.experiments.map(e => e.id); + return this.apiTasks.tasksUpdateTags({ + ids, + add_tags: [action.tag] + }) + .pipe( + concatLatestFrom(() => [ + this.store.select(selectExperimentsList), + this.store.select(selectSelectedExperiment) + ]), + mergeMap(([res, experiments, selectedExperimentInfo]: [TasksUpdateTagsResponse, ITableExperiment[], IExperimentInfo]) => { + if (res.updated === ids.length) { + const updatedExperiments = experiments?.filter(exp => ids.includes(exp.id)) ?? action.experiments; + return [ + viewActions.updateManyExperiment({changeList: updatedExperiments.map(exp => ({ + id: exp.id, + fields: {tags: Array.from(new Set((exp?.tags || []).concat([action.tag]))).sort()}, + }))}), + ...(ids.includes(selectedExperimentInfo?.id) ? + [commonInfoActions.updateExperimentInfoData({ + id: selectedExperimentInfo.id, + changes: {tags: Array.from(new Set((selectedExperimentInfo?.tags || []).concat([action.tag]))).sort()} + })] : + []), + addProjectsTag({tag: action.tag}), + projectsActions.addCompanyTag({tag: action.tag}), + ]; + } else { + return [addMessage(MESSAGES_SEVERITY.ERROR, 'Not all tags were applied')] + } + }), + catchError(() => [addMessage(MESSAGES_SEVERITY.ERROR, 'Failed to apply tags')]) + ); + }), )); removeTag$ = createEffect(() => this.actions$.pipe( ofType(menuActions.removeTag), - switchMap((action) => - action.experiments.filter(experiment => experiment.tags.includes(action.tag)).map(experiment => - experimentDetailsUpdated({ - id: experiment.id, - changes: {tags: experiment.tags.filter(tag => tag !== action.tag)} - }) - ).concat(addMessage('success', `“${action.tag}” tag has been removed from “${action.experiments[0]?.name}” experiment`, [ + switchMap((action) => [ + ...action.experiments + .filter(experiment => experiment.tags.includes(action.tag)) + .map(experiment => + experimentDetailsUpdated({ + id: experiment.id, + changes: {tags: experiment.tags.filter(tag => tag !== action.tag)} + }) + ), + addMessage('success', `“${action.tag}” tag has been removed from “${action.experiments[0]?.name}” experiment`, [ { name: 'Undo', actions: [ @@ -390,8 +403,8 @@ export class CommonExperimentsMenuEffects { })) ] }] - ) as any) - ) + ) + ]) )); @@ -437,7 +450,7 @@ export class CommonExperimentsMenuEffects { actions.push(experimentDetailsUpdated({ id: experiments[0].id, // eslint-disable-next-line @typescript-eslint/naming-convention - changes: {system_tags: [...experiments[0]?.system_tags.filter(t => t !== 'shared'), 'archived'].sort()} + changes: {system_tags: [...(experiments[0]?.system_tags.filter(t => t !== 'shared') ?? []), 'archived'].sort()} })); } if (this.isSelectedExpInCheckedExps(action.selectedEntities, selectedExperiment)) { @@ -537,7 +550,7 @@ export class CommonExperimentsMenuEffects { ), {dispatch: false}); - isSelectedExpInCheckedExps(checked: ISelectedExperiment[], selected: ISelectedExperiment): boolean { + isSelectedExpInCheckedExps(checked: ISelectedExperiment[], selected: IExperimentInfo): boolean { return selected && checked.some(exp => exp.id === selected.id); } diff --git a/src/app/webapp-common/experiments/effects/common-experiments-view.effects.ts b/src/app/webapp-common/experiments/effects/common-experiments-view.effects.ts index d8e663d7..3293f6f4 100755 --- a/src/app/webapp-common/experiments/effects/common-experiments-view.effects.ts +++ b/src/app/webapp-common/experiments/effects/common-experiments-view.effects.ts @@ -3,10 +3,11 @@ import {ActivatedRoute, Router} from '@angular/router'; import {Actions, concatLatestFrom, createEffect, ofType} from '@ngrx/effects'; import {Action, Store} from '@ngrx/store'; import {cloneDeep, flatten, isEqual} from 'lodash-es'; -import {EMPTY, Observable, of} from 'rxjs'; +import {EMPTY, interval, Observable, of} from 'rxjs'; import { auditTime, catchError, + debounce, debounceTime, expand, filter, @@ -27,7 +28,8 @@ import {activeLoader, addMessage, deactivateLoader, setServerError} from '../../ import {setURLParams} from '../../core/actions/router.actions'; import { selectIsArchivedMode, - selectIsDeepMode, selectRouterProjectId, + selectIsDeepMode, + selectRouterProjectId, selectSelectedProject, selectShowHidden } from '../../core/reducers/projects.reducer'; @@ -36,18 +38,18 @@ import {FilterMetadata} from 'primeng/api/filtermetadata'; import {ISmCol} from '../../shared/ui-components/data/table/table.consts'; import {addMultipleSortColumns, getRouteFullUrl} from '../../shared/utils/shared-utils'; import { - addExcludeFilters, createFiltersFromStore, decodeHyperParam, encodeColumns, encodeOrder, + excludedKey, getTagsFilters, TableFilter } from '../../shared/utils/tableParamEncode'; import {autoRefreshExperimentInfo, getExperimentInfo} from '../actions/common-experiments-info.actions'; import * as exActions from '../actions/common-experiments-view.actions'; import {setActiveParentsFilter, setParents, updateManyExperiment} from '../actions/common-experiments-view.actions'; import * as exSelectors from '../reducers/index'; -import {selectTableRefreshList} from '../reducers/index'; +import {selectHyperParamsFiltersPage, selectTableRefreshList} from '../reducers/index'; import {ITableExperiment} from '../shared/common-experiment-model.model'; import {EXPERIMENTS_PAGE_SIZE} from '../shared/common-experiments.const'; import {convertStopToComplete, encodeHyperParameter} from '../shared/common-experiments.utils'; @@ -80,7 +82,6 @@ import { } from '../../shared/entity-page/items.utils'; import {MINIMUM_ONLY_FIELDS} from '../experiment.consts'; import {ProjectsGetHyperparamValuesResponse} from '~/business-logic/model/projects/projectsGetHyperparamValuesResponse'; -import {TasksGetAllExRequest} from '~/business-logic/model/tasks/tasksGetAllExRequest'; import {TasksGetAllExResponse} from '~/business-logic/model/tasks/tasksGetAllExResponse'; import { selectIsCompare, @@ -99,11 +100,12 @@ import {TaskTypeEnum} from '~/business-logic/model/tasks/taskTypeEnum'; import {downloadForGetAll, getFilteredUsers, setProjectUsers} from '@common/core/actions/projects.actions'; import {selectActiveWorkspaceReady} from '~/core/reducers/view.reducer'; import {escapeRegex} from '@common/shared/utils/escape-regex'; -import {MESSAGES_SEVERITY} from '@common/constants'; -import {modelExperimentsTableFilterChanged,} from '@common/models/actions/models-info.actions'; +import {MESSAGES_SEVERITY, rootProjectsPageSize} from '@common/constants'; +import {modelExperimentsTableFilterChanged} from '@common/models/actions/models-info.actions'; import {ApiOrganizationService} from '~/business-logic/api-services/organization.service'; import {INITIAL_CONTROLLER_TABLE_COLS} from '@common/pipelines-controller/controllers.consts'; import {prepareColsForDownload} from '@common/shared/utils/download'; +import {TasksGetAllExRequest} from '~/business-logic/model/tasks/tasksGetAllExRequest'; @Injectable() @@ -219,12 +221,12 @@ export class CommonExperimentsViewEffects { compareAddDialogTableSortChanged, compareAddTableFilterChanged, compareAddTableFilterInit, compareAddTableClearAllFilters, setCompareAddTableViewArchived, modelExperimentsTableFilterChanged ), + tap(action => this.refreshActions.push(action.type)), switchMap((action) => this.store.select(selectActiveWorkspaceReady).pipe( filter(ready => ready), map(() => action))), - tap(action => this.refreshActions.push(action.type)), auditTime(50), - switchMap((action) => this.fetchExperiments$(null, true, (action as any).pageSize as number) + switchMap((action) => this.fetchExperiments$(null, true, action.type === modelExperimentsTableFilterChanged.type, (action as ReturnType).pageSize as number) .pipe( mergeMap(res => { res.tasks = convertStopToComplete(res.tasks); @@ -328,7 +330,7 @@ export class CommonExperimentsViewEffects { this.store.select(selectExperimentsList), this.store.select(selectTableRefreshList) ]), - switchMap(([action, scrollId, tasks, refreshPending]) => this.fetchExperiments$(scrollId) + switchMap(([action, scrollId, tasks, refreshPending]) => this.fetchExperiments$(scrollId, false, action.allProjects) .pipe( mergeMap(res => { if (refreshPending) { @@ -454,15 +456,15 @@ export class CommonExperimentsViewEffects { ...(action.searchValue && {task_name: `(?i)${action.searchValue}`}) // (?i) is case insensitive }).pipe( concatLatestFrom(() => this.store.select(selectTableFilters).pipe(map(filters => filters?.['parent.name']?.value || []))), - mergeMap(([res, filteredParentIds]: [ProjectsGetTaskParentsResponse, string[]]) => { - const missingParentsIds = filteredParentIds.filter(parentId => !res.parents.find(parent => (parent as any).id === parentId)); + mergeMap(([{parents}, filteredParentIds]: [ProjectsGetTaskParentsResponse, string[]]) => { + const missingParentsIds = filteredParentIds.filter(parentId => !parents.find(parent => parent.id === parentId)); return (missingParentsIds.length ? this.apiTasks.tasksGetAllEx({ id: missingParentsIds, only_fields: ['name', 'project.name'] }) : of({tasks: []})).pipe( mergeMap((parentsTasks) => [ setActiveParentsFilter({parents: parentsTasks.tasks || []}), - setParents({parents: res.parents})]) + setParents({parents: parents})]) ); }), catchError(error => [ @@ -533,23 +535,30 @@ export class CommonExperimentsViewEffects { hyperParameterMenuClicked = createEffect(() => this.actions$.pipe( ofType(exActions.hyperParamSelectedExperiments), + debounce((action) => interval(action.searchValue ? 300 : 0)), concatLatestFrom(() => [ this.store.select(selectIsDeepMode), this.store.select(selectSelectedProject), this.store.select(selectIsCompare), + this.store.select(selectHyperParamsFiltersPage), ]), - switchMap(([action, isDeep, selectedProject, isCompare]) => { + switchMap(([action, isDeep, selectedProject, isCompare, page]) => { const id = action.col.id; const getter = Array.isArray(action.col.getter) ? action.col.getter[0] : action.col.getter; const projectId = action.col.projectId || selectedProject.id; const {section, name} = decodeHyperParam(getter || id); return this.projectsApi.projectsGetHyperparamValues({ - include_subprojects: isDeep, section, name, - ...((!isCompare && projectId !== '*') && {projects: [projectId]}) + include_subprojects: isDeep, + section, + name, + ...((!isCompare && projectId !== '*') && {projects: [projectId]}), + page, + page_size: rootProjectsPageSize, + pattern: escapeRegex(action.searchValue), }).pipe( map((data: ProjectsGetHyperparamValuesResponse) => { const values = data.values.filter(x => hasValue(x) && x !== ''); - return exActions.hyperParamSelectedInfoExperiments({col: action.col, values}); + return exActions.hyperParamSelectedInfoExperiments({col: action.col, values, loadMore: page > 0}); }), ); }) @@ -645,7 +654,10 @@ export class CommonExperimentsViewEffects { [module, experimentProject, 'experiments', selectedExperiment.id].concat(activeChild ? activeChildUrl.split('/') : []), {queryParamsHandling: 'preserve'} ) : - this.router.navigate([module, experimentProject, 'experiments'], {queryParamsHandling: 'preserve', replaceUrl}); + this.router.navigate([module, experimentProject, 'experiments'], { + queryParamsHandling: 'preserve', + replaceUrl + }); } getGetAllQuery({ @@ -692,12 +704,17 @@ export class CommonExperimentsViewEffects { const tagsFilter = tableFilters?.[EXPERIMENTS_TABLE_COL_FIELDS.TAGS]?.value; const tagsFilterAnd = tableFilters?.[EXPERIMENTS_TABLE_COL_FIELDS.TAGS]?.matchMode === 'AND'; const parentFilter = tableFilters?.[EXPERIMENTS_TABLE_COL_FIELDS.PARENT]?.value; - const systemTags = tableFilters?.system_tags?.value; + const systemTags = tableFilters?.system_tags?.value as string[]; - const systemTagsFilter = (showArchived ? [] : - archived ? ['__$and', MODEL_TAGS.HIDDEN] : ['__$and', '__$not', MODEL_TAGS.HIDDEN]) - .concat(systemTags ? systemTags : []).concat((isPipeline || isDataset || showHidden) ? [] : ['__$not', 'pipeline']) - .concat(isDataset ? ['dataset'] : []); + let systemTagsFilter = (showArchived ? [] : archived ? [MODEL_TAGS.HIDDEN] : [excludedKey, MODEL_TAGS.HIDDEN]); + if (systemTags) { + systemTagsFilter = systemTagsFilter.concat(systemTags); + } + if (isDataset) { + systemTagsFilter.push('dataset'); + } else if (!isPipeline && !showHidden) { + systemTagsFilter = systemTagsFilter.concat([excludedKey, 'pipeline', excludedKey, 'dataset', excludedKey, 'reports']); + } let filters = createFiltersFromStore(tableFilters, true); const tableCols = cols.length > 0 ? cols : isDataset ? INITIAL_CONTROLLER_TABLE_COLS : INITIAL_EXPERIMENT_TABLE_COLS; @@ -730,6 +747,7 @@ export class CommonExperimentsViewEffects { (col?.isParam && typeof col.getter === 'string') ? encodeHyperParameter(col.getter) : col.getter || col.id)) : []; const only_fields = [...new Set([...MINIMUM_ONLY_FIELDS, ...colsFilters, ...metricColsFilters] .concat(isPipeline || isDataset ? ['parent.name', 'runtime._pipeline_hash', 'runtime.version', 'execution.queue', 'type', 'hyperparams.properties.version'] : []))]; + delete filters['tags']; return { ...filters, id: selectedIds, @@ -749,14 +767,18 @@ export class CommonExperimentsViewEffects { user: (userFilter?.length > 0) ? userFilter : [], ...(parentFilter?.length > 0 && {parent: parentFilter}), ...(systemTagsFilter?.length > 0 && {system_tags: systemTagsFilter}), - ...(tagsFilter?.length > 0 && {tags: [(tagsFilterAnd ? '__$and' : '__$or'), ...addExcludeFilters(tagsFilter)]}), + ...(tagsFilter?.length > 0 && { + filters: { + tags: getTagsFilters(tagsFilterAnd, tagsFilter), + } + }), include_subprojects: deep && !projectFilter, search_hidden: showHidden, only_fields }; } - fetchExperiments$(scrollId1: string, refreshScroll: boolean = false, pageSize = EXPERIMENTS_PAGE_SIZE): Observable { + fetchExperiments$(scrollId1: string, refreshScroll = false, allProjects = false, pageSize = EXPERIMENTS_PAGE_SIZE): Observable { return of(scrollId1) .pipe( concatLatestFrom(() => [ @@ -789,7 +811,7 @@ export class CommonExperimentsViewEffects { return this.apiTasks.tasksGetAllEx(this.getGetAllQuery({ refreshScroll, scrollId, - projectId, + projectId: allProjects ? '*' : projectId, searchQuery: gb, archived: isArchived, orderFields, @@ -809,7 +831,7 @@ export class CommonExperimentsViewEffects { ); } - private filterColumns(projectId: string, metricsCols: any) { + private filterColumns(projectId: string, metricsCols: ISmCol[]) { return metricsCols.filter(col => col.projectId === projectId); } diff --git a/src/app/webapp-common/experiments/experiment.consts.ts b/src/app/webapp-common/experiments/experiment.consts.ts index 47c3408f..519954a5 100644 --- a/src/app/webapp-common/experiments/experiment.consts.ts +++ b/src/app/webapp-common/experiments/experiment.consts.ts @@ -197,6 +197,8 @@ export const MINIMUM_ONLY_FIELDS = [ ]; export const ARTIFACTS_ONLY_FIELDS = [ + 'name', + 'project.id', 'execution.artifacts', 'models.output.name', 'models.output.model.name', @@ -204,9 +206,6 @@ export const ARTIFACTS_ONLY_FIELDS = [ 'models.output.model.uri', 'models.output.model.framework', 'models.output.model.created', - 'models.output.model.task.id', - 'models.output.model.task.name', - 'models.output.model.task.project.id', 'models.input.name', 'models.input.model.name', 'models.input.model.design', @@ -217,3 +216,9 @@ export const ARTIFACTS_ONLY_FIELDS = [ 'models.input.model.task.name', 'models.input.model.task.project.id', ]; +export enum ActiveSectionEnum { + 'input-model' = 'input-model', + 'output-model' = 'output-model', + 'artifact' = 'artifact', + 'other' = 'other', +} diff --git a/src/app/webapp-common/experiments/experiments.component.ts b/src/app/webapp-common/experiments/experiments.component.ts index bd320377..327bb8ff 100644 --- a/src/app/webapp-common/experiments/experiments.component.ts +++ b/src/app/webapp-common/experiments/experiments.component.ts @@ -2,8 +2,7 @@ import {AfterViewInit, ChangeDetectionStrategy, Component, OnDestroy, OnInit, Vi import { getCustomColumns$, selectActiveParentsFilter, - selectedExperimentsDisableAvailable, - selectExperimentsHiddenTableCols, + selectSelectedExperimentsDisableAvailable, selectExperimentsList, selectExperimentsParents, selectExperimentsTableCols, @@ -31,13 +30,11 @@ import { selectSelectedProjectId, selectTagsFilterByProject } from '../core/reducers/projects.reducer'; -import {Store} from '@ngrx/store'; import {ColHeaderTypeEnum, ISmCol, TableSortOrderEnum} from '../shared/ui-components/data/table/table.consts'; -import {ActivatedRoute, Params, Router} from '@angular/router'; +import {Params} from '@angular/router'; import {isEqual} from 'lodash-es'; import {selectRouterParams} from '../core/reducers/router-reducer'; import {debounceTime, distinctUntilChanged, filter, map, skip, switchMap, tap, withLatestFrom} from 'rxjs/operators'; -import {MatDialog} from '@angular/material/dialog'; import {combineLatest, Observable} from 'rxjs'; import {selectAppVisible, selectBackdropActive} from '../core/reducers/view.reducer'; import {initSearch, resetSearch} from '../common-search/common-search.actions'; @@ -104,12 +101,12 @@ import { } from '~/features/experiments/containers/experiment-menu-extended/experiment-menu-extended.component'; import {INITIAL_EXPERIMENT_TABLE_COLS} from './experiment.consts'; import {selectIsPipelines} from '@common/experiments-compare/reducers'; -import {RefreshService} from '@common/core/services/refresh.service'; import {ExperimentMenuComponent} from '@common/experiments/shared/components/experiment-menu/experiment-menu.component'; import {WelcomeMessageComponent} from '@common/layout/welcome-message/welcome-message.component'; import {ConfigurationService} from '@common/shared/services/configuration.service'; import {isReadOnly} from '@common/shared/utils/is-read-only'; import {MetricValueType} from '@common/experiments-compare/experiments-compare.constants'; +import {rootProjectsPageSize} from '@common/constants'; @Component({ selector: 'sm-common-experiments', @@ -127,19 +124,18 @@ export class ExperimentsComponent extends BaseEntityPageComponent implements OnI public noMoreExperiments$: Observable; public tableSortFields$: Observable; public tableSortOrder$: Observable; - public selectedExperiments$: Observable>; + public selectedExperiments$: Observable>; public isArchived$: Observable; - public tableFilters$: Observable; - public showAllSelectedIsActive$: Observable; - public columns$: Observable; + public tableFilters$: Observable<{ [columnId: string]: FilterMetadata }>; + public columns$: Observable; public filteredTableCols$: Observable; public tableCols$: Observable; - public metricVariants$: Observable; + public metricVariants$: Observable; public hyperParams$: Observable<{ [section: string]: any[] }>; public hyperParamsOptions$: Observable>; - public selectedTableExperiment$: Observable; + public selectedTableExperiment$ = this.store.select(selectSelectedTableExperiment); public selectedExperimentsDisableAvailable$: Observable>; - public backdropActive$: Observable; + public backdropActive$: Observable; public metricLoading$: Observable; public tableColsOrder$: Observable; public parents$: Observable; @@ -148,7 +144,7 @@ export class ExperimentsComponent extends BaseEntityPageComponent implements OnI public companyTags$: Observable; public tagsFilterByProject$: Observable; public systemTags$: Observable; - public types$: Observable>; + public types$: Observable; public currentUser$: Observable; public selectedExperiment$: Observable; public isSharedAndNotOwner$: Observable; @@ -162,30 +158,22 @@ export class ExperimentsComponent extends BaseEntityPageComponent implements OnI public selectedDisableAvailable; public firstExperiment: ITableExperiment; public menuBackdrop: boolean; - protected setSplitSizeAction = experimentsActions.setSplitSize; - protected addTag = addTag; protected setTableModeAction = experimentsActions.setTableMode; protected inEditMode$: Observable; private sortFields: SortMeta[]; - private isAppVisible$: Observable; - private deep: boolean; + protected isAppVisible$: Observable; private isDeep$: Observable; - private hiddenTableCols$: Observable; - private metricTableCols$: Observable; + private metricTableCols$: Observable; private searchQuery$: Observable; - protected parents: ProjectsGetTaskParentsResponseParents[]; + protected override parents: ProjectsGetTaskParentsResponseParents[]; @ViewChild('experimentsTable') public table: ExperimentsTableComponent; @ViewChild('contextMenuExtended') contextMenuExtended: ExperimentMenuExtendedComponent; - constructor( - protected store: Store, - protected route: ActivatedRoute, - protected router: Router, - protected dialog: MatDialog, - protected refresh: RefreshService, - ) { - super(store, route, router, dialog, refresh); + constructor() { + super(); + this.setSplitSizeAction = experimentsActions.setSplitSize; + this.addTag = addTag; this.selectSplitSize$ = this.store.select(selectSplitSize); this.isPipeline$ = this.store.select(selectIsPipelines); this.tableSortFields$ = this.store.select(selectTableSortFields).pipe(tap(field => this.sortFields = field)); @@ -194,16 +182,14 @@ export class ExperimentsComponent extends BaseEntityPageComponent implements OnI this.tableFilters$ = this.store.select(selectTableFilters); this.isArchived$ = this.store.select(selectIsArchivedMode); this.showAllSelectedIsActive$ = this.store.select(selectShowAllSelectedIsActive); - this.selectedTableExperiment$ = this.store.select(selectSelectedTableExperiment); - this.selectedExperimentsDisableAvailable$ = this.store.select(selectedExperimentsDisableAvailable); + this.selectedExperimentsDisableAvailable$ = this.store.select(selectSelectedExperimentsDisableAvailable); this.selectedExperiment$ = this.store.select(selectSelectedExperiment); this.selectedExperimentsHasUpdate$ = this.store.select(selectTableRefreshList); this.selectedExperiments$ = this.store.select(selectSelectedExperiments) - .pipe(tap(selectedExperiments => { + .pipe(tap((selectedExperiments: ITableExperiment[]) => { this.selectedExperiments = selectedExperiments; this.readOnlySelection = this.selectedExperiments.some(exp => isReadOnly(exp)); })); - this.hiddenTableCols$ = this.store.select(selectExperimentsHiddenTableCols); this.searchQuery$ = this.store.select(selectSearchQuery); this.isAppVisible$ = this.store.select(selectAppVisible); this.inEditMode$ = this.store.select(selectIsExperimentInEditMode); @@ -253,7 +239,7 @@ export class ExperimentsComponent extends BaseEntityPageComponent implements OnI this.syncAppSearch(); } - ngOnInit() { + override ngOnInit() { super.ngOnInit(); this.store.dispatch(setTableCols({cols: this.tableCols})); @@ -270,8 +256,10 @@ export class ExperimentsComponent extends BaseEntityPageComponent implements OnI if (!projectId) { return false; } - const equal = projectId === this.projectId && isEqual(queryParams, prevQueryParams); - prevQueryParams = queryParams; + // eslint-disable-next-line @typescript-eslint/no-unused-vars + const {q, qreg, ...queryParamsWithoutSearch} = queryParams; + const equal = projectId === this.projectId && isEqual(queryParamsWithoutSearch, prevQueryParams); + prevQueryParams = queryParamsWithoutSearch; return !equal; }) ) @@ -279,6 +267,7 @@ export class ExperimentsComponent extends BaseEntityPageComponent implements OnI if (projectId != this.projectId && Object.keys(params || {}).length === 0) { this.emptyUrlInit(); } else { + this.projectId = projectId; if (params.columns) { const [cols, metrics, hyperParams, , allIds] = decodeColumns(params.columns, this.tableCols); this.store.dispatch(experimentsActions.setVisibleColumnsForProject({ @@ -305,13 +294,11 @@ export class ExperimentsComponent extends BaseEntityPageComponent implements OnI } } if (params.deep) { - this.deep = true; this.store.dispatch(setDeep({deep: true})); } this.store.dispatch(setProjectArchive({archive: params.archive === 'true'})); this.store.dispatch(experimentsActions.getExperiments()); } - this.projectId = projectId; }) ); @@ -334,7 +321,7 @@ export class ExperimentsComponent extends BaseEntityPageComponent implements OnI this.store.dispatch(experimentsActions.getProjectTypes({})); } - ngAfterViewInit() { + override ngAfterViewInit() { super.ngAfterViewInit(); if (this.contextMenuExtended) { this.contextMenu = this.contextMenuExtended.contextMenu; @@ -350,9 +337,9 @@ export class ExperimentsComponent extends BaseEntityPageComponent implements OnI return this.selectedExperiments; } - createFooterItems(config: { + override createFooterItems(config: { entitiesType: EntityTypeEnum; - selected$: Observable>; + selected$: Observable>; showAllSelectedIsActive$: Observable; tags$: Observable; data$?: Observable>; @@ -386,47 +373,50 @@ export class ExperimentsComponent extends BaseEntityPageComponent implements OnI } onFooterHandler({emitValue, item}) { - switch (item.id) { - case MenuItems.showAllItems: - this.showAllSelected(!emitValue); - break; - case MenuItems.compare: - this.compareExperiments(); - break; - case MenuItems.archive: - this.contextMenu.restoreArchive(item.entitiesType); - break; - case MenuItems.reset: - this.contextMenu.resetPopup(); - break; - case MenuItems.publish: - this.contextMenu.publishPopup(); - break; - case MenuItems.enqueue: - this.contextMenu.enqueuePopup(); - break; - case MenuItems.dequeue: - this.contextMenu.dequeuePopup(); - break; - case MenuItems.delete: - this.contextMenu.deleteExperimentPopup(); - break; - case MenuItems.abort: - this.contextMenu.stopPopup(); - break; - case MenuItems.abortAllChildren: - this.contextMenu.stopAllChildrenPopup(); - break; - case MenuItems.moveTo: - this.contextMenu.moveToProjectPopup(); - break; - } + this.singleRowContext = false; + window.setTimeout(() => { + switch (item.id) { + case MenuItems.showAllItems: + this.showAllSelected(!emitValue); + break; + case MenuItems.compare: + this.compareExperiments(); + break; + case MenuItems.archive: + this.contextMenu.restoreArchive(item.entitiesType); + break; + case MenuItems.reset: + this.contextMenu.resetPopup(); + break; + case MenuItems.publish: + this.contextMenu.publishPopup(); + break; + case MenuItems.enqueue: + this.contextMenu.enqueuePopup(); + break; + case MenuItems.dequeue: + this.contextMenu.dequeuePopup(); + break; + case MenuItems.delete: + this.contextMenu.deleteExperimentPopup(); + break; + case MenuItems.abort: + this.contextMenu.stopPopup(); + break; + case MenuItems.abortAllChildren: + this.contextMenu.stopAllChildrenPopup(); + break; + case MenuItems.moveTo: + this.contextMenu.moveToProjectPopup(); + break; + } + }); } onAddTag(tag: string, contextExperiment: ITableExperiment) { this.store.dispatch(addTag({ tag, - experiments: this.selectedExperiments.length > 1 ? this.selectedExperiments.filter(_selected => !isReadOnly(_selected)) : [contextExperiment] + experiments: this.singleRowContext ? [contextExperiment] : this.selectedExperiments.filter(_selected => !isReadOnly(_selected)) })); this.store.dispatch(addProjectsTag({tag})); } @@ -435,7 +425,7 @@ export class ExperimentsComponent extends BaseEntityPageComponent implements OnI this.contextMenuActive = menuStatus; } - ngOnDestroy(): void { + override ngOnDestroy(): void { super.ngOnDestroy(); this.store.dispatch(experimentsActions.resetExperiments()); this.stopSyncSearch(); @@ -474,7 +464,7 @@ export class ExperimentsComponent extends BaseEntityPageComponent implements OnI project: this.selectedProjectId })); } else { - this.store.dispatch(experimentsActions.setTableMode({mode: !!experimentId ? 'info' : 'table'})); + this.store.dispatch(experimentsActions.setTableMode({mode: experimentId ? 'info' : 'table'})); } return experiments.find(experiment => experiment.id === experimentId); }), @@ -573,6 +563,9 @@ export class ExperimentsComponent extends BaseEntityPageComponent implements OnI projectId: projectId || this.projectId, isParam: true, style: {width: '200px'}, + searchableFilter: true, + asyncFilter: true, + paginatedFilterPageSize: rootProjectsPageSize, }; } @@ -670,6 +663,7 @@ export class ExperimentsComponent extends BaseEntityPageComponent implements OnI experiment: this.selectedExperiments?.[0] || this.firstExperiment, project: this.selectedProjectId })); + return Promise.resolve(); } else { return this.closePanel(); } @@ -695,7 +689,7 @@ export class ExperimentsComponent extends BaseEntityPageComponent implements OnI this.store.dispatch(experimentsActions.prepareTableForDownload({entityType: 'task'})); } - setupBreadcrumbsOptions() { + override setupBreadcrumbsOptions() { this.sub.add(this.selectedProject$.pipe( withLatestFrom(this.store.select(selectIsDeepMode)) ).subscribe(([selectedProject, isDeep]) => { diff --git a/src/app/webapp-common/experiments/reducers/common-experiment-info.reducer.ts b/src/app/webapp-common/experiments/reducers/common-experiment-info.reducer.ts index cd0c7cf0..cc541462 100755 --- a/src/app/webapp-common/experiments/reducers/common-experiment-info.reducer.ts +++ b/src/app/webapp-common/experiments/reducers/common-experiment-info.reducer.ts @@ -64,7 +64,7 @@ export const initialCommonExperimentInfoState: CommonExperimentInfoState = { }; export const commonExperimentInfoReducers = [ - on(setExperiment, (state, action): CommonExperimentInfoState => ({...state, selectedExperiment: action.experiment as unknown})), + on(setExperiment, (state, action): CommonExperimentInfoState => ({...state, selectedExperiment: action.experiment})), on(setExperimentFormErrors, (state, action): CommonExperimentInfoState => ({...state, errors: action.errors})), on(experimentDataUpdated, (state, action): CommonExperimentInfoState => ({...state, infoData: {...state.infoData, ...action.changes}})), on(saveExperiment, saveHyperParamsSection, saveExperimentConfigObj, deleteHyperParamsSection, saveExperimentSection, diff --git a/src/app/webapp-common/experiments/reducers/experiment-output.reducer.ts b/src/app/webapp-common/experiments/reducers/experiment-output.reducer.ts index 25901425..9dc91f17 100644 --- a/src/app/webapp-common/experiments/reducers/experiment-output.reducer.ts +++ b/src/app/webapp-common/experiments/reducers/experiment-output.reducer.ts @@ -2,11 +2,11 @@ import * as actions from '../actions/common-experiment-output.actions'; import {HistogramCharts} from '../actions/common-experiment-output.actions'; import {ScalarKeyEnum} from '~/business-logic/model/events/scalarKeyEnum'; import {sortBy} from 'lodash-es'; -import {ChartHoverModeEnum, LOG_BATCH_SIZE} from '../shared/common-experiments.const'; +import {LOG_BATCH_SIZE} from '../shared/common-experiments.const'; import {MetricsPlotEvent} from '~/business-logic/model/events/metricsPlotEvent'; import {EventsGetTaskSingleValueMetricsResponseValues} from '~/business-logic/model/events/eventsGetTaskSingleValueMetricsResponseValues'; import {createReducer, on} from '@ngrx/store'; -import {smoothTypeEnum, SmoothTypeEnum} from '@common/shared/single-graph/single-graph.utils'; +import {SmoothTypeEnum} from '@common/shared/single-graph/single-graph.utils'; export type GroupByCharts = 'metric' | 'none'; @@ -41,7 +41,6 @@ export interface ExperimentOutputState { logLoading: boolean; showSettings: boolean; scalarSingleValue: Array; - scalarsHoverMode: ChartHoverModeEnum; graphsPerRow: number; } @@ -51,13 +50,12 @@ export interface ExperimentSettings { hiddenMetricsPlot: Array; selectedHyperParams: Array; selectedMetric: string; - selectedScalar: string; - selectedPlot: string; smoothWeight: number; smoothType: SmoothTypeEnum; xAxisType: ScalarKeyEnum; groupBy: GroupByCharts; lastModified?: number; + valueType?: "min_value" | "max_value" | "value" } export const experimentOutputInitState: ExperimentOutputState = { @@ -74,7 +72,6 @@ export const experimentOutputInitState: ExperimentOutputState = { logFilter: null, logLoading: false, showSettings: false, - scalarsHoverMode: 'x', graphsPerRow: 2 }; @@ -155,6 +152,5 @@ export const experimentOutputReducer = createReducer( on(actions.setLogFilter, (state, action) => ({...state, logFilter: (action as ReturnType).filter})), on(actions.resetLogFilter, state => ({...state, logFilter: null})), on(actions.toggleSettings, state => ({...state, showSettings: !state.showSettings})), - on(actions.setScalarsHoverMode, (state, action) => ({...state, scalarsHoverMode: action.hoverMode})), on(actions.setGraphsPerRow, (state, action) => ({...state, graphsPerRow: action.graphsPerRow})), ); diff --git a/src/app/webapp-common/experiments/reducers/experiments-view.reducer.ts b/src/app/webapp-common/experiments/reducers/experiments-view.reducer.ts index df6b368a..607b32d6 100644 --- a/src/app/webapp-common/experiments/reducers/experiments-view.reducer.ts +++ b/src/app/webapp-common/experiments/reducers/experiments-view.reducer.ts @@ -11,6 +11,7 @@ import {setSelectedProject} from '@common/core/actions/projects.actions'; import {createReducer, on} from '@ngrx/store'; import {modelsInitialState} from '@common/models/reducers/models-view.reducer'; import {FilterMetadata} from 'primeng/api/filtermetadata'; +import {IExperimentInfo, ISelectedExperiment} from '~/features/experiments/shared/experiment-info.model'; export interface ExperimentsViewState { @@ -27,12 +28,13 @@ export interface ExperimentsViewState { experiments: Array; refreshList: boolean; noMoreExperiment: boolean; - selectedExperiment: ITableExperiment; - selectedExperiments: Array; + selectedExperiment: IExperimentInfo; + selectedExperiments: Array; selectedExperimentsDisableAvailable: Record; selectedExperimentSource: string; experimentToken: string; scrollId: string; + hyperParamsFiltersPage: number; globalFilter: SearchState['searchQuery']; showAllSelectedIsActive: boolean; metricVariants: Array; @@ -67,6 +69,7 @@ export const experimentsViewInitialState: ExperimentsViewState = { selectedExperimentSource: null, experimentToken: null, scrollId: null, // -1 so the "getNextExperiments" will send 0. + hyperParamsFiltersPage: 0, globalFilter: null, showAllSelectedIsActive: false, metricsCols: [], @@ -140,6 +143,7 @@ export const experimentsViewReducer = createReducer( })), on(actions.setNoMoreExperiments, (state, action): ExperimentsViewState => ({...state, noMoreExperiment: action.hasMore})), on(actions.setCurrentScrollId, (state, action): ExperimentsViewState => ({...state, scrollId: action.scrollId})), + on(actions.setHyperParamsFiltersPage, (state, action): ExperimentsViewState => ({...state, hyperParamsFiltersPage: action.page})), on(actions.setSelectedExperiment, (state, action): ExperimentsViewState => ({...state, selectedExperiment: action.experiment})), on(actions.setSelectedExperiments, (state, action): ExperimentsViewState => ({...state, selectedExperiments: action.experiments})), on(actions.setSelectedExperimentsDisableAvailable, (state, action): ExperimentsViewState => @@ -253,7 +257,13 @@ export const experimentsViewReducer = createReducer( ({...state, colsOrder: {...state.colsOrder, [action.project]: action.cols}})), on(actions.setCustomHyperParams, (state, action): ExperimentsViewState => ({...state, hyperParams: action.params, metricsLoading: false})), on(actions.hyperParamSelectedInfoExperiments, (state, action): ExperimentsViewState => - ({...state, hyperParamsOptions: {...state.hyperParamsOptions, [action.col.id]: action.values}})), + ({ + ...state, + hyperParamsOptions: { + ...state.hyperParamsOptions, + [action.col.id]: action.loadMore ? state.hyperParamsOptions[action.col.id].concat(action.values) : action.values}, + hyperParamsFiltersPage: state.hyperParamsFiltersPage + 1 + })), on(actions.getCustomMetrics, (state): ExperimentsViewState => ({...state, metricsLoading: true})), on(actions.getCustomHyperParams, (state): ExperimentsViewState => ({...state, metricsLoading: true})), on(actions.setSplitSize, (state, action): ExperimentsViewState => ({...state, splitSize: action.splitSize})), diff --git a/src/app/webapp-common/experiments/reducers/index.ts b/src/app/webapp-common/experiments/reducers/index.ts index 4f851f86..e836a341 100755 --- a/src/app/webapp-common/experiments/reducers/index.ts +++ b/src/app/webapp-common/experiments/reducers/index.ts @@ -1,5 +1,4 @@ import {createSelector, Store} from '@ngrx/store'; -import {ITableExperiment} from '../shared/common-experiment-model.model'; import {ISmCol, TABLE_SORT_ORDER} from '../../shared/ui-components/data/table/table.consts'; import { experimentInfo, @@ -32,15 +31,14 @@ import {combineLatest} from 'rxjs'; import { EventsGetTaskSingleValueMetricsResponseValues } from '~/business-logic/model/events/eventsGetTaskSingleValueMetricsResponseValues'; -import {ChartHoverModeEnum} from '../shared/common-experiments.const'; import {selectModelExperimentsTableFilters} from '@common/models/reducers'; import {smoothTypeEnum, SmoothTypeEnum} from '@common/shared/single-graph/single-graph.utils'; import {EXPERIMENT_COMMENT} from '@common/experiments/dumb/experiment-general-info/experiment-general-info.component'; import {isReadOnly} from '@common/shared/utils/is-read-only'; -export const selectExperimentsList = createSelector(experimentsView, (state): ITableExperiment[] => state.experiments); -export const selectTableRefreshList = createSelector(experimentsView, (state): boolean => !!state.refreshList); -export const selectSelectedTableExperiment = createSelector(experimentsView, (state): ITableExperiment => state.selectedExperiment); +export const selectExperimentsList = createSelector(experimentsView, state => state.experiments); +export const selectTableRefreshList = createSelector(experimentsView, state => !!state.refreshList); +export const selectSelectedTableExperiment = createSelector(experimentsView, state => state.selectedExperiment); export const selectExperimentsTableColsWidth = createSelector(experimentsView, selectRouterParams, (state, params) => state.projectColumnsWidth?.[params?.projectId] ?? {}); @@ -59,10 +57,10 @@ export const selectExperimentsParents = createSelector(experimentsView, (state) export const selectActiveParentsFilter = createSelector(experimentsView, (state) => state.activeParentsFilter); export const selectExperimentsTypes = createSelector(experimentsView, (state) => state.types); -export const selectExperimentsTableColsOrder = createSelector([experimentsView, selectRouterParams], (state, params): string[] => +export const selectExperimentsTableColsOrder = createSelector(experimentsView, selectRouterParams, (state, params): string[] => (state.colsOrder && params?.projectId) ? state.colsOrder[params?.projectId] : undefined); export const selectExperimentsMetricsCols = createSelector(experimentsView, (state) => state.metricsCols); -export const selectExperimentsMetricsColsForProject = createSelector([experimentsView, selectRouterParams, selectExperimentsHiddenTableCols, selectExperimentsTableColsWidth], (state, params, hidden, colWidth) => +export const selectExperimentsMetricsColsForProject = createSelector(experimentsView, selectRouterParams, selectExperimentsHiddenTableCols, selectExperimentsTableColsWidth, (state, params, hidden, colWidth) => state.metricsCols .filter(metricCol => metricCol.projectId === params?.projectId) .map(col => ({ @@ -94,6 +92,7 @@ export const getCustomColumns$ = (store: Store) => combineLatest([ ) ); +export const selectHyperParamsFiltersPage = createSelector(experimentsView, state => state.hyperParamsFiltersPage); export const selectCurrentScrollId = createSelector(experimentsView, (state): string => state.scrollId); export const selectSplitSize = createSelector(experimentsView, (state): number => state.splitSize); export const selectGlobalFilter = createSelector(experimentsView, (state) => state.globalFilter); @@ -115,13 +114,20 @@ export const selectTableFilters = createSelector( export const selectExperimentsTableFilters = createSelector(experimentsView, selectRouterParams, (state, params) => state.projectColumnFilters?.[params?.projectId] ?? {} as { [columnId: string]: FilterMetadata }); export const selectSelectedExperiments = createSelector(experimentsView, state => state.selectedExperiments); -export const selectedExperimentsDisableAvailable = createSelector(experimentsView, (state) => state.selectedExperimentsDisableAvailable); +export const selectSelectedExperimentsDisableAvailable = createSelector(experimentsView, (state) => state.selectedExperimentsDisableAvailable); export const selectShowAllSelectedIsActive = createSelector(experimentsView, (state): boolean => state.showAllSelectedIsActive); export const selectNoMoreExperiments = createSelector(experimentsView, (state): boolean => state.noMoreExperiment); export const selectTableMode = createSelector(experimentsView, state => state.tableMode); export const selectExperimentInfoDataFreeze = createSelector(experimentInfo, (state): IExperimentInfo => state.infoDataFreeze); export const selectExperimentInfoErrors = createSelector(experimentInfo, (state): CommonExperimentInfoState['errors'] => state.errors); + +export const selectSelectedFromTable = createSelector(selectSelectedTableExperiment, selectSelectedExperiment, selectExperimentsList, + (selectedFromTable, selectedFromInfo, experiments) => { + const selectedId = selectedFromTable?.id ?? selectedFromInfo?.id; + return experiments?.find(exp => exp.id === selectedId) ?? null; + }); + // eslint-disable-next-line @typescript-eslint/no-unused-vars export const selectIsSelectedExperimentInDev = createSelector(experimentInfo, info => false); export const selectIsExperimentSaving = createSelector(experimentInfo, (state): boolean => state.saving); @@ -133,12 +139,11 @@ export const selectExperimentBeginningOfLog = createSelector(experimentOutput, ( export const selectExperimentInfoPlots = createSelector(experimentOutput, (state) => state.metricsPlotsCharts); export const selectExperimentHistogramCacheAxisType = createSelector(experimentOutput, (state) => state.cachedAxisType); export const selectExperimentMetricsSearchTerm = createSelector(experimentOutput, (state) => state.searchTerm); -export const selectScalarsHoverMode = createSelector(experimentOutput, (state): ChartHoverModeEnum => state.scalarsHoverMode); - export const selectGraphsPerRow = createSelector(experimentOutput, state => state.graphsPerRow); export const selectHyperParamsVariants = createSelector(experimentsView, state => state.hyperParams); export const selectHyperParamsOptions = createSelector(experimentsView, (state): Record => state.hyperParamsOptions); export const selectPipelineSelectedStep = createSelector(experimentInfo, state => state.selectedPipelineStep); +export const selectPipelineSelectedStepWithFallback = createSelector( selectSelectedExperiment, selectPipelineSelectedStep, (selectedController, selectedStep) => selectedStep ?? selectedController) export const selectStartPipelineDialogTask = createSelector(experimentInfo, state => state.pipelineRunDialogTask); export const selectExperimentUserKnowledge = createSelector(experimentInfo, @@ -157,7 +162,7 @@ export const selectSelectedSettingsHiddenPlot = createSelector(selectSelectedExp export const selectSelectedSettingsHiddenScalar = createSelector(selectSelectedExperimentSettings, settings => settings?.hiddenMetricsScalar ?? []); export const selectSelectedSettingsSmoothWeight = createSelector(selectSelectedExperimentSettings, - settings => settings?.smoothWeight ?? 0); + settings => settings?.smoothWeight === undefined ? 0 : settings.smoothWeight); export const selectSelectedSettingsSmoothType = createSelector(selectSelectedExperimentSettings, (settings): SmoothTypeEnum => settings?.smoothType ?? smoothTypeEnum.exponential); export const selectSelectedSettingsxAxisType = (isModel: boolean) => createSelector(selectSelectedExperimentSettings, selectSelectedModelSettings, @@ -193,7 +198,7 @@ export const selectSelectedExperimentFromRouter = createSelector(selectRouterPar export const selectExperimentConfigObj = createSelector(selectExperimentConfiguration, selectExperimentSelectedConfigObjectFromRoute, - (configuration: IExperimentInfo['configuration'], configObj: string): any => get(configuration, configObj, null)); + (configuration: IExperimentInfo['configuration'], configObj: string) => get(configuration, configObj, null)); export const selectExperimentHyperParamsSelectedSectionParams = @@ -224,6 +229,10 @@ const createHistogramSelector = (selectAxisType) => }); export const selectExperimentInfoHistograms = createHistogramSelector(selectSelectedSettingsxAxisType(false)); + +export const selectArtifactId = createSelector(selectRouterParams, + params => decodeURIComponent(params?.artifactId || params?.modelId) +); export const selectCurrentArtifactExperimentId = createSelector(experimentInfo, state => state.artifactsExperimentId); export const selectModelSettingsXAxisType = createSelector(selectSelectedModelSettings, @@ -232,12 +241,13 @@ export const selectModelInfoHistograms = createHistogramSelector(selectModelSett export const selectModelSettingsGroupBy = createSelector(selectSelectedModelSettings, settings => settings?.groupBy ?? 'metric'); export const selectModelSettingsSmoothWeight = createSelector(selectSelectedModelSettings, - settings => settings?.smoothWeight ?? 0); + settings => settings?.smoothWeight === undefined ? 0 : settings.smoothWeight); export const selectModelSettingsSmoothType = createSelector(selectSelectedModelSettings, settings => settings?.smoothType ?? smoothTypeEnum.exponential); export const selectModelSettingsHiddenScalar = createSelector(selectSelectedModelSettings, settings => settings?.hiddenMetricsScalar ?? []); - +export const selectModelSettingsHiddenPlot = createSelector(selectSelectedModelSettings, + settings => settings?.hiddenMetricsPlot ?? []); export const selectEditingDescription = createSelector(selectCurrentActiveSectionEdit, section => section === EXPERIMENT_COMMENT); export const selectSelectedExperimentReadOnly = createSelector(selectSelectedExperiment, experiment => isReadOnly(experiment)); diff --git a/src/app/webapp-common/experiments/shared/common-experiment-model.model.ts b/src/app/webapp-common/experiments/shared/common-experiment-model.model.ts index d1fa7ebd..59c51c7f 100755 --- a/src/app/webapp-common/experiments/shared/common-experiment-model.model.ts +++ b/src/app/webapp-common/experiments/shared/common-experiment-model.model.ts @@ -1,9 +1,10 @@ -import {Model} from '../../../business-logic/model/models/model'; -import {Project} from '../../../business-logic/model/projects/project'; -import {User} from '../../../business-logic/model/users/user'; -import {Task} from '../../../business-logic/model/tasks/task'; -import {Artifact} from '../../../business-logic/model/tasks/artifact'; -import {ITask} from '../../../business-logic/model/al-task'; +import {Model} from '~/business-logic/model/models/model'; +import {Project} from '~/business-logic/model/projects/project'; +import {User} from '~/business-logic/model/users/user'; +import {Task} from '~/business-logic/model/tasks/task'; +import {Artifact} from '~/business-logic/model/tasks/artifact'; +import {ITask} from '~/business-logic/model/al-task'; +import {DataDictionary} from '@common/experiments-compare/experiments-compare.constants'; export interface IModelInfo extends Omit { project?: Project; @@ -12,6 +13,14 @@ export interface IModelInfo extends Omit { user?: User; } +export interface CompareIModelInfo extends Omit { + project?: Project; + task?: ITask; + taskName?: string; + user?: User; + id?: DataDictionary; +} + export interface IModelInfoInput { id?: Model['id']; framework: Model['framework']; @@ -74,7 +83,7 @@ export type ExperimentTableColFieldsEnum = | 'tags'; export interface ITableExperiment { - id?: Task['id']; + id: Task['id']; type?: Task['type']; name?: Task['name']; created?: Task['created']; diff --git a/src/app/webapp-common/experiments/shared/common-experiments.const.ts b/src/app/webapp-common/experiments/shared/common-experiments.const.ts index 91500ee8..880b9d7b 100755 --- a/src/app/webapp-common/experiments/shared/common-experiments.const.ts +++ b/src/app/webapp-common/experiments/shared/common-experiments.const.ts @@ -61,3 +61,5 @@ export enum CustomColumnMode { } export const NONE_USER_TASK_TYPES = ['-dataset_import', '-annotation', '-annotation_manual']; + +export const singleValueChartTitle = ' Summary'; diff --git a/src/app/webapp-common/experiments/shared/components/abort-all-children-dialog/abort-all-children-dialog.component.ts b/src/app/webapp-common/experiments/shared/components/abort-all-children-dialog/abort-all-children-dialog.component.ts index 2ef75676..b5e4cd1a 100644 --- a/src/app/webapp-common/experiments/shared/components/abort-all-children-dialog/abort-all-children-dialog.component.ts +++ b/src/app/webapp-common/experiments/shared/components/abort-all-children-dialog/abort-all-children-dialog.component.ts @@ -2,7 +2,6 @@ import {MAT_DIALOG_DATA, MatDialogRef} from '@angular/material/dialog'; import {Component, Inject} from '@angular/core'; import {Store} from '@ngrx/store'; import {ISelectedExperiment} from '~/features/experiments/shared/experiment-info.model'; -import {ITableExperiment} from '../../common-experiment-model.model'; @Component({ selector: 'sm-abort-all-children-dialog', @@ -11,7 +10,7 @@ import {ITableExperiment} from '../../common-experiment-model.model'; }) export class AbortAllChildrenDialogComponent { public experiments: ISelectedExperiment[]; - shouldBeAbortedTasks: ITableExperiment[] = null; + shouldBeAbortedTasks: ISelectedExperiment[] = null; constructor( diff --git a/src/app/webapp-common/experiments/shared/components/change-project-dialog/change-project-dialog.component.html b/src/app/webapp-common/experiments/shared/components/change-project-dialog/change-project-dialog.component.html index 281d0e7f..7bc2dec7 100755 --- a/src/app/webapp-common/experiments/shared/components/change-project-dialog/change-project-dialog.component.html +++ b/src/app/webapp-common/experiments/shared/components/change-project-dialog/change-project-dialog.component.html @@ -61,8 +61,8 @@
-
- +
+
Loading more...
diff --git a/src/app/webapp-common/experiments/shared/components/change-project-dialog/change-project-dialog.component.scss b/src/app/webapp-common/experiments/shared/components/change-project-dialog/change-project-dialog.component.scss index 4ebd0a29..ef7a2cf6 100755 --- a/src/app/webapp-common/experiments/shared/components/change-project-dialog/change-project-dialog.component.scss +++ b/src/app/webapp-common/experiments/shared/components/change-project-dialog/change-project-dialog.component.scss @@ -5,7 +5,10 @@ } } .creat-new-suffix{ + display: inline-block; margin-right: 18px; + font-size: 14px; + transform: translateY(-4px); } .message { padding: 6px; @@ -34,8 +37,4 @@ margin-left: 16px; } } - - .search-icon { - transform: translateY(3px); - } } diff --git a/src/app/webapp-common/experiments/shared/components/change-project-dialog/change-project-dialog.component.ts b/src/app/webapp-common/experiments/shared/components/change-project-dialog/change-project-dialog.component.ts index 55b9c7b3..fa4e1e05 100755 --- a/src/app/webapp-common/experiments/shared/components/change-project-dialog/change-project-dialog.component.ts +++ b/src/app/webapp-common/experiments/shared/components/change-project-dialog/change-project-dialog.component.ts @@ -80,7 +80,7 @@ export class ChangeProjectDialogComponent implements OnInit, OnDestroy { this.noMoreOptions = this.allProjectsBeforeFilter?.length === this.previousLength || this.allProjectsBeforeFilter?.length < rootProjectsPageSize; this.previousLength = this.allProjectsBeforeFilter?.length; if (this.currentProjects.length === 1) { - this.currentProjectInstance = projects.find(proj => proj.id === this.currentProjects[0]); + this.currentProjectInstance = projects.filter(proj=> !proj.hidden).find(proj => proj.id === this.currentProjects[0]); } // const projectNameToHide = (this.sourceProject && !this.sourceProject.name.match(/^\.\w+$/)) ? this.sourceProject.name?.replace(/\/\.\w+$/, '') : 'Projects root'; // const sourceProjectOrChild = new RegExp(`^${projectNameToHide}(\/\.[a-zA-Z]+)*$`); @@ -114,7 +114,7 @@ export class ChangeProjectDialogComponent implements OnInit, OnDestroy { this.projects = null; this.rootFiltered = !this.projectRoot.includes(searchString); this.store.dispatch(resetTablesFilterProjectsOptions()); - this.store.dispatch(getTablesFilterProjectsOptions({searchString, loadMore: false})); + this.store.dispatch(getTablesFilterProjectsOptions({searchString, loadMore: false, allowPublic: false})); } ngOnDestroy(): void { @@ -147,7 +147,7 @@ export class ChangeProjectDialogComponent implements OnInit, OnDestroy { loadMore(searchString) { this.loading = true; - this.store.dispatch(getTablesFilterProjectsOptions({searchString: searchString || '', loadMore: true})); + this.store.dispatch(getTablesFilterProjectsOptions({searchString: searchString || '', loadMore: true, allowPublic: false})); } isFocused(locationRef: HTMLInputElement) { diff --git a/src/app/webapp-common/experiments/shared/components/clone-dialog/clone-dialog.component.html b/src/app/webapp-common/experiments/shared/components/clone-dialog/clone-dialog.component.html index 54b47a2c..6e11226b 100755 --- a/src/app/webapp-common/experiments/shared/components/clone-dialog/clone-dialog.component.html +++ b/src/app/webapp-common/experiments/shared/components/clone-dialog/clone-dialog.component.html @@ -57,8 +57,8 @@ {{project.label}} -
- +
+
Loading more...
@@ -78,9 +78,10 @@ hideRequiredMarker="true"> Description diff --git a/src/app/webapp-common/experiments/shared/components/clone-dialog/clone-dialog.component.scss b/src/app/webapp-common/experiments/shared/components/clone-dialog/clone-dialog.component.scss index ddc307eb..5af307c9 100755 --- a/src/app/webapp-common/experiments/shared/components/clone-dialog/clone-dialog.component.scss +++ b/src/app/webapp-common/experiments/shared/components/clone-dialog/clone-dialog.component.scss @@ -15,22 +15,16 @@ } mat-form-field { - margin-top: -8px; - } - - textarea { - resize: none; - min-height: 60px; + .clone-description { + min-height: 68px; + } } .creat-new-suffix { + display: inline-block; margin-right: 18px; - } - - textarea, - input, - select { - width: 100%; + font-size: 14px; + transform: translateY(-4px); } .buttons { @@ -57,8 +51,4 @@ display: block; position: absolute; } - - .search-icon { - transform: translateY(3px); - } } diff --git a/src/app/webapp-common/experiments/shared/components/clone-dialog/clone-dialog.component.ts b/src/app/webapp-common/experiments/shared/components/clone-dialog/clone-dialog.component.ts index 3000cf35..4ae28cbf 100755 --- a/src/app/webapp-common/experiments/shared/components/clone-dialog/clone-dialog.component.ts +++ b/src/app/webapp-common/experiments/shared/components/clone-dialog/clone-dialog.component.ts @@ -160,7 +160,7 @@ export class CloneDialogComponent implements OnInit, OnDestroy { loadMore() { this.loading = true; - this.store.dispatch(getTablesFilterProjectsOptions({searchString: this.formData.project || '', loadMore: true})); + this.store.dispatch(getTablesFilterProjectsOptions({searchString: this.formData.project || '', loadMore: true, allowPublic: false})); } isFocused(locationRef: HTMLInputElement) { diff --git a/src/app/webapp-common/experiments/shared/components/experiment-menu/experiment-menu.component.ts b/src/app/webapp-common/experiments/shared/components/experiment-menu/experiment-menu.component.ts index d7dc8e28..56df998e 100755 --- a/src/app/webapp-common/experiments/shared/components/experiment-menu/experiment-menu.component.ts +++ b/src/app/webapp-common/experiments/shared/components/experiment-menu/experiment-menu.component.ts @@ -7,7 +7,7 @@ import {Queue} from '~/business-logic/model/queues/queue'; import {TaskStatusEnum} from '~/business-logic/model/tasks/taskStatusEnum'; import {TaskTypeEnum} from '~/business-logic/model/tasks/taskTypeEnum'; import {BlTasksService} from '~/business-logic/services/tasks.service'; -import {CloneForm} from '../../common-experiment-model.model'; +import {CloneForm, ITableExperiment} from '../../common-experiment-model.model'; import {ConfirmDialogComponent} from '@common/shared/ui-components/overlay/confirm-dialog/confirm-dialog.component'; import {htmlTextShort} from '@common/shared/utils/shared-utils'; import * as commonMenuActions from '../../../actions/common-experiments-menu.actions'; @@ -15,11 +15,11 @@ import {abortAllChildren, archiveSelectedExperiments} from '../../../actions/com import {ChangeProjectDialogComponent} from '../change-project-dialog/change-project-dialog.component'; import {CloneDialogComponent} from '../clone-dialog/clone-dialog.component'; import {SelectQueueComponent} from '../select-queue/select-queue.component'; -import {ISelectedExperiment} from '~/features/experiments/shared/experiment-info.model'; +import {IExperimentInfo, ISelectedExperiment} from '~/features/experiments/shared/experiment-info.model'; import {getQueuesForEnqueue} from '../select-queue/select-queue.actions'; import {selectQueuesList} from '../select-queue/select-queue.reducer'; import {isDevelopment} from '~/features/experiments/shared/experiments.utils'; -import {Component, ElementRef, EventEmitter, Input, OnInit, Output} from '@angular/core'; +import {Component, EventEmitter, inject, Input, OnInit, Output} from '@angular/core'; import {BaseContextMenuComponent} from '@common/shared/components/base-context-menu/base-context-menu.component'; import * as experimentsActions from '../../../actions/common-experiments-view.actions'; import {ShareDialogComponent} from '@common/shared/ui-components/overlay/share-dialog/share-dialog.component'; @@ -45,6 +45,7 @@ import { } from '@common/shared/entity-page/items.utils'; import {resetOutput} from '@common/experiments/actions/common-experiment-output.actions'; import {isReadOnly} from '@common/shared/utils/is-read-only'; +import {resetDebugImages} from '@common/debug-images/debug-images-actions'; @Component({ @@ -63,9 +64,9 @@ export class ExperimentMenuComponent extends BaseContextMenuComponent implements public selectionHasExamples: boolean; public isCommunity: boolean; protected _experiment: ISelectedExperiment = null; - private _selectedExperiments: ISelectedExperiment[]; + private _selectedExperiments: IExperimentInfo[]; - @Input() selectedExperiment: any; + @Input() selectedExperiment: IExperimentInfo; @Input() isSharedAndNotOwner = false; @Input() tagsFilterByProject: boolean; @Input() projectTags: string[]; @@ -87,26 +88,30 @@ export class ExperimentMenuComponent extends BaseContextMenuComponent implements @Input() neverShowPopups; @Input() minimizedView: boolean; - @Input() set selectedExperiments(experiments: ISelectedExperiment[]) { + @Input() set selectedExperiments(experiments: IExperimentInfo[]) { this._selectedExperiments = experiments; this.selectionHasExamples = experiments && experiments.some((exp => isReadOnly(exp))); } - get selectedExperiments(): ISelectedExperiment[] { + get selectedExperiments(): IExperimentInfo[] { return this._selectedExperiments; } @Output() tagSelected = new EventEmitter(); - constructor( - protected blTaskService: BlTasksService, - protected dialog: MatDialog, - protected router: Router, - protected store: Store, - protected eRef: ElementRef, - protected configService: ConfigurationService, - protected route?: ActivatedRoute - ) { - super(store, eRef); + protected blTaskService: BlTasksService; + protected dialog: MatDialog; + protected router: Router; + protected configService: ConfigurationService; + protected route: ActivatedRoute; + + constructor() { + super(); + + this.blTaskService = inject(BlTasksService); + this.dialog = inject(MatDialog); + this.router = inject(Router); + this.configService = inject(ConfigurationService); + this.route = inject(ActivatedRoute); } @@ -149,7 +154,9 @@ export class ExperimentMenuComponent extends BaseContextMenuComponent implements } enqueuePopup() { - const selectedExperiments = this.selectedExperiments ? selectionDisabledEnqueue(this.selectedExperiments).selectedFiltered : [this._experiment]; + const selectedExperiments = !(this.activateFromMenuButton || this.useCurrentEntity) ? + selectionDisabledEnqueue(this.selectedExperiments).selectedFiltered : + [this._experiment]; const selectQueueDialog: MatDialogRef = this.dialog.open(SelectQueueComponent, { @@ -224,6 +231,7 @@ export class ExperimentMenuComponent extends BaseContextMenuComponent implements if (confirmed) { this.store.dispatch(resetOutput()); if (this.activateFromMenuButton || !this.tableMode && this.selectedExperiments.some(exp => exp.id === this._experiment.id)) { + this.store.dispatch(resetDebugImages()); this.store.dispatch(autoRefreshExperimentInfo({id: this._experiment.id})); } this.store.dispatch(deactivateEdit()); diff --git a/src/app/webapp-common/layout/breadcrumbs/breadcrumbs.component.html b/src/app/webapp-common/layout/breadcrumbs/breadcrumbs.component.html index bdaadb43..be0e6823 100644 --- a/src/app/webapp-common/layout/breadcrumbs/breadcrumbs.component.html +++ b/src/app/webapp-common/layout/breadcrumbs/breadcrumbs.component.html @@ -5,22 +5,22 @@ - - - - - - {{breadcrumb.name}} - - + + + + + + {{breadcrumb.name}} + + -
{{breadcrumb.name}} {{breadcrumb.example? ' (example)':''}}
 +
+
{{breadcrumb.name}}{{breadcrumb.example ? ' (example)' : ''}}
+ +
@@ -33,15 +33,16 @@ - - - {{breadcrumb.name}} - + + + {{breadcrumb.name}} + diff --git a/src/app/webapp-common/layout/breadcrumbs/breadcrumbs.component.scss b/src/app/webapp-common/layout/breadcrumbs/breadcrumbs.component.scss index 0384ddc1..9a2723e5 100644 --- a/src/app/webapp-common/layout/breadcrumbs/breadcrumbs.component.scss +++ b/src/app/webapp-common/layout/breadcrumbs/breadcrumbs.component.scss @@ -17,6 +17,10 @@ span { display: flex; overflow: hidden; flex-shrink: 0; + + &.last { + flex-shrink: 1; + } } .crumb { @@ -31,17 +35,22 @@ span { } } - } + &.first { + text-transform: uppercase; + } - .crumb.first { - text-transform: uppercase; - } - - .crumb.last { - font-weight: 700; - color: #fff; - white-space: nowrap; - overflow: hidden; + &.last { + color: #fff; + white-space: nowrap; + overflow: hidden; + display: grid; + grid-template-columns: 1fr auto; + align-items: center; + grid-gap: 8px; + .name { + font-weight: 700; + } + } } .sub-project { @@ -100,6 +109,12 @@ span { height: 24px; padding-top: 4px; } + sm-tag-list { + display: inline-flex; + margin-left: 8px; + } + + } .sub-project-menu-item { @@ -107,6 +122,13 @@ span { font-size: 14px; font-weight: 500; color: $blue-900; + + ::ng-deep .mdc-list-item__primary-text { + display: -webkit-box; + -webkit-box-orient: vertical; + -webkit-line-clamp: 2; + overflow: hidden; + } } .workspace { diff --git a/src/app/webapp-common/layout/breadcrumbs/breadcrumbs.component.ts b/src/app/webapp-common/layout/breadcrumbs/breadcrumbs.component.ts index f04f28a2..54c1af07 100644 --- a/src/app/webapp-common/layout/breadcrumbs/breadcrumbs.component.ts +++ b/src/app/webapp-common/layout/breadcrumbs/breadcrumbs.component.ts @@ -5,13 +5,13 @@ import { ElementRef, Input, OnDestroy, - OnInit, - ViewChild + OnInit, QueryList, + ViewChild, ViewChildren } from '@angular/core'; import {Store} from '@ngrx/store'; import {selectRouterConfig, selectRouterQueryParams} from '../../core/reducers/router-reducer'; import {debounceTime} from 'rxjs/operators'; -import {ActivatedRoute, Router, RouterLink} from '@angular/router'; +import {ActivatedRoute, RouterLink} from '@angular/router'; import {combineLatest, fromEvent, Observable, Subscription} from 'rxjs'; import {addMessage} from '../../core/actions/layout.actions'; import {ConfigurationService} from '../../shared/services/configuration.service'; @@ -32,6 +32,8 @@ import { import {ClipboardModule} from 'ngx-clipboard'; import {ClickStopPropagationDirective} from '@common/shared/ui-components/directives/click-stop-propagation.directive'; import {BreadcrumbsService} from '@common/shared/services/breadcrumbs.service'; +import {TagListComponent} from '@common/shared/ui-components/tags/tag-list/tag-list.component'; +import {cloneItemIntoDummy} from '@common/shared/utils/shared-utils'; export enum CrumbTypeEnum { Workspace = 'Workspace', @@ -49,6 +51,8 @@ export interface IBreadcrumbsLink { hidden?: boolean; collapsable?: boolean; example?: boolean; + tags?: string[]; + onlyWithProject?: boolean; } export interface IBreadcrumbsOptions { @@ -78,7 +82,8 @@ export interface IBreadcrumbsOptions { ClipboardModule, RouterLink, NgIf, - ClickStopPropagationDirective + ClickStopPropagationDirective, + TagListComponent ], standalone: true }) @@ -96,8 +101,8 @@ export class BreadcrumbsComponent implements OnInit, OnDestroy { private isSearching$ = this.store.select(selectIsSearching); @Input() activeWorkspace: GetCurrentUserResponseUserObjectCompany; - @ViewChild('container') private breadCrumbsContainer: ElementRef; - private expandedSize: number; + @ViewChild('container') private breadCrumbsContainer: ElementRef; + @ViewChildren('crumb') private crumbElements: QueryList>; public breadcrumbs$: Observable; public showHidden: boolean; public projectFeature: boolean; @@ -105,10 +110,8 @@ export class BreadcrumbsComponent implements OnInit, OnDestroy { constructor( private store: Store, public route: ActivatedRoute, - private router: Router, private configService: ConfigurationService, private cd: ChangeDetectorRef, - private ref: ElementRef, private breadcrumbsService: BreadcrumbsService // don't delete ) { this.breadcrumbs$ = this.store.select(selectBreadcrumbs); @@ -124,7 +127,11 @@ export class BreadcrumbsComponent implements OnInit, OnDestroy { ); this.sub.add(this.breadcrumbs$.subscribe(breadcrumbs => { - this.breadcrumbs = breadcrumbs.map(breadcrumbsGroup => breadcrumbsGroup.filter(breadcrumb => (!breadcrumb.hidden) || (this.showHidden && this.projectFeature))).filter(breadcrumbsGroup => breadcrumbsGroup.length > 0); + this.breadcrumbs = breadcrumbs + .map(breadcrumbsGroup => breadcrumbsGroup?.filter( breadcrumb => + (!breadcrumb.hidden) || (this.showHidden && this.projectFeature) + )) + .filter(breadcrumbsGroup => breadcrumbsGroup?.length > 0); this.cd.detectChanges(); })); @@ -143,6 +150,7 @@ export class BreadcrumbsComponent implements OnInit, OnDestroy { this.sub.add(this.configService.globalEnvironmentObservable.subscribe(env => this.isCommunity = env.communityServer)); + // todo: check if needed this.sub.add(this.store.select(selectIsDeepMode).subscribe(isDeep => { this.isDeep = isDeep; this.cd.detectChanges(); @@ -186,12 +194,15 @@ export class BreadcrumbsComponent implements OnInit, OnDestroy { private calcOverflowing() { this.shouldCollapse = false; this.cd.detectChanges(); - setTimeout(() => { - this.expandedSize = this.breadCrumbsContainer?.nativeElement.scrollWidth; - this.shouldCollapse = this.ref?.nativeElement.clientWidth < this.expandedSize; - this.cd.detectChanges(); - }, 150); - + const lastCrumb = this.crumbElements.last.nativeElement; + const dummyContainer = document.createElement('span'); + dummyContainer.style.position = 'fixed'; + this.breadCrumbsContainer.nativeElement.appendChild(dummyContainer); + cloneItemIntoDummy(lastCrumb, dummyContainer); + const width = dummyContainer.offsetWidth; + this.breadCrumbsContainer.nativeElement.removeChild(dummyContainer); + this.shouldCollapse = lastCrumb.clientWidth < width; + this.cd.detectChanges(); } ngOnDestroy() { @@ -210,9 +221,4 @@ export class BreadcrumbsComponent implements OnInit, OnDestroy { subProjectsMenuOpened(b: boolean) { this.subProjectsMenuIsOpen = b; } - - private resetShouldCollapse() { - this.shouldCollapse = false; - return true; - } } diff --git a/src/app/webapp-common/layout/header/header.component.html b/src/app/webapp-common/layout/header/header.component.html index e2006f31..81b91e8e 100644 --- a/src/app/webapp-common/layout/header/header.component.html +++ b/src/app/webapp-common/layout/header/header.component.html @@ -11,12 +11,14 @@
- logo -
{{environment.whiteLabelSlogan}}
-
-
- logo + [class.make-room-for-slogan]="(environment$ | async).whiteLabelSlogan"> + logo + +
{{(environment$ | async).whiteLabelSlogan}}
+
+ logo +
+
@@ -33,12 +35,12 @@
-
+
- @@ -47,30 +49,30 @@ - + - - + - +
diff --git a/src/app/webapp-common/layout/header/header.component.ts b/src/app/webapp-common/layout/header/header.component.ts index 3730dc46..efb92f07 100644 --- a/src/app/webapp-common/layout/header/header.component.ts +++ b/src/app/webapp-common/layout/header/header.component.ts @@ -17,6 +17,7 @@ import {LoginService} from '~/shared/services/login.service'; import {selectUserSettingsNotificationPath} from '~/core/reducers/view.reducer'; import {selectInvitesPending} from '~/core/reducers/users.reducer'; import {MESSAGES_SEVERITY} from '@common/constants'; +import {UsersGetInvitesResponseInvites} from '~/business-logic/model/users/usersGetInvitesResponseInvites'; @Component({ selector: 'sm-header', @@ -30,13 +31,13 @@ export class HeaderComponent implements OnInit, OnDestroy { showLogo: boolean; profile: boolean; userFocus: boolean; - environment = ConfigurationService.globalEnvironment; + public environment$ = this.configService.getEnvironment(); public user: Observable; public activeWorkspace: GetCurrentUserResponseUserObjectCompany; public url: Observable; - public invitesPending$: Observable; - public userNotificationPath: string; + public invitesPending$: Observable; private sub = new Subscription(); + public userNotificationPath$: Observable; constructor( private store: Store, @@ -44,12 +45,12 @@ export class HeaderComponent implements OnInit, OnDestroy { private tipsService: TipsService, private loginService: LoginService, private router: Router, - private activeRoute: ActivatedRoute - + private activeRoute: ActivatedRoute, + private configService: ConfigurationService ) { this.url = this.store.select(selectRouterUrl); this.user = this.store.select(selectCurrentUser); - this.sub.add(this.store.select(selectUserSettingsNotificationPath).subscribe(path => this.userNotificationPath = path)); + this.userNotificationPath$ = this.store.select(selectUserSettingsNotificationPath); this.invitesPending$ = this.store.select(selectInvitesPending); this.sub.add(this.store.select(selectActiveWorkspace) .pipe( @@ -97,15 +98,8 @@ export class HeaderComponent implements OnInit, OnDestroy { this.dialog.open(WelcomeMessageComponent, {data: {step: 2}}); } - openAppsAwareness($event: MouseEvent, appsYouTubeIntroVideoId: string) { + openAppsAwareness($event: MouseEvent) { $event.preventDefault(); - this.store.dispatch(openAppsAwarenessDialog({appsYouTubeIntroVideoId})); - } - - navigate(link: string) { - const a = document.createElement('a'); - a.target = '_blank'; - a.href = link; - a.click(); + this.store.dispatch(openAppsAwarenessDialog()); } } diff --git a/src/app/webapp-common/layout/project-context-navbar/project-context-navbar.component.scss b/src/app/webapp-common/layout/project-context-navbar/project-context-navbar.component.scss index 023c51fe..591c8834 100755 --- a/src/app/webapp-common/layout/project-context-navbar/project-context-navbar.component.scss +++ b/src/app/webapp-common/layout/project-context-navbar/project-context-navbar.component.scss @@ -1,6 +1,5 @@ @import "variables"; -$lg-breakpoint: map-get($grid-breakpoints, lg); :host { .navbar-header-container { min-height: $nav-bar-height; @@ -31,7 +30,7 @@ $lg-breakpoint: map-get($grid-breakpoints, lg); font-size: 16px; font-weight: 700; } - @media screen and (max-width: $lg-breakpoint) { + @media screen and (max-width: 1000px) { .nav-bar-items-container { left: 60%; } diff --git a/src/app/webapp-common/layout/s3-access-dialog/s3-access-dialog.component.html b/src/app/webapp-common/layout/s3-access-dialog/s3-access-dialog.component.html index d707af98..359d31ec 100755 --- a/src/app/webapp-common/layout/s3-access-dialog/s3-access-dialog.component.html +++ b/src/app/webapp-common/layout/s3-access-dialog/s3-access-dialog.component.html @@ -2,7 +2,7 @@
- +
Key Token - + Region Endpoint - - + +
- +
diff --git a/src/app/webapp-common/layout/s3-access-dialog/s3-access-dialog.component.ts b/src/app/webapp-common/layout/s3-access-dialog/s3-access-dialog.component.ts index 030fdfa4..78457de8 100755 --- a/src/app/webapp-common/layout/s3-access-dialog/s3-access-dialog.component.ts +++ b/src/app/webapp-common/layout/s3-access-dialog/s3-access-dialog.component.ts @@ -16,18 +16,19 @@ export class S3AccessDialogComponent implements OnChanges { @ViewChild('S3NGForm', {static: true}) s3NGForm: NgForm; - @Input() isAzure; - @Input() key; - @Input() secret = ''; - @Input() region = ''; - @Input() token = ''; - @Input() bucket; - @Input() endpoint; - @Input() editMode = false; - @Input() header; + @Input() isAzure: boolean; + @Input() isGCS: boolean; + @Input() key: string; + @Input() secret = ''; + @Input() region = ''; + @Input() token = ''; + @Input() bucket: string; + @Input() endpoint: string; + @Input() editMode = false; + @Input() header: string; - @Output() closeCancel: EventEmitter = new EventEmitter(); - @Output() closeSave: EventEmitter = new EventEmitter(); + @Output() closeCancel: EventEmitter = new EventEmitter(); + @Output() closeSave: EventEmitter = new EventEmitter(); @Input() saveEnabled = true; @@ -56,8 +57,8 @@ export class S3AccessDialogComponent implements OnChanges { return false; } else { this.closeSave.emit(this.s3Form); + return true; } - } public cancel() { diff --git a/src/app/webapp-common/layout/s3-access-resolver/s3-access-resolver.component.html b/src/app/webapp-common/layout/s3-access-resolver/s3-access-resolver.component.html index 37714964..6f4d421d 100755 --- a/src/app/webapp-common/layout/s3-access-resolver/s3-access-resolver.component.html +++ b/src/app/webapp-common/layout/s3-access-resolver/s3-access-resolver.component.html @@ -1,5 +1,10 @@ - + + +
signing in with your google account to view {{bucket}} bucket content, and reload the page.
+ Use HMAC instead + diff --git a/src/app/webapp-common/layout/s3-access-resolver/s3-access-resolver.component.scss b/src/app/webapp-common/layout/s3-access-resolver/s3-access-resolver.component.scss index e69de29b..096813af 100755 --- a/src/app/webapp-common/layout/s3-access-resolver/s3-access-resolver.component.scss +++ b/src/app/webapp-common/layout/s3-access-resolver/s3-access-resolver.component.scss @@ -0,0 +1,11 @@ +@import "variables"; +@import "mixins/link"; + +:host { + @include link(); +} + +.gcs-note { + font-weight: 500; + padding-left: 8px; +} diff --git a/src/app/webapp-common/layout/s3-access-resolver/s3-access-resolver.component.ts b/src/app/webapp-common/layout/s3-access-resolver/s3-access-resolver.component.ts index 2273c568..7d67c77e 100755 --- a/src/app/webapp-common/layout/s3-access-resolver/s3-access-resolver.component.ts +++ b/src/app/webapp-common/layout/s3-access-resolver/s3-access-resolver.component.ts @@ -3,6 +3,14 @@ import {Credentials} from '../../core/reducers/common-auth-reducer'; import {Observable} from 'rxjs'; import {MAT_DIALOG_DATA, MatDialogRef} from '@angular/material/dialog'; import {ProjectDialogComponent} from '../../shared/project-dialog/project-dialog.component'; +import {isGoogleCloudUrl} from '@common/settings/admin/base-admin-utils'; + + +export interface S3AccessDialogData { + credentials: Credentials; + provider: 's3' | 'gcs' | 'azure'; + credentialsError: string; +} @Component({ selector : 'sm-s3-access-resolver', @@ -20,13 +28,14 @@ export class S3AccessResolverComponent { region: any; header: any; editMode: any; + title: string; public useSSL: boolean; - public isAzure: boolean; + useGcsHmac = false; constructor( private matDialogRef: MatDialogRef, - @Inject(MAT_DIALOG_DATA) public data: {credentials: Credentials; isAzure?: boolean; credentialsError} + @Inject(MAT_DIALOG_DATA) public data: S3AccessDialogData ) { const s3Credentials = data.credentials; this.bucket = s3Credentials.Bucket; @@ -35,11 +44,22 @@ export class S3AccessResolverComponent { this.secret = s3Credentials.Secret; this.token = s3Credentials.Token; this.region = s3Credentials.Region; - this.isAzure = data.isAzure; if (data.credentialsError) { this.header = this.header = `${data.credentialsError}, please check credentials for bucket ${this.bucket}.`; } else { - this.header = `Please provide credentials for bucket ${this.bucket}.`; + if (data?.provider !== 'gcs') { + this.header = `Please provide credentials for bucket ${this.bucket}.`; + } + } + switch (data?.provider) { + case 'azure': + this.title = 'Azure Credentials'; + break; + case 'gcs': + this.title = 'GCS Credentials'; + break; + default: + this.title = 'S3 Credentials'; } } @@ -66,4 +86,9 @@ export class S3AccessResolverComponent { }); } + protected readonly isGoogleCloudUrl = isGoogleCloudUrl; + + reload() { + window.location.reload(); + } } diff --git a/src/app/webapp-common/layout/welcome-message/welcome-message.component.html b/src/app/webapp-common/layout/welcome-message/welcome-message.component.html index 55cdb64a..3e9231c0 100644 --- a/src/app/webapp-common/layout/welcome-message/welcome-message.component.html +++ b/src/app/webapp-common/layout/welcome-message/welcome-message.component.html @@ -1,6 +1,6 @@ diff --git a/src/app/webapp-common/layout/welcome-message/welcome-message.component.scss b/src/app/webapp-common/layout/welcome-message/welcome-message.component.scss index 01dab8dc..819ba74b 100644 --- a/src/app/webapp-common/layout/welcome-message/welcome-message.component.scss +++ b/src/app/webapp-common/layout/welcome-message/welcome-message.component.scss @@ -1,4 +1,5 @@ @import "variables"; +@import "mixins/link"; $credentialBaseHeight: 238px; @@ -6,6 +7,8 @@ $credentialBaseHeight: 238px; ::ng-deep .sub-header { padding: 0 32px; } + + @include link(); } .welcome-content { @@ -56,13 +59,6 @@ $credentialBaseHeight: 238px; border-bottom: $separator-line solid 2px; } - .link { - .title { - color: $blue-500; - font-size: 14px; - font-weight: 500; - } - } } .steps-content { @@ -102,6 +98,7 @@ $credentialBaseHeight: 238px; .bolder { font-weight: 500; + margin: 0 4px; } .code { @@ -166,7 +163,7 @@ $credentialBaseHeight: 238px; height: $credentialBaseHeight + 20; } &.jupyter{ - height: 0px; + height: 0; } &.first-step { diff --git a/src/app/webapp-common/layout/welcome-message/welcome-message.component.ts b/src/app/webapp-common/layout/welcome-message/welcome-message.component.ts index 5ddb4659..273d5ef9 100644 --- a/src/app/webapp-common/layout/welcome-message/welcome-message.component.ts +++ b/src/app/webapp-common/layout/welcome-message/welcome-message.component.ts @@ -65,7 +65,7 @@ export class WelcomeMessageComponent implements OnInit, OnDestroy { code: 'clearml-agent init' } ]; - links = ['Setup ClearML', 'Run your ML code', 'Relaunch previous experiments']; + links = ['Set up ClearML', 'Run your ML code', 'Relaunch previous experiments']; host: string; community = false; public queue: Queue; diff --git a/src/app/webapp-common/login/login/login.component.html b/src/app/webapp-common/login/login/login.component.html index 99269d10..38ebd8fa 100644 --- a/src/app/webapp-common/login/login/login.component.html +++ b/src/app/webapp-common/login/login/login.component.html @@ -1,4 +1,4 @@ -
+ diff --git a/src/app/webapp-common/models/containers/model-info-experiments/model-info-experiments.component.scss b/src/app/webapp-common/models/containers/model-info-experiments/model-info-experiments.component.scss index d3563e18..0295d605 100644 --- a/src/app/webapp-common/models/containers/model-info-experiments/model-info-experiments.component.scss +++ b/src/app/webapp-common/models/containers/model-info-experiments/model-info-experiments.component.scss @@ -1,6 +1,9 @@ +@import "mixins/link"; + :host{ .lineage-container{ height: 100%; padding: 24px; } + @include link(); } diff --git a/src/app/webapp-common/models/containers/model-info-experiments/model-info-experiments.component.ts b/src/app/webapp-common/models/containers/model-info-experiments/model-info-experiments.component.ts index de712043..80d35b93 100644 --- a/src/app/webapp-common/models/containers/model-info-experiments/model-info-experiments.component.ts +++ b/src/app/webapp-common/models/containers/model-info-experiments/model-info-experiments.component.ts @@ -1,6 +1,5 @@ import {Component, ViewChild} from '@angular/core'; import {Store} from "@ngrx/store"; -import {ModelInfoState} from "@common/models/reducers/model-info.reducer"; import {selectSelectedModel} from "@common/models/reducers"; import {Observable} from "rxjs"; import {EntityTypeEnum} from '~/shared/constants/non-common-consts'; diff --git a/src/app/webapp-common/models/containers/model-info-general/model-info-general.component.ts b/src/app/webapp-common/models/containers/model-info-general/model-info-general.component.ts index 036474f1..3c790821 100755 --- a/src/app/webapp-common/models/containers/model-info-general/model-info-general.component.ts +++ b/src/app/webapp-common/models/containers/model-info-general/model-info-general.component.ts @@ -1,10 +1,8 @@ -import {Component, OnDestroy} from '@angular/core'; +import {ChangeDetectorRef, Component, OnDestroy, OnInit} from '@angular/core'; import {Subscription} from 'rxjs'; -import {ModelInfoState} from '../../reducers/model-info.reducer'; import {Store} from '@ngrx/store'; import {SelectedModel} from '../../shared/models.model'; import {selectSelectedModel} from '../../reducers'; -import {filter} from 'rxjs/operators'; import {resetDontShowAgainForBucketEndpoint} from '@common/core/actions/common-auth.actions'; import {createModelLink, isExample} from '@common/shared/utils/shared-utils'; import {AdminService} from '~/shared/services/admin.service'; @@ -16,19 +14,15 @@ import {updateModelDetails} from '../../actions/models-info.actions'; templateUrl: './model-info-general.component.html', styleUrls: ['./model-info-general.component.scss'] }) -export class ModelInfoGeneralComponent implements OnDestroy { +export class ModelInfoGeneralComponent implements OnDestroy, OnInit{ public selectedModel: SelectedModel; public isExample: boolean; private selectedModelSubscription: Subscription; - constructor(private store: Store, private adminService: AdminService) { - this.selectedModelSubscription = this.store.select(selectSelectedModel).pipe( - filter(model => !!model)) - .subscribe(model => { - this.isExample = isExample(model); - this.selectedModel = model; - }); + constructor(private store: Store, private adminService: AdminService, private cdr: ChangeDetectorRef, + ) { + } showModel(model) { @@ -47,4 +41,14 @@ export class ModelInfoGeneralComponent implements OnDestroy { this.selectedModelSubscription.unsubscribe(); } + ngOnInit(): void { + this.selectedModelSubscription = this.store.select(selectSelectedModel).pipe( + ) + .subscribe(model => { + this.isExample = isExample(model); + this.selectedModel = model; + // this.cdr.detectChanges(); + }); + } + } diff --git a/src/app/webapp-common/models/containers/model-info-metadata/model-info-metadata.component.html b/src/app/webapp-common/models/containers/model-info-metadata/model-info-metadata.component.html index b41503b1..6a199b90 100644 --- a/src/app/webapp-common/models/containers/model-info-metadata/model-info-metadata.component.html +++ b/src/app/webapp-common/models/containers/model-info-metadata/model-info-metadata.component.html @@ -6,69 +6,60 @@ (saveClicked)="saveFormData()" (activateEditClicked)="activateEditChanged('metadata')"> -
- +
+
- - - - Required - - Key must be unique. + + + + Required + + Key must be unique. - - - - - Required - - - - - - + + + + + Required + + + + + +
- - -
- -
- - -
-
- {{row.key}} -
-
- {{row.type}} -
-
- {{row.value}} -
-
- - +
+ + + {{row?.[col.id]}} + + diff --git a/src/app/webapp-common/models/containers/model-info-metadata/model-info-metadata.component.ts b/src/app/webapp-common/models/containers/model-info-metadata/model-info-metadata.component.ts index d4387762..17233eef 100644 --- a/src/app/webapp-common/models/containers/model-info-metadata/model-info-metadata.component.ts +++ b/src/app/webapp-common/models/containers/model-info-metadata/model-info-metadata.component.ts @@ -1,20 +1,20 @@ import {ChangeDetectionStrategy, Component, OnDestroy, OnInit} from '@angular/core'; import {selectIsModelSaving, selectSelectedModel} from '../../reducers'; -import {filter} from 'rxjs/operators'; import {Store} from '@ngrx/store'; -import {ModelInfoState} from '../../reducers/model-info.reducer'; import {Observable, Subscription} from 'rxjs'; import {SelectedModel} from '../../shared/models.model'; import {selectIsSharedAndNotOwner} from '~/features/experiments/reducers'; -import {activateModelEdit, cancelModelEdit, saveMetaData, setSavingModel } from '../../actions/models-info.actions'; -import {cloneDeep} from 'lodash-es'; +import {activateModelEdit, cancelModelEdit, saveMetaData} from '../../actions/models-info.actions'; +import {cloneDeep, toInteger} from 'lodash-es'; import {trackById} from '@common/shared/utils/forms-track-by'; +import {filter, map} from 'rxjs/operators'; export interface IModelMetadataMap { [key: string]: IModelMetadataItem; } export interface IModelMetadataItem { + id: string; key?: string; type?: string; value?: string; @@ -32,35 +32,43 @@ export class ModelInfoMetadataComponent implements OnInit, OnDestroy { public isSharedAndNotOwner$: Observable; public inEdit: boolean; trackByFn = trackById; - public cols = [{header: 'Key', class: 'col-8'}, - {header: 'Type', class: 'col-8'}, {header: 'Value', class: 'col-8'}]; - public metadata: IModelMetadataItem[]; + public cols = [ + {id : 'key', header: 'Key'}, + {id : 'type', header: 'Type'}, + {id : 'value', header: 'Value'} + ]; + public metadata = null as IModelMetadataItem[]; private modelSub: Subscription; - private originalMetadata: IModelMetadataItem[]; - searchedText: string; + private originalMetadata; public searchResultsCount: number; - public scrollIndexCounter: number; constructor(private store: Store) { - this.selectedModel$ = this.store.select(selectSelectedModel).pipe(filter(model => !!model)); + this.selectedModel$ = this.store.select(selectSelectedModel); this.saving$ = this.store.select(selectIsModelSaving); this.isSharedAndNotOwner$ = this.store.select(selectIsSharedAndNotOwner); } ngOnInit(): void { - this.modelSub = this.selectedModel$.subscribe(model => { - this.originalMetadata = Object.values(cloneDeep(model?.metadata)); - this.metadata = Object.values(cloneDeep(model?.metadata)); - }); + this.modelSub = this.selectedModel$ + .pipe( + map(model => model?.metadata), + filter(metadata => !!metadata) + ) + .subscribe(metadata => { + this.originalMetadata = Object.values(cloneDeep(metadata)); + this.metadata = Object.values(metadata) + .map((item, index) => ({...item, id: `${index}`})); + }); } saveFormData() { this.inEdit = false; const metadataObject = this.metadata.reduce((acc, metaItem) => { - acc[metaItem.key] = metaItem; + // eslint-disable-next-line @typescript-eslint/no-unused-vars + const {id, ...item} = metaItem; + acc[metaItem.key] = item; return acc; }, {}) as IModelMetadataMap; - this.store.dispatch(setSavingModel (true)); this.store.dispatch(saveMetaData({metadata: metadataObject})); } @@ -78,6 +86,7 @@ export class ModelInfoMetadataComponent implements OnInit, OnDestroy { addRow() { this.metadata.push({ + id: `${toInteger(this.metadata?.at(-1)?.id ?? '0') + 1}`, key: null, type: null, value: null diff --git a/src/app/webapp-common/models/containers/model-info-plots/model-info-plots.component.html b/src/app/webapp-common/models/containers/model-info-plots/model-info-plots.component.html index a34a2128..538dbe87 100644 --- a/src/app/webapp-common/models/containers/model-info-plots/model-info-plots.component.html +++ b/src/app/webapp-common/models/containers/model-info-plots/model-info-plots.component.html @@ -1,5 +1,5 @@ - +
; - public selectedGraph: string = null; - public listOfHidden = [] as string[]; public searchTerm: string; public minimized = true; public dark = false; @@ -37,6 +39,7 @@ export class ModelInfoPlotsComponent implements OnInit, OnDestroy { private modelId: string; @ViewChild(ExperimentGraphsComponent) graphsComponent: ExperimentGraphsComponent; + public listOfHidden$: Observable; constructor( private store: Store, @@ -47,7 +50,9 @@ export class ModelInfoPlotsComponent implements OnInit, OnDestroy { ) { // this.searchTerm$ = this.store.select(selectExperimentMetricsSearchTerm); this.splitSize$ = this.store.select(selectSplitSize); - this.modelsFeature = !!route.snapshot?.parent?.parent?.data?.setAllProject; + this.modelsFeature = !!this.route.snapshot?.parent?.parent?.data?.setAllProject; + this.listOfHidden$ = this.store.select(selectModelSettingsHiddenPlot) + .pipe(distinctUntilChanged(isEqual)); } ngOnInit(): void { @@ -109,12 +114,11 @@ export class ModelInfoPlotsComponent implements OnInit, OnDestroy { } metricSelected(id: string) { - this.selectedGraph = id; this.graphsComponent?.scrollToGraph(id); } hiddenListChanged(hiddenList: string[]) { - this.listOfHidden = hiddenList; + this.store.dispatch(setExperimentSettings({id: this.modelId, changes: {hiddenMetricsPlot: hiddenList}})); } searchTermChanged(searchTerm: string) { this.searchTerm = searchTerm; diff --git a/src/app/webapp-common/models/containers/model-info-scalars/model-info-scalars.component.ts b/src/app/webapp-common/models/containers/model-info-scalars/model-info-scalars.component.ts index 1c7b7522..efdef3e6 100644 --- a/src/app/webapp-common/models/containers/model-info-scalars/model-info-scalars.component.ts +++ b/src/app/webapp-common/models/containers/model-info-scalars/model-info-scalars.component.ts @@ -1,15 +1,11 @@ -import {ChangeDetectorRef, Component} from '@angular/core'; -import {RefreshService} from '@common/core/services/refresh.service'; +import {Component} from '@angular/core'; import { ExperimentOutputScalarsComponent } from '@common/experiments/containers/experiment-output-scalars/experiment-output-scalars.component'; -import {Store} from '@ngrx/store'; -import {ActivatedRoute, Router} from '@angular/router'; +import {ActivatedRoute} from '@angular/router'; import {selectSelectedModel} from '@common/models/reducers'; import {experimentScalarRequested} from '@common/experiments/actions/common-experiment-output.actions'; -import {ReportCodeEmbedService} from '~/shared/services/report-code-embed.service'; -import {debounceTime, distinctUntilChanged, filter, map, tap} from 'rxjs/operators'; -import {selectSelectedModelSettings} from '~/features/experiments/reducers'; +import {debounceTime, distinctUntilChanged, filter, tap} from 'rxjs/operators'; import {selectRouterParams} from '@common/core/reducers/router-reducer'; import { selectModelInfoHistograms, @@ -27,37 +23,22 @@ import {isEqual} from 'lodash-es'; ] }) export class ModelInfoScalarsComponent extends ExperimentOutputScalarsComponent { - protected entitySelector = this.store.select(selectSelectedModel); - protected entityType: 'task' | 'model' = 'model'; - constructor( - protected store: Store, - protected router: Router, - private route: ActivatedRoute, - protected activeRoute: ActivatedRoute, - protected changeDetection: ChangeDetectorRef, - protected reportEmbed: ReportCodeEmbedService, - protected refreshService: RefreshService - ) { - super(store, router, activeRoute, changeDetection, reportEmbed, refreshService); + constructor(private route: ActivatedRoute) { + super(); + this.entitySelector = this.store.select(selectSelectedModel); + this.entityType = 'model'; this.exportForReport = !route.snapshot?.parent?.parent?.data?.setAllProject; this.xAxisType$ = this.store.select(selectModelSettingsXAxisType); this.groupBy$ = this.store.select(selectModelSettingsGroupBy); - this.smoothWeight$ = this.store.select(selectModelSettingsSmoothWeight); + this.smoothWeight$ = this.store.select(selectModelSettingsSmoothWeight).pipe(filter(smooth => smooth !== null)); this.smoothWeightDelayed$ = this.store.select(selectModelSettingsSmoothWeight).pipe(debounceTime(75)); this.smoothType$ = this.store.select(selectModelSettingsSmoothType); this.listOfHidden$ = this.store.select(selectModelSettingsHiddenScalar) .pipe(distinctUntilChanged(isEqual)); - this.settings$ = this.store.select(selectSelectedModelSettings).pipe( - filter(settings => !!settings), - map(settings => settings ? settings.selectedScalar : null), - distinctUntilChanged(), - filter(selectedPlot => selectedPlot !== undefined) - ); - this.scalars$ = this.store.select(selectModelInfoHistograms) .pipe( filter((metrics) => !!metrics), @@ -72,14 +53,14 @@ export class ModelInfoScalarsComponent extends ExperimentOutputScalarsComponent } - refresh() { + override refresh() { if (!this.refreshDisabled) { this.refreshDisabled = true; this.store.dispatch(experimentScalarRequested({experimentId: this.experimentId, model: true})); } } - protected axisChanged() { + protected override axisChanged() { this.store.dispatch(experimentScalarRequested({experimentId: this.experimentId, model: true})); this.experimentGraphs.prepareRedraw(); } diff --git a/src/app/webapp-common/models/containers/model-info/model-info.component.scss b/src/app/webapp-common/models/containers/model-info/model-info.component.scss index 8543027f..6224f4d9 100755 --- a/src/app/webapp-common/models/containers/model-info/model-info.component.scss +++ b/src/app/webapp-common/models/containers/model-info/model-info.component.scss @@ -12,7 +12,7 @@ } .model-info-container { - height: calc(100% - 32px); + height: calc(100% - 34px); nav { border-bottom: 1px solid rgba(2, 2, 2, 0.07); diff --git a/src/app/webapp-common/models/containers/model-info/model-info.component.ts b/src/app/webapp-common/models/containers/model-info/model-info.component.ts index 824fbf86..fc26623f 100755 --- a/src/app/webapp-common/models/containers/model-info/model-info.component.ts +++ b/src/app/webapp-common/models/containers/model-info/model-info.component.ts @@ -1,13 +1,12 @@ -import {Component, OnDestroy, OnInit} from '@angular/core'; +import {ChangeDetectorRef, Component, OnDestroy, OnInit} from '@angular/core'; import {ActivatedRoute, Router} from '@angular/router'; import {selectRouterConfig, selectRouterParams} from '@common/core/reducers/router-reducer'; import {Store} from '@ngrx/store'; import * as infoActions from '../../actions/models-info.actions'; import {selectIsModelInEditMode, selectSelectedModel, selectSelectedTableModel, selectSplitSize} from '../../reducers'; import {SelectedModel} from '../../shared/models.model'; -import {selectS3BucketCredentials} from '@common/core/reducers/common-auth-reducer'; import {Observable, Subscription} from 'rxjs'; -import {debounceTime, distinctUntilChanged, filter, map, tap, withLatestFrom} from 'rxjs/operators'; +import {debounceTime, distinctUntilChanged, filter, map, withLatestFrom} from 'rxjs/operators'; import {addMessage, setAutoRefresh} from '@common/core/actions/layout.actions'; import {selectBackdropActive} from '@common/core/reducers/view.reducer'; import {setTableMode} from '@common/models/actions/models-view.actions'; @@ -21,6 +20,7 @@ import {getCompanyTags, setBreadcrumbsOptions, setSelectedProject} from '@common import {selectSelectedProject} from '@common/core/reducers/projects.reducer'; import {Project} from '~/business-logic/model/projects/project'; import {ALL_PROJECTS_OBJECT} from '@common/core/effects/projects.effects'; +import {ModelsInfoEffects} from '@common/models/effects/models-info.effects'; @Component({ @@ -33,11 +33,9 @@ export class ModelInfoComponent implements OnInit, OnDestroy { public selectedModel: SelectedModel; private sub = new Subscription(); - private s3BucketCredentials: Observable; public selectedModel$: Observable; public isExample: boolean; - public backdropActive$: Observable; - private projectId: string; + public backdropActive$: Observable; public selectedTableModel$: Observable; public scalars$: Observable; public splitSize$: Observable; @@ -60,9 +58,10 @@ export class ModelInfoComponent implements OnInit, OnDestroy { private router: Router, private store: Store, private route: ActivatedRoute, - private refresh: RefreshService + private refresh: RefreshService, + private cdr: ChangeDetectorRef, + private modelInfoEffect: ModelsInfoEffects ) { - this.s3BucketCredentials = store.select(selectS3BucketCredentials); this.backdropActive$ = this.store.select(selectBackdropActive); this.selectedTableModel$ = this.store.select(selectSelectedTableModel); this.splitSize$ = this.store.select(selectSplitSize); @@ -74,14 +73,13 @@ export class ModelInfoComponent implements OnInit, OnDestroy { this.store.dispatch(setSelectedProject({project: ALL_PROJECTS_OBJECT})); this.store.dispatch(getCompanyTags()); } - - } - - ngOnInit() { this.minimized = this.route.snapshot.firstChild?.data.minimized; if (!this.minimized) { this.setupBreadcrumbsOptions(); } + } + + ngOnInit() { this.scalars$ = this.store.select(selectRouterConfig) .pipe( filter(c => !!c), @@ -93,14 +91,12 @@ export class ModelInfoComponent implements OnInit, OnDestroy { .subscribe(model => { this.selectedModel = model; this.isExample = isReadOnly(model); + this.cdr.detectChanges(); }) ); this.sub.add(this.store.select(selectRouterParams) .pipe( - tap((params) => { - this.projectId = params?.projectId; - }), debounceTime(150), map(params => params?.modelId), filter(modelId => !!modelId), @@ -129,6 +125,8 @@ export class ModelInfoComponent implements OnInit, OnDestroy { ngOnDestroy(): void { this.sub.unsubscribe(); if (!this.toMaximize) { + this.modelInfoEffect.previousSelectedId = null; + this.modelInfoEffect.previousSelectedLastUpdate = null; this.store.dispatch(infoActions.setModelInfo({model: null})); } } diff --git a/src/app/webapp-common/models/containers/model-menu/model-menu.component.html b/src/app/webapp-common/models/containers/model-menu/model-menu.component.html index 4d52bf64..fdaa9448 100644 --- a/src/app/webapp-common/models/containers/model-menu/model-menu.component.html +++ b/src/app/webapp-common/models/containers/model-menu/model-menu.component.html @@ -15,16 +15,16 @@ Details
- - @@ -35,6 +35,7 @@ [disabled]="isExample" (menuOpened)="tagMenuOpened()" (menuClosed)="tagMenuClosed()" + data-id="addTagOption" > {{numSelected | menuItemText : 'Add Tag' : selectedDisableAvailableIsMultiple}} @@ -48,10 +49,10 @@ (tagSelected)="tagSelected.emit($event)">
- - diff --git a/src/app/webapp-common/models/containers/model-menu/model-menu.component.ts b/src/app/webapp-common/models/containers/model-menu/model-menu.component.ts index 5aa293fe..f58a70dd 100644 --- a/src/app/webapp-common/models/containers/model-menu/model-menu.component.ts +++ b/src/app/webapp-common/models/containers/model-menu/model-menu.component.ts @@ -1,4 +1,4 @@ -import {Component, ElementRef, EventEmitter, Input, Output} from '@angular/core'; +import {Component, EventEmitter, Input, Output} from '@angular/core'; import { archiveSelectedModels, changeProjectRequested, @@ -8,11 +8,8 @@ import { import {htmlTextShort} from '@common/shared/utils/shared-utils'; import {ICONS} from '@common/constants'; import {MatDialog} from '@angular/material/dialog'; -import {Store} from '@ngrx/store'; import {AdminService} from '~/shared/services/admin.service'; -import {selectS3BucketCredentials} from '@common/core/reducers/common-auth-reducer'; import {ConfirmDialogComponent} from '@common/shared/ui-components/overlay/confirm-dialog/confirm-dialog.component'; -import {Observable} from 'rxjs'; import {filter, map, take} from 'rxjs/operators'; import {ChangeProjectDialogComponent} from '@common/experiments/shared/components/change-project-dialog/change-project-dialog.component'; import { @@ -44,9 +41,8 @@ import {isReadOnly} from '@common/shared/utils/is-read-only'; export class ModelMenuComponent extends BaseContextMenuComponent { readonly icons = ICONS; - private s3BucketCredentials: Observable; public modelSignedUri: string; - public _model: any; + public _model: SelectedModel; public isExample: boolean; public isLocalFile: boolean; public isArchive: boolean; @@ -74,12 +70,9 @@ export class ModelMenuComponent extends BaseContextMenuComponent { constructor( protected dialog: MatDialog, - protected store: Store, protected adminService: AdminService, - protected eRef: ElementRef ) { - super(store, eRef); - this.s3BucketCredentials = store.select(selectS3BucketCredentials); + super(); } archiveClicked() { diff --git a/src/app/webapp-common/models/dumbs/model-general-info/model-general-info.component.html b/src/app/webapp-common/models/dumbs/model-general-info/model-general-info.component.html index 4f320682..8346c886 100755 --- a/src/app/webapp-common/models/dumbs/model-general-info/model-general-info.component.html +++ b/src/app/webapp-common/models/dumbs/model-general-info/model-general-info.component.html @@ -5,7 +5,7 @@ @@ -29,5 +29,5 @@ (inlineActiveStateChanged)="editExperimentComment($event)" (cancel)="cancelEdit()" > - {{model?.comment | NA}} + {{!model? '-': (model?.comment | NA)}} diff --git a/src/app/webapp-common/models/dumbs/model-general-info/model-general-info.component.scss b/src/app/webapp-common/models/dumbs/model-general-info/model-general-info.component.scss index 51d1eb12..8380eafe 100755 --- a/src/app/webapp-common/models/dumbs/model-general-info/model-general-info.component.scss +++ b/src/app/webapp-common/models/dumbs/model-general-info/model-general-info.component.scss @@ -1,13 +1,10 @@ +@import "mixins/link"; + :host { display: flex; flex-direction: column; - a[href] { - text-decoration: underline; - &:hover { - text-decoration: none; - } - } + @include link(); .preserve-spaces { white-space: pre-wrap; diff --git a/src/app/webapp-common/models/dumbs/model-general-info/model-general-info.component.ts b/src/app/webapp-common/models/dumbs/model-general-info/model-general-info.component.ts index 2c057e87..b0224c67 100755 --- a/src/app/webapp-common/models/dumbs/model-general-info/model-general-info.component.ts +++ b/src/app/webapp-common/models/dumbs/model-general-info/model-general-info.component.ts @@ -43,6 +43,17 @@ export class ModelGeneralInfoComponent { {label: 'ARCHIVED', value: model && model.system_tags && model.system_tags.includes(TAGS.HIDDEN) ? 'Yes' : 'No'}, {label: 'PROJECT', value: get(model, 'project.name', NA)}, ]; + } else { + this.kpis = [ + {label: 'CREATED AT', value: '-'}, + {label: 'UPDATED AT', value: '-'}, + {label: 'FRAMEWORK', value: '-'}, + {label: 'STATUS', value: '-'}, + {label: 'MODEL URL', value: '-'}, + {label: 'USER', value: '-'}, + {label: 'ARCHIVED', value: '-'}, + {label: 'PROJECT',value: '-'}, + ]; } } diff --git a/src/app/webapp-common/models/dumbs/model-header/model-header.component.html b/src/app/webapp-common/models/dumbs/model-header/model-header.component.html index 698a8324..fd10d8e4 100644 --- a/src/app/webapp-common/models/dumbs/model-header/model-header.component.html +++ b/src/app/webapp-common/models/dumbs/model-header/model-header.component.html @@ -28,7 +28,7 @@ (clearTableFilters)="clearTableFilters.emit(tableFilters)" > + [showCart]="false" smTooltip="Download table as CSV" [disabled]="noData" data-id="downloadCSVButton"> diff --git a/src/app/webapp-common/models/dumbs/model-info-header/model-info-header.component.html b/src/app/webapp-common/models/dumbs/model-info-header/model-info-header.component.html index 31d58247..c0dc847d 100755 --- a/src/app/webapp-common/models/dumbs/model-info-header/model-info-header.component.html +++ b/src/app/webapp-common/models/dumbs/model-info-header/model-info-header.component.html @@ -14,7 +14,7 @@ (inlineActiveStateChanged)="editExperimentName($event)" >
- {{model?.name}} + {{model?.name}}
diff --git a/src/app/webapp-common/models/dumbs/model-info-labels-view/model-info-labels-view.component.html b/src/app/webapp-common/models/dumbs/model-info-labels-view/model-info-labels-view.component.html index f3c1ef41..63e15e8d 100755 --- a/src/app/webapp-common/models/dumbs/model-info-labels-view/model-info-labels-view.component.html +++ b/src/app/webapp-common/models/dumbs/model-info-labels-view/model-info-labels-view.component.html @@ -1,62 +1,61 @@ N/A - - -
-
-
-
-
- - - - Required - - + +
+
+ + + + + Required + + + + Labels must be unique. + + Label must be unique. + -
+ + + + Required + + + .(dot) $(dollar) and space are not allowed in parameter id. + + -
- - - - Required - - - .(dot) $(dollar) and space are not allowed in parameter id. - - -
- -
- -
-
-
+ + +
-
-
- -
+
+
@@ -64,11 +63,11 @@ let-col let-i="rowIndex" let-row="row"> -
-
+
+
{{row.label}}
-
+
{{row.id}}
diff --git a/src/app/webapp-common/models/dumbs/model-info-labels-view/model-info-labels-view.component.scss b/src/app/webapp-common/models/dumbs/model-info-labels-view/model-info-labels-view.component.scss index 281be76d..3466d25a 100755 --- a/src/app/webapp-common/models/dumbs/model-info-labels-view/model-info-labels-view.component.scss +++ b/src/app/webapp-common/models/dumbs/model-info-labels-view/model-info-labels-view.component.scss @@ -1,4 +1,14 @@ :host { + sm-simple-table-2 ::ng-deep .headers, .body { + display: grid !important; + grid-template-columns: 1fr 1fr auto; + grid-gap: 12px; + } + + .body-container { + height: 100%; + overflow: auto; + } form.edit { height: calc(100% - 96px); @@ -9,7 +19,19 @@ overflow: auto; } - .btn.plus { - width: 40px; + .trash { + width: 48px; + height: 33px; + } + + .plus { + width: 48px; + } + .outside-error { + position: absolute; + top: 35px; + left: 90px; + font-size: 11px; + color: red; } } diff --git a/src/app/webapp-common/models/dumbs/model-info-labels-view/model-info-labels-view.component.ts b/src/app/webapp-common/models/dumbs/model-info-labels-view/model-info-labels-view.component.ts index 8a34d79f..4836990a 100755 --- a/src/app/webapp-common/models/dumbs/model-info-labels-view/model-info-labels-view.component.ts +++ b/src/app/webapp-common/models/dumbs/model-info-labels-view/model-info-labels-view.component.ts @@ -12,15 +12,14 @@ import {SelectedModel} from '../../shared/models.model'; }) export class ModelInfoLabelsViewComponent implements OnInit, OnDestroy { public formData: Array<{ label: string; id: number }> = []; - public editable: boolean = false; - public cols = [{header: 'Label', class: 'col-10'}, - {header: 'Id', class: 'col-4'}]; + public editable = false; + public cols = [{header: 'Label', class: ''}, {header: 'Id', class: ''}]; private unsavedValue: any; private formChangesSubscription: Subscription; private _model: SelectedModel; - @ViewChild('labels', {static: true}) labels: NgForm; + @ViewChild('labelsForm', {static: true}) labelsForm: NgForm; @Input() set model(model: SelectedModel) { if (model) { @@ -43,7 +42,7 @@ export class ModelInfoLabelsViewComponent implements OnInit, OnDestroy { } ngOnInit(): void { - this.formChangesSubscription = this.labels.valueChanges.pipe(debounceTime(10)).subscribe(formValue => { + this.formChangesSubscription = this.labelsForm.valueChanges.pipe(debounceTime(10)).subscribe(formValue => { if (this.editable) { this.unsavedValue = this.formData; } @@ -72,7 +71,7 @@ export class ModelInfoLabelsViewComponent implements OnInit, OnDestroy { saveClicked() { this.editable = false; - this.saveFormData.emit({...this.model, labels: this.convertParameters(this.unsavedValue)}); + this.saveFormData.emit({...this.model, labels: this.unsavedValue ? this.convertParameters(this.unsavedValue) : this.model.labels}); } cancelEdit() { @@ -87,7 +86,7 @@ export class ModelInfoLabelsViewComponent implements OnInit, OnDestroy { convertParameters(labels: Array<{ id: number, label: string }>): Model['labels'] { const obj = {}; - labels.forEach(l => { + labels?.forEach(l => { obj[l.label] = l.id; }); return obj; diff --git a/src/app/webapp-common/models/effects/models-info.effects.ts b/src/app/webapp-common/models/effects/models-info.effects.ts index a12b2b09..ab508dde 100755 --- a/src/app/webapp-common/models/effects/models-info.effects.ts +++ b/src/app/webapp-common/models/effects/models-info.effects.ts @@ -1,5 +1,5 @@ import {Injectable} from '@angular/core'; -import {Actions, createEffect, ofType} from '@ngrx/effects'; +import {Actions, concatLatestFrom, createEffect, ofType} from '@ngrx/effects'; import {Action, Store} from '@ngrx/store'; import { catchError, @@ -7,10 +7,10 @@ import { expand, filter, map, - mergeMap, reduce, + mergeMap, + reduce, shareReplay, switchMap, - withLatestFrom } from 'rxjs/operators'; import {ApiModelsService} from '~/business-logic/api-services/models.service'; import {ModelsGetAllResponse} from '~/business-logic/model/models/modelsGetAllResponse'; @@ -20,41 +20,49 @@ import {selectAppVisible} from '../../core/reducers/view.reducer'; import * as infoActions from '../actions/models-info.actions'; import {resetActiveSection} from '../actions/models-info.actions'; import * as viewActions from '../actions/models-view.actions'; -import {ModelInfoState} from '../reducers/model-info.reducer'; import {MODELS_INFO_ONLY_FIELDS} from '../shared/models.const'; -import {selectSelectedModel} from '../reducers'; +import {selectModelsList, selectSelectedModel, selectSelectedTableModel} from '../reducers'; import {SelectedModel} from '../shared/models.model'; import {selectActiveWorkspace} from '../../core/reducers/users-reducer'; import {isExample} from '../../shared/utils/shared-utils'; import {isSharedAndNotOwner} from '@common/shared/utils/is-shared-and-not-owner'; import {ApiEventsService} from '~/business-logic/api-services/events.service'; -import {EMPTY} from 'rxjs'; +import {EMPTY, of} from 'rxjs'; +import {RefreshService} from '@common/core/services/refresh.service'; +import {ModelsUpdateRequest} from '~/business-logic/model/models/modelsUpdateRequest'; @Injectable() export class ModelsInfoEffects { + public previousSelectedLastUpdate: Date = null; + public previousSelectedId: string; constructor( private actions$: Actions, private store: Store, private apiModels: ApiModelsService, - private eventsService: ApiEventsService - ) {} + private eventsService: ApiEventsService, + private refreshService: RefreshService +) { + } activeLoader = createEffect(() => this.actions$.pipe( ofType(infoActions.getModelInfo), map(action => activeLoader(action.type)))); - - getModelInfo$ = createEffect(() => this.actions$.pipe( - ofType(infoActions.getModelInfo, infoActions.refreshModelInfo), - withLatestFrom(this.store.select(selectActiveWorkspace), this.store.select(selectAppVisible)), + getModel = createEffect(() => this.actions$.pipe( + ofType(infoActions.getModel), + concatLatestFrom(() => [ + this.store.select(selectActiveWorkspace), + this.store.select(selectAppVisible) + ]), filter(([, , visible]) => visible), switchMap(([action, activeWorkspace]) => // eslint-disable-next-line @typescript-eslint/naming-convention - this.apiModels.modelsGetByIdEx({id: [action.id], only_fields: MODELS_INFO_ONLY_FIELDS}) + this.apiModels.modelsGetByIdEx({id: [action.modelId], only_fields: MODELS_INFO_ONLY_FIELDS}) .pipe( mergeMap((res: ModelsGetAllResponse) => { const model = res.models[0] as SelectedModel; + this.previousSelectedLastUpdate = model.last_change; const actions = [deactivateLoader(action.type)] as Action[]; if (model) { model.readOnly = isExample(model) || isSharedAndNotOwner(model, activeWorkspace); @@ -71,6 +79,55 @@ export class ModelsInfoEffects { ) )); + getModelInfo$ = createEffect(() => this.actions$.pipe( + ofType(infoActions.getModelInfo, infoActions.refreshModelInfo), + concatLatestFrom(() => [ + this.store.select(selectSelectedTableModel), + this.store.select(selectSelectedModel), + this.store.select(selectModelsList), + this.store.select(selectActiveWorkspace), + this.store.select(selectAppVisible) + ]), + // filter(([,, , visible]) => visible), + switchMap(([action, tableSelected, selected, models, , visible]) => { + const currentSelected = tableSelected || selected; + if (this.previousSelectedId && currentSelected?.id != this.previousSelectedId) { + this.previousSelectedLastUpdate = null; + } + this.previousSelectedId = currentSelected?.id; + if (!currentSelected || !visible) { + return of([action, null, tableSelected, selected]); + } + + const listed = models?.find(e => e.id === currentSelected?.id); + return (listed ? of(listed) : + // eslint-disable-next-line @typescript-eslint/naming-convention + this.apiModels.modelsGetByIdEx({id: [selected?.id ?? action.id], only_fields: ['last_change']}).pipe(map(res => res.models[0])) + ).pipe(map(model => [action, model?.last_change ?? model?.last_update, model, selected])); + } + ), + filter(([action, , tableSelected, selected]) => (action.type !== infoActions.refreshModelInfo.type || (!tableSelected) || (tableSelected?.id === selected?.id))), + switchMap(([action, updateTime]) => { + // else will deactivate loader + if ( + !updateTime || + (new Date(this.previousSelectedLastUpdate) < new Date(updateTime)) || + action.type === infoActions.modelDetailsUpdated.type + ) { + const autoRefresh = action.type === infoActions.refreshModelInfo.type; + if (autoRefresh) { + this.refreshService.trigger(true); + } + return [ + deactivateLoader(action.type), + infoActions.getModel({modelId: action.id, autoRefresh}), + ]; + } else { + return [deactivateLoader(action.type)]; + } + }) + )); + editModel$ = createEffect(() => this.actions$.pipe( ofType(infoActions.editModel), debounceTime(1000), @@ -84,8 +141,8 @@ export class ModelsInfoEffects { }) .pipe( mergeMap(() => [ - infoActions.getModelInfo({id: action.model.id}), - infoActions.setSavingModel (false), + infoActions.modelDetailsUpdated({id: action.model.id, changes: action.model as unknown as Partial}), + infoActions.setSavingModel(false), setBackdrop({active: false}) ]), catchError(err => [ @@ -101,16 +158,17 @@ export class ModelsInfoEffects { saveModelMetadata$ = createEffect(() => this.actions$.pipe( ofType(infoActions.saveMetaData), - withLatestFrom(this.store.select(selectSelectedModel)), + concatLatestFrom(() => this.store.select(selectSelectedModel)), mergeMap(([action, selectedModel]) => this.apiModels.modelsEdit({model: selectedModel.id, metadata: action.metadata}) .pipe( mergeMap(() => [ - infoActions.getModelInfo({id: selectedModel.id}), - infoActions.setSavingModel (false), - resetActiveSection(), - setBackdrop({active: false}) - ]), + infoActions.modelDetailsUpdated({id:selectedModel.id, changes:{metadata: action.metadata} as Partial}), + infoActions.getModelInfo({id: selectedModel.id}), + infoActions.setSavingModel(false), + resetActiveSection(), + setBackdrop({active: false}) + ]), catchError(err => [ requestFailed(err), setServerError(err, null, 'Update metadata failed'), @@ -123,7 +181,7 @@ export class ModelsInfoEffects { updateModelDetails$ = createEffect(() => this.actions$.pipe( ofType(infoActions.updateModelDetails), - withLatestFrom(this.store.select(selectSelectedModel)), + concatLatestFrom(() => this.store.select(selectSelectedModel)), mergeMap(([action, selectedModel]) => this.apiModels.modelsUpdate({model: action.id, ...action.changes}) .pipe( @@ -132,8 +190,8 @@ export class ModelsInfoEffects { return [ viewActions.updateModel({id: action.id, changes}), ...(selectedModel?.id === action.id ? - [infoActions.modelDetailsUpdated({id: action.id, changes})] - : [] + [infoActions.modelDetailsUpdated({id: action.id, changes})] + : [] ), ...(changes.tags ? [viewActions.getTags()] : []) ]; diff --git a/src/app/webapp-common/models/effects/models-menu.effects.ts b/src/app/webapp-common/models/effects/models-menu.effects.ts index f76ba00d..7bd24e7c 100644 --- a/src/app/webapp-common/models/effects/models-menu.effects.ts +++ b/src/app/webapp-common/models/effects/models-menu.effects.ts @@ -13,8 +13,8 @@ import {requestFailed} from '../../core/actions/http.actions'; import {ActivatedRoute, Router} from '@angular/router'; import {ApiTasksService} from '~/business-logic/api-services/tasks.service'; import {of} from 'rxjs'; -import {selectSelectedModel, selectSelectedModels, selectSelectedTableModel} from '../reducers'; -import {SelectedModel} from '../shared/models.model'; +import {selectModelsList, selectSelectedModel, selectSelectedTableModel} from '../reducers'; +import {SelectedModel, TableModel} from '../shared/models.model'; import {RouterState, selectRouterConfig} from '../../core/reducers/router-reducer'; import {ModelsArchiveManyResponse} from '~/business-logic/model/models/modelsArchiveManyResponse'; import {emptyAction} from '~/app.constants'; @@ -22,7 +22,9 @@ import {EntityTypeEnum} from '~/shared/constants/non-common-consts'; import {ModelsUnarchiveManyResponse} from '~/business-logic/model/models/modelsUnarchiveManyResponse'; import {getNotificationAction, MenuItems, MoreMenuItems} from '../../shared/entity-page/items.utils'; import {MESSAGES_SEVERITY} from '@common/constants'; -import {addProjectTag} from '../actions/models-view.actions'; +import {ModelsUpdateTagsResponse} from '~/business-logic/model/models/modelsUpdateTagsResponse'; +import {addProjectsTag} from '@common/experiments/actions/common-experiments-view.actions'; +import * as projectsActions from '@common/core/actions/projects.actions'; @Injectable() export class ModelsMenuEffects { @@ -94,7 +96,7 @@ export class ModelsMenuEffects { ) )); - publishModelFailedText(error: any, model) { + publishModelFailedText(error, model) { if (model.task && error?.error?.meta?.result_subcode == 110) { // eslint-disable-next-line @typescript-eslint/naming-convention return this.apiTasks.tasksGetAllEx({id: [model.task.id], only_fields: ['id', 'name', 'project']}).pipe( @@ -113,21 +115,41 @@ export class ModelsMenuEffects { addTag$ = createEffect( () => this.actions$.pipe( ofType(addTag), - concatLatestFrom(() => [ - this.store.select(selectSelectedModels), - this.store.select(selectSelectedTableModel) - ]), - switchMap(([action, selectedModels, selectedModelInfo]) => { - const modelsFromState = selectedModelInfo ? selectedModels.concat(selectedModelInfo) as SelectedModel[] : selectedModels; - return [...action.models.map(model => { - const modelFromState = modelsFromState.find(mod => mod.id === model.id); - return updateModelDetails({ - id: model.id, - changes: {tags: Array.from(new Set((modelFromState?.tags || model.tags || []).concat([action.tag]))).sort() as string[]} - }); - }), addProjectTag]; - } - ) + switchMap(action => { + const ids = action.models.map(e => e.id); + return this.apiModels.modelsUpdateTags({ + ids, + add_tags: [action.tag] + }) + .pipe( + concatLatestFrom(() => [ + this.store.select(selectModelsList), + this.store.select(selectSelectedModel) + ]), + mergeMap(([res, models, selectedModelInfo]: [ModelsUpdateTagsResponse, TableModel[], SelectedModel]) => { + if (res.updated === ids.length) { + const updatedModels = models?.filter(exp => ids.includes(exp.id)) ?? action.models as unknown as TableModel[]; + return [ + viewActions.updateManyModels({changeList: updatedModels.reduce((acc, model) => { + acc[model.id] = {tags: Array.from(new Set((model?.tags || []).concat([action.tag]))).sort()}; + return acc; + }, {})}), + ...(ids.includes(selectedModelInfo?.id) ? + [infoActions.modelDetailsUpdated({ + id: selectedModelInfo.id, + changes: {tags: Array.from(new Set((selectedModelInfo?.tags || []).concat([action.tag]))).sort()} + })] : + []), + addProjectsTag({tag: action.tag}), + projectsActions.addCompanyTag({tag: action.tag}), + ]; + } else { + return [addMessage(MESSAGES_SEVERITY.ERROR, 'Not all tags were applied')] + } + }), + catchError(() => [addMessage(MESSAGES_SEVERITY.ERROR, 'Failed to apply tags')]) + ); + }) )); removeTag$ = createEffect( () => this.actions$.pipe( diff --git a/src/app/webapp-common/models/effects/models-view.effects.ts b/src/app/webapp-common/models/effects/models-view.effects.ts index 60be02f3..d30f879b 100755 --- a/src/app/webapp-common/models/effects/models-view.effects.ts +++ b/src/app/webapp-common/models/effects/models-view.effects.ts @@ -4,17 +4,7 @@ import {Actions, concatLatestFrom, createEffect, ofType} from '@ngrx/effects'; import {Action, Store} from '@ngrx/store'; import {flatten, isEqual} from 'lodash-es'; import {EMPTY, of} from 'rxjs'; -import { - auditTime, - catchError, - expand, - filter, - map, - mergeMap, - reduce, - switchMap, - tap, -} from 'rxjs/operators'; +import {auditTime, catchError, expand, filter, map, mergeMap, reduce, switchMap, tap,} from 'rxjs/operators'; import {ApiModelsService} from '~/business-logic/api-services/models.service'; import {BlModelsService} from '~/business-logic/services/models.service'; import {requestFailed} from '../../core/actions/http.actions'; @@ -22,7 +12,6 @@ import {activeLoader, addMessage, deactivateLoader, setServerError} from '../../ import { downloadForGetAll, getFilteredUsers, - setArchive as setProjectArchive, setProjectUsers } from '../../core/actions/projects.actions'; import {setURLParams} from '../../core/actions/router.actions'; @@ -39,12 +28,7 @@ import {selectModelsList, selectSelectedModels, selectTableFilters, selectTableS import {MODEL_TAGS, MODELS_ONLY_FIELDS, MODELS_TABLE_COL_FIELDS} from '../shared/models.const'; import {SelectedModel} from '../shared/models.model'; import {ModelsGetAllExRequest} from '~/business-logic/model/models/modelsGetAllExRequest'; -import { - addExcludeFilters, - createFiltersFromStore, - encodeColumns, - encodeOrder -} from '../../shared/utils/tableParamEncode'; +import {createFiltersFromStore, encodeColumns, encodeOrder, getTagsFilters} from '../../shared/utils/tableParamEncode'; import {emptyAction} from '~/app.constants'; import {ApiProjectsService} from '~/business-logic/api-services/projects.service'; import {SearchState} from '../../common-search/common-search.reducer'; @@ -285,6 +269,7 @@ export class ModelsViewEffects { mergeMap(res => { this.lockRefresh = false; const resActions: Action[] = [deactivateLoader('Fetch Models')]; + if (selectedModel) { if (action.hideLoader || action.autoRefresh) { resActions.push(refreshModelInfo(selectedModel.id)); @@ -428,11 +413,6 @@ export class ModelsViewEffects { mergeMap(() => [actions.setTableMode({mode: 'info'})]) )); - setArchiveMode = createEffect(() => this.actions$.pipe( - ofType(actions.setArchive), - switchMap(action => [setProjectArchive(action), setURLParams({isArchived: action.archive, update: true})]) - )); - getReadyFilter(tableFilters) { switch (tableFilters?.ready?.value?.length) { case 0: @@ -512,7 +492,7 @@ export class ModelsViewEffects { const metaColsFilters = metaCols ? flatten(metaCols.map(col => col.getter || col.id)) : []; const only_fields = [...new Set([...MODELS_ONLY_FIELDS, ...colsFilters, ...metaColsFilters])]; const tableFilters = createFiltersFromStore(filters, true); - + delete tableFilters['tags']; return { id: selectedIds, ...tableFilters, @@ -530,7 +510,11 @@ export class ModelsViewEffects { order_by: encodeOrder(orderFields), system_tags: (systemTagsFilter && systemTagsFilter.length > 0) ? systemTagsFilter : [], only_fields, - ...(tagsFilter?.length > 0 && {tags: addExcludeFilters(tagsFilterAnd ? ['__$and', ...tagsFilter] : tagsFilter)}), + ...(tagsFilter?.length > 0 && { + filters: { + tags: getTagsFilters(tagsFilterAnd, tagsFilter), + } + }), ...(frameworkFilter?.length > 0 && {framework: frameworkFilter}), ...(userFilter?.length > 0 && {user: userFilter}), ready: ready !== null ? ready : null @@ -557,8 +541,8 @@ export class ModelsViewEffects { ]), switchMap(([scrollId, projectId, isArchived, metadataCols, gb, orderFields, filters, selectedModels, showAllSelectedIsActive, colsOrder, hiddenCols, cols, deep]) => { const selectedIds = showAllSelectedIsActive ? selectedModels.map(exp => exp.id) : []; - const columns = encodeColumns(MODELS_TABLE_COLS, hiddenCols, metadataCols, colsOrder); - this.setModelsUrlParams(filters, orderFields, isArchived, columns, deep); + // const columns = encodeColumns(MODELS_TABLE_COLS, hiddenCols, metadataCols, colsOrder); + // this.setModelsUrlParams(filters, orderFields, isArchived, columns, deep); return this.apiModels.modelsGetAllEx( this.getGetAllQuery({ refreshScroll, scrollId, projectId, searchQuery: gb, archived: isArchived, @@ -601,7 +585,10 @@ export class ModelsViewEffects { baseUrl = baseUrl.firstChild; } selectedModel ? - this.router.navigate([selectedModel.id, activeChildUrl], {queryParamsHandling: 'preserve', relativeTo: baseUrl}) : + this.router.navigate([selectedModel.id, activeChildUrl], { + queryParamsHandling: 'preserve', + relativeTo: baseUrl + }) : this.router.navigate([], {queryParamsHandling: 'preserve', relativeTo: baseUrl}); } diff --git a/src/app/webapp-common/models/models.component.ts b/src/app/webapp-common/models/models.component.ts index ce8ffa8b..69becc9b 100755 --- a/src/app/webapp-common/models/models.component.ts +++ b/src/app/webapp-common/models/models.component.ts @@ -1,7 +1,5 @@ import {Component, OnDestroy, OnInit, ViewChild} from '@angular/core'; -import {MatDialog} from '@angular/material/dialog'; -import {ActivatedRoute, Params, Router} from '@angular/router'; -import {Store} from '@ngrx/store'; +import {Params} from '@angular/router'; import {isEqual} from 'lodash-es'; import {combineLatest, Observable} from 'rxjs'; import {debounceTime, distinctUntilChanged, filter, map, skip, switchMap, withLatestFrom} from 'rxjs/operators'; @@ -62,7 +60,6 @@ import {CountAvailableAndIsDisableSelectedFiltered, MenuItems} from '../shared/e import {PublishFooterItem} from '../shared/entity-page/footer-items/publish-footer-item'; import {HasReadOnlyFooterItem} from '../shared/entity-page/footer-items/has-read-only-footer-item'; import {SelectedTagsFooterItem} from '../shared/entity-page/footer-items/selected-tags-footer-item'; -import {RefreshService} from '@common/core/services/refresh.service'; import {CompareFooterItem} from '@common/shared/entity-page/footer-items/compare-footer-item'; import {MetricVariantResult} from '~/business-logic/model/projects/metricVariantResult'; import {MetricValueType} from '@common/experiments-compare/experiments-compare.constants'; @@ -87,7 +84,6 @@ export class ModelsComponent extends BaseEntityPageComponent implements OnInit, public isArchived$: Observable; public tableFilters$: Observable<{ [s: string]: FilterMetadata }>; public noMoreModels$: Observable; - public showAllSelectedIsActive$: Observable; public showInfo$: Observable; public activeSectionEdit$: Observable; public selectedProjectId$: Observable; @@ -106,8 +102,8 @@ export class ModelsComponent extends BaseEntityPageComponent implements OnInit, public metricVariants$: Observable; public modelsPage$: Observable; protected inEditMode$: Observable; - protected addTag = addTag; - protected setSplitSizeAction = modelsActions.setSplitSize; + protected override addTag = addTag; + protected override setSplitSizeAction = modelsActions.setSplitSize; protected setTableModeAction = modelsActions.setTableMode; private selectedModels: TableModel[]; private searchQuery$: Observable; @@ -119,14 +115,8 @@ export class ModelsComponent extends BaseEntityPageComponent implements OnInit, @ViewChild('modelsTable') private table: ModelsTableComponent; private modelsFeature = false; - constructor( - protected store: Store, - protected route: ActivatedRoute, - protected router: Router, - protected dialog: MatDialog, - protected refresh: RefreshService, - ) { - super(store, route, router, dialog, refresh); + constructor() { + super(); this.selectSplitSize$ = this.store.select(modelsSelectors.selectSplitSize); this.tableSortFields$ = this.store.select(modelsSelectors.selectTableSortFields); this.selectedModel$ = this.store.select(modelsSelectors.selectSelectedTableModel); @@ -190,7 +180,7 @@ export class ModelsComponent extends BaseEntityPageComponent implements OnInit, this.syncAppSearch(); } - ngOnInit() { + override ngOnInit() { super.ngOnInit(); let prevQueryParams: Params; this.sub.add(this.selectedProject$.pipe(filter(selectedProject => (this.modelsFeature && !selectedProject))).subscribe(() => @@ -205,8 +195,10 @@ export class ModelsComponent extends BaseEntityPageComponent implements OnInit, if (!projectId) { return false; } - const equal = projectId === this.projectId && isEqual(queryParams, prevQueryParams); - prevQueryParams = queryParams; + // eslint-disable-next-line @typescript-eslint/no-unused-vars + const {q, qreg, ...queryParamsWithoutSearch} = queryParams; + const equal = projectId === this.projectId && isEqual(queryParamsWithoutSearch, prevQueryParams); + prevQueryParams = queryParamsWithoutSearch; return !equal; }) ) @@ -214,6 +206,7 @@ export class ModelsComponent extends BaseEntityPageComponent implements OnInit, if (projectId != this.projectId && Object.keys(params || {}).length === 0) { this.emptyUrlInit(); } else { + this.projectId = projectId; if (params.order) { const orders = decodeOrder(params.order); this.store.dispatch(modelsActions.setTableSort({orders, projectId: this.projectId})); @@ -249,7 +242,6 @@ export class ModelsComponent extends BaseEntityPageComponent implements OnInit, } this.store.dispatch(modelsActions.fetchModelsRequested()); } - this.projectId = projectId; }) ); @@ -274,7 +266,7 @@ export class ModelsComponent extends BaseEntityPageComponent implements OnInit, this.store.dispatch(getTags()); } - ngOnDestroy(): void { + override ngOnDestroy(): void { super.ngOnDestroy(); this.store.dispatch(modelsActions.resetState()); this.stopSyncSearch(); @@ -319,7 +311,7 @@ export class ModelsComponent extends BaseEntityPageComponent implements OnInit, project: this.projectId })); } else { - this.store.dispatch(modelsActions.setTableMode({mode: !!id ? 'info' : 'table'})); + this.store.dispatch(modelsActions.setTableMode({mode: id ? 'info' : 'table'})); } return models?.find(model => model.id === id); }), @@ -367,16 +359,6 @@ export class ModelsComponent extends BaseEntityPageComponent implements OnInit, })); } - compareModels() { - // TODO: temporary until the compare component will be under models module... - this.router.navigate( - [ - `${this.route.parent.snapshot.params.projectId}/models/compare-models`, - {ids: this.selectedModels.map(model => model.id)} - ] - ); - } - afterArchiveChanged() { this.store.dispatch(modelsActions.showSelectedOnly({active: false, projectId: this.projectId})); } @@ -394,9 +376,11 @@ export class ModelsComponent extends BaseEntityPageComponent implements OnInit, this.store.dispatch(setAutoRefresh({autoRefresh: $event})); } - columnsReordered(cols: string[], fromUrl = false) { - this.store.dispatch(modelsActions.setColsOrderForProject({cols, project: this.projectId, fromUrl})); - this.store.dispatch(modelsActions.updateUrlParams()); + columnsReordered(cols: string[], updateUrl = true) { + this.store.dispatch(modelsActions.setColsOrderForProject({cols, project: this.projectId})); + if (updateUrl) { + this.store.dispatch(modelsActions.updateUrlParams()); + } } selectedTableColsChanged(col) { @@ -418,9 +402,9 @@ export class ModelsComponent extends BaseEntityPageComponent implements OnInit, return params?.modelId; } - createFooterItems(config: { + override createFooterItems(config: { entitiesType: EntityTypeEnum; - selected$: Observable>; + selected$: Observable; showAllSelectedIsActive$: Observable; tags$: Observable; data$?: Observable>; @@ -446,26 +430,29 @@ export class ModelsComponent extends BaseEntityPageComponent implements OnInit, } onFooterHandler({emitValue, item}) { - switch (item.id) { - case MenuItems.showAllItems: - this.showAllSelected(!emitValue); - break; - case MenuItems.compare: - this.compareExperiments(); - break; - case MenuItems.archive: - this.table.contextMenuExtended.contextMenu.archiveClicked(); - break; - case MenuItems.delete: - this.table.contextMenuExtended.contextMenu.deleteModelPopup(); - break; - case MenuItems.moveTo: - this.table.contextMenuExtended.contextMenu.moveToProjectPopup(); - break; - case MenuItems.publish: - this.table.contextMenuExtended.contextMenu.publishPopup(); - break; - } + this.table.singleRowContext = false; + window.setTimeout(() => { + switch (item.id) { + case MenuItems.showAllItems: + this.showAllSelected(!emitValue); + break; + case MenuItems.compare: + this.compareExperiments(); + break; + case MenuItems.archive: + this.table.contextMenuExtended.contextMenu.archiveClicked(); + break; + case MenuItems.delete: + this.table.contextMenuExtended.contextMenu.deleteModelPopup(); + break; + case MenuItems.moveTo: + this.table.contextMenuExtended.contextMenu.moveToProjectPopup(); + break; + case MenuItems.publish: + this.table.contextMenuExtended.contextMenu.publishPopup(); + break; + } + }); } compareExperiments() { @@ -478,7 +465,7 @@ export class ModelsComponent extends BaseEntityPageComponent implements OnInit, {relativeTo: this.route.parent.parent}); } - clearTableFiltersHandler(tableFilters: any) { + clearTableFiltersHandler(tableFilters: { [s: string]: FilterMetadata }) { const filters = Object.keys(tableFilters).map(col => ({col, value: []})); this.store.dispatch(modelsActions.tableFilterChanged({filters, projectId: this.projectId})); } @@ -515,6 +502,7 @@ export class ModelsComponent extends BaseEntityPageComponent implements OnInit, model: this.selectedModels?.[0] || this.firstModel, project: this.projectId })); + return Promise.resolve() } else { return this.closePanel(); } @@ -546,7 +534,7 @@ export class ModelsComponent extends BaseEntityPageComponent implements OnInit, this.store.dispatch(modelsActions.prepareTableForDownload({entityType: 'model'})); } - setupBreadcrumbsOptions() { + override setupBreadcrumbsOptions() { this.sub.add(this.selectedProject$.pipe( withLatestFrom(this.store.select(selectIsDeepMode)), ).subscribe(([selectedProject, isDeep]) => { diff --git a/src/app/webapp-common/models/reducers/index.ts b/src/app/webapp-common/models/reducers/index.ts index f2513afa..99f64c87 100755 --- a/src/app/webapp-common/models/reducers/index.ts +++ b/src/app/webapp-common/models/reducers/index.ts @@ -1,5 +1,5 @@ import {ActionReducerMap, createSelector} from '@ngrx/store'; -import {IModelsViewState, modelsInitialState, modelsViewReducer} from './models-view.reducer'; +import {ModelsViewState, modelsInitialState, modelsViewReducer} from './models-view.reducer'; import {ModelInfoState, modelsInfoReducer} from './model-info.reducer'; import {SelectedModel} from '../shared/models.model'; import {CountAvailableAndIsDisableSelectedFiltered} from '@common/shared/entity-page/items.utils'; @@ -10,7 +10,7 @@ import {MetricVariantResult} from '~/business-logic/model/projects/metricVariant import {selectSelectedProjectId} from '@common/core/reducers/projects.reducer'; export interface ModelsState { - view: IModelsViewState; + view: ModelsViewState; info: ModelInfoState; } @@ -22,19 +22,19 @@ export const reducers: ActionReducerMap = { const models = (state) => state.models; // view selectors. -export const selectModelsView = createSelector(models, (state): IModelsViewState => state ? state.view : {}); +export const selectModelsView = createSelector(models, (state): ModelsViewState => state ? state.view : {}); export const selectModelsList = createSelector(selectModelsView, (state) => state.models); -export const selectCurrentScrollId = createSelector(selectModelsView, (state): string => state.scrollId); +export const selectCurrentScrollId = createSelector(selectModelsView, (state) => state.scrollId); export const selectGlobalFilter = createSelector(selectModelsView, (state) => state.globalFilter); export const selectTableSortFields = createSelector(selectModelsView, selectSelectedProjectId, (state, projectId) => state.projectColumnsSortOrder[projectId] || modelsInitialState.tableSortFields); export const selectTableFilters = createSelector(selectModelsView, selectSelectedProjectId, (state, projectId) => state.projectColumnFilters?.[projectId] || {}); -export const selectSelectedModels = createSelector(selectModelsView, (state): Array => state.selectedModels); -export const selectSelectedModelsDisableAvailable = createSelector(selectModelsView, (state): Record => state.selectedModelsDisableAvailable); -export const selectSelectedTableModel = createSelector(selectModelsView, (state): SelectedModel => state.selectedModel); -export const selectNoMoreModels = createSelector(selectModelsView, (state): boolean => state.noMoreModels); -export const selectShowAllSelectedIsActive = createSelector(selectModelsView, (state): boolean => state.showAllSelectedIsActive); +export const selectSelectedModels = createSelector(selectModelsView, state => state.selectedModels); +export const selectSelectedModelsDisableAvailable = createSelector(selectModelsView, (state) => state.selectedModelsDisableAvailable); +export const selectSelectedTableModel = createSelector(selectModelsView, (state) => state.selectedModel); +export const selectNoMoreModels = createSelector(selectModelsView, (state) => state.noMoreModels); +export const selectShowAllSelectedIsActive = createSelector(selectModelsView, (state) => state.showAllSelectedIsActive); export const selectModelsTableColsOrder = createSelector(selectModelsView, selectSelectedProjectId, (state, projectId): string[] => (state.colsOrder && projectId) ? state.colsOrder[projectId] : undefined); export const selectModelsFrameworks = createSelector(selectModelsView, (state): Array => state.frameworks); @@ -64,17 +64,17 @@ export const selectMetadataColsForProject = createSelector(selectMetadataColumns hidden: !!hidden[col.id], style: {...col.style, ...(colWidth[col.id] && {width: `${colWidth[col.id]}px`})} } as ISmCol))); -export const selectSplitSize = createSelector(selectModelsView, (state): number => state.splitSize); +export const selectSplitSize = createSelector(selectModelsView, (state) => state.splitSize); export const selectTableMode = createSelector(selectModelsView, state => state.tableMode); // info selectors export const selectModelInfo = createSelector(models, (state): ModelInfoState => state ? state.info : {}); -export const selectSelectedModel = createSelector(selectModelInfo, (state): SelectedModel => state.selectedModel); -export const selectIsModelSaving = createSelector(selectModelInfo, (state): boolean => state.saving); +export const selectSelectedModel = createSelector(selectModelInfo, (state) => state.selectedModel); +export const selectIsModelSaving = createSelector(selectModelInfo, (state) => state.saving); export const selectActiveSectionEdit = createSelector(selectModelInfo, state => state.activeSectionEdit); -export const selectIsModelInEditMode = createSelector(selectModelInfo, (state): boolean => !!state.activeSectionEdit); +export const selectIsModelInEditMode = createSelector(selectModelInfo, (state) => !!state.activeSectionEdit); export const selectModelExperimentsTableFilters = createSelector(selectModelInfo, state => state.modelExperimentsTableFilter); export const selectModelPlots = createSelector(selectModelInfo, state => state.plots); diff --git a/src/app/webapp-common/models/reducers/model-info.reducer.ts b/src/app/webapp-common/models/reducers/model-info.reducer.ts index f99a4490..46a9e2c9 100755 --- a/src/app/webapp-common/models/reducers/model-info.reducer.ts +++ b/src/app/webapp-common/models/reducers/model-info.reducer.ts @@ -3,11 +3,10 @@ import { modelsExperimentsTableClearAllFilters, activateModelEdit, cancelModelEdit, editModel, - getModelInfo, modelDetailsUpdated, resetActiveSection, setSavingModel, - setModelInfo, setPlots + setModelInfo, setPlots, saveMetaData } from '../actions/models-info.actions'; import {TableModel} from '../shared/models.model'; import {cloneDeep} from 'lodash-es'; @@ -16,11 +15,12 @@ import {FilterMetadata} from 'primeng/api/filtermetadata'; import {createReducer, on} from '@ngrx/store'; import {ScalarKeyEnum} from '~/business-logic/model/events/scalarKeyEnum'; import {MetricsPlotEvent} from '~/business-logic/model/events/metricsPlotEvent'; +import {modelSelectionChanged} from '@common/models/actions/models-view.actions'; export interface ModelInfoState { selectedModel: TableModel; activeSectionEdit: boolean; - infoDataFreeze: any; + infoDataFreeze: TableModel; saving: boolean; modelExperiments: ITableExperiment[]; modelExperimentsTableFilter: { [columnId: string]: FilterMetadata }; @@ -43,31 +43,37 @@ const initialState: ModelInfoState = { export const modelsInfoReducer = createReducer( initialState, - on(getModelInfo, (state, action) => ({...state, ...(state.selectedModel?.id !== action.id && {selectedModel: null})})), - on(setModelInfo, (state, action) => ({...state, selectedModel: action.model as TableModel})), - on(modelDetailsUpdated, (state, action) => ({ + on(setModelInfo, (state, action): ModelInfoState => ({ ...state, - selectedModel: {...state.selectedModel, ...action.changes} + selectedModel: action.model as TableModel, + infoDataFreeze: initialState.infoDataFreeze })), - on(activateModelEdit, state => + on(modelDetailsUpdated, (state, action): ModelInfoState => ({ + ...state, + selectedModel: {...state.selectedModel, ...action.changes}, + infoDataFreeze: initialState.infoDataFreeze + })), + on(activateModelEdit, (state): ModelInfoState => ({...state, activeSectionEdit: true, infoDataFreeze: state.selectedModel})), - on(cancelModelEdit, (state) => ({ + on(cancelModelEdit, (state): ModelInfoState => ({ ...state, selectedModel: state.infoDataFreeze ? cloneDeep(state.infoDataFreeze) : state.selectedModel, activeSectionEdit: null })), - on(setSavingModel, (state, action) => ({...state, saving: action.saving})), - on(editModel, (state) => ({...state, activeSectionEdit: null})), - on(resetActiveSection, (state) => ({...state, activeSectionEdit: null})), - on(setPlots, (state, action) => ({...state, plots: action.plots})), - on(modelExperimentsTableFilterChanged, (state, action) => ({ + on(setSavingModel, (state, action): ModelInfoState => ({...state, saving: action.saving})), + on(saveMetaData, (state): ModelInfoState => ({...state, saving: true})), + on(editModel, (state): ModelInfoState => ({...state, activeSectionEdit: null})), + on(resetActiveSection, (state): ModelInfoState => ({...state, activeSectionEdit: null})), + on(setPlots, (state, action): ModelInfoState => ({...state, plots: action.plots})), + on(modelSelectionChanged, (state, ): ModelInfoState => ({...state, selectedModel: initialState.selectedModel })), + on(modelExperimentsTableFilterChanged, (state, action): ModelInfoState => ({ ...state, modelExperimentsTableFilter: { ...state.modelExperimentsTableFilter, [action.filter.col]: {value: action.filter.value, matchMode: action.filter.filterMatchMode} } })), - on(modelsExperimentsTableClearAllFilters, state => + on(modelsExperimentsTableClearAllFilters, (state): ModelInfoState => ({...state, modelExperimentsTableFilter: initialState.modelExperimentsTableFilter,}) ) ); diff --git a/src/app/webapp-common/models/reducers/models-view.reducer.ts b/src/app/webapp-common/models/reducers/models-view.reducer.ts index dc33e32a..d8831fc1 100755 --- a/src/app/webapp-common/models/reducers/models-view.reducer.ts +++ b/src/app/webapp-common/models/reducers/models-view.reducer.ts @@ -9,13 +9,14 @@ import {SortMeta} from 'primeng/api'; import {CountAvailableAndIsDisableSelectedFiltered} from '@common/shared/entity-page/items.utils'; import {setSelectedProject} from '@common/core/actions/projects.actions'; import {MetricVariantResult} from '~/business-logic/model/projects/metricVariantResult'; +import {FilterMetadata} from 'primeng/api/filtermetadata'; -export interface IModelsViewState { +export interface ModelsViewState { splitSize: number; - models: Array; - tableFilters: any; - tempFilters: { [columnId: string]: { value: any; matchMode: string } }; - projectColumnFilters: { [projectId: string]: { [columnId: string]: { value: any; matchMode: string } } }; + models: TableModel[]; + tableFilters: { [s: string]: FilterMetadata }; + tempFilters: { [columnId: string]: FilterMetadata}; + projectColumnFilters: { [projectId: string]: {[columnId: string]: FilterMetadata} }; colsOrder: { [Project: string]: string[] }; tableSortFields: SortMeta[]; projectColumnsSortOrder: { [projectId: string]: SortMeta[] }; @@ -41,7 +42,7 @@ export interface IModelsViewState { tableMode: 'info' | 'table'; } -export const modelsInitialState: IModelsViewState = { +export const modelsInitialState: ModelsViewState = { splitSize: 65, models: null, frameworks: [], @@ -72,22 +73,22 @@ export const modelsInitialState: IModelsViewState = { tableMode: 'table', }; -export const modelsViewReducer = createReducer( +export const modelsViewReducer = createReducer( modelsInitialState, - on(actions.resetState, (state): IModelsViewState => ({ + on(actions.resetState, (state): ModelsViewState => ({ ...state, models: modelsInitialState.models, selectedModel: modelsInitialState.selectedModel, })), - on(setSelectedProject, (state): IModelsViewState => ({...state, selectedModels: modelsInitialState.selectedModels})), - on(actions.addModels, (state, action): IModelsViewState => + on(setSelectedProject, (state): ModelsViewState => ({...state, selectedModels: modelsInitialState.selectedModels})), + on(actions.addModels, (state, action): ModelsViewState => ({...state, models: state.models?.concat(action.models) || null})), - on(actions.removeModels, (state, action): IModelsViewState => + on(actions.removeModels, (state, action): ModelsViewState => ({ ...state, models: state.models?.filter(exp => !action.modelIds.includes(exp.id)) || null })), - on(actions.showSelectedOnly, (state, action): IModelsViewState => + on(actions.showSelectedOnly, (state, action): ModelsViewState => ({ ...state, showAllSelectedIsActive: action.active, @@ -100,7 +101,7 @@ export const modelsViewReducer = createReducer( } }) })), - on(actions.updateModel, (state, action): IModelsViewState => { + on(actions.updateModel, (state, action): ModelsViewState => { const newState = { ...state, models: state.models?.map(ex => ex.id === action.id ? {...ex, ...action.changes} : ex) @@ -113,26 +114,26 @@ export const modelsViewReducer = createReducer( } return newState; }), - on(actions.setModels, (state, action): IModelsViewState => + on(actions.setModels, (state, action): ModelsViewState => ({...state, models: action.models})), - on(actions.setModelsInPlace, (state, action): IModelsViewState => + on(actions.setModelsInPlace, (state, action): ModelsViewState => ({...state, models: state.models?.map(currModel => action.models?.find(newModel => newModel.id === currModel.id)) || null })), - on(actions.setNoMoreModels, (state, action): IModelsViewState => + on(actions.setNoMoreModels, (state, action): ModelsViewState => ({...state, noMoreModels: action.payload})), - on(actions.setCurrentScrollId, (state, action): IModelsViewState => + on(actions.setCurrentScrollId, (state, action): ModelsViewState => ({...state, scrollId: action.scrollId})), - on(actions.setSelectedModels, (state, action): IModelsViewState => + on(actions.setSelectedModels, (state, action): ModelsViewState => ({...state, selectedModels: action.models as unknown as TableModel[]})), - on(actions.setSelectedModelsDisableAvailable, (state, action): IModelsViewState => + on(actions.setSelectedModelsDisableAvailable, (state, action): ModelsViewState => ({...state, selectedModelsDisableAvailable: action.selectedModelsDisableAvailable})), - on(actions.setSelectedModel, (state, action): IModelsViewState => + on(actions.setSelectedModel, (state, action): ModelsViewState => ({...state, selectedModel: action.model})), - on(actions.globalFilterChanged, (state, action): IModelsViewState => + on(actions.globalFilterChanged, (state, action): ModelsViewState => ({...state, globalFilter: action as ReturnType})), - on(actions.resetGlobalFilter, (state): IModelsViewState => + on(actions.resetGlobalFilter, (state): ModelsViewState => ({...state, globalFilter: modelsInitialState.globalFilter})), - on(actions.toggleColHidden, (state, action): IModelsViewState => + on(actions.toggleColHidden, (state, action): ModelsViewState => ({ ...state, hiddenProjectTableCols: { @@ -143,11 +144,11 @@ export const modelsViewReducer = createReducer( } } })), - on(actions.setHiddenCols, (state, action): IModelsViewState => + on(actions.setHiddenCols, (state, action): ModelsViewState => ({...state, hiddenTableCols: action.hiddenCols})), - on(actions.addColumn, (state, action): IModelsViewState => + on(actions.addColumn, (state, action): ModelsViewState => ({...state, metadataCols: [...state.metadataCols, action.col]})), - on(actions.removeCol, (state, action): IModelsViewState => ({ + on(actions.removeCol, (state, action): ModelsViewState => ({ ...state, metadataCols: [...state.metadataCols.filter(tableCol => !(tableCol.key === action.id && tableCol.projectId === action.projectId))], colsOrder: { @@ -155,19 +156,19 @@ export const modelsViewReducer = createReducer( [action.projectId]: state.colsOrder[action.projectId] ? state.colsOrder[action.projectId].filter(colId => colId !== action.id) : null } })), - on(actions.setExtraColumns, (state, action): IModelsViewState => + on(actions.setExtraColumns, (state, action): ModelsViewState => ({ ...state, metadataCols: [...state.metadataCols.filter(tableCol => !(tableCol.projectId === action['projectId'])), ...action['columns']] })), - on(actions.setFrameworks, (state, action): IModelsViewState => + on(actions.setFrameworks, (state, action): ModelsViewState => ({...state, frameworks: action.frameworks})), - on(actions.setTags, (state, action): IModelsViewState => ({...state, projectTags: action.tags})), - on(actions.addProjectTag, (state, action): IModelsViewState => ({...state, projectTags: Array.from(new Set(state.projectTags.concat(action.tag))).sort()})), - on(actions.setMetadataKeys, (state, action): IModelsViewState => ({...state, projectMetadataKeys: action.keys})), - on(actions.setMetadataColValuesOptions, (state, action): IModelsViewState => + on(actions.setTags, (state, action): ModelsViewState => ({...state, projectTags: action.tags})), + on(actions.addProjectTag, (state, action): ModelsViewState => ({...state, projectTags: Array.from(new Set(state.projectTags.concat(action.tag))).sort()})), + on(actions.setMetadataKeys, (state, action): ModelsViewState => ({...state, projectMetadataKeys: action.keys})), + on(actions.setMetadataColValuesOptions, (state, action): ModelsViewState => ({...state, metadataColsOptions: {...state.metadataColsOptions, [action.col.id]: action.values}})), - on(actions.setTableSort, (state, action): IModelsViewState => { + on(actions.setTableSort, (state, action): ModelsViewState => { const colIds = (Object.values(MODELS_TABLE_COL_FIELDS) as string[]).concat(state.metadataCols.map(col => col.id)); let orders = action.orders.filter(order => colIds.includes(order.field)); orders = orders.length > 0 ? orders : null; @@ -179,7 +180,7 @@ export const modelsViewReducer = createReducer( } }; }), - on(actions.setColumnWidth, (state, action): IModelsViewState => ({ + on(actions.setColumnWidth, (state, action): ModelsViewState => ({ ...state, projectColumnsWidth: { ...state.projectColumnsWidth, @@ -189,9 +190,9 @@ export const modelsViewReducer = createReducer( } } })), - on(actions.setColsOrderForProject, (state, action): IModelsViewState => + on(actions.setColsOrderForProject, (state, action): ModelsViewState => ({...state, colsOrder: {...state.colsOrder, [action.project]: action.cols}})), - on(actions.setTableFilters, (state, action): IModelsViewState => ({ + on(actions.setTableFilters, (state, action): ModelsViewState => ({ ...state, projectColumnFilters: { ...state.projectColumnFilters, @@ -199,11 +200,11 @@ export const modelsViewReducer = createReducer( ...action.filters.reduce((obj, filter: TableFilter) => { obj[filter.col] = {value: filter.value, matchMode: filter.filterMatchMode}; return obj; - }, {} as { [columnId: string]: { value: any; matchMode: string } }) + }, {} as { [columnId: string]: FilterMetadata }) } } })), - on(actions.removeMetricCol, (state, action): IModelsViewState => { + on(actions.removeMetricCol, (state, action): ModelsViewState => { // eslint-disable-next-line @typescript-eslint/no-unused-vars const {[action.id]: removedCol, ...remainingColsWidth} = state.projectColumnsWidth[action.projectId] || {}; return { @@ -220,8 +221,14 @@ export const modelsViewReducer = createReducer( } }; }), - on(actions.setSplitSize, (state, action): IModelsViewState => + on(actions.setSplitSize, (state, action): ModelsViewState => ({...state, splitSize: action.splitSize})), - on(actions.setTableMode, (state, action): IModelsViewState => ({...state, tableMode: action.mode})), - on(actions.setCustomMetrics, (state, action): IModelsViewState => ({...state, metricVariants: action.metrics})), + on(actions.setTableMode, (state, action): ModelsViewState => ({...state, tableMode: action.mode})), + on(actions.setCustomMetrics, (state, action): ModelsViewState => ({...state, metricVariants: action.metrics})), + on(actions.updateManyModels, (state, action): ModelsViewState => ({ + ...state, + models: state.models?.map(model => Object.hasOwn(action.changeList, model.id) ? {...model, ...action.changeList[model.id]} : model) ?? null, + ...(Object.hasOwn(action.changeList, state.selectedModel?.id) && {selectedModel: {...state.selectedModel, ...action.changeList[state.selectedModel.id]}}), + selectedModels: state.selectedModels.map(model => Object.hasOwn(action.changeList, model.id) ? {...model, ...action.changeList[model.id]} : model), + })), ); diff --git a/src/app/webapp-common/models/shared/models-table/models-table.component.html b/src/app/webapp-common/models/shared/models-table/models-table.component.html index 7bd0d728..25cfa357 100755 --- a/src/app/webapp-common/models/shared/models-table/models-table.component.html +++ b/src/app/webapp-common/models/shared/models-table/models-table.component.html @@ -19,6 +19,7 @@ >
@@ -180,7 +181,7 @@ [status]="model?.ready? 'published': 'created'"> + inputClassName="table-check-box table-body"> diff --git a/src/app/webapp-common/models/shared/models-table/models-table.component.scss b/src/app/webapp-common/models/shared/models-table/models-table.component.scss index ae46fee9..d9fd2ffa 100755 --- a/src/app/webapp-common/models/shared/models-table/models-table.component.scss +++ b/src/app/webapp-common/models/shared/models-table/models-table.component.scss @@ -29,9 +29,11 @@ .checkbox-col { display: block; + position: relative; + z-index: 1; float: left; padding: 13px 0 13px 26px; - margin-left: -8px; + margin-left: -12px; &:not(.header) { padding-right: 24px; @@ -50,6 +52,7 @@ .compact-columns-data { color: $blue-250; + font-size: 12px; } sm-table-card-filter-template { diff --git a/src/app/webapp-common/models/shared/models-table/models-table.component.ts b/src/app/webapp-common/models/shared/models-table/models-table.component.ts index 9b2e415e..f9e4a2a4 100755 --- a/src/app/webapp-common/models/shared/models-table/models-table.component.ts +++ b/src/app/webapp-common/models/shared/models-table/models-table.component.ts @@ -53,7 +53,7 @@ export class ModelsTableComponent extends BaseTableView { readonly modelsReadyOptions = Object.entries(MODELS_READY_LABELS).map(([key, val]) => ({label: val, value: key})); readonly timeFormatString = TIME_FORMAT_STRING; - public filtersOptions: { [colId: string]: IOption[] } = { + public override filtersOptions: { [colId: string]: IOption[] } = { [MODELS_TABLE_COL_FIELDS.FRAMEWORK]: [], [MODELS_TABLE_COL_FIELDS.READY]: this.modelsReadyOptions, [MODELS_TABLE_COL_FIELDS.USER]: [], @@ -99,7 +99,7 @@ export class ModelsTableComponent extends BaseTableView { } @Input() noMoreModels: boolean; - @Input() reorderableColumns: boolean = true; + @Input() reorderableColumns = true; @Input() set tableCols(tableCols: ISmCol[]) { if (tableCols?.length > 0) { @@ -132,7 +132,6 @@ export class ModelsTableComponent extends BaseTableView { this.filtersOptions[MODELS_TABLE_COL_FIELDS.PROJECT] = projects.map(project => ({ label: project.name, value: project.id, - tooltip: `${project.name}` })); this.sortOptionsList(MODELS_TABLE_COL_FIELDS.PROJECT); } @@ -211,7 +210,7 @@ export class ModelsTableComponent extends BaseTableView { @Input() set metadataValuesOptions(metadataValuesOptions: Record) { Object.entries(metadataValuesOptions).forEach(([id, values]) => { - this.filtersOptions[id] = [{label: '(No Value)', value: null}].concat(values.map(value => ({ + this.filtersOptions[id] = values === null ? null : [{label: '(No Value)', value: null}].concat(values.map(value => ({ label: value, value }))); @@ -251,7 +250,7 @@ export class ModelsTableComponent extends BaseTableView { @Output() columnResized = new EventEmitter<{ columnId: string; widthPx: number }>(); @Output() clearAllFilters = new EventEmitter<{ [s: string]: FilterMetadata }>(); - @ViewChild(TableComponent, {static: true}) table: TableComponent; + @ViewChild(TableComponent, {static: true}) override table: TableComponent; @ViewChild('contextMenuExtended') contextMenuExtended: ModelMenuExtendedComponent; public readonly initialColumns = MODELS_TABLE_COLS; @@ -300,7 +299,7 @@ export class ModelsTableComponent extends BaseTableView { const addList = this.getSelectionRange(change, model); this.modelsSelectionChanged.emit([...this.selectedModels, ...addList]); } else { - const removeList = this.getDeselectionRange(change, model as any); + const removeList = this.getDeselectionRange(change, model); this.modelsSelectionChanged.emit(this.selectedModels.filter((selectedModel) => !removeList.includes(selectedModel.id))); } @@ -310,7 +309,7 @@ export class ModelsTableComponent extends BaseTableView { this.store.dispatch(selectAllModels({filtered})); } - emitSelection(selection: any[]) { + emitSelection(selection: SelectedModel[]) { this.modelsSelectionChanged.emit(selection); } @@ -323,7 +322,7 @@ export class ModelsTableComponent extends BaseTableView { this.filtersOptions[MODELS_TABLE_COL_FIELDS.TAGS] = []; } - tableRowClicked(event: { e: MouseEvent; data: TableModel }) { + tableRowClicked(event: { e: Event; data: SelectedModel }) { if (this._selectedModels.some(exp => exp.id === event.data.id)) { this.openContextMenu({e: event.e, rowData: event.data, backdrop: true}); } else { @@ -331,7 +330,7 @@ export class ModelsTableComponent extends BaseTableView { } } - openContextMenu(data: { e: MouseEvent; rowData; single?: boolean; backdrop?: boolean }) { + openContextMenu(data: { e: Event; rowData; single?: boolean; backdrop?: boolean }) { if (!this.modelsSelectionChanged.observed) { return; } diff --git a/src/app/webapp-common/models/shared/models.const.ts b/src/app/webapp-common/models/shared/models.const.ts index 57e32253..360ef58b 100755 --- a/src/app/webapp-common/models/shared/models.const.ts +++ b/src/app/webapp-common/models/shared/models.const.ts @@ -38,5 +38,5 @@ export const MODEL_TAGS = { }; -export const MODELS_ONLY_FIELDS = ['company', 'created', 'last_update', 'framework', 'id', 'labels', 'name', 'ready', 'tags', 'system_tags', 'task.name', 'uri', 'user.name', 'parent', 'comment', 'project.name']; -export const MODELS_INFO_ONLY_FIELDS = ['company', 'created', 'last_update', 'framework', 'id', 'labels', 'name', 'ready', 'tags', 'system_tags', 'task.name', 'task.project', 'uri', 'user.name', 'parent', 'comment', 'project.name', 'design', 'metadata']; +export const MODELS_ONLY_FIELDS = ['company', 'created','last_change' ,'last_update', 'framework', 'id', 'labels', 'name', 'ready', 'tags', 'system_tags', 'task.name', 'uri', 'user.name', 'parent', 'comment', 'project.name']; +export const MODELS_INFO_ONLY_FIELDS = ['company', 'created','last_change' ,'last_update', 'framework', 'id', 'labels', 'name', 'ready', 'tags', 'system_tags', 'task.name', 'task.project', 'uri', 'user.name', 'parent', 'comment', 'project.name', 'design', 'metadata']; diff --git a/src/app/webapp-common/models/shared/models.model.ts b/src/app/webapp-common/models/shared/models.model.ts index 592f8acd..c5125781 100755 --- a/src/app/webapp-common/models/shared/models.model.ts +++ b/src/app/webapp-common/models/shared/models.model.ts @@ -1,12 +1,13 @@ //table -import {Model} from '../../../business-logic/model/models/model'; -import {User} from '../../../business-logic/model/users/user'; -import {Task} from '../../../business-logic/model/tasks/task'; -import {Project} from '../../../business-logic/model/projects/project'; +import {Model} from '~/business-logic/model/models/model'; +import {User} from '~/business-logic/model/users/user'; +import {Task} from '~/business-logic/model/tasks/task'; +import {Project} from '~/business-logic/model/projects/project'; export type ModelTableColFieldsEnum = 'system_tags' | 'id' | 'project.name' | 'name' | 'created' | 'framework' | 'user.name' | 'ready' | 'task.name' | 'selected' | 'last_update'; -export interface SelectedModel extends Omit { +export interface SelectedModel extends Omit { + id: string; user?: User; company?: any; task?: Task; diff --git a/src/app/webapp-common/nested-project-view/nested-card/nested-card.component.html b/src/app/webapp-common/nested-project-view/nested-card/nested-card.component.html index c008ab26..d2c135da 100644 --- a/src/app/webapp-common/nested-project-view/nested-card/nested-card.component.html +++ b/src/app/webapp-common/nested-project-view/nested-card/nested-card.component.html @@ -4,6 +4,7 @@ [isFolder]="true" [oneTabMode]="!(project?.sub_projects?.length>0)" [subFolderTitle]="project?.sub_projects?.length + ' sub projects'" + data-id="projectCard" >
diff --git a/src/app/webapp-common/nested-project-view/nested-project-view-page/nested-project-view-page.component.scss b/src/app/webapp-common/nested-project-view/nested-project-view-page/nested-project-view-page.component.scss index c9d6220a..f5f721fe 100644 --- a/src/app/webapp-common/nested-project-view/nested-project-view-page/nested-project-view-page.component.scss +++ b/src/app/webapp-common/nested-project-view/nested-project-view-page/nested-project-view-page.component.scss @@ -1,4 +1,5 @@ @import "variables"; +@import "empty"; :host { display: block; @@ -44,40 +45,7 @@ margin-bottom: -12px; } - - .empty-state { - width: 100%; - grid-column: 1/-1; - display: flex; - flex-direction: column; - height: 100%; - max-width: map-get($grid-max-widths, xl); - margin: 0 auto; - - .title-icon { - color: $blue-600; - text-align: center; - margin-bottom: 24px; - } - - .title { - font-size: 20px; - font-weight: 500; - color: $blue-100; - margin-bottom: 6px; - text-align: center; - } - - .sub-title { - text-align: center; - margin-bottom: 64px; - - .link { - color: $neon-yellow; - } - } - - } + @include empty-card-mixin(); } .content { @@ -93,8 +61,15 @@ flex: 1; flex-direction: column; - a.dark { - color: white; + a { + color: $purple; + &.dark { + color: white; + } + + &:hover { + text-decoration: underline; + } } sm-code-editor { diff --git a/src/app/webapp-common/pipelines-controller/controllers.component.html b/src/app/webapp-common/pipelines-controller/controllers.component.html index c020a3d2..ab7b4166 100644 --- a/src/app/webapp-common/pipelines-controller/controllers.component.html +++ b/src/app/webapp-common/pipelines-controller/controllers.component.html @@ -29,7 +29,7 @@
>; + selected$: Observable>; showAllSelectedIsActive$: Observable; tags$: Observable; data$?: Observable>; @@ -79,20 +68,24 @@ export class ControllersComponent extends ExperimentsComponent implements OnInit ]; } - onFooterHandler({emitValue, item}, entityType?) { - switch (item.id) { - case MenuItems.delete: - this.contextMenu.deleteExperimentPopup(entityType || EntityTypeEnum.controller, true); - break; - case MenuItems.abort: - this.contextMenu.abortControllerPopup(); - break; - default: - super.onFooterHandler({emitValue, item}); - } + override onFooterHandler({emitValue, item}, entityType?) { + this.singleRowContext = false; + + window.setTimeout(() => { + switch (item.id) { + case MenuItems.delete: + this.contextMenu.deleteExperimentPopup(entityType || EntityTypeEnum.controller, true); + break; + case MenuItems.abort: + this.contextMenu.abortControllerPopup(); + break; + default: + super.onFooterHandler({emitValue, item}); + } + }); } - protected getParamId(params) { + protected override getParamId(params) { return params?.controllerId; } @@ -104,17 +97,17 @@ export class ControllersComponent extends ExperimentsComponent implements OnInit this.store.dispatch(removeTag({experiments: [experiment], tag})); } - getSingleSelectedDisableAvailable(experiment) { + override getSingleSelectedDisableAvailable(experiment) { return { ...(super.getSingleSelectedDisableAvailable(experiment)), [MenuItems.continue]: selectionDisabledContinue([experiment]) }; } - downloadTableAsCSV() { + override downloadTableAsCSV() { this.table.table.downloadTableAsCSV(`ClearML ${this.selectedProject.id === '*'? 'All': this.selectedProject?.basename?.substring(0,60)} Pipelines`); } - setupBreadcrumbsOptions() { + override setupBreadcrumbsOptions() { this.sub.add(this.selectedProject$.pipe( withLatestFrom(this.store.select(selectDefaultNestedModeForFeature)) ).subscribe(([selectedProject, defaultNestedModeForFeature]) => { diff --git a/src/app/webapp-common/pipelines-controller/controllers.consts.ts b/src/app/webapp-common/pipelines-controller/controllers.consts.ts index f577dfa7..d59f532a 100644 --- a/src/app/webapp-common/pipelines-controller/controllers.consts.ts +++ b/src/app/webapp-common/pipelines-controller/controllers.consts.ts @@ -36,6 +36,8 @@ export const INITIAL_CONTROLLER_TABLE_COLS: ISmCol[] = [ sortable: true, isParam: true, searchableFilter: true, + asyncFilter: true, + paginatedFilterPageSize: rootProjectsPageSize, header: 'VERSION', style: {width: '200px'}, showInCardFilters: true diff --git a/src/app/webapp-common/pipelines-controller/pipeline-controller-info/pipeline-controller-info.component.html b/src/app/webapp-common/pipelines-controller/pipeline-controller-info/pipeline-controller-info.component.html index 5fd1031f..2f90a539 100644 --- a/src/app/webapp-common/pipelines-controller/pipeline-controller-info/pipeline-controller-info.component.html +++ b/src/app/webapp-common/pipelines-controller/pipeline-controller-info/pipeline-controller-info.component.html @@ -1,14 +1,17 @@ - +
-
@@ -39,7 +42,7 @@
-
+
@@ -56,8 +59,8 @@ (valueChanged)="detailsPanelMode = $event" >
- - + +
@@ -73,9 +76,9 @@
-
+
-

NO CODE

+

NO CODE

diff --git a/src/app/webapp-common/pipelines-controller/pipeline-controller-info/pipeline-controller-info.component.scss b/src/app/webapp-common/pipelines-controller/pipeline-controller-info/pipeline-controller-info.component.scss index b3fa5a39..89cd703a 100644 --- a/src/app/webapp-common/pipelines-controller/pipeline-controller-info/pipeline-controller-info.component.scss +++ b/src/app/webapp-common/pipelines-controller/pipeline-controller-info/pipeline-controller-info.component.scss @@ -83,9 +83,8 @@ $log-header-height: 48px; transform: translateY(-50%) translateX(-50%); display: block; text-align: center; - h3 { - font-weight: 500; - font-size: 14px; + h4 { + color: $blue-250; } .no-output-icon { height: 100px; diff --git a/src/app/webapp-common/pipelines-controller/pipeline-controller-info/pipeline-controller-info.component.ts b/src/app/webapp-common/pipelines-controller/pipeline-controller-info/pipeline-controller-info.component.ts index 6e636b0a..7a9e035b 100644 --- a/src/app/webapp-common/pipelines-controller/pipeline-controller-info/pipeline-controller-info.component.ts +++ b/src/app/webapp-common/pipelines-controller/pipeline-controller-info/pipeline-controller-info.component.ts @@ -1,7 +1,7 @@ import { AfterViewInit, ChangeDetectionStrategy, ChangeDetectorRef, Component, - ElementRef, HostListener, + ElementRef, HostListener, inject, NgZone, OnDestroy, OnInit, @@ -10,8 +10,8 @@ import { ViewChildren } from '@angular/core'; import {DagModelItem} from '@ngneat/dag'; -import {combineLatest, fromEvent, Observable, Subscription} from 'rxjs'; -import {debounceTime, delay, distinctUntilChanged, filter, map, mergeMap, takeUntil, tap, throttleTime} from 'rxjs/operators'; +import {fromEvent, Observable, Subscription} from 'rxjs'; +import {debounceTime, distinctUntilChanged, filter, map, mergeMap, takeUntil, tap, throttleTime} from 'rxjs/operators'; import {Store} from '@ngrx/store'; import {selectSelectedExperiment} from '~/features/experiments/reducers'; import {selectRouterParams} from '../../core/reducers/router-reducer'; @@ -20,18 +20,44 @@ import { getSelectedPipelineStep, setSelectedPipelineStep } from '../../experiments/actions/common-experiments-info.actions'; -import {selectPipelineSelectedStep} from '../../experiments/reducers'; +import {selectPipelineSelectedStepWithFallback} from '../../experiments/reducers'; import {IExperimentInfo} from '~/features/experiments/shared/experiment-info.model'; import {getBoxToBoxArrow} from 'curved-arrows'; import {Ace, edit} from 'ace-builds'; import {TaskStatusEnum} from '~/business-logic/model/tasks/taskStatusEnum'; import {selectScaleFactor} from '@common/core/reducers/view.reducer'; import {DagManagerUnsortedService} from '@common/shared/services/dag-manager-unsorted.service'; +import {TaskTypeEnum} from '~/business-logic/model/tasks/taskTypeEnum'; + +export enum StepStatusEnum { + queued = 'queued', + pending = 'pending', + skipped = 'skipped', + cached = 'cached', + executed = 'executed', + running = 'running', + failed = 'failed', + aborted = 'aborted', + completed = 'completed' +} + +export interface TreeStep { + base_task_id: string, + queue: string, + parents: string[], + executed: string; + status: StepStatusEnum; + job_type: TaskTypeEnum; + job_started: number; + job_ended: number; + job_code_section: string; + job_id: string; +} export interface PipelineItem extends DagModelItem { name: string; id: string; - data: any; + data: TreeStep; } export interface Arrow { @@ -66,17 +92,15 @@ export class PipelineControllerInfoComponent implements OnInit, AfterViewInit, O private aceEditor: Ace.Editor; private sub = new Subscription(); private dragging: boolean; - protected pipelineConfiguration: any; public chartWidth = 0; public arrows: Arrow[]; public diagramRect: DOMRect; public dagModel$: Observable; - public selected$: Observable; + public selected$: Observable; public selectedEntity: PipelineItem; public projectId$: Observable; - private tasksElementsLength$: Observable; - private pipelineController: PipelineItem[]; + protected pipelineController: PipelineItem[]; private skipAutoCenter: boolean; private scale: number; showLog: boolean; @@ -89,6 +113,10 @@ export class PipelineControllerInfoComponent implements OnInit, AfterViewInit, O trackArrows = (index: number, arrow: Arrow) => arrow.path; trackByStepId = (index: number, step) => step.stepId; public maximizeResults: boolean; + protected _dagManager: DagManagerUnsortedService; + protected store: Store; + protected cdr: ChangeDetectorRef; + protected zone: NgZone; @HostListener('document:keydown', ['$event']) onKeyDown(e: KeyboardEvent) { @@ -97,12 +125,12 @@ export class PipelineControllerInfoComponent implements OnInit, AfterViewInit, O } } - constructor( - protected _dagManager: DagManagerUnsortedService, - protected store: Store, - protected cdr: ChangeDetectorRef, - protected zone: NgZone - ) { + constructor() { + this._dagManager = inject(DagManagerUnsortedService); + this.store = inject(Store); + this.cdr = inject(ChangeDetectorRef); + this.zone = inject(NgZone); + this.sub.add(this.store.select(selectRouterParams) .pipe( debounceTime(150), @@ -120,12 +148,7 @@ export class PipelineControllerInfoComponent implements OnInit, AfterViewInit, O this.sub.add(this.store.select(selectScaleFactor).subscribe(factor => this.scale = 100 / factor)); - this.selected$ = combineLatest([ - this.store.select(selectSelectedExperiment), - this.store.select(selectPipelineSelectedStep) - ]).pipe( - map(([selectedPipe, selectedStep]) => selectedStep || selectedPipe) - ); + this.selected$ = this.store.select(selectPipelineSelectedStepWithFallback); this.projectId$ = this.store.select(selectRouterParams) .pipe(map(params => params?.projectId)); @@ -143,22 +166,25 @@ export class PipelineControllerInfoComponent implements OnInit, AfterViewInit, O const width = this.diagramContainer?.nativeElement.getBoundingClientRect().width; this.chartWidth = Math.max(Number.isNaN(width) ? 0 : width, 4000); this.dagModel$ = this._dagManager.dagModel$ - .pipe(filter(model => model?.length > 0), tap((model: any[]) => + .pipe(filter(model => model?.length > 0), tap(model => model.forEach(row => this.chartWidth = Math.max(this.chartWidth, row.length * 300)))); const pipelineObject = this.getTreeObject(task); - this.pipelineController = this.convertPipelineToDagModel(pipelineObject); - this.resetUninitializedRunningFields(); - this._dagManager.setNewItemsArrayAsDagModel(this.pipelineController); - window.setTimeout(() => { - if (!this.skipAutoCenter) { - const element = this.diagramContainer.nativeElement; - element.scroll({left: (element.scrollWidth - element.getBoundingClientRect().width) / 2}); - } - this.removeLines(); - this.drawLines(); - this.cdr.detectChanges(); - }, 0); + this.pipelineController = this.convertPipelineToDagModel(pipelineObject); + this.resetUninitializedRunningFields(); + this._dagManager.setNewItemsArrayAsDagModel(this.pipelineController); + window.setTimeout(() => { + if (!this.skipAutoCenter) { + const element = this.diagramContainer.nativeElement; + element.scroll({left: (element.scrollWidth - element.getBoundingClientRect().width) / 2}); + } + this.removeLines(); + this.drawLines(); + this.cdr.detectChanges(); + }, 0); + if(this.selectedEntity) { + this.selectStep(this.selectedEntity); + } }) ); } @@ -168,7 +194,7 @@ export class PipelineControllerInfoComponent implements OnInit, AfterViewInit, O this.pipelineController.forEach(step => { step.data.job_started = null; step.data.job_ended = null; - step.data.status = 'pending'; + step.data.status = StepStatusEnum.pending; }); } } @@ -181,11 +207,10 @@ export class PipelineControllerInfoComponent implements OnInit, AfterViewInit, O let pipelineObj; try { pipelineObj = JSON.parse(pipeline); - pipelineObj = Object.entries(pipelineObj).reduce((acc, [key, val]: [string, any]) => { + pipelineObj = Object.entries(pipelineObj).reduce((acc, [key, val]: [string, TreeStep]) => { acc[key] = {...val, parents: val.parents.map(parent => `${parent}`)}; return acc; }, {}); - this.pipelineConfiguration = pipelineObj; } catch { return []; } @@ -222,11 +247,6 @@ export class PipelineControllerInfoComponent implements OnInit, AfterViewInit, O } ngAfterViewInit(): void { - this.tasksElementsLength$ = this.tasksElements.changes.pipe( - delay(0), - map((list: QueryList) => list.toArray().length) - ); - this.sub.add(this.aceEditorElements.changes.subscribe(() => this.initAceEditor())); fromEvent(this.diagramContainer.nativeElement, 'wheel') @@ -322,7 +342,12 @@ export class PipelineControllerInfoComponent implements OnInit, AfterViewInit, O if (id) { this.store.dispatch(getSelectedPipelineStep({id})); } else { - this.store.dispatch(setSelectedPipelineStep({step: {id, type: step.data.job_type, status: step.data.status, name: step.name}})); + this.store.dispatch(setSelectedPipelineStep({step: { + id, + type: step.data.job_type, + status: step.data.status as unknown as TaskStatusEnum, + name: step.name + }})); this.showLog = false; } this.selectedEntity = step; diff --git a/src/app/webapp-common/pipelines-controller/pipeline-controller-menu/abort-controller-dialog/abort-controller-dialog.component.ts b/src/app/webapp-common/pipelines-controller/pipeline-controller-menu/abort-controller-dialog/abort-controller-dialog.component.ts index 5c1f45d8..9a1f730f 100644 --- a/src/app/webapp-common/pipelines-controller/pipeline-controller-menu/abort-controller-dialog/abort-controller-dialog.component.ts +++ b/src/app/webapp-common/pipelines-controller/pipeline-controller-menu/abort-controller-dialog/abort-controller-dialog.component.ts @@ -2,7 +2,6 @@ import {MAT_DIALOG_DATA, MatDialogRef} from '@angular/material/dialog'; import {ChangeDetectionStrategy, Component, Inject} from '@angular/core'; import {Store} from '@ngrx/store'; import {ISelectedExperiment} from '~/features/experiments/shared/experiment-info.model'; -import {ITableExperiment} from '@common/experiments/shared/common-experiment-model.model'; @Component({ selector: 'sm-abort-controller-dialog', @@ -12,7 +11,7 @@ import {ITableExperiment} from '@common/experiments/shared/common-experiment-mod }) export class AbortControllerDialogComponent { public experiments: ISelectedExperiment[]; - shouldBeAbortedTasks: ITableExperiment[] = null; + shouldBeAbortedTasks: ISelectedExperiment[] = null; constructor( private store: Store, diff --git a/src/app/webapp-common/pipelines-controller/pipeline-controller-menu/pipeline-controller-menu.component.ts b/src/app/webapp-common/pipelines-controller/pipeline-controller-menu/pipeline-controller-menu.component.ts index 45ed2b75..d5fac995 100755 --- a/src/app/webapp-common/pipelines-controller/pipeline-controller-menu/pipeline-controller-menu.component.ts +++ b/src/app/webapp-common/pipelines-controller/pipeline-controller-menu/pipeline-controller-menu.component.ts @@ -1,11 +1,5 @@ import {Component, ElementRef} from '@angular/core'; import {ExperimentMenuComponent} from '@common/experiments/shared/components/experiment-menu/experiment-menu.component'; -import {BlTasksService} from '~/business-logic/services/tasks.service'; -import {MatDialog} from '@angular/material/dialog'; -import {ActivatedRoute, Router} from '@angular/router'; -import {Store} from '@ngrx/store'; -import {ExperimentInfoState} from '~/features/experiments/reducers/experiment-info.reducer'; -import {ConfigurationService} from '@common/shared/services/configuration.service'; import {selectionDisabledAbort, selectionDisabledContinue} from '@common/shared/entity-page/items.utils'; import * as commonMenuActions from '@common/experiments/actions/common-experiments-menu.actions'; import {RunPipelineControllerDialogComponent} from '../run-pipeline-controller-dialog/run-pipeline-controller-dialog.component'; @@ -22,19 +16,11 @@ import {EntityTypeEnum} from '~/shared/constants/non-common-consts'; export class PipelineControllerMenuComponent extends ExperimentMenuComponent { entityTypeEnum = EntityTypeEnum; - constructor( - protected blTaskService: BlTasksService, - protected dialog: MatDialog, - protected router: Router, - protected store: Store, - protected eRef: ElementRef, - protected configService: ConfigurationService, - protected route?: ActivatedRoute - ) { - super(blTaskService, dialog, router, store, eRef, configService, route); + constructor() { + super(); } - runPipelineController(runNew: boolean = false) { + runPipelineController(runNew = false) { const runPipelineDialog = this.dialog.open(RunPipelineControllerDialogComponent, { data: {task: runNew ? null : this._experiment} }); diff --git a/src/app/webapp-common/pipelines-controller/pipeline-controller-step/pipeline-controller-step.component.html b/src/app/webapp-common/pipelines-controller/pipeline-controller-step/pipeline-controller-step.component.html index 6809889c..6b80e452 100644 --- a/src/app/webapp-common/pipelines-controller/pipeline-controller-step/pipeline-controller-step.component.html +++ b/src/app/webapp-common/pipelines-controller/pipeline-controller-step/pipeline-controller-step.component.html @@ -1,12 +1,12 @@
+ [class.selected]="selected" data-id="stepContainer">
{{step.name}}
- +
-
- +
+
{{runTime | duration}}
diff --git a/src/app/webapp-common/pipelines-controller/pipeline-controller-step/pipeline-controller-step.component.ts b/src/app/webapp-common/pipelines-controller/pipeline-controller-step/pipeline-controller-step.component.ts index 038ef943..84a273b8 100644 --- a/src/app/webapp-common/pipelines-controller/pipeline-controller-step/pipeline-controller-step.component.ts +++ b/src/app/webapp-common/pipelines-controller/pipeline-controller-step/pipeline-controller-step.component.ts @@ -1,26 +1,57 @@ -import {Component, EventEmitter, Input, Output} from '@angular/core'; -import {PipelineItem} from '@common/pipelines-controller/pipeline-controller-info/pipeline-controller-info.component'; -import {TaskStatusEnum} from '~/business-logic/model/tasks/taskStatusEnum'; +import { + ChangeDetectionStrategy, + ChangeDetectorRef, + Component, + EventEmitter, + Input, + OnDestroy, + Output +} from '@angular/core'; +import { + PipelineItem, + StepStatusEnum +} from '@common/pipelines-controller/pipeline-controller-info/pipeline-controller-info.component'; +import {interval, Subscription} from 'rxjs'; @Component({ selector: 'sm-pipeline-controller-step', templateUrl: './pipeline-controller-step.component.html', - styleUrls: ['./pipeline-controller-step.component.scss'] + styleUrls: ['./pipeline-controller-step.component.scss'], + changeDetection: ChangeDetectionStrategy.OnPush }) -export class PipelineControllerStepComponent { +export class PipelineControllerStepComponent implements OnDestroy { protected _step: PipelineItem; public runTime: number; + private timeSub: Subscription; + + constructor(private cdr: ChangeDetectorRef) { } - constructor() { } @Input() set step(step: PipelineItem) { - this._step = {...step, data: {...step.data, status: step.data?.status || 'pending'}}; - this.runTime = step?.data?.job_ended ? step?.data?.job_ended - step?.data?.job_started : - step.data.status === TaskStatusEnum.InProgress ? Date.now() / 1000 - step?.data?.job_started : 0; - }; + this._step = {...step, data: {...step.data, status: step.data?.status || StepStatusEnum.pending}}; + this.timeSub?.unsubscribe(); + if (step?.data?.job_ended) { + this.runTime = step.data.job_ended - step?.data?.job_started; + } else if (step?.data?.job_started && step.data.status === 'running') { + this.timeSub = interval(1000) + .subscribe(() => this.updateRunningTime()) + this.updateRunningTime(); + } else { + this.runTime = null; + } + } get step() { return this._step; } @Input() selected: boolean; @Output() openConsole = new EventEmitter(); + + updateRunningTime() { + this.runTime = (Date.now() / 1000) - this.step.data.job_started; + this.cdr.detectChanges(); + } + + ngOnDestroy(): void { + this.timeSub?.unsubscribe(); + } } diff --git a/src/app/webapp-common/pipelines-controller/pipeline-details/pipeline-info.component.html b/src/app/webapp-common/pipelines-controller/pipeline-details/pipeline-info.component.html index 03ba160f..a0fd45e0 100644 --- a/src/app/webapp-common/pipelines-controller/pipeline-details/pipeline-info.component.html +++ b/src/app/webapp-common/pipelines-controller/pipeline-details/pipeline-info.component.html @@ -1,6 +1,6 @@ -
{{controller ? 'RUN INFO' : 'STEP INFO'}}
+
{{controller ? 'RUN INFO' : 'STEP INFO'}}
@@ -10,7 +10,7 @@ >
{{step.name}}
-
{{step.data.status}}
+
{{step.data.status}}
@@ -67,7 +67,7 @@ -
No data to show
+
No data to show
@@ -76,7 +76,7 @@ class="arr-link" target="_blank" [href]="'/projects/' + project + '/experiments/' + entity?.id + '/output/execution'"> - Full details + Full details diff --git a/src/app/webapp-common/pipelines-controller/pipeline-details/pipeline-info.component.scss b/src/app/webapp-common/pipelines-controller/pipeline-details/pipeline-info.component.scss index c2210bc2..4dc30fc0 100644 --- a/src/app/webapp-common/pipelines-controller/pipeline-details/pipeline-info.component.scss +++ b/src/app/webapp-common/pipelines-controller/pipeline-details/pipeline-info.component.scss @@ -52,7 +52,7 @@ .key { flex: 1 1 0; - color: $blue-grey; + color: $blue-300; margin-right: 12px; overflow: hidden; text-overflow: ellipsis; diff --git a/src/app/webapp-common/pipelines-controller/pipeline-details/pipeline-info.component.ts b/src/app/webapp-common/pipelines-controller/pipeline-details/pipeline-info.component.ts index bc346b5a..90c2615f 100644 --- a/src/app/webapp-common/pipelines-controller/pipeline-details/pipeline-info.component.ts +++ b/src/app/webapp-common/pipelines-controller/pipeline-details/pipeline-info.component.ts @@ -1,12 +1,16 @@ import {Component, Input} from '@angular/core'; import {Store} from '@ngrx/store'; import {Artifact} from '~/business-logic/model/tasks/artifact'; -import {Task} from '~/business-logic/model/tasks/task'; -import {PipelineItem} from '@common/pipelines-controller/pipeline-controller-info/pipeline-controller-info.component'; +import { + PipelineItem, + StepStatusEnum, + TreeStep +} from '@common/pipelines-controller/pipeline-controller-info/pipeline-controller-info.component'; import {TaskTypeEnum} from '~/business-logic/model/tasks/taskTypeEnum'; import {addMessage} from '@common/core/actions/layout.actions'; -import { fileSizeConfigStorage } from '@common/shared/pipes/filesize.pipe'; +import {fileSizeConfigStorage} from '@common/shared/pipes/filesize.pipe'; import {MESSAGES_SEVERITY} from '@common/constants'; +import {IExperimentInfo} from '~/features/experiments/shared/experiment-info.model'; @Component({ selector: 'sm-pipeline-info', @@ -14,12 +18,12 @@ import {MESSAGES_SEVERITY} from '@common/constants'; styleUrls: ['./pipeline-info.component.scss'] }) export class PipelineInfoComponent { - private _entity: Task; + private _entity: IExperimentInfo; public controller: boolean; public fileSizeConfigStorage = fileSizeConfigStorage; - private _step: { branchPath: number; data: any; name: string; stepId: number; parentIds: number[]; id: string }; + private _step: { branchPath: number; data: TreeStep; name: string; stepId: number; parentIds: number[]; id: string }; - @Input() set entity(task: Task) { + @Input() set entity(task: IExperimentInfo) { this._entity = task; this.controller = task?.type === TaskTypeEnum.Controller; } @@ -28,8 +32,8 @@ export class PipelineInfoComponent { } @Input() set step(step: PipelineItem) { - this._step = step ? {...step, data: {...step.data, status: step.data?.status || 'pending'}} : null; - }; + this._step = step ? {...step, data: {...step.data, status: step.data?.status || StepStatusEnum.pending}} : null; + } get step() { return this._step; diff --git a/src/app/webapp-common/pipelines-controller/run-pipeline-controller-dialog/run-pipeline-controller-dialog.component.html b/src/app/webapp-common/pipelines-controller/run-pipeline-controller-dialog/run-pipeline-controller-dialog.component.html index f06db1d5..d48dca30 100644 --- a/src/app/webapp-common/pipelines-controller/run-pipeline-controller-dialog/run-pipeline-controller-dialog.component.html +++ b/src/app/webapp-common/pipelines-controller/run-pipeline-controller-dialog/run-pipeline-controller-dialog.component.html @@ -2,6 +2,7 @@ [pageHeader]="title" iconClass="al-color blue-300 al-ico-pipelines"> +
Parameters
{{param.name}}
@@ -25,22 +26,27 @@
-
-
Advanced configuration
- -
-
-
Pipeline controller queue
- - +
Configuration
+
+
Pipeline controller queue*
+ - + [matAutocomplete]="auto" + required + data-id="queueFiled"> +
@@ -50,10 +56,10 @@
- -
diff --git a/src/app/webapp-common/pipelines-controller/run-pipeline-controller-dialog/run-pipeline-controller-dialog.component.scss b/src/app/webapp-common/pipelines-controller/run-pipeline-controller-dialog/run-pipeline-controller-dialog.component.scss index 58b386ea..f322ac24 100644 --- a/src/app/webapp-common/pipelines-controller/run-pipeline-controller-dialog/run-pipeline-controller-dialog.component.scss +++ b/src/app/webapp-common/pipelines-controller/run-pipeline-controller-dialog/run-pipeline-controller-dialog.component.scss @@ -27,6 +27,7 @@ width: 180px; font-size: 12px; } + .mat-mdc-form-field{ width: 340px; &.hidden{ @@ -34,7 +35,8 @@ } } } - .search-icon { - transform: translateY(3px); + + .error { + color: $error-color } } diff --git a/src/app/webapp-common/pipelines-controller/run-pipeline-controller-dialog/run-pipeline-controller-dialog.component.ts b/src/app/webapp-common/pipelines-controller/run-pipeline-controller-dialog/run-pipeline-controller-dialog.component.ts index 2e838c89..ad6666c5 100644 --- a/src/app/webapp-common/pipelines-controller/run-pipeline-controller-dialog/run-pipeline-controller-dialog.component.ts +++ b/src/app/webapp-common/pipelines-controller/run-pipeline-controller-dialog/run-pipeline-controller-dialog.component.ts @@ -27,7 +27,6 @@ export class RunPipelineControllerDialogComponent implements OnInit, OnDestroy { public title: string; public params: any; public task: IExperimentInfo; - public chooseCustomQueue: boolean = false; private queuesSub: Subscription; private baseControllerSub: Subscription; private selectedQueueSub: Subscription; @@ -59,7 +58,7 @@ export class RunPipelineControllerDialogComponent implements OnInit, OnDestroy { }); this.selectedQueueSub = combineLatest([this.baseController$, this.queues$]) .pipe(filter(([baseController, queues]) => !!baseController && queues?.length > 0)).subscribe(([baseController, queues]) => { - this.selectedQueue = queues.find(queue => baseController.execution?.queue?.id === queue?.id) || queues[0]; + this.selectedQueue = queues.find(queue => baseController.execution?.queue?.id === queue?.id) || null; }); } @@ -78,15 +77,8 @@ export class RunPipelineControllerDialogComponent implements OnInit, OnDestroy { this.store.dispatch(setControllerForStartPipelineDialog({task: null})); } - changeChooseCustomQueue() { - this.chooseCustomQueue = !this.chooseCustomQueue; - if (!this.chooseCustomQueue) { - this.selectedQueue = this.queues.find(queue => this.task.execution?.queue?.id === queue?.id) || this.queues[0]; - } - } - getTitle() { - const version = this.task?.hyperparams?.properties?.version.value; + const version = this.task?.hyperparams?.properties?.version?.value; if (version) { return `${this.task.name} v${version}`; } @@ -95,6 +87,6 @@ export class RunPipelineControllerDialogComponent implements OnInit, OnDestroy { displayFn = (entityObj: { name: string; id: string }) => entityObj?.name ?? ''; - isFocused = (locationRef: HTMLInputElement) => document.activeElement === locationRef + isFocused = (locationRef: HTMLInputElement) => document.activeElement === locationRef; } diff --git a/src/app/webapp-common/pipelines/nested-pipeline-page/nested-pipeline-page.component.ts b/src/app/webapp-common/pipelines/nested-pipeline-page/nested-pipeline-page.component.ts index 00cca677..ef8a5f61 100644 --- a/src/app/webapp-common/pipelines/nested-pipeline-page/nested-pipeline-page.component.ts +++ b/src/app/webapp-common/pipelines/nested-pipeline-page/nested-pipeline-page.component.ts @@ -24,9 +24,13 @@ export class NestedPipelinePageComponent extends PipelinesPageComponent { entityTypeEnum = ProjectTypeEnum; circleTypeEnum = CircleTypeEnum; hideMenu = false; - entityType = ProjectTypeEnum.pipelines; - projectCardClicked(data: { hasSubProjects: boolean; id: string; name: string }) { + constructor() { + super(); + this.entityType = ProjectTypeEnum.pipelines; + } + + override projectCardClicked(data: { hasSubProjects: boolean; id: string; name: string }) { if (data.hasSubProjects) { this.router.navigate([data.id, 'projects'], {relativeTo: this.route.parent?.parent}); } else { @@ -38,7 +42,7 @@ export class NestedPipelinePageComponent extends PipelinesPageComponent { this.store.dispatch(showExamplePipelines()); } - toggleNestedView(nested: boolean) { + override toggleNestedView(nested: boolean) { this.store.dispatch(setDefaultNestedModeForFeature({feature: this.entityType, isNested: nested})); if (!nested) { this.router.navigateByUrl(this.entityType); diff --git a/src/app/webapp-common/pipelines/pipeline-card/pipeline-card.component.html b/src/app/webapp-common/pipelines/pipeline-card/pipeline-card.component.html index a1be30a2..2be69b39 100644 --- a/src/app/webapp-common/pipelines/pipeline-card/pipeline-card.component.html +++ b/src/app/webapp-common/pipelines/pipeline-card/pipeline-card.component.html @@ -48,10 +48,15 @@ (rename)="editName.inlineActivated()" (addTag)="addTag.emit($event)" (delete)="delete.emit()" + data-id="pipelineCardMenu" >
-
Last - run {{project.stats?.active?.last_task_run | timeAgo}}
+ Last run {{project.stats?.active?.last_task_run | timeAgo}}
No pipeline runs yet
 diff --git a/src/app/webapp-common/pipelines/pipeline-card/pipeline-card.component.ts b/src/app/webapp-common/pipelines/pipeline-card/pipeline-card.component.ts index 6835e818..a34eb89e 100644 --- a/src/app/webapp-common/pipelines/pipeline-card/pipeline-card.component.ts +++ b/src/app/webapp-common/pipelines/pipeline-card/pipeline-card.component.ts @@ -1,4 +1,5 @@ import {Component, EventEmitter, Input, Output} from '@angular/core'; +import {TIME_FORMAT_STRING} from '@common/constants'; import {ProjectCardComponent} from '@common/shared/ui-components/panel/project-card/project-card.component'; import {trackById} from '@common/shared/utils/forms-track-by'; @@ -13,5 +14,6 @@ export class PipelineCardComponent extends ProjectCardComponent { @Output() addTag = new EventEmitter(); @Output() removeTag = new EventEmitter(); @Output() delete = new EventEmitter(); - trackById = trackById; + protected readonly TIME_FORMAT_STRING = TIME_FORMAT_STRING; + timeFormatString = TIME_FORMAT_STRING; } diff --git a/src/app/webapp-common/pipelines/pipelines-page/pipelines-empty-state/pipelines-empty-state.component.scss b/src/app/webapp-common/pipelines/pipelines-page/pipelines-empty-state/pipelines-empty-state.component.scss index 632bfa82..5053ebc3 100644 --- a/src/app/webapp-common/pipelines/pipelines-page/pipelines-empty-state/pipelines-empty-state.component.scss +++ b/src/app/webapp-common/pipelines/pipelines-page/pipelines-empty-state/pipelines-empty-state.component.scss @@ -1,3 +1,6 @@ +@import "variables"; + + .content { width: 100%; display: flex; @@ -11,8 +14,15 @@ flex: 1; flex-direction: column; - a.dark { - color: white; + a { + color: $purple; + &.dark { + color: white; + } + + &:hover { + text-decoration: underline; + } } sm-code-editor { @@ -36,4 +46,4 @@ height: 440px; } } -} \ No newline at end of file +} diff --git a/src/app/webapp-common/pipelines/pipelines-page/pipelines-page.component.html b/src/app/webapp-common/pipelines/pipelines-page/pipelines-page.component.html index ab8501dd..d64d7195 100644 --- a/src/app/webapp-common/pipelines/pipelines-page/pipelines-page.component.html +++ b/src/app/webapp-common/pipelines/pipelines-page/pipelines-page.component.html @@ -46,7 +46,7 @@
-
+
NO PIPELINES TO SHOW
Run your first pipeline to see it displayed here diff --git a/src/app/webapp-common/pipelines/pipelines-page/pipelines-page.component.scss b/src/app/webapp-common/pipelines/pipelines-page/pipelines-page.component.scss index 5d5be051..2e623ae6 100644 --- a/src/app/webapp-common/pipelines/pipelines-page/pipelines-page.component.scss +++ b/src/app/webapp-common/pipelines/pipelines-page/pipelines-page.component.scss @@ -1,4 +1,5 @@ @import "variables"; +@import "empty"; :host { display: block; @@ -23,36 +24,5 @@ } - .empty-pipelines { - width: 100%; - grid-column: 1/-1; - display: flex; - flex-direction: column; - height: 100%; - max-width: map-get($grid-max-widths, xl); - margin: 0 auto; - - .title-icon { - color: $blue-600; - text-align: center; - margin-bottom: 24px; - } - .title { - font-size: 20px; - font-weight: 500; - color: $blue-100; - margin-bottom: 6px; - text-align: center; - } - - .sub-title { - text-align: center; - margin-bottom: 64px; - - .link { - color: $neon-yellow; - } - } - - } + @include empty-card-mixin(); } diff --git a/src/app/webapp-common/pipelines/pipelines-page/pipelines-page.component.ts b/src/app/webapp-common/pipelines/pipelines-page/pipelines-page.component.ts index 694341a5..9147d319 100644 --- a/src/app/webapp-common/pipelines/pipelines-page/pipelines-page.component.ts +++ b/src/app/webapp-common/pipelines/pipelines-page/pipelines-page.component.ts @@ -30,7 +30,7 @@ import {EntityTypeEnum} from '~/shared/constants/non-common-consts'; import { PipelinesEmptyStateComponent } from '@common/pipelines/pipelines-page/pipelines-empty-state/pipelines-empty-state.component'; -import {debounceTime, withLatestFrom} from 'rxjs/operators'; +import {debounceTime, skip, withLatestFrom} from 'rxjs/operators'; import {ProjectTypeEnum} from '@common/nested-project-view/nested-project-view-page/nested-project-view-page.component'; @Component({ @@ -74,7 +74,7 @@ if __name__ == '__main__': private mainPageFilterSub: Subscription; public isNested$: Observable; - ngOnInit() { + override ngOnInit() { super.ngOnInit(); this.store.dispatch(getProjectsTags({entity: this.getName()})); this.showExamples$ = this.store.select(selectShowPipelineExamples); @@ -82,7 +82,7 @@ if __name__ == '__main__': this.mainPageFilterSub = combineLatest([ this.store.select(selectMainPageTagsFilter), this.store.select(selectMainPageTagsFilterMatchMode) - ]).pipe(debounceTime(0)) + ]).pipe(debounceTime(0), skip(1)) .subscribe(() => { this.store.dispatch(resetProjects()); this.store.dispatch(getAllProjectsPageProjects()); @@ -90,7 +90,7 @@ if __name__ == '__main__': } - ngOnDestroy() { + override ngOnDestroy() { super.ngOnDestroy(); this.headerUserFocusSub?.unsubscribe(); this.mainPageFilterSub.unsubscribe(); @@ -109,20 +109,20 @@ if __name__ == '__main__': } // eslint-disable-next-line @typescript-eslint/no-unused-vars - protected getExtraProjects(selectedProjectId, selectedProject) { + protected override getExtraProjects(selectedProjectId, selectedProject) { return []; } - public projectCardClicked(project: ProjectsGetAllResponseSingle) { + public override projectCardClicked(project: ProjectsGetAllResponseSingle) { this.router.navigate([project.id, 'experiments'], {relativeTo: this.projectId ? this.route.parent.parent.parent : this.route}); this.store.dispatch(setSelectedProjectId({projectId: project.id, example: isExample(project)})); } - protected getName() { + protected override getName() { return EntityTypeEnum.pipeline; } - protected getDeletePopupEntitiesList() { + protected override getDeletePopupEntitiesList() { return 'run'; } @@ -140,12 +140,12 @@ if __name__ == '__main__': this.store.dispatch(showExamplePipelines()); } - shouldReRoute(selectedProject, config) { + override shouldReRoute(selectedProject, config) { const relevantSubProjects = selectedProject?.sub_projects?.filter(proj => proj.name.includes('.pipelines')); return config[2] === 'projects' && selectedProject.id !== '*' && (relevantSubProjects?.every(subProject => subProject.name.startsWith(selectedProject.name + '/.'))); - }; + } - noProjectsReRoute() { + override noProjectsReRoute() { return this.router.navigate(['..', 'pipelines'], {relativeTo: this.route}); } @@ -159,7 +159,7 @@ if __name__ == '__main__': } } - setupBreadcrumbsOptions() { + override setupBreadcrumbsOptions() { this.subs.add(this.selectedProject$.pipe( withLatestFrom(this.store.select(selectDefaultNestedModeForFeature)) ).subscribe(([selectedProject, defaultNestedModeForFeature]) => { diff --git a/src/app/webapp-common/project-info/conteiners/project-stats/project-stats.component.ts b/src/app/webapp-common/project-info/conteiners/project-stats/project-stats.component.ts index 8aa5b4cf..0de7d38b 100644 --- a/src/app/webapp-common/project-info/conteiners/project-stats/project-stats.component.ts +++ b/src/app/webapp-common/project-info/conteiners/project-stats/project-stats.component.ts @@ -30,7 +30,7 @@ import { } from '@common/project-info/conteiners/metric-for-stats-dialog/metric-for-stats-dialog.component'; import {MetricValueType} from '@common/experiments-compare/experiments-compare.constants'; import {ScatterPlotComponent} from '@common/shared/components/charts/scatter-plot/scatter-plot.component'; -import tinycolor from 'tinycolor2'; +import { TinyColor } from '@ctrl/tinycolor'; @Component({ selector: 'sm-project-stats', @@ -171,7 +171,7 @@ export class ProjectStatsComponent implements OnInit, OnDestroy { break; } if (hidden) { - return tinycolor(color).darken(30).toHexString(); + return new TinyColor(color).darken(30).toHexString(); } return color; } diff --git a/src/app/webapp-common/project-info/project-info.component.ts b/src/app/webapp-common/project-info/project-info.component.ts index c42ffaf5..98a45d77 100644 --- a/src/app/webapp-common/project-info/project-info.component.ts +++ b/src/app/webapp-common/project-info/project-info.component.ts @@ -49,12 +49,12 @@ export class ProjectInfoComponent implements OnInit, OnDestroy { this.info = project.description; this.projectId = project.id; this.loading = false; - this.cdr.detectChanges(); + this.cdr.markForCheck(); }); this.selectedVariantSub = this.store.select(selectSelectedMetricVariantForCurrProject).pipe(filter(data => !!data), take(1)) .subscribe(() => { this.setMetricsPanel(true); - this.cdr.detectChanges(); + this.cdr.markForCheck(); }); this.setupBreadcrumbsOptions(); } diff --git a/src/app/webapp-common/projects/common-projects.actions.ts b/src/app/webapp-common/projects/common-projects.actions.ts index 291ac22f..7d1b10e9 100755 --- a/src/app/webapp-common/projects/common-projects.actions.ts +++ b/src/app/webapp-common/projects/common-projects.actions.ts @@ -19,7 +19,7 @@ export const setProjectsOrderBy = createAction( ); export const setProjectsSearchQuery = createAction( PROJECTS_PREFIX + 'SET_SEARCH_QUERY', - props<{query: string; regExp?: boolean}>() + props<{query: string; regExp?: boolean, skipGetAll?: boolean}>() ); export const resetProjectsSearchQuery = createAction(PROJECTS_PREFIX + 'RESET_SEARCH_QUERY'); export const addToProjectsList = createAction( diff --git a/src/app/webapp-common/projects/common-projects.effects.ts b/src/app/webapp-common/projects/common-projects.effects.ts index 746035fc..6d153468 100755 --- a/src/app/webapp-common/projects/common-projects.effects.ts +++ b/src/app/webapp-common/projects/common-projects.effects.ts @@ -40,19 +40,19 @@ import { } from '../core/reducers/projects.reducer'; import {forkJoin, of} from 'rxjs'; import {Project} from '~/business-logic/model/projects/project'; -import { - setMainPageTagsFilter, - setMainPageTagsFilterMatchMode, - setSelectedProjectStats -} from '../core/actions/projects.actions'; +import {setSelectedProjectStats} from '../core/actions/projects.actions'; import {ActivatedRoute} from '@angular/router'; import {ProjectsUpdateResponse} from '~/business-logic/model/projects/projectsUpdateResponse'; import {setFilterByUser} from '@common/core/actions/users.actions'; import {escapeRegex} from '@common/shared/utils/escape-regex'; -import {addExcludeFilters} from '../shared/utils/tableParamEncode'; import {isPipelines, isReports} from './common-projects.utils'; -import {getFeatureProjectRequest, getSelfFeatureProjectRequest, isDatasets} from '~/features/projects/projects-page.utils'; +import { + getFeatureProjectRequest, + getSelfFeatureProjectRequest, + isDatasets +} from '~/features/projects/projects-page.utils'; import {TaskTypeEnum} from '~/business-logic/model/tasks/taskTypeEnum'; +import {getTagsFilters} from '@common/shared/utils/tableParamEncode'; @Injectable() export class CommonProjectsEffects { @@ -138,66 +138,92 @@ export class CommonProjectsEffects { if (projectsView && !showHidden) { statsFilter = {system_tags: ['-pipeline', '-dataset', '-Annotation', '-report']}; } - return forkJoin([ - // projects list - this.projectsApi.projectsGetAllEx({ - ...(!nested && mainPageTagsFilter?.length > 0 && {tags: [(mainPageTagsFilterMatchMode ? '__$and' : '__$or'), ...addExcludeFilters(mainPageTagsFilter)]}), - ...(nested && mainPageTagsFilter?.length > 0 && {children_tags: [(mainPageTagsFilterMatchMode ? '__$and' : '__$or'), ...addExcludeFilters(mainPageTagsFilter)]}), - stats_for_state: ProjectsGetAllExRequest.StatsForStateEnum.Active, - include_stats: true, - shallow_search: !searchQuery?.query, - ...((projectsView && !searchQuery?.query) && {permission_roots_only: true}), - ...((projectsView && selectedProjectId && selectedProjectId !== '*') && {parent: [selectedProjectId]}), - scroll_id: scrollId || null, // null to create new scroll (undefined doesn't generate scroll) - size: pageSize, - ...(showOnlyUserWork && {active_users: [user?.id]}), - ...((showHidden) && {search_hidden: true}), - ...(hideExamples && {allow_public: false}), - order_by: ['featured', sortOrder === TABLE_SORT_ORDER.DESC ? '-' + orderBy : orderBy], - only_fields: ['name', 'company', 'user', 'created', 'default_output_destination', 'basename', 'system_tags'] - .concat(pipelines || datasets ? ['tags', 'last_update'] : []), - ...(searchQuery?.query && { - _any_: { - pattern: searchQuery.regExp ? searchQuery.query : escapeRegex(searchQuery.query), - fields: ['id', 'basename', 'description'] - } - }), - ...(!projectsView && getFeatureProjectRequest(this.route.snapshot, nested, searchQuery, selectedProjectName, selectedProjectId)), - }), - // Getting [current project] stats from server - ((nested || projectsView) && selectedProjectId && selectedProjectId !== '*' && !scrollId && !searchQuery?.query) ? + return forkJoin([ + // projects list this.projectsApi.projectsGetAllEx({ - ...(!datasets && !pipelines && !reports && {id: selectedProjectId}), - ...(datasets && {name: `^${selectedProjectName}/\\.datasets$`, search_hidden: true, children_type: 'dataset'}), - ...(pipelines && {name: `^${selectedProjectName}/\\.pipelines$`, search_hidden: true, children_type: 'pipeline'}), - ...(reports && {name: `^${selectedProjectName}/\\.reports$`, search_hidden: true, children_type: 'report'}), - ...((!showHidden && projectsView) && {include_stats_filter: statsFilter}), - ...((pipelines && !nested) && {include_stats_filter: {system_tags: ['pipeline'], type: ['controller']}}), - ...(datasets && !nested ? {include_dataset_stats: true} : {include_stats: true}), - stats_with_children: reports || pipelines || datasets, + ...(!nested && mainPageTagsFilter?.length > 0 && { + filters: { + tags: getTagsFilters(mainPageTagsFilterMatchMode === 'AND', mainPageTagsFilter), + } + }), + ...(nested && mainPageTagsFilter?.length > 0 && { + children_tags_filter: getTagsFilters(mainPageTagsFilterMatchMode === 'AND', mainPageTagsFilter) + }), stats_for_state: ProjectsGetAllExRequest.StatsForStateEnum.Active, - ...(showHidden && {search_hidden: true}), - check_own_contents: true, // in order to check if project is empty - ...(showOnlyUserWork && {active_users: [user.id]}), - only_fields: ['name', 'company', 'user', 'created', 'default_output_destination'], - ...(!projectsView && getSelfFeatureProjectRequest(this.route.snapshot)), - }) : nested && reports && selectedProjectId === '*' && !scrollId && !searchQuery?.query ? - // nested reports virtual card + include_stats: true, + shallow_search: !searchQuery?.query, + ...(((projectsView || nested) && !searchQuery?.query) && {permission_roots_only: true}), + ...((projectsView && selectedProjectId && selectedProjectId !== '*') && {parent: [selectedProjectId]}), + scroll_id: scrollId || null, // null to create new scroll (undefined doesn't generate scroll) + size: pageSize, + ...(showOnlyUserWork && {active_users: [user?.id]}), + ...((showHidden) && {search_hidden: true}), + ...(hideExamples && {allow_public: false}), + order_by: ['featured', sortOrder === TABLE_SORT_ORDER.DESC ? '-' + orderBy : orderBy], + only_fields: ['name', 'company', 'user', 'created', 'default_output_destination', 'basename', 'system_tags'] + .concat(pipelines || datasets ? ['tags', 'last_update'] : []), + ...(searchQuery?.query && { + _any_: { + pattern: searchQuery.regExp ? searchQuery.query : escapeRegex(searchQuery.query), + fields: ['id', 'basename', 'description'] + } + }), + ...(!projectsView && getFeatureProjectRequest(this.route.snapshot, nested, searchQuery, selectedProjectName, selectedProjectId)), + }), + // Getting [current project] stats from server + ((nested || projectsView) && selectedProjectId && selectedProjectId !== '*' && !scrollId && !searchQuery?.query) ? this.projectsApi.projectsGetAllEx({ - name: '^\\.reports$', - search_hidden: true, - children_type: 'report', - stats_with_children: false, + ...(!datasets && !pipelines && !reports && {id: selectedProjectId}), + ...(datasets && { + name: `^${escapeRegex(selectedProjectName)}/\\.datasets$`, + search_hidden: true, + children_type: 'dataset' + }), + ...(pipelines && { + name: `^${escapeRegex(selectedProjectName)}/\\.pipelines$`, + search_hidden: true, + children_type: 'pipeline' + }), + ...(reports && { + name: `^${escapeRegex(selectedProjectName)}/\\.reports$`, + search_hidden: true, + children_type: 'report' + }), + ...((!showHidden && projectsView) && {include_stats_filter: statsFilter}), + ...((pipelines && !nested) && { + include_stats_filter: { + system_tags: ['pipeline'], + type: ['controller'] + } + }), + ...(datasets && !nested ? {include_dataset_stats: true} : {include_stats: true}), + stats_with_children: reports || pipelines || datasets, stats_for_state: ProjectsGetAllExRequest.StatsForStateEnum.Active, - include_stats: true, + ...(showHidden && {search_hidden: true}), check_own_contents: true, // in order to check if project is empty ...(showOnlyUserWork && {active_users: [user.id]}), - only_fields: ['id', 'company'], - ...(mainPageTagsFilter?.length > 0 && {children_tags: [(mainPageTagsFilterMatchMode ? '__$and' : '__$or'), ...addExcludeFilters(mainPageTagsFilter)]}), - /* eslint-enable @typescript-eslint/naming-convention */ - }) : - of(null), - ]).pipe( + only_fields: ['name', 'company', 'user', 'created', 'default_output_destination'], + ...(!projectsView && getSelfFeatureProjectRequest(this.route.snapshot)), + }) : nested && reports && selectedProjectId === '*' && !scrollId && !searchQuery?.query ? + // nested reports virtual card + this.projectsApi.projectsGetAllEx({ + name: '^\\.reports$', + search_hidden: true, + children_type: 'report', + stats_with_children: false, + stats_for_state: ProjectsGetAllExRequest.StatsForStateEnum.Active, + include_stats: true, + check_own_contents: true, // in order to check if project is empty + ...(showOnlyUserWork && {active_users: [user.id]}), + only_fields: ['id', 'company'], + ...(mainPageTagsFilter?.length > 0 && { + children_tags_filter: getTagsFilters(mainPageTagsFilterMatchMode === 'AND', mainPageTagsFilter) + }), + + /* eslint-enable @typescript-eslint/naming-convention */ + }) : + of(null), + ]).pipe( debounceTime(0), map(([projectsRes, currentProjectRes]: [ProjectsGetAllExResponse, ProjectsGetAllExResponse]) => ({ newScrollId: projectsRes.scroll_id, @@ -228,8 +254,7 @@ export class CommonProjectsEffects { )), mergeMap(({newScrollId, projects}) => [ addToProjectsList({ - projects, reset: - [setMainPageTagsFilter.type, setMainPageTagsFilterMatchMode.type].includes(action.type) + projects, reset: !scrollId }), deactivateLoader(action.type), setCurrentScrollId({scrollId: newScrollId}), @@ -283,6 +308,7 @@ export class CommonProjectsEffects { setProjectsSearchQuery = createEffect(() => this.actions.pipe( ofType(setProjectsSearchQuery), + filter(action => !action.skipGetAll), mergeMap(() => [getAllProjectsPageProjects()]) )); diff --git a/src/app/webapp-common/projects/common-projects.reducer.ts b/src/app/webapp-common/projects/common-projects.reducer.ts index f14f4e9e..66969ac4 100755 --- a/src/app/webapp-common/projects/common-projects.reducer.ts +++ b/src/app/webapp-common/projects/common-projects.reducer.ts @@ -1,4 +1,4 @@ -import {createReducer, createSelector, on, ReducerTypes} from '@ngrx/store'; +import {ActionCreator, createReducer, createSelector, on, ReducerTypes} from '@ngrx/store'; import {Project} from '~/business-logic/model/projects/project'; import {TABLE_SORT_ORDER, TableSortOrderEnum} from '../shared/ui-components/data/table/table.consts'; import { @@ -55,13 +55,7 @@ export const commonProjectsInitState: CommonProjectsState = { sortOrder: TABLE_SORT_ORDER.DESC, searchQuery: null, projectsNonFilteredList: [], - projectReadyForDeletion: { - experiments: null, - models: null, - pipelines: null, - reports: null, - datasets: null, - }, + projectReadyForDeletion: null, validatedProject: null, noMoreProjects: true, scrollId: null, @@ -115,14 +109,15 @@ export const commonProjectsReducers = [ })), on(resetProjectsSearchQuery, state => ({ ...state, - searchQuery: commonProjectsInitState.searchQuery, + // searchQuery: commonProjectsInitState.searchQuery, scrollId: null, noMoreProjects: commonProjectsInitState.noMoreProjects, projects: commonProjectsInitState.projects })), on(checkProjectForDeletion, (state, action) => ({ ...state, - validatedProject: action.project + validatedProject: action.project, + projectReadyForDeletion: commonProjectsInitState.projectReadyForDeletion })), on(resetReadyToDelete, state => ({ ...state, @@ -133,7 +128,7 @@ export const commonProjectsReducers = [ ({...state, tableModeAwareness: (action as ReturnType).awareness})), on(showExamplePipelines, state => ({...state, showPipelineExamples: true})), on(showExampleDatasets, state => ({...state, showDatasetExamples: true})) -] as ReducerTypes[]; +] as ReducerTypes[]; export const commonProjectsReducer = createReducer(commonProjectsInitState, ...commonProjectsReducers); export const projects = state => state.projects as CommonProjectsState; @@ -149,7 +144,7 @@ export const selectValidatedProject = createSelector(projects, state => state.va export const selectReadyForDeletion = createSelector(projects, state => state.projectReadyForDeletion); export const selectProjectReadyForDeletion = createSelector(selectValidatedProject, selectReadyForDeletion, - (project, projectReadyForDeletion) => ({...projectReadyForDeletion, project})); + (project, projectReadyForDeletion) => projectReadyForDeletion ? {...projectReadyForDeletion, project} : null); export const selectProjectForDelete = createSelector(projects, state => [state?.validatedProject]); export const selectNoMoreProjects = createSelector(projects, state => state.noMoreProjects); export const selectProjectsScrollId = createSelector(projects, (state): string => state?.scrollId || null); diff --git a/src/app/webapp-common/projects/containers/projects-page/common-projects-page.component.ts b/src/app/webapp-common/projects/containers/projects-page/common-projects-page.component.ts index 1c6192ae..fd784eca 100755 --- a/src/app/webapp-common/projects/containers/projects-page/common-projects-page.component.ts +++ b/src/app/webapp-common/projects/containers/projects-page/common-projects-page.component.ts @@ -13,7 +13,7 @@ import { getAllProjectsPageProjects, resetProjects, resetProjectsSearchQuery, - resetReadyToDelete, + resetReadyToDelete, setCurrentScrollId, setProjectsOrderBy, setProjectsSearchQuery, updateProject @@ -25,7 +25,6 @@ import {ProjectDialogComponent} from '@common/shared/project-dialog/project-dial import {combineLatest, Observable, Subscription} from 'rxjs'; import { debounceTime, - distinctUntilChanged, distinctUntilKeyChanged, filter, map, @@ -101,7 +100,6 @@ export class CommonProjectsPageComponent implements OnInit, OnDestroy { protected router = inject(Router); protected route = inject(ActivatedRoute); protected dialog = inject(MatDialog); - private projectReadyForDeletion$: Observable; constructor() { this.searchQuery$ = this.store.select(selectSearchQuery); @@ -110,9 +108,6 @@ export class CommonProjectsPageComponent implements OnInit, OnDestroy { this.noMoreProjects$ = this.store.select(selectNoMoreProjects); this.selectedProjectId$ = this.store.select(selectRouterParams).pipe(map((params: Params) => params?.projectId)); this.selectedProject$ = this.store.select(selectSelectedProject).pipe(tap(selectedProject => this.selectedProject = selectedProject)); - this.projectReadyForDeletion$ = this.store.select(selectProjectReadyForDeletion).pipe( - distinctUntilChanged(), - filter(readyForDeletion => readyForDeletionFilter(readyForDeletion))); this.projectsList$ = combineLatest([ this.store.select(selectProjects), @@ -138,7 +133,6 @@ export class CommonProjectsPageComponent implements OnInit, OnDestroy { } }), ); - this.syncAppSearch(); } @@ -164,36 +158,25 @@ export class CommonProjectsPageComponent implements OnInit, OnDestroy { } ngOnInit() { - // this.store.dispatch(new ResetSelectedProject()); this.store.dispatch(resetProjects()); this.store.dispatch(setDeep({deep: false})); // Todo: join the 2 subscriptions to 1 selector. this.subs.add(this.store.select(selectActiveWorkspaceReady) .pipe(filter(ready => !!ready), take(1)) - .subscribe(() => { - this.store.dispatch(getAllProjectsPageProjects()); - })); + .subscribe(() => this.store.dispatch(getAllProjectsPageProjects()))); this.subs.add(this.selectedProjectId$.pipe( - tap(projectId => this.projectId = projectId), - filter(projectId => !projectId), - distinctUntilChanged(), - ).subscribe(() => { - this.store.dispatch(resetProjectsSearchQuery()); - this.store.dispatch(getAllProjectsPageProjects()); + ).subscribe((projectId) => { + this.projectId = projectId; } )); - - - - this.subs.add(this.selectedProject$.pipe( filter(project => (!!project)), distinctUntilKeyChanged('id'), skip(1), ).subscribe(() => { - this.store.dispatch(resetProjectsSearchQuery()); + this.store.dispatch(setCurrentScrollId({scrollId: null})); this.store.dispatch(getAllProjectsPageProjects()); })); this.subs.add(this.store.select(selectShowOnlyUserWork) @@ -203,13 +186,18 @@ export class CommonProjectsPageComponent implements OnInit, OnDestroy { this.store.dispatch(getAllProjectsPageProjects()); })); - this.subs.add(this.projectReadyForDeletion$.subscribe(readyForDeletion => { - if (isDeletableProject(readyForDeletion)) { - this.showDeleteDialog(readyForDeletion); - } else { - this.showConfirmDialog(readyForDeletion); - } - })); + this.subs.add(this.store.select(selectProjectReadyForDeletion) + .pipe( + filter(readyForDeletion => readyForDeletion !== null && readyForDeletionFilter(readyForDeletion)) + ) + .subscribe(readyForDeletion => { + if (isDeletableProject(readyForDeletion)) { + this.showDeleteDialog(readyForDeletion); + } else { + this.showConfirmDialog(readyForDeletion); + } + }) + ); this.setupBreadcrumbsOptions(); } @@ -260,7 +248,7 @@ export class CommonProjectsPageComponent implements OnInit, OnDestroy { } private showDeleteDialog(readyForDeletion) { - const confirmDialogRef = this.dialog.open(CommonDeleteDialogComponent, { + this.dialog.open(CommonDeleteDialogComponent, { data: { entity: readyForDeletion.project, numSelected: 1, @@ -269,13 +257,13 @@ export class CommonProjectsPageComponent implements OnInit, OnDestroy { }, width: '600px', disableClose: true - }); - confirmDialogRef.afterClosed().subscribe((confirmed) => { + }).afterClosed() + .subscribe((confirmed) => { if (confirmed) { - this.store.dispatch(resetDeleteState()); this.store.dispatch(resetProjects()); this.store.dispatch(getAllProjectsPageProjects()); } + this.store.dispatch(resetDeleteState()); }); } @@ -294,6 +282,8 @@ export class CommonProjectsPageComponent implements OnInit, OnDestroy { syncAppSearch() { this.store.dispatch(initSearch({payload: `Search for ${this.getName()}s`})); + this.subs.add(this.searchQuery$.pipe(take(1)).subscribe(query => + this.store.dispatch(setProjectsSearchQuery({...query, skipGetAll: true})))); this.subs.add(this.searchQuery$.pipe(skip(1)).subscribe(query => this.search(query))); } diff --git a/src/app/webapp-common/reports/nested-reports-page/nested-reports-page.component.ts b/src/app/webapp-common/reports/nested-reports-page/nested-reports-page.component.ts index 8c03a2f4..b4ec0b67 100644 --- a/src/app/webapp-common/reports/nested-reports-page/nested-reports-page.component.ts +++ b/src/app/webapp-common/reports/nested-reports-page/nested-reports-page.component.ts @@ -9,7 +9,7 @@ import {getAllProjectsPageProjects, resetProjects, setProjectsOrderBy} from '@co import {setDefaultNestedModeForFeature} from '@common/core/actions/projects.actions'; import {selectMainPageTagsFilter, selectMainPageTagsFilterMatchMode} from "@common/core/reducers/projects.reducer"; import {combineLatest, Subscription} from "rxjs"; -import {debounceTime} from "rxjs/operators"; +import {debounceTime, skip} from "rxjs/operators"; @Component({ selector: 'sm-nested-reports-page', @@ -29,7 +29,7 @@ export class NestedReportsPageComponent extends ReportsPageComponent { hideMenu = false; entityType = ProjectTypeEnum.reports; private mainPageFilterSub: Subscription; - projectCardClicked(data: { hasSubProjects: boolean; id: string; name: string }) { + override projectCardClicked(data: { hasSubProjects: boolean; id: string; name: string }) { if (data.hasSubProjects) { this.router.navigate([data.id, 'projects'], {relativeTo: this.route.parent?.parent}); } else { @@ -37,43 +37,43 @@ export class NestedReportsPageComponent extends ReportsPageComponent { } } - protected getReports() { + protected override getReports() { // Override getReports from reports page - we need projects (from common-projects), not reports. } // eslint-disable-next-line @typescript-eslint/no-unused-vars - protected getExtraProjects(selectedProjectId, selectedProject) { + protected override getExtraProjects(selectedProjectId, selectedProject) { return []; } // eslint-disable-next-line @typescript-eslint/no-unused-vars - orderByChanged(sortByFieldName: string) { + override orderByChanged(sortByFieldName: string) { this.store.dispatch(setProjectsOrderBy({orderBy: sortByFieldName})); } - loadMore() { + override loadMore() { this.store.dispatch(getAllProjectsPageProjects()); } - toggleNestedView(nested: boolean) { + override toggleNestedView(nested: boolean) { this.store.dispatch(setDefaultNestedModeForFeature({feature: this.entityType, isNested: nested})); if (!nested) { this.router.navigateByUrl(this.entityType); } } - ngOnInit() { + override ngOnInit() { super.ngOnInit(); this.mainPageFilterSub = combineLatest([ this.store.select(selectMainPageTagsFilter), this.store.select(selectMainPageTagsFilterMatchMode) - ]).pipe(debounceTime(0)) + ]).pipe(debounceTime(0), skip(1)) .subscribe(() => { this.store.dispatch(resetProjects()); this.store.dispatch(getAllProjectsPageProjects()); }); } - ngOnDestroy() { + override ngOnDestroy() { super.ngOnDestroy(); this.mainPageFilterSub.unsubscribe(); } diff --git a/src/app/webapp-common/reports/report-card/report-card.component.html b/src/app/webapp-common/reports/report-card/report-card.component.html index 230835b2..ecb87b35 100644 --- a/src/app/webapp-common/reports/report-card/report-card.component.html +++ b/src/app/webapp-common/reports/report-card/report-card.component.html @@ -18,7 +18,7 @@ > {{report.name}} - +
-
{{report?.project?.name | cleanProjectPath}}
+
{{report?.project?.name | cleanProjectPath}}
●
{{report?.user?.name}}
-
Updated {{report.last_update | timeAgo}}
+
Updated {{report.last_update | timeAgo}}
 @@ -51,13 +56,14 @@
{{report?.comment}}
- - - + + +
diff --git a/src/app/webapp-common/reports/report-card/report-card.component.ts b/src/app/webapp-common/reports/report-card/report-card.component.ts index dd1b5e9b..30c9c3a0 100644 --- a/src/app/webapp-common/reports/report-card/report-card.component.ts +++ b/src/app/webapp-common/reports/report-card/report-card.component.ts @@ -1,4 +1,5 @@ -import {Component, EventEmitter, Input, OnInit, Output} from '@angular/core'; +import {Component, EventEmitter, Input, Output} from '@angular/core'; +import {TIME_FORMAT_STRING} from '@common/constants'; import {IReport} from '../reports.consts'; @Component({ @@ -6,7 +7,7 @@ import {IReport} from '../reports.consts'; templateUrl: './report-card.component.html', styleUrls: ['./report-card.component.scss'] }) -export class ReportCardComponent implements OnInit { +export class ReportCardComponent { public isExample: boolean; private _report: IReport; @@ -15,7 +16,7 @@ export class ReportCardComponent implements OnInit { @Input() set report(data: IReport) { this._report = data; this.isExample = !['All Experiments'].includes(data.name) && (!data.company || ! data.company['id']); - }; + } get report() { return this._report; } @@ -32,11 +33,5 @@ export class ReportCardComponent implements OnInit { @Output() archive = new EventEmitter(); @Output() moveTo = new EventEmitter(); @Output() share = new EventEmitter(); - - - constructor() { } - - ngOnInit(): void { - } - + timeFormatString = TIME_FORMAT_STRING; } diff --git a/src/app/webapp-common/reports/report-dialog/create-new-report-form/create-new-report-form.component.html b/src/app/webapp-common/reports/report-dialog/create-new-report-form/create-new-report-form.component.html index 5516c46e..a5e32b54 100644 --- a/src/app/webapp-common/reports/report-dialog/create-new-report-form/create-new-report-form.component.html +++ b/src/app/webapp-common/reports/report-dialog/create-new-report-form/create-new-report-form.component.html @@ -60,8 +60,8 @@ >
-
- +
+
Loading more...
@@ -79,14 +79,12 @@ #description="ngModel" > -
-
- -
+
+
diff --git a/src/app/webapp-common/reports/report-dialog/create-new-report-form/create-new-report-form.component.scss b/src/app/webapp-common/reports/report-dialog/create-new-report-form/create-new-report-form.component.scss index 89f9e8ab..8bb42ffb 100644 --- a/src/app/webapp-common/reports/report-dialog/create-new-report-form/create-new-report-form.component.scss +++ b/src/app/webapp-common/reports/report-dialog/create-new-report-form/create-new-report-form.component.scss @@ -1,25 +1,12 @@ :host { .create-report-button { - padding-top: 32px; + padding: 32px 12px 0; } - - small.text-danger { - //position: absolute !important; - //top: -15px; - } - #report-description{ - max-height:250px; - padding-top: 12px; - height: 65px; - } - mat-form-field{ + mat-form-field { width: 100%; - .report-description{ + + .report-description { min-height: 68px; } } - - .search-icon { - transform: translateY(3px); - } } diff --git a/src/app/webapp-common/reports/report-dialog/report-dialog.component.ts b/src/app/webapp-common/reports/report-dialog/report-dialog.component.ts index 072ffeb5..fe5d2206 100644 --- a/src/app/webapp-common/reports/report-dialog/report-dialog.component.ts +++ b/src/app/webapp-common/reports/report-dialog/report-dialog.component.ts @@ -47,6 +47,6 @@ export class ReportDialogComponent { filterSearchChanged($event: {value: string; loadMore?: boolean}) { !$event.loadMore && this.store.dispatch(resetTablesFilterProjectsOptions()); - this.store.dispatch(getTablesFilterProjectsOptions({searchString: $event.value || '', loadMore: $event.loadMore})); + this.store.dispatch(getTablesFilterProjectsOptions({searchString: $event.value || '', loadMore: $event.loadMore, allowPublic: false})); } } diff --git a/src/app/webapp-common/reports/report/report.component.html b/src/app/webapp-common/reports/report/report.component.html index 28d07ab9..d6b8da64 100644 --- a/src/app/webapp-common/reports/report/report.component.html +++ b/src/app/webapp-common/reports/report/report.component.html @@ -98,6 +98,7 @@ [handleUpload]="handleUpload" (saveInfo)="save($event)" (editModeChanged)="editModeChanged();" + (dirtyChanged)="dirtyChanged($event);" (deleteResource)="deleteResource($event)" (imageMenuOpened)="calculateUnusedResources($event)" > diff --git a/src/app/webapp-common/reports/report/report.component.ts b/src/app/webapp-common/reports/report/report.component.ts index cefacc2c..d5d2059f 100644 --- a/src/app/webapp-common/reports/report/report.component.ts +++ b/src/app/webapp-common/reports/report/report.component.ts @@ -17,8 +17,11 @@ import { getReportsTags, moveReport, publishReport, - restoreReport, setEditMode, - setReport, setReportChanges, + restoreReport, + setDirty, + setEditMode, + setReport, + setReportChanges, updateReport } from '@common/reports/reports.actions'; import {selectRouterParams} from '@common/core/reducers/router-reducer'; @@ -201,26 +204,34 @@ export class ReportComponent implements OnInit, OnDestroy { }; } setupBreadcrumbsOptions() { - this.sub.add(combineLatest([this.store.select(selectReport), this.store.select(selectSelectedProject)]).pipe( - withLatestFrom(this.store.select(selectDefaultNestedModeForFeature)) - ).subscribe(([[selectedReport,selectedProject], defaultNestedModeForFeature]) => { - this.store.dispatch(setBreadcrumbsOptions({ - breadcrumbOptions: { - showProjects: !!selectedReport, - featureBreadcrumb: { - name: 'REPORTS', - url: defaultNestedModeForFeature['reports'] ? 'reports/*/projects' : 'reports' - }, - projectsOptions: { - basePath: 'reports', - filterBaseNameWith: ['.reports'], - compareModule: null, - showSelectedProject: false, - selectedProjectBreadcrumb: null + this.sub.add( + combineLatest([ + this.store.select(selectReport), + this.store.select(selectSelectedProject) + ]).pipe( + filter(([selectedReport]) => !!selectedReport), + withLatestFrom(this.store.select(selectDefaultNestedModeForFeature)) + ).subscribe(([[selectedReport,], defaultNestedModeForFeature]) => this.store.dispatch(setBreadcrumbsOptions({ + breadcrumbOptions: { + showProjects: !!selectedReport, + featureBreadcrumb: { + name: 'REPORTS', + url: defaultNestedModeForFeature['reports'] ? 'reports/*/projects' : 'reports' + }, + projectsOptions: { + basePath: 'reports', + filterBaseNameWith: ['.reports'], + compareModule: null, + showSelectedProject: false, + selectedProjectBreadcrumb: null + }, + subFeatureBreadcrumb: { + name: selectedReport.name, + onlyWithProject: true + } } - } - })); - })); + })) + )); } ngOnInit() { @@ -242,6 +253,7 @@ export class ReportComponent implements OnInit, OnDestroy { save(report: string) { this.store.dispatch(updateReport({id: this.report.id, changes: {report}})); + this.store.dispatch(setDirty({dirty: false})); Array.from(window.frames).forEach(frame => frame.postMessage('renderPlot', '*')); } @@ -332,6 +344,10 @@ export class ReportComponent implements OnInit, OnDestroy { setTimeout(() => Array.from(window.frames).forEach(frame => frame.postMessage('resizePlot', '*')), 500); } + dirtyChanged(isDirty: boolean) { + this.store.dispatch(setDirty({dirty: isDirty})); + } + copyMarkdown() { this._clipboardService.copyResponse$ .pipe(take(1)) @@ -353,14 +369,24 @@ export class ReportComponent implements OnInit, OnDestroy { .subscribe(() => { const test = new RegExp(`!\\[(.*)\\]\\(${escapeRegex(resource)}\\)`, 'gm'); const ace = this.mdEditor.ace; - const range = ace.find(test, { + let range = ace.find(test, { wrap: true, caseSensitive: true, wholeWord: true, regExp: false, preventScroll: true // do not change selection }); - ace.session.replace(range, `![${getBaseName(resource)}]()`); + + while (range) { + ace.session.replace(range, `![${getBaseName(resource)}]()`); + range = ace.find(test, { + wrap: true, + caseSensitive: true, + wholeWord: true, + regExp: false, + preventScroll: true // do not change selection + }); + } }); } diff --git a/src/app/webapp-common/reports/reports-list/reports-list.component.html b/src/app/webapp-common/reports/reports-list/reports-list.component.html index dc8621a8..556153d0 100644 --- a/src/app/webapp-common/reports/reports-list/reports-list.component.html +++ b/src/app/webapp-common/reports/reports-list/reports-list.component.html @@ -29,7 +29,7 @@
-

NO REPORTS TO SHOW

+

NO REPORTS TO SHOW

diff --git a/src/app/webapp-common/reports/reports-list/reports-list.component.scss b/src/app/webapp-common/reports/reports-list/reports-list.component.scss index 4cb8f41d..7e4cade3 100644 --- a/src/app/webapp-common/reports/reports-list/reports-list.component.scss +++ b/src/app/webapp-common/reports/reports-list/reports-list.component.scss @@ -19,20 +19,20 @@ color: $blue-600; margin-bottom: 24px; } - h3 { - font-size: 20px; - font-weight: 500; + + h4 { color: $blue-100; margin-bottom: 24px; + font-size: 20px; } } - .sm-card-list-layout{ - &.in-empty-state{ + + .sm-card-list-layout { + &.in-empty-state { height: 100%; grid-template-rows: 64px 1fr; } } - } diff --git a/src/app/webapp-common/reports/reports-page/reports-page.component.ts b/src/app/webapp-common/reports/reports-page/reports-page.component.ts index 759332ed..260140fa 100644 --- a/src/app/webapp-common/reports/reports-page/reports-page.component.ts +++ b/src/app/webapp-common/reports/reports-page/reports-page.component.ts @@ -1,4 +1,4 @@ -import {Component, OnDestroy, OnInit, } from '@angular/core'; +import {Component, OnDestroy, OnInit,} from '@angular/core'; import {Params} from '@angular/router'; import {ReportDialogComponent} from '../report-dialog/report-dialog.component'; import { @@ -36,13 +36,14 @@ import { selectMainPageTagsFilterMatchMode } from '../../core/reducers/projects.reducer'; import {selectShowOnlyUserWork} from '../../core/reducers/users-reducer'; -import {initSearch, setSearching, setSearchQuery} from '../../common-search/common-search.actions'; import {debounceTime, filter, map, tap, withLatestFrom} from 'rxjs/operators'; import {setBreadcrumbsOptions, setDefaultNestedModeForFeature} from '@common/core/actions/projects.actions'; import {isEqual} from 'lodash-es'; import {ClipboardService} from 'ngx-clipboard'; import {selectRouterParams} from '@common/core/reducers/router-reducer'; import {CommonProjectsPageComponent} from '@common/projects/containers/projects-page/common-projects-page.component'; +import {EntityTypeEnum} from "~/shared/constants/non-common-consts"; +import {Project} from "~/business-logic/model/projects/project"; @Component({ selector: 'sm-reports-page', @@ -50,14 +51,13 @@ import {CommonProjectsPageComponent} from '@common/projects/containers/projects- styleUrls: ['./reports-page.component.scss'] }) export class ReportsPageComponent extends CommonProjectsPageComponent implements OnInit, OnDestroy { - public reports$: Observable; - public archive$: Observable; + public reports$: Observable; + public archive$: Observable; public reportsTags$: Observable; private sub = new Subscription(); public noMoreReports$: Observable; public reportsOrderBy$: Observable; public reportsSortOrder$: Observable<1 | -1>; - public selectedProjectId$: Observable; constructor( private _clipboardService: ClipboardService @@ -87,15 +87,14 @@ export class ReportsPageComponent extends CommonProjectsPageComponent implements }); } - ngOnDestroy(): void { + override ngOnDestroy(): void { super.ngOnDestroy(); this.sub.unsubscribe(); this.store.dispatch(resetReports()); } - ngOnInit(): void { + override ngOnInit(): void { super.ngOnInit(); - this.store.dispatch(initSearch({payload: 'Search for reports'})); let prevQueryParams: Params; this.sub.add(combineLatest([ this.store.select(selectMainPageTagsFilter), @@ -124,9 +123,7 @@ export class ReportsPageComponent extends CommonProjectsPageComponent implements } reportSelected(report: Report) { - this.store.dispatch(setSearchQuery({query: ''})); - this.store.dispatch(setSearching({payload: false})); - this.router.navigate(['reports',(report.project as any)?.id ?? '*', report.id]); + this.router.navigate(['reports',(report.project as Project)?.id ?? '*', report.id]); } toggleArchive(archive: boolean) { @@ -163,7 +160,7 @@ export class ReportsPageComponent extends CommonProjectsPageComponent implements })); } - loadMore() { + override loadMore() { this.store.dispatch(getReports(true)); } @@ -175,7 +172,7 @@ export class ReportsPageComponent extends CommonProjectsPageComponent implements } } - orderByChanged(sortByFieldName: string) { + override orderByChanged(sortByFieldName: string) { this.store.dispatch(setReportsOrderBy({orderBy: sortByFieldName})); } @@ -191,7 +188,7 @@ export class ReportsPageComponent extends CommonProjectsPageComponent implements } } - setupBreadcrumbsOptions() { + override setupBreadcrumbsOptions() { this.subs.add(this.selectedProject$.pipe( withLatestFrom(this.store.select(selectDefaultNestedModeForFeature)) ).subscribe(([selectedProject, defaultNestedModeForFeature]) => { @@ -213,4 +210,8 @@ export class ReportsPageComponent extends CommonProjectsPageComponent implements })); })); } + + protected override getName(): string { + return EntityTypeEnum.report; + } } diff --git a/src/app/webapp-common/reports/reports-routing.module.ts b/src/app/webapp-common/reports/reports-routing.module.ts index 7df404ec..1acf4aa1 100644 --- a/src/app/webapp-common/reports/reports-routing.module.ts +++ b/src/app/webapp-common/reports/reports-routing.module.ts @@ -5,14 +5,14 @@ import {ReportComponent} from '@common/reports/report/report.component'; import {CrumbTypeEnum} from '@common/layout/breadcrumbs/breadcrumbs.component'; import {NestedReportsPageComponent} from '@common/reports/nested-reports-page/nested-reports-page.component'; import {leavingBeforeSaveAlertGuard} from '@common/shared/guards/leaving-before-save-alert.guard'; -import {selectEditingReport} from '@common/reports/reports.reducer'; +import {selectDirtyReport} from '@common/reports/reports.reducer'; export const routes: Routes = [ { - path: '', component: ReportsPageComponent, data: {search: true, staticBreadcrumb:[[{ - name: 'REPORTS', - type: CrumbTypeEnum.Feature - }]]} + path: '', component: ReportsPageComponent, data: {search: true, staticBreadcrumb: [[{ + name: 'REPORTS', + type: CrumbTypeEnum.Feature + }]]} }, // Adding project param to url, for automatic workspace switching. { @@ -22,7 +22,7 @@ export const routes: Routes = [ {path: 'projects', component: NestedReportsPageComponent, data: {search: true}}, { path: ':reportId', component: ReportComponent, - canDeactivate: [leavingBeforeSaveAlertGuard(selectEditingReport)], + canDeactivate: [leavingBeforeSaveAlertGuard(selectDirtyReport)], } ] }, diff --git a/src/app/webapp-common/reports/reports.actions.ts b/src/app/webapp-common/reports/reports.actions.ts index 84bba2d9..01169825 100644 --- a/src/app/webapp-common/reports/reports.actions.ts +++ b/src/app/webapp-common/reports/reports.actions.ts @@ -120,3 +120,8 @@ export const setEditMode = createAction( REPORTS_PREFIX + 'Set Edit Mode', props<{editing: boolean}>() ); + +export const setDirty = createAction( + REPORTS_PREFIX + 'Set Dirty', + props<{dirty: boolean}>() +); diff --git a/src/app/webapp-common/reports/reports.effects.ts b/src/app/webapp-common/reports/reports.effects.ts index b4bded64..7583f531 100644 --- a/src/app/webapp-common/reports/reports.effects.ts +++ b/src/app/webapp-common/reports/reports.effects.ts @@ -29,7 +29,8 @@ import { import {ApiReportsService} from '~/business-logic/api-services/reports.service'; import {IReport, PAGE_SIZE} from './reports.consts'; import { - selectArchiveView, selectNestedReports, + selectArchiveView, + selectNestedReports, selectReport, selectReportsOrderBy, selectReportsQueryString, @@ -48,7 +49,6 @@ import { } from '../core/reducers/projects.reducer'; import {TABLE_SORT_ORDER} from '../shared/ui-components/data/table/table.consts'; import {selectCurrentUser, selectShowOnlyUserWork} from '../core/reducers/users-reducer'; -import {addExcludeFilters} from '../shared/utils/tableParamEncode'; import {escapeRegex} from '../shared/utils/escape-regex'; import {MESSAGES_SEVERITY} from '../constants'; import {MatDialog} from '@angular/material/dialog'; @@ -63,6 +63,7 @@ import {HttpClient} from '@angular/common/http'; import {selectRouterParams} from '@common/core/reducers/router-reducer'; import {setMainPageTagsFilter} from '@common/core/actions/projects.actions'; import {cleanTag} from '@common/shared/utils/helpers.util'; +import {excludedKey, getTagsFilters} from '@common/shared/utils/tableParamEncode'; @Injectable() export class ReportsEffects { @@ -86,16 +87,16 @@ export class ReportsEffects { createReport$ = createEffect(() => this.actions.pipe( ofType(createReport), - switchMap((action) => this.reportsApiService.reportsCreate(action.reportsCreateRequest)), - mergeMap((res: ReportsCreateResponse) => { - this.router.navigate(['reports', res.project_id, res.id]); - return [deactivateLoader(createReport.type)]; - }), - catchError(err => [ - requestFailed(err), - setServerError(err, null, 'failed to create a new report'), - deactivateLoader(createReport.type), - ]) + switchMap((action) => this.reportsApiService.reportsCreate(action.reportsCreateRequest) + .pipe(mergeMap((res: ReportsCreateResponse) => { + this.router.navigate(['reports', res.project_id, res.id]); + return [deactivateLoader(createReport.type)]; + }), + catchError(err => [ + requestFailed(err), + setServerError(err, null, 'failed to create a new report'), + deactivateLoader(createReport.type), + ]))) )); getReports = createEffect(() => this.actions.pipe( @@ -121,10 +122,14 @@ export class ReportsEffects { project: projectId === '*' ? null : projectId, scroll_id: action['loadMore'] ? scroll : null, ...(hideExamples && {allow_public: false}), - system_tags: [archive ? '__$and' : '__$not', 'archived'], + system_tags: [archive ? '__$and' : excludedKey, 'archived'], ...(showOnlyUserWork && {user: [user.id]}), order_by: [sortOrder === TABLE_SORT_ORDER.DESC ? '-' + orderBy : orderBy], - ...(mainPageTagsFilter?.length > 0 && {tags: [(mainPageTagsFilterMatchMode ? '__$and' : '__$or'), ...addExcludeFilters(mainPageTagsFilter)]}), + ...(mainPageTagsFilter?.length > 0 && { + filters: { + tags: getTagsFilters(!!mainPageTagsFilterMatchMode, mainPageTagsFilter), + } + }), ...(searchQuery?.query && { _any_: { pattern: searchQuery.regExp ? searchQuery.query : escapeRegex(searchQuery.query), @@ -272,11 +277,11 @@ export class ReportsEffects { navigateToProjectAfterMove = createEffect(() => this.actions.pipe( ofType(navigateToProjectAfterMove), concatLatestFrom(() => this.store.select(selectReport)), - filter(([, report])=> !!report?.id), + filter(([, report]) => !!report?.id), tap(([action, report]) => { this.router.navigateByUrl(`reports/${action.projectId}/${report.id}`); }), - ), {dispatch: false}); + ), {dispatch: false}); publishReport = createEffect(() => this.actions.pipe( ofType(publishReport), diff --git a/src/app/webapp-common/reports/reports.reducer.ts b/src/app/webapp-common/reports/reports.reducer.ts index 0dc6ea46..41b6920f 100644 --- a/src/app/webapp-common/reports/reports.reducer.ts +++ b/src/app/webapp-common/reports/reports.reducer.ts @@ -3,7 +3,7 @@ import { addReports, addReportsTags, removeReport, resetReports, - setArchive, setEditMode, + setArchive, setDirty, setEditMode, setReport, setReportChanges, setReports, @@ -36,6 +36,7 @@ export interface ReportsState { noMoreReports: boolean; queryString: { query: string; regExp?: boolean }; editing: boolean; + dirty: boolean; } export const reportsInitState: ReportsState = { @@ -48,7 +49,8 @@ export const reportsInitState: ReportsState = { archive: false, noMoreReports: null, queryString: null, - editing: false + editing: false, + dirty: false }; export const reportsReducer = createReducer( @@ -103,6 +105,7 @@ export const reportsReducer = createReducer( queryString: (action as ReturnType), })), on(setEditMode, (state, action): ReportsState => ({...state, editing: action.editing})), + on(setDirty, (state, action): ReportsState => ({...state, dirty: action.dirty})), ); export const selectReportsState = state => state[REPORTS_KEY] as ReportsState; @@ -117,4 +120,5 @@ export const selectReportsOrderBy = createSelector(selectReportsState, state => export const selectReportsSortOrder = createSelector(selectReportsState, state => state ? state.sortOrder : reportsInitState.sortOrder); export const selectReportsQueryString = createSelector(selectReportsState, state => state ? state.queryString : reportsInitState.queryString); export const selectEditingReport = createSelector(selectReportsState, state => state.editing); +export const selectDirtyReport = createSelector(selectReportsState, state => state.dirty); export const selectNestedReports = createSelector(selectRouterConfig, config => config?.length === 3 && config.at(-1) === 'reports'); diff --git a/src/app/webapp-common/select-model/select-model.component.html b/src/app/webapp-common/select-model/select-model.component.html index 439e1fe5..b2cd7028 100755 --- a/src/app/webapp-common/select-model/select-model.component.html +++ b/src/app/webapp-common/select-model/select-model.component.html @@ -5,6 +5,7 @@ [searchActive]="true" [searchValue]="searchValue$ | async" [viewMode]="viewMode$ | async" + [isShowArchived]="showArchive$ | async" [hideArchiveToggle]="data.hideShowArchived" [hideCreateNewButton]="true" [tableFilters]="tableFilters$ | async" diff --git a/src/app/webapp-common/select-model/select-model.component.ts b/src/app/webapp-common/select-model/select-model.component.ts index 789a9cf2..2ed17194 100755 --- a/src/app/webapp-common/select-model/select-model.component.ts +++ b/src/app/webapp-common/select-model/select-model.component.ts @@ -3,13 +3,13 @@ import {Store} from '@ngrx/store'; import * as actions from './select-model.actions'; import {clearTableFilter, setSelectedModels, showArchive} from './select-model.actions'; import { - selectGlobalFilter, selectModels, selectNoMoreModels, selectSelectedModels, selectSelectedModelsList, selectSelectModelTableFilters, selectTableSortFields, selectViewMode + selectGlobalFilter, selectModels, selectNoMoreModels, selectSelectedModels, selectSelectedModelsList, selectSelectModelTableFilters, selectShowArchive, selectTableSortFields, selectViewMode } from './select-model.reducer'; import {combineLatest, Observable, Subscription} from 'rxjs'; import {MAT_DIALOG_DATA, MatDialogRef} from '@angular/material/dialog'; import {ConfirmDialogComponent} from '../shared/ui-components/overlay/confirm-dialog/confirm-dialog.component'; import {ColHeaderTypeEnum, ISmCol, TableSortOrderEnum} from '../shared/ui-components/data/table/table.consts'; -import {SelectedModel} from '../models/shared/models.model'; +import {SelectedModel, TableModel} from '../models/shared/models.model'; import {MODELS_TABLE_COLS, ModelsViewModesEnum} from '../models/models.consts'; import {FilterMetadata} from 'primeng/api/filtermetadata'; import {selectAllProjectsUsers, selectProjectSystemTags, selectSelectedProject, selectTablesFilterProjectsOptions} from '../core/reducers/projects.reducer'; @@ -20,7 +20,7 @@ import {SortMeta} from 'primeng/api'; import {ModelsTableComponent} from '@common/models/shared/models-table/models-table.component'; import {debounceTime, distinctUntilChanged, map, tap} from 'rxjs/operators'; import {Project} from '~/business-logic/model/projects/models'; -import {getTablesFilterProjectsOptions, resetTablesFilterProjectsOptions, setTablesFilterProjectsOptions} from '@common/core/actions/projects.actions'; +import {getTablesFilterProjectsOptions, resetTablesFilterProjectsOptions} from '@common/core/actions/projects.actions'; import {isEqual, unionBy} from 'lodash-es'; import {compareLimitations} from '@common/shared/entity-page/footer-items/compare-footer-item'; import {addMessage} from '@common/core/actions/layout.actions'; @@ -40,7 +40,7 @@ export class SelectModelComponent implements OnInit, OnDestroy { public noMoreModels$: Observable; public tableFilters$: Observable<{ [s: string]: FilterMetadata }>; public searchValue$: Observable; - public selectedModels$: Observable>; + public selectedModels$: Observable>; public viewMode$: Observable; public users$: Observable>; public tags$: Observable; @@ -51,13 +51,13 @@ export class SelectModelComponent implements OnInit, OnDestroy { public frameworks$: Observable; private subs = new Subscription(); - private isAllProjects: any; public selectedProject: Project; private selectedModels: Array; private columns$: Observable; private metadataTableCols$: Observable; public tableCols$: Observable; public metadataColsOptions$: Observable>; + public showArchive$: Observable; constructor(private store: Store, public dialogRef: MatDialogRef, @@ -71,13 +71,17 @@ export class SelectModelComponent implements OnInit, OnDestroy { this.models$ = combineLatest([ this.store.select(selectModels), this.store.select(selectSelectedModelsList), - ]).pipe(map(([models, selectedModels]) => unionBy(selectedModels, models, 'id'))); + ]).pipe( + map(([models, selectedModels]) => unionBy(selectedModels, models, 'id')), + map(models => models?.map(model => ({...model, system_tags: model.system_tags?.map((t => t.replace('archive', ' archive')))}))) + ); this.tableSortFields$ = this.store.select(selectTableSortFields); this.tableFilters$ = this.store.select(selectSelectModelTableFilters); this.selectedModels$ = this.store.select(selectSelectedModels).pipe(tap(models => this.selectedModels = models)); this.viewMode$ = this.store.select(selectViewMode); this.searchValue$ = this.store.select(selectGlobalFilter); this.noMoreModels$ = this.store.select(selectNoMoreModels); + this.showArchive$ = this.store.select(selectShowArchive); this.users$ = this.store.select(selectAllProjectsUsers); this.tags$ = this.store.select(selectModelsTags); this.systemTags$ = this.store.select(selectProjectSystemTags); @@ -153,7 +157,7 @@ export class SelectModelComponent implements OnInit, OnDestroy { this.store.dispatch(actions.tableSortChanged({colId: sort.colId, isShift: sort.isShift})); } - filterChanged(filter: { col: ISmCol; value: any }) { + filterChanged(filter: { col: ISmCol; value: string }) { this.store.dispatch(actions.tableFilterChanged({col: filter.col, value: filter.value})); } diff --git a/src/app/webapp-common/select-model/select-model.effects.ts b/src/app/webapp-common/select-model/select-model.effects.ts index edcd6464..49b102ae 100755 --- a/src/app/webapp-common/select-model/select-model.effects.ts +++ b/src/app/webapp-common/select-model/select-model.effects.ts @@ -2,9 +2,11 @@ import {Injectable} from '@angular/core'; import {Store} from '@ngrx/store'; import {Actions, concatLatestFrom, createEffect, ofType} from '@ngrx/effects'; import * as actions from './select-model.actions'; +import {getNextModels, getSelectedModels, setSelectedModels, setSelectedModelsList} from './select-model.actions'; import * as exSelectors from './select-model.reducer'; +import {selectTableSortFields} from './select-model.reducer'; import {MODELS_PAGE_SIZE} from '../models/models.consts'; -import {catchError, mergeMap, map, switchMap, debounceTime} from 'rxjs/operators'; +import {catchError, debounceTime, map, mergeMap, switchMap} from 'rxjs/operators'; import {get} from 'lodash-es'; import {MODEL_TAGS, MODELS_TABLE_COL_FIELDS} from '../models/shared/models.const'; import {ApiModelsService} from '~/business-logic/api-services/models.service'; @@ -15,10 +17,8 @@ import {of} from 'rxjs'; import {FilterMetadata} from 'primeng/api/filtermetadata'; import {ModelsGetAllExRequest} from '~/business-logic/model/models/modelsGetAllExRequest'; import {SortMeta} from 'primeng/api'; -import {addExcludeFilters, createFiltersFromStore, encodeOrder} from '../shared/utils/tableParamEncode'; -import {selectTableSortFields} from './select-model.reducer'; +import {createFiltersFromStore, encodeOrder, excludedKey, getTagsFilters} from '../shared/utils/tableParamEncode'; import {escapeRegex} from '@common/shared/utils/escape-regex'; -import {getNextModels, getSelectedModels, setSelectedModels, setSelectedModelsList} from './select-model.actions'; import {selectMetadataColsForProject} from '@common/models/reducers'; import {ISmCol} from '@common/shared/ui-components/data/table/table.consts'; import {selectRouterProjectId} from '@common/core/reducers/projects.reducer'; @@ -100,8 +100,9 @@ export class SelectModelEffects { const projectFilter = get(tableFilters, [MODELS_TABLE_COL_FIELDS.PROJECT, 'value']); const systemTags = tableFilters?.system_tags?.value; const systemTagsFilter = (showArchived ? [] : - ['__$and', '__$not', MODEL_TAGS.HIDDEN]).concat(systemTags ? systemTags : []); + ['__$and', excludedKey, MODEL_TAGS.HIDDEN]).concat(systemTags ? systemTags : []); const filters = createFiltersFromStore(tableFilters, true); + delete filters['tags']; return { ...filters, _any_: searchQuery ? { @@ -113,7 +114,11 @@ export class SelectModelEffects { scroll_id: scrollId || null, // null to create new scroll (undefined doesn't generate scroll) size: MODELS_PAGE_SIZE, order_by: encodeOrder(orderFields), - ...(tagsFilter?.length > 0 && {tags: addExcludeFilters(tagsFilterAnd ? ['__$and', ...tagsFilter] : tagsFilter)}), + ...(tagsFilter?.length > 0 && { + filters: { + tags: getTagsFilters(tagsFilterAnd, tagsFilter), + } + }), system_tags: (systemTagsFilter && systemTagsFilter.length > 0) ? systemTagsFilter : [], only_fields: [...this.selectModelsOnlyFields, ...metadataCols.map(col => col.id)], ...(tableFilters?.[MODELS_TABLE_COL_FIELDS.READY]?.value.length == 1 && !!tableFilters) ? diff --git a/src/app/webapp-common/settings/admin/admin-credential-table.base.ts b/src/app/webapp-common/settings/admin/admin-credential-table.base.ts index 0779a1b3..d3715289 100755 --- a/src/app/webapp-common/settings/admin/admin-credential-table.base.ts +++ b/src/app/webapp-common/settings/admin/admin-credential-table.base.ts @@ -1,4 +1,4 @@ -import {EventEmitter, Input, Output, Directive} from '@angular/core'; +import {EventEmitter, Input, Output, Directive, inject} from '@angular/core'; import {MatDialog, MatDialogRef} from '@angular/material/dialog'; import {ConfirmDialogComponent} from '../../shared/ui-components/overlay/confirm-dialog/confirm-dialog.component'; import {ICONS} from '../../constants'; @@ -14,8 +14,8 @@ export class AdminCredentialTableBaseDirective { public icons = ICONS; public dialog: MatDialog; - constructor(dialog: MatDialog) { - this.dialog = dialog; + constructor() { + this.dialog = inject(MatDialog); } confirmPopUp(credential) { diff --git a/src/app/webapp-common/settings/admin/admin-credential-table/admin-credential-table.component.ts b/src/app/webapp-common/settings/admin/admin-credential-table/admin-credential-table.component.ts index 7f72df35..b9ebb2c5 100755 --- a/src/app/webapp-common/settings/admin/admin-credential-table/admin-credential-table.component.ts +++ b/src/app/webapp-common/settings/admin/admin-credential-table/admin-credential-table.component.ts @@ -1,5 +1,4 @@ import {Component} from '@angular/core'; -import {MatDialog} from '@angular/material/dialog'; import {AdminCredentialTableBaseDirective} from '../admin-credential-table.base'; import {TIME_FORMAT_STRING} from '@common/constants'; @@ -11,7 +10,4 @@ import {TIME_FORMAT_STRING} from '@common/constants'; }) export class AdminCredentialTableComponent extends AdminCredentialTableBaseDirective { timeFormatString = TIME_FORMAT_STRING; - constructor(public dialog: MatDialog) { - super(dialog); - } } diff --git a/src/app/webapp-common/settings/admin/base-admin-utils.ts b/src/app/webapp-common/settings/admin/base-admin-utils.ts index c80b2934..e1422280 100644 --- a/src/app/webapp-common/settings/admin/base-admin-utils.ts +++ b/src/app/webapp-common/settings/admin/base-admin-utils.ts @@ -2,6 +2,9 @@ import {AmazonS3URI} from '@common/shared/utils/amazon-s3-uri'; import {Credentials} from '@common/core/reducers/common-auth-reducer'; export const isS3Url = (src) => src?.startsWith('s3://'); + +export const isGoogleCloudUrl = (src) => src?.startsWith('gs://'); + const replaceAll = (baseString: string, toReplace: string, replaceWith: string, ignore = false) => baseString.replace(new RegExp(toReplace.replace(/([\/\,\!\\\^\$\{\}\[\]\(\)\.\*\+\?\|\<\>\-\&])/g, '\\$&'), (ignore ? 'gi' : 'g')), (typeof (replaceWith) == 'string') ? replaceWith.replace(/\$/g, '$$$$') : replaceWith); const encodeSpecialCharacters = (src: string) => { @@ -24,7 +27,15 @@ export const getBucketAndKeyFromSrc = (src) => { /* eslint-enable @typescript-eslint/naming-convention */ } const srcArr = src.split('/'); - if (!isS3Url(src)) { + if(isGoogleCloudUrl(src)) { + return { + /* eslint-disable @typescript-eslint/naming-convention */ + Bucket: srcArr[2], + Endpoint: 'https://storage.googleapis.com', + Key: srcArr.slice(3).join('/') + /* eslint-enable @typescript-eslint/naming-convention */ + }; + } else if (!isS3Url(src)) { return null; } else if (srcArr[2].includes(':')) { // We identify minio cae by it's port (:) and use same behavior in case user already set credentials for that endpoint @@ -69,5 +80,5 @@ export interface SignResponse { signed?: string; expires?: number; bucket?: Credentials; - azure?: boolean; + provider?: 's3' | 'azure' | 'gcs'; } diff --git a/src/app/webapp-common/settings/admin/base-admin.service.ts b/src/app/webapp-common/settings/admin/base-admin.service.ts index cf6a9304..09541aac 100755 --- a/src/app/webapp-common/settings/admin/base-admin.service.ts +++ b/src/app/webapp-common/settings/admin/base-admin.service.ts @@ -1,4 +1,4 @@ -import {Injectable} from '@angular/core'; +import {inject, Injectable} from '@angular/core'; import {Store} from '@ngrx/store'; import {from, fromEvent, Observable, of, Subject} from 'rxjs'; import {fromFetch} from 'rxjs/fetch'; @@ -6,12 +6,17 @@ import {catchError, debounceTime, filter, map, skip} from 'rxjs/operators'; import {DeleteObjectsCommand, GetObjectCommand, ObjectIdentifier, S3Client, S3ClientConfig} from '@aws-sdk/client-s3'; import {getSignedUrl} from '@aws-sdk/s3-request-presigner'; import {convertToReverseProxy, isFileserverUrl} from '~/shared/utils/url'; -import {selectRevokeSucceed, selectS3BucketCredentials, selectS3BucketCredentialsBucketCredentials} from '../../core/reducers/common-auth-reducer'; +import { + Credentials, + selectRevokeSucceed, + selectS3BucketCredentials, + selectS3BucketCredentialsBucketCredentials +} from '../../core/reducers/common-auth-reducer'; import {getAllCredentials, refreshS3Credential, showLocalFilePopUp} from '../../core/actions/common-auth.actions'; import {ConfigurationService} from '../../shared/services/configuration.service'; import {Environment} from '../../../../environments/base'; import {DEFAULT_REGION} from '../../shared/utils/amazon-s3-uri'; -import {getBucketAndKeyFromSrc, SignResponse} from '@common/settings/admin/base-admin-utils'; +import {getBucketAndKeyFromSrc, isGoogleCloudUrl, SignResponse} from '@common/settings/admin/base-admin-utils'; const LOCAL_SERVER_PORT = 27878; const FOUR_DAYS = 60 * 60 * 24 * 4; @@ -20,27 +25,29 @@ const HTTP_REGEX = /^https?:\/\//; @Injectable() export class BaseAdminService { - bucketCredentials: Observable; + // bucketCredentials: Observable; public s3Services: {[bucket: string]: S3Client} = {}; revokeSucceed: Observable; private readonly s3BucketCredentials: Observable; - private previouslySignedUrls = {}; private localServerWorking = false; private environment: Environment; private deleteS3FilesSubject: Subject<{ success: boolean; files: string[] }>; private credentials: any[]; + protected store: Store; + protected confService: ConfigurationService; + private gcsFirstAttempt = {}; - constructor(protected store: Store, protected confService: ConfigurationService) { - this.store = store; - this.revokeSucceed = store.select(selectRevokeSucceed); + constructor() { + this.store = inject(Store); + this.confService = inject(ConfigurationService); + this.revokeSucceed = this.store.select(selectRevokeSucceed); this.revokeSucceed.subscribe(this.onRevokeSucceed); - this.s3BucketCredentials = store.select(selectS3BucketCredentials); + this.s3BucketCredentials = this.store.select(selectS3BucketCredentials); this.s3BucketCredentials.pipe(skip(1)).subscribe(() => { - this.previouslySignedUrls = {}; }); - store.select(selectS3BucketCredentialsBucketCredentials) + this.store.select(selectS3BucketCredentialsBucketCredentials) .subscribe(cred => this.credentials = cred); - confService.getEnvironment().subscribe(conf => this.environment = conf); + this.confService.getEnvironment().subscribe(conf => this.environment = conf); this.deleteS3FilesSubject = new Subject(); fromEvent(window, 'storage') @@ -79,10 +86,6 @@ export class BaseAdminService { return of({type: 'sign', signed: this.redirectToLocalServer(url), expires: Number.MAX_VALUE}); } - if (this.isGoogleCloudUrl(url)) { - return of({type: 'sign', signed: this.signGoogleCloudUrl(url), expires: Number.MAX_VALUE}); - } - if (this.isAzureUrl(url)) { const azureBucket = this.credentials.find((b) => b.Bucket && b.Bucket.toLowerCase() == 'azure'); if (azureBucket) { @@ -92,43 +95,50 @@ export class BaseAdminService { const bucketKeyEndpoint = url && getBucketAndKeyFromSrc(url); if (bucketKeyEndpoint) { if (this.isAzureUrl(url)) { - return of({type: 'popup', bucket: bucketKeyEndpoint, azure: true}); + return of({type: 'popup', bucket: bucketKeyEndpoint, provider: 'azure'}); } const s3 = this.findOrInitBucketS3(bucketKeyEndpoint); if (s3) { // eslint-disable-next-line @typescript-eslint/naming-convention - const command = new GetObjectCommand({Key: bucketKeyEndpoint.Key, Bucket: bucketKeyEndpoint.Bucket/*, ResponseContentType: 'image/jpeg'*/}); + const command = new GetObjectCommand({ + Key: bucketKeyEndpoint.Key, + Bucket: bucketKeyEndpoint.Bucket/*, ResponseContentType: 'image/jpeg'*/ + }); return from(getSignedUrl(s3, command, { expiresIn: FOUR_DAYS, unhoistableHeaders: new Set(['x-amz-content-sha256', 'x-id']), unsignableHeaders: new Set(['x-amz-content-sha256', 'x-id']), })) .pipe(map(signed => ({type: 'sign', signed, expires: (new Date()).getTime() + FOUR_DAYS * 1000}))); + } else if (isGoogleCloudUrl(url) && !this.gcsFirstAttempt?.[bucketKeyEndpoint.Bucket]) { + this.gcsFirstAttempt[bucketKeyEndpoint.Bucket] = true; + return of({type: 'sign', signed: this.signGoogleCloudUrl(url), expires: Number.MAX_VALUE}); } else { delete bucketKeyEndpoint.Key; - return of({type: 'popup', bucket: bucketKeyEndpoint}); + return of({type: 'popup', bucket: bucketKeyEndpoint, provider: isGoogleCloudUrl(url) ? 'gcs' : 's3'}); } } else { return of({type: 'sign', signed: url, expires: Number.MAX_VALUE}); } } - findS3CredentialsInStore(bucketKeyEndpoint) { + findS3CredentialsInStore(bucketKeyEndpoint: Credentials) { + const endpoint = bucketKeyEndpoint.Endpoint?.replace(HTTP_REGEX,''); return this.credentials - .find(bucket => bucket?.Bucket === bucketKeyEndpoint.Bucket && bucket?.Endpoint?.replace(HTTP_REGEX,'') == bucketKeyEndpoint.Endpoint); + .find(bucket => bucket?.Bucket === bucketKeyEndpoint.Bucket && bucket?.Endpoint?.replace(HTTP_REGEX,'') === endpoint); } - findOrInitBucketS3(bucketKeyEndpoint) { + findOrInitBucketS3(bucketKeyEndpoint: Credentials) { const set = this.findS3CredentialsInStore(bucketKeyEndpoint); const s3Service = this.s3Services[bucketKeyEndpoint.Bucket + bucketKeyEndpoint.Endpoint]; - if (set && s3Service) { - return s3Service; - } else { - if (set) { - this.s3Services[bucketKeyEndpoint.Bucket + bucketKeyEndpoint.Endpoint] = this.createS3Service(set); - return this.s3Services[bucketKeyEndpoint.Bucket + bucketKeyEndpoint.Endpoint]; + if (set) { + if (s3Service) { + return s3Service; } + this.s3Services[bucketKeyEndpoint.Bucket + bucketKeyEndpoint.Endpoint] = this.createS3Service(set); + return this.s3Services[bucketKeyEndpoint.Bucket + bucketKeyEndpoint.Endpoint]; } + return null; } createS3Service(set) { @@ -165,11 +175,6 @@ export class BaseAdminService { private onRevokeSucceed = (bool) => bool ? this.getAllCredentials() : false; - public isGoogleCloudUrl(src) { - return src?.startsWith('gs://'); - } - - // Uses Allegro Chrome extension injecting patch_local_link function to window - hack to get local files. redirectToLocalServer(url: string): string { return `http://localhost:${LOCAL_SERVER_PORT}${url.replace('file://', '/')}`; diff --git a/src/app/webapp-common/shared/components/base-context-menu/base-context-menu.component.ts b/src/app/webapp-common/shared/components/base-context-menu/base-context-menu.component.ts index 71ff7c04..b1383561 100644 --- a/src/app/webapp-common/shared/components/base-context-menu/base-context-menu.component.ts +++ b/src/app/webapp-common/shared/components/base-context-menu/base-context-menu.component.ts @@ -1,9 +1,19 @@ -import {Component, ElementRef, EventEmitter, HostListener, Input, OnDestroy, Output, ViewChild} from '@angular/core'; +import { + Component, + ElementRef, + EventEmitter, + HostListener, + inject, + Input, + OnDestroy, + Output, + ViewChild +} from '@angular/core'; import {MatMenuTrigger} from '@angular/material/menu'; import {TagsMenuComponent} from '../../ui-components/tags/tags-menu/tags-menu.component'; import {Store} from '@ngrx/store'; -import {deactivateEdit, activateEdit} from 'app/webapp-common/experiments/actions/common-experiments-info.actions'; -import {activateModelEdit, cancelModelEdit} from 'app/webapp-common/models/actions/models-info.actions'; +import {deactivateEdit, activateEdit} from '@common/experiments/actions/common-experiments-info.actions'; +import {activateModelEdit, cancelModelEdit} from '@common/models/actions/models-info.actions'; import {CountAvailableAndIsDisableSelectedFiltered} from '@common/shared/entity-page/items.utils'; import {MenuItems} from '../../entity-page/items.utils'; import {Subscription} from 'rxjs'; @@ -37,11 +47,14 @@ export class BaseContextMenuComponent implements OnDestroy{ } } - constructor( - protected store: Store, - protected eRef: ElementRef - ) { - this.sub.add(store.select(selectSelectedProjectId) + protected store: Store; + protected eRef: ElementRef; + + constructor() { + this.store = inject(Store); + this.eRef = inject(ElementRef); + + this.sub.add(this.store.select(selectSelectedProjectId) .subscribe(id => { this.projectId = id; this.allProjects = id === '*'; diff --git a/src/app/webapp-common/shared/components/charts/line-chart/line-chart.component.html b/src/app/webapp-common/shared/components/charts/line-chart/line-chart.component.html index 99dc81aa..feae0b43 100644 --- a/src/app/webapp-common/shared/components/charts/line-chart/line-chart.component.html +++ b/src/app/webapp-common/shared/components/charts/line-chart/line-chart.component.html @@ -1,6 +1,6 @@
- +
Loading
@@ -11,7 +11,5 @@
-
-
-
-
+
+
diff --git a/src/app/webapp-common/shared/components/charts/line-chart/line-chart.component.scss b/src/app/webapp-common/shared/components/charts/line-chart/line-chart.component.scss index 19a01e68..27d31a9a 100644 --- a/src/app/webapp-common/shared/components/charts/line-chart/line-chart.component.scss +++ b/src/app/webapp-common/shared/components/charts/line-chart/line-chart.component.scss @@ -5,10 +5,10 @@ display: block; position: relative; - background-color: $black; + background-color: var(--line-chart-background-color, $black); .chart { - height: calc(100% - 40px); + height: calc(100% - 46px); margin-bottom: 6px; } @@ -18,7 +18,7 @@ bottom: 0; left: 0 ; right: 0; - background-color: $black; + background-color: var(--line-chart-background-color, $black); .loading { display: flex; align-items: center; @@ -84,3 +84,8 @@ } } } + +::ng-deep .legend-circle.circle-hidden { + fill-opacity: 0.4; +} + diff --git a/src/app/webapp-common/shared/components/charts/line-chart/line-chart.component.ts b/src/app/webapp-common/shared/components/charts/line-chart/line-chart.component.ts index 72f6f56c..8c368779 100644 --- a/src/app/webapp-common/shared/components/charts/line-chart/line-chart.component.ts +++ b/src/app/webapp-common/shared/components/charts/line-chart/line-chart.component.ts @@ -3,14 +3,19 @@ import { Input, ChangeDetectionStrategy, ViewChild, - ViewContainerRef, ChangeDetectorRef, AfterViewInit, - NgZone, + NgZone, ElementRef, OnDestroy, } from '@angular/core'; -import {line, tooltip, legend} from 'britecharts'; +import {selectScaleFactor} from '@common/core/reducers/view.reducer'; +import {Store} from '@ngrx/store'; +import {line, tooltip, legend, LegendModule} from 'britecharts'; import {select, Selection} from 'd3-selection'; import 'd3-transition'; +import {LineChartModule} from 'britecharts/src/typings/charts/line-chart'; +import {TimeSeriesChartAPI} from 'britecharts/src/typings/common/base'; +import {Subscription} from 'rxjs'; +import {map} from 'rxjs/operators'; interface Topic { topicName: string; @@ -18,11 +23,18 @@ interface Topic { dates: { value: number; date: string }[]; } -export interface LineChartData { - dataByTopic?: Topic[]; +export interface LineChartFlatData { + topicName: string; + name: string; + originalDate: number; + date: string; + value: number; } -const COLOR_SCHEME = ['#a4a1fb', '#ff8a15']; +export interface LineChartData { + dataByTopic?: Topic[]; + data: LineChartFlatData[]; +} @Component({ selector : 'sm-line-chart', @@ -30,22 +42,26 @@ const COLOR_SCHEME = ['#a4a1fb', '#ff8a15']; styleUrls : ['./line-chart.component.scss'], changeDetection: ChangeDetectionStrategy.OnPush }) -export class LineChartComponent implements AfterViewInit { +export class LineChartComponent implements AfterViewInit, OnDestroy { private lineMargin = {top: 30, bottom: 50, left: 80, right: 10}; - private lineChartContainer: Selection; - private lineChart; + private lineChartContainer: Selection; + private lineChart: LineChartModule; private lineTooltipContainer; private lineTooltip; - private legendContainer: Selection; - private legendChart; + private legendContainer: Selection; + private legendChart: LegendModule; private legendWidth: number; public loading = false; private _yLabel: string; public chartData: LineChartData; private initDone = false; + private hidden = {} as {[id: string]: boolean} + private hiddenIndexes = {} as {[id: number]: boolean} @Input() yTickFormatter: (number) => number; + private sub = new Subscription(); + private scale: number; @Input() set yLabel(label: string) { this._yLabel = label; @@ -70,7 +86,7 @@ export class LineChartComponent implements AfterViewInit { @Input() tooltipVerticalOffset = -100; @Input() set data(data: LineChartData) { - if (data && (data.dataByTopic.length === 0 || data.dataByTopic.every(topic => topic.dates.length === 0))) { + if (data && !(data?.data?.length > 0) && (data.dataByTopic?.length === 0 || data.dataByTopic?.every(topic => topic.dates.length === 0))) { this.chartData = undefined; return; } @@ -83,37 +99,52 @@ export class LineChartComponent implements AfterViewInit { this.updateLegend(); } } + @Input() colorScheme = ['#a4a1fb', '#ff8a15']; - @ViewChild('chart', {read: ViewContainerRef, static: true}) chartRef: ViewContainerRef; - @ViewChild('legend', {read: ViewContainerRef, static: true}) legendRef: ViewContainerRef; + @ViewChild('chart') chartRef: ElementRef; + @ViewChild('legend') legendRef: ElementRef; - constructor(private cdr: ChangeDetectorRef, private readonly zone: NgZone) { + constructor(private cdr: ChangeDetectorRef, private readonly zone: NgZone, private store: Store) { + this.sub.add(this.store.select(selectScaleFactor) + .pipe(map(factor => 100 / factor)) + .subscribe(scale => this.scale = scale) + ); } ngAfterViewInit() { - this.legendChart = legend(); - this.legendContainer = select(this.legendRef.element.nativeElement); - this.lineChart = line(); - this.lineTooltip = tooltip(); - this.lineChartContainer = select(this.chartRef.element.nativeElement); + this.zone.runOutsideAngular(() => { + this.legendChart = legend(); + this.legendContainer = select(this.legendRef.nativeElement); + this.lineChart = line(); + this.lineTooltip = tooltip(); + this.lineChartContainer = select(this.chartRef.nativeElement); + }); if (!this.loading) { setTimeout(this.initLineChart.bind(this)); } } initLegend() { - const rect = this.legendContainer.node().getBoundingClientRect(); - const {width} = rect; - this.legendWidth = width; + this.zone.runOutsideAngular(() => { + const rect = this.legendContainer.node().getBoundingClientRect(); + const {width} = rect; + this.legendWidth = width; - if (rect) { - this.legendChart - .width(this.legendWidth) - .height(40) - .colorSchema(COLOR_SCHEME) - .numberFormat('l') - .isHorizontal(true); - } + if (rect) { + this.legendChart + .width(this.legendWidth) + .height(40) + .colorSchema(this.colorScheme) + .numberFormat('l') + .isHorizontal(true) + } + }); + } + + toggleSeries({id, name}: {id: number; name: string}) { + this.hidden[name] = !this.hidden[name]; + this.hiddenIndexes[id] = !this.hiddenIndexes[id]; + this.onResize(); } updateLegend() { @@ -122,10 +153,23 @@ export class LineChartComponent implements AfterViewInit { } this.zone.runOutsideAngular(() => { - const data = this.chartData.dataByTopic.map(topic => ({id: topic.topic, name: topic.topicName})); - this.legendContainer.datum(data).call(this.legendChart); + const data = this.chartData.dataByTopic ? + this.chartData.dataByTopic.map(topic => ({id: topic.topic, name: topic.topicName})) : + this.chartData.data.reduce((acc, d) => { + !acc.find(entry => entry.name === d.topicName) && acc.push({name: d.topicName, id: acc.length}); + return acc; + }, []) + + this.legendContainer.datum(data).call(this.legendChart, []); this.legendContainer.select('defs').remove(); + this.legendContainer.selectAll('.legend-entry') + .style('cursor', 'pointer') + .on('click', (event, data: {id: number; name: string}) => this.toggleSeries(data)); + + this.legendContainer.selectAll('.legend-circle') + .classed('circle-hidden', (data: {name: string}) => this.hidden[data.name]) + this.legendContainer.select('svg').append('defs').append('svg:clipPath') .attr('id', 'legend-label-clip') .append('svg:rect') @@ -137,30 +181,30 @@ export class LineChartComponent implements AfterViewInit { this.legendContainer.selectAll('.legend-entry-name') .attr('clip-path', 'url(#legend-label-clip)') .append('title') - .text((d: any[]) => d['name']); + .text((d) => d['name']); }); } initLineChart() { this.zone.runOutsideAngular(() => { const containerWidth: number = this.lineChartContainer.node() ? - this.lineChartContainer.node().getBoundingClientRect().width : 10; + this.lineChartContainer.node().getBoundingClientRect().width / this.scale : 10; this.lineChart .tooltipThreshold(600) - .height(270) + .height(this.chartRef.nativeElement.getBoundingClientRect().height) .margin(this.lineMargin) .lineCurve('monotoneX') .isAnimated(true) .grid('horizontal') .width(containerWidth) - .colorSchema(COLOR_SCHEME) - .lineGradient(['#a4a1fb', '#a4a1fb']) + .colorSchema(this.colorScheme) + .lineGradient([this.colorScheme[0], this.colorScheme[0]]) .xAxisLabel('') - .xTicks(8) + .xTicks(2) .yAxisLabelPadding(50) .yAxisLabel(this._yLabel) - .xAxisFormat(this.lineChart.axisTimeCombinations.CUSTOM) + .xAxisFormat('custom' as unknown as TimeSeriesChartAPI['axisTimeCombinations']) .on('customMouseOver', this.lineTooltip.show) .on('customMouseMove', this.lineTooltip.update) .on('customMouseOut', this.lineTooltip.hide); @@ -174,7 +218,7 @@ export class LineChartComponent implements AfterViewInit { } // Tooltip Setup and start - const tooltipElm = this.chartRef.element.nativeElement; + const tooltipElm = this.chartRef.nativeElement; this.lineTooltipContainer = select(tooltipElm).select('.metadata-group .vertical-marker-container'); this.lineTooltip .title('') @@ -199,7 +243,16 @@ export class LineChartComponent implements AfterViewInit { updateChart() { if (this.chartData) { this.zone.runOutsideAngular(() => { - this.lineChartContainer.datum(this.chartData).call(this.lineChart); + const firstColorNotHidden = this.colorScheme.find( (color, i) => !this.hiddenIndexes[i]); + this.lineChartContainer.selectAll('#one-line-gradient-1 stop').attr('stop-color', firstColorNotHidden); + const chartData = { + ...this.chartData, + data: this.chartData?.data?.filter(d => !this.hidden?.[d.topicName]), + dataByTopic: this.chartData?.dataByTopic?.filter(t => !this.hidden?.[t.topicName]) + } as LineChartData; + this.lineChartContainer.selectAll('.chart-group .topic').remove(); + this.lineChartContainer.datum(chartData).call(this.lineChart, undefined); + this.lineChartContainer.selectAll('.chart-group .topic path').attr('stroke', (base: Topic)=> this.colorScheme[base.topic - 1]); if (this.yTickFormatter) { this.lineChartContainer.selectAll('.y.axis .tick text').text(this.yTickFormatter); } @@ -207,13 +260,13 @@ export class LineChartComponent implements AfterViewInit { } } - getXAxisFormatter(data) { + getXAxisFormatter(data: LineChartData) { if (!data) { - return; + return null; } - data = data.dataByTopic[0].dates; - const firstDate = new Date(data[0].date); - const lastDate = new Date(data[data.length - 1].date); + const dates = data.dataByTopic?.[0].dates.map(d => d.date) ?? data.data.map(d => d.originalDate); + const firstDate = new Date(dates[0]); + const lastDate = new Date(dates.at(-1)); const dateTimeSpan = lastDate.getTime() - firstDate.getTime(); if (dateTimeSpan > 3 * 24 * 60 * 60 * 1000) { // more then 3 days @@ -236,4 +289,8 @@ export class LineChartComponent implements AfterViewInit { this.updateChart(); this.updateLegend(); } + + ngOnDestroy() { + this.sub.unsubscribe(); + } } diff --git a/src/app/webapp-common/shared/components/charts/scatter-plot/scatter-plot.component.html b/src/app/webapp-common/shared/components/charts/scatter-plot/scatter-plot.component.html index 1e40b3cd..f2bbd67b 100644 --- a/src/app/webapp-common/shared/components/charts/scatter-plot/scatter-plot.component.html +++ b/src/app/webapp-common/shared/components/charts/scatter-plot/scatter-plot.component.html @@ -1,6 +1,6 @@
- +
Loading
diff --git a/src/app/webapp-common/shared/components/custom-columns-list/custom-columns-list.component.html b/src/app/webapp-common/shared/components/custom-columns-list/custom-columns-list.component.html index b5277073..f3b57fad 100644 --- a/src/app/webapp-common/shared/components/custom-columns-list/custom-columns-list.component.html +++ b/src/app/webapp-common/shared/components/custom-columns-list/custom-columns-list.component.html @@ -11,6 +11,6 @@ (itemClicked)="selectedTableColsChanged.emit(col)">
-
- +
+
diff --git a/src/app/webapp-common/shared/components/experiment-refresh/experiment-refresh.component.html b/src/app/webapp-common/shared/components/experiment-refresh/experiment-refresh.component.html deleted file mode 100644 index 773a0f54..00000000 --- a/src/app/webapp-common/shared/components/experiment-refresh/experiment-refresh.component.html +++ /dev/null @@ -1,18 +0,0 @@ -
-
- Auto Refresh - -
-
- - -
-
diff --git a/src/app/webapp-common/shared/components/experiment-refresh/experiment-refresh.component.scss b/src/app/webapp-common/shared/components/experiment-refresh/experiment-refresh.component.scss deleted file mode 100644 index a31680a4..00000000 --- a/src/app/webapp-common/shared/components/experiment-refresh/experiment-refresh.component.scss +++ /dev/null @@ -1,5 +0,0 @@ -:host{ - &{ - display: inline-block; - } -} diff --git a/src/app/webapp-common/shared/components/experiment-refresh/experiment-refresh.component.spec.ts b/src/app/webapp-common/shared/components/experiment-refresh/experiment-refresh.component.spec.ts deleted file mode 100644 index 87562839..00000000 --- a/src/app/webapp-common/shared/components/experiment-refresh/experiment-refresh.component.spec.ts +++ /dev/null @@ -1,27 +0,0 @@ -import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; - -import { ExperimentRefreshComponent } from './experiment-refresh.component'; -import {StoreModule} from '@ngrx/store'; - -describe('ExperimentRefreshComponent', () => { - let component: ExperimentRefreshComponent; - let fixture: ComponentFixture; - - beforeEach(waitForAsync(() => { - TestBed.configureTestingModule({ - declarations: [ ExperimentRefreshComponent ], - imports: [StoreModule.forRoot({})] - }) - .compileComponents(); - })); - - beforeEach(() => { - fixture = TestBed.createComponent(ExperimentRefreshComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/src/app/webapp-common/shared/components/experiment-refresh/experiment-refresh.component.ts b/src/app/webapp-common/shared/components/experiment-refresh/experiment-refresh.component.ts deleted file mode 100644 index 8c550529..00000000 --- a/src/app/webapp-common/shared/components/experiment-refresh/experiment-refresh.component.ts +++ /dev/null @@ -1,47 +0,0 @@ -import {Component, EventEmitter, Input, OnDestroy, OnInit, Output} from '@angular/core'; -import {filter} from 'rxjs/operators'; -import {Subscription, interval} from 'rxjs'; -import {Store} from '@ngrx/store'; -import {setCompareAutoRefresh} from '@common/core/actions/layout.actions'; -import {selectCompareAutoRefresh} from '@common/core/reducers/view.reducer'; - -@Component({ - selector : 'sm-experiment-refresh', - templateUrl: './experiment-refresh.component.html', - styleUrls : ['./experiment-refresh.component.scss'] -}) -export class ExperimentRefreshComponent implements OnInit, OnDestroy { - - public autoRefreshValue = false; - private autoRefreshSubscription: Subscription; - private autoRefreshValueSub: Subscription; - readonly refreshInterval: number = 30000; - @Input() disabled = false; - @Input() showSettings = false; - @Input() allowAutorefresh: boolean = true; - @Output() onRefreshLogClicked = new EventEmitter<{isAutoRefresh: boolean}>(); - @Output() toggleSettings = new EventEmitter(); - - constructor(private store: Store) { - } - - ngOnInit() { - this.autoRefreshValueSub = this.store.select(selectCompareAutoRefresh) - .subscribe(val => this.autoRefreshValue = val); - - this.autoRefreshSubscription = interval(this.refreshInterval) - .pipe( - filter(() => this.autoRefreshValue && this.allowAutorefresh) - ) - .subscribe(() => this.onRefreshLogClicked.emit({isAutoRefresh: true})); - } - - onAutoRefreshChange(event) { - this.store.dispatch(setCompareAutoRefresh({autoRefresh: event.checked})); - } - - ngOnDestroy(): void { - this.autoRefreshSubscription.unsubscribe(); - this.autoRefreshValueSub.unsubscribe(); - } -} diff --git a/src/app/webapp-common/shared/components/id-badge/id-badge.component.scss b/src/app/webapp-common/shared/components/id-badge/id-badge.component.scss index 68492986..2a19caec 100644 --- a/src/app/webapp-common/shared/components/id-badge/id-badge.component.scss +++ b/src/app/webapp-common/shared/components/id-badge/id-badge.component.scss @@ -3,6 +3,7 @@ :host { height: 16px; user-select: none; + display: inline-flex; .id-number { color: $blue-250; diff --git a/src/app/webapp-common/shared/components/json-viewer/json-viewer.component.ts b/src/app/webapp-common/shared/components/json-viewer/json-viewer.component.ts index f15e39c6..176ab815 100644 --- a/src/app/webapp-common/shared/components/json-viewer/json-viewer.component.ts +++ b/src/app/webapp-common/shared/components/json-viewer/json-viewer.component.ts @@ -85,7 +85,7 @@ export class JsonViewerComponent { private _search: string = null; public isArray: boolean; - public index: number = 0; + public index = 0; public stringify = JSON.stringify; // nestedNodeMap = new Map(); // flatNodeMap = new Map(); diff --git a/src/app/webapp-common/shared/components/main-pages-header-filter/main-pages-header-filter.component.html b/src/app/webapp-common/shared/components/main-pages-header-filter/main-pages-header-filter.component.html index 71da6120..ae1fe140 100644 --- a/src/app/webapp-common/shared/components/main-pages-header-filter/main-pages-header-filter.component.html +++ b/src/app/webapp-common/shared/components/main-pages-header-filter/main-pages-header-filter.component.html @@ -38,6 +38,7 @@
-
+
+
diff --git a/src/app/webapp-common/shared/project-dialog/create-new-project-form/create-new-project-form.component.scss b/src/app/webapp-common/shared/project-dialog/create-new-project-form/create-new-project-form.component.scss index 2bd0d35a..06944c9a 100755 --- a/src/app/webapp-common/shared/project-dialog/create-new-project-form/create-new-project-form.component.scss +++ b/src/app/webapp-common/shared/project-dialog/create-new-project-form/create-new-project-form.component.scss @@ -1,22 +1,7 @@ :host { - form { - gap: 12px; - } .create-project-button { - padding-top: 32px; + padding: 32px 12px 0; } - - small.text-danger { - //position: absolute !important; - //top: -15px; - } - - #project-description { - max-height: 250px; - padding-top: 12px; - height: 65px; - } - mat-form-field { width: 100%; @@ -24,8 +9,10 @@ min-height: 68px; } } - - .search-icon { - transform: translateY(3px); + .creat-new-suffix { + display: inline-block; + margin-right: 18px; + font-size: 14px; + transform: translateY(-4px); } } diff --git a/src/app/webapp-common/shared/project-dialog/project-dialog.component.ts b/src/app/webapp-common/shared/project-dialog/project-dialog.component.ts index e4e793a3..38c717a3 100755 --- a/src/app/webapp-common/shared/project-dialog/project-dialog.component.ts +++ b/src/app/webapp-common/shared/project-dialog/project-dialog.component.ts @@ -86,7 +86,7 @@ export class ProjectDialogComponent implements OnInit, OnDestroy { filterSearchChanged($event: {value: string; loadMore?: boolean}) { !$event.loadMore && this.store.dispatch(resetTablesFilterProjectsOptions()); - this.store.dispatch(getTablesFilterProjectsOptions({searchString: $event.value || '', loadMore: $event.loadMore})); + this.store.dispatch(getTablesFilterProjectsOptions({searchString: $event.value || '', loadMore: $event.loadMore, allowPublic: false})); } closeDialog() { diff --git a/src/app/webapp-common/shared/project-dialog/project-move-to-form/project-move-to-form.component.html b/src/app/webapp-common/shared/project-dialog/project-move-to-form/project-move-to-form.component.html index 4d028be2..cbd8c955 100755 --- a/src/app/webapp-common/shared/project-dialog/project-move-to-form/project-move-to-form.component.html +++ b/src/app/webapp-common/shared/project-dialog/project-move-to-form/project-move-to-form.component.html @@ -1,9 +1,8 @@
-
Move {{projectName | shortProjectName}} from {{projectName | projectLocation}}
-
To {{project.parent}} - Project… -
+
Move
+
{{projectName | shortProjectName}} from {{projectName | projectLocation}}
+
To
+
{{project.parent}} Project…
-
- +
+
Loading more...
diff --git a/src/app/webapp-common/shared/project-dialog/project-move-to-form/project-move-to-form.component.scss b/src/app/webapp-common/shared/project-dialog/project-move-to-form/project-move-to-form.component.scss index 7404435e..bfa07d75 100755 --- a/src/app/webapp-common/shared/project-dialog/project-move-to-form/project-move-to-form.component.scss +++ b/src/app/webapp-common/shared/project-dialog/project-move-to-form/project-move-to-form.component.scss @@ -2,7 +2,10 @@ :host { .creat-new-suffix { + display: inline-block; margin-right: 18px; + font-size: 14px; + transform: translateY(-4px); } .buttons { @@ -25,47 +28,31 @@ } } - .line { - line-height: 2; - } - .create-project-button { padding-top: 32px; } .dynamic-subtitle { - padding: 9px; - margin-bottom: 9px; + display: grid; + grid-template-columns: auto 1fr; + gap: 12px 6px; + padding: 12px; + margin-bottom: 12px; + border-radius: 4px; background-color: $blue-50; .p-name { - font-weight: bold; - max-width: calc(100% - 38px); - display: inline-block; - vertical-align: middle; + color: $blue-600; + font-weight: 500; + word-break: break-word; /* prevent long strings from breaking the layout */ } .p-holder { - opacity: 0.3; - font-weight: bold; - font-stretch: normal; - font-style: normal; - line-height: 1.5; - color: $blue-500; + opacity: 0.6; + font-weight: 500; } } - small.text-danger { - //position: absolute !important; - //top: -15px; - } - - #project-description { - max-height: 250px; - padding-top: 12px; - height: 65px; - } - mat-form-field { width: 100%; @@ -73,8 +60,4 @@ min-height: 68px; } } - - .search-icon { - transform: translateY(3px); - } } diff --git a/src/app/webapp-common/shared/queue-create-dialog/create-new-queue-form/create-new-queue-form.component.html b/src/app/webapp-common/shared/queue-create-dialog/create-new-queue-form/create-new-queue-form.component.html index c6f37f4a..9859eb9c 100755 --- a/src/app/webapp-common/shared/queue-create-dialog/create-new-queue-form/create-new-queue-form.component.html +++ b/src/app/webapp-common/shared/queue-create-dialog/create-new-queue-form/create-new-queue-form.component.html @@ -16,11 +16,9 @@

-
-
- -
+
+
diff --git a/src/app/webapp-common/shared/queue-create-dialog/create-new-queue-form/create-new-queue-form.component.scss b/src/app/webapp-common/shared/queue-create-dialog/create-new-queue-form/create-new-queue-form.component.scss index 2edb23d0..91cb3de2 100755 --- a/src/app/webapp-common/shared/queue-create-dialog/create-new-queue-form/create-new-queue-form.component.scss +++ b/src/app/webapp-common/shared/queue-create-dialog/create-new-queue-form/create-new-queue-form.component.scss @@ -5,7 +5,8 @@ } .create-queue-button { - padding-top: 32px; + width: 100%; + padding: 32px 12px 0; } small.text-danger { diff --git a/src/app/webapp-common/shared/queue-create-dialog/queue-create-dialog.component.ts b/src/app/webapp-common/shared/queue-create-dialog/queue-create-dialog.component.ts index 3cb74357..13576539 100755 --- a/src/app/webapp-common/shared/queue-create-dialog/queue-create-dialog.component.ts +++ b/src/app/webapp-common/shared/queue-create-dialog/queue-create-dialog.component.ts @@ -20,7 +20,7 @@ export class QueueCreateDialogComponent implements OnInit, OnDestroy { constructor(private store: Store, private matDialogRef: MatDialogRef, @Inject(MAT_DIALOG_DATA) public data) { if (data) { - this.queue = data; + this.queue = {...data}; this.editMode = true; } this.queues$ = this.store.select(createQueueSelectors.selectQueues); diff --git a/src/app/webapp-common/shared/services/breadcrumbs.service.ts b/src/app/webapp-common/shared/services/breadcrumbs.service.ts index 0207ba8b..266e3c0e 100644 --- a/src/app/webapp-common/shared/services/breadcrumbs.service.ts +++ b/src/app/webapp-common/shared/services/breadcrumbs.service.ts @@ -35,7 +35,11 @@ export class BreadcrumbsService implements OnDestroy { this.store.dispatch(setBreadcrumbs({ breadcrumbs: [ [breadcrumbOptions.featureBreadcrumb], - ...(projectAncestors?.length > 0 ? [projectAncestors?.filter(ancestor => (!breadcrumbOptions.projectsOptions.filterBaseNameWith || !breadcrumbOptions.projectsOptions.filterBaseNameWith.includes(ancestor.basename))) + ...([projectAncestors + ?.filter(ancestor => + !breadcrumbOptions.projectsOptions.filterBaseNameWith || + !breadcrumbOptions.projectsOptions.filterBaseNameWith.includes(ancestor.basename) + ) .map(ancestor => ({ name: ancestor.basename, example: isExample(ancestor), @@ -43,9 +47,10 @@ export class BreadcrumbsService implements OnDestroy { type: CrumbTypeEnum.Project, hidden: ancestor.hidden, collapsable: true - }))] : []), + })) + ] ?? []), ...(breadcrumbOptions.projectsOptions?.selectedProjectBreadcrumb ? [[breadcrumbOptions.projectsOptions.selectedProjectBreadcrumb]] : []), - ...(breadcrumbOptions.subFeatureBreadcrumb ? [[breadcrumbOptions.subFeatureBreadcrumb]] : []), + ...(breadcrumbOptions.subFeatureBreadcrumb && (!breadcrumbOptions.subFeatureBreadcrumb.onlyWithProject || projectAncestors?.length > 0) ? [[breadcrumbOptions.subFeatureBreadcrumb]] : []), ] })); }) diff --git a/src/app/webapp-common/shared/services/color-hash/color-hash.service.ts b/src/app/webapp-common/shared/services/color-hash/color-hash.service.ts index ab794846..02e1dc6c 100755 --- a/src/app/webapp-common/shared/services/color-hash/color-hash.service.ts +++ b/src/app/webapp-common/shared/services/color-hash/color-hash.service.ts @@ -1,12 +1,11 @@ import { Injectable } from '@angular/core'; import {BehaviorSubject} from 'rxjs'; import {Store} from '@ngrx/store'; -import {UsersState} from '@common/core/reducers/users-reducer'; import {filter, take} from 'rxjs/operators'; import {selectColorPreferences} from '../../ui-components/directives/choose-color/choose-color.reducer'; import {addUpdateColorPreferences, ColorPreference} from '../../ui-components/directives/choose-color/choose-color.actions'; import stc from 'string-to-color'; -import tinycolor from 'tinycolor2'; +import { TinyColor } from '@ctrl/tinycolor'; export interface ColorCache {[label: string]: number[]} export const DOT_PLACEHOLDER = '--DOT--'; @@ -37,7 +36,7 @@ export class ColorHashService { if (colorCache) { return colorCache; } - const tColor = tinycolor(stc(label)); + const tColor = new TinyColor(stc(label)); const tLum = tColor.getLuminance(); if (tLum < 0.3 && lighten) { tColor.lighten(30 - tLum * 100); @@ -76,14 +75,13 @@ export class ColorHashService { setColorForString(str: string, color: number[], savePreference: boolean = true) { if (savePreference) { this.updateColorCache(str, color); - const cleanString = str.replace(/\./, DOT_PLACEHOLDER); - this.store.dispatch(addUpdateColorPreferences({[cleanString]: color})); + this.store.dispatch(addUpdateColorPreferences({[str]: color})); } } public hex(hash: string) { const rgb = this.initColor(hash); - return tinycolor({r: rgb[0], g: rgb[1], b: rgb[2], a: rgb[3]}).toHexString(); + return new TinyColor({r: rgb[0], g: rgb[1], b: rgb[2], a: rgb[3]}).toHexString(); } public getRgbString(str, opacity = -1) { diff --git a/src/app/webapp-common/shared/services/color-hash/color-hash.utils.ts b/src/app/webapp-common/shared/services/color-hash/color-hash.utils.ts index dcbfeddc..f625a6cb 100644 --- a/src/app/webapp-common/shared/services/color-hash/color-hash.utils.ts +++ b/src/app/webapp-common/shared/services/color-hash/color-hash.utils.ts @@ -1,7 +1,7 @@ -import tinycolor from 'tinycolor2'; +import { TinyColor } from '@ctrl/tinycolor'; export const rgbList2Hex = (rgbArray: number[]) => - tinycolor({r: rgbArray[0], g: rgbArray[1], b: rgbArray[2], ...(rgbArray.length === 4 && {a: rgbArray[3]})}).toHexString(); + new TinyColor({r: rgbArray[0], g: rgbArray[1], b: rgbArray[2], ...(rgbArray.length === 4 && {a: rgbArray[3]})}).toHexString(); export const RGB2HEX = (rgbArray: number[]) => { if (!rgbArray) { @@ -17,16 +17,95 @@ export const rgba2String = (rgba: number[]) => `rgba(${rgba.join(',')})`; export const normalizeColorToString = (color) => { if (typeof color === 'string') { - return tinycolor(color).toHexString(); + return new TinyColor(color).toHexString(); } if (Array.isArray(color)) { return rgbList2Hex(color); } + return color; }; export const hexToRgb = hex => { - const {r, g, b} = tinycolor(hex).toRgb(); + const {r, g, b} = new TinyColor(hex).toRgb(); return [r, g, b]; }; export const invertRgb = (rgb: [number, number, number]) => rgb.map(c => 255 - c); + +export function rgbToHsl(rgbArray): [number, number, number] { + let [r, g, b] = [...rgbArray]; + r /= 255, g /= 255, b /= 255; + + const max = Math.max(r, g, b), min = Math.min(r, g, b); + let h, s, l = (max + min) / 2; + + if (max == min) { + h = s = 0; // achromatic + } else { + const d = max - min; + s = l > 0.5 ? d / (2 - max - min) : d / (max + min); + + switch (max) { + case r: + h = (g - b) / d + (g < b ? 6 : 0); + break; + case g: + h = (b - r) / d + 2; + break; + case b: + h = (r - g) / d + 4; + break; + } + + h /= 6; + } + + return [h, s, l]; +} + +export function hslToRgb(hslArray) { + // const [h, s, l, a] = [...hslArray]; Skip this line for performance + let r, g, b; + + if (hslArray[1] === 0) { + r = g = b = hslArray[2]; // achromatic + } else { + const q = hslArray[2] < 0.5 ? hslArray[2] * (1 + hslArray[1]) : hslArray[2] + hslArray[1] - hslArray[2] * hslArray[1]; + const p = 2 * hslArray[2] - q; + + r = hue2rgb(p, q, hslArray[0] + 1 / 3); + g = hue2rgb(p, q, hslArray[0]); + b = hue2rgb(p, q, hslArray[0] - 1 / 3); + } + + return [Math.floor(r * 255), Math.floor(g * 255), Math.floor(b * 255), hslArray[3] ? hslArray[3] : null]; +} + +export function hue2rgb(p, q, t) { + if (t < 0) t += 1; + if (t > 1) t -= 1; + if (t < 1 / 6) return p + (q - p) * 6 * t; + if (t < 1 / 2) return q; + if (t < 2 / 3) return p + (q - p) * (2 / 3 - t) * 6; + return p; +} + +export function getLuminanace(r, g, b) { + const a = [r, g, b].map(function (v) { + v /= 255; + return v <= 0.03928 + ? v / 12.92 + : Math.pow((v + 0.055) / 1.055, 2.4); + }); + return a[0] * 0.2126 + a[1] * 0.7152 + a[2] * 0.0722; +} + +export function getHslContrast(hsl1, hsl2): number { + return getContrast(hslToRgb(hsl1), hslToRgb(hsl2)); +} + +export function getContrast(rgb1, rgb2) { + const l1 = getLuminanace(rgb1[0], rgb1[1], rgb1[2]) + 0.05; + const l2 = getLuminanace(rgb2[0], rgb2[1], rgb2[2]) + 0.05; + return (Math.max(l1, l2) / Math.min(l1, l2)); +} diff --git a/src/app/webapp-common/shared/services/configuration.service.ts b/src/app/webapp-common/shared/services/configuration.service.ts index 5cff75cc..a9c7e7c8 100644 --- a/src/app/webapp-common/shared/services/configuration.service.ts +++ b/src/app/webapp-common/shared/services/configuration.service.ts @@ -2,7 +2,7 @@ import {Injectable} from '@angular/core'; import {environment} from '../../../../environments/environment'; import {HttpClient} from '@angular/common/http'; import {BehaviorSubject, of, timer, throwError} from 'rxjs'; -import {catchError, map, retryWhen, mergeMap} from 'rxjs/operators'; +import {catchError, retryWhen, mergeMap, tap} from 'rxjs/operators'; import {Environment} from '../../../../environments/base'; import { retryOperation } from '../utils/promie-with-retry'; @@ -31,10 +31,7 @@ export class ConfigurationService { mergeMap((err, i) => i > 2 ? throwError('Error from retry!') : timer(500)) )), catchError(() => of({})), - map(env => { - ConfigurationService.globalEnvironment = {...ConfigurationService.globalEnvironment, ...env}; - this.globalEnvironmentObservable.next(ConfigurationService.globalEnvironment); - }) + tap(env => this.setEnv(env)) ); } diff --git a/src/app/webapp-common/shared/services/dag-manager-unsorted.service.ts b/src/app/webapp-common/shared/services/dag-manager-unsorted.service.ts index 9bd71946..dbff3613 100644 --- a/src/app/webapp-common/shared/services/dag-manager-unsorted.service.ts +++ b/src/app/webapp-common/shared/services/dag-manager-unsorted.service.ts @@ -6,7 +6,7 @@ import {DagManagerService, DagModelItem} from '@ngneat/dag'; }) export class DagManagerUnsortedService extends DagManagerService { - convertArrayToDagModel(itemsArray: Array): Array> { + override convertArrayToDagModel(itemsArray: Array): Array> { const result = []; const levels = {}; diff --git a/src/app/webapp-common/shared/services/error.service.ts b/src/app/webapp-common/shared/services/error.service.ts index 83a00fec..f3f2bb32 100644 --- a/src/app/webapp-common/shared/services/error.service.ts +++ b/src/app/webapp-common/shared/services/error.service.ts @@ -37,7 +37,7 @@ export class ErrorService { 57: this.template`Account already exists for this ${'provider'} identity. Use 'Log In' Instead.`, 58: this.template`No account exists. Use the provider you signed up with or sign up to create a new account`, 62: this.template`Please check your email to continue the signup process`, - 67: this.template`${'email'} is not registered - please contact your admin`, + 67: this.template`${'email'} does not have access to ClearML - Ask your admin to whitelist this address`, 1205: this.template`This workspace is at its limit for concurrently running instances.`, 509: this.template`Can't edit frame's metadata for published version.` } diff --git a/src/app/webapp-common/shared/services/login.service.ts b/src/app/webapp-common/shared/services/login.service.ts index 559c22bf..2b8d7a53 100644 --- a/src/app/webapp-common/shared/services/login.service.ts +++ b/src/app/webapp-common/shared/services/login.service.ts @@ -1,11 +1,11 @@ -import {Injectable} from '@angular/core'; +import {inject, Injectable} from '@angular/core'; import {HttpClient, HttpHeaders} from '@angular/common/http'; -import {catchError, filter, map, mergeMap, retryWhen, switchMap, tap} from 'rxjs/operators'; +import {catchError, filter, map, retry, switchMap, take, tap} from 'rxjs/operators'; import {HTTP} from '~/app.constants'; import {UsersGetAllResponse} from '~/business-logic/model/users/usersGetAllResponse'; import {AuthCreateUserResponse} from '~/business-logic/model/auth/authCreateUserResponse'; import {v1 as uuidV1} from 'uuid'; -import {EMPTY, Observable, of, throwError, timer} from 'rxjs'; +import {EMPTY, Observable, of, timer} from 'rxjs'; import {MatDialog} from '@angular/material/dialog'; import {ConfirmDialogComponent} from '../ui-components/overlay/confirm-dialog/confirm-dialog.component'; import {LoginModeResponse} from '~/business-logic/model/LoginModeResponse'; @@ -40,6 +40,13 @@ export class BaseLoginService { private _loginMode: LoginMode; private _guestUser: { enabled: boolean; username: string; password: string }; private environment: Environment; + protected httpClient: HttpClient; + protected loginApi: ApiLoginService; + protected dialog: MatDialog; + protected configService: ConfigurationService; + protected store: Store; + protected router: Router; + protected userPreferences: UserPreferences; get guestUser() { return clone(this._guestUser); } @@ -48,16 +55,15 @@ export class BaseLoginService { return this._authenticated; } - constructor( - protected httpClient: HttpClient, - protected loginApi: ApiLoginService, - protected dialog: MatDialog, - protected configService: ConfigurationService, - protected store: Store, - protected router: Router, - protected userPreferences: UserPreferences - ) { - configService.globalEnvironmentObservable.subscribe(env => { + constructor() { + this.httpClient = inject(HttpClient); + this.loginApi = inject(ApiLoginService); + this.dialog = inject(MatDialog); + this.configService = inject(ConfigurationService); + this.store = inject(Store); + this.router = inject(Router); + this.userPreferences = inject(UserPreferences); + this.configService.globalEnvironmentObservable.subscribe(env => { const firstLogin = !window.localStorage.getItem(USER_PREFERENCES_KEY.firstLogin); this.environment = env; this.signupMode = !!this.environment.communityServer && firstLogin; @@ -72,12 +78,10 @@ export class BaseLoginService { }); return this.getLoginMode().pipe( - retryWhen(errors => errors.pipe( - mergeMap((err, i) => i > 2 ? throwError(() => 'Error from retry!') : timer(500)) - )), - catchError(() => { + retry({count: 3, delay: (err, count) => timer(500 * count)}), + catchError(err => { this.openServerError(); - return of({}); + throw err; }), switchMap(mode => mode === loginModes.simple ? this.httpClient.get('credentials.json') : of(fromEnv())), catchError(() => of(fromEnv())), @@ -167,12 +171,11 @@ export class BaseLoginService { .pipe(map((x: any) => x.data.id)); } - autoLogin(name: string, callback: (res) => void) { + autoLogin(name: string) { return this.createUser(name) - .subscribe(id => this.login(id) - .subscribe((res: any) => { - callback(res); - })); + .pipe( + switchMap(id => this.login(id)), + ); } // eslint-disable-next-line @typescript-eslint/naming-convention @@ -243,14 +246,6 @@ After the issue is resolved and Trains Server is up and running, reload this pag this._loginMode = undefined; } - afterLogin(resolve, store) { - this.userPreferences.loadPreferences() - .subscribe(() => { - store.dispatch(fetchCurrentUser()); - resolve(null); - }); - } - loginFlow(resolve, skipInvite = false) { if (location.search.includes('invite') && !skipInvite) { const currentURL = new URL(location.href); @@ -266,10 +261,25 @@ After the issue is resolved and Trains Server is up and running, reload this pag ) { if (this.guestUser?.enabled) { this.passwordLogin(this.guestUser.username, this.guestUser.password) - .subscribe(() => this.afterLogin.bind(this)(resolve, this.store)); + .pipe( + take(1), + switchMap(() => this.userPreferences.loadPreferences()) + ) + .subscribe(() => { + this.store.dispatch(fetchCurrentUser()); + resolve(null); + }); } else if (ConfigurationService.globalEnvironment.autoLogin) { const name = `${(new Date()).getTime().toString()}`; - this.autoLogin(name, this.afterLogin.bind(this, resolve, this.store)); + this.autoLogin(name) + .pipe( + take(1), + switchMap(() => this.userPreferences.loadPreferences()) + ) + .subscribe(() => { + this.store.dispatch(fetchCurrentUser()); + resolve(null) + }); } else { resolve(null); } @@ -293,6 +303,7 @@ After the issue is resolved and Trains Server is up and running, reload this pag } } + // eslint-disable-next-line @typescript-eslint/no-unused-vars getInviteInfo(inviteId: string): Observable { return EMPTY; } diff --git a/src/app/webapp-common/shared/services/report-code-embed-base.service.ts b/src/app/webapp-common/shared/services/report-code-embed-base.service.ts index 9f4bd16d..c0e75b9a 100644 --- a/src/app/webapp-common/shared/services/report-code-embed-base.service.ts +++ b/src/app/webapp-common/shared/services/report-code-embed-base.service.ts @@ -1,4 +1,4 @@ -import {Injectable} from '@angular/core'; +import {inject, Injectable} from '@angular/core'; import {Store} from '@ngrx/store'; import {addMessage} from '@common/core/actions/layout.actions'; import {LocationStrategy} from '@angular/common'; @@ -29,13 +29,16 @@ export interface ReportCodeEmbedConfiguration { export class ReportCodeEmbedBaseService { private workspace: GetCurrentUserResponseUserObjectCompany; private isCommunity: boolean; + protected store: Store; + protected locationStrategy: LocationStrategy; + protected configService: ConfigurationService; + protected _clipboardService: ClipboardService; - constructor( - protected store: Store, - protected locationStrategy: LocationStrategy, - protected configService: ConfigurationService, - protected _clipboardService: ClipboardService - ) { + constructor() { + this.store = inject(Store); + this.locationStrategy = inject(LocationStrategy); + this.configService = inject(ConfigurationService); + this._clipboardService = inject(ClipboardService); this.isCommunity = this.configService.getStaticEnvironment().communityServer; this.store.select(selectActiveWorkspace).subscribe(workspace => this.workspace = workspace); } diff --git a/src/app/webapp-common/shared/shared.module.ts b/src/app/webapp-common/shared/shared.module.ts index a15c11d8..6323241b 100755 --- a/src/app/webapp-common/shared/shared.module.ts +++ b/src/app/webapp-common/shared/shared.module.ts @@ -22,7 +22,6 @@ import {TableModule} from 'primeng/table'; import {SectionHeaderComponent} from './components/section-header/section-header.component'; import {LineChartComponent} from './components/charts/line-chart/line-chart.component'; import {DonutComponent} from './components/charts/donut/donut.component'; -import {ExperimentRefreshComponent} from './components/experiment-refresh/experiment-refresh.component'; import {CustomColumnsListComponent} from './components/custom-columns-list/custom-columns-list.component'; import {BaseContextMenuComponent} from './components/base-context-menu/base-context-menu.component'; import {EntityFooterComponent} from './entity-page/entity-footer/entity-footer.component'; @@ -56,6 +55,7 @@ import { ExperimentTypeIconLabelComponent } from '@common/shared/experiment-type-icon-label/experiment-type-icon-label.component'; import {LabeledFormFieldDirective} from '@common/shared/directive/labeled-form-field.directive'; +import {EllipsisMiddleDirective} from '@common/shared/ui-components/directives/ellipsis-middle.directive'; const _declarations = [ ExperimentInfoHeaderStatusProgressBarComponent, @@ -68,7 +68,6 @@ const _declarations = [ SectionHeaderComponent, LineChartComponent, DonutComponent, - ExperimentRefreshComponent, CustomColumnsListComponent, EntityFooterComponent, CheckPermissionDirective, @@ -101,6 +100,7 @@ const _declarations = [ LMarkdownEditorModule, SharedPipesModule, LabeledFormFieldDirective, + EllipsisMiddleDirective, ], declarations: [ ..._declarations, diff --git a/src/app/webapp-common/shared/single-graph/graph-viewer/graph-viewer.component.html b/src/app/webapp-common/shared/single-graph/graph-viewer/graph-viewer.component.html index df31a48b..5ff21ca2 100644 --- a/src/app/webapp-common/shared/single-graph/graph-viewer/graph-viewer.component.html +++ b/src/app/webapp-common/shared/single-graph/graph-viewer/graph-viewer.component.html @@ -1,6 +1,17 @@
-
{{chart?.metric}} - {{chart?.layout?.title || chart?.metric}}
+
+ + + {{chart?.metric}} - {{chart?.variants?.length > 1 ? chart.variants.join(', ') : chart?.layout?.title || chart?.metric}} + +
@@ -70,6 +81,7 @@ [disabled]="smoothType === smoothTypeEnum.any" [(ngModel)]="smoothWeight" (ngModelChange)="changeWeight($any($event))" + (blur)="smoothWeight === null && changeWeight(-1)" /> @@ -102,7 +114,7 @@ [isCompare]="isCompare" [xAxisType]="xAxisType" [yAxisType]="yAxisType" - [moveLegendToTitle]="false" + [moveLegendToTitle]="data.moveLegendToTitle && !chart.layout.showlegend" [legendConfiguration]="this.data.legendConfiguration || {}" [isDarkTheme]="darkTheme" [graphsNumber]="9999" diff --git a/src/app/webapp-common/shared/single-graph/graph-viewer/graph-viewer.component.scss b/src/app/webapp-common/shared/single-graph/graph-viewer/graph-viewer.component.scss index 9a8d5d14..e57a85e1 100644 --- a/src/app/webapp-common/shared/single-graph/graph-viewer/graph-viewer.component.scss +++ b/src/app/webapp-common/shared/single-graph/graph-viewer/graph-viewer.component.scss @@ -62,6 +62,14 @@ color: $blue-500; } + .title-color { + display: inline-block; + width: 10px; + height: 10px; + margin-right: 6px; + cursor: pointer; + } + height: 56px; display: flex; align-items: center; diff --git a/src/app/webapp-common/shared/single-graph/graph-viewer/graph-viewer.component.ts b/src/app/webapp-common/shared/single-graph/graph-viewer/graph-viewer.component.ts index c1d536cb..7d85db19 100644 --- a/src/app/webapp-common/shared/single-graph/graph-viewer/graph-viewer.component.ts +++ b/src/app/webapp-common/shared/single-graph/graph-viewer/graph-viewer.component.ts @@ -21,6 +21,7 @@ import {getSignedUrl} from '@common/core/actions/common-auth.actions'; import {selectSignedUrl} from '@common/core/reducers/common-auth-reducer'; import {AxisType} from 'plotly.js'; import {SmoothTypeEnum, smoothTypeEnum} from '@common/shared/single-graph/single-graph.utils'; +import {SingleGraphComponent} from "@common/shared/single-graph/single-graph.component"; export interface GraphViewerData { chart: ExtFrame; @@ -31,6 +32,7 @@ export interface GraphViewerData { smoothType?: SmoothTypeEnum; darkTheme: boolean; isCompare: boolean; + moveLegendToTitle: boolean; embedFunction: (data: {xaxis: ScalarKeyEnum; domRect: DOMRect}) => null; legendConfiguration: Partial; } @@ -41,7 +43,7 @@ export interface GraphViewerData { styleUrls: ['./graph-viewer.component.scss'] }) export class GraphViewerComponent implements AfterViewInit, OnInit, OnDestroy { - @ViewChild('singleGraph') singleGraph; + @ViewChild('singleGraph') singleGraph: SingleGraphComponent; @ViewChild('modalContainer') modalContainer; public height; public width; @@ -178,6 +180,10 @@ export class GraphViewerComponent implements AfterViewInit, OnInit, OnDestroy { parsingError && this.store.dispatch(addMessage('warn', `Couldn't read all plots. Please make sure all plots are properly formatted (NaN & Inf aren't supported).`, [], true)); Object.values(graphs).forEach((graphss: ExtFrame[]) => { graphss.forEach((graph: ExtFrame) => { + graph.data?.forEach((d, i) => d.visible = this.data.chart.data[i]?.visible) + // if (this.data.chart?.layout?.showlegend === false) { + graph.layout.showlegend = this.data.chart?.layout?.showlegend ?? false; + // } if ((graph?.layout?.images?.length ?? 0) > 0) { graph.layout.images.forEach((image: Plotly.Image) => { this.store.dispatch(getSignedUrl({ @@ -240,6 +246,7 @@ export class GraphViewerComponent implements AfterViewInit, OnInit, OnDestroy { this.singleGraph.shouldRefresh = true; } this.chart = cloneDeep(chart); + console.log(this.chart?.data[0].line?.color); this.cdr.detectChanges(); })); this.sub.add(this.iterationChanged$ @@ -281,7 +288,7 @@ export class GraphViewerComponent implements AfterViewInit, OnInit, OnDestroy { } changeWeight(value: number) { - if (value === 0) { + if (value === 0 || value === null) { return; } if (value > (this.smoothType === smoothTypeEnum.exponential ? 0.999 : 100) || value < (this.smoothType === smoothTypeEnum.exponential ? 0 : 1)) { diff --git a/src/app/webapp-common/shared/single-graph/plotly-graph-base.ts b/src/app/webapp-common/shared/single-graph/plotly-graph-base.ts index 78226282..2c618dea 100644 --- a/src/app/webapp-common/shared/single-graph/plotly-graph-base.ts +++ b/src/app/webapp-common/shared/single-graph/plotly-graph-base.ts @@ -1,9 +1,9 @@ import {Subscription} from 'rxjs'; -import {Component, Input, OnDestroy} from '@angular/core'; -import {Config, Frame, Layout, Legend, PlotData} from 'plotly.js'; +import {Component, inject, Input, OnDestroy} from '@angular/core'; +import plotly from 'plotly.js'; import {selectScaleFactor} from '@common/core/reducers/view.reducer'; import {Store} from '@ngrx/store'; -import tinycolor from 'tinycolor2'; +import { TinyColor } from '@ctrl/tinycolor'; export const DARK_THEME_GRAPH_LINES_COLOR = '#39405f'; export const DARK_THEME_GRAPH_TICK_COLOR = '#c1cdf3'; @@ -12,7 +12,7 @@ export interface VisibleExtFrame extends ExtFrame { visible: boolean; } -export interface ExtFrame extends Omit { +export interface ExtFrame extends Omit { iter: number; metric: string; task: string; @@ -23,22 +23,23 @@ export interface ExtFrame extends Omit { worker: string; data: ExtData[]; layout: Partial; - config: Partial; + config: Partial; + tags?: string[]; } -export interface ExtLegend extends Legend { +export interface ExtLegend extends plotly.Legend { valign: 'top' | 'middle' | 'bottom'; itemwidth: number; } -export interface ExtLayout extends Omit { +export interface ExtLayout extends Omit { type: string; legend: Partial; uirevision: number | string; name: string; } -export interface ExtData extends PlotData { +export interface ExtData extends plotly.PlotData { task: string; cells: any; header: any; @@ -58,19 +59,21 @@ export abstract class PlotlyGraphBaseComponent implements OnDestroy { protected colorSub: Subscription; public isSmooth = false; public scaleFactor: number; + protected store: Store; - @Input() isCompare: boolean = false; + @Input() isCompare= false; - protected constructor(protected store: Store) { - this.sub.add(store.select(selectScaleFactor).subscribe(scaleFactor => this.scaleFactor = scaleFactor)); + protected constructor() { + this.store = inject(Store); + this.sub.add(this.store.select(selectScaleFactor).subscribe(scaleFactor => this.scaleFactor = scaleFactor)); } public _reColorTrace(trace: ExtData, newColor: number[]): void { if (Array.isArray(trace.line?.color) || Array.isArray(trace.marker?.color)) { return; } - const colorString = tinycolor({r: newColor[0], g: newColor[1], b: newColor[2]}) + const colorString = new TinyColor({r: newColor[0], g: newColor[1], b: newColor[2]}) .lighten((this.isSmooth && !trace.isSmoothed) ? 20 : 0).toRgbString(); if (trace.marker) { trace.marker.color = colorString; @@ -104,7 +107,7 @@ export abstract class PlotlyGraphBaseComponent implements OnDestroy { continue; } const name = data[i].name; - if (namesHash[name]) { + if (namesHash[name] && name !== data[i].legendgroup) { namesHash[name].push(i); } else { namesHash[name] = [i]; @@ -118,7 +121,7 @@ export abstract class PlotlyGraphBaseComponent implements OnDestroy { data[key].colorHash = data[key].name; // Warning: "data[key].task" in compare case. taskId in subplots (multiple plots with same name) if (data[key].task || taskId) { - data[key].name = `${data[key].name}.${(data[key].task || taskId).substring(0, 7)}`; + data[key].name = `${data[key].name}.${(data[key].task || taskId).substring(0, 6)}`; } } return data; diff --git a/src/app/webapp-common/shared/single-graph/single-graph.component.html b/src/app/webapp-common/shared/single-graph/single-graph.component.html index 1feec54c..72117f9f 100644 --- a/src/app/webapp-common/shared/single-graph/single-graph.component.html +++ b/src/app/webapp-common/shared/single-graph/single-graph.component.html @@ -3,10 +3,21 @@ [class.whitebg]="!isDarkTheme" [class.dark-theme]="isDarkTheme" [class.loading]="loading" - [class.whitebg-table]="type === 'table'" - [class.move-title]="type !== 'parcoords'" + [class.whitebg-table]="type?.[0] === 'table'" + [class.move-title]="type?.[0] !== 'parcoords'" (scroll)="repositionModeBar($event.target)" > -
{{title}}
- +
+ + +
{{title}}
+ +
+
diff --git a/src/app/webapp-common/shared/single-graph/single-graph.component.scss b/src/app/webapp-common/shared/single-graph/single-graph.component.scss index 956eb219..197923ab 100644 --- a/src/app/webapp-common/shared/single-graph/single-graph.component.scss +++ b/src/app/webapp-common/shared/single-graph/single-graph.component.scss @@ -3,12 +3,15 @@ .graph-title { position: absolute; + display: flex; + gap: 12px; + align-items: center; top: 36px; width: fit-content; max-width: 100%; left: 50%; transform: translateX(-50%); - padding: 0 80px; + padding: 0 60px; z-index: 1; font-size: 16px; color: $blue-600; @@ -16,6 +19,19 @@ &.table-title { top: 20px } + + .title-color { + display: inline-block; + width: 10px; + height: 10px; + flex: 0 0 10px; + margin-right: 6px; + cursor: pointer; + } + sm-tag-list { + flex-shrink: 2; + max-width: 50%; + } } .dark-theme .graph-title { diff --git a/src/app/webapp-common/shared/single-graph/single-graph.component.ts b/src/app/webapp-common/shared/single-graph/single-graph.component.ts index ea893fcb..f262aaef 100644 --- a/src/app/webapp-common/shared/single-graph/single-graph.component.ts +++ b/src/app/webapp-common/shared/single-graph/single-graph.component.ts @@ -12,26 +12,10 @@ import { } from '@angular/core'; import {select} from 'd3-selection'; import {cloneDeep, escape} from 'lodash-es'; -import {Store} from '@ngrx/store'; -import { - AxisType, - Config, - Data, - Datum, - Margin, - ModeBarButton, - ModeBarDefaultButtons, - PlotData, - PlotlyHTMLElement, - PlotMarker, - PlotType, - Root, - deleteTraces, - react -} from 'plotly.js'; +import plotly from 'plotly.js'; import {Subject} from 'rxjs'; import {debounceTime, filter} from 'rxjs/operators'; -import tinycolor from 'tinycolor2'; +import {TinyColor} from '@ctrl/tinycolor'; import {ScalarKeyEnum} from '~/business-logic/model/events/scalarKeyEnum'; import {ColorHashService} from '@common/shared/services/color-hash/color-hash.service'; import {wordWrap} from '@common/tasks/tasks.utils'; @@ -57,10 +41,10 @@ export type ChartHoverModeEnum = 'x' | 'y' | 'closest' | false | 'x unified' | ' changeDetection: ChangeDetectionStrategy.OnPush }) export class SingleGraphComponent extends PlotlyGraphBaseComponent { - public alreadyDrawn: boolean = false; - public shouldRefresh: boolean = false; + public alreadyDrawn = false; + public shouldRefresh = false; public loading: boolean; - public type: PlotData['type'] | 'table'; + public type: Array; public ratio: number; public title: string; private originalChart: ExtFrame; @@ -74,16 +58,18 @@ export class SingleGraphComponent extends PlotlyGraphBaseComponent { private _height: number; private _hoverMode: ChartHoverModeEnum; private listeningToHoverMode = false; + public singleColorKey: string; + private drawGraph$ = new Subject<{ forceRedraw?: boolean; forceSkipReact?: boolean }>(); - private drawGraph$ = new Subject<{forceRedraw?: boolean; forceSkipReact?: boolean}>(); @Input() identifier: string; - @Input() hideTitle: boolean = false; - @Input() hideLegend: boolean = false; + @Input() hideTitle = false; + @Input() hideLegend = false; @Input() isDarkTheme: boolean; @Input() showLoaderOnDraw = true; @Input() hideMaximize: 'show' | 'hide' | 'disabled' = 'show'; @Input() legendConfiguration: Partial = {}; - @Input() yAxisType: AxisType = 'linear'; + @Input() yAxisType: plotly.AxisType = 'linear'; + private previousHoverMode: "x" | "y" | "closest" | false | "x unified" | "y unified"; @Input() set height(height: number) { this._height = height; @@ -98,7 +84,7 @@ export class SingleGraphComponent extends PlotlyGraphBaseComponent { @Input() set width(width: number) { if (this.chart) { - this.drawGraph$.next({forceRedraw: false, forceSkipReact: false}); + this.drawGraph$.next({forceRedraw: true, forceSkipReact: false}); } } @@ -126,12 +112,12 @@ export class SingleGraphComponent extends PlotlyGraphBaseComponent { .filter(d => !d.isSmoothed) .map((d, i) => d.visible === 'legendonly' ? i : null) .filter(index => index !== null); - if (clean && this.alreadyDrawn && this.type === 'scatter' && chart.data[0]?.x?.length === 1) { - (Plotly.deleteTraces as typeof deleteTraces)(this.chartElm, Array.from({length: this.chartElm.data.length ?? 0}, (v, i) => i)); + if (clean && this.alreadyDrawn && this.type[0] === 'scatter' && chart.data[0]?.x?.length === 1) { + (Plotly.deleteTraces as typeof plotly.deleteTraces)(this.chartElm, Array.from({length: this.chartElm.data.length ?? 0}, (v, i) => i)); this.modeBar = null; } this._chart = cloneDeep(chart); - if (hidden) { + if (hidden?.length > 0) { this._chart.data.forEach((d, i) => d.visible = hidden.includes(i) ? 'legendonly': true); } } @@ -143,6 +129,7 @@ export class SingleGraphComponent extends PlotlyGraphBaseComponent { @Input() set hoverMode(hoverMode) { this._hoverMode = hoverMode; + this.previousHoverMode = this.previousHoverMode ?? hoverMode; if (this.chart) { this.drawGraph$.next({forceRedraw: true, forceSkipReact: false}); } @@ -180,7 +167,7 @@ export class SingleGraphComponent extends PlotlyGraphBaseComponent { @Input() hideDownloadButtons = false; @Input() noMargins = false; @Output() hoverModeChanged = new EventEmitter(); - @Output() createEmbedCode = new EventEmitter<{xaxis: ScalarKeyEnum; domRect: DOMRect}>(); + @Output() createEmbedCode = new EventEmitter<{ xaxis: ScalarKeyEnum; domRect: DOMRect }>(); @Output() maximizeClicked = new EventEmitter(); @ViewChild('drawHere', {static: true}) plotlyContainer: ElementRef; private chartElm; @@ -192,11 +179,10 @@ export class SingleGraphComponent extends PlotlyGraphBaseComponent { protected renderer: Renderer2, private colorHash: ColorHashService, public changeDetector: ChangeDetectorRef, - protected store: Store, private dialog: MatDialog, private readonly zone: NgZone ) { - super(store); + super(); this.initColorSubscription(); this.sub.add(this.smooth$ @@ -213,7 +199,7 @@ export class SingleGraphComponent extends PlotlyGraphBaseComponent { .pipe( debounceTime(100), filter(() => !!this.chart) - ) + ) .subscribe(({forceRedraw, forceSkipReact}) => { if (this.showLoaderOnDraw) { this.loading = true; @@ -242,7 +228,7 @@ export class SingleGraphComponent extends PlotlyGraphBaseComponent { this.loading = false; this.changeDetector.detectChanges(); this.updateLegend(); - if ((data[0] as any)?.mode === 'gauge+number') { + if ((data[0] as ExtData)?.mode === 'gauge+number') { this.fixGaugeValuePositionAfterResize(); } })); @@ -251,7 +237,7 @@ export class SingleGraphComponent extends PlotlyGraphBaseComponent { this.previousHeight = this.height; if (!skipReact) { - this.zone.runOutsideAngular(() => (Plotly.react as typeof react)(root, data, layout, config).then(() => { + this.zone.runOutsideAngular(() => (Plotly.react as typeof plotly.react)(root, data, layout, config).then(() => { this.loading = false; this.changeDetector.detectChanges(); })); @@ -277,18 +263,19 @@ export class SingleGraphComponent extends PlotlyGraphBaseComponent { if (activeBtns.length > 0) { activeBtns.forEach((bt => { if (bt.attributes['data-attr'].value === 'hovermode') { - if (bt.attributes['data-val'].value !== this.hoverMode) { + if (bt.attributes['data-val'].value !== this.hoverMode && this.previousHoverMode === this.hoverMode) { this._hoverMode = bt.attributes['data-val'].value; this.hoverModeChanged.emit(bt.attributes['data-val'].value); } } })); + this.previousHoverMode = this.hoverMode; } }); this.listeningToHoverMode = true; } - drawPlotly(): [Root, Data[], Partial, Partial, Element] { + drawPlotly(): [plotly.Root, plotly.Data[], Partial, Partial, Element] { this.chartData = this.chartData || this.renderer.createElement('div'); this.chartElm = this.chartElm || this.renderer.createElement('div'); this.chartElm.classList.add('chart'); @@ -297,7 +284,7 @@ export class SingleGraphComponent extends PlotlyGraphBaseComponent { } const graph = this.formatChartLines() as ExtFrame; - this.type = (graph?.data?.[0]?.type ?? graph?.layout?.type) as PlotType; + this.type = (graph?.data?.map(dat => dat?.type ?? graph?.layout?.type)) as plotly.PlotType[]; this.title = (this.isDarkTheme || this.hideTitle) ? '' : this.getTitle(graph); let layout = { ...this.hideDownloadButtons ? {} : this.addParametersIfDarkTheme({ @@ -313,7 +300,7 @@ export class SingleGraphComponent extends PlotlyGraphBaseComponent { ...graph.layout, // eslint-disable-next-line @typescript-eslint/naming-convention ...this.addParametersIfDarkTheme({plot_bgcolor: 'transparent'}), - height: this.type === 'table' ? this.height - 20 : this.height, + height: this.type[0] === 'table' ? this.height - 20 : this.height, width: this.ratio ? (this.height * this.ratio) + RATIO_OFFSET_FIX : undefined, modebar: { color: '#5a658e', @@ -377,7 +364,7 @@ export class SingleGraphComponent extends PlotlyGraphBaseComponent { ...this.legendConfiguration, ...graph.layout.legend, }, - showlegend: !this.hideLegend && (this.chartElm.layout && Object.prototype.hasOwnProperty.call(this.chartElm.layout, 'showlegend') ? this.chartElm.layout.showlegend : graph.layout?.showlegend !== false), + showlegend: !this.moveLegendToTitle && !this.hideLegend && (this.chartElm.layout && Object.prototype.hasOwnProperty.call(this.chartElm.layout, 'showlegend') ? this.chartElm.layout.showlegend : graph.layout?.showlegend !== false), margin: graph.layout.margin ? graph.layout.margin : this.noMargins ? { l: 50, r: 50, @@ -392,53 +379,55 @@ export class SingleGraphComponent extends PlotlyGraphBaseComponent { b: 90, pad: 0, autoexpand: true - } as Partial, + } as Partial, } as Partial; - if (this.type === 'table') { - this.changeDetector.detectChanges(); - // override header design - graph.data[0].header = { - ...graph.data[0].header, - line: {width: 1, color: this.isDarkTheme ? '#5a658e' : '#d4d6e0'}, - height: 29, - align: 'left', - font: { - color: [this.isDarkTheme ? PALLET.blue200 : PALLET.blue400], - size: 12 - }, - fill: {...graph.data[0].header?.fill, color: this.isDarkTheme ? PALLET.blue800 : PALLET.blue50} - }; + graph.data.forEach(data => { + if (data.type === 'table') { + this.changeDetector.detectChanges(); + // override header design + data.header = { + ...data.header, + line: {width: 1, color: this.isDarkTheme ? '#5a658e' : '#d4d6e0'}, + height: 29, + align: 'left', + font: { + color: [this.isDarkTheme ? PALLET.blue200 : PALLET.blue400], + size: 12 + }, + fill: {...data.header?.fill, color: this.isDarkTheme ? PALLET.blue800 : PALLET.blue50} + }; - // override cells design - const isFireFox = navigator.userAgent.toLowerCase().indexOf('firefox') > -1; - graph.data[0].cells = { - ...graph.data[0].cells, - align: 'left', - height: (isFireFox && this.isDarkTheme) ? 'auto' : 30, - font: { - color: [this.isDarkTheme ? PALLET.blue200 : PALLET.blue400], - size: 12 - }, - fill: {...graph.data[0].cells, color: this.isDarkTheme ? PALLET.blue950 : '#ffffff'}, - line: {width: 1, color: this.isDarkTheme ? DARK_THEME_GRAPH_LINES_COLOR : PALLET.blue100} - }; - layout.width = Math.max((graph?.data?.[0]?.cells?.values?.length ?? 0 ) * 100, this.plotlyContainer.nativeElement.offsetWidth - 3); - layout.title = { - ...layout.title as Record, - xanchor: 'left', - xref: 'paper', - x: 0 - }; - layout.margin = { - l: 24, - t: 52, - r: 24, - b: 0 - }; - } + // override cells design + const isFireFox = navigator.userAgent.toLowerCase().indexOf('firefox') > -1; + data.cells = { + ...data.cells, + align: 'left', + height: (isFireFox && this.isDarkTheme) ? 'auto' : 30, + font: { + color: [this.isDarkTheme ? PALLET.blue200 : PALLET.blue400], + size: 12 + }, + fill: {...data.cells, color: this.isDarkTheme ? PALLET.blue950 : '#ffffff'}, + line: {width: 1, color: this.isDarkTheme ? DARK_THEME_GRAPH_LINES_COLOR : PALLET.blue100} + }; + layout.width = Math.max((data?.cells?.values?.length ?? 0) * 100, this.plotlyContainer.nativeElement.offsetWidth - 3); + layout.title = { + ...layout.title as Record, + xanchor: 'left', + xref: 'paper', + x: 0 + }; + layout.margin = { + l: 24, + t: 52, + r: 24, + b: 0 + }; + } + }) const barLayoutConfig = { - hovermode: 'closest', + hovermode: this.hoverMode ?? 'closest', }; const scatterLayoutConfig: Partial = { @@ -494,22 +483,22 @@ export class SingleGraphComponent extends PlotlyGraphBaseComponent { }; if (['multiScalar', 'scalar'].includes(graph.layout.type)) { - if (['scatter', 'scatter3d'].includes(this.type)) { + if (this.type.includes('scatter') || this.type.includes('scatter3d')) { layout = {hovermode: this.hoverMode, ...layout, ...scatterLayoutConfig} as Partial; } } - if (['bar'].includes(this.type)) { + if (this.type.includes('bar')) { layout = {...layout, ...barLayoutConfig} as Partial; } - const modeBarButtonsToAdd = ['v1hovermode', 'togglespikelines'] as undefined as ModeBarButton[]; + const modeBarButtonsToAdd = ['v1hovermode', 'togglespikelines'] as undefined as plotly.ModeBarButton[]; if (['multiScalar', 'scalar'].includes(graph.layout.type)) { modeBarButtonsToAdd.push({ name: 'Log view', title: this.getLogButtonTitle(this.yAxisType === 'log'), icon: this.getLogIcon(this.yAxisType === 'log'), - click: (gd: PlotlyHTMLElement, ev: MouseEvent) => { + click: (gd: plotly.PlotlyHTMLElement, ev: MouseEvent) => { this.yAxisType = this.yAxisType === 'log' ? 'linear' : 'log'; const icon = this.getLogIcon(this.yAxisType === 'log'); let path: SVGPathElement; @@ -573,7 +562,7 @@ export class SingleGraphComponent extends PlotlyGraphBaseComponent { } }); } - if (this.type === 'table') { + if (this.type[0] === 'table') { modeBarButtonsToAdd.push({ name: 'Download CSV', title: 'Download CSV', @@ -585,7 +574,7 @@ export class SingleGraphComponent extends PlotlyGraphBaseComponent { } if (this.exportForReport) { - const button: ModeBarButton = { + const button: plotly.ModeBarButton = { name: 'Embed', title: 'Copy embed code', attr: 'plotly-embedded-modebar-button', @@ -598,7 +587,7 @@ export class SingleGraphComponent extends PlotlyGraphBaseComponent { } if (this.hideMaximize !== 'hide') { - const maximizeButton: ModeBarButton = { + const maximizeButton: plotly.ModeBarButton = { name: 'Maximize', title: this.hideMaximize === 'disabled' ? `Can't maximize because an iframe with the same name exists` : 'Maximize Graph', attr: this.hideMaximize === 'disabled' ? 'plotly-disabled-maximize' : '', @@ -611,14 +600,14 @@ export class SingleGraphComponent extends PlotlyGraphBaseComponent { } const config = { - modeBarButtonsToRemove: (this.hideDownloadButtons ? ['sendDataToCloud', 'toImage']: ['sendDataToCloud']) as ModeBarDefaultButtons[], + modeBarButtonsToRemove: (this.hideDownloadButtons ? ['sendDataToCloud', 'toImage'] : ['sendDataToCloud']) as plotly.ModeBarDefaultButtons[], displaylogo: false, modeBarButtonsToAdd, - toImageButtonOptions : { + toImageButtonOptions: { filename: this.getExportName(this.chart), scale: 3 } - } as Config; + } as plotly.Config; return [this.chartElm, graph.data, layout, config, this.chartData]; } @@ -632,16 +621,16 @@ export class SingleGraphComponent extends PlotlyGraphBaseComponent { } private getExportName(graph: ExtFrame) { - const title = this.getTitle(graph); - if (title) { - return title; - } - const metric = this.chart.metric?.trim(); - const variant = this.chart.variant?.trim(); - if (metric && variant) { - return `${metric} - ${variant}`; - } - return `${metric || variant}` || 'chart'; + const title = this.getTitle(graph); + if (title) { + return title; + } + const metric = this.chart.metric?.trim(); + const variant = this.chart.variant?.trim(); + if (metric && variant) { + return `${metric} - ${variant}`; + } + return (metric || variant) ? `${metric || variant}` : 'chart'; } private updateLegend() { @@ -677,24 +666,25 @@ export class SingleGraphComponent extends PlotlyGraphBaseComponent { if (this.xAxisType === ScalarKeyEnum.Timestamp) { const zeroTime = graph.data[i].x[0] as number; - graph.data[i].x = (graph.data[i].x as Datum[]).map((timestamp: number) => (timestamp - zeroTime) / timeUnit.time); + graph.data[i].x = (graph.data[i].x as plotly.Datum[]).map((timestamp: number) => (timestamp - zeroTime) / timeUnit.time); // graph.data[i].hovertext = graph.data[i].x.map(timestamp => timeInWords((timestamp - zeroTime))); } if (graph.data[i].type === 'bar' && !graph.data[i].marker) { - graph.data[i].marker = {} as Partial; + graph.data[i].marker = {} as Partial; } const genColorKey = this.generateColorKey(graph, i); + this.singleColorKey = genColorKey; const wrappedText = this.legendConfiguration.noTextWrap || this.scaleFactor === 100 ? graph.data[i].name : wordWrap(graph.data[i].name, this.legendStringLength / 2); - const orgColor = this.getOriginalColor(i); + const orgColor = this.isCompare ? undefined : this.getOriginalColor(i); graph.data[i].name = wrappedText + ``; } const [colorKey, originalColor] = this.extractColorKey(graph.data[i].name); if (!Array.isArray(originalColor)) { let color; if (originalColor && !this.colorHash.hasColor(colorKey)) { - const c = tinycolor(this.getOriginalColor(i)).toRgb(); + const c = new TinyColor(this.getOriginalColor(i)).toRgb(); color = [c.r, c.g, c.b]; } else { color = this.colorHash.initColor(colorKey, null, this.isDarkTheme); @@ -721,11 +711,11 @@ export class SingleGraphComponent extends PlotlyGraphBaseComponent { } public generateColorKey(graph: ExtFrame, i: number) { - const variant = graph.data[i].colorHash || graph.data[i].colorKey || graph.data[i].name; + const variant = graph.data[i].colorHash || graph.data[i].colorKey || graph.data[i].name; if (!this.isCompare) { return `${variant}?`; // "?" to adjust desired colors (legend title is removing this ?) } else { - const task = graph.data[i].task; + const task = graph.data[i].task ?? graph.task; return `${variant}-${task}`; } } @@ -761,10 +751,10 @@ export class SingleGraphComponent extends PlotlyGraphBaseComponent { ) .subscribe(colorObj => { const graph = this.chart; - let changed: boolean = false; + let changed = false; graph?.data.forEach(trace => { const name = trace.name; - const [colorKey, ] = this.extractColorKey(name); + const [colorKey,] = this.extractColorKey(name); if (!name || !this.colorHash.hasColor(colorKey)) { return; } @@ -786,26 +776,16 @@ export class SingleGraphComponent extends PlotlyGraphBaseComponent { private subscribeColorButtons(container) { this.repositionModeBar(this.plotlyContainer.nativeElement); - if (this.moveLegendToTitle) { - const graphTitle = container.querySelector('.gtitle') as SVGTextElement; - if (graphTitle) { - const endOfTitlePosition = ( - (this.plotlyContainer.nativeElement.offsetWidth / 2) + - (graphTitle.getClientRects()[0].width * this.scaleFactor / 200) - ); - const legend = container.querySelector('.legend') as SVGGElement; - legend.style.transform = `translate(${endOfTitlePosition}px, 30px)`; - legend.classList.add('hide-text'); - } - } const traces = container.querySelectorAll('.traces'); for (const trace of traces) { + let originalColor = null const textEl = trace.querySelector('.legendtext') as SVGTextElement; const textElData = textEl.getAttribute('data-unformatted'); const [text, orgColor] = textEl ? this.extractColorKey(textElData) : ['', '']; - const {r, g, b, a} = tinycolor(orgColor).toRgb(); - const originalColor = orgColor ? [r, g, b, a] : null; - + if (orgColor) { + const {r, g, b, a} = new TinyColor(orgColor).toRgb(); + originalColor = orgColor ? [r, g, b, a] : null; + } const title = document.createElementNS('http://www.w3.org/2000/svg', 'title'); title.textContent = text.replace('?', ''); textEl.parentElement.appendChild(title); @@ -962,7 +942,8 @@ export class SingleGraphComponent extends PlotlyGraphBaseComponent { // signed url are updated after originChart was cloned - need to update images urls! chart: cloneDeep({ ...this.originalChart, - layout: {...this.originalChart.layout, images: this.chart.layout?.images} + data: this.originalChart.data.map((d, i) => ({...d, visible: this._chart.data[i].visible})), + layout: {...this.originalChart.layout, showlegend: this.moveLegendToTitle || this.chartElm.layout.showlegend, images: this.chart.layout?.images} }), id: this.identifier, xAxisType: this.xAxisType, @@ -971,6 +952,7 @@ export class SingleGraphComponent extends PlotlyGraphBaseComponent { smoothType: this.smoothType, darkTheme: this.isDarkTheme, isCompare: this.isCompare, + moveLegendToTitle: this.moveLegendToTitle, legendConfiguration: this.legendConfiguration } as GraphViewerData, panelClass: ['image-viewer-dialog', this.isDarkTheme ? 'dark-theme' : 'light-theme'], @@ -994,7 +976,7 @@ export class SingleGraphComponent extends PlotlyGraphBaseComponent { } public repositionModeBar(singleGraphEl) { - if (this.type === 'table') { + if (this.type[0] === 'table') { this.modeBar = this.modeBar || this.chartElm.querySelector('.modebar-container'); this.modeBar.style.right = `${singleGraphEl.scrollWidth - singleGraphEl.clientWidth - singleGraphEl.scrollLeft}px`; } @@ -1019,11 +1001,15 @@ export class SingleGraphComponent extends PlotlyGraphBaseComponent { public redrawPlot() { this.drawGraph$.next({forceRedraw: true, forceSkipReact: false}); - }; + } private fixGaugeValuePositionAfterResize() { - const graph = select(this.plotlyContainer.nativeElement).selectAll('.main-svg .indicatorlayer .trace'); - const graphPosition = graph.selectAll('.angular').attr('transform'); - graph.selectAll('.numbers').attr('transform', graphPosition); + select(this.plotlyContainer.nativeElement) + .selectAll('.main-svg .indicatorlayer .trace') + .each((datum, index, group) => { + const node = select(group[index]); + const graphPosition = node.selectAll('.angular').attr('transform'); + node.selectAll('.numbers').attr('transform', graphPosition); + }); } } diff --git a/src/app/webapp-common/shared/single-graph/single-graph.module.ts b/src/app/webapp-common/shared/single-graph/single-graph.module.ts index a8456917..0c4dcc59 100644 --- a/src/app/webapp-common/shared/single-graph/single-graph.module.ts +++ b/src/app/webapp-common/shared/single-graph/single-graph.module.ts @@ -12,6 +12,8 @@ import {FormsModule} from '@angular/forms'; import {MatInputModule} from '@angular/material/input'; import {TooltipDirective} from '@common/shared/ui-components/indicators/tooltip/tooltip.directive'; import {MatProgressSpinnerModule} from '@angular/material/progress-spinner'; +import {ChooseColorModule} from '@common/shared/ui-components/directives/choose-color/choose-color.module'; +import {TagListComponent} from "@common/shared/ui-components/tags/tag-list/tag-list.component"; @@ -28,6 +30,8 @@ import {MatProgressSpinnerModule} from '@angular/material/progress-spinner'; MatInputModule, TooltipDirective, MatProgressSpinnerModule, + ChooseColorModule, + TagListComponent, ] }) export class SingleGraphModule { } diff --git a/src/app/webapp-common/shared/single-graph/single-graph.utils.ts b/src/app/webapp-common/shared/single-graph/single-graph.utils.ts index 3a3fc0a0..727c3a4b 100644 --- a/src/app/webapp-common/shared/single-graph/single-graph.utils.ts +++ b/src/app/webapp-common/shared/single-graph/single-graph.utils.ts @@ -34,4 +34,5 @@ export const getSmoothedLine = (arr, weight, smoothType): number[] => { case smoothTypeEnum.exponential: return averageDebiased(arr, weight); } + return arr; }; diff --git a/src/app/webapp-common/shared/single-value-summary-table/single-value-summary-table.component.html b/src/app/webapp-common/shared/single-value-summary-table/single-value-summary-table.component.html index d9025d70..cc4fc59d 100644 --- a/src/app/webapp-common/shared/single-value-summary-table/single-value-summary-table.component.html +++ b/src/app/webapp-common/shared/single-value-summary-table/single-value-summary-table.component.html @@ -1,14 +1,15 @@
Summary
-
+
{{item.variant}}
{{item.value}}
- - + + CSV +
diff --git a/src/app/webapp-common/shared/single-value-summary-table/single-value-summary-table.component.scss b/src/app/webapp-common/shared/single-value-summary-table/single-value-summary-table.component.scss index 52a8a4c6..fbb038e3 100644 --- a/src/app/webapp-common/shared/single-value-summary-table/single-value-summary-table.component.scss +++ b/src/app/webapp-common/shared/single-value-summary-table/single-value-summary-table.component.scss @@ -2,25 +2,40 @@ .single-table-container { - border-radius: 4px; - border: solid 1px $blue-100; - + position: relative; + width: 100%; .summary-header { + height: 48px; + min-height: 48px; + max-height: 48px; padding: 12px; font-size: 16px; color: $blue-600; text-align: center; + border-radius: 4px 4px 0 0; + border: 1px solid $blue-100; + border-bottom: none; } - .items-container { - border-top: solid 1px $blue-100; - overflow: auto; + overflow: scroll; + + .wrapper { + position: absolute; + top: 48px; + left: 0; + border-radius: 0 0 4px 4px; + border: 1px solid $blue-100; + width: 100%; + height: calc(100% - 62px); + z-index: -1; + } .item { padding: 12px 24px; text-align: center; + margin-bottom: 2px; &:not(:last-child) { border-right: solid 1px $blue-100; @@ -36,6 +51,53 @@ } } } + + .csv-no-icon { + display: none; + } + + &.dark-theme { + + .summary-header { + color: $blue-300; + border-color: $dark-border; + } + + .items-container { + .wrapper { + border-color: $dark-border; + } + + .item { + &:not(:last-child) { + border-color: $dark-border; + } + + .variant { + color: $blue-300; + } + + .value { + color: $blue-100; + } + } + } + + + .csv-no-icon { + display: block; + background-color: $blue-300; + color: #fff; + font-size: 10px; + padding: 6px 2px; + border-radius: 4px; + cursor: pointer; + } + + .al-ico-csv { + display: none; + } + } } :host { @@ -70,30 +132,15 @@ } /////// DARK THEME ////////// - .dark-theme { - &.single-table-container { - border: solid 1px $dark-border; - } - - .summary-header { - color: $blue-300; - } - - .items-container { - border-top: solid 1px $dark-border; + @supports (-moz-appearance:none) { + .single-table-container .items-container { .item { - &:not(:last-child) { - border-right: solid 1px $dark-border; - } + margin-bottom: 12px; + } - .variant { - color: $blue-300; - } - - .value { - color: $blue-100; - } + .wrapper { + height: calc(100% - 60px); } } } diff --git a/src/app/webapp-common/shared/ui-components/buttons/chips-list/chips-list.component.ts b/src/app/webapp-common/shared/ui-components/buttons/chips-list/chips-list.component.ts index c6eaf560..2bd62803 100644 --- a/src/app/webapp-common/shared/ui-components/buttons/chips-list/chips-list.component.ts +++ b/src/app/webapp-common/shared/ui-components/buttons/chips-list/chips-list.component.ts @@ -28,12 +28,14 @@ export class ChipsListComponent implements AfterViewInit, OnDestroy { } ngAfterViewInit(): void { - this.calcChipsWidth(this.chips); - this.sub.add(this.chips.changes.subscribe((chips) => { - this.calcChipsWidth(chips); + setTimeout(() => { + this.calcChipsWidth(this.chips); + this.sub.add(this.chips.changes.subscribe((chips) => { + this.calcChipsWidth(chips); + this.hideChips(); + })); this.hideChips(); - })); - this.hideChips(); + }, 100) } hideChips() { diff --git a/src/app/webapp-common/shared/ui-components/buttons/chips/chips.component.ts b/src/app/webapp-common/shared/ui-components/buttons/chips/chips.component.ts index d7f6b63b..177a707a 100755 --- a/src/app/webapp-common/shared/ui-components/buttons/chips/chips.component.ts +++ b/src/app/webapp-common/shared/ui-components/buttons/chips/chips.component.ts @@ -5,7 +5,7 @@ import {FORCED_COLORS_FOR_STRING} from '../../../services/color-hash/color-hash- import {Subscription} from 'rxjs'; import {getCssTheme} from '../../../utils/shared-utils'; import {invertRgb} from '../../../services/color-hash/color-hash.utils'; -import tinycolor from 'tinycolor2'; +import { TinyColor, mostReadable } from '@ctrl/tinycolor'; @Component({ selector: 'sm-chips', @@ -19,7 +19,7 @@ export class ChipsComponent implements OnInit, OnDestroy { public backgroundColor: string; public colorIsForced: boolean = false; public colorTuple: number[]; - private _label: any; + private _label: string; private colorSub: Subscription; @Input() set label(label) { @@ -69,10 +69,10 @@ export class ChipsComponent implements OnInit, OnDestroy { return; } this.color = `rgb(${color[0]},${color[1]},${color[2]})`; - const t = tinycolor(this.color); - const background = tinycolor.mostReadable(t.toString(), t.isDark() ? - [t.lighten(20).toString(), t.lighten(15).toString(), t.lighten(15).toString()] : - [t.darken(20).toString(), t.darken(15).toString(), t.darken(15).toString()], {includeFallbackColors:false, level: 'AA'}); + const t = new TinyColor(this.color); + const background = mostReadable(t.toString(), t.isDark() ? + [t.lighten(35).toString(), t.lighten(25).toString(), t.lighten(15).toString()] : + [t.darken(35).toString(), t.darken(25).toString(), t.darken(15).toString()], {includeFallbackColors:false, level: 'AA'}); this.backgroundColor = background.toRgbString(); } diff --git a/src/app/webapp-common/shared/ui-components/data/grouped-selectable-list/grouped-selectable-list.component.html b/src/app/webapp-common/shared/ui-components/data/grouped-selectable-list/grouped-selectable-list.component.html index 91017a9b..c5666c0d 100644 --- a/src/app/webapp-common/shared/ui-components/data/grouped-selectable-list/grouped-selectable-list.component.html +++ b/src/app/webapp-common/shared/ui-components/data/grouped-selectable-list/grouped-selectable-list.component.html @@ -10,12 +10,16 @@ [class.has-children]="item.value.hasChildren" (click)="selectedItem(item, panelH)" > +
{{item.key}}
-
+ + + +
    diff --git a/src/app/webapp-common/shared/ui-components/data/grouped-selectable-list/grouped-selectable-list.component.scss b/src/app/webapp-common/shared/ui-components/data/grouped-selectable-list/grouped-selectable-list.component.scss index 1527826d..f4024685 100644 --- a/src/app/webapp-common/shared/ui-components/data/grouped-selectable-list/grouped-selectable-list.component.scss +++ b/src/app/webapp-common/shared/ui-components/data/grouped-selectable-list/grouped-selectable-list.component.scss @@ -1,13 +1,12 @@ @import "variables"; :host { - display: block; padding: 0 10px 0 24px; margin: 0; overflow: scroll; - ::ng-deep .mat-expansion-panel-header { + mat-expansion-panel-header { padding: 0; &.mat-expansion-toggle-indicator-before { @@ -37,45 +36,46 @@ } } - ::ng-deep mat-expansion-panel.no-children { - .mat-expansion-panel-body { + mat-panel-description { + justify-content: flex-end; + color: $blue-400; + } + + .no-children { + margin-left: -3px; + ::ng-deep .mat-expansion-panel-body { display: none; } + + mat-panel-description { + margin-right: 16px; + } } - ::ng-deep .mat-expansion-panel-body { - padding: 0 0 0 24px; + .list { + padding: 0; + margin: 0 -12px 0 0; - .list { - padding-left: 0; - - li { - &.list-item { - display: flex; - gap: 12px; - justify-content: space-between; - align-items: center; - border-radius: 4px; - cursor: pointer; - padding: 0 12px; - line-height: 32px; - list-style: none; - - &:hover { - background-color: $blue-50; - transition: background-color 0.2s; - } + li { + &.list-item { + display: flex; + gap: 12px; + justify-content: space-between; + align-items: center; + border-radius: 4px; + cursor: pointer; + padding: 0 4px; + line-height: 32px; + list-style: none; + &:hover { + background-color: $blue-50; + transition: background-color 0.2s; } } + } - - } - - ::ng-deep .mat-expansion-panel-header-description { - flex-grow: 0; - color: $blue-400; } .mat-expansion-panel { @@ -98,32 +98,12 @@ } } } - - ::ng-deep .mat-content { - padding-right: 2px; - - .mat-expansion-panel-header-title { - margin: unset; - color: $blue-400; - } - - } - } .gray { color: gray; } -/* -i.icon { - display: block; - font-size: 15px; - width: 15px; - height: 15px; -} -*/ - .item-key { font-size: 14px; } diff --git a/src/app/webapp-common/shared/ui-components/data/grouped-selectable-list/grouped-selectable-list.component.ts b/src/app/webapp-common/shared/ui-components/data/grouped-selectable-list/grouped-selectable-list.component.ts index 78508981..0bd12234 100644 --- a/src/app/webapp-common/shared/ui-components/data/grouped-selectable-list/grouped-selectable-list.component.ts +++ b/src/app/webapp-common/shared/ui-components/data/grouped-selectable-list/grouped-selectable-list.component.ts @@ -42,7 +42,6 @@ export class GroupedSelectableListComponent implements OnChanges { } @Input() checkedList: Array; - @Input() selected: SelectableListItem['value']; @Output() onItemSelect = new EventEmitter(); @Output() onItemCheck = new EventEmitter<{ pathString: string; parent: string }>(); @Output() onGroupCheck = new EventEmitter(); diff --git a/src/app/webapp-common/shared/ui-components/data/selectable-filter-list/selectable-filter-list.component.html b/src/app/webapp-common/shared/ui-components/data/selectable-filter-list/selectable-filter-list.component.html index a69aa21f..2f30ecfe 100644 --- a/src/app/webapp-common/shared/ui-components/data/selectable-filter-list/selectable-filter-list.component.html +++ b/src/app/webapp-common/shared/ui-components/data/selectable-filter-list/selectable-filter-list.component.html @@ -14,7 +14,6 @@
= []; - @Input() selected: string; @Input() placeholder: string = 'Search'; @Input() titleLabel: string; @Input() checkAllIcon: string; diff --git a/src/app/webapp-common/shared/ui-components/data/selectable-grouped-filter-list/selectable-grouped-filter-list.component.html b/src/app/webapp-common/shared/ui-components/data/selectable-grouped-filter-list/selectable-grouped-filter-list.component.html index 9265237a..cfcb18ba 100644 --- a/src/app/webapp-common/shared/ui-components/data/selectable-grouped-filter-list/selectable-grouped-filter-list.component.html +++ b/src/app/webapp-common/shared/ui-components/data/selectable-grouped-filter-list/selectable-grouped-filter-list.component.html @@ -15,7 +15,6 @@ = []; - @Input() selected: string; @Input() titleLabel: string; @Input() checkAllIcon: string; @Output() itemSelect = new EventEmitter(); - @Output() hiddenChanged = new EventEmitter(); + @Output() hiddenChanged = new EventEmitter(); @Output() searchTermChanged = new EventEmitter(); diff --git a/src/app/webapp-common/shared/ui-components/data/selectable-list/selectable-list.component.ts b/src/app/webapp-common/shared/ui-components/data/selectable-list/selectable-list.component.ts index 04967152..e0b86798 100644 --- a/src/app/webapp-common/shared/ui-components/data/selectable-list/selectable-list.component.ts +++ b/src/app/webapp-common/shared/ui-components/data/selectable-list/selectable-list.component.ts @@ -21,7 +21,6 @@ export class SelectableListComponent implements OnChanges{ @Input() list: SelectableListItem[] = []; @Input() checkedList: string[]; - @Input() selected: SelectableListItem['value']; @Input() checkIcon: string[] = ['al-ico-show', 'al-ico-hide']; @Output() onItemSelect = new EventEmitter(); @Output() onItemCheck = new EventEmitter(); diff --git a/src/app/webapp-common/shared/ui-components/data/simple-table/simple-table.component.html b/src/app/webapp-common/shared/ui-components/data/simple-table/simple-table.component.html index 83666bb2..3499c9e1 100755 --- a/src/app/webapp-common/shared/ui-components/data/simple-table/simple-table.component.html +++ b/src/app/webapp-common/shared/ui-components/data/simple-table/simple-table.component.html @@ -1,4 +1,4 @@ -
+
{{col.header}}
@@ -12,12 +12,10 @@ [class.draggable]="enableDragAndDrop" (click)="toggleRow(i)" > -
-
{{ noDataMessage || 'No data to show'}} diff --git a/src/app/webapp-common/shared/ui-components/data/simple-table/simple-table.component.ts b/src/app/webapp-common/shared/ui-components/data/simple-table/simple-table.component.ts index 635b87d6..5139f998 100755 --- a/src/app/webapp-common/shared/ui-components/data/simple-table/simple-table.component.ts +++ b/src/app/webapp-common/shared/ui-components/data/simple-table/simple-table.component.ts @@ -7,7 +7,7 @@ import {FormsTrackBy, trackById} from '../../../utils/forms-track-by'; templateUrl: './simple-table.component.html', styleUrls: ['./simple-table.component.scss'], }) -export class SimpleTableComponent2 extends FormsTrackBy { +export class SimpleTableComponent extends FormsTrackBy { public open = []; public trackById = trackById; diff --git a/src/app/webapp-common/shared/ui-components/data/table-card/table-card.component.scss b/src/app/webapp-common/shared/ui-components/data/table-card/table-card.component.scss index 7680e509..946ffb9b 100644 --- a/src/app/webapp-common/shared/ui-components/data/table-card/table-card.component.scss +++ b/src/app/webapp-common/shared/ui-components/data/table-card/table-card.component.scss @@ -4,12 +4,12 @@ display: grid; grid-template-columns: 20px 32px 1fr; align-items: center; - gap: 8px 12px; - padding: 30px 16px; + gap: 12px 6px; + padding: 16px; grid-template-areas: "cbx type-icon card-name" - ". . tags" - ". . data"; + ". tags tags" + ". data data"; &.two-columns { grid-template-columns: 24px 1fr; grid-template-areas: diff --git a/src/app/webapp-common/shared/ui-components/data/table/base-table-view.ts b/src/app/webapp-common/shared/ui-components/data/table/base-table-view.ts index 51937fc1..2bc88d98 100644 --- a/src/app/webapp-common/shared/ui-components/data/table/base-table-view.ts +++ b/src/app/webapp-common/shared/ui-components/data/table/base-table-view.ts @@ -18,7 +18,7 @@ export abstract class BaseTableView implements AfterViewInit, OnDestroy { public selectionState: TableSelectionState; protected entitiesKey: string; public selectedEntitiesKey: string; - public table: TableComponent; + public table: TableComponent<{id: string}>; public menuBackdrop: boolean; public searchValues: { [colId: string]: string } = {}; public filtersOptions: { [colId: string]: IOption[] } = {}; @@ -74,12 +74,12 @@ export abstract class BaseTableView implements AfterViewInit, OnDestroy { @Output() filterSearchChanged = new EventEmitter() as EventEmitter<{ colId: string; value: {value: string; loadMore?: boolean} }>; @Output() filterChanged = new EventEmitter() as EventEmitter<{ col: ISmCol; value: any; andFilter?: boolean }>; @Output() columnsReordered = new EventEmitter(); - @ViewChildren(TableComponent) tables: QueryList; + @ViewChildren(TableComponent) tables: QueryList>; ngAfterViewInit(): void { this.tables.changes - .pipe(filter((comps: QueryList) => !!comps.first), take(1)) - .subscribe((comps: QueryList) => { + .pipe(filter((comps: QueryList>) => !!comps.first), take(1)) + .subscribe((comps: QueryList>) => { this.table = comps.first; window.setTimeout(() => this.table?.focusSelected()); this.afterTableInit(); diff --git a/src/app/webapp-common/shared/ui-components/data/table/resizable-column.directive.ts b/src/app/webapp-common/shared/ui-components/data/table/resizable-column.directive.ts index 07911316..56da3023 100644 --- a/src/app/webapp-common/shared/ui-components/data/table/resizable-column.directive.ts +++ b/src/app/webapp-common/shared/ui-components/data/table/resizable-column.directive.ts @@ -1,14 +1,15 @@ -import {AfterViewInit, Directive} from '@angular/core'; +import {AfterViewInit, Directive, OnDestroy} from '@angular/core'; import {ResizableColumn} from 'primeng/table'; import {fromEvent, Subscription} from 'rxjs'; +import {cloneItemIntoDummy} from '@common/shared/utils/shared-utils'; @Directive({ selector: '[smResizableColumn]' }) -export class ResizableColumnDirective extends ResizableColumn implements AfterViewInit{ +export class ResizableColumnDirective extends ResizableColumn implements AfterViewInit, OnDestroy { private sub: Subscription; - ngAfterViewInit() { + override ngAfterViewInit() { super.ngAfterViewInit(); if (this.resizer) { this.sub = fromEvent(this.resizer, 'dblclick').subscribe((event: MouseEvent) => { @@ -21,7 +22,7 @@ export class ResizableColumnDirective extends ResizableColumn implements AfterVi } } - ngOnDestroy(): void { + override ngOnDestroy(): void { super.ngOnDestroy(); this.sub?.unsubscribe(); } @@ -36,12 +37,12 @@ export class ResizableColumnDirective extends ResizableColumn implements AfterVi // attach the dummy container to our table so all relevant styles will apply to it table.el.nativeElement.appendChild(dummyContainer); - this.cloneItemIntoDummy(column, dummyContainer); + cloneItemIntoDummy(column, dummyContainer); // add all relevant cells to dummy container rows.forEach(row => { const cells = row.getElementsByTagName('td'); if (cells.length > index) { - this.cloneItemIntoDummy(cells.item(index), dummyContainer); + cloneItemIntoDummy(cells.item(index), dummyContainer); } }); // measure and detach container @@ -51,24 +52,5 @@ export class ResizableColumnDirective extends ResizableColumn implements AfterVi return width; } - private cloneItemIntoDummy(eCell: HTMLElement, eDummyContainer: HTMLElement): void { - // shamelessly copied from ag-grid - // make a deep clone of the cell - const eCellClone: HTMLElement = eCell.cloneNode(true) as HTMLElement; - // the original has a fixed width, we remove this to allow the natural width based on content - eCellClone.style.width = ''; - // the original has position = absolute, we need to remove this so it's positioned normally - eCellClone.style.position = 'static'; - eCellClone.style.left = ''; - // we put the cell into a containing div, as otherwise the cells would just line up - // on the same line, standard flow layout, by putting them into divs, they are laid - // out one per line - const eCloneParent = document.createElement('div'); - - // table-row, so that each cell is on a row. - eCloneParent.style.display = 'table-row'; - eCloneParent.appendChild(eCellClone); - eDummyContainer.appendChild(eCloneParent); - } } diff --git a/src/app/webapp-common/shared/ui-components/data/table/table-card-filter-template/table-card-filter-template.component.ts b/src/app/webapp-common/shared/ui-components/data/table/table-card-filter-template/table-card-filter-template.component.ts index b38ee4ad..9e6039ea 100755 --- a/src/app/webapp-common/shared/ui-components/data/table/table-card-filter-template/table-card-filter-template.component.ts +++ b/src/app/webapp-common/shared/ui-components/data/table/table-card-filter-template/table-card-filter-template.component.ts @@ -21,7 +21,7 @@ export class TableCardFilterTemplateComponent { @Input() set value(value: any) { this._value = value; - this.isFiltering = this.isFiltered(); + this.isFiltering = value && this.isFiltered(); } get value() { @@ -81,7 +81,8 @@ export class TableCardFilterTemplateComponent { } isFiltered() { - return ((this.value && Object.keys(this.value).filter(col => this.value[col].length > 0).length > 0) || (this.subValue && this.subValue.length > 0)); + return (this.value && Object.keys(this.value).some(col => this.value[col]?.length > 0)) || + this.subValue?.length > 0; } @@ -111,7 +112,7 @@ export class TableCardFilterTemplateComponent { } } - getColumnByOption(option: any) { + getColumnByOption(option: {key: string}) { return this.columns.find(col => col.id === option.key); } diff --git a/src/app/webapp-common/shared/ui-components/data/table/table-duration-sort-template/table-duration-sort-base.component.ts b/src/app/webapp-common/shared/ui-components/data/table/table-duration-sort-template/table-duration-sort-base.component.ts index fe2f9d75..9c23d380 100644 --- a/src/app/webapp-common/shared/ui-components/data/table/table-duration-sort-template/table-duration-sort-base.component.ts +++ b/src/app/webapp-common/shared/ui-components/data/table/table-duration-sort-template/table-duration-sort-base.component.ts @@ -1,4 +1,4 @@ -import {ChangeDetectorRef, Component, EventEmitter, Input, Output} from '@angular/core'; +import {ChangeDetectorRef, Component, EventEmitter, inject, Input, Output} from '@angular/core'; import {getValueOrDefault, hasValue} from '../../../../utils/helpers.util'; import {ErrorStateMatcher} from '@angular/material/core'; @@ -84,6 +84,8 @@ export class DataInputOutputHelper { template: 'sm-table-duration-base' }) export abstract class TableDurationSortBaseComponent { + protected cdr: ChangeDetectorRef; + @Output() filterChanged = new EventEmitter<{ value: any }>(); @Output() hasError = new EventEmitter(); @@ -94,8 +96,10 @@ export abstract class TableDurationSortBaseComponent { abstract parseServerDataFunction(data: null | string | number): number; abstract prepareDataToServerFunction(data: null | string | number): string | number | null; - constructor(private cdr: ChangeDetectorRef) { + constructor() { + this.cdr = inject(ChangeDetectorRef); } + lessThan: IDurationThan = { checked: false, value: null diff --git a/src/app/webapp-common/shared/ui-components/data/table/table-duration-sort-template/table-filter-duration-date-time/table-filter-duration-date-time.component.ts b/src/app/webapp-common/shared/ui-components/data/table/table-duration-sort-template/table-filter-duration-date-time/table-filter-duration-date-time.component.ts index 26eeeba3..36c549d4 100644 --- a/src/app/webapp-common/shared/ui-components/data/table/table-duration-sort-template/table-filter-duration-date-time/table-filter-duration-date-time.component.ts +++ b/src/app/webapp-common/shared/ui-components/data/table/table-duration-sort-template/table-filter-duration-date-time/table-filter-duration-date-time.component.ts @@ -1,4 +1,4 @@ -import {ChangeDetectionStrategy, ChangeDetectorRef, Component, OnInit} from '@angular/core'; +import {ChangeDetectionStrategy, Component} from '@angular/core'; import {DurationParameters, TableDurationSortBaseComponent} from '../table-duration-sort-base.component'; import {TIME_IN_MILLI} from '../../../../../utils/time-util'; import {MAT_DATE_FORMATS, MAT_DATE_LOCALE} from '@angular/material/core'; @@ -65,7 +65,7 @@ export const getTimeInSecondsFromDate = (_date: number | Date): number => { ], changeDetection: ChangeDetectionStrategy.OnPush }) -export class TableFilterDurationDateTimeComponent extends TableDurationSortBaseComponent implements OnInit { +export class TableFilterDurationDateTimeComponent extends TableDurationSortBaseComponent { _selectedDate: Date; _selectedTimeInSeconds: number; @@ -79,13 +79,6 @@ export class TableFilterDurationDateTimeComponent extends TableDurationSortBase }; isFakeNowCheckbox = false; MINIMUM_TIME_DISPLAY = 0.001; - constructor(cdr: ChangeDetectorRef) { - super(cdr); - } - - ngOnInit(): void { - } - get hasGreaterThanValue() { return this._greaterThan.date || this._greaterThan.time; } diff --git a/src/app/webapp-common/shared/ui-components/data/table/table-duration-sort-template/table-filter-duration-numeric/table-filter-duration-numeric.component.ts b/src/app/webapp-common/shared/ui-components/data/table/table-duration-sort-template/table-filter-duration-numeric/table-filter-duration-numeric.component.ts index ce833e93..907ab764 100644 --- a/src/app/webapp-common/shared/ui-components/data/table/table-duration-sort-template/table-filter-duration-numeric/table-filter-duration-numeric.component.ts +++ b/src/app/webapp-common/shared/ui-components/data/table/table-duration-sort-template/table-filter-duration-numeric/table-filter-duration-numeric.component.ts @@ -1,6 +1,5 @@ import { ChangeDetectionStrategy, - ChangeDetectorRef, Component, OnDestroy, OnInit, @@ -35,10 +34,6 @@ export class TableFilterDurationNumericComponent extends TableDurationSortBaseCo lessThan: new FormControl('', [Validators.pattern(this.numericPattern)]) }); - constructor(cdr: ChangeDetectorRef) { - super(cdr); - } - ngOnInit(): void { this.iterationsForm.valueChanges .pipe( @@ -48,9 +43,9 @@ export class TableFilterDurationNumericComponent extends TableDurationSortBaseCo ) .subscribe( ({greaterThan, lessThan}) => { !!greaterThan != this.greaterThan.checked && this.setCheckBox(!this.greaterThan.checked, 'greaterThan', false); - this.timeStampChanged(!!greaterThan ? parseInt(greaterThan, 10) : greaterThan, 'greaterThan'); + this.timeStampChanged(greaterThan ? parseInt(greaterThan, 10) : greaterThan, 'greaterThan'); !!lessThan != this.lessThan.checked && this.setCheckBox(!this.lessThan.checked, 'lessThan', false); - this.timeStampChanged(!!lessThan ? parseInt(lessThan, 10) : lessThan, 'lessThan'); + this.timeStampChanged(lessThan ? parseInt(lessThan, 10) : lessThan, 'lessThan'); }); } diff --git a/src/app/webapp-common/shared/ui-components/data/table/table-duration-sort-template/table-filter-duration/table-filter-duration.component.ts b/src/app/webapp-common/shared/ui-components/data/table/table-duration-sort-template/table-filter-duration/table-filter-duration.component.ts index 1b572379..34ca9dff 100644 --- a/src/app/webapp-common/shared/ui-components/data/table/table-duration-sort-template/table-filter-duration/table-filter-duration.component.ts +++ b/src/app/webapp-common/shared/ui-components/data/table/table-duration-sort-template/table-filter-duration/table-filter-duration.component.ts @@ -1,4 +1,4 @@ -import {ChangeDetectionStrategy, ChangeDetectorRef, Component, OnInit} from '@angular/core'; +import {ChangeDetectionStrategy, Component} from '@angular/core'; import {DurationParameters, TableDurationSortBaseComponent} from '../table-duration-sort-base.component'; import {isNil} from 'lodash-es'; @@ -9,14 +9,7 @@ import {isNil} from 'lodash-es'; changeDetection: ChangeDetectionStrategy.OnPush }) -export class TableFilterDurationComponent extends TableDurationSortBaseComponent implements OnInit { - - constructor(cdr: ChangeDetectorRef) { - super(cdr); - } - - ngOnInit(): void { - } +export class TableFilterDurationComponent extends TableDurationSortBaseComponent { _updateValue(): void { } @@ -29,7 +22,7 @@ export class TableFilterDurationComponent extends TableDurationSortBaseComponent return isNil(data) || data === '' ? null : +data ; } - timeStampChanged(value: number, name: DurationParameters) { + override timeStampChanged(value: number, name: DurationParameters) { if (this[name].checked !== !!value) { this.setCheckBox(!!value, name, false); } diff --git a/src/app/webapp-common/shared/ui-components/data/table/table-filter-sort-template/table-filter-sort-template.component.html b/src/app/webapp-common/shared/ui-components/data/table/table-filter-sort-template/table-filter-sort-template.component.html index a3d52718..55337157 100755 --- a/src/app/webapp-common/shared/ui-components/data/table/table-filter-sort-template/table-filter-sort-template.component.html +++ b/src/app/webapp-common/shared/ui-components/data/table/table-filter-sort-template/table-filter-sort-template.component.html @@ -48,8 +48,8 @@ >
- Any - All + Any + All
-
{{columnExplain}}
+
{{columnExplain}}
diff --git a/src/app/webapp-common/shared/ui-components/data/table/table-filter-sort-template/table-filter-sort-template.component.scss b/src/app/webapp-common/shared/ui-components/data/table/table-filter-sort-template/table-filter-sort-template.component.scss index e2288a9e..e5f93ea8 100755 --- a/src/app/webapp-common/shared/ui-components/data/table/table-filter-sort-template/table-filter-sort-template.component.scss +++ b/src/app/webapp-common/shared/ui-components/data/table/table-filter-sort-template/table-filter-sort-template.component.scss @@ -8,6 +8,7 @@ .menu-button { font-weight: 500; font-size: 12px; + white-space: nowrap; &.active { color: $blue-250; diff --git a/src/app/webapp-common/shared/ui-components/data/table/table-filter-sort-template/table-filter-sort-template.component.ts b/src/app/webapp-common/shared/ui-components/data/table/table-filter-sort-template/table-filter-sort-template.component.ts index f3318144..a32e7f72 100755 --- a/src/app/webapp-common/shared/ui-components/data/table/table-filter-sort-template/table-filter-sort-template.component.ts +++ b/src/app/webapp-common/shared/ui-components/data/table/table-filter-sort-template/table-filter-sort-template.component.ts @@ -1,7 +1,7 @@ import { - ChangeDetectionStrategy, + ChangeDetectionStrategy, ChangeDetectorRef, Component, - EventEmitter, + EventEmitter, inject, Input, Output } from '@angular/core'; @@ -41,6 +41,7 @@ export class TableFilterSortTemplateComponent { public filterPageSize: number; private previousSearchValue: { label: string; value: string; tooltip?: string } | undefined; private isOpen: boolean; + private cdr = inject(ChangeDetectorRef); @Input() set column(col: ISmCol) { this.header = col.header; diff --git a/src/app/webapp-common/shared/ui-components/data/table/table.component.html b/src/app/webapp-common/shared/ui-components/data/table/table.component.html index aa4f0cc7..40907904 100755 --- a/src/app/webapp-common/shared/ui-components/data/table/table.component.html +++ b/src/app/webapp-common/shared/ui-components/data/table/table.component.html @@ -2,6 +2,8 @@ *ngIf="columns?.length > 0" class="table" dataKey="id" + [style.--table-row-height]="rowHeight + 'px'" + [style.--card-height]="cardHeight + 'px'" [filterDelay]="0" [globalFilterFields]="enableTableSearch? globalFilterFields: null" [scrollHeight]="'flex'" @@ -22,8 +24,9 @@ [contextMenu]="cm" [rowTrackBy]="trackByFunction" [expandedRowKeys]="expandedRowKeys" - (onRowExpand)="updateNumberOfRows({event: $event, expanded: true})" - (onRowCollapse)="updateNumberOfRows({event: $event, expanded: false})" + [rowExpandMode]="rowExpandMode" + (onRowExpand)="updateNumberOfRows({event: $event, expanded: true}); rowExpanded.emit($event)" + (onRowCollapse)="updateNumberOfRows({event: $event, expanded: false}); rowCollapsed.emit($event)" (firstChange)="onFirstChanged($event)" (onColReorder)="onColReorder($event)" (onSort)="onSortChanged($event)" @@ -33,9 +36,9 @@ (onColResize)="colResize($event)" > -
-
-
{{noDataMessage}}
+
+
+ {{noDataMessage}}
@@ -58,9 +61,8 @@ [class.resize-disabled]="!resizableColumns" [class.selected-col-header]="col?.disablePointerEvents" [style.min-width]="col.style?.minWidth" - [style.max-width]="col.style?.maxWidth" + [style.max-width]="col.style?.maxWidth ?? !resizableColumns && columnResizeMode === 'fit' && col.style?.width" [style.width]="col.style?.width" - [style.flex-basis]="!resizableColumns && columnResizeMode === 'fit' && col.style?.width" > @@ -77,20 +79,22 @@ - @@ -99,7 +103,7 @@ @@ -138,27 +141,27 @@ -
+
+
+
- -
-
+
+ diff --git a/src/app/webapp-common/shared/ui-components/data/table/table.component.scss b/src/app/webapp-common/shared/ui-components/data/table/table.component.scss index 62dbd6cf..8cffbcd7 100755 --- a/src/app/webapp-common/shared/ui-components/data/table/table.component.scss +++ b/src/app/webapp-common/shared/ui-components/data/table/table.component.scss @@ -22,20 +22,30 @@ z-index: 1000; } - ::ng-deep .p-datatable-scrollable > .p-datatable-wrapper > .p-datatable-table > .p-datatable-thead { - z-index: 20; + ::ng-deep .p-datatable-scrollable, ::ng-deep .p-datatable { + &> .p-datatable-wrapper > .p-datatable-table > .p-datatable-thead { + z-index: 20; + + &:after { + content: ""; + position: absolute; + z-index: -1; + left: 0; + right: 0; + top: 0; + height: var(--table-row-height); + background-color: $blue-700; + } + } } ::ng-deep .p-datatable-wrapper { - position: relative; - .p-datatable-tbody { - height: calc(100% - 48px); + height: calc(100% - var(--table-row-height, 48px)); } } .table-header { - padding: 0 24px; display: flex; align-items: center; justify-content: space-between; @@ -63,14 +73,22 @@ .table-load-more { background-color: transparent !important; + border-bottom: none !important; + height: 100px; + position: relative; } .load-more-wrapper { - padding: 32px 0; + position: absolute; + width: 100%; + bottom: 32px; button { padding: 8px 40px; width: 175px; + position: sticky; + left: 50%; + transform: translateX(-50%); } .load-spinner { @@ -86,42 +104,52 @@ } } - - .no-data { - text-align: center; - white-space: nowrap; - padding: 15px 0 10px 0; - font-size: 14px; - width: 120px; + .no-data-wrapper { + display: flex; + position: absolute; + width: 100%; + span { + position: sticky; + left: 50%; + transform: translateX(-50%); + } } tr:not(.cards-table) { &:not(.no-data-row):not(.load-more-wrapper) { border-bottom: 1px solid $blue-600; } - &:hover:not(.header):not(.selected):not(.no-data-row):not(.simple):not(.load-more-wrapper) { - background-color: $blue-650; - border-bottom: 1px solid $blue-600; + &:not(.header):not(.selected):not(.checked):not(.no-data-row):not(.simple):not(.load-more-wrapper) { + &:hover, &.contexted { + background-color: $blue-650; + border-bottom: 1px solid $blue-600; - .p-frozen-column { - background-color: $blue-650 !important; - z-index: 1; + .p-frozen-column { + background-color: $blue-650 !important; + z-index: 1; + } } } &.checked:not(.header):not(.selected):not(.no-data-row):not(.simple) { background-color: $blue-500; - .td{ + .card-wrapper { border-bottom: none; } &:hover, &.contexted { - background-color: $blue-550; + &:not(.cards-table) { + background-color: $blue-550; + } + + .card-wrapper { + background-color: $blue-550; + } } } &.selected { - .td{ + .card-wrapper { border-bottom-color: $blue-600; } background-color: $blue-400; @@ -133,19 +161,15 @@ } tr { - display: flex; - transition: height 0.5s linear; - width: 100%; + position: relative; + transition: height 0.35s ease-in-out; &.header { - height: 48px; + height: var(--table-row-height, 48px); background-color: $blue-700; } th { - display: flex; - align-items: center; - flex: 1 1 0; color: $blue-300; border-bottom: none; padding:0 8px; @@ -158,6 +182,7 @@ text-align: left; font-size: 12px !important; font-weight: 500; + white-space: nowrap; } &:hover { @@ -166,9 +191,7 @@ } td { - display: flex; align-items: center; - flex: 1 1 0; color: $blue-100; font-size: 1rem; overflow: hidden; @@ -200,20 +223,28 @@ } } - .context-button { - cursor: pointer; + .context-button-wrapper { + width: 100%; + height: 0; position: absolute; + left: 0; + } + + .context-button { + position: sticky; + z-index: 2; + left: calc(100% - 46px); + cursor: pointer; opacity: 0; transition: opacity 0.35s ease-in-out; - margin-top: 8px; - width: calc(var(--rowHeight) * 0.666); - height: calc(var(--rowHeight) * 0.666); + margin-top: calc(var(--table-row-height) * 0.166); + width: calc(var(--table-row-height) * 0.666); + height: calc(var(--table-row-height) * 0.666); padding: 3px; color: $blue-400; background-color: rgba($blue-600, 95%); border-radius: 4px; border: solid 1px $blue-400; - z-index: 2; &:hover { color: $blue-300; background-color: lighten($blue-600, 5%); @@ -222,34 +253,42 @@ &.cards-table { - td { - margin: 6px 16px; + .card-wrapper { + margin: 6px 2px 6px 12px; border: 1px solid $dark-border; border-radius: 4px; + overflow: hidden; + animation-name: expand; + animation-duration: 0.35s; + animation-timing-function: ease-in-out; } + &:first-child { - margin-top: 6px; + .card-wrapper { + margin-top: 12px; + } } - &:hover:not(.selected):not(.simple) td { + &:hover:not(.selected):not(.simple) .card-wrapper { background-color: $blue-650; } + &.selected { - td { + .card-wrapper { background-color: $blue-400; } - &:hover td{ + &:hover .card-wrapper{ background-color: $blue-480; } } &.checked:not(.selected):not(.simple) { - td { + .card-wrapper { background-color: $blue-500; } &:hover, &.contexted { - td { + .card-wrapper { background-color: $blue-550; } } @@ -260,26 +299,41 @@ :host-context(.light-theme) { tr:not(.cards-table) { &:not(.no-data-row):not(.load-more-wrapper) { - border-bottom: 1px solid $blue-50; + border-bottom: 1px solid $blue-100; } - &.checked:not(.header):not(.no-data-row):not(.simple):not(.load-more-wrapper) { + &:not(.header):not(.selected):not(.no-data-row):not(.simple):not(.load-more-wrapper) { + &:hover, &.contexted { + background-color: $blue-50; + border-bottom: 1px solid $blue-50; + } + } + + &.checked:not(.header):not(.selected):not(.no-data-row):not(.simple) { background-color: $blue-100; border-bottom-color: $blue-50; &:hover, &.contexted { - background-color: $blue-50; + .simple-row, .card-wrapper { + background-color: $blue-50; + } } - } - &:hover:not(.header):not(.no-data-row):not(.simple):not(.load-more-wrapper) { - background-color: $blue-50; - border-bottom-color: $blue-50; + &.selected { + .card-wrapper { + border-bottom-color: $blue-50; + } + background-color: $blue-100; + + &:hover { + background-color: $blue-50; + } + } } &.header { background-color: $blue-50; @supports (-moz-appearance:meterbar) { - border-bottom: 3px solid $blue-500; + border-bottom: 3px solid $blue-100; } } @@ -289,7 +343,7 @@ border-bottom: none; &:hover { - background-color: $blue-100; + background-color: $blue-50; } } @@ -306,9 +360,30 @@ } } + + &.selected { + background-color: $blue-100; + + &:hover { + background-color: $blue-200; + } + } + } + + ::ng-deep .p-datatable-scrollable > .p-datatable-wrapper > .p-datatable-table > .p-datatable-thead { + &:after { + background-color: $blue-50; + } + } + } + + @supports (-moz-appearance:none) { + tr.cards-table .card-wrapper { + margin: 6px 12px; } } } + :host-context(.dark-theme-table.table-first-column-color) { tr td:not(.no-data):not(.load-more-wrapper).simple { border-bottom-color: $dark-grey-blue; @@ -324,3 +399,14 @@ background-color: transparent; } } + +@keyframes expand { + from { + height: var(--table-row-height); + } + + to { + height: var(--card-height, 90px); + } +} + diff --git a/src/app/webapp-common/shared/ui-components/data/table/table.component.ts b/src/app/webapp-common/shared/ui-components/data/table/table.component.ts index 5faffd21..cc70b1d4 100755 --- a/src/app/webapp-common/shared/ui-components/data/table/table.component.ts +++ b/src/app/webapp-common/shared/ui-components/data/table/table.component.ts @@ -13,7 +13,6 @@ import { OnInit, Output, QueryList, - Renderer2, TemplateRef, TrackByFunction, ViewChild, @@ -23,44 +22,54 @@ import {get, isArray, isString} from 'lodash-es'; import {MenuItem, PrimeTemplate, SortMeta} from 'primeng/api'; import {FilterMetadata} from 'primeng/api/filtermetadata'; import {ContextMenu} from 'primeng/contextmenu'; -import {Table} from 'primeng/table'; +import { + Table, + TableColumnReorderEvent, + TableContextMenuSelectEvent, + TableRowCollapseEvent, + TableRowExpandEvent +} from 'primeng/table'; import {BehaviorSubject, combineLatest, fromEvent, interval, startWith, Subject, Subscription} from 'rxjs'; -import {debounce, debounceTime, filter, take, throttleTime} from 'rxjs/operators'; +import {debounce, filter, take, throttleTime} from 'rxjs/operators'; import {custumFilterFunc, custumSortSingle} from './overrideFilterFunc'; import {ColHeaderTypeEnum, ISmCol, TableSortOrderEnum} from './table.consts'; import {Store} from '@ngrx/store'; import {selectScaleFactor} from '@common/core/reducers/view.reducer'; import {trackById} from '@common/shared/utils/forms-track-by'; import {sortCol} from '@common/shared/utils/sortCol'; -import {Options, Angular2CsvComponent} from 'angular2-csv'; +import {ExportToCsv, Options} from 'export-to-csv'; import {prepareColsForDownload} from '@common/shared/utils/download'; +export interface TableContextMenuSelectEventExt extends Omit { + single?: boolean; + index?: number; +} + @Component({ selector: 'sm-table', templateUrl: './table.component.html', styleUrls: ['./table.component.scss'], changeDetection: ChangeDetectionStrategy.OnPush }) -export class TableComponent implements AfterContentInit, AfterViewInit, OnInit, OnDestroy { +export class TableComponent implements AfterContentInit, AfterViewInit, OnInit, OnDestroy { public active = false; - public bodyTemplate: TemplateRef; - public sortTemplate: TemplateRef; - public cardTemplate: TemplateRef; - public footerTemplate: TemplateRef; - public rowExpansionTemplate: TemplateRef; - public cardHeaderTemplate: TemplateRef; - public checkboxTemplate: any; - public sortFilterTemplate: any; - public headerTemplate: TemplateRef; + public bodyTemplate: TemplateRef<{$implicit: ISmCol; rowData: D; rowIndex: number; expanded: boolean}>; + public cardTemplate: TemplateRef<{rowData: D; rowNumber: number; selected: boolean}>; + public footerTemplate: TemplateRef<{$implicit: ISmCol}>; + public rowExpansionTemplate: TemplateRef<{$implicit: D; lastFrame: boolean}>; + public cardHeaderTemplate: TemplateRef; + public checkboxTemplate: TemplateRef<{$implicit: ISmCol}>; + public sortFilterTemplate: TemplateRef<{$implicit: ISmCol}>; public trackByColFn: TrackByFunction = trackById; private loadMoreSubscription: Subscription; - private loadMoreDebouncer: Subject; + private loadMoreDebouncer: Subject; public menuItems = [] as MenuItem[]; minView: boolean; private _filters: { [s: string]: FilterMetadata }; private readonly isChrome = navigator.userAgent.indexOf('Chrome') > -1; public lastRowExpanded: boolean; + public noDataTop: number; readonly colHeaderTypeEnum = ColHeaderTypeEnum; @@ -69,27 +78,24 @@ export class TableComponent implements AfterContentInit, AfterViewInit, OnInit, loadButton: ElementRef; @ViewChildren('loadButton') loadButtons: QueryList>; @ViewChild('cm', {static: true}) menu: ContextMenu; - @ContentChildren(PrimeTemplate) templates: QueryList; - private _tableData: any; + @ContentChildren(PrimeTemplate) templates: QueryList; + private _tableData: D[]; private _columnsOrder: string[]; public loading: boolean; - private scrollLeft = 0; - public buttonLeft: number; - public contextButtonPosition: number; private scaleFactor: number; private waiting: boolean; private scrollContainer: HTMLDivElement; - private updateLoadButton$ = new BehaviorSubject(null); private resize$ = new BehaviorSubject(null); private sub = new Subscription(); - @Input() autoLoadMore: boolean = false; + @Input() autoLoadMore = false; @Input() columnResizeMode = 'expand' as 'fit' | 'expand'; @Input() expandableRows = false; + @Input() expandRowOnClick = true; @Input() initialColumns; private waitForClick: number; - @Input() set tableData(tableData) { + @Input() set tableData(tableData: any) { this.loading = false; this.rowsNumber = tableData ? tableData.length : 0; this._tableData = tableData; @@ -136,22 +142,21 @@ export class TableComponent implements AfterContentInit, AfterViewInit, OnInit, @Input() rowHeight = 48; @Input() cardHeight = 130; @Input() lazyLoading = false; - @Input() keyboardControl: boolean = false; + @Input() keyboardControl = false; @Input() noMoreData: boolean; @Input() rowHover: boolean; - @Input() noHeader: boolean = false; - @Input() simple: boolean = false; + @Input() noHeader = false; + @Input() simple = false; @Input() expandedRowKeys: { [s: string]: boolean } = {}; + @Input() rowExpandMode: 'multiple' | 'single' = 'multiple'; @Input() set minimizedView(minView: boolean) { - const delay = this.minView === undefined ? 0 : 3000; - this.minView = minView; if (!minView) { window.setTimeout(() => this.table && this.updateFilter()); } - this.resize$.next(delay); + this.calcResize(); } @Input() set filters(filters: { [s: string]: FilterMetadata }) { @@ -169,17 +174,19 @@ export class TableComponent implements AfterContentInit, AfterViewInit, OnInit, @Input() checkedItems = []; @Input() virtualScroll: boolean; @Input() globalFilterFields: string[]; - @Input() enableTableSearch: boolean = false; + @Input() enableTableSearch = false; @Input() minimizedTableHeader: string; @Input() hasExperimentUpdate: boolean; @Output() sortChanged = new EventEmitter<{ field: ISmCol['id']; isShift: boolean }>(); - @Output() rowClicked = new EventEmitter<{ e: MouseEvent; data: any }>(); - @Output() rowDoubleClicked = new EventEmitter<{ e: MouseEvent; data: any }>(); - @Output() rowSelectionChanged = new EventEmitter<{ data: Array; originalEvent?: Event }>(); + @Output() rowClicked = new EventEmitter<{ e: MouseEvent; data: D }>(); + @Output() rowDoubleClicked = new EventEmitter<{ e: MouseEvent; data: D }>(); + @Output() rowSelectionChanged = new EventEmitter<{ data: D; originalEvent?: Event }>(); + @Output() rowExpanded = new EventEmitter(); + @Output() rowCollapsed = new EventEmitter(); @Output() firstChanged = new EventEmitter(); @Output() loadMoreClicked = new EventEmitter(); - @Output() rowRightClick = new EventEmitter<{ e: MouseEvent; rowData; single?: boolean }>(); + @Output() rowRightClick = new EventEmitter<{ e: Event; rowData; single?: boolean }>(); @Output() colReordered = new EventEmitter(); @Output() columnResized = new EventEmitter<{ columnId: string; widthPx: number }>(); search: string; @@ -189,7 +196,6 @@ export class TableComponent implements AfterContentInit, AfterViewInit, OnInit, } private calcResize() { - this.updateLoadButton$.next(null); if (this.table && this.resizableColumns) { const element = (this.table.el.nativeElement as HTMLDivElement); let width = element.getBoundingClientRect().width; @@ -198,17 +204,16 @@ export class TableComponent implements AfterContentInit, AfterViewInit, OnInit, } let totalWidth = 0; if (this.minView) { - if (this.table?.styleElement) { - this.table.styleElement.innerHTML = ''; - } - totalWidth = width - (this.isChrome ? 14 : 0); + // if (this.table?.styleElement) { + // this.table.styleElement.innerHTML = ''; + // } + totalWidth = width; + this.table.columnWidthsState = `${totalWidth - 4}`; } else { this.table.destroyStyleElement(); this.table.createStyleElement(); - let innerHTML = ''; - this.columns.forEach((col, index) => { - let colWidth; - let grow = 0; + this.table.columnWidthsState = this.columns.map((col, index) => { + let colWidth: number; if (col.style?.width?.endsWith('px')) { colWidth = parseInt(col.style.width.slice(0, -2), 10); totalWidth += colWidth; @@ -216,23 +221,16 @@ export class TableComponent implements AfterContentInit, AfterViewInit, OnInit, colWidth = element.getElementsByTagName('th')[index]?.getBoundingClientRect().width || 0; totalWidth += this.scaleFactor ? colWidth * this.scaleFactor / 100 : colWidth; } - if (index === this.columns.length - 1 && totalWidth < width) { - grow = 1; - } - innerHTML += ` - #${this.table.id}-table .p-datatable-thead > tr:not(.cards-table) > th:nth-child(${index + 1}), - #${this.table.id}-table .p-datatable-tbody > tr:not(.cards-table) > td:nth-child(${index + 1}), - #${this.table.id}-table .p-datatable-tfoot > tr:not(.cards-table) > td:nth-child(${index + 1}) { - flex: ${grow} 0 ${colWidth}px !important - } - `; - }); - this.table.styleElement.innerHTML = innerHTML; + return colWidth; + }).join(','); totalWidth = Math.max(totalWidth, width); } - this.renderer.setStyle(this.table.tableViewChild.nativeElement, 'width', `${totalWidth}px`); - this.renderer.setStyle(this.table.tableViewChild.nativeElement, 'min-width', `${totalWidth}px`); + totalWidth = totalWidth - (this.isChrome ? 14 : 0); + this.table.tableWidthState = `${totalWidth}`; + this.table.restoreColumnWidths(); } + this.noDataTop = this.table?.wrapperViewChild.nativeElement.getBoundingClientRect().height / 2 - this.rowHeight / 2 - 1; + this.noDataTop && this.cdr.detectChanges(); } @HostListener('keydown', ['$event']) @@ -261,7 +259,6 @@ export class TableComponent implements AfterContentInit, AfterViewInit, OnInit, constructor( private element: ElementRef, - private renderer: Renderer2, private cdr: ChangeDetectorRef, private store: Store ) { @@ -272,7 +269,7 @@ export class TableComponent implements AfterContentInit, AfterViewInit, OnInit, () => this.loadMoreClicked.emit() ); - store.select(selectScaleFactor) + this.store.select(selectScaleFactor) .pipe(filter(s => !!s), take(1)) .subscribe(scale => this.scaleFactor = scale); @@ -284,10 +281,6 @@ export class TableComponent implements AfterContentInit, AfterViewInit, OnInit, debounce(([delay]) => interval(typeof delay === 'number' ? delay : 50)) ) .subscribe(() => this.calcResize())); - - this.sub.add(this.updateLoadButton$ - .pipe(debounceTime(50)) - .subscribe(e => this.updateLoadButton(e))); } ngOnInit(): void { @@ -301,17 +294,15 @@ export class TableComponent implements AfterContentInit, AfterViewInit, OnInit, this.table = item; this.scrollContainer = this.table.el.nativeElement.getElementsByClassName('p-datatable-wrapper')[0] as HTMLDivElement; if (this.scrollContainer) { - this.scrollContainer.onscroll = (e: Event) => { + this.scrollContainer.onscroll = () => { if (!this.waiting) { this.waiting = true; window.setTimeout(() => { this.waiting = false; - this.updateLoadButton$.next(e); }, 60); } }; } - this.updateLoadButton$.next(null); this.updateFilter(); } }; @@ -324,7 +315,6 @@ export class TableComponent implements AfterContentInit, AfterViewInit, OnInit, .pipe(filter((comps: QueryList>) => !!comps.first), take(1)) .subscribe((comps: QueryList>) => { this.loadButton = comps.first; - this.updateLoadButton$.next(null); }); } @@ -334,12 +324,6 @@ export class TableComponent implements AfterContentInit, AfterViewInit, OnInit, case 'body': this.bodyTemplate = item.template; break; - case 'header': - this.headerTemplate = item.template; - break; - case 'sort': - this.sortTemplate = item.template; - break; case 'card': this.cardTemplate = item.template; break; @@ -381,7 +365,7 @@ export class TableComponent implements AfterContentInit, AfterViewInit, OnInit, } onRowSelected(event) { - if (this.selection && event.data.id === this.selection.id) { + if (this.selection && !Array.isArray(this.selection) && event.data.id === this.selection.id) { this.rowSelectionChanged.emit({data: null, originalEvent: event.originalEvent}); } else { this.rowSelectionChanged.emit(event); @@ -425,7 +409,7 @@ export class TableComponent implements AfterContentInit, AfterViewInit, OnInit, this.firstChanged.emit(event); } - openContext({originalEvent, data, single}: { originalEvent: MouseEvent; data: any; single?: boolean }) { + openContext({originalEvent, data, single}: TableContextMenuSelectEventExt) { if (this.rowRightClick.observed) { this.rowRightClick.emit({e: originalEvent, rowData: data, single}); if (this.table) { @@ -439,14 +423,14 @@ export class TableComponent implements AfterContentInit, AfterViewInit, OnInit, return item?.id || item?.name || index; } - public locateInTable() { - const selectedTask = this.selection; - const tableData = this.table.filteredValue ? this.table.filteredValue : this.table.value; - const rowIndex = tableData.findIndex((task) => task.id === selectedTask.id); - const first = rowIndex > 0 ? (rowIndex - rowIndex % 10) : 0; - this.first = first; - this.firstChanged.emit(first); - } + // public locateInTable() { + // const selectedTask = this.selection; + // const tableData = this.table.filteredValue ? this.table.filteredValue : this.table.value; + // const rowIndex = tableData.findIndex((task) => task.id === selectedTask.id); + // const first = rowIndex > 0 ? (rowIndex - rowIndex % 10) : 0; + // this.first = first; + // this.firstChanged.emit(first); + // } getBodyData(rowData, col) { return get(rowData, col.id); @@ -467,8 +451,8 @@ export class TableComponent implements AfterContentInit, AfterViewInit, OnInit, } getCurrentIndex() { - if (this.selection) { - return this.tableData.findIndex((row) => row.id === this.selection.id); + if (this.selection && !Array.isArray(this.selection)) { + return this.tableData.findIndex((row) => row.id === (this.selection as D).id); } else { return 0; } @@ -479,7 +463,7 @@ export class TableComponent implements AfterContentInit, AfterViewInit, OnInit, this.loadMoreDebouncer.next(null); } - onColReorder($event: any) { + onColReorder($event: TableColumnReorderEvent) { const columnsList = $event.columns.map(column => column.id); this.colReordered.emit(columnsList); this.resize(); @@ -492,7 +476,7 @@ export class TableComponent implements AfterContentInit, AfterViewInit, OnInit, } } - isRowSelected(entity: { id: any }) { + isRowSelected(entity: { id: string }) { if (!entity) { return false; } @@ -501,18 +485,6 @@ export class TableComponent implements AfterContentInit, AfterViewInit, OnInit, (this.checkedItems.some((selectedEntity: { id: string }) => selectedEntity?.id === entity.id)); } - private updateLoadButton(e: Event) { - if (e) { - this.scrollLeft = (e.target as HTMLDivElement).scrollLeft; - } - if (this.table?.el?.nativeElement) { - const width = this.table.el.nativeElement.getBoundingClientRect().width * this.scaleFactor / 100; - this.buttonLeft = (width / 2) - 70 + this.scrollLeft; - this.contextButtonPosition = width - 70 + this.scrollLeft; - } - this.cdr.detectChanges(); - } - private updateFilter() { if (this.minView) { // Overriding prime ng filter and sort functions so that it wont reset first after data change. @@ -524,10 +496,10 @@ export class TableComponent implements AfterContentInit, AfterViewInit, OnInit, } focusSelected() { - this.table.el?.nativeElement.getElementsByClassName('selected')[0]?.focus(); + this.table?.el?.nativeElement.getElementsByClassName('selected')[0]?.focus(); } - colResize({delta, element}: { delta: number; element: HTMLTableHeaderCellElement }) { + colResize({delta, element}: { delta: number; element: HTMLElement }) { if (delta) { setTimeout(() => { const width = element.clientWidth; @@ -573,7 +545,7 @@ export class TableComponent implements AfterContentInit, AfterViewInit, OnInit, return this.sortFields.find(field => field.field === colId)?.order; } - checkClick(param: { data: any; e: MouseEvent }) { + checkClick(param: { data: D; e: MouseEvent }) { if (param.e.type === 'dblclick' || this.waitForClick) { window.clearTimeout(this.waitForClick); this.waitForClick = null; @@ -586,44 +558,36 @@ export class TableComponent implements AfterContentInit, AfterViewInit, OnInit, } } - updateNumberOfRows({event, expanded}: { event: any; expanded: boolean }) { - const expandedIndex = Object.values(this.tableData).findIndex((row: any) => row.id === event.data.id); + updateNumberOfRows({event, expanded}: { event: TableRowExpandEvent; expanded: boolean }) { + const expandedIndex = Object.values(this.tableData).findIndex((row: D) => row.id === event.data.id); this.lastRowExpanded = expanded && expandedIndex === this.rowsNumber - 1; } downloadTableAsCSV(tableName?: string) { const options: Options = { - filename: null, - fieldSeparator: ',', - quoteStrings: '"', - decimalseparator: '.', - title: '', - showLabels: false, - headers: [], - showTitle: false, - useBom: true, - removeNewLines: true, - keys: [] + filename: `${tableName}${tableName ? '-' : ''}table`, + showLabels: true, + useKeysAsHeaders: true }; - const rows = []; const downloadCols = prepareColsForDownload(this.columns); - options.keys = downloadCols.map(dCol=>dCol.field); options.headers = downloadCols.map(dCol=> dCol.name); - this.tableData.forEach(row => { - rows.push(options.keys.reduce((acc, key) => { + const rows = this.tableData.map(row => + downloadCols.reduce((acc, col) => { + const key = col.field; const val = get(row, key, ''); - acc[key] = isArray(val) ? val.toString() : isString(val) ? val.replace(/\r?\n|\r/g + acc[col.name] = isArray(val) ? val.toString() : isString(val) ? val.replace(/\r?\n|\r/g , '') : val; return acc; - }, {})); - }); - const angular2csvButton = new Angular2CsvComponent(); - angular2csvButton.data = rows; - angular2csvButton.options = options; - angular2csvButton.filename = `${tableName}${tableName ? '-' : ''}table`; - angular2csvButton.generateCsv(); + }, {}) + ); + + const csvExporter = new ExportToCsv(options); + csvExporter.generateCsv(rows); } + isSelected = (rowData: D) => + Array.isArray(this.selection) ? this.selection?.some(s => s.id === rowData.id) : this.selection?.id === rowData?.id; + } diff --git a/src/app/webapp-common/shared/ui-components/data/veritical-labeled-row/vertical-labeled-row.component.html b/src/app/webapp-common/shared/ui-components/data/veritical-labeled-row/vertical-labeled-row.component.html index 07385057..089c7efa 100755 --- a/src/app/webapp-common/shared/ui-components/data/veritical-labeled-row/vertical-labeled-row.component.html +++ b/src/app/webapp-common/shared/ui-components/data/veritical-labeled-row/vertical-labeled-row.component.html @@ -1,6 +1,6 @@
-
{{label}}
-
+
{{label}}
+
diff --git a/src/app/webapp-common/shared/ui-components/data/veritical-labeled-row/vertical-labeled-row.component.ts b/src/app/webapp-common/shared/ui-components/data/veritical-labeled-row/vertical-labeled-row.component.ts index 488f9f83..57dcdc13 100755 --- a/src/app/webapp-common/shared/ui-components/data/veritical-labeled-row/vertical-labeled-row.component.ts +++ b/src/app/webapp-common/shared/ui-components/data/veritical-labeled-row/vertical-labeled-row.component.ts @@ -9,6 +9,7 @@ export class VerticalLabeledRowComponent implements OnInit { @Input() label: string; @Input() showRow? = true; @Input() labelClass: string; + @Input() tooltip: string; constructor() { } ngOnInit() { diff --git a/src/app/webapp-common/shared/ui-components/directives/ellipsis-middle.directive.ts b/src/app/webapp-common/shared/ui-components/directives/ellipsis-middle.directive.ts index 461dd107..ac2d3f47 100644 --- a/src/app/webapp-common/shared/ui-components/directives/ellipsis-middle.directive.ts +++ b/src/app/webapp-common/shared/ui-components/directives/ellipsis-middle.directive.ts @@ -1,33 +1,43 @@ -import {AfterViewInit, Directive, ElementRef, HostListener} from '@angular/core'; +import {AfterViewInit, Directive, ElementRef, Input} from '@angular/core'; +import {TooltipDirective} from '@common/shared/ui-components/indicators/tooltip/tooltip.directive'; @Directive({ - selector: '[smEllipsisMiddleDirective]' + selector: '[smEllipsisMiddleDirective]', + standalone: true }) export class EllipsisMiddleDirective implements AfterViewInit { private timeoutSubscription: NodeJS.Timer; - - constructor(private el: ElementRef) { + @Input() smEllipsisMiddleDirective: string; + @Input() delay: number; + @Input() maxChars: number = Infinity; + @Input() set triggerEllipsis(triggerEllipsis: number) { + this.el.nativeElement.innerHTML = this.smEllipsisMiddleDirective; + this.ngAfterViewInit(); + } + constructor(private el: ElementRef, private matTooltip: TooltipDirective,) { } ngAfterViewInit(): void { - this.cropTextToFit(this.el); - } - - @HostListener('window:resize') - onResize() { - clearTimeout(this.timeoutSubscription); - this.timeoutSubscription = setTimeout(this.cropTextToFit.bind(this, this.el), 75); + if (this.delay !== undefined) { + setTimeout( () => this.cropTextToFit(this.el), this.delay); + } else { + this.cropTextToFit(this.el); + } } private cropTextToFit = (el: ElementRef) => { const o = el.nativeElement; let txt = o.innerText; + let ellipsised = txt.includes(' ... '); - while (o.scrollWidth > o.clientWidth && txt.length > 0) { - txt = txt.substring(0, txt.length / 2 - 1) + txt.substring(txt.length / 2 + 1, txt.length); - o.innerHTML = txt.substring(0, txt.length / 2) + '...' + txt.substring(txt.length / 2, txt.length); + while (o.clientWidth > 10 && o.scrollWidth > o.clientWidth && txt.length > 0 || txt.length > this.maxChars) { + txt = `${txt.substring(0, txt.length / 2 - 4)} ... ${txt.substring(txt.length / 2 + 4, txt.length)}`; + o.innerHTML = txt; + ellipsised = true; } - }; + + this.matTooltip.disabled = !ellipsised; + } } diff --git a/src/app/webapp-common/shared/ui-components/directives/fitElementsToContainer.directive.ts b/src/app/webapp-common/shared/ui-components/directives/fitElementsToContainer.directive.ts index 959628c2..f9e43e34 100644 --- a/src/app/webapp-common/shared/ui-components/directives/fitElementsToContainer.directive.ts +++ b/src/app/webapp-common/shared/ui-components/directives/fitElementsToContainer.directive.ts @@ -1,6 +1,5 @@ -import {AfterViewInit, ChangeDetectorRef, ContentChild, ContentChildren, Directive, ElementRef, EventEmitter, Input, OnDestroy, Output, QueryList, Renderer2, ViewChildren} from '@angular/core'; -import {fromEvent, Subscription} from 'rxjs'; -import {debounceTime} from 'rxjs/operators'; +import {AfterViewInit, ChangeDetectorRef, ContentChild, ContentChildren, Directive, ElementRef, EventEmitter, Input, OnDestroy, Output, QueryList, Renderer2} from '@angular/core'; +import {Subscription} from 'rxjs'; import {ChipsComponent} from '@common/shared/ui-components/buttons/chips/chips.component'; const isElementOverflow = ({clientWidth, clientHeight, scrollWidth, scrollHeight}) => diff --git a/src/app/webapp-common/shared/ui-components/forms/checkbox-control/checkbox-control.component.scss b/src/app/webapp-common/shared/ui-components/forms/checkbox-control/checkbox-control.component.scss index af0aa620..831ad63d 100755 --- a/src/app/webapp-common/shared/ui-components/forms/checkbox-control/checkbox-control.component.scss +++ b/src/app/webapp-common/shared/ui-components/forms/checkbox-control/checkbox-control.component.scss @@ -5,6 +5,7 @@ align-content: space-between; align-items: center; position: relative; + z-index: 1; &.select-col-checkbox { pointer-events: none; diff --git a/src/app/webapp-common/shared/ui-components/forms/checkbox-control/checkbox-control.component.ts b/src/app/webapp-common/shared/ui-components/forms/checkbox-control/checkbox-control.component.ts index 39ac1206..08d87be6 100755 --- a/src/app/webapp-common/shared/ui-components/forms/checkbox-control/checkbox-control.component.ts +++ b/src/app/webapp-common/shared/ui-components/forms/checkbox-control/checkbox-control.component.ts @@ -32,7 +32,7 @@ export class CheckboxControlComponent extends ImmutableFormField implements Afte } @HostListener('click', ['$event']) - fieldValueChanged(event: Event) { + override fieldValueChanged(event: Event) { if (this.disabled) { return; } @@ -45,7 +45,7 @@ export class CheckboxControlComponent extends ImmutableFormField implements Afte // this.formDataChanged.emit({field: this.fieldName, value: !this.formData}); } - formDataUpdated() { + override formDataUpdated() { if (!isString(this.formData)) { this.state = this.formData === true ? 'All' : 'None'; } else { diff --git a/src/app/webapp-common/shared/ui-components/indicators/snippet-error/snippet-error.component.html b/src/app/webapp-common/shared/ui-components/indicators/snippet-error/snippet-error.component.html index 7d29ea0b..2a920566 100644 --- a/src/app/webapp-common/shared/ui-components/indicators/snippet-error/snippet-error.component.html +++ b/src/app/webapp-common/shared/ui-components/indicators/snippet-error/snippet-error.component.html @@ -26,7 +26,7 @@ smTooltip="Copy Image URL" [cbContent]="copyContent" (cbOnSuccess)="copyToClipboardSuccess(true)"> - +
) {} - @Input() showAllwaysTooltip = false; + @Input() showAlwaysTooltip = false; + @Output() smShowTooltipIfEllipsis = new EventEmitter(); @HostListener('mouseenter', ['$event']) setTooltipState(): void { - if(this.showAllwaysTooltip) { + if(this.showAlwaysTooltip) { return; } const element = this.elementRef.nativeElement; - if(element.tagName==='MAT-OPTION' && element.firstElementChild?.tagName==='SPAN'){ + if(element.tagName==='MAT-OPTION' && element.firstElementChild?.tagName==='SPAN' || element.firstElementChild?.classList.contains('ellipsis')){ this.matTooltip.disabled = element.firstElementChild.scrollWidth === element.firstElementChild.clientWidth; } else { this.matTooltip.disabled = element.scrollWidth === element.clientWidth; diff --git a/src/app/webapp-common/shared/ui-components/inputs/color-picker/color-picker-wrapper.component.scss b/src/app/webapp-common/shared/ui-components/inputs/color-picker/color-picker-wrapper.component.scss index 7b2894ed..0a1f817c 100644 --- a/src/app/webapp-common/shared/ui-components/inputs/color-picker/color-picker-wrapper.component.scss +++ b/src/app/webapp-common/shared/ui-components/inputs/color-picker/color-picker-wrapper.component.scss @@ -3,17 +3,30 @@ :host { ::ng-deep color-picker .color-picker { z-index: $zindex-colorpicker; - .arrow { - display: none; + border-radius: 4px; + box-shadow: 0 3px 6px 0 rgba(0, 0, 0, 0.16); + border-color: $blue-200; + .saturation-lightness { + border-radius: 3px 3px 0 0; } - .preset-color { - margin: 4px; - border-color: white; - border-radius: 3px; - box-shadow: 0 0 0 1px $blue-300; + .preset-area { + hr { + margin-top: 0; + } + .preset-color { + margin: 4px; + border-color: white; + box-shadow: 0 0 0 1px $blue-200; + &:hover { + box-shadow: 0 0 0 1px $blue-400; + } + } } .button-area { - margin-top: 16px; + padding: 0 16px; + } + .arrow { + display: none; } } diff --git a/src/app/webapp-common/shared/ui-components/inputs/color-picker/color-picker-wrapper.component.ts b/src/app/webapp-common/shared/ui-components/inputs/color-picker/color-picker-wrapper.component.ts index c58e0b27..a50cb8cc 100644 --- a/src/app/webapp-common/shared/ui-components/inputs/color-picker/color-picker-wrapper.component.ts +++ b/src/app/webapp-common/shared/ui-components/inputs/color-picker/color-picker-wrapper.component.ts @@ -6,7 +6,7 @@ import {isEqual} from 'lodash-es'; import {selectColorPickerProps} from '@common/shared/ui-components/directives/choose-color/choose-color.reducer'; import {ColorPickerProps} from '@common/shared/ui-components/directives/choose-color/choose-color.actions'; import {ColorHashService} from '@common/shared/services/color-hash/color-hash.service'; -import tinycolor from 'tinycolor2'; +import { TinyColor } from '@ctrl/tinycolor'; @Component({ selector: 'sm-color-picker-wrapper', @@ -54,7 +54,7 @@ export class ColorPickerWrapperComponent implements OnInit, OnDestroy { } selectColor(event: string) { - const {r, g, b, a} = tinycolor(event).toRgb(); + const {r, g, b, a} = new TinyColor(event).toRgb(); const color = [r, g, b, a]; this.colorHashService.setColorForString(this.props.cacheKey, color); } diff --git a/src/app/webapp-common/shared/ui-components/inputs/duration-input/duration-input.base.ts b/src/app/webapp-common/shared/ui-components/inputs/duration-input/duration-input.base.ts index 5f26c753..0140df3d 100644 --- a/src/app/webapp-common/shared/ui-components/inputs/duration-input/duration-input.base.ts +++ b/src/app/webapp-common/shared/ui-components/inputs/duration-input/duration-input.base.ts @@ -26,8 +26,8 @@ export abstract class DurationInputBase extends TemplateFormSectionBase { @Output() onEditing = new EventEmitter(); @Output() onDurationChanged = new EventEmitter(); - get value() {return this.ngModelValue;} - set value(val) { // this value is updated by programmatic changes if( ngModelValue !== undefined && this.ngModelValue !== ngModelValue){ + override get value() {return this.ngModelValue;} + override set value(val) { // this value is updated by programmatic changes if( ngModelValue !== undefined && this.ngModelValue !== ngModelValue){ if (val !== undefined && val !== this.val && val !== '0') { val = `${val || 0}`; diff --git a/src/app/webapp-common/shared/ui-components/inputs/duration-input/duration-input.component.scss b/src/app/webapp-common/shared/ui-components/inputs/duration-input/duration-input.component.scss index 0b453b63..6937b5e0 100644 --- a/src/app/webapp-common/shared/ui-components/inputs/duration-input/duration-input.component.scss +++ b/src/app/webapp-common/shared/ui-components/inputs/duration-input/duration-input.component.scss @@ -29,7 +29,7 @@ .separator { line-height: 32px; - color: $blue-grey; + color: $blue-300; &:last-child { padding-right: 0; diff --git a/src/app/webapp-common/shared/ui-components/inputs/duration-input/duration-input.component.ts b/src/app/webapp-common/shared/ui-components/inputs/duration-input/duration-input.component.ts index c737def4..9ecf715f 100644 --- a/src/app/webapp-common/shared/ui-components/inputs/duration-input/duration-input.component.ts +++ b/src/app/webapp-common/shared/ui-components/inputs/duration-input/duration-input.component.ts @@ -15,7 +15,6 @@ import {NG_VALUE_ACCESSOR} from '@angular/forms'; }] }) export class DurationInputComponent extends TemplateFormSectionBase { - public val = 0; public ms = '0'; public seconds = '0'; public minutes = '0'; @@ -23,7 +22,7 @@ export class DurationInputComponent extends TemplateFormSectionBase { public inEdit: boolean; - set value(val) { // this value is updated by programmatic changes if( ngModelValue !== undefined && this.ngModelValue !== ngModelValue){ + override set value(val) { // this value is updated by programmatic changes if( ngModelValue !== undefined && this.ngModelValue !== ngModelValue){ this.inEdit = false; if (val !== undefined) { this.val = val; @@ -33,6 +32,7 @@ export class DurationInputComponent extends TemplateFormSectionBase { constructor(private eRef: ElementRef, private cdr: ChangeDetectorRef) { super(); + this.val = 0; } @HostListener('document:click', ['$event']) diff --git a/src/app/webapp-common/shared/ui-components/inputs/inline-edit/inline-edit.component.ts b/src/app/webapp-common/shared/ui-components/inputs/inline-edit/inline-edit.component.ts index 6d3f0be0..6c8727c5 100755 --- a/src/app/webapp-common/shared/ui-components/inputs/inline-edit/inline-edit.component.ts +++ b/src/app/webapp-common/shared/ui-components/inputs/inline-edit/inline-edit.component.ts @@ -99,7 +99,9 @@ export class InlineEditComponent implements OnDestroy { ngOnDestroy(): void { - this.inlineCanceled(); + if (this.active) { + this.inlineCanceled(); + } this.inlineInput = null; this.template = null; } diff --git a/src/app/webapp-common/shared/ui-components/inputs/search/search.component.html b/src/app/webapp-common/shared/ui-components/inputs/search/search.component.html index 6e1abaac..057b915b 100755 --- a/src/app/webapp-common/shared/ui-components/inputs/search/search.component.html +++ b/src/app/webapp-common/shared/ui-components/inputs/search/search.component.html @@ -30,10 +30,10 @@
{{searchCounterIndex + 1}} of {{searchResultsCount}}
- - diff --git a/src/app/webapp-common/shared/ui-components/inputs/search/search.component.scss b/src/app/webapp-common/shared/ui-components/inputs/search/search.component.scss index b68af579..179abd8f 100755 --- a/src/app/webapp-common/shared/ui-components/inputs/search/search.component.scss +++ b/src/app/webapp-common/shared/ui-components/inputs/search/search.component.scss @@ -16,7 +16,7 @@ $search-font-size: 14px; border-radius: 4px 4px 0 0; &.active { - width: 200px; + width: 100%; &.with-counter { width: 300px; @@ -161,7 +161,7 @@ $search-font-size: 14px; input { background-color: $blue-700; border-bottom: 2px solid; - border-color: $blue-grey; + border-color: $blue-300; color: $blue-280; font-weight: 400; padding-right: 28px; @@ -215,7 +215,7 @@ $search-font-size: 14px; color: $blue-400; } .separator { - background: $blue-250; + background: $blue-200; } } } @@ -226,7 +226,7 @@ $search-font-size: 14px; .search-input { color: $blue-280; - border-color: $blue-grey; + border-color: $blue-300; &:focus { border-color: $blue-500; diff --git a/src/app/webapp-common/shared/ui-components/inputs/search/search.component.ts b/src/app/webapp-common/shared/ui-components/inputs/search/search.component.ts index f2671296..f8c9e316 100755 --- a/src/app/webapp-common/shared/ui-components/inputs/search/search.component.ts +++ b/src/app/webapp-common/shared/ui-components/inputs/search/search.component.ts @@ -48,8 +48,8 @@ export class SearchComponent implements OnInit, OnChanges, OnDestroy { ngOnInit(): void { this.subs.add(this.value$.pipe( tap((val: string) => this.empty = val?.length === 0), - debounce((val: string) => val.length > 0 ? timer(this.debounceTime) : timer(0)), distinctUntilChanged(), + debounce((val: string) => val.length > 0 ? timer(this.debounceTime) : timer(0)), filter(val => val.length >= this.minimumChars || val.length === 0) ) .subscribe((value: string) => { diff --git a/src/app/webapp-common/shared/ui-components/inputs/select-autocomplete-for-template-forms/select-autocomplete-for-template-forms.component.ts b/src/app/webapp-common/shared/ui-components/inputs/select-autocomplete-for-template-forms/select-autocomplete-for-template-forms.component.ts index 9feae7f0..d6b094ab 100644 --- a/src/app/webapp-common/shared/ui-components/inputs/select-autocomplete-for-template-forms/select-autocomplete-for-template-forms.component.ts +++ b/src/app/webapp-common/shared/ui-components/inputs/select-autocomplete-for-template-forms/select-autocomplete-for-template-forms.component.ts @@ -31,12 +31,12 @@ export interface IOption { export class SelectAutocompleteForTemplateFormsComponent extends TemplateFormSectionBase implements OnInit { private _items: { label: string; value: string }[]; private _focusIt: any; - public loading: boolean = true; + public loading = true; separatorKeysCodes: number[] = [ENTER, COMMA]; - filterText: string = ''; - isNewName: boolean = false; + filterText = ''; + isNewName = false; @Input() errorMsg: string; - @Input() multiple: boolean = true; + @Input() multiple = true; @Input() name: string; @Output() customOptionAdded = new EventEmitter(); @Input() formFieldClass: string; @@ -57,12 +57,11 @@ export class SelectAutocompleteForTemplateFormsComponent extends TemplateFormSec return this._items || []; } - @Input() disabled: boolean = false; // @Input() required: boolean = false; - @Input() clearable: boolean = true; - @Input() placeholder: string = ''; - @Input() optionAddable: boolean = false; - @Input() autofocus: boolean = false; + @Input() clearable = true; + @Input() placeholder = ''; + @Input() optionAddable = false; + @Input() autofocus = false; @Input() set focusIt(isFocus) { if (isFocus && this.autofocus === true) { diff --git a/src/app/webapp-common/shared/ui-components/inputs/select-autocomplete-with-chips/select-autocomplete-with-chips.component.ts b/src/app/webapp-common/shared/ui-components/inputs/select-autocomplete-with-chips/select-autocomplete-with-chips.component.ts index 37a28c13..2860b0a7 100644 --- a/src/app/webapp-common/shared/ui-components/inputs/select-autocomplete-with-chips/select-autocomplete-with-chips.component.ts +++ b/src/app/webapp-common/shared/ui-components/inputs/select-autocomplete-with-chips/select-autocomplete-with-chips.component.ts @@ -47,15 +47,15 @@ export interface IOption { export class SelectAutocompleteWithChipsComponent extends TemplateFormSectionBase implements OnDestroy, AfterViewInit { private _items: { label: string; value: string }[]; private _focusIt: any; - public loading: boolean = true; + public loading = true; separatorKeysCodes: number[] = [ENTER, COMMA]; - filterText: string = ''; - isNewName: boolean = false; + filterText = ''; + isNewName = false; @Input() errorMsg: string; - @Input() multiple: boolean = true; + @Input() multiple = true; @Input() appearance: 'outline' | 'fill'; @Input() name: string; - @Input() showSearchIcon: boolean = false; + @Input() showSearchIcon = false; @Input() formFieldClass: string; @Output() customOptionAdded = new EventEmitter(); public filteredItems: Observable<{ label: string; value: string }[]>; @@ -72,11 +72,11 @@ export class SelectAutocompleteWithChipsComponent extends TemplateFormSectionBas return this._items || []; } - @Input() disabled: boolean = false; - @Input() clearable: boolean = true; - @Input() placeholder: string = ''; - @Input() optionAddable: boolean = false; - @Input() autofocus: boolean = false; + @Input() override disabled = false; + @Input() clearable = true; + @Input() placeholder = ''; + @Input() optionAddable = false; + @Input() autofocus = false; @Input() set focusIt(isFocus) { if (isFocus && this.autofocus) { diff --git a/src/app/webapp-common/shared/ui-components/overlay/dialog-template/dialog-template.component.html b/src/app/webapp-common/shared/ui-components/overlay/dialog-template/dialog-template.component.html index 717e3498..cdefbc3f 100755 --- a/src/app/webapp-common/shared/ui-components/overlay/dialog-template/dialog-template.component.html +++ b/src/app/webapp-common/shared/ui-components/overlay/dialog-template/dialog-template.component.html @@ -10,9 +10,9 @@ -
+
-
+
diff --git a/src/app/webapp-common/shared/ui-components/overlay/edit-json/edit-json.component.ts b/src/app/webapp-common/shared/ui-components/overlay/edit-json/edit-json.component.ts index 1b05bb05..9d232e3b 100644 --- a/src/app/webapp-common/shared/ui-components/overlay/edit-json/edit-json.component.ts +++ b/src/app/webapp-common/shared/ui-components/overlay/edit-json/edit-json.component.ts @@ -1,7 +1,6 @@ import {AfterViewInit, Component, ElementRef, HostListener, Inject, NgZone, ViewChild} from '@angular/core'; import {MAT_DIALOG_DATA, MatDialogRef} from '@angular/material/dialog'; import {JsonPipe} from '@angular/common'; -import {validateJson} from '../../../utils/validation-utils'; import {Store} from '@ngrx/store'; import {addMessage, saveAceCaretPosition} from '@common/core/actions/layout.actions'; import {Ace} from 'ace-builds'; @@ -11,11 +10,12 @@ import {map, take} from 'rxjs/operators'; declare const ace; export interface EditJsonData { - textData?: string | any; + textData?: string | object; readOnly?: boolean; title: string; format?: 'json' | 'yaml' | 'hocon'; placeHolder?: string; + reorder?: boolean; } @Component({ @@ -28,7 +28,6 @@ export class EditJsonComponent implements AfterViewInit{ public errors: Map; public textData: string; public showErrors: boolean; - public validators: Array = [validateJson]; private _readOnly: boolean; public placeHolder: string; @@ -37,12 +36,12 @@ export class EditJsonComponent implements AfterViewInit{ @ViewChild('aceEditor') private aceEditorElement: ElementRef; private aceEditor: Ace.Editor; private $aceCaretPosition: Observable<{ [key: string]: Ace.Point }>; - private defaultPlaceHolder = ''; - private format?: 'json' | 'yaml' | 'hocon'; + private readonly defaultPlaceHolder: string; + private readonly format?: 'json' | 'yaml' | 'hocon'; set readOnly(readOnly: boolean) { this._readOnly = readOnly; - }; + } get readOnly(): boolean { return this._readOnly; @@ -57,7 +56,7 @@ export class EditJsonComponent implements AfterViewInit{ constructor( @Inject(MAT_DIALOG_DATA) public data: EditJsonData, - private dialogRef: MatDialogRef, + private dialogRef: MatDialogRef, private jsonPipe: JsonPipe, private store: Store, private zone: NgZone, @@ -71,9 +70,21 @@ export class EditJsonComponent implements AfterViewInit{ "location" : "london", "date" : "2019-01-31 22:41:03" }`; + } else { + this.defaultPlaceHolder = ''; } this.placeHolder = data.placeHolder; - this.textData = data.textData ? (this.typeJson && typeof data.textData !== 'string' ? jsonPipe.transform(data.textData) : data.textData).slice() : undefined; + if(!data.textData) { + this.textData = undefined; + } else if (this.typeJson && typeof data.textData !== 'string') { + if (data.reorder) { + this.textData = jsonPipe.transform(this.orderJson(data.textData)); + } else { + this.textData = jsonPipe.transform(data.textData); + } + } else { + this.textData = data.textData as string; + } this.readOnly = data.readOnly; this.title = data.title; this.$aceCaretPosition = this.store.select(selectAceCaretPosition); @@ -150,4 +161,17 @@ export class EditJsonComponent implements AfterViewInit{ }); }); } + + private orderJson(data) { + if (data !== null && typeof data === 'object') { + if (Array.isArray(data)) { + return data.map(val => this.orderJson(val)); + } + return Object.keys(data).sort().reduce((acc, key) => { + acc[key] = this.orderJson(data[key]); + return acc; + }, {}); + } + return data; + } } diff --git a/src/app/webapp-common/shared/ui-components/overlay/share-dialog/share-dialog.component.scss b/src/app/webapp-common/shared/ui-components/overlay/share-dialog/share-dialog.component.scss index 936bb32f..e15d144e 100755 --- a/src/app/webapp-common/shared/ui-components/overlay/share-dialog/share-dialog.component.scss +++ b/src/app/webapp-common/shared/ui-components/overlay/share-dialog/share-dialog.component.scss @@ -1,8 +1,10 @@ -@import '../../styles/variables'; +@import 'variables'; +@import "mixins/link"; :host { width: 570px; + @include link(); .sub-title { max-width: 500px; diff --git a/src/app/webapp-common/shared/ui-components/overlay/spinner/spinner.component.scss b/src/app/webapp-common/shared/ui-components/overlay/spinner/spinner.component.scss index f0c38ce1..4daf87ba 100755 --- a/src/app/webapp-common/shared/ui-components/overlay/spinner/spinner.component.scss +++ b/src/app/webapp-common/shared/ui-components/overlay/spinner/spinner.component.scss @@ -7,38 +7,6 @@ align-items: center; z-index: 9999999; top: 50%; - left: 50%; + left: calc(50% + #{$side-bar-close-width * 0.5}); transform: translate(-50%); } - -.circle { - box-sizing: border-box; - width: 80px; - height: 80px; - border-radius: 100%; - border: 10px solid rgba(90, 101, 142, 0.8); - border-top-color: $purple; - animation: spin 1s infinite linear; - @keyframes spin { - 100% { - transform: rotate(360deg); - } - } -} - -.spinner-overlay { - position: absolute; - top: 60px; - left: 60px; - width: calc(100% - 60px); - height: calc(100% - 60px); - background: $blue-800; - opacity: 0; - z-index: 999998; - animation: showup 0.2s both normal; - @keyframes showup { - 100% { - opacity: 0.20; - } - } -} diff --git a/src/app/webapp-common/shared/ui-components/overlay/spinner/spinner.component.ts b/src/app/webapp-common/shared/ui-components/overlay/spinner/spinner.component.ts index 9f619232..72825398 100755 --- a/src/app/webapp-common/shared/ui-components/overlay/spinner/spinner.component.ts +++ b/src/app/webapp-common/shared/ui-components/overlay/spinner/spinner.component.ts @@ -10,12 +10,9 @@ import {isEqual} from 'lodash-es'; @Component({ selector: 'sm-spinner', template: ` -
-
-
+
+
- -
`, styleUrls: ['./spinner.component.scss'], changeDetection: ChangeDetectionStrategy.OnPush diff --git a/src/app/webapp-common/shared/ui-components/panel/card/card.component.html b/src/app/webapp-common/shared/ui-components/panel/card/card.component.html index 69861cd5..0ccc2f69 100755 --- a/src/app/webapp-common/shared/ui-components/panel/card/card.component.html +++ b/src/app/webapp-common/shared/ui-components/panel/card/card.component.html @@ -36,7 +36,7 @@
-
+
{{option.label}} @@ -18,5 +18,5 @@
No item found
- +
diff --git a/src/app/webapp-common/shared/ui-components/panel/checkbox-three-state-list/checkbox-three-state-list.component.scss b/src/app/webapp-common/shared/ui-components/panel/checkbox-three-state-list/checkbox-three-state-list.component.scss index b0e68dd1..c955428f 100644 --- a/src/app/webapp-common/shared/ui-components/panel/checkbox-three-state-list/checkbox-three-state-list.component.scss +++ b/src/app/webapp-common/shared/ui-components/panel/checkbox-three-state-list/checkbox-three-state-list.component.scss @@ -8,15 +8,11 @@ height: 40px; align-items: center; border-radius: 4px; - - &:hover { - background: $blue-50; - } } ::ng-deep .mat-mdc-checkbox { .mdc-checkbox .mdc-checkbox__native-control:indeterminate ~ .mdc-checkbox__background { - background-image: url('~app/webapp-common/assets/icons/cbx-exlude.svg'); + background-image: url(../../../../../../app/webapp-common/assets/icons/cbx-exlude.svg); background-size: 18px; border: 0; transition: none; diff --git a/src/app/webapp-common/shared/ui-components/panel/checkbox-three-state-list/checkbox-three-state-list.component.ts b/src/app/webapp-common/shared/ui-components/panel/checkbox-three-state-list/checkbox-three-state-list.component.ts index eba60c42..a71cc2c7 100644 --- a/src/app/webapp-common/shared/ui-components/panel/checkbox-three-state-list/checkbox-three-state-list.component.ts +++ b/src/app/webapp-common/shared/ui-components/panel/checkbox-three-state-list/checkbox-three-state-list.component.ts @@ -1,4 +1,4 @@ -import {ChangeDetectionStrategy, Component, EventEmitter, Input, OnInit, Output} from '@angular/core'; +import {ChangeDetectionStrategy, Component, EventEmitter, Input, Output} from '@angular/core'; import {excludedKey} from '@common/shared/utils/tableParamEncode'; import {addOrRemoveFromArray} from '@common/shared/utils/shared-utils'; @@ -25,7 +25,7 @@ export enum CheckboxState { styleUrls: ['./checkbox-three-state-list.component.scss'], changeDetection: ChangeDetectionStrategy.OnPush }) -export class CheckboxThreeStateListComponent implements OnInit { +export class CheckboxThreeStateListComponent { @Input() options: Array<{ label: string; value: string; tooltip?: string }>; @Input() supportExcludeFilter: boolean; @@ -66,13 +66,6 @@ export class CheckboxThreeStateListComponent implements OnInit { private _checkedList: string[]; private _excludeList: string[]; - constructor() { - } - - ngOnInit(): void { - } - - onFilterChanged(val) { if (val) { if (this.supportExcludeFilter && val.source.value !== null) { @@ -80,14 +73,14 @@ export class CheckboxThreeStateListComponent implements OnInit { return; } - const newValues = addOrRemoveFromArray(this.checkedList, val.source.value); + const newValues = this.checkedList? addOrRemoveFromArray(this.checkedList, val.source.value) : [val.source.value]; this.emitFilterChanged(newValues); } } emitFilterChanged(values?: string[], exclude = '') { const value = this.supportExcludeFilter - ? [...(values || this.checkedList), ...this.getExcludedValues(exclude)] + ? [...(values || this.checkedList || []), ...this.getExcludedValues(exclude)] : values; this.filterChanged.emit(value); } @@ -105,7 +98,7 @@ export class CheckboxThreeStateListComponent implements OnInit { case CheckboxState.checked: { val.source.checked = true; this.indeterminateState[value] = CheckboxState.exclude; - const newValues = this.checkedList.filter(v => v !== value); + const newValues = this.checkedList?.filter(v => v !== value); this.emitFilterChanged(newValues, value); break; } @@ -118,7 +111,7 @@ export class CheckboxThreeStateListComponent implements OnInit { case CheckboxState.empty: default: { this.indeterminateState[value] = CheckboxState.checked; - const newValues = addOrRemoveFromArray(this.checkedList, value); + const newValues = this.checkedList ? addOrRemoveFromArray(this.checkedList, value) : value; this.emitFilterChanged(newValues); } } diff --git a/src/app/webapp-common/shared/ui-components/panel/drawer/drawer.component.html b/src/app/webapp-common/shared/ui-components/panel/drawer/drawer.component.html index 72b853ef..d26cc85f 100755 --- a/src/app/webapp-common/shared/ui-components/panel/drawer/drawer.component.html +++ b/src/app/webapp-common/shared/ui-components/panel/drawer/drawer.component.html @@ -5,10 +5,11 @@
diff --git a/src/app/webapp-common/shared/ui-components/panel/editable-section/editable-section.component.html b/src/app/webapp-common/shared/ui-components/panel/editable-section/editable-section.component.html index 76aa6ce6..32ebe89d 100644 --- a/src/app/webapp-common/shared/ui-components/panel/editable-section/editable-section.component.html +++ b/src/app/webapp-common/shared/ui-components/panel/editable-section/editable-section.component.html @@ -15,8 +15,8 @@
-
- +
+ { this.listenScrollEvent(); }, 50); @@ -107,6 +108,10 @@ export class EditableSectionComponent implements OnDestroy { } private listenScrollEvent() { + if (!this.scrollToSection) { + return; + } + const {height: initHeight} = this.getEdges(); let initBottom; const factor = initHeight / 2; diff --git a/src/app/webapp-common/shared/ui-components/panel/experiment-card/experiment-card.component.html b/src/app/webapp-common/shared/ui-components/panel/experiment-card/experiment-card.component.html index 1bfbcb13..95d209e3 100755 --- a/src/app/webapp-common/shared/ui-components/panel/experiment-card/experiment-card.component.html +++ b/src/app/webapp-common/shared/ui-components/panel/experiment-card/experiment-card.component.html @@ -1,7 +1,7 @@
-
{{experiment?.name }}
+
{{experiment?.name }}
diff --git a/src/app/webapp-common/shared/ui-components/panel/experiment-card/experiment-card.component.ts b/src/app/webapp-common/shared/ui-components/panel/experiment-card/experiment-card.component.ts index f801dd75..33926dc8 100755 --- a/src/app/webapp-common/shared/ui-components/panel/experiment-card/experiment-card.component.ts +++ b/src/app/webapp-common/shared/ui-components/panel/experiment-card/experiment-card.component.ts @@ -1,7 +1,7 @@ import {ChangeDetectionStrategy, Component, EventEmitter, Input, Output} from '@angular/core'; import {isEmpty} from 'lodash-es'; -import {ITask} from '../../../../../business-logic/model/al-task'; -import {TIME_FORMAT_STRING} from '../../../../constants'; +import {TIME_FORMAT_STRING} from '@common/constants'; +import {ITask} from '~/business-logic/model/al-task'; @Component({ @@ -14,7 +14,7 @@ export class ExperimentCardComponent { public isEmpty = isEmpty; - @Input() experiment: any; + @Input() experiment: ITask; @Output() experimentCardClicked = new EventEmitter(); TIME_FORMAT_STRING = TIME_FORMAT_STRING; diff --git a/src/app/webapp-common/shared/ui-components/panel/model-card/model-card.component.html b/src/app/webapp-common/shared/ui-components/panel/model-card/model-card.component.html index f6fc3ae2..fce3a50d 100755 --- a/src/app/webapp-common/shared/ui-components/panel/model-card/model-card.component.html +++ b/src/app/webapp-common/shared/ui-components/panel/model-card/model-card.component.html @@ -1,7 +1,7 @@
-
{{model?.name}}
+
{{model?.name}}
diff --git a/src/app/webapp-common/shared/ui-components/panel/navbar-item/navbar-item.component.scss b/src/app/webapp-common/shared/ui-components/panel/navbar-item/navbar-item.component.scss index fbdb1d6b..68738b95 100755 --- a/src/app/webapp-common/shared/ui-components/panel/navbar-item/navbar-item.component.scss +++ b/src/app/webapp-common/shared/ui-components/panel/navbar-item/navbar-item.component.scss @@ -6,8 +6,9 @@ display: flex; flex-direction: column; align-items: center; - font-size: 13px; + font-size: 12px; font-weight: 500; + letter-spacing: 0.03em; text-align: center; cursor: pointer; padding: 22px; diff --git a/src/app/webapp-common/shared/ui-components/panel/project-card/project-card.component.html b/src/app/webapp-common/shared/ui-components/panel/project-card/project-card.component.html index 57aa6daa..432de2f1 100755 --- a/src/app/webapp-common/shared/ui-components/panel/project-card/project-card.component.html +++ b/src/app/webapp-common/shared/ui-components/panel/project-card/project-card.component.html @@ -30,7 +30,9 @@ (textChanged)="prepareProjectNameForChange($event)" > {{project.basename}}
Sample
diff --git a/src/app/webapp-common/shared/ui-components/styles/bootstrap-settings.scss b/src/app/webapp-common/shared/ui-components/styles/bootstrap-settings.scss index b0b8a8e1..575a488c 100755 --- a/src/app/webapp-common/shared/ui-components/styles/bootstrap-settings.scss +++ b/src/app/webapp-common/shared/ui-components/styles/bootstrap-settings.scss @@ -2,6 +2,7 @@ @import "variables"; @import "themes"; +$link-decoration: none; $dark-bootstrap-theme: map-get($dark-theme, bootstrap); $light-bootstrap-theme: map-get($light-theme, bootstrap); @@ -25,9 +26,6 @@ $btn-font-family: $font-family-base; .dark-theme { $primary: map-get($dark-bootstrap-theme, primary); - $grid-columns: $grid-cols; - $grid-gutter-width: $grid-gutter; - $container-max-widths: $grid-max-widths; $input-color: map-get($dark-theme-input, color); $input-placeholder-color: map-get($dark-theme-input, place-holder-color); $input-bg: map-get($dark-theme-input, background-color); @@ -45,12 +43,13 @@ $btn-font-family: $font-family-base; $button: map-get($dark-theme, button); + --bs-border-width: 1px; + // @import '~bootstrap/scss/bootstrap.scss'; @import 'bootstrap/scss/bootstrap-reboot'; @import 'bootstrap/scss/bootstrap-grid'; @import 'bootstrap/scss/bootstrap-utilities'; - @import "bootstrap/scss/grid"; @import "bootstrap/scss/buttons"; @import "bootstrap/scss/button-group"; @import "bootstrap/scss/card"; @@ -142,7 +141,7 @@ $btn-font-family: $font-family-base; font-size: 1rem; font-weight: 400; line-height: 1.5; - color: $blue-grey; + color: $blue-200; background-color: $black; background-clip: padding-box; border: 1px solid $blue-500; @@ -220,9 +219,6 @@ $btn-font-family: $font-family-base; .light-theme { $primary: map-get($light-bootstrap-theme, primary); $secondary: $white; - $grid-columns: $grid-cols; - $grid-gutter-width: $grid-gutter; - $container-max-widths: $grid-max-widths; $input-color: map-get($light-theme-input, color); $input-placeholder-color: map-get($light-theme-input, place-holder-color); @@ -248,14 +244,17 @@ $btn-font-family: $font-family-base; @import "bootstrap/scss/button-group"; @import "bootstrap/scss/card"; + --bs-border-width: 1px; + label { display: inline-flex; } .btn { - font-size: 11px; + font-size: 12px; line-height: normal; letter-spacing: 0.03em; + border-radius: 4px; } .btn-primary { @@ -285,29 +284,25 @@ $btn-font-family: $font-family-base; } .btn-secondary { - height: 32px; - border: solid 1px $blue-250; - color: $blue-480; - font-size: 11px; + height: 36px; + border: solid 1px $cloudy-blue; + color: $blue-500; + font-size: 12px; &:hover { - border: solid 1px $blue-300; - color: $blue-300; + border: solid 1px $cloudy-blue-two; + color: $blue-600; background-color: $white; } &:active, &:focus { - border: solid 1px $blue-250 !important; - color: $blue-400 !important; + border: solid 1px $blue-400 !important; + color: $blue-600 !important; background-color: white !important; box-shadow: none !important; } - &:focus { - color: $blue-480 !important; - } - &:disabled { border-color: $blue-250; color: $blue-250; diff --git a/src/app/webapp-common/shared/ui-components/styles/empty.scss b/src/app/webapp-common/shared/ui-components/styles/empty.scss new file mode 100644 index 00000000..9c72283b --- /dev/null +++ b/src/app/webapp-common/shared/ui-components/styles/empty.scss @@ -0,0 +1,36 @@ +@import "variables"; + +@mixin empty-card-mixin() { + .empty-state { + height: 100%; + width: 100%; + max-width: 2400px; + grid-column: 1/-1; + display: flex; + flex-direction: column; + margin: 0 auto; + + .title-icon { + color: $blue-600; + text-align: center; + margin-bottom: 24px; + } + + .title { + font-size: 20px; + font-weight: 500; + color: $blue-100; + margin-bottom: 6px; + text-align: center; + } + + .sub-title { + text-align: center; + margin-bottom: 64px; + + .link { + color: $neon-yellow; + } + } + } +} diff --git a/src/app/webapp-common/shared/ui-components/styles/icons.scss b/src/app/webapp-common/shared/ui-components/styles/icons.scss index f16ef513..e3384df6 100755 --- a/src/app/webapp-common/shared/ui-components/styles/icons.scss +++ b/src/app/webapp-common/shared/ui-components/styles/icons.scss @@ -30,6 +30,10 @@ color: $blue-800; } + &.purple { + color: $purple; + } + &.error-dark{ color: $error-dark } @@ -294,6 +298,12 @@ &.dark { @include icon('#{$assets-icons-path}/running-dark.svg'); } + &.notify { + @include icon('#{$assets-icons-path}/running-notify.svg'); + &.grey{ + @include icon('#{$assets-icons-path}/running-notify-grey.svg'); + } + } } .i-completed, .i-Final { @@ -326,6 +336,10 @@ &.bw { @include icon('#{$assets-icons-path}/failed-white.svg'); } + + &.small { + @include icon('#{$assets-icons-path}/failed-sm.svg'); + } } .i-published { @@ -512,6 +526,11 @@ @include icon('#{$assets-icons-path}/audio.svg'); } +//No font icon +.i-no-table-data { + @include icon('#{$assets-icons-path}/no-table-data.svg'); +} + //No font icon .i-no-debug-samples { @include icon('#{$assets-icons-path}/no-debug-samples.svg'); diff --git a/src/app/webapp-common/shared/ui-components/styles/index.scss b/src/app/webapp-common/shared/ui-components/styles/index.scss index 74a469da..1fee9c3d 100755 --- a/src/app/webapp-common/shared/ui-components/styles/index.scss +++ b/src/app/webapp-common/shared/ui-components/styles/index.scss @@ -33,7 +33,7 @@ body { h4 { font-size: 14px; - font-weight: bold; + font-weight: 500; } option { @@ -41,14 +41,6 @@ body { background-color: map-get($dark-theme-select, option-bg); } - a { - color: $blue-250; - - &:hover { - color: #FFFFFF; - } - } - sm-menu .btn { color: $blue-250; } @@ -64,18 +56,10 @@ body { background-color: transparent; } - a { - color: $purple; - - &:hover { - color: $purple; - text-decoration: underline; - } - } h4 { font-size: 14px; - font-weight: bold; + font-weight: 500; } option { diff --git a/src/app/webapp-common/shared/ui-components/styles/material-overide.scss b/src/app/webapp-common/shared/ui-components/styles/material-overide.scss index b3ecb717..2becb7c6 100644 --- a/src/app/webapp-common/shared/ui-components/styles/material-overide.scss +++ b/src/app/webapp-common/shared/ui-components/styles/material-overide.scss @@ -3,12 +3,20 @@ .dark-theme, .light-theme { + /* mat select */ + --mat-select-trigger-text-size: 14px; + --mat-select-trigger-text-tracking: 0; + --mat-option-label-text-size: 14px; + --mat-option-label-text-tracking: 0; + --mat-option-label-text-line-height: 32px; + .entity-context-menu .cdk-program-focused { background-color: transparent !important; } + .mat-mdc-form-field { - --mdc-typography-body1-font-size: 14px; - --mdc-typography-body1-line-height: 16px; + --mat-menu-item-label-text-size: 14px; + --mat-menu-item-label-text-line-height: 16px; &.mat-form-field-appearance-outline { &.black { @@ -24,25 +32,13 @@ height: 100%; .mat-mdc-form-field-infix { - min-height: 100%; + min-height: 36px; padding: 5px 0; - - .mat-mdc-input-element { - height: 26px; - } - } - - .mat-mdc-form-field-icon-suffix { - line-height: 24px; } } } - &.mat-mdc-form-field-type-mat-select { - .mat-mdc-text-field-wrapper .mat-mdc-form-field-infix { - padding: 6px 0; - } - } + } &.mat-form-field-appearance-fill { @@ -105,7 +101,7 @@ } &.dark, &.black { - --mdc-theme-surface: #000; + --mat-autocomplete-background-color: #000; .mat-mdc-option { --mdc-theme-text-primary-on-background: #{$blue-200}; @@ -113,8 +109,6 @@ } .mat-mdc-option { - --mdc-typography-body1-line-height: 36px; - --mdc-typography-body1-font-size: 14px; min-height: 36px; } } @@ -123,7 +117,7 @@ --mdc-theme-primary: #{$blue-200}; --mdc-list-list-item-label-text-color: #{$blue-200}; --mdc-theme-text-primary-on-background: #{$blue-200}; - --mdc-typography-body1-font-size: 14px; + --mat-menu-item-label-text-size: 14px; } .dark-theme { @@ -145,9 +139,69 @@ } } } + + .mat-mdc-select { + --mat-select-enabled-trigger-text-color: #{$blue-200}; + } + .mat-mdc-option { + --mat-option-label-text-color: #{$blue-200}; + &.mdc-list-item--selected:not(.mdc-list-item--disabled) .mdc-list-item__primary-text { + --mat-option-selected-state-label-text-color: #{$blue-100}; + } + } + .mat-mdc-select-arrow { + --mat-select-enabled-arrow-color: #{$blue-300}; + } + .mat-mdc-form-field.mat-focused .mat-mdc-select-arrow { + --mat-select-focused-arrow-color: #{$blue-100}; + } + /* placeholder */ + .mdc-text-field:not(.mdc-text-field--disabled) .mdc-text-field__input::placeholder { + color: $blue-300; + } + .mat-mdc-menu-item .mat-mdc-menu-submenu-icon { + --mat-menu-item-icon-color: #{$blue-300}; + } + .mdc-text-field:not(.mdc-text-field--disabled) .mdc-text-field__input { + color: $blue-200; + } } .light-theme { + mat-option { + --mat-option-hover-state-layer-color: #{$blue-50}; + --mat-option-focus-state-layer-color: #{$blue-100}; + --mat-option-selected-state-layer-color: #{$blue-50}; + margin: 0 4px; + } + + .mat-mdc-select { + --mat-select-enabled-trigger-text-color: #{$blue-500}; + } + .mat-mdc-option { + --mat-option-label-text-color: #{$blue-500}; + &.mdc-list-item--selected:not(.mdc-list-item--disabled) .mdc-list-item__primary-text { + --mat-option-selected-state-label-text-color: #{$blue-600}; + } + } + .mat-mdc-select-arrow { + --mat-select-enabled-arrow-color: #{$blue-400}; + } + .mat-mdc-form-field.mat-focused .mat-mdc-select-arrow { + --mat-select-focused-arrow-color: #{$blue-500}; + } + /* placeholder */ + .mdc-text-field:not(.mdc-text-field--disabled) .mdc-text-field__input::placeholder { + color: $blue-300; + } + .mat-mdc-menu-item .mat-mdc-menu-submenu-icon { + --mat-menu-item-icon-color: #{$blue-400}; + } + .mdc-text-field:not(.mdc-text-field--disabled) .mdc-text-field__input { + color: $blue-500; + } + + .mat-mdc-form-field, .mat-mdc-form-field.notched { .mdc-notched-outline__notch { border-radius: 4px 0 0 4px; @@ -178,7 +232,7 @@ } .mat-mdc-select, &.mat-mdc-select-panel { - --mdc-typography-body1-font-size: 14px; + --mat-menu-item-label-text-size: 14px; .mat-mdc-option { border-radius: 4px; @@ -201,7 +255,7 @@ } &.wider-options { - min-width: 250px; + min-width: 250px; } } } @@ -209,7 +263,8 @@ body.dark-theme .mat-mdc-select-panel.dark-outline, body.dark-theme .mat-mdc-autocomplete-panel.dark-outline { --mdc-theme-primary: #{$blue-200}; - --mdc-typography-body1-font-size: 14px; + --mat-menu-item-label-text-size: 14px; + --mat-option-selected-state-label-text-color: $blue-200; background-color: #000; border: 1px solid $blue-500; padding: 4px; @@ -255,6 +310,7 @@ body.dark-theme .mat-mdc-autocomplete-panel.dark-outline { &.mat-primary .mat-mdc-option.mat-selected:not(.mat-option-disabled) .mdc-list-item__primary-text { color: $blue-200; } + &.unset-option-height .mat-mdc-option { // show all options text inside height: unset; @@ -282,6 +338,17 @@ body.dark-theme .mat-mdc-autocomplete-panel.dark-outline { } } +.light-theme .mat-mdc-slide-toggle.mat-primary { + --mdc-switch-selected-hover-handle-color: #{$purple}; + --mdc-switch-selected-focus-handle-color: #{$purple}; + --mdc-switch-selected-pressed-handle-color: #{$purple}; + --mdc-switch-unselected-focus-handle-color: #616161; + --mdc-switch-selected-track-color: #{rgba($purple, 0.3)}; + --mdc-switch-selected-focus-track-color: #{rgba($purple, 0.3)}; + --mdc-switch-selected-pressed-track-color: #{rgba($purple, 0.4)}; + --mdc-switch-selected-hover-track-color: #{rgba($purple, 0.4)}; +} + .mat-mdc-slide-toggle { --mdc-switch-selected-icon-size: 8px; --mdc-switch-unselected-icon-size: 8px; @@ -381,6 +448,10 @@ body.dark-theme .mat-mdc-autocomplete-panel.dark-outline { } } -.dark-theme .mat-primary .mat-pseudo-checkbox-checked.mat-pseudo-checkbox-minimal::after { - color: $blue-200; +.dark-theme, .light-theme { + .mat-primary .mat-pseudo-checkbox-checked.mat-pseudo-checkbox-minimal::after, + .mat-primary .mat-pseudo-checkbox-checked.mat-pseudo-checkbox-full::after, + .mat-primary .mat-pseudo-checkbox-indeterminate.mat-pseudo-checkbox-full::after { + color: $blue-200; + } } diff --git a/src/app/webapp-common/shared/ui-components/styles/mixins/icon.scss b/src/app/webapp-common/shared/ui-components/styles/mixins/icon.scss index 09018408..202050d7 100755 --- a/src/app/webapp-common/shared/ui-components/styles/mixins/icon.scss +++ b/src/app/webapp-common/shared/ui-components/styles/mixins/icon.scss @@ -1,5 +1,5 @@ @mixin icon($url) { - background-image: url('../../../../../' + $url); + background-image: url('../../../../../../#{$url}'); background-repeat: no-repeat; background-position-x: center; background-position-y: center; diff --git a/src/app/webapp-common/shared/ui-components/styles/mixins/link.scss b/src/app/webapp-common/shared/ui-components/styles/mixins/link.scss new file mode 100644 index 00000000..d64bc3cc --- /dev/null +++ b/src/app/webapp-common/shared/ui-components/styles/mixins/link.scss @@ -0,0 +1,12 @@ +@import "variables"; + +@mixin link($link-color: $purple) { + a[href] { + color: $link-color; + cursor: pointer; + + &:hover { + text-decoration: underline; + } + } +} diff --git a/src/app/webapp-common/shared/ui-components/styles/notifications.scss b/src/app/webapp-common/shared/ui-components/styles/notifications.scss index ac68c7fb..f2826fb2 100644 --- a/src/app/webapp-common/shared/ui-components/styles/notifications.scss +++ b/src/app/webapp-common/shared/ui-components/styles/notifications.scss @@ -10,12 +10,12 @@ $levels-list: error warn info success; .notifier__notification-button { position: absolute; - right: 5px; - top: -5px; + right: 10px; + top: 2px; fill: $blue-300; .notifier__notification-button-icon { - height: 15px; + height: 32px; } } diff --git a/src/app/webapp-common/shared/ui-components/styles/primeng/_slider.scss b/src/app/webapp-common/shared/ui-components/styles/primeng/_slider.scss new file mode 100644 index 00000000..138a5085 --- /dev/null +++ b/src/app/webapp-common/shared/ui-components/styles/primeng/_slider.scss @@ -0,0 +1,75 @@ +/* modified from https://github.com/primefaces/primeng-sass-theme/blob/main/theme-base/components/input/_slider.scss */ +@use 'sass:math'; + +.p-slider { + background: $sliderBg; + border: $sliderBorder; + border-radius: $borderRadius; + + &.p-slider-horizontal { + height: $sliderHorizontalHeight; + + .p-slider-handle { + margin-top: math.div(-1 * $sliderHandleHeight, 2); + margin-left: math.div(-1 * $sliderHandleWidth, 2); + } + } + + &.p-slider-vertical { + width: $sliderVerticalWidth; + height: 100%; + + .p-slider-handle { + height: $sliderHandleWidth; + width: $sliderHandleHeight; + margin-left: math.div(-1 * $sliderHandleHeight, 2); + margin-bottom: math.div(-1 * $sliderHandleWidth, 2); + } + } + + .p-slider-handle { + height: $sliderHandleHeight; + width: $sliderHandleWidth; + background: $sliderHandleBg; + border: $sliderHandleBorder; + border-radius: $sliderHandleBorderRadius; + transition: $formElementTransition; + + &:focus { + //@include focused(); + } + } + + .p-slider-range { + background: $sliderRangeBg; + } + + &:not(.p-disabled) { + .p-slider-handle:hover { + background: $sliderHandleHoverBg; + border-color: $sliderHandleHoverBorderColor; + } + } + + &.p-slider-animate { + &.p-slider-horizontal { + .p-slider-handle { + transition: $formElementTransition, left $transitionDuration; + } + + .p-slider-range { + transition: width $transitionDuration; + } + } + + &.p-slider-vertical { + .p-slider-handle { + transition: $formElementTransition, bottom $transitionDuration; + } + + .p-slider-range { + transition: height $transitionDuration; + } + } + } +} diff --git a/src/app/webapp-common/shared/ui-components/styles/primeng/p-slider.scss b/src/app/webapp-common/shared/ui-components/styles/primeng/p-slider.scss new file mode 100644 index 00000000..355a9d70 --- /dev/null +++ b/src/app/webapp-common/shared/ui-components/styles/primeng/p-slider.scss @@ -0,0 +1,22 @@ +@import "variables"; +@import "primeng/resources/components/slider/slider"; + +$borderRadius: 12px; +$formElementTransition: background-color 0.2s, color 0.2s, border-color 0.2s, box-shadow 0.2s; +$transitionDuration: 0.2s; + +$sliderBg: $blue-600; +$sliderBorder: 0 none !default; +$sliderHorizontalHeight: 4px !default; +$sliderVerticalWidth: 4px !default; +$sliderHandleWidth: 40px !default; +$sliderHandleHeight: 12px !default; +$sliderHandleBg: $blue-300 !default; +$sliderHandleBorder: none !default; +$sliderHandleBorderRadius: 12px !default; +$sliderHandleHoverBorderColor: $blue-280 !default; +$sliderHandleHoverBg: $blue-280 !default; +$sliderRangeBg: $blue-600 !default; + +@import "./_slider"; + diff --git a/src/app/webapp-common/shared/ui-components/styles/themes/dark.scss b/src/app/webapp-common/shared/ui-components/styles/themes/dark.scss index 207dcdf4..32c6a357 100755 --- a/src/app/webapp-common/shared/ui-components/styles/themes/dark.scss +++ b/src/app/webapp-common/shared/ui-components/styles/themes/dark.scss @@ -74,14 +74,14 @@ $dark-theme: ( ), input: ( height: 32px, - color: $blue-grey, + color: $blue-200, place-holder-color: $blue-300, background-color: #000, background-color-disabled: #000, border-radius: 4px, border-color: $blue-500, border-width: 1px, - focus-color: $blue-grey, + focus-color: $blue-100, hover-border-color: rgba(206, 209, 220, 0.5), focus-border-color: $blue-300, focus-box-shadow: none, @@ -91,7 +91,7 @@ $dark-theme: ( search-input: ( color: $blue-280, icon-color: $blue-280, - border-color: $blue-grey, + border-color: $blue-200, border-color-focus: $blue-500, ph-color: $blue-280, seperator: $blue-900 @@ -105,7 +105,7 @@ $dark-theme: ( background-color: black, border-radius: 4px, border: 0px, - color: $blue-grey, + color: $blue-200, placeholder-color: $blue-300 ), table: ( diff --git a/src/app/webapp-common/shared/ui-components/styles/variables.scss b/src/app/webapp-common/shared/ui-components/styles/variables.scss index 3944c5eb..80af353d 100755 --- a/src/app/webapp-common/shared/ui-components/styles/variables.scss +++ b/src/app/webapp-common/shared/ui-components/styles/variables.scss @@ -21,7 +21,6 @@ $blue-700: #202432; //32,36,50 $blue-800: #1a1e2c; //26,30,44 $blue-900: #141722; //20,23,34 $blue-950: #0d0e15; //20,23,34 - $black: #000000; $cloudy-blue: #d4d6e0; @@ -76,10 +75,23 @@ $level-colors: ( error: $error-color, ); +$severity-colors: ( + 0: #21B553, + 1: #4EB243, + 2: #7BAE32, + 3: #A6AA21, + 4: #D2A611, + 5: #FFA301, + 6: #F98D0B, + 7: #F17514, + 8: #EB5F1E, + 9: #E54928, + 10: #DE3232, +); + $dark-grey-blue: #39405f; $light-periwinkle-two: #c1cdf3; $faint-gray: #f4f7ff; -$blue-grey: #8693be; $dark-primary-text: rgba(black, 0.87); @@ -176,28 +188,6 @@ $font-weight-base: $font-weight-normal; // TODO: $font-weight-light: 300; // TODO: $font-weight-bold: 700; // TODO: -// grid -$grid-gutter: 30px; - -$grid-cols: 24; - -$grid-max-widths: ( - sm: 540px, - md: 720px, - lg: 960px, - xl: 1528px -); - -$grid-breakpoints: (// TODO: - xs: 0, - sm: 576px, - md: 768px, - lg: 992px, - xl: 1200px, - xxl: 1600px, - xxxl: 1900px -); - $nav-bar-height: 64px; $nav-bar-bg: $blue-900; $side-bar-close-width: 64px; @@ -222,8 +212,6 @@ $zindex-popover: 1060; $zindex-tooltip: 1070; // card -$card-spacer-y: math.div($grid-gutter, 2); -$card-spacer-x: math.div($grid-gutter, 2); $card-border-radius: 6px; $card-bg: $blue-500; $card-footer-bg: $blue-600; diff --git a/src/app/webapp-common/shared/ui-components/tags/tag-color-menu/tag-color-menu.component.scss b/src/app/webapp-common/shared/ui-components/tags/tag-color-menu/tag-color-menu.component.scss index 36bf3191..afd29582 100644 --- a/src/app/webapp-common/shared/ui-components/tags/tag-color-menu/tag-color-menu.component.scss +++ b/src/app/webapp-common/shared/ui-components/tags/tag-color-menu/tag-color-menu.component.scss @@ -9,12 +9,23 @@ display: none; } ::ng-deep .color-picker { - .preset-area .preset-color { - margin: 4px; - border-color: white; - box-shadow: 0 0 0 1px $blue-200; - &:hover { - box-shadow: 0 0 0 1px $blue-400; + border-radius: 4px; + box-shadow: 0 3px 6px 0 rgba(0, 0, 0, 0.16); + border-color: $blue-200; + .saturation-lightness { + border-radius: 3px 3px 0 0; + } + .preset-area { + hr { + margin-top: 0; + } + .preset-color { + margin: 4px; + border-color: white; + box-shadow: 0 0 0 1px $blue-200; + &:hover { + box-shadow: 0 0 0 1px $blue-400; + } } } .button-area { diff --git a/src/app/webapp-common/shared/ui-components/tags/tag-list/tag-list.component.html b/src/app/webapp-common/shared/ui-components/tags/tag-list/tag-list.component.html index 41ce2c05..17b49e28 100644 --- a/src/app/webapp-common/shared/ui-components/tags/tag-list/tag-list.component.html +++ b/src/app/webapp-common/shared/ui-components/tags/tag-list/tag-list.component.html @@ -12,7 +12,7 @@ - +
- +
diff --git a/src/app/webapp-common/shared/ui-components/tags/user-tag/user-tag.component.ts b/src/app/webapp-common/shared/ui-components/tags/user-tag/user-tag.component.ts index 0cd05304..b8d7f526 100644 --- a/src/app/webapp-common/shared/ui-components/tags/user-tag/user-tag.component.ts +++ b/src/app/webapp-common/shared/ui-components/tags/user-tag/user-tag.component.ts @@ -1,10 +1,19 @@ import {Component, Input, Output, EventEmitter} from '@angular/core'; import {TagColor} from '../../../../core/actions/projects.actions'; +import {TooltipDirective} from '@common/shared/ui-components/indicators/tooltip/tooltip.directive'; +import {NgIf} from '@angular/common'; +import {MatProgressSpinnerModule} from '@angular/material/progress-spinner'; @Component({ selector: 'sm-user-tag', templateUrl: './user-tag.component.html', - styleUrls: ['./user-tag.component.scss'] + styleUrls: ['./user-tag.component.scss'], + imports: [ + TooltipDirective, + NgIf, + MatProgressSpinnerModule + ], + standalone: true }) export class UserTagComponent { @Input() caption: string; diff --git a/src/app/webapp-common/shared/ui-components/template-forms-ui/cross-fields-duplicate-validator.directive.ts b/src/app/webapp-common/shared/ui-components/template-forms-ui/cross-fields-duplicate-validator.directive.ts new file mode 100644 index 00000000..118feed8 --- /dev/null +++ b/src/app/webapp-common/shared/ui-components/template-forms-ui/cross-fields-duplicate-validator.directive.ts @@ -0,0 +1,20 @@ +import {Directive, Input} from '@angular/core'; +import {AbstractControl, NG_VALIDATORS, ValidationErrors, Validator} from '@angular/forms'; + +export const crossFieldsDuplicatesValidator = (control:AbstractControl, fieldNames: string[]): ValidationErrors | null => { + const controls = fieldNames.map(name=> control.get(name)); + return (new Set(controls.map(control=> control?.value)).size !== controls.length ? { crossFieldsDuplicates: true } : null); +} + +@Directive({ + selector: '[smCrossFieldsDuplicatesValidator]', + providers: [{provide: NG_VALIDATORS, useExisting: ExistNameValidatorDirective, multi: true}] +}) +export class ExistNameValidatorDirective implements Validator { + @Input('smCrossFieldsDuplicatesValidator') fieldsNames: string[] = []; + validate(control: AbstractControl): ValidationErrors | null { + return this.fieldsNames ? crossFieldsDuplicatesValidator(control, this.fieldsNames) : null; + } +} + + diff --git a/src/app/webapp-common/shared/ui-components/template-forms-ui/templateFormSectionBase.ts b/src/app/webapp-common/shared/ui-components/template-forms-ui/templateFormSectionBase.ts index 4d63d50a..c162a189 100644 --- a/src/app/webapp-common/shared/ui-components/template-forms-ui/templateFormSectionBase.ts +++ b/src/app/webapp-common/shared/ui-components/template-forms-ui/templateFormSectionBase.ts @@ -3,7 +3,7 @@ import {ControlValueAccessor, NgForm} from '@angular/forms'; @Directive() export class TemplateFormSectionBase implements ControlValueAccessor { - public disabled: boolean; + @Input() public disabled: boolean; public val = null; public ngModelValue = null; protected valueFromInherit = true; diff --git a/src/app/webapp-common/shared/ui-components/ui-components.module.ts b/src/app/webapp-common/shared/ui-components/ui-components.module.ts index dbbf1b40..a0e27ca8 100755 --- a/src/app/webapp-common/shared/ui-components/ui-components.module.ts +++ b/src/app/webapp-common/shared/ui-components/ui-components.module.ts @@ -21,7 +21,7 @@ import {SMMaterialModule} from '../material/material.module'; import {AlertDialogComponent} from './overlay/alert-dialog/alert-dialog.component'; import {TooltipDirective} from './indicators/tooltip/tooltip.directive'; import {CheckboxControlComponent} from './forms/checkbox-control/checkbox-control.component'; -import {SimpleTableComponent2} from './data/simple-table/simple-table.component'; +import {SimpleTableComponent} from './data/simple-table/simple-table.component'; import {ChipsModule} from './buttons/chips/chips.module'; import {TermsOfUseDialogComponent} from './overlay/terms-of-use-dialog/terms-of-use-dialog.component'; import {LeafComponent} from './overlay/leaf/leaf.component'; @@ -73,7 +73,6 @@ import {RefreshButtonComponent} from '../components/refresh-button/refresh-butto import {DurationInputComponent} from './inputs/duration-input/duration-input.component'; import {KeydownStopPropagationDirective} from './directives/keydown-stop-propagation.directive'; import {PreventArrowKeysDirective} from './directives/prevent-arrow-keys.directive'; -import {EllipsisMiddleDirective} from './directives/ellipsis-middle.directive'; import {UserTagComponent} from './tags/user-tag/user-tag.component'; import {TagListComponent} from './tags/tag-list/tag-list.component'; import {TagsMenuComponent} from './tags/tags-menu/tags-menu.component'; @@ -115,8 +114,10 @@ import { ChipsListComponent } from './buttons/chips-list/chips-list.component'; import {VirtualGridComponent} from '@common/shared/components/virtual-grid/virtual-grid.component'; import {ScrollEndDirective, ScrollEndRootDirective} from './directives/scroll-end.directive'; import {LabeledFormFieldDirective} from '@common/shared/directive/labeled-form-field.directive'; -import {Angular2CsvModule} from 'angular2-csv'; import {A11yModule} from '@angular/cdk/a11y'; +import { + ExistNameValidatorDirective +} from '@common/shared/ui-components/template-forms-ui/cross-fields-duplicate-validator.directive'; const declarations = [ DurationInputComponent, @@ -146,14 +147,13 @@ const declarations = [ OperationErrorDialogComponent, EditJsonComponent, ShareDialogComponent, - EllipsisMiddleDirective, KeydownStopPropagationDirective, PreventArrowKeysDirective, ThrottledScrollListenerDirective, JsonValidatorDirective, AlertDialogComponent, CheckboxControlComponent, - SimpleTableComponent2, + SimpleTableComponent, SelectableListComponent, GroupedCheckedFilterListComponent, GroupedSelectableListComponent, @@ -171,16 +171,14 @@ const declarations = [ ToggleArchiveComponent, TermsOfUseDialogComponent, LoadingButtonComponent, - TagComponent, UniqueNameValidatorDirective, UniquePathValidatorDirective, RequiredAutocompleteSelectionValidatorDirective, InvalidPrefixValidatorDirective, ForceInvalidValidatorDirective, NotAllowedStringsValidatorValidatorDirective, + ExistNameValidatorDirective, RefreshButtonComponent, - UserTagComponent, - TagListComponent, HesitateDirective, DividerComponent, TableFilterDurationDateTimeComponent, @@ -226,13 +224,15 @@ const declarations = [ DialogTemplateComponent, ClickStopPropagationDirective, LabeledFormFieldDirective, - Angular2CsvModule, A11yModule, + TagListComponent, + UserTagComponent, + TagComponent ], providers : [ ], declarations: [...declarations, TagsMenuComponent, TagColorMenuComponent, ResizableColumnDirective, HesitateDirective, DurationInputListComponent, TableFilterDurationComponent, TableFilterDurationErrorComponent, RippleButtonComponent, TemplateAliasDirective, CodeEditorComponent, ChipsListComponent], exports: [...declarations, ChipsModule, SMMaterialModule, ChooseColorModule, SMPortalModule, TagsMenuComponent, - TableFilterDurationComponent, MatDatepickerModule, TemplateAliasDirective, CodeEditorComponent, ChipsListComponent, + TableFilterDurationComponent, MatDatepickerModule, TemplateAliasDirective, CodeEditorComponent, ChipsListComponent, TagComponent, TagListComponent, UserTagComponent, TooltipDirective, ShowTooltipIfEllipsisDirective, SelectAutocompleteWithChipsComponent, DialogTemplateComponent, ClickStopPropagationDirective] }) export class UiComponentsModule { diff --git a/src/app/webapp-common/shared/utils/helpers.util.ts b/src/app/webapp-common/shared/utils/helpers.util.ts index 4284be02..3154f03b 100644 --- a/src/app/webapp-common/shared/utils/helpers.util.ts +++ b/src/app/webapp-common/shared/utils/helpers.util.ts @@ -1,4 +1,4 @@ -import { isNil, isUndefined } from 'lodash-es'; +import {isNil, isUndefined} from 'lodash-es'; import {excludedKey} from '@common/shared/utils/tableParamEncode'; export function hasValue(value): boolean { @@ -8,4 +8,26 @@ export function hasValue(value): boolean { export function getValueOrDefault(value: T, fallbackValue?: F): T | F { return hasValue(value) ? value : fallbackValue; } -export const cleanTag = (tag) => tag.replace(excludedKey, ''); + +export const cleanTag = (tag) => tag === null ? null : tag.replace(excludedKey, ''); + +// 2 helper functions to overcome Chrome issue with min/max calculation of large arrays +// https://stackoverflow.com/questions/42623071/maximum-call-stack-size-exceeded-with-math-min-and-math-max +export const maxInArray = (arr: number[]) => { + let len = arr.length; + let max = -Infinity; + + while (len--) { + max = arr[len] > max ? arr[len] : max; + } + return max; +}; +export const minInArray = (arr: number[]) => { + let len = arr.length; + let min = Infinity; + + while (len--) { + min = arr[len] < min ? arr[len] : min; + } + return min; +}; diff --git a/src/app/webapp-common/shared/utils/shared-utils.ts b/src/app/webapp-common/shared/utils/shared-utils.ts index 7dfc7299..8203f4a6 100755 --- a/src/app/webapp-common/shared/utils/shared-utils.ts +++ b/src/app/webapp-common/shared/utils/shared-utils.ts @@ -1,11 +1,11 @@ import {MEDIA_VIDEO_EXTENSIONS, MediaContentTypeEnum} from '~/app.constants'; import {ActivatedRoute} from '@angular/router'; import {EXPERIMENT_GRAPH_ID_PREFIX} from '../../experiments/shared/common-experiments.const'; -import {get, last} from 'lodash-es'; +import {capitalize, get, last, snakeCase} from 'lodash-es'; import {User} from '~/business-logic/model/users/user'; import {TABLE_SORT_ORDER} from '../ui-components/data/table/table.consts'; +import {camelCase} from 'lodash-es'; -export const capitalizeFirstLetter = (str: string) => str.charAt(0).toUpperCase() + str.slice(1); const CRC_TABLE = () => { const polynomial = 0x04C11DB7; @@ -78,7 +78,7 @@ export const createModelLink = (uri, modelId, modelSignedUri) => { return encodeURI(url); }; -export const allItemsAreSelected = (itemsInView: { id: any }[], selectedItems: { id: any }[]) => { +export const allItemsAreSelected = (itemsInView: { id: string }[], selectedItems: { id: string }[]) => { if (itemsInView?.length === 0 || selectedItems.length === 0) { return false; } else { @@ -87,7 +87,7 @@ export const allItemsAreSelected = (itemsInView: { id: any }[], selectedItems: { } }; -export const addOrRemoveFromArray = (arr: Array = [], item) => { +export const addOrRemoveFromArray = (arr: T[] = [], item: T) => { if (arr.includes(item)) { return arr.filter(arrItem => item !== arrItem); } else { @@ -114,7 +114,7 @@ export const isScrolledIntoView = el => { // Only completely visible elements return true: // const isVisible = (elemTop >= 0) && (elemBottom <= window.innerHeight); // Partially visible elements return true: - return elemTop < window.innerHeight && elemBottom >= 0; + return elemTop < window.innerHeight && elemBottom >= 0; }; export const getRouteFullUrl = (route: ActivatedRoute) => { @@ -153,12 +153,11 @@ export const getCssTheme = (el: HTMLElement): string => { return null; }; -// eslint-disable-next-line prefer-arrow/prefer-arrow-functions -export function crc32(str /* , polynomial = 0x04C11DB7, initialValue = 0xFFFFFFFF, finalXORValue = 0xFFFFFFFF*/) { +export function crc32(str, ...rest /* , polynomial = 0x04C11DB7, initialValue = 0xFFFFFFFF, finalXORValue = 0xFFFFFFFF*/) { const s = String(str); const table = CRC_TABLE; - const initialValue = arguments.length < 3 ? 0xFFFFFFFF : (arguments[2] >>> 0); - const finalXORValue = arguments.length < 4 ? 0xFFFFFFFF : (arguments[3] >>> 0); + const initialValue = arguments.length < 3 ? 0xFFFFFFFF : (rest[1] >>> 0); + const finalXORValue = arguments.length < 4 ? 0xFFFFFFFF : (rest[2] >>> 0); let crc = initialValue; const length = s.length; let k = -1; @@ -271,5 +270,47 @@ export const getBaseName = (url: string): string => { export const splitLine = (line: string, search: string) => { const regex = new RegExp(search, 'gi'); const match = line.match(regex); - return line.split(regex).map( (part, i) => [part, match?.[i]]); + return line.split(regex).map((part, i) => [part, match?.[i]]); }; +export const cloneItemIntoDummy = (eCell: HTMLElement, eDummyContainer: HTMLElement) => { + // shamelessly copied from ag-grid + // make a deep clone of the cell + const eCellClone: HTMLElement = eCell.cloneNode(true) as HTMLElement; + // the original has a fixed width, we remove this to allow the natural width based on content + eCellClone.style.width = ''; + // the original has position = absolute, we need to remove this, so it's positioned normally + eCellClone.style.position = 'static'; + eCellClone.style.left = ''; + // we put the cell into a containing div, as otherwise the cells would just line up + // on the same line, standard flow layout, by putting them into divs, they are laid + // out one per line + const eCloneParent = document.createElement('div'); + + // table-row, so that each cell is on a row. + eCloneParent.style.display = 'table-row'; + eCloneParent.appendChild(eCellClone); + eDummyContainer.appendChild(eCloneParent); +}; + +export const convertSnakeToCamel = (obj) => { + return Object.keys(obj).reduce((result, key) => ({ + ...result, + [camelCase(key)]: typeof obj[key] === 'object' && obj[key] !== null ? + Array.isArray(obj[key]) ? + obj[key].map(val => convertSnakeToCamel(val)) : + convertSnakeToCamel(obj[key]) : + obj[key], + }), {}); +}; + +export const convertCamelToSnake = (obj) => { + return Object.keys(obj).reduce( + (result, key) => ({ + ...result, + [snakeCase(key)]: obj[key], + }), + {}, + ); +}; + +export const snakeToTitle = (value: string) => value.split('_').map(w => capitalize(w)).join(' '); diff --git a/src/app/webapp-common/shared/utils/statistics.ts b/src/app/webapp-common/shared/utils/statistics.ts index 916a50d3..f315ba34 100644 --- a/src/app/webapp-common/shared/utils/statistics.ts +++ b/src/app/webapp-common/shared/utils/statistics.ts @@ -1,4 +1,5 @@ import {flattenDeep, last} from 'lodash-es'; +import {maxInArray} from '@common/shared/utils/helpers.util'; export interface DataPoint { date: string; @@ -19,8 +20,8 @@ export interface RequestParam { const defaultMaxValHandler = { get: function (target: object, name: string) { - if (!target.hasOwnProperty(name)) { - target[name] = Math.max(...(Object.values(target) as number[]), 0) + 1; + if (!Object.hasOwn(target,name)) { + target[name] = maxInArray([...Object.values(target) as number[], 0]) + 1; } return target[name]; } @@ -56,9 +57,9 @@ export function addStats(current: Topic[], data, maxPoints: number, const dates: number[] = paramData.dates; const param = paramData.metric; paramData.stats.forEach(aggData => { - const aggregation = aggData.aggregation; - const topicID = `${entity} ${param} ${aggregation}`; - const topicName = `${paramInfo[param].title} (${aggregation})${shouldAddEntity && entity ? ' for ' + entity : ''}`; + const aggregation = aggData.aggregation ? ` (${aggData.aggregation})` : ''; + const topicID = `${entity} ${param}${aggregation}`; + const topicName = `${paramInfo[param].title}${aggregation}${shouldAddEntity && entity ? ' for ' + entity : ''}`; let topic: Topic = dataByTopic.find(topic => topic.topicID === topicID); if (!topic) { topic = {topicName, topicID, topic: topicIDs[topicID], dates: [] as DataPoint[]}; diff --git a/src/app/webapp-common/shared/utils/tableParamEncode.ts b/src/app/webapp-common/shared/utils/tableParamEncode.ts index 7a4f2339..059ddca4 100644 --- a/src/app/webapp-common/shared/utils/tableParamEncode.ts +++ b/src/app/webapp-common/shared/utils/tableParamEncode.ts @@ -9,6 +9,7 @@ import {SortMeta} from 'primeng/api'; import {hasValue} from './helpers.util'; import {MetricValueType} from '@common/experiments-compare/experiments-compare.constants'; import {sortCol} from '@common/shared/utils/sortCol'; +import {TasksGetAllExRequestFilters} from '~/business-logic/model/tasks/tasksGetAllExRequestFilters'; export interface TableFilter { col?: string; @@ -24,31 +25,20 @@ export interface MetricColumn { variant: string; } +export const excludedKey = '__$not'; + export const getValueTypeName = (valueType: string) => valueType.replace('_', '').replace('value', '').toUpperCase(); +export const getTagsFilters = (tagsFilterAnd: boolean, tagsFilter: (string | null)[]): TasksGetAllExRequestFilters => { + return { + [tagsFilterAnd ? 'all' : 'any']: { + include: tagsFilter.filter(tagI => tagI === null || !tagI.startsWith(excludedKey)), + exclude: tagsFilter.filter(tagI => tagI?.startsWith(excludedKey)).map(tagItem => tagItem.substring(excludedKey.length)) + } + }; +}; export const encodeOrder = (orders: SortMeta[]): string[] => orders.map(order => `${order.order === TABLE_SORT_ORDER.DESC ? '-' : ''}${order.field}`); -export const encodeFilters = (filters: { [key: string]: FilterMetadata }) => { - if (filters) { - return Object.keys(filters) - .filter((key: string) => filters[key].value?.length) - .map((key: string) => { - const val = filters[key] as FilterMetadata; - return `${key}:${val.matchMode ? val.matchMode + ':' : ''}${val.value.join('+$+')}`; - }).join(','); - } -}; -export const excludedKey = '__$not'; -export const uniqueFilterValueAndExcluded = (arr1 = [], arr2 = []) => Array.from(new Set(arr1.concat((arr2).map(key => key ? key.replace(/^__\$not/, '') : key)))); -export const addExcludeFilters = (arr1: string[]) => - arr1.reduce((returnArray, currentFilter) => { - if (currentFilter?.startsWith(excludedKey)) { - return [...returnArray, excludedKey, currentFilter.substring(excludedKey.length)]; - } - return [...returnArray, currentFilter]; - - }, []); - export const decodeOrder = (orders: string[]): SortMeta[] => { if (typeof orders === 'string') { orders = [orders]; @@ -62,6 +52,18 @@ export const decodeOrder = (orders: string[]): SortMeta[] => { }); }; +export const encodeFilters = (filters: { [key: string]: FilterMetadata }) => { + if (filters) { + return Object.keys(filters) + .filter((key: string) => filters[key].value?.length) + .map((key: string) => { + const val = filters[key] as FilterMetadata; + return `${key}:${val.matchMode ? val.matchMode + ':' : ''}${encodeURIComponent(val.value.join('+$+'))}`; + }).join(','); + } + return null; +}; + export const decodeFilter = (filters: string): TableFilter[] => filters.split(',').map((filter: string) => { let mode: string; const index = filter.indexOf(':AND'); @@ -74,9 +76,11 @@ export const decodeFilter = (filters: string): TableFilter[] => filters.split(', // mode = parts[1]; // parts[1] = parts[2]; // } - return {col, filterMatchMode: mode, value: values?.split('+$+').map(x => x === '' ? null : x)}; + return {col, filterMatchMode: mode, value: decodeURIComponent(values)?.split('+$+').map(x => x === '' ? null : x)}; }); +export const uniqueFilterValueAndExcluded = (arr1 = [], arr2 = []) => Array.from(new Set(arr1.concat((arr2).map(key => key ? key.replace(/^__\$not/, '') : key)))); + export const encodeColumns = (mainCols: ISmCol[] | any, hiddenCols = {}, metricsCols = [], colsOrder = []): string[] => { colsOrder = colsOrder.filter(col => !hiddenCols[col]); return mainCols diff --git a/src/app/webapp-common/tasks/tasks.utils.ts b/src/app/webapp-common/tasks/tasks.utils.ts index 4b622b0a..7f14a29c 100755 --- a/src/app/webapp-common/tasks/tasks.utils.ts +++ b/src/app/webapp-common/tasks/tasks.utils.ts @@ -1,10 +1,12 @@ import {Task} from '~/business-logic/model/tasks/task'; -import {cloneDeep, isEmpty, sortBy} from 'lodash-es'; +import {cloneDeep, sortBy} from 'lodash-es'; import {SelectableListItem} from '@common/shared/ui-components/data/selectable-list/selectable-list.model'; -import {Config, PlotData} from 'plotly.js'; +import {Config, Layout, PlotData} from 'plotly.js'; import {ExtData, ExtFrame, ExtLayout} from '../shared/single-graph/plotly-graph-base'; import {MetricsPlotEvent} from '../../business-logic/model/events/models'; import {KeyValue} from '@angular/common'; +import {EventsGetTaskSingleValueMetricsResponseTasks} from '~/business-logic/model/events/eventsGetTaskSingleValueMetricsResponseTasks'; +import {maxInArray} from '@common/shared/utils/helpers.util'; export interface ExtMetricsPlotEvent extends MetricsPlotEvent { variants?: Array; @@ -53,7 +55,7 @@ export const getModelDesign = (modelDesc: Task['execution']['model_desc']): { ke return {key, value: key ? modelDesc[key] : modelDesc}; }; -export const prepareGraph = (data: ExtData[], layout: Partial, config: Partial, graph: Partial): Partial => +export const prepareGraph = (data: ExtData[], layout: Partial, config: Partial, graph: Partial): ExtFrame => ({ data, layout, @@ -62,10 +64,14 @@ export const prepareGraph = (data: ExtData[], layout: Partial, config metric: graph.metric, task: graph.task, timestamp: graph.timestamp, - type: graph.type as unknown as string, + type: (graph.type ?? Array.isArray(data) ? data[0]?.type : data) as unknown as string, variant: graph.variant, variants: graph.variants, worker: graph['worker'], + group: null, + name: null, + traces: null, + baseframe: null }); export const tryParseJson = (plotString: string): { data: any; layout: any; config?: any } => { @@ -106,13 +112,6 @@ export const convertPlots = ({plots, id}: { plots: { [title: string]: MetricsPlo }; }; -export const convertScalar = (chartData, title?: string): Partial => { - if (!chartData || isEmpty(chartData)) { - return null; - } - return prepareGraph(chartData, {type: 'scalar', title, xaxis: {title: 'Iterations'}}, {}, {metric: title}); -}; - export const convertScalars = (scalars: GroupedList, experimentId: string): { [key: string]: ExtFrame[] } => Object.entries(scalars).reduce((acc, graphGroup) => { const key = graphGroup[0]; @@ -126,7 +125,7 @@ export const convertScalars = (scalars: GroupedList, experimentId: string): { [k })); const yValues = chartData?.map((trace: ExtData) => (trace.y as number[])).flat() ?? [0]; - const maxY = Math.max(...yValues); + const maxY = maxInArray(yValues); const tickformat = maxY >= 1e9 || (maxY < 1e-5 && maxY > 0) ? '.1e' : undefined; acc[key] = [prepareGraph( chartData, @@ -149,12 +148,15 @@ export const groupIterations = (plots: MetricsPlotEvent[]): { [title: string]: E groupedPlots[metric] = cloneDeep(groupedPlots[metric]) || []; const index = groupedPlots[metric].findIndex((existingGraph) => plot.iter === existingGraph.iter); const plotParsed = tryParseJson(plot.plot_str); + if (plotParsed.data[0] && !plotParsed.data[0].name) { + plotParsed.data[0].name = plot.variant; + } if (index > -1 && plotParsed.data && plotParsed.data[0] && ['scatter', 'bar'].includes(plotParsed.data[0]?.type) && previousPlotIsMergable) { const basePlotParsed = tryParseJson(groupedPlots[metric][index].plot_str); groupedPlots[metric][index].plot_str = _mergePlotsData(basePlotParsed, plotParsed); groupedPlots[metric][index].variants.push(plot.variant); } else { - groupedPlots[metric].push({...plot, variants: [plot.variant]}); + groupedPlots[metric].push({...plot, plot_str: JSON.stringify(plotParsed), variants: [plot.variant]}); } previousPlotIsMergable = index > -1 || (index === -1 && ['scatter', 'bar'].includes(plotParsed.data[0]?.type)); return groupedPlots; @@ -187,7 +189,7 @@ export const compareByFieldFunc = (field) => export const mergeMultiMetrics = (metrics): { [key: string]: ExtFrame[] } => { const graphsMap = {}; - Object.keys(metrics).forEach(metric => { + Object.keys(metrics ?? {}).forEach(metric => { Object.keys(metrics[metric]).forEach(variant => { const chartData = Object.entries(metrics[metric][variant]) .map(([task, data]: [string, any]) => ({...data, type: 'scatter', task})); @@ -203,15 +205,22 @@ export const mergeMultiMetrics = (metrics): { [key: string]: ExtFrame[] } => { export const mergeMultiMetricsGroupedVariant = (metrics): { [key: string]: ExtFrame[] } => { const graphsMap = {}; Object.keys(metrics).forEach(metric => { + + //Search for duplicates names across all metrics and variants + const duplicateNamesObject = Object.values(Object.assign({}, ...Object.values(metrics).map(a => Object.values(a)).flat())).reduce((acc, legendItem: ExtData) => { + const experimentName = legendItem.name; + acc[experimentName] = acc[experimentName] !== undefined; + return acc; + }, {} as { [name: string]: boolean }); + const chartData = []; Object.keys(metrics[metric]).forEach(variant => { - const multipleExperiments = Object.keys(metrics[metric][variant]).length > 1; chartData.push(Object.entries(metrics[metric][variant]) - .map(([taskId, data]: [string, any]) => ({ + .map(([taskId, data]: [string, ExtData]) => ({ ...data, type: 'scatter', task: taskId, - name: multipleExperiments ? `${variant} - ${data.name}` : variant + name: `${variant} - ${data.name}${duplicateNamesObject[data.name] ? '.' + taskId.substring(0,6) : ''}`, })) ); }); @@ -220,17 +229,20 @@ export const mergeMultiMetricsGroupedVariant = (metrics): { [key: string]: ExtFr return graphsMap; }; -export const convertMultiPlots = (plots): { [key: string]: ExtFrame[] } => +export const convertMultiPlots = (plots, tagsLists?: {[id:string]: string[]}): { [key: string]: ExtFrame[] } => Object.entries(plots).reduce((acc, graphGroup) => { const key = graphGroup[0]; const graphs = graphGroup[1] as Array; acc[key] = Object.values(graphs).map( - graph => prepareGraph(graph.data, graph.layout, graph.config, {...graph, task: graph.task}) + graph => { + const singleTask = new Set(graph.data.map(d => d.task)).size === 1; + return {...prepareGraph(graph.data, graph.layout, graph.config, {...graph, task: graph.task}), tags: singleTask ? tagsLists?.[graph.task] ?? [] : []} + } ); return acc; }, {}); -export const multiplotsAddChartToGroup = (charts, parsed, metric, experiment, experimentId, variant, iteration, isMultipleVar: boolean) => { +export const multiplotsAddChartToGroup = (charts, parsed, metric, experimentName, experiment, experimentId, variant, iteration, isMultipleVar: boolean) => { const allowedMergedTypes = ['scatter', 'scattergl', 'bar', 'scatter3d']; let fullName: string; const metricVariant = `${metric} - ${variant}`; //isMultipleVar ? `${metric} - ${variant}` : metric; @@ -251,6 +263,7 @@ export const multiplotsAddChartToGroup = (charts, parsed, metric, experiment, ex const isVariantsSplited = (new Set(parsed.data.map(varPlot => varPlot.name))).size > 1; + const allWithoutName = parsed.data.length > 1 && parsed.data.some( plot => !plot.name); for (let i = 0; i < parsed.data.length; i++) { let isMultipleTasks = false; const variantPlot = parsed.data.slice()[i]; @@ -271,8 +284,8 @@ export const multiplotsAddChartToGroup = (charts, parsed, metric, experiment, ex if (isVariantsSplited) { variantPlot.seriesName = variantPlot.name; } - variantPlot.name = `${experiment} (iteration ${iteration})`; - variantPlot.colorKey = experiment; + variantPlot.name = allWithoutName ? `${experiment} (iteration ${iteration}) ${i}` : `${experiment} (iteration ${iteration})`; + variantPlot.colorKey = experimentName; variantPlot.task = experimentId; } else if (variantPlot.type === 'table') { fullName = `${metricVariant} - ${experiment}`; @@ -281,7 +294,7 @@ export const multiplotsAddChartToGroup = (charts, parsed, metric, experiment, ex fullName = `${metricVariant} - ${experiment}`; variantPlot.seriesName = variantPlot.name; variantPlot.name = experiment; - variantPlot.colorKey = experiment; + variantPlot.colorKey = experimentName; variantPlot.task = experimentId; } if (!charts[metricName][fullName]) { @@ -291,11 +304,12 @@ export const multiplotsAddChartToGroup = (charts, parsed, metric, experiment, ex charts[metricName][fullName].data = _mergeVariants(charts[metricName][fullName].data.slice(), variantPlot); isMultipleTasks = true; } - charts[metricName][fullName].layout = Object.assign({}, {...charts[metricName][fullName].layout}); + charts[metricName][fullName].layout = Object.assign({}, {...charts[metricName][fullName].layout}) as Layout; charts[metricName][fullName].layout.title = isMultipleTasks ? variantPlot.seriesName ?? '' : `${experiment} (iteration ${iteration})`; charts[metricName][fullName].layout.name = charts[metricName][fullName].layout.name ? `${charts[metricName][fullName].layout.name} - ${experiment}` : fullName; charts[metricName][fullName].layout.barmode = isMultipleTasks ? 'group' : 'stack'; charts[metricName][fullName].layout.showlegend = isMultipleTasks ? true : charts[metricName][fullName].layout.showlegend; + charts[metricName][fullName].layout.orientation = isMultipleTasks ? 'h' : charts[metricName][fullName].layout.orientation; charts[metricName][fullName].metric = metric; charts[metricName][fullName].variant = variant; charts[metricName][fullName].task = charts[metricName][fullName].task ?? experimentId; @@ -303,7 +317,7 @@ export const multiplotsAddChartToGroup = (charts, parsed, metric, experiment, ex return charts; }; -export const seperateMultiplotsVariants = (mixedPlot: IMultiplot, isMultipleVarients): { charts: any; parsingError: boolean } => { +export const seperateMultiplotsVariants = (mixedPlot: IMultiplot, isMultipleVarients, duplicateNamesObject: { [name: string]: boolean }): { charts: any; parsingError: boolean } => { let charts = {}; let parsingError: boolean; const values = Object.values(mixedPlot); @@ -311,15 +325,9 @@ export const seperateMultiplotsVariants = (mixedPlot: IMultiplot, isMultipleVari return {charts: mixedPlot, parsingError: false}; } for (const variant of values) { - const duplicateNamesObject = Object.values(variant).reduce((acc, experiment) => { - const experimentName = Object.values(experiment)[0].name; - acc[experimentName] = acc[experimentName] !== undefined; - return acc; - }, {} as { [name: string]: boolean }); - Object.entries(variant).map(experiment => { const experimentId = experiment[0]; - const shortExpId = experimentId.substr(0, 6); + const shortExpId = experimentId.substring(0, 6); const experimentData = experiment[1]; const iterationKey = Object.keys(experimentData)[0]; @@ -330,24 +338,42 @@ export const seperateMultiplotsVariants = (mixedPlot: IMultiplot, isMultipleVari if (parsed.data.length === 0 && parsed.layout.title === 'Unknown data') { parsingError = true; } - charts = multiplotsAddChartToGroup(charts, parsed, plot.metric, experimentName, experimentId, plot.variant, iterationKey, isMultipleVarients); + if (parsed.data.length > 1) { + charts[`${plot.metric} - ${plot.variant}`] = charts[`${plot.metric} - ${plot.variant}`] ?? {}; + const plotObj = {...parsed, metric: plot.metric, variant: plot.variant, task: experimentId} + plotObj.layout.showlegend = true; + plotObj.layout.title = `${experimentName} (iteration ${iterationKey})`; + plotObj.data.forEach((p, i) => { + p.colorKey = p.name ?? experimentName; + p.name = p.name ?? `series ${i + 1}`; + }) + charts[`${plot.metric} - ${plot.variant}`][`${plot.metric} - ${plot.variant} - ${experimentName}`] = plotObj; + } else { + charts = multiplotsAddChartToGroup(charts, parsed, plot.metric, iteration.name, experimentName, experimentId, plot.variant, iterationKey, isMultipleVarients); + } }); } return {charts, parsingError}; }; -export const prepareMultiPlots = (multiPlots: any): { merged: any; parsingError: boolean } => { +export const prepareMultiPlots = (multiPlots: any, globalLegend: {id: string, tags: string[], name: string}[] = []): { merged: any; parsingError: boolean } => { let hadParsingError = false; if (!multiPlots) { return {merged: multiPlots, parsingError: false}; } + const duplicateNamesObject = globalLegend.reduce((acc, legendItem) => { + const experimentName = legendItem.name; + acc[experimentName] = acc[experimentName] !== undefined; + return acc; + }, {} as { [name: string]: boolean }); + const merged = Object.entries(multiPlots).reduce((acc, graph) => { if (!graph[1]) { return acc; } const isMultipleVarients = Object.keys(graph[1]).length > 1; - const {charts, parsingError} = seperateMultiplotsVariants(graph[1] as IMultiplot, isMultipleVarients); + const {charts, parsingError} = seperateMultiplotsVariants(graph[1] as IMultiplot, isMultipleVarients, duplicateNamesObject); const graphsPerVariant = charts; hadParsingError = hadParsingError || parsingError; return {...acc, ...graphsPerVariant}; @@ -355,6 +381,23 @@ export const prepareMultiPlots = (multiPlots: any): { merged: any; parsingError: return {merged, parsingError: hadParsingError}; }; +export function createMultiSingleValuesChart(singleValues: EventsGetTaskSingleValueMetricsResponseTasks[], visibles = {}) { + const yValues = singleValues?.map(singleValue => singleValue.values.map(trace => (trace.value))).flat(1) ?? [0]; + const maxY = maxInArray(yValues); + const tickformat = maxY >= 1e9 || (maxY < 1e-5 && maxY > 0) ? '.1e' : undefined; + return { + data: singleValues.map(task => ({ + type: 'bar', + task: task.task, + name: task.task_name, + visible: visibles[task.task], + x: task.values.map(v => v.variant), + y: task.values.map(v => v.value) + }) as ExtData), + layout: {title: 'Summary', barmode: 'group' as ExtLayout['barmode'], bargap: 0.08, bargroupgap: 0, xaxis: {title: 'Series'}, yaxis: {tickformat}} + }; +} + export const _testWhite = (x) => { const white = new RegExp(/^[\s\-_]$/); return white.test(x.charAt(0)); diff --git a/src/app/webapp-common/user-preferences.ts b/src/app/webapp-common/user-preferences.ts index 5c3a7b94..f6fb4843 100644 --- a/src/app/webapp-common/user-preferences.ts +++ b/src/app/webapp-common/user-preferences.ts @@ -3,8 +3,6 @@ import {Observable, of} from 'rxjs'; import {catchError, map, tap} from 'rxjs/operators'; import {cloneDeep, isEqual} from 'lodash-es'; import {UsersSetPreferencesRequest} from '~/business-logic/model/users/usersSetPreferencesRequest'; -import {ConfigurationService} from './shared/services/configuration.service'; -import {LoginService} from '~/shared/services/login.service'; import {Injectable} from '@angular/core'; const USER_PREFERENCES_STORAGE_KEY = '_USER_PREFERENCES_'; @@ -106,12 +104,3 @@ export class UserPreferences { } } } - -export const loadUserAndPreferences = ( - loginService: LoginService, - confService: ConfigurationService, -): () => Promise => (): Promise => new Promise((resolve) => { - confService.initConfigurationService().subscribe(() => - loginService.initCredentials().subscribe(() => loginService.loginFlow(resolve)) - ); -}); diff --git a/src/app/webapp-common/workers-and-queues/actions/queues.actions.ts b/src/app/webapp-common/workers-and-queues/actions/queues.actions.ts index ac2cbe9b..91125945 100755 --- a/src/app/webapp-common/workers-and-queues/actions/queues.actions.ts +++ b/src/app/webapp-common/workers-and-queues/actions/queues.actions.ts @@ -1,8 +1,13 @@ import {createAction, props} from '@ngrx/store'; -import {Queue} from '~/business-logic/model/queues/queue'; +import {Queue as BLQueue} from '~/business-logic/model/queues/queue'; import {Topic} from '../../shared/utils/statistics'; import {SortMeta} from 'primeng/api'; +export interface Queue extends Omit { + id: string; +} + + const queuesPrefix = 'QUEUES_'; export const GET_QUEUES = queuesPrefix + 'GET_QUEUES'; export const SET_QUEUES = queuesPrefix + 'SET_QUEUES'; diff --git a/src/app/webapp-common/workers-and-queues/actions/workers.actions.ts b/src/app/webapp-common/workers-and-queues/actions/workers.actions.ts index a8653c78..d276405b 100755 --- a/src/app/webapp-common/workers-and-queues/actions/workers.actions.ts +++ b/src/app/webapp-common/workers-and-queues/actions/workers.actions.ts @@ -1,11 +1,12 @@ import {createAction, props} from '@ngrx/store'; -import {Worker} from '../../../business-logic/model/workers/worker'; +import {Worker} from '~/business-logic/model/workers/worker'; import {Topic} from '../../shared/utils/statistics'; import {SortMeta} from 'primeng/api'; const workersPrefix = 'WORKERS_'; -export interface WorkerExt extends Worker { +export interface WorkerExt extends Omit { + id: string; name: string; originalName: string; } diff --git a/src/app/webapp-common/workers-and-queues/containers/queue-stats/queue-stats.component.html b/src/app/webapp-common/workers-and-queues/containers/queue-stats/queue-stats.component.html index 0bf4363d..d45c77dc 100644 --- a/src/app/webapp-common/workers-and-queues/containers/queue-stats/queue-stats.component.html +++ b/src/app/webapp-common/workers-and-queues/containers/queue-stats/queue-stats.component.html @@ -1,37 +1,35 @@ -
-
-
-
-
{{selectedQueue ? selectedQueue.name : 'Overall'}} Experiment Wait Time
- - -
-
-
- +
+
+
+
{{selectedQueue ? selectedQueue.name : 'Overall'}} Experiment Wait Time
+ +
-
-
-
-
{{selectedQueue ? selectedQueue.name : 'Overall'}} Queued Experiments
- - -
- - - - {{timeFrame.label}} - - - -
-
- -
+
+ +
+
+
+
+
+
{{selectedQueue ? selectedQueue.name : 'Overall'}} Queued Experiments
+ + +
+ + + + {{timeFrame.label}} + + + +
+
+
diff --git a/src/app/webapp-common/workers-and-queues/containers/queue-stats/queue-stats.component.scss b/src/app/webapp-common/workers-and-queues/containers/queue-stats/queue-stats.component.scss index 85e23315..a3eb7d18 100644 --- a/src/app/webapp-common/workers-and-queues/containers/queue-stats/queue-stats.component.scss +++ b/src/app/webapp-common/workers-and-queues/containers/queue-stats/queue-stats.component.scss @@ -2,6 +2,8 @@ @import "../../../../webapp-common/layout/layout.scss"; :host { + display: flex; + > div { height: $graph-height; } diff --git a/src/app/webapp-common/workers-and-queues/containers/queue-stats/queue-stats.component.ts b/src/app/webapp-common/workers-and-queues/containers/queue-stats/queue-stats.component.ts index 6eff34f5..510d21c2 100644 --- a/src/app/webapp-common/workers-and-queues/containers/queue-stats/queue-stats.component.ts +++ b/src/app/webapp-common/workers-and-queues/containers/queue-stats/queue-stats.component.ts @@ -14,11 +14,11 @@ import {Queue} from '~/business-logic/model/queues/queue'; import {getStats, setStats, setStatsParams} from '../../actions/queues.actions'; import {selectQueuesStatsTimeFrame, selectQueueStats, selectStatsErrorNotice} from '../../reducers/index.reducer'; import {filter} from 'rxjs/operators'; -import {Topic} from '@common/shared/utils/statistics'; import {TIME_INTERVALS} from '../../workers-and-queues.consts'; import { IOption } from '@common/shared/ui-components/inputs/select-autocomplete-with-chips/select-autocomplete-with-chips.component'; +import {LineChartData} from '@common/shared/components/charts/line-chart/line-chart.component'; @Component({ selector: 'sm-queue-stats', @@ -32,8 +32,8 @@ export class QueueStatsComponent implements OnInit, OnDestroy { public statsError$ = this.store.select(selectStatsErrorNotice); public selectedQueue: Queue; public refreshChart = true; - public waitChartData: { dataByTopic: Topic[] }; - public lenChartData: { dataByTopic: Topic[] }; + public waitChartData: LineChartData; + public lenChartData: LineChartData; public timeFrameOptions: IOption[] = [ {label: '3 Hours', value: (3 * TIME_INTERVALS.HOUR).toString()}, @@ -71,8 +71,8 @@ export class QueueStatsComponent implements OnInit, OnDestroy { (data) => { if (data && (data.wait || data.length)) { this.refreshChart = false; - this.waitChartData = {dataByTopic: data.wait}; - this.lenChartData = {dataByTopic: data.length}; + this.waitChartData = {dataByTopic: data.wait, data: null}; + this.lenChartData = {dataByTopic: data.length, data: null}; this.cdr.detectChanges(); } } diff --git a/src/app/webapp-common/workers-and-queues/containers/queues/queues.component.scss b/src/app/webapp-common/workers-and-queues/containers/queues/queues.component.scss index c0d74b10..3c9004a3 100755 --- a/src/app/webapp-common/workers-and-queues/containers/queues/queues.component.scss +++ b/src/app/webapp-common/workers-and-queues/containers/queues/queues.component.scss @@ -3,14 +3,16 @@ :host { display: flex !important; flex-direction: column; - - //as-split { - //height: calc(100% - #{$graph-height}); - //min-height: 180px; - //} + gap: 24px; + height: 100%; sm-queue-stats { - display: block; - margin: 0 48px 20px; + margin: 0 48px; + } +} + +@media (max-height: 750px) { + :host { + height: unset; } } diff --git a/src/app/webapp-common/workers-and-queues/containers/queues/queues.component.ts b/src/app/webapp-common/workers-and-queues/containers/queues/queues.component.ts index 5f3a7fb9..132c3df8 100755 --- a/src/app/webapp-common/workers-and-queues/containers/queues/queues.component.ts +++ b/src/app/webapp-common/workers-and-queues/containers/queues/queues.component.ts @@ -1,6 +1,5 @@ import {Component, OnInit} from '@angular/core'; import {Observable} from 'rxjs'; -import {Queue} from '~/business-logic/model/queues/queue'; import {Task} from '~/business-logic/model/tasks/task'; import {Store} from '@ngrx/store'; import {ActivatedRoute, Router} from '@angular/router'; @@ -11,7 +10,7 @@ import { moveExperimentInQueue, moveExperimentToBottomOfQueue, moveExperimentToOtherQueue, - moveExperimentToTopOfQueue, + moveExperimentToTopOfQueue, Queue, queuesTableSortChanged, removeExperimentFromQueue, setSelectedQueue @@ -37,7 +36,7 @@ export class QueuesComponent implements OnInit { public queues$: Observable; public selectedQueue$: Observable; - private createQueueDialog: MatDialogRef; + private createQueueDialog: MatDialogRef; public tableSortOrder$: Observable<1 | -1>; public tableSortFields$: Observable; diff --git a/src/app/webapp-common/workers-and-queues/containers/workers-stats/workers-stats.component.ts b/src/app/webapp-common/workers-and-queues/containers/workers-stats/workers-stats.component.ts index 6ab5bb19..bfc34cbe 100644 --- a/src/app/webapp-common/workers-and-queues/containers/workers-stats/workers-stats.component.ts +++ b/src/app/webapp-common/workers-and-queues/containers/workers-stats/workers-stats.component.ts @@ -23,7 +23,8 @@ import { selectStatsParams, selectStatsTimeFrame } from '../../reducers/index.reducer'; -import {TIME_INTERVALS} from '../../workers-and-queues.consts'; +import {timeFrameOptions} from '@common/constants'; +import {LineChartData} from '@common/shared/components/charts/line-chart/line-chart.component'; @Component({ selector: 'sm-workers-graph', @@ -54,14 +55,7 @@ export class WorkersStatsComponent implements OnInit, OnDestroy { } } - public timeFrameOptions: IOption[] = [ - {label: '3 Hours', value: (3 * TIME_INTERVALS.HOUR).toString()}, - {label: '6 Hours', value: (6 * TIME_INTERVALS.HOUR).toString()}, - {label: '12 Hours', value: (12 * TIME_INTERVALS.HOUR).toString()}, - {label: '1 Day', value: (TIME_INTERVALS.DAY).toString()}, - {label: '1 Week', value: (TIME_INTERVALS.WEEK).toString()}, - {label: '1 Month', value: (TIME_INTERVALS.MONTH).toString()}]; - + timeFrameOptions = timeFrameOptions; public chartParamOptions: IOption[] = [ {label: 'CPU and GPU Usage', value: 'cpu_usage;gpu_usage'}, {label: 'Memory Usage', value: 'memory_used'}, @@ -79,7 +73,7 @@ export class WorkersStatsComponent implements OnInit, OnDestroy { /* eslint-enable @typescript-eslint/naming-convention */ }; - public chartData: { dataByTopic: Topic[] }; + public chartData: LineChartData; constructor(public store: Store, private cdr: ChangeDetectorRef) { } @@ -98,7 +92,7 @@ export class WorkersStatsComponent implements OnInit, OnDestroy { (data) => { if (data) { this.refreshChart = false; - this.chartData = {dataByTopic: data}; + this.chartData = {dataByTopic: data, data: null}; this.cdr.detectChanges(); } } diff --git a/src/app/webapp-common/workers-and-queues/containers/workers/workers.component.html b/src/app/webapp-common/workers-and-queues/containers/workers/workers.component.html index 510e777b..6d27546a 100755 --- a/src/app/webapp-common/workers-and-queues/containers/workers/workers.component.html +++ b/src/app/webapp-common/workers-and-queues/containers/workers/workers.component.html @@ -1,12 +1,13 @@ - + diff --git a/src/app/webapp-common/workers-and-queues/containers/workers/workers.component.scss b/src/app/webapp-common/workers-and-queues/containers/workers/workers.component.scss index 8250fd5b..819d9cfb 100755 --- a/src/app/webapp-common/workers-and-queues/containers/workers/workers.component.scss +++ b/src/app/webapp-common/workers-and-queues/containers/workers/workers.component.scss @@ -3,13 +3,16 @@ :host { display: flex !important; flex-direction: column; + gap: 24px; + height: 100%; sm-workers-graph { - margin: 0 50px 20px; + margin: 0 48px; + } +} + +@media (max-height: 750px) { + :host { + height: unset; } - - //as-split { - // height: calc(100% - #{$graph-height}); - // min-height: 180px; - //} } diff --git a/src/app/webapp-common/workers-and-queues/containers/workers/workers.component.ts b/src/app/webapp-common/workers-and-queues/containers/workers/workers.component.ts index 7be7a3f7..17f6ffbf 100755 --- a/src/app/webapp-common/workers-and-queues/containers/workers/workers.component.ts +++ b/src/app/webapp-common/workers-and-queues/containers/workers/workers.component.ts @@ -1,13 +1,10 @@ -import {Component, OnDestroy, OnInit} from '@angular/core'; +import {Component, OnInit} from '@angular/core'; import {Store} from '@ngrx/store'; -import {Worker} from '../../../../business-logic/model/workers/worker'; import {getSelectedWorker, workersTableSortChanged} from '../../actions/workers.actions'; import {selectSelectedWorker, selectWorkers, selectWorkersTableSortFields} from '../../reducers/index.reducer'; import {ActivatedRoute, Router} from '@angular/router'; -import {Observable} from 'rxjs'; -import {ISmCol} from '../../../shared/ui-components/data/table/table.consts'; +import {ISmCol} from '@common/shared/ui-components/data/table/table.consts'; import {filter, take, withLatestFrom} from 'rxjs/operators'; -import {SortMeta} from 'primeng/api'; @Component({ selector: 'sm-workers', @@ -16,9 +13,9 @@ import {SortMeta} from 'primeng/api'; }) export class WorkersComponent implements OnInit { - public workers$: Observable; - public selectedWorker$: Observable; - public tableSortFields$: Observable; + public workers$ = this.store.select(selectWorkers); + public selectedWorker$ = this.store.select(selectSelectedWorker); + public tableSortFields$ = this.store.select(selectWorkersTableSortFields); get routerWorkerId() { const url = new URL(window.location.href); @@ -26,9 +23,6 @@ export class WorkersComponent implements OnInit { } constructor(private store: Store, private router: Router, private route: ActivatedRoute) { - this.workers$ = this.store.select(selectWorkers); - this.selectedWorker$ = this.store.select(selectSelectedWorker); - this.tableSortFields$ = this.store.select(selectWorkersTableSortFields); } ngOnInit(): void { @@ -45,14 +39,15 @@ export class WorkersComponent implements OnInit { public selectWorker(worker) { - this.router.navigate( + this.store.dispatch(getSelectedWorker({worker})); + return this.router.navigate( [], { relativeTo: this.route, queryParams: {id: worker?.id}, - queryParamsHandling: 'merge' + queryParamsHandling: 'merge', + replaceUrl: true }); - this.store.dispatch(getSelectedWorker({worker})); } sortedChanged(sort: { isShift: boolean; colId: ISmCol['id'] }) { diff --git a/src/app/webapp-common/workers-and-queues/dumb/queue-info/queue-info.component.html b/src/app/webapp-common/workers-and-queues/dumb/queue-info/queue-info.component.html index 7668b173..44b8892d 100644 --- a/src/app/webapp-common/workers-and-queues/dumb/queue-info/queue-info.component.html +++ b/src/app/webapp-common/workers-and-queues/dumb/queue-info/queue-info.component.html @@ -1,4 +1,4 @@ -
+
@@ -13,30 +13,24 @@ class="empty-state">No workers currently assigned to this queue
- -
- {{row?.name}} -
-
- {{row.ip}} -
-
- +
+ {{row?.name}} +
{{row.ip}}
+ {{row?.task?.name}}
- - -
+ +
-
-
- {{i + 1}} -
-
- {{i + 1}}
+ {{row?.task?.name}} -
-
diff --git a/src/app/webapp-common/workers-and-queues/dumb/queue-info/queue-info.component.scss b/src/app/webapp-common/workers-and-queues/dumb/queue-info/queue-info.component.scss index 034f2968..8966471c 100644 --- a/src/app/webapp-common/workers-and-queues/dumb/queue-info/queue-info.component.scss +++ b/src/app/webapp-common/workers-and-queues/dumb/queue-info/queue-info.component.scss @@ -5,11 +5,36 @@ flex-direction: column; height: 100%; + a[href]:hover { + color: white; + } + sm-simple-table-2 { flex: 1; overflow: auto; } + .experiments-table .body { + display: grid !important; + grid-template-columns: 30px minmax(30px, auto) minmax(150px, 1fr) 30px; + grid-gap: 12px; + padding: 0 18px; + + .al-icon { + line-height: 36px; + } + } + .experiments-table ::ng-deep .headers {display: none;} + + .workers-table { + ::ng-deep .headers, .body { + display: grid !important; + grid-template-columns: minmax(150px, 1fr) minmax(150px, 1fr) minmax(150px, 1fr); + grid-gap: 12px; + padding: 0 18px; + } + } + ::ng-deep .table-row { height: 40px; background-color: $blue-800 !important; @@ -19,13 +44,12 @@ &:last-of-type {border-bottom-color: $dark-border !important;} } - ::ng-deep .row.headers { + sm-simple-table-2 ::ng-deep .headers { height: 39px; color: $blue-400; border-bottom-color: $blue-600 !important; } - ::ng-deep .experiments-table .row.headers {display: none;} .tabs-container { diff --git a/src/app/webapp-common/workers-and-queues/dumb/queue-info/queue-info.component.ts b/src/app/webapp-common/workers-and-queues/dumb/queue-info/queue-info.component.ts index c61fc4fe..811fed9e 100644 --- a/src/app/webapp-common/workers-and-queues/dumb/queue-info/queue-info.component.ts +++ b/src/app/webapp-common/workers-and-queues/dumb/queue-info/queue-info.component.ts @@ -35,13 +35,13 @@ export class QueueInfoComponent implements OnInit { public menuOpen: boolean; public menuPosition: { x: number; y: number }; public readonly experimentsCols = [ - {header: '', class: 'col-4'}, - {header: '', class: 'col-20'}, + {header: '', class: ''}, + {header: '', class: ''}, ]; public readonly workersCols = [ - {header: 'NAME', class: 'col-9 flex-column'}, - {header: 'IP', class: 'col-6 flex-column'}, - {header: 'CURRENTLY EXECUTING', class: 'col-9 flex-column'}, + {header: 'NAME', class: ''}, + {header: 'IP', class: ''}, + {header: 'CURRENTLY EXECUTING', class: ''}, ]; public menuClosed: any; diff --git a/src/app/webapp-common/workers-and-queues/dumb/queue-task-table/queue-task-table.component.ts b/src/app/webapp-common/workers-and-queues/dumb/queue-task-table/queue-task-table.component.ts index c5c13770..aa096fc7 100755 --- a/src/app/webapp-common/workers-and-queues/dumb/queue-task-table/queue-task-table.component.ts +++ b/src/app/webapp-common/workers-and-queues/dumb/queue-task-table/queue-task-table.component.ts @@ -1,9 +1,9 @@ import {Component, EventEmitter, Input, Output} from '@angular/core'; -import {ColHeaderTypeEnum, ISmCol} from '../../../../webapp-common/shared/ui-components/data/table/table.consts'; +import {ColHeaderTypeEnum, ISmCol} from '@common/shared/ui-components/data/table/table.consts'; import {QUEUES_TABLE_COL_FIELDS} from '../../workers-and-queues.consts'; -import {Queue} from '../../../../business-logic/model/queues/queue'; -import {Task} from '../../../../business-logic/model/tasks/task'; -import {TIME_FORMAT_STRING} from '../../../constants'; +import {Queue} from '~/business-logic/model/queues/queue'; +import {TIME_FORMAT_STRING} from '@common/constants'; +import {ITableExperiment} from '@common/experiments/shared/common-experiment-model.model'; @Component({ selector : 'sm-queue-task-table', @@ -16,7 +16,7 @@ export class QueueTaskTableComponent { public readonly QUEUES_TABLE_COL_FIELDS = QUEUES_TABLE_COL_FIELDS; @Input() queue: Queue; - @Input() tasks: Array; + @Input() tasks: ITableExperiment[]; @Output() taskSelected = new EventEmitter(); TIME_FORMAT_STRING = TIME_FORMAT_STRING; diff --git a/src/app/webapp-common/workers-and-queues/dumb/queues-table/queues-table.component.ts b/src/app/webapp-common/workers-and-queues/dumb/queues-table/queues-table.component.ts index 5ce34b78..249a69ab 100755 --- a/src/app/webapp-common/workers-and-queues/dumb/queues-table/queues-table.component.ts +++ b/src/app/webapp-common/workers-and-queues/dumb/queues-table/queues-table.component.ts @@ -1,12 +1,12 @@ import {ChangeDetectorRef, Component, EventEmitter, Input, Output, ViewChild} from '@angular/core'; -import {ColHeaderTypeEnum, ISmCol, TableSortOrderEnum} from '@common/shared/ui-components/data/table/table.consts'; +import {ColHeaderTypeEnum, ISmCol} from '@common/shared/ui-components/data/table/table.consts'; import {find, get} from 'lodash-es'; -import {Queue} from '~/business-logic/model/queues/queue'; import {QUEUES_TABLE_COL_FIELDS} from '../../workers-and-queues.consts'; -import {TableComponent} from '@common/shared/ui-components/data/table/table.component'; import {BaseTableView} from '@common/shared/ui-components/data/table/base-table-view'; import {ActivatedRoute} from '@angular/router'; import {ICONS} from '@common/constants'; +import {Queue} from '@common/workers-and-queues/actions/queues.actions'; + @Component({ selector: 'sm-queues-table', @@ -22,7 +22,7 @@ export class QueuesTableComponent extends BaseTableView { readonly ICONS = ICONS; contextQueue: Queue; - @Input() set queues(queues: Array) { + @Input() set queues(queues: Queue[]) { this._queues = queues; this.table && this.table.focusSelected(); } @@ -38,9 +38,7 @@ export class QueuesTableComponent extends BaseTableView { @Output() clearQueue = new EventEmitter(); @Output() sortedChanged = new EventEmitter<{ isShift: boolean; colId: ISmCol['id'] }>(); - @Input() tableSortOrder: TableSortOrderEnum; @ViewChild('tableContainer', {static: false}) tableContainer; - @ViewChild('table', {static: false}) table: TableComponent; public menuPosition: { x: number; y: number }; @@ -115,7 +113,7 @@ export class QueuesTableComponent extends BaseTableView { } - scrollTableToTop() { + override scrollTableToTop() { this.tableContainer.nativeElement.scroll({top: 0}); } @@ -124,7 +122,7 @@ export class QueuesTableComponent extends BaseTableView { this.scrollTableToTop(); } - afterTableInit(): void { + override afterTableInit(): void { } // eslint-disable-next-line @typescript-eslint/no-unused-vars diff --git a/src/app/webapp-common/workers-and-queues/dumb/worker-info/worker-info.component.html b/src/app/webapp-common/workers-and-queues/dumb/worker-info/worker-info.component.html index 49913440..41179699 100644 --- a/src/app/webapp-common/workers-and-queues/dumb/worker-info/worker-info.component.html +++ b/src/app/webapp-common/workers-and-queues/dumb/worker-info/worker-info.component.html @@ -10,50 +10,48 @@
- - -
- {{row?.name}} - - -
+ +
+ +
+ {{row?.name}} + + +
- -
- {{row?.next_task?.name}} -
+ +
{{row?.next_task?.name}}
- -
- {{row?.num_tasks}} + +
{{row?.num_tasks}}
-
-
- {{selectedWorker?.name ?? '—' }} - {{selectedWorker?.last_report_time | timeAgo}} - - {{selectedWorker?.task?.name}} - — - -
-
- {{selectedWorker?.task?.running_time ? (selectedWorker?.task?.running_time | msToSec) : '—'}} - {{selectedWorker?.task?.last_iteration ? selectedWorker?.task?.last_iteration : '—'}} -
+
+ {{selectedWorker?.name ?? '—' }} + {{selectedWorker?.last_report_time | timeAgo}} + + {{selectedWorker?.task?.name}} + — + +
+
+ {{selectedWorker?.task?.running_time ? (selectedWorker?.task?.running_time | durationFormater:'ms':'ddhhmmss') : '—'}} + {{selectedWorker?.task?.last_iteration ? selectedWorker?.task?.last_iteration : '—'}}
diff --git a/src/app/webapp-common/workers-and-queues/dumb/worker-info/worker-info.component.scss b/src/app/webapp-common/workers-and-queues/dumb/worker-info/worker-info.component.scss index 08c8e637..4949c4cf 100644 --- a/src/app/webapp-common/workers-and-queues/dumb/worker-info/worker-info.component.scss +++ b/src/app/webapp-common/workers-and-queues/dumb/worker-info/worker-info.component.scss @@ -5,7 +5,17 @@ flex-direction: column; height: 100%; - .worker-info-container, + a[href]:hover { + color: white; + } + + .worker-info-container { + display: grid; + grid-template-columns: minmax(100px, 2fr) minmax(100px, 1fr); + gap: 12px; + padding: 12px; + } + .queues-table-container { flex: 1; overflow: auto; @@ -21,16 +31,7 @@ } ::ng-deep { - .row { - width: 100%; - line-height: normal !important; - } - [class^='col'] { - text-overflow: ellipsis; - white-space: nowrap; - overflow: hidden; - } - .row.headers { + .headers { height: 39px; align-items: center; line-height: normal !important; @@ -39,6 +40,15 @@ } } + sm-simple-table-2 ::ng-deep .headers, .body { + width: 100%; + display: grid !important; + grid-template-columns: 33% 50% 16%; + grid-gap: 12px; + padding: 0 12px; + line-height: 40px; + } + .tabs-container { position: relative; height: 48px; diff --git a/src/app/webapp-common/workers-and-queues/dumb/worker-info/worker-info.component.ts b/src/app/webapp-common/workers-and-queues/dumb/worker-info/worker-info.component.ts index d1e798bd..a975965f 100644 --- a/src/app/webapp-common/workers-and-queues/dumb/worker-info/worker-info.component.ts +++ b/src/app/webapp-common/workers-and-queues/dumb/worker-info/worker-info.component.ts @@ -11,9 +11,9 @@ export class WorkerInfoComponent { @Output() deselectWorker = new EventEmitter(); activeTab: string = 'info'; public readonly cols = [ - {header: 'QUEUE', class: 'col-8'}, - {header: 'NEXT EXPERIMENT', class: 'col-12'}, - {header: 'IN QUEUE', class: 'col-4'}, + {header: 'QUEUE', class: ''}, + {header: 'NEXT EXPERIMENT', class: ''}, + {header: 'IN QUEUE', class: ''}, ]; constructor() { diff --git a/src/app/webapp-common/workers-and-queues/dumb/workers-table/workers-table.component.html b/src/app/webapp-common/workers-and-queues/dumb/workers-table/workers-table.component.html index 4ce376b1..2a208dde 100755 --- a/src/app/webapp-common/workers-and-queues/dumb/workers-table/workers-table.component.html +++ b/src/app/webapp-common/workers-and-queues/dumb/workers-table/workers-table.component.html @@ -13,7 +13,7 @@ - {{worker?.task?.running_time | msToSec}} + {{worker?.task?.running_time | durationFormater:'ms':'ddhhmmss'}} — diff --git a/src/app/webapp-common/workers-and-queues/dumb/workers-table/workers-table.component.ts b/src/app/webapp-common/workers-and-queues/dumb/workers-table/workers-table.component.ts index 304f7fce..580fe0e3 100755 --- a/src/app/webapp-common/workers-and-queues/dumb/workers-table/workers-table.component.ts +++ b/src/app/webapp-common/workers-and-queues/dumb/workers-table/workers-table.component.ts @@ -1,10 +1,11 @@ import {Component, EventEmitter, Input, Output, ViewChild} from '@angular/core'; -import {ColHeaderTypeEnum, ISmCol} from '../../../shared/ui-components/data/table/table.consts'; +import {ColHeaderTypeEnum, ISmCol} from '@common/shared/ui-components/data/table/table.consts'; import {get} from 'lodash-es'; import {WORKERS_TABLE_COL_FIELDS} from '../../workers-and-queues.consts'; -import {Worker} from '../../../../business-logic/model/workers/worker'; -import {TableComponent} from '../../../shared/ui-components/data/table/table.component'; -import {BaseTableView} from '../../../shared/ui-components/data/table/base-table-view'; +import {TableComponent} from '@common/shared/ui-components/data/table/table.component'; +import {BaseTableView} from '@common/shared/ui-components/data/table/base-table-view'; +import {WorkerExt} from '@common/workers-and-queues/actions/workers.actions'; + @Component({ selector: 'sm-workers-table', @@ -15,9 +16,9 @@ export class WorkersTableComponent extends BaseTableView { public cols: Array; public readonly WORKERS_TABLE_COL_FIELDS = WORKERS_TABLE_COL_FIELDS; - private _workers: Worker[]; + private _workers: WorkerExt[]; - @Input() set workers(workers: Worker[]) { + @Input() set workers(workers) { this._workers = workers; this.table && this.table.focusSelected(); } @@ -26,12 +27,11 @@ export class WorkersTableComponent extends BaseTableView { return this._workers; } - @Input() selectedWorker: Worker; + @Input() selectedWorker: WorkerExt; @Output() workerSelected = new EventEmitter(); @Output() sortedChanged = new EventEmitter<{ isShift: boolean; colId: ISmCol['id'] }>(); @ViewChild('tableContainer', {static: true}) tableContainer; - @ViewChild('table', {static: false}) table: TableComponent; constructor() { super(); @@ -75,7 +75,7 @@ export class WorkersTableComponent extends BaseTableView { this.workerSelected.emit(event.data); } - scrollTableToTop() { + override scrollTableToTop() { this.tableContainer.nativeElement.scroll({top: 0}); } @@ -84,7 +84,7 @@ export class WorkersTableComponent extends BaseTableView { this.scrollTableToTop(); } - afterTableInit(): void { + override afterTableInit(): void { } // eslint-disable-next-line @typescript-eslint/no-unused-vars diff --git a/src/app/webapp-common/workers-and-queues/effects/queues.effects.ts b/src/app/webapp-common/workers-and-queues/effects/queues.effects.ts index e2f5c470..a4bf9fb3 100755 --- a/src/app/webapp-common/workers-and-queues/effects/queues.effects.ts +++ b/src/app/webapp-common/workers-and-queues/effects/queues.effects.ts @@ -50,7 +50,7 @@ import {MESSAGES_SEVERITY} from '@common/constants'; export class QueuesEffect { constructor( private actions: Actions, private queuesApi: ApiQueuesService, private tasksApi: ApiTasksService, - private store: Store + private store: Store ) { } diff --git a/src/app/webapp-common/workers-and-queues/effects/workers.effects.ts b/src/app/webapp-common/workers-and-queues/effects/workers.effects.ts index 3e4a0d95..c3cfe5ef 100755 --- a/src/app/webapp-common/workers-and-queues/effects/workers.effects.ts +++ b/src/app/webapp-common/workers-and-queues/effects/workers.effects.ts @@ -17,6 +17,7 @@ import {showStatsErrorNotice, hideNoStatsNotice} from '../actions/stats.actions' import {addMultipleSortColumns} from '../../shared/utils/shared-utils'; import {transformAndSortWorkers} from '@common/workers-and-queues/workers-and-queues.utils'; import {MESSAGES_SEVERITY} from '@common/constants'; +import {WorkerExt} from '../actions/workers.actions'; const prepareStatsQuery = (entitie: string, keys: { key: string }[], range: number, granularity: number): WorkersGetStatsRequest => { const now = Math.floor((new Date()).getTime() / 1000); diff --git a/src/app/webapp-common/workers-and-queues/orchestration.component.scss b/src/app/webapp-common/workers-and-queues/orchestration.component.scss index c4e6cae5..264afd8d 100644 --- a/src/app/webapp-common/workers-and-queues/orchestration.component.scss +++ b/src/app/webapp-common/workers-and-queues/orchestration.component.scss @@ -23,9 +23,9 @@ } } - ::ng-deep .outlet + * { - display: block; - height: calc(100% - #{$wnq-tabs-height}); + .content { + overflow: auto; + height: calc(100% - 66px); } } diff --git a/src/app/webapp-common/workers-and-queues/orchestration.component.ts b/src/app/webapp-common/workers-and-queues/orchestration.component.ts index 835d6e8c..bf1efadd 100644 --- a/src/app/webapp-common/workers-and-queues/orchestration.component.ts +++ b/src/app/webapp-common/workers-and-queues/orchestration.component.ts @@ -1,10 +1,11 @@ import {Component} from '@angular/core'; import {filter, take} from 'rxjs/operators'; -import {MatDialog, MatDialogRef} from '@angular/material/dialog'; +import {MatDialog} from '@angular/material/dialog'; import {getQueues} from '@common/workers-and-queues/actions/queues.actions'; import {Store} from '@ngrx/store'; import {QueueCreateDialogComponent} from '@common/shared/queue-create-dialog/queue-create-dialog.component'; import {ActivatedRoute} from '@angular/router'; +import {FeaturesEnum} from '~/business-logic/model/users/featuresEnum'; @Component({ selector: 'sm-orchestration', @@ -12,8 +13,8 @@ import {ActivatedRoute} from '@angular/router'; styleUrls: ['./orchestration.component.scss'] }) export class OrchestrationComponent { - private createQueueDialog: MatDialogRef; public queuesManager: boolean; + featuresEnum = FeaturesEnum; constructor(private dialog: MatDialog, private store: Store, private route: ActivatedRoute) { this.queuesManager = route.snapshot.data.queuesManager; @@ -21,13 +22,13 @@ export class OrchestrationComponent { addQueue() { - this.createQueueDialog = this.dialog.open(QueueCreateDialogComponent); - this.createQueueDialog.afterClosed() + this.dialog.open(QueueCreateDialogComponent) + .afterClosed() .pipe( filter(queue => !!queue), take(1) ) - .subscribe((queue) => { + .subscribe(() => { this.store.dispatch(getQueues()); }); } diff --git a/src/app/webapp-common/workers-and-queues/reducers/queues.reducer.ts b/src/app/webapp-common/workers-and-queues/reducers/queues.reducer.ts index 195a9242..dd91ceeb 100755 --- a/src/app/webapp-common/workers-and-queues/reducers/queues.reducer.ts +++ b/src/app/webapp-common/workers-and-queues/reducers/queues.reducer.ts @@ -1,11 +1,17 @@ import { - queuesTableSetSort, setQueues, setSelectedQueue, setSelectedQueueFromServer, syncSpecificQueueInTable, setStats, setStatsParams + queuesTableSetSort, + setQueues, + setSelectedQueue, + setSelectedQueueFromServer, + syncSpecificQueueInTable, + setStats, + setStatsParams, + Queue } from '../actions/queues.actions'; -import {Queue} from '../../../business-logic/model/queues/queue'; import {QUEUES_TABLE_COL_FIELDS, TIME_INTERVALS} from '../workers-and-queues.consts'; import {TABLE_SORT_ORDER} from '../../shared/ui-components/data/table/table.consts'; import {SortMeta} from 'primeng/api'; -import {ITask} from '../../../business-logic/model/al-task'; +import {ITask} from '~/business-logic/model/al-task'; import {Topic} from '@common/shared/utils/statistics'; export interface QueueStoreType { diff --git a/src/app/webapp-common/workers-and-queues/workers-and-queues.consts.ts b/src/app/webapp-common/workers-and-queues/workers-and-queues.consts.ts index 139b6beb..33cd7258 100755 --- a/src/app/webapp-common/workers-and-queues/workers-and-queues.consts.ts +++ b/src/app/webapp-common/workers-and-queues/workers-and-queues.consts.ts @@ -16,6 +16,18 @@ export const WORKERS_TABLE_COL_FIELDS = { TASK_ITERATIONS : 'task.last_iteration' }; +export const SOURCES_TABLE_COL_FIELDS = { + ID : 'id', + KEY : 'key', + GPU : 'avgGpuUtil', + CPU : 'avgCpuLoad', + RAM_TOTAL : 'ramTotal', + RAM_FREE : 'ramFree', + HOME_FREE : 'homeFree', + WORKERS_COUNT : 'workerCount', + NETWORK : 'network', +}; + const MiB = 1024 * 1024; export const WORKER_STATS_PARAM_INFO = { cpu_usage : {title: 'CPU Usage', multiply: 1}, diff --git a/src/app/webapp-common/workers-and-queues/workers-and-queues.utils.ts b/src/app/webapp-common/workers-and-queues/workers-and-queues.utils.ts index 30aadf1f..e837fa28 100644 --- a/src/app/webapp-common/workers-and-queues/workers-and-queues.utils.ts +++ b/src/app/webapp-common/workers-and-queues/workers-and-queues.utils.ts @@ -4,13 +4,12 @@ import {SortMeta} from 'primeng/api'; export const sortTable = (sortFields: SortMeta[], entities: T[]): T[] => { const srtByFields = sortFields.map(f => f.field); - const srtByOrders = sortFields.map(f => f.order > 0 ? 'asc' : 'desc'); + const srtByOrders = sortFields.map(f => f.order > 0 ? 'asc': 'desc'); return orderBy(entities, srtByFields, srtByOrders); }; export const transformAndSortWorkers = (sortFields, workers: WorkerExt[]): WorkerExt[] => sortTable(sortFields, workers.map(worker => ({ ...worker, originalName: worker.originalName || worker.id, - id: worker.key || worker.id, name: worker.originalName || worker.id }))); diff --git a/src/environments/base.ts b/src/environments/base.ts index 6ed42f96..b72ced17 100644 --- a/src/environments/base.ts +++ b/src/environments/base.ts @@ -55,6 +55,7 @@ export interface Environment { serverDownMessage?: string; legal: Legal; loginPopup?: string; + appsYouTubeIntroVideoId?: string; newExperimentYouTubeVideoId: string; baseHref?: string; } diff --git a/src/test.ts b/src/test.ts index cd612eeb..9ca61ee1 100644 --- a/src/test.ts +++ b/src/test.ts @@ -14,7 +14,6 @@ import { // Unfortunately there's no typing for the `__karma__` variable. Just declare it as any. declare const __karma__: any; -declare const require: any; // Prevent Karma from running prematurely. __karma__.loaded = function () {}; @@ -24,9 +23,5 @@ getTestBed().initTestEnvironment( BrowserDynamicTestingModule, platformBrowserDynamicTesting() ); -// Then we find all the tests. -const context = require.context('./', true, /\.spec\.ts$/); -// And load the modules. -context.keys().map(context); // Finally, start Karma to run the tests. __karma__.start(); diff --git a/src/version.json b/src/version.json index 25730537..aed7fef1 100644 --- a/src/version.json +++ b/src/version.json @@ -1,5 +1,5 @@ { - "version": "1.11.0-000", + "version": "1.13.0-000", "trains-server-treeish": "master", "trains-server-commit": "master", "webapp-treeish": "master", diff --git a/tsconfig.json b/tsconfig.json index 15397180..7b83a0fc 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -1,25 +1,28 @@ { "compileOnSave": false, "compilerOptions": { - "downlevelIteration": true, - "importHelpers": true, - "module": "es2020", "outDir": "./dist/out-tsc", + "forceConsistentCasingInFileNames": true, + "noImplicitOverride": true, + "noImplicitReturns": true, + "noFallthroughCasesInSwitch": true, "sourceMap": true, "declaration": false, - "moduleResolution": "node", - "emitDecoratorMetadata": true, + "downlevelIteration": true, "experimentalDecorators": true, + "moduleResolution": "node", + "importHelpers": true, "allowSyntheticDefaultImports": true, + "esModuleInterop": true, "target": "ES2022", + "module": "ES2022", + "useDefineForClassFields": false, "resolveJsonModule": true, "typeRoots": [ "node_modules/@types" ], "lib": [ - "es2019.array", - "es2019.object", - "es2017", + "ES2022", "dom" ], "baseUrl": "src", @@ -31,9 +34,11 @@ "app/*" ] }, - "useDefineForClassFields": false }, "angularCompilerOptions": { + "enableI18nLegacyMessageIdFormat": false, + "strictInjectionParameters": true, + "strictInputAccessModifiers": true, "strictTemplates": true, "preserveWhitespaces": true }
- -
{{minimizedTableHeader}}
-
-
- -
- -
- +
+
+ +
{{minimizedTableHeader}}
+
+
+ +
+ +
+ +
+
-
- - +
+ + +