From c155face32547415d42b9fb3ef04bfbdc164977b Mon Sep 17 00:00:00 2001 From: Daniel von Atzigen Date: Wed, 8 May 2024 09:29:46 +0200 Subject: [PATCH] Deployment to int (#105) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * local development environment * relocate local development init files * create ci action * update ci action * update ci action * clean unit-tests and fix lint errors * create codeQL action * update codeQL action * create pre-release action * update pre-release action * update pre-release action * update pre-release action * update pre-release action * assets #12 setup local environment and create a clean DB * create release action * update release action * update release action * clean-up * rename development-names * update release action * update release action * update release action * update docker file * update docker file * Bump @babel/traverse from 7.20.12 to 7.24.0 Bumps [@babel/traverse](https://github.com/babel/babel/tree/HEAD/packages/babel-traverse) from 7.20.12 to 7.24.0. - [Release notes](https://github.com/babel/babel/releases) - [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md) - [Commits](https://github.com/babel/babel/commits/v7.24.0/packages/babel-traverse) --- updated-dependencies: - dependency-name: "@babel/traverse" dependency-type: indirect ... Signed-off-by: dependabot[bot] * Bump webpack and @angular-devkit/build-angular Bumps [webpack](https://github.com/webpack/webpack) to 5.76.1 and updates ancestor dependency [@angular-devkit/build-angular](https://github.com/angular/angular-cli). These dependencies need to be updated together. Updates `webpack` from 5.75.0 to 5.76.1 - [Release notes](https://github.com/webpack/webpack/releases) - [Commits](https://github.com/webpack/webpack/compare/v5.75.0...v5.76.1) Updates `@angular-devkit/build-angular` from 15.1.1 to 15.2.10 - [Release notes](https://github.com/angular/angular-cli/releases) - [Changelog](https://github.com/angular/angular-cli/blob/main/CHANGELOG.md) - [Commits](https://github.com/angular/angular-cli/compare/15.1.1...15.2.10) --- updated-dependencies: - dependency-name: webpack dependency-type: indirect - dependency-name: "@angular-devkit/build-angular" dependency-type: direct:development ... Signed-off-by: dependabot[bot] * Bump vite from 4.0.4 to 4.5.2 Bumps [vite](https://github.com/vitejs/vite/tree/HEAD/packages/vite) from 4.0.4 to 4.5.2. - [Release notes](https://github.com/vitejs/vite/releases) - [Changelog](https://github.com/vitejs/vite/blob/v4.5.2/packages/vite/CHANGELOG.md) - [Commits](https://github.com/vitejs/vite/commits/v4.5.2/packages/vite) --- updated-dependencies: - dependency-name: vite dependency-type: direct:development ... Signed-off-by: dependabot[bot] * Bump word-wrap from 1.2.3 to 1.2.5 Bumps [word-wrap](https://github.com/jonschlinkert/word-wrap) from 1.2.3 to 1.2.5. - [Release notes](https://github.com/jonschlinkert/word-wrap/releases) - [Commits](https://github.com/jonschlinkert/word-wrap/compare/1.2.3...1.2.5) --- updated-dependencies: - dependency-name: word-wrap dependency-type: indirect ... Signed-off-by: dependabot[bot] * Bump axios from 1.4.0 to 1.6.7 Bumps [axios](https://github.com/axios/axios) from 1.4.0 to 1.6.7. - [Release notes](https://github.com/axios/axios/releases) - [Changelog](https://github.com/axios/axios/blob/v1.x/CHANGELOG.md) - [Commits](https://github.com/axios/axios/compare/v1.4.0...v1.6.7) --- updated-dependencies: - dependency-name: axios dependency-type: indirect ... Signed-off-by: dependabot[bot] * Bump follow-redirects from 1.15.2 to 1.15.5 Bumps [follow-redirects](https://github.com/follow-redirects/follow-redirects) from 1.15.2 to 1.15.5. - [Release notes](https://github.com/follow-redirects/follow-redirects/releases) - [Commits](https://github.com/follow-redirects/follow-redirects/compare/v1.15.2...v1.15.5) --- updated-dependencies: - dependency-name: follow-redirects dependency-type: indirect ... Signed-off-by: dependabot[bot] * Bump undici from 5.22.1 to 5.28.3 Bumps [undici](https://github.com/nodejs/undici) from 5.22.1 to 5.28.3. - [Release notes](https://github.com/nodejs/undici/releases) - [Commits](https://github.com/nodejs/undici/compare/v5.22.1...v5.28.3) --- updated-dependencies: - dependency-name: undici dependency-type: indirect ... Signed-off-by: dependabot[bot] * Bump semver from 5.7.1 to 5.7.2 Bumps [semver](https://github.com/npm/node-semver) from 5.7.1 to 5.7.2. - [Release notes](https://github.com/npm/node-semver/releases) - [Changelog](https://github.com/npm/node-semver/blob/v5.7.2/CHANGELOG.md) - [Commits](https://github.com/npm/node-semver/compare/v5.7.1...v5.7.2) --- updated-dependencies: - dependency-name: semver dependency-type: indirect ... Signed-off-by: dependabot[bot] * Bump ip from 2.0.0 to 2.0.1 Bumps [ip](https://github.com/indutny/node-ip) from 2.0.0 to 2.0.1. - [Commits](https://github.com/indutny/node-ip/compare/v2.0.0...v2.0.1) --- updated-dependencies: - dependency-name: ip dependency-type: indirect ... Signed-off-by: dependabot[bot] * assets-39: remove console log of password from test * Feature/assets 16 replace logos (#43) * assets-16: replace the old logo and favicon with new ones * assets-32: replace the logo with the actual one for assets * Feature/assets 8: add missing scrollbars (#40) * assets-8: add scrollbars to all tabs in assets editor and user management * assets-8: remove some duplicate attributes * assets-8: fix unchanged files with annotations * assets-8: fix unchanged files with annotations * assets-8: fix unchanged files with annotations --------- Co-authored-by: Alex Graf * assets-32: break long titles so the edit button is not hidden. same for the search result in order to display the entire title (#44) * update pre-release action * update pre-release action * update pre-release action * update pre-release action * update release action * update release action * update dockerfiles and actions * Bump follow-redirects from 1.15.5 to 1.15.6 Bumps [follow-redirects](https://github.com/follow-redirects/follow-redirects) from 1.15.5 to 1.15.6. - [Release notes](https://github.com/follow-redirects/follow-redirects/releases) - [Commits](https://github.com/follow-redirects/follow-redirects/compare/v1.15.5...v1.15.6) --- updated-dependencies: - dependency-name: follow-redirects dependency-type: indirect ... Signed-off-by: dependabot[bot] * Bump fast-xml-parser and @aws-sdk/client-s3 Bumps [fast-xml-parser](https://github.com/NaturalIntelligence/fast-xml-parser) to 4.2.5 and updates ancestor dependency [@aws-sdk/client-s3](https://github.com/aws/aws-sdk-js-v3/tree/HEAD/clients/client-s3). These dependencies need to be updated together. Updates `fast-xml-parser` from 4.0.11 to 4.2.5 - [Release notes](https://github.com/NaturalIntelligence/fast-xml-parser/releases) - [Changelog](https://github.com/NaturalIntelligence/fast-xml-parser/blob/master/CHANGELOG.md) - [Commits](https://github.com/NaturalIntelligence/fast-xml-parser/compare/v4.0.11...v4.2.5) Updates `@aws-sdk/client-s3` from 3.252.0 to 3.537.0 - [Release notes](https://github.com/aws/aws-sdk-js-v3/releases) - [Changelog](https://github.com/aws/aws-sdk-js-v3/blob/main/clients/client-s3/CHANGELOG.md) - [Commits](https://github.com/aws/aws-sdk-js-v3/commits/v3.537.0/clients/client-s3) --- updated-dependencies: - dependency-name: fast-xml-parser dependency-type: indirect - dependency-name: "@aws-sdk/client-s3" dependency-type: direct:production ... Signed-off-by: dependabot[bot] * Bump tough-cookie and @cypress/request Bumps [tough-cookie](https://github.com/salesforce/tough-cookie) and [@cypress/request](https://github.com/cypress-io/request). These dependencies needed to be updated together. Updates `tough-cookie` from 4.1.2 to 4.1.3 - [Release notes](https://github.com/salesforce/tough-cookie/releases) - [Changelog](https://github.com/salesforce/tough-cookie/blob/master/CHANGELOG.md) - [Commits](https://github.com/salesforce/tough-cookie/compare/v4.1.2...v4.1.3) Updates `@cypress/request` from 2.88.11 to 2.88.12 - [Release notes](https://github.com/cypress-io/request/releases) - [Changelog](https://github.com/cypress-io/request/blob/master/CHANGELOG.md) - [Commits](https://github.com/cypress-io/request/compare/v2.88.11...v2.88.12) --- updated-dependencies: - dependency-name: tough-cookie dependency-type: indirect - dependency-name: "@cypress/request" dependency-type: indirect ... Signed-off-by: dependabot[bot] * update release action * update release action * update release action * update release action * Bump the npm_and_yarn group across 1 directory with 6 updates Bumps the npm_and_yarn group with 6 updates in the / directory: | Package | From | To | | --- | --- | --- | | [fast-xml-parser](https://github.com/NaturalIntelligence/fast-xml-parser) | `4.0.11` | `4.2.5` | | [@aws-sdk/client-s3](https://github.com/aws/aws-sdk-js-v3/tree/HEAD/clients/client-s3) | `3.252.0` | `3.537.0` | | [follow-redirects](https://github.com/follow-redirects/follow-redirects) | `1.15.5` | `1.15.6` | | [ip](https://github.com/indutny/node-ip) | `2.0.0` | `2.0.1` | | [tough-cookie](https://github.com/salesforce/tough-cookie) | `4.1.2` | `4.1.3` | | [@cypress/request](https://github.com/cypress-io/request) | `2.88.11` | `2.88.12` | Updates `fast-xml-parser` from 4.0.11 to 4.2.5 - [Release notes](https://github.com/NaturalIntelligence/fast-xml-parser/releases) - [Changelog](https://github.com/NaturalIntelligence/fast-xml-parser/blob/master/CHANGELOG.md) - [Commits](https://github.com/NaturalIntelligence/fast-xml-parser/compare/v4.0.11...v4.2.5) Updates `@aws-sdk/client-s3` from 3.252.0 to 3.537.0 - [Release notes](https://github.com/aws/aws-sdk-js-v3/releases) - [Changelog](https://github.com/aws/aws-sdk-js-v3/blob/main/clients/client-s3/CHANGELOG.md) - [Commits](https://github.com/aws/aws-sdk-js-v3/commits/v3.537.0/clients/client-s3) Updates `follow-redirects` from 1.15.5 to 1.15.6 - [Release notes](https://github.com/follow-redirects/follow-redirects/releases) - [Commits](https://github.com/follow-redirects/follow-redirects/compare/v1.15.5...v1.15.6) Updates `ip` from 2.0.0 to 2.0.1 - [Commits](https://github.com/indutny/node-ip/compare/v2.0.0...v2.0.1) Updates `tough-cookie` from 4.1.2 to 4.1.3 - [Release notes](https://github.com/salesforce/tough-cookie/releases) - [Changelog](https://github.com/salesforce/tough-cookie/blob/master/CHANGELOG.md) - [Commits](https://github.com/salesforce/tough-cookie/compare/v4.1.2...v4.1.3) Updates `@cypress/request` from 2.88.11 to 2.88.12 - [Release notes](https://github.com/cypress-io/request/releases) - [Changelog](https://github.com/cypress-io/request/blob/master/CHANGELOG.md) - [Commits](https://github.com/cypress-io/request/compare/v2.88.11...v2.88.12) --- updated-dependencies: - dependency-name: fast-xml-parser dependency-type: indirect dependency-group: npm_and_yarn-security-group - dependency-name: "@aws-sdk/client-s3" dependency-type: direct:production dependency-group: npm_and_yarn-security-group - dependency-name: follow-redirects dependency-type: indirect dependency-group: npm_and_yarn-security-group - dependency-name: ip dependency-type: indirect dependency-group: npm_and_yarn-security-group - dependency-name: tough-cookie dependency-type: indirect dependency-group: npm_and_yarn-security-group - dependency-name: "@cypress/request" dependency-type: indirect dependency-group: npm_and_yarn-security-group ... Signed-off-by: dependabot[bot] * update release action * update release action * update pre-release action * update dev-deploy action * update dev-deploy action * update dev-deploy action * update dev-deploy action * update dev-deploy action * update dev-deploy action * update dev-deploy action * update dev-deploy action * update dev-deploy action * update release action * update release action * update release action * #67: update elasticsearch-index local * fix lint * #11 fix sonar-issues, unit-tests * Feature/assets 7 eIAM (#75) #7: integrate eIAM * Add elasticsearch init script * Remove initial `rdsadmin` user * Extend setup instructions in README * update create-docker-image action * update create-docker-image action * update create-docker-image action * Replace build workflows with new unified `build` workflow * Rewrite `release` workflow to just add `latest` flag The workflow will no longer add a new image tagged as `release`. Also, the ChangeLog has been removed completely as it is not used by the current project team. * Re-add codeql workflow * Remove pull request triggers from workflows * Remove duplicates from displayed sibling assets * Remove all existing siblings when patching an asset * Revert bad commits * Remove all existing siblings when patching an asset * Add tagging/release notes to actions * Add name to `release` pipeline * Remove self-dependency of `build.build` step * Remove docker image version tag * Use `install` instead of `ci` to install node modules * Run nx with `npx` * Add node modules cache to build pipeline * Add debug steps to build pipeline * Move debug steps to test job * Add `npm ci` to check jobs * Cache build node_modules from within build dir * Reset nx in build pipeline * Add explicit typing to `contact-edit.service` * Add dev setup steps to build pipeline * Remove postinstall from build pipeline * Run `ng` via npx in build pipeline * Replace `actions/cache@v2` with `v4` * Make `tag_edge_commit` build step depend on `build_and_push_app` * Fix pipeline job branch check * Add checkouts before building images * Make GITHUB_TOKEN an input for `create-image` action * Add startup prisma migration to server Dockerfile * #81: Added checking for user groups in middleware and returns the error message to the frontend. Added env variable fields to template for o_Auth * #81: Show error message when error returned from the backend * Remove unused code for auth (password reset etc) as part of #11 * #81: pr comments and remove serach field on error page * Create Bug template * Add Issue template * Refine templates * #81: fix lint issues * Extract CRUD of `asset` table into `AssetRepo` * Install `@faker-js/faker` Library for generating fake data for testing. * Test `AssetRepo` * Apply `build` workflow to all branches * Update `fp-ts` package `tap` function is only available from 2.15+ * Extract elasticsearch usages into `AssetSearchService` * Add `AllStudy` view definition to schema * Test `AssetSearchService` * Replace elasticsearch usages by `AssetSearchService` * Merge pull request #96 from swisstopo/feature/asset-71-update-elasticsearch-index * Merge pull request #98 from swisstopo/feature/asset-33-bug-alternative-ids --------- Signed-off-by: dependabot[bot] Co-authored-by: Alex Graf Co-authored-by: till_schuetze Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Till Schütze <151851258+TIL-EBP@users.noreply.github.com> Co-authored-by: Jannic Veith <103118462+vej-ananas@users.noreply.github.com> Co-authored-by: Jannic Veith --- .editorconfig | 1 + .github/ISSUE_TEMPLATE/1-issue.md | 23 + .github/ISSUE_TEMPLATE/2-bug.md | 33 + .github/actions/create-image/action.yaml | 57 + .github/actions/deploy/action.yaml | 84 - .github/actions/generate-version/action.yaml | 15 - .github/actions/registry-push/action.yaml | 26 - .github/workflows/build.yml | 231 + .github/workflows/codeql.yml | 38 + .github/workflows/release.yml | 115 + .github/workflows/swissgeol-dev.yml | 67 - .github/workflows/swissgeol-int.yml | 100 - .github/workflows/swissgeol-prod.yml | 100 - .gitignore | 1 + .vscode/settings.json | 4 +- README.md | 189 +- apps/client-asset-sg-e2e/cypress.config.ts | 2 +- .../src/support/commands.ts | 2 +- apps/client-asset-sg/docker/Dockerfile | 5 +- apps/client-asset-sg/project.json | 193 +- .../src/app/app.component.html | 10 +- .../src/app/app.component.spec.ts | 31 - apps/client-asset-sg/src/app/app.component.ts | 86 +- apps/client-asset-sg/src/app/app.module.ts | 180 +- .../components/app-bar/app-bar.component.html | 2 +- .../components/app-bar/app-bar.component.scss | 1 + .../app/components/error/error.component.html | 6 + .../app/components/error/error.component.scss | 13 + .../app/components/error/error.component.ts | 24 + .../not-found/not-found.component.ts | 2 +- .../redirect-to-lang.component.ts | 9 +- apps/client-asset-sg/src/app/i18n/de.ts | 41 +- apps/client-asset-sg/src/app/i18n/en.ts | 41 +- apps/client-asset-sg/src/app/i18n/fr.ts | 42 +- apps/client-asset-sg/src/app/i18n/it.ts | 41 +- apps/client-asset-sg/src/app/i18n/rm.ts | 41 +- .../src/assets/email-templates/invite.html | 49 - .../src/assets/email-templates/recover.html | 45 - apps/client-asset-sg/src/assets/logo-CH.svg | 1 - .../src/assets/swissgeol_assets.svg | 92 + .../src/environments/environment.int.ts | 5 + apps/client-asset-sg/src/favicon.ico | Bin 15086 -> 9662 bytes apps/client-asset-sg/src/styles.scss | 4 + apps/server-asset-sg/.env.template | 28 +- apps/server-asset-sg/docker/Dockerfile | 19 +- apps/server-asset-sg/docker/start.sh | 4 + apps/server-asset-sg/jest.config.ts | 9 + apps/server-asset-sg/jest.setup.ts | 4 + apps/server-asset-sg/project.json | 10 +- .../src/app/admin/admin.controller.ts | 23 +- .../src/app/admin/admin.service.ts | 80 +- .../src/app/app.controller.spec.ts | 22 - .../server-asset-sg/src/app/app.controller.ts | 103 +- apps/server-asset-sg/src/app/app.module.ts | 22 +- .../src/app/app.service.spec.ts | 21 - apps/server-asset-sg/src/app/app.service.ts | 227 +- .../app/asset-edit/asset-edit.controller.ts | 81 +- .../src/app/asset-edit/asset-edit.fake.ts | 83 + .../src/app/asset-edit/asset-edit.service.ts | 438 +- .../contact-edit/contact-edit.controller.ts | 12 +- .../contact-edit/contact-edit.service.spec.ts | 107 + .../app/contact-edit/contact-edit.service.ts | 3 +- .../src/app/jwt/jwt-middleware.ts | 150 +- apps/server-asset-sg/src/app/jwt/jwt.ts | 35 +- .../oauth-config/oauth-config.controller.ts | 16 + .../migration.sql | 19 + .../src/app/prisma/schema.prisma | 1233 +- .../src/app/repos/asset.repo.spec.ts | 243 + .../src/app/repos/asset.repo.ts | 364 + .../src/app/repos/base/repo.ts | 13 + .../src/app/scripts/create-admin-user.ts | 63 - .../app/scripts/export-to-elasticsearch.ts | 320 - .../src/app/scripts/http-utils.ts | 2 +- .../app/search/asset-search-service.spec.ts | 225 + .../src/app/search/asset-search-service.ts | 339 + .../src/app/search/elastic-search-client.ts | 17 - .../src/app/search/elasticsearch.ts | 15 + .../app/search/find-assets-by-search-text.ts | 299 - .../src/app/search/find-assets-by-title.ts | 61 - .../src/app/user/models/user.ts | 23 +- .../src/app/user/user.controller.ts | 8 +- .../src/app/user/user.service.ts | 45 +- apps/server-asset-sg/tsconfig.spec.json | 4 +- deployment/.gitignore | 2 - deployment/.npmrc | 2 - deployment/Pulumi.swissgeol-asset-dev.yaml | 1 - deployment/Pulumi.swissgeol-asset-int.yaml | 32 - deployment/Pulumi.swissgeol-asset-prod.yaml | 32 - deployment/Pulumi.yaml | 3 - deployment/components/api.ts | 89 - deployment/components/app.ts | 12 - deployment/components/auth.ts | 110 - deployment/components/debug.ts | 32 - deployment/components/routing.ts | 118 - deployment/components/search.ts | 120 - deployment/components/secrets.ts | 41 - deployment/helper.ts | 11 - deployment/index.ts | 125 - deployment/package-lock.json | 2214 -- deployment/package.json | 15 - deployment/tsconfig.json | 19 - development/.env.template | 7 + development/.gitignore | 7 + development/docker-compose.test.yaml | 36 + development/docker-compose.yaml | 154 + .../images/db}/Dockerfile | 0 development/images/db/postgres-readme.md | 1 + development/init/db/01_roles.sql | 2 + development/init/db/02_dump.sql | 17244 ++++++++++++++++ development/init/elasticsearch/init.sh | 44 + .../mappings/swissgeol_asset_asset.json | 58 + development/init/oidc/oidc-mock-clients.json | 29 + development/init/oidc/oidc-mock-users.json | 76 + docker/.env | 7 - docker/create.sh | 4 - docker/docker-compose-stage-test.yaml | 15 - docker/docker-compose.yaml | 114 - docker/up-stage-test.sh | 3 - docker/up.sh | 4 - docker/volumes/db/init/00_init_postgres.sql | 7 - docker/volumes/pgadmin/config/servers.json | 20 - envs.api.json | 107 - envs.auth.json | 130 - images/bulk-ocr/.gitignore | 1 - images/bulk-ocr/Dockerfile | 14 - images/bulk-ocr/build.sh | 2 - images/bulk-ocr/docker-compose.yaml | 9 - images/bulk-ocr/flask/ocr_pipeline.py | 85 - images/bulk-ocr/flask/readme.md | 5 - images/bulk-ocr/flask/requirements.txt | 7 - images/bulk-ocr/flask/run_ocr_pipeline.py | 29 - images/bulk-ocr/flask/server.py | 136 - .../admin-page/admin-page.component.html | 8 - .../admin-page/admin-page.component.scss | 5 + .../admin-page/admin-page.component.ts | 2 - .../admin-page/admin-page.state-machine.ts | 19 +- .../user-expanded.component.html | 9 +- .../user-expanded/user-expanded.component.ts | 13 +- libs/admin/src/lib/services/admin.service.ts | 17 - libs/asset-editor/jest.config.ts | 2 +- .../asset-editor-launch.component.html | 18 +- .../asset-editor-launch.component.scss | 35 + .../asset-editor-launch.component.ts | 49 +- ...t-editor-tab-administration.component.html | 6 +- ...set-editor-tab-administration.component.ts | 4 +- .../asset-editor-tab-contacts.component.html | 4 +- .../asset-editor-tab-contacts.component.ts | 1 - .../asset-editor-tab-general.component.html | 4 +- .../asset-editor-tab-general.component.ts | 44 +- .../asset-editor-tab-page.component.scss | 2 +- .../asset-editor-tab-references.component.ts | 3 +- .../asset-editor-tab-usage.component.html | 4 +- .../asset-editor-tab-usage.component.scss | 5 + .../asset-multiselect.component.ts | 2 +- .../src/lib/services/asset-editor.service.ts | 6 +- .../src/lib/state/asset-editor.effects.ts | 2 +- .../asset-search-detail.component.html | 4 +- .../asset-search-results.component.html | 2 +- .../src/lib/models/all-study-dto.ts | 2 +- .../lib/models/client-asset-search-params.ts | 2 +- libs/auth/src/index.ts | 1 - libs/auth/src/lib/auth.module.ts | 25 +- libs/auth/src/lib/components/login/index.ts | 1 - .../lib/components/login/login.component.html | 93 - .../lib/components/login/login.component.scss | 94 - .../lib/components/login/login.component.ts | 177 - .../components/reset-password-dialog/index.ts | 1 - .../reset-password-dialog.component.html | 41 - .../reset-password-dialog.component.scss | 25 - .../reset-password-dialog.component.ts | 139 - .../components/reset-password-page/index.ts | 1 - .../reset-password-page.component.scss | 5 - .../reset-password-page.component.ts | 31 - .../set-password-dialog.component.html | 41 - .../set-password-dialog.component.scss | 26 - .../set-password-dialog.component.ts | 139 - .../lib/components/set-password-page/index.ts | 1 - .../set-password-page.component.scss | 5 - .../set-password-page.component.ts | 32 - .../auth/src/lib/services/auth.interceptor.ts | 85 +- libs/auth/src/lib/services/auth.service.ts | 138 +- .../components/button/button.component.scss | 6 +- .../drag-handle/drag-handle.component.ts | 2 +- .../ngrx-store-logger.spec.ts | 17 + .../serialize-error/serialize-error.spec.ts | 68 + libs/core/src/lib/utils/array.ts | 36 - .../lib/services/favourite.service.spec.ts | 40 + libs/ngx-kobalte/src/lib/components/tabs.ts | 5 +- libs/ngx-kobalte/tsconfig.spec.json | 3 +- .../components/profile/profile.component.ts | 4 +- libs/shared/src/lib/models/asset-usage.ts | 1 + libs/shared/src/lib/models/user.ts | 2 + package-lock.json | 8775 +++++--- package.json | 25 +- postgres-docker-image/build.sh | 3 - postgres-docker-image/postgres-readme.md | 5 - test/data/asset-format-item.ts | 169 + test/data/asset-kind-item.ts | 505 + test/data/language-items.ts | 105 + test/data/man-cat-label-item.ts | 201 + test/data/status-asset-use-item.ts | 52 + test/data/status-work-item.ts | 132 + test/setup-db.ts | 48 + tools/BatchOCR/BatchOCR.ts | 145 - tools/BatchOCR/ExractText.ts | 60 - tools/BatchOCR/decs.d.ts | 1 - tools/BatchOCR/docker-compose.yaml | 29 - tools/generators/.gitkeep | 0 tools/github/.gitignore | 1 - tools/github/export-issues.sh | 3 - tools/scripts/gdal-it | 1 - tools/scripts/ogr2ogr | 4 - tools/scripts/publish.mjs | 56 - tools/tsconfig.tools.json | 12 - 214 files changed, 28923 insertions(+), 11145 deletions(-) create mode 100644 .github/ISSUE_TEMPLATE/1-issue.md create mode 100644 .github/ISSUE_TEMPLATE/2-bug.md create mode 100644 .github/actions/create-image/action.yaml delete mode 100644 .github/actions/deploy/action.yaml delete mode 100644 .github/actions/generate-version/action.yaml delete mode 100644 .github/actions/registry-push/action.yaml create mode 100644 .github/workflows/build.yml create mode 100644 .github/workflows/codeql.yml create mode 100644 .github/workflows/release.yml delete mode 100644 .github/workflows/swissgeol-dev.yml delete mode 100644 .github/workflows/swissgeol-int.yml delete mode 100644 .github/workflows/swissgeol-prod.yml delete mode 100644 apps/client-asset-sg/src/app/app.component.spec.ts create mode 100644 apps/client-asset-sg/src/app/components/error/error.component.html create mode 100644 apps/client-asset-sg/src/app/components/error/error.component.scss create mode 100644 apps/client-asset-sg/src/app/components/error/error.component.ts delete mode 100644 apps/client-asset-sg/src/assets/email-templates/invite.html delete mode 100644 apps/client-asset-sg/src/assets/email-templates/recover.html delete mode 100644 apps/client-asset-sg/src/assets/logo-CH.svg create mode 100644 apps/client-asset-sg/src/assets/swissgeol_assets.svg create mode 100644 apps/client-asset-sg/src/environments/environment.int.ts create mode 100644 apps/server-asset-sg/docker/start.sh create mode 100644 apps/server-asset-sg/jest.setup.ts delete mode 100644 apps/server-asset-sg/src/app/app.controller.spec.ts delete mode 100644 apps/server-asset-sg/src/app/app.service.spec.ts create mode 100644 apps/server-asset-sg/src/app/asset-edit/asset-edit.fake.ts create mode 100644 apps/server-asset-sg/src/app/contact-edit/contact-edit.service.spec.ts create mode 100644 apps/server-asset-sg/src/app/oauth-config/oauth-config.controller.ts create mode 100644 apps/server-asset-sg/src/app/prisma/migrations/20240318103937_update_user_schema/migration.sql create mode 100644 apps/server-asset-sg/src/app/repos/asset.repo.spec.ts create mode 100644 apps/server-asset-sg/src/app/repos/asset.repo.ts create mode 100644 apps/server-asset-sg/src/app/repos/base/repo.ts delete mode 100644 apps/server-asset-sg/src/app/scripts/create-admin-user.ts delete mode 100644 apps/server-asset-sg/src/app/scripts/export-to-elasticsearch.ts create mode 100644 apps/server-asset-sg/src/app/search/asset-search-service.spec.ts create mode 100644 apps/server-asset-sg/src/app/search/asset-search-service.ts delete mode 100644 apps/server-asset-sg/src/app/search/elastic-search-client.ts create mode 100644 apps/server-asset-sg/src/app/search/elasticsearch.ts delete mode 100644 apps/server-asset-sg/src/app/search/find-assets-by-search-text.ts delete mode 100644 apps/server-asset-sg/src/app/search/find-assets-by-title.ts delete mode 100644 deployment/.gitignore delete mode 100644 deployment/.npmrc delete mode 100644 deployment/Pulumi.swissgeol-asset-dev.yaml delete mode 100644 deployment/Pulumi.swissgeol-asset-int.yaml delete mode 100644 deployment/Pulumi.swissgeol-asset-prod.yaml delete mode 100644 deployment/Pulumi.yaml delete mode 100644 deployment/components/api.ts delete mode 100644 deployment/components/app.ts delete mode 100644 deployment/components/auth.ts delete mode 100644 deployment/components/debug.ts delete mode 100644 deployment/components/routing.ts delete mode 100644 deployment/components/search.ts delete mode 100644 deployment/components/secrets.ts delete mode 100644 deployment/helper.ts delete mode 100644 deployment/index.ts delete mode 100644 deployment/package-lock.json delete mode 100644 deployment/package.json delete mode 100644 deployment/tsconfig.json create mode 100644 development/.env.template create mode 100644 development/.gitignore create mode 100644 development/docker-compose.test.yaml create mode 100644 development/docker-compose.yaml rename {postgres-docker-image => development/images/db}/Dockerfile (100%) create mode 100644 development/images/db/postgres-readme.md create mode 100644 development/init/db/01_roles.sql create mode 100644 development/init/db/02_dump.sql create mode 100644 development/init/elasticsearch/init.sh create mode 100644 development/init/elasticsearch/mappings/swissgeol_asset_asset.json create mode 100644 development/init/oidc/oidc-mock-clients.json create mode 100644 development/init/oidc/oidc-mock-users.json delete mode 100644 docker/.env delete mode 100755 docker/create.sh delete mode 100644 docker/docker-compose-stage-test.yaml delete mode 100644 docker/docker-compose.yaml delete mode 100755 docker/up-stage-test.sh delete mode 100755 docker/up.sh delete mode 100644 docker/volumes/db/init/00_init_postgres.sql delete mode 100644 docker/volumes/pgadmin/config/servers.json delete mode 100644 envs.api.json delete mode 100644 envs.auth.json delete mode 100644 images/bulk-ocr/.gitignore delete mode 100644 images/bulk-ocr/Dockerfile delete mode 100755 images/bulk-ocr/build.sh delete mode 100644 images/bulk-ocr/docker-compose.yaml delete mode 100644 images/bulk-ocr/flask/ocr_pipeline.py delete mode 100644 images/bulk-ocr/flask/readme.md delete mode 100644 images/bulk-ocr/flask/requirements.txt delete mode 100644 images/bulk-ocr/flask/run_ocr_pipeline.py delete mode 100644 images/bulk-ocr/flask/server.py create mode 100644 libs/asset-editor/src/lib/components/asset-editor-launch/asset-editor-launch.component.scss delete mode 100644 libs/auth/src/lib/components/login/index.ts delete mode 100644 libs/auth/src/lib/components/login/login.component.html delete mode 100644 libs/auth/src/lib/components/login/login.component.scss delete mode 100644 libs/auth/src/lib/components/login/login.component.ts delete mode 100644 libs/auth/src/lib/components/reset-password-dialog/index.ts delete mode 100644 libs/auth/src/lib/components/reset-password-dialog/reset-password-dialog.component.html delete mode 100644 libs/auth/src/lib/components/reset-password-dialog/reset-password-dialog.component.scss delete mode 100644 libs/auth/src/lib/components/reset-password-dialog/reset-password-dialog.component.ts delete mode 100644 libs/auth/src/lib/components/reset-password-page/index.ts delete mode 100644 libs/auth/src/lib/components/reset-password-page/reset-password-page.component.scss delete mode 100644 libs/auth/src/lib/components/reset-password-page/reset-password-page.component.ts delete mode 100644 libs/auth/src/lib/components/set-password-dialog/set-password-dialog.component.html delete mode 100644 libs/auth/src/lib/components/set-password-dialog/set-password-dialog.component.scss delete mode 100644 libs/auth/src/lib/components/set-password-dialog/set-password-dialog.component.ts delete mode 100644 libs/auth/src/lib/components/set-password-page/index.ts delete mode 100644 libs/auth/src/lib/components/set-password-page/set-password-page.component.scss delete mode 100644 libs/auth/src/lib/components/set-password-page/set-password-page.component.ts create mode 100644 libs/core/src/lib/ngrx-store-logger/ngrx-store-logger.spec.ts create mode 100644 libs/core/src/lib/serialize-error/serialize-error.spec.ts create mode 100644 libs/favourite/src/lib/services/favourite.service.spec.ts delete mode 100755 postgres-docker-image/build.sh delete mode 100644 postgres-docker-image/postgres-readme.md create mode 100644 test/data/asset-format-item.ts create mode 100644 test/data/asset-kind-item.ts create mode 100644 test/data/language-items.ts create mode 100644 test/data/man-cat-label-item.ts create mode 100644 test/data/status-asset-use-item.ts create mode 100644 test/data/status-work-item.ts create mode 100644 test/setup-db.ts delete mode 100644 tools/BatchOCR/BatchOCR.ts delete mode 100644 tools/BatchOCR/ExractText.ts delete mode 100644 tools/BatchOCR/decs.d.ts delete mode 100644 tools/BatchOCR/docker-compose.yaml delete mode 100644 tools/generators/.gitkeep delete mode 100644 tools/github/.gitignore delete mode 100755 tools/github/export-issues.sh delete mode 100755 tools/scripts/gdal-it delete mode 100755 tools/scripts/ogr2ogr delete mode 100644 tools/scripts/publish.mjs delete mode 100644 tools/tsconfig.tools.json diff --git a/.editorconfig b/.editorconfig index 71cd14e9..aa5b9729 100644 --- a/.editorconfig +++ b/.editorconfig @@ -7,6 +7,7 @@ indent_style = space indent_size = 2 insert_final_newline = true trim_trailing_whitespace = true +end_of_line = lf [*.md] max_line_length = off diff --git a/.github/ISSUE_TEMPLATE/1-issue.md b/.github/ISSUE_TEMPLATE/1-issue.md new file mode 100644 index 00000000..b22f1e61 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/1-issue.md @@ -0,0 +1,23 @@ +--- +name: Issue +about: Beschreibe eine neue Aufgabe +title: '' +labels: '' +assignees: '' + +--- + +**Beschreibung** + +Eine klare und präzise Beschreibung der Ausgangssituation, der Problematik sowie bereits bekannter Lösungsansätze. + + + +**Abgrenzung** + +Nicht beachtet in dieser Aufgabe wird die Suche nach der Frage. + +**Acceptance Criteria** + + - [ ] Die Antwort muss 42 sein. + - [ ] ... diff --git a/.github/ISSUE_TEMPLATE/2-bug.md b/.github/ISSUE_TEMPLATE/2-bug.md new file mode 100644 index 00000000..21936a17 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/2-bug.md @@ -0,0 +1,33 @@ +--- +name: Bug +about: Melde einen neuen Bug +title: 'Bug: ' +labels: bug +assignees: '' + +--- + +**Beschreibung** +Eine klare und präzise Beschreibung des Problems. + +**Schritte zum Reproduzieren** +1. Gehe zur Seite '....' +2. Klicke auf '....' +3. Scrolle zu '....' +4. Ein Fehler erscheint + +**Beobachtetes Verhalten** +Eine Beschreibung des Fehlverhaltens. + +**Erwartetes Verhalten** +Eine Beschreibung des eigentlich erwarteten Verhaltens + +**Screenshots** +Zeige Screenshots, wenn vorhanden und hilfreich. + +**Plattform** +Falls relevant: + - Device: [e.g. Desktop, iPhone6] + - OS: [e.g. Windows, iOS8.1] + - Browser [e.g. firefox, edge] + - Mobile Version [e.g. 22] diff --git a/.github/actions/create-image/action.yaml b/.github/actions/create-image/action.yaml new file mode 100644 index 00000000..62955900 --- /dev/null +++ b/.github/actions/create-image/action.yaml @@ -0,0 +1,57 @@ +name: 'create docker image' +description: 'Builds a docker image and tags it' +inputs: + IMAGE_NAME: + description: 'The image name' + required: true + TAG: + description: 'The version of the image' + required: true + DOCKERFILE: + description: 'The path to the Dockerfile' + required: true + GITHUB_TOKEN: + description: 'The github token' + required: true + +runs: + using: 'composite' + steps: + - name: Checkout repository + uses: actions/checkout@v4 + + - name: Set environment variables + shell: bash + run: | + echo COMMITED_AT=$(git show -s --format=%cI ${{ github.sha }}) >> $GITHUB_ENV + echo REVISION=$(git rev-parse --short HEAD) >> $GITHUB_ENV + + - name: Collect docker image metadata + id: meta-data + uses: docker/metadata-action@v5 + with: + images: ${{ inputs.IMAGE_NAME }} + labels: | + org.opencontainers.image.created=${{ env.COMMITED_AT }} + org.opencontainers.image.maintainer=EBP Schweiz AG + flavor: | + latest=false + tags: | + ${{ inputs.TAG }} + + - name: Log in to the GitHub container registry + uses: docker/login-action@v3 + with: + registry: ghcr.io + username: ${{ github.repository_owner }} + password: ${{ inputs.GITHUB_TOKEN }} + + - name: Build and push Docker image + uses: docker/build-push-action@v5 + with: + context: ./ + file: ${{ inputs.DOCKERFILE }} + push: true + tags: ${{ steps.meta-data.outputs.tags }} + labels: ${{ steps.meta-data.outputs.labels }} + no-cache: true diff --git a/.github/actions/deploy/action.yaml b/.github/actions/deploy/action.yaml deleted file mode 100644 index 30d4f921..00000000 --- a/.github/actions/deploy/action.yaml +++ /dev/null @@ -1,84 +0,0 @@ -name: "Pulumi deployment to cluster" -description: "Starts a pulumi deployment to the cluster" -inputs: - # secrets for login etc - pulumiConfigSecret: - description: "Pulumi config secret" - required: true - npmPkgToken: - description: "token for npm pkg access" - required: true - awsAccessKeyId: - description: "AWS access key id" - required: true - awsSecretAccessKey: - description: "AWS secret access key" - required: true - eksClusterName: - description: "AWS EKS cluster name" - required: true - eksRoleArn: - description: "AWS EKS Role ARN" - required: true - # variables for pulumi setup - pulumiConfigPassphrase: - description: "Pulumi config passphrase" - required: true - stack: - description: "Pulumi stack name" - required: true - command: - description: "Pulumi command to run" - required: false - default: "preview" - region: - description: "AWS region" - required: false - default: "eu-central-1" - s3Bucket: - description: "S3 bucket for pulumi state" - required: false - default: "swissgeol-assets-swisstopo" - version: - description: "App version for assets" - required: false - default: "dev" -runs: - using: "composite" - steps: - # https://github.com/marketplace/actions/configure-aws-credentials-for-github-actions - - name: configure aws credentials - uses: aws-actions/configure-aws-credentials@v2 - with: - aws-access-key-id: ${{ inputs.awsAccessKeyId }} - aws-secret-access-key: ${{ inputs.awsSecretAccessKey }} - aws-region: ${{ inputs.region }} - - - name: Create kubeconfig - shell: bash - working-directory: ./deployment - run: | - aws --region ${{ inputs.region }} eks update-kubeconfig --name ${{ inputs.eksClusterName }} --alias swissgeol-${{ inputs.eksClusterName }} --role-arn ${{ inputs.eksRoleArn }} - kubectl get namespaces - - - name: install pulumi deps - shell: bash - working-directory: ./deployment - run: | - echo "//npm.pkg.github.com/:_authToken=${{ inputs.npmPkgToken }}" >> .npmrc - npm ci - - # https://github.com/marketplace/actions/pulumi-cli-action - - name: execute pulumi - uses: pulumi/actions@v4 - with: - command: ${{ inputs.command }} - stack-name: ${{ inputs.stack }} - cloud-url: "s3://${{ inputs.s3Bucket }}?region=${{ inputs.region }}&awssdk=v2" - work-dir: ./deployment - config-map: "{ geoadmin-swissgeol-asset:version: {value: ${{ inputs.version }}, secret: false }}" - env: - AWS_ACCESS_KEY_ID: ${{ inputs.awsAccessKeyId }} - AWS_SECRET_ACCESS_KEY: ${{ inputs.awsSecretAccessKey }} - AWS_REGION: ${{ inputs.region }} - PULUMI_CONFIG_PASSPHRASE: ${{ inputs.pulumiConfigPassphrase }} diff --git a/.github/actions/generate-version/action.yaml b/.github/actions/generate-version/action.yaml deleted file mode 100644 index 952f52dc..00000000 --- a/.github/actions/generate-version/action.yaml +++ /dev/null @@ -1,15 +0,0 @@ -name: "Generate Version for Asset" -description: "Generates a new version from git sha" -inputs: - path: - description: "path for version.json" - required: true -runs: - using: "composite" - steps: - - name: generate version.json - shell: bash - run: | - VERSION="{\"tag\": \"generated_by_build\",\"build\": \"${{github.run_number}}\",\"commit\": \"${{github.sha}}\"}" - echo $VERSION > ${{ inputs.path }}/version.json - cat ${{ inputs.path }}/version.json diff --git a/.github/actions/registry-push/action.yaml b/.github/actions/registry-push/action.yaml deleted file mode 100644 index 4ea0ab86..00000000 --- a/.github/actions/registry-push/action.yaml +++ /dev/null @@ -1,26 +0,0 @@ -name: "Container regsistry login & push" -description: "Logins to the registry and pushes the given images" -inputs: - image: - description: "Container image name" - required: true - username: - description: "Username for the registry" - required: true - password: - description: "Password for the registry" - required: true -runs: - using: "composite" - steps: - # https://github.com/marketplace/actions/docker-login - - name: Login to container registry - uses: docker/login-action@v2 - with: - registry: ghcr.io - username: ${{ inputs.username }} - password: ${{ inputs.password }} - - - name: Push container image - shell: bash - run: docker push ${{ inputs.image }} diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml new file mode 100644 index 00000000..8d1d36af --- /dev/null +++ b/.github/workflows/build.yml @@ -0,0 +1,231 @@ +name: build + +on: + push: + branches: + - '**' + workflow_dispatch: + +env: + NODE_VERSION: '20.x' + +jobs: + install: + runs-on: ubuntu-latest + steps: + - name: Checkout repository + uses: actions/checkout@v4 + - name: Setup node + uses: actions/setup-node@v4 + with: + node-version: ${{ env.NODE_VERSION }} + - name: Cache node modules + uses: actions/cache@v4 + with: + path: ./node_modules + key: "${{ runner.os }}-npm-${{ hashFiles('**/package-lock.json') }}" + restore-keys: | + ${{ runner.os }}-npm- + - name: Install node dependencies + run: npm ci + - name: Run postinstall + run: npm run postinstall + - name: Generate prisma types + run: | + cd apps/server-asset-sg/ + npx ng gen-prisma-client + + test: + runs-on: ubuntu-latest + needs: install + env: + DB_USERNAME: postgres-test + DB_PASSWORD: postgres-test + DB_DATABASE: postgres-test + DATABASE_URL: postgres://postgres-test:postgres-test@localhost:5432/postgres-test?schema=public + services: + db: + image: postgis/postgis + ports: + - '5432:5432' + env: + POSTGRES_USER: ${{ env.DB_USERNAME }} + POSTGRES_PASSWORD: ${{ env.DB_PASSWORD }} + POSTGRES_DB: ${{ env.DB_DATABASE }} + options: --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 5 + elasticsearch: + image: docker.elastic.co/elasticsearch/elasticsearch:8.12.1 + ports: + - '9200:9200' + env: + ES_JAVA_OPTS: -Xms512m -Xmx512m + xpack.security.enabled: false + discovery.type: single-node + cluster.routing.allocation.disk.threshold_enabled: false + steps: + - name: Checkout repository + uses: actions/checkout@v4 + - name: Setup node + uses: actions/setup-node@v4 + with: + node-version: ${{ env.NODE_VERSION }} + - name: Restore cached node modules + uses: actions/cache@v4 + with: + path: ./node_modules + key: "${{ runner.os }}-npm-${{ steps.cache-node-modules.outputs.cache-key }}" + - name: Migrate database + run: | + cd apps/server-asset-sg/ + npx prisma migrate deploy --schema src/app/prisma/schema.prisma + - name: Run tests + run: npm run test + + lint: + runs-on: ubuntu-latest + needs: install + steps: + - name: Checkout repository + uses: actions/checkout@v4 + - name: Setup node + uses: actions/setup-node@v4 + with: + node-version: ${{ env.NODE_VERSION }} + - name: Restore cached node modules + uses: actions/cache@v4 + with: + path: ./node_modules + key: "${{ runner.os }}-npm-${{ steps.cache-node-modules.outputs.cache-key }}" + - name: Run lint + run: npm run lint + + # It would be cleaner and probably more performant to replace this build step + # with either a non-emitting build or a simple type check. + # We only have `build` available for now, + # since the project is currently split across a multitude of small packages, + # all of which have to specify their own commands. + # (Daniel von Atzigen, 2024-04-12) + build: + runs-on: ubuntu-latest + needs: + - test + - lint + steps: + - name: Checkout repository + uses: actions/checkout@v4 + - name: Setup node + uses: actions/setup-node@v4 + with: + node-version: ${{ env.NODE_VERSION }} + - name: Restore cached node modules + uses: actions/cache@v4 + with: + path: ./node_modules + key: "${{ runner.os }}-npm-${{ steps.cache-node-modules.outputs.cache-key }}" + - name: Reset nx + run: npx nx reset + - name: Run build + run: npm run build + + build_and_push_app: + name: 'build and push app' + if: github.event_name == 'push' && github.ref == 'refs/heads/develop' + needs: + - build + runs-on: ubuntu-latest + steps: + - name: Checkout repository + uses: actions/checkout@v4 + - name: Create image + uses: ./.github/actions/create-image + with: + IMAGE_NAME: ${{ vars.BASE_IMAGE_NAME }}-app + TAG: edge + DOCKERFILE: ./apps/client-asset-sg/docker/Dockerfile + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + + build_and_push_api: + name: 'build and push api' + if: github.event_name == 'push' && github.ref == 'refs/heads/develop' + needs: + - build + runs-on: ubuntu-latest + steps: + - name: Checkout repository + uses: actions/checkout@v4 + - name: Create image + uses: ./.github/actions/create-image + with: + IMAGE_NAME: ${{ vars.BASE_IMAGE_NAME }}-api + TAG: edge + DOCKERFILE: ./apps/server-asset-sg/docker/Dockerfile + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + + tag_edge_commit: + name: 'tag edge commit' + needs: + - build_and_push_app + - build_and_push_api + runs-on: ubuntu-latest + steps: + - name: Create/update tag + uses: actions/github-script@v7 + with: + script: | + github.rest.git.createRef({ + owner: context.repo.owner, + repo: context.repo.repo, + ref: 'refs/tags/edge', + sha: context.sha + }).catch(err => { + if (err.status !== 422) throw err; + github.rest.git.updateRef({ + owner: context.repo.owner, + repo: context.repo.repo, + ref: 'tags/edge', + sha: context.sha + }); + }) + + tag_rc_image: + name: tag rc image + if: github.event_name == 'push' && github.ref == 'refs/heads/main' + needs: + - build + runs-on: ubuntu-latest + steps: + - name: Login to GitHub Packages + run: echo "${{ secrets.GITHUB_TOKEN }}" | docker login ghcr.io -u ${{ github.repository_owner }} --password-stdin + + - name: Pull docker image + run: docker pull ${{ vars.BASE_IMAGE_NAME }}-app:edge + + - name: Tag docker image + run: docker tag ${{ vars.BASE_IMAGE_NAME }}-app:edge ${{ vars.BASE_IMAGE_NAME }}-app:release-candidate + + - name: Push docker image + run: docker push ${{ vars.BASE_IMAGE_NAME }}-app:release-candidate + + tag_rc_commit: + name: 'tag rc commit' + needs: tag_rc_image + runs-on: ubuntu-latest + steps: + - name: Create/update tag + uses: actions/github-script@v7 + with: + script: | + github.rest.git.createRef({ + owner: context.repo.owner, + repo: context.repo.repo, + ref: 'refs/tags/release-candidate', + sha: context.sha + }).catch(err => { + if (err.status !== 422) throw err; + github.rest.git.updateRef({ + owner: context.repo.owner, + repo: context.repo.repo, + ref: 'tags/release-candidate', + sha: context.sha + }); + }) diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml new file mode 100644 index 00000000..6440b54c --- /dev/null +++ b/.github/workflows/codeql.yml @@ -0,0 +1,38 @@ +name: code-ql + +on: + push: + branches: + - develop + workflow_dispatch: + schedule: + - cron: '35 4 * * 5' + +jobs: + analyze: + name: Analyze + runs-on: ubuntu-latest + permissions: + actions: read + contents: read + security-events: write + + strategy: + fail-fast: false + matrix: + language: [ 'javascript' ] + + steps: + - name: Checkout repository + uses: actions/checkout@v4 + + - name: Initialize CodeQL + uses: github/codeql-action/init@v3 + with: + languages: ${{ matrix.language }} + + - name: Autobuild + uses: github/codeql-action/autobuild@v3 + + - name: Perform CodeQL Analysis + uses: github/codeql-action/analyze@v3 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml new file mode 100644 index 00000000..1667602b --- /dev/null +++ b/.github/workflows/release.yml @@ -0,0 +1,115 @@ +name: release + +on: + workflow_dispatch: + inputs: + version: + description: "Version number (e.g. 1.12)" + required: true +jobs: + release_app: + name: release app + needs: + - read_version + runs-on: ubuntu-latest + steps: + - name: Login to GitHub Packages + run: echo "${{ secrets.GITHUB_TOKEN }}" | docker login ghcr.io -u ${{ github.repository_owner }} --password-stdin + + - name: Pull docker image + run: docker pull ${{ vars.BASE_IMAGE_NAME }}-app:release-candidate + + - name: Tag docker image + run: | + docker tag ${{ vars.BASE_IMAGE_NAME }}-app:release-candidate ${{ vars.BASE_IMAGE_NAME }}-app:${{ inputs.VERSION }} + docker tag ${{ vars.BASE_IMAGE_NAME }}-app:release-candidate ${{ vars.BASE_IMAGE_NAME }}-app:latest + + - name: Push docker image + run: | + docker push ${{ vars.BASE_IMAGE_NAME }}-app:${{ inputs.VERSION }} + docker push ${{ vars.BASE_IMAGE_NAME }}-app:latest + + release_api: + name: release api + needs: + - read_version + runs-on: ubuntu-latest + steps: + - name: Login to GitHub Packages + run: echo "${{ secrets.GITHUB_TOKEN }}" | docker login ghcr.io -u ${{ github.repository_owner }} --password-stdin + + - name: Pull docker image + run: docker pull ${{ vars.BASE_IMAGE_NAME }}-api:release-candidate + + - name: Tag docker image + run: | + docker tag ${{ vars.BASE_IMAGE_NAME }}-api:release-candidate ${{ vars.BASE_IMAGE_NAME }}-api:${{ inputs.VERSION }} + docker tag ${{ vars.BASE_IMAGE_NAME }}-api:release-candidate ${{ vars.BASE_IMAGE_NAME }}-api:latest + + - name: Push docker image + run: | + docker push ${{ vars.BASE_IMAGE_NAME }}-api:${{ inputs.VERSION }} + docker push ${{ vars.BASE_IMAGE_NAME }}-api:latest + + + tag_commit: + name: 'tag commit' + needs: + - release_app + - release_api + runs-on: ubuntu-latest + steps: + - name: Create/update latest tag + uses: actions/github-script@v7 + with: + script: | + github.rest.git.createRef({ + owner: context.repo.owner, + repo: context.repo.repo, + ref: 'refs/tags/latest', + sha: context.sha + }).catch(err => { + if (err.status !== 422) throw err; + github.rest.git.updateRef({ + owner: context.repo.owner, + repo: context.repo.repo, + ref: 'tags/latest', + sha: context.sha + }); + }) + + - name: Create/update version tag + uses: actions/github-script@v7 + with: + script: | + github.rest.git.createRef({ + owner: context.repo.owner, + repo: context.repo.repo, + ref: 'refs/tags/${{ inputs.VERSION }}', + sha: context.sha + }).catch(err => { + if (err.status !== 422) throw err; + github.rest.git.updateRef({ + owner: context.repo.owner, + repo: context.repo.repo, + ref: 'tags/${{ inputs.VERSION }}', + sha: context.sha + }); + }) + + create_release: + name: 'create release' + needs: + - release_app + - release_api + runs-on: ubuntu-latest + steps: + - name: Checkout repository + uses: actions/checkout@v4 + - name: Create release + uses: softprops/action-gh-release@v2 + with: + tag_name: '${{ inputs.VERSION }}' + name: 'swissgeol-assets v${{ inputs.VERSION }}' + generate_release_notes: true + make_latest: true diff --git a/.github/workflows/swissgeol-dev.yml b/.github/workflows/swissgeol-dev.yml deleted file mode 100644 index 6133b3b0..00000000 --- a/.github/workflows/swissgeol-dev.yml +++ /dev/null @@ -1,67 +0,0 @@ -name: Swissgeol Asset Dev Deploy - -on: - push: - branches: ["main"] - workflow_dispatch: -env: - APP_IMAGE: ghcr.io/geoadmin/swissgeol-asset-app:dev - API_IMAGE: ghcr.io/geoadmin/swissgeol-asset-api:dev - -jobs: - # ------------------ - build-web-app: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v3 - - uses: actions/setup-node@v3 - with: - node-version: 18 - - - name: generate version.json - id: generate-version - uses: ./.github/actions/generate-version - with: - path: ./apps/client-asset-sg/src/assets - - - name: Build app Docker image - run: docker build . -f ./apps/client-asset-sg/docker/Dockerfile -t ${{ env.APP_IMAGE }} - - - name: Push container image - id: registry-push - uses: ./.github/actions/registry-push - with: - image: ${{ env.APP_IMAGE }} - username: ${{ vars.SWISSGEOL_BUILD_USERNAME }} - password: ${{ secrets.SWISSGEOL_BUILD_PAT }} - - # ------------------ - build-web-api: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v3 - - uses: actions/setup-node@v3 - with: - node-version: 18 - - - name: generate version.json - id: generate-version - uses: ./.github/actions/generate-version - with: - path: ./apps/server-asset-sg/src/assets - - - name: Run NPM build - run: | - npm ci - npm run build -- server-asset-sg - - name: Retag Image - working-directory: ./apps/server-asset-sg/docker - run: docker tag registry.lambda-it.ch/asset-swissgeol/api:latest ${{ env.API_IMAGE }} - - - name: Push container image - id: registry-push - uses: ./.github/actions/registry-push - with: - image: ${{ env.API_IMAGE }} - username: ${{ vars.SWISSGEOL_BUILD_USERNAME }} - password: ${{ secrets.SWISSGEOL_BUILD_PAT }} diff --git a/.github/workflows/swissgeol-int.yml b/.github/workflows/swissgeol-int.yml deleted file mode 100644 index 4294496b..00000000 --- a/.github/workflows/swissgeol-int.yml +++ /dev/null @@ -1,100 +0,0 @@ -name: Swissgeol Asset Int Deploy - -on: - release: - types: [published] - workflow_dispatch: - inputs: - tag: - description: "Container Tag" -env: - APP_IMAGE: ghcr.io/geoadmin/swissgeol-asset-app:${{ github.event.inputs.tag || github.event.release.tag_name }} - API_IMAGE: ghcr.io/geoadmin/swissgeol-asset-api:${{ github.event.inputs.tag || github.event.release.tag_name }} - -jobs: - # ------------------ - build-web-app: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v3 - with: - ref: ${{ github.event.release.tag_name }} - - uses: actions/setup-node@v3 - with: - node-version: 18 - - - name: generate version.json - id: generate-version - uses: ./.github/actions/generate-version - with: - path: ./apps/client-asset-sg/src/assets - - - name: Build app Docker image - run: docker build . -f ./apps/client-asset-sg/docker/Dockerfile -t ${{ env.APP_IMAGE }} - - - name: Push container image - id: registry-push - uses: ./.github/actions/registry-push - with: - image: ${{ env.APP_IMAGE }} - username: ${{ vars.SWISSGEOL_BUILD_USERNAME }} - password: ${{ secrets.SWISSGEOL_BUILD_PAT }} - - # ------------------ - build-web-api: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v3 - with: - ref: ${{ github.event.release.tag_name }} - - uses: actions/setup-node@v3 - with: - node-version: 18 - - - name: generate version.json - id: generate-version - uses: ./.github/actions/generate-version - with: - path: ./apps/client-asset-sg/src/assets - - - name: Run NPM build - run: | - npm ci - npm run build -- server-asset-sg - - name: Retag Image - working-directory: ./apps/server-asset-sg/docker - run: docker tag registry.lambda-it.ch/asset-swissgeol/api:latest ${{ env.API_IMAGE }} - - - name: Push container image - id: registry-push - uses: ./.github/actions/registry-push - with: - image: ${{ env.API_IMAGE }} - username: ${{ vars.SWISSGEOL_BUILD_USERNAME }} - password: ${{ secrets.SWISSGEOL_BUILD_PAT }} - - # ------------------ - deployment: - runs-on: ubuntu-latest - needs: [build-web-app, build-web-api] - steps: - - uses: actions/checkout@v3 - with: - ref: ${{ github.event.release.tag_name }} - - uses: actions/setup-node@v3 - with: - node-version: 18 - - - name: Pulumi deployment to cluster - uses: ./.github/actions/deploy - with: - pulumiConfigSecret: ${{ secrets.PULUMI_CONFIG_PASSPHRASE }} - awsAccessKeyId: ${{ secrets.AWS_ACCESS_KEY_ID }} - awsSecretAccessKey: ${{ secrets.AWS_SECRET_ACCESS_KEY }} - eksClusterName: int - eksRoleArn: arn:aws:iam::779726271945:role/kubernetes-admins-int - pulumiConfigPassphrase: ${{ secrets.PULUMI_CONFIG_PASSPHRASE }} - stack: swissgeol-asset-int - npmPkgToken: ${{ secrets.SWISSGEOL_BUILD_PAT }} - command: up - version: ${{ github.event.release.tag_name }} diff --git a/.github/workflows/swissgeol-prod.yml b/.github/workflows/swissgeol-prod.yml deleted file mode 100644 index 4528d5fc..00000000 --- a/.github/workflows/swissgeol-prod.yml +++ /dev/null @@ -1,100 +0,0 @@ -name: Swissgeol Asset Prod Deploy - -on: - release: - types: [published] - workflow_dispatch: - inputs: - tag: - description: "Container Tag" -env: - APP_IMAGE: ghcr.io/geoadmin/swissgeol-asset-app:${{ github.event.inputs.tag || github.event.release.tag_name }} - API_IMAGE: ghcr.io/geoadmin/swissgeol-asset-api:${{ github.event.inputs.tag || github.event.release.tag_name }} - -jobs: - # ------------------ - build-web-app: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v3 - with: - ref: ${{ github.event.release.tag_name }} - - uses: actions/setup-node@v3 - with: - node-version: 18 - - - name: generate version.json - id: generate-version - uses: ./.github/actions/generate-version - with: - path: ./apps/client-asset-sg/src/assets - - - name: Build app Docker image - run: docker build . -f ./apps/client-asset-sg/docker/Dockerfile -t ${{ env.APP_IMAGE }} - - - name: Push container image - id: registry-push - uses: ./.github/actions/registry-push - with: - image: ${{ env.APP_IMAGE }} - username: ${{ vars.SWISSGEOL_BUILD_USERNAME }} - password: ${{ secrets.SWISSGEOL_BUILD_PAT }} - - # ------------------ - build-web-api: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v3 - with: - ref: ${{ github.event.release.tag_name }} - - uses: actions/setup-node@v3 - with: - node-version: 18 - - - name: generate version.json - id: generate-version - uses: ./.github/actions/generate-version - with: - path: ./apps/client-asset-sg/src/assets - - - name: Run NPM build - run: | - npm ci - npm run build -- server-asset-sg - - name: Retag Image - working-directory: ./apps/server-asset-sg/docker - run: docker tag registry.lambda-it.ch/asset-swissgeol/api:latest ${{ env.API_IMAGE }} - - - name: Push container image - id: registry-push - uses: ./.github/actions/registry-push - with: - image: ${{ env.API_IMAGE }} - username: ${{ vars.SWISSGEOL_BUILD_USERNAME }} - password: ${{ secrets.SWISSGEOL_BUILD_PAT }} - - # ------------------ - deployment: - runs-on: ubuntu-latest - needs: [build-web-app, build-web-api] - steps: - - uses: actions/checkout@v3 - with: - ref: ${{ github.event.release.tag_name }} - - uses: actions/setup-node@v3 - with: - node-version: 18 - - - name: Pulumi deployment to cluster - uses: ./.github/actions/deploy - with: - pulumiConfigSecret: ${{ secrets.PULUMI_CONFIG_PASSPHRASE }} - awsAccessKeyId: ${{ secrets.AWS_ACCESS_KEY_ID }} - awsSecretAccessKey: ${{ secrets.AWS_SECRET_ACCESS_KEY }} - eksClusterName: prod - eksRoleArn: arn:aws:iam::779726271945:role/kubernetes-admins-prod - pulumiConfigPassphrase: ${{ secrets.PULUMI_CONFIG_PASSPHRASE }} - stack: swissgeol-asset-prod - npmPkgToken: ${{ secrets.SWISSGEOL_BUILD_PAT }} - command: up - version: ${{ github.event.release.tag_name }} diff --git a/.gitignore b/.gitignore index c04fa8be..1c03120f 100644 --- a/.gitignore +++ b/.gitignore @@ -49,6 +49,7 @@ Thumbs.db __pycache__ +.env.local .env.staging .env.prod diff --git a/.vscode/settings.json b/.vscode/settings.json index 34d8f2e1..db0ada5d 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,7 +1,7 @@ { "editor.codeActionsOnSave": { - "source.organizeImports": false, - "source.fixAll.eslint": true + "source.organizeImports": "never", + "source.fixAll.eslint": "explicit" }, "peacock.color": "#0b7285", "peacock.remoteColor": "#000", diff --git a/README.md b/README.md index 7582a80f..17303b39 100644 --- a/README.md +++ b/README.md @@ -1,10 +1,185 @@ -# asset-swissgeol-ch +# SwissGeol Asset -More docs for asset-swissgeol-ch: https://github.com/Lambda-IT/asset-swissgeol-ch/wiki +## Development +The following components must be installed on the development computer: -## Instances +✔️ Git +✔️ Docker +✔️ Node.js 20 LTS -- assets.swissgeol.ch - - assets.swissgeol.ch/kibana -- int-assets.swissgeol.ch - - int-assets.swissgeol.ch/kibana +### Setting Up the Development Environment +Follow these steps to set up the development environment on your local machine: +* [1. Configure Local Systems](#1-Configure-Local-Systems) +* [2. Configure the Asset Server](#2-Configure-the-Asset-Server) +* [3. Install Dependencies](#3-Install-Dependencies) +* [4. Build Local Systems](#4-Build-Local-Systems) +* [5. Initialize MinIO](#5-Initialize-MinIO) + +#### 1. Configure Local Systems +Configure `development/.env` according to the [development services configuration](#Development-Services-Configuration). + +#### 2. Configure the Asset Server +Create an empty copy of the [web server configuration](#Asset-Server-Configuration) as [`apps/server-asset-sg/.env.local`](apps/server-asset-sg/.env.local). +Configure the following variables: +* Set `AUTH_URL=http://localhost:8866`. +* Set `FRONTEND_URL=http://localhost:4200`. +* Set `DATABASE_URL=postgres://asset-swissgeol:asset-swissgeol@localhost:5432/postgres?schema=public`. +* Set `GOTRUE_JWT_SECRET` to the same value as in [`development/.env`](development/.env). +* Leave `OCR_URL` empty. +* Leave `OCR_CALLBACK_URL` empty. + +#### 3. Install Dependencies +Install node modules: +```bash +npm run install +``` + +Decorate the Angular CLI with the Nx CLI: +```bash +npm run postinstall +``` + +#### 4. Build Local Services +Generate prisma-client for database-access: +```bash +cd apps/server-asset-sg/ +ng gen-prisma-client +``` + +Build postgis-gotrue docker image: +```bash +cd development/images/db +docker build -t postgis-gotrue . +``` + +#### 5. Initialize MinIO +* [Start the development services](#Starting-the-Development-Environment). +* Open http://localhost:9001 +* Sign in using the `STORAGE_USER` and `STORAGE_PASSWORD` of your development environment. +* Navigate to [Buckets](http://localhost:9001/buckets) and create a new bucket with the name `asset-sg`. +* Navigate to [the new bucket's browser](http://localhost:9001/browser/asset-sg) and create an empty folder with the name `asset-sg`. +* Navigate to [Configuration](http://localhost:9001/settings/configurations/region) and change the server region to `local`. +* Navigate to [Access Keys](http://localhost:9001/access-keys) and create a new access key. +* Open your Asset Server Configuration at [`apps/server-asset-sg/.env.local`](apps/server-asset-sg/.env.local) and make the following changes: + * `S3_REGION=local` + * `S3_ENDPOINT=http://localhost:9000` + * `S3_BUCKET_NAME=asset-sg` + * `S3_ASSET_FOLDER=asset-sg` + * `S3_ACCESS_KEY_ID` as your newly generated access key. + * `S3_SECRET_ACCESS_KEY` as your newly generated access key's secret. + +### Starting the Development Environment +Start development services: +```bash +cd development +docker compose up +``` +Start the application: +```bash +npm run start +``` + +### Local Services and Applications +| 🔖App/Service | 🔗Link | 🧞User | 🔐Password | +|:-------------------------|:-------------------------------------------------|:-------------------------|:-------------------------| +| Assets (client) | [localhost:4200](http://localhost:4200/) | `admin@swissgeol.assets` | `swissgeol_assets` | +| Assets REST API (server) | [localhost:3333/api/](http://localhost:3333/api) | n/a | n/a | +| postgreSQL (docker) | localhost:5432 | .env `$DB_USER` | .env `$DB_PASSWORD` | +| Elasticsearch (docker) | [localhost:9200](http://localhost:9200) | n/a | n/a | +| Kibana (docker) | [localhost:5601](http://localhost:5601) | n/a | n/a | +| pgAdmin (docker) | [localhost:5051](http://localhost:5051/) | .env `$PGADMIN_EMAIL` | .env `$PGADMIN_PASSWORD` | +| MinIO (docker) | [localhost:9001](http://localhost:9001/) | .env `$STORAGE_USER` | .env `$STORAGE_PASSWORD` | +| smtp4dev (docker) | [localhost:5000](http://localhost:5000/) | n/a | n/a | +| oidc-server (docker) | [localhost:4011](http://localhost:4011/) | n/a | n/a | + +### Importing Example Data +You can dump data from a remote environment into a local file so you can initialize your development database with it. +To do so, use the following commands. +Be aware that you need to manually insert the `{DB_*}` values beforehand. +```bash +cd development +docker compose exec db sh -c 'pg_dump --dbname=postgresql://{DB_USERNAME}:{DB_PASSWORD}@{DB_HOST}:5432/{DB_DATABASE} --data-only --exclude-table asset_user -n public > /dump.sql' +``` +> The export will output warnings related to circular foreign-key constraints. +> These can be safely ignored. + +> The export will only contain the database's data, not its structure. +> Data related to the authentication process is also excluded, +> so we don't run into conflicts when using a different eIAM provider. + +To import the dumped data, run the following commands. +Ensure to start your database service beforehand. +```bash +# Reset the database: +npm run prisma -- migrate reset -f +npm run prisma -- migrate deploy + +# Import example data: +cd development +docker compose exec db sh -c 'psql --dbname=postgresql://${POSTGRES_USER}:${POSTGRES_PASSWORD}@localhost:5432/${POSTGRES_DB} -f /dump.sql' +``` +> You will need to manually sync the data to Elasticsearch via the admin panel in the web UI. + +## Testing +> Tests execute automatically on every push to the Git repository. + +The local tests require a running instance of both _postgreSQL_ and _Elasticsearch_. +Make sure that your local development environment is fully shutdown and then run the test services: +```bash +cd development +docker compose down +docker compose -f docker-compose.test.yml up +``` +Then run all tests: +```bash +npm run test +``` +It is also possible to run only specific tests: +```bash +# Run only the server tests: +nx run server-asset-sg:test + +# Run only a specific test suite: +nx run server-asset-sg:test -t 'AssetRepo' + +# Run only a specific, nested test suite: +nx run server-asset-sg:test -t 'AssetRepo create' +``` + +## Configuration +### Asset Server Configuration +The file `apps/server-asset-sg/.env.local` configures secrets for the SwissGeol Asset server. +An empty template for the file can be found in [`apps/server-asset-sg/.env.template`](apps/server-asset-sg/.env.template). + +| Variable | Example | Description | +|----------------------|--------------------------------------------------------------------------------------------|------------------------------------------------------------| +| AUTH_URL | http://my.gotrue.example:8866 | URL of the GoTrue auth service. | +| FRONTEND_URL | http://assets.geo.admin.ch | Public URL of the SwissGeol Asset web client. | +| S3_REGION | euw-3 | Region of the S3 instance. | +| S3_ENDPOINT | http://compute-1.amazonaws.com | URL to the S3 instance. | +| S3_ACCESS_KEY_ID | AP6wpeXraSc0IH4d42IN | Access Key for the S3 instance. | +| S3_SECRET_ACCESS_KEY | fSx5Bfib0OeAyG1mwtslKA04Qj6oPStLcpnkACmF | Secret Key for the S3 instance. | +| S3_BUCKET_NAME | asset-sg | S3 bucket name. | +| S3_ASSET_FOLDER | asset-sg | Folder within the S3 bucket into which objects are stored. | +| DATABASE_URL | postgres://asset-swissgeol:asset-swissgeol@my.postgres.example:5432/postgres?schema=public | PostgreSQL access URL. | +| GOTRUE_JWT_SECRET | 18af41574b30be7539d8c3e45ccdeea9431cff6419cdce5cabc5f28cfb73e15c | JWT secret key for the GoTrue server. | +| OCR_URL | | Leave empty. | +| OCR_CALLBACK_URL | | Leave empty. | + + +### Development Services Configuration +The file `development/.env` configures secrets for the services used in local development. +An empty template for the file can be found in [`development/.env.template`](development/.env.template). + +> Make sure that your passwords have a minimal length of 8 and contain at combination of +> upper, lower and special characters. Some of the passwords will be checked for validity during startup. + +| Variable | Wert | Beschreibung | +|-------------------|----------|------------------------------------------| +| STORAGE_USER | _custom_ | Username for the MinIO container. | +| STORAGE_PASSWORD | _custom_ | Password for the MinIO container. | +| DB_USER | postgres | Username for the PostgreSQL container. | +| DB_PASSWORD | _custom_ | Password for the PostgreSQL container. | +| PGADMIN_EMAIL | _custom_ | Email for the PgAdmin container. | +| PGADMIN_PASSWORD | _custom_ | Password for the PgAdmin container. | +| GOTRUE_JWT_SECRET | _custom_ | JWT Secret Key for the GoTrue container. | diff --git a/apps/client-asset-sg-e2e/cypress.config.ts b/apps/client-asset-sg-e2e/cypress.config.ts index ec4ed885..39337d99 100644 --- a/apps/client-asset-sg-e2e/cypress.config.ts +++ b/apps/client-asset-sg-e2e/cypress.config.ts @@ -1,5 +1,5 @@ -import { defineConfig } from 'cypress'; import { nxE2EPreset } from '@nrwl/cypress/plugins/cypress-preset'; +import { defineConfig } from 'cypress'; export default defineConfig({ e2e: nxE2EPreset(__dirname), diff --git a/apps/client-asset-sg-e2e/src/support/commands.ts b/apps/client-asset-sg-e2e/src/support/commands.ts index 4200179b..384d6715 100644 --- a/apps/client-asset-sg-e2e/src/support/commands.ts +++ b/apps/client-asset-sg-e2e/src/support/commands.ts @@ -18,7 +18,7 @@ declare namespace Cypress { // // -- This is a parent command -- Cypress.Commands.add('login', (email, password) => { - console.log('Custom command example: Login', email, password); + console.log('Custom command example: Login'); }); // // -- This is a child command -- diff --git a/apps/client-asset-sg/docker/Dockerfile b/apps/client-asset-sg/docker/Dockerfile index ae87bd02..5842e09c 100644 --- a/apps/client-asset-sg/docker/Dockerfile +++ b/apps/client-asset-sg/docker/Dockerfile @@ -1,4 +1,4 @@ -FROM node:16-alpine as ui-builder +FROM node:20-alpine as app-builder WORKDIR /app COPY . . @@ -11,10 +11,9 @@ RUN npx nx build client-asset-sg # final image build FROM nginx:mainline-alpine -LABEL maintainer=support@lambda-it.ch WORKDIR /usr/share/nginx/html -COPY --from=ui-builder /app/dist/apps/client-asset-sg . +COPY --from=app-builder /app/dist/apps/client-asset-sg . # this nginx base image will parse the template and will move it to # /etc/nginx/conf.d/default.conf before it starts nginx process diff --git a/apps/client-asset-sg/project.json b/apps/client-asset-sg/project.json index dceecf5a..b99fba3a 100644 --- a/apps/client-asset-sg/project.json +++ b/apps/client-asset-sg/project.json @@ -1,93 +1,120 @@ { - "name": "client-asset-sg", - "$schema": "../../node_modules/nx/schemas/project-schema.json", - "projectType": "application", - "sourceRoot": "apps/client-asset-sg/src", - "prefix": "asset-sg", - "targets": { - "build": { - "executor": "@angular-devkit/build-angular:browser", - "outputs": ["{options.outputPath}"], - "options": { - "outputPath": "dist/apps/client-asset-sg", - "index": "apps/client-asset-sg/src/index.html", - "main": "apps/client-asset-sg/src/main.ts", - "polyfills": ["zone.js"], - "tsConfig": "apps/client-asset-sg/tsconfig.app.json", - "inlineStyleLanguage": "scss", - "assets": ["apps/client-asset-sg/src/favicon.ico", "apps/client-asset-sg/src/assets"], - "styles": ["apps/client-asset-sg/src/styles.scss"], - "scripts": [] + "name": "client-asset-sg", + "$schema": "../../node_modules/nx/schemas/project-schema.json", + "projectType": "application", + "sourceRoot": "apps/client-asset-sg/src", + "prefix": "asset-sg", + "targets": { + "build": { + "executor": "@angular-devkit/build-angular:browser", + "outputs": [ + "{options.outputPath}" + ], + "options": { + "outputPath": "dist/apps/client-asset-sg", + "index": "apps/client-asset-sg/src/index.html", + "main": "apps/client-asset-sg/src/main.ts", + "polyfills": [ + "zone.js" + ], + "tsConfig": "apps/client-asset-sg/tsconfig.app.json", + "inlineStyleLanguage": "scss", + "assets": [ + "apps/client-asset-sg/src/favicon.ico", + "apps/client-asset-sg/src/assets" + ], + "styles": [ + "apps/client-asset-sg/src/styles.scss" + ], + "scripts": [] + }, + "configurations": { + "production": { + "budgets": [ + { + "type": "initial", + "maximumWarning": "1.2mb", + "maximumError": "1.3mb" }, - "configurations": { - "production": { - "budgets": [ - { - "type": "initial", - "maximumWarning": "1.2mb", - "maximumError": "1.3mb" - }, - { - "type": "anyComponentStyle", - "maximumWarning": "2kb", - "maximumError": "4kb" - } - ], - "outputHashing": "all", - "fileReplacements": [ - { - "replace": "apps/client-asset-sg/src/environments/environment.ts", - "with": "apps/client-asset-sg/src/environments/environment.prod.ts" - } - ] - }, - "development": { - "buildOptimizer": false, - "optimization": false, - "vendorChunk": true, - "extractLicenses": false, - "sourceMap": true, - "namedChunks": true - } - }, - "defaultConfiguration": "production" - }, - "serve": { - "executor": "@angular-devkit/build-angular:dev-server", - "configurations": { - "production": { - "browserTarget": "client-asset-sg:build:production" - }, - "development": { - "browserTarget": "client-asset-sg:build:development" - } - }, - "defaultConfiguration": "development", - "options": { - "proxyConfig": "apps/client-asset-sg/proxy.conf.json" + { + "type": "anyComponentStyle", + "maximumWarning": "2kb", + "maximumError": "4kb" } - }, - "extract-i18n": { - "executor": "@angular-devkit/build-angular:extract-i18n", - "options": { - "browserTarget": "client-asset-sg:build" + ], + "outputHashing": "all", + "fileReplacements": [ + { + "replace": "apps/client-asset-sg/src/environments/environment.ts", + "with": "apps/client-asset-sg/src/environments/environment.prod.ts" } + ] }, - "lint": { - "executor": "@nrwl/linter:eslint", - "outputs": ["{options.outputFile}"], - "options": { - "lintFilePatterns": ["apps/client-asset-sg/**/*.ts", "apps/client-asset-sg/**/*.html"] + "int": { + "fileReplacements": [ + { + "replace": "apps/client-asset-sg/src/environments/environment.ts", + "with": "apps/client-asset-sg/src/environments/environment.int.ts" } + ] }, - "test": { - "executor": "@nrwl/jest:jest", - "outputs": ["{workspaceRoot}/coverage/{projectRoot}"], - "options": { - "jestConfig": "apps/client-asset-sg/jest.config.ts", - "passWithNoTests": true - } + "development": { + "buildOptimizer": false, + "optimization": false, + "vendorChunk": true, + "extractLicenses": false, + "sourceMap": true, + "namedChunks": true } + }, + "defaultConfiguration": "production" + }, + "serve": { + "executor": "@angular-devkit/build-angular:dev-server", + "configurations": { + "production": { + "browserTarget": "client-asset-sg:build:production" + }, + "int": { + "browserTarget": "client-asset-sg:build:int" + }, + "development": { + "browserTarget": "client-asset-sg:build:development" + } + }, + "defaultConfiguration": "development", + "options": { + "proxyConfig": "apps/client-asset-sg/proxy.conf.json" + } + }, + "extract-i18n": { + "executor": "@angular-devkit/build-angular:extract-i18n", + "options": { + "browserTarget": "client-asset-sg:build" + } + }, + "lint": { + "executor": "@nrwl/linter:eslint", + "outputs": [ + "{options.outputFile}" + ], + "options": { + "lintFilePatterns": [ + "apps/client-asset-sg/**/*.ts", + "apps/client-asset-sg/**/*.html" + ] + } }, - "tags": [] + "test": { + "executor": "@nrwl/jest:jest", + "outputs": [ + "{workspaceRoot}/coverage/{projectRoot}" + ], + "options": { + "jestConfig": "apps/client-asset-sg/jest.config.ts", + "passWithNoTests": true + } + } + }, + "tags": [] } diff --git a/apps/client-asset-sg/src/app/app.component.html b/apps/client-asset-sg/src/app/app.component.html index 51447d42..52c102ab 100644 --- a/apps/client-asset-sg/src/app/app.component.html +++ b/apps/client-asset-sg/src/app/app.component.html @@ -1,10 +1,10 @@ - + - +
- +
-
- +
+
diff --git a/apps/client-asset-sg/src/app/app.component.spec.ts b/apps/client-asset-sg/src/app/app.component.spec.ts deleted file mode 100644 index 5c44f3d5..00000000 --- a/apps/client-asset-sg/src/app/app.component.spec.ts +++ /dev/null @@ -1,31 +0,0 @@ -import { TestBed } from '@angular/core/testing'; - -import { AppComponent } from './app.component'; -import { NxWelcomeComponent } from './nx-welcome.component'; - -describe('AppComponent', () => { - beforeEach(async () => { - await TestBed.configureTestingModule({ - declarations: [AppComponent, NxWelcomeComponent], - }).compileComponents(); - }); - - it('should create the app', () => { - const fixture = TestBed.createComponent(AppComponent); - const app = fixture.componentInstance; - expect(app).toBeTruthy(); - }); - - it(`should have as title 'client-asset-sg'`, () => { - const fixture = TestBed.createComponent(AppComponent); - const app = fixture.componentInstance; - expect(app.title).toEqual('client-asset-sg'); - }); - - it('should render title', () => { - const fixture = TestBed.createComponent(AppComponent); - fixture.detectChanges(); - const compiled = fixture.nativeElement as HTMLElement; - expect(compiled.querySelector('h1')?.textContent).toContain('Welcome client-asset-sg'); - }); -}); diff --git a/apps/client-asset-sg/src/app/app.component.ts b/apps/client-asset-sg/src/app/app.component.ts index 7ec1d29a..f6cd7e3a 100644 --- a/apps/client-asset-sg/src/app/app.component.ts +++ b/apps/client-asset-sg/src/app/app.component.ts @@ -1,43 +1,69 @@ +import { HttpClient } from '@angular/common/http'; import { Component, inject } from '@angular/core'; +import { Router } from '@angular/router'; import { UntilDestroy, untilDestroyed } from '@ngneat/until-destroy'; +import { Store } from '@ngrx/store'; import { WINDOW } from 'ngx-window-token'; -import { debounceTime, fromEvent, startWith } from 'rxjs'; +import { debounceTime, fromEvent, map, startWith } from 'rxjs'; import { assert } from 'tsafe'; -import { AppPortalService, setCssCustomProperties } from '@asset-sg/client-shared'; -import { FavouriteService } from '@asset-sg/favourite'; +import { AuthService } from '@asset-sg/auth'; +import { AppPortalService, appSharedStateActions, setCssCustomProperties } from '@asset-sg/client-shared'; + +import { AppState } from './state/app-state'; const fullHdWidth = 1920; @UntilDestroy() @Component({ - selector: 'asset-sg-root', - templateUrl: './app.component.html', - styleUrls: ['./app.component.scss'], + selector: 'asset-sg-root', + templateUrl: './app.component.html', + styleUrls: ['./app.component.scss'], }) export class AppComponent { - private _wndw = inject(WINDOW); - - public appPortalService = inject(AppPortalService); - private _favouriteService = inject(FavouriteService); - - constructor() { - const wndw = this._wndw; - assert(wndw != null); - - fromEvent(wndw, 'resize') - .pipe(debounceTime(50), startWith(null), untilDestroyed(this)) - .subscribe(() => { - let fontSize = '1rem'; - const width = window.innerWidth; - if (width >= fullHdWidth) { - fontSize = '1rem'; - } else if (width >= 0.8 * fullHdWidth) { - fontSize = `${width / fullHdWidth}rem`; - } else { - fontSize = '0.8rem'; - } - setCssCustomProperties(wndw.document.documentElement, ['font-size', fontSize]); - }); - } + private _wndw = inject(WINDOW); + private _httpClient = inject(HttpClient); + public appPortalService = inject(AppPortalService); + private store = inject(Store); + public readonly router: Router = inject(Router); + + constructor(private readonly _authService: AuthService) { + this._httpClient + .get('api/oauth-config/config') + .pipe( + map((response: any) => { + return response; + }), + ) + .subscribe(async oAuthConfig => { + await this._authService.configureOAuth( + oAuthConfig.oauth_issuer, + oAuthConfig.oauth_clientId, + oAuthConfig.oauth_scope, + oAuthConfig.oauth_showDebugInformation, + oAuthConfig.oauth_tokenEndpoint, + ); + + this.store.dispatch(appSharedStateActions.loadUserProfile()); + this.store.dispatch(appSharedStateActions.loadReferenceData()); + }); + + const wndw = this._wndw; + assert(wndw != null); + + fromEvent(wndw, 'resize') + .pipe(debounceTime(50), startWith(null), untilDestroyed(this)) + .subscribe(() => { + let fontSize; + const width = window.innerWidth; + if (width >= fullHdWidth) { + fontSize = '1rem'; + } else if (width >= 0.8 * fullHdWidth) { + fontSize = `${width / fullHdWidth}rem`; + } else { + fontSize = '0.8rem'; + } + setCssCustomProperties(wndw.document.documentElement, ['font-size', fontSize]); + }); + } } diff --git a/apps/client-asset-sg/src/app/app.module.ts b/apps/client-asset-sg/src/app/app.module.ts index 2cfdf690..abfd15f4 100644 --- a/apps/client-asset-sg/src/app/app.module.ts +++ b/apps/client-asset-sg/src/app/app.module.ts @@ -19,14 +19,14 @@ import { PushModule } from '@rx-angular/template/push'; import * as O from 'fp-ts/Option'; import * as C from 'io-ts/Codec'; -import { AuthInterceptor } from '@asset-sg/auth'; +import { AuthInterceptor, AuthModule } from '@asset-sg/auth'; import { - AnchorComponent, - ButtonComponent, - CURRENT_LANG, - TranslateTsLoader, - currentLangFactory, - icons, + AnchorComponent, + ButtonComponent, + CURRENT_LANG, + TranslateTsLoader, + currentLangFactory, + icons, } from '@asset-sg/client-shared'; import { storeLogger } from '@asset-sg/core'; @@ -36,6 +36,7 @@ import { adminGuard, editorGuard } from './app-guards'; import { assetsPageMatcher } from './app-matchers'; import { AppComponent } from './app.component'; import { AppBarComponent, MenuBarComponent, NotFoundComponent, RedirectToLangComponent } from './components'; +import { ErrorComponent } from './components/error/error.component'; import { appTranslations } from './i18n'; import { AppSharedStateEffects } from './state'; import { appSharedStateReducer } from './state/app-shared.reducer'; @@ -43,89 +44,104 @@ import { appSharedStateReducer } from './state/app-shared.reducer'; registerLocaleData(locale_deCH, 'de-CH'); @NgModule({ - declarations: [AppComponent, RedirectToLangComponent, NotFoundComponent, AppBarComponent, MenuBarComponent], - imports: [ - BrowserModule, - BrowserAnimationsModule, - HttpClientModule, - RouterModule.forRoot([ - { - path: ':lang/a', - loadChildren: () => import('@asset-sg/auth').then(m => m.AuthModule), - }, - { - path: ':lang/profile', - loadChildren: () => import('@asset-sg/profile').then(m => m.ProfileModule), - }, - { - path: ':lang/admin', - loadChildren: () => import('@asset-sg/admin').then(m => m.AdminModule), - canActivate: [adminGuard], - }, - { - path: ':lang/asset-admin', - loadChildren: () => import('@asset-sg/asset-editor').then(m => m.AssetEditorModule), - canActivate: [editorGuard], - }, - { - matcher: assetsPageMatcher, - loadChildren: () => import('@asset-sg/asset-viewer').then(m => m.AssetViewerModule), - }, - { - path: 'not-found', - component: NotFoundComponent, - }, - { - path: '**', - component: RedirectToLangComponent, - }, - ]), - TranslateModule.forRoot({ - loader: { provide: TranslateLoader, useFactory: () => new TranslateTsLoader(appTranslations) }, - }), - StoreRouterConnectingModule.forRoot({ serializer: FullRouterStateSerializer, stateKey: 'router' }), - StoreModule.forRoot( - { router: routerReducer, shared: appSharedStateReducer }, - { - metaReducers: environment.ngrxStoreLoggerEnabled ? [storeLogger()] : [], - runtimeChecks: { - strictStateImmutability: false, - }, - }, - ), - EffectsModule.forRoot([AppSharedStateEffects]), - ForModule, - LetModule, - PushModule, + declarations: [ + AppComponent, + RedirectToLangComponent, + NotFoundComponent, + AppBarComponent, + MenuBarComponent, + ErrorComponent, + ], + imports: [ + BrowserModule, + BrowserAnimationsModule, + HttpClientModule, + RouterModule.forRoot([ + { + path: ':lang/a', + loadChildren: () => import('@asset-sg/auth').then(m => m.AuthModule), + }, + { + path: ':lang/profile', + loadChildren: () => import('@asset-sg/profile').then(m => m.ProfileModule), + }, + { + path: ':lang/admin', + loadChildren: () => import('@asset-sg/admin').then(m => m.AdminModule), + canActivate: [adminGuard], + }, + { + path: ':lang/asset-admin', + loadChildren: () => import('@asset-sg/asset-editor').then(m => m.AssetEditorModule), + canActivate: [editorGuard], + }, + { + path: ':lang/error', + component: ErrorComponent, + }, + { + matcher: assetsPageMatcher, + loadChildren: () => import('@asset-sg/asset-viewer').then(m => m.AssetViewerModule), + }, + { + path: 'not-found', + component: NotFoundComponent, + }, + { + path: '**', + component: RedirectToLangComponent, + }, + ]), + TranslateModule.forRoot({ + loader: { provide: TranslateLoader, useFactory: () => new TranslateTsLoader(appTranslations) }, + }), + StoreRouterConnectingModule.forRoot({ serializer: FullRouterStateSerializer, stateKey: 'router' }), + StoreModule.forRoot( + { router: routerReducer, shared: appSharedStateReducer }, + { + metaReducers: environment.ngrxStoreLoggerEnabled ? [storeLogger()] : [], + runtimeChecks: { + strictStateImmutability: false, + }, + }, + ), + EffectsModule.forRoot([AppSharedStateEffects]), + ForModule, + LetModule, + PushModule, - SvgIconComponent, + SvgIconComponent, - AnchorComponent, - ButtonComponent, - DialogModule, - A11yModule, - ], - providers: [ - provideSvgIcons(icons), - { provide: HTTP_INTERCEPTORS, useClass: AuthInterceptor, multi: true }, - { provide: MAT_FORM_FIELD_DEFAULT_OPTIONS, useValue: { appearance: 'fill', floatLabel: 'auto' } }, - { provide: CURRENT_LANG, useFactory: currentLangFactory }, - ], - bootstrap: [AppComponent], + AnchorComponent, + ButtonComponent, + DialogModule, + A11yModule, + AuthModule, + ], + providers: [ + provideSvgIcons(icons), + { provide: HTTP_INTERCEPTORS, useClass: AuthInterceptor, multi: true }, + { provide: MAT_FORM_FIELD_DEFAULT_OPTIONS, useValue: { appearance: 'fill', floatLabel: 'auto' } }, + { provide: CURRENT_LANG, useFactory: currentLangFactory }, + ], + bootstrap: [AppComponent], }) export class AppModule { - private _translateService = inject(TranslateService); - constructor() { - this._translateService.setDefaultLang('de'); - } + private _translateService = inject(TranslateService); + + constructor() { + this._translateService.setDefaultLang('de'); + } } export interface Encoder { - readonly encode: (a: A) => O; + readonly encode: (a: A) => O; } + function optionFromNullable(encoder: Encoder): Encoder> { - return { - encode: O.fold(() => null, encoder.encode), - }; + return { + encode: O.fold(() => null, encoder.encode), + }; } + const foooobar = optionFromNullable(C.string); diff --git a/apps/client-asset-sg/src/app/components/app-bar/app-bar.component.html b/apps/client-asset-sg/src/app/components/app-bar/app-bar.component.html index eda685f8..8eb2d1a1 100644 --- a/apps/client-asset-sg/src/app/components/app-bar/app-bar.component.html +++ b/apps/client-asset-sg/src/app/components/app-bar/app-bar.component.html @@ -1,5 +1,5 @@ - +
diff --git a/apps/client-asset-sg/src/app/components/app-bar/app-bar.component.scss b/apps/client-asset-sg/src/app/components/app-bar/app-bar.component.scss index 784abc95..66a94626 100644 --- a/apps/client-asset-sg/src/app/components/app-bar/app-bar.component.scss +++ b/apps/client-asset-sg/src/app/components/app-bar/app-bar.component.scss @@ -9,6 +9,7 @@ .logo { margin-left: 24px; + height: 56px; } .search-input { diff --git a/apps/client-asset-sg/src/app/components/error/error.component.html b/apps/client-asset-sg/src/app/components/error/error.component.html new file mode 100644 index 00000000..954e8fd2 --- /dev/null +++ b/apps/client-asset-sg/src/app/components/error/error.component.html @@ -0,0 +1,6 @@ + +
+ {{errorMessage}} + +
+ diff --git a/apps/client-asset-sg/src/app/components/error/error.component.scss b/apps/client-asset-sg/src/app/components/error/error.component.scss new file mode 100644 index 00000000..d3503d87 --- /dev/null +++ b/apps/client-asset-sg/src/app/components/error/error.component.scss @@ -0,0 +1,13 @@ +.error-page { + display: flex; + flex-direction: column; + gap: 20px; + position: absolute; + padding: 40px; + width: 100%; + background-color: red; + color: white; + align-items: center; + font-size: 24px; + font-weight: bolder; +} diff --git a/apps/client-asset-sg/src/app/components/error/error.component.ts b/apps/client-asset-sg/src/app/components/error/error.component.ts new file mode 100644 index 00000000..cc161e7a --- /dev/null +++ b/apps/client-asset-sg/src/app/components/error/error.component.ts @@ -0,0 +1,24 @@ +import { Component, inject } from '@angular/core'; +import { ActivatedRoute, Router } from '@angular/router'; + +import { AuthService } from '@asset-sg/auth'; + +@Component({ + selector: 'asset-sg-error', + templateUrl: './error.component.html', + styleUrls: ['./error.component.scss'], +}) +export class ErrorComponent { + errorMessage: string; + private readonly _authService = inject(AuthService); + + constructor(private route: ActivatedRoute, private router: Router) { + const navigation = this.router.getCurrentNavigation(); + console.log(navigation?.extras.state?.['errorMessage']); + this.errorMessage = navigation?.extras.state?.['errorMessage'] ?? 'An error occurred, please try again later.'; + } + + public logout() { + this._authService.logOut(); + } +} diff --git a/apps/client-asset-sg/src/app/components/not-found/not-found.component.ts b/apps/client-asset-sg/src/app/components/not-found/not-found.component.ts index ecf8d128..0088f5a9 100644 --- a/apps/client-asset-sg/src/app/components/not-found/not-found.component.ts +++ b/apps/client-asset-sg/src/app/components/not-found/not-found.component.ts @@ -2,6 +2,6 @@ import { Component } from '@angular/core'; @Component({ selector: 'asset-sg-not-found', - template: `
Not Found
`, + template: `
Not Found
`, }) export class NotFoundComponent {} diff --git a/apps/client-asset-sg/src/app/components/redirect-to-lang/redirect-to-lang.component.ts b/apps/client-asset-sg/src/app/components/redirect-to-lang/redirect-to-lang.component.ts index 320d2c24..0a193649 100644 --- a/apps/client-asset-sg/src/app/components/redirect-to-lang/redirect-to-lang.component.ts +++ b/apps/client-asset-sg/src/app/components/redirect-to-lang/redirect-to-lang.component.ts @@ -5,15 +5,16 @@ import * as E from 'fp-ts/Either'; import * as D from 'io-ts/Decoder'; import queryString from 'query-string'; +import { AuthService } from '@asset-sg/auth'; import { Lang } from '@asset-sg/shared'; @UntilDestroy() @Component({ selector: 'asset-sg-redirect-to-lang', - template: 'redirect', + template: 'Redirect to main page...', }) export class RedirectToLangComponent { - constructor(route: ActivatedRoute, router: Router) { + constructor(route: ActivatedRoute, router: Router, authService: AuthService) { route.queryParams.pipe(untilDestroyed(this)).subscribe(params => { const paramsDecoded = D.struct({ lang: Lang, @@ -25,6 +26,10 @@ export class RedirectToLangComponent { const { lang, ...rest } = query; const newUrl = `/${paramsDecoded.right.lang}${url}?${queryString.stringify(rest)}`; router.navigateByUrl(newUrl); + } else if (!authService.isLoggedIn()) { + setTimeout(() => { + router.navigate(['/de']); + }, 500); } else { router.navigate(['/de']); } diff --git a/apps/client-asset-sg/src/app/i18n/de.ts b/apps/client-asset-sg/src/app/i18n/de.ts index cdb53867..ee6d461b 100644 --- a/apps/client-asset-sg/src/app/i18n/de.ts +++ b/apps/client-asset-sg/src/app/i18n/de.ts @@ -1,5 +1,5 @@ export const deAppTranslations = { - logoSwissConfederation: 'Logo Schweizerische Eidgenossenschaft', + logoSwissGeol: 'Logo Swissgeol Assets', ok: 'OK', submit: 'Absenden', cancel: 'Abbrechen', @@ -31,40 +31,6 @@ export const deAppTranslations = { drawingModeOff: 'Der Zeichenmodus ist eingeschaltet. Klicken Sie, um den Zeichenmodus auszuschalten', dragHandleLabel: 'Ziehgriff', }, - auth: { - signInHeading: 'Anmeldung in SwissGeol Asset', - email: 'E-Mail', - password: 'Passwort', - signIn: 'Anmelden', - forgotPassword: 'Passwort vergessen?', - invalidCredentials: 'Ungültige Anmeldedaten', - error: { - required: 'Dieses Feld ist erforderlich', - email: 'Bitte geben Sie eine gültige E-Mail-Adresse ein', - }, - recovery: { - enterEmail: - 'Geben Sie Ihre E-Mail-Adresse ein, und ein Link zum Zurücksetzen des Passworts wird Ihnen per E-Mail zugeschickt.', - backToLogin: 'Zurück zur Anmeldung', - tooManyRequests: 'Aus Sicherheitsgründen können Sie dies nur einmal alle 60 Sekunden anfordern.', - recoverySuccess: - 'Bitte klicken Sie auf den Link, den Sie per E-Mail erhalten haben, um Ihr Passwort zurückzusetzen.', - }, - reset: { - welcome: 'Neues Passwort erstellen', - enterPassword: 'Bitte geben Sie ein Passwort ein.', - unauthorised: 'Nicht autorisiert', - invalidEmailLink: 'E-Mail-Link ist ungültig oder abgelaufen.', - }, - set: { - welcome: 'Willkommen bei SwissGeol Asset', - enterPassword: 'Bitte geben Sie ein Passwort ein, um die Registrierung abzuschliessen.', - }, - }, - userManagement: { - createNewUser: 'Neuen Benutzer erstellen', - confirmDelete: 'Möchten Sie den folgenden Benutzer wirklich löschen?', - }, search: { textSearchFieldPlaceholder: 'Suche nach Original- oder Öffentlichem Titel und Autor oder Einlieferer', searchInstructionsHeading: 'Asset-Suche', @@ -252,5 +218,10 @@ export const deAppTranslations = { adminInstructionsEdit: 'Suche nach einem Asset über das Menü Assets, um dieses zu verwalten.', adminInstructionsCreateHeading: 'Neues Asset', adminInstructionsCreate: 'Neues Asset erstellen', + adminInstructionsSyncElasticAssetsHeading: 'Assets mit Elasticsearch synchronisieren', + adminInstructionsSyncElasticAssets: + 'Gleicht den Zustand von Elasticsearch mit der Datenbank ab.' + + ' Damit wird sichergestellt, dass die Suche alle vorhandenen Assets miteinbezieht.', + adminInstructionsSyncElasticAssetsStart: 'Synchronisation starten', }, }; diff --git a/apps/client-asset-sg/src/app/i18n/en.ts b/apps/client-asset-sg/src/app/i18n/en.ts index 223ecdc1..02f2ea96 100644 --- a/apps/client-asset-sg/src/app/i18n/en.ts +++ b/apps/client-asset-sg/src/app/i18n/en.ts @@ -1,7 +1,7 @@ import { AppTranslations } from './i18n'; export const enAppTranslations: AppTranslations = { - logoSwissConfederation: 'Logo Swiss Confederation', + logoSwissGeol: 'Logo Swissgeol Assets', ok: 'OK', submit: 'Submit', cancel: 'Cancel', @@ -33,38 +33,6 @@ export const enAppTranslations: AppTranslations = { drawingModeOff: 'Drawing mode is on. Click to turn off drawing mode', dragHandleLabel: 'Drag handle', }, - auth: { - signInHeading: 'Sign in to Swissgeol Asset', - email: 'E-Mail', - password: 'Password', - signIn: 'Sign in', - forgotPassword: 'Forgot password?', - invalidCredentials: 'Invalid credentials', - error: { - required: 'This field is required', - email: 'Please enter a valid email address', - }, - recovery: { - enterEmail: 'Enter your email and a password reset link will be emailed to you.', - backToLogin: 'Back to login', - tooManyRequests: 'For security purposes, you can only request this once every 60 seconds', - recoverySuccess: 'Please click on the link email to you to reset your password.', - }, - reset: { - welcome: 'Create a new password', - enterPassword: 'Please set enter a new password', - unauthorised: 'Unauthorised', - invalidEmailLink: 'Email link is invalid or expired.', - }, - set: { - welcome: 'Welcome to Swissgeol Asset', - enterPassword: 'Please set a password to complete the registration.', - }, - }, - userManagement: { - createNewUser: 'Create new user', - confirmDelete: 'Are you sure you want to delete the following user?', - }, search: { textSearchFieldPlaceholder: 'Search by original or public title and author or consignor', searchInstructionsHeading: 'Asset-Search', @@ -248,8 +216,13 @@ export const enAppTranslations: AppTranslations = { closeManageAsset: 'Close manage asset', questionDiscardChanges: 'Do you want to discard your changes?', adminInstructionsEditHeading: 'Manage asset', - adminInstructionsEdit: 'Search for an Asset via the Assets menu, in order to manage it.', + adminInstructionsEdit: 'Search for an asset via the assets menu, in order to manage it.', adminInstructionsCreateHeading: 'New asset', adminInstructionsCreate: 'Create new asset', + adminInstructionsSyncElasticAssetsHeading: 'Synchronize assets with Elasticsearch', + adminInstructionsSyncElasticAssets: + 'Equalizes the state of Elasticsearch with the local database.' + + ' This ensures that the search includes all existing assets.', + adminInstructionsSyncElasticAssetsStart: 'Start synchronization', }, }; diff --git a/apps/client-asset-sg/src/app/i18n/fr.ts b/apps/client-asset-sg/src/app/i18n/fr.ts index 14a26e9d..584035a6 100644 --- a/apps/client-asset-sg/src/app/i18n/fr.ts +++ b/apps/client-asset-sg/src/app/i18n/fr.ts @@ -1,7 +1,7 @@ import { AppTranslations } from './i18n'; export const frAppTranslations: AppTranslations = { - logoSwissConfederation: 'Logo Confédération suisse', + logoSwissGeol: 'Logo Swissgeol Assets', ok: 'OK', submit: 'Envoyer', cancel: 'Annuler', @@ -33,41 +33,6 @@ export const frAppTranslations: AppTranslations = { drawingModeOff: 'Mode de dessin désactivé', dragHandleLabel: 'Poignée de tirage', }, - auth: { - signInHeading: 'Inscription à assets.swissgeol', - email: 'E-Mail', - password: 'Mot de passe', - signIn: 'Inscrire', - forgotPassword: 'Oublié le mot de passe ?', - invalidCredentials: 'Données de connexion non valables', - error: { - required: 'Ce champ est obligatoire', - email: 'Bitte geben Sie eine gültige E-Mail-Adresse ein', - }, - recovery: { - enterEmail: - 'Saisissez votre adresse e-mail et un lien pour réinitialiser votre mot de passe vous sera envoyé par e-mail.', - backToLogin: "Retour à l'inscription", - tooManyRequests: - "Pour des raisons de sécurité, vous ne pouvez en faire la demande qu'une fois toutes les 60 secondes.", - recoverySuccess: - 'Veuillez cliquer sur le lien que vous avez reçu par e-mail pour réinitialiser votre mot de passe.', - }, - reset: { - welcome: 'Créer un nouveau mot de passe', - enterPassword: 'Veuillez saisir un mot de passe.', - unauthorised: 'Non autorisé', - invalidEmailLink: "Le lien e-mail n'est pas valide ou a expiré.", - }, - set: { - welcome: 'Bienvenue sur asset.swissgeol', - enterPassword: "Veuillez saisir un mot de passe pour terminer l'enregistrement.", - }, - }, - userManagement: { - createNewUser: 'Créer un nouvel utilisateur', - confirmDelete: " Voulez-vous vraiment supprimer l'utilisateur suivant ?", - }, search: { textSearchFieldPlaceholder: 'Recherche par titre original ou public et auteur ou déposant', searchInstructionsHeading: "Recherche d'assets", @@ -255,5 +220,10 @@ export const frAppTranslations: AppTranslations = { adminInstructionsEdit: 'Recherche un asset via le menu Assets pour le gérer.', adminInstructionsCreateHeading: 'Nouvel asset', adminInstructionsCreate: 'Créer un nouvel asset', + adminInstructionsSyncElasticAssetsHeading: 'Synchroniser les assets avec Elasticsearch', + adminInstructionsSyncElasticAssets: + 'Fait correspondre l\'état d\'Elasticsearch avec la base de données.' + + ' Cela permet de s\'assurer que la recherche inclut tous les actifs existants.', + adminInstructionsSyncElasticAssetsStart: 'Démarrer la synchronisation', }, }; diff --git a/apps/client-asset-sg/src/app/i18n/it.ts b/apps/client-asset-sg/src/app/i18n/it.ts index b22f80c6..8a431442 100644 --- a/apps/client-asset-sg/src/app/i18n/it.ts +++ b/apps/client-asset-sg/src/app/i18n/it.ts @@ -1,7 +1,7 @@ import { AppTranslations } from './i18n'; export const itAppTranslations: AppTranslations = { - logoSwissConfederation: 'Logo Confederazione Svizzera', + logoSwissGeol: 'Logo Swissgeol Assets', ok: 'OK', submit: 'IT Absenden', cancel: 'IT Abbrechen', @@ -33,40 +33,6 @@ export const itAppTranslations: AppTranslations = { drawingModeOff: 'IT Zeichenmodus aus', dragHandleLabel: 'IT Ziehgriff', }, - auth: { - signInHeading: 'IT Anmeldung in SwissGeol Asset', - email: 'IT E-Mail', - password: 'IT Passwort', - signIn: 'IT Anmelden', - forgotPassword: 'IT Passwort vergessen?', - invalidCredentials: 'IT Ungültige Anmeldedaten', - error: { - required: 'IT Dieses Feld ist erforderlich', - email: 'IT Bitte geben Sie eine gültige E-Mail-Adresse ein', - }, - recovery: { - enterEmail: - 'IT Geben Sie Ihre E-Mail-Adresse ein, und ein Link zum Zurücksetzen des Passworts wird Ihnen per E-Mail zugeschickt.', - backToLogin: 'IT Zurück zur Anmeldung', - tooManyRequests: 'IT Aus Sicherheitsgründen können Sie dies nur einmal alle 60 Sekunden anfordern.', - recoverySuccess: - 'IT Bitte klicken Sie auf den Link, den Sie per E-Mail erhalten haben, um Ihr Passwort zurückzusetzen.', - }, - reset: { - welcome: 'IT Neues Passwort erstellen', - enterPassword: 'IT Bitte geben Sie ein Passwort ein.', - unauthorised: 'IT Nicht autorisiert', - invalidEmailLink: 'IT E-Mail-Link ist ungültig oder abgelaufen.', - }, - set: { - welcome: 'IT Willkommen bei SwissGeol Asset', - enterPassword: 'IT Bitte geben Sie ein Passwort ein, um die Registrierung abzuschliessen.', - }, - }, - userManagement: { - createNewUser: 'IT Neuen Benutzer erstellen', - confirmDelete: 'IT Möchten Sie den folgenden Benutzer wirklich löschen?', - }, search: { textSearchFieldPlaceholder: 'IT Suche nach Original- oder Öffentlichem Titel und Autor oder Einlieferer', searchInstructionsHeading: 'IT Asset-Suche', @@ -255,5 +221,10 @@ export const itAppTranslations: AppTranslations = { adminInstructionsEdit: 'IT Suche nach einem Asset über das Menü Assets, um dieses zu verwalten.', adminInstructionsCreateHeading: 'IT Neues Asset', adminInstructionsCreate: 'IT Neues Asset erstellen', + adminInstructionsSyncElasticAssetsHeading: 'IT Assets mit Elasticsearch synchronisieren', + adminInstructionsSyncElasticAssets: + 'IT Gleicht den Zustand von Elasticsearch mit der Datenbank ab.' + + 'IT Damit wird sichergestellt, dass die Suche alle vorhandenen Assets miteinbezieht.', + adminInstructionsSyncElasticAssetsStart: 'IT Synchronisation starten', }, }; diff --git a/apps/client-asset-sg/src/app/i18n/rm.ts b/apps/client-asset-sg/src/app/i18n/rm.ts index f9110e4c..19a6fbb1 100644 --- a/apps/client-asset-sg/src/app/i18n/rm.ts +++ b/apps/client-asset-sg/src/app/i18n/rm.ts @@ -1,7 +1,7 @@ import { AppTranslations } from './i18n'; export const rmAppTranslations: AppTranslations = { - logoSwissConfederation: 'Logo Confederazione Svizzera', + logoSwissGeol: 'Logo Swissgeol Assets', ok: 'OK', submit: 'RM Absenden', cancel: 'RM Abbrechen', @@ -33,40 +33,6 @@ export const rmAppTranslations: AppTranslations = { drawingModeOff: 'RM Zeichenmodus aus', dragHandleLabel: 'RM Ziehgriff', }, - auth: { - signInHeading: 'RM Anmeldung in SwissGeol Asset', - email: 'RM E-Mail', - password: 'RM Passwort', - signIn: 'RM Anmelden', - forgotPassword: 'RM Passwort vergessen?', - invalidCredentials: 'RM Ungültige Anmeldedaten', - error: { - required: 'RM Dieses Feld ist erforderlich', - email: 'RM Bitte geben Sie eine gültige E-Mail-Adresse ein', - }, - recovery: { - enterEmail: - 'RM Geben Sie Ihre E-Mail-Adresse ein, und ein Link zum Zurücksetzen des Passworts wird Ihnen per E-Mail zugeschickt.', - backToLogin: 'RM Zurück zur Anmeldung', - tooManyRequests: 'RM Aus Sicherheitsgründen können Sie dies nur einmal alle 60 Sekunden anfordern.', - recoverySuccess: - 'RM Bitte klicken Sie auf den Link, den Sie per E-Mail erhalten haben, um Ihr Passwort zurückzusetzen.', - }, - reset: { - welcome: 'RM Neues Passwort erstellen', - enterPassword: 'RM Bitte geben Sie ein Passwort ein.', - unauthorised: 'RM Nicht autorisiert', - invalidEmailLink: 'RM E-Mail-Link ist ungültig oder abgelaufen.', - }, - set: { - welcome: 'RM Willkommen bei SwissGeol Asset', - enterPassword: 'RM Bitte geben Sie ein Passwort ein, um die Registrierung abzuschliessen.', - }, - }, - userManagement: { - createNewUser: 'RM Neuen Benutzer erstellen', - confirmDelete: 'RM Möchten Sie den folgenden Benutzer wirklich löschen?', - }, search: { textSearchFieldPlaceholder: 'RM Suche nach Original- oder Öffentlichem Titel und Autor oder Einlieferer', searchInstructionsHeading: 'RM Asset-Suche', @@ -255,5 +221,10 @@ export const rmAppTranslations: AppTranslations = { adminInstructionsEdit: 'RM Suche nach einem Asset über das Menü Assets, um dieses zu verwalten.', adminInstructionsCreateHeading: 'RM Neues Asset', adminInstructionsCreate: 'RM Neues Asset erstellen', + adminInstructionsSyncElasticAssetsHeading: 'RM Assets mit Elasticsearch synchronisieren', + adminInstructionsSyncElasticAssets: + 'RM Gleicht den Zustand von Elasticsearch mit der Datenbank ab.' + + 'RM Damit wird sichergestellt, dass die Suche alle vorhandenen Assets miteinbezieht.', + adminInstructionsSyncElasticAssetsStart: 'RM Synchronisation starten', }, }; diff --git a/apps/client-asset-sg/src/assets/email-templates/invite.html b/apps/client-asset-sg/src/assets/email-templates/invite.html deleted file mode 100644 index 3a4f422d..00000000 --- a/apps/client-asset-sg/src/assets/email-templates/invite.html +++ /dev/null @@ -1,49 +0,0 @@ -{{if eq .Data.lang "de"}} - -

Einladung für assets.swissgeol.ch Login

- -

Guten Tag

-

- Es wurde für Sie ein Login erstellt für den Zugang bei asset.swissgeol.ch. Bitte aktivieren Sie den Benutzer über - den folgenden Link:
- {{ .ConfirmationURL }}&lang=de -

-

- Freundliche Grüsse
- Ihr Swisstopo Team -

- -{{else if eq .Data.lang "fr"}} - -

FR: Einladung für assets.swissgeol.ch Login

- -{{ .ConfirmationURL }}&lang=fr - -{{else if eq .Data.lang "it"}} - -

IT: Einladung für assets.swissgeol.ch Login

- -{{ .ConfirmationURL }}&lang=it - -{{else if eq .Data.lang "rm"}} - -

RM: Einladung für assets.swissgeol.ch Login

- -{{ .ConfirmationURL }}&lang=rm - -{{else}} - -

Invitation to assets.swissgeol.ch

- -

Hello

-

- A login has been created for you to access assset.swissgeol.ch. Please activate the account via the following - link:
- {{ .ConfirmationURL }}&lang=en -

-

- Best regards
- Your Swisstopo Team -

- -{{end}} diff --git a/apps/client-asset-sg/src/assets/email-templates/recover.html b/apps/client-asset-sg/src/assets/email-templates/recover.html deleted file mode 100644 index 3342bb2c..00000000 --- a/apps/client-asset-sg/src/assets/email-templates/recover.html +++ /dev/null @@ -1,45 +0,0 @@ -{{if eq .Data.lang "de"}} - -

Passwort zurücksetzen für assets.swissgeol.ch

- -

- Folgen Sie diesem Link, um das Passwort für Ihren Benutzer zurückzusetzen:
- {{ .ConfirmationURL }}&lang=de -

-

- Freundliche Grüsse
- Ihr Swisstopo Team -

- -{{else if eq .Data.lang "fr"}} - -

FR: Passwort zurücksetzen für assets.swissgeol.ch

- -{{ .ConfirmationURL }}&lang=fr - -{{else if eq .Data.lang "it"}} - -

IT: Passwort zurücksetzen für assets.swissgeol.ch

- -{{ .ConfirmationURL }}&lang=it - -{{else if eq .Data.lang "rm"}} - -

RM: Passwort zurücksetzen für assets.swissgeol.ch

- -{{ .ConfirmationURL }}&lang=rm - -{{else}} - -

Password reset for assets.swissgeol.ch

- -

- Follow this link to reset the password for your user:
- {{ .ConfirmationURL }}&lang=en -

-

- Best regards
- Your Swisstopo Team -

- -{{end}} diff --git a/apps/client-asset-sg/src/assets/logo-CH.svg b/apps/client-asset-sg/src/assets/logo-CH.svg deleted file mode 100644 index e45aa1ef..00000000 --- a/apps/client-asset-sg/src/assets/logo-CH.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/apps/client-asset-sg/src/assets/swissgeol_assets.svg b/apps/client-asset-sg/src/assets/swissgeol_assets.svg new file mode 100644 index 00000000..f2235bc2 --- /dev/null +++ b/apps/client-asset-sg/src/assets/swissgeol_assets.svg @@ -0,0 +1,92 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/apps/client-asset-sg/src/environments/environment.int.ts b/apps/client-asset-sg/src/environments/environment.int.ts new file mode 100644 index 00000000..453523f3 --- /dev/null +++ b/apps/client-asset-sg/src/environments/environment.int.ts @@ -0,0 +1,5 @@ +import { CompileTimeEnvironment } from './environment-type'; + +export const environment: CompileTimeEnvironment = { + ngrxStoreLoggerEnabled: false, +}; diff --git a/apps/client-asset-sg/src/favicon.ico b/apps/client-asset-sg/src/favicon.ico index 317ebcb2336e0833a22dddf0ab287849f26fda57..3ba7fce9d9f709cfaa035c464261b6fa6ffbbb38 100644 GIT binary patch literal 9662 zcmeHN`A=L`6n_2_{%oQqMxBDSE>)|sYSh*=uCXqSRcjNs_=_=VG-^_0YpHDoYzquK zvdLPYl(tYPn?fm4$|6)KEwTudt-vrdpZB|uH@wGM(i!HF^peZFb7$t>@0@$?Io~~Z z6y*-_=j*G8|92_L_bSSrilW>ns_0U7ipqXj?opJx*Qr(QP?V^j*5P*5>A=r|NWTXW zvG)O2jTG%j(QjToStM4gzYh`*JdMnVH&KwZ8>iB~!pW2`kQ=iD$%kKn)!!GC#awb& z5WoKk6lZ>e*7|G=^tNE~#t`h&Q*b)$a5$!6n;OUP;1#qr97kdDr-%+*Z<_U>KC`Xw z2+Y@UGljBTs!2xT&(BCZ^Y&WMu8DIWcU&2d5L`BfWATXGd+9ZT$zD>(UpoIbBR&1&%}ePYHbyBZFOf zc&;|%*wxDw^WubA@N@q~2du|GO+^y3)9H|L*ETgKk{1HXPy{(%zVl-wr*upx@Nw@wWZbe;<$A z3ESkD0srMoCj{@@xTNkW1M#PZZ}FP{UAS`XdTt}8oY)S<}f zGIyfsmEVsIer&diGe6J$>|_4dQ@A-U^~xLw&xHEIv+Y1nv*bfOb1jcSwLfj|&pwU1 zT7I0Bf4)ihJAGjeiaOWwv6`MeG54*G86EgA$kp_PdE0~on_TvBt8;kr`?TH8Is9iW z;iqk!FAdkLU*rRAs6G`UeG>g8t66P`xH68tA$_@Ch-updy4uQ6TM~+@qF~flM9J7- zPB|bIVzqd`MRU!wA|m^ALJI~4a@QEmCWzX&q`S+&rBu9<{g;6@O~^O=6xx% zJLmSqSX`IGl8s literal 15086 zcmeI332;U^%p|z7g|#(P)qFEA@4f!_@qOK2 z_lJl}!lhL!VT_U|uN7%8B2iKH??xhDa;*`g{yjTFWHvXn;2s{4R7kH|pKGdy(7z!K zgftM+Ku7~24TLlh(!g)gz|foI94G^t2^IO$uvX$3(OR0<_5L2sB)lMAMy|+`xodJ{ z_Uh_1m)~h?a;2W{dmhM;u!YGo=)OdmId_B<%^V^{ovI@y`7^g1_V9G}*f# zNzAtvou}I!W1#{M^@ROc(BZ! z+F!!_aR&Px3_reO(EW+TwlW~tv*2zr?iP7(d~a~yA|@*a89IUke+c472NXM0wiX{- zl`UrZC^1XYyf%1u)-Y)jj9;MZ!SLfd2Hl?o|80Su%Z?To_=^g_Jt0oa#CT*tjx>BI z16wec&AOWNK<#i0Qd=1O$fymLRoUR*%;h@*@v7}wApDl^w*h}!sYq%kw+DKDY)@&A z@9$ULEB3qkR#85`lb8#WZw=@})#kQig9oqy^I$dj&k4jU&^2(M3q{n1AKeGUKPFbr z1^<)aH;VsG@J|B&l>UtU#Ejv3GIqERzYgL@UOAWtW<{p#zy`WyJgpCy8$c_e%wYJL zyGHRRx38)HyjU3y{-4z6)pzb>&Q1pR)B&u01F-|&Gx4EZWK$nkUkOI|(D4UHOXg_- zw{OBf!oWQUn)Pe(=f=nt=zkmdjpO^o8ZZ9o_|4tW1ni+Un9iCW47*-ut$KQOww!;u z`0q)$s6IZO!~9$e_P9X!hqLxu`fpcL|2f^I5d4*a@Dq28;@2271v_N+5HqYZ>x;&O z05*7JT)mUe&%S0@UD)@&8SmQrMtsDfZT;fkdA!r(S=}Oz>iP)w=W508=Rc#nNn7ym z1;42c|8($ALY8#a({%1#IXbWn9-Y|0eDY$_L&j{63?{?AH{);EzcqfydD$@-B`Y3<%IIj7S7rK_N}je^=dEk%JQ4c z!tBdTPE3Tse;oYF>cnrapWq*o)m47X1`~6@(!Y29#>-#8zm&LXrXa(3=7Z)ElaQqj z-#0JJy3Fi(C#Rx(`=VXtJ63E2_bZGCz+QRa{W0e2(m3sI?LOcUBx)~^YCqZ{XEPX)C>G>U4tfqeH8L(3|pQR*zbL1 zT9e~4Tb5p9_G}$y4t`i*4t_Mr9QYvL9C&Ah*}t`q*}S+VYh0M6GxTTSXI)hMpMpIq zD1ImYqJLzbj0}~EpE-aH#VCH_udYEW#`P2zYmi&xSPs_{n6tBj=MY|-XrA;SGA_>y zGtU$?HXm$gYj*!N)_nQ59%lQdXtQZS3*#PC-{iB_sm+ytD*7j`D*k(P&IH2GHT}Eh z5697eQECVIGQAUe#eU2I!yI&%0CP#>%6MWV z@zS!p@+Y1i1b^QuuEF*13CuB zu69dve5k7&Wgb+^s|UB08Dr3u`h@yM0NTj4h7MnHo-4@xmyr7(*4$rpPwsCDZ@2be zRz9V^GnV;;?^Lk%ynzq&K(Aix`mWmW`^152Hoy$CTYVehpD-S1-W^#k#{0^L`V6CN+E z!w+xte;2vu4AmVNEFUOBmrBL>6MK@!O2*N|2=d|Y;oN&A&qv=qKn73lDD zI(+oJAdgv>Yr}8(&@ZuAZE%XUXmX(U!N+Z_sjL<1vjy1R+1IeHt`79fnYdOL{$ci7 z%3f0A*;Zt@ED&Gjm|OFTYBDe%bbo*xXAQsFz+Q`fVBH!N2)kaxN8P$c>sp~QXnv>b zwq=W3&Mtmih7xkR$YA)1Yi?avHNR6C99!u6fh=cL|KQ&PwF!n@ud^n(HNIImHD!h87!i*t?G|p0o+eelJ?B@A64_9%SBhNaJ64EvKgD&%LjLCYnNfc; znj?%*p@*?dq#NqcQFmmX($wms@CSAr9#>hUR^=I+=0B)vvGX%T&#h$kmX*s=^M2E!@N9#m?LhMvz}YB+kd zG~mbP|D(;{s_#;hsKK9lbVK&Lo734x7SIFJ9V_}2$@q?zm^7?*XH94w5Qae{7zOMUF z^?%F%)c1Y)Q?Iy?I>knw*8gYW#ok|2gdS=YYZLiD=CW|Nj;n^x!=S#iJ#`~Ld79+xXpVmUK^B(xO_vO!btA9y7w3L3-0j-y4 z?M-V{%z;JI`bk7yFDcP}OcCd*{Q9S5$iGA7*E1@tfkyjAi!;wP^O71cZ^Ep)qrQ)N z#wqw0_HS;T7x3y|`P==i3hEwK%|>fZ)c&@kgKO1~5<5xBSk?iZV?KI6&i72H6S9A* z=U(*e)EqEs?Oc04)V-~K5AUmh|62H4*`UAtItO$O(q5?6jj+K^oD!04r=6#dsxp?~}{`?&sXn#q2 zGuY~7>O2=!u@@Kfu7q=W*4egu@qPMRM>(eyYyaIE<|j%d=iWNdGsx%c!902v#ngNg z@#U-O_4xN$s_9?(`{>{>7~-6FgWpBpqXb`Ydc3OFL#&I}Irse9F_8R@4zSS*Y*o*B zXL?6*Aw!AfkNCgcr#*yj&p3ZDe2y>v$>FUdKIy_2N~}6AbHc7gA3`6$g@1o|dE>vz z4pl(j9;kyMsjaw}lO?(?Xg%4k!5%^t#@5n=WVc&JRa+XT$~#@rldvN3S1rEpU$;XgxVny7mki3 z-Hh|jUCHrUXuLr!)`w>wgO0N%KTB-1di>cj(x3Bav`7v z3G7EIbU$z>`Nad7Rk_&OT-W{;qg)-GXV-aJT#(ozdmnA~Rq3GQ_3mby(>q6Ocb-RgTUhTN)))x>m&eD;$J5Bg zo&DhY36Yg=J=$Z>t}RJ>o|@hAcwWzN#r(WJ52^g$lh^!63@hh+dR$&_dEGu&^CR*< z!oFqSqO@>xZ*nC2oiOd0eS*F^IL~W-rsrO`J`ej{=ou_q^_(<$&-3f^J z&L^MSYWIe{&pYq&9eGaArA~*kA/tsconfig.spec.json', @@ -13,4 +16,10 @@ export default { }, moduleFileExtensions: ['ts', 'js', 'html'], coverageDirectory: '../../coverage/apps/server-asset-sg', + coverageReporters: ['json', 'text', 'cobertura', 'lcov'], + + // Allow only a single worker so the tests don't run in parallel. + // Many of the tests are integration tests, meaning they access actual databases. + // When running in parallel, read and writes of multiple tests will overlap and cause failing tests. + maxWorkers: 1, }; diff --git a/apps/server-asset-sg/jest.setup.ts b/apps/server-asset-sg/jest.setup.ts new file mode 100644 index 00000000..146ef85e --- /dev/null +++ b/apps/server-asset-sg/jest.setup.ts @@ -0,0 +1,4 @@ +import * as dotenv from 'dotenv' + +dotenv.config({ path: '.env.local' }); +dotenv.config({ path: '.env.test' }); diff --git a/apps/server-asset-sg/project.json b/apps/server-asset-sg/project.json index 8fe5543b..58a7917e 100644 --- a/apps/server-asset-sg/project.json +++ b/apps/server-asset-sg/project.json @@ -10,10 +10,10 @@ "parallel": false, "commands": [ { - "command": "nx run server-asset-sg:gen-prisma-client" + "command": "npx nx run server-asset-sg:gen-prisma-client" }, { - "command": "nx run server-asset-sg:build-app" + "command": "npx nx run server-asset-sg:build-app" }, { "command": "npx shx cp apps/server-asset-sg/docker/* dist/apps/server-asset-sg" @@ -23,9 +23,6 @@ }, { "command": "npx shx sed -i \"s/(\\.\\.\\/)*node_modules/\\.\\/node_modules/g\" dist/apps/server-asset-sg/schema.prisma" - }, - { - "command": "docker build -t registry.lambda-it.ch/asset-swissgeol/api:latest dist/apps/server-asset-sg" } ] } @@ -80,7 +77,8 @@ "outputs": ["{workspaceRoot}/coverage/{projectRoot}"], "options": { "jestConfig": "apps/server-asset-sg/jest.config.ts", - "passWithNoTests": true + "passWithNoTests": true, + "codeCoverage": true } }, "gen-prisma-client": { diff --git a/apps/server-asset-sg/src/app/admin/admin.controller.ts b/apps/server-asset-sg/src/app/admin/admin.controller.ts index b322f8e9..5d0ab92c 100644 --- a/apps/server-asset-sg/src/app/admin/admin.controller.ts +++ b/apps/server-asset-sg/src/app/admin/admin.controller.ts @@ -1,11 +1,11 @@ -import { Body, Controller, Delete, Get, HttpCode, HttpException, Param, Patch, Post, Req } from '@nestjs/common'; +import { Body, Controller, Delete, Get, HttpCode, HttpException, Param, Patch, Req } from '@nestjs/common'; import * as E from 'fp-ts/Either'; import { pipe } from 'fp-ts/function'; import * as TE from 'fp-ts/TaskEither'; import * as D from 'io-ts/Decoder'; import { decodeError, serializeError } from '@asset-sg/core'; -import { UserPatch, UserPost } from '@asset-sg/shared'; +import { UserPatch } from '@asset-sg/shared'; import { AuthenticatedRequest } from '../models/request'; @@ -45,25 +45,6 @@ export class AdminController { } } - @Post('user') - @HttpCode(201) - async createUser(@Req() req: AuthenticatedRequest, @Body() body: UserPost) { - const e = await pipe( - UserPost.decode(body), - E.mapLeft(decodeError), - TE.fromEither, - TE.chainW(user => this.adminService.createUser(req.accessToken, user)), - )(); - if (E.isLeft(e)) { - console.error(e.left); - if (e.left._tag === 'decodeError') { - console.log(D.draw(e.left.cause)); - throw new HttpException(e.left.message, 400); - } - throw new HttpException(e.left.message, 500); - } - } - @Delete('user/:id') @HttpCode(201) async deleteUser(@Req() req: AuthenticatedRequest, @Param('id') id: string) { diff --git a/apps/server-asset-sg/src/app/admin/admin.service.ts b/apps/server-asset-sg/src/app/admin/admin.service.ts index 3cb0cb41..26bc5485 100644 --- a/apps/server-asset-sg/src/app/admin/admin.service.ts +++ b/apps/server-asset-sg/src/app/admin/admin.service.ts @@ -1,26 +1,22 @@ -import * as path from 'node:path'; - import { Injectable } from '@nestjs/common'; import * as A from 'fp-ts/Array'; import * as E from 'fp-ts/Either'; import { flow, pipe } from 'fp-ts/function'; import * as TE from 'fp-ts/TaskEither'; -import * as D from 'io-ts/Decoder'; import { DecodeError, TypedError, UnknownError, decodeError, - isNil, unknownErrorTag, unknownToError, unknownToUnknownError, } from '@asset-sg/core'; -import { UserPatch, UserPost, UserRoleEnum, Users } from '@asset-sg/shared'; +import { UserPatch, Users } from '@asset-sg/shared'; import { PrismaService } from '../prisma/prisma.service'; -import { PrismaUsersDecoder, RawUserMetaData } from '../user/models'; +import { PrismaUsersDecoder } from '../user/models'; const _importDynamic = new Function('modulePath', 'return import(modulePath)'); export const _fetch = async function (...args: unknown[]) { @@ -37,7 +33,7 @@ export class AdminService { TE.tryCatch( () => this.prismaService.assetUser.findMany({ - select: { id: true, role: true, user: { select: { email: true, raw_user_meta_data: true } } }, + select: { id: true, role: true, email: true, lang: true }, }), unknownToUnknownError, ), @@ -52,81 +48,13 @@ export class AdminService { where: { id }, data: { role: user.role, - user: { - update: { - raw_user_meta_data: RawUserMetaData.encode({ lang: user.lang }), - }, - }, + lang: user.lang, }, }), unknownToUnknownError, ); } - createUser(accessToken: string, user: UserPost) { - return pipe( - pipe( - TE.tryCatch( - () => this.prismaService.assetUser.findFirst({ where: { user: { email: user.email } } }), - unknownToUnknownError, - ), - ), - TE.filterOrElseW(isNil, () => new TypedError('PermissionDeniedError', `User already exists`)), - TE.chainW(() => - TE.tryCatch(() => { - const inviteUrl = new URL('/invite', process.env.AUTH_URL).href; - const redirect_to = new URL( - path.join(user.lang, `/a/set-password?ts=${Date.now()}`), - process.env.FRONTEND_URL, - ).href; - console.log( - 'createUser', - JSON.stringify({ - userLang: user.lang, - frontendUrl: process.env.FRONTEND_URL, - redirect_to, - }), - ); - return _fetch(inviteUrl, { - method: 'POST', - headers: { Authorization: 'Bearer ' + accessToken, redirect_to, referer: redirect_to }, - body: JSON.stringify({ email: user.email, data: RawUserMetaData.encode({ lang: user.lang }) }), - }); - }, unknownToUnknownError), - ), - TE.filterOrElseW( - res => res.status === 200, - res => - new TypedError( - 'PermissionDeniedError', - `Failed to create user. status ${res.status}. statusText: ${res.statusText} `, - ), - ), - TE.chainW(res => TE.tryCatch(() => res.json(), unknownToUnknownError)), - TE.chainEitherKW(flow(D.struct({ id: D.string }).decode, E.mapLeft(decodeError))), - TE.chainW(({ id }) => - TE.tryCatch( - () => - this.prismaService.assetUser.create({ - data: { - id, - role: user.role, - }, - }), - unknownToUnknownError, - ), - ), - TE.chain(({ id }) => - user.role === UserRoleEnum.admin - ? TE.tryCatch( - () => this.prismaService.users.update({ where: { id }, data: { role: 'service_role' } }), - unknownToUnknownError, - ) - : TE.right(null), - ), - ); - } - deleteUser(accessToken: string, id: string) { const tasks: TE.TaskEither, any>[] = [ TE.tryCatch( diff --git a/apps/server-asset-sg/src/app/app.controller.spec.ts b/apps/server-asset-sg/src/app/app.controller.spec.ts deleted file mode 100644 index e487446f..00000000 --- a/apps/server-asset-sg/src/app/app.controller.spec.ts +++ /dev/null @@ -1,22 +0,0 @@ -import { Test, TestingModule } from '@nestjs/testing'; - -import { AppController } from './app.controller'; -import { AppService } from './app.service'; - -describe('AppController', () => { - let app: TestingModule; - - beforeAll(async () => { - app = await Test.createTestingModule({ - controllers: [AppController], - providers: [AppService], - }).compile(); - }); - - describe('getData', () => { - it('should return "Welcome to api!"', () => { - const appController = app.get(AppController); - expect(appController.getData()).toEqual({ message: 'Welcome to api!' }); - }); - }); -}); diff --git a/apps/server-asset-sg/src/app/app.controller.ts b/apps/server-asset-sg/src/app/app.controller.ts index 33120620..6327ab8b 100644 --- a/apps/server-asset-sg/src/app/app.controller.ts +++ b/apps/server-asset-sg/src/app/app.controller.ts @@ -1,16 +1,33 @@ -import { Controller, Get, HttpException, Param, Query, Req, Res } from '@nestjs/common'; +import * as fs from 'fs/promises'; + +import { Controller, Get, HttpException, OnApplicationBootstrap, Param, Post, Query, Req, Res } from '@nestjs/common'; import { Request, Response } from 'express'; import * as E from 'fp-ts/Either'; import * as D from 'io-ts/Decoder'; -import { DT } from '@asset-sg/core'; +import { DT, unknownToError } from '@asset-sg/core'; +import { isAdmin } from '@asset-sg/shared'; import { AppService } from './app.service'; import { isNotFoundError } from './errors'; +import { AuthenticatedRequest } from './models/request'; +import { AssetSearchService } from './search/asset-search-service'; +import { UserService } from './user/user.service'; @Controller() -export class AppController { - constructor(private readonly appService: AppService) {} +export class AppController implements OnApplicationBootstrap { + constructor( + private readonly appService: AppService, + private readonly userService: UserService, + private readonly assetSearchService: AssetSearchService, + ) {} + + async onApplicationBootstrap() { + const syncFileExists = await fs.access(assetSyncFile).then(() => true).catch(() => false); + if (syncFileExists) { + void fs.rm(assetSyncFile); + } + } @Get('all-study') getAllStudies() { @@ -19,12 +36,15 @@ export class AppController { @Get('search-asset') async searchAsset(@Query('searchText') searchText: string) { - const e = await this.appService.searchAssets(searchText)(); - if (E.isLeft(e)) { - console.error(e.left); - throw new HttpException(e.left.message, 500); + try { + return this.assetSearchService.search(searchText, { + scope: ['titlePublic', 'titleOriginal', 'contactNames', 'sgsId'], + }) + } catch (e) { + const error = unknownToError(e); + console.error(error); + throw new HttpException(error.message, 500); } - return e.right; } @Get('asset') @@ -43,7 +63,7 @@ export class AppController { // ); // console.log(JSON.stringify(pipe(AssetSearchParams.decode(req.query), E.mapLeft(D.draw)), null, 2)); // return 'adsf;'; - const e = await this.appService.searchAssets2(req.query)(); + const e = await this.appService.searchAssets(req.query)(); if (E.isLeft(e)) { console.error(e.left); throw new HttpException(e.left.message, 500); @@ -51,6 +71,62 @@ export class AppController { return e.right; } + @Get('/assets/sync') + async getAssetSyncProgress( + @Req() req: AuthenticatedRequest, + @Res() res: Response, + ): Promise<{ progress: number } | void> { + const userResult = await this.userService.getUser(req.jwtPayload.sub || '')() + if (E.isLeft(userResult)) { + throw new HttpException(userResult.left.message, 500); + } + const user = userResult.right; + if (!isAdmin(user)) { + throw new HttpException('Operation not permitted', 403); + } + try { + const data = await fs.readFile(assetSyncFile, { encoding: 'utf-8' }); + const state: AssetSyncState = JSON.parse(data); + res.status(200).json({ progress: state.progress }).end(); + } catch (e) { + if ((e as { code?: string }).code === 'ENOENT') { + res.status(204).end(); + return; + } + throw new HttpException(`${e}`, 500); + } + } + + @Post('/assets/sync') + async startAssetSync(@Req() req: AuthenticatedRequest, @Res() res: Response): Promise { + const userResult = await this.userService.getUser(req.jwtPayload.sub || '')() + if (E.isLeft(userResult)) { + throw new HttpException(userResult.left.message, 500); + } + const user = userResult.right; + if (!isAdmin(user)) { + throw new HttpException('Operation not permitted', 403); + } + const isSyncRunning = await fs.access(assetSyncFile).then(() => true).catch(() => false); + if (isSyncRunning) { + res.status(204).end(); + return; + } + + const writeProgress = (progress: number): Promise => { + const state: AssetSyncState = { progress: parseFloat(progress.toFixed(3)) }; + const data = JSON.stringify(state); + return fs.writeFile(assetSyncFile, data, { encoding: 'utf-8' }); + } + + await writeProgress(0); + setTimeout(async () => { + await this.assetSearchService.syncWithDatabase(writeProgress); + await fs.rm(assetSyncFile); + }); + res.status(204).end(); + } + // @Post('find-assets-by-polygon') // async findAssetsByPolygon(@Body() polygon: [number, number][]) { // const e = await this.appService.findAssetsByPolygon(polygon)(); @@ -98,7 +174,6 @@ export class AppController { const e = await this.appService.getFile(maybeFileId.right)(); if (E.isLeft(e)) { - console.log(JSON.stringify(e.left)); throw new HttpException(e.left.message, 500); } const result = e.right; @@ -113,3 +188,9 @@ export class AppController { e.right.stream.pipe(res); } } + +const assetSyncFile = './asset-sync-progress.tmp.json'; + +interface AssetSyncState { + progress: number +} diff --git a/apps/server-asset-sg/src/app/app.module.ts b/apps/server-asset-sg/src/app/app.module.ts index 8d48a702..94a4eb33 100644 --- a/apps/server-asset-sg/src/app/app.module.ts +++ b/apps/server-asset-sg/src/app/app.module.ts @@ -1,4 +1,5 @@ import { HttpModule } from '@nestjs/axios'; +import { CacheModule } from '@nestjs/cache-manager'; import { MiddlewareConsumer, Module, NestModule } from '@nestjs/common'; import { ScheduleModule } from '@nestjs/schedule'; @@ -11,13 +12,17 @@ import { AssetEditService } from './asset-edit/asset-edit.service'; import { ContactEditController } from './contact-edit/contact-edit.controller'; import { ContactEditService } from './contact-edit/contact-edit.service'; import { JwtMiddleware } from './jwt/jwt-middleware'; +import { OAuthController } from './oauth-config/oauth-config.controller'; import { OcrController } from './ocr/ocr.controller'; import { PrismaService } from './prisma/prisma.service'; +import { AssetRepo } from './repos/asset.repo'; +import { AssetSearchService } from './search/asset-search-service'; +import { provideElasticsearch } from './search/elasticsearch'; import { UserController } from './user/user.controller'; import { UserService } from './user/user.service'; @Module({ - imports: [HttpModule, ScheduleModule.forRoot()], + imports: [HttpModule, ScheduleModule.forRoot(), CacheModule.register()], controllers: [ AppController, AdminController, @@ -25,11 +30,22 @@ import { UserService } from './user/user.service'; AssetEditController, ContactEditController, OcrController, + OAuthController, + ], + providers: [ + provideElasticsearch, + AppService, + AdminService, + PrismaService, + UserService, + AssetEditService, + ContactEditService, + AssetRepo, + AssetSearchService, ], - providers: [AppService, AdminService, PrismaService, UserService, AssetEditService, ContactEditService], }) export class AppModule implements NestModule { configure(consumer: MiddlewareConsumer) { - consumer.apply(JwtMiddleware).exclude('api/ocr/(.*)').forRoutes('*'); + consumer.apply(JwtMiddleware).exclude('api/oauth-config/config', 'api/ocr/(.*)').forRoutes('*'); } } diff --git a/apps/server-asset-sg/src/app/app.service.spec.ts b/apps/server-asset-sg/src/app/app.service.spec.ts deleted file mode 100644 index 063c2830..00000000 --- a/apps/server-asset-sg/src/app/app.service.spec.ts +++ /dev/null @@ -1,21 +0,0 @@ -import { Test } from '@nestjs/testing'; - -import { AppService } from './app.service'; - -describe('AppService', () => { - let service: AppService; - - beforeAll(async () => { - const app = await Test.createTestingModule({ - providers: [AppService], - }).compile(); - - service = app.get(AppService); - }); - - describe('getData', () => { - it('should return "Welcome to api!"', () => { - expect(service.getData()).toEqual({ message: 'Welcome to api!' }); - }); - }); -}); diff --git a/apps/server-asset-sg/src/app/app.service.ts b/apps/server-asset-sg/src/app/app.service.ts index 11be8624..3999a881 100644 --- a/apps/server-asset-sg/src/app/app.service.ts +++ b/apps/server-asset-sg/src/app/app.service.ts @@ -1,15 +1,12 @@ import { Injectable } from '@nestjs/common'; -import { Prisma } from '@prisma/client'; import { sequenceS } from 'fp-ts/Apply'; import * as A from 'fp-ts/Array'; -import * as E from 'fp-ts/Either'; import { contramap } from 'fp-ts/Eq'; import { Lazy, flow, pipe } from 'fp-ts/function'; import * as NEA from 'fp-ts/NonEmptyArray'; import * as N from 'fp-ts/number'; import * as O from 'fp-ts/Option'; import * as RR from 'fp-ts/ReadonlyRecord'; -import * as R from 'fp-ts/Record'; import * as S from 'fp-ts/string'; import * as TE from 'fp-ts/TaskEither'; import * as C from 'io-ts/Codec'; @@ -22,8 +19,6 @@ import { DateId, DateIdFromDate, SearchAssetResult, - SearchAssetResultCodec, - SearchAssetResultOutput, UsageCode, makeUsageCode, } from '@asset-sg/shared'; @@ -31,20 +26,17 @@ import { import { notFoundError } from './errors'; import { getFile } from './file/get-file'; import { AssetDetailFromPostgres } from './models/AssetDetailFromPostgres'; -import { - SearchAssetElasticResult, - SearchAssetElasticResultDecoder, - SearchResultsElasticData, -} from './models/SearchAssetElasticResult'; import { postgresStudiesByAssetId } from './postgres-studies/postgres-studies'; import { PrismaService } from './prisma/prisma.service'; -import { createElasticSearchClient } from './search/elastic-search-client'; +import { AssetSearchService } from './search/asset-search-service'; import { findAssetsByPolygon } from './search/find-assets-by-polygon'; -import { searchAssets } from './search/find-assets-by-search-text'; @Injectable() export class AppService { - constructor(private readonly prismaService: PrismaService) {} + constructor( + private readonly prismaService: PrismaService, + private readonly assetSearchService: AssetSearchService, + ) {} async getData(polygon: [number, number][]) { const polygonParam = polygon.map(point => `${point[0]} ${point[1]}`).join(','); @@ -72,7 +64,7 @@ export class AppService { return getFile(this.prismaService, fileId); } - searchAssets2(query: unknown): TE.TaskEither { + searchAssets(query: unknown): TE.TaskEither { return pipe( TE.fromEither(AssetSearchParams.decode(query)), TE.mapLeft(e => new Error(D.draw(e))), @@ -88,15 +80,15 @@ export class AppService { findAssetsByPolygon(this.prismaService, a.polygon), TE.chainW( SearchAssetResult.matchStrict({ - SearchAssetResultNonEmpty: result => - searchAssets( - this.prismaService, - normaliseSearchString(searchText), - pipe( - O.some(result.assets), - O.map(assets => assets.map(asset => asset.assetId)), - ), - ), + SearchAssetResultNonEmpty: (result) => ( + TE.tryCatch( + () => this.assetSearchService.search(searchText, { + scope: ['titlePublic', 'titleOriginal', 'contactNames'], + assetIds: result.assets.map(asset => asset.assetId), + }), + unknownToError, + ) + ), SearchAssetResultEmpty: TE.of, }), ), @@ -217,169 +209,7 @@ export class AppService { // where asset_id=${assetId}}`, // ); // } - - searchAssets(searchString: string): TE.TaskEither { - const client = createElasticSearchClient(); - - const searchAssetElasticResult = pipe( - TE.tryCatch( - () => - client.search({ - index: 'swissgeol_asset_asset', - size: 10000, - query: { - bool: { - must: { - query_string: { - query: normaliseSearchString(searchString), - fields: ['titlePublic', 'titleOriginal', 'contactNames', 'sgsId'], - }, - }, - }, - }, - aggs: { - authorIds: { terms: { field: 'authorIds', size: 1000 } }, - minCreateDate: { min: { field: 'createDate' } }, - maxCreateDate: { max: { field: 'createDate' } }, - assetKindItemCodes: { terms: { field: 'assetKindItemCode' } }, - manCatLabelItemCodes: { terms: { field: 'manCatLabelItemCodes' } }, - languageItemCodes: { terms: { field: 'languageItemCode' } }, - usageCodes: { terms: { field: 'usageCode' } }, - }, - fields: ['assetId'], - _source: false, - }), - unknownToError, - ), - TE.chainW( - flow( - SearchAssetElasticResultDecoder.decode, - E.mapLeft(e => new Error(D.draw(e))), - TE.fromEither, - ), - ), - ); - - const queryDb = (elasticResults: SearchResultsElasticData) => - pipe( - elasticResults.hits.hits.map(a => a.fields.assetId), - TE.of, - TE.chain(assetIds => - TE.tryCatch( - () => this.prismaService.$queryRaw` - select - a.asset_id as "assetId", - a.title_public as "titlePublic", - a.create_date as "createDate", - a.asset_kind_item_code as "assetKindItemCode", - a.asset_format_item_code as "assetFormatItemCode", - a.language_item_code as "languageItemCode", - mclr.man_cat_label_item_code as "manCatLabelItemCode", - ac.contact_id as "contactId", - ac.role as "contactRole", - ius.is_available as "internalUse", - pus.is_available as "publicUse", - s.study_id as "studyId", - s.geom_text as "studyGeomText" - from - asset a - inner join - internal_use ius - on ius.internal_use_id = a.internal_use_id - inner join - public_use pus - on pus.public_use_id = a.public_use_id - left join - all_study s - on s.asset_id = a.asset_id - left join - asset_contact ac - on ac.asset_id = a.asset_id - left join - man_cat_label_ref mclr - on ac.asset_id = mclr.asset_id - where - a.asset_id in (${Prisma.join(assetIds)}) - `, - unknownToError, - ), - ), - TE.chainW( - flow( - DBResultList.decode, - E.mapLeft(e => new Error(D.draw(e))), - TE.fromEither, - ), - ), - ); - - const combineResults = (elasticResults: SearchResultsElasticData, dbResults: DBResultList) => - SearchAssetResultCodec.encode({ - _tag: 'SearchAssetResultNonEmpty', - aggregations: { - ranges: { - createDate: { - min: elasticResults.aggregations.minCreateDate, - max: elasticResults.aggregations.maxCreateDate, - }, - }, - buckets: { - authorIds: elasticResults.aggregations.authorIds.buckets.map(a => ({ - key: a.key, - count: a.doc_count, - })), - languageItemCodes: elasticResults.aggregations.languageItemCodes.buckets.map(a => ({ - key: a.key, - count: a.doc_count, - })), - usageCodes: elasticResults.aggregations.usageCodes.buckets.map(a => ({ - key: a.key, - count: a.doc_count, - })), - assetKindItemCodes: elasticResults.aggregations.assetKindItemCodes.buckets.map(a => ({ - key: a.key, - count: a.doc_count, - })), - manCatLabelItemCodes: elasticResults.aggregations.manCatLabelItemCodes.buckets.map(a => ({ - key: a.key, - count: a.doc_count, - })), - }, - }, - assets: pipe( - dbResults, - A.map(a => [String(a.assetId), a] as const), - RR.fromEntries, - assetsRecord => - pipe( - elasticResults.hits.hits, - A.map(a => - pipe( - R.lookup(String(a.fields.assetId), assetsRecord), - O.map(asset => ({ ...asset, score: a._score })), - ), - ), - A.compact, - ), - ), - }); - - return pipe( - searchAssetElasticResult, - TE.chain( - SearchAssetElasticResult.match({ - SearchAssetElasticResultEmpty: () => - TE.of({ _tag: 'SearchAssetResultEmpty' } as SearchAssetResultOutput), - SearchAssetElasticResultNonEmpty: data => - pipe( - queryDb(data), - TE.map(dbResults => combineResults(data, dbResults)), - ), - }), - ), - ); - } - + getReferenceData() { const qt = (f: Lazy>, key: K, newKey: string) => pipe( @@ -550,28 +380,3 @@ const dbResultRawToDBResult = (dbResultRawList: NEA.NonEmptyArray): usageCode: makeUsageCode(publicUse, internalUse), }; }; - -const dbResultsRawListToDBResultList = (dbResultRawList: DBResultRawList): Array => - pipe( - dbResultRawList, - NEA.groupBy(x => String(x.assetId)), - R.map(dbResultRawToDBResult), - R.toArray, - A.map(([, dbResult]) => dbResult), - ); -const DBResultList = pipe(DBResultRawList, D.map(dbResultsRawListToDBResultList)); -type DBResultList = D.TypeOf; - -const normaliseSearchString = (searchString: string) => { - const replaceForSearchStringNormalisation: [RegExp, string][] = [ - [/title(_*)public:/i, 'titlePublic:'], - [/title(_*)original:/i, 'titleOriginal:'], - [/contact(_*)name(s*):/i, 'contactNames:'], - [/sgs(_*)id:/i, 'sgsId:'], - ]; - - return replaceForSearchStringNormalisation.reduce( - (acc, [regex, replacement]) => acc.replace(regex, replacement), - searchString, - ); -}; diff --git a/apps/server-asset-sg/src/app/asset-edit/asset-edit.controller.ts b/apps/server-asset-sg/src/app/asset-edit/asset-edit.controller.ts index df74a637..3f9f112e 100644 --- a/apps/server-asset-sg/src/app/asset-edit/asset-edit.controller.ts +++ b/apps/server-asset-sg/src/app/asset-edit/asset-edit.controller.ts @@ -17,52 +17,49 @@ import { FileInterceptor } from '@nestjs/platform-express'; import * as E from 'fp-ts/Either'; import { pipe } from 'fp-ts/function'; import * as TE from 'fp-ts/TaskEither'; -import * as D from 'io-ts/Decoder'; -import { DT, decodeError } from '@asset-sg/core'; -import { PatchAsset, isEditor } from '@asset-sg/shared'; +import { DT, decodeError, unknownToError } from '@asset-sg/core'; +import { AssetByTitle, PatchAsset, isEditor } from '@asset-sg/shared'; -import { isNotFoundError, permissionDeniedError } from '../errors'; +import { permissionDeniedError } from '../errors'; import { AuthenticatedRequest } from '../models/request'; +import { AssetRepo } from '../repos/asset.repo'; +import { AssetSearchService } from '../search/asset-search-service'; import { UserService } from '../user/user.service'; -import { AssetEditService } from './asset-edit.service'; +import { AssetEditDetail, AssetEditService } from './asset-edit.service'; + @Controller('asset-edit') export class AssetEditController { - constructor(private readonly assetEditService: AssetEditService, private readonly userService: UserService) {} + constructor( + private readonly assetRepo: AssetRepo, + private readonly assetEditService: AssetEditService, + private readonly assetSearchService: AssetSearchService, + private readonly userService: UserService, + ) {} @Get('search') - async searchForAssetByTitle(@Query('title') title: string) { - const maybeTitle = D.string.decode(title); - if (E.isLeft(maybeTitle)) { - throw new HttpException(D.draw(maybeTitle.left), 400); - } - - const e = await this.assetEditService.searchForAssetByTitle(title)(); - if (E.isLeft(e)) { - console.error(e.left); - throw new HttpException(e.left.message, 500); + async searchForAssetByTitle(@Query('title') title: string): Promise { + try { + return await this.assetSearchService.searchByTitle(title); + } catch (e) { + throw new HttpException(unknownToError(e).message, 500); } - return e.right; } @Get(':assetId') - async getAsset(@Param('assetId') assetId: string) { - const maybeAssetId = DT.IntFromString.decode(assetId); - if (E.isLeft(maybeAssetId)) { - throw new HttpException(D.draw(maybeAssetId.left), 400); + async getAsset(@Param('assetId') assetId: string): Promise { + const id = parseInt(assetId); + if (isNaN(id)) { + throw new HttpException('Resource not found', 404); } - - const e = await this.assetEditService.getAsset(maybeAssetId.right)(); - if (E.isLeft(e)) { - console.error(e.left); - if (isNotFoundError(e.left)) { - throw new HttpException('Resource not found', 400); - } - throw new HttpException(e.left.message, 500); + console.log(id); + const asset = await this.assetRepo.find(id); + if (asset === null) { + throw new HttpException('Resource not found', 404); } - return e.right; + return AssetEditDetail.encode(asset) } @Put() @@ -79,9 +76,9 @@ export class AssetEditController { )(); if (E.isLeft(e)) { console.error(e.left); - if (e.left._tag === 'decodeError') { - throw new HttpException(e.left.message, 400); - } + // if (e.left._tag === 'decodeError') { + // throw new HttpException(e.left.message, 400); + // } throw new HttpException(e.left.message, 500); } return e.right; @@ -113,9 +110,9 @@ export class AssetEditController { )(); if (E.isLeft(e)) { console.error(e.left); - if (e.left._tag === 'decodeError') { - throw new HttpException(e.left.message, 400); - } + // if (e.left._tag === 'decodeError') { + // throw new HttpException(e.left.message, 400); + // } throw new HttpException(e.left.message, 500); } return e.right; @@ -140,9 +137,9 @@ export class AssetEditController { )(); if (E.isLeft(e)) { console.error(e.left); - if (e.left._tag === 'decodeError') { - throw new HttpException(e.left.message, 400); - } + // if (e.left._tag === 'decodeError') { + // throw new HttpException(e.left.message, 400); + // } throw new HttpException(e.left.message, 500); } return e.right; @@ -163,9 +160,9 @@ export class AssetEditController { )(); if (E.isLeft(e)) { console.error(e.left); - if (e.left._tag === 'decodeError') { - throw new HttpException(e.left.message, 400); - } + // if (e.left._tag === 'decodeError') { + // throw new HttpException(e.left.message, 400); + // } throw new HttpException(e.left.message, 500); } return e.right; diff --git a/apps/server-asset-sg/src/app/asset-edit/asset-edit.fake.ts b/apps/server-asset-sg/src/app/asset-edit/asset-edit.fake.ts new file mode 100644 index 00000000..412b7666 --- /dev/null +++ b/apps/server-asset-sg/src/app/asset-edit/asset-edit.fake.ts @@ -0,0 +1,83 @@ +import { faker } from '@faker-js/faker'; +import * as O from 'fp-ts/Option'; + +import { AssetUsage, PatchAsset, User, UserRoleEnum, dateIdFromDate } from '@asset-sg/shared'; + +import { fakeAssetFormatItemCode } from '../../../../../test/data/asset-format-item'; +import { fakeAssetKindItemCode } from '../../../../../test/data/asset-kind-item'; +import { fakeLanguageItemCode } from '../../../../../test/data/language-items'; + +import { AssetEditDetail } from './asset-edit.service'; + +let nextUniqueId = 0 +const fakeIdNumber = (): number => nextUniqueId++; + +const define = (value: T): T => value; + +const fakeAssetUsage = (): AssetUsage => ({ + isAvailable: faker.datatype.boolean(), + startAvailabilityDate: O.fromNullable(faker.helpers.maybe(() => dateIdFromDate(faker.date.past()))), + statusAssetUseItemCode: faker.helpers.arrayElement(['tobechecked', 'underclarification', 'approved']), +}); + +export const fakeUser = () => define({ + email: faker.internet.email(), + id: faker.string.uuid(), + lang: faker.helpers.fromRegExp(/[a-z]{2}/), + role: faker.helpers.arrayElement(Object.values(UserRoleEnum)), +}) + +export const fakeAssetPatch = (): PatchAsset => ({ + assetContacts: [], + assetFormatItemCode: fakeAssetFormatItemCode(), + assetKindItemCode: fakeAssetKindItemCode(), + assetMainId: O.none, + createDate: dateIdFromDate(faker.date.past()), + ids: [], + internalUse: fakeAssetUsage(), + publicUse: fakeAssetUsage(), + isNatRel: false, + languageItemCode: fakeLanguageItemCode(), + manCatLabelRefs: [], + newStatusWorkItemCode: O.none, + newStudies: [], + receiptDate: dateIdFromDate(faker.date.past()), + siblingAssetIds: [], + studies: [], + titleOriginal: faker.music.songName(), + titlePublic: faker.commerce.productName(), + typeNatRels: [], +}) + +export const fakeAssetEditDetail = (): AssetEditDetail => ({ + assetId: fakeIdNumber(), + sgsId: faker.number.int({ min: 1 }), + titleOriginal: faker.music.songName(), + titlePublic: faker.commerce.productName(), + assetContacts: [], + assetFiles: [], + assetFormatCompositions: [], + assetFormatItemCode: fakeAssetFormatItemCode(), + assetKindItemCode: fakeAssetKindItemCode(), + assetMain: O.none, + createDate: dateIdFromDate(faker.date.past()), + geolAuxDataInfo: faker.hacker.phrase(), + geolContactDataInfo: faker.vehicle.manufacturer(), + geolDataInfo: faker.word.words({ count: { min: 4, max: 25 } }), + ids: [], + internalUse: fakeAssetUsage(), + publicUse: fakeAssetUsage(), + isNatRel: false, + languageItemCode: fakeLanguageItemCode(), + lastProcessedDate: new Date(), + manCatLabelRefs: [], + municipality: '', + processor: '', + receiptDate: dateIdFromDate(faker.date.past()), + siblingXAssets: [], + siblingYAssets: [], + statusWorks: [], + studies: [], + subordinateAssets: [], + typeNatRels: [], +}) diff --git a/apps/server-asset-sg/src/app/asset-edit/asset-edit.service.ts b/apps/server-asset-sg/src/app/asset-edit/asset-edit.service.ts index cfa3c20e..a8753e8c 100644 --- a/apps/server-asset-sg/src/app/asset-edit/asset-edit.service.ts +++ b/apps/server-asset-sg/src/app/asset-edit/asset-edit.service.ts @@ -1,36 +1,17 @@ -import { basename } from 'node:path'; - import { Injectable } from '@nestjs/common'; -import { Contact } from '@prisma/client'; -import * as A from 'fp-ts/Array'; import { pipe } from 'fp-ts/function'; -import * as O from 'fp-ts/Option'; import * as TE from 'fp-ts/TaskEither'; import * as C from 'io-ts/Codec'; -import { decodeError, isNotNil, sequenceProps, unknownToUnknownError } from '@asset-sg/core'; -import { - BaseAssetEditDetail, - DateIdFromDate, - ElasticSearchAsset, - PatchAsset, - User, - dateFromDateId, -} from '@asset-sg/shared'; +import { isNotNull, unknownToUnknownError } from '@asset-sg/core'; +import { BaseAssetEditDetail, PatchAsset, User } from '@asset-sg/shared'; import { notFoundError } from '../errors'; import { deleteFile } from '../file/delete-file'; import { putFile } from '../file/put-file'; -import { AssetEditDetailFromPostgres } from '../models/asset-edit-detail'; -import { - createStudies, - deleteStudies, - postgresStudiesByAssetId, - updateStudies, -} from '../postgres-studies/postgres-studies'; import { PrismaService } from '../prisma/prisma.service'; -import { createElasticSearchClient } from '../search/elastic-search-client'; -import { searchAssetsByTitle } from '../search/find-assets-by-title'; +import { AssetRepo } from '../repos/asset.repo'; +import { AssetSearchService } from '../search/asset-search-service'; export const AssetEditDetail = C.struct({ ...BaseAssetEditDetail, @@ -40,360 +21,35 @@ export type AssetEditDetail = C.TypeOf; @Injectable() export class AssetEditService { - constructor(private readonly prismaService: PrismaService) {} + constructor( + private readonly assetRepo: AssetRepo, + private readonly prismaService: PrismaService, + private readonly assetSearchService: AssetSearchService, + ) {} - private _getAsset(assetId: number) { + public createAsset(user: User, patch: PatchAsset) { return pipe( TE.tryCatch( - () => - this.prismaService.asset.findUnique({ - where: { assetId }, - select: { - assetId: true, - titlePublic: true, - titleOriginal: true, - createDate: true, - receiptDate: true, - lastProcessedDate: true, - processor: true, - assetKindItemCode: true, - assetFormatItemCode: true, - languageItemCode: true, - internalUse: true, - publicUse: true, - isNatRel: true, - sgsId: true, - geolDataInfo: true, - geolContactDataInfo: true, - geolAuxDataInfo: true, - municipality: true, - ids: true, - assetContacts: { select: { role: true, contactId: true } }, - manCatLabelRefs: { select: { manCatLabelItemCode: true } }, - assetFormatCompositions: { select: { assetFormatItemCode: true } }, - typeNatRels: { select: { natRelItemCode: true } }, - assetMain: { select: { assetId: true, titlePublic: true } }, - subordinateAssets: { select: { assetId: true, titlePublic: true } }, - siblingXAssets: { select: { assetY: { select: { assetId: true, titlePublic: true } } } }, - siblingYAssets: { select: { assetX: { select: { assetId: true, titlePublic: true } } } }, - statusWorks: { select: { statusWorkItemCode: true, statusWorkDate: true } }, - assetFiles: { select: { file: true } }, - }, - }), + () => this.assetRepo.create({ user, patch }), unknownToUnknownError, ), - TE.chainW(TE.fromPredicate(isNotNil, notFoundError)), - TE.chainW(a => - pipe( - postgresStudiesByAssetId(this.prismaService, a.assetId), - TE.mapLeft(unknownToUnknownError), - TE.map(studies => ({ ...a, studies })), - ), - ), - TE.chainW(a => pipe(TE.fromEither(AssetEditDetailFromPostgres.decode(a)), TE.mapLeft(decodeError))), + TE.chain(({ assetId }) => TE.tryCatch(() => this.assetRepo.find(assetId), unknownToUnknownError)), + TE.chainW(TE.fromPredicate(isNotNull, notFoundError)), + TE.tap((asset) => ( + TE.tryCatch(() => this.assetSearchService.register(asset), unknownToUnknownError) + )), + TE.map((asset) => AssetEditDetail.encode(asset)), ); } - public getAsset(assetId: number) { - return pipe(this._getAsset(assetId), TE.map(AssetEditDetail.encode)); - } - public searchForAssetByTitle(title: string) { - return pipe(searchAssetsByTitle(title)); - } - - public createAsset(user: User, patchAsset: PatchAsset) { + public updateAsset(user: User, assetId: number, patch: PatchAsset) { return pipe( - TE.tryCatch( - () => - this.prismaService.asset.create({ - data: { - titlePublic: patchAsset.titlePublic, - titleOriginal: patchAsset.titleOriginal, - createDate: DateIdFromDate.encode(patchAsset.createDate), - receiptDate: DateIdFromDate.encode(patchAsset.receiptDate), - assetKindItem: { connect: { assetKindItemCode: patchAsset.assetKindItemCode } }, - assetFormatItem: { connect: { assetFormatItemCode: patchAsset.assetFormatItemCode } }, - languageItem: { connect: { languageItemCode: patchAsset.languageItemCode } }, - isExtract: false, - isNatRel: patchAsset.isNatRel, - lastProcessedDate: new Date(), - processor: user.email, - manCatLabelRefs: { - createMany: { - data: patchAsset.manCatLabelRefs.map(manCatLabelItemCode => ({ - manCatLabelItemCode, - })), - skipDuplicates: true, - }, - }, - assetContacts: { - createMany: { data: patchAsset.assetContacts, skipDuplicates: true }, - }, - ids: { - createMany: { - data: pipe(patchAsset.ids.map(({ id, description }) => ({ id, description }))), - }, - }, - typeNatRels: { - createMany: { - data: patchAsset.typeNatRels.map(natRelItemCode => ({ natRelItemCode })), - skipDuplicates: true, - }, - }, - internalUse: { - create: { - isAvailable: patchAsset.internalUse.isAvailable, - statusAssetUseItemCode: patchAsset.internalUse.statusAssetUseItemCode, - startAvailabilityDate: pipe( - patchAsset.internalUse.startAvailabilityDate, - O.map(dateFromDateId), - O.toNullable, - ), - }, - }, - publicUse: { - create: { - isAvailable: patchAsset.publicUse.isAvailable, - statusAssetUseItemCode: patchAsset.publicUse.statusAssetUseItemCode, - startAvailabilityDate: pipe( - patchAsset.publicUse.startAvailabilityDate, - O.map(dateFromDateId), - O.toNullable, - ), - }, - }, - statusWorks: { - create: { - statusWorkDate: new Date(), - statusWorkItemCode: 'initiateAsset', - }, - }, - }, - }), - unknownToUnknownError, - ), - TE.chain(({ assetId }) => this._getAsset(assetId)), - TE.bindTo('asset'), - TE.bindW('contacts', () => TE.tryCatch(() => this.prismaService.contact.findMany(), unknownToUnknownError)), - TE.bindW('elasticSearchResult', ({ asset, contacts }) => - TE.tryCatch( - () => - createElasticSearchClient().bulk({ - refresh: true, - operations: [ - { index: { _index: 'swissgeol_asset_asset', _id: asset.assetId } }, - createElasticSearchAsset(asset, contacts), - ], - }), - unknownToUnknownError, - ), - ), - TE.map(({ asset }) => AssetEditDetail.encode(asset)), - ); - } - - public updateAsset(user: User, assetId: number, patchAsset: PatchAsset) { - return pipe( - TE.tryCatch( - () => - this.prismaService.assetXAssetY.findMany({ - where: { OR: [{ assetXId: assetId }, { assetYId: assetId }] }, - }), - unknownToUnknownError, - ), - TE.map(dbSiblingAssets => - dbSiblingAssets.filter( - a => - !patchAsset.siblingAssetIds.includes(a.assetXId) && - !patchAsset.siblingAssetIds.includes(a.assetYId), - ), - ), - TE.chain(dbSiblingAssetsToDelete => - pipe( - dbSiblingAssetsToDelete, - A.map(({ assetXId, assetYId }) => - TE.tryCatch( - () => - this.prismaService.assetXAssetY.delete({ - where: { assetXId_assetYId: { assetXId, assetYId } }, - }), - unknownToUnknownError, - ), - ), - A.sequence(TE.ApplicativeSeq), - ), - ), - TE.chain(() => - TE.tryCatch( - () => - this.prismaService.assetXAssetY.createMany({ - data: patchAsset.siblingAssetIds.map(assetYId => ({ assetXId: assetId, assetYId })), - skipDuplicates: true, - }), - unknownToUnknownError, - ), - ), - TE.chain(() => - TE.tryCatch( - () => - this.prismaService.asset.update({ - where: { assetId }, - data: { - titlePublic: patchAsset.titlePublic, - titleOriginal: patchAsset.titleOriginal, - createDate: DateIdFromDate.encode(patchAsset.createDate), - receiptDate: DateIdFromDate.encode(patchAsset.receiptDate), - assetKindItemCode: patchAsset.assetKindItemCode, - assetFormatItemCode: patchAsset.assetFormatItemCode, - languageItemCode: patchAsset.languageItemCode, - isNatRel: patchAsset.isNatRel, - assetMainId: O.toUndefined(patchAsset.assetMainId), - lastProcessedDate: new Date(), - processor: user.email, - manCatLabelRefs: { - deleteMany: {}, - createMany: { - data: patchAsset.manCatLabelRefs.map(manCatLabelItemCode => ({ - manCatLabelItemCode, - })), - skipDuplicates: true, - }, - }, - assetContacts: { - deleteMany: {}, - createMany: { data: patchAsset.assetContacts, skipDuplicates: true }, - }, - ids: { - deleteMany: { - NOT: pipe( - patchAsset.ids, - A.map(id => id.idId), - A.compact, - A.map(idId => ({ idId })), - ), - }, - upsert: [ - ...pipe( - patchAsset.ids, - A.map(id => sequenceProps(id, 'idId')), - A.compact, - A.map(id => ({ where: { idId: id.idId }, create: id, update: id })), - ), - ...pipe( - patchAsset.ids, - A.filter(id => O.isNone(id.idId)), - A.map(id => ({ - where: { idId: -1 }, - create: { id: id.id, description: id.description }, - update: {}, - })), - ), - ], - }, - typeNatRels: { - deleteMany: {}, - createMany: { - data: patchAsset.typeNatRels.map(natRelItemCode => ({ natRelItemCode })), - skipDuplicates: true, - }, - }, - }, - }), - unknownToUnknownError, - ), - ), - TE.chain(() => - TE.tryCatch( - () => - this.prismaService.asset.update({ - where: { assetId }, - data: { - internalUse: { - update: { - isAvailable: patchAsset.internalUse.isAvailable, - statusAssetUseItemCode: patchAsset.internalUse.statusAssetUseItemCode, - startAvailabilityDate: pipe( - patchAsset.internalUse.startAvailabilityDate, - O.map(dateFromDateId), - O.toNullable, - ), - }, - }, - publicUse: { - update: { - isAvailable: patchAsset.publicUse.isAvailable, - statusAssetUseItemCode: patchAsset.publicUse.statusAssetUseItemCode, - startAvailabilityDate: pipe( - patchAsset.publicUse.startAvailabilityDate, - O.map(dateFromDateId), - O.toNullable, - ), - }, - }, - }, - }), - unknownToUnknownError, - ), - ), - TE.chainW(() => - pipe( - patchAsset.newStatusWorkItemCode, - O.map(workstatusItemCode => - TE.tryCatch( - () => - this.prismaService.asset.update({ - where: { assetId }, - data: { - statusWorks: { - create: { - statusWorkDate: new Date(), - statusWorkItemCode: workstatusItemCode, - }, - }, - }, - }), - unknownToUnknownError, - ), - ), - O.getOrElseW(() => TE.right(undefined)), - ), - ), - TE.chain(() => - TE.tryCatch( - () => - this.prismaService.assetXAssetY.createMany({ - data: patchAsset.siblingAssetIds.map(assetYId => ({ assetXId: assetId, assetYId })), - skipDuplicates: true, - }), - unknownToUnknownError, - ), - ), - TE.chain(() => updateStudies(this.prismaService, patchAsset.studies)), - TE.chain(() => - deleteStudies( - this.prismaService, - assetId, - patchAsset.studies.map(s => s.studyId), - ), - ), - TE.chain(() => createStudies(this.prismaService, assetId, patchAsset.newStudies)), - TE.chain(() => this._getAsset(assetId)), - TE.bindTo('asset'), - TE.bindW('contacts', () => TE.tryCatch(() => this.prismaService.contact.findMany(), unknownToUnknownError)), - TE.bindW('elasticSearchResult', ({ asset, contacts }) => - TE.tryCatch( - () => - createElasticSearchClient().bulk({ - refresh: true, - operations: [ - { index: { _index: 'swissgeol_asset_asset', _id: asset.assetId } }, - createElasticSearchAsset(asset, contacts), - ], - }), - unknownToUnknownError, - ), - ), - TE.map(({ asset }) => AssetEditDetail.encode(asset)), + TE.tryCatch(() => this.assetRepo.update(assetId, { user, patch }), unknownToUnknownError), + TE.chainW(TE.fromPredicate(isNotNull, notFoundError)), + TE.tap((asset) => ( + TE.tryCatch(() => this.assetSearchService.register(asset), unknownToUnknownError) + )), + TE.map((asset) => AssetEditDetail.encode(asset)), ); } @@ -430,15 +86,15 @@ export class AssetEditService { const d = new Date(); return file ? fileNameWithoutTs + - '_' + - d.getFullYear() + - (d.getMonth() + 1).toString().padStart(2, '0') + - d.getDate().toString().padStart(2, '0') + - d.getHours().toString().padStart(2, '0') + - d.getMinutes().toString().padStart(2, '0') + - d.getSeconds().toString().padStart(2, '0') + - '.' + - fileExtension + '_' + + d.getFullYear() + + (d.getMonth() + 1).toString().padStart(2, '0') + + d.getDate().toString().padStart(2, '0') + + d.getHours().toString().padStart(2, '0') + + d.getMinutes().toString().padStart(2, '0') + + d.getSeconds().toString().padStart(2, '0') + + '.' + + fileExtension : fileName; }), TE.bindTo('_fileName'), @@ -499,31 +155,3 @@ export class AssetEditService { ); } } - -const createElasticSearchAsset = (asset: AssetEditDetailFromPostgres, contacts: Contact[]): ElasticSearchAsset => ({ - assetId: asset.assetId, - titlePublic: asset.titlePublic, - titleOriginal: asset.titleOriginal, - sgsId: asset.sgsId, - createDate: asset.createDate, - assetKindItemCode: asset.assetKindItemCode, - languageItemCode: asset.languageItemCode, - usageCode: asset.publicUse.isAvailable ? 'public' : asset.internalUse.isAvailable ? 'internal' : 'useOnRequest', - authorIds: pipe( - asset.assetContacts, - A.filter(c => c.role === 'author'), - A.map(c => c.contactId), - ), - contactNames: pipe( - asset.assetContacts, - A.map(c => - pipe( - contacts, - A.findFirst(contact => contact.contactId === c.contactId), - ), - ), - A.compact, - A.map(contact => contact.name), - ), - manCatLabelItemCodes: asset.manCatLabelRefs, -}); diff --git a/apps/server-asset-sg/src/app/contact-edit/contact-edit.controller.ts b/apps/server-asset-sg/src/app/contact-edit/contact-edit.controller.ts index ff77e315..a95d479d 100644 --- a/apps/server-asset-sg/src/app/contact-edit/contact-edit.controller.ts +++ b/apps/server-asset-sg/src/app/contact-edit/contact-edit.controller.ts @@ -30,9 +30,9 @@ export class ContactEditController { if (E.isLeft(e)) { console.error(e.left); - if (e.left._tag === 'decodeError') { - throw new HttpException(e.left.message, 400); - } + // if (e.left._type === 'decodeError') { + // throw new HttpException(e.left.message, 400); + // } throw new HttpException(e.left.message, 500); } return e.right; @@ -58,9 +58,9 @@ export class ContactEditController { if (E.isLeft(e)) { console.error(e.left); - if (e.left._tag === 'decodeError') { - throw new HttpException(e.left.message, 400); - } + // if (e.left._tag === 'decodeError') { + // throw new HttpException(e.left.message, 400); + // } throw new HttpException(e.left.message, 500); } return e.right; diff --git a/apps/server-asset-sg/src/app/contact-edit/contact-edit.service.spec.ts b/apps/server-asset-sg/src/app/contact-edit/contact-edit.service.spec.ts new file mode 100644 index 00000000..d2f7eed7 --- /dev/null +++ b/apps/server-asset-sg/src/app/contact-edit/contact-edit.service.spec.ts @@ -0,0 +1,107 @@ +import { Test, TestingModule } from '@nestjs/testing'; +import { left, right } from 'fp-ts/Either'; + +import { Contact, PatchContact } from '@asset-sg/shared'; + +import { PrismaService } from '../prisma/prisma.service'; + +import { ContactEditService } from './contact-edit.service'; + + +jest.mock('../prisma/prisma.service'); + +const mockPatchContact: PatchContact = { + name: 'John Doe', + street: '123 Main Street', + houseNumber: '1A', + plz: '12345', + locality: 'City', + country: 'Country', + telephone: '123-456-7890', + email: 'john.doe@example.com', + website: 'www.example.com', + contactKindItemCode: '123' +}; +const mockContact: Contact = { + id: 1, + contactKindItemCode: '123', + name: 'John Doe', + street: '123 Main Street', + houseNumber: '1A', + plz: '12345', + locality: 'City', + country: 'Country', + telephone: '123-456-7890', + email: 'john.doe@example.com', + website: 'www.example.com' +}; + +const mockPrisma = { + contact: {} +}; + + +describe('ContactEditService', () => { + let service: ContactEditService; + let prismaService: PrismaService; + + beforeEach(async () => { + const module: TestingModule = await Test.createTestingModule({ + providers: [ + ContactEditService, + { + provide: PrismaService, + useValue: mockPrisma, + }, + ], + }).compile(); + + service = module.get(ContactEditService); + prismaService = module.get(PrismaService); + + }); + + it('should be defined', () => { + expect(service).toBeDefined(); + }); + + it('should create a contact', async () => { + prismaService.contact.create = jest.fn().mockResolvedValue(mockContact); + + const result = await service.createContact(mockPatchContact)(); + + expect(result).toEqual(right(mockContact)); + expect(prismaService.contact.create).toHaveBeenCalledWith({ data: mockPatchContact }); + }); + + it('should update a contact', async () => { + const mockContactId = 1; + + prismaService.contact.update = jest.fn().mockResolvedValue(mockPatchContact); + prismaService.contact.findFirstOrThrow = jest.fn().mockResolvedValue(mockContact); + + const result = await service.updateContact(mockContactId, mockContact)(); + + expect(result).toEqual(right(mockContact)); + expect(prismaService.contact.update).toHaveBeenCalledWith({ where: { contactId: mockContactId }, data: mockContact }); + }); + + it('should handle errors when creating a contact', async () => { + prismaService.contact.create = jest.fn().mockRejectedValue(new Error('Test error')); + + const result = await service.createContact(mockContact)(); + + expect(result).toEqual(left(new Error())); + expect(prismaService.contact.create).toHaveBeenCalledWith({ data: mockContact }); + }); + + it('should handle errors when updating a contact', async () => { + const mockContactId = 1; + prismaService.contact.update = jest.fn().mockRejectedValue(new Error('Test error')); + + const result = await service.updateContact(mockContactId, mockContact)(); + + expect(result).toEqual(left(new Error())); + expect(prismaService.contact.update).toHaveBeenCalledWith({ where: { contactId: mockContactId }, data: mockContact }); + }); +}); \ No newline at end of file diff --git a/apps/server-asset-sg/src/app/contact-edit/contact-edit.service.ts b/apps/server-asset-sg/src/app/contact-edit/contact-edit.service.ts index d3cfc531..8e98a16c 100644 --- a/apps/server-asset-sg/src/app/contact-edit/contact-edit.service.ts +++ b/apps/server-asset-sg/src/app/contact-edit/contact-edit.service.ts @@ -1,4 +1,5 @@ import { Injectable } from '@nestjs/common'; +import { Contact as DbContact } from '@prisma/client'; import { pipe } from 'fp-ts/function'; import * as TE from 'fp-ts/TaskEither'; @@ -14,7 +15,7 @@ export class ContactEditService { public createContact(contact: PatchContact) { return pipe( TE.tryCatch(() => this.prismaService.contact.create({ data: contact }), unknownToUnknownError), - TE.map(contact => { + TE.map((contact: DbContact) => { const { contactId: id, ...rest } = contact; return Contact.encode({ id, ...rest }); }), diff --git a/apps/server-asset-sg/src/app/jwt/jwt-middleware.ts b/apps/server-asset-sg/src/app/jwt/jwt-middleware.ts index b78dd794..a61ca5d0 100644 --- a/apps/server-asset-sg/src/app/jwt/jwt-middleware.ts +++ b/apps/server-asset-sg/src/app/jwt/jwt-middleware.ts @@ -1,30 +1,150 @@ -import { HttpException, Injectable, NestMiddleware } from '@nestjs/common'; +import { CACHE_MANAGER } from '@nestjs/cache-manager'; +import { Inject, Injectable, NestMiddleware } from '@nestjs/common'; +import axios from 'axios'; +import { Cache } from 'cache-manager'; import { NextFunction, Request, Response } from 'express'; import * as E from 'fp-ts/Either'; import { pipe } from 'fp-ts/function'; -import { assert } from 'tsafe'; - -import { isTruthy } from '@asset-sg/core'; +import * as TE from 'fp-ts/TaskEither'; +import * as jwt from 'jsonwebtoken'; +import { Jwt, JwtPayload } from 'jsonwebtoken'; +import * as jwkToPem from 'jwk-to-pem'; import { AuthenticatedRequest } from '../models/request'; -import { jwtFromCookie } from './jwt'; - -export const cookieKey = 'asset-sg-access-token'; - @Injectable() export class JwtMiddleware implements NestMiddleware { - use(req: Request, _res: Response, next: NextFunction) { - const jwtSecret = process.env['GOTRUE_JWT_SECRET']; - assert(isTruthy(jwtSecret), 'GOTRUE_JWT_SECRET is not defined'); - const result = pipe(req.headers.cookie, jwtFromCookie(cookieKey, jwtSecret)); + constructor(@Inject(CACHE_MANAGER) private cacheManager: Cache) {} + + async use(req: Request, _res: Response, next: NextFunction) { + // Get JWK from cache if exists, otherwise fetch from issuer and set to cache for 1 minute + const cachedJwk = await this.getJwkFromCache()(); + const jwk = E.isRight(cachedJwk) ? cachedJwk : await this.getJwkTE()(); + await this.cacheManager.set('jwk', E.isRight(jwk) ? jwk.right : [], 60 * 1000); + + const token = this.extractTokenFromHeaderE(req); + // Decode token, check groups permission, get JWK, convert JWK to PEM, and verify token + const result = pipe( + token, + E.chain(this.decodeTokenE), + E.chain(this.isAuthorizedByGroupE), + E.chain(decoded => + pipe( + jwk, + E.chain(jwk => this.getSigningKeyE(decoded, jwk)), + ), + ), + this.jwkToPemE, + E.chain(pem => this.verifyToken(token, pem)), + ); + + // Set accessToken and jwtPayload to request if verification is successful if (E.isRight(result)) { - // eslint-disable-next-line @typescript-eslint/no-explicit-any (req as AuthenticatedRequest).accessToken = result.right.accessToken; - (req as AuthenticatedRequest).jwtPayload = result.right.jwtPayload; + (req as AuthenticatedRequest).jwtPayload = result.right.jwtPayload as JwtPayload; next(); } else { - throw new HttpException('Unauthorised', 401); + _res.status(403).json({ error: result.left.message }); } } + + private getJwkFromCache(): TE.TaskEither { + return pipe( + TE.tryCatch( + () => this.cacheManager.get('jwk'), + reason => new Error(`${reason}`), + ), + TE.chain(cache => (cache ? TE.right(cache as JwksKey[]) : TE.left(new Error('No cache found')))), + ); + } + + private extractTokenFromHeaderE(request: Request): E.Either { + const [type, token] = request.headers.authorization?.split(' ') ?? []; + return pipe( + token, + E.fromNullable(new Error('No token found')), + E.chain( + E.fromPredicate( + () => type === 'Bearer', + () => new Error('Invalid token type'), + ), + ), + ); + } + + private decodeTokenE(token: string): E.Either { + return pipe( + E.tryCatch(() => jwt.decode(token, { complete: true }), E.toError), + E.chain(decoded => + decoded !== null ? E.right(decoded) : E.left(new Error('Token decoding resulted in null')), + ), + ); + } + + private isAuthorizedByGroupE(jwt: Jwt): E.Either { + const authorizedGroups = process.env.OAUTH_AUTHORIZED_GROUPS?.split(',').map(group => group.trim().toLowerCase()) + if (!authorizedGroups) { + return E.left(new Error('An internal server error occurred. Please try again.')); + } + const userGroups = (jwt.payload as JwtPayload)['cognito:groups'].map(((group: string) => group.trim().toLowerCase())) as string[]; + const isUserAuthorized = userGroups.some(group => authorizedGroups.includes(group)); + return isUserAuthorized ? E.right(jwt) : E.left(new Error('You are not authorized to access this resource')); + } + + private getJwkTE(): TE.TaskEither { + return pipe( + TE.tryCatch( + () => axios.get(`${process.env.OAUTH_ISSUER}/.well-known/jwks.json`), + reason => new Error(`${reason}`), + ), + TE.map(response => response.data.keys), + ); + } + + + + private getSigningKeyE(decoded: Jwt, jwks: JwksKey[]): E.Either { + return pipe( + jwks.find((key: any) => key.kid === decoded.header.kid), + signingKey => (signingKey ? E.right(signingKey) : E.left(new Error('Matching object not found'))), + ); + } + + private jwkToPemE(signingKey: E.Either): E.Either { + return pipe( + signingKey, + E.chain(signingKeyObject => + E.tryCatch( + () => jwkToPem(signingKeyObject as jwkToPem.JWK), // Attempt to convert JWK to PEM + error => new Error(`Failed to convert JWK to PEM: ${error}`), // Catch and wrap any errors + ), + ), + ); + } + + private verifyToken( + token: E.Either, + pem: string, + ): E.Either< + Error, + { + accessToken: string; + jwtPayload: string | JwtPayload; + } + > { + return pipe( + token, + E.chain(tokenString => + pipe( + E.tryCatch( + () => jwt.verify(tokenString, pem, { algorithms: ['RS256'] }), + (err: unknown) => new Error(`Invalid token: ${(err as Error).message}`), + ), + E.map(verified => ({ accessToken: tokenString, jwtPayload: verified })), + ), + ), + ); + } } + +interface JwksKey {} // TODO implement JwksKey interface diff --git a/apps/server-asset-sg/src/app/jwt/jwt.ts b/apps/server-asset-sg/src/app/jwt/jwt.ts index 6afd63f7..ff6b6e8e 100644 --- a/apps/server-asset-sg/src/app/jwt/jwt.ts +++ b/apps/server-asset-sg/src/app/jwt/jwt.ts @@ -1,33 +1,14 @@ -import * as A from 'fp-ts/Array'; import * as E from 'fp-ts/Either'; -import { flow, pipe } from 'fp-ts/function'; -import * as R from 'fp-ts/ReadonlyRecord'; -import * as D from 'io-ts/Decoder'; import * as jwt from 'jsonwebtoken'; -export const jwtFromCookie = (cookieKey: string, jwtSecret: string) => (reqHeaderCookie: unknown) => - pipe( - reqHeaderCookie, - E.fromNullable('No cookie header' as const), - E.chainW( - flow( - D.string.decode, - E.chain( - flow( - a => a.split(';'), - A.map(c => c.trim().split('=')), - A.map(([k, v]) => [k, v] as const), - R.fromEntries, - E.of, - E.chainW(D.struct({ [cookieKey]: D.string }).decode), - E.map(a => a[cookieKey]), - E.bindTo('accessToken'), - E.bindW('jwtPayload', ({ accessToken }) => verifyJwt(jwtSecret)(accessToken)), - ), - ), - ), - ), - ); +export const jwtFromToken = (token: string, jwtSecret: string) => { + const decoded = jwt.decode(token, { complete: true }); + console.log('decoded', decoded); + if (decoded?.payload) { + console.log('verify', jwt.verify(token, jwtSecret, { algorithms: ['HS256'], complete: true })); + } + return decoded; +}; const verifyJwt = (jwtSecret: string) => (token: string) => E.tryCatch( diff --git a/apps/server-asset-sg/src/app/oauth-config/oauth-config.controller.ts b/apps/server-asset-sg/src/app/oauth-config/oauth-config.controller.ts new file mode 100644 index 00000000..9747ae0b --- /dev/null +++ b/apps/server-asset-sg/src/app/oauth-config/oauth-config.controller.ts @@ -0,0 +1,16 @@ +import { Controller, Get } from '@nestjs/common'; + +@Controller('oauth-config') +export class OAuthController { + @Get('config') + getConfig() { + return { + oauth_issuer: process.env.OAUTH_ISSUER, + oauth_clientId: process.env.OAUTH_CLIENT_ID, + oauth_scope: process.env.OAUTH_SCOPE, + oauth_responseType: process.env.OAUTH_RESPONSE_TYPE, + oauth_showDebugInformation: !!process.env.OAUTH_SHOW_DEBUG_INFORMATION, + oauth_tokenEndpoint: process.env.OAUTH_TOKEN_ENDPOINT, + }; + } +} diff --git a/apps/server-asset-sg/src/app/prisma/migrations/20240318103937_update_user_schema/migration.sql b/apps/server-asset-sg/src/app/prisma/migrations/20240318103937_update_user_schema/migration.sql new file mode 100644 index 00000000..892af1f5 --- /dev/null +++ b/apps/server-asset-sg/src/app/prisma/migrations/20240318103937_update_user_schema/migration.sql @@ -0,0 +1,19 @@ +/* + Warnings: + + - Added the required column `email` to the `asset_user` table without a default value. This is not possible if the table is not empty. + - Added the required column `lang` to the `asset_user` table without a default value. This is not possible if the table is not empty. + - Added the required column `oidcId` to the `asset_user` table without a default value. This is not possible if the table is not empty. + +*/ +-- DropForeignKey +ALTER TABLE "public"."asset_user" DROP CONSTRAINT "asset_user_id_fkey"; + +-- AlterTable +ALTER TABLE "auth"."users" ALTER COLUMN "confirmed_at" DROP EXPRESSION; + +-- AlterTable +DELETE FROM "public"."asset_user"; +ALTER TABLE "public"."asset_user" ADD COLUMN "email" TEXT NOT NULL, +ADD COLUMN "lang" TEXT NOT NULL, +ADD COLUMN "oidcId" TEXT NOT NULL; diff --git a/apps/server-asset-sg/src/app/prisma/schema.prisma b/apps/server-asset-sg/src/app/prisma/schema.prisma index 4dbe36eb..d9060338 100644 --- a/apps/server-asset-sg/src/app/prisma/schema.prisma +++ b/apps/server-asset-sg/src/app/prisma/schema.prisma @@ -1,793 +1,810 @@ generator client { - provider = "prisma-client-js" - output = "../../../../../node_modules/.prisma/client" - previewFeatures = ["multiSchema"] + provider = "prisma-client-js" + output = "../../../../../node_modules/.prisma/client" + previewFeatures = ["multiSchema", "views"] } datasource db { - provider = "postgresql" - url = env("DATABASE_URL") - schemas = ["public", "auth"] + provider = "postgresql" + url = env("DATABASE_URL") + shadowDatabaseUrl = env("SHADOW_DATABASE_URL") + schemas = ["public", "auth"] } // start gotrue schema model audit_log_entries { - instance_id String? @db.Uuid - id String @id @db.Uuid - payload Json? @db.Json - created_at DateTime? @db.Timestamptz(6) - ip_address String @default("") @db.VarChar(64) + instance_id String? @db.Uuid + id String @id @db.Uuid + payload Json? @db.Json + created_at DateTime? @db.Timestamptz(6) + ip_address String @default("") @db.VarChar(64) - @@index([instance_id], map: "audit_logs_instance_id_idx") - @@schema("auth") + @@index([instance_id], map: "audit_logs_instance_id_idx") + @@schema("auth") } model identities { - id String - user_id String @db.Uuid - identity_data Json - provider String - last_sign_in_at DateTime? @db.Timestamptz(6) - created_at DateTime? @db.Timestamptz(6) - updated_at DateTime? @db.Timestamptz(6) - users users @relation(fields: [user_id], references: [id], onDelete: Cascade, onUpdate: NoAction) + id String + user_id String @db.Uuid + identity_data Json + provider String + last_sign_in_at DateTime? @db.Timestamptz(6) + created_at DateTime? @db.Timestamptz(6) + updated_at DateTime? @db.Timestamptz(6) + users users @relation(fields: [user_id], references: [id], onDelete: Cascade, onUpdate: NoAction) - @@id([provider, id]) - @@index([user_id]) - @@schema("auth") + @@id([provider, id]) + @@index([user_id]) + @@schema("auth") } model instances { - id String @id @db.Uuid - uuid String? @db.Uuid - raw_base_config String? - created_at DateTime? @db.Timestamptz(6) - updated_at DateTime? @db.Timestamptz(6) + id String @id @db.Uuid + uuid String? @db.Uuid + raw_base_config String? + created_at DateTime? @db.Timestamptz(6) + updated_at DateTime? @db.Timestamptz(6) - @@schema("auth") + @@schema("auth") } model refresh_tokens { - instance_id String? @db.Uuid - id BigInt @id @default(autoincrement()) - token String? @unique(map: "refresh_tokens_token_unique") @db.VarChar(255) - user_id String? @db.VarChar(255) - revoked Boolean? - created_at DateTime? @db.Timestamptz(6) - updated_at DateTime? @db.Timestamptz(6) - parent String? @db.VarChar(255) - refresh_tokens refresh_tokens? @relation("refresh_tokensTorefresh_tokens", fields: [parent], references: [token], onDelete: NoAction, onUpdate: NoAction) - other_refresh_tokens refresh_tokens[] @relation("refresh_tokensTorefresh_tokens") - - @@index([instance_id]) - @@index([instance_id, user_id]) - @@index([parent]) - @@index([token]) - @@schema("auth") + instance_id String? @db.Uuid + id BigInt @id @default(autoincrement()) + token String? @unique(map: "refresh_tokens_token_unique") @db.VarChar(255) + user_id String? @db.VarChar(255) + revoked Boolean? + created_at DateTime? @db.Timestamptz(6) + updated_at DateTime? @db.Timestamptz(6) + parent String? @db.VarChar(255) + refresh_tokens refresh_tokens? @relation("refresh_tokensTorefresh_tokens", fields: [parent], references: [token], onDelete: NoAction, onUpdate: NoAction) + other_refresh_tokens refresh_tokens[] @relation("refresh_tokensTorefresh_tokens") + + @@index([instance_id]) + @@index([instance_id, user_id]) + @@index([parent]) + @@index([token]) + @@schema("auth") } model schema_migrations { - version String @unique(map: "schema_migrations_version_idx") @db.VarChar(14) + version String @unique(map: "schema_migrations_version_idx") @db.VarChar(14) - @@schema("auth") + @@schema("auth") } model users { - instance_id String? @db.Uuid - id String @id @db.Uuid - aud String? @db.VarChar(255) - role String? @db.VarChar(255) - email String? @unique @db.VarChar(255) - encrypted_password String? @db.VarChar(255) - email_confirmed_at DateTime? @db.Timestamptz(6) - invited_at DateTime? @db.Timestamptz(6) - confirmation_token String? @db.VarChar(255) - confirmation_sent_at DateTime? @db.Timestamptz(6) - recovery_token String? @db.VarChar(255) - recovery_sent_at DateTime? @db.Timestamptz(6) - email_change_token_new String? @db.VarChar(255) - email_change String? @db.VarChar(255) - email_change_sent_at DateTime? @db.Timestamptz(6) - last_sign_in_at DateTime? @db.Timestamptz(6) - raw_app_meta_data Json? - raw_user_meta_data Json? - is_super_admin Boolean? - created_at DateTime? @db.Timestamptz(6) - updated_at DateTime? @db.Timestamptz(6) - phone String? @unique @db.VarChar(15) - phone_confirmed_at DateTime? @db.Timestamptz(6) - phone_change String? @default("") @db.VarChar(15) - phone_change_token String? @default("") @db.VarChar(255) - phone_change_sent_at DateTime? @db.Timestamptz(6) - confirmed_at DateTime? @db.Timestamptz(6) - // confirmed_at DateTime? @default(dbgenerated("LEAST(email_confirmed_at, phone_confirmed_at)")) @db.Timestamptz(6) - email_change_token_current String? @default("") @db.VarChar(255) - email_change_confirm_status Int? @default(0) @db.SmallInt - banned_until DateTime? @db.Timestamptz(6) - reauthentication_token String? @default("") @db.VarChar(255) - reauthentication_sent_at DateTime? @db.Timestamptz(6) - identities identities[] - AssetUser AssetUser? - - @@index([instance_id]) - @@schema("auth") + instance_id String? @db.Uuid + id String @id @db.Uuid + aud String? @db.VarChar(255) + role String? @db.VarChar(255) + email String? @unique @db.VarChar(255) + encrypted_password String? @db.VarChar(255) + email_confirmed_at DateTime? @db.Timestamptz(6) + invited_at DateTime? @db.Timestamptz(6) + confirmation_token String? @db.VarChar(255) + confirmation_sent_at DateTime? @db.Timestamptz(6) + recovery_token String? @db.VarChar(255) + recovery_sent_at DateTime? @db.Timestamptz(6) + email_change_token_new String? @db.VarChar(255) + email_change String? @db.VarChar(255) + email_change_sent_at DateTime? @db.Timestamptz(6) + last_sign_in_at DateTime? @db.Timestamptz(6) + raw_app_meta_data Json? + raw_user_meta_data Json? + is_super_admin Boolean? + created_at DateTime? @db.Timestamptz(6) + updated_at DateTime? @db.Timestamptz(6) + phone String? @unique @db.VarChar(15) + phone_confirmed_at DateTime? @db.Timestamptz(6) + phone_change String? @default("") @db.VarChar(15) + phone_change_token String? @default("") @db.VarChar(255) + phone_change_sent_at DateTime? @db.Timestamptz(6) + confirmed_at DateTime? @db.Timestamptz(6) + // confirmed_at DateTime? @default(dbgenerated("LEAST(email_confirmed_at, phone_confirmed_at)")) @db.Timestamptz(6) + email_change_token_current String? @default("") @db.VarChar(255) + email_change_confirm_status Int? @default(0) @db.SmallInt + banned_until DateTime? @db.Timestamptz(6) + reauthentication_token String? @default("") @db.VarChar(255) + reauthentication_sent_at DateTime? @db.Timestamptz(6) + identities identities[] + + @@index([instance_id]) + @@schema("auth") } // end gotrue schema model Asset { - assetId Int @id @default(autoincrement()) @map("asset_id") - titlePublic String @map("title_public") - titleOriginal String? @map("title_original") - isNatRel Boolean @map("is_nat_rel") - receiptDate DateTime @map("receipt_date") - municipality String? @map("municipality") - url String? @map("url") - locationAnalog String? @map("location_analog") - processor String? @map("processor") - lastProcessedDate DateTime @map("last_processed_date") - textBody String? @map("text_body") - sgsId Int? @map("sgs_id") - geolDataInfo String? @map("geol_data_info") - geolContactDataInfo String? @map("geol_contact_data_info") - geolAuxDataInfo String? @map("geol_aux_data_info") - remark String? @map("remark") - assetKindItemCode String @map("asset_kind_item_code") - assetKindItem AssetKindItem @relation(fields: [assetKindItemCode], references: [assetKindItemCode]) - createDate DateTime @map("create_date") - languageItemCode String @map("language_item_code") - languageItem LanguageItem @relation(fields: [languageItemCode], references: [languageItemCode]) - assetFormatItemCode String @map("asset_format_item_code") - assetFormatItem AssetFormatItem @relation(fields: [assetFormatItemCode], references: [assetFormatItemCode]) - authorBiblio String? @map("author_biblio_id") - sourceProject String? @map("source_project") - description String? @map("description") - isExtract Boolean @map("is_extract") - internalUseId Int @map("internal_use_id") - internalUse InternalUse @relation(fields: [internalUseId], references: [internalUseId]) - publicUseId Int @map("public_use_id") - publicUse PublicUse @relation(fields: [publicUseId], references: [publicUseId]) - assetMainId Int? @map("asset_main_id") - assetMain Asset? @relation(name: "asset", fields: [assetMainId], references: [assetId]) - - assetContacts AssetContact[] - assetFiles AssetFile[] - assetFormatCompositions AssetFormatComposition[] - assetKindCompositions AssetKindComposition[] - assetPublications AssetPublication[] - autoCats AutoCat[] - ids Id[] - legalDocs LegalDoc[] - manCatLabelRefs ManCatLabelRef[] - statusWorks StatusWork[] - studyAreas StudyArea[] - studyLocations StudyLocation[] - studyTraces StudyTrace[] - typeNatRels TypeNatRel[] - - siblingXAssets AssetXAssetY[] @relation("sibling_x_asset") - siblingYAssets AssetXAssetY[] @relation("sibling_y_asset") - - assetInternalProjects AssetInternalProject[] - subordinateAssets Asset[] @relation("asset") - AssetUserFavourite AssetUserFavourite[] - - @@map("asset") - @@schema("public") + assetId Int @id @default(autoincrement()) @map("asset_id") + titlePublic String @map("title_public") + titleOriginal String? @map("title_original") + isNatRel Boolean @map("is_nat_rel") + receiptDate DateTime @map("receipt_date") + municipality String? @map("municipality") + url String? @map("url") + locationAnalog String? @map("location_analog") + processor String? @map("processor") + lastProcessedDate DateTime @map("last_processed_date") + textBody String? @map("text_body") + sgsId Int? @map("sgs_id") + geolDataInfo String? @map("geol_data_info") + geolContactDataInfo String? @map("geol_contact_data_info") + geolAuxDataInfo String? @map("geol_aux_data_info") + remark String? @map("remark") + assetKindItemCode String @map("asset_kind_item_code") + assetKindItem AssetKindItem @relation(fields: [assetKindItemCode], references: [assetKindItemCode]) + createDate DateTime @map("create_date") + languageItemCode String @map("language_item_code") + languageItem LanguageItem @relation(fields: [languageItemCode], references: [languageItemCode]) + assetFormatItemCode String @map("asset_format_item_code") + assetFormatItem AssetFormatItem @relation(fields: [assetFormatItemCode], references: [assetFormatItemCode]) + authorBiblio String? @map("author_biblio_id") + sourceProject String? @map("source_project") + description String? @map("description") + isExtract Boolean @map("is_extract") + internalUseId Int @map("internal_use_id") + internalUse InternalUse @relation(fields: [internalUseId], references: [internalUseId]) + publicUseId Int @map("public_use_id") + publicUse PublicUse @relation(fields: [publicUseId], references: [publicUseId]) + assetMainId Int? @map("asset_main_id") + assetMain Asset? @relation(name: "asset", fields: [assetMainId], references: [assetId]) + + assetContacts AssetContact[] + assetFiles AssetFile[] + assetFormatCompositions AssetFormatComposition[] + assetKindCompositions AssetKindComposition[] + assetPublications AssetPublication[] + autoCats AutoCat[] + ids Id[] + legalDocs LegalDoc[] + manCatLabelRefs ManCatLabelRef[] + statusWorks StatusWork[] + studyAreas StudyArea[] + studyLocations StudyLocation[] + studyTraces StudyTrace[] + typeNatRels TypeNatRel[] + + siblingXAssets AssetXAssetY[] @relation("sibling_x_asset") + siblingYAssets AssetXAssetY[] @relation("sibling_y_asset") + + assetInternalProjects AssetInternalProject[] + subordinateAssets Asset[] @relation("asset") + AssetUserFavourite AssetUserFavourite[] + allStudies AllStudy[] + + @@map("asset") + @@schema("public") } model Id { - idId Int @id @default(autoincrement()) @map("id_id") - assetId Int @map("asset_id") - asset Asset @relation(fields: [assetId], references: [assetId]) - id String @map("id") - description String @map("description") + idId Int @id @default(autoincrement()) @map("id_id") + assetId Int @map("asset_id") + asset Asset @relation(fields: [assetId], references: [assetId]) + id String @map("id") + description String @map("description") - @@map("id") - @@schema("public") + @@map("id") + @@schema("public") } model AssetXAssetY { - assetXId Int @map("asset_x_id") - assetX Asset @relation("sibling_x_asset", fields: [assetXId], references: [assetId]) + assetXId Int @map("asset_x_id") + assetX Asset @relation("sibling_x_asset", fields: [assetXId], references: [assetId]) - assetYId Int @map("asset_y_id") - assetY Asset @relation("sibling_y_asset", fields: [assetYId], references: [assetId]) + assetYId Int @map("asset_y_id") + assetY Asset @relation("sibling_y_asset", fields: [assetYId], references: [assetId]) - @@id([assetXId, assetYId]) - @@map("asset_x_asset_y") - @@schema("public") + @@id([assetXId, assetYId]) + @@map("asset_x_asset_y") + @@schema("public") } model InternalUse { - internalUseId Int @id @default(autoincrement()) @map("internal_use_id") - isAvailable Boolean @map("is_available") - statusAssetUseItemCode String @map("status_asset_use_item_code") - statusAssetUseItem StatusAssetUseItem @relation(fields: [statusAssetUseItemCode], references: [statusAssetUseItemCode]) - startAvailabilityDate DateTime? @map("start_availability_date") + internalUseId Int @id @default(autoincrement()) @map("internal_use_id") + isAvailable Boolean @map("is_available") + statusAssetUseItemCode String @map("status_asset_use_item_code") + statusAssetUseItem StatusAssetUseItem @relation(fields: [statusAssetUseItemCode], references: [statusAssetUseItemCode]) + startAvailabilityDate DateTime? @map("start_availability_date") - Asset Asset[] + Asset Asset[] - @@map("internal_use") - @@schema("public") + @@map("internal_use") + @@schema("public") } model PublicUse { - publicUseId Int @id @default(autoincrement()) @map("public_use_id") - isAvailable Boolean @map("is_available") - statusAssetUseItemCode String @map("status_asset_use_item_code") - statusAssetUseItem StatusAssetUseItem @relation(fields: [statusAssetUseItemCode], references: [statusAssetUseItemCode]) - startAvailabilityDate DateTime? @map("start_availability_date") + publicUseId Int @id @default(autoincrement()) @map("public_use_id") + isAvailable Boolean @map("is_available") + statusAssetUseItemCode String @map("status_asset_use_item_code") + statusAssetUseItem StatusAssetUseItem @relation(fields: [statusAssetUseItemCode], references: [statusAssetUseItemCode]) + startAvailabilityDate DateTime? @map("start_availability_date") - Asset Asset[] + Asset Asset[] - @@map("public_use") - @@schema("public") + @@map("public_use") + @@schema("public") } model AssetFile { - assetId Int @map("asset_id") - asset Asset @relation(fields: [assetId], references: [assetId]) - fileId Int @map("file_id") - file File @relation(fields: [fileId], references: [fileId], onDelete: Cascade) + assetId Int @map("asset_id") + asset Asset @relation(fields: [assetId], references: [assetId]) + fileId Int @map("file_id") + file File @relation(fields: [fileId], references: [fileId], onDelete: Cascade) - @@id([assetId, fileId]) - @@map("asset_file") - @@schema("public") + @@id([assetId, fileId]) + @@map("asset_file") + @@schema("public") } enum OcrState { - willNotBeProcessed - created - waiting - processing - error - success + willNotBeProcessed + created + waiting + processing + error + success - @@schema("public") + @@schema("public") } model File { - fileId Int @id @default(autoincrement()) @map("file_id") - fileName String @map("file_name") - ocrStatus OcrState @default(created) @map("ocr_status") - fileSize BigInt @map("file_size") - lastModified DateTime @map("file_date") + fileId Int @id @default(autoincrement()) @map("file_id") + fileName String @map("file_name") + ocrStatus OcrState @default(created) @map("ocr_status") + fileSize BigInt @map("file_size") + lastModified DateTime @map("file_date") - AssetObjectInfo AssetObjectInfo[] - AssetFile AssetFile[] + AssetObjectInfo AssetObjectInfo[] + AssetFile AssetFile[] - @@unique([fileName]) - @@map("file") - @@schema("public") + @@unique([fileName]) + @@map("file") + @@schema("public") } model AssetObjectInfo { - assetObjectInfoId Int @id @default(autoincrement()) @map("asset_object_info_id") - fileId Int @map("file_id") - file File @relation(fields: [fileId], references: [fileId]) - autoObjectCatItemCode String @map("auto_object_cat_item_code") - autoObjectCatItem AutoObjectCatItem @relation(fields: [autoObjectCatItemCode], references: [autoObjectCatItemCode]) - objectPage String @map("object_page") - objectBbox String @map("object_bbox") - objectScore String @map("object_score") - pathToImage String @map("path_to_image") + assetObjectInfoId Int @id @default(autoincrement()) @map("asset_object_info_id") + fileId Int @map("file_id") + file File @relation(fields: [fileId], references: [fileId]) + autoObjectCatItemCode String @map("auto_object_cat_item_code") + autoObjectCatItem AutoObjectCatItem @relation(fields: [autoObjectCatItemCode], references: [autoObjectCatItemCode]) + objectPage String @map("object_page") + objectBbox String @map("object_bbox") + objectScore String @map("object_score") + pathToImage String @map("path_to_image") - @@map("asset_object_info") - @@schema("public") + @@map("asset_object_info") + @@schema("public") } model ManCatLabelRef { - assetId Int @map("asset_id") - asset Asset @relation(fields: [assetId], references: [assetId]) - manCatLabelItemCode String @map("man_cat_label_item_code") - manCatLabelItem ManCatLabelItem @relation(fields: [manCatLabelItemCode], references: [manCatLabelItemCode]) + assetId Int @map("asset_id") + asset Asset @relation(fields: [assetId], references: [assetId]) + manCatLabelItemCode String @map("man_cat_label_item_code") + manCatLabelItem ManCatLabelItem @relation(fields: [manCatLabelItemCode], references: [manCatLabelItemCode]) - @@unique([assetId, manCatLabelItemCode]) - @@map("man_cat_label_ref") - @@schema("public") + @@unique([assetId, manCatLabelItemCode]) + @@map("man_cat_label_ref") + @@schema("public") } model AssetFormatComposition { - assetFormatCompositionId Int @id @default(autoincrement()) @map("asset_format_composition_id") - assetId Int @map("asset_id") - asset Asset @relation(fields: [assetId], references: [assetId]) - assetFormatItemCode String @map("asset_format_item_code") - assetFormatItem AssetFormatItem @relation(fields: [assetFormatItemCode], references: [assetFormatItemCode]) + assetFormatCompositionId Int @id @default(autoincrement()) @map("asset_format_composition_id") + assetId Int @map("asset_id") + asset Asset @relation(fields: [assetId], references: [assetId]) + assetFormatItemCode String @map("asset_format_item_code") + assetFormatItem AssetFormatItem @relation(fields: [assetFormatItemCode], references: [assetFormatItemCode]) - @@map("asset_format_composition") - @@schema("public") + @@map("asset_format_composition") + @@schema("public") } model AssetKindComposition { - assetKindCompositionId Int @id @default(autoincrement()) @map("asset_kind_composition_id") - assetId Int @map("asset_id") - asset Asset @relation(fields: [assetId], references: [assetId]) - assetKindItemCode String @map("asset_kind_item_code") - assetKindItem AssetKindItem @relation(fields: [assetKindItemCode], references: [assetKindItemCode]) + assetKindCompositionId Int @id @default(autoincrement()) @map("asset_kind_composition_id") + assetId Int @map("asset_id") + asset Asset @relation(fields: [assetId], references: [assetId]) + assetKindItemCode String @map("asset_kind_item_code") + assetKindItem AssetKindItem @relation(fields: [assetKindItemCode], references: [assetKindItemCode]) - @@map("asset_kind_composition") - @@schema("public") + @@map("asset_kind_composition") + @@schema("public") } model StatusWork { - statusWorkId Int @id @default(autoincrement()) @map("status_work_id") - assetId Int @map("asset_id") - asset Asset @relation(fields: [assetId], references: [assetId]) - statusWorkItemCode String @map("status_work_item_code") - statusWorkItem StatusWorkItem @relation(fields: [statusWorkItemCode], references: [statusWorkItemCode]) - statusWorkDate DateTime @map("status_work_date") - processor String? @map("processor") + statusWorkId Int @id @default(autoincrement()) @map("status_work_id") + assetId Int @map("asset_id") + asset Asset @relation(fields: [assetId], references: [assetId]) + statusWorkItemCode String @map("status_work_item_code") + statusWorkItem StatusWorkItem @relation(fields: [statusWorkItemCode], references: [statusWorkItemCode]) + statusWorkDate DateTime @map("status_work_date") + processor String? @map("processor") - @@map("status_work") - @@schema("public") + @@map("status_work") + @@schema("public") } model AutoCat { - autoCatId Int @id @default(autoincrement()) @map("auto_cat_id") - assetId Int @map("asset_id") - asset Asset @relation(fields: [assetId], references: [assetId]) - autoCatLabelItemCode String @map("auto_cat_label_item_code") - autoCatLabelItem AutoCatLabelItem @relation(fields: [autoCatLabelItemCode], references: [autoCatLabelItemCode]) - autoCatLabelScore Int @map("auto_cat_label_score") + autoCatId Int @id @default(autoincrement()) @map("auto_cat_id") + assetId Int @map("asset_id") + asset Asset @relation(fields: [assetId], references: [assetId]) + autoCatLabelItemCode String @map("auto_cat_label_item_code") + autoCatLabelItem AutoCatLabelItem @relation(fields: [autoCatLabelItemCode], references: [autoCatLabelItemCode]) + autoCatLabelScore Int @map("auto_cat_label_score") - @@map("auto_cat") - @@schema("public") + @@map("auto_cat") + @@schema("public") } model TypeNatRel { - typeNatRelId Int @id @default(autoincrement()) @map("type_nat_rel_id") - assetId Int @map("asset_id") - asset Asset @relation(fields: [assetId], references: [assetId]) - natRelItemCode String @map("nat_rel_item_code") - natRelItem NatRelItem @relation(fields: [natRelItemCode], references: [natRelItemCode]) + typeNatRelId Int @id @default(autoincrement()) @map("type_nat_rel_id") + assetId Int @map("asset_id") + asset Asset @relation(fields: [assetId], references: [assetId]) + natRelItemCode String @map("nat_rel_item_code") + natRelItem NatRelItem @relation(fields: [natRelItemCode], references: [natRelItemCode]) - @@map("type_nat_rel") - @@schema("public") + @@map("type_nat_rel") + @@schema("public") } model LegalDoc { - legalDocId Int @id @default(autoincrement()) @map("legal_doc_id") - assetId Int @map("asset_id") - asset Asset @relation(fields: [assetId], references: [assetId]) - title String @map("title") - legalDocItemCode String @map("legal_doc_item_code") - legalDocItem LegalDocItem @relation(fields: [legalDocItemCode], references: [legalDocItemCode]) + legalDocId Int @id @default(autoincrement()) @map("legal_doc_id") + assetId Int @map("asset_id") + asset Asset @relation(fields: [assetId], references: [assetId]) + title String @map("title") + legalDocItemCode String @map("legal_doc_item_code") + legalDocItem LegalDocItem @relation(fields: [legalDocItemCode], references: [legalDocItemCode]) - @@map("legal_doc") - @@schema("public") + @@map("legal_doc") + @@schema("public") } model Contact { - contactId Int @id @default(autoincrement()) @map("contact_id") - contactKindItemCode String @map("contact_kind_item_code") - contactKindItem ContactKindItem @relation(fields: [contactKindItemCode], references: [contactKindItemCode]) - name String @map("name") - street String? @map("street") - houseNumber String? @map("house_number") - plz String? @map("plz") - locality String? @map("locality") - country String? @map("country") - telephone String? @map("telephone") - email String? @map("email") - website String? @map("website") + contactId Int @id @default(autoincrement()) @map("contact_id") + contactKindItemCode String @map("contact_kind_item_code") + contactKindItem ContactKindItem @relation(fields: [contactKindItemCode], references: [contactKindItemCode]) + name String @map("name") + street String? @map("street") + houseNumber String? @map("house_number") + plz String? @map("plz") + locality String? @map("locality") + country String? @map("country") + telephone String? @map("telephone") + email String? @map("email") + website String? @map("website") - assetContacts AssetContact[] + assetContacts AssetContact[] - @@map("contact") - @@schema("public") + @@map("contact") + @@schema("public") } model AssetContact { - assetId Int @map("asset_id") - asset Asset @relation(fields: [assetId], references: [assetId]) - contactId Int @map("contact_id") - contact Contact @relation(fields: [contactId], references: [contactId]) - role String @map("role") + assetId Int @map("asset_id") + asset Asset @relation(fields: [assetId], references: [assetId]) + contactId Int @map("contact_id") + contact Contact @relation(fields: [contactId], references: [contactId]) + role String @map("role") - @@id([assetId, contactId, role]) - @@map("asset_contact") - @@schema("public") + @@id([assetId, contactId, role]) + @@map("asset_contact") + @@schema("public") } model Publication { - publicationId Int @id @default(autoincrement()) @map("publication_id") - pubChannelItemCode String @map("pub_channel_item_code") - pubChannelItem PubChannelItem @relation(fields: [pubChannelItemCode], references: [pubChannelItemCode]) - publicationDate DateTime @map("publication_date") - description String @map("description") - link String @map("link") + publicationId Int @id @default(autoincrement()) @map("publication_id") + pubChannelItemCode String @map("pub_channel_item_code") + pubChannelItem PubChannelItem @relation(fields: [pubChannelItemCode], references: [pubChannelItemCode]) + publicationDate DateTime @map("publication_date") + description String @map("description") + link String @map("link") - assetPublications AssetPublication[] + assetPublications AssetPublication[] - @@map("publication") - @@schema("public") + @@map("publication") + @@schema("public") } model AssetPublication { - assetId Int @map("asset_id") - asset Asset @relation(fields: [assetId], references: [assetId]) - publicationId Int @map("publication_id") - publication Publication @relation(fields: [publicationId], references: [publicationId]) + assetId Int @map("asset_id") + asset Asset @relation(fields: [assetId], references: [assetId]) + publicationId Int @map("publication_id") + publication Publication @relation(fields: [publicationId], references: [publicationId]) - @@id([assetId, publicationId]) - @@map("asset_publication") - @@schema("public") + @@id([assetId, publicationId]) + @@map("asset_publication") + @@schema("public") } model InternalProject { - internalProjectId Int @id @default(autoincrement()) @map("internal_project_id") - name String @map("name") - description String? @map("description") - dateDelivered String @map("date_delivered") + internalProjectId Int @id @default(autoincrement()) @map("internal_project_id") + name String @map("name") + description String? @map("description") + dateDelivered String @map("date_delivered") - assetInternalProjects AssetInternalProject[] + assetInternalProjects AssetInternalProject[] - @@map("internal_project") - @@schema("public") + @@map("internal_project") + @@schema("public") } model AssetInternalProject { - assetId Int @map("asset_id") - asset Asset @relation(fields: [assetId], references: [assetId]) - internalProjectId Int @map("internal_project_id") - internalProject InternalProject @relation(fields: [internalProjectId], references: [internalProjectId]) + assetId Int @map("asset_id") + asset Asset @relation(fields: [assetId], references: [assetId]) + internalProjectId Int @map("internal_project_id") + internalProject InternalProject @relation(fields: [internalProjectId], references: [internalProjectId]) - @@id([assetId, internalProjectId]) - @@map("asset_internal_project") - @@schema("public") + @@id([assetId, internalProjectId]) + @@map("asset_internal_project") + @@schema("public") } model StudyArea { - studyAreaId Int @id @default(autoincrement()) @map("study_area_id") - assetId Int @map("asset_id") - asset Asset @relation(fields: [assetId], references: [assetId]) - geomQualityItemCode String @map("geom_quality_item_code") - geomQualityItem GeomQualityItem @relation(fields: [geomQualityItemCode], references: [geomQualityItemCode]) - geom Unsupported("geometry")? + studyAreaId Int @id @default(autoincrement()) @map("study_area_id") + assetId Int @map("asset_id") + asset Asset @relation(fields: [assetId], references: [assetId]) + geomQualityItemCode String @map("geom_quality_item_code") + geomQualityItem GeomQualityItem @relation(fields: [geomQualityItemCode], references: [geomQualityItemCode]) + geom Unsupported("geometry")? - @@index([geom], type: Gist) - @@map("study_area") - @@schema("public") + @@index([geom], type: Gist) + @@map("study_area") + @@schema("public") } model StudyLocation { - studyLocationId Int @id @default(autoincrement()) @map("study_location_id") - assetId Int @map("asset_id") - asset Asset @relation(fields: [assetId], references: [assetId]) - geomQualityItemCode String @map("geom_quality_item_code") - geomQualityItem GeomQualityItem @relation(fields: [geomQualityItemCode], references: [geomQualityItemCode]) - geom Unsupported("geometry")? + studyLocationId Int @id @default(autoincrement()) @map("study_location_id") + assetId Int @map("asset_id") + asset Asset @relation(fields: [assetId], references: [assetId]) + geomQualityItemCode String @map("geom_quality_item_code") + geomQualityItem GeomQualityItem @relation(fields: [geomQualityItemCode], references: [geomQualityItemCode]) + geom Unsupported("geometry")? - @@index([geom], type: Gist) - @@map("study_location") - @@schema("public") + @@index([geom], type: Gist) + @@map("study_location") + @@schema("public") } model StudyTrace { - studyTraceId Int @id @default(autoincrement()) @map("study_trace_id") - assetId Int @map("asset_id") - asset Asset @relation(fields: [assetId], references: [assetId]) - geomQualityItemCode String @map("geom_quality_item_code") - geomQualityItem GeomQualityItem @relation(fields: [geomQualityItemCode], references: [geomQualityItemCode]) - geom Unsupported("geometry")? + studyTraceId Int @id @default(autoincrement()) @map("study_trace_id") + assetId Int @map("asset_id") + asset Asset @relation(fields: [assetId], references: [assetId]) + geomQualityItemCode String @map("geom_quality_item_code") + geomQualityItem GeomQualityItem @relation(fields: [geomQualityItemCode], references: [geomQualityItemCode]) + geom Unsupported("geometry")? - @@index([geom], type: Gist) - @@map("study_trace") - @@schema("public") + @@index([geom], type: Gist) + @@map("study_trace") + @@schema("public") } model AssetFormatItem { - assetFormatItemCode String @id @map("asset_format_item_code") - geolCode String @map("geol_code") - name String @map("name") - nameDe String @map("name_de") - nameFr String @map("name_fr") - nameRm String @map("name_rm") - nameIt String @map("name_it") - nameEn String @map("name_en") - description String @map("description") - descriptionDe String @map("description_de") - descriptionFr String @map("description_fr") - descriptionRm String @map("description_rm") - descriptionIt String @map("description_it") - descriptionEn String @map("description_en") - - assets Asset[] - assetFormatCompositions AssetFormatComposition[] - - @@map("asset_format_item") - @@schema("public") + assetFormatItemCode String @id @map("asset_format_item_code") + geolCode String @map("geol_code") + name String @map("name") + nameDe String @map("name_de") + nameFr String @map("name_fr") + nameRm String @map("name_rm") + nameIt String @map("name_it") + nameEn String @map("name_en") + description String @map("description") + descriptionDe String @map("description_de") + descriptionFr String @map("description_fr") + descriptionRm String @map("description_rm") + descriptionIt String @map("description_it") + descriptionEn String @map("description_en") + + assets Asset[] + assetFormatCompositions AssetFormatComposition[] + + @@map("asset_format_item") + @@schema("public") } model AssetKindItem { - assetKindItemCode String @id @map("asset_kind_item_code") - geolCode String @map("geol_code") - name String @map("name") - nameDe String @map("name_de") - nameFr String @map("name_fr") - nameRm String @map("name_rm") - nameIt String @map("name_it") - nameEn String @map("name_en") - description String @map("description") - descriptionDe String @map("description_de") - descriptionFr String @map("description_fr") - descriptionRm String @map("description_rm") - descriptionIt String @map("description_it") - descriptionEn String @map("description_en") - - assets Asset[] - assetKindCompositions AssetKindComposition[] - - @@map("asset_kind_item") - @@schema("public") + assetKindItemCode String @id @map("asset_kind_item_code") + geolCode String @map("geol_code") + name String @map("name") + nameDe String @map("name_de") + nameFr String @map("name_fr") + nameRm String @map("name_rm") + nameIt String @map("name_it") + nameEn String @map("name_en") + description String @map("description") + descriptionDe String @map("description_de") + descriptionFr String @map("description_fr") + descriptionRm String @map("description_rm") + descriptionIt String @map("description_it") + descriptionEn String @map("description_en") + + assets Asset[] + assetKindCompositions AssetKindComposition[] + + @@map("asset_kind_item") + @@schema("public") } model AutoCatLabelItem { - autoCatLabelItemCode String @id @map("asset_cat_label_item_code") - geolCode String @map("geol_code") - name String @map("name") - nameDe String @map("name_de") - nameFr String @map("name_fr") - nameRm String @map("name_rm") - nameIt String @map("name_it") - nameEn String @map("name_en") - description String @map("description") - descriptionDe String @map("description_de") - descriptionFr String @map("description_fr") - descriptionRm String @map("description_rm") - descriptionIt String @map("description_it") - descriptionEn String @map("description_en") - - autoCats AutoCat[] - - @@map("auto_cat_label_item") - @@schema("public") + autoCatLabelItemCode String @id @map("asset_cat_label_item_code") + geolCode String @map("geol_code") + name String @map("name") + nameDe String @map("name_de") + nameFr String @map("name_fr") + nameRm String @map("name_rm") + nameIt String @map("name_it") + nameEn String @map("name_en") + description String @map("description") + descriptionDe String @map("description_de") + descriptionFr String @map("description_fr") + descriptionRm String @map("description_rm") + descriptionIt String @map("description_it") + descriptionEn String @map("description_en") + + autoCats AutoCat[] + + @@map("auto_cat_label_item") + @@schema("public") } model AutoObjectCatItem { - autoObjectCatItemCode String @id @map("auto_object_cat_item_code") - geolCode String @map("geol_code") - name String @map("name") - nameDe String @map("name_de") - nameFr String @map("name_fr") - nameRm String @map("name_rm") - nameIt String @map("name_it") - nameEn String @map("name_en") - description String @map("description") - descriptionDe String @map("description_de") - descriptionFr String @map("description_fr") - descriptionRm String @map("description_rm") - descriptionIt String @map("description_it") - descriptionEn String @map("description_en") - - assetObjectInfos AssetObjectInfo[] - - @@map("auto_object_cat_item") - @@schema("public") + autoObjectCatItemCode String @id @map("auto_object_cat_item_code") + geolCode String @map("geol_code") + name String @map("name") + nameDe String @map("name_de") + nameFr String @map("name_fr") + nameRm String @map("name_rm") + nameIt String @map("name_it") + nameEn String @map("name_en") + description String @map("description") + descriptionDe String @map("description_de") + descriptionFr String @map("description_fr") + descriptionRm String @map("description_rm") + descriptionIt String @map("description_it") + descriptionEn String @map("description_en") + + assetObjectInfos AssetObjectInfo[] + + @@map("auto_object_cat_item") + @@schema("public") } model ContactKindItem { - contactKindItemCode String @id @map("contact_kind_item_code") - geolCode String @map("geol_code") - name String @map("name") - nameDe String @map("name_de") - nameFr String @map("name_fr") - nameRm String @map("name_rm") - nameIt String @map("name_it") - nameEn String @map("name_en") - description String @map("description") - descriptionDe String @map("description_de") - descriptionFr String @map("description_fr") - descriptionRm String @map("description_rm") - descriptionIt String @map("description_it") - descriptionEn String @map("description_en") - - contacts Contact[] - - @@map("contact_kind_item") - @@schema("public") + contactKindItemCode String @id @map("contact_kind_item_code") + geolCode String @map("geol_code") + name String @map("name") + nameDe String @map("name_de") + nameFr String @map("name_fr") + nameRm String @map("name_rm") + nameIt String @map("name_it") + nameEn String @map("name_en") + description String @map("description") + descriptionDe String @map("description_de") + descriptionFr String @map("description_fr") + descriptionRm String @map("description_rm") + descriptionIt String @map("description_it") + descriptionEn String @map("description_en") + + contacts Contact[] + + @@map("contact_kind_item") + @@schema("public") } model GeomQualityItem { - geomQualityItemCode String @id @map("geom_quality_item_code") - geolCode String @map("geol_code") - name String @map("name") - nameDe String @map("name_de") - nameFr String @map("name_fr") - nameRm String @map("name_rm") - nameIt String @map("name_it") - nameEn String @map("name_en") - description String @map("description") - descriptionDe String @map("description_de") - descriptionFr String @map("description_fr") - descriptionRm String @map("description_rm") - descriptionIt String @map("description_it") - descriptionEn String @map("description_en") - - studyAreas StudyArea[] - studyLocations StudyLocation[] - studyTraces StudyTrace[] - - @@map("geom_quality_item") - @@schema("public") + geomQualityItemCode String @id @map("geom_quality_item_code") + geolCode String @map("geol_code") + name String @map("name") + nameDe String @map("name_de") + nameFr String @map("name_fr") + nameRm String @map("name_rm") + nameIt String @map("name_it") + nameEn String @map("name_en") + description String @map("description") + descriptionDe String @map("description_de") + descriptionFr String @map("description_fr") + descriptionRm String @map("description_rm") + descriptionIt String @map("description_it") + descriptionEn String @map("description_en") + + studyAreas StudyArea[] + studyLocations StudyLocation[] + studyTraces StudyTrace[] + + @@map("geom_quality_item") + @@schema("public") } model LanguageItem { - languageItemCode String @id @map("language_item_code") - geolCode String @map("geol_code") - name String @map("name") - nameDe String @map("name_de") - nameFr String @map("name_fr") - nameRm String @map("name_rm") - nameIt String @map("name_it") - nameEn String @map("name_en") - description String @map("description") - descriptionDe String @map("description_de") - descriptionFr String @map("description_fr") - descriptionRm String @map("description_rm") - descriptionIt String @map("description_it") - descriptionEn String @map("description_en") - - assets Asset[] - - @@map("language_item") - @@schema("public") + languageItemCode String @id @map("language_item_code") + geolCode String @map("geol_code") + name String @map("name") + nameDe String @map("name_de") + nameFr String @map("name_fr") + nameRm String @map("name_rm") + nameIt String @map("name_it") + nameEn String @map("name_en") + description String @map("description") + descriptionDe String @map("description_de") + descriptionFr String @map("description_fr") + descriptionRm String @map("description_rm") + descriptionIt String @map("description_it") + descriptionEn String @map("description_en") + + assets Asset[] + + @@map("language_item") + @@schema("public") } model ManCatLabelItem { - manCatLabelItemCode String @id @map("man_cat_label_item_code") - geolCode String @map("geol_code") - name String @map("name") - nameDe String @map("name_de") - nameFr String @map("name_fr") - nameRm String @map("name_rm") - nameIt String @map("name_it") - nameEn String @map("name_en") - description String @map("description") - descriptionDe String @map("description_de") - descriptionFr String @map("description_fr") - descriptionRm String @map("description_rm") - descriptionIt String @map("description_it") - descriptionEn String @map("description_en") - - manCatLabelRefs ManCatLabelRef[] - - @@map("man_cat_label_item") - @@schema("public") + manCatLabelItemCode String @id @map("man_cat_label_item_code") + geolCode String @map("geol_code") + name String @map("name") + nameDe String @map("name_de") + nameFr String @map("name_fr") + nameRm String @map("name_rm") + nameIt String @map("name_it") + nameEn String @map("name_en") + description String @map("description") + descriptionDe String @map("description_de") + descriptionFr String @map("description_fr") + descriptionRm String @map("description_rm") + descriptionIt String @map("description_it") + descriptionEn String @map("description_en") + + manCatLabelRefs ManCatLabelRef[] + + @@map("man_cat_label_item") + @@schema("public") } model NatRelItem { - natRelItemCode String @id @map("nat_rel_item_code") - geolCode String @map("geol_code") - name String @map("name") - nameDe String @map("name_de") - nameFr String @map("name_fr") - nameRm String @map("name_rm") - nameIt String @map("name_it") - nameEn String @map("name_en") - description String @map("description") - descriptionDe String @map("description_de") - descriptionFr String @map("description_fr") - descriptionRm String @map("description_rm") - descriptionIt String @map("description_it") - descriptionEn String @map("description_en") - - typeNatRels TypeNatRel[] - - @@map("nat_rel_item") - @@schema("public") + natRelItemCode String @id @map("nat_rel_item_code") + geolCode String @map("geol_code") + name String @map("name") + nameDe String @map("name_de") + nameFr String @map("name_fr") + nameRm String @map("name_rm") + nameIt String @map("name_it") + nameEn String @map("name_en") + description String @map("description") + descriptionDe String @map("description_de") + descriptionFr String @map("description_fr") + descriptionRm String @map("description_rm") + descriptionIt String @map("description_it") + descriptionEn String @map("description_en") + + typeNatRels TypeNatRel[] + + @@map("nat_rel_item") + @@schema("public") } model LegalDocItem { - legalDocItemCode String @id @map("legal_doc_item_code") - geolCode String @map("geol_code") - name String @map("name") - nameDe String @map("name_de") - nameFr String @map("name_fr") - nameRm String @map("name_rm") - nameIt String @map("name_it") - nameEn String @map("name_en") - description String @map("description") - descriptionDe String @map("description_de") - descriptionFr String @map("description_fr") - descriptionRm String @map("description_rm") - descriptionIt String @map("description_it") - descriptionEn String @map("description_en") - - legalDocs LegalDoc[] - - @@map("legal_doc_item") - @@schema("public") + legalDocItemCode String @id @map("legal_doc_item_code") + geolCode String @map("geol_code") + name String @map("name") + nameDe String @map("name_de") + nameFr String @map("name_fr") + nameRm String @map("name_rm") + nameIt String @map("name_it") + nameEn String @map("name_en") + description String @map("description") + descriptionDe String @map("description_de") + descriptionFr String @map("description_fr") + descriptionRm String @map("description_rm") + descriptionIt String @map("description_it") + descriptionEn String @map("description_en") + + legalDocs LegalDoc[] + + @@map("legal_doc_item") + @@schema("public") } model PubChannelItem { - pubChannelItemCode String @id @map("pub_channel_item_code") - geolCode String @map("geol_code") - name String @map("name") - nameDe String @map("name_de") - nameFr String @map("name_fr") - nameRm String @map("name_rm") - nameIt String @map("name_it") - nameEn String @map("name_en") - description String @map("description") - descriptionDe String @map("description_de") - descriptionFr String @map("description_fr") - descriptionRm String @map("description_rm") - descriptionIt String @map("description_it") - descriptionEn String @map("description_en") - - publications Publication[] - - @@map("pub_channel_item") - @@schema("public") + pubChannelItemCode String @id @map("pub_channel_item_code") + geolCode String @map("geol_code") + name String @map("name") + nameDe String @map("name_de") + nameFr String @map("name_fr") + nameRm String @map("name_rm") + nameIt String @map("name_it") + nameEn String @map("name_en") + description String @map("description") + descriptionDe String @map("description_de") + descriptionFr String @map("description_fr") + descriptionRm String @map("description_rm") + descriptionIt String @map("description_it") + descriptionEn String @map("description_en") + + publications Publication[] + + @@map("pub_channel_item") + @@schema("public") } model StatusAssetUseItem { - statusAssetUseItemCode String @id @map("status_asset_use_item_code") - geolCode String @map("geol_code") - name String @map("name") - nameDe String @map("name_de") - nameFr String @map("name_fr") - nameRm String @map("name_rm") - nameIt String @map("name_it") - nameEn String @map("name_en") - description String @map("description") - descriptionDe String @map("description_de") - descriptionFr String @map("description_fr") - descriptionRm String @map("description_rm") - descriptionIt String @map("description_it") - descriptionEn String @map("description_en") - - publicUses PublicUse[] - internalUses InternalUse[] - - @@map("status_asset_use_item") - @@schema("public") + statusAssetUseItemCode String @id @map("status_asset_use_item_code") + geolCode String @map("geol_code") + name String @map("name") + nameDe String @map("name_de") + nameFr String @map("name_fr") + nameRm String @map("name_rm") + nameIt String @map("name_it") + nameEn String @map("name_en") + description String @map("description") + descriptionDe String @map("description_de") + descriptionFr String @map("description_fr") + descriptionRm String @map("description_rm") + descriptionIt String @map("description_it") + descriptionEn String @map("description_en") + + publicUses PublicUse[] + internalUses InternalUse[] + + @@map("status_asset_use_item") + @@schema("public") } model StatusWorkItem { - statusWorkItemCode String @id @map("status_work_item_code") - geolCode String @map("geol_code") - name String @map("name") - nameDe String @map("name_de") - nameFr String @map("name_fr") - nameRm String @map("name_rm") - nameIt String @map("name_it") - nameEn String @map("name_en") - description String @map("description") - descriptionDe String @map("description_de") - descriptionFr String @map("description_fr") - descriptionRm String @map("description_rm") - descriptionIt String @map("description_it") - descriptionEn String @map("description_en") - - statusWorks StatusWork[] - - @@map("status_work_item") - @@schema("public") + statusWorkItemCode String @id @map("status_work_item_code") + geolCode String @map("geol_code") + name String @map("name") + nameDe String @map("name_de") + nameFr String @map("name_fr") + nameRm String @map("name_rm") + nameIt String @map("name_it") + nameEn String @map("name_en") + description String @map("description") + descriptionDe String @map("description_de") + descriptionFr String @map("description_fr") + descriptionRm String @map("description_rm") + descriptionIt String @map("description_it") + descriptionEn String @map("description_en") + + statusWorks StatusWork[] + + @@map("status_work_item") + @@schema("public") } model AssetUser { - id String @id @db.Uuid - user users @relation(fields: [id], references: [id]) - role String - AssetUserFavourite AssetUserFavourite[] + id String @id @db.Uuid + role String + email String + lang String + oidcId String + AssetUserFavourite AssetUserFavourite[] - @@map("asset_user") - @@schema("public") + @@map("asset_user") + @@schema("public") } model AssetUserFavourite { - assetUserId String @map("asset_user_id") @db.Uuid - AssetUser AssetUser @relation(fields: [assetUserId], references: [id]) + assetUserId String @map("asset_user_id") @db.Uuid + AssetUser AssetUser @relation(fields: [assetUserId], references: [id]) - assetId Int @map("asset_id") - Asset Asset @relation(fields: [assetId], references: [assetId]) + assetId Int @map("asset_id") + Asset Asset @relation(fields: [assetId], references: [assetId]) - created_at DateTime @db.Timestamptz(6) + created_at DateTime @db.Timestamptz(6) - @@id([assetUserId, assetId]) - @@map("asset_user_favourite") - @@schema("public") + @@id([assetUserId, assetId]) + @@map("asset_user_favourite") + @@schema("public") +} + +view AllStudy { + assetId Int @map("asset_id") + asset Asset @relation(fields: [assetId], references: [assetId]) + id Int + studyId String @unique @map("study_id") + geom Unsupported("geometry")? + isPoint Boolean @map("is_point") + centroidGeomText String @map("centroid_geom_text") + geomText String @map("geom_text") + + @@map("all_study") + @@schema("public") } diff --git a/apps/server-asset-sg/src/app/repos/asset.repo.spec.ts b/apps/server-asset-sg/src/app/repos/asset.repo.spec.ts new file mode 100644 index 00000000..89ec7ff3 --- /dev/null +++ b/apps/server-asset-sg/src/app/repos/asset.repo.spec.ts @@ -0,0 +1,243 @@ +import * as Option from 'fp-ts/Option' + +import { clearPrismaAssets, setupDB } from '../../../../../test/setup-db'; +import { fakeAssetPatch, fakeUser } from '../asset-edit/asset-edit.fake'; +import { PrismaService } from '../prisma/prisma.service'; + +import { AssetRepo } from './asset.repo'; + +describe(AssetRepo, () => { + const prisma = new PrismaService() + const repo = new AssetRepo(prisma); + + beforeAll(async () => { + await setupDB(prisma); + }); + + beforeEach(async () => { + await clearPrismaAssets(prisma); + }) + + describe('find', () => { + it('returns `null` when searching for a non-existent record', async () => { + // When + const asset = await repo.find(1); + + // Then + expect(asset).toBeNull(); + }) + + it('returns the record associated with a specific id', async () => { + // Given + const user = fakeUser(); + const patch = fakeAssetPatch(); + const expected = await repo.create({ patch, user }); + + // When + const actual = await repo.find(expected.assetId); + + // Then + expect(actual).not.toBeNull(); + expect(actual).toEqual(expected); + }) + }) + + + describe('list', () => { + it('returns an empty list when no records exist', async () => { + // When + const assets = await repo.list({ limit: 100 }); + + // Then + expect(assets).toEqual([]); + }) + + it('returns the specified amount of records', async () => { + // Given + const user = fakeUser(); + const record1 = await repo.create({ patch: fakeAssetPatch(), user }); + const record2 = await repo.create({ patch: fakeAssetPatch(), user }); + const record3 = await repo.create({ patch: fakeAssetPatch(), user }); + await repo.create({ patch: fakeAssetPatch(), user }); + await repo.create({ patch: fakeAssetPatch(), user }); + + // When + const assets = await repo.list({ limit: 3 }); + + // Then + expect(assets.length).toEqual(3); + expect(assets).toEqual([record1, record2, record3]); + }) + + it('returns the records appearing after the specified offset', async () => { + // Given + const user = fakeUser(); + await repo.create({ patch: fakeAssetPatch(), user }); + await repo.create({ patch: fakeAssetPatch(), user }); + const record1 = await repo.create({ patch: fakeAssetPatch(), user }); + const record2 = await repo.create({ patch: fakeAssetPatch(), user }); + const record3 = await repo.create({ patch: fakeAssetPatch(), user }); + + // When + const assets = await repo.list({ offset: 2, limit: 100 }); + + // Then + expect(assets.length).toEqual(3); + expect(assets).toEqual([record1, record2, record3]); + }) + + it('returns an empty list when offset is larger than the total amount of records', async () => { + // Given + const user = fakeUser(); + await repo.create({ patch: fakeAssetPatch(), user }); + await repo.create({ patch: fakeAssetPatch(), user }); + await repo.create({ patch: fakeAssetPatch(), user }); + await repo.create({ patch: fakeAssetPatch(), user }); + + // When + const assets = await repo.list({ offset: 5, limit: 10 }); + + // Then + expect(assets).toEqual([]); + }) + }) + + describe('create', () => { + it('inserts a new record', async () => { + // Given + const user = fakeUser(); + const patch = fakeAssetPatch(); + + // When + const record = await repo.create({ patch, user }); + + // Then + expect(record.titlePublic).toEqual(patch.titlePublic); + expect(record.titleOriginal).toEqual(patch.titleOriginal); + expect(record.createDate).toEqual(patch.createDate); + expect(record.receiptDate).toEqual(patch.receiptDate); + expect(record.lastProcessedDate.getTime()).toBeLessThan(new Date().getTime()) + expect(record.processor).toEqual(user.email); + expect(record.publicUse).toEqual(patch.publicUse); + expect(record.internalUse).toEqual(patch.internalUse); + expect(record.assetKindItemCode).toEqual(patch.assetKindItemCode); + expect(record.assetFormatItemCode).toEqual(patch.assetFormatItemCode); + expect(record.languageItemCode).toEqual(patch.languageItemCode); + expect(record.isNatRel).toEqual(patch.isNatRel); + expect(record.sgsId).toBeNull(); + expect(record.geolDataInfo).toEqual(null); + expect(record.geolContactDataInfo).toEqual(null); + expect(record.geolAuxDataInfo).toBeNull(); + expect(record.municipality).toBeNull(); + expect(record.ids).toEqual(patch.ids); + expect(record.assetContacts).toEqual(patch.assetContacts); + expect(record.manCatLabelRefs).toEqual(patch.manCatLabelRefs); + expect(record.assetFormatCompositions).toEqual([]); + expect(record.typeNatRels).toEqual(patch.typeNatRels); + expect(record.assetMain).toEqual(Option.none); + expect(record.subordinateAssets).toEqual([]); + expect(record.siblingXAssets).toEqual([]); + expect(record.siblingYAssets).toEqual([]); + expect(record.statusWorks).toHaveLength(1); + expect(record.statusWorks[0].statusWorkItemCode).toEqual('initiateAsset') + expect(record.statusWorks[0].statusWorkDate.getTime()).toBeLessThan(new Date().getTime()) + expect(record.assetFiles).toEqual([]); + }) + }) + + describe('update', () => { + it('returns `null` when updating a non-existent record', async () => { + // Given + const user = fakeUser(); + const patch = fakeAssetPatch(); + + // When + const asset = await repo.update(1, { user, patch }); + + // Then + expect(asset).toBeNull(); + }) + + it('should update the fields of an existing record', async () => { + // Given + const record = await repo.create({ patch: fakeAssetPatch(), user: fakeUser() }); + const user = fakeUser(); + const patch = fakeAssetPatch(); + + // When + const updated = await repo.update(record.assetId, { patch, user }); + + // Then + expect(updated.assetId).toEqual(record.assetId) + expect(updated.titlePublic).toEqual(patch.titlePublic); + expect(updated.titleOriginal).toEqual(patch.titleOriginal); + expect(updated.createDate).toEqual(patch.createDate); + expect(updated.receiptDate).toEqual(patch.receiptDate); + expect(updated.lastProcessedDate.getTime()).toBeLessThan(new Date().getTime()) + expect(updated.processor).toEqual(user.email); + expect(updated.publicUse).toEqual(patch.publicUse); + expect(updated.internalUse).toEqual(patch.internalUse); + expect(updated.assetKindItemCode).toEqual(patch.assetKindItemCode); + expect(updated.assetFormatItemCode).toEqual(patch.assetFormatItemCode); + expect(updated.languageItemCode).toEqual(patch.languageItemCode); + expect(updated.isNatRel).toEqual(patch.isNatRel); + expect(updated.sgsId).toBeNull(); + expect(updated.geolDataInfo).toEqual(null); + expect(updated.geolContactDataInfo).toEqual(null); + expect(updated.geolAuxDataInfo).toBeNull(); + expect(updated.municipality).toBeNull(); + expect(updated.ids).toEqual(patch.ids); + expect(updated.assetContacts).toEqual(patch.assetContacts); + expect(updated.manCatLabelRefs).toEqual(patch.manCatLabelRefs); + expect(updated.assetFormatCompositions).toEqual([]); + expect(updated.typeNatRels).toEqual(patch.typeNatRels); + expect(updated.assetMain).toEqual(Option.none); + expect(updated.subordinateAssets).toEqual([]); + expect(updated.siblingXAssets).toEqual([]); + expect(updated.siblingYAssets).toEqual([]); + expect(updated.statusWorks).toHaveLength(1); + expect(updated.statusWorks[0].statusWorkItemCode).toEqual('initiateAsset') + expect(updated.statusWorks[0].statusWorkDate.getTime()).toBeLessThan(new Date().getTime()) + expect(updated.assetFiles).toEqual([]); + }) + }) + + describe('delete', () => { + it('returns `false` when deleting an non-existent record', async () => { + // When + const isOk = await repo.delete(1); + + // Then + expect(isOk).toEqual(false); + }) + + it('removes a record and its relations from the database', async () => { + // Given + const record = await repo.create({ patch: fakeAssetPatch(), user: fakeUser() }); + + // When + const isOk = await repo.delete(record.assetId); + + // Then + expect(isOk).toEqual(true); + + const assetCount = await prisma.asset.count({ where: { assetId: record.assetId } }); + expect(assetCount).toEqual(0); + + const internalUseCount = await prisma.internalUse.count({ + where: { + Asset: { none: {} }, + }, + }); + expect(internalUseCount).toEqual(0); + + const publicUseCount = await prisma.publicUse.count({ + where: { + Asset: { none: {} }, + }, + }); + expect(publicUseCount).toEqual(0); + + }) + }) +}) diff --git a/apps/server-asset-sg/src/app/repos/asset.repo.ts b/apps/server-asset-sg/src/app/repos/asset.repo.ts new file mode 100644 index 00000000..63c26cf2 --- /dev/null +++ b/apps/server-asset-sg/src/app/repos/asset.repo.ts @@ -0,0 +1,364 @@ +import { Injectable } from '@nestjs/common'; +import { Prisma } from '@prisma/client'; +import * as E from 'fp-ts/Either'; +import * as O from 'fp-ts/Option'; + +import { decodeError, isNotNull } from '@asset-sg/core'; +import { AssetUsage, DateIdFromDate, PatchAsset, User, dateFromDateId } from '@asset-sg/shared'; + +import { AssetEditDetail } from '../asset-edit/asset-edit.service'; +import { AssetEditDetailFromPostgres } from '../models/asset-edit-detail'; +import { + createStudies, + deleteStudies, + postgresStudiesByAssetId, + updateStudies, +} from '../postgres-studies/postgres-studies'; +import { PrismaService } from '../prisma/prisma.service'; + +import { Repo, RepoListOptions } from './base/repo'; + +@Injectable() +export class AssetRepo implements Repo { + constructor( + private readonly prismaService: PrismaService, + ) {} + + async find(id: number): Promise { + const asset = await this.prismaService.asset.findUnique({ + where: { assetId: id }, + select: selectPrismaAsset, + }); + if (asset === null) { + return null; + } + return this.loadDetail(asset); + } + + async list({ limit, offset = 0 }: RepoListOptions): Promise { + const assets = await this.prismaService.asset.findMany({ + select: selectPrismaAsset, + take: limit, + skip: offset, + }) + return await Promise.all(assets.map((it) => this.loadDetail(it))); + } + + async create(data: AssetData): Promise { + const asset = await this.prismaService.asset.create({ + select: selectPrismaAsset, + data: { + titlePublic: data.patch.titlePublic, + titleOriginal: data.patch.titleOriginal, + createDate: DateIdFromDate.encode(data.patch.createDate), + receiptDate: DateIdFromDate.encode(data.patch.receiptDate), + assetKindItem: { connect: { assetKindItemCode: data.patch.assetKindItemCode } }, + assetFormatItem: { connect: { assetFormatItemCode: data.patch.assetFormatItemCode } }, + languageItem: { connect: { languageItemCode: data.patch.languageItemCode } }, + isExtract: false, + isNatRel: data.patch.isNatRel, + lastProcessedDate: new Date(), + processor: data.user.email, + manCatLabelRefs: { + createMany: { + data: data.patch.manCatLabelRefs.map(manCatLabelItemCode => ({ + manCatLabelItemCode, + })), + skipDuplicates: true, + }, + }, + assetContacts: { + createMany: { data: data.patch.assetContacts, skipDuplicates: true }, + }, + ids: { + createMany: { + data: data.patch.ids.map(({ id, description }) => ({ id, description })), + }, + }, + typeNatRels: { + createMany: { + data: data.patch.typeNatRels.map(natRelItemCode => ({ natRelItemCode })), + skipDuplicates: true, + }, + }, + internalUse: { + create: makeUsageInput(data.patch.internalUse), + }, + publicUse: { + create: makeUsageInput(data.patch.publicUse), + }, + statusWorks: { + create: { + statusWorkDate: new Date(), + statusWorkItemCode: 'initiateAsset', + }, + }, + }, + }); + return (await this.find(asset.assetId)) as AssetEditDetail; + } + + async update(id: number, data: AssetData): Promise { + // Check if a record for `id` exists, and return `null` if not. + const count = await this.prismaService.asset.count({ where: { assetId: id } }); + if (count === 0) { + return null; + } + + // Run the update in a transaction, as it consists of multiple prisma queries. + // Note that all mutations within this transaction are no-ops if there is no asset for `id`. + await this.prismaService.$transaction(async () => { + // Update the asset. + // For any relation, delete the existing records, and insert the updated ones. + await this.prismaService.asset.update({ + where: { assetId: id }, + data: { + titlePublic: data.patch.titlePublic, + titleOriginal: data.patch.titleOriginal, + createDate: DateIdFromDate.encode(data.patch.createDate), + receiptDate: DateIdFromDate.encode(data.patch.receiptDate), + assetKindItemCode: data.patch.assetKindItemCode, + assetFormatItemCode: data.patch.assetFormatItemCode, + languageItemCode: data.patch.languageItemCode, + isNatRel: data.patch.isNatRel, + assetMainId: O.toUndefined(data.patch.assetMainId), + lastProcessedDate: new Date(), + processor: data.user.email, + manCatLabelRefs: { + deleteMany: {}, + createMany: { + data: data.patch.manCatLabelRefs.map(manCatLabelItemCode => ({ + manCatLabelItemCode, + })), + skipDuplicates: true, + }, + }, + assetContacts: { + deleteMany: {}, + createMany: { data: data.patch.assetContacts, skipDuplicates: true }, + }, + ids: { + deleteMany: { + idId: { + notIn: data.patch.ids + .map((it) => O.toNullable(it.idId)) + .filter(isNotNull), + } + }, + upsert: [ + ...data.patch.ids + .map((it) => ({ ...it, idId: O.toNullable(it.idId) })) + .filter((it): it is PatchAsset['ids'][0] & { idId: number } => it.idId !== null) + .map((it) => ({ where: { idId: it.idId }, create: it, update: it })), + + ...data.patch.ids + .filter((it) => O.isNone(it.idId)) + .map((it) => ({ + where: { idId: -1 }, + create: { id: it.id, description: it.description }, + update: {}, + })), + ], + }, + typeNatRels: { + deleteMany: {}, + createMany: { + data: data.patch.typeNatRels.map(natRelItemCode => ({ natRelItemCode })), + skipDuplicates: true, + }, + }, + statusWorks: { + create: O.isSome(data.patch.newStatusWorkItemCode) + ? { + statusWorkDate: new Date(), + statusWorkItemCode: data.patch.newStatusWorkItemCode.value, + } + : [], + }, + }, + }); + + // Delete any existing sibling mappings and insert the updated ones. + await this.prismaService.assetXAssetY.deleteMany({ + where: { OR: [{ assetXId: id }, { assetYId: id }] }, + }); + await this.prismaService.assetXAssetY.createMany({ + data: data.patch.siblingAssetIds.map(assetYId => ({ assetXId: id, assetYId })), + skipDuplicates: true, + }); + + // Update the many-to-one relations of the asset. + // These can't be combined with the other updates, so we run them in a separate query. + await this.prismaService.asset.update({ + where: { assetId: id }, + data: { + internalUse: { + update: makeUsageInput(data.patch.internalUse), + }, + publicUse: { + update: makeUsageInput(data.patch.publicUse), + }, + }, + }); + + // For now, handling of studies is passed to the pre-existing functions. + // We probably want to refactor them too, at some point. + // (DVA, 2024-04-24) + + // Delete the studies that are missing from the updated data. + // Note that the ids that we're passing to `deleteStudies` are **not** the ones that are deleted, + // but instead the ones that are being preserved. + await deleteStudies(this.prismaService, id, data.patch.studies.map((it) => it.studyId))(); + + // Update the asset's old studies that are still present in the update. + await updateStudies(this.prismaService, data.patch.studies)(); + + // Create the studies that do no exist yet. + await createStudies(this.prismaService, id, data.patch.newStudies)(); + }) + + // Load the now-modified asset. + // We theoretically have all the updated asset's data after updating it, + // but stitching it together is quite hard and prone to errors. + // We fully skip that risk by just using `find` instead of manually handling the data. + return this.find(id); + } + + async delete(id: number): Promise { + // Check if a record for `id` exists, and return `false` if not. + const count = await this.prismaService.asset.count({ where: { assetId: id } }); + if (count === 0) { + return false; + } + + await this.prismaService.$transaction(async () => { + // Delete the record's `manCatLabelRef` records. + await this.prismaService.manCatLabelRef.deleteMany({ + where: { assetId: id }, + }) + + // Delete the record's `assetContact` records. + await this.prismaService.assetContact.deleteMany({ + where: { assetId: id }, + }); + + // Delete the record's `id` records. + await this.prismaService.id.deleteMany({ + where: { assetId: id }, + }); + + // Delete the record's `typeNatRel` records. + await this.prismaService.typeNatRel.deleteMany({ + where: { assetId: id }, + }); + + // Delete the record's `statusWork` records. + await this.prismaService.statusWork.deleteMany({ + where: { assetId: id }, + }); + + // Delete the record. + await this.prismaService.asset.delete({ where: { assetId: id } }); + + // Delete all `internalUse` records that are not in use anymore. + await this.prismaService.internalUse.deleteMany({ + where: { + Asset: { none: {} }, + }, + }); + + // Delete all `publicUse` records that are not in use anymore. + await this.prismaService.publicUse.deleteMany({ + where: { + Asset: { none: {} }, + }, + }); + }) + return true; + } + + private async loadDetail(asset: PrismaAsset): Promise { + const studiesResult = await postgresStudiesByAssetId(this.prismaService, asset.assetId)(); + if (E.isLeft(studiesResult)) { + throw new Error(`failed to load studies for asset ${asset.assetId}: ${studiesResult.left}`); + } + + const detailResult = AssetEditDetailFromPostgres.decode({ ...asset, studies: studiesResult.right }); + if (E.isLeft(detailResult)) { + const error = decodeError(detailResult.left); + throw new Error(`failed to decode details from postgres for asset ${asset.assetId}: ${error}`); + } + return detailResult.right + } +} + +interface AssetData { + patch: PatchAsset, + user: User +} + +/** + * Helper function to create a well-typed {@link AssetSelect} without losing context-specific type information. + * @param value The selection of asset fields. + */ +const selectOnAsset = (value: T): T => value + +/** + * The selection of fields on the `asset` table that is required to build an {@link AssetEditDetailFromPostgres}. + */ +const selectPrismaAsset = selectOnAsset({ + assetId: true, + titlePublic: true, + titleOriginal: true, + createDate: true, + receiptDate: true, + lastProcessedDate: true, + processor: true, + assetKindItemCode: true, + assetFormatItemCode: true, + languageItemCode: true, + internalUse: true, + publicUse: true, + isNatRel: true, + sgsId: true, + geolDataInfo: true, + geolContactDataInfo: true, + geolAuxDataInfo: true, + municipality: true, + ids: true, + assetContacts: { select: { role: true, contactId: true } }, + manCatLabelRefs: { select: { manCatLabelItemCode: true } }, + assetFormatCompositions: { select: { assetFormatItemCode: true } }, + typeNatRels: { select: { natRelItemCode: true } }, + assetMain: { select: { assetId: true, titlePublic: true } }, + subordinateAssets: { select: { assetId: true, titlePublic: true } }, + siblingXAssets: { select: { assetY: { select: { assetId: true, titlePublic: true } } } }, + siblingYAssets: { select: { assetX: { select: { assetId: true, titlePublic: true } } } }, + statusWorks: { select: { statusWorkItemCode: true, statusWorkDate: true } }, + assetFiles: { select: { file: true } }, +}) + +/** + * The type of values selected by {@link selectPrismaAsset}. + */ +type PrismaAsset = Prisma.AssetGetPayload<{ select: typeof selectPrismaAsset }>; + +/** + * The type of the input that creates or updates {@link PrismaAssetUsageInput} records. + */ +type PrismaAssetUsageInput = Prisma.InternalUseUncheckedCreateWithoutAssetInput + +/** + * Create the {@link PrismaAssetUsageInput} for the given {@link AssetUsage}. + * @param usage The usage to create or update. + */ +const makeUsageInput = (usage: AssetUsage): PrismaAssetUsageInput => { + const startAvailabilityDate = O.isNone(usage.startAvailabilityDate) + ? null + : dateFromDateId(usage.startAvailabilityDate.value); + return { + isAvailable: usage.isAvailable, + statusAssetUseItemCode: usage.statusAssetUseItemCode, + startAvailabilityDate, + }; +} diff --git a/apps/server-asset-sg/src/app/repos/base/repo.ts b/apps/server-asset-sg/src/app/repos/base/repo.ts new file mode 100644 index 00000000..e1ce8c1b --- /dev/null +++ b/apps/server-asset-sg/src/app/repos/base/repo.ts @@ -0,0 +1,13 @@ + +export interface Repo { + find(id: TId): Promise + list(options: RepoListOptions): Promise + create(data: TData): Promise + update(id: TId, data: TData): Promise + delete(id: TId): Promise +} + +export interface RepoListOptions { + limit: number + offset?: number +} diff --git a/apps/server-asset-sg/src/app/scripts/create-admin-user.ts b/apps/server-asset-sg/src/app/scripts/create-admin-user.ts deleted file mode 100644 index 797a783c..00000000 --- a/apps/server-asset-sg/src/app/scripts/create-admin-user.ts +++ /dev/null @@ -1,63 +0,0 @@ -import { PrismaClient } from '@prisma/client'; -import { pipe } from 'fp-ts/function'; -import * as TE from 'fp-ts/TaskEither'; - -const _importDynamic = new Function('modulePath', 'return import(modulePath)'); - -export const _fetch = async function (...args: unknown[]) { - const { default: fetch } = await _importDynamic('node-fetch'); - return fetch(...args); -}; - -// eslint-disable-next-line @nrwl/nx/enforce-module-boundaries -import { unknownToError } from '../../../../../libs/core/src'; - -import { httpJson, printResult } from './http-utils'; - -const createUser = (email: string, password: string) => - httpJson(() => { - console.log(JSON.stringify({ email, password, data: { lang: 'de' } })); - - return _fetch('http://localhost:4200/auth/signup', { - method: 'POST', - body: JSON.stringify({ email, password, data: { lang: 'de' } }), - }); - }); - -const confirmAdminUser = (email: string) => { - const prisma = new PrismaClient(); - return pipe( - TE.tryCatch( - () => - prisma.$executeRawUnsafe( - `update auth.users set email_confirmed_at = now(), role = 'service_role' where email = '${email}';`, - ), - unknownToError, - ), - TE.chain(() => - TE.tryCatch( - () => - prisma.$executeRawUnsafe( - `insert into asset_user select id, 'admin' as role from auth.users where email = '${email}';`, - ), - unknownToError, - ), - ), - // TE.filterOrElse( - // n => n === 1, - // unknownToError, - // // () => new Error(`No user found with email ${email}`), - // ), - TE.map(() => `User ${email} create and confirmed`), - ); -}; - -const email = 'wayne.maurer@lambda-it.ch'; -const password = 'secret'; - -const program = pipe( - createUser(email, password), - TE.chain(() => confirmAdminUser(email)), -); - -program().then(printResult); diff --git a/apps/server-asset-sg/src/app/scripts/export-to-elasticsearch.ts b/apps/server-asset-sg/src/app/scripts/export-to-elasticsearch.ts deleted file mode 100644 index f4f38b98..00000000 --- a/apps/server-asset-sg/src/app/scripts/export-to-elasticsearch.ts +++ /dev/null @@ -1,320 +0,0 @@ -/* eslint-disable @nrwl/nx/enforce-module-boundaries */ -import { Client } from '@elastic/elasticsearch'; -import { PrismaClient } from '@prisma/client'; -import * as A from 'fp-ts/Array'; -import * as E from 'fp-ts/Either'; -import { Eq, struct } from 'fp-ts/Eq'; -import { flow, pipe } from 'fp-ts/function'; -import * as NEA from 'fp-ts/NonEmptyArray'; -import { Eq as EqNumber } from 'fp-ts/number'; -import { Eq as EqString } from 'fp-ts/string'; -import * as D from 'io-ts/Decoder'; -import * as G from 'io-ts/Guard'; -import { Overwrite } from 'type-zoo'; - -import { isNotNil } from '../../../../../libs/core/src/'; -import { ElasticSearchAsset } from '../../../../../libs/shared/src/'; - -export interface DateIdBrand { - readonly DateId: unique symbol; -} -export type DateId = number & DateIdBrand; -export const dateGuard: G.Guard = { - is: (u: unknown): u is Date => Object.prototype.toString.call(u) === '[object Date]', -}; -export const date: D.Decoder = D.fromGuard(dateGuard, 'Date'); -export const dateIdFromDate = (d: Date) => (d.getFullYear() * 10000 + (d.getMonth() + 1) * 100 + d.getDate()) as DateId; -export const DateIdFromDate = pipe(date, D.map(dateIdFromDate)); - -const index = 'asset-swissgeol-asset'; - -const main = async () => { - try { - const options = { - node: process.env.ELASTICSEARCH_URL || 'http://localhost:9200', - ...(process.env.ELASTICSEARCH_USERNAME && process.env.ELASTICSEARCH_PASSWORD - ? { - auth: { - username: process.env.ELASTICSEARCH_USERNAME || '', - password: process.env.ELASTICSEARCH_PASSWORD || '', - }, - } - : {}), - }; - // console.log({ options }); - - const client = new Client(options); - - // console.log('connected'); - - // console.log({ client }); - - const exists = await client.indices.exists({ index }); - if (exists) { - await client.indices.delete({ index }); - } - - await client.indices.create({ - index, - mappings: { - properties: { - assetId: { type: 'integer' }, - createDateId: { type: 'integer' }, - authorIds: { type: 'integer' }, - assetKindItemCode: { type: 'keyword' }, - languageItemCode: { type: 'keyword' }, - usageCode: { type: 'keyword' }, - manCatLabelItemCodes: { type: 'keyword' }, - sgsId: { type: 'keyword' }, - }, - }, - }); - - const prisma = new PrismaClient(); - - const RawAsset = D.struct({ - assetId: D.number, - titlePublic: D.string, - titleOriginal: D.string, - sgsId: D.nullable(D.number), - createDate: DateIdFromDate, - assetKindItemCode: D.string, - languageItemCode: D.string, - authorId: D.nullable(D.number), - contactName: D.nullable(D.string), - manCatLabelItemCode: D.nullable(D.string), - internalUseIsAvailable: D.boolean, - publicUseIsAvailable: D.boolean, - }); - type RawAsset = D.TypeOf; - - const EqRawAssetByAssetId: Eq = struct({ assetId: EqNumber }); - - const dataset = await prisma.$queryRaw>` - select - a.asset_id as "assetId", - a.title_public as "titlePublic", - a.title_original as "titleOriginal", - a.sgs_id as "sgsId", - a.create_date as "createDate", - a.asset_kind_item_code as "assetKindItemCode", - a.language_item_code as "languageItemCode", - ac.contact_id as "authorId", - c.name as "contactName", - mclr.man_cat_label_item_code as "manCatLabelItemCode", - iu.is_available as "internalUseIsAvailable", - pu.is_available as "publicUseIsAvailable" - from - public.asset a - left join - public.asset_contact ac - on ac.role = ${'author'} - and ac.asset_id = a.asset_id - left join - public.asset_contact ac2 - on ac2.asset_id = a.asset_id - left join - public.contact c - on c.contact_id = ac2.contact_id - left join - public.man_cat_label_ref mclr - on mclr.asset_id = a.asset_id - left join - public.internal_use iu - on iu.internal_use_id = a.internal_use_id - left join - public.public_use pu - on pu.public_use_id = a.public_use_id - order by - a.asset_id - `; - - const assets = pipe( - D.array(RawAsset).decode(dataset), - E.map( - flow( - NEA.group(EqRawAssetByAssetId), - A.map((a): Overwrite => { - const usageCode = NEA.head(a).publicUseIsAvailable - ? 'public' - : NEA.head(a).internalUseIsAvailable - ? 'internal' - : 'useOnRequest'; - return { - assetId: NEA.head(a).assetId, - titlePublic: NEA.head(a).titlePublic, - titleOriginal: NEA.head(a).titleOriginal, - sgsId: NEA.head(a).sgsId, - createDate: NEA.head(a).createDate, - assetKindItemCode: NEA.head(a).assetKindItemCode, - languageItemCode: NEA.head(a).languageItemCode, - usageCode, - authorIds: pipe( - a, - A.map(at => at.authorId), - A.filter(isNotNil), - A.uniq(EqNumber), - ), - contactNames: pipe( - a, - A.map(at => at.contactName), - A.filter(isNotNil), - A.uniq(EqString), - ), - manCatLabelItemCodes: pipe( - a, - A.map(at => at.manCatLabelItemCode), - A.filter(isNotNil), - A.uniq(EqString), - ), - }; - }), - ), - ), - ); - - // const assets = pipe( - // dataset, - // NEA.group(EqRawAssetByAssetId), - // NEA.fromArray, - // O.map( - // flow( - // A.filter(a => a.length > 1), - // A.splitAt(3), - // a => a[0], - // ), - // ), - // ); - // const dataset = await prisma.asset.findMany({ - // // where: { assetId: { lt: 10 } }, - // // where: { AND: [{ assetId: { gte: 0 } }, { assetId: { lte: 32768 } }] }, - // take: 32000, - // select: { - // assetId: true, - // titlePublic: true, - // assetContacts: { - // where: { role: 'author' }, - // select: { - // contact: { - // select: { - // name: true, - // }, - // }, - // }, - // }, - // }, - // }); - // const dataset = await prisma.asset.findMany({ - // select: { - // assetId: true, - // titlePublic: true, - // // internalUses: { - // // select: { - // // isAvailable: true, - // // }, - // // }, - // }, - // // include: { - // // languageItem: true, - // // }, - // }); - // - // - - // const dataset2 = dataset.map(x => ({ - // assetId: x.assetId, - // titlePublic: x.titlePublic, - // authors: x.assetContacts.map(y => y.contact.name), - // })); - - // console.log((dataset as any).filter((a: any) => !a.authorName)); - // console.log(dataset.length); - // - // console.log(JSON.stringify(assets, null, 4)); - - if (E.isRight(assets)) { - // console.log(assets.right.slice(1, 10)); - // console.log(assets.right.filter(a => a.assetId === 38981)[0]); - const operations = assets.right.flatMap(doc => [ - { index: { _index: 'swissgeol_asset_asset', _id: doc.assetId } }, - doc, - ]); - // console.log(operations[0]); - - // console.log(assets.right.filter(a => a.assetId === 34153)[0]); - - // console.log(operations); - // - const bulkResponse = await client.bulk({ refresh: true, operations }); - console.log(bulkResponse); - // - // const SearchResults = D.struct({ - // hits: D.struct({ - // hits: D.array( - // D.struct({ - // fields: D.struct({ - // assetId: D.array(D.number), - // }), - // }), - // ), - // }), - // aggregations: D.struct({ - // authors: D.struct({ - // buckets: D.array(D.struct({ key: D.string, doc_count: D.number })), - // }), - // }), - // }); - - // const foo = pipe( - // TE.tryCatch( - // () => - // client.search({ - // // size: 10000, - // query: { - // bool: { - // must: { - // query_string: { - // query: 'Schenker', - // fields: ['titlePublic', 'titleOriginal', 'contactNames'], - // }, - // }, - // }, - // }, - // aggs: { - // authorIds: { terms: { field: 'authorIds' } }, - // minCreateDate: { min: { field: 'createDate' } }, - // maxCreateDate: { max: { field: 'createDate' } }, - // }, - // fields: [ - // 'assetId', - // 'titlePublic', - // 'titleOriginal', - // 'createDate', - // 'authorIds', - // 'contactNames', - // ], - // _source: false, - // }), - // unknownToError, - // ), - // // TE.chainW(flow(SearchResults.decode, E.mapLeft(D.draw), TE.fromEither)), - // // TE.mapLeft(e => console.log(JSON.stringify(e, null, 4))), - // ); - - // foo().then(a => { - // if (a._tag === 'Right') { - // console.log(a.right.aggregations); - // } - // }); - // console.log('hi', JSON.stringify(results, null, 4)); - } else { - console.log(D.draw(assets.left)); - } - } catch (e) { - console.error(e); - } -}; - -main().then(() => console.log('done')); - -// client.indices.delete({ index: 'asset' }); diff --git a/apps/server-asset-sg/src/app/scripts/http-utils.ts b/apps/server-asset-sg/src/app/scripts/http-utils.ts index cebd2922..95387b73 100644 --- a/apps/server-asset-sg/src/app/scripts/http-utils.ts +++ b/apps/server-asset-sg/src/app/scripts/http-utils.ts @@ -4,7 +4,7 @@ import * as TE from 'fp-ts/TaskEither'; import { Response } from 'node-fetch'; // eslint-disable-next-line @nrwl/nx/enforce-module-boundaries -import { unknownToError } from '../../../../../libs/core/src'; +import { unknownToError } from '@asset-sg/core'; export const httpJson = (req: () => Promise) => pipe( diff --git a/apps/server-asset-sg/src/app/search/asset-search-service.spec.ts b/apps/server-asset-sg/src/app/search/asset-search-service.spec.ts new file mode 100644 index 00000000..31ef52d2 --- /dev/null +++ b/apps/server-asset-sg/src/app/search/asset-search-service.spec.ts @@ -0,0 +1,225 @@ +import { faker } from '@faker-js/faker'; + +import { + ElasticSearchAsset, + PatchAsset, SearchAsset, + SearchAssetAggregations, + SearchAssetResultNonEmpty, + makeUsageCode, +} from '@asset-sg/shared'; + +import indexMapping from '../../../../../development/init/elasticsearch/mappings/swissgeol_asset_asset.json'; +import { clearPrismaAssets, setupDB } from '../../../../../test/setup-db'; +import { fakeAssetPatch, fakeUser } from '../asset-edit/asset-edit.fake'; +import { AssetEditDetail } from '../asset-edit/asset-edit.service'; +import { PrismaService } from '../prisma/prisma.service'; +import { AssetRepo } from '../repos/asset.repo'; + +import { ASSET_ELASTIC_INDEX, AssetSearchService } from './asset-search-service'; +import { openElasticsearchClient } from './elasticsearch'; + +describe(AssetSearchService, () => { + const elastic = openElasticsearchClient() + const prisma = new PrismaService() + const assetRepo = new AssetRepo(prisma); + const service = new AssetSearchService(elastic, prisma, assetRepo); + + beforeAll(async () => { + const existsIndex = await elastic.indices.exists({ index: ASSET_ELASTIC_INDEX }); + if (!existsIndex) { + await elastic.indices.create({ index: ASSET_ELASTIC_INDEX }); + await elastic.indices.putMapping({ + index: ASSET_ELASTIC_INDEX, + ...indexMapping, + }); + } + + await setupDB(prisma); + }) + + beforeEach(async () => { + await clearPrismaAssets(prisma); + await elastic.deleteByQuery({ + index: ASSET_ELASTIC_INDEX, + query: { match_all: {} }, + refresh: true, + }) + }) + + describe('register', () => { + it('adds an asset to elasticsearch', async () => { + // Given + const asset = await assetRepo.create({ patch: fakeAssetPatch(), user: fakeUser() }); + + // When + await service.register(asset) + + // Then + const response = await elastic.search({ + index: ASSET_ELASTIC_INDEX, + size: 10_000, + _source: true, + }); + expect(response.hits.hits.length).toEqual(1); + + const hit = response.hits.hits[0]._source as ElasticSearchAsset; + expect(hit.assetId).toEqual(asset.assetId); + expect(hit.titlePublic).toEqual(asset.titlePublic); + expect(hit.titleOriginal).toEqual(asset.titleOriginal); + expect(hit.sgsId).toEqual(asset.sgsId); + expect(hit.createDate).toEqual(asset.createDate); + expect(hit.assetKindItemCode).toEqual(asset.assetKindItemCode); + expect(hit.languageItemCode).toEqual(asset.languageItemCode); + expect(hit.usageCode).toEqual(makeUsageCode(asset.publicUse.isAvailable, asset.internalUse.isAvailable)); + expect(hit.authorIds).toEqual([]); + expect(hit.contactNames).toEqual([]); + expect(hit.manCatLabelItemCodes).toEqual([]); + }) + }) + + describe('search', () => { + interface Bucket { + key: string | number + count: number + } + + const makeBucket = ( + expectedAssets: AssetEditDetail[], + extract: (asset: AssetEditDetail) => string | number, + ): Bucket[] => { + return expectedAssets.reduce((buckets, asset) => { + const key = extract(asset); + const bucket = buckets.find((it) => it.key === key); + if (bucket == null) { + buckets.push({ key, count: 1 }); + } else { + bucket.count += 1; + } + return buckets; + }, [] as Bucket[]); + } + + const compareBuckets = (a: Bucket, b: Bucket): number => a.key.toString().localeCompare(b.key.toString()); + + const testSearchOnProperty = (property: keyof PatchAsset & keyof ElasticSearchAsset) => async () => { + // Given + const uniqueString = faker.string.uuid(); + const asset1 = await assetRepo.create({ + user: fakeUser(), + patch: { ...fakeAssetPatch(), [property]: `My unique title: ${uniqueString}` }, + }); + const asset2 = await assetRepo.create({ + user: fakeUser(), + patch: { ...fakeAssetPatch(), [property]: `${uniqueString} is also here` }, + }); + const asset3 = await assetRepo.create({ + user: fakeUser(), + patch: { ...fakeAssetPatch(), [property]: `${uniqueString}` }, + }); + const asset4 = await assetRepo.create({ + user: fakeUser(), + patch: { ...fakeAssetPatch(), [property]: `some${uniqueString}things` }, + }); + await service.register(asset1); + await service.register(asset2); + await service.register(asset3); + await service.register(asset4); + const expectedAssets = [asset1, asset2, asset3, asset4]; + + await service.register(await assetRepo.create({ + user: fakeUser(), + patch: { ...fakeAssetPatch(), [property]: 'unrelated' }, + })); + await service.register(await assetRepo.create({ + user: fakeUser(), + patch: { ...fakeAssetPatch(), [property]: '' }, + })); + await service.register(await assetRepo.create({ + user: fakeUser(), + patch: { ...fakeAssetPatch(), [property]: uniqueString.slice(0, 6).replace(/\d/, '_') }, + })); + + // When + const result = await service.search(uniqueString, { + scope: [property], + }); + + // Then + expect(result).toMatchObject({ _tag: 'SearchAssetResultNonEmpty' }); + const { aggregations: aggs, assets } = result as SearchAssetResultNonEmpty; + assertAssets(expectedAssets, assets); + assertAggregations(expectedAssets, aggs); + } + + it('should return an empty result when no assets exist', async () => { + // When + const result = await service.search('', { + scope: ['titlePublic', 'titleOriginal', 'contactNames'], + }); + + // Then + expect(result).toEqual({ _tag: 'SearchAssetResultEmpty' }); + }) + + it( + 'should match all assets which contain the query in their `titleOriginal`', + testSearchOnProperty('titleOriginal'), + ) + it( + 'should match all assets which contain the query in their `titlePublic`', + testSearchOnProperty('titlePublic'), + ) + + const assertAssets = ( + expectedAssets: AssetEditDetail[], + actualAssets: SearchAsset[], + ): void => { + expect(actualAssets.length).toEqual(expectedAssets.length); + for (let i = 0; i < actualAssets.length; i++) { + const actualAsset = actualAssets[i]; + const expectedAsset = expectedAssets[i]; + + expect(actualAsset.assetId).toEqual(expectedAsset.assetId); + expect(actualAsset.titlePublic).toEqual(expectedAsset.titlePublic); + expect(actualAsset.createDate).toEqual(expectedAsset.createDate); + expect(actualAsset.assetFormatItemCode).toEqual(expectedAsset.assetFormatItemCode); + expect(actualAsset.assetKindItemCode).toEqual(expectedAsset.assetKindItemCode); + expect(actualAsset.languageItemCode).toEqual(expectedAsset.languageItemCode); + expect(actualAsset.contacts).toEqual([]); + expect(actualAsset.studies).toEqual([]); + expect(actualAsset.manCatLabelItemCodes).toEqual([]); + expect(actualAsset.usageCode).toEqual( + makeUsageCode(expectedAsset.publicUse.isAvailable, expectedAsset.internalUse.isAvailable), + ); + } + } + + const assertAggregations = ( + expectedAssets: AssetEditDetail[], + aggs: SearchAssetAggregations, + ): void => { + const expectedMinCreateDate = Math.min(...expectedAssets.map((it) => it.createDate)); + expect(aggs.ranges.createDate.min).toEqual(expectedMinCreateDate); + + const expectedMaxCreateDate = Math.max(...expectedAssets.map((it) => it.createDate)); + expect(aggs.ranges.createDate.max).toEqual(expectedMaxCreateDate); + + const expectedAssetKindItemCodes = makeBucket(expectedAssets, (asset) => asset.assetKindItemCode); + expect(aggs.buckets.assetKindItemCodes.sort(compareBuckets)) + .toEqual(expectedAssetKindItemCodes.sort(compareBuckets)); + + const expectedLanguageItemCodes = makeBucket(expectedAssets, (asset) => asset.languageItemCode); + expect(aggs.buckets.languageItemCodes.sort(compareBuckets)) + .toEqual(expectedLanguageItemCodes.sort(compareBuckets)); + + const expectedUsageCodes = makeBucket(expectedAssets, (asset) => ( + makeUsageCode(asset.publicUse.isAvailable, asset.internalUse.isAvailable) + )); + expect(aggs.buckets.usageCodes.sort(compareBuckets)) + .toEqual(expectedUsageCodes.sort(compareBuckets)); + + expect(aggs.buckets.manCatLabelItemCodes).toEqual([]); + expect(aggs.buckets.authorIds).toEqual([]); + } + }) +}) diff --git a/apps/server-asset-sg/src/app/search/asset-search-service.ts b/apps/server-asset-sg/src/app/search/asset-search-service.ts new file mode 100644 index 00000000..58d5585c --- /dev/null +++ b/apps/server-asset-sg/src/app/search/asset-search-service.ts @@ -0,0 +1,339 @@ +import { Client as ElasticsearchClient } from '@elastic/elasticsearch'; +import { BulkOperationContainer, QueryDslQueryContainer } from '@elastic/elasticsearch/lib/api/types'; +import { Injectable } from '@nestjs/common'; + +import { + AssetByTitle, + DateId, + ElasticSearchAsset, + SearchAssetAggregations, + SearchAssetResult, + UsageCode, + dateIdFromDate, + makeUsageCode, +} from '@asset-sg/shared'; + +import { AssetEditDetail } from '../asset-edit/asset-edit.service'; +import { AssetEditDetailFromPostgres } from '../models/asset-edit-detail'; +import { PrismaService } from '../prisma/prisma.service'; +import { AssetRepo } from '../repos/asset.repo'; + +const INDEX = 'swissgeol_asset_asset'; +export { INDEX as ASSET_ELASTIC_INDEX }; + +interface SearchOptions { + scope: Array + assetIds?: number[] +} + +interface ElasticSearchResult { + scoresByAssetId: Map + aggs: SearchAssetAggregations +} + +@Injectable() +export class AssetSearchService { + constructor( + private readonly elastic: ElasticsearchClient, + private readonly prisma: PrismaService, + private readonly assetRepo: AssetRepo, + ) { + } + + async register(oneOrMore: AssetEditDetail | AssetEditDetail[]): Promise { + const assets = Array.isArray(oneOrMore) ? oneOrMore : [oneOrMore]; + const elasticAssets = await Promise.all(assets.map((asset) => this.mapAssetToElastic(asset))) + const operations = elasticAssets.reduce((ops, elasticAsset) => { + ops.push( + { index: { _index: INDEX, _id: `${elasticAsset.assetId}` } }, + elasticAsset, + ) + return ops; + }, [] as Array); + await this.elastic.bulk({ + index: INDEX, + refresh: true, + operations, + }) + } + + async syncWithDatabase(onProgress?: (percentage: number) => (void | Promise)): Promise { + // Delete all assets stored in elasticsearch. + await this.elastic.deleteByQuery({ + index: INDEX, + query: { match_all: {} }, + refresh: true, + }) + + const total = await this.prisma.asset.count(); + + let offset = 0; + for (;;) { + const records = await this.assetRepo.list({ limit: 1_00, offset }); + if (records.length === 0) { + break; + } + await this.register(records); + offset += records.length; + if (onProgress != null) { + await onProgress(offset / total); + } + } + } + + async search(query: string, options: SearchOptions): Promise { + const elasticResult = await this.searchElastic(query, options); + return await this.loadAssetsByElasticResult(elasticResult); + } + + async searchByTitle(title: string): Promise { + interface SearchHit { + _score: number; + fields: { + assetId: [number] + titlePublic: [string] + }; + } + + const response = await this.elastic.search({ + index: INDEX, + size: 10_000, + query: { + bool: { + must: { + query_string: { + query: `*${title}*`, + fields: ['titlePublic'], + }, + }, + }, + }, + fields: ['assetId', 'titlePublic'], + _source: false, + }); + return (response.hits.hits as unknown as SearchHit[]).map((hit) => ({ + score: hit._score, + assetId: hit.fields.assetId[0], + titlePublic: hit.fields.titlePublic[0], + })); + } + + private async searchElastic( + query: string, + { scope, assetIds }: SearchOptions, + ): Promise { + const filters: QueryDslQueryContainer[] = []; + if (assetIds != null) { + filters.push({ terms: { assetId: assetIds } }); + } + + const response = await this.elastic.search({ + index: INDEX, + size: 10_000, + query: { + bool: { + should: [ + { + multi_match: { + query, + fields: scope, + fuzziness: 'AUTO', + }, + }, + { + query_string: { + query: `*${query}*`, + fields: scope, + }, + }, + ], + filter: filters, + }, + }, + aggs: { + authorIds: { terms: { field: 'authorIds' } }, + minCreateDate: { min: { field: 'createDate' } }, + maxCreateDate: { max: { field: 'createDate' } }, + assetKindItemCodes: { terms: { field: 'assetKindItemCode' } }, + languageItemCodes: { terms: { field: 'languageItemCode' } }, + usageCodes: { terms: { field: 'usageCode' } }, + manCatLabelItemCodes: { terms: { field: 'manCatLabelItemCodes' } }, + }, + fields: ['assetId'], + _source: false, + }); + + interface ElasticSearchResult { + hits: { + hits: Array<{ + _score: number + fields: { + assetId: [number] + } + }> + }; + aggregations: { + minCreateDate: { value: DateId } + maxCreateDate: { value: DateId } + authorIds: { + buckets: AggregationBucket[] + } + assetKindItemCodes: { + buckets: AggregationBucket[] + } + languageItemCodes: { + buckets: AggregationBucket[] + } + usageCodes: { + buckets: AggregationBucket[] + } + manCatLabelItemCodes: { + buckets: AggregationBucket[] + } + }; + } + + interface AggregationBucket { + key: K; + doc_count: number; + } + + const { aggregations: aggs, hits } = response as unknown as ElasticSearchResult; + const scoresByAssetId = new Map(); + for (const hit of hits.hits) { + scoresByAssetId.set(hit.fields.assetId[0], hit._score); + } + const searchAggs: SearchAssetAggregations = { + ranges: { + createDate: { + min: aggs.minCreateDate.value, + max: aggs.maxCreateDate.value, + }, + }, + buckets: { + authorIds: aggs.authorIds.buckets.map(agg => ({ + key: agg.key, + count: agg.doc_count, + })), + assetKindItemCodes: aggs.assetKindItemCodes.buckets.map(agg => ({ + key: agg.key, + count: agg.doc_count, + })), + languageItemCodes: aggs.languageItemCodes.buckets.map(agg => ({ + key: agg.key, + count: agg.doc_count, + })), + usageCodes: aggs.usageCodes.buckets.map(agg => ({ + key: agg.key, + count: agg.doc_count, + })), + manCatLabelItemCodes: aggs.manCatLabelItemCodes.buckets.map(agg => ({ + key: agg.key, + count: agg.doc_count, + })), + }, + }; + + return { scoresByAssetId, aggs: searchAggs }; + } + + private async loadAssetsByElasticResult({ + scoresByAssetId, + aggs, + }: ElasticSearchResult): Promise { + if (scoresByAssetId.size === 0) { + return { _tag: 'SearchAssetResultEmpty' } + } + const entities = await this.prisma.asset.findMany({ + where: { + assetId: { in: [...scoresByAssetId.keys()] }, + }, + select: { + assetId: true, + titlePublic: true, + createDate: true, + assetKindItemCode: true, + assetFormatItemCode: true, + languageItemCode: true, + internalUse: { + select: { + isAvailable: true, + }, + }, + publicUse: { + select: { + isAvailable: true, + }, + }, + allStudies: { + select: { + studyId: true, + geomText: true, + }, + }, + assetContacts: { + select: { + contactId: true, + role: true, + }, + }, + manCatLabelRefs: { + select: { + manCatLabelItemCode: true, + }, + }, + }, + }); + return { + _tag: 'SearchAssetResultNonEmpty', + aggregations: aggs, + assets: entities.map((entity) => { + const { assetId } = entity; + const score = scoresByAssetId.get(assetId); + if (score == null) { + throw new Error(`found prisma entity that was not part of the elastic result: ${assetId}`); + } + return { + score, + assetId, + titlePublic: entity.titlePublic, + createDate: dateIdFromDate(entity.createDate), + assetFormatItemCode: entity.assetFormatItemCode, + assetKindItemCode: entity.assetKindItemCode, + languageItemCode: entity.languageItemCode, + contacts: entity.assetContacts.map((contact) => ({ + id: contact.contactId, + role: contact.role, + })), + studies: entity.allStudies, + manCatLabelItemCodes: entity.manCatLabelRefs.map((ref) => ref.manCatLabelItemCode), + usageCode: makeUsageCode(entity.publicUse.isAvailable, entity.internalUse.isAvailable), + }; + }), + }; + } + + private async mapAssetToElastic(asset: AssetEditDetailFromPostgres): Promise { + const contacts = await this.prisma.contact.findMany({ + select: { + name: true, + }, + where: { + contactId: { in: asset.assetContacts.map((it) => it.contactId) }, + }, + }) + return { + assetId: asset.assetId, + titlePublic: asset.titlePublic, + titleOriginal: asset.titleOriginal, + sgsId: asset.sgsId, + createDate: asset.createDate, + assetKindItemCode: asset.assetKindItemCode, + languageItemCode: asset.languageItemCode, + usageCode: makeUsageCode(asset.publicUse.isAvailable, asset.internalUse.isAvailable), + authorIds: asset.assetContacts.filter((it) => it.role === 'author').map((it) => it.contactId), + contactNames: contacts.map((it) => it.name), // TODO + manCatLabelItemCodes: asset.manCatLabelRefs, + } + } +} diff --git a/apps/server-asset-sg/src/app/search/elastic-search-client.ts b/apps/server-asset-sg/src/app/search/elastic-search-client.ts deleted file mode 100644 index dae3f139..00000000 --- a/apps/server-asset-sg/src/app/search/elastic-search-client.ts +++ /dev/null @@ -1,17 +0,0 @@ -import { ClientOptions, Client as ElasticSearchClient } from '@elastic/elasticsearch'; - -export const createElasticSearchClient = () => { - const options: ClientOptions = { - node: process.env.ELASTICSEARCH_URL || 'http://localhost:9200', - ...(process.env.ELASTICSEARCH_USERNAME && process.env.ELASTICSEARCH_PASSWORD - ? { - auth: { - username: process.env.ELASTICSEARCH_USERNAME || '', - password: process.env.ELASTICSEARCH_PASSWORD || '', - }, - } - : {}), - }; - - return new ElasticSearchClient(options); -}; diff --git a/apps/server-asset-sg/src/app/search/elasticsearch.ts b/apps/server-asset-sg/src/app/search/elasticsearch.ts new file mode 100644 index 00000000..744bbe83 --- /dev/null +++ b/apps/server-asset-sg/src/app/search/elasticsearch.ts @@ -0,0 +1,15 @@ +import { Client } from '@elastic/elasticsearch'; +import { FactoryProvider } from '@nestjs/common/interfaces/modules/provider.interface'; + +export const openElasticsearchClient = () => new Client({ + node: process.env.ELASTICSEARCH_URL ?? 'http://localhost:9200', + auth: { + username: process.env.ELASTICSEARCH_USERNAME ?? '', + password: process.env.ELASTICSEARCH_PASSWORD ?? '', + }, +}) + +export const provideElasticsearch: FactoryProvider = { + provide: Client, + useFactory: openElasticsearchClient, +} diff --git a/apps/server-asset-sg/src/app/search/find-assets-by-search-text.ts b/apps/server-asset-sg/src/app/search/find-assets-by-search-text.ts deleted file mode 100644 index e2f063c1..00000000 --- a/apps/server-asset-sg/src/app/search/find-assets-by-search-text.ts +++ /dev/null @@ -1,299 +0,0 @@ -import { Prisma, PrismaClient } from '@prisma/client'; -import { sequenceS } from 'fp-ts/Apply'; -import * as A from 'fp-ts/Array'; -import * as E from 'fp-ts/Either'; -import { contramap } from 'fp-ts/Eq'; -import { flow, pipe } from 'fp-ts/function'; -import * as NEA from 'fp-ts/NonEmptyArray'; -import * as N from 'fp-ts/number'; -import * as O from 'fp-ts/Option'; -import * as RR from 'fp-ts/ReadonlyRecord'; -import * as R from 'fp-ts/Record'; -import * as S from 'fp-ts/string'; -import * as TE from 'fp-ts/TaskEither'; -import * as D from 'io-ts/Decoder'; - -import { DT, unknownToError } from '@asset-sg/core'; -import { - DateId, - DateIdFromDate, - SearchAssetResultCodec, - SearchAssetResultOutput, - UsageCode, - makeUsageCode, -} from '@asset-sg/shared'; - -import { - SearchAssetElasticResult, - SearchAssetElasticResultDecoder, - SearchResultsElasticData, -} from '../models/SearchAssetElasticResult'; - -import { createElasticSearchClient } from './elastic-search-client'; - -export const searchAssets = ( - prismaClient: PrismaClient, - searchString: string, - filterAssetIds: O.Option, -): TE.TaskEither => { - const client = createElasticSearchClient(); - - const filter = pipe( - filterAssetIds, - O.map(assetIds => ({ - filter: { - terms: { - assetId: assetIds, - }, - }, - })), - O.toUndefined, - ); - - const searchAssetElasticResult = pipe( - TE.tryCatch( - () => - client.search({ - index: 'swissgeol_asset_asset', - size: 10000, - query: { - bool: { - must: { - query_string: { - query: searchString, - fields: ['titlePublic', 'titleOriginal', 'contactNames'], - }, - }, - ...filter, - }, - }, - aggs: { - authorIds: { terms: { field: 'authorIds' } }, - minCreateDate: { min: { field: 'createDate' } }, - maxCreateDate: { max: { field: 'createDate' } }, - assetKindItemCodes: { terms: { field: 'assetKindItemCode' } }, - languageItemCodes: { terms: { field: 'languageItemCode' } }, - usageCodes: { terms: { field: 'usageCode' } }, - manCatLabelItemCodes: { terms: { field: 'manCatLabelItemCodes' } }, - }, - fields: ['assetId'], - _source: false, - }), - unknownToError, - ), - TE.chainW( - flow( - SearchAssetElasticResultDecoder.decode, - E.mapLeft(e => new Error(D.draw(e))), - TE.fromEither, - ), - ), - ); - - const queryDb = (elasticResults: SearchResultsElasticData) => - pipe( - elasticResults.hits.hits.map(a => a.fields.assetId), - TE.of, - TE.chain(assetIds => - TE.tryCatch( - () => prismaClient.$queryRaw` - select - a.asset_id as "assetId", - a.title_public as "titlePublic", - a.create_date as "createDate", - a.asset_kind_item_code as "assetKindItemCode", - a.asset_format_item_code as "assetFormatItemCode", - a.language_item_code as "languageItemCode", - mclr.man_cat_label_item_code as "manCatLabelItemCode", - ac.contact_id as "contactId", - ac.role as "contactRole", - ius.is_available as "internalUse", - pus.is_available as "publicUse", - s.study_id as "studyId", - s.geom_text as "studyGeomText" - from - asset a - inner join - internal_use ius - on ius.internal_use_id = a.internal_use_id - inner join - public_use pus - on pus.public_use_id = a.public_use_id - left join - all_study s - on s.asset_id = a.asset_id - left join - asset_contact ac - on ac.asset_id = a.asset_id - left join - man_cat_label_ref mclr - on ac.asset_id = mclr.asset_id - where - a.asset_id in (${Prisma.join(assetIds)}) - `, - unknownToError, - ), - ), - TE.chainW( - flow( - DBResultList.decode, - E.mapLeft(e => new Error(D.draw(e))), - TE.fromEither, - ), - ), - ); - - const combineResults = (elasticResults: SearchResultsElasticData, dbResults: DBResultList) => - SearchAssetResultCodec.encode({ - _tag: 'SearchAssetResultNonEmpty', - aggregations: { - ranges: { - createDate: { - min: elasticResults.aggregations.minCreateDate, - max: elasticResults.aggregations.maxCreateDate, - }, - }, - buckets: { - authorIds: elasticResults.aggregations.authorIds.buckets.map(a => ({ - key: a.key, - count: a.doc_count, - })), - assetKindItemCodes: elasticResults.aggregations.assetKindItemCodes.buckets.map(a => ({ - key: a.key, - count: a.doc_count, - })), - languageItemCodes: elasticResults.aggregations.languageItemCodes.buckets.map(a => ({ - key: a.key, - count: a.doc_count, - })), - usageCodes: elasticResults.aggregations.usageCodes.buckets.map(a => ({ - key: a.key, - count: a.doc_count, - })), - manCatLabelItemCodes: elasticResults.aggregations.manCatLabelItemCodes.buckets.map(a => ({ - key: a.key, - count: a.doc_count, - })), - }, - }, - assets: pipe( - dbResults, - A.map(a => [String(a.assetId), a] as const), - RR.fromEntries, - assetsRecord => - pipe( - elasticResults.hits.hits, - A.map(a => - pipe( - R.lookup(String(a.fields.assetId), assetsRecord), - O.map(asset => ({ ...asset, score: a._score })), - ), - ), - A.compact, - ), - ), - }); - - return pipe( - searchAssetElasticResult, - TE.chain( - SearchAssetElasticResult.match({ - SearchAssetElasticResultEmpty: () => - TE.of({ _tag: 'SearchAssetResultEmpty' } as SearchAssetResultOutput), - SearchAssetElasticResultNonEmpty: data => - pipe( - queryDb(data), - TE.map(dbResults => combineResults(data, dbResults)), - ), - }), - ), - ); -}; - -const DBResultRaw = D.struct({ - assetId: D.number, - titlePublic: D.string, - contactId: DT.optionFromNullable(D.number), - contactRole: DT.optionFromNullable(D.string), - createDate: DateIdFromDate, - assetKindItemCode: D.string, - assetFormatItemCode: D.string, - languageItemCode: D.string, - manCatLabelItemCode: DT.optionFromNullable(D.string), - internalUse: D.boolean, - publicUse: D.boolean, - studyId: DT.optionFromNullable(D.string), - studyGeomText: DT.optionFromNullable(D.string), -}); -type DBResultRaw = D.TypeOf; - -const DBResultRawList = D.array(DBResultRaw); -type DBResultRawList = D.TypeOf; - -type DBResult = { - assetId: number; - titlePublic: string; - createDate: DateId; - assetKindItemCode: string; - assetFormatItemCode: string; - languageItemCode: string; - manCatLabelItemCodes: Array; - usageCode: UsageCode; - contacts: Array<{ role: string; id: number }>; - studies: Array<{ studyId: string; geomText: string }>; -}; - -const eqStudyByStudyId = contramap((x: { studyId: string; geomText: string }) => x.studyId)(S.Eq); -const eqContactByContactId = contramap((x: { contactId: number; contactRole: string }) => x.contactId)(N.Eq); - -const dbResultRawToDBResult = (dbResultRawList: NEA.NonEmptyArray): DBResult => { - const { - assetId, - titlePublic, - createDate, - assetFormatItemCode, - assetKindItemCode, - languageItemCode, - internalUse, - publicUse, - } = NEA.head(dbResultRawList); - return { - assetId, - titlePublic, - createDate, - assetFormatItemCode, - assetKindItemCode, - languageItemCode, - contacts: pipe( - dbResultRawList, - NEA.map(x => sequenceS(O.Apply)({ contactId: x.contactId, contactRole: x.contactRole })), - A.compact, - A.uniq(eqContactByContactId), - A.map(a => ({ id: a.contactId, role: a.contactRole })), - ), - studies: pipe( - dbResultRawList, - NEA.map(x => sequenceS(O.Apply)({ studyId: x.studyId, geomText: x.studyGeomText })), - A.compact, - A.uniq(eqStudyByStudyId), - ), - manCatLabelItemCodes: pipe( - dbResultRawList, - NEA.map(x => x.manCatLabelItemCode), - A.compact, - A.uniq(S.Eq), - ), - usageCode: makeUsageCode(publicUse, internalUse), - }; -}; - -const dbResultsRawListToDBResultList = (dbResultRawList: DBResultRawList): Array => - pipe( - dbResultRawList, - NEA.groupBy(x => String(x.assetId)), - R.map(dbResultRawToDBResult), - R.toArray, - A.map(([, dbResult]) => dbResult), - ); -const DBResultList = pipe(DBResultRawList, D.map(dbResultsRawListToDBResultList)); -type DBResultList = D.TypeOf; diff --git a/apps/server-asset-sg/src/app/search/find-assets-by-title.ts b/apps/server-asset-sg/src/app/search/find-assets-by-title.ts deleted file mode 100644 index 3a48c52b..00000000 --- a/apps/server-asset-sg/src/app/search/find-assets-by-title.ts +++ /dev/null @@ -1,61 +0,0 @@ -import * as E from 'fp-ts/Either'; -import { flow, pipe } from 'fp-ts/function'; -import * as TE from 'fp-ts/TaskEither'; -import * as D from 'io-ts/Decoder'; - -import { DT, unknownToError } from '@asset-sg/core'; -import { AssetByTitle } from '@asset-sg/shared'; - -import { createElasticSearchClient } from './elastic-search-client'; - -const decoder = pipe( - D.struct({ - hits: D.struct({ - hits: D.array( - D.struct({ - _score: D.number, - fields: D.struct({ - assetId: DT.HeadOfNonEmptyArray(D.number), - titlePublic: DT.HeadOfNonEmptyArray(D.string), - }), - }), - ), - }), - }), - D.map(a => - a.hits.hits.map(b => ({ score: b._score, titlePublic: b.fields.titlePublic, assetId: b.fields.assetId })), - ), -); - -export const searchAssetsByTitle = (searchString: string): TE.TaskEither => { - const client = createElasticSearchClient(); - - return pipe( - TE.tryCatch( - () => - client.search({ - index: 'swissgeol_asset_asset', - size: 10000, - query: { - bool: { - must: { - query_string: { - query: searchString, - fields: ['titlePublic'], - }, - }, - }, - }, - fields: ['assetId', 'titlePublic'], - _source: false, - }), - unknownToError, - ), - TE.chainEitherKW( - flow( - decoder.decode, - E.mapLeft(e => new Error(D.draw(e))), - ), - ), - ); -}; diff --git a/apps/server-asset-sg/src/app/user/models/user.ts b/apps/server-asset-sg/src/app/user/models/user.ts index e0e6ca9e..9a9a893a 100644 --- a/apps/server-asset-sg/src/app/user/models/user.ts +++ b/apps/server-asset-sg/src/app/user/models/user.ts @@ -1,6 +1,3 @@ -import * as E from 'fp-ts/Either'; -import { identity, pipe } from 'fp-ts/function'; -import * as C from 'io-ts/Codec'; import * as D from 'io-ts/Decoder'; import { Equals, assert } from 'tsafe'; @@ -9,24 +6,12 @@ import { User, UserRole } from '@asset-sg/shared'; const PrismaUserRaw = D.struct({ id: D.string, role: UserRole, - user: D.struct({ - email: D.string, - raw_user_meta_data: D.UnknownRecord, - }), -}); + email: D.string, + lang: D.string, -const RawUserMetaDataDecoder = D.struct({ lang: D.string }); -export const RawUserMetaData = C.make(RawUserMetaDataDecoder, { encode: identity }); +}); -export const PrismaUserDecoder = pipe( - PrismaUserRaw, - D.parse(u => - pipe( - RawUserMetaDataDecoder.decode(u.user.raw_user_meta_data), - E.map(rawUserMetaData => ({ id: u.id, role: u.role, email: u.user.email, lang: rawUserMetaData.lang })), - ), - ), -); +export const PrismaUserDecoder = PrismaUserRaw assert, User>>(); diff --git a/apps/server-asset-sg/src/app/user/user.controller.ts b/apps/server-asset-sg/src/app/user/user.controller.ts index 880e5f7e..9b9dd789 100644 --- a/apps/server-asset-sg/src/app/user/user.controller.ts +++ b/apps/server-asset-sg/src/app/user/user.controller.ts @@ -1,12 +1,10 @@ -import { Controller, Delete, Get, HttpCode, HttpException, Param, Put, Req, Res } from '@nestjs/common'; -import { Response } from 'express'; +import { Controller, Delete, Get, HttpCode, HttpException, Param, Put, Req } from '@nestjs/common'; import * as E from 'fp-ts/Either'; import * as D from 'io-ts/Decoder'; import { DT } from '@asset-sg/core'; import { isNotFoundError } from '../errors'; -import { cookieKey } from '../jwt/jwt-middleware'; import { AuthenticatedRequest } from '../models/request'; import { UserService } from './user.service'; @@ -17,11 +15,9 @@ export class UserController { @Get('') async getUser(@Req() req: AuthenticatedRequest) { - const e = await this.userService.getUser(req.jwtPayload.sub || '')(); + const e = await this.userService.getUser(req.jwtPayload.sub ?? '', req.jwtPayload.username.split('_')[1])(); if (E.isLeft(e)) { console.error(e.left); - req.res?.clearCookie(cookieKey); - req.res?.clearCookie('asset-sg-refresh-token'); throw new HttpException('Resource not found', 400); } return e.right; diff --git a/apps/server-asset-sg/src/app/user/user.service.ts b/apps/server-asset-sg/src/app/user/user.service.ts index 1a3b90e4..3bfffc4c 100644 --- a/apps/server-asset-sg/src/app/user/user.service.ts +++ b/apps/server-asset-sg/src/app/user/user.service.ts @@ -5,6 +5,7 @@ import * as TE from 'fp-ts/TaskEither'; import { DecodeError, UnknownError, decode, unknownToUnknownError } from '@asset-sg/core'; import { SearchAssetResult, User } from '@asset-sg/shared'; +import { AdminService } from '../admin/admin.service'; import { PrismaService } from '../prisma/prisma.service'; import { getFavourites } from './get-favourites'; @@ -12,18 +13,54 @@ import { PrismaUserDecoder } from './models'; @Injectable() export class UserService { - constructor(private readonly prismaService: PrismaService) {} + constructor(private readonly prismaService: PrismaService, private readonly adminServie: AdminService) {} - getUser(assetUserId: string): TE.TaskEither { + getUser(assetUserId: string, email?: string): TE.TaskEither { return pipe( TE.tryCatch( () => - this.prismaService.assetUser.findUnique({ - select: { id: true, role: true, user: { select: { email: true, raw_user_meta_data: true } } }, + this.prismaService.assetUser.findFirst({ + select: { id: true, role: true, email: true, lang: true }, where: { id: assetUserId }, }), unknownToUnknownError, ), + TE.chain(userOrNull => { + return userOrNull + ? TE.right(userOrNull) + : pipe( + this.createDefaultUser(assetUserId, email ?? ''), + TE.map(newUser => { + return newUser; + }), + ); + }), + TE.chainEitherKW(decode(PrismaUserDecoder)), + ); + } + + createDefaultUser(assetUserId: string, email: string): TE.TaskEither { + return pipe( + TE.tryCatch( + () => + this.prismaService.assetUser.create({ + data: { + id: assetUserId, + oidcId: assetUserId, + email: email ?? 'example@email.com', + role: 'viewer', + lang: 'de', + }, + select: { + id: true, + email: true, + role: true, + lang: true, + }, + }), + (error: unknown) => + new Error('Failed to create user: ' + (error instanceof Error ? error.message : String(error))), + ), TE.chainEitherKW(decode(PrismaUserDecoder)), ); } diff --git a/apps/server-asset-sg/tsconfig.spec.json b/apps/server-asset-sg/tsconfig.spec.json index c354ed63..de833b92 100644 --- a/apps/server-asset-sg/tsconfig.spec.json +++ b/apps/server-asset-sg/tsconfig.spec.json @@ -3,7 +3,9 @@ "compilerOptions": { "outDir": "../../dist/out-tsc", "module": "commonjs", - "types": ["jest", "node"] + "types": ["jest", "node"], + "resolveJsonModule": true, + "esModuleInterop": true }, "include": ["jest.config.ts", "src/**/*.test.ts", "src/**/*.spec.ts", "src/**/*.d.ts"] } diff --git a/deployment/.gitignore b/deployment/.gitignore deleted file mode 100644 index c6958891..00000000 --- a/deployment/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -/bin/ -/node_modules/ diff --git a/deployment/.npmrc b/deployment/.npmrc deleted file mode 100644 index ada002dc..00000000 --- a/deployment/.npmrc +++ /dev/null @@ -1,2 +0,0 @@ -@geoadmin:registry=https://npm.pkg.github.com - diff --git a/deployment/Pulumi.swissgeol-asset-dev.yaml b/deployment/Pulumi.swissgeol-asset-dev.yaml deleted file mode 100644 index a5245663..00000000 --- a/deployment/Pulumi.swissgeol-asset-dev.yaml +++ /dev/null @@ -1 +0,0 @@ -encryptionsalt: v1:xvQJdhou/Mo=:v1:AXKbjvdwfAAPx7C2:u7MtwzGkmlM/BBNMPvMxcPV8/hKKqg== diff --git a/deployment/Pulumi.swissgeol-asset-int.yaml b/deployment/Pulumi.swissgeol-asset-int.yaml deleted file mode 100644 index 7a4a2a33..00000000 --- a/deployment/Pulumi.swissgeol-asset-int.yaml +++ /dev/null @@ -1,32 +0,0 @@ -encryptionsalt: v1:NXwct9nFTZM=:v1:hQG2COhgQIaEolEV:oq6JKksPorLXiZZYhUv7FdtmSOj4nw== -config: - geoadmin-swissgeol-asset:apiDbCon: - secure: v1:waZr+8fn0BBLVaed:/QRuS33G2T8cFfSdNe695+T05r8LiWoE8U8C8ZVE6zUg7oLqh4zx+cBVRaurr7MX+JeYrbBnXxfgeZvzrlgLGNoHQ5wV0Uy0CS1VEO4VsZF6RuidoIONqPsgK3cP7+A99nRu7T53m3Xq7jreCom3ONK9Vq4tiPK+FdSAk7N/lu9I6Ew4k50RN55UFzXEajIs7Qx/XRlmsoVoXBAG3Rz/ahiizkeqU+SWQMAemUgxnZh6Y5L6qK5Q0g2WAhaSW2wA5Q6HmyJ9O6o45iJnzEBb6dpdGklQ2XLK6y397tULHyC0iayh - geoadmin-swissgeol-asset:authDbCon: - secure: v1:nssGZtjUUf1iJ5FX:1Sqw+SHcwDnReO08WqpozXIGDNB81JA0vap0FbXirzNna0kzwpF+LBMMWST0rpWhWB+bi/ZIjOzuvvLK3c3XnTD662ObFPJNWXo1jqoJzs9Rja4SwBlmFAxWhTVA2NMyHEb8ofJrQnoIC28KXS9H0Wv4dYX5WuqPHDeFtXuC6QlUS8JuDhu5+FiBsK+cdrH+WVwvx9h8P2SnPmb2OyiobgfyT/VjfG7HMLfLbCt9c9Fyg7xvVlSpJFTpemmeo/uUzn84Dpgynej8odS7Tl+i6kqd7j8sVuEoz5rdw3AaFcPj316ZyVibdQ== - geoadmin-swissgeol-asset:authDisableSignup: 'false' - geoadmin-swissgeol-asset:authSmtp: - admin_email: swissgeol@swisstopo.ch - host: mailrelay.swissgeol.ch - port: 465 - geoadmin-swissgeol-asset:authSmtpPass: - secure: v1:EbNF/c/Dbdj0VTFo:mzrlagWOrEnXNQggcbNOTLjKtMCEKxMj8956vP4PfsZTru01 - geoadmin-swissgeol-asset:elasticPassword: - secure: v1:vNIs4FduVFSjVe0V:Y/eMG84Vmk5XSr+NcGpYieToxJOMeU5LvLRpvMlvnR0GSc8JZA1UiYE5hZi81/rDmtehk8zz5hE= - geoadmin-swissgeol-asset:elasticVersion: 8.6.2 - geoadmin-swissgeol-asset:env: int - geoadmin-swissgeol-asset:ghcr-registry-secret: - secure: v1:660QyRmF8Vf+eNTo:s85LCoy0cMjfCEyGvSNVjN0wlknyaNMKPEtj3l98CDqano3VeUio46Us50aLmO4LeXPj6dIuqvUJFhFG4VTnFv5P+eYqyCY2HTOSde8/TtCdcYUQ4g6FcwdufWNZt1aTQbNUw4cgXHSEu9rd+JTr6fB0G2tjT27ZX4NjGdU2dWcRm4RbAzXqUBO9kyba7u1LUeeOrZ2atpoc5DXTa7JpDqyoZxc= - geoadmin-swissgeol-asset:s3: - bucket: swissgeol-assets-int-swisstopo - endpoint: https://s3.eu-central-1.amazonaws.com - region: eu-central-1 - geoadmin-swissgeol-asset:s3AccessKeyId: - secure: v1:jHi2r/8MRI6e47vg:yI5m1Yal7pdD5kj687W+og1YYhZPg8nNcpP7TPNSMpkMnPIavDAIANEP7Xo= - geoadmin-swissgeol-asset:s3SecretAccessKey: - secure: v1:y/9Ob3Rzq/VMOrP4:oSqMiGetio6/UaiumLGtuKeVTpln7nLvMPSdLkJw7/gS2aZLPy/3aY+xu/D0plhzcIh4jFTNLxsEaY1mZBYw9kaLfJ35fZaN - geoadmin-swissgeol-asset:searchEncryptionKey: - secure: v1:0QKHb9jZCKyOGxzO:iVwWeKrP++qSLveUasHFQA/OWSyBs2g/ypXhjSkPOjinoxNOCMiOh675ufFnE8J9U5FVmZ2UdBU= - geoadmin-swissgeol-asset:url: int-assets.swissgeol.ch - geoadmin-swissgeol-asset:version: 1.0.2 - kubernetes:context: swissgeol-int diff --git a/deployment/Pulumi.swissgeol-asset-prod.yaml b/deployment/Pulumi.swissgeol-asset-prod.yaml deleted file mode 100644 index c3daca2c..00000000 --- a/deployment/Pulumi.swissgeol-asset-prod.yaml +++ /dev/null @@ -1,32 +0,0 @@ -encryptionsalt: v1:lTcM7gC+GHI=:v1:kh6W3ak+T5NFtCRq:tuMXDgqxpVKFH+Yf5aGW5Jkku30NuA== -config: - geoadmin-swissgeol-asset:apiDbCon: - secure: v1:BoafVy7yhi+d5MBK:GFWEJnaI8wvkjZ2f9SU/k9+sC+laNCFgLJAO1m3c7WN5HKvqZbS6a6fbrFM/QxhStaDlh3ZTvnMXfIDI4Oygtgzq6SCDuPqPXMasd1ApUX5zNKHyQAnhgXR32I05t33B5sGzUkIQGpeF3Uw+/DyZ37r9DKdHxMFUWb+1mocflikm5RCDwUYPFu4xTKwEd1FIn8IF+jGXTmtHqtEphhgqlzo8g2bD63UZNVJzqZA1CyKZgLr1NjSqYabtie+t4QV4FOkvyK3glSLJ9v66eavp8g== - geoadmin-swissgeol-asset:authDbCon: - secure: v1:Hwvvv5n+n054ITCH:+d7UKMi6DJnZ3Q6GLvUE5/5NO6AYB8qqfWZFRNY1oZaO1+8802Uv4iKcEpKJuoN+9RLaSFVIl+c4iV2KRM5Y69Sl4YeFsdwQouakdURJIeBn4vqn25b4xWbLGHgF83Jc9HOSbQP4azGIbvKhk8Jt/YVe9P6otiV/YjgqY04f6h4a2USmRRXLMJMeJW8UAJCvtnZUkyTESnq+S2MbKbzW/g/12AIdFG1OhC7OSAS7qcuofopYUfZvD3lDOn0lqWUA7Zo2aq7TN6oPbcHEL0i1pOecD/0= - geoadmin-swissgeol-asset:authDisableSignup: 'false' - geoadmin-swissgeol-asset:authSmtp: - admin_email: swissgeol@swisstopo.ch - host: mailrelay.swissgeol.ch - port: 25 - geoadmin-swissgeol-asset:authSmtpPass: - secure: v1:5xbCZh7AAJDWNcr+:tHOKb+e++oJKrCk5g8aoTHi40MIDbOrymeY/MvmzAs1+wbSl - geoadmin-swissgeol-asset:elasticPassword: - secure: v1:95bRCyJJ58GRwzcl:iuCMfwrJ0/lUojRcIRkiO8i8dWI+lUsVVjsYUKXdrQD/SWmJP7GFn1BmNIU= - geoadmin-swissgeol-asset:elasticVersion: 8.6.2 - geoadmin-swissgeol-asset:env: prod - geoadmin-swissgeol-asset:ghcr-registry-secret: - secure: v1:z6bCRCOao2zX2Dz2:EiIASTu+pbxMVTRKnE1cgDTUfH8SJAzmL9l7pxqWOOMP4Nu4jSF+f7QFomD82GHi+ddCKqghUGxj9r8o1dezR6XzFjuBFSIOOqTGuEWSXBt3nYBdUIxM7KNm8YOmVmBXNZeFMBxr1MFcecqIMn6GHR5NWzHNkN5KuXvvShbFuVk6GXTCqfk+Bn5GdblMCjpDCG2/w/Ay9g2QuEX9QxbSUGN1Wr0= - geoadmin-swissgeol-asset:s3: - bucket: swissgeol-assets-swisstopo - endpoint: https://s3.eu-central-1.amazonaws.com - region: eu-central-1 - geoadmin-swissgeol-asset:s3AccessKeyId: - secure: v1:qxwdOAXw0LpR9IlE:HFn3V5nHmt22fgUajreMPM7yPUNJsrcKZlqIDYBruSA7DxScPerq+aQ7MGo= - geoadmin-swissgeol-asset:s3SecretAccessKey: - secure: v1:1wnUxik2LalkkWv/:Ud5skErM9ORk2xNYcEG8i+QjNAXn4NBe/keqc2Np/k1jzqDM7635v51ex1LW+dIvzEl+hWjg3QYaGlKFXYJZ6X1ypkf+ERTv - geoadmin-swissgeol-asset:searchEncryptionKey: - secure: v1:VBPGplDKXMuaQZrt:OCSfb4QzEGfkH6mKC7Le0fh6eAYcU5gnFXmszoqhk5WTPH75KEmXJ19jMJs= - geoadmin-swissgeol-asset:url: assets.swissgeol.ch - geoadmin-swissgeol-asset:version: 1.0.2 - kubernetes:context: swissgeol-prod diff --git a/deployment/Pulumi.yaml b/deployment/Pulumi.yaml deleted file mode 100644 index c27878ad..00000000 --- a/deployment/Pulumi.yaml +++ /dev/null @@ -1,3 +0,0 @@ -name: geoadmin-swissgeol-asset -runtime: nodejs -description: swissgeol asset deployment configuration diff --git a/deployment/components/api.ts b/deployment/components/api.ts deleted file mode 100644 index 0fcb8fc9..00000000 --- a/deployment/components/api.ts +++ /dev/null @@ -1,89 +0,0 @@ -import { Config } from '@pulumi/pulumi'; -import { InitPulumiConfig, LambdaK8SDeployment, LambdaK8sConfiguration } from '@geoadmin/lambda-it-pulumi-lib'; -import { AdditionalArgs } from '../helper'; - -export default function deployApi(initConfig: InitPulumiConfig, cfg: Config, args: AdditionalArgs) { - const { secretsName } = args; - const deployCfg = new LambdaK8sConfiguration(initConfig); - const { - metadata, - pulumiConfig: { appUrls }, - } = deployCfg.values(); - deployCfg.setReplicas(1).setResources({ - limits: { cpu: '1', memory: '1024M' }, - requests: { cpu: '0.25', memory: '64M' }, - }); - - const s3Config = cfg.requireObject<{ endpoint: string; region: string; bucket: string }>('s3'); - - deployCfg - .addEnvironment({ - name: 'DATABASE_URL', - valueFrom: { - secretKeyRef: { - name: secretsName, - key: 'apiDbCon', - }, - }, - }) - .addEnvironment({ name: 'FRONTEND_URL', value: `https://${appUrls[0]}` }) - .addEnvironment({ - name: 'ELASTICSEARCH_URL', - value: `http://swissgeol-asset-elasticsearch-${metadata.labels.env}:9200`, - }) - .addEnvironment({ name: 'ELASTICSEARCH_USERNAME', value: 'elastic' }) - .addEnvironment({ - name: 'ELASTICSEARCH_PASSWORD', - valueFrom: { - secretKeyRef: { - name: secretsName, - key: 'elasticPassword', - }, - }, - }) - .addEnvironment({ name: 'AUTH_URL', value: `http://swissgeol-asset-gotrue-${metadata.labels.env}:8081` }) - .addEnvironment({ - name: 'GOTRUE_JWT_SECRET', - valueFrom: { - secretKeyRef: { - name: secretsName, - key: 'gotrueJwtSecret', - }, - }, - }) - .addEnvironment({ name: 'S3_BUCKET_NAME', value: s3Config.bucket }) - .addEnvironment({ name: 'S3_REGION', value: s3Config.region }) - .addEnvironment({ name: 'S3_ENDPOINT', value: s3Config.endpoint }) - .addEnvironment({ - name: 'S3_ACCESS_KEY_ID', - valueFrom: { - secretKeyRef: { - name: secretsName, - key: 's3AccessKeyId', - }, - }, - }) - .addEnvironment({ - name: 'S3_SECRET_ACCESS_KEY', - valueFrom: { - secretKeyRef: { - name: secretsName, - key: 's3SecretAccessKey', - }, - }, - }) - .addEnvironment({ - name: 'S3_ASSET_FOLDER', - value: 'asset/asset_files', - }) - .addEnvironment({ - name: 'OCR_URL', - value: `http://swissgeol-digi-ocr-${metadata.labels.env}.swissgeol-digi.svc.cluster.local:5000`, - }) - .addEnvironment({ - name: 'OCR_CALLBACK_URL', - value: `http://swissgeol-asset-api-${metadata.labels.env}.swissgeol-asset.svc.cluster.local:3333/api`, - }); - - new LambdaK8SDeployment(deployCfg).createDeployment(); -} diff --git a/deployment/components/app.ts b/deployment/components/app.ts deleted file mode 100644 index dfd01312..00000000 --- a/deployment/components/app.ts +++ /dev/null @@ -1,12 +0,0 @@ -import { Config } from '@pulumi/pulumi'; -import { InitPulumiConfig, LambdaK8SDeployment, LambdaK8sConfiguration } from '@geoadmin/lambda-it-pulumi-lib'; - -export default function deployApp(initConfig: InitPulumiConfig, cfg: Config) { - const deployCfg = new LambdaK8sConfiguration(initConfig); - deployCfg.setReplicas(1).setResources({ - limits: { cpu: '1', memory: '256M' }, - requests: { cpu: '0.25', memory: '64M' }, - }); - - new LambdaK8SDeployment(deployCfg).createRepository().createDeployment(); -} diff --git a/deployment/components/auth.ts b/deployment/components/auth.ts deleted file mode 100644 index a5d7babf..00000000 --- a/deployment/components/auth.ts +++ /dev/null @@ -1,110 +0,0 @@ -import { Config } from '@pulumi/pulumi'; -import { InitPulumiConfig, LambdaK8SDeployment, LambdaK8sConfiguration } from '@geoadmin/lambda-it-pulumi-lib'; -import { AdditionalArgs } from '../helper'; - -export default function deployAuth(initConfig: InitPulumiConfig, cfg: Config, args: AdditionalArgs) { - const { secretsName } = args; - const deployCfg = new LambdaK8sConfiguration(initConfig); - const { - pulumiConfig: { - appUrls: [url], - }, - } = deployCfg.values(); - - deployCfg - .addEnvironment({ - name: 'GOTRUE_API_HOST', - value: '0.0.0.0', - }) - .addEnvironment({ - name: 'GOTRUE_SITE_URL', - value: `https://${url}`, - }) - .addEnvironment({ - name: 'GOTRUE_DB_DRIVER', - value: 'postgres', - }) - .addEnvironment({ - name: 'DB_DRIVER', - value: 'postgres', - }) - .addEnvironment({ - name: 'DATABASE_URL', - valueFrom: { - secretKeyRef: { - name: secretsName, - key: 'authDbCon', - }, - }, - }) - .addEnvironment({ - name: 'GOTRUE_COOKIE_KEY', - value: 'asset-sg', - }) - .addEnvironment({ - name: 'GOTRUE_JWT_SECRET', - valueFrom: { - secretKeyRef: { - name: secretsName, - key: 'gotrueJwtSecret', - }, - }, - }) - .addEnvironment({ - name: 'GOTRUE_DISABLE_SIGNUP', - value: (cfg.getBoolean('authDisableSignup') ?? true).toString(), - }) - .addEnvironment({ name: 'GOTRUE_SMTP_SENDER_NAME', value: 'Swissgeol' }) - .addEnvironment({ - name: 'GOTRUE_MAILER_URLPATHS_INVITE', - value: `https://${url}/auth/verify`, - }) - .addEnvironment({ - name: 'GOTRUE_MAILER_URLPATHS_CONFIRMATION', - value: '/auth/v1/verify', - }) - .addEnvironment({ - name: 'GOTRUE_MAILER_URLPATHS_RECOVERY', - value: `https://${url}/auth/verify`, - }) - .addEnvironment({ - name: 'GOTRUE_MAILER_URLPATHS_EMAIL_CHANGE', - value: '/auth/v1/verify', - }) - .addEnvironment({ - name: 'GOTRUE_MAILER_SUBJECTS_INVITE', - value: '{{if eq .Data.language "de"}} Einladung für assets.swissgeol.ch Login {{else if eq .Data.language "fr"}} Invitation à se connecter à assets.swissgeol.ch {{else if eq .Data.language "it"}} Invito all\'\'accesso a assets.swissgeol.ch {{else if eq .Data.language "rm"}} RM TODO TRANSLATE Einladung für assets.swissgeol.ch Login {{else}} Invitation to assets.swissgeol.ch {{end}}\'', - }) - .addEnvironment({ - name: 'GOTRUE_MAILER_TEMPLATES_INVITE', - value: `https://${url}/assets/email-templates/invite.html`, - }) - .addEnvironment({ - name: 'GOTRUE_MAILER_SUBJECTS_RECOVERY', - value: '{{if eq .Data.language "de"}} Passwort zurücksetzen für assets.swissgeol.ch {{else if eq .Data.language "fr"}} Réinitialiser le mot de passe pour assets.swissgeol.ch {{else if eq .Data.language "it"}} Reimpostare la password di assets.swissgeol.ch {{else if eq .Data.language "rm"}} RM TODO TRANSLATE Passwort zurücksetzen für assets.swissgeol.ch {{else}} Password reset for assets.swissgeol.ch {{end}}', - }) - .addEnvironment({ - name: 'GOTRUE_MAILER_TEMPLATES_RECOVERY', - value: `https://${url}/assets/email-templates/recover.html`, - }); - - // add ressource configuration - deployCfg.setReplicas(1).setResources({ - limits: { cpu: '1', memory: '512M' }, - requests: { cpu: '0.1', memory: '128M' }, - }); - - // add smtp environment variables - const smtpSettings = cfg.requireObject<{ host: string; port: number; user: string; adminEmail: string }>( - 'authSmtp', - ); - Object.keys(smtpSettings).forEach(key => { - deployCfg.addEnvironment({ - name: `GOTRUE_SMTP_${key.toUpperCase()}`, - value: smtpSettings[key as keyof typeof smtpSettings].toString(), - }); - }); - - // gotrue deployment - new LambdaK8SDeployment(deployCfg).createDeployment(); -} diff --git a/deployment/components/debug.ts b/deployment/components/debug.ts deleted file mode 100644 index ee3cfc9b..00000000 --- a/deployment/components/debug.ts +++ /dev/null @@ -1,32 +0,0 @@ -import { Pod } from '@pulumi/kubernetes/core/v1'; - -export function createDebugPod(baseMetadata: any, volumeName: string) { - const pod = new Pod('debug-pod', { - metadata: { - name: 'debug-pod', - namespace: baseMetadata.namespace, - }, - spec: { - volumes: [{ - name: volumeName, - persistentVolumeClaim: { - claimName: volumeName, - }, - }], - containers: [ - { - name: 'debug-pod', - image: 'busybox', - command: ['sleep', '360000'], - volumeMounts: [ - { - name: volumeName, - mountPath: '/data', - }, - ], - }, - ], - }, - }); - return pod; -} diff --git a/deployment/components/routing.ts b/deployment/components/routing.ts deleted file mode 100644 index 86703694..00000000 --- a/deployment/components/routing.ts +++ /dev/null @@ -1,118 +0,0 @@ -import { Metadata } from '@geoadmin/lambda-it-pulumi-lib'; -import { IngressRoute, Middleware } from '@geoadmin/lambda-it-pulumi-lib/crds/traefik/traefik/v1alpha1'; - -export default function createTraefikRoutes(metadata: Metadata, url: string) { - const { project, app, env } = metadata.labels; - const routeName = `${project}-${app}-${env}-routes`; - - const mwWhiteListName = `${metadata.labels.project}-${metadata.labels.app}-${metadata.labels.env}-whitelist`; - const mwKibanaRewriteName = `${metadata.labels.project}-${metadata.labels.app}-${metadata.labels.env}-kibana-rewrite`; - const mwAuthRewriteName = `${metadata.labels.project}-${metadata.labels.app}-${metadata.labels.env}-auth-rewrite`; - - const ingressRoute = new IngressRoute(routeName, { - metadata: { - name: routeName, - namespace: metadata.namespace, - labels: metadata.labels, - }, - spec: { - entryPoints: ['web'], - routes: [ - // app - { - kind: 'Rule', - match: 'Host(`' + url + '`)', - services: [{ name: `${project}-${app}-app-${env}`, port: 80 }], - priority: 100, - }, - // api - { - kind: 'Rule', - match: 'Host(`' + url + '`) && PathPrefix(`/api`)', - services: [{ name: `${project}-${app}-api-${env}`, port: 3333 }], - priority: 120, - }, - // auth - { - kind: 'Rule', - match: 'Host(`' + url + '`) && PathPrefix(`/auth`)', - services: [{ name: `${project}-${app}-gotrue-${env}`, port: 8081 }], - middlewares: [ - { name: mwAuthRewriteName }, - ], - priority: 121, - }, - // kibana - { - kind: 'Rule', - match: 'Host(`' + url + '`) && PathPrefix(`/kibana`)', - services: [{ name: `${project}-${app}-kibana-${env}`, port: 5601 }], - middlewares: [ - // { - // name: mwWhiteListName, - // }, - { name: mwKibanaRewriteName }, - ], - priority: 110, - }, - ], - }, - }); - - new Middleware( - mwWhiteListName, - { - metadata: { - name: mwWhiteListName, - namespace: metadata.namespace, - labels: metadata.labels, - }, - spec: { - ipWhiteList: { - sourceRange: ['62.202.47.154'], - }, - }, - }, - { - parent: ingressRoute, - }, - ); - - new Middleware( - mwKibanaRewriteName, - { - metadata: { - name: mwKibanaRewriteName, - namespace: metadata.namespace, - labels: metadata.labels, - }, - spec: { - stripPrefix: { - prefixes: ['/kibana'], - }, - }, - }, - { - parent: ingressRoute, - }, - ); - - new Middleware( - mwAuthRewriteName, - { - metadata: { - name: mwAuthRewriteName, - namespace: metadata.namespace, - labels: metadata.labels, - }, - spec: { - stripPrefix: { - prefixes: ['/auth'], - }, - }, - }, - { - parent: ingressRoute, - }, - ); -} diff --git a/deployment/components/search.ts b/deployment/components/search.ts deleted file mode 100644 index d0b9e501..00000000 --- a/deployment/components/search.ts +++ /dev/null @@ -1,120 +0,0 @@ -import { Config } from '@pulumi/pulumi'; -import * as k8s from '@pulumi/kubernetes'; -import { InitPulumiConfig, LambdaK8SDeployment, LambdaK8sConfiguration } from '@geoadmin/lambda-it-pulumi-lib'; -import { AdditionalArgs } from '../helper'; - -export function deployElasticsearch(initConfig: InitPulumiConfig, cfg: Config, args: AdditionalArgs) { - const deployCfg = new LambdaK8sConfiguration(initConfig); - const { secretsName } = args; - const { metadata } = deployCfg.values(); - - const pvc = `${metadata.labels.project}-${metadata.labels.app}-${metadata.labels.env}-volume`; - new k8s.core.v1.PersistentVolumeClaim(pvc, { - metadata: { ...metadata, name: pvc }, - spec: { - accessModes: ['ReadWriteOnce'], - resources: { - requests: { - storage: '50Gi', - }, - }, - storageClassName: 'gp2', - }, - }); - - deployCfg - .addEnvironment({ name: 'discovery.type', value: 'single-node' }) - .addEnvironment({ name: 'ES_JAVA_OPTS', value: '-Xms1024m -Xmx1024m' }) - .addEnvironment({ name: 'ELASTIC_USERNAME', value: 'elastic' }) - .addEnvironment({ - name: 'ELASTIC_PASSWORD', - valueFrom: { - secretKeyRef: { - name: secretsName, - key: 'elasticPassword', - }, - }, - }) - .addEnvironment({ name: 'xpack.security.enabled', value: 'true' }) - .addEnvironment({ - name: 'xpack.encryptedSavedObjects.encryptionKey', - valueFrom: { - secretKeyRef: { - name: secretsName, - key: 'elasticEncryptionKey', - }, - }, - }) - .addEnvironment({ name: 'bootstrap.memory_lock', value: 'true' }) - .setResources({ - requests: { - cpu: '1', - memory: '2Gi', - }, - limits: { - cpu: '4', - memory: '4Gi', - }, - }) - .addVolume({ - name: pvc, - persistentVolumeClaim: { - claimName: pvc, - }, - }) - .addVolumeMount({ - name: pvc, - mountPath: '/usr/share/elasticsearch/data', - subPath: 'elasticsearch', - }) - .setDeployStrategy({ - type: 'Recreate', - }) - .setSecurityContext({ - fsGroup: 0, - }); - new LambdaK8SDeployment(deployCfg).createDeployment(); -} - -export function deployKibana(initConfig: InitPulumiConfig, cfg: Config, args: AdditionalArgs) { - const deployCfg = new LambdaK8sConfiguration(initConfig); - const { secretsName } = args; - const { - metadata, - pulumiConfig: { - appUrls: [url], - }, - } = deployCfg.values(); - - deployCfg - .addEnvironment({ name: 'SERVER_BASEPATH', value: '/kibana' }) - .addEnvironment({ name: 'SERVER_PUBLICBASEURL', value: `https://${url}/kibana` }) - .addEnvironment({ - name: 'ELASTICSEARCH_PASSWORD', - valueFrom: { - secretKeyRef: { - name: secretsName, - key: 'elasticPassword', - }, - }, - }) - .addEnvironment({ - name: 'ELASTICSEARCH_HOSTS', - value: `http://kibana_system:$(ELASTICSEARCH_PASSWORD)@swissgeol-asset-elasticsearch-${metadata.labels.env}:9200`, - }) - .addEnvironment({ - name: 'xpack.encryptedSavedObjects.encryptionKey', - valueFrom: { - secretKeyRef: { - name: secretsName, - key: 'elasticEncryptionKey', - }, - }, - }) - .setResources({ - limits: { cpu: '2', memory: '1024M' }, - requests: { cpu: '0.25', memory: '256M' }, - }); - - new LambdaK8SDeployment(deployCfg).createDeployment(); -} diff --git a/deployment/components/secrets.ts b/deployment/components/secrets.ts deleted file mode 100644 index d6d4ee6c..00000000 --- a/deployment/components/secrets.ts +++ /dev/null @@ -1,41 +0,0 @@ -import { createSecret } from '@geoadmin/lambda-it-pulumi-lib/components/secret'; -import { GA_Env } from '../helper'; -import { Config, Output } from '@pulumi/pulumi'; -import { RandomPassword } from '@pulumi/random'; -import { SecretData } from '@geoadmin/lambda-it-pulumi-lib'; -import { Secret } from '@geoadmin/lambda-it-pulumi-lib/types'; - -export interface AssetSecretKeys { - elasticPassword: Output; - elasticEncryptionKey: Output; - gotrueJwtSecret: string; - // s3AccessKeyId: Output; - // s3SecretAccessKey: Output; - apiDbCon: Output; - authDbCon: Output; -} - -export function getAssetSecretName(env: GA_Env): string { - return `swissgeol-asset-secrets-${env}`; -} - -export function createAssetSecret(cfg: Config, baseMetadata: any, name: string): Secret { - const jwtSecret = new RandomPassword(`${baseMetadata.namespace}-jwt-secret-gotrue-jwt-secret`, { - length: 30, - }); - - const secretData: SecretData & AssetSecretKeys = { - elasticPassword: cfg.requireSecret('elasticPassword'), - elasticEncryptionKey: cfg.requireSecret('searchEncryptionKey'), - gotrueJwtSecret: Buffer.from(jwtSecret.result.toString()).toString('base64'), - s3AccessKeyId: cfg.requireSecret('s3AccessKeyId'), - s3SecretAccessKey: cfg.requireSecret('s3SecretAccessKey'), - apiDbCon: cfg.requireSecret('apiDbCon'), - authDbCon: cfg.requireSecret('authDbCon'), - }; - - return createSecret( - { ...baseMetadata, labels: { ...baseMetadata.labels, app: 'asset-core' }, name: name }, - secretData, - ); -} diff --git a/deployment/helper.ts b/deployment/helper.ts deleted file mode 100644 index 36dfc130..00000000 --- a/deployment/helper.ts +++ /dev/null @@ -1,11 +0,0 @@ -import { RandomPassword } from "@pulumi/random"; - -export enum GA_Env { - DEV = 'dev', - STAGE = 'stage', - PROD = 'prod', -} - -export interface AdditionalArgs { - secretsName: string; -} diff --git a/deployment/index.ts b/deployment/index.ts deleted file mode 100644 index 674b386c..00000000 --- a/deployment/index.ts +++ /dev/null @@ -1,125 +0,0 @@ -import { Config } from '@pulumi/pulumi'; -import deployApp from './components/app'; -import { LambdaK8sConfiguration } from '@geoadmin/lambda-it-pulumi-lib'; -import { RegistryName } from '@geoadmin/lambda-it-pulumi-lib'; -import { GA_Env } from './helper'; -import deployAuth from './components/auth'; -import { deployElasticsearch, deployKibana } from './components/search'; -import deployApi from './components/api'; -import { createAssetSecret, getAssetSecretName } from './components/secrets'; -import createTraefikRoutes from './components/routing'; - -const cfg = new Config(); -const registry = 'ghcr.io/geoadmin'; -const env: GA_Env = cfg.get('env') || GA_Env.DEV; -const version = cfg.get('version') ?? 'latest'; -const goTrueVersion = cfg.get('goTrueVersion') ?? 'latest'; -const elasticVersion = cfg.require('elasticVersion'); -const baseAppName = 'asset'; - -const baseMetadata = { - namespace: 'swissgeol-asset', - labels: { project: 'swissgeol', env: env.toString() }, -}; - -const baseCfgFactory = LambdaK8sConfiguration.createFactory({ - namespace: baseMetadata.namespace, // namespace is created manually, permission reasons - labels: { - project: baseMetadata.labels.project, - env: baseMetadata.labels.env, - }, - registrySecret: { - name: 'geoadmin-ghcr-registry' as RegistryName, - value: cfg.requireSecret('ghcr-registry-secret'), - }, - // only defined as placeholder, will be overwritten deploy functions - appUrls: [cfg.require('url')], -}); - -// ------------- DEPLOY DEFAULTS ------------- -const assetCoreSecrets = getAssetSecretName(env); -createAssetSecret(cfg, baseMetadata, assetCoreSecrets); - -// ------------- DEPLOY APP ------------- -deployApp( - baseCfgFactory({ - labels: { - app: `${baseAppName}-app`, - }, - dockerImage: `${registry}/swissgeol-asset-app:${version}`, - port: { - containerPort: 80, - }, - }), - cfg, -); - -// ------------- DEPLOY API ------------- -deployApi( - baseCfgFactory({ - labels: { - app: `${baseAppName}-api`, - }, - dockerImage: `${registry}/swissgeol-asset-api:${version}`, - port: { - containerPort: 3333, - }, - }), - cfg, - { secretsName: assetCoreSecrets }, -); - -// ------------- DEPLOY AUTH ------------- -deployAuth( - baseCfgFactory({ - labels: { - app: `${baseAppName}-gotrue`, - }, - dockerImage: `${registry}/swissgeol-auth-gotrue:${goTrueVersion}`, - port: { - containerPort: 8081, - }, - }), - cfg, - { secretsName: assetCoreSecrets }, -); - -// ------------- DEPLOY SEARCH ------------- -deployElasticsearch( - baseCfgFactory({ - labels: { - app: `${baseAppName}-elasticsearch`, - }, - dockerImage: `${registry}/swissgeol-search-elasticsearch:${elasticVersion}`, - port: { - containerPort: 9200, - }, - }), - cfg, - { secretsName: assetCoreSecrets }, -); - -// createDebugPod( -// baseMetadata, -// `${baseMetadata.labels.project}-${baseAppName}-elasticsearch-${env}-volume`, -// ); - -deployKibana( - baseCfgFactory({ - labels: { - app: `${baseAppName}-kibana`, - }, - dockerImage: `${registry}/swissgeol-search-kibana:${elasticVersion}`, - port: { - containerPort: 5601, - }, - }), - cfg, - { secretsName: assetCoreSecrets }, -); - -// ------------- DEPLOY ROUTING ------------- -createTraefikRoutes( - { ...baseMetadata, name: '', labels: { ...baseMetadata.labels, app: 'asset' } }, - cfg.require('url'), -); diff --git a/deployment/package-lock.json b/deployment/package-lock.json deleted file mode 100644 index 02ea3dc8..00000000 --- a/deployment/package-lock.json +++ /dev/null @@ -1,2214 +0,0 @@ -{ - "name": "geoadmin-swissgeol-asset", - "lockfileVersion": 3, - "requires": true, - "packages": { - "": { - "name": "geoadmin-swissgeol-asset", - "dependencies": { - "@geoadmin/lambda-it-pulumi-lib": "^0.7.10", - "@pulumi/kubernetes": "^3.0.0", - "@pulumi/kubernetesx": "^0.1.5", - "@pulumi/pulumi": "^3.0.0", - "@pulumi/random": "^4.13.0" - }, - "devDependencies": { - "@types/node": "^16", - "typescript": "^5.0.4" - } - }, - "node_modules/@geoadmin/lambda-it-pulumi-lib": { - "version": "0.7.10", - "resolved": "https://npm.pkg.github.com/download/@geoadmin/lambda-it-pulumi-lib/0.7.10/d5d8715b6ca1489de9a9b020d4b133b002108c7f", - "integrity": "sha512-QM3Wf4Lb3yCCzW+8YZaRMYnSaD37VcxZEUBzFMbinPlVy/5OM2SzsjliwZQzeqyQiPdGxkFYSUuI6Ne9N9WMJg==", - "dependencies": { - "deepmerge": "^4.2.2", - "fp-ts": "^2.13.1", - "io-ts": "^2.2.19", - "io-ts-reporters": "^2.0.1", - "mongodb-uri": "^0.9.7" - }, - "peerDependencies": { - "@pulumi/kubernetes": "^3.21.4", - "@pulumi/pulumi": "^3.43.1" - } - }, - "node_modules/@grpc/grpc-js": { - "version": "1.8.14", - "resolved": "https://registry.npmjs.org/@grpc/grpc-js/-/grpc-js-1.8.14.tgz", - "integrity": "sha512-w84maJ6CKl5aApCMzFll0hxtFNT6or9WwMslobKaqWUEf1K+zhlL43bSQhFreyYWIWR+Z0xnVFC1KtLm4ZpM/A==", - "dependencies": { - "@grpc/proto-loader": "^0.7.0", - "@types/node": ">=12.12.47" - }, - "engines": { - "node": "^8.13.0 || >=10.10.0" - } - }, - "node_modules/@grpc/proto-loader": { - "version": "0.7.6", - "resolved": "https://registry.npmjs.org/@grpc/proto-loader/-/proto-loader-0.7.6.tgz", - "integrity": "sha512-QyAXR8Hyh7uMDmveWxDSUcJr9NAWaZ2I6IXgAYvQmfflwouTM+rArE2eEaCtLlRqO81j7pRLCt81IefUei6Zbw==", - "dependencies": { - "@types/long": "^4.0.1", - "lodash.camelcase": "^4.3.0", - "long": "^4.0.0", - "protobufjs": "^7.0.0", - "yargs": "^16.2.0" - }, - "bin": { - "proto-loader-gen-types": "build/bin/proto-loader-gen-types.js" - }, - "engines": { - "node": ">=6" - } - }, - "node_modules/@logdna/tail-file": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/@logdna/tail-file/-/tail-file-2.2.0.tgz", - "integrity": "sha512-XGSsWDweP80Fks16lwkAUIr54ICyBs6PsI4mpfTLQaWgEJRtY9xEV+PeyDpJ+sJEGZxqINlpmAwe/6tS1pP8Ng==", - "engines": { - "node": ">=10.3.0" - } - }, - "node_modules/@opentelemetry/api": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/@opentelemetry/api/-/api-1.4.1.tgz", - "integrity": "sha512-O2yRJce1GOc6PAy3QxFM4NzFiWzvScDC1/5ihYBL6BUEVdq0XMWN01sppE+H6bBXbaFYipjwFLEWLg5PaSOThA==", - "engines": { - "node": ">=8.0.0" - } - }, - "node_modules/@opentelemetry/api-metrics": { - "version": "0.32.0", - "resolved": "https://registry.npmjs.org/@opentelemetry/api-metrics/-/api-metrics-0.32.0.tgz", - "integrity": "sha512-g1WLhpG8B6iuDyZJFRGsR+JKyZ94m5LEmY2f+duEJ9Xb4XRlLHrZvh6G34OH6GJ8iDHxfHb/sWjJ1ZpkI9yGMQ==", - "deprecated": "Please use @opentelemetry/api >= 1.3.0", - "dependencies": { - "@opentelemetry/api": "^1.0.0" - }, - "engines": { - "node": ">=14" - } - }, - "node_modules/@opentelemetry/context-async-hooks": { - "version": "1.12.0", - "resolved": "https://registry.npmjs.org/@opentelemetry/context-async-hooks/-/context-async-hooks-1.12.0.tgz", - "integrity": "sha512-PmwAanPNWCyS9JYFzhzVzHgviLhc0UHjOwdth+hp3HgQQ9XZZNE635P8JhAUHZmbghW9/qQFafRWOS4VN9VVnQ==", - "engines": { - "node": ">=14" - }, - "peerDependencies": { - "@opentelemetry/api": ">=1.0.0 <1.5.0" - } - }, - "node_modules/@opentelemetry/core": { - "version": "1.12.0", - "resolved": "https://registry.npmjs.org/@opentelemetry/core/-/core-1.12.0.tgz", - "integrity": "sha512-4DWYNb3dLs2mSCGl65jY3aEgbvPWSHVQV/dmDWiYeWUrMakZQFcymqZOSUNZO0uDrEJoxMu8O5tZktX6UKFwag==", - "dependencies": { - "@opentelemetry/semantic-conventions": "1.12.0" - }, - "engines": { - "node": ">=14" - }, - "peerDependencies": { - "@opentelemetry/api": ">=1.0.0 <1.5.0" - } - }, - "node_modules/@opentelemetry/exporter-zipkin": { - "version": "1.12.0", - "resolved": "https://registry.npmjs.org/@opentelemetry/exporter-zipkin/-/exporter-zipkin-1.12.0.tgz", - "integrity": "sha512-HJ4ww7OjVIV4x5ZGgY+h+D1JS0GsCtnHuqZUVHl7EFFQxMGpbQcf5eISRtwqgQwlQKh2iqrEbiHdDyzbgA/7XQ==", - "dependencies": { - "@opentelemetry/core": "1.12.0", - "@opentelemetry/resources": "1.12.0", - "@opentelemetry/sdk-trace-base": "1.12.0", - "@opentelemetry/semantic-conventions": "1.12.0" - }, - "engines": { - "node": ">=14" - }, - "peerDependencies": { - "@opentelemetry/api": "^1.0.0" - } - }, - "node_modules/@opentelemetry/instrumentation": { - "version": "0.32.0", - "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation/-/instrumentation-0.32.0.tgz", - "integrity": "sha512-y6ADjHpkUz/v1nkyyYjsQa/zorhX+0qVGpFvXMcbjU4sHnBnC02c6wcc93sIgZfiQClIWo45TGku1KQxJ5UUbQ==", - "dependencies": { - "@opentelemetry/api-metrics": "0.32.0", - "require-in-the-middle": "^5.0.3", - "semver": "^7.3.2", - "shimmer": "^1.2.1" - }, - "engines": { - "node": ">=14" - }, - "peerDependencies": { - "@opentelemetry/api": "^1.0.0" - } - }, - "node_modules/@opentelemetry/instrumentation-grpc": { - "version": "0.32.0", - "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-grpc/-/instrumentation-grpc-0.32.0.tgz", - "integrity": "sha512-Az6wdkPx/Mi26lT9LKFV6GhCA9prwQFPz5eCNSExTnSP49YhQ7XCjzPd2POPeLKt84ICitrBMdE1mj0zbPdLAQ==", - "dependencies": { - "@opentelemetry/api-metrics": "0.32.0", - "@opentelemetry/instrumentation": "0.32.0", - "@opentelemetry/semantic-conventions": "1.6.0" - }, - "engines": { - "node": ">=14" - }, - "peerDependencies": { - "@opentelemetry/api": "^1.0.0" - } - }, - "node_modules/@opentelemetry/instrumentation-grpc/node_modules/@opentelemetry/semantic-conventions": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/@opentelemetry/semantic-conventions/-/semantic-conventions-1.6.0.tgz", - "integrity": "sha512-aPfcBeLErM/PPiAuAbNFLN5sNbZLc3KZlar27uohllN8Zs6jJbHyJU1y7cMA6W/zuq+thkaG8mujiS+3iD/FWQ==", - "engines": { - "node": ">=14" - } - }, - "node_modules/@opentelemetry/instrumentation/node_modules/semver": { - "version": "7.5.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.0.tgz", - "integrity": "sha512-+XC0AD/R7Q2mPSRuy2Id0+CGTZ98+8f+KvwirxOKIEyid+XSx6HbC63p+O4IndTHuX5Z+JxQ0TghCkO5Cg/2HA==", - "dependencies": { - "lru-cache": "^6.0.0" - }, - "bin": { - "semver": "bin/semver.js" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/@opentelemetry/propagator-b3": { - "version": "1.12.0", - "resolved": "https://registry.npmjs.org/@opentelemetry/propagator-b3/-/propagator-b3-1.12.0.tgz", - "integrity": "sha512-WFcn98075QPc2zE1obhKydJHUehI5/HuLoelPEVwATj+487hjCwjHj9r2fgmQkWpvuNSB7CJaA0ys6qqq1N6lg==", - "dependencies": { - "@opentelemetry/core": "1.12.0" - }, - "engines": { - "node": ">=14" - }, - "peerDependencies": { - "@opentelemetry/api": ">=1.0.0 <1.5.0" - } - }, - "node_modules/@opentelemetry/propagator-jaeger": { - "version": "1.12.0", - "resolved": "https://registry.npmjs.org/@opentelemetry/propagator-jaeger/-/propagator-jaeger-1.12.0.tgz", - "integrity": "sha512-ugtWF7GC6X5RIJ0+iMwW2iVAGNs206CAeq8XQ8OkJRg+v0lp4H0/i+gJ4hubTT8NIL5a3IxtIrAENPLIGdLucQ==", - "dependencies": { - "@opentelemetry/core": "1.12.0" - }, - "engines": { - "node": ">=14" - }, - "peerDependencies": { - "@opentelemetry/api": ">=1.0.0 <1.5.0" - } - }, - "node_modules/@opentelemetry/resources": { - "version": "1.12.0", - "resolved": "https://registry.npmjs.org/@opentelemetry/resources/-/resources-1.12.0.tgz", - "integrity": "sha512-gunMKXG0hJrR0LXrqh7BVbziA/+iJBL3ZbXCXO64uY+SrExkwoyJkpiq9l5ismkGF/A20mDEV7tGwh+KyPw00Q==", - "dependencies": { - "@opentelemetry/core": "1.12.0", - "@opentelemetry/semantic-conventions": "1.12.0" - }, - "engines": { - "node": ">=14" - }, - "peerDependencies": { - "@opentelemetry/api": ">=1.0.0 <1.5.0" - } - }, - "node_modules/@opentelemetry/sdk-trace-base": { - "version": "1.12.0", - "resolved": "https://registry.npmjs.org/@opentelemetry/sdk-trace-base/-/sdk-trace-base-1.12.0.tgz", - "integrity": "sha512-pfCOB3tNDlYVoWuz4D7Ji+Jmy9MHnATWHVpkERdCEiwUGEZ+4IvNPXUcPc37wJVmMpjGLeaWgPPrie0KIpWf1A==", - "dependencies": { - "@opentelemetry/core": "1.12.0", - "@opentelemetry/resources": "1.12.0", - "@opentelemetry/semantic-conventions": "1.12.0" - }, - "engines": { - "node": ">=14" - }, - "peerDependencies": { - "@opentelemetry/api": ">=1.0.0 <1.5.0" - } - }, - "node_modules/@opentelemetry/sdk-trace-node": { - "version": "1.12.0", - "resolved": "https://registry.npmjs.org/@opentelemetry/sdk-trace-node/-/sdk-trace-node-1.12.0.tgz", - "integrity": "sha512-PxpDemnNZLLeFNLAu95/K3QubjlaScXVjVQPlwPui65VRxIvxGVysnN7DFfsref+qoh1hI6nlrYSij43vxdm2w==", - "dependencies": { - "@opentelemetry/context-async-hooks": "1.12.0", - "@opentelemetry/core": "1.12.0", - "@opentelemetry/propagator-b3": "1.12.0", - "@opentelemetry/propagator-jaeger": "1.12.0", - "@opentelemetry/sdk-trace-base": "1.12.0", - "semver": "^7.3.5" - }, - "engines": { - "node": ">=14" - }, - "peerDependencies": { - "@opentelemetry/api": ">=1.0.0 <1.5.0" - } - }, - "node_modules/@opentelemetry/sdk-trace-node/node_modules/semver": { - "version": "7.5.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.0.tgz", - "integrity": "sha512-+XC0AD/R7Q2mPSRuy2Id0+CGTZ98+8f+KvwirxOKIEyid+XSx6HbC63p+O4IndTHuX5Z+JxQ0TghCkO5Cg/2HA==", - "dependencies": { - "lru-cache": "^6.0.0" - }, - "bin": { - "semver": "bin/semver.js" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/@opentelemetry/semantic-conventions": { - "version": "1.12.0", - "resolved": "https://registry.npmjs.org/@opentelemetry/semantic-conventions/-/semantic-conventions-1.12.0.tgz", - "integrity": "sha512-hO+bdeGOlJwqowUBoZF5LyP3ORUFOP1G0GRv8N45W/cztXbT2ZEXaAzfokRS9Xc9FWmYrDj32mF6SzH6wuoIyA==", - "engines": { - "node": ">=14" - } - }, - "node_modules/@protobufjs/aspromise": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/@protobufjs/aspromise/-/aspromise-1.1.2.tgz", - "integrity": "sha512-j+gKExEuLmKwvz3OgROXtrJ2UG2x8Ch2YZUxahh+s1F2HZ+wAceUNLkvy6zKCPVRkU++ZWQrdxsUeQXmcg4uoQ==" - }, - "node_modules/@protobufjs/base64": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/@protobufjs/base64/-/base64-1.1.2.tgz", - "integrity": "sha512-AZkcAA5vnN/v4PDqKyMR5lx7hZttPDgClv83E//FMNhR2TMcLUhfRUBHCmSl0oi9zMgDDqRUJkSxO3wm85+XLg==" - }, - "node_modules/@protobufjs/codegen": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/@protobufjs/codegen/-/codegen-2.0.4.tgz", - "integrity": "sha512-YyFaikqM5sH0ziFZCN3xDC7zeGaB/d0IUb9CATugHWbd1FRFwWwt4ld4OYMPWu5a3Xe01mGAULCdqhMlPl29Jg==" - }, - "node_modules/@protobufjs/eventemitter": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/@protobufjs/eventemitter/-/eventemitter-1.1.0.tgz", - "integrity": "sha512-j9ednRT81vYJ9OfVuXG6ERSTdEL1xVsNgqpkxMsbIabzSo3goCjDIveeGv5d03om39ML71RdmrGNjG5SReBP/Q==" - }, - "node_modules/@protobufjs/fetch": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/@protobufjs/fetch/-/fetch-1.1.0.tgz", - "integrity": "sha512-lljVXpqXebpsijW71PZaCYeIcE5on1w5DlQy5WH6GLbFryLUrBD4932W/E2BSpfRJWseIL4v/KPgBFxDOIdKpQ==", - "dependencies": { - "@protobufjs/aspromise": "^1.1.1", - "@protobufjs/inquire": "^1.1.0" - } - }, - "node_modules/@protobufjs/float": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/@protobufjs/float/-/float-1.0.2.tgz", - "integrity": "sha512-Ddb+kVXlXst9d+R9PfTIxh1EdNkgoRe5tOX6t01f1lYWOvJnSPDBlG241QLzcyPdoNTsblLUdujGSE4RzrTZGQ==" - }, - "node_modules/@protobufjs/inquire": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/@protobufjs/inquire/-/inquire-1.1.0.tgz", - "integrity": "sha512-kdSefcPdruJiFMVSbn801t4vFK7KB/5gd2fYvrxhuJYg8ILrmn9SKSX2tZdV6V+ksulWqS7aXjBcRXl3wHoD9Q==" - }, - "node_modules/@protobufjs/path": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/@protobufjs/path/-/path-1.1.2.tgz", - "integrity": "sha512-6JOcJ5Tm08dOHAbdR3GrvP+yUUfkjG5ePsHYczMFLq3ZmMkAD98cDgcT2iA1lJ9NVwFd4tH/iSSoe44YWkltEA==" - }, - "node_modules/@protobufjs/pool": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/@protobufjs/pool/-/pool-1.1.0.tgz", - "integrity": "sha512-0kELaGSIDBKvcgS4zkjz1PeddatrjYcmMWOlAuAPwAeccUrPHdUqo/J6LiymHHEiJT5NrF1UVwxY14f+fy4WQw==" - }, - "node_modules/@protobufjs/utf8": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/@protobufjs/utf8/-/utf8-1.1.0.tgz", - "integrity": "sha512-Vvn3zZrhQZkkBE8LSuW3em98c0FwgO4nxzv6OdSxPKJIEKY2bGbHn+mhGIPerzI4twdxaP8/0+06HBpwf345Lw==" - }, - "node_modules/@pulumi/kubernetes": { - "version": "3.26.0", - "resolved": "https://registry.npmjs.org/@pulumi/kubernetes/-/kubernetes-3.26.0.tgz", - "integrity": "sha512-GDJkWgl7VCGPKUrnnrHWs0rIXyMT+2q7rmCsWTHYjbFwAT+nX9fQtUQbQs59Ns0eQaTfZKTr9aRInQHxyaQ07w==", - "hasInstallScript": true, - "dependencies": { - "@pulumi/pulumi": "^3.25.0", - "@types/glob": "^5.0.35", - "@types/node-fetch": "^2.1.4", - "@types/tmp": "^0.0.33", - "glob": "^7.1.2", - "node-fetch": "^2.3.0", - "shell-quote": "^1.6.1", - "tmp": "^0.0.33" - } - }, - "node_modules/@pulumi/kubernetesx": { - "version": "0.1.6", - "resolved": "https://registry.npmjs.org/@pulumi/kubernetesx/-/kubernetesx-0.1.6.tgz", - "integrity": "sha512-9VL4Yi4b4aLC/obBarJuNkm86kABByUZICYPSTdV396MGZtOc066o2brsB+kWVQcVfkYVXTPrpjIkAwBXXnzGw==", - "peerDependencies": { - "@pulumi/kubernetes": "^3.0.0", - "@pulumi/pulumi": "^3.0.0" - } - }, - "node_modules/@pulumi/pulumi": { - "version": "3.65.1", - "resolved": "https://registry.npmjs.org/@pulumi/pulumi/-/pulumi-3.65.1.tgz", - "integrity": "sha512-XhyBtrA8dvgpiMt7jTnhIuRKIVQ0e/P89WRcsPdkYpnJVM3dc7YdMrFPZ4ceWrDdbNuNgq/fNOCsnxjo5BM/WA==", - "dependencies": { - "@grpc/grpc-js": "^1.3.8", - "@logdna/tail-file": "^2.0.6", - "@opentelemetry/api": "^1.2.0", - "@opentelemetry/exporter-zipkin": "^1.6.0", - "@opentelemetry/instrumentation-grpc": "^0.32.0", - "@opentelemetry/resources": "^1.6.0", - "@opentelemetry/sdk-trace-base": "^1.6.0", - "@opentelemetry/sdk-trace-node": "^1.6.0", - "@opentelemetry/semantic-conventions": "^1.6.0", - "@pulumi/query": "^0.3.0", - "execa": "^5.1.0", - "google-protobuf": "^3.5.0", - "ini": "^2.0.0", - "js-yaml": "^3.14.0", - "minimist": "^1.2.6", - "normalize-package-data": "^2.4.0", - "read-package-tree": "^5.3.1", - "require-from-string": "^2.0.1", - "semver": "^6.1.0", - "source-map-support": "^0.5.6", - "ts-node": "^7.0.1", - "typescript": "~3.8.3", - "upath": "^1.1.0" - }, - "engines": { - "node": ">=8.13.0 || >=10.10.0" - } - }, - "node_modules/@pulumi/pulumi/node_modules/typescript": { - "version": "3.8.3", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.8.3.tgz", - "integrity": "sha512-MYlEfn5VrLNsgudQTVJeNaQFUAI7DkhnOjdpAp4T+ku1TfQClewlbSuTVHiA+8skNBgaf02TL/kLOvig4y3G8w==", - "bin": { - "tsc": "bin/tsc", - "tsserver": "bin/tsserver" - }, - "engines": { - "node": ">=4.2.0" - } - }, - "node_modules/@pulumi/query": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/@pulumi/query/-/query-0.3.0.tgz", - "integrity": "sha512-xfo+yLRM2zVjVEA4p23IjQWzyWl1ZhWOGobsBqRpIarzLvwNH/RAGaoehdxlhx4X92302DrpdIFgTICMN4P38w==" - }, - "node_modules/@pulumi/random": { - "version": "4.13.0", - "resolved": "https://registry.npmjs.org/@pulumi/random/-/random-4.13.0.tgz", - "integrity": "sha512-AKnbzftGaFq5sLo2VmDCAjmwTE0Oo1lmr2azqDUk7rx65r4TArLyqOZVJRLlb0WgEpcL2ZhS4D+vozeiT1Iqtw==", - "hasInstallScript": true, - "dependencies": { - "@pulumi/pulumi": "^3.0.0" - } - }, - "node_modules/@scarf/scarf": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/@scarf/scarf/-/scarf-1.1.1.tgz", - "integrity": "sha512-VGbKDbk1RFIaSmdVb0cNjjWJoRWRI/Weo23AjRCC2nryO0iAS8pzsToJfPVPtVs74WHw4L1UTADNdIYRLkirZQ==", - "hasInstallScript": true - }, - "node_modules/@types/glob": { - "version": "5.0.38", - "resolved": "https://registry.npmjs.org/@types/glob/-/glob-5.0.38.tgz", - "integrity": "sha512-rTtf75rwyP9G2qO5yRpYtdJ6aU1QqEhWbtW55qEgquEDa6bXW0s2TWZfDm02GuppjEozOWG/F2UnPq5hAQb+gw==", - "dependencies": { - "@types/minimatch": "*", - "@types/node": "*" - } - }, - "node_modules/@types/long": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/@types/long/-/long-4.0.2.tgz", - "integrity": "sha512-MqTGEo5bj5t157U6fA/BiDynNkn0YknVdh48CMPkTSpFTVmvao5UQmm7uEF6xBEo7qIMAlY/JSleYaE6VOdpaA==" - }, - "node_modules/@types/minimatch": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/@types/minimatch/-/minimatch-5.1.2.tgz", - "integrity": "sha512-K0VQKziLUWkVKiRVrx4a40iPaxTUefQmjtkQofBkYRcoaaL/8rhwDWww9qWbrgicNOgnpIsMxyNIUM4+n6dUIA==" - }, - "node_modules/@types/node": { - "version": "16.18.25", - "resolved": "https://registry.npmjs.org/@types/node/-/node-16.18.25.tgz", - "integrity": "sha512-rUDO6s9Q/El1R1I21HG4qw/LstTHCPO/oQNAwI/4b2f9EWvMnqt4d3HJwPMawfZ3UvodB8516Yg+VAq54YM+eA==" - }, - "node_modules/@types/node-fetch": { - "version": "2.6.3", - "resolved": "https://registry.npmjs.org/@types/node-fetch/-/node-fetch-2.6.3.tgz", - "integrity": "sha512-ETTL1mOEdq/sxUtgtOhKjyB2Irra4cjxksvcMUR5Zr4n+PxVhsCD9WS46oPbHL3et9Zde7CNRr+WUNlcHvsX+w==", - "dependencies": { - "@types/node": "*", - "form-data": "^3.0.0" - } - }, - "node_modules/@types/tmp": { - "version": "0.0.33", - "resolved": "https://registry.npmjs.org/@types/tmp/-/tmp-0.0.33.tgz", - "integrity": "sha512-gVC1InwyVrO326wbBZw+AO3u2vRXz/iRWq9jYhpG4W8LXyIgDv3ZmcLQ5Q4Gs+gFMyqx+viFoFT+l3p61QFCmQ==" - }, - "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==", - "engines": { - "node": ">=8" - } - }, - "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==", - "dependencies": { - "color-convert": "^2.0.1" - }, - "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/chalk/ansi-styles?sponsor=1" - } - }, - "node_modules/argparse": { - "version": "1.0.10", - "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz", - "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==", - "dependencies": { - "sprintf-js": "~1.0.2" - } - }, - "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==", - "dependencies": { - "call-bind": "^1.0.2", - "is-array-buffer": "^3.0.1" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/array.prototype.reduce": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/array.prototype.reduce/-/array.prototype.reduce-1.0.5.tgz", - "integrity": "sha512-kDdugMl7id9COE8R7MHF5jWk7Dqt/fs4Pv+JXoICnYwqpjjjbUurz6w5fT5IG6brLdJhv6/VoHB0H7oyIBXd+Q==", - "dependencies": { - "call-bind": "^1.0.2", - "define-properties": "^1.1.4", - "es-abstract": "^1.20.4", - "es-array-method-boxes-properly": "^1.0.0", - "is-string": "^1.0.7" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/arrify": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz", - "integrity": "sha512-3CYzex9M9FGQjCGMGyi6/31c8GJbgb0qGyrx5HWxPd0aCwh4cB2YjMb2Xf9UuoogrMrlO9cTqnB5rI5GHZTcUA==", - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/asap": { - "version": "2.0.6", - "resolved": "https://registry.npmjs.org/asap/-/asap-2.0.6.tgz", - "integrity": "sha512-BSHWgDSAiKs50o2Re8ppvp3seVHXSRM44cdSsT9FfNEUUZLOGWVCsiWaRPWM1Znn+mqZ1OfVZ3z3DWEzSp7hRA==" - }, - "node_modules/asynckit": { - "version": "0.4.0", - "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz", - "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==" - }, - "node_modules/available-typed-arrays": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/available-typed-arrays/-/available-typed-arrays-1.0.5.tgz", - "integrity": "sha512-DMD0KiN46eipeziST1LPP/STfDU0sufISXmjSgvVsoU2tqxctQeASejWcfNtxYKqETM1UxQ8sp2OrSBWpHY6sw==", - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/balanced-match": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", - "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==" - }, - "node_modules/brace-expansion": { - "version": "1.1.11", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", - "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", - "dependencies": { - "balanced-match": "^1.0.0", - "concat-map": "0.0.1" - } - }, - "node_modules/buffer-from": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz", - "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==" - }, - "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==", - "dependencies": { - "function-bind": "^1.1.1", - "get-intrinsic": "^1.0.2" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "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==", - "dependencies": { - "string-width": "^4.2.0", - "strip-ansi": "^6.0.0", - "wrap-ansi": "^7.0.0" - } - }, - "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==", - "dependencies": { - "color-name": "~1.1.4" - }, - "engines": { - "node": ">=7.0.0" - } - }, - "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==" - }, - "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==", - "dependencies": { - "delayed-stream": "~1.0.0" - }, - "engines": { - "node": ">= 0.8" - } - }, - "node_modules/concat-map": { - "version": "0.0.1", - "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", - "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==" - }, - "node_modules/cross-spawn": { - "version": "7.0.3", - "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz", - "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==", - "dependencies": { - "path-key": "^3.1.0", - "shebang-command": "^2.0.0", - "which": "^2.0.1" - }, - "engines": { - "node": ">= 8" - } - }, - "node_modules/debug": { - "version": "4.3.4", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", - "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==", - "dependencies": { - "ms": "2.1.2" - }, - "engines": { - "node": ">=6.0" - }, - "peerDependenciesMeta": { - "supports-color": { - "optional": true - } - } - }, - "node_modules/debuglog": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/debuglog/-/debuglog-1.0.1.tgz", - "integrity": "sha512-syBZ+rnAK3EgMsH2aYEOLUW7mZSY9Gb+0wUMCFsZvcmiz+HigA0LOcq/HoQqVuGG+EKykunc7QG2bzrponfaSw==", - "engines": { - "node": "*" - } - }, - "node_modules/deepmerge": { - "version": "4.3.1", - "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.3.1.tgz", - "integrity": "sha512-3sUqbMEc77XqpdNO7FRyRog+eW3ph+GYCbj+rK+uYyRMuwsVy0rMiVtPn+QJlKFvWP/1PYpapqYn0Me2knFn+A==", - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/define-properties": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.2.0.tgz", - "integrity": "sha512-xvqAVKGfT1+UAvPwKTVw/njhdQ8ZhXK4lI0bCIuCMrp2up9nPnaDftrLtmpTazqd1o+UY4zgzU+avtMbDP+ldA==", - "dependencies": { - "has-property-descriptors": "^1.0.0", - "object-keys": "^1.1.1" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "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==", - "engines": { - "node": ">=0.4.0" - } - }, - "node_modules/dezalgo": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/dezalgo/-/dezalgo-1.0.4.tgz", - "integrity": "sha512-rXSP0bf+5n0Qonsb+SVVfNfIsimO4HEtmnIpPHY8Q1UCzKlQrDMfdobr8nJOOsRgWCyMRqeSBQzmWUMq7zvVig==", - "dependencies": { - "asap": "^2.0.0", - "wrappy": "1" - } - }, - "node_modules/diff": { - "version": "3.5.0", - "resolved": "https://registry.npmjs.org/diff/-/diff-3.5.0.tgz", - "integrity": "sha512-A46qtFgd+g7pDZinpnwiRJtxbC1hpgf0uzP3iG89scHk0AUC7A1TGxf5OiiOUv/JMZR8GOt8hL900hV0bOy5xA==", - "engines": { - "node": ">=0.3.1" - } - }, - "node_modules/emoji-regex": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", - "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==" - }, - "node_modules/es-abstract": { - "version": "1.21.2", - "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.21.2.tgz", - "integrity": "sha512-y/B5POM2iBnIxCiernH1G7rC9qQoM77lLIMQLuob0zhp8C56Po81+2Nj0WFKnd0pNReDTnkYryc+zhOzpEIROg==", - "dependencies": { - "array-buffer-byte-length": "^1.0.0", - "available-typed-arrays": "^1.0.5", - "call-bind": "^1.0.2", - "es-set-tostringtag": "^2.0.1", - "es-to-primitive": "^1.2.1", - "function.prototype.name": "^1.1.5", - "get-intrinsic": "^1.2.0", - "get-symbol-description": "^1.0.0", - "globalthis": "^1.0.3", - "gopd": "^1.0.1", - "has": "^1.0.3", - "has-property-descriptors": "^1.0.0", - "has-proto": "^1.0.1", - "has-symbols": "^1.0.3", - "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-weakref": "^1.0.2", - "object-inspect": "^1.12.3", - "object-keys": "^1.1.1", - "object.assign": "^4.1.4", - "regexp.prototype.flags": "^1.4.3", - "safe-regex-test": "^1.0.0", - "string.prototype.trim": "^1.2.7", - "string.prototype.trimend": "^1.0.6", - "string.prototype.trimstart": "^1.0.6", - "typed-array-length": "^1.0.4", - "unbox-primitive": "^1.0.2", - "which-typed-array": "^1.1.9" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/es-array-method-boxes-properly": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/es-array-method-boxes-properly/-/es-array-method-boxes-properly-1.0.0.tgz", - "integrity": "sha512-wd6JXUmyHmt8T5a2xreUwKcGPq6f1f+WwIJkijUqiGcJz1qqnZgP6XIK+QyIWU5lT7imeNxUll48bziG+TSYcA==" - }, - "node_modules/es-set-tostringtag": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.0.1.tgz", - "integrity": "sha512-g3OMbtlwY3QewlqAiMLI47KywjWZoEytKr8pf6iTC8uJq5bIAH52Z9pnQ8pVL6whrCto53JZDuUIsifGeLorTg==", - "dependencies": { - "get-intrinsic": "^1.1.3", - "has": "^1.0.3", - "has-tostringtag": "^1.0.0" - }, - "engines": { - "node": ">= 0.4" - } - }, - "node_modules/es-to-primitive": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz", - "integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==", - "dependencies": { - "is-callable": "^1.1.4", - "is-date-object": "^1.0.1", - "is-symbol": "^1.0.2" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/escalade": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz", - "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==", - "engines": { - "node": ">=6" - } - }, - "node_modules/esprima": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz", - "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==", - "bin": { - "esparse": "bin/esparse.js", - "esvalidate": "bin/esvalidate.js" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/execa": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz", - "integrity": "sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==", - "dependencies": { - "cross-spawn": "^7.0.3", - "get-stream": "^6.0.0", - "human-signals": "^2.1.0", - "is-stream": "^2.0.0", - "merge-stream": "^2.0.0", - "npm-run-path": "^4.0.1", - "onetime": "^5.1.2", - "signal-exit": "^3.0.3", - "strip-final-newline": "^2.0.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sindresorhus/execa?sponsor=1" - } - }, - "node_modules/for-each": { - "version": "0.3.3", - "resolved": "https://registry.npmjs.org/for-each/-/for-each-0.3.3.tgz", - "integrity": "sha512-jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw==", - "dependencies": { - "is-callable": "^1.1.3" - } - }, - "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==", - "dependencies": { - "asynckit": "^0.4.0", - "combined-stream": "^1.0.8", - "mime-types": "^2.1.12" - }, - "engines": { - "node": ">= 6" - } - }, - "node_modules/fp-ts": { - "version": "2.14.0", - "resolved": "https://registry.npmjs.org/fp-ts/-/fp-ts-2.14.0.tgz", - "integrity": "sha512-QLagLSYAgMA00pZzUzeksH/78Sd14y7+Gc2A8Yaja3/IpGOFMdm/gYBuDMxYqLsJ58iT5lz+bJb953RAeFfp1A==" - }, - "node_modules/fs.realpath": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", - "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==" - }, - "node_modules/function-bind": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz", - "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==", - "dependencies": { - "call-bind": "^1.0.2", - "define-properties": "^1.1.3", - "es-abstract": "^1.19.0", - "functions-have-names": "^1.2.2" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/functions-have-names": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/functions-have-names/-/functions-have-names-1.2.3.tgz", - "integrity": "sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==", - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/get-caller-file": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz", - "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==", - "engines": { - "node": "6.* || 8.* || >= 10.*" - } - }, - "node_modules/get-intrinsic": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.0.tgz", - "integrity": "sha512-L049y6nFOuom5wGyRc3/gdTLO94dySVKRACj1RmJZBQXlbTMhtNIgkWkUHq+jYmZvKf14EW1EoJnnjbmoHij0Q==", - "dependencies": { - "function-bind": "^1.1.1", - "has": "^1.0.3", - "has-symbols": "^1.0.3" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/get-stream": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz", - "integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==", - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/get-symbol-description": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/get-symbol-description/-/get-symbol-description-1.0.0.tgz", - "integrity": "sha512-2EmdH1YvIQiZpltCNgkuiUnyukzxM/R6NDJX31Ke3BG1Nq5b0S2PhX59UKi9vZpPDQVdqn+1IcaAwnzTT5vCjw==", - "dependencies": { - "call-bind": "^1.0.2", - "get-intrinsic": "^1.1.1" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/glob": { - "version": "7.2.3", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", - "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==", - "dependencies": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^3.1.1", - "once": "^1.3.0", - "path-is-absolute": "^1.0.0" - }, - "engines": { - "node": "*" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, - "node_modules/globalthis": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/globalthis/-/globalthis-1.0.3.tgz", - "integrity": "sha512-sFdI5LyBiNTHjRd7cGPWapiHWMOXKyuBNX/cWJ3NfzrZQVa8GI/8cofCl74AOVqq9W5kNmguTIzJ/1s2gyI9wA==", - "dependencies": { - "define-properties": "^1.1.3" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/google-protobuf": { - "version": "3.21.2", - "resolved": "https://registry.npmjs.org/google-protobuf/-/google-protobuf-3.21.2.tgz", - "integrity": "sha512-3MSOYFO5U9mPGikIYCzK0SaThypfGgS6bHqrUGXG3DPHCrb+txNqeEcns1W0lkGfk0rCyNXm7xB9rMxnCiZOoA==" - }, - "node_modules/gopd": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.0.1.tgz", - "integrity": "sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==", - "dependencies": { - "get-intrinsic": "^1.1.3" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/graceful-fs": { - "version": "4.2.11", - "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz", - "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==" - }, - "node_modules/has": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz", - "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==", - "dependencies": { - "function-bind": "^1.1.1" - }, - "engines": { - "node": ">= 0.4.0" - } - }, - "node_modules/has-bigints": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.2.tgz", - "integrity": "sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ==", - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/has-property-descriptors": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.0.tgz", - "integrity": "sha512-62DVLZGoiEBDHQyqG4w9xCuZ7eJEwNmJRWw2VY84Oedb7WFcA27fiEVe8oUQx9hAUJ4ekurquucTGwsyO1XGdQ==", - "dependencies": { - "get-intrinsic": "^1.1.1" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/has-proto": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.0.1.tgz", - "integrity": "sha512-7qE+iP+O+bgF9clE5+UoBFzE65mlBiVj3tKCrlNQ0Ogwm0BjpT/gK4SlLYDMybDh5I3TCTKnPPa0oMG7JDYrhg==", - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/has-symbols": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz", - "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==", - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/has-tostringtag": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.0.tgz", - "integrity": "sha512-kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ==", - "dependencies": { - "has-symbols": "^1.0.2" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/hosted-git-info": { - "version": "2.8.9", - "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz", - "integrity": "sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==" - }, - "node_modules/human-signals": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-2.1.0.tgz", - "integrity": "sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==", - "engines": { - "node": ">=10.17.0" - } - }, - "node_modules/inflight": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", - "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==", - "dependencies": { - "once": "^1.3.0", - "wrappy": "1" - } - }, - "node_modules/inherits": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", - "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==" - }, - "node_modules/ini": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ini/-/ini-2.0.0.tgz", - "integrity": "sha512-7PnF4oN3CvZF23ADhA5wRaYEQpJ8qygSkbtTXWBeXWXmEVRXK+1ITciHWwHhsjv1TmW0MgacIv6hEi5pX5NQdA==", - "engines": { - "node": ">=10" - } - }, - "node_modules/internal-slot": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.5.tgz", - "integrity": "sha512-Y+R5hJrzs52QCG2laLn4udYVnxsfny9CpOhNhUvk/SSSVyF6T27FzRbF0sroPidSu3X8oEAkOn2K804mjpt6UQ==", - "dependencies": { - "get-intrinsic": "^1.2.0", - "has": "^1.0.3", - "side-channel": "^1.0.4" - }, - "engines": { - "node": ">= 0.4" - } - }, - "node_modules/io-ts": { - "version": "2.2.20", - "resolved": "https://registry.npmjs.org/io-ts/-/io-ts-2.2.20.tgz", - "integrity": "sha512-Rq2BsYmtwS5vVttie4rqrOCIfHCS9TgpRLFpKQCM1wZBBRY9nWVGmEvm2FnDbSE2un1UE39DvFpTR5UL47YDcA==", - "peerDependencies": { - "fp-ts": "^2.5.0" - } - }, - "node_modules/io-ts-reporters": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/io-ts-reporters/-/io-ts-reporters-2.0.1.tgz", - "integrity": "sha512-RVpLstYBsmTGgCW9wJ5KVyN/eRnRUDp87Flt4D1O3aJ7oAnd8csq8aXuu7ZeNK8qEDKmjUl9oUuzfwikaNAMKQ==", - "dependencies": { - "@scarf/scarf": "^1.1.1" - }, - "peerDependencies": { - "fp-ts": "^2.10.5", - "io-ts": "^2.2.16" - } - }, - "node_modules/is-array-buffer": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/is-array-buffer/-/is-array-buffer-3.0.2.tgz", - "integrity": "sha512-y+FyyR/w8vfIRq4eQcM1EYgSTnmHXPqaF+IgzgraytCFq5Xh8lllDVmAZolPJiZttZLeFSINPYMaEJ7/vWUa1w==", - "dependencies": { - "call-bind": "^1.0.2", - "get-intrinsic": "^1.2.0", - "is-typed-array": "^1.1.10" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/is-bigint": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/is-bigint/-/is-bigint-1.0.4.tgz", - "integrity": "sha512-zB9CruMamjym81i2JZ3UMn54PKGsQzsJeo6xvN3HJJ4CAsQNB6iRutp2To77OfCNuoxspsIhzaPoO1zyCEhFOg==", - "dependencies": { - "has-bigints": "^1.0.1" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/is-boolean-object": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.1.2.tgz", - "integrity": "sha512-gDYaKHJmnj4aWxyj6YHyXVpdQawtVLHU5cb+eztPGczf6cjuTdwve5ZIEfgXqH4e57An1D1AKf8CZ3kYrQRqYA==", - "dependencies": { - "call-bind": "^1.0.2", - "has-tostringtag": "^1.0.0" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/is-callable": { - "version": "1.2.7", - "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.7.tgz", - "integrity": "sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==", - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/is-core-module": { - "version": "2.12.0", - "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.12.0.tgz", - "integrity": "sha512-RECHCBCd/viahWmwj6enj19sKbHfJrddi/6cBDsNTKbNq0f7VeaUkBo60BqzvPqo/W54ChS62Z5qyun7cfOMqQ==", - "dependencies": { - "has": "^1.0.3" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/is-date-object": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.5.tgz", - "integrity": "sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ==", - "dependencies": { - "has-tostringtag": "^1.0.0" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/is-fullwidth-code-point": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", - "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", - "engines": { - "node": ">=8" - } - }, - "node_modules/is-negative-zero": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.2.tgz", - "integrity": "sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA==", - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/is-number-object": { - "version": "1.0.7", - "resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.7.tgz", - "integrity": "sha512-k1U0IRzLMo7ZlYIfzRu23Oh6MiIFasgpb9X76eqfFZAqwH44UI4KTBvBYIZ1dSL9ZzChTB9ShHfLkR4pdW5krQ==", - "dependencies": { - "has-tostringtag": "^1.0.0" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/is-regex": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz", - "integrity": "sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==", - "dependencies": { - "call-bind": "^1.0.2", - "has-tostringtag": "^1.0.0" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/is-shared-array-buffer": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.2.tgz", - "integrity": "sha512-sqN2UDu1/0y6uvXyStCOzyhAjCSlHceFoMKJW8W9EU9cvic/QdsZ0kEU93HEy3IUEFZIiH/3w+AH/UQbPHNdhA==", - "dependencies": { - "call-bind": "^1.0.2" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/is-stream": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz", - "integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==", - "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/is-string": { - "version": "1.0.7", - "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.7.tgz", - "integrity": "sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==", - "dependencies": { - "has-tostringtag": "^1.0.0" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/is-symbol": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.4.tgz", - "integrity": "sha512-C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg==", - "dependencies": { - "has-symbols": "^1.0.2" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "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==", - "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" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/is-weakref": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/is-weakref/-/is-weakref-1.0.2.tgz", - "integrity": "sha512-qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ==", - "dependencies": { - "call-bind": "^1.0.2" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/isarray": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.5.tgz", - "integrity": "sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==" - }, - "node_modules/isexe": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", - "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==" - }, - "node_modules/js-yaml": { - "version": "3.14.1", - "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz", - "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==", - "dependencies": { - "argparse": "^1.0.7", - "esprima": "^4.0.0" - }, - "bin": { - "js-yaml": "bin/js-yaml.js" - } - }, - "node_modules/json-parse-even-better-errors": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz", - "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==" - }, - "node_modules/lodash.camelcase": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz", - "integrity": "sha512-TwuEnCnxbc3rAvhf/LbG7tJUDzhqXyFnv3dtzLOPgCG/hODL7WFnsbwktkD7yUV0RrreP/l1PALq/YSg6VvjlA==" - }, - "node_modules/long": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/long/-/long-4.0.0.tgz", - "integrity": "sha512-XsP+KhQif4bjX1kbuSiySJFNAehNxgLb6hPRGJ9QsUr8ajHkuXGdrHmFUTUUXhDwVX2R5bY4JNZEwbUiMhV+MA==" - }, - "node_modules/lru-cache": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", - "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", - "dependencies": { - "yallist": "^4.0.0" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/make-error": { - "version": "1.3.6", - "resolved": "https://registry.npmjs.org/make-error/-/make-error-1.3.6.tgz", - "integrity": "sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==" - }, - "node_modules/merge-stream": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz", - "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==" - }, - "node_modules/mime-db": { - "version": "1.52.0", - "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz", - "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==", - "engines": { - "node": ">= 0.6" - } - }, - "node_modules/mime-types": { - "version": "2.1.35", - "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz", - "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==", - "dependencies": { - "mime-db": "1.52.0" - }, - "engines": { - "node": ">= 0.6" - } - }, - "node_modules/mimic-fn": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz", - "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==", - "engines": { - "node": ">=6" - } - }, - "node_modules/minimatch": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", - "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", - "dependencies": { - "brace-expansion": "^1.1.7" - }, - "engines": { - "node": "*" - } - }, - "node_modules/minimist": { - "version": "1.2.8", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz", - "integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==", - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/mkdirp": { - "version": "0.5.6", - "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.6.tgz", - "integrity": "sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==", - "dependencies": { - "minimist": "^1.2.6" - }, - "bin": { - "mkdirp": "bin/cmd.js" - } - }, - "node_modules/module-details-from-path": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/module-details-from-path/-/module-details-from-path-1.0.3.tgz", - "integrity": "sha512-ySViT69/76t8VhE1xXHK6Ch4NcDd26gx0MzKXLO+F7NOtnqH68d9zF94nT8ZWSxXh8ELOERsnJO/sWt1xZYw5A==" - }, - "node_modules/mongodb-uri": { - "version": "0.9.7", - "resolved": "https://registry.npmjs.org/mongodb-uri/-/mongodb-uri-0.9.7.tgz", - "integrity": "sha512-s6BdnqNoEYfViPJgkH85X5Nw5NpzxN8hoflKLweNa7vBxt2V7kaS06d74pAtqDxde8fn4r9h4dNdLiFGoNV0KA==", - "engines": { - "node": ">= 0.6.0" - } - }, - "node_modules/ms": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", - "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" - }, - "node_modules/node-fetch": { - "version": "2.6.9", - "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.9.tgz", - "integrity": "sha512-DJm/CJkZkRjKKj4Zi4BsKVZh3ValV5IR5s7LVZnW+6YMh0W1BfNA8XSs6DLMGYlId5F3KnA70uu2qepcR08Qqg==", - "dependencies": { - "whatwg-url": "^5.0.0" - }, - "engines": { - "node": "4.x || >=6.0.0" - }, - "peerDependencies": { - "encoding": "^0.1.0" - }, - "peerDependenciesMeta": { - "encoding": { - "optional": true - } - } - }, - "node_modules/normalize-package-data": { - "version": "2.5.0", - "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz", - "integrity": "sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==", - "dependencies": { - "hosted-git-info": "^2.1.4", - "resolve": "^1.10.0", - "semver": "2 || 3 || 4 || 5", - "validate-npm-package-license": "^3.0.1" - } - }, - "node_modules/normalize-package-data/node_modules/semver": { - "version": "5.7.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", - "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==", - "bin": { - "semver": "bin/semver" - } - }, - "node_modules/npm-normalize-package-bin": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/npm-normalize-package-bin/-/npm-normalize-package-bin-1.0.1.tgz", - "integrity": "sha512-EPfafl6JL5/rU+ot6P3gRSCpPDW5VmIzX959Ob1+ySFUuuYHWHekXpwdUZcKP5C+DS4GEtdJluwBjnsNDl+fSA==" - }, - "node_modules/npm-run-path": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz", - "integrity": "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==", - "dependencies": { - "path-key": "^3.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/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==", - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/object-keys": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz", - "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==", - "engines": { - "node": ">= 0.4" - } - }, - "node_modules/object.assign": { - "version": "4.1.4", - "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.4.tgz", - "integrity": "sha512-1mxKf0e58bvyjSCtKYY4sRe9itRk3PJpquJOjeIkz885CczcI4IvJJDLPS72oowuSh+pBxUFROpX+TU++hxhZQ==", - "dependencies": { - "call-bind": "^1.0.2", - "define-properties": "^1.1.4", - "has-symbols": "^1.0.3", - "object-keys": "^1.1.1" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/object.getownpropertydescriptors": { - "version": "2.1.6", - "resolved": "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.6.tgz", - "integrity": "sha512-lq+61g26E/BgHv0ZTFgRvi7NMEPuAxLkFU7rukXjc/AlwH4Am5xXVnIXy3un1bg/JPbXHrixRkK1itUzzPiIjQ==", - "dependencies": { - "array.prototype.reduce": "^1.0.5", - "call-bind": "^1.0.2", - "define-properties": "^1.2.0", - "es-abstract": "^1.21.2", - "safe-array-concat": "^1.0.0" - }, - "engines": { - "node": ">= 0.8" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/once": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", - "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==", - "dependencies": { - "wrappy": "1" - } - }, - "node_modules/onetime": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz", - "integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==", - "dependencies": { - "mimic-fn": "^2.1.0" - }, - "engines": { - "node": ">=6" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/os-tmpdir": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz", - "integrity": "sha512-D2FR03Vir7FIu45XBY20mTb+/ZSWB00sjU9jdQXt83gDrI4Ztz5Fs7/yy74g2N5SVQY4xY1qDr4rNddwYRVX0g==", - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/path-is-absolute": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", - "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==", - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/path-key": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz", - "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==", - "engines": { - "node": ">=8" - } - }, - "node_modules/path-parse": { - "version": "1.0.7", - "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz", - "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==" - }, - "node_modules/protobufjs": { - "version": "7.2.3", - "resolved": "https://registry.npmjs.org/protobufjs/-/protobufjs-7.2.3.tgz", - "integrity": "sha512-TtpvOqwB5Gdz/PQmOjgsrGH1nHjAQVCN7JG4A6r1sXRWESL5rNMAiRcBQlCAdKxZcAbstExQePYG8xof/JVRgg==", - "hasInstallScript": true, - "dependencies": { - "@protobufjs/aspromise": "^1.1.2", - "@protobufjs/base64": "^1.1.2", - "@protobufjs/codegen": "^2.0.4", - "@protobufjs/eventemitter": "^1.1.0", - "@protobufjs/fetch": "^1.1.0", - "@protobufjs/float": "^1.0.2", - "@protobufjs/inquire": "^1.1.0", - "@protobufjs/path": "^1.1.2", - "@protobufjs/pool": "^1.1.0", - "@protobufjs/utf8": "^1.1.0", - "@types/node": ">=13.7.0", - "long": "^5.0.0" - }, - "engines": { - "node": ">=12.0.0" - } - }, - "node_modules/protobufjs/node_modules/long": { - "version": "5.2.3", - "resolved": "https://registry.npmjs.org/long/-/long-5.2.3.tgz", - "integrity": "sha512-lcHwpNoggQTObv5apGNCTdJrO69eHOZMi4BNC+rTLER8iHAqGrUVeLh/irVIM7zTw2bOXA8T6uNPeujwOLg/2Q==" - }, - "node_modules/read-package-json": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/read-package-json/-/read-package-json-2.1.2.tgz", - "integrity": "sha512-D1KmuLQr6ZSJS0tW8hf3WGpRlwszJOXZ3E8Yd/DNRaM5d+1wVRZdHlpGBLAuovjr28LbWvjpWkBHMxpRGGjzNA==", - "dependencies": { - "glob": "^7.1.1", - "json-parse-even-better-errors": "^2.3.0", - "normalize-package-data": "^2.0.0", - "npm-normalize-package-bin": "^1.0.0" - } - }, - "node_modules/read-package-tree": { - "version": "5.3.1", - "resolved": "https://registry.npmjs.org/read-package-tree/-/read-package-tree-5.3.1.tgz", - "integrity": "sha512-mLUDsD5JVtlZxjSlPPx1RETkNjjvQYuweKwNVt1Sn8kP5Jh44pvYuUHCp6xSVDZWbNxVxG5lyZJ921aJH61sTw==", - "deprecated": "The functionality that this package provided is now in @npmcli/arborist", - "dependencies": { - "read-package-json": "^2.0.0", - "readdir-scoped-modules": "^1.0.0", - "util-promisify": "^2.1.0" - } - }, - "node_modules/readdir-scoped-modules": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/readdir-scoped-modules/-/readdir-scoped-modules-1.1.0.tgz", - "integrity": "sha512-asaikDeqAQg7JifRsZn1NJZXo9E+VwlyCfbkZhwyISinqk5zNS6266HS5kah6P0SaQKGF6SkNnZVHUzHFYxYDw==", - "deprecated": "This functionality has been moved to @npmcli/fs", - "dependencies": { - "debuglog": "^1.0.1", - "dezalgo": "^1.0.0", - "graceful-fs": "^4.1.2", - "once": "^1.3.0" - } - }, - "node_modules/regexp.prototype.flags": { - "version": "1.5.0", - "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.5.0.tgz", - "integrity": "sha512-0SutC3pNudRKgquxGoRGIz946MZVHqbNfPjBdxeOhBrdgDKlRoXmYLQN9xRbrR09ZXWeGAdPuif7egofn6v5LA==", - "dependencies": { - "call-bind": "^1.0.2", - "define-properties": "^1.2.0", - "functions-have-names": "^1.2.3" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/require-directory": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz", - "integrity": "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==", - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/require-from-string": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz", - "integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==", - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/require-in-the-middle": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/require-in-the-middle/-/require-in-the-middle-5.2.0.tgz", - "integrity": "sha512-efCx3b+0Z69/LGJmm9Yvi4cqEdxnoGnxYxGxBghkkTTFeXRtTCmmhO0AnAfHz59k957uTSuy8WaHqOs8wbYUWg==", - "dependencies": { - "debug": "^4.1.1", - "module-details-from-path": "^1.0.3", - "resolve": "^1.22.1" - }, - "engines": { - "node": ">=6" - } - }, - "node_modules/resolve": { - "version": "1.22.2", - "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.2.tgz", - "integrity": "sha512-Sb+mjNHOULsBv818T40qSPeRiuWLyaGMa5ewydRLFimneixmVy2zdivRl+AF6jaYPC8ERxGDmFSiqui6SfPd+g==", - "dependencies": { - "is-core-module": "^2.11.0", - "path-parse": "^1.0.7", - "supports-preserve-symlinks-flag": "^1.0.0" - }, - "bin": { - "resolve": "bin/resolve" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/safe-array-concat": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/safe-array-concat/-/safe-array-concat-1.0.0.tgz", - "integrity": "sha512-9dVEFruWIsnie89yym+xWTAYASdpw3CJV7Li/6zBewGf9z2i1j31rP6jnY0pHEO4QZh6N0K11bFjWmdR8UGdPQ==", - "dependencies": { - "call-bind": "^1.0.2", - "get-intrinsic": "^1.2.0", - "has-symbols": "^1.0.3", - "isarray": "^2.0.5" - }, - "engines": { - "node": ">=0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/safe-regex-test": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/safe-regex-test/-/safe-regex-test-1.0.0.tgz", - "integrity": "sha512-JBUUzyOgEwXQY1NuPtvcj/qcBDbDmEvWufhlnXZIm75DEHp+afM1r1ujJpJsV/gSM4t59tpDyPi1sd6ZaPFfsA==", - "dependencies": { - "call-bind": "^1.0.2", - "get-intrinsic": "^1.1.3", - "is-regex": "^1.1.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", - "bin": { - "semver": "bin/semver.js" - } - }, - "node_modules/shebang-command": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz", - "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==", - "dependencies": { - "shebang-regex": "^3.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/shebang-regex": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz", - "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==", - "engines": { - "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==", - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/shimmer": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/shimmer/-/shimmer-1.2.1.tgz", - "integrity": "sha512-sQTKC1Re/rM6XyFM6fIAGHRPVGvyXfgzIDvzoq608vM+jeyVD0Tu1E6Np0Kc2zAIFWIj963V2800iF/9LPieQw==" - }, - "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==", - "dependencies": { - "call-bind": "^1.0.0", - "get-intrinsic": "^1.0.2", - "object-inspect": "^1.9.0" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/signal-exit": { - "version": "3.0.7", - "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz", - "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==" - }, - "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==", - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/source-map-support": { - "version": "0.5.21", - "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz", - "integrity": "sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==", - "dependencies": { - "buffer-from": "^1.0.0", - "source-map": "^0.6.0" - } - }, - "node_modules/spdx-correct": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.2.0.tgz", - "integrity": "sha512-kN9dJbvnySHULIluDHy32WHRUu3Og7B9sbY7tsFLctQkIqnMh3hErYgdMjTYuqmcXX+lK5T1lnUt3G7zNswmZA==", - "dependencies": { - "spdx-expression-parse": "^3.0.0", - "spdx-license-ids": "^3.0.0" - } - }, - "node_modules/spdx-exceptions": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.3.0.tgz", - "integrity": "sha512-/tTrYOC7PPI1nUAgx34hUpqXuyJG+DTHJTnIULG4rDygi4xu/tfgmq1e1cIRwRzwZgo4NLySi+ricLkZkw4i5A==" - }, - "node_modules/spdx-expression-parse": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz", - "integrity": "sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==", - "dependencies": { - "spdx-exceptions": "^2.1.0", - "spdx-license-ids": "^3.0.0" - } - }, - "node_modules/spdx-license-ids": { - "version": "3.0.13", - "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.13.tgz", - "integrity": "sha512-XkD+zwiqXHikFZm4AX/7JSCXA98U5Db4AFd5XUg/+9UNtnH75+Z9KxtpYiJZx36mUDVOwH83pl7yvCer6ewM3w==" - }, - "node_modules/sprintf-js": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz", - "integrity": "sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==" - }, - "node_modules/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==", - "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.7", - "resolved": "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.2.7.tgz", - "integrity": "sha512-p6TmeT1T3411M8Cgg9wBTMRtY2q9+PNy9EV1i2lIXUN/btt763oIfxwN3RR8VU6wHX8j/1CFy0L+YuThm6bgOg==", - "dependencies": { - "call-bind": "^1.0.2", - "define-properties": "^1.1.4", - "es-abstract": "^1.20.4" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "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==", - "dependencies": { - "call-bind": "^1.0.2", - "define-properties": "^1.1.4", - "es-abstract": "^1.20.4" - }, - "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==", - "dependencies": { - "call-bind": "^1.0.2", - "define-properties": "^1.1.4", - "es-abstract": "^1.20.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/strip-ansi": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", - "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", - "dependencies": { - "ansi-regex": "^5.0.1" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/strip-final-newline": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-2.0.0.tgz", - "integrity": "sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==", - "engines": { - "node": ">=6" - } - }, - "node_modules/supports-preserve-symlinks-flag": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz", - "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==", - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/tmp": { - "version": "0.0.33", - "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz", - "integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==", - "dependencies": { - "os-tmpdir": "~1.0.2" - }, - "engines": { - "node": ">=0.6.0" - } - }, - "node_modules/tr46": { - "version": "0.0.3", - "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz", - "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==" - }, - "node_modules/ts-node": { - "version": "7.0.1", - "resolved": "https://registry.npmjs.org/ts-node/-/ts-node-7.0.1.tgz", - "integrity": "sha512-BVwVbPJRspzNh2yfslyT1PSbl5uIk03EZlb493RKHN4qej/D06n1cEhjlOJG69oFsE7OT8XjpTUcYf6pKTLMhw==", - "dependencies": { - "arrify": "^1.0.0", - "buffer-from": "^1.1.0", - "diff": "^3.1.0", - "make-error": "^1.1.1", - "minimist": "^1.2.0", - "mkdirp": "^0.5.1", - "source-map-support": "^0.5.6", - "yn": "^2.0.0" - }, - "bin": { - "ts-node": "dist/bin.js" - }, - "engines": { - "node": ">=4.2.0" - } - }, - "node_modules/typed-array-length": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/typed-array-length/-/typed-array-length-1.0.4.tgz", - "integrity": "sha512-KjZypGq+I/H7HI5HlOoGHkWUUGq+Q0TPhQurLbyrVrvnKTBgzLhIJ7j6J/XTQOi0d1RjyZ0wdas8bKs2p0x3Ng==", - "dependencies": { - "call-bind": "^1.0.2", - "for-each": "^0.3.3", - "is-typed-array": "^1.1.9" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/typescript": { - "version": "5.0.4", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.0.4.tgz", - "integrity": "sha512-cW9T5W9xY37cc+jfEnaUvX91foxtHkza3Nw3wkoF4sSlKn0MONdkdEndig/qPBWXNkmplh3NzayQzCiHM4/hqw==", - "dev": true, - "bin": { - "tsc": "bin/tsc", - "tsserver": "bin/tsserver" - }, - "engines": { - "node": ">=12.20" - } - }, - "node_modules/unbox-primitive": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.2.tgz", - "integrity": "sha512-61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw==", - "dependencies": { - "call-bind": "^1.0.2", - "has-bigints": "^1.0.2", - "has-symbols": "^1.0.3", - "which-boxed-primitive": "^1.0.2" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/upath": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/upath/-/upath-1.2.0.tgz", - "integrity": "sha512-aZwGpamFO61g3OlfT7OQCHqhGnW43ieH9WZeP7QxN/G/jS4jfqUkZxoryvJgVPEcrl5NL/ggHsSmLMHuH64Lhg==", - "engines": { - "node": ">=4", - "yarn": "*" - } - }, - "node_modules/util-promisify": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/util-promisify/-/util-promisify-2.1.0.tgz", - "integrity": "sha512-K+5eQPYs14b3+E+hmE2J6gCZ4JmMl9DbYS6BeP2CHq6WMuNxErxf5B/n0fz85L8zUuoO6rIzNNmIQDu/j+1OcA==", - "dependencies": { - "object.getownpropertydescriptors": "^2.0.3" - } - }, - "node_modules/validate-npm-package-license": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz", - "integrity": "sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==", - "dependencies": { - "spdx-correct": "^3.0.0", - "spdx-expression-parse": "^3.0.0" - } - }, - "node_modules/webidl-conversions": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz", - "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==" - }, - "node_modules/whatwg-url": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz", - "integrity": "sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==", - "dependencies": { - "tr46": "~0.0.3", - "webidl-conversions": "^3.0.0" - } - }, - "node_modules/which": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", - "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==", - "dependencies": { - "isexe": "^2.0.0" - }, - "bin": { - "node-which": "bin/node-which" - }, - "engines": { - "node": ">= 8" - } - }, - "node_modules/which-boxed-primitive": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz", - "integrity": "sha512-bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg==", - "dependencies": { - "is-bigint": "^1.0.1", - "is-boolean-object": "^1.1.0", - "is-number-object": "^1.0.4", - "is-string": "^1.0.5", - "is-symbol": "^1.0.3" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "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==", - "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" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/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==", - "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/wrappy": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", - "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==" - }, - "node_modules/y18n": { - "version": "5.0.8", - "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz", - "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==", - "engines": { - "node": ">=10" - } - }, - "node_modules/yallist": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", - "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==" - }, - "node_modules/yargs": { - "version": "16.2.0", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz", - "integrity": "sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==", - "dependencies": { - "cliui": "^7.0.2", - "escalade": "^3.1.1", - "get-caller-file": "^2.0.5", - "require-directory": "^2.1.1", - "string-width": "^4.2.0", - "y18n": "^5.0.5", - "yargs-parser": "^20.2.2" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/yargs-parser": { - "version": "20.2.9", - "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.9.tgz", - "integrity": "sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==", - "engines": { - "node": ">=10" - } - }, - "node_modules/yn": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/yn/-/yn-2.0.0.tgz", - "integrity": "sha512-uTv8J/wiWTgUTg+9vLTi//leUl5vDQS6uii/emeTb2ssY7vl6QWf2fFbIIGjnhjvbdKlU0ed7QPgY1htTC86jQ==", - "engines": { - "node": ">=4" - } - } - } -} diff --git a/deployment/package.json b/deployment/package.json deleted file mode 100644 index 9de078c3..00000000 --- a/deployment/package.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "name": "geoadmin-swissgeol-asset", - "main": "index.ts", - "devDependencies": { - "@types/node": "^16", - "typescript": "^5.0.4" - }, - "dependencies": { - "@geoadmin/lambda-it-pulumi-lib": "^0.7.10", - "@pulumi/kubernetes": "^3.0.0", - "@pulumi/kubernetesx": "^0.1.5", - "@pulumi/pulumi": "^3.0.0", - "@pulumi/random": "^4.13.0" - } -} diff --git a/deployment/tsconfig.json b/deployment/tsconfig.json deleted file mode 100644 index 2e768957..00000000 --- a/deployment/tsconfig.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "compilerOptions": { - "strict": true, - "outDir": "bin", - "target": "es2016", - "module": "commonjs", - "moduleResolution": "node", - "sourceMap": true, - "experimentalDecorators": true, - "pretty": true, - "noFallthroughCasesInSwitch": true, - "noImplicitReturns": true, - "forceConsistentCasingInFileNames": true - }, - "files": [ - "index.ts" - ], - "include": ["helper.ts", "components/**/*"], -} diff --git a/development/.env.template b/development/.env.template new file mode 100644 index 00000000..684912a5 --- /dev/null +++ b/development/.env.template @@ -0,0 +1,7 @@ +STORAGE_USER= +STORAGE_PASSWORD= +DB_USER= +DB_PASSWORD= +PGADMIN_EMAIL= +PGADMIN_PASSWORD= +GOTRUE_JWT_SECRET= diff --git a/development/.gitignore b/development/.gitignore new file mode 100644 index 00000000..da8cd8d7 --- /dev/null +++ b/development/.gitignore @@ -0,0 +1,7 @@ +# See http://help.github.com/ignore-files/ for more about ignoring files. + +volumes +.env + +# DB dump for local development +init/dump.sql diff --git a/development/docker-compose.test.yaml b/development/docker-compose.test.yaml new file mode 100644 index 00000000..6967ce73 --- /dev/null +++ b/development/docker-compose.test.yaml @@ -0,0 +1,36 @@ +services: + db: + container_name: swissgeol-assets-postgres-test + image: postgis-gotrue + restart: unless-stopped + ports: + - 5432:5432 + environment: + POSTGRES_USER: ${DB_USER} + POSTGRES_PASSWORD: ${DB_PASSWORD} + POSTGRES_DB: postgres + volumes: + - ./init/db:/docker-entrypoint-initdb.d + - ./volumes/test.db/data/postgres:/var/lib/postgresql/data + healthcheck: + test: "pg_isready -U ${DB_USER} -d postgres -h db" + interval: 5s + timeout: 5s + retries: 10 + + elasticsearch: + container_name: swissgeol-assets-elasticsearch-test + image: docker.elastic.co/elasticsearch/elasticsearch:8.12.1 + restart: unless-stopped + entrypoint: ["/bin/tini", "--"] + command: ["sh", "-c", "/init/init.sh & /usr/local/bin/docker-entrypoint.sh"] + ports: + - 9200:9200 + environment: + ES_JAVA_OPTS: -Xms512m -Xmx512m + xpack.security.enabled: false + discovery.type: single-node + cluster.routing.allocation.disk.threshold_enabled: false + volumes: + - ./init/elasticsearch/:/init/:ro + - ./volumes/test.elasticsearch/data:/usr/share/elasticsearch/data diff --git a/development/docker-compose.yaml b/development/docker-compose.yaml new file mode 100644 index 00000000..149e0877 --- /dev/null +++ b/development/docker-compose.yaml @@ -0,0 +1,154 @@ +services: + storage: + container_name: swissgeol-assets-storage + image: quay.io/minio/minio + restart: unless-stopped + ports: + - 9000:9000 + - 9001:9001 + environment: + MINIO_ROOT_USER: ${STORAGE_USER} + MINIO_ROOT_PASSWORD: ${STORAGE_PASSWORD} + volumes: + - ./volumes/minio/data:/data + command: server --console-address ":9001" /data + + db: + container_name: swissgeol-assets-postgres + image: postgis-gotrue + restart: unless-stopped + ports: + - 5432:5432 + environment: + POSTGRES_USER: ${DB_USER} + POSTGRES_PASSWORD: ${DB_PASSWORD} + POSTGRES_DB: postgres + volumes: + - ./init/db:/docker-entrypoint-initdb.d + - ./init/dump.sql:/dump.sql + - ./volumes/db/data/postgres:/var/lib/postgresql/data + healthcheck: + test: "pg_isready -U ${DB_USER} -d postgres -h db" + interval: 5s + timeout: 5s + retries: 10 + + pgadmin: + container_name: swissgeol-assets-pgadmin + image: dpage/pgadmin4 + depends_on: + db: + condition: service_healthy + restart: unless-stopped + ports: + - 5051:5050 + environment: + PGADMIN_DEFAULT_EMAIL: ${PGADMIN_EMAIL} + PGADMIN_DEFAULT_PASSWORD: ${PGADMIN_PASSWORD} + PGADMIN_LISTEN_PORT: 5050 + volumes: + - ./volumes/pgadmin/data:/var/lib/pgadmin + + gotrue: + container_name: swissgeol-assets-gotrue + image: supabase/gotrue@sha256:794d7df376329df93c0d9ed9237868363de5c858301147e08e6620fb67d1a2c6 + depends_on: + db: + condition: service_healthy + restart: unless-stopped + ports: + - 8866:9999 + - 9100:9100 + environment: + GOTRUE_API_HOST: 0.0.0.0 + PORT: 9999 + GOTRUE_SITE_URL: 'http://localhost:4200' + GOTRUE_JWT_SECRET: ${GOTRUE_JWT_SECRET} + GOTRUE_COOKIE_KEY: asset-sg + GOTRUE_DB_DRIVER: postgres + DB_NAMESPACE: auth + DATABASE_URL: postgres://${DB_USER}:${DB_PASSWORD}@db:5432/postgres?search_path=auth + GOTRUE_DISABLE_SIGNUP: false + GOTRUE_SMTP_ADMIN_EMAIL: admin@go.true + GOTRUE_SMTP_HOST: smtp4dev + GOTRUE_SMTP_PORT: 25 + GOTRUE_SMTP_SENDER_NAME: swissgeol-assets + GOTRUE_MAILER_URLPATHS_INVITE: http://localhost:4200/auth/verify + GOTRUE_MAILER_URLPATHS_CONFIRMATION: /auth/v1/verify + GOTRUE_MAILER_URLPATHS_RECOVERY: http://localhost:4200/auth/verify + GOTRUE_MAILER_URLPATHS_EMAIL_CHANGE: /auth/v1/verify + GOTRUE_MAILER_TEMPLATES_INVITE: http://localhost:4200/assets/email-templates/invite.html + GOTRUE_MAILER_TEMPLATES_RECOVERY: http://localhost:4200/assets/email-templates/recover.html + + elasticsearch: + container_name: swissgeol-assets-elasticsearch + image: docker.elastic.co/elasticsearch/elasticsearch:8.12.1 + restart: unless-stopped + entrypoint: ["/bin/tini", "--"] + command: ["sh", "-c", "/init/init.sh & /usr/local/bin/docker-entrypoint.sh"] + ports: + - 9200:9200 + environment: + ES_JAVA_OPTS: -Xms512m -Xmx512m + xpack.security.enabled: false + discovery.type: single-node + cluster.routing.allocation.disk.threshold_enabled: false + volumes: + - ./init/elasticsearch/:/init/:ro + - ./volumes/elasticsearch/data:/usr/share/elasticsearch/data + + kibana: + container_name: swissgeol-assets-kibana + image: docker.elastic.co/kibana/kibana:8.12.1 + depends_on: + - elasticsearch + restart: unless-stopped + ports: + - 5601:5601 + environment: + ELASTICSEARCH_HOSTS: http://elasticsearch:9200 + + smtp4dev: + container_name: swissgeol-assets-smtp + image: rnwood/smtp4dev:v3 + restart: unless-stopped + ports: + - '5000:80' + volumes: + - ./volumes/smtp4dev/data:/smtp4dev + environment: + - ServerOptions__HostName=smtp4dev + + oidc-server: + container_name: swissgeol-assets-oidc + image: soluto/oidc-server-mock + restart: unless-stopped + ports: + - "4011:80" + environment: + CLIENTS_CONFIGURATION_PATH: /tmp/config/clients-config.json + USERS_CONFIGURATION_PATH: /tmp/config/users-config.json + IDENTITY_RESOURCES_INLINE: | + [ + { + "Name": "local_groups_scope", + "ClaimTypes": [ + "local_groups_claim" + ] + } + ] + SERVER_OPTIONS_INLINE: | + { + "IssuerUri": "http://localhost:4011", + "AccessTokenJwtType": "JWT", + "Discovery": { + "ShowKeySet": true + }, + "Authentication": { + "CookieSameSiteMode": "Lax", + "CheckSessionCookieSameSiteMode": "Lax" + } + } + volumes: + - ./init/oidc/oidc-mock-clients.json:/tmp/config/clients-config.json:ro + - ./init/oidc/oidc-mock-users.json:/tmp/config/users-config.json:ro diff --git a/postgres-docker-image/Dockerfile b/development/images/db/Dockerfile similarity index 100% rename from postgres-docker-image/Dockerfile rename to development/images/db/Dockerfile diff --git a/development/images/db/postgres-readme.md b/development/images/db/postgres-readme.md new file mode 100644 index 00000000..348a50ca --- /dev/null +++ b/development/images/db/postgres-readme.md @@ -0,0 +1 @@ +To build the postgre-docker-image execute `docker build -t postgis-gotrue .` diff --git a/development/init/db/01_roles.sql b/development/init/db/01_roles.sql new file mode 100644 index 00000000..5939c1de --- /dev/null +++ b/development/init/db/01_roles.sql @@ -0,0 +1,2 @@ +CREATE ROLE "asset-swissgeol" WITH LOGIN PASSWORD 'asset-swissgeol'; + diff --git a/development/init/db/02_dump.sql b/development/init/db/02_dump.sql new file mode 100644 index 00000000..7900935b --- /dev/null +++ b/development/init/db/02_dump.sql @@ -0,0 +1,17244 @@ +-- +-- PostgreSQL database dump +-- + +-- Dumped from database version 16.1 (Debian 16.1-1.pgdg110+1) +-- Dumped by pg_dump version 16.1 + +-- Started on 2024-02-29 18:46:55 UTC + +SET statement_timeout = 0; +SET lock_timeout = 0; +SET idle_in_transaction_session_timeout = 0; +SET client_encoding = 'UTF8'; +SET standard_conforming_strings = on; +SELECT pg_catalog.set_config('search_path', '', false); +SET check_function_bodies = false; +SET xmloption = content; +SET client_min_messages = warning; +SET row_security = off; + +-- +-- TOC entry 6 (class 2615 OID 16386) +-- Name: auth; Type: SCHEMA; Schema: -; Owner: asset-swissgeol +-- + +CREATE SCHEMA auth; + + +ALTER SCHEMA auth OWNER TO "asset-swissgeol"; + +-- +-- TOC entry 2 (class 3079 OID 16387) +-- Name: postgis; Type: EXTENSION; Schema: -; Owner: - +-- + +CREATE EXTENSION IF NOT EXISTS postgis WITH SCHEMA public; + + +-- +-- TOC entry 4715 (class 0 OID 0) +-- Dependencies: 2 +-- Name: EXTENSION postgis; Type: COMMENT; Schema: -; Owner: +-- + +COMMENT ON EXTENSION postgis IS 'PostGIS geometry and geography spatial types and functions'; + + +-- +-- TOC entry 1703 (class 1247 OID 17466) +-- Name: OcrState; Type: TYPE; Schema: public; Owner: postgres +-- + +CREATE TYPE public."OcrState" AS ENUM ( + 'willNotBeProcessed', + 'created', + 'waiting', + 'processing', + 'error', + 'success' +); + + +ALTER TYPE public."OcrState" OWNER TO postgres; + +SET default_tablespace = ''; + +SET default_table_access_method = heap; + +-- +-- TOC entry 222 (class 1259 OID 17479) +-- Name: audit_log_entries; Type: TABLE; Schema: auth; Owner: asset-swissgeol +-- + +CREATE TABLE auth.audit_log_entries ( + instance_id uuid, + id uuid NOT NULL, + payload json, + created_at timestamp(6) with time zone, + ip_address character varying(64) DEFAULT ''::character varying NOT NULL +); + + +ALTER TABLE auth.audit_log_entries OWNER TO "asset-swissgeol"; + +-- +-- TOC entry 223 (class 1259 OID 17485) +-- Name: identities; Type: TABLE; Schema: auth; Owner: asset-swissgeol +-- + +CREATE TABLE auth.identities ( + id text NOT NULL, + user_id uuid NOT NULL, + identity_data jsonb NOT NULL, + provider text NOT NULL, + last_sign_in_at timestamp(6) with time zone, + created_at timestamp(6) with time zone, + updated_at timestamp(6) with time zone +); + + +ALTER TABLE auth.identities OWNER TO "asset-swissgeol"; + +-- +-- TOC entry 224 (class 1259 OID 17490) +-- Name: instances; Type: TABLE; Schema: auth; Owner: asset-swissgeol +-- + +CREATE TABLE auth.instances ( + id uuid NOT NULL, + uuid uuid, + raw_base_config text, + created_at timestamp(6) with time zone, + updated_at timestamp(6) with time zone +); + + +ALTER TABLE auth.instances OWNER TO "asset-swissgeol"; + +-- +-- TOC entry 225 (class 1259 OID 17495) +-- Name: refresh_tokens; Type: TABLE; Schema: auth; Owner: asset-swissgeol +-- + +CREATE TABLE auth.refresh_tokens ( + instance_id uuid, + id bigint NOT NULL, + token character varying(255), + user_id character varying(255), + revoked boolean, + created_at timestamp(6) with time zone, + updated_at timestamp(6) with time zone, + parent character varying(255) +); + + +ALTER TABLE auth.refresh_tokens OWNER TO "asset-swissgeol"; + +-- +-- TOC entry 226 (class 1259 OID 17500) +-- Name: refresh_tokens_id_seq; Type: SEQUENCE; Schema: auth; Owner: asset-swissgeol +-- + +CREATE SEQUENCE auth.refresh_tokens_id_seq + START WITH 1 + INCREMENT BY 1 + NO MINVALUE + NO MAXVALUE + CACHE 1; + + +ALTER SEQUENCE auth.refresh_tokens_id_seq OWNER TO "asset-swissgeol"; + +-- +-- TOC entry 4716 (class 0 OID 0) +-- Dependencies: 226 +-- Name: refresh_tokens_id_seq; Type: SEQUENCE OWNED BY; Schema: auth; Owner: asset-swissgeol +-- + +ALTER SEQUENCE auth.refresh_tokens_id_seq OWNED BY auth.refresh_tokens.id; + + +-- +-- TOC entry 227 (class 1259 OID 17501) +-- Name: schema_migrations; Type: TABLE; Schema: auth; Owner: asset-swissgeol +-- + +CREATE TABLE auth.schema_migrations ( + version character varying(14) NOT NULL +); + + +ALTER TABLE auth.schema_migrations OWNER TO "asset-swissgeol"; + +-- +-- TOC entry 228 (class 1259 OID 17504) +-- Name: users; Type: TABLE; Schema: auth; Owner: asset-swissgeol +-- + +CREATE TABLE auth.users ( + instance_id uuid, + id uuid NOT NULL, + aud character varying(255), + role character varying(255), + email character varying(255), + encrypted_password character varying(255), + email_confirmed_at timestamp(6) with time zone, + invited_at timestamp(6) with time zone, + confirmation_token character varying(255), + confirmation_sent_at timestamp(6) with time zone, + recovery_token character varying(255), + recovery_sent_at timestamp(6) with time zone, + email_change_token_new character varying(255), + email_change character varying(255), + email_change_sent_at timestamp(6) with time zone, + last_sign_in_at timestamp(6) with time zone, + raw_app_meta_data jsonb, + raw_user_meta_data jsonb, + is_super_admin boolean, + created_at timestamp(6) with time zone, + updated_at timestamp(6) with time zone, + phone character varying(15), + phone_confirmed_at timestamp(6) with time zone, + phone_change character varying(15) DEFAULT ''::character varying, + phone_change_token character varying(255) DEFAULT ''::character varying, + phone_change_sent_at timestamp(6) with time zone, + email_change_token_current character varying(255) DEFAULT ''::character varying, + email_change_confirm_status smallint DEFAULT 0, + banned_until timestamp(6) with time zone, + reauthentication_token character varying(255) DEFAULT ''::character varying, + reauthentication_sent_at timestamp(6) with time zone, + confirmed_at timestamp with time zone GENERATED ALWAYS AS (LEAST(email_confirmed_at, phone_confirmed_at)) STORED +); + + +ALTER TABLE auth.users OWNER TO "asset-swissgeol"; + +-- +-- TOC entry 229 (class 1259 OID 17515) +-- Name: _prisma_migrations; Type: TABLE; Schema: public; Owner: asset-swissgeol +-- + +CREATE TABLE public._prisma_migrations ( + id character varying(36) NOT NULL, + checksum character varying(64) NOT NULL, + finished_at timestamp with time zone, + migration_name character varying(255) NOT NULL, + logs text, + rolled_back_at timestamp with time zone, + started_at timestamp with time zone DEFAULT now() NOT NULL, + applied_steps_count integer DEFAULT 0 NOT NULL +); + + +ALTER TABLE public._prisma_migrations OWNER TO "asset-swissgeol"; + +-- +-- TOC entry 230 (class 1259 OID 17522) +-- Name: study_area; Type: TABLE; Schema: public; Owner: asset-swissgeol +-- + +CREATE TABLE public.study_area ( + study_area_id integer NOT NULL, + asset_id integer NOT NULL, + geom_quality_item_code text NOT NULL, + geom public.geometry +); + + +ALTER TABLE public.study_area OWNER TO "asset-swissgeol"; + +-- +-- TOC entry 231 (class 1259 OID 17527) +-- Name: study_location; Type: TABLE; Schema: public; Owner: asset-swissgeol +-- + +CREATE TABLE public.study_location ( + study_location_id integer NOT NULL, + asset_id integer NOT NULL, + geom_quality_item_code text NOT NULL, + geom public.geometry +); + + +ALTER TABLE public.study_location OWNER TO "asset-swissgeol"; + +-- +-- TOC entry 232 (class 1259 OID 17532) +-- Name: study_trace; Type: TABLE; Schema: public; Owner: asset-swissgeol +-- + +CREATE TABLE public.study_trace ( + study_trace_id integer NOT NULL, + asset_id integer NOT NULL, + geom_quality_item_code text NOT NULL, + geom public.geometry +); + + +ALTER TABLE public.study_trace OWNER TO "asset-swissgeol"; + +-- +-- TOC entry 233 (class 1259 OID 17537) +-- Name: all_study; Type: VIEW; Schema: public; Owner: asset-swissgeol +-- + +CREATE VIEW public.all_study AS + SELECT study_area.asset_id, + concat('study_area_', (study_area.study_area_id)::text) AS study_id, + study_area.study_area_id AS id, + study_area.geom, + (study_area.geom OPERATOR(public.=) public.st_centroid(study_area.geom)) AS is_point, + public.st_astext(public.st_centroid(study_area.geom)) AS centroid_geom_text, + public.st_astext(study_area.geom) AS geom_text + FROM public.study_area +UNION ALL + SELECT study_location.asset_id, + concat('study_location_', (study_location.study_location_id)::text) AS study_id, + study_location.study_location_id AS id, + study_location.geom, + (study_location.geom OPERATOR(public.=) public.st_centroid(study_location.geom)) AS is_point, + public.st_astext(public.st_centroid(study_location.geom)) AS centroid_geom_text, + public.st_astext(study_location.geom) AS geom_text + FROM public.study_location +UNION ALL + SELECT study_trace.asset_id, + concat('study_trace_', (study_trace.study_trace_id)::text) AS study_id, + study_trace.study_trace_id AS id, + study_trace.geom, + (study_trace.geom OPERATOR(public.=) public.st_centroid(study_trace.geom)) AS is_point, + public.st_astext(public.st_centroid(study_trace.geom)) AS centroid_geom_text, + public.st_astext(study_trace.geom) AS geom_text + FROM public.study_trace; + + +ALTER VIEW public.all_study OWNER TO "asset-swissgeol"; + +-- +-- TOC entry 234 (class 1259 OID 17542) +-- Name: asset; Type: TABLE; Schema: public; Owner: asset-swissgeol +-- + +CREATE TABLE public.asset ( + asset_id integer NOT NULL, + title_public text NOT NULL, + title_original text, + is_nat_rel boolean NOT NULL, + receipt_date timestamp(3) without time zone NOT NULL, + municipality text, + url text, + location_analog text, + processor text, + last_processed_date timestamp(3) without time zone NOT NULL, + text_body text, + sgs_id integer, + geol_data_info text, + geol_contact_data_info text, + geol_aux_data_info text, + remark text, + asset_kind_item_code text NOT NULL, + create_date timestamp(3) without time zone NOT NULL, + language_item_code text NOT NULL, + asset_format_item_code text NOT NULL, + author_biblio_id text, + source_project text, + description text, + is_extract boolean NOT NULL, + internal_use_id integer NOT NULL, + public_use_id integer NOT NULL, + asset_main_id integer +); + + +ALTER TABLE public.asset OWNER TO "asset-swissgeol"; + +-- +-- TOC entry 235 (class 1259 OID 17547) +-- Name: asset_asset_id_seq; Type: SEQUENCE; Schema: public; Owner: asset-swissgeol +-- + +CREATE SEQUENCE public.asset_asset_id_seq + AS integer + START WITH 1 + INCREMENT BY 1 + NO MINVALUE + NO MAXVALUE + CACHE 1; + + +ALTER SEQUENCE public.asset_asset_id_seq OWNER TO "asset-swissgeol"; + +-- +-- TOC entry 4717 (class 0 OID 0) +-- Dependencies: 235 +-- Name: asset_asset_id_seq; Type: SEQUENCE OWNED BY; Schema: public; Owner: asset-swissgeol +-- + +ALTER SEQUENCE public.asset_asset_id_seq OWNED BY public.asset.asset_id; + + +-- +-- TOC entry 236 (class 1259 OID 17548) +-- Name: asset_contact; Type: TABLE; Schema: public; Owner: asset-swissgeol +-- + +CREATE TABLE public.asset_contact ( + asset_id integer NOT NULL, + contact_id integer NOT NULL, + role text NOT NULL +); + + +ALTER TABLE public.asset_contact OWNER TO "asset-swissgeol"; + +-- +-- TOC entry 237 (class 1259 OID 17553) +-- Name: asset_file; Type: TABLE; Schema: public; Owner: asset-swissgeol +-- + +CREATE TABLE public.asset_file ( + asset_id integer NOT NULL, + file_id integer NOT NULL +); + + +ALTER TABLE public.asset_file OWNER TO "asset-swissgeol"; + +-- +-- TOC entry 238 (class 1259 OID 17556) +-- Name: asset_format_composition; Type: TABLE; Schema: public; Owner: asset-swissgeol +-- + +CREATE TABLE public.asset_format_composition ( + asset_format_composition_id integer NOT NULL, + asset_id integer NOT NULL, + asset_format_item_code text NOT NULL +); + + +ALTER TABLE public.asset_format_composition OWNER TO "asset-swissgeol"; + +-- +-- TOC entry 239 (class 1259 OID 17561) +-- Name: asset_format_composition_asset_format_composition_id_seq; Type: SEQUENCE; Schema: public; Owner: asset-swissgeol +-- + +CREATE SEQUENCE public.asset_format_composition_asset_format_composition_id_seq + AS integer + START WITH 1 + INCREMENT BY 1 + NO MINVALUE + NO MAXVALUE + CACHE 1; + + +ALTER SEQUENCE public.asset_format_composition_asset_format_composition_id_seq OWNER TO "asset-swissgeol"; + +-- +-- TOC entry 4718 (class 0 OID 0) +-- Dependencies: 239 +-- Name: asset_format_composition_asset_format_composition_id_seq; Type: SEQUENCE OWNED BY; Schema: public; Owner: asset-swissgeol +-- + +ALTER SEQUENCE public.asset_format_composition_asset_format_composition_id_seq OWNED BY public.asset_format_composition.asset_format_composition_id; + + +-- +-- TOC entry 240 (class 1259 OID 17562) +-- Name: asset_format_item; Type: TABLE; Schema: public; Owner: asset-swissgeol +-- + +CREATE TABLE public.asset_format_item ( + asset_format_item_code text NOT NULL, + geol_code text NOT NULL, + name text NOT NULL, + name_de text NOT NULL, + name_fr text NOT NULL, + name_rm text NOT NULL, + name_it text NOT NULL, + name_en text NOT NULL, + description text NOT NULL, + description_de text NOT NULL, + description_fr text NOT NULL, + description_rm text NOT NULL, + description_it text NOT NULL, + description_en text NOT NULL +); + + +ALTER TABLE public.asset_format_item OWNER TO "asset-swissgeol"; + +-- +-- TOC entry 241 (class 1259 OID 17567) +-- Name: asset_internal_project; Type: TABLE; Schema: public; Owner: asset-swissgeol +-- + +CREATE TABLE public.asset_internal_project ( + asset_id integer NOT NULL, + internal_project_id integer NOT NULL +); + + +ALTER TABLE public.asset_internal_project OWNER TO "asset-swissgeol"; + +-- +-- TOC entry 242 (class 1259 OID 17570) +-- Name: asset_kind_composition; Type: TABLE; Schema: public; Owner: asset-swissgeol +-- + +CREATE TABLE public.asset_kind_composition ( + asset_kind_composition_id integer NOT NULL, + asset_id integer NOT NULL, + asset_kind_item_code text NOT NULL +); + + +ALTER TABLE public.asset_kind_composition OWNER TO "asset-swissgeol"; + +-- +-- TOC entry 243 (class 1259 OID 17575) +-- Name: asset_kind_composition_asset_kind_composition_id_seq; Type: SEQUENCE; Schema: public; Owner: asset-swissgeol +-- + +CREATE SEQUENCE public.asset_kind_composition_asset_kind_composition_id_seq + AS integer + START WITH 1 + INCREMENT BY 1 + NO MINVALUE + NO MAXVALUE + CACHE 1; + + +ALTER SEQUENCE public.asset_kind_composition_asset_kind_composition_id_seq OWNER TO "asset-swissgeol"; + +-- +-- TOC entry 4719 (class 0 OID 0) +-- Dependencies: 243 +-- Name: asset_kind_composition_asset_kind_composition_id_seq; Type: SEQUENCE OWNED BY; Schema: public; Owner: asset-swissgeol +-- + +ALTER SEQUENCE public.asset_kind_composition_asset_kind_composition_id_seq OWNED BY public.asset_kind_composition.asset_kind_composition_id; + + +-- +-- TOC entry 244 (class 1259 OID 17576) +-- Name: asset_kind_item; Type: TABLE; Schema: public; Owner: asset-swissgeol +-- + +CREATE TABLE public.asset_kind_item ( + asset_kind_item_code text NOT NULL, + geol_code text NOT NULL, + name text NOT NULL, + name_de text NOT NULL, + name_fr text NOT NULL, + name_rm text NOT NULL, + name_it text NOT NULL, + name_en text NOT NULL, + description text NOT NULL, + description_de text NOT NULL, + description_fr text NOT NULL, + description_rm text NOT NULL, + description_it text NOT NULL, + description_en text NOT NULL +); + + +ALTER TABLE public.asset_kind_item OWNER TO "asset-swissgeol"; + +-- +-- TOC entry 245 (class 1259 OID 17581) +-- Name: asset_object_info; Type: TABLE; Schema: public; Owner: asset-swissgeol +-- + +CREATE TABLE public.asset_object_info ( + asset_object_info_id integer NOT NULL, + file_id integer NOT NULL, + auto_object_cat_item_code text NOT NULL, + object_page text NOT NULL, + object_bbox text NOT NULL, + object_score text NOT NULL, + path_to_image text NOT NULL +); + + +ALTER TABLE public.asset_object_info OWNER TO "asset-swissgeol"; + +-- +-- TOC entry 246 (class 1259 OID 17586) +-- Name: asset_object_info_asset_object_info_id_seq; Type: SEQUENCE; Schema: public; Owner: asset-swissgeol +-- + +CREATE SEQUENCE public.asset_object_info_asset_object_info_id_seq + AS integer + START WITH 1 + INCREMENT BY 1 + NO MINVALUE + NO MAXVALUE + CACHE 1; + + +ALTER SEQUENCE public.asset_object_info_asset_object_info_id_seq OWNER TO "asset-swissgeol"; + +-- +-- TOC entry 4720 (class 0 OID 0) +-- Dependencies: 246 +-- Name: asset_object_info_asset_object_info_id_seq; Type: SEQUENCE OWNED BY; Schema: public; Owner: asset-swissgeol +-- + +ALTER SEQUENCE public.asset_object_info_asset_object_info_id_seq OWNED BY public.asset_object_info.asset_object_info_id; + + +-- +-- TOC entry 247 (class 1259 OID 17587) +-- Name: asset_publication; Type: TABLE; Schema: public; Owner: asset-swissgeol +-- + +CREATE TABLE public.asset_publication ( + asset_id integer NOT NULL, + publication_id integer NOT NULL +); + + +ALTER TABLE public.asset_publication OWNER TO "asset-swissgeol"; + +-- +-- TOC entry 248 (class 1259 OID 17590) +-- Name: asset_user; Type: TABLE; Schema: public; Owner: asset-swissgeol +-- + +CREATE TABLE public.asset_user ( + id uuid NOT NULL, + role text NOT NULL +); + + +ALTER TABLE public.asset_user OWNER TO "asset-swissgeol"; + +-- +-- TOC entry 249 (class 1259 OID 17595) +-- Name: asset_user_favourite; Type: TABLE; Schema: public; Owner: asset-swissgeol +-- + +CREATE TABLE public.asset_user_favourite ( + asset_user_id uuid NOT NULL, + asset_id integer NOT NULL, + created_at timestamp(6) with time zone NOT NULL +); + + +ALTER TABLE public.asset_user_favourite OWNER TO "asset-swissgeol"; + +-- +-- TOC entry 250 (class 1259 OID 17598) +-- Name: asset_x_asset_y; Type: TABLE; Schema: public; Owner: asset-swissgeol +-- + +CREATE TABLE public.asset_x_asset_y ( + asset_x_id integer NOT NULL, + asset_y_id integer NOT NULL +); + + +ALTER TABLE public.asset_x_asset_y OWNER TO "asset-swissgeol"; + +-- +-- TOC entry 251 (class 1259 OID 17601) +-- Name: auto_cat; Type: TABLE; Schema: public; Owner: asset-swissgeol +-- + +CREATE TABLE public.auto_cat ( + auto_cat_id integer NOT NULL, + asset_id integer NOT NULL, + auto_cat_label_item_code text NOT NULL, + auto_cat_label_score integer NOT NULL +); + + +ALTER TABLE public.auto_cat OWNER TO "asset-swissgeol"; + +-- +-- TOC entry 252 (class 1259 OID 17606) +-- Name: auto_cat_auto_cat_id_seq; Type: SEQUENCE; Schema: public; Owner: asset-swissgeol +-- + +CREATE SEQUENCE public.auto_cat_auto_cat_id_seq + AS integer + START WITH 1 + INCREMENT BY 1 + NO MINVALUE + NO MAXVALUE + CACHE 1; + + +ALTER SEQUENCE public.auto_cat_auto_cat_id_seq OWNER TO "asset-swissgeol"; + +-- +-- TOC entry 4721 (class 0 OID 0) +-- Dependencies: 252 +-- Name: auto_cat_auto_cat_id_seq; Type: SEQUENCE OWNED BY; Schema: public; Owner: asset-swissgeol +-- + +ALTER SEQUENCE public.auto_cat_auto_cat_id_seq OWNED BY public.auto_cat.auto_cat_id; + + +-- +-- TOC entry 253 (class 1259 OID 17607) +-- Name: auto_cat_label_item; Type: TABLE; Schema: public; Owner: asset-swissgeol +-- + +CREATE TABLE public.auto_cat_label_item ( + asset_cat_label_item_code text NOT NULL, + geol_code text NOT NULL, + name text NOT NULL, + name_de text NOT NULL, + name_fr text NOT NULL, + name_rm text NOT NULL, + name_it text NOT NULL, + name_en text NOT NULL, + description text NOT NULL, + description_de text NOT NULL, + description_fr text NOT NULL, + description_rm text NOT NULL, + description_it text NOT NULL, + description_en text NOT NULL +); + + +ALTER TABLE public.auto_cat_label_item OWNER TO "asset-swissgeol"; + +-- +-- TOC entry 254 (class 1259 OID 17612) +-- Name: auto_object_cat_item; Type: TABLE; Schema: public; Owner: asset-swissgeol +-- + +CREATE TABLE public.auto_object_cat_item ( + auto_object_cat_item_code text NOT NULL, + geol_code text NOT NULL, + name text NOT NULL, + name_de text NOT NULL, + name_fr text NOT NULL, + name_rm text NOT NULL, + name_it text NOT NULL, + name_en text NOT NULL, + description text NOT NULL, + description_de text NOT NULL, + description_fr text NOT NULL, + description_rm text NOT NULL, + description_it text NOT NULL, + description_en text NOT NULL +); + + +ALTER TABLE public.auto_object_cat_item OWNER TO "asset-swissgeol"; + +-- +-- TOC entry 255 (class 1259 OID 17617) +-- Name: contact; Type: TABLE; Schema: public; Owner: asset-swissgeol +-- + +CREATE TABLE public.contact ( + contact_id integer NOT NULL, + contact_kind_item_code text NOT NULL, + name text NOT NULL, + street text, + house_number text, + plz text, + locality text, + country text, + telephone text, + email text, + website text +); + + +ALTER TABLE public.contact OWNER TO "asset-swissgeol"; + +-- +-- TOC entry 256 (class 1259 OID 17622) +-- Name: contact_contact_id_seq; Type: SEQUENCE; Schema: public; Owner: asset-swissgeol +-- + +CREATE SEQUENCE public.contact_contact_id_seq + AS integer + START WITH 1 + INCREMENT BY 1 + NO MINVALUE + NO MAXVALUE + CACHE 1; + + +ALTER SEQUENCE public.contact_contact_id_seq OWNER TO "asset-swissgeol"; + +-- +-- TOC entry 4722 (class 0 OID 0) +-- Dependencies: 256 +-- Name: contact_contact_id_seq; Type: SEQUENCE OWNED BY; Schema: public; Owner: asset-swissgeol +-- + +ALTER SEQUENCE public.contact_contact_id_seq OWNED BY public.contact.contact_id; + + +-- +-- TOC entry 257 (class 1259 OID 17623) +-- Name: contact_kind_item; Type: TABLE; Schema: public; Owner: asset-swissgeol +-- + +CREATE TABLE public.contact_kind_item ( + contact_kind_item_code text NOT NULL, + geol_code text NOT NULL, + name text NOT NULL, + name_de text NOT NULL, + name_fr text NOT NULL, + name_rm text NOT NULL, + name_it text NOT NULL, + name_en text NOT NULL, + description text NOT NULL, + description_de text NOT NULL, + description_fr text NOT NULL, + description_rm text NOT NULL, + description_it text NOT NULL, + description_en text NOT NULL +); + + +ALTER TABLE public.contact_kind_item OWNER TO "asset-swissgeol"; + +-- +-- TOC entry 258 (class 1259 OID 17628) +-- Name: file; Type: TABLE; Schema: public; Owner: asset-swissgeol +-- + +CREATE TABLE public.file ( + file_id integer NOT NULL, + file_name text NOT NULL, + file_size bigint NOT NULL, + file_date timestamp(3) without time zone NOT NULL, + ocr_status public."OcrState" DEFAULT 'created'::public."OcrState" NOT NULL +); + + +ALTER TABLE public.file OWNER TO "asset-swissgeol"; + +-- +-- TOC entry 259 (class 1259 OID 17634) +-- Name: file_file_id_seq; Type: SEQUENCE; Schema: public; Owner: asset-swissgeol +-- + +CREATE SEQUENCE public.file_file_id_seq + AS integer + START WITH 1 + INCREMENT BY 1 + NO MINVALUE + NO MAXVALUE + CACHE 1; + + +ALTER SEQUENCE public.file_file_id_seq OWNER TO "asset-swissgeol"; + +-- +-- TOC entry 4723 (class 0 OID 0) +-- Dependencies: 259 +-- Name: file_file_id_seq; Type: SEQUENCE OWNED BY; Schema: public; Owner: asset-swissgeol +-- + +ALTER SEQUENCE public.file_file_id_seq OWNED BY public.file.file_id; + + +-- +-- TOC entry 260 (class 1259 OID 17635) +-- Name: geom_quality_item; Type: TABLE; Schema: public; Owner: asset-swissgeol +-- + +CREATE TABLE public.geom_quality_item ( + geom_quality_item_code text NOT NULL, + geol_code text NOT NULL, + name text NOT NULL, + name_de text NOT NULL, + name_fr text NOT NULL, + name_rm text NOT NULL, + name_it text NOT NULL, + name_en text NOT NULL, + description text NOT NULL, + description_de text NOT NULL, + description_fr text NOT NULL, + description_rm text NOT NULL, + description_it text NOT NULL, + description_en text NOT NULL +); + + +ALTER TABLE public.geom_quality_item OWNER TO "asset-swissgeol"; + +-- +-- TOC entry 261 (class 1259 OID 17640) +-- Name: id; Type: TABLE; Schema: public; Owner: asset-swissgeol +-- + +CREATE TABLE public.id ( + id_id integer NOT NULL, + asset_id integer NOT NULL, + id text NOT NULL, + description text NOT NULL +); + + +ALTER TABLE public.id OWNER TO "asset-swissgeol"; + +-- +-- TOC entry 262 (class 1259 OID 17645) +-- Name: id_id_id_seq; Type: SEQUENCE; Schema: public; Owner: asset-swissgeol +-- + +CREATE SEQUENCE public.id_id_id_seq + AS integer + START WITH 1 + INCREMENT BY 1 + NO MINVALUE + NO MAXVALUE + CACHE 1; + + +ALTER SEQUENCE public.id_id_id_seq OWNER TO "asset-swissgeol"; + +-- +-- TOC entry 4724 (class 0 OID 0) +-- Dependencies: 262 +-- Name: id_id_id_seq; Type: SEQUENCE OWNED BY; Schema: public; Owner: asset-swissgeol +-- + +ALTER SEQUENCE public.id_id_id_seq OWNED BY public.id.id_id; + + +-- +-- TOC entry 263 (class 1259 OID 17646) +-- Name: internal_project; Type: TABLE; Schema: public; Owner: asset-swissgeol +-- + +CREATE TABLE public.internal_project ( + internal_project_id integer NOT NULL, + name text NOT NULL, + description text, + date_delivered text NOT NULL +); + + +ALTER TABLE public.internal_project OWNER TO "asset-swissgeol"; + +-- +-- TOC entry 264 (class 1259 OID 17651) +-- Name: internal_project_internal_project_id_seq; Type: SEQUENCE; Schema: public; Owner: asset-swissgeol +-- + +CREATE SEQUENCE public.internal_project_internal_project_id_seq + AS integer + START WITH 1 + INCREMENT BY 1 + NO MINVALUE + NO MAXVALUE + CACHE 1; + + +ALTER SEQUENCE public.internal_project_internal_project_id_seq OWNER TO "asset-swissgeol"; + +-- +-- TOC entry 4725 (class 0 OID 0) +-- Dependencies: 264 +-- Name: internal_project_internal_project_id_seq; Type: SEQUENCE OWNED BY; Schema: public; Owner: asset-swissgeol +-- + +ALTER SEQUENCE public.internal_project_internal_project_id_seq OWNED BY public.internal_project.internal_project_id; + + +-- +-- TOC entry 265 (class 1259 OID 17652) +-- Name: internal_use; Type: TABLE; Schema: public; Owner: asset-swissgeol +-- + +CREATE TABLE public.internal_use ( + internal_use_id integer NOT NULL, + is_available boolean NOT NULL, + status_asset_use_item_code text NOT NULL, + start_availability_date timestamp(3) without time zone +); + + +ALTER TABLE public.internal_use OWNER TO "asset-swissgeol"; + +-- +-- TOC entry 266 (class 1259 OID 17657) +-- Name: internal_use_internal_use_id_seq; Type: SEQUENCE; Schema: public; Owner: asset-swissgeol +-- + +CREATE SEQUENCE public.internal_use_internal_use_id_seq + AS integer + START WITH 1 + INCREMENT BY 1 + NO MINVALUE + NO MAXVALUE + CACHE 1; + + +ALTER SEQUENCE public.internal_use_internal_use_id_seq OWNER TO "asset-swissgeol"; + +-- +-- TOC entry 4726 (class 0 OID 0) +-- Dependencies: 266 +-- Name: internal_use_internal_use_id_seq; Type: SEQUENCE OWNED BY; Schema: public; Owner: asset-swissgeol +-- + +ALTER SEQUENCE public.internal_use_internal_use_id_seq OWNED BY public.internal_use.internal_use_id; + + +-- +-- TOC entry 267 (class 1259 OID 17658) +-- Name: language_item; Type: TABLE; Schema: public; Owner: asset-swissgeol +-- + +CREATE TABLE public.language_item ( + language_item_code text NOT NULL, + geol_code text NOT NULL, + name text NOT NULL, + name_de text NOT NULL, + name_fr text NOT NULL, + name_rm text NOT NULL, + name_it text NOT NULL, + name_en text NOT NULL, + description text NOT NULL, + description_de text NOT NULL, + description_fr text NOT NULL, + description_rm text NOT NULL, + description_it text NOT NULL, + description_en text NOT NULL +); + + +ALTER TABLE public.language_item OWNER TO "asset-swissgeol"; + +-- +-- TOC entry 268 (class 1259 OID 17663) +-- Name: legal_doc; Type: TABLE; Schema: public; Owner: asset-swissgeol +-- + +CREATE TABLE public.legal_doc ( + legal_doc_id integer NOT NULL, + asset_id integer NOT NULL, + title text NOT NULL, + legal_doc_item_code text NOT NULL +); + + +ALTER TABLE public.legal_doc OWNER TO "asset-swissgeol"; + +-- +-- TOC entry 269 (class 1259 OID 17668) +-- Name: legal_doc_item; Type: TABLE; Schema: public; Owner: asset-swissgeol +-- + +CREATE TABLE public.legal_doc_item ( + legal_doc_item_code text NOT NULL, + geol_code text NOT NULL, + name text NOT NULL, + name_de text NOT NULL, + name_fr text NOT NULL, + name_rm text NOT NULL, + name_it text NOT NULL, + name_en text NOT NULL, + description text NOT NULL, + description_de text NOT NULL, + description_fr text NOT NULL, + description_rm text NOT NULL, + description_it text NOT NULL, + description_en text NOT NULL +); + + +ALTER TABLE public.legal_doc_item OWNER TO "asset-swissgeol"; + +-- +-- TOC entry 270 (class 1259 OID 17673) +-- Name: legal_doc_legal_doc_id_seq; Type: SEQUENCE; Schema: public; Owner: asset-swissgeol +-- + +CREATE SEQUENCE public.legal_doc_legal_doc_id_seq + AS integer + START WITH 1 + INCREMENT BY 1 + NO MINVALUE + NO MAXVALUE + CACHE 1; + + +ALTER SEQUENCE public.legal_doc_legal_doc_id_seq OWNER TO "asset-swissgeol"; + +-- +-- TOC entry 4727 (class 0 OID 0) +-- Dependencies: 270 +-- Name: legal_doc_legal_doc_id_seq; Type: SEQUENCE OWNED BY; Schema: public; Owner: asset-swissgeol +-- + +ALTER SEQUENCE public.legal_doc_legal_doc_id_seq OWNED BY public.legal_doc.legal_doc_id; + + +-- +-- TOC entry 271 (class 1259 OID 17674) +-- Name: man_cat_label_item; Type: TABLE; Schema: public; Owner: asset-swissgeol +-- + +CREATE TABLE public.man_cat_label_item ( + man_cat_label_item_code text NOT NULL, + geol_code text NOT NULL, + name text NOT NULL, + name_de text NOT NULL, + name_fr text NOT NULL, + name_rm text NOT NULL, + name_it text NOT NULL, + name_en text NOT NULL, + description text NOT NULL, + description_de text NOT NULL, + description_fr text NOT NULL, + description_rm text NOT NULL, + description_it text NOT NULL, + description_en text NOT NULL +); + + +ALTER TABLE public.man_cat_label_item OWNER TO "asset-swissgeol"; + +-- +-- TOC entry 272 (class 1259 OID 17679) +-- Name: man_cat_label_ref; Type: TABLE; Schema: public; Owner: asset-swissgeol +-- + +CREATE TABLE public.man_cat_label_ref ( + asset_id integer NOT NULL, + man_cat_label_item_code text NOT NULL +); + + +ALTER TABLE public.man_cat_label_ref OWNER TO "asset-swissgeol"; + +-- +-- TOC entry 273 (class 1259 OID 17684) +-- Name: nat_rel_item; Type: TABLE; Schema: public; Owner: asset-swissgeol +-- + +CREATE TABLE public.nat_rel_item ( + nat_rel_item_code text NOT NULL, + geol_code text NOT NULL, + name text NOT NULL, + name_de text NOT NULL, + name_fr text NOT NULL, + name_rm text NOT NULL, + name_it text NOT NULL, + name_en text NOT NULL, + description text NOT NULL, + description_de text NOT NULL, + description_fr text NOT NULL, + description_rm text NOT NULL, + description_it text NOT NULL, + description_en text NOT NULL +); + + +ALTER TABLE public.nat_rel_item OWNER TO "asset-swissgeol"; + +-- +-- TOC entry 274 (class 1259 OID 17689) +-- Name: pub_channel_item; Type: TABLE; Schema: public; Owner: asset-swissgeol +-- + +CREATE TABLE public.pub_channel_item ( + pub_channel_item_code text NOT NULL, + geol_code text NOT NULL, + name text NOT NULL, + name_de text NOT NULL, + name_fr text NOT NULL, + name_rm text NOT NULL, + name_it text NOT NULL, + name_en text NOT NULL, + description text NOT NULL, + description_de text NOT NULL, + description_fr text NOT NULL, + description_rm text NOT NULL, + description_it text NOT NULL, + description_en text NOT NULL +); + + +ALTER TABLE public.pub_channel_item OWNER TO "asset-swissgeol"; + +-- +-- TOC entry 275 (class 1259 OID 17694) +-- Name: public_use; Type: TABLE; Schema: public; Owner: asset-swissgeol +-- + +CREATE TABLE public.public_use ( + public_use_id integer NOT NULL, + is_available boolean NOT NULL, + status_asset_use_item_code text NOT NULL, + start_availability_date timestamp(3) without time zone +); + + +ALTER TABLE public.public_use OWNER TO "asset-swissgeol"; + +-- +-- TOC entry 276 (class 1259 OID 17699) +-- Name: public_use_public_use_id_seq; Type: SEQUENCE; Schema: public; Owner: asset-swissgeol +-- + +CREATE SEQUENCE public.public_use_public_use_id_seq + AS integer + START WITH 1 + INCREMENT BY 1 + NO MINVALUE + NO MAXVALUE + CACHE 1; + + +ALTER SEQUENCE public.public_use_public_use_id_seq OWNER TO "asset-swissgeol"; + +-- +-- TOC entry 4728 (class 0 OID 0) +-- Dependencies: 276 +-- Name: public_use_public_use_id_seq; Type: SEQUENCE OWNED BY; Schema: public; Owner: asset-swissgeol +-- + +ALTER SEQUENCE public.public_use_public_use_id_seq OWNED BY public.public_use.public_use_id; + + +-- +-- TOC entry 277 (class 1259 OID 17700) +-- Name: publication; Type: TABLE; Schema: public; Owner: asset-swissgeol +-- + +CREATE TABLE public.publication ( + publication_id integer NOT NULL, + pub_channel_item_code text NOT NULL, + publication_date timestamp(3) without time zone NOT NULL, + description text NOT NULL, + link text NOT NULL +); + + +ALTER TABLE public.publication OWNER TO "asset-swissgeol"; + +-- +-- TOC entry 278 (class 1259 OID 17705) +-- Name: publication_publication_id_seq; Type: SEQUENCE; Schema: public; Owner: asset-swissgeol +-- + +CREATE SEQUENCE public.publication_publication_id_seq + AS integer + START WITH 1 + INCREMENT BY 1 + NO MINVALUE + NO MAXVALUE + CACHE 1; + + +ALTER SEQUENCE public.publication_publication_id_seq OWNER TO "asset-swissgeol"; + +-- +-- TOC entry 4729 (class 0 OID 0) +-- Dependencies: 278 +-- Name: publication_publication_id_seq; Type: SEQUENCE OWNED BY; Schema: public; Owner: asset-swissgeol +-- + +ALTER SEQUENCE public.publication_publication_id_seq OWNED BY public.publication.publication_id; + + +-- +-- TOC entry 279 (class 1259 OID 17706) +-- Name: status_asset_use_item; Type: TABLE; Schema: public; Owner: asset-swissgeol +-- + +CREATE TABLE public.status_asset_use_item ( + status_asset_use_item_code text NOT NULL, + geol_code text NOT NULL, + name text NOT NULL, + name_de text NOT NULL, + name_fr text NOT NULL, + name_rm text NOT NULL, + name_it text NOT NULL, + name_en text NOT NULL, + description text NOT NULL, + description_de text NOT NULL, + description_fr text NOT NULL, + description_rm text NOT NULL, + description_it text NOT NULL, + description_en text NOT NULL +); + + +ALTER TABLE public.status_asset_use_item OWNER TO "asset-swissgeol"; + +-- +-- TOC entry 280 (class 1259 OID 17711) +-- Name: status_work; Type: TABLE; Schema: public; Owner: asset-swissgeol +-- + +CREATE TABLE public.status_work ( + status_work_id integer NOT NULL, + asset_id integer NOT NULL, + status_work_item_code text NOT NULL, + status_work_date timestamp(3) without time zone NOT NULL, + processor text +); + + +ALTER TABLE public.status_work OWNER TO "asset-swissgeol"; + +-- +-- TOC entry 281 (class 1259 OID 17716) +-- Name: status_work_item; Type: TABLE; Schema: public; Owner: asset-swissgeol +-- + +CREATE TABLE public.status_work_item ( + status_work_item_code text NOT NULL, + geol_code text NOT NULL, + name text NOT NULL, + name_de text NOT NULL, + name_fr text NOT NULL, + name_rm text NOT NULL, + name_it text NOT NULL, + name_en text NOT NULL, + description text NOT NULL, + description_de text NOT NULL, + description_fr text NOT NULL, + description_rm text NOT NULL, + description_it text NOT NULL, + description_en text NOT NULL +); + + +ALTER TABLE public.status_work_item OWNER TO "asset-swissgeol"; + +-- +-- TOC entry 282 (class 1259 OID 17721) +-- Name: status_work_status_work_id_seq; Type: SEQUENCE; Schema: public; Owner: asset-swissgeol +-- + +CREATE SEQUENCE public.status_work_status_work_id_seq + AS integer + START WITH 1 + INCREMENT BY 1 + NO MINVALUE + NO MAXVALUE + CACHE 1; + + +ALTER SEQUENCE public.status_work_status_work_id_seq OWNER TO "asset-swissgeol"; + +-- +-- TOC entry 4730 (class 0 OID 0) +-- Dependencies: 282 +-- Name: status_work_status_work_id_seq; Type: SEQUENCE OWNED BY; Schema: public; Owner: asset-swissgeol +-- + +ALTER SEQUENCE public.status_work_status_work_id_seq OWNED BY public.status_work.status_work_id; + + +-- +-- TOC entry 283 (class 1259 OID 17722) +-- Name: study_area_study_area_id_seq; Type: SEQUENCE; Schema: public; Owner: asset-swissgeol +-- + +CREATE SEQUENCE public.study_area_study_area_id_seq + AS integer + START WITH 1 + INCREMENT BY 1 + NO MINVALUE + NO MAXVALUE + CACHE 1; + + +ALTER SEQUENCE public.study_area_study_area_id_seq OWNER TO "asset-swissgeol"; + +-- +-- TOC entry 4731 (class 0 OID 0) +-- Dependencies: 283 +-- Name: study_area_study_area_id_seq; Type: SEQUENCE OWNED BY; Schema: public; Owner: asset-swissgeol +-- + +ALTER SEQUENCE public.study_area_study_area_id_seq OWNED BY public.study_area.study_area_id; + + +-- +-- TOC entry 284 (class 1259 OID 17723) +-- Name: study_location_study_location_id_seq; Type: SEQUENCE; Schema: public; Owner: asset-swissgeol +-- + +CREATE SEQUENCE public.study_location_study_location_id_seq + AS integer + START WITH 1 + INCREMENT BY 1 + NO MINVALUE + NO MAXVALUE + CACHE 1; + + +ALTER SEQUENCE public.study_location_study_location_id_seq OWNER TO "asset-swissgeol"; + +-- +-- TOC entry 4732 (class 0 OID 0) +-- Dependencies: 284 +-- Name: study_location_study_location_id_seq; Type: SEQUENCE OWNED BY; Schema: public; Owner: asset-swissgeol +-- + +ALTER SEQUENCE public.study_location_study_location_id_seq OWNED BY public.study_location.study_location_id; + + +-- +-- TOC entry 285 (class 1259 OID 17724) +-- Name: study_trace_study_trace_id_seq; Type: SEQUENCE; Schema: public; Owner: asset-swissgeol +-- + +CREATE SEQUENCE public.study_trace_study_trace_id_seq + AS integer + START WITH 1 + INCREMENT BY 1 + NO MINVALUE + NO MAXVALUE + CACHE 1; + + +ALTER SEQUENCE public.study_trace_study_trace_id_seq OWNER TO "asset-swissgeol"; + +-- +-- TOC entry 4733 (class 0 OID 0) +-- Dependencies: 285 +-- Name: study_trace_study_trace_id_seq; Type: SEQUENCE OWNED BY; Schema: public; Owner: asset-swissgeol +-- + +ALTER SEQUENCE public.study_trace_study_trace_id_seq OWNED BY public.study_trace.study_trace_id; + + +-- +-- TOC entry 286 (class 1259 OID 17725) +-- Name: type_nat_rel; Type: TABLE; Schema: public; Owner: asset-swissgeol +-- + +CREATE TABLE public.type_nat_rel ( + type_nat_rel_id integer NOT NULL, + asset_id integer NOT NULL, + nat_rel_item_code text NOT NULL +); + + +ALTER TABLE public.type_nat_rel OWNER TO "asset-swissgeol"; + +-- +-- TOC entry 287 (class 1259 OID 17730) +-- Name: type_nat_rel_type_nat_rel_id_seq; Type: SEQUENCE; Schema: public; Owner: asset-swissgeol +-- + +CREATE SEQUENCE public.type_nat_rel_type_nat_rel_id_seq + AS integer + START WITH 1 + INCREMENT BY 1 + NO MINVALUE + NO MAXVALUE + CACHE 1; + + +ALTER SEQUENCE public.type_nat_rel_type_nat_rel_id_seq OWNER TO "asset-swissgeol"; + +-- +-- TOC entry 4734 (class 0 OID 0) +-- Dependencies: 287 +-- Name: type_nat_rel_type_nat_rel_id_seq; Type: SEQUENCE OWNED BY; Schema: public; Owner: asset-swissgeol +-- + +ALTER SEQUENCE public.type_nat_rel_type_nat_rel_id_seq OWNED BY public.type_nat_rel.type_nat_rel_id; + + +-- +-- TOC entry 4312 (class 2604 OID 17731) +-- Name: refresh_tokens id; Type: DEFAULT; Schema: auth; Owner: asset-swissgeol +-- + +ALTER TABLE ONLY auth.refresh_tokens ALTER COLUMN id SET DEFAULT nextval('auth.refresh_tokens_id_seq'::regclass); + + +-- +-- TOC entry 4324 (class 2604 OID 17732) +-- Name: asset asset_id; Type: DEFAULT; Schema: public; Owner: asset-swissgeol +-- + +ALTER TABLE ONLY public.asset ALTER COLUMN asset_id SET DEFAULT nextval('public.asset_asset_id_seq'::regclass); + + +-- +-- TOC entry 4325 (class 2604 OID 17733) +-- Name: asset_format_composition asset_format_composition_id; Type: DEFAULT; Schema: public; Owner: asset-swissgeol +-- + +ALTER TABLE ONLY public.asset_format_composition ALTER COLUMN asset_format_composition_id SET DEFAULT nextval('public.asset_format_composition_asset_format_composition_id_seq'::regclass); + + +-- +-- TOC entry 4326 (class 2604 OID 17734) +-- Name: asset_kind_composition asset_kind_composition_id; Type: DEFAULT; Schema: public; Owner: asset-swissgeol +-- + +ALTER TABLE ONLY public.asset_kind_composition ALTER COLUMN asset_kind_composition_id SET DEFAULT nextval('public.asset_kind_composition_asset_kind_composition_id_seq'::regclass); + + +-- +-- TOC entry 4327 (class 2604 OID 17735) +-- Name: asset_object_info asset_object_info_id; Type: DEFAULT; Schema: public; Owner: asset-swissgeol +-- + +ALTER TABLE ONLY public.asset_object_info ALTER COLUMN asset_object_info_id SET DEFAULT nextval('public.asset_object_info_asset_object_info_id_seq'::regclass); + + +-- +-- TOC entry 4328 (class 2604 OID 17736) +-- Name: auto_cat auto_cat_id; Type: DEFAULT; Schema: public; Owner: asset-swissgeol +-- + +ALTER TABLE ONLY public.auto_cat ALTER COLUMN auto_cat_id SET DEFAULT nextval('public.auto_cat_auto_cat_id_seq'::regclass); + + +-- +-- TOC entry 4329 (class 2604 OID 17737) +-- Name: contact contact_id; Type: DEFAULT; Schema: public; Owner: asset-swissgeol +-- + +ALTER TABLE ONLY public.contact ALTER COLUMN contact_id SET DEFAULT nextval('public.contact_contact_id_seq'::regclass); + + +-- +-- TOC entry 4330 (class 2604 OID 17738) +-- Name: file file_id; Type: DEFAULT; Schema: public; Owner: asset-swissgeol +-- + +ALTER TABLE ONLY public.file ALTER COLUMN file_id SET DEFAULT nextval('public.file_file_id_seq'::regclass); + + +-- +-- TOC entry 4332 (class 2604 OID 17739) +-- Name: id id_id; Type: DEFAULT; Schema: public; Owner: asset-swissgeol +-- + +ALTER TABLE ONLY public.id ALTER COLUMN id_id SET DEFAULT nextval('public.id_id_id_seq'::regclass); + + +-- +-- TOC entry 4333 (class 2604 OID 17740) +-- Name: internal_project internal_project_id; Type: DEFAULT; Schema: public; Owner: asset-swissgeol +-- + +ALTER TABLE ONLY public.internal_project ALTER COLUMN internal_project_id SET DEFAULT nextval('public.internal_project_internal_project_id_seq'::regclass); + + +-- +-- TOC entry 4334 (class 2604 OID 17741) +-- Name: internal_use internal_use_id; Type: DEFAULT; Schema: public; Owner: asset-swissgeol +-- + +ALTER TABLE ONLY public.internal_use ALTER COLUMN internal_use_id SET DEFAULT nextval('public.internal_use_internal_use_id_seq'::regclass); + + +-- +-- TOC entry 4335 (class 2604 OID 17742) +-- Name: legal_doc legal_doc_id; Type: DEFAULT; Schema: public; Owner: asset-swissgeol +-- + +ALTER TABLE ONLY public.legal_doc ALTER COLUMN legal_doc_id SET DEFAULT nextval('public.legal_doc_legal_doc_id_seq'::regclass); + + +-- +-- TOC entry 4336 (class 2604 OID 17743) +-- Name: public_use public_use_id; Type: DEFAULT; Schema: public; Owner: asset-swissgeol +-- + +ALTER TABLE ONLY public.public_use ALTER COLUMN public_use_id SET DEFAULT nextval('public.public_use_public_use_id_seq'::regclass); + + +-- +-- TOC entry 4337 (class 2604 OID 17744) +-- Name: publication publication_id; Type: DEFAULT; Schema: public; Owner: asset-swissgeol +-- + +ALTER TABLE ONLY public.publication ALTER COLUMN publication_id SET DEFAULT nextval('public.publication_publication_id_seq'::regclass); + + +-- +-- TOC entry 4338 (class 2604 OID 17745) +-- Name: status_work status_work_id; Type: DEFAULT; Schema: public; Owner: asset-swissgeol +-- + +ALTER TABLE ONLY public.status_work ALTER COLUMN status_work_id SET DEFAULT nextval('public.status_work_status_work_id_seq'::regclass); + + +-- +-- TOC entry 4321 (class 2604 OID 17746) +-- Name: study_area study_area_id; Type: DEFAULT; Schema: public; Owner: asset-swissgeol +-- + +ALTER TABLE ONLY public.study_area ALTER COLUMN study_area_id SET DEFAULT nextval('public.study_area_study_area_id_seq'::regclass); + + +-- +-- TOC entry 4322 (class 2604 OID 17747) +-- Name: study_location study_location_id; Type: DEFAULT; Schema: public; Owner: asset-swissgeol +-- + +ALTER TABLE ONLY public.study_location ALTER COLUMN study_location_id SET DEFAULT nextval('public.study_location_study_location_id_seq'::regclass); + + +-- +-- TOC entry 4323 (class 2604 OID 17748) +-- Name: study_trace study_trace_id; Type: DEFAULT; Schema: public; Owner: asset-swissgeol +-- + +ALTER TABLE ONLY public.study_trace ALTER COLUMN study_trace_id SET DEFAULT nextval('public.study_trace_study_trace_id_seq'::regclass); + + +-- +-- TOC entry 4339 (class 2604 OID 17749) +-- Name: type_nat_rel type_nat_rel_id; Type: DEFAULT; Schema: public; Owner: asset-swissgeol +-- + +ALTER TABLE ONLY public.type_nat_rel ALTER COLUMN type_nat_rel_id SET DEFAULT nextval('public.type_nat_rel_type_nat_rel_id_seq'::regclass); + + +-- +-- TOC entry 4644 (class 0 OID 17479) +-- Dependencies: 222 +-- Data for Name: audit_log_entries; Type: TABLE DATA; Schema: auth; Owner: asset-swissgeol +-- + +COPY auth.audit_log_entries (instance_id, id, payload, created_at, ip_address) FROM stdin; +00000000-0000-0000-0000-000000000000 9176a1dc-0b48-451c-a8c6-237a01a0c6d4 {"action":"logout","actor_id":"10f95aa3-fb95-41eb-b754-5f729a092e30","actor_username":"admin@swissgeol.assets","log_type":"account"} 2024-02-29 18:43:07.688568+00 +00000000-0000-0000-0000-000000000000 7a180e80-e484-4a00-9948-c05de08d3bc0 {"action":"login","actor_id":"10f95aa3-fb95-41eb-b754-5f729a092e30","actor_username":"admin@swissgeol.assets","log_type":"account","traits":{"provider":"email"}} 2024-02-29 18:43:10.920386+00 +\. + + +-- +-- TOC entry 4645 (class 0 OID 17485) +-- Dependencies: 223 +-- Data for Name: identities; Type: TABLE DATA; Schema: auth; Owner: asset-swissgeol +-- + +COPY auth.identities (id, user_id, identity_data, provider, last_sign_in_at, created_at, updated_at) FROM stdin; +\. + + +-- +-- TOC entry 4646 (class 0 OID 17490) +-- Dependencies: 224 +-- Data for Name: instances; Type: TABLE DATA; Schema: auth; Owner: asset-swissgeol +-- + +COPY auth.instances (id, uuid, raw_base_config, created_at, updated_at) FROM stdin; +\. + + +-- +-- TOC entry 4647 (class 0 OID 17495) +-- Dependencies: 225 +-- Data for Name: refresh_tokens; Type: TABLE DATA; Schema: auth; Owner: asset-swissgeol +-- + +COPY auth.refresh_tokens (instance_id, id, token, user_id, revoked, created_at, updated_at, parent) FROM stdin; +00000000-0000-0000-0000-000000000000 1162 PaXdL_ZF_XBdHBtZihuAsg 10f95aa3-fb95-41eb-b754-5f729a092e30 f 2024-02-29 18:43:10.921231+00 2024-02-29 18:43:10.921234+00 \N +\. + + +-- +-- TOC entry 4649 (class 0 OID 17501) +-- Dependencies: 227 +-- Data for Name: schema_migrations; Type: TABLE DATA; Schema: auth; Owner: asset-swissgeol +-- + +COPY auth.schema_migrations (version) FROM stdin; +00 +20210710035447 +20210722035447 +20210730183235 +20210909172000 +20210927181326 +20211122151130 +20211124214934 +20211202183645 +20220114185221 +20220114185340 +20220224000811 +20220323170000 +20220429102000 +20220531120530 +20220614074223 +\. + + +-- +-- TOC entry 4650 (class 0 OID 17504) +-- Dependencies: 228 +-- Data for Name: users; Type: TABLE DATA; Schema: auth; Owner: asset-swissgeol +-- + +COPY auth.users (instance_id, id, aud, role, email, encrypted_password, email_confirmed_at, invited_at, confirmation_token, confirmation_sent_at, recovery_token, recovery_sent_at, email_change_token_new, email_change, email_change_sent_at, last_sign_in_at, raw_app_meta_data, raw_user_meta_data, is_super_admin, created_at, updated_at, phone, phone_confirmed_at, phone_change, phone_change_token, phone_change_sent_at, email_change_token_current, email_change_confirm_status, banned_until, reauthentication_token, reauthentication_sent_at) FROM stdin; +00000000-0000-0000-0000-000000000000 10f95aa3-fb95-41eb-b754-5f729a092e30 service_role admin@swissgeol.assets $2a$10$oS5YndA5kGTybe8TEl/uDe8BEr.cLhRpytY9dQjntY1YNMv8zfxvq 2024-02-15 16:28:47.224034+00 2024-02-15 16:27:23.057106+00 2024-02-15 16:27:23.057106+00 2024-02-29 18:36:20.170736+00 \N 2024-02-29 18:43:10.921203+00 {"provider": "email", "providers": ["email"]} {"lang": "de"} f 2024-02-15 16:27:23.053463+00 2024-02-29 18:43:10.924009+00 \N \N \N 0 \N \N +\. + + +-- +-- TOC entry 4651 (class 0 OID 17515) +-- Dependencies: 229 +-- Data for Name: _prisma_migrations; Type: TABLE DATA; Schema: public; Owner: asset-swissgeol +-- + +COPY public._prisma_migrations (id, checksum, finished_at, migration_name, logs, rolled_back_at, started_at, applied_steps_count) FROM stdin; +bc6d2f10-b62c-4ae1-ae56-5b2be0b2fd79 887e976d868da9e7139edcf0c1b9b34829b83deaf16bc2810d34eb362f25d80b 2023-05-15 07:55:39.679904+00 00_postgis \N \N 2023-05-15 07:55:39.606356+00 1 +30cac75d-2b65-4140-b22f-8bbddac7c31a 8ed38958c4008b866fa445b1d73e65676d85ee66e257f557baa2a69309235bdc 2023-05-15 07:55:40.254676+00 20230111143745_init \N \N 2023-05-15 07:55:39.707888+00 1 +642d02ac-9edc-4817-ba87-75ece5cab116 f7e683cb9b7f8b060cec80bafab4339bcb1ede0e95561d2370c9433ce67d4c7d 2023-05-15 07:55:40.381405+00 20230111143746_post-init \N \N 2023-05-15 07:55:40.281783+00 1 +a0c73e74-fb8f-406d-95c0-49e8b23b22d1 a420bf686dc742c137db016ee40fc6ffcdea31a692d2b13e5f09f923330ad008 2023-05-15 07:55:40.48204+00 20230117130629_favourite \N \N 2023-05-15 07:55:40.408558+00 1 +f32cd95a-338b-4450-b5bf-0a7a68fb6409 ecd3d5bfc26aad5de4b38f0a1df602904c615651c4a66115741c847a7bd12077 2023-05-15 07:55:40.575853+00 20230329093128_make_some_columns_on_table_asset_nullable \N \N 2023-05-15 07:55:40.508574+00 1 +1e91a6df-c902-45e2-8f71-94fe2e1dae70 5d89edd597c56ef7af331d0686b3e29517366c115f08c210e09cc6bc841c8262 2023-05-15 07:55:40.687801+00 20230409083312_location_analog_auto_cat \N \N 2023-05-15 07:55:40.607546+00 1 +f7840704-a48a-4a5b-b3fe-7dd21b53fdf6 e717ff7aa814cc181d76a19885cb59f486e8a7ee228c397b84b2dfda647fe341 2023-05-15 07:55:40.783342+00 20230411131547_original_title \N \N 2023-05-15 07:55:40.714157+00 1 +3a2493c4-7c42-4688-8074-9e5491e59850 n/a 2023-05-24 08:18:23.847932+00 20230522084603_ocr_status \N \N 2023-05-24 08:18:23.847932+00 1 +\. + + +-- +-- TOC entry 4655 (class 0 OID 17542) +-- Dependencies: 234 +-- Data for Name: asset; Type: TABLE DATA; Schema: public; Owner: asset-swissgeol +-- + +COPY public.asset (asset_id, title_public, title_original, is_nat_rel, receipt_date, municipality, url, location_analog, processor, last_processed_date, text_body, sgs_id, geol_data_info, geol_contact_data_info, geol_aux_data_info, remark, asset_kind_item_code, create_date, language_item_code, asset_format_item_code, author_biblio_id, source_project, description, is_extract, internal_use_id, public_use_id, asset_main_id) FROM stdin; +44382 Erstes allererstesasset t 2024-02-06 00:00:00 \N \N \N admin@assets.sg 2024-02-20 15:20:59.111 \N \N \N \N \N \N boreholeProfile 2024-02-13 00:00:00 EN db \N \N \N f 130109 130108 \N +\. + + +-- +-- TOC entry 4657 (class 0 OID 17548) +-- Dependencies: 236 +-- Data for Name: asset_contact; Type: TABLE DATA; Schema: public; Owner: asset-swissgeol +-- + +COPY public.asset_contact (asset_id, contact_id, role) FROM stdin; +\. + + +-- +-- TOC entry 4658 (class 0 OID 17553) +-- Dependencies: 237 +-- Data for Name: asset_file; Type: TABLE DATA; Schema: public; Owner: asset-swissgeol +-- + +COPY public.asset_file (asset_id, file_id) FROM stdin; +\. + + +-- +-- TOC entry 4659 (class 0 OID 17556) +-- Dependencies: 238 +-- Data for Name: asset_format_composition; Type: TABLE DATA; Schema: public; Owner: asset-swissgeol +-- + +COPY public.asset_format_composition (asset_format_composition_id, asset_id, asset_format_item_code) FROM stdin; +\. + + +-- +-- TOC entry 4661 (class 0 OID 17562) +-- Dependencies: 240 +-- Data for Name: asset_format_item; Type: TABLE DATA; Schema: public; Owner: asset-swissgeol +-- + +COPY public.asset_format_item (asset_format_item_code, geol_code, name, name_de, name_fr, name_rm, name_it, name_en, description, description_de, description_fr, description_rm, description_it, description_en) FROM stdin; +archive No-GeolCode-specified Archive Archive-Format Format d'archive Formato d'archivio Archive format Archive format resp. compression format, such as zip, tar, gz, bz2 etc. Archivformat resp. Komprimierungsformat, wie z.B. zip, tar, gz, bz2 etc. Format d'archivage ou de compression, p. ex. zip, tar, gz, bz2, etc. Formato d'archivio o formato di compressione, come zip, tar, gz, bz2 ecc. Archive format resp. compression format, such as zip, tar, gz, bz2 etc. +other No-GeolCode-specified Other Andere Autres Altro Other Other formats of assets not covered by the values in this list Andere Formate von Assets, die nicht mit den Werten dieser Liste abgedeckt sind Autres formats d'assets non couverts par les valeurs de cette liste Altri formati di elementi non coperti dai valori di questo elenco Other formats of assets not covered by the values in this list +textAnalog No-GeolCode-specified Text analog Analoge Dokumente (Papier, Mikrofichen etc.) Documents analogiques (papier, microfiches, etc.) Documenti analogici (cartaceo, microfiche, ecc.) Analogue documents (paper, microfiche etc.) Analogue asset, on e.g. paper, microfiche etc. Analoges Asset, auf z.B. Papier, Mikrofichen etc. Asset analogique, p. ex. sur papier, microfiches, etc. Elemento in formato analogico, ad esempio cartaceo, microfiche, ecc. Analogue asset, on e.g. paper, microfiche etc. +graphicVector No-GeolCode-specified Graphic vector Digitale Vektorgrafik Format graphique numérique vectoriel Grafica digitale vettoriale Digital vector graphics Vector graphics format, such as eps, ai, svg etc. Vektorgrafikformat, wie z.B. eps, ai, svg etc. Format graphique vectoriel, p. ex. eps, ai, svg, etc. Formato grafico vettoriale, come eps, ai, svg ecc. Vector graphics format, such as eps, ai, svg etc. +graphicRaster No-GeolCode-specified Graphic raster Digitale Rastergrafik Format graphique numérique raster Grafica digitale raster Digital raster graphics Raster graphics format, such as tiff, jpeg, png etc. Rastergrafikformat, wie z.B. tiff, jpeg, png etc. Format graphique raster, p. ex. tiff, jpeg, png, etc. Formato grafico raster, come tiff, jpeg, png ecc. Raster graphics format, such as tiff, jpeg, png etc. +binary No-GeolCode-specified Binary Digitales binäres Format Format binaire numérique Formato binario digitale Digital binary format Binary format Binäres Format Format binaire Formato binario Binary format +textDigital No-GeolCode-specified Text digital Textformat digital Format texte numérique Formato testo digitale Digital text format Text or ASCII format, such as txt, doc, docx, xls, xlsx, xml, csv etc. Textformat, wie z.B. txt, doc, docx, xls, xlsx, xml, csv etc. Format texte, p. ex. txt, doc, docx, xls, xlsx, xml, csv etc. Formato di testo, come txt, doc, docx, xls, xlsx, xml, csv ecc. Text or ASCII format, such as txt, doc, docx, xls, xlsx, xml, csv etc. +seismic No-GeolCode-specified Seismic Seismikspezifisches Format Format spécifique à la sismique Formato specifico per il sismica Seismic specific format Seismic-specific format, such as SPS, SEG2, SEGD, etc. Seismikspezifisches Format, wie z.B. SPS, SEG2, SEGD etc. Format spécifique à la sismologie, p. ex. SPS, SEG2, SEGD, etc. Formato specifico per la sismica, come SPS, SEG2, SEGD, ecc. Seismic-specific format, such as SPS, SEG2, SEGD, etc. +segy No-GeolCode-specified SEGY SEGY SEGY SEGY SEGY Seismic-specific format SEGY Seismikspezifisches Format SEGY Format spécifique à la sismologie SEGY Formato specifico sismico SEGY Seismic-specific format SEGY +segyExported No-GeolCode-specified SEGY exported SEGY exportiert SEGY exporté SEGY esportato SEGY exported Seismic-specific format SEGY exported Seismikspezifisches Format SEGY exportiert Format spécifique à la sismologie SEGY exporté Formato specifico sismico SEGY esportato Seismic-specific format SEGY exported +pdf No-GeolCode-specified PDF PDF PDF PDF PDF Any versions of PDF formats Jegliche Versionen von PDF-Formaten Toutes les versions des formats PDF Qualsiasi versione del formato PDF Any versions of PDF formats +shapefile No-GeolCode-specified Shapefile Shapefile Shapefile Shapefile Shapefile ESRI shapefile ESRI-Shapefile Shapefile ESRI Formato ESRI ESRI shapefile +las No-GeolCode-specified LAS Log ASCII Standard Log ASCII standard Log ASCII Standard Log ASCII Standard Specific format for well logs, such as log ASCII standard spezifisches Format für Well-Logs, wie z.B. Log ASCII Standard Format spécifique pour les logs de forage, p. ex. standard Log ASCII Formato specifico per i log di perforazione, come ad esempio lo standard ASCII dei log Specific format for well logs, such as log ASCII standard +unknown No-GeolCode-specified Unknown Unbekannt Inconnu Sconosciuto Unknown Format of the asset not known Format des Assets nicht bekannt Format de l'asset non connu Formato non noto Format of the asset not known +3D No-GeolCode-specified 3D 3D-spezifisches Format Format spécifique à la 3D Formato specifico per il 3D 3D-specific format Specific format for 3D models, such as mve, ts, xyz, kml/Collada, OBJ. spezifisches Format für 3D-Modelle, wie z.B. mve, ts, xyz, kml/Collada, OBJ Format spécifique pour les modèles 3D, p. ex. mve, ts, xyz, kml/Collada, OBJ Formato specifico per i modelli 3D, come mve, ts, xyz, kml/Collada, OBJ. Specific format for 3D models, such as mve, ts, xyz, kml/Collada, OBJ. +db No-GeolCode-specified DB Datenbank Base de données Database Database Database format, e.g. gpkg, sql, fgdb, mdb Datenbank-Format, wie z.B. gpkg, sql, fgdb, mdb Format de base de données, p. ex. gpkg, sql, fgdb, mdb Formato del database, ad esempio gpkg, sql, fgdb, mdb Database format, e.g. gpkg, sql, fgdb, mdb +multimedia No-GeolCode-specified Multimedia Multimedia-Format Format multimédia Formato multimediale Multimedia format Multimedia format, such as MPEG, mp4, mov, avi, wmv. Multimedia-Format, wie z.B. MPEG, mp4, mov, avi, wmv Format multimédia, p. ex. MPEG, mp4, mov, avi, wmv Formato multimediale, come MPEG, mp4, mov, avi, wmv. Multimedia format, such as MPEG, mp4, mov, avi, wmv. +\. + + +-- +-- TOC entry 4662 (class 0 OID 17567) +-- Dependencies: 241 +-- Data for Name: asset_internal_project; Type: TABLE DATA; Schema: public; Owner: asset-swissgeol +-- + +COPY public.asset_internal_project (asset_id, internal_project_id) FROM stdin; +\. + + +-- +-- TOC entry 4663 (class 0 OID 17570) +-- Dependencies: 242 +-- Data for Name: asset_kind_composition; Type: TABLE DATA; Schema: public; Owner: asset-swissgeol +-- + +COPY public.asset_kind_composition (asset_kind_composition_id, asset_id, asset_kind_item_code) FROM stdin; +\. + + +-- +-- TOC entry 4665 (class 0 OID 17576) +-- Dependencies: 244 +-- Data for Name: asset_kind_item; Type: TABLE DATA; Schema: public; Owner: asset-swissgeol +-- + +COPY public.asset_kind_item (asset_kind_item_code, geol_code, name, name_de, name_fr, name_rm, name_it, name_en, description, description_de, description_fr, description_rm, description_it, description_en) FROM stdin; +package No-GeolCode-specified Asset package Asset-Paket Collection d'assets Raccolta di elementi Asset package Collection/package of assets of different types Sammlung/Paket von Assets verschiedener Arten Collection/paquet d'assets de différents types Raccolta di elementi di diverso tipo Collection/package of assets of different types +other No-GeolCode-specified Other Andere Autre Altro Other Other types of assets not covered by the values in this list Andere Arten von Assets, die nicht mit den Werten dieser Liste abgedeckt sind Autres types d'assets non couverts par les valeurs de cette liste Altri tipi di elementi non coperti dai valori di questo elenco Other types of assets not covered by the values in this list +rawData No-GeolCode-specified Raw data Rohdaten Données brutes Dati grezzi Raw data Raw data Rohdaten Données brutes Dati grezzi Raw data +report No-GeolCode-specified Report Bericht Rapport Rapporto Report Geological reports or other documentation of geological investigations Geologsiche Berichte oder sonstige Dokumentationen von geologischen Untersuchungen Rapports géologiques ou autres documentations d'études géologiques Rapporti geologici o altra documentazione di indagini geologiche Geological reports or other documentation of geological investigations +measurements No-GeolCode-specified Measurements Messungen allgemein Mesures en général Misure Measurements Any type of measurements, if not further specifiable Jegliche Arten von Messungen, wenn nicht genauer spezifizierbar Tout type de mesures, en l'absence d'autres précisions Qualsiasi tipo di misura, se non ulteriormente specificabile Any type of measurements, if not further specifiable +log No-GeolCode-specified Log LOG Log Log Log Borehole log or other log data Bohr-Log oder andere Log-Daten Log de forage ou autres données de log Log di perforazione o altri dati di log Borehole log or other log data +deviceOutput No-GeolCode-specified Device output Geräteoutput Données de sortie de l'appareil Output del dispositivo Device output Data output directly from an instrument Daten, die direkt aus einem Gerät ausgegeben wurden Données sortant directement d'un appareil Dati di output ottenuti direttamente da uno strumento Data output directly from an instrument +manualFieldRecord No-GeolCode-specified Manual field record Feldaufzeichnung Enregistrement de terrain Registrazione manuale sul campo Manual field record Records made during fieldwork Aufzeichnungen, die bei der Feldarbeit gemacht wurden Enregistrements réalisés lors du travail sur le terrain Registrazioni effettuate durante i lavori sul campo Records made during fieldwork +labData No-GeolCode-specified Lab data Labormessung Mesure en laboratoire Dati di laboratorio Laboratory data Data collected in the laboratory, e.g. grain distribution, compressive strength tests, etc. Daten, die im Labor erhoben wurden, wie z.B. Kornverteilung, Druckversuche, etc. Données collectées en laboratoire, p. ex. répartition granulométrique, essais de compression, etc. Dati raccolti in laboratorio, ad esempio distribuzione granulometrica, prove di pressione, ecc. Data collected in the laboratory, e.g. grain distribution, compressive strength tests, etc. +map No-GeolCode-specified Map Karte allgemein Carte en général Mappa Map Any type of maps, if not specifiable Jegliche Arten von Karten, wenn nicht genauer spezifizierbar Tout type de carte, en l'absence d'autres précisions Qualsiasi tipo di mappa, se non specificabile Any type of maps, if not specifiable +shotpointmap No-GeolCode-specified Shotpoint map Schusspunktkarte Carte des points de tir Mappa dei punti di tiro Shotpoint map Map of seismic survey shot points Karte der Schusspunkte bei einer Seismischen Untersuchung Carte des points de tir lors d'une étude sismique Mappa dei punti di tiro durante un'indagine sismica Map of seismic survey shot points +basemap No-GeolCode-specified Basemap Basemap Carte de base Mappa di base Basemap Base map Grundkarte Carte de base Mappa di base Base map +wellLocationmap No-GeolCode-specified Well location map Bohrstandortkarte Carte du site de forage Mappa della posizione della perforazione Borehole location map Map showing locations of one or more boreholes Karte mit den Standorten von einer oder mehrer Bohrungen Carte montrant l'emplacement d'un ou de plusieurs forages Mappa che mostra l'ubicazione di uno o più perforazioni Map showing locations of one or more boreholes +geologicalMap No-GeolCode-specified Geological map Geologische Karte Carte géologique Carta geologica Geological map Geological map Geologische Karte Carte géologique Carta geologica Geological map +location No-GeolCode-specified Location Situationsplan Plan de situation Posizione Location Site plan,locality plan of an investigation Situationsplan, Lageplan einer Untersuchung Plan de situation, plan d'implantation d'une étude Localizzazone del sito o di un'indagine Site plan,locality plan of an investigation +crossSection No-GeolCode-specified Cross section Geologischer Profilschnitt Coupe géologique Sezione geologica trasversale Cross section Geological cross section or profile Geologische Längen- oder Querprofile Coupes géologiques longitudinales ou transversales Profili geologici longitudinali o trasversali Geological cross section or profile +seismicSection No-GeolCode-specified Seismic section Seismische Section Section sismique Sezione sismica Seismic section Seismic section Seismische Sektion Section sismique Sezione sismica Seismic section +drillPath No-GeolCode-specified Drill path Bohrpfad Trajectoire de forage Percorso di perforazione Borehole path Borehole path: information on the spatial course of the borehole Bohrpfad: Angaben zum räumlichen Verlauf der Bohrung Trajectoire de forage : indications sur le tracé spatial du forage Percorso della perforazione: informazioni sulla traccia della perforazione Borehole path: information on the spatial course of the borehole +softwareCode No-GeolCode-specified Software / code Software-Code Code du logiciel Software / codice Software / code Software, script, code/coding Software, Skript, Code/Codierung Logiciel, script, code/codage Software, script, codice Software, script, code/coding +model No-GeolCode-specified Model Modell Modèle Modello Model Models, e.g. 3D model, block model, etc. Modelle, z.B. 3D-Modell, Blocksturzmodell, etc. Modèles, p. ex. modèle 3D, modèle de chute de blocs, etc. Modelli, ad esempio modello 3D, modello di scivolamento di blocchi, ecc. Models, e.g. 3D model, block model, etc. +photo No-GeolCode-specified Photo Foto Photo Foto Photo Any kind of photos Jegliche Art von Fotos Tout type de photos Qualsiasi tipo di foto Any kind of photos +seismic3D No-GeolCode-specified Seismic 3D Seismische 3D Untersuchung Étude sismique 3D Sismica 3D Seismic 3D Data from 3D seismic surveys (3D seismic) Daten aus 3D-seismischen Untersuchungen (3D-Seismik) Données d'études sismiques 3D Dati provenienti da indagini sismiche 3D (sismica 3D) Data from 3D seismic surveys (3D seismic) +profileSection No-GeolCode-specified Profile / section Profil / Profilschnitt Profil / Coupe Profilo / sezione Profile / section Any kind of sections or profiles, if not further specifiable Jegliche Arten von Profilen, wenn nicht genauer spezifizierbar Tout type de profil ou de coupe, en l'absence d'autres précisions Qualsiasi tipo di profilo, se non ulteriormente specificabile Any kind of sections or profiles, if not further specifiable +seismicInterpretation No-GeolCode-specified Seismic interpretation Seismische Interpretation Interprétation sismique Interpretazione sismica Seismic interpretation Profile with seismic interpretation Profil mit seismischer Interpretation Profil avec interprétation sismique Profilo con interpretazione sismica Profile with seismic interpretation +boreholeProfile No-GeolCode-specified Borehole profile Bohrprofil Profil de forage Profilo della perforazione Borehole profile Borehole profile: representation of the drilled layers, layer interpretations and further information on the borehole Bohrprofil: Darstellung der erbohrten Schichten, Schichtinterpretationen und weiteren Angaben zur Bohrung Profil de forage : représentation des couches forées, interprétations des couches et autres indications sur le forage. Profilo della perforazione: rappresentazione degli strati perforati, interpretazione degli strati e ulteriori informazioni sulla perforazione Borehole profile: representation of the drilled layers, layer interpretations and further information on the borehole +boreholeCompletion No-GeolCode-specified Borehole completion Bohrlochausbau Aménagement du forage Completamento della perforazione Borehole completion Borehole completion: details of casing, backfill, internals (e.g. piezometer), etc. Bohrlochausbau: Angaben zu Verrohrung, Hinterfüllung, Einbauten (z.B. Piezometer), etc. Aménagement du trou de forage : indications sur le tubage, le remblayage, les installations (p. ex. piézomètre), etc. Completamento dela perforazione: dettagli del tipo di tubatura, del riempimento, dei componenti interni (ad es. piezometro), ecc. Borehole completion: details of casing, backfill, internals (e.g. piezometer), etc. +configuration No-GeolCode-specified configuration Konfiguration Configuration Configurazione configuration Configurations of modelling or other calculations Konfigurationen von Modellierungen oder sonstigen Berechnungen Configurations de modélisations ou autres calculs Configurazioni di modellazione o altri calcoli Configurations of modelling or other calculations +multmedia No-GeolCode-specified Multmedia Multimediadatei Fichier multimédia File multimediale Multmedia Any type of multimedia files, if not further specifiable. Jegliche Art von Multimediadateien, wenn nicht genauer spezifizierbar Tout type de fichier multimédia, en l'absence d'autres précisions Qualsiasi tipo di file multimediale, se non ulteriormente specificabile. Any type of multimedia files, if not further specifiable. +video No-GeolCode-specified Video Video Vidéo Video Video Any type of video Jegliche Art von Videos Tout type de vidéos Qualsiasi tipo di video Any type of video +unknown No-GeolCode-specified Unknown Unbekannt Inconnu Sconosciuto Unknown Assets whose nature/type is not known Assets, deren Art/Typ nicht bekannt ist Assets dont la nature/le type n'est pas connu/e Attività la cui natura/tipo non è nota Assets whose nature/type is not known +inSitu No-GeolCode-specified In-situ measurment In-situ Messung Mesure in situ Misurazione in situ In-situ measurement Any kind of in-situ measurements, such as pump test, well test, etc. Jegliche Art von In-situ Messungen, wie z.B. Pumpversuch, Well-Test, etc. Tout type de mesures in situ, p. ex. essai de pompage, test de puits, etc. Qualsiasi tipo di misurazione in situ, come un test di pompaggio, il test del pozzo, ecc. Any kind of in-situ measurements, such as pump test, well test, etc. +\. + + +-- +-- TOC entry 4666 (class 0 OID 17581) +-- Dependencies: 245 +-- Data for Name: asset_object_info; Type: TABLE DATA; Schema: public; Owner: asset-swissgeol +-- + +COPY public.asset_object_info (asset_object_info_id, file_id, auto_object_cat_item_code, object_page, object_bbox, object_score, path_to_image) FROM stdin; +\. + + +-- +-- TOC entry 4668 (class 0 OID 17587) +-- Dependencies: 247 +-- Data for Name: asset_publication; Type: TABLE DATA; Schema: public; Owner: asset-swissgeol +-- + +COPY public.asset_publication (asset_id, publication_id) FROM stdin; +\. + + +-- +-- TOC entry 4669 (class 0 OID 17590) +-- Dependencies: 248 +-- Data for Name: asset_user; Type: TABLE DATA; Schema: public; Owner: asset-swissgeol +-- + +COPY public.asset_user (id, role) FROM stdin; +10f95aa3-fb95-41eb-b754-5f729a092e30 admin +\. + + +-- +-- TOC entry 4670 (class 0 OID 17595) +-- Dependencies: 249 +-- Data for Name: asset_user_favourite; Type: TABLE DATA; Schema: public; Owner: asset-swissgeol +-- + +COPY public.asset_user_favourite (asset_user_id, asset_id, created_at) FROM stdin; +\. + + +-- +-- TOC entry 4671 (class 0 OID 17598) +-- Dependencies: 250 +-- Data for Name: asset_x_asset_y; Type: TABLE DATA; Schema: public; Owner: asset-swissgeol +-- + +COPY public.asset_x_asset_y (asset_x_id, asset_y_id) FROM stdin; +\. + + +-- +-- TOC entry 4672 (class 0 OID 17601) +-- Dependencies: 251 +-- Data for Name: auto_cat; Type: TABLE DATA; Schema: public; Owner: asset-swissgeol +-- + +COPY public.auto_cat (auto_cat_id, asset_id, auto_cat_label_item_code, auto_cat_label_score) FROM stdin; +\. + + +-- +-- TOC entry 4674 (class 0 OID 17607) +-- Dependencies: 253 +-- Data for Name: auto_cat_label_item; Type: TABLE DATA; Schema: public; Owner: asset-swissgeol +-- + +COPY public.auto_cat_label_item (asset_cat_label_item_code, geol_code, name, name_de, name_fr, name_rm, name_it, name_en, description, description_de, description_fr, description_rm, description_it, description_en) FROM stdin; +energyresources No-GeolCode-specified Energy resources Energierohstoffe Matières premières énergétiques Risorse energetiche Energy resources Asset on the topic of energy resources (crude oil, natural gas, coal/anthracite) Asset zum Thema Energierohstoffe (Erdöl, Erdgas, Kohle/Anthrazit) Asset sur le thème des matières premières énergétiques (pétrole, gaz naturel, charbon/anthracite) Elemento sul tema delle risorse energetiche (petrolio, gas naturale, carbone/antracite) Asset on the topic of energy resources (crude oil, natural gas, coal/anthracite) +mining No-GeolCode-specified Mining Bergbau Exploitation minière Estrazione mineraria Mining Asset on the topic of (historical) mining Asset zum Thema (historischer) Bergbau Asset sur le thème de l'exploitation minière (historique) Elemento sul tema dell'attività mineraria (storica) Asset on the topic of (historical) mining +mineralressources No-GeolCode-specified Mineral ressources Mineralische Rohstoffe Matières premières minérales Materie prime minerali Mineral resources Asset on the topic of mineral resources (ores, stone, gravel/sand/clay, etc.) Asset zum Thema Mineralische Rohstoffe (Erze, Hartstein, Kies/Sand/Ton, etc.) Asset sur le thème des matières premières minérales (minerais, pierre dure, gravier/sable/argile, etc.) Elemento sul tema delle risorse minerali (minerali, rocce dure, ghiaia/sabbia/argilla, ecc.) Asset on the topic of mineral resources (ores, stone, gravel/sand/clay, etc.) +naturalHazards No-GeolCode-specified Natural hazards Naturgefahren Dangers naturels Rischi naturali Natural hazards Asset on the topic of natural hazards Asset zum Thema Naturgefahren Asset sur le thème des dangers naturels Elemento sul tema dei rischi naturali Asset on the topic of natural hazards +geothermal No-GeolCode-specified Geothermal Geothermie Géothermie Energia geotermica Geothermal energy Asset on the topic of geothermal energy Asset zum Thema Geothermie Asset sur le thème de la géothermie Elemento sul tema dell'energia geotermica Asset on the topic of geothermal energy +measureLabresults No-GeolCode-specified Measurements, lab results Messungen, Laborresultate Mesures, résultats de laboratoire Misure, risultati di laboratorio Measurements, laboratory results Asset on the topic of measurements and laboratory results Asset zum Thema Messungen und Laborresultate Asset sur le thème des mesures et des résultats de laboratoire Elemento sul tema delle misure e dei risultati di laboratorio Asset on the topic of measurements and laboratory results +science No-GeolCode-specified Science Wissenschaft Science Scienza Science Asset on the topic of science Asset zum Thema Wissenschaft Asset sur le thème de la science fondamentale Elemento su temi scientifici non specificati Asset on the topic of science +geophysics No-GeolCode-specified Geophysics Geophysik Géophysique Geofisica Geophysics Asset on the topic of geophysics Asset zum Thema Geophysik Asset sur le thème de la géophysique Elemento sul tema della geofisica Asset on the topic of geophysics +pollution No-GeolCode-specified Pollution Altlasten Sites contaminés Siti contaminati Contaminated sites Asset on the topic of contaminated sites Asset zum Thema Altlasten Asset sur le thème des sites contaminés Elemento sul tema dei siti contaminati Asset on the topic of contaminated sites +geologieGeneral No-GeolCode-specified Geology general Geologie allgemein Géologie en général Geologia in generale Geology in general Asset on the topic of geology in general Asset zum Thema Geologie allgemein Asset sur la géologie en général Elemento sul tema della geologia in generale Asset on the topic of geology in general +hydrogeology No-GeolCode-specified Hydrogeology Hydrogeologie Hydrogéologie Idrogeologia Hydrogeology Asset on the topic of hydrogeology Asset zum Thema Hydrogeologie Asset sur le thème de l'hydrogéologie Elemento sul tema dell'idrogeologia Asset on the topic of hydrogeology +drilling No-GeolCode-specified Drilling Bohrung Forage Perforazione Borehole Asset on the topic of drilling Asset zum Thema Bohrungen Asset sur le thème des forages Elemento sul tema delle perforazioni Asset on the topic of drilling +geotechnics No-GeolCode-specified Geotechnics Geotechnik Géotechnique Geotecnica Geotechnics Asset on the topic of geotechnics (incl. building ground etc.) Asset zum Thema Geotechnik (inkl. Baugrund etc.) Asset sur le thème de la géotechnique (y compris sols de fondation, etc.) Elemento sul tema della geotecnica (incluso il terreno edificabile, ecc.) Asset on the topic of geotechnics (incl. building ground etc.) +other No-GeolCode-specified Other Andere Autres Altro Other Asset on other topics not covered by the values in this list Asset zu anderen Themen, die nicht mit den Werten dieser Liste abgedeckt sind Asset sur d'autres thèmes qui ne sont pas couverts par les valeurs de cette liste Elemento su altri argomenti non coperti dai valori di questo elenco Asset on other topics not covered by the values in this list +\. + + +-- +-- TOC entry 4675 (class 0 OID 17612) +-- Dependencies: 254 +-- Data for Name: auto_object_cat_item; Type: TABLE DATA; Schema: public; Owner: asset-swissgeol +-- + +COPY public.auto_object_cat_item (auto_object_cat_item_code, geol_code, name, name_de, name_fr, name_rm, name_it, name_en, description, description_de, description_fr, description_rm, description_it, description_en) FROM stdin; +drillProfile No-GeolCode-specified Drill profile Bohrprofil Profil de forage Profilo di perforazione Borehole profile Borehole profile Bohrprofil Profil de forage Profilo di perforazione Borehole profile +stratiSection No-GeolCode-specified Strati section Stratigrafisches Profil Profil stratigraphique Profilo stratigrafico Stratigraphic profile Stratigraphic profile Stratigrafisches Profil Profil stratigraphique Profilo stratigrafico Stratigraphic profile +geotechnicSection No-GeolCode-specified Geotechnic section Geotechnisches Profil Profil géotechnique Profilo geotecnico Geotechnical profile Geotechnical profile Geotechnisches Profil Profil géotechnique Profilo geotecnico Geotechnical profile +seismicSection No-GeolCode-specified Seismic section Seismisches Profil Profil sismique Profilo sismico Seismic profile Seismic profile Seismisches Profil Profil sismique Profilo sismico Seismic profile +wellLog No-GeolCode-specified Well log Bohr-Log Log de forage Log di perforazione Borehole log Borehole log Bohr-Log Log de forage Log di perforazione Borehole log +map No-GeolCode-specified Map Karte Carte Mappa Map Map Karte Carte Mappa Map +graphic No-GeolCode-specified Graphic Grafik Graphique Grafica Graphic Graphic Grafik Graphique Grafica Graphic +table No-GeolCode-specified Table Tabelle Tableau Tabella Table Table Tabelle Tableau Tabella Table +photo No-GeolCode-specified Photo Foto Photo Foto Photo Photo Foto Photo Foto Photo +geologicalSection No-GeolCode-specified Geological Section Geologisches Profil Coupe géologique Profilo geologico Geological profile Geological profile Geologisches Profil Coupe géologique Profilo geologico Geological profile +\. + + +-- +-- TOC entry 4676 (class 0 OID 17617) +-- Dependencies: 255 +-- Data for Name: contact; Type: TABLE DATA; Schema: public; Owner: asset-swissgeol +-- + +COPY public.contact (contact_id, contact_kind_item_code, name, street, house_number, plz, locality, country, telephone, email, website) FROM stdin; +\. + + +-- +-- TOC entry 4678 (class 0 OID 17623) +-- Dependencies: 257 +-- Data for Name: contact_kind_item; Type: TABLE DATA; Schema: public; Owner: asset-swissgeol +-- + +COPY public.contact_kind_item (contact_kind_item_code, geol_code, name, name_de, name_fr, name_rm, name_it, name_en, description, description_de, description_fr, description_rm, description_it, description_en) FROM stdin; +private No-GeolCode-specified Private company or private person Privatfirma oder Privatperson Entreprise privée ou personne privée Azienda privata o persona privata Private company or private person Private company or private person Privatfirma oder Privatperson Entreprise privée ou personne privée Azienda privata o persona privata Private company or private person +fedAdmin No-GeolCode-specified Federal authority Bundesbehörde Autorité fédérale Autorità federale Federal authority Federal authority Bundesbehörde Autorité fédérale Autorità federale Federal authority +other No-GeolCode-specified Other Andere Autre Altro Other Other Andere Autre Altro Other +university No-GeolCode-specified University Universität, Fachhochschule FH Université, haute école spécialisée HES Università, Università di Scienze Applicate University, Vocational University University and vocational university Universität und Fachhochschule Université et haute école spécialisée Università e scuole universitarie professionali University and vocational university +community No-GeolCode-specified Community Gemeinde Commune Comune Municipality Municipality Gemeinde Commune Comune Municipality +cantonAdmin No-GeolCode-specified Cantonal authority Kantonale Bewilligungsbehörde Autorité cantonale chargée de délivrer les autorisations Autorità cantonale di autorizzazione Cantonal licensing authority Cantonal authority Kantonale Behörde Autorité cantonale Autorità cantonale Cantonal authority +swisstopo No-GeolCode-specified swisstopo swisstopo swisstopo swisstopo swisstopo swisstopo swisstopo swisstopo swisstopo swisstopo +unknown No-GeolCode-specified Unknown Unbekannt Inconnu Sconosciuto Unknown Unknown Unbekannt Inconnu Sconosciuto Unknown +\. + + +-- +-- TOC entry 4679 (class 0 OID 17628) +-- Dependencies: 258 +-- Data for Name: file; Type: TABLE DATA; Schema: public; Owner: asset-swissgeol +-- + +COPY public.file (file_id, file_name, file_size, file_date, ocr_status) FROM stdin; +\. + + +-- +-- TOC entry 4681 (class 0 OID 17635) +-- Dependencies: 260 +-- Data for Name: geom_quality_item; Type: TABLE DATA; Schema: public; Owner: asset-swissgeol +-- + +COPY public.geom_quality_item (geom_quality_item_code, geol_code, name, name_de, name_fr, name_rm, name_it, name_en, description, description_de, description_fr, description_rm, description_it, description_en) FROM stdin; +placeholder No-GeolCode-specified Placeholder Platzhaltergeometrie Indicative générique Geometria segnaposto Placeholder geometry Placeholder geometry in general, without a concretely defined size Platzhaltergeometrie allgemein, ohne eine konkret definiert Grösse Géométrie indicative générique, sans taille concrètement définie Geometria segnaposto in generale, senza una dimensione concretamente definita Placeholder geometry in general, without a concretely defined size +placeholder100x100 No-GeolCode-specified Placeholder100x100 Platzhaltergeometrie 100x100km Indicative 100x100km Geometria segnaposto 100x100km Placeholder geometry 100x100km Placeholder geometry larger than 100x100km Platzhaltergeometrie grösser als 100x100km Géométrie indicative de taille supérieure à 100x100km Geometria segnaposto superiore a 100x100km Placeholder geometry larger than 100x100km +placeholder10x10 No-GeolCode-specified Placeholder10x10 Platzhaltergeometrie 10x10km Indicative 10x10km Geometria segnaposto 10x10km Placeholder geometry 10x10km Placeholder geometry larger than 10x10km Platzhaltergeometrie grösser als 10x10km Géométrie indicative de taille supérieure à 10x10km Geometria segnaposto superiore a 10x10km Placeholder geometry larger than 10x10km +placeholder1x1 No-GeolCode-specified Placeholder1x1 Platzhaltergeometrie 1x1km Indicative 1x1km Geometria segnaposto 1x1km Placeholder geometry 1x1km Placeholder geometry larger than 1x1km Platzhaltergeometrie grösser als 1x1km Géométrie indicative de taille supérieure à 1x1km Geometria segnaposto di dimensioni superiori a 1x1km Placeholder geometry larger than 1x1km +simplification No-GeolCode-specified Simplification Vereinfachung Simplifiée Semplificazione Simplified Simplified from actual geometry Der tatsächlichen Geometrie angenähert Approximation de la géométrie réelle Approssimazione alla geometria reale Simplified from actual geometry +original No-GeolCode-specified Original Original Originale Originale Original Corresponds to the original, unaltered geometry Entspricht der tatsächlichen Geometrie Correspond à la géométrie réelle Corrisponde alla geometria effettiva Corresponds to the original, unaltered geometry +revised No-GeolCode-specified Revised Überarbeitet Indicative révisée Versione revisionata Revised Revised from placeholder geometry Von Platzhaltergeometrie korrigiert Géométrie indicative corrigée Corretto dalla geometria segnaposto Revised from placeholder geometry +unkown No-GeolCode-specified Unkown Unbekannt Inconnue Sconosciuto Unknown Quality of geometry not known Qualität der Geometrie nicht bekannt Qualité de la géométrie inconnue Qualità della geometria non nota Quality of geometry not known +imported No-GeolCode-specified Imported Importiert Importée Importato Imported Imported geometry Importierte Geometrie Géométrie importée Geometria importata Imported geometry +\. + + +-- +-- TOC entry 4682 (class 0 OID 17640) +-- Dependencies: 261 +-- Data for Name: id; Type: TABLE DATA; Schema: public; Owner: asset-swissgeol +-- + +COPY public.id (id_id, asset_id, id, description) FROM stdin; +\. + + +-- +-- TOC entry 4684 (class 0 OID 17646) +-- Dependencies: 263 +-- Data for Name: internal_project; Type: TABLE DATA; Schema: public; Owner: asset-swissgeol +-- + +COPY public.internal_project (internal_project_id, name, description, date_delivered) FROM stdin; +\. + + +-- +-- TOC entry 4686 (class 0 OID 17652) +-- Dependencies: 265 +-- Data for Name: internal_use; Type: TABLE DATA; Schema: public; Owner: asset-swissgeol +-- + +COPY public.internal_use (internal_use_id, is_available, status_asset_use_item_code, start_availability_date) FROM stdin; +7 f tobechecked \N +34 t tobechecked \N +37 f tobechecked \N +40 f tobechecked \N +43 f tobechecked \N +75 t tobechecked \N +78 t tobechecked \N +159 t tobechecked \N +162 t tobechecked \N +165 t tobechecked \N +168 t tobechecked \N +171 t tobechecked \N +173 t tobechecked \N +176 t tobechecked \N +179 t tobechecked \N +182 t tobechecked \N +185 t tobechecked \N +188 t tobechecked \N +191 t tobechecked \N +194 t tobechecked \N +197 t tobechecked \N +200 t tobechecked \N +203 t tobechecked \N +206 t tobechecked \N +209 t tobechecked \N +212 t tobechecked \N +215 t tobechecked \N +218 t tobechecked \N +221 t tobechecked \N +224 t tobechecked \N +227 t tobechecked \N +230 t tobechecked \N +233 t tobechecked \N +236 t tobechecked \N +239 t tobechecked \N +242 t tobechecked \N +245 t tobechecked \N +248 t tobechecked \N +251 t tobechecked \N +254 t tobechecked \N +257 t tobechecked \N +260 t tobechecked \N +263 t tobechecked \N +266 t tobechecked \N +269 t tobechecked \N +272 t tobechecked \N +275 t tobechecked \N +278 t tobechecked \N +281 t tobechecked \N +284 t tobechecked \N +287 t tobechecked \N +290 t tobechecked \N +293 t tobechecked \N +296 t tobechecked \N +299 t tobechecked \N +302 t tobechecked \N +305 t tobechecked \N +308 t tobechecked \N +311 t tobechecked \N +314 t tobechecked \N +317 t tobechecked \N +320 t tobechecked \N +323 t tobechecked \N +326 t tobechecked \N +329 t tobechecked \N +332 t tobechecked \N +335 t tobechecked \N +338 t tobechecked \N +341 t tobechecked \N +347 f tobechecked \N +350 f tobechecked \N +353 f tobechecked \N +356 f tobechecked \N +359 f tobechecked \N +362 f tobechecked \N +365 f tobechecked \N +368 f tobechecked \N +371 f tobechecked \N +374 f tobechecked \N +377 f tobechecked \N +380 f tobechecked \N +383 f tobechecked \N +386 f tobechecked \N +389 f tobechecked \N +392 f tobechecked \N +395 f tobechecked \N +398 f tobechecked \N +401 f tobechecked \N +404 f tobechecked \N +407 f tobechecked \N +410 f tobechecked \N +413 f tobechecked \N +416 f tobechecked \N +419 f tobechecked \N +422 f tobechecked \N +425 f tobechecked \N +428 f tobechecked \N +431 f tobechecked \N +434 f tobechecked \N +437 f tobechecked \N +440 f tobechecked \N +443 f tobechecked \N +446 f tobechecked \N +449 f tobechecked \N +452 f tobechecked \N +455 f tobechecked \N +458 f tobechecked \N +461 f tobechecked \N +464 f tobechecked \N +467 f tobechecked \N +470 f tobechecked \N +473 f tobechecked \N +476 f tobechecked \N +479 f tobechecked \N +482 f tobechecked \N +485 f tobechecked \N +488 f tobechecked \N +491 f tobechecked \N +494 f tobechecked \N +497 f tobechecked \N +500 f tobechecked \N +503 f tobechecked \N +506 f tobechecked \N +509 f tobechecked \N +512 f tobechecked \N +515 f tobechecked \N +518 f tobechecked \N +521 f tobechecked \N +524 f tobechecked \N +527 f tobechecked \N +530 f tobechecked \N +533 f tobechecked \N +536 f tobechecked \N +539 f tobechecked \N +542 f tobechecked \N +545 f tobechecked \N +548 f tobechecked \N +551 f tobechecked \N +554 f tobechecked \N +557 f tobechecked \N +560 f tobechecked \N +563 f tobechecked \N +566 f tobechecked \N +569 f tobechecked \N +572 f tobechecked \N +575 f tobechecked \N +578 f tobechecked \N +581 f tobechecked \N +584 f tobechecked \N +587 f tobechecked \N +590 f tobechecked \N +593 f tobechecked \N +596 f tobechecked \N +599 f tobechecked \N +602 f tobechecked \N +605 f tobechecked \N +608 f tobechecked \N +611 f tobechecked \N +614 f tobechecked \N +617 f tobechecked \N +620 f tobechecked \N +623 f tobechecked \N +626 f tobechecked \N +629 f tobechecked \N +632 f tobechecked \N +635 f tobechecked \N +638 f tobechecked \N +641 f tobechecked \N +644 f tobechecked \N +647 f tobechecked \N +650 f tobechecked \N +653 f tobechecked \N +656 f tobechecked \N +659 f tobechecked \N +662 f tobechecked \N +665 f tobechecked \N +668 f tobechecked \N +671 f tobechecked \N +674 f tobechecked \N +677 f tobechecked \N +680 f tobechecked \N +683 f tobechecked \N +686 f tobechecked \N +689 f tobechecked \N +692 f tobechecked \N +695 f tobechecked \N +698 f tobechecked \N +701 f tobechecked \N +704 f tobechecked \N +707 f tobechecked \N +710 f tobechecked \N +713 f tobechecked \N +716 f tobechecked \N +719 f tobechecked \N +722 f tobechecked \N +725 f tobechecked \N +728 f tobechecked \N +731 f tobechecked \N +734 f tobechecked \N +737 f tobechecked \N +740 f tobechecked \N +743 f tobechecked \N +746 f tobechecked \N +749 f tobechecked \N +752 f tobechecked \N +755 f tobechecked \N +758 f tobechecked \N +761 f tobechecked \N +764 f tobechecked \N +767 f tobechecked \N +770 f tobechecked \N +773 f tobechecked \N +776 f tobechecked \N +779 f tobechecked \N +782 f tobechecked \N +785 f tobechecked \N +788 f tobechecked \N +791 f tobechecked \N +794 f tobechecked \N +797 f tobechecked \N +800 f tobechecked \N +803 f tobechecked \N +806 f tobechecked \N +809 f tobechecked \N +812 f tobechecked \N +815 f tobechecked \N +818 f tobechecked \N +821 f tobechecked \N +824 f tobechecked \N +827 f tobechecked \N +830 f tobechecked \N +833 f tobechecked \N +836 f tobechecked \N +839 f tobechecked \N +842 f tobechecked \N +845 f tobechecked \N +848 f tobechecked \N +851 f tobechecked \N +854 f tobechecked \N +857 f tobechecked \N +860 f tobechecked \N +863 f tobechecked \N +866 f tobechecked \N +869 f tobechecked \N +872 f tobechecked \N +875 f tobechecked \N +878 f tobechecked \N +881 f tobechecked \N +884 f tobechecked \N +887 f tobechecked \N +890 f tobechecked \N +893 f tobechecked \N +896 f tobechecked \N +899 f tobechecked \N +902 f tobechecked \N +905 f tobechecked \N +908 f tobechecked \N +911 f tobechecked \N +914 f tobechecked \N +917 f tobechecked \N +920 f tobechecked \N +923 f tobechecked \N +926 f tobechecked \N +929 f tobechecked \N +932 f tobechecked \N +935 f tobechecked \N +938 f tobechecked \N +941 f tobechecked \N +944 f tobechecked \N +947 f tobechecked \N +950 f tobechecked \N +962 t tobechecked \N +974 t tobechecked \N +1127 t tobechecked \N +1163 t tobechecked \N +1241 f tobechecked \N +1244 t tobechecked \N +1253 f tobechecked \N +1256 f tobechecked \N +1259 f tobechecked \N +1262 f tobechecked \N +1265 f tobechecked \N +1268 f tobechecked \N +1271 f tobechecked \N +1323 t tobechecked \N +1340 f tobechecked \N +1349 t tobechecked \N +1351 t tobechecked \N +1381 f tobechecked \N +1465 f tobechecked \N +1468 f tobechecked \N +1471 f tobechecked \N +1474 f tobechecked \N +1477 f tobechecked \N +1480 f tobechecked \N +1483 f tobechecked \N +1570 t tobechecked \N +1576 t tobechecked \N +1657 f tobechecked \N +1660 f tobechecked \N +1663 f tobechecked \N +1672 t tobechecked \N +1674 t tobechecked \N +1676 t tobechecked \N +1723 f tobechecked \N +1726 f tobechecked \N +1853 t tobechecked \N +1856 t tobechecked \N +1859 t tobechecked \N +1862 t tobechecked \N +1865 t tobechecked \N +1875 t tobechecked \N +1884 t tobechecked \N +1962 f tobechecked \N +2013 f tobechecked \N +2025 t tobechecked \N +2073 t tobechecked \N +2142 t tobechecked \N +2201 f tobechecked \N +2231 t tobechecked \N +2243 t tobechecked \N +2288 t tobechecked \N +2312 t tobechecked \N +2315 t tobechecked \N +2354 t tobechecked \N +2357 t tobechecked \N +2402 t tobechecked \N +2453 t tobechecked \N +2456 t tobechecked \N +2459 t tobechecked \N +2462 t tobechecked \N +2465 t tobechecked \N +2468 t tobechecked \N +2584 t tobechecked \N +2637 f tobechecked \N +2700 t tobechecked \N +2720 t tobechecked \N +2723 t tobechecked \N +2726 t tobechecked \N +2729 t tobechecked \N +2732 t tobechecked \N +2735 t tobechecked \N +2738 t tobechecked \N +2756 t tobechecked \N +2759 t tobechecked \N +2801 t tobechecked \N +2807 t tobechecked \N +2843 f tobechecked \N +2888 t tobechecked \N +2894 f tobechecked \N +2939 t tobechecked \N +2945 t tobechecked \N +2954 f tobechecked \N +2993 f tobechecked \N +2996 f tobechecked \N +2999 f tobechecked \N +3038 t tobechecked \N +3041 t tobechecked \N +3044 t tobechecked \N +3047 t tobechecked \N +3050 t tobechecked \N +3053 t tobechecked \N +3063 f tobechecked \N +3066 f tobechecked \N +3069 f tobechecked \N +3074 t tobechecked \N +3134 f tobechecked \N +3137 f tobechecked \N +3140 f tobechecked \N +3143 f tobechecked \N +3152 f tobechecked \N +3158 f tobechecked \N +3161 f tobechecked \N +3164 f tobechecked \N +3167 f tobechecked \N +3170 f tobechecked \N +3173 f tobechecked \N +3176 f tobechecked \N +3179 f tobechecked \N +3182 f tobechecked \N +3185 f tobechecked \N +3188 f tobechecked \N +3194 t tobechecked \N +3197 t tobechecked \N +3224 t tobechecked \N +3227 t tobechecked \N +3230 t tobechecked \N +3233 t tobechecked \N +3236 t tobechecked \N +3263 f tobechecked \N +3269 f tobechecked \N +3272 f tobechecked \N +3293 f tobechecked \N +3296 f tobechecked \N +3302 t tobechecked \N +3304 t tobechecked \N +3306 t tobechecked \N +3308 t tobechecked \N +3311 t tobechecked \N +3368 t tobechecked \N +3380 t tobechecked \N +3404 t tobechecked \N +3464 t tobechecked \N +3572 t tobechecked \N +3590 t tobechecked \N +3635 t tobechecked \N +3650 t tobechecked \N +3659 t tobechecked \N +3671 t tobechecked \N +3908 t tobechecked \N +3917 t tobechecked \N +3935 f tobechecked \N +3938 f tobechecked \N +3944 t tobechecked \N +3947 t tobechecked \N +3956 t tobechecked \N +3965 t tobechecked \N +3974 t tobechecked \N +3989 t tobechecked \N +4013 t tobechecked \N +4031 f tobechecked \N +4052 t tobechecked \N +4067 t tobechecked \N +4091 t tobechecked \N +4121 t tobechecked \N +4124 t tobechecked \N +4126 t tobechecked \N +4129 t tobechecked \N +4132 t tobechecked \N +4135 t tobechecked \N +4138 t tobechecked \N +4141 t tobechecked \N +4144 t tobechecked \N +4147 t tobechecked \N +4150 t tobechecked \N +4153 t tobechecked \N +4156 t tobechecked \N +4159 t tobechecked \N +4162 t tobechecked \N +4165 t tobechecked \N +4168 t tobechecked \N +4171 t tobechecked \N +4174 t tobechecked \N +4177 t tobechecked \N +4180 t tobechecked \N +4183 t tobechecked \N +4186 t tobechecked \N +4189 t tobechecked \N +4192 t tobechecked \N +4195 t tobechecked \N +4198 t tobechecked \N +4201 t tobechecked \N +4204 t tobechecked \N +4207 t tobechecked \N +4210 t tobechecked \N +4213 t tobechecked \N +4216 t tobechecked \N +4219 t tobechecked \N +4222 t tobechecked \N +4225 t tobechecked \N +4228 t tobechecked \N +4231 t tobechecked \N +4234 t tobechecked \N +4237 t tobechecked \N +4240 t tobechecked \N +4243 t tobechecked \N +4246 t tobechecked \N +4249 t tobechecked \N +4252 t tobechecked \N +4255 t tobechecked \N +4258 t tobechecked \N +4261 t tobechecked \N +4264 t tobechecked \N +4267 t tobechecked \N +4270 t tobechecked \N +4273 t tobechecked \N +4276 t tobechecked \N +4279 t tobechecked \N +4282 t tobechecked \N +4285 t tobechecked \N +4288 t tobechecked \N +4291 t tobechecked \N +4294 t tobechecked \N +4297 t tobechecked \N +4300 t tobechecked \N +4303 t tobechecked \N +4306 t tobechecked \N +4312 t tobechecked \N +4315 t tobechecked \N +4318 t tobechecked \N +4321 t tobechecked \N +4324 t tobechecked \N +4327 t tobechecked \N +4330 t tobechecked \N +4333 t tobechecked \N +4336 t tobechecked \N +4339 t tobechecked \N +4342 t tobechecked \N +4345 t tobechecked \N +4348 t tobechecked \N +4351 t tobechecked \N +4354 t tobechecked \N +4357 t tobechecked \N +4360 t tobechecked \N +4363 t tobechecked \N +4366 t tobechecked \N +4369 t tobechecked \N +4372 t tobechecked \N +4378 t tobechecked \N +4384 t tobechecked \N +4390 t tobechecked \N +4396 t tobechecked \N +4399 t tobechecked \N +4402 t tobechecked \N +4405 t tobechecked \N +4420 t tobechecked \N +4429 t tobechecked \N +4450 t tobechecked \N +4458 t tobechecked \N +4461 t tobechecked \N +4464 t tobechecked \N +4467 t tobechecked \N +4470 t tobechecked \N +4473 t tobechecked \N +4476 t tobechecked \N +4479 t tobechecked \N +4482 t tobechecked \N +4485 t tobechecked \N +4488 t tobechecked \N +4491 t tobechecked \N +4530 t tobechecked \N +4533 t tobechecked \N +4535 f tobechecked \N +4538 f tobechecked \N +4541 t tobechecked \N +4544 t tobechecked \N +4547 t tobechecked \N +4550 t tobechecked \N +4553 t tobechecked \N +4556 t tobechecked \N +4559 t tobechecked \N +4562 t tobechecked \N +4565 t tobechecked \N +4568 t tobechecked \N +4571 t tobechecked \N +4574 t tobechecked \N +4577 t tobechecked \N +4580 t tobechecked \N +4583 t tobechecked \N +4586 t tobechecked \N +4589 t tobechecked \N +4592 t tobechecked \N +4604 f tobechecked \N +4616 f tobechecked 2024-12-31 00:00:00 +4619 f tobechecked 2023-04-30 00:00:00 +4622 t tobechecked \N +4625 f tobechecked \N +4628 f tobechecked \N +4634 t tobechecked \N +4664 t tobechecked \N +4676 t tobechecked \N +4795 t tobechecked \N +4781 t tobechecked \N +4778 t tobechecked \N +4771 t approved \N +4784 t tobechecked \N +4769 t approved \N +4773 t approved \N +4761 t tobechecked \N +4789 t approved \N +4787 t approved \N +4792 t tobechecked \N +4746 t tobechecked \N +4798 t tobechecked \N +4764 t tobechecked \N +4800 t tobechecked \N +4826 t tobechecked \N +4802 t tobechecked \N +4823 t tobechecked \N +4829 t tobechecked \N +4835 t tobechecked \N +4838 t tobechecked \N +4841 t tobechecked \N +4847 t tobechecked \N +4844 t tobechecked \N +4853 t tobechecked \N +4850 t tobechecked \N +4856 t tobechecked \N +4869 t tobechecked \N +4859 t tobechecked \N +4866 t tobechecked \N +4812 t tobechecked \N +4872 t tobechecked \N +4878 t tobechecked \N +4804 t tobechecked \N +4815 t tobechecked \N +4915 t tobechecked \N +4818 t tobechecked \N +4881 t tobechecked \N +4899 t tobechecked \N +4912 t tobechecked \N +4921 t tobechecked \N +4918 t tobechecked \N +4924 t tobechecked \N +4939 t tobechecked \N +4930 t tobechecked \N +4933 t tobechecked \N +4936 t tobechecked \N +4945 t tobechecked \N +4942 t tobechecked \N +4954 t tobechecked \N +4948 t tobechecked \N +4951 t tobechecked \N +4963 t tobechecked \N +4957 t tobechecked \N +4960 t tobechecked \N +4968 t tobechecked \N +4971 t tobechecked \N +4736 t tobechecked \N +4749 t tobechecked \N +4976 t tobechecked \N +4979 t tobechecked \N +4988 t tobechecked \N +4991 t tobechecked \N +4994 t tobechecked \N +4997 t tobechecked \N +5000 t tobechecked \N +5003 t tobechecked \N +5006 t tobechecked \N +5009 t tobechecked \N +5012 t tobechecked \N +5015 t tobechecked \N +5018 t tobechecked \N +5021 t tobechecked \N +5024 t tobechecked \N +5027 t tobechecked \N +5030 t tobechecked \N +5033 t tobechecked \N +5036 t tobechecked \N +5039 t tobechecked \N +5042 t tobechecked \N +5045 t tobechecked \N +5048 t tobechecked \N +5051 t tobechecked \N +5053 t tobechecked \N +5056 t tobechecked \N +5059 t tobechecked \N +5062 t tobechecked \N +5065 t tobechecked \N +5068 t tobechecked \N +5071 t tobechecked \N +5074 t tobechecked \N +5077 t tobechecked \N +5080 t tobechecked \N +5083 t tobechecked \N +5086 t tobechecked \N +5089 t tobechecked \N +5092 t tobechecked \N +5095 t tobechecked \N +5098 t tobechecked \N +5101 t tobechecked \N +5104 t tobechecked \N +5107 t tobechecked \N +5110 t tobechecked \N +5113 t tobechecked \N +5116 t tobechecked \N +5119 t tobechecked \N +5122 t tobechecked \N +5125 t tobechecked \N +5128 t tobechecked \N +5131 t tobechecked \N +5134 t tobechecked \N +5137 t tobechecked \N +5140 t tobechecked \N +5143 t tobechecked \N +5146 t tobechecked \N +5149 t tobechecked \N +5152 t tobechecked \N +5155 t tobechecked \N +5158 f tobechecked \N +5161 f tobechecked \N +5170 t tobechecked \N +5173 t tobechecked \N +5218 t tobechecked \N +5230 t tobechecked \N +5233 t tobechecked \N +5236 t tobechecked \N +5239 t tobechecked \N +5242 t tobechecked \N +5245 t tobechecked \N +5248 t tobechecked \N +5251 t tobechecked \N +5254 t tobechecked \N +5257 t tobechecked \N +5260 t tobechecked \N +5263 t tobechecked \N +5266 t tobechecked \N +5269 t tobechecked \N +5272 t tobechecked \N +5275 t tobechecked \N +5278 t tobechecked \N +5281 t tobechecked \N +5284 t tobechecked \N +5287 t tobechecked \N +5290 t tobechecked \N +5293 t tobechecked \N +5296 t tobechecked \N +5299 t tobechecked \N +5302 t tobechecked \N +5305 t tobechecked \N +5308 t tobechecked \N +5311 t tobechecked \N +5314 t tobechecked \N +5317 t tobechecked \N +5320 t tobechecked \N +5323 t tobechecked \N +5326 t tobechecked \N +5329 t tobechecked \N +5332 t tobechecked \N +5335 t tobechecked \N +5337 t tobechecked \N +5339 t tobechecked \N +5349 t tobechecked \N +5351 t tobechecked \N +5380 t tobechecked \N +5443 f tobechecked \N +5464 t tobechecked \N +5470 t tobechecked \N +5491 t tobechecked \N +5561 f tobechecked \N +5564 t tobechecked \N +5566 t tobechecked \N +5638 t tobechecked \N +5644 t tobechecked \N +5646 t tobechecked \N +5648 t tobechecked \N +5650 t tobechecked \N +5652 t tobechecked \N +5678 t tobechecked \N +5699 t tobechecked \N +5705 t tobechecked \N +5708 t tobechecked \N +5711 t tobechecked \N +5714 t tobechecked \N +5717 t tobechecked \N +5726 t tobechecked \N +5729 t tobechecked \N +5777 t tobechecked \N +5780 t tobechecked \N +5783 t tobechecked \N +5786 t tobechecked \N +5789 t tobechecked \N +5792 t tobechecked \N +5795 t tobechecked \N +5803 f tobechecked \N +5865 f tobechecked \N +5868 t tobechecked \N +5874 f tobechecked \N +5876 t tobechecked \N +5882 t tobechecked \N +5885 t tobechecked \N +5906 t tobechecked \N +5909 t tobechecked \N +5942 t tobechecked \N +5945 t tobechecked \N +5954 t tobechecked \N +5957 t tobechecked \N +5960 t tobechecked \N +5963 f tobechecked \N +5966 t tobechecked \N +5969 t tobechecked \N +5972 t tobechecked \N +5975 t tobechecked \N +5978 t tobechecked \N +5981 t tobechecked \N +5984 t tobechecked \N +5990 t tobechecked \N +6006 f tobechecked \N +6058 t tobechecked \N +6076 f tobechecked \N +6097 f tobechecked \N +6108 t tobechecked \N +6111 t tobechecked \N +6150 t tobechecked \N +6153 t tobechecked \N +6156 f tobechecked \N +6162 t tobechecked \N +6165 t tobechecked \N +6168 t tobechecked \N +6171 t tobechecked \N +6174 t tobechecked \N +6177 f tobechecked \N +6180 t tobechecked \N +6183 t tobechecked \N +6186 t tobechecked \N +6189 t tobechecked \N +6192 t tobechecked \N +6195 t tobechecked \N +6198 t tobechecked \N +6201 t tobechecked \N +6204 t tobechecked \N +6207 t tobechecked \N +6210 t tobechecked \N +6213 t tobechecked \N +6216 t tobechecked \N +6219 t tobechecked \N +6222 t tobechecked \N +6225 t tobechecked \N +6228 t tobechecked \N +6231 t tobechecked \N +6234 t tobechecked \N +6237 t tobechecked \N +6240 t tobechecked \N +6243 t tobechecked \N +6246 t tobechecked \N +6249 t tobechecked \N +6252 t tobechecked \N +6255 f tobechecked \N +6258 t tobechecked \N +6261 t tobechecked \N +6264 t tobechecked \N +6267 t tobechecked \N +6270 t tobechecked \N +6273 f tobechecked \N +6276 t tobechecked \N +6279 t tobechecked \N +6282 t tobechecked \N +6285 t tobechecked \N +6300 t tobechecked \N +6303 t tobechecked \N +6306 t tobechecked \N +6309 t tobechecked \N +6321 t tobechecked \N +6324 t tobechecked \N +6327 t tobechecked \N +6330 t tobechecked \N +6333 t tobechecked \N +6336 t tobechecked \N +6339 t tobechecked \N +6342 t tobechecked \N +6345 t tobechecked \N +6348 t tobechecked \N +6351 t tobechecked \N +6363 t tobechecked \N +6372 t tobechecked \N +6375 t tobechecked \N +6378 t tobechecked \N +6381 t tobechecked \N +6384 t tobechecked \N +6387 t tobechecked \N +6390 t tobechecked \N +6393 t tobechecked \N +6396 t tobechecked \N +6399 t tobechecked \N +6402 t tobechecked \N +6414 t tobechecked \N +6417 t tobechecked \N +6420 t tobechecked \N +6423 t tobechecked \N +6426 t tobechecked \N +6429 t tobechecked \N +6432 t tobechecked \N +6435 t tobechecked \N +6438 t tobechecked \N +6441 t tobechecked \N +6450 t tobechecked \N +6453 t tobechecked \N +6456 t tobechecked \N +6462 t tobechecked \N +6465 f tobechecked \N +6468 f tobechecked \N +6471 t tobechecked \N +6474 t tobechecked \N +6477 f tobechecked \N +6480 f tobechecked \N +6483 f tobechecked \N +6486 t tobechecked \N +6489 t tobechecked \N +6492 f tobechecked \N +6495 f tobechecked \N +6498 t tobechecked \N +6501 f tobechecked \N +6504 t tobechecked \N +6507 t tobechecked \N +6510 f tobechecked \N +6513 f tobechecked \N +6516 f tobechecked \N +6519 t tobechecked \N +6522 t tobechecked \N +6525 t tobechecked \N +6531 t tobechecked \N +6534 t tobechecked \N +6537 t tobechecked \N +6540 t tobechecked \N +6543 t tobechecked \N +6546 t tobechecked \N +6549 t tobechecked \N +6552 f tobechecked \N +6555 f tobechecked \N +6558 t tobechecked \N +6561 t tobechecked \N +6564 f tobechecked \N +6567 t tobechecked \N +6570 t tobechecked \N +6573 f tobechecked \N +6576 t tobechecked \N +6579 t tobechecked \N +6582 t tobechecked \N +6585 t tobechecked \N +6588 t tobechecked \N +6591 t tobechecked \N +6594 t tobechecked \N +6597 t tobechecked \N +6600 t tobechecked \N +6603 t tobechecked \N +6606 t tobechecked \N +6609 t tobechecked \N +6612 t tobechecked \N +6615 t tobechecked \N +6618 t tobechecked \N +6621 t tobechecked \N +6624 t tobechecked \N +6627 t tobechecked \N +6654 t tobechecked \N +6657 t tobechecked \N +6660 t tobechecked \N +6681 t tobechecked \N +6684 t tobechecked \N +6687 t tobechecked \N +6702 t tobechecked \N +6705 t tobechecked \N +6708 t tobechecked \N +6711 t tobechecked \N +6714 t tobechecked \N +6717 t tobechecked \N +6720 t tobechecked \N +6723 t tobechecked \N +6726 t tobechecked \N +6729 t tobechecked \N +6732 t tobechecked \N +6735 t tobechecked \N +6738 t tobechecked \N +6741 t tobechecked \N +6744 t tobechecked \N +6747 t tobechecked \N +6750 t tobechecked \N +6753 t tobechecked \N +6756 t tobechecked \N +6759 t tobechecked \N +6762 t tobechecked \N +6765 t tobechecked \N +6768 t tobechecked \N +6771 t tobechecked \N +6774 t tobechecked \N +6777 t tobechecked \N +6780 t tobechecked \N +6783 t tobechecked \N +6786 t tobechecked \N +6789 t tobechecked \N +6792 t tobechecked \N +6795 t tobechecked \N +6798 t tobechecked \N +6801 t tobechecked \N +6804 t tobechecked \N +6807 t tobechecked \N +6810 t tobechecked \N +6813 t tobechecked \N +6816 t tobechecked \N +6819 t tobechecked \N +6822 t tobechecked \N +6825 t tobechecked \N +6828 t tobechecked \N +6831 t tobechecked \N +6834 t tobechecked \N +6837 t tobechecked \N +6840 t tobechecked \N +6843 t tobechecked \N +6846 t tobechecked \N +6849 t tobechecked \N +6852 t tobechecked \N +6855 t tobechecked \N +6858 t tobechecked \N +6861 t tobechecked \N +6864 t tobechecked \N +6867 t tobechecked \N +6870 t tobechecked \N +6873 t tobechecked \N +6876 t tobechecked \N +6885 t tobechecked \N +6888 f tobechecked \N +6891 f tobechecked \N +6894 f tobechecked \N +6897 f tobechecked \N +6900 t tobechecked \N +6903 f tobechecked \N +6906 f tobechecked \N +6909 f tobechecked \N +6912 f tobechecked \N +6915 t tobechecked \N +6918 f tobechecked \N +6924 t tobechecked \N +6927 t tobechecked \N +6930 t tobechecked \N +6933 t tobechecked \N +6936 t tobechecked \N +6939 t tobechecked \N +6942 t tobechecked \N +6945 t tobechecked \N +6954 t tobechecked \N +6957 t tobechecked \N +6960 t tobechecked \N +6963 t tobechecked \N +6966 t tobechecked \N +6969 t tobechecked \N +6972 t tobechecked \N +6975 t tobechecked \N +6978 t tobechecked \N +6981 t tobechecked \N +6984 t tobechecked \N +6987 t tobechecked \N +6990 t tobechecked \N +6993 t tobechecked \N +6996 t tobechecked \N +6999 t tobechecked \N +7008 t tobechecked \N +7011 t tobechecked \N +7014 t tobechecked \N +7017 t tobechecked \N +7020 t tobechecked \N +7023 t tobechecked \N +7026 t tobechecked \N +7029 t tobechecked \N +7056 t tobechecked \N +7062 t tobechecked \N +7065 t tobechecked \N +7068 t tobechecked \N +7071 t tobechecked \N +7083 t tobechecked \N +7086 t tobechecked \N +7089 t tobechecked \N +7092 t tobechecked \N +7095 t tobechecked \N +7098 t tobechecked \N +7101 t tobechecked \N +7104 t tobechecked \N +7107 t tobechecked \N +7110 t tobechecked \N +7113 t tobechecked \N +7116 f tobechecked \N +7119 f tobechecked \N +7122 f tobechecked \N +7125 f tobechecked \N +7128 f tobechecked \N +7131 f tobechecked \N +7134 f tobechecked \N +7137 f tobechecked \N +7140 f tobechecked \N +7143 f tobechecked \N +7146 f tobechecked \N +7149 f tobechecked \N +7152 f tobechecked \N +7155 f tobechecked \N +7158 f tobechecked \N +7161 f tobechecked \N +7164 f tobechecked \N +7167 f tobechecked \N +7170 f tobechecked \N +7173 f tobechecked \N +7176 f tobechecked \N +7179 f tobechecked \N +7182 f tobechecked \N +7185 f tobechecked \N +7188 f tobechecked \N +7191 f tobechecked \N +7194 f tobechecked \N +7197 f tobechecked \N +7200 f tobechecked \N +7203 f tobechecked \N +7206 f tobechecked \N +7209 f tobechecked \N +7212 f tobechecked \N +7215 f tobechecked \N +7218 f tobechecked \N +7221 f tobechecked \N +7224 f tobechecked \N +7227 f tobechecked \N +7230 f tobechecked \N +7233 f tobechecked \N +7236 f tobechecked \N +7239 f tobechecked \N +7242 f tobechecked \N +7245 f tobechecked \N +7248 f tobechecked \N +7251 f tobechecked \N +7254 f tobechecked \N +7257 f tobechecked \N +7260 f tobechecked \N +7263 f tobechecked \N +7266 f tobechecked \N +7269 f tobechecked \N +7272 f tobechecked \N +7275 f tobechecked \N +7278 f tobechecked \N +7281 f tobechecked \N +7284 f tobechecked \N +7287 f tobechecked \N +7290 f tobechecked \N +7293 f tobechecked \N +7296 f tobechecked \N +7299 f tobechecked \N +7302 f tobechecked \N +7305 f tobechecked \N +7308 f tobechecked \N +7311 f tobechecked \N +7314 f tobechecked \N +7317 f tobechecked \N +7320 f tobechecked \N +7323 f tobechecked \N +7326 f tobechecked \N +7329 f tobechecked \N +7332 f tobechecked \N +7335 f tobechecked \N +7338 f tobechecked \N +7341 f tobechecked \N +7344 f tobechecked \N +7347 f tobechecked \N +7350 f tobechecked \N +7353 f tobechecked \N +7356 f tobechecked \N +7359 f tobechecked \N +7362 f tobechecked \N +7365 f tobechecked \N +7368 f tobechecked \N +7371 f tobechecked \N +7374 f tobechecked \N +7377 f tobechecked \N +7380 f tobechecked \N +7383 f tobechecked \N +7386 f tobechecked \N +7389 f tobechecked \N +7392 f tobechecked \N +7395 f tobechecked \N +7398 f tobechecked \N +7401 f tobechecked \N +7404 f tobechecked \N +7407 f tobechecked \N +7410 f tobechecked \N +7413 f tobechecked \N +7416 f tobechecked \N +7419 f tobechecked \N +7422 f tobechecked \N +7425 f tobechecked \N +7428 f tobechecked \N +7431 f tobechecked \N +7434 f tobechecked \N +7437 f tobechecked \N +7440 f tobechecked \N +7443 f tobechecked \N +7446 f tobechecked \N +7449 f tobechecked \N +7452 f tobechecked \N +7455 f tobechecked \N +7458 f tobechecked \N +7461 f tobechecked \N +7464 f tobechecked \N +7467 f tobechecked \N +7470 f tobechecked \N +7473 f tobechecked \N +7476 f tobechecked \N +7479 f tobechecked \N +7482 f tobechecked \N +7485 f tobechecked \N +7488 f tobechecked \N +7491 f tobechecked \N +7494 f tobechecked \N +7497 f tobechecked \N +7500 f tobechecked \N +7503 f tobechecked \N +7506 f tobechecked \N +7509 f tobechecked \N +7512 f tobechecked \N +7515 f tobechecked \N +7518 f tobechecked \N +7521 f tobechecked \N +7524 f tobechecked \N +7527 f tobechecked \N +7530 f tobechecked \N +7533 f tobechecked \N +7536 f tobechecked \N +7539 f tobechecked \N +7542 f tobechecked \N +7545 f tobechecked \N +7548 f tobechecked \N +7551 f tobechecked \N +7554 f tobechecked \N +7557 f tobechecked \N +7560 f tobechecked \N +7563 f tobechecked \N +7566 f tobechecked \N +7569 f tobechecked \N +7572 f tobechecked \N +7575 f tobechecked \N +7578 f tobechecked \N +7581 f tobechecked \N +7584 f tobechecked \N +7596 t tobechecked \N +7620 t tobechecked \N +7647 t tobechecked \N +7650 t tobechecked \N +7653 t tobechecked \N +7659 t tobechecked \N +7662 t tobechecked \N +7688 t tobechecked \N +7691 t tobechecked \N +7694 t tobechecked \N +7697 t tobechecked \N +7699 t tobechecked \N +7702 t tobechecked \N +7705 t tobechecked \N +7708 t tobechecked \N +7711 t tobechecked \N +7714 t tobechecked \N +7716 t tobechecked \N +7719 t tobechecked \N +7722 t tobechecked \N +7725 t tobechecked \N +7728 t tobechecked \N +7731 t tobechecked \N +7734 t tobechecked \N +7737 t tobechecked \N +7740 t tobechecked \N +7743 t tobechecked \N +7746 t tobechecked \N +7749 t tobechecked \N +7752 t tobechecked \N +7754 t tobechecked \N +7756 t tobechecked \N +7758 t tobechecked \N +7760 t tobechecked \N +7762 t tobechecked \N +7764 t tobechecked \N +7766 t tobechecked \N +7768 t tobechecked \N +7770 t tobechecked \N +7772 t tobechecked \N +7775 t tobechecked \N +7778 t tobechecked \N +7781 t tobechecked \N +7784 t tobechecked \N +7786 t tobechecked \N +7788 t tobechecked \N +7790 t tobechecked \N +7793 t tobechecked \N +7796 t tobechecked \N +7799 t tobechecked \N +7802 t tobechecked \N +7805 t tobechecked \N +7808 t tobechecked \N +7811 t tobechecked \N +7814 t tobechecked \N +7817 t tobechecked \N +7820 t tobechecked \N +7823 t tobechecked \N +7826 t tobechecked \N +7829 t tobechecked \N +7832 t tobechecked \N +7835 t tobechecked \N +7837 t tobechecked \N +7839 t tobechecked \N +7842 t tobechecked \N +7845 t tobechecked \N +7848 t tobechecked \N +7851 t tobechecked \N +7860 t tobechecked \N +7863 t tobechecked \N +7866 t tobechecked \N +7869 t tobechecked \N +7872 t tobechecked \N +7875 t tobechecked \N +7878 t tobechecked \N +7935 t tobechecked \N +7938 t tobechecked \N +7941 t tobechecked \N +7944 t tobechecked \N +7947 t tobechecked \N +7950 t tobechecked \N +7962 f tobechecked \N +7965 f tobechecked \N +7968 f tobechecked \N +7971 f tobechecked \N +7974 f tobechecked \N +7977 f tobechecked \N +7980 f tobechecked \N +7983 t tobechecked \N +7986 t tobechecked \N +7989 t tobechecked \N +7992 t tobechecked \N +7995 t tobechecked \N +7998 t tobechecked \N +8001 t tobechecked \N +8004 t tobechecked \N +8007 t tobechecked \N +8010 t tobechecked \N +8013 t tobechecked \N +8016 t tobechecked \N +8019 t tobechecked \N +8021 t tobechecked \N +8024 t tobechecked \N +8027 t tobechecked \N +8030 t tobechecked \N +8033 t tobechecked \N +8036 t tobechecked \N +8039 t tobechecked \N +8042 t tobechecked \N +8045 t tobechecked \N +8048 t tobechecked \N +8051 t tobechecked \N +8054 t tobechecked \N +8057 t tobechecked \N +8060 t tobechecked \N +8063 t tobechecked \N +8065 t tobechecked \N +8068 t tobechecked \N +8071 t tobechecked \N +8074 t tobechecked \N +8077 t tobechecked \N +8080 t tobechecked \N +8083 t tobechecked \N +8086 t tobechecked \N +8089 t tobechecked \N +8092 t tobechecked \N +8095 t tobechecked \N +8098 t tobechecked \N +8101 t tobechecked \N +8104 t tobechecked \N +8107 t tobechecked \N +8110 t tobechecked \N +8113 t tobechecked \N +8116 t tobechecked \N +8119 t tobechecked \N +8122 t tobechecked \N +8125 t tobechecked \N +8128 t tobechecked \N +8131 t tobechecked \N +8134 t tobechecked \N +8137 t tobechecked \N +8140 t tobechecked \N +8143 t tobechecked \N +8146 t tobechecked \N +8149 t tobechecked \N +8152 t tobechecked \N +8155 t tobechecked \N +8158 t tobechecked \N +8161 t tobechecked \N +8164 t tobechecked \N +8167 t tobechecked \N +8170 t tobechecked \N +8173 t tobechecked \N +8176 t tobechecked \N +8179 t tobechecked \N +8182 t tobechecked \N +8185 t tobechecked \N +8188 t tobechecked \N +8191 t tobechecked \N +8194 t tobechecked \N +8197 t tobechecked \N +8200 t tobechecked \N +8203 t tobechecked \N +8206 t tobechecked \N +8209 t tobechecked \N +8212 t tobechecked \N +8215 t tobechecked \N +8218 t tobechecked \N +8221 t tobechecked \N +8224 t tobechecked \N +8227 t tobechecked \N +8230 t tobechecked \N +8233 t tobechecked \N +8236 t tobechecked \N +8239 t tobechecked \N +8242 t tobechecked \N +8245 t tobechecked \N +8248 t tobechecked \N +8251 t tobechecked \N +8254 t tobechecked \N +8257 t tobechecked \N +8260 t tobechecked \N +8263 t tobechecked \N +8266 t tobechecked \N +8269 t tobechecked \N +8272 t tobechecked \N +8275 t tobechecked \N +8278 t tobechecked \N +8281 t tobechecked \N +8284 t tobechecked \N +8287 t tobechecked \N +8290 t tobechecked \N +8293 t tobechecked \N +8296 t tobechecked \N +8299 t tobechecked \N +8302 t tobechecked \N +8305 t tobechecked \N +8308 t tobechecked \N +8311 t tobechecked \N +8748 t tobechecked \N +8750 t tobechecked \N +8752 t tobechecked \N +8754 t tobechecked \N +8756 t tobechecked \N +8758 t tobechecked \N +8760 t tobechecked \N +8762 t tobechecked \N +8764 t tobechecked \N +8766 t tobechecked \N +8768 t tobechecked \N +8770 t tobechecked \N +8772 t tobechecked \N +8774 t tobechecked \N +8776 t tobechecked \N +8806 f tobechecked \N +8808 f tobechecked \N +8820 f tobechecked \N +8824 t tobechecked \N +8826 t tobechecked \N +8828 t tobechecked \N +8830 t tobechecked \N +8332 t approved \N +8352 t approved \N +8372 t tobechecked \N +8400 t tobechecked \N +8348 t approved \N +8414 t tobechecked \N +8584 t tobechecked \N +8404 t tobechecked \N +8498 t approved \N +8380 t tobechecked \N +8506 t approved \N +8502 t approved \N +8500 t approved \N +8382 t tobechecked \N +8504 t approved \N +8526 t tobechecked \N +8496 t approved \N +8514 t approved \N +8510 t approved \N +8508 t approved \N +8512 t approved \N +8354 t approved \N +8356 t approved \N +8360 t approved \N +8362 t approved \N +8540 t approved \N +8358 t approved \N +8466 t tobechecked \N +8544 t approved \N +8542 t approved \N +8452 t tobechecked \N +8456 t tobechecked \N +8546 t tobechecked \N +8548 t tobechecked \N +8520 t approved \N +8516 t approved \N +8518 t approved \N +8522 t approved \N +8550 t tobechecked \N +8528 t approved \N +8552 t tobechecked \N +8554 t tobechecked \N +8468 t tobechecked \N +8556 t tobechecked \N +8530 t approved \N +8558 t tobechecked \N +8560 t tobechecked \N +8534 t approved \N +8434 t tobechecked \N +8538 t approved \N +8532 t approved \N +8562 t tobechecked \N +8566 t tobechecked \N +8564 t tobechecked \N +8568 t tobechecked \N +8572 t tobechecked \N +8570 t tobechecked \N +8574 t tobechecked \N +8578 t tobechecked \N +8576 t tobechecked \N +8536 t approved \N +8370 t approved \N +8412 t tobechecked \N +8472 t tobechecked \N +8478 t tobechecked \N +8474 t tobechecked \N +8476 t tobechecked \N +8334 t approved \N +8480 t tobechecked \N +8482 t tobechecked \N +8484 t tobechecked \N +8580 t tobechecked \N +8582 t tobechecked \N +8590 t tobechecked \N +8586 t tobechecked \N +8588 t tobechecked \N +8486 t tobechecked \N +8594 t tobechecked \N +8596 t tobechecked \N +8524 t approved \N +8490 t tobechecked \N +8488 t tobechecked \N +8492 t tobechecked \N +8494 t tobechecked \N +8612 t tobechecked \N +8598 t tobechecked \N +8600 t tobechecked \N +8602 t tobechecked \N +8604 t tobechecked \N +8606 t tobechecked \N +8608 t tobechecked \N +8616 t tobechecked \N +8614 t tobechecked \N +8622 t tobechecked \N +8644 t tobechecked \N +8618 t tobechecked \N +8620 t tobechecked \N +8624 t tobechecked \N +8626 t tobechecked \N +8630 t tobechecked \N +8628 t tobechecked \N +8632 t tobechecked \N +8634 t tobechecked \N +8636 t tobechecked \N +8640 t tobechecked \N +8642 t tobechecked \N +8648 t tobechecked \N +8646 t tobechecked \N +8652 t tobechecked \N +8650 t tobechecked \N +8654 t tobechecked \N +8656 t tobechecked \N +8670 t tobechecked \N +8660 t tobechecked \N +8662 t tobechecked \N +8666 t tobechecked \N +8668 t tobechecked \N +8672 t tobechecked \N +8724 t tobechecked \N +8734 t tobechecked \N +8730 t tobechecked \N +8738 t tobechecked \N +8736 t tobechecked \N +8428 t tobechecked \N +8746 t tobechecked \N +8438 t tobechecked \N +8440 t tobechecked \N +8442 t tobechecked \N +8350 t approved \N +8832 t tobechecked \N +8836 t tobechecked \N +8838 t tobechecked \N +8840 t tobechecked \N +8846 t tobechecked \N +8848 t tobechecked \N +8850 t tobechecked \N +8852 t tobechecked \N +8854 t tobechecked \N +8862 t tobechecked \N +8864 t tobechecked \N +8866 t tobechecked \N +8870 t tobechecked \N +8872 t tobechecked \N +8874 t tobechecked \N +8876 t tobechecked \N +8884 t tobechecked \N +8886 t tobechecked \N +8888 t tobechecked \N +8890 t tobechecked \N +8914 t tobechecked \N +8920 t tobechecked \N +8922 t tobechecked \N +8994 f tobechecked \N +8996 f tobechecked \N +9000 f tobechecked \N +9002 f tobechecked \N +9004 f tobechecked \N +9006 f tobechecked \N +9008 t tobechecked \N +9010 t tobechecked \N +9012 t tobechecked \N +9014 t tobechecked \N +9064 t tobechecked \N +9200 f tobechecked \N +9246 t tobechecked \N +9256 t tobechecked \N +9258 t tobechecked \N +9260 t tobechecked \N +9262 t tobechecked \N +9264 t tobechecked \N +9266 t tobechecked \N +9268 t tobechecked \N +9270 t tobechecked \N +9272 t tobechecked \N +9274 t tobechecked \N +9276 t tobechecked \N +9278 t tobechecked \N +9378 f tobechecked \N +9388 t tobechecked \N +9398 t tobechecked \N +9404 t tobechecked \N +9410 t tobechecked \N +9412 t tobechecked \N +9460 t tobechecked \N +9462 t tobechecked \N +9506 f tobechecked \N +9562 f tobechecked \N +9572 f tobechecked \N +9574 t tobechecked \N +9584 t tobechecked \N +9586 t tobechecked \N +9588 f tobechecked \N +9590 f tobechecked \N +9592 f tobechecked \N +9594 f tobechecked \N +9596 f tobechecked \N +9598 f tobechecked \N +9602 f tobechecked \N +9604 f tobechecked \N +9606 t tobechecked \N +9608 t tobechecked \N +9610 t tobechecked \N +9612 t tobechecked \N +9614 t tobechecked \N +9616 t tobechecked \N +9618 t tobechecked \N +9620 t tobechecked \N +9622 t tobechecked \N +9626 f tobechecked \N +9628 t tobechecked \N +9630 t tobechecked \N +9632 t tobechecked \N +9634 t tobechecked \N +9636 t tobechecked \N +9638 t tobechecked \N +9656 t tobechecked \N +9658 t tobechecked \N +9664 t tobechecked \N +9666 t tobechecked \N +9726 t tobechecked \N +9728 t tobechecked \N +9730 t tobechecked \N +9732 t tobechecked \N +9734 t tobechecked \N +9736 t tobechecked \N +9740 t tobechecked \N +9742 t tobechecked \N +9744 t tobechecked \N +9746 t tobechecked \N +9748 t tobechecked \N +9750 t tobechecked \N +9752 t tobechecked \N +9754 t tobechecked \N +9758 t tobechecked \N +9760 t tobechecked \N +9762 t tobechecked \N +9768 t tobechecked \N +9814 t tobechecked \N +9882 t tobechecked \N +9884 t tobechecked \N +9888 t tobechecked \N +9892 t tobechecked \N +9910 t tobechecked \N +9912 t tobechecked \N +9914 t tobechecked \N +9916 t tobechecked \N +9918 t tobechecked \N +9920 t tobechecked \N +9922 t tobechecked \N +9924 t tobechecked \N +9932 t tobechecked \N +9936 t tobechecked \N +9942 t tobechecked \N +9946 t tobechecked \N +9964 t tobechecked \N +9966 t tobechecked \N +9968 t tobechecked \N +10028 t tobechecked \N +10102 f tobechecked \N +10104 f tobechecked \N +10106 f tobechecked \N +10108 f tobechecked \N +10110 f tobechecked \N +10112 f tobechecked \N +10114 f tobechecked \N +10116 f tobechecked \N +10118 f tobechecked \N +10120 f tobechecked \N +10122 f tobechecked \N +10124 t tobechecked \N +10132 t tobechecked \N +10134 t tobechecked \N +10136 t tobechecked \N +10138 f tobechecked \N +10140 f tobechecked \N +10174 t tobechecked \N +10176 t tobechecked \N +10178 t tobechecked \N +10180 t tobechecked \N +10182 t tobechecked \N +10184 t tobechecked \N +10186 t tobechecked \N +10188 t tobechecked \N +10190 t tobechecked \N +10192 t tobechecked \N +10194 t tobechecked \N +10196 t tobechecked \N +10198 f tobechecked \N +10200 t tobechecked \N +10202 t tobechecked \N +10204 t tobechecked \N +10206 t tobechecked \N +10208 t tobechecked \N +10210 t tobechecked \N +10212 t tobechecked \N +10214 t tobechecked \N +10216 t tobechecked \N +10218 t tobechecked \N +10220 t tobechecked \N +10222 t tobechecked \N +10224 t tobechecked \N +10226 t tobechecked \N +10228 t tobechecked \N +10230 t tobechecked \N +10236 t tobechecked \N +10238 t tobechecked \N +10240 f tobechecked \N +10250 t tobechecked \N +10252 t tobechecked \N +10254 t tobechecked \N +10256 t tobechecked \N +10258 t tobechecked \N +10262 t tobechecked \N +10264 t tobechecked \N +10266 t tobechecked \N +10270 t tobechecked \N +10298 t tobechecked \N +10302 f tobechecked \N +10304 f tobechecked \N +10306 f tobechecked \N +10308 f tobechecked \N +10310 f tobechecked \N +10312 f tobechecked \N +10314 f tobechecked \N +10324 t tobechecked \N +10338 t tobechecked \N +10348 t tobechecked \N +10350 t tobechecked \N +10352 t tobechecked \N +10354 t tobechecked \N +10356 t tobechecked \N +10360 t tobechecked \N +10362 t tobechecked \N +10364 t tobechecked \N +10374 f tobechecked \N +10378 t tobechecked \N +10382 t tobechecked \N +10384 t tobechecked \N +10388 t tobechecked \N +10392 t tobechecked \N +10398 t tobechecked \N +10404 t tobechecked \N +10408 t tobechecked \N +10410 t tobechecked \N +10416 t tobechecked \N +10420 t tobechecked \N +10424 f tobechecked \N +10426 f tobechecked \N +10438 f tobechecked \N +10444 f tobechecked \N +10464 t tobechecked \N +10470 f tobechecked \N +10472 f tobechecked \N +10474 t tobechecked \N +10478 t tobechecked \N +10496 f tobechecked \N +10498 f tobechecked \N +10530 t tobechecked \N +10532 t tobechecked \N +10534 t tobechecked \N +10536 t tobechecked \N +10538 t tobechecked \N +10540 t tobechecked \N +10542 t tobechecked \N +10544 t tobechecked \N +10546 t tobechecked \N +10548 t tobechecked \N +10550 t tobechecked \N +10552 t tobechecked \N +10554 t tobechecked \N +10556 t tobechecked \N +10558 t tobechecked \N +10560 t tobechecked \N +10564 f tobechecked \N +10570 t tobechecked \N +10586 t tobechecked \N +10588 t tobechecked \N +10592 f tobechecked \N +10602 t tobechecked \N +10614 t tobechecked \N +10616 t tobechecked \N +10618 t tobechecked \N +10620 t tobechecked \N +10622 f tobechecked \N +10624 t tobechecked \N +10626 t tobechecked \N +10628 t tobechecked \N +10630 t tobechecked \N +10632 t tobechecked \N +10634 t tobechecked \N +10636 t tobechecked \N +10640 t tobechecked \N +10644 t tobechecked \N +10648 t tobechecked \N +10652 t tobechecked \N +10676 t tobechecked \N +10684 t tobechecked \N +10690 t tobechecked \N +10694 t tobechecked \N +10696 t tobechecked \N +10698 t tobechecked \N +10720 t tobechecked \N +10728 t tobechecked \N +10730 t tobechecked \N +10732 t tobechecked \N +10766 f tobechecked \N +10772 f tobechecked \N +10782 f tobechecked \N +10784 f tobechecked \N +10788 t tobechecked \N +10814 t tobechecked \N +10818 t tobechecked \N +10826 t tobechecked \N +10868 t tobechecked \N +10870 t tobechecked \N +10906 t tobechecked \N +10922 t tobechecked \N +10924 t tobechecked \N +10928 t tobechecked \N +10932 t tobechecked \N +10950 t tobechecked \N +10952 t tobechecked \N +10972 f tobechecked \N +10990 t tobechecked \N +10994 t tobechecked \N +11002 t tobechecked \N +11004 t tobechecked \N +11006 t tobechecked \N +11038 t tobechecked \N +11040 t tobechecked \N +11042 t tobechecked \N +11044 t tobechecked \N +11046 t tobechecked \N +11048 t tobechecked \N +11050 t tobechecked \N +11052 t tobechecked \N +11054 t tobechecked \N +11056 t tobechecked \N +11058 t tobechecked \N +11060 t tobechecked \N +11062 t tobechecked \N +11064 t tobechecked \N +11066 t tobechecked \N +11068 t tobechecked \N +11070 t tobechecked \N +11072 t tobechecked \N +11074 t tobechecked \N +11076 t tobechecked \N +11078 t tobechecked \N +11080 t tobechecked \N +11082 t tobechecked \N +11084 t tobechecked \N +11086 t tobechecked \N +11088 t tobechecked \N +11090 t tobechecked \N +11092 t tobechecked \N +11094 t tobechecked \N +11096 t tobechecked \N +11098 t tobechecked \N +11100 t tobechecked \N +11102 t tobechecked \N +11104 t tobechecked \N +11106 t tobechecked \N +11108 t tobechecked \N +11110 t tobechecked \N +11112 t tobechecked \N +11114 t tobechecked \N +11116 t tobechecked \N +11118 t tobechecked \N +11120 t tobechecked \N +11122 t tobechecked \N +11124 t tobechecked \N +11126 t tobechecked \N +11128 t tobechecked \N +11130 t tobechecked \N +11132 t tobechecked \N +11134 t tobechecked \N +11136 t tobechecked \N +11138 t tobechecked \N +11140 t tobechecked \N +11142 t tobechecked \N +11144 t tobechecked \N +11146 t tobechecked \N +11148 t tobechecked \N +11150 t tobechecked \N +11152 t tobechecked \N +11154 t tobechecked \N +11156 t tobechecked \N +11158 t tobechecked \N +11160 t tobechecked \N +11166 t tobechecked \N +11172 t tobechecked \N +11174 t tobechecked \N +11176 t tobechecked \N +11178 t tobechecked \N +11180 t tobechecked \N +11182 t tobechecked \N +11184 t tobechecked \N +11186 t tobechecked \N +11188 t tobechecked \N +11190 t tobechecked \N +11249 t tobechecked \N +11258 t tobechecked \N +11261 t tobechecked \N +11297 t tobechecked \N +11312 f tobechecked \N +11315 f tobechecked \N +11318 f tobechecked \N +11321 f tobechecked \N +11324 f tobechecked \N +11393 f tobechecked \N +11396 f tobechecked \N +11399 f tobechecked \N +11402 f tobechecked \N +11405 t tobechecked \N +11408 t tobechecked \N +11426 f tobechecked \N +11444 f tobechecked \N +11447 t tobechecked \N +11450 f tobechecked \N +11453 t tobechecked \N +11456 t tobechecked \N +11459 t tobechecked \N +11465 t tobechecked \N +11468 f tobechecked \N +11471 t tobechecked \N +11477 t tobechecked \N +11483 t tobechecked \N +11486 t tobechecked \N +11489 t tobechecked \N +11498 f tobechecked \N +11501 f tobechecked \N +11510 t tobechecked \N +11513 t tobechecked \N +11519 t tobechecked \N +11522 t tobechecked \N +11525 t tobechecked \N +11528 t tobechecked \N +11531 t tobechecked \N +11534 t tobechecked \N +11537 t tobechecked \N +11540 t tobechecked \N +11543 t tobechecked \N +11546 t tobechecked \N +11549 t tobechecked \N +11552 t tobechecked \N +11573 f tobechecked \N +11576 t tobechecked \N +11579 t tobechecked \N +11582 t tobechecked \N +11585 t tobechecked \N +42331 t approved \N +42323 t approved \N +42320 t approved \N +42335 t approved \N +42332 t approved \N +42411 t approved \N +42405 t approved \N +42415 t approved \N +11201 t tobechecked \N +11213 t tobechecked \N +42333 t approved \N +42365 t approved \N +42348 t approved \N +42346 t approved \N +42356 t approved \N +42358 t approved \N +42357 t approved \N +42361 t approved \N +42370 t approved \N +42369 t approved \N +42385 t approved \N +42334 t approved \N +42373 t approved \N +42375 t approved \N +42379 t approved \N +42389 t approved \N +42388 t approved \N +42401 t approved \N +42398 t approved \N +42412 t approved \N +11207 t tobechecked \N +11231 t tobechecked \N +11228 t tobechecked \N +11237 t tobechecked \N +11234 t tobechecked \N +42416 t approved \N +11240 t tobechecked \N +11243 t tobechecked \N +42315 t approved \N +11246 t tobechecked \N +11210 t tobechecked \N +11219 t tobechecked \N +11216 t tobechecked \N +11222 t tobechecked \N +42374 t approved \N +42502 f tobechecked \N +42519 t approved \N +42806 t approved \N +42419 t approved \N +42800 t approved \N +42586 t approved \N +42802 t approved \N +42780 t approved \N +42805 t approved \N +42807 t approved \N +42588 t approved \N +42587 t approved \N +42589 t approved \N +42592 t approved \N +42823 t approved \N +42842 t approved \N +42812 t approved \N +42810 t approved \N +42591 t approved \N +42811 t approved \N +42813 t approved \N +42818 t approved \N +42815 t approved \N +42590 t approved \N +42820 t approved \N +42593 t approved \N +42595 t approved \N +42598 t approved \N +42600 t approved \N +42596 t approved \N +42597 t approved \N +42602 t approved \N +42599 t approved \N +42841 t approved \N +42808 t approved \N +42594 t approved \N +42443 t approved \N +42421 t approved \N +42663 t approved \N +42601 t approved \N +42457 t approved \N +42489 t approved \N +42603 t approved \N +42607 t approved \N +42604 t approved \N +42606 t approved \N +42673 t approved \N +42605 t approved \N +42627 t approved \N +42670 t approved \N +42646 t approved \N +42628 t approved \N +42422 t approved \N +42660 t approved \N +42664 t approved \N +42662 t approved \N +42665 t approved \N +42667 t approved \N +42661 t approved \N +42668 t approved \N +42666 t approved \N +42669 t approved \N +42626 t approved \N +42672 t approved \N +42671 t approved \N +42674 t approved \N +42675 t approved \N +42676 t approved \N +42714 t approved \N +42677 t approved \N +42702 t approved \N +42420 t approved \N +42712 t approved \N +42713 t approved \N +42718 f approved \N +42727 t approved \N +42719 f approved \N +42720 f approved \N +42515 t approved \N +42703 t approved \N +42471 t approved \N +42469 t approved \N +42493 t approved \N +42491 t approved \N +42488 t approved \N +42459 t approved \N +42490 t approved \N +42492 t approved \N +42497 t approved \N +42495 t approved \N +42494 t approved \N +42496 t approved \N +42498 t approved \N +42499 t approved \N +42500 t approved \N +42501 t approved \N +42503 t approved \N +42505 t approved \N +42504 t approved \N +42510 t approved \N +42517 t approved \N +42514 t approved \N +42728 t approved \N +42742 t approved \N +42740 t approved \N +42746 t approved \N +42743 t approved \N +42809 t approved \N +42748 f approved \N +42750 t approved \N +42751 t approved \N +42752 t approved \N +42738 t approved \N +42516 t approved \N +42521 t approved \N +42529 t approved \N +42431 t approved \N +42520 t approved \N +42524 t approved \N +42522 t approved \N +42523 t approved \N +42518 t approved \N +42526 t approved \N +42527 t approved \N +42528 t approved \N +42525 t approved \N +42530 t approved \N +42533 t approved \N +42535 t approved \N +42531 t approved \N +42532 t approved \N +42534 t approved \N +42739 t approved \N +42785 t tobechecked \N +42879 t approved \N +42878 t approved \N +42921 t approved \N +42896 t approved \N +42936 t tobechecked \N +42882 t approved \N +42880 t approved \N +42904 t approved \N +42908 t approved \N +42907 t approved \N +42905 t approved \N +42930 t approved \N +42903 t approved \N +42909 t approved \N +42911 t approved \N +42910 t approved \N +43284 t tobechecked \N +42877 t approved \N +43251 t tobechecked \N +43253 t tobechecked \N +43267 t tobechecked \N +43262 t tobechecked \N +43263 t tobechecked \N +43269 t tobechecked \N +43313 t tobechecked \N +43287 t tobechecked \N +43156 t tobechecked \N +43346 t tobechecked \N +43317 t tobechecked \N +42993 t tobechecked \N +42916 t approved \N +42929 t approved \N +42931 t tobechecked \N +42934 t tobechecked \N +42935 t tobechecked \N +42933 t tobechecked \N +42937 t tobechecked \N +42938 t tobechecked \N +42912 t approved \N +42951 t tobechecked \N +42955 t tobechecked \N +42940 t tobechecked \N +42947 t tobechecked \N +42950 t tobechecked \N +43090 t tobechecked \N +42900 t approved \N +43016 t tobechecked \N +42990 t tobechecked \N +43008 t tobechecked \N +43019 t tobechecked \N +43018 t tobechecked \N +43023 t tobechecked \N +43164 t tobechecked \N +43033 t tobechecked \N +43020 t tobechecked \N +43021 t tobechecked \N +43022 t tobechecked \N +43057 t tobechecked \N +43037 t tobechecked \N +43035 t tobechecked \N +43046 t tobechecked \N +43053 t tobechecked \N +43048 t tobechecked \N +43054 t tobechecked \N +43060 t tobechecked \N +43061 t tobechecked \N +43297 t tobechecked \N +43065 t tobechecked \N +43146 t tobechecked \N +43143 t tobechecked \N +43083 t tobechecked \N +43216 t tobechecked \N +43147 t tobechecked \N +43145 t tobechecked \N +43162 t tobechecked \N +42957 t tobechecked \N +43148 t tobechecked \N +43160 t tobechecked \N +43165 t tobechecked \N +43163 t tobechecked \N +43169 t tobechecked \N +43177 t tobechecked \N +43196 t tobechecked \N +43185 t tobechecked \N +43221 t tobechecked \N +43214 t tobechecked \N +43212 t tobechecked \N +43220 t tobechecked \N +43215 t tobechecked \N +42881 t approved \N +43233 t tobechecked \N +43222 t tobechecked \N +43232 t tobechecked \N +43059 t tobechecked \N +43321 t tobechecked \N +43234 t tobechecked \N +43318 t tobechecked \N +43325 t tobechecked \N +43326 t tobechecked \N +43329 t tobechecked \N +43328 t tobechecked \N +43327 t tobechecked \N +43330 t tobechecked \N +43331 t tobechecked \N +43333 t tobechecked \N +43334 t tobechecked \N +43335 t tobechecked \N +43340 t tobechecked \N +43341 t tobechecked \N +43344 t tobechecked \N +43342 t tobechecked \N +43252 t tobechecked \N +43343 t tobechecked \N +43347 t tobechecked \N +43345 t tobechecked \N +43348 t tobechecked \N +43349 t tobechecked \N +43350 t tobechecked \N +43356 t tobechecked \N +43357 t tobechecked \N +43358 t tobechecked \N +43359 t tobechecked \N +43360 t tobechecked \N +43362 t tobechecked \N +43379 t tobechecked \N +43365 t tobechecked \N +42867 t approved \N +43380 t tobechecked \N +43381 t tobechecked \N +43382 t tobechecked \N +43383 t tobechecked \N +43398 t tobechecked \N +43427 f tobechecked \N +43456 t tobechecked \N +43457 t tobechecked \N +43458 t tobechecked \N +43459 t tobechecked \N +43460 t tobechecked \N +43461 t tobechecked \N +43463 t tobechecked \N +43465 t tobechecked \N +43466 t tobechecked \N +43475 t tobechecked \N +43468 t tobechecked \N +43467 t tobechecked \N +43472 t tobechecked \N +43471 t tobechecked \N +43470 t tobechecked \N +43473 t tobechecked \N +43474 t tobechecked \N +43464 t tobechecked \N +43476 t tobechecked \N +43477 t tobechecked \N +43478 t tobechecked \N +43479 t tobechecked \N +43480 t tobechecked \N +43483 t tobechecked \N +43482 t tobechecked \N +43484 t tobechecked \N +43485 t tobechecked \N +43486 t tobechecked \N +43487 t tobechecked \N +43488 t tobechecked \N +43489 t tobechecked \N +43490 t tobechecked \N +43491 t tobechecked \N +43492 t tobechecked \N +43493 t tobechecked \N +43494 t tobechecked \N +43496 t tobechecked \N +43497 t tobechecked \N +43498 t tobechecked \N +43500 t tobechecked \N +43454 t tobechecked \N +43501 t tobechecked \N +43499 t tobechecked \N +43502 t tobechecked \N +43503 t tobechecked \N +43504 t tobechecked \N +43505 t tobechecked \N +43506 t tobechecked \N +43507 t tobechecked \N +43509 t tobechecked \N +43510 t tobechecked \N +43511 t tobechecked \N +43512 t tobechecked \N +43513 t tobechecked \N +43514 t tobechecked \N +43516 t tobechecked \N +43515 t tobechecked \N +43517 t tobechecked \N +43518 t tobechecked \N +43519 t tobechecked \N +43520 t tobechecked \N +43524 t tobechecked \N +43522 t tobechecked \N +43523 t tobechecked \N +43525 t tobechecked \N +43526 t tobechecked \N +43528 t tobechecked \N +43527 t tobechecked \N +43529 t tobechecked \N +43530 t tobechecked \N +43531 t tobechecked \N +43532 t tobechecked \N +43534 t tobechecked \N +43535 t tobechecked \N +43536 t tobechecked \N +43537 t tobechecked \N +43538 t tobechecked \N +43539 t tobechecked \N +43541 t tobechecked \N +43540 t tobechecked \N +43542 t tobechecked \N +43543 t tobechecked \N +43547 t tobechecked \N +43544 t tobechecked \N +43545 t tobechecked \N +43552 t tobechecked \N +43548 t tobechecked \N +43549 t tobechecked \N +43550 t tobechecked \N +43551 t tobechecked \N +43553 t tobechecked \N +43554 t tobechecked \N +43555 t tobechecked \N +43556 t tobechecked \N +43563 t tobechecked \N +43564 t tobechecked \N +43566 t tobechecked \N +43568 t tobechecked \N +43569 t tobechecked \N +43578 t tobechecked \N +43577 t tobechecked \N +43579 t tobechecked \N +43580 t tobechecked \N +43581 t tobechecked \N +43582 t tobechecked \N +43583 t tobechecked \N +43584 t tobechecked \N +43585 t tobechecked \N +43586 t tobechecked \N +43588 t tobechecked \N +43589 t tobechecked \N +43590 t tobechecked \N +43591 t tobechecked \N +43592 t tobechecked \N +43595 t tobechecked \N +43594 t tobechecked \N +43596 t tobechecked \N +43598 t tobechecked \N +43597 t tobechecked \N +43601 t tobechecked \N +43602 t tobechecked \N +43611 t tobechecked \N +43622 t tobechecked \N +43619 t tobechecked \N +43623 t tobechecked \N +43624 t tobechecked \N +43625 t tobechecked \N +43626 t tobechecked \N +43627 t tobechecked \N +43629 t tobechecked \N +43630 t tobechecked \N +43631 t tobechecked \N +43632 t tobechecked \N +43636 t tobechecked \N +43677 t tobechecked \N +43680 t tobechecked \N +43855 t tobechecked \N +43706 t tobechecked \N +43953 t approved \N +43954 t approved \N +43950 t approved \N +43952 t approved \N +43955 t approved \N +43957 t approved \N +43956 t approved \N +43951 t approved \N +43958 f approved \N +43960 t approved \N +43959 t approved \N +43949 t approved \N +43961 t approved \N +43965 t approved \N +43963 t approved \N +43964 t approved \N +43966 t approved \N +43967 t approved \N +43969 t approved \N +43968 t approved \N +43729 t tobechecked \N +43701 t tobechecked \N +43710 t tobechecked \N +43817 t tobechecked \N +43783 t tobechecked \N +43728 t tobechecked \N +43720 t tobechecked \N +43730 t tobechecked \N +43735 t tobechecked \N +43759 t tobechecked \N +43727 t tobechecked \N +43775 t tobechecked \N +43784 t tobechecked \N +43814 t tobechecked \N +43825 t tobechecked \N +43830 t tobechecked \N +43826 t tobechecked \N +43827 t tobechecked \N +43828 t tobechecked \N +43829 t tobechecked \N +43831 t tobechecked \N +43832 t tobechecked \N +43833 t tobechecked \N +43834 t tobechecked \N +43835 t tobechecked \N +43836 t tobechecked \N +43837 t tobechecked \N +43839 t tobechecked \N +43838 t tobechecked \N +43840 t tobechecked \N +43843 t tobechecked \N +43842 t tobechecked \N +43844 t tobechecked \N +43845 t tobechecked \N +43850 t tobechecked \N +43846 t tobechecked \N +43847 t tobechecked \N +43848 t tobechecked \N +43849 t tobechecked \N +43851 t tobechecked \N +43852 t tobechecked \N +43858 t tobechecked \N +43853 t tobechecked \N +43854 t tobechecked \N +43857 t tobechecked \N +43860 t tobechecked \N +43859 t tobechecked \N +43861 t tobechecked \N +43864 t tobechecked \N +43862 t tobechecked \N +43863 t tobechecked \N +43865 t tobechecked \N +43866 t tobechecked \N +43868 t tobechecked \N +43871 t tobechecked \N +43870 t tobechecked \N +43874 t tobechecked \N +43872 t tobechecked \N +43875 t tobechecked \N +43873 t tobechecked \N +43878 t tobechecked \N +43876 t tobechecked \N +43877 t tobechecked \N +43927 t tobechecked \N +43879 t tobechecked \N +43881 t tobechecked \N +43882 t tobechecked \N +43884 t tobechecked \N +43898 t tobechecked \N +43891 t tobechecked \N +43892 t tobechecked \N +43893 t tobechecked \N +43894 t tobechecked \N +43895 t tobechecked \N +43896 t tobechecked \N +43897 t tobechecked \N +43900 t tobechecked \N +43899 t tobechecked \N +43902 t tobechecked \N +43903 t tobechecked \N +43904 t tobechecked \N +43906 t tobechecked \N +43905 t tobechecked \N +43907 t tobechecked \N +43908 t tobechecked \N +43909 t tobechecked \N +43910 t tobechecked \N +43913 t tobechecked \N +43911 t tobechecked \N +43912 t tobechecked \N +43917 t tobechecked \N +43914 t tobechecked \N +43916 t tobechecked \N +43918 t tobechecked \N +43919 t tobechecked \N +43923 t tobechecked \N +43920 t tobechecked \N +43921 t tobechecked \N +43922 t tobechecked \N +43924 t tobechecked \N +43925 t tobechecked \N +43926 t tobechecked \N +43928 t tobechecked \N +43932 t tobechecked \N +43929 t tobechecked \N +43930 t tobechecked \N +43931 t tobechecked \N +43933 t tobechecked \N +43934 t tobechecked \N +43662 t tobechecked \N +43935 t tobechecked \N +43936 t tobechecked \N +43937 t tobechecked \N +44151 t tobechecked \N +44045 t tobechecked \N +44041 t tobechecked \N +44049 t tobechecked \N +44046 t tobechecked \N +44048 t tobechecked \N +44040 t tobechecked \N +44051 t tobechecked \N +44050 t tobechecked \N +43971 t approved \N +43970 t approved \N +43972 t approved \N +43973 t approved \N +43974 t approved \N +44066 t approved \N +44067 t approved \N +44068 t approved \N +44092 t approved \N +44069 t approved \N +44070 t approved \N +44121 t tobechecked \N +44072 t approved \N +44073 t approved \N +44074 t approved \N +44093 t approved \N +44094 t approved \N +44095 t approved \N +44075 t approved \N +44104 t approved \N +44060 t approved \N +44106 t approved \N +44105 t approved \N +44057 t approved \N +44058 t approved \N +44059 t approved \N +44107 t tobechecked \N +44061 t approved \N +43982 t approved \N +44063 t approved \N +44064 t approved \N +44065 t approved \N +44056 t approved \N +44109 t tobechecked \N +44108 t tobechecked \N +44110 t tobechecked \N +44062 t approved \N +43981 t approved \N +44071 t approved \N +43989 t approved \N +43990 t approved \N +43992 t approved \N +43991 t approved \N +43993 t approved \N +43985 t approved \N +43994 t approved \N +43995 t approved \N +43996 t approved \N +44134 t tobechecked \N +44133 t tobechecked \N +44140 t tobechecked \N +44138 t tobechecked \N +44139 t tobechecked \N +44142 t tobechecked \N +44141 t tobechecked \N +44147 t tobechecked \N +44143 t tobechecked \N +44144 t tobechecked \N +44145 t tobechecked \N +44146 t tobechecked \N +44155 t tobechecked \N +44148 t tobechecked \N +44149 t tobechecked \N +44150 t tobechecked \N +44152 t tobechecked \N +44153 t tobechecked \N +44160 t tobechecked \N +44161 t tobechecked \N +44165 t tobechecked \N +44163 t tobechecked \N +44164 t tobechecked \N +44166 t tobechecked \N +44167 t tobechecked \N +44168 t tobechecked \N +44169 t tobechecked \N +44170 t tobechecked \N +44171 t tobechecked \N +44176 t tobechecked \N +44172 t tobechecked \N +44175 t tobechecked \N +44174 t tobechecked \N +44179 t tobechecked \N +44177 t tobechecked \N +44178 t tobechecked \N +44180 t tobechecked \N +44183 t tobechecked \N +44181 t tobechecked \N +44182 t tobechecked \N +44184 t tobechecked \N +44186 t tobechecked \N +44185 t tobechecked \N +44187 t tobechecked \N +44193 t tobechecked \N +44188 t tobechecked \N +44189 t tobechecked \N +44190 t tobechecked \N +44191 t tobechecked \N +44192 t tobechecked \N +44052 t approved \N +44053 t approved \N +44055 t approved \N +44209 t tobechecked \N +44194 t tobechecked \N +44197 t tobechecked \N +44195 t tobechecked \N +44199 t tobechecked \N +44198 t tobechecked \N +44200 t tobechecked \N +44201 t tobechecked \N +44204 t tobechecked \N +44202 t tobechecked \N +44203 t tobechecked \N +44054 t approved \N +44205 t tobechecked \N +44207 t tobechecked \N +44208 t tobechecked \N +44210 t tobechecked \N +44215 t tobechecked \N +44211 t tobechecked \N +44212 t tobechecked \N +44213 t tobechecked \N +44217 t tobechecked \N +44216 t tobechecked \N +44218 t tobechecked \N +44220 t tobechecked \N +44283 t tobechecked \N +44436 t tobechecked \N +44227 t tobechecked \N +44231 t tobechecked \N +44228 t tobechecked \N +44229 t tobechecked \N +44230 t tobechecked \N +44232 t tobechecked \N +44233 t tobechecked \N +44236 t tobechecked \N +44234 t tobechecked \N +44235 t tobechecked \N +44242 t tobechecked \N +44237 t tobechecked \N +44239 t tobechecked \N +44240 t tobechecked \N +44241 t tobechecked \N +44243 t tobechecked \N +44245 t tobechecked \N +44244 t tobechecked \N +44246 t tobechecked \N +44247 t tobechecked \N +44348 t tobechecked \N +44248 t tobechecked \N +44351 t tobechecked \N +44349 t tobechecked \N +44357 t tobechecked \N +44249 t tobechecked \N +44356 t tobechecked \N +44359 t tobechecked \N +44358 t tobechecked \N +44252 t tobechecked \N +44367 t tobechecked \N +44373 t tobechecked \N +44250 t tobechecked \N +44374 t tobechecked \N +44251 t tobechecked \N +44376 t tobechecked \N +44253 t tobechecked \N +44375 t tobechecked \N +44377 t tobechecked \N +44380 t tobechecked \N +44378 t tobechecked \N +44379 t tobechecked \N +44383 t tobechecked \N +44381 t tobechecked \N +44382 t tobechecked \N +44384 t tobechecked \N +44389 t tobechecked \N +44385 t tobechecked \N +44387 t tobechecked \N +44388 t tobechecked \N +44390 t tobechecked \N +44391 t tobechecked \N +44393 t tobechecked \N +44392 t tobechecked \N +44395 t tobechecked \N +44394 t tobechecked \N +44396 t tobechecked \N +44400 t tobechecked \N +44397 t tobechecked \N +44398 t tobechecked \N +44410 t tobechecked \N +44406 t tobechecked \N +44412 t tobechecked \N +44411 t tobechecked \N +44413 t tobechecked \N +44417 t tobechecked \N +44414 t tobechecked \N +44430 t tobechecked \N +44429 t tobechecked \N +44431 t tobechecked \N +44277 t tobechecked \N +44432 t tobechecked \N +44434 t tobechecked \N +44435 t tobechecked \N +44255 t tobechecked \N +44438 t tobechecked \N +44276 t tobechecked \N +44439 t tobechecked \N +44442 t tobechecked \N +44440 t tobechecked \N +44284 t tobechecked \N +44278 t tobechecked \N +44279 t tobechecked \N +44280 t tobechecked \N +44281 t tobechecked \N +44286 t tobechecked \N +44285 t tobechecked \N +44288 t tobechecked \N +44287 t tobechecked \N +44451 t tobechecked \N +44290 t tobechecked \N +44291 t tobechecked \N +44452 t tobechecked \N +44468 t tobechecked \N +44458 t tobechecked \N +44464 t tobechecked \N +44292 t tobechecked \N +44469 t tobechecked \N +44296 t tobechecked \N +44293 t tobechecked \N +44470 t tobechecked \N +44298 t tobechecked \N +44474 t tobechecked \N +44299 t tobechecked \N +44301 t tobechecked \N +44300 t tobechecked \N +44302 t tobechecked \N +44305 t tobechecked \N +44303 t tobechecked \N +44308 t tobechecked \N +44306 t tobechecked \N +44307 t tobechecked \N +44310 t tobechecked \N +44309 t tobechecked \N +44311 t tobechecked \N +44312 t tobechecked \N +44313 t tobechecked \N +44314 t tobechecked \N +44315 t tobechecked \N +44318 t tobechecked \N +44317 t tobechecked \N +44320 t tobechecked \N +44319 t tobechecked \N +44321 t tobechecked \N +44478 t tobechecked \N +44322 t tobechecked \N +44484 t tobechecked \N +44479 t tobechecked \N +44482 t tobechecked \N +44483 t tobechecked \N +44485 t tobechecked \N +44489 t tobechecked \N +44488 t tobechecked \N +44675 t tobechecked \N +44676 t tobechecked \N +44677 t tobechecked \N +44678 t tobechecked \N +44679 t tobechecked \N +44680 t tobechecked \N +44681 t tobechecked \N +44682 t tobechecked \N +44683 t tobechecked \N +44684 t tobechecked \N +44685 t tobechecked \N +44686 t tobechecked \N +44687 t tobechecked \N +44688 t tobechecked \N +44689 t tobechecked \N +44690 t tobechecked \N +44691 t tobechecked \N +44692 t tobechecked \N +44693 t tobechecked \N +44694 t tobechecked \N +44695 t tobechecked \N +44696 t tobechecked \N +44697 t tobechecked \N +44698 t tobechecked \N +44699 t tobechecked \N +44700 t tobechecked \N +44701 t tobechecked \N +44702 t tobechecked \N +44703 t tobechecked \N +44704 t tobechecked \N +44705 t tobechecked \N +44706 t tobechecked \N +44707 t tobechecked \N +44708 t tobechecked \N +44709 t tobechecked \N +44710 t tobechecked \N +44711 t tobechecked \N +44712 t tobechecked \N +44713 t tobechecked \N +44714 t tobechecked \N +44715 t tobechecked \N +44716 t tobechecked \N +44717 f tobechecked \N +44718 t tobechecked \N +44719 t tobechecked \N +44720 t tobechecked \N +44725 t tobechecked \N +44733 f tobechecked \N +44734 f tobechecked \N +44735 f tobechecked \N +44736 f tobechecked \N +44737 f tobechecked \N +44738 f tobechecked \N +44746 t tobechecked \N +44748 t tobechecked \N +44749 t tobechecked \N +44750 t tobechecked \N +44751 t tobechecked \N +44752 t tobechecked \N +44753 t tobechecked \N +44754 t tobechecked \N +44755 t tobechecked \N +44756 t tobechecked \N +44757 t tobechecked \N +44758 t tobechecked \N +44759 t tobechecked \N +44760 t tobechecked \N +44761 t tobechecked \N +44551 t tobechecked \N +44552 t tobechecked \N +44553 t tobechecked \N +44557 t tobechecked \N +44554 t tobechecked \N +44555 t tobechecked \N +44556 t tobechecked \N +44559 t tobechecked \N +44558 t tobechecked \N +44561 t tobechecked \N +44560 t tobechecked \N +44563 t tobechecked \N +44565 t tobechecked \N +44564 t tobechecked \N +44571 t tobechecked \N +44566 t tobechecked \N +44567 t tobechecked \N +44568 t tobechecked \N +44569 t tobechecked \N +44570 t tobechecked \N +44572 t tobechecked \N +44573 t tobechecked \N +44574 t tobechecked \N +44578 t tobechecked \N +44588 t tobechecked \N +44579 t tobechecked \N +44586 t tobechecked \N +44591 t tobechecked \N +44589 t tobechecked \N +44590 t tobechecked \N +44592 t tobechecked \N +44593 t tobechecked \N +44597 t tobechecked \N +44594 t tobechecked \N +44595 t tobechecked \N +44601 t tobechecked \N +44599 t tobechecked \N +44598 t tobechecked \N +44600 t tobechecked \N +44602 t tobechecked \N +44603 t tobechecked \N +44608 t tobechecked \N +44604 t tobechecked \N +44605 t tobechecked \N +44607 t tobechecked \N +44609 t tobechecked \N +44613 t tobechecked \N +44610 t tobechecked \N +44611 t tobechecked \N +44615 t tobechecked \N +44614 t tobechecked \N +44616 t tobechecked \N +44617 t tobechecked \N +44620 t tobechecked \N +44618 t tobechecked \N +44619 t tobechecked \N +44623 t tobechecked \N +44621 t tobechecked \N +44622 t tobechecked \N +44627 t tobechecked \N +44625 t tobechecked \N +44626 t tobechecked \N +44631 t tobechecked \N +44628 t tobechecked \N +44635 t tobechecked \N +44640 t tobechecked \N +44638 t tobechecked \N +44639 t tobechecked \N +44642 t tobechecked \N +44641 t tobechecked \N +44646 t tobechecked \N +44643 t tobechecked \N +44660 t tobechecked \N +44652 t tobechecked \N +44668 t tobechecked \N +44671 t tobechecked \N +44669 t tobechecked \N +44670 t tobechecked \N +44672 t tobechecked \N +44674 t tobechecked \N +44673 t tobechecked \N +44762 t tobechecked \N +44763 t tobechecked \N +44764 t tobechecked \N +44765 t tobechecked \N +44766 t tobechecked \N +44767 t tobechecked \N +44768 t tobechecked \N +44769 t tobechecked \N +44770 t tobechecked \N +44771 t tobechecked \N +44772 t tobechecked \N +44773 t tobechecked \N +44774 t tobechecked \N +44775 t tobechecked \N +44776 t tobechecked \N +44777 t tobechecked \N +44778 t tobechecked \N +44779 t tobechecked \N +44780 t tobechecked \N +44781 t tobechecked \N +44782 t tobechecked \N +44783 t tobechecked \N +44784 t tobechecked \N +44785 t tobechecked \N +44786 t tobechecked \N +44787 t tobechecked \N +44788 t tobechecked \N +44789 t tobechecked \N +44790 t tobechecked \N +44791 t tobechecked \N +44792 t tobechecked \N +44793 t tobechecked \N +44794 t tobechecked \N +44795 t tobechecked \N +44796 t tobechecked \N +44797 t tobechecked \N +44798 t tobechecked \N +44799 t tobechecked \N +44800 t tobechecked \N +44801 t tobechecked \N +44802 t tobechecked \N +44803 t tobechecked \N +44804 t tobechecked \N +44805 t tobechecked \N +44806 t tobechecked \N +44807 t tobechecked \N +44808 t tobechecked \N +44809 f tobechecked \N +44810 t tobechecked \N +44811 f tobechecked \N +44812 t tobechecked \N +44813 f tobechecked \N +44814 f tobechecked \N +44815 f tobechecked \N +44816 f tobechecked \N +44817 f tobechecked \N +44818 t tobechecked \N +44819 t tobechecked \N +44820 t tobechecked \N +44821 t tobechecked \N +44822 t tobechecked \N +44823 t tobechecked \N +44824 t tobechecked \N +44825 t tobechecked \N +44826 t tobechecked \N +44827 f tobechecked \N +44828 f tobechecked \N +44829 f tobechecked \N +44830 t tobechecked \N +44831 f tobechecked \N +44832 f tobechecked \N +44833 f tobechecked \N +44834 f tobechecked \N +44835 t tobechecked \N +44838 f tobechecked \N +44839 f tobechecked \N +44840 f tobechecked \N +44841 f tobechecked \N +44842 f tobechecked \N +44843 f tobechecked \N +44844 f tobechecked \N +44845 f tobechecked \N +44846 f tobechecked \N +44847 f tobechecked \N +44848 t tobechecked \N +44849 f tobechecked \N +44850 f tobechecked \N +44851 f tobechecked \N +44852 f tobechecked \N +44865 t tobechecked \N +44866 t tobechecked \N +44867 t tobechecked \N +44868 t tobechecked \N +44869 t tobechecked \N +44870 t tobechecked \N +44871 t tobechecked \N +44872 t tobechecked \N +44882 f tobechecked \N +44883 f tobechecked \N +44884 f tobechecked \N +44885 f tobechecked \N +44886 t tobechecked \N +44887 f tobechecked \N +44888 f tobechecked \N +44889 f tobechecked \N +44890 f tobechecked \N +44891 f tobechecked \N +44905 t tobechecked \N +44906 t tobechecked \N +44907 t tobechecked \N +44908 t tobechecked \N +44909 t tobechecked \N +44911 t tobechecked \N +44913 t tobechecked \N +44924 f tobechecked \N +44930 t tobechecked \N +44931 t tobechecked \N +44946 t tobechecked \N +44947 f tobechecked \N +44976 t tobechecked \N +44990 t tobechecked \N +44991 t tobechecked \N +44995 t tobechecked \N +44996 t tobechecked \N +44997 t tobechecked \N +45012 t tobechecked \N +45015 t tobechecked \N +45026 f tobechecked \N +45036 t tobechecked \N +45037 t tobechecked \N +45039 t tobechecked \N +45042 t tobechecked \N +45046 t tobechecked \N +45049 t tobechecked \N +45050 t tobechecked \N +45051 t tobechecked \N +45052 t tobechecked \N +45053 t tobechecked \N +45054 t tobechecked \N +45055 t tobechecked \N +45056 t tobechecked \N +45057 t tobechecked \N +45058 t tobechecked \N +45059 t tobechecked \N +45060 t tobechecked \N +45061 t tobechecked \N +45062 t tobechecked \N +45063 t tobechecked \N +45064 t tobechecked \N +45065 t tobechecked \N +45066 t tobechecked \N +45067 t tobechecked \N +45068 t tobechecked \N +45069 t tobechecked \N +45070 t tobechecked \N +45071 t tobechecked \N +45072 t tobechecked \N +45073 t tobechecked \N +45074 t tobechecked \N +45075 t tobechecked \N +45076 t tobechecked \N +45077 t tobechecked \N +45078 t tobechecked \N +45079 t tobechecked \N +45080 t tobechecked \N +45081 t tobechecked \N +45082 t tobechecked \N +45083 t tobechecked \N +45084 t tobechecked \N +45085 t tobechecked \N +45086 t tobechecked \N +45087 t tobechecked \N +45088 t tobechecked \N +45089 t tobechecked \N +45090 t tobechecked \N +45091 t tobechecked \N +45092 t tobechecked \N +45093 t tobechecked \N +45094 t tobechecked \N +45095 t tobechecked \N +45096 t tobechecked \N +45097 t tobechecked \N +45098 t tobechecked \N +45099 t tobechecked \N +45100 t tobechecked \N +45101 t tobechecked \N +45102 t tobechecked \N +45103 t tobechecked \N +45104 t tobechecked \N +45105 t tobechecked \N +45106 t tobechecked \N +45107 t tobechecked \N +45108 t tobechecked \N +45109 t tobechecked \N +45110 t tobechecked \N +45111 t tobechecked \N +45112 t tobechecked \N +45113 t tobechecked \N +45115 t tobechecked \N +45116 t tobechecked \N +45117 t tobechecked \N +45118 t tobechecked \N +45119 t tobechecked \N +45120 f tobechecked \N +45121 f tobechecked \N +45122 t tobechecked \N +45123 t tobechecked \N +45124 f tobechecked \N +45125 f tobechecked \N +45126 f tobechecked \N +45139 t tobechecked \N +45140 t tobechecked \N +45141 t tobechecked \N +45143 t tobechecked \N +45144 t tobechecked \N +45145 t tobechecked \N +45146 t tobechecked \N +45147 f tobechecked \N +45148 t tobechecked \N +45149 t tobechecked \N +45150 t tobechecked \N +45151 f tobechecked \N +45152 t tobechecked \N +45153 t tobechecked \N +45154 t tobechecked \N +45155 t tobechecked \N +45156 t tobechecked \N +45157 t tobechecked \N +45158 t tobechecked \N +45159 t tobechecked \N +45160 t tobechecked \N +45161 t tobechecked \N +45162 t tobechecked \N +45163 t tobechecked \N +45164 t tobechecked \N +45165 t tobechecked \N +45169 t tobechecked \N +45207 t tobechecked \N +45217 t tobechecked \N +45218 t tobechecked \N +45232 t tobechecked \N +45233 t tobechecked \N +45238 t tobechecked \N +45260 t tobechecked \N +45293 f tobechecked \N +45294 t tobechecked \N +45307 t tobechecked \N +45310 t tobechecked \N +45321 t tobechecked \N +45322 t tobechecked \N +45323 t tobechecked \N +45324 t tobechecked \N +45325 t tobechecked \N +45326 t tobechecked \N +45327 t tobechecked \N +45328 t tobechecked \N +45329 t tobechecked \N +45344 t tobechecked \N +45348 t tobechecked \N +45359 f tobechecked \N +45360 f tobechecked \N +45361 f tobechecked \N +45362 f tobechecked \N +45368 f tobechecked \N +45369 f tobechecked \N +45370 f tobechecked \N +45371 f tobechecked \N +45372 f tobechecked \N +45373 f tobechecked \N +45374 f tobechecked \N +45375 f tobechecked \N +45376 f tobechecked \N +45377 f tobechecked \N +45378 f tobechecked \N +45379 f tobechecked \N +45401 t tobechecked \N +45403 t tobechecked \N +45404 t tobechecked \N +45405 t tobechecked \N +45406 t tobechecked \N +45407 t tobechecked \N +45408 t tobechecked \N +45410 t tobechecked \N +45412 t tobechecked \N +45418 t tobechecked \N +45419 t tobechecked \N +45420 t tobechecked \N +45422 t tobechecked \N +45423 t tobechecked \N +45424 t tobechecked \N +45425 t tobechecked \N +45426 t tobechecked \N +45427 t tobechecked \N +45428 t tobechecked \N +45429 t tobechecked \N +45430 t tobechecked \N +45431 t tobechecked \N +45432 t tobechecked \N +45433 t tobechecked \N +45434 t tobechecked \N +45435 t tobechecked \N +45436 t tobechecked \N +45437 t tobechecked \N +45438 f tobechecked \N +45439 f tobechecked \N +45440 t tobechecked \N +45441 t tobechecked \N +45442 t tobechecked \N +45443 t tobechecked \N +45444 t tobechecked \N +45445 t tobechecked \N +45446 t tobechecked \N +45447 t tobechecked \N +45448 t tobechecked \N +45449 t tobechecked \N +45450 t tobechecked \N +45451 t tobechecked \N +45452 t tobechecked \N +45454 t tobechecked \N +45455 t tobechecked \N +45456 t tobechecked \N +45458 t tobechecked \N +45459 t tobechecked \N +45463 t tobechecked \N +45495 t tobechecked \N +45496 t tobechecked \N +45503 t tobechecked \N +45504 t tobechecked \N +45511 f tobechecked \N +45513 t tobechecked \N +45521 t tobechecked \N +45522 t tobechecked \N +45523 f tobechecked \N +45524 f tobechecked \N +45529 f tobechecked \N +45530 t tobechecked \N +45531 t tobechecked \N +45532 t tobechecked \N +45538 t tobechecked \N +45539 t tobechecked \N +45544 t tobechecked \N +45545 t tobechecked \N +45547 f tobechecked \N +45553 t tobechecked \N +45559 t tobechecked \N +45571 t tobechecked \N +45574 t tobechecked \N +45575 t tobechecked \N +45576 t tobechecked \N +45577 t tobechecked \N +45578 t tobechecked \N +45579 t tobechecked \N +45580 t tobechecked \N +45581 t tobechecked \N +45582 t tobechecked \N +45583 t tobechecked \N +45589 f tobechecked \N +45590 f tobechecked \N +45597 f tobechecked \N +45611 f tobechecked \N +45615 f tobechecked \N +45618 f tobechecked \N +45663 f tobechecked \N +45664 f tobechecked \N +45686 f tobechecked \N +45718 f tobechecked \N +45725 t tobechecked \N +45728 t tobechecked \N +45732 t tobechecked \N +45747 t tobechecked \N +45750 t tobechecked \N +45751 t tobechecked \N +45752 t tobechecked \N +45753 t tobechecked \N +45754 t tobechecked \N +45755 t tobechecked \N +45756 t tobechecked \N +45757 t tobechecked \N +45758 t tobechecked \N +45759 t tobechecked \N +45800 f tobechecked \N +45821 t tobechecked \N +45836 t tobechecked \N +45837 t tobechecked \N +45838 t tobechecked \N +45839 t tobechecked \N +45840 t tobechecked \N +45841 t tobechecked \N +45842 t tobechecked \N +45843 t tobechecked \N +45844 t tobechecked \N +45845 t tobechecked \N +45846 t tobechecked \N +45847 t tobechecked \N +45848 t tobechecked \N +45849 t tobechecked \N +45850 t tobechecked \N +45851 t tobechecked \N +45852 t tobechecked \N +45853 t tobechecked \N +45859 t tobechecked \N +45880 t tobechecked \N +45881 t tobechecked \N +45882 t tobechecked \N +45883 t tobechecked \N +45884 t tobechecked \N +45885 t tobechecked \N +45886 t tobechecked \N +45887 t tobechecked \N +45888 t tobechecked \N +45889 t tobechecked \N +45890 t tobechecked \N +45891 t tobechecked \N +45892 t tobechecked \N +45893 t tobechecked \N +45894 t tobechecked \N +45895 t tobechecked \N +45896 t tobechecked \N +45897 t tobechecked \N +45898 t tobechecked \N +45899 t tobechecked \N +45900 t tobechecked \N +45901 t tobechecked \N +45902 t tobechecked \N +45903 t tobechecked \N +45904 t tobechecked \N +45905 t tobechecked \N +45906 t tobechecked \N +45907 t tobechecked \N +45908 t tobechecked \N +45909 t tobechecked \N +45910 t tobechecked \N +45911 t tobechecked \N +45912 t tobechecked \N +45913 t tobechecked \N +45914 t tobechecked \N +45915 t tobechecked \N +45916 t tobechecked \N +45917 t tobechecked \N +45918 t tobechecked \N +45919 t tobechecked \N +45920 t tobechecked \N +45921 t tobechecked \N +45922 t tobechecked \N +45923 t tobechecked \N +45924 t tobechecked \N +45925 t tobechecked \N +45926 t tobechecked \N +45927 t tobechecked \N +45928 t tobechecked \N +45929 t tobechecked \N +45930 t tobechecked \N +45931 t tobechecked \N +45932 t tobechecked \N +45933 t tobechecked \N +45934 t tobechecked \N +45935 t tobechecked \N +45936 t tobechecked \N +45937 t tobechecked \N +45938 t tobechecked \N +45939 t tobechecked \N +45940 t tobechecked \N +45941 t tobechecked \N +45942 t tobechecked \N +45943 t tobechecked \N +45944 t tobechecked \N +45946 t tobechecked \N +45947 t tobechecked \N +45948 t tobechecked \N +45949 t tobechecked \N +45950 t tobechecked \N +45951 t tobechecked \N +45952 t tobechecked \N +45953 t tobechecked \N +45954 t tobechecked \N +45955 t tobechecked \N +45956 t tobechecked \N +45963 t tobechecked \N +45993 t tobechecked \N +46001 t tobechecked \N +46003 t tobechecked \N +46023 f tobechecked \N +46040 t tobechecked \N +46041 f tobechecked \N +46057 f tobechecked \N +46059 f tobechecked \N +46072 t tobechecked \N +46073 t tobechecked \N +46074 t tobechecked \N +46075 t tobechecked \N +46076 t tobechecked \N +46077 t tobechecked \N +46078 t tobechecked \N +46079 t tobechecked \N +46080 t tobechecked \N +46082 t tobechecked \N +46083 t tobechecked \N +46084 t tobechecked \N +46085 t tobechecked \N +46086 t tobechecked \N +46088 f tobechecked \N +46093 f tobechecked \N +46106 t tobechecked \N +46107 t tobechecked \N +46124 f tobechecked \N +46128 t tobechecked \N +46129 t tobechecked \N +46130 t tobechecked \N +46131 t tobechecked \N +46132 t tobechecked \N +46133 t tobechecked \N +46134 t tobechecked \N +46135 t tobechecked \N +46136 t tobechecked \N +46137 f tobechecked \N +46154 t tobechecked \N +46156 t tobechecked \N +46157 t tobechecked \N +46158 t tobechecked \N +46159 t tobechecked \N +46160 t tobechecked \N +46161 t tobechecked \N +46162 t tobechecked \N +46163 t tobechecked \N +46164 t tobechecked \N +46165 t tobechecked \N +46166 t tobechecked \N +46167 t tobechecked \N +46168 t tobechecked \N +46169 t tobechecked \N +46170 t tobechecked \N +46172 t tobechecked \N +46173 t tobechecked \N +46174 t tobechecked \N +46175 t tobechecked \N +46176 t tobechecked \N +46226 f tobechecked \N +46239 t tobechecked \N +46240 t tobechecked \N +46270 f tobechecked \N +46276 f tobechecked \N +46280 f tobechecked \N +46281 f tobechecked \N +46285 f tobechecked \N +46314 f tobechecked \N +46339 f tobechecked \N +46361 f tobechecked \N +46388 t tobechecked \N +46389 t tobechecked \N +46390 t tobechecked \N +46391 t tobechecked \N +46392 t tobechecked \N +46393 t tobechecked \N +46394 t tobechecked \N +46395 t tobechecked \N +46396 t tobechecked \N +46397 t tobechecked \N +46398 t tobechecked \N +46399 t tobechecked \N +46400 t tobechecked \N +46401 t tobechecked \N +46402 t tobechecked \N +46405 t tobechecked \N +46406 t tobechecked \N +46407 t tobechecked \N +46408 t tobechecked \N +46409 t tobechecked \N +46410 t tobechecked \N +46411 t tobechecked \N +46412 t tobechecked \N +46413 t tobechecked \N +46414 t tobechecked \N +46415 t tobechecked \N +46435 f tobechecked \N +46447 t tobechecked \N +46448 t tobechecked \N +46449 t tobechecked \N +46450 t tobechecked \N +46451 t tobechecked \N +46452 t tobechecked \N +46453 t tobechecked \N +46454 t tobechecked \N +46455 t tobechecked \N +46456 t tobechecked \N +46457 t tobechecked \N +46458 t tobechecked \N +46459 t tobechecked \N +46479 t tobechecked \N +46480 t tobechecked \N +46481 t tobechecked \N +46482 t tobechecked \N +46483 t tobechecked \N +46487 t tobechecked \N +46492 t tobechecked \N +46503 t tobechecked \N +46504 t tobechecked \N +46505 t tobechecked \N +46506 t tobechecked \N +46507 t tobechecked \N +46508 t tobechecked \N +46509 t tobechecked \N +46510 t tobechecked \N +46511 t tobechecked \N +46512 f tobechecked \N +46522 t tobechecked \N +46523 t tobechecked \N +46524 t tobechecked \N +46525 t tobechecked \N +46526 t tobechecked \N +46527 t tobechecked \N +46528 t tobechecked \N +46529 t tobechecked \N +46530 t tobechecked \N +46531 t tobechecked \N +46532 t tobechecked \N +46533 t tobechecked \N +46534 t tobechecked \N +46535 t tobechecked \N +46536 t tobechecked \N +46537 t tobechecked \N +46538 t tobechecked \N +46539 t tobechecked \N +46542 t tobechecked \N +46543 t tobechecked \N +46544 t tobechecked \N +46545 t tobechecked \N +46546 t tobechecked \N +46547 t tobechecked \N +46548 t tobechecked \N +46549 t tobechecked \N +46550 t tobechecked \N +46551 t tobechecked \N +46552 t tobechecked \N +46553 t tobechecked \N +46554 t tobechecked \N +46555 t tobechecked \N +46556 t tobechecked \N +46557 t tobechecked \N +46558 t tobechecked \N +46559 t tobechecked \N +46560 t tobechecked \N +46561 t tobechecked \N +46562 t tobechecked \N +46563 t tobechecked \N +46564 t tobechecked \N +46565 t tobechecked \N +46566 t tobechecked \N +46567 t tobechecked \N +46568 t tobechecked \N +46632 f tobechecked \N +46648 f tobechecked \N +46690 t tobechecked \N +46691 t tobechecked \N +46692 t tobechecked \N +46693 t tobechecked \N +46694 t tobechecked \N +46695 t tobechecked \N +46696 t tobechecked \N +46697 t tobechecked \N +46698 t tobechecked \N +46699 t tobechecked \N +46700 t tobechecked \N +46701 t tobechecked \N +46702 t tobechecked \N +46703 t tobechecked \N +46704 t tobechecked \N +46705 t tobechecked \N +46706 t tobechecked \N +46707 t tobechecked \N +46708 t tobechecked \N +46709 t tobechecked \N +46710 t tobechecked \N +46711 t tobechecked \N +46720 t tobechecked \N +46733 t tobechecked \N +46743 t tobechecked \N +46755 t tobechecked \N +46773 t tobechecked \N +46789 t tobechecked \N +46807 t tobechecked \N +46814 f tobechecked \N +46817 t tobechecked \N +46820 t tobechecked \N +46838 t tobechecked \N +46842 t tobechecked \N +46868 t tobechecked \N +46873 t tobechecked \N +46884 t tobechecked \N +46900 t tobechecked \N +46901 t tobechecked \N +46902 t tobechecked \N +46907 t tobechecked \N +46908 t tobechecked \N +46909 t tobechecked \N +46910 t tobechecked \N +46911 t tobechecked \N +46912 t tobechecked \N +46913 t tobechecked \N +46914 t tobechecked \N +46915 t tobechecked \N +46916 t tobechecked \N +46917 t tobechecked \N +46918 t tobechecked \N +46934 t tobechecked \N +46971 t tobechecked \N +47015 t tobechecked \N +47022 t tobechecked \N +47073 t tobechecked \N +47082 t tobechecked \N +47107 t tobechecked \N +47108 t tobechecked \N +47109 t tobechecked \N +47111 f tobechecked \N +47120 t tobechecked \N +47122 t tobechecked \N +47135 t tobechecked \N +47137 t tobechecked \N +47140 t tobechecked \N +47143 t tobechecked \N +47146 t tobechecked \N +47161 f tobechecked \N +47164 f tobechecked \N +47208 f tobechecked \N +47209 f tobechecked \N +47211 t tobechecked \N +47212 t tobechecked \N +47221 t tobechecked \N +47222 t tobechecked \N +47223 t tobechecked \N +47226 t tobechecked \N +47227 t tobechecked \N +47228 t tobechecked \N +47229 t tobechecked \N +47230 t tobechecked \N +47231 t tobechecked \N +47232 t tobechecked \N +47233 t tobechecked \N +47234 t tobechecked \N +47261 t tobechecked \N +47262 t tobechecked \N +47266 f tobechecked \N +47275 t tobechecked \N +47282 t tobechecked \N +47299 f tobechecked \N +47300 f tobechecked \N +47301 t tobechecked \N +47302 t tobechecked \N +47306 t tobechecked \N +47307 t tobechecked \N +47308 t tobechecked \N +47309 t tobechecked \N +47310 t tobechecked \N +47311 t tobechecked \N +47312 t tobechecked \N +47313 t tobechecked \N +47323 t tobechecked \N +47358 t tobechecked \N +47381 f tobechecked \N +47398 t tobechecked \N +47410 t tobechecked \N +47458 t tobechecked \N +47493 t tobechecked \N +47494 t tobechecked \N +47495 t tobechecked \N +47518 t tobechecked \N +47542 t tobechecked \N +47546 t tobechecked \N +47547 t tobechecked \N +47548 t tobechecked \N +47549 t tobechecked \N +47550 t tobechecked \N +47551 t tobechecked \N +47552 t tobechecked \N +47553 t tobechecked \N +47554 t tobechecked \N +47555 t tobechecked \N +47556 t tobechecked \N +47557 t tobechecked \N +47558 t tobechecked \N +47559 t tobechecked \N +47560 t tobechecked \N +47561 t tobechecked \N +47562 t tobechecked \N +47563 t tobechecked \N +47583 t tobechecked \N +47600 t tobechecked \N +47625 t tobechecked \N +47656 t tobechecked \N +47661 f tobechecked \N +47665 t tobechecked \N +47666 t tobechecked \N +47667 t tobechecked \N +47668 t tobechecked \N +47669 t tobechecked \N +47670 t tobechecked \N +47688 t tobechecked \N +47696 t tobechecked \N +47704 t tobechecked \N +47707 t tobechecked \N +47720 f tobechecked \N +47739 t tobechecked \N +47741 t tobechecked \N +47773 t tobechecked \N +47802 t tobechecked \N +47813 t tobechecked \N +47821 t tobechecked \N +47824 t tobechecked \N +47826 t tobechecked \N +47827 t tobechecked \N +47829 t tobechecked \N +47835 t tobechecked \N +47836 t tobechecked \N +47851 f tobechecked \N +47859 f tobechecked \N +47904 f tobechecked \N +47925 f tobechecked \N +47951 f tobechecked \N +47960 f tobechecked \N +47961 f tobechecked \N +47978 f tobechecked \N +48018 t tobechecked \N +48024 t tobechecked \N +48025 f tobechecked \N +48026 t tobechecked \N +48029 t tobechecked \N +48030 t tobechecked \N +48031 t tobechecked \N +48032 t tobechecked \N +48033 t tobechecked \N +48034 t tobechecked \N +48035 t tobechecked \N +48036 t tobechecked \N +48037 t tobechecked \N +48038 t tobechecked \N +48039 t tobechecked \N +48040 t tobechecked \N +48041 t tobechecked \N +48042 t tobechecked \N +48043 t tobechecked \N +48044 t tobechecked \N +48045 t tobechecked \N +48046 t tobechecked \N +48047 t tobechecked \N +48048 t tobechecked \N +48049 t tobechecked \N +48050 t tobechecked \N +48051 t tobechecked \N +48052 t tobechecked \N +48053 t tobechecked \N +48054 t tobechecked \N +48055 t tobechecked \N +48056 t tobechecked \N +48057 t tobechecked \N +48058 t tobechecked \N +48059 t tobechecked \N +48060 t tobechecked \N +48061 t tobechecked \N +48062 t tobechecked \N +48063 t tobechecked \N +48068 f tobechecked \N +48070 t tobechecked \N +48071 t tobechecked \N +48072 t tobechecked \N +48073 t tobechecked \N +48074 t tobechecked \N +48075 t tobechecked \N +48076 t tobechecked \N +48077 t tobechecked \N +48078 t tobechecked \N +48079 t tobechecked \N +48080 t tobechecked \N +48081 t tobechecked \N +48082 t tobechecked \N +48083 t tobechecked \N +48084 t tobechecked \N +48085 t tobechecked \N +48086 t tobechecked \N +48087 t tobechecked \N +48088 t tobechecked \N +48089 t tobechecked \N +48090 t tobechecked \N +48091 t tobechecked \N +48092 t tobechecked \N +48093 t tobechecked \N +48096 t tobechecked \N +48105 f tobechecked \N +48107 t tobechecked \N +48108 t tobechecked \N +48109 t tobechecked \N +48110 t tobechecked \N +48111 t tobechecked \N +48112 t tobechecked \N +48113 t tobechecked \N +48114 t tobechecked \N +48115 t tobechecked \N +48116 t tobechecked \N +48117 t tobechecked \N +48118 t tobechecked \N +48119 t tobechecked \N +48120 t tobechecked \N +48121 t tobechecked \N +48122 t tobechecked \N +48123 t tobechecked \N +48124 t tobechecked \N +48125 t tobechecked \N +48126 t tobechecked \N +48127 t tobechecked \N +48128 t tobechecked \N +48129 t tobechecked \N +48130 t tobechecked \N +48131 t tobechecked \N +48132 t tobechecked \N +48133 t tobechecked \N +48134 t tobechecked \N +48135 t tobechecked \N +48136 t tobechecked \N +48152 t tobechecked \N +48154 t tobechecked \N +48168 t tobechecked \N +48169 t tobechecked \N +48170 t tobechecked \N +48171 t tobechecked \N +48172 t tobechecked \N +48173 t tobechecked \N +48175 t tobechecked \N +48176 t tobechecked \N +48177 t tobechecked \N +48181 t tobechecked \N +48223 f tobechecked \N +48256 f tobechecked \N +48275 f tobechecked \N +48277 f tobechecked \N +48278 f tobechecked \N +48289 f tobechecked \N +48299 t tobechecked \N +48300 t tobechecked \N +48301 t tobechecked \N +48302 t tobechecked \N +48303 t tobechecked \N +48304 t tobechecked \N +48305 t tobechecked \N +48306 t tobechecked \N +48307 t tobechecked \N +48308 t tobechecked \N +48309 t tobechecked \N +48310 t tobechecked \N +48311 t tobechecked \N +48312 t tobechecked \N +48313 t tobechecked \N +48314 t tobechecked \N +48315 t tobechecked \N +48316 t tobechecked \N +48317 t tobechecked \N +48318 t tobechecked \N +48319 t tobechecked \N +48320 t tobechecked \N +48321 t tobechecked \N +48322 t tobechecked \N +48323 t tobechecked \N +48324 t tobechecked \N +48325 t tobechecked \N +48326 t tobechecked \N +48327 t tobechecked \N +48328 t tobechecked \N +48329 t tobechecked \N +48330 t tobechecked \N +48331 t tobechecked \N +48332 t tobechecked \N +48333 t tobechecked \N +48334 t tobechecked \N +48335 t tobechecked \N +48336 t tobechecked \N +48337 t tobechecked \N +48338 t tobechecked \N +48339 t tobechecked \N +48354 t tobechecked \N +48355 t tobechecked \N +48358 t tobechecked \N +48359 t tobechecked \N +48360 t tobechecked \N +48362 t tobechecked \N +48373 t tobechecked \N +48384 f tobechecked \N +48443 f tobechecked \N +48449 f tobechecked \N +48470 f tobechecked \N +48489 t tobechecked \N +48490 f tobechecked \N +48513 t tobechecked \N +48515 f tobechecked \N +48522 t tobechecked \N +48527 t tobechecked \N +48532 t tobechecked \N +48534 t tobechecked \N +48537 f tobechecked \N +48539 f tobechecked \N +48558 t tobechecked \N +48593 f tobechecked \N +48594 f tobechecked \N +48609 f tobechecked \N +48612 f tobechecked \N +48641 f tobechecked \N +48642 f tobechecked \N +48651 f tobechecked \N +48653 f tobechecked \N +48656 f tobechecked \N +48666 f tobechecked \N +48668 t tobechecked \N +48669 t tobechecked \N +48670 t tobechecked \N +48671 t tobechecked \N +48672 t tobechecked \N +48673 t tobechecked \N +48674 t tobechecked \N +48675 t tobechecked \N +48676 t tobechecked \N +48677 t tobechecked \N +48678 t tobechecked \N +48679 t tobechecked \N +48680 t tobechecked \N +48681 t tobechecked \N +48682 t tobechecked \N +48683 t tobechecked \N +48684 t tobechecked \N +48685 t tobechecked \N +48686 t tobechecked \N +48687 t tobechecked \N +48688 t tobechecked \N +48689 t tobechecked \N +48690 t tobechecked \N +48691 t tobechecked \N +48692 t tobechecked \N +48693 t tobechecked \N +48694 t tobechecked \N +48695 t tobechecked \N +48696 t tobechecked \N +48697 t tobechecked \N +48698 t tobechecked \N +48725 f tobechecked \N +48726 f tobechecked \N +48727 f tobechecked \N +48728 f tobechecked \N +48729 f tobechecked \N +48730 f tobechecked \N +48731 f tobechecked \N +48732 f tobechecked \N +48733 f tobechecked \N +48734 f tobechecked \N +48735 f tobechecked \N +48736 f tobechecked \N +48737 f tobechecked \N +48738 f tobechecked \N +48739 f tobechecked \N +48740 f tobechecked \N +48741 t tobechecked \N +48742 f tobechecked \N +48743 f tobechecked \N +48744 f tobechecked \N +48745 f tobechecked \N +48746 f tobechecked \N +48747 f tobechecked \N +48748 f tobechecked \N +48749 f tobechecked \N +48750 f tobechecked \N +48751 f tobechecked \N +48752 t tobechecked \N +48754 f tobechecked \N +48755 t tobechecked \N +48756 f tobechecked \N +48757 f tobechecked \N +48758 f tobechecked \N +48759 f tobechecked \N +48760 f tobechecked \N +48761 t tobechecked \N +48762 t tobechecked \N +48763 t tobechecked \N +48764 t tobechecked \N +48765 t tobechecked \N +48766 t tobechecked \N +48767 t tobechecked \N +48768 t tobechecked \N +48769 t tobechecked \N +48770 t tobechecked \N +48772 t tobechecked \N +48773 t tobechecked \N +48778 t tobechecked \N +48783 f tobechecked \N +48791 t tobechecked \N +48798 t tobechecked \N +48799 t tobechecked \N +48812 f tobechecked \N +48848 f tobechecked \N +48860 f tobechecked \N +48879 f tobechecked \N +48889 f tobechecked \N +48905 f tobechecked \N +48910 f tobechecked \N +48919 f tobechecked \N +48920 t tobechecked \N +48921 f tobechecked \N +48924 f tobechecked \N +48947 f tobechecked \N +48948 f tobechecked \N +48949 f tobechecked \N +48950 f tobechecked \N +48951 f tobechecked \N +48952 f tobechecked \N +48953 f tobechecked \N +48954 f tobechecked \N +48955 f tobechecked \N +48956 f tobechecked \N +48957 f tobechecked \N +48958 f tobechecked \N +48959 f tobechecked \N +48960 f tobechecked \N +48961 f tobechecked \N +48962 f tobechecked \N +48963 f tobechecked \N +48964 f tobechecked \N +48965 f tobechecked \N +48966 f tobechecked \N +48967 f tobechecked \N +48968 f tobechecked \N +48971 f tobechecked \N +48988 t tobechecked \N +48991 t tobechecked \N +48999 t tobechecked \N +49027 t tobechecked \N +49031 f tobechecked \N +49032 f tobechecked \N +49033 t tobechecked \N +49041 t tobechecked \N +49042 t tobechecked \N +49049 t tobechecked \N +49051 t tobechecked \N +49058 t tobechecked \N +49059 t tobechecked \N +49062 t tobechecked \N +49063 t tobechecked \N +49065 t tobechecked \N +49066 t tobechecked \N +49067 t tobechecked \N +49069 f tobechecked \N +49070 t tobechecked \N +49089 t tobechecked \N +49090 t tobechecked \N +49095 t tobechecked \N +49096 f tobechecked \N +49097 t tobechecked \N +49098 t tobechecked \N +49099 t tobechecked \N +49100 t tobechecked \N +49101 t tobechecked \N +49102 t tobechecked \N +49104 f tobechecked \N +49106 t tobechecked \N +49107 f tobechecked \N +49108 t tobechecked \N +49109 t tobechecked \N +49110 f tobechecked \N +49155 f tobechecked \N +49171 f tobechecked \N +49197 f tobechecked \N +49217 t tobechecked \N +49218 t tobechecked \N +49219 t tobechecked \N +49220 t tobechecked \N +49221 t tobechecked \N +49239 t tobechecked \N +49240 t tobechecked \N +49241 t tobechecked \N +49242 t tobechecked \N +49243 t tobechecked \N +49247 t tobechecked \N +49248 t tobechecked \N +49249 t tobechecked \N +49250 t tobechecked \N +49254 t tobechecked \N +49257 t tobechecked \N +49258 t tobechecked \N +49259 t tobechecked \N +49260 t tobechecked \N +49261 t tobechecked \N +49262 t tobechecked \N +49263 t tobechecked \N +49267 t tobechecked \N +49268 t tobechecked \N +49270 t tobechecked \N +49271 t tobechecked \N +49272 t tobechecked \N +49275 f tobechecked \N +49276 f tobechecked \N +49277 f tobechecked \N +49279 t tobechecked \N +49280 t tobechecked \N +49281 t tobechecked \N +49282 t tobechecked \N +49283 t tobechecked \N +49289 t tobechecked \N +49315 t tobechecked \N +49337 t tobechecked \N +49338 t tobechecked \N +49339 t tobechecked \N +49341 t tobechecked \N +49342 t tobechecked \N +49343 t tobechecked \N +49344 t tobechecked \N +49346 t tobechecked \N +49347 t tobechecked \N +49348 t tobechecked \N +49349 t tobechecked \N +49350 t tobechecked \N +49351 t tobechecked \N +49355 t tobechecked \N +49356 t tobechecked \N +49357 t tobechecked \N +49359 t tobechecked \N +49360 t tobechecked \N +49361 t tobechecked \N +49365 t tobechecked \N +49366 t tobechecked \N +49368 t tobechecked \N +49369 t tobechecked \N +49370 t tobechecked \N +49372 t tobechecked \N +49373 t tobechecked \N +49374 t tobechecked \N +49376 t tobechecked \N +49377 t tobechecked \N +49378 t tobechecked \N +49379 t tobechecked \N +49381 t tobechecked \N +49382 f tobechecked \N +49383 t tobechecked \N +49384 t tobechecked \N +49385 t tobechecked \N +49387 t tobechecked \N +49388 t tobechecked \N +49389 t tobechecked \N +49390 t tobechecked \N +49391 t tobechecked \N +49392 t tobechecked \N +49393 t tobechecked \N +49395 t tobechecked \N +49396 t tobechecked \N +49409 t tobechecked \N +49413 t tobechecked \N +49429 t tobechecked \N +49435 t tobechecked \N +49438 t tobechecked \N +49444 t tobechecked \N +49475 f tobechecked \N +49480 f tobechecked \N +49519 f tobechecked \N +49526 t tobechecked \N +49527 t tobechecked \N +49544 t tobechecked \N +49545 t tobechecked \N +49546 t tobechecked \N +49547 t tobechecked \N +49554 f tobechecked \N +49555 t tobechecked \N +49556 t tobechecked \N +49557 t tobechecked \N +49561 t tobechecked \N +49562 t tobechecked \N +49575 t tobechecked \N +49577 t tobechecked \N +49578 t tobechecked \N +49579 t tobechecked \N +49580 t tobechecked \N +49581 t tobechecked \N +49582 t tobechecked \N +49588 f tobechecked \N +49599 f tobechecked \N +49600 f tobechecked \N +49601 f tobechecked \N +49605 t tobechecked \N +49606 t tobechecked \N +49614 f tobechecked \N +49616 t tobechecked \N +49617 t tobechecked \N +49625 f tobechecked \N +49656 f tobechecked \N +49657 f tobechecked \N +49666 f tobechecked \N +49668 t tobechecked \N +49673 f tobechecked \N +49675 f tobechecked \N +49676 f tobechecked \N +49677 f tobechecked \N +49685 f tobechecked \N +49698 t tobechecked \N +49699 t tobechecked \N +49700 t tobechecked \N +49701 t tobechecked \N +49702 t tobechecked \N +49703 t tobechecked \N +49704 t tobechecked \N +49705 t tobechecked \N +49707 t tobechecked \N +49709 f tobechecked \N +49710 t tobechecked \N +49711 t tobechecked \N +49714 t tobechecked \N +49715 t tobechecked \N +49719 t tobechecked \N +49720 t tobechecked \N +49722 t tobechecked \N +49724 t tobechecked \N +49725 f tobechecked \N +49726 t tobechecked \N +49727 t tobechecked \N +49729 t tobechecked \N +49730 t tobechecked \N +49731 t tobechecked \N +49732 t tobechecked \N +49733 t tobechecked \N +49734 t tobechecked \N +49735 t tobechecked \N +49739 t tobechecked \N +49740 t tobechecked \N +49741 t tobechecked \N +49743 t tobechecked \N +49744 t tobechecked \N +49745 t tobechecked \N +49747 f tobechecked \N +49748 t tobechecked \N +49749 f tobechecked \N +49750 t tobechecked \N +49766 t tobechecked \N +49767 t tobechecked \N +49768 t tobechecked \N +49769 t tobechecked \N +49785 f tobechecked \N +49786 f tobechecked \N +49787 f tobechecked \N +49813 t tobechecked \N +49814 t tobechecked \N +49825 t tobechecked \N +49826 t tobechecked \N +49827 t tobechecked \N +49828 t tobechecked \N +49829 t tobechecked \N +49842 t tobechecked \N +49848 t tobechecked \N +49855 t tobechecked \N +49876 t tobechecked \N +49980 f tobechecked \N +49990 f tobechecked \N +49994 f tobechecked \N +50003 f tobechecked \N +50004 f tobechecked \N +50005 f tobechecked \N +50012 f tobechecked \N +50013 f tobechecked \N +50015 f tobechecked \N +50030 f tobechecked \N +50040 f tobechecked \N +50046 f tobechecked \N +50052 t tobechecked \N +50053 t tobechecked \N +50059 t tobechecked \N +50128 f tobechecked \N +50132 t tobechecked \N +50134 t tobechecked \N +50139 t tobechecked \N +50140 t tobechecked \N +50141 t tobechecked \N +50142 t tobechecked \N +50143 t tobechecked \N +50146 t tobechecked \N +50151 t tobechecked \N +50162 t tobechecked \N +50165 t tobechecked \N +50169 f tobechecked \N +50170 f tobechecked \N +50171 f tobechecked \N +50172 f tobechecked \N +50191 f tobechecked \N +50192 f tobechecked \N +50200 f tobechecked \N +50209 f tobechecked \N +50239 f tobechecked \N +50243 f tobechecked \N +50244 f tobechecked \N +50258 t tobechecked \N +50259 t tobechecked \N +50261 t tobechecked \N +50279 t tobechecked \N +50282 t tobechecked \N +50288 t tobechecked \N +50289 t tobechecked \N +50304 t tobechecked \N +50322 t tobechecked \N +50326 t tobechecked \N +50348 f tobechecked \N +50349 f tobechecked \N +50360 f tobechecked \N +50380 f tobechecked \N +50381 f tobechecked \N +50395 f tobechecked \N +50408 f tobechecked \N +50419 t tobechecked \N +50424 f tobechecked \N +50426 f tobechecked \N +50458 t tobechecked \N +50467 t tobechecked \N +50468 t tobechecked \N +50469 t tobechecked \N +50476 t tobechecked \N +50482 t tobechecked \N +50483 t tobechecked \N +50486 t tobechecked \N +50489 t tobechecked \N +50490 t tobechecked \N +50507 t tobechecked \N +50519 t tobechecked \N +50525 t tobechecked \N +50529 t tobechecked \N +50535 f tobechecked \N +50536 t tobechecked \N +50553 t tobechecked \N +50557 t tobechecked \N +50558 t tobechecked \N +50562 t tobechecked \N +50563 t tobechecked \N +50567 t tobechecked \N +50573 t tobechecked \N +50576 t tobechecked \N +50577 t tobechecked \N +50589 t tobechecked \N +50599 t tobechecked \N +50600 t tobechecked \N +50601 t tobechecked \N +50603 t tobechecked \N +50605 t tobechecked \N +50610 t tobechecked \N +50622 t tobechecked \N +50624 f tobechecked \N +50627 t tobechecked \N +50639 f tobechecked \N +50654 f tobechecked \N +50655 f tobechecked \N +50656 f tobechecked \N +50657 f tobechecked \N +50658 t tobechecked \N +50659 f tobechecked \N +50660 t tobechecked \N +50671 t tobechecked \N +50701 t tobechecked \N +50712 t tobechecked \N +50717 t tobechecked \N +50718 t tobechecked \N +50760 t tobechecked \N +50762 t tobechecked \N +50763 t tobechecked \N +50764 t tobechecked \N +50771 t tobechecked \N +50772 t tobechecked \N +50797 t tobechecked \N +50801 t tobechecked \N +50807 t tobechecked \N +50808 t tobechecked \N +50813 t tobechecked \N +50814 t tobechecked \N +50815 t tobechecked \N +50816 t tobechecked \N +50817 t tobechecked \N +50818 t tobechecked \N +50819 t tobechecked \N +50820 t tobechecked \N +50821 t tobechecked \N +50836 f tobechecked \N +50837 f tobechecked \N +50839 f tobechecked \N +50881 f tobechecked \N +50885 f tobechecked \N +50907 f tobechecked \N +50908 f tobechecked \N +50909 f tobechecked \N +50910 t tobechecked \N +50911 t tobechecked \N +50912 f tobechecked \N +50913 f tobechecked \N +50914 f tobechecked \N +50915 f tobechecked \N +50916 f tobechecked \N +50917 f tobechecked \N +50918 f tobechecked \N +50919 f tobechecked \N +50920 f tobechecked \N +50937 f tobechecked \N +50938 f tobechecked \N +50940 t tobechecked \N +50952 t tobechecked \N +50966 t tobechecked \N +50977 t tobechecked \N +50984 t tobechecked \N +50986 t tobechecked \N +50988 t tobechecked \N +51001 t tobechecked \N +51008 t tobechecked \N +51015 f tobechecked \N +51016 t tobechecked \N +51017 t tobechecked \N +51022 f tobechecked \N +51035 f tobechecked \N +51036 f tobechecked \N +51089 f tobechecked \N +51106 t tobechecked \N +51107 t tobechecked \N +51148 f tobechecked \N +51160 f tobechecked \N +51161 f tobechecked \N +51162 f tobechecked \N +51181 f tobechecked \N +51188 f tobechecked \N +51191 f tobechecked \N +51212 t tobechecked \N +51219 t tobechecked \N +51220 t tobechecked \N +51221 t tobechecked \N +51222 t tobechecked \N +51223 t tobechecked \N +51224 t tobechecked \N +51225 t tobechecked \N +51226 t tobechecked \N +51227 t tobechecked \N +51228 t tobechecked \N +51229 t tobechecked \N +51232 t tobechecked \N +51233 t tobechecked \N +51238 t tobechecked \N +51242 t tobechecked \N +51243 t tobechecked \N +51244 t tobechecked \N +51256 t tobechecked \N +51263 t tobechecked \N +51268 t tobechecked \N +51297 t tobechecked \N +51298 t tobechecked \N +51314 t tobechecked \N +51332 t tobechecked \N +51343 f tobechecked \N +51356 f tobechecked \N +51385 t tobechecked \N +51387 t tobechecked \N +51388 t tobechecked \N +51395 t tobechecked \N +51427 f tobechecked \N +51430 f tobechecked \N +51435 f tobechecked \N +51444 f tobechecked \N +51451 f tobechecked \N +51472 t tobechecked \N +51476 t tobechecked \N +51477 t tobechecked \N +51479 t tobechecked \N +51513 t tobechecked \N +51520 f tobechecked \N +51521 t tobechecked \N +51522 t tobechecked \N +51523 t tobechecked \N +51555 t tobechecked \N +51556 t tobechecked \N +51579 f tobechecked \N +51580 f tobechecked \N +51587 f tobechecked \N +51606 f tobechecked \N +51607 f tobechecked \N +51651 f tobechecked \N +51784 t tobechecked \N +51785 f tobechecked \N +51832 t tobechecked \N +51833 f tobechecked \N +51834 f tobechecked \N +51835 f tobechecked \N +51843 t tobechecked \N +51850 f tobechecked \N +51851 f tobechecked \N +51858 t tobechecked \N +51882 t tobechecked \N +51884 t tobechecked \N +51891 t tobechecked \N +51894 t tobechecked \N +51909 t tobechecked \N +51917 t tobechecked \N +51999 f tobechecked \N +52000 f tobechecked \N +52017 f tobechecked \N +52021 f tobechecked \N +52022 f tobechecked \N +52023 f tobechecked \N +52025 t tobechecked \N +52055 f tobechecked \N +52056 t tobechecked \N +52057 t tobechecked \N +52058 t tobechecked \N +52059 t tobechecked \N +52060 t tobechecked \N +52061 t tobechecked \N +52062 t tobechecked \N +52065 t tobechecked \N +52066 t tobechecked \N +52068 t tobechecked \N +52069 t tobechecked \N +52070 t tobechecked \N +52071 t tobechecked \N +52072 t tobechecked \N +52073 t tobechecked \N +52074 t tobechecked \N +52075 t tobechecked \N +52081 t tobechecked \N +52082 t tobechecked \N +52090 t tobechecked \N +52091 t tobechecked \N +52092 t tobechecked \N +52093 t tobechecked \N +52094 t tobechecked \N +52104 t tobechecked \N +52109 t tobechecked \N +52112 t tobechecked \N +52124 t tobechecked \N +52130 t tobechecked \N +52131 t tobechecked \N +52132 t tobechecked \N +52138 t tobechecked \N +52158 t tobechecked \N +52159 t tobechecked \N +52183 t tobechecked \N +52209 f tobechecked \N +52257 f tobechecked \N +52258 f tobechecked \N +52272 t tobechecked \N +52277 t tobechecked \N +52288 t tobechecked \N +52291 t tobechecked \N +52293 t tobechecked \N +52294 t tobechecked \N +52297 t tobechecked \N +52298 t tobechecked \N +52299 t tobechecked \N +52300 t tobechecked \N +52304 t tobechecked \N +52308 t tobechecked \N +52310 t tobechecked \N +52319 t tobechecked \N +52356 t tobechecked \N +52404 f tobechecked \N +52405 f tobechecked \N +52413 f tobechecked \N +52422 f tobechecked \N +52468 t tobechecked \N +52469 t tobechecked \N +52561 f tobechecked \N +52570 f tobechecked \N +52585 f tobechecked \N +52626 t tobechecked \N +52629 t tobechecked \N +52633 t tobechecked \N +52635 t tobechecked \N +52637 t tobechecked \N +52642 t tobechecked \N +52644 t tobechecked \N +52645 t tobechecked \N +52655 t tobechecked \N +52662 t tobechecked \N +52712 f tobechecked \N +52721 f tobechecked \N +52723 f tobechecked \N +52747 f tobechecked \N +52771 t tobechecked \N +52775 t tobechecked \N +52782 t tobechecked \N +52817 t tobechecked \N +52822 t tobechecked \N +52841 t tobechecked \N +52890 f tobechecked \N +52896 f tobechecked \N +52906 f tobechecked \N +52928 f tobechecked \N +52941 t tobechecked \N +52942 t tobechecked \N +52943 t tobechecked \N +52944 t tobechecked \N +52945 t tobechecked \N +52946 t tobechecked \N +52947 t tobechecked \N +52948 t tobechecked \N +52949 t tobechecked \N +52950 t tobechecked \N +52951 t tobechecked \N +52952 t tobechecked \N +52953 t tobechecked \N +52954 t tobechecked \N +52955 t tobechecked \N +52956 t tobechecked \N +52957 t tobechecked \N +52966 t tobechecked \N +52967 t tobechecked \N +52968 t tobechecked \N +52969 t tobechecked \N +52970 t tobechecked \N +52971 t tobechecked \N +52974 t tobechecked \N +52976 t tobechecked \N +52987 t tobechecked \N +52988 t tobechecked \N +52994 t tobechecked \N +52997 t tobechecked \N +53001 t tobechecked \N +53007 t tobechecked \N +53020 t tobechecked \N +53054 t tobechecked \N +53055 t tobechecked \N +53056 t tobechecked \N +53057 t tobechecked \N +53058 t tobechecked \N +53073 f tobechecked \N +53092 f tobechecked \N +53096 f tobechecked \N +53097 f tobechecked \N +53099 f tobechecked \N +53114 f tobechecked \N +53116 f tobechecked \N +53117 f tobechecked \N +53123 f tobechecked \N +53133 f tobechecked \N +53171 f tobechecked \N +53180 t tobechecked \N +53181 t tobechecked \N +53217 f tobechecked \N +53233 t tobechecked \N +53234 t tobechecked \N +53235 t tobechecked \N +53236 t tobechecked \N +53237 t tobechecked \N +53250 t tobechecked \N +53256 f tobechecked \N +53258 t tobechecked \N +53259 t tobechecked \N +53268 t tobechecked \N +53271 t tobechecked \N +53273 t tobechecked \N +53278 f tobechecked \N +53279 t tobechecked \N +53283 t tobechecked \N +53284 t tobechecked \N +53285 f tobechecked \N +53289 f tobechecked \N +53295 t tobechecked \N +53305 t tobechecked \N +53318 f tobechecked \N +53334 f tobechecked \N +53337 f tobechecked \N +53338 f tobechecked \N +53339 f tobechecked \N +53393 f tobechecked \N +53447 t tobechecked \N +53448 t tobechecked \N +53456 t tobechecked \N +53457 t tobechecked \N +53458 t tobechecked \N +53496 t tobechecked \N +53517 t tobechecked \N +53555 t tobechecked \N +53556 t tobechecked \N +53557 t tobechecked \N +53559 t tobechecked \N +53565 t tobechecked \N +53568 t tobechecked \N +53570 t tobechecked \N +53572 t tobechecked \N +53574 t tobechecked \N +53575 t tobechecked \N +53576 t tobechecked \N +53580 t tobechecked \N +53581 t tobechecked \N +53585 t tobechecked \N +53599 t tobechecked \N +53601 t tobechecked \N +53604 t tobechecked \N +53605 t tobechecked \N +53606 t tobechecked \N +53611 t tobechecked \N +53612 t tobechecked \N +53613 t tobechecked \N +53616 t tobechecked \N +53617 t tobechecked \N +53618 t tobechecked \N +53619 t tobechecked \N +53620 t tobechecked \N +53621 t tobechecked \N +53622 t tobechecked \N +53623 t tobechecked \N +53624 t tobechecked \N +53625 t tobechecked \N +53626 t tobechecked \N +53627 t tobechecked \N +53628 t tobechecked \N +53629 t tobechecked \N +53630 t tobechecked \N +53651 f tobechecked \N +53653 t tobechecked \N +53657 t tobechecked \N +53669 t tobechecked \N +53670 t tobechecked \N +53677 f tobechecked \N +53695 f tobechecked \N +53696 f tobechecked \N +53697 f tobechecked \N +53718 f tobechecked \N +53730 f tobechecked \N +53733 f tobechecked \N +53740 f tobechecked \N +53767 f tobechecked \N +53773 f tobechecked \N +53777 f tobechecked \N +53781 t tobechecked \N +53782 t tobechecked \N +53787 t tobechecked \N +53791 t tobechecked \N +53793 t tobechecked \N +53797 t tobechecked \N +53812 f tobechecked \N +53815 f tobechecked \N +53835 f tobechecked \N +53865 f tobechecked \N +53884 f tobechecked \N +53893 f tobechecked \N +53911 f tobechecked \N +53919 f tobechecked \N +53920 f tobechecked \N +53942 f tobechecked \N +53960 f tobechecked \N +53961 f tobechecked \N +53963 f tobechecked \N +53982 f tobechecked \N +53990 f tobechecked \N +53995 f tobechecked \N +54011 f tobechecked \N +54021 f tobechecked \N +54025 f tobechecked \N +54038 f tobechecked \N +54044 f tobechecked \N +54080 f tobechecked \N +54085 f tobechecked \N +54092 t tobechecked \N +54109 t tobechecked \N +54122 t tobechecked \N +54123 t tobechecked \N +54127 t tobechecked \N +54136 f tobechecked \N +54141 f tobechecked \N +54144 t tobechecked \N +54159 t tobechecked \N +54160 t tobechecked \N +54163 t tobechecked \N +54168 t tobechecked \N +54169 t tobechecked \N +54189 t tobechecked \N +54202 t tobechecked \N +54203 t tobechecked \N +54230 t tobechecked \N +54231 f tobechecked \N +54233 t tobechecked \N +54234 t tobechecked \N +54236 t tobechecked \N +54237 t tobechecked \N +54254 t tobechecked \N +54255 t tobechecked \N +54270 f tobechecked \N +54277 f tobechecked \N +54315 f tobechecked \N +54325 f tobechecked \N +54326 f tobechecked \N +54327 f tobechecked \N +54328 f tobechecked \N +54333 f tobechecked \N +54397 t tobechecked \N +54424 t tobechecked \N +54429 t tobechecked \N +54431 t tobechecked \N +54449 f tobechecked \N +54454 f tobechecked \N +54456 t tobechecked \N +54463 f tobechecked \N +54475 f tobechecked \N +54476 f tobechecked \N +54481 f tobechecked \N +54502 f tobechecked \N +54517 f tobechecked \N +54525 f tobechecked \N +54567 t tobechecked \N +54580 t tobechecked \N +54583 f tobechecked \N +54584 t tobechecked \N +54596 t tobechecked \N +54602 f tobechecked \N +54603 f tobechecked \N +54604 f tobechecked \N +54605 f tobechecked \N +54612 t tobechecked \N +54627 t tobechecked \N +54648 t tobechecked \N +54651 t tobechecked \N +54663 t tobechecked \N +54664 t tobechecked \N +54666 t tobechecked \N +54667 t tobechecked \N +54668 t tobechecked \N +54669 t tobechecked \N +54670 t tobechecked \N +54671 t tobechecked \N +54672 t tobechecked \N +54673 t tobechecked \N +54674 t tobechecked \N +54675 t tobechecked \N +54676 t tobechecked \N +54677 t tobechecked \N +54678 t tobechecked \N +54679 t tobechecked \N +54680 t tobechecked \N +54681 t tobechecked \N +54682 t tobechecked \N +54683 f tobechecked \N +54684 f tobechecked \N +54685 f tobechecked \N +54686 t tobechecked \N +54687 t tobechecked \N +54688 t tobechecked \N +54689 t tobechecked \N +54690 t tobechecked \N +54691 t tobechecked \N +54692 t tobechecked \N +54693 t tobechecked \N +54694 t tobechecked \N +54695 f tobechecked \N +54696 t tobechecked \N +54697 t tobechecked \N +54698 t tobechecked \N +54699 t tobechecked \N +54700 t tobechecked \N +54701 f tobechecked \N +54704 t tobechecked \N +54705 f tobechecked \N +54715 t tobechecked \N +54718 t tobechecked \N +54721 f tobechecked \N +54722 f tobechecked \N +54723 f tobechecked \N +54724 f tobechecked \N +54725 f tobechecked \N +54726 f tobechecked \N +54727 f tobechecked \N +54728 f tobechecked \N +54729 f tobechecked \N +54730 f tobechecked \N +54731 t tobechecked \N +54732 f tobechecked \N +54733 f tobechecked \N +54734 f tobechecked \N +54735 f tobechecked \N +54736 t tobechecked \N +54739 t tobechecked \N +54740 t tobechecked \N +54741 f tobechecked \N +54762 f tobechecked \N +54763 f tobechecked \N +54764 f tobechecked \N +54765 f tobechecked \N +54790 f tobechecked \N +54799 f tobechecked \N +54800 f tobechecked \N +54801 f tobechecked \N +54802 f tobechecked \N +54803 f tobechecked \N +54814 f tobechecked \N +54815 f tobechecked \N +54816 f tobechecked \N +54817 f tobechecked \N +54818 f tobechecked \N +54819 f tobechecked \N +54820 f tobechecked \N +54821 f tobechecked \N +54822 f tobechecked \N +54828 f tobechecked \N +54904 f tobechecked \N +54905 f tobechecked \N +54909 f tobechecked \N +54950 f tobechecked \N +54963 f tobechecked \N +54995 f tobechecked \N +54996 f tobechecked \N +54997 f tobechecked \N +54998 f tobechecked \N +54999 f tobechecked \N +55000 f tobechecked \N +55001 f tobechecked \N +55008 f tobechecked \N +55032 f tobechecked \N +55043 f tobechecked \N +55044 f tobechecked \N +55046 f tobechecked \N +55056 f tobechecked \N +55057 f tobechecked \N +55058 f tobechecked \N +55059 f tobechecked \N +55060 f tobechecked \N +55061 f tobechecked \N +55062 f tobechecked \N +55063 f tobechecked \N +55064 f tobechecked \N +55065 f tobechecked \N +55066 f tobechecked \N +55077 t tobechecked \N +55078 f tobechecked \N +55103 t tobechecked \N +55117 f tobechecked \N +55118 f tobechecked \N +55120 f tobechecked \N +55121 f tobechecked \N +55127 f tobechecked \N +55134 f tobechecked \N +55162 f tobechecked \N +55169 t tobechecked \N +55170 t tobechecked \N +55171 t tobechecked \N +55175 t tobechecked \N +55183 t tobechecked \N +55184 t tobechecked \N +55187 f tobechecked \N +55188 f tobechecked \N +55189 f tobechecked \N +55190 f tobechecked \N +55192 t tobechecked \N +55193 t tobechecked \N +55194 t tobechecked \N +55214 f tobechecked \N +55226 f tobechecked \N +55233 f tobechecked \N +55242 f tobechecked \N +55243 f tobechecked \N +55244 f tobechecked \N +55248 f tobechecked \N +55254 f tobechecked \N +55277 f tobechecked \N +55283 f tobechecked \N +55284 f tobechecked \N +55290 f tobechecked \N +55291 f tobechecked \N +55298 f tobechecked \N +55300 f tobechecked \N +55309 f tobechecked \N +55351 f tobechecked \N +55357 f tobechecked \N +55368 f tobechecked \N +55373 f tobechecked \N +55379 f tobechecked \N +55390 f tobechecked \N +55393 f tobechecked \N +55395 f tobechecked \N +55400 f tobechecked \N +55407 f tobechecked \N +55415 f tobechecked \N +55428 f tobechecked \N +55488 f tobechecked \N +55489 f tobechecked \N +55496 f tobechecked \N +55497 f tobechecked \N +55499 f tobechecked \N +55501 f tobechecked \N +55502 f tobechecked \N +55505 f tobechecked \N +55507 f tobechecked \N +55542 t tobechecked \N +55544 t tobechecked \N +55545 t tobechecked \N +55546 t tobechecked \N +55547 t tobechecked \N +55548 t tobechecked \N +55549 t tobechecked \N +55552 t tobechecked \N +55553 t tobechecked \N +55554 t tobechecked \N +55555 t tobechecked \N +55556 t tobechecked \N +55561 t tobechecked \N +55566 t tobechecked \N +55570 t tobechecked \N +55571 t tobechecked \N +55575 t tobechecked \N +55577 t tobechecked \N +55581 t tobechecked \N +55582 t tobechecked \N +55589 f tobechecked \N +55657 f tobechecked \N +55658 f tobechecked \N +55659 f tobechecked \N +55660 f tobechecked \N +55661 f tobechecked \N +55662 f tobechecked \N +55663 f tobechecked \N +55664 f tobechecked \N +55665 f tobechecked \N +55666 f tobechecked \N +55667 f tobechecked \N +55668 f tobechecked \N +55669 f tobechecked \N +55670 f tobechecked \N +55671 f tobechecked \N +55672 f tobechecked \N +55673 f tobechecked \N +55674 f tobechecked \N +55675 f tobechecked \N +55676 f tobechecked \N +55677 f tobechecked \N +55678 f tobechecked \N +55679 f tobechecked \N +55680 f tobechecked \N +55681 f tobechecked \N +55682 f tobechecked \N +55683 f tobechecked \N +55684 f tobechecked \N +55685 f tobechecked \N +55686 f tobechecked \N +55687 f tobechecked \N +55688 f tobechecked \N +55689 f tobechecked \N +55690 f tobechecked \N +55691 f tobechecked \N +55692 f tobechecked \N +55693 f tobechecked \N +55694 f tobechecked \N +55695 f tobechecked \N +55696 f tobechecked \N +55697 f tobechecked \N +55698 f tobechecked \N +55699 f tobechecked \N +55700 f tobechecked \N +55701 f tobechecked \N +55702 f tobechecked \N +55703 f tobechecked \N +55704 f tobechecked \N +55705 f tobechecked \N +55706 f tobechecked \N +55707 f tobechecked \N +55708 f tobechecked \N +55737 t tobechecked \N +55738 t tobechecked \N +55753 f tobechecked \N +55756 t tobechecked \N +55762 t tobechecked \N +55764 t tobechecked \N +55767 f tobechecked \N +55768 f tobechecked \N +55773 t tobechecked \N +55817 t tobechecked \N +55827 t tobechecked \N +55847 f tobechecked \N +55877 f tobechecked \N +55927 f tobechecked \N +55928 f tobechecked \N +55929 f tobechecked \N +55930 f tobechecked \N +55931 f tobechecked \N +55932 f tobechecked \N +55933 f tobechecked \N +55934 f tobechecked \N +55935 f tobechecked \N +55936 f tobechecked \N +55937 f tobechecked \N +55938 f tobechecked \N +55939 f tobechecked \N +55940 f tobechecked \N +55941 f tobechecked \N +55942 f tobechecked \N +55943 f tobechecked \N +55944 f tobechecked \N +55945 f tobechecked \N +55947 f tobechecked \N +55948 f tobechecked \N +55949 f tobechecked \N +55951 f tobechecked \N +55952 f tobechecked \N +55958 f tobechecked \N +55961 f tobechecked \N +55975 t tobechecked \N +55977 t tobechecked \N +55979 f tobechecked \N +55985 t tobechecked \N +55987 f tobechecked \N +55988 t tobechecked \N +56012 f tobechecked \N +56019 f tobechecked \N +56025 f tobechecked \N +56031 f tobechecked \N +56041 f tobechecked \N +56047 f tobechecked \N +56051 f tobechecked \N +56083 t tobechecked \N +56089 t tobechecked \N +56093 t tobechecked \N +56097 f tobechecked \N +56100 t tobechecked \N +56104 t tobechecked \N +56110 f tobechecked \N +56111 t tobechecked \N +56113 t tobechecked \N +56114 t tobechecked \N +56115 t tobechecked \N +56119 t tobechecked \N +56129 f tobechecked \N +56147 t tobechecked \N +56149 t tobechecked \N +56154 t tobechecked \N +56156 t tobechecked \N +56157 t tobechecked \N +56158 t tobechecked \N +56159 t tobechecked \N +56160 t tobechecked \N +56161 t tobechecked \N +56162 t tobechecked \N +56163 t tobechecked \N +56164 t tobechecked \N +56165 t tobechecked \N +56177 f tobechecked \N +56178 f tobechecked \N +56179 f tobechecked \N +56180 f tobechecked \N +56181 f tobechecked \N +56182 f tobechecked \N +56183 f tobechecked \N +56184 f tobechecked \N +56185 f tobechecked \N +56186 f tobechecked \N +56187 f tobechecked \N +56188 f tobechecked \N +56189 f tobechecked \N +56190 f tobechecked \N +56191 f tobechecked \N +56192 f tobechecked \N +56193 f tobechecked \N +56194 f tobechecked \N +56197 f tobechecked \N +56198 f tobechecked \N +56239 f tobechecked \N +56260 t tobechecked \N +56279 t tobechecked \N +56320 f tobechecked \N +56321 f tobechecked \N +56322 f tobechecked \N +56323 f tobechecked \N +56324 f tobechecked \N +56325 f tobechecked \N +56344 f tobechecked \N +56347 f tobechecked \N +56348 f tobechecked \N +56369 f tobechecked \N +56389 t tobechecked \N +56402 t tobechecked \N +56468 t tobechecked \N +56469 t tobechecked \N +56470 t tobechecked \N +56480 t tobechecked \N +56481 t tobechecked \N +56489 t tobechecked \N +56490 f tobechecked \N +56501 t tobechecked \N +56503 t tobechecked \N +56504 f tobechecked \N +56508 t tobechecked \N +56509 t tobechecked \N +56510 t tobechecked \N +56520 t tobechecked \N +56522 t tobechecked \N +56528 t tobechecked \N +56536 t tobechecked \N +56537 t tobechecked \N +56541 t tobechecked \N +56546 t tobechecked \N +56553 t tobechecked \N +56557 f tobechecked \N +56572 f tobechecked \N +56593 f tobechecked \N +56637 f tobechecked \N +56638 t tobechecked \N +56639 t tobechecked \N +56640 t tobechecked \N +56650 t tobechecked \N +56651 t tobechecked \N +56681 t tobechecked \N +56709 t tobechecked \N +56723 t tobechecked \N +56724 t tobechecked \N +56734 t tobechecked \N +56749 t tobechecked \N +56750 f tobechecked \N +56751 t tobechecked \N +56752 t tobechecked \N +56753 t tobechecked \N +56758 t tobechecked \N +56766 f tobechecked \N +56767 f tobechecked \N +56814 f tobechecked \N +56815 f tobechecked \N +56816 f tobechecked \N +56824 f tobechecked \N +56840 f tobechecked \N +56849 f tobechecked \N +56850 f tobechecked \N +56851 f tobechecked \N +56852 f tobechecked \N +56853 f tobechecked \N +56854 f tobechecked \N +56855 f tobechecked \N +56856 f tobechecked \N +56857 f tobechecked \N +56858 f tobechecked \N +56859 f tobechecked \N +56860 f tobechecked \N +56861 f tobechecked \N +56862 f tobechecked \N +56863 f tobechecked \N +56864 f tobechecked \N +56865 f tobechecked \N +56866 f tobechecked \N +56867 f tobechecked \N +56868 f tobechecked \N +56869 f tobechecked \N +56870 f tobechecked \N +56871 f tobechecked \N +56872 f tobechecked \N +56873 f tobechecked \N +56874 f tobechecked \N +56875 f tobechecked \N +56876 f tobechecked \N +56877 f tobechecked \N +56878 f tobechecked \N +56879 f tobechecked \N +56880 f tobechecked \N +56881 f tobechecked \N +56882 f tobechecked \N +56883 f tobechecked \N +56889 f tobechecked \N +56890 f tobechecked \N +56891 f tobechecked \N +56892 f tobechecked \N +56893 f tobechecked \N +56894 f tobechecked \N +56895 f tobechecked \N +56896 f tobechecked \N +56897 f tobechecked \N +56899 f tobechecked \N +56900 f tobechecked \N +56902 f tobechecked \N +56903 f tobechecked \N +56904 f tobechecked \N +56905 f tobechecked \N +56906 f tobechecked \N +56943 f tobechecked \N +56960 f tobechecked \N +56964 f tobechecked \N +56966 f tobechecked \N +56967 f tobechecked \N +56998 t tobechecked \N +57013 f tobechecked \N +57021 f tobechecked \N +57029 f tobechecked \N +57050 f tobechecked \N +57053 f tobechecked \N +57057 f tobechecked \N +57072 f tobechecked \N +57073 f tobechecked \N +57103 f tobechecked \N +57107 f tobechecked \N +57124 f tobechecked \N +57130 f tobechecked \N +57172 f tobechecked \N +57173 f tobechecked \N +57174 f tobechecked \N +57175 f tobechecked \N +57176 f tobechecked \N +57181 f tobechecked \N +57182 f tobechecked \N +57255 f tobechecked \N +57314 f tobechecked \N +57320 f tobechecked \N +57321 f tobechecked \N +57329 f tobechecked \N +57340 f tobechecked \N +57384 f tobechecked \N +57394 t tobechecked \N +57406 t tobechecked \N +57408 f tobechecked \N +57409 t tobechecked \N +57411 t tobechecked \N +57413 t tobechecked \N +57414 t tobechecked \N +57415 f tobechecked \N +57418 t tobechecked \N +57423 t tobechecked \N +57424 t tobechecked \N +57425 t tobechecked \N +57436 t tobechecked \N +57451 t tobechecked \N +57455 t tobechecked \N +57469 t tobechecked \N +57470 t tobechecked \N +57471 t tobechecked \N +57472 t tobechecked \N +57473 f tobechecked \N +57476 f tobechecked \N +57478 t tobechecked \N +57480 f tobechecked \N +57481 f tobechecked \N +57482 f tobechecked \N +57483 t tobechecked \N +57487 f tobechecked \N +57488 f tobechecked \N +57489 f tobechecked \N +57508 f tobechecked \N +57510 f tobechecked \N +57531 f tobechecked \N +57534 f tobechecked \N +57535 f tobechecked \N +57602 f tobechecked \N +57604 f tobechecked \N +57605 f tobechecked \N +57606 f tobechecked \N +57607 f tobechecked \N +57608 f tobechecked \N +57609 f tobechecked \N +57610 f tobechecked \N +57611 f tobechecked \N +57612 t tobechecked \N +57613 t tobechecked \N +57614 t tobechecked \N +57615 t tobechecked \N +57616 f tobechecked \N +57617 t tobechecked \N +57618 t tobechecked \N +57619 t tobechecked \N +57620 t tobechecked \N +57621 t tobechecked \N +57622 t tobechecked \N +57623 t tobechecked \N +57624 t tobechecked \N +57625 t tobechecked \N +57626 t tobechecked \N +57627 t tobechecked \N +57628 t tobechecked \N +57629 f tobechecked \N +57631 f tobechecked \N +57632 t tobechecked \N +57633 t tobechecked \N +57634 t tobechecked \N +57635 t tobechecked \N +57636 t tobechecked \N +57637 t tobechecked \N +57639 f tobechecked \N +57649 t tobechecked \N +57655 t tobechecked \N +57658 f tobechecked \N +57661 f tobechecked \N +57665 t tobechecked \N +57690 f tobechecked \N +57691 f tobechecked \N +57692 f tobechecked \N +57693 f tobechecked \N +57694 f tobechecked \N +57695 f tobechecked \N +57698 t tobechecked \N +57699 t tobechecked \N +57700 t tobechecked \N +57701 t tobechecked \N +57702 t tobechecked \N +57703 t tobechecked \N +57715 f tobechecked \N +57716 f tobechecked \N +57734 f tobechecked \N +57735 f tobechecked \N +57736 f tobechecked \N +57737 f tobechecked \N +57738 f tobechecked \N +57739 f tobechecked \N +57740 f tobechecked \N +57741 f tobechecked \N +57743 f tobechecked \N +57775 f tobechecked \N +57779 f tobechecked \N +57789 f tobechecked \N +57805 f tobechecked \N +57807 f tobechecked \N +57823 t tobechecked \N +57846 f tobechecked \N +57850 f tobechecked \N +57851 f tobechecked \N +57880 f tobechecked \N +57882 f tobechecked \N +57900 f tobechecked \N +57904 t tobechecked \N +57905 t tobechecked \N +57906 t tobechecked \N +57907 t tobechecked \N +57908 t tobechecked \N +57909 t tobechecked \N +57913 t tobechecked \N +57914 t tobechecked \N +57915 t tobechecked \N +57916 t tobechecked \N +57917 t tobechecked \N +57919 t tobechecked \N +57920 t tobechecked \N +57921 t tobechecked \N +57933 t tobechecked \N +57941 t tobechecked \N +57942 t tobechecked \N +57943 t tobechecked \N +57944 t tobechecked \N +57945 t tobechecked \N +57946 t tobechecked \N +57947 t tobechecked \N +57952 t tobechecked \N +57954 t tobechecked \N +57960 t tobechecked \N +57965 t tobechecked \N +57971 t tobechecked \N +57974 t tobechecked \N +57979 t tobechecked \N +57980 t tobechecked \N +57981 f tobechecked \N +57982 t tobechecked \N +57983 t tobechecked \N +57984 t tobechecked \N +57985 t tobechecked \N +57986 t tobechecked \N +57987 t tobechecked \N +57989 t tobechecked \N +57990 t tobechecked \N +57991 t tobechecked \N +57992 t tobechecked \N +58031 t tobechecked \N +58032 t tobechecked \N +58038 t tobechecked \N +58039 t tobechecked \N +58040 t tobechecked \N +58041 t tobechecked \N +58042 t tobechecked \N +58043 t tobechecked \N +58044 t tobechecked \N +58045 t tobechecked \N +58067 t tobechecked \N +58068 t tobechecked \N +58069 t tobechecked \N +58087 t tobechecked \N +58116 f tobechecked \N +58117 t tobechecked \N +58142 t tobechecked \N +58143 t tobechecked \N +58160 t tobechecked \N +58161 t tobechecked \N +58162 t tobechecked \N +58163 t tobechecked \N +58164 t tobechecked \N +58165 t tobechecked \N +58166 t tobechecked \N +58167 t tobechecked \N +58168 f tobechecked \N +58169 t tobechecked \N +58170 f tobechecked \N +58191 f tobechecked \N +58192 f tobechecked \N +58219 f tobechecked \N +58220 f tobechecked \N +58240 f tobechecked \N +58241 f tobechecked \N +58242 f tobechecked \N +58243 f tobechecked \N +58244 f tobechecked \N +58245 f tobechecked \N +58246 f tobechecked \N +58247 f tobechecked \N +58248 f tobechecked \N +58249 f tobechecked \N +58250 f tobechecked \N +58251 f tobechecked \N +58252 f tobechecked \N +58253 f tobechecked \N +58254 f tobechecked \N +58255 f tobechecked \N +58256 f tobechecked \N +58257 f tobechecked \N +58258 f tobechecked \N +58259 f tobechecked \N +58260 f tobechecked \N +58262 t tobechecked \N +58265 t tobechecked \N +58266 t tobechecked \N +58284 t tobechecked \N +58293 t tobechecked \N +58297 t tobechecked \N +58299 t tobechecked \N +58310 t tobechecked \N +58311 t tobechecked \N +58322 t tobechecked \N +58324 t tobechecked \N +58325 f tobechecked \N +58340 f tobechecked \N +58341 f tobechecked \N +58342 f tobechecked \N +58343 f tobechecked \N +58344 f tobechecked \N +58345 f tobechecked \N +58346 f tobechecked \N +58362 f tobechecked \N +58374 f tobechecked \N +58395 t tobechecked \N +58396 t tobechecked \N +58406 t tobechecked \N +58409 t tobechecked \N +58412 t tobechecked \N +58413 t tobechecked \N +58421 t tobechecked \N +58425 t tobechecked \N +58426 t tobechecked \N +58431 t tobechecked \N +58437 t tobechecked \N +58439 f tobechecked \N +58441 t tobechecked \N +58447 f tobechecked \N +58450 t tobechecked \N +58451 t tobechecked \N +58452 t tobechecked \N +58453 t tobechecked \N +58454 t tobechecked \N +58455 t tobechecked \N +58456 t tobechecked \N +58457 t tobechecked \N +58458 t tobechecked \N +58459 t tobechecked \N +58460 t tobechecked \N +58461 t tobechecked \N +58468 t tobechecked \N +58473 t tobechecked \N +58477 t tobechecked \N +58478 t tobechecked \N +58479 t tobechecked \N +58480 t tobechecked \N +58481 t tobechecked \N +58482 t tobechecked \N +58483 f tobechecked \N +58484 f tobechecked \N +58485 f tobechecked \N +58486 f tobechecked \N +58487 f tobechecked \N +58488 f tobechecked \N +58489 f tobechecked \N +58490 f tobechecked \N +58491 f tobechecked \N +58492 f tobechecked \N +58493 f tobechecked \N +58494 f tobechecked \N +58495 f tobechecked \N +58502 f tobechecked \N +58503 f tobechecked \N +58504 f tobechecked \N +58516 f tobechecked \N +58518 f tobechecked \N +58519 f tobechecked \N +58533 f tobechecked \N +58567 f tobechecked \N +58574 t tobechecked \N +58580 t tobechecked \N +58583 t tobechecked \N +58584 t tobechecked \N +58585 t tobechecked \N +58586 t tobechecked \N +58591 t tobechecked \N +58592 f tobechecked \N +58593 t tobechecked \N +58595 t tobechecked \N +58600 t tobechecked \N +58607 t tobechecked \N +58613 t tobechecked \N +58614 f tobechecked \N +58616 t tobechecked \N +58622 f tobechecked \N +58626 t tobechecked \N +58627 t tobechecked \N +58628 t tobechecked \N +58631 t tobechecked \N +58640 t tobechecked \N +58641 t tobechecked \N +58646 f tobechecked \N +58674 t tobechecked \N +58678 f tobechecked \N +58679 f tobechecked \N +58680 t tobechecked \N +58682 t tobechecked \N +58684 t tobechecked \N +58686 t tobechecked \N +58688 t tobechecked \N +58696 t tobechecked \N +58697 t tobechecked \N +58706 f tobechecked \N +58725 f tobechecked \N +58744 f tobechecked \N +58747 t tobechecked \N +58748 t tobechecked \N +58749 t tobechecked \N +58751 f tobechecked \N +58757 t tobechecked \N +58772 f tobechecked \N +58783 t tobechecked \N +58787 t tobechecked \N +58799 f tobechecked \N +58800 f tobechecked \N +58802 t tobechecked \N +58808 t tobechecked \N +58809 t tobechecked \N +58831 f tobechecked \N +58834 f tobechecked \N +58844 f tobechecked \N +58845 f tobechecked \N +58846 f tobechecked \N +58847 f tobechecked \N +58848 f tobechecked \N +58853 f tobechecked \N +58854 f tobechecked \N +58866 f tobechecked \N +58877 t tobechecked \N +58886 t tobechecked \N +58893 t tobechecked \N +58894 t tobechecked \N +58897 t tobechecked \N +58903 t tobechecked \N +58904 t tobechecked \N +58910 t tobechecked \N +58911 t tobechecked \N +58912 t tobechecked \N +58913 t tobechecked \N +58914 t tobechecked \N +58915 t tobechecked \N +58916 t tobechecked \N +58917 t tobechecked \N +58921 t tobechecked \N +58922 t tobechecked \N +58923 f tobechecked \N +58925 t tobechecked \N +58928 t tobechecked \N +58930 t tobechecked \N +58931 t tobechecked \N +58933 t tobechecked \N +58934 t tobechecked \N +58935 t tobechecked \N +58938 t tobechecked \N +58941 t tobechecked \N +58942 t tobechecked \N +58943 t tobechecked \N +58948 t tobechecked \N +58950 t tobechecked \N +58951 t tobechecked \N +58952 f tobechecked \N +58953 t tobechecked \N +58954 t tobechecked \N +58955 t tobechecked \N +58956 t tobechecked \N +58957 t tobechecked \N +58958 t tobechecked \N +58960 t tobechecked \N +58961 t tobechecked \N +58962 t tobechecked \N +58963 f tobechecked \N +58964 t tobechecked \N +58966 f tobechecked \N +58967 f tobechecked \N +58968 f tobechecked \N +58969 f tobechecked \N +58970 f tobechecked \N +58977 t tobechecked \N +58984 f tobechecked \N +58986 t tobechecked \N +58988 t tobechecked \N +58989 t tobechecked \N +58990 t tobechecked \N +58997 t tobechecked \N +58998 t tobechecked \N +58999 t tobechecked \N +59000 t tobechecked \N +59001 t tobechecked \N +59002 t tobechecked \N +59003 t tobechecked \N +59004 f tobechecked \N +59005 f tobechecked \N +59006 f tobechecked \N +59007 f tobechecked \N +59008 f tobechecked \N +59009 f tobechecked \N +59010 f tobechecked \N +59011 f tobechecked \N +59012 f tobechecked \N +59013 f tobechecked \N +59014 t tobechecked \N +59023 t tobechecked \N +59025 t tobechecked \N +59031 t tobechecked \N +59036 t tobechecked \N +59040 t tobechecked \N +59042 t tobechecked \N +59044 t tobechecked \N +59045 t tobechecked \N +59046 t tobechecked \N +59051 t tobechecked \N +59052 t tobechecked \N +59059 t tobechecked \N +59061 t tobechecked \N +59066 t tobechecked \N +59070 t tobechecked \N +59071 t tobechecked \N +59072 f tobechecked \N +59073 t tobechecked \N +59075 t tobechecked \N +59076 t tobechecked \N +59078 t tobechecked \N +59079 t tobechecked \N +59080 t tobechecked \N +59081 t tobechecked \N +59082 t tobechecked \N +59083 t tobechecked \N +59084 t tobechecked \N +59085 t tobechecked \N +59086 t tobechecked \N +59087 t tobechecked \N +59088 t tobechecked \N +59089 t tobechecked \N +59090 t tobechecked \N +59091 t tobechecked \N +59092 t tobechecked \N +59093 t tobechecked \N +59094 t tobechecked \N +59095 t tobechecked \N +59096 t tobechecked \N +59097 t tobechecked \N +59098 t tobechecked \N +59099 t tobechecked \N +59100 t tobechecked \N +59101 t tobechecked \N +59106 t tobechecked \N +59117 f tobechecked \N +59118 f tobechecked \N +59119 f tobechecked \N +59120 f tobechecked \N +59121 f tobechecked \N +59128 f tobechecked \N +59129 f tobechecked \N +59130 f tobechecked \N +59131 f tobechecked \N +59132 f tobechecked \N +59134 f tobechecked \N +59150 f tobechecked \N +59153 f tobechecked \N +59184 f tobechecked \N +59189 f tobechecked \N +59199 f tobechecked \N +59222 f tobechecked \N +59230 t tobechecked \N +59231 t tobechecked \N +59232 t tobechecked \N +59233 t tobechecked \N +59234 t tobechecked \N +59235 f tobechecked \N +59236 t tobechecked \N +59237 t tobechecked \N +59238 t tobechecked \N +59239 t tobechecked \N +59253 t tobechecked \N +59254 t tobechecked \N +59255 t tobechecked \N +59256 t tobechecked \N +59257 t tobechecked \N +59258 t tobechecked \N +59264 f tobechecked \N +59273 t tobechecked \N +59288 t tobechecked \N +59292 t tobechecked \N +59297 t tobechecked \N +59298 t tobechecked \N +59311 t tobechecked \N +59312 t tobechecked \N +59313 t tobechecked \N +59317 t tobechecked \N +59324 t tobechecked \N +59325 t tobechecked \N +59351 t tobechecked \N +59353 t tobechecked \N +59364 f tobechecked \N +59365 t tobechecked \N +59368 t tobechecked \N +59369 f tobechecked \N +59372 t tobechecked \N +59383 f tobechecked \N +59396 t tobechecked \N +59397 t tobechecked \N +59400 t tobechecked \N +59416 t tobechecked \N +59417 t tobechecked \N +59418 t tobechecked \N +59426 t tobechecked \N +59430 f tobechecked \N +59431 f tobechecked \N +59432 f tobechecked \N +59433 f tobechecked \N +59437 f tobechecked \N +59438 f tobechecked \N +59439 f tobechecked \N +59440 f tobechecked \N +59441 f tobechecked \N +59442 f tobechecked \N +59451 f tobechecked \N +59462 f tobechecked \N +59464 t tobechecked \N +59467 t tobechecked \N +59468 t tobechecked \N +59469 t tobechecked \N +59470 t tobechecked \N +59471 t tobechecked \N +59472 t tobechecked \N +59473 t tobechecked \N +59474 t tobechecked \N +59475 t tobechecked \N +59476 t tobechecked \N +59477 t tobechecked \N +59478 t tobechecked \N +59479 t tobechecked \N +59480 t tobechecked \N +59481 t tobechecked \N +59482 t tobechecked \N +59483 t tobechecked \N +59484 t tobechecked \N +59485 t tobechecked \N +59486 t tobechecked \N +59487 t tobechecked \N +59488 t tobechecked \N +59489 t tobechecked \N +59490 t tobechecked \N +59496 t tobechecked \N +59497 t tobechecked \N +59498 f tobechecked \N +59499 t tobechecked \N +59500 t tobechecked \N +59501 t tobechecked \N +59502 t tobechecked \N +59507 t tobechecked \N +59508 t tobechecked \N +59511 t tobechecked \N +59512 t tobechecked \N +59515 t tobechecked \N +59517 f tobechecked \N +59518 f tobechecked \N +59520 t tobechecked \N +59523 f tobechecked \N +59524 f tobechecked \N +59525 t tobechecked \N +59526 t tobechecked \N +59527 t tobechecked \N +59528 t tobechecked \N +59529 t tobechecked \N +59530 t tobechecked \N +59531 t tobechecked \N +59533 t tobechecked \N +59534 t tobechecked \N +59536 t tobechecked \N +59539 t tobechecked \N +59540 t tobechecked \N +59542 t tobechecked \N +59544 t tobechecked \N +59546 t tobechecked \N +59547 t tobechecked \N +59549 t tobechecked \N +59550 t tobechecked \N +59551 t tobechecked \N +59552 t tobechecked \N +59553 t tobechecked \N +59554 t tobechecked \N +59555 t tobechecked \N +59556 t tobechecked \N +59558 t tobechecked \N +59560 t tobechecked \N +59561 t tobechecked \N +59563 t tobechecked \N +59564 t tobechecked \N +59565 t tobechecked \N +59566 t tobechecked \N +59567 t tobechecked \N +59568 t tobechecked \N +59569 t tobechecked \N +59570 t tobechecked \N +59571 t tobechecked \N +59572 t tobechecked \N +59573 t tobechecked \N +59576 f tobechecked \N +59581 t tobechecked \N +59593 t tobechecked \N +59594 t tobechecked \N +59595 t tobechecked \N +59596 t tobechecked \N +59597 t tobechecked \N +59598 t tobechecked \N +59599 t tobechecked \N +59600 t tobechecked \N +59601 t tobechecked \N +59604 t tobechecked \N +59609 f tobechecked \N +59610 f tobechecked \N +59611 f tobechecked \N +59612 f tobechecked \N +59613 f tobechecked \N +59614 f tobechecked \N +59615 f tobechecked \N +59616 f tobechecked \N +59617 f tobechecked \N +59618 f tobechecked \N +59619 f tobechecked \N +59620 f tobechecked \N +59621 f tobechecked \N +59622 f tobechecked \N +59623 f tobechecked \N +59624 f tobechecked \N +59625 f tobechecked \N +59626 f tobechecked \N +59627 f tobechecked \N +59628 f tobechecked \N +59629 f tobechecked \N +59630 f tobechecked \N +59631 f tobechecked \N +59632 f tobechecked \N +59633 f tobechecked \N +59634 f tobechecked \N +59635 f tobechecked \N +59636 f tobechecked \N +59637 f tobechecked \N +59638 f tobechecked \N +59639 f tobechecked \N +59640 f tobechecked \N +59641 f tobechecked \N +59642 f tobechecked \N +59643 f tobechecked \N +59644 f tobechecked \N +59645 f tobechecked \N +59646 f tobechecked \N +59647 f tobechecked \N +59648 f tobechecked \N +59649 f tobechecked \N +59650 f tobechecked \N +59651 f tobechecked \N +59652 f tobechecked \N +59678 t tobechecked \N +59688 t tobechecked \N +59697 f tobechecked \N +59720 t tobechecked \N +59721 t tobechecked \N +59722 t tobechecked \N +59723 t tobechecked \N +59725 t tobechecked \N +59726 t tobechecked \N +59727 t tobechecked \N +59728 t tobechecked \N +59729 t tobechecked \N +59730 t tobechecked \N +59731 t tobechecked \N +59732 t tobechecked \N +59733 t tobechecked \N +59734 t tobechecked \N +59735 t tobechecked \N +59736 t tobechecked \N +59737 t tobechecked \N +59738 t tobechecked \N +59739 t tobechecked \N +59740 t tobechecked \N +59741 t tobechecked \N +59742 t tobechecked \N +59743 t tobechecked \N +59744 t tobechecked \N +59745 t tobechecked \N +59746 t tobechecked \N +59747 t tobechecked \N +59748 t tobechecked \N +59749 t tobechecked \N +59750 t tobechecked \N +59751 t tobechecked \N +59752 t tobechecked \N +59753 t tobechecked \N +59754 t tobechecked \N +59755 t tobechecked \N +59756 t tobechecked \N +59757 t tobechecked \N +59758 t tobechecked \N +59759 t tobechecked \N +59760 t tobechecked \N +59761 f tobechecked \N +59762 t tobechecked \N +59763 t tobechecked \N +59764 t tobechecked \N +59765 t tobechecked \N +59766 t tobechecked \N +59767 t tobechecked \N +59778 t tobechecked \N +59779 t tobechecked \N +59781 t tobechecked \N +59785 t tobechecked \N +59792 f tobechecked \N +59812 f tobechecked \N +59813 f tobechecked \N +59814 f tobechecked \N +59815 f tobechecked \N +59817 f tobechecked \N +59820 f tobechecked \N +59822 f tobechecked \N +59831 t tobechecked \N +59835 t tobechecked \N +59836 t tobechecked \N +59837 t tobechecked \N +59847 t tobechecked \N +59848 t tobechecked \N +59855 t tobechecked \N +59858 t tobechecked \N +59860 t tobechecked \N +59864 t tobechecked \N +59870 t tobechecked \N +59875 f tobechecked \N +59876 f tobechecked \N +59877 f tobechecked \N +59878 f tobechecked \N +59879 f tobechecked \N +59880 f tobechecked \N +59881 f tobechecked \N +59882 f tobechecked \N +59883 f tobechecked \N +59884 f tobechecked \N +59885 f tobechecked \N +59886 f tobechecked \N +59887 f tobechecked \N +59888 f tobechecked \N +59889 f tobechecked \N +59890 f tobechecked \N +59891 f tobechecked \N +59892 f tobechecked \N +59893 f tobechecked \N +59894 f tobechecked \N +59895 f tobechecked \N +59896 f tobechecked \N +59897 f tobechecked \N +59898 f tobechecked \N +59899 f tobechecked \N +59900 f tobechecked \N +59901 f tobechecked \N +59902 f tobechecked \N +59903 f tobechecked \N +59904 f tobechecked \N +59907 t tobechecked \N +59908 t tobechecked \N +59909 t tobechecked \N +59914 t tobechecked \N +59916 t tobechecked \N +59917 t tobechecked \N +59918 t tobechecked \N +59919 t tobechecked \N +59920 t tobechecked \N +59921 t tobechecked \N +59922 t tobechecked \N +59923 t tobechecked \N +59924 t tobechecked \N +59925 t tobechecked \N +59926 t tobechecked \N +59927 t tobechecked \N +59928 t tobechecked \N +59929 t tobechecked \N +59930 t tobechecked \N +59931 t tobechecked \N +59939 t tobechecked \N +59961 t tobechecked \N +59971 t tobechecked \N +60009 f tobechecked \N +60063 f tobechecked \N +60070 f tobechecked \N +60075 f tobechecked \N +60079 t tobechecked \N +60083 t tobechecked \N +60086 t tobechecked \N +60088 t tobechecked \N +60089 f tobechecked \N +60090 f tobechecked \N +60091 f tobechecked \N +60092 f tobechecked \N +60093 f tobechecked \N +60098 t tobechecked \N +60099 t tobechecked \N +60100 t tobechecked \N +60101 t tobechecked \N +60102 t tobechecked \N +60106 t tobechecked \N +60107 t tobechecked \N +60112 t tobechecked \N +60113 t tobechecked \N +60114 t tobechecked \N +60115 t tobechecked \N +60116 t tobechecked \N +60117 t tobechecked \N +60118 t tobechecked \N +60119 t tobechecked \N +60121 t tobechecked \N +60138 t tobechecked \N +60139 t tobechecked \N +60140 t tobechecked \N +60154 t tobechecked \N +60155 t tobechecked \N +60201 t tobechecked \N +60212 t tobechecked \N +60228 f tobechecked \N +60229 f tobechecked \N +60230 f tobechecked \N +60231 f tobechecked \N +60232 f tobechecked \N +60233 f tobechecked \N +60234 f tobechecked \N +60235 f tobechecked \N +60236 f tobechecked \N +60237 t tobechecked \N +60238 t tobechecked \N +60239 t tobechecked \N +60240 t tobechecked \N +60241 t tobechecked \N +60242 t tobechecked \N +60243 t tobechecked \N +60244 t tobechecked \N +60245 t tobechecked \N +60246 t tobechecked \N +60247 t tobechecked \N +60248 t tobechecked \N +60249 t tobechecked \N +60250 t tobechecked \N +60251 t tobechecked \N +60252 t tobechecked \N +60253 t tobechecked \N +60254 t tobechecked \N +60255 t tobechecked \N +60256 t tobechecked \N +60257 t tobechecked \N +60258 t tobechecked \N +60259 t tobechecked \N +60260 t tobechecked \N +60261 t tobechecked \N +60262 t tobechecked \N +60263 t tobechecked \N +60264 t tobechecked \N +60265 t tobechecked \N +60266 t tobechecked \N +60267 t tobechecked \N +60268 t tobechecked \N +60269 t tobechecked \N +60270 t tobechecked \N +60271 t tobechecked \N +60272 t tobechecked \N +60273 t tobechecked \N +60274 t tobechecked \N +60275 t tobechecked \N +60276 t tobechecked \N +60277 t tobechecked \N +60278 t tobechecked \N +60279 t tobechecked \N +60280 t tobechecked \N +60281 t tobechecked \N +60282 t tobechecked \N +60283 t tobechecked \N +60284 t tobechecked \N +60285 t tobechecked \N +60286 t tobechecked \N +60287 t tobechecked \N +60288 t tobechecked \N +60289 t tobechecked \N +60290 t tobechecked \N +60291 t tobechecked \N +60292 t tobechecked \N +60293 t tobechecked \N +60294 t tobechecked \N +60304 t tobechecked \N +60307 f tobechecked \N +60317 t tobechecked \N +60327 t tobechecked \N +60337 f tobechecked \N +60340 f tobechecked \N +60345 t tobechecked \N +60350 t tobechecked \N +60080 t tobechecked \N +60351 t tobechecked \N +60358 t tobechecked \N +60388 t tobechecked \N +60403 f tobechecked \N +60404 t tobechecked \N +60405 t tobechecked \N +60406 t tobechecked \N +60407 t tobechecked \N +60408 t tobechecked \N +60409 t tobechecked \N +60429 t tobechecked \N +60433 t tobechecked \N +60444 t tobechecked \N +60447 t tobechecked \N +60451 t tobechecked \N +60463 t tobechecked \N +60474 t tobechecked \N +60488 t tobechecked \N +60492 t tobechecked \N +60493 f tobechecked \N +60501 t tobechecked \N +60515 f tobechecked \N +60517 f tobechecked \N +60525 f tobechecked \N +60531 f tobechecked \N +60532 f tobechecked \N +60533 f tobechecked \N +60534 f tobechecked \N +60538 f tobechecked \N +60549 f tobechecked \N +60576 t tobechecked \N +60578 t tobechecked \N +60580 t tobechecked \N +60582 t tobechecked \N +60583 t tobechecked \N +60584 t tobechecked \N +60589 t tobechecked \N +60590 t tobechecked \N +60591 t tobechecked \N +60592 t tobechecked \N +60593 t tobechecked \N +60594 t tobechecked \N +60595 t tobechecked \N +60596 t tobechecked \N +60599 t tobechecked \N +60602 t tobechecked \N +60606 t tobechecked \N +60609 t tobechecked \N +60610 t tobechecked \N +60611 t tobechecked \N +60613 t tobechecked \N +60614 t tobechecked \N +60615 t tobechecked \N +60616 t tobechecked \N +60617 t tobechecked \N +60618 t tobechecked \N +60619 t tobechecked \N +60620 t tobechecked \N +60621 t tobechecked \N +60622 t tobechecked \N +60623 t tobechecked \N +60624 t tobechecked \N +60625 t tobechecked \N +60626 t tobechecked \N +60627 t tobechecked \N +60628 t tobechecked \N +60629 t tobechecked \N +60630 t tobechecked \N +60631 t tobechecked \N +60632 t tobechecked \N +60633 t tobechecked \N +60634 t tobechecked \N +60635 t tobechecked \N +60636 t tobechecked \N +60637 t tobechecked \N +60638 t tobechecked \N +60641 t tobechecked \N +60653 t tobechecked \N +60665 t tobechecked \N +60684 t tobechecked \N +60685 f tobechecked \N +60686 f tobechecked \N +60687 f tobechecked \N +60688 f tobechecked \N +60689 f tobechecked \N +60690 f tobechecked \N +60691 f tobechecked \N +60692 f tobechecked \N +60693 f tobechecked \N +60694 f tobechecked \N +60695 f tobechecked \N +60696 f tobechecked \N +60697 f tobechecked \N +60698 f tobechecked \N +60699 f tobechecked \N +60700 f tobechecked \N +60718 t tobechecked \N +60719 t tobechecked \N +60720 t tobechecked \N +60721 t tobechecked \N +60722 t tobechecked \N +60723 t tobechecked \N +60724 t tobechecked \N +60725 t tobechecked \N +60727 t tobechecked \N +60728 t tobechecked \N +60729 t tobechecked \N +60730 t tobechecked \N +60731 t tobechecked \N +60732 t tobechecked \N +60733 t tobechecked \N +60739 t tobechecked \N +60740 t tobechecked \N +60741 t tobechecked \N +60742 t tobechecked \N +60745 t tobechecked \N +60753 f tobechecked \N +60762 f tobechecked \N +60763 f tobechecked \N +60764 f tobechecked \N +60776 f tobechecked \N +60777 f tobechecked \N +60780 f tobechecked \N +60781 f tobechecked \N +60785 f tobechecked \N +60792 f tobechecked \N +60806 f tobechecked \N +60842 t tobechecked \N +60843 t tobechecked \N +60844 t tobechecked \N +60845 t tobechecked \N +60846 f tobechecked \N +60847 f tobechecked \N +60848 f tobechecked \N +60853 t tobechecked \N +60854 t tobechecked \N +60868 t tobechecked \N +60869 t tobechecked \N +60870 t tobechecked \N +60872 t tobechecked \N +60873 f tobechecked \N +60874 t tobechecked \N +60875 t tobechecked \N +60876 t tobechecked \N +60879 t tobechecked \N +60880 t tobechecked \N +60884 t tobechecked \N +60885 t tobechecked \N +60886 t tobechecked \N +60907 t tobechecked \N +60923 t tobechecked \N +60969 t tobechecked \N +60970 t tobechecked \N +60971 t tobechecked \N +60973 t tobechecked \N +60976 t tobechecked \N +60979 t tobechecked \N +60992 t tobechecked \N +60993 t tobechecked \N +60994 t tobechecked \N +60995 t tobechecked \N +60996 t tobechecked \N +60997 t tobechecked \N +60998 t tobechecked \N +60999 t tobechecked \N +61000 t tobechecked \N +61001 t tobechecked \N +61002 t tobechecked \N +61003 t tobechecked \N +61004 t tobechecked \N +61005 t tobechecked \N +61006 t tobechecked \N +61007 t tobechecked \N +61008 t tobechecked \N +61009 t tobechecked \N +61010 t tobechecked \N +61011 t tobechecked \N +61012 t tobechecked \N +61014 f tobechecked \N +61015 t tobechecked \N +61016 f tobechecked \N +61017 t tobechecked \N +61019 f tobechecked \N +61020 t tobechecked \N +61021 t tobechecked \N +61030 t tobechecked \N +61031 t tobechecked \N +61032 t tobechecked \N +61035 t tobechecked \N +61039 f tobechecked \N +61041 t tobechecked \N +61049 t tobechecked \N +61055 t tobechecked \N +61056 t tobechecked \N +61058 t tobechecked \N +61059 t tobechecked \N +61060 t tobechecked \N +61062 f tobechecked \N +61065 t tobechecked \N +61068 t tobechecked \N +61073 t tobechecked \N +61075 t tobechecked \N +61078 t tobechecked \N +61079 t tobechecked \N +61080 t tobechecked \N +61087 t tobechecked \N +61089 t tobechecked \N +61090 t tobechecked \N +61105 t tobechecked \N +61109 t tobechecked \N +61115 t tobechecked \N +61141 f tobechecked \N +61142 f tobechecked \N +61143 f tobechecked \N +61145 f tobechecked \N +61146 f tobechecked \N +61147 f tobechecked \N +61148 f tobechecked \N +61149 f tobechecked \N +61150 f tobechecked \N +61151 f tobechecked \N +61152 f tobechecked \N +61153 f tobechecked \N +61154 f tobechecked \N +61155 f tobechecked \N +61156 f tobechecked \N +61157 f tobechecked \N +61158 f tobechecked \N +61159 f tobechecked \N +61160 f tobechecked \N +61209 t tobechecked \N +61213 t tobechecked \N +61224 t tobechecked \N +61225 f tobechecked \N +61226 f tobechecked \N +61227 f tobechecked \N +61228 f tobechecked \N +61229 f tobechecked \N +61230 f tobechecked \N +61278 f tobechecked \N +61280 t tobechecked \N +61281 t tobechecked \N +61284 t tobechecked \N +61288 t tobechecked \N +61289 t tobechecked \N +61296 t tobechecked \N +61310 t tobechecked \N +61313 t tobechecked \N +61315 t tobechecked \N +61316 t tobechecked \N +61317 t tobechecked \N +61318 t tobechecked \N +61319 t tobechecked \N +61320 t tobechecked \N +61322 t tobechecked \N +61323 t tobechecked \N +61324 t tobechecked \N +61325 t tobechecked \N +61326 t tobechecked \N +61327 t tobechecked \N +61328 t tobechecked \N +61329 t tobechecked \N +61330 t tobechecked \N +61331 t tobechecked \N +61332 t tobechecked \N +61333 t tobechecked \N +61334 t tobechecked \N +61335 t tobechecked \N +61336 t tobechecked \N +61337 t tobechecked \N +61338 t tobechecked \N +61341 t tobechecked \N +61343 t tobechecked \N +61345 t tobechecked \N +61346 t tobechecked \N +61347 t tobechecked \N +61348 t tobechecked \N +61349 t tobechecked \N +61350 t tobechecked \N +61351 t tobechecked \N +61352 t tobechecked \N +61353 t tobechecked \N +61354 t tobechecked \N +61355 t tobechecked \N +61356 t tobechecked \N +61357 t tobechecked \N +61358 t tobechecked \N +61359 t tobechecked \N +61361 t tobechecked \N +61364 t tobechecked \N +61369 t tobechecked \N +61370 t tobechecked \N +61372 t tobechecked \N +61373 t tobechecked \N +61374 t tobechecked \N +61375 t tobechecked \N +61377 t tobechecked \N +61380 t tobechecked \N +61381 t tobechecked \N +61383 t tobechecked \N +61384 t tobechecked \N +61386 t tobechecked \N +61387 t tobechecked \N +61388 t tobechecked \N +61389 t tobechecked \N +61396 t tobechecked \N +61402 t tobechecked \N +61403 t tobechecked \N +61404 t tobechecked \N +61405 t tobechecked \N +61406 t tobechecked \N +61407 t tobechecked \N +61411 t tobechecked \N +61412 t tobechecked \N +61413 t tobechecked \N +61414 t tobechecked \N +61416 t tobechecked \N +61428 t tobechecked \N +61429 t tobechecked \N +61439 t tobechecked \N +61442 t tobechecked \N +61443 t tobechecked \N +61444 t tobechecked \N +61445 t tobechecked \N +61446 t tobechecked \N +61447 t tobechecked \N +61448 t tobechecked \N +61449 t tobechecked \N +61451 t tobechecked \N +61452 t tobechecked \N +61454 t tobechecked \N +61457 t tobechecked \N +61458 t tobechecked \N +61459 t tobechecked \N +61460 t tobechecked \N +61461 t tobechecked \N +61462 t tobechecked \N +61463 t tobechecked \N +61464 t tobechecked \N +61471 f tobechecked \N +61472 f tobechecked \N +61473 f tobechecked \N +61474 f tobechecked \N +61475 f tobechecked \N +61476 f tobechecked \N +61477 f tobechecked \N +61478 f tobechecked \N +61479 f tobechecked \N +61480 f tobechecked \N +61481 f tobechecked \N +61482 f tobechecked \N +61483 f tobechecked \N +61484 f tobechecked \N +61485 f tobechecked \N +61486 f tobechecked \N +61487 f tobechecked \N +61488 f tobechecked \N +61489 f tobechecked \N +61490 f tobechecked \N +61491 f tobechecked \N +61492 f tobechecked \N +61493 f tobechecked \N +61494 f tobechecked \N +61495 f tobechecked \N +61496 f tobechecked \N +61497 f tobechecked \N +61498 f tobechecked \N +61499 f tobechecked \N +61500 f tobechecked \N +61501 f tobechecked \N +61502 f tobechecked \N +61503 f tobechecked \N +61504 f tobechecked \N +61505 f tobechecked \N +61506 f tobechecked \N +61507 f tobechecked \N +61508 f tobechecked \N +61509 f tobechecked \N +61510 f tobechecked \N +61511 f tobechecked \N +61512 f tobechecked \N +61513 f tobechecked \N +61514 f tobechecked \N +61515 f tobechecked \N +61516 f tobechecked \N +61517 f tobechecked \N +61518 f tobechecked \N +61519 f tobechecked \N +61520 f tobechecked \N +61521 f tobechecked \N +61522 f tobechecked \N +61523 f tobechecked \N +61524 f tobechecked \N +61525 f tobechecked \N +61526 f tobechecked \N +61527 f tobechecked \N +61528 f tobechecked \N +61529 f tobechecked \N +61530 f tobechecked \N +61531 f tobechecked \N +61532 f tobechecked \N +61533 f tobechecked \N +61534 f tobechecked \N +61535 f tobechecked \N +61536 f tobechecked \N +61537 f tobechecked \N +61538 f tobechecked \N +61539 f tobechecked \N +61540 f tobechecked \N +61541 f tobechecked \N +61542 f tobechecked \N +61543 f tobechecked \N +61544 f tobechecked \N +61545 f tobechecked \N +61546 f tobechecked \N +61547 f tobechecked \N +61548 f tobechecked \N +61549 f tobechecked \N +61550 f tobechecked \N +61551 f tobechecked \N +61552 t tobechecked \N +61553 t tobechecked \N +61554 t tobechecked \N +61555 t tobechecked \N +61556 t tobechecked \N +61557 t tobechecked \N +61558 t tobechecked \N +61559 t tobechecked \N +61560 t tobechecked \N +61561 t tobechecked \N +61562 t tobechecked \N +61563 t tobechecked \N +61564 t tobechecked \N +61565 t tobechecked \N +61566 t tobechecked \N +61567 t tobechecked \N +61568 t tobechecked \N +61569 t tobechecked \N +61570 t tobechecked \N +61571 t tobechecked \N +61572 t tobechecked \N +61573 t tobechecked \N +61574 t tobechecked \N +61575 t tobechecked \N +61576 t tobechecked \N +61577 t tobechecked \N +61578 t tobechecked \N +61579 t tobechecked \N +61580 t tobechecked \N +61581 t tobechecked \N +61582 t tobechecked \N +61583 t tobechecked \N +61584 t tobechecked \N +61585 t tobechecked \N +61586 t tobechecked \N +61587 t tobechecked \N +61588 t tobechecked \N +61589 t tobechecked \N +61590 t tobechecked \N +61591 f tobechecked \N +61592 t tobechecked \N +61593 t tobechecked \N +61594 t tobechecked \N +61595 t tobechecked \N +61596 t tobechecked \N +61597 t tobechecked \N +61598 t tobechecked \N +61599 t tobechecked \N +61600 t tobechecked \N +61601 t tobechecked \N +61602 t tobechecked \N +61603 t tobechecked \N +61604 t tobechecked \N +61605 t tobechecked \N +61606 t tobechecked \N +61607 t tobechecked \N +61608 t tobechecked \N +61609 t tobechecked \N +61610 t tobechecked \N +61611 t tobechecked \N +61612 t tobechecked \N +61613 t tobechecked \N +61614 t tobechecked \N +61615 t tobechecked \N +61616 t tobechecked \N +61617 t tobechecked \N +61618 t tobechecked \N +61619 t tobechecked \N +61620 t tobechecked \N +61621 t tobechecked \N +61622 t tobechecked \N +61623 t tobechecked \N +61624 t tobechecked \N +61625 t tobechecked \N +61626 t tobechecked \N +61627 t tobechecked \N +61628 t tobechecked \N +61629 t tobechecked \N +61630 t tobechecked \N +61631 t tobechecked \N +61632 t tobechecked \N +61633 t tobechecked \N +61634 t tobechecked \N +61644 t tobechecked \N +61645 t tobechecked \N +61648 t tobechecked \N +61651 t tobechecked \N +61652 t tobechecked \N +61653 t tobechecked \N +61654 t tobechecked \N +61655 t tobechecked \N +61656 t tobechecked \N +61663 t tobechecked \N +61667 t tobechecked \N +61668 f tobechecked \N +61669 t tobechecked \N +61670 t tobechecked \N +61671 t tobechecked \N +61673 t tobechecked \N +61674 t tobechecked \N +61675 t tobechecked \N +61676 t tobechecked \N +61681 t tobechecked \N +61682 t tobechecked \N +61683 t tobechecked \N +61684 t tobechecked \N +61694 t tobechecked \N +61702 t tobechecked \N +61707 t tobechecked \N +61708 t tobechecked \N +61712 t tobechecked \N +61713 t tobechecked \N +61724 t tobechecked \N +61725 t tobechecked \N +61747 f tobechecked \N +61763 t tobechecked \N +61764 t tobechecked \N +61765 t tobechecked \N +61766 t tobechecked \N +61767 t tobechecked \N +61768 t tobechecked \N +61769 t tobechecked \N +61770 t tobechecked \N +61771 t tobechecked \N +61772 t tobechecked \N +61773 t tobechecked \N +61774 t tobechecked \N +61775 t tobechecked \N +61776 t tobechecked \N +61777 t tobechecked \N +61778 t tobechecked \N +61779 t tobechecked \N +61780 t tobechecked \N +61781 t tobechecked \N +61782 t tobechecked \N +61783 t tobechecked \N +61784 t tobechecked \N +61786 t tobechecked \N +61787 t tobechecked \N +61788 t tobechecked \N +61789 t tobechecked \N +61790 t tobechecked \N +61819 t tobechecked \N +61882 t tobechecked \N +61885 t tobechecked \N +61887 t tobechecked \N +61897 t tobechecked \N +61941 t tobechecked \N +61942 t tobechecked \N +61965 t tobechecked \N +61972 f tobechecked \N +61973 f tobechecked \N +61974 f tobechecked \N +61975 f tobechecked \N +61976 f tobechecked \N +61977 f tobechecked \N +61978 f tobechecked \N +61979 f tobechecked \N +61980 f tobechecked \N +61981 f tobechecked \N +61982 f tobechecked \N +61983 f tobechecked \N +61984 f tobechecked \N +61985 f tobechecked \N +61986 f tobechecked \N +61987 f tobechecked \N +61988 f tobechecked \N +61989 f tobechecked \N +61990 f tobechecked \N +61991 f tobechecked \N +61992 f tobechecked \N +61993 f tobechecked \N +61994 f tobechecked \N +61995 f tobechecked \N +61996 f tobechecked \N +61997 f tobechecked \N +61998 f tobechecked \N +61999 f tobechecked \N +62000 f tobechecked \N +62001 f tobechecked \N +62002 f tobechecked \N +62003 f tobechecked \N +62004 f tobechecked \N +62005 f tobechecked \N +62006 f tobechecked \N +62007 f tobechecked \N +62008 f tobechecked \N +62025 t tobechecked \N +62069 f tobechecked \N +62070 f tobechecked \N +62071 f tobechecked \N +62072 f tobechecked \N +62073 f tobechecked \N +62074 f tobechecked \N +62075 f tobechecked \N +62076 f tobechecked \N +62077 f tobechecked \N +62078 f tobechecked \N +62079 f tobechecked \N +62080 f tobechecked \N +62081 f tobechecked \N +62082 f tobechecked \N +62083 f tobechecked \N +62084 f tobechecked \N +62085 f tobechecked \N +62086 f tobechecked \N +62087 f tobechecked \N +62088 f tobechecked \N +62089 f tobechecked \N +62090 f tobechecked \N +62091 f tobechecked \N +62092 f tobechecked \N +62093 f tobechecked \N +62094 f tobechecked \N +62095 t tobechecked \N +62096 t tobechecked \N +62097 t tobechecked \N +62098 t tobechecked \N +62099 f tobechecked \N +62131 f tobechecked \N +62132 f tobechecked \N +62133 f tobechecked \N +62134 f tobechecked \N +62135 f tobechecked \N +62136 f tobechecked \N +62137 f tobechecked \N +62138 f tobechecked \N +62139 f tobechecked \N +62140 f tobechecked \N +62141 f tobechecked \N +62142 f tobechecked \N +62144 t tobechecked \N +62148 t tobechecked \N +62157 t tobechecked \N +62163 t tobechecked \N +62166 t tobechecked \N +62168 t tobechecked \N +62170 t tobechecked \N +62171 t tobechecked \N +62172 t tobechecked \N +62198 t tobechecked \N +62199 t tobechecked \N +62201 t tobechecked \N +62202 t tobechecked \N +62203 t tobechecked \N +62204 t tobechecked \N +62205 t tobechecked \N +62207 t tobechecked \N +62208 t tobechecked \N +62209 t tobechecked \N +62210 f tobechecked \N +62211 f tobechecked \N +62212 f tobechecked \N +62213 f tobechecked \N +62214 f tobechecked \N +62215 f tobechecked \N +62216 f tobechecked \N +62217 f tobechecked \N +62218 f tobechecked \N +62219 f tobechecked \N +62220 f tobechecked \N +62221 f tobechecked \N +62222 f tobechecked \N +62223 f tobechecked \N +62224 f tobechecked \N +62225 f tobechecked \N +62226 f tobechecked \N +62227 t tobechecked \N +62231 t tobechecked \N +62232 t tobechecked \N +62233 t tobechecked \N +62234 t tobechecked \N +62235 t tobechecked \N +62236 t tobechecked \N +62237 t tobechecked \N +62238 t tobechecked \N +62239 t tobechecked \N +62240 t tobechecked \N +62241 t tobechecked \N +62242 t tobechecked \N +62243 t tobechecked \N +62244 t tobechecked \N +62245 t tobechecked \N +62246 t tobechecked \N +62247 t tobechecked \N +62248 t tobechecked \N +62249 t tobechecked \N +62250 t tobechecked \N +62251 t tobechecked \N +62252 t tobechecked \N +62254 t tobechecked \N +62255 t tobechecked \N +62256 t tobechecked \N +62257 t tobechecked \N +62258 t tobechecked \N +62259 t tobechecked \N +62260 t tobechecked \N +62261 t tobechecked \N +62262 t tobechecked \N +62309 t tobechecked \N +62325 t tobechecked \N +62334 t tobechecked \N +62339 t tobechecked \N +62369 t tobechecked \N +62370 t tobechecked \N +62378 t tobechecked \N +62402 t tobechecked \N +62409 t tobechecked \N +62438 t tobechecked \N +62444 t tobechecked \N +62454 t tobechecked \N +62459 t tobechecked \N +62460 t tobechecked \N +62470 t tobechecked \N +62486 t tobechecked \N +62504 f tobechecked \N +62505 f tobechecked \N +62506 f tobechecked \N +62507 f tobechecked \N +62508 f tobechecked \N +62509 f tobechecked \N +62510 f tobechecked \N +62511 f tobechecked \N +62512 f tobechecked \N +62513 f tobechecked \N +62514 f tobechecked \N +62515 f tobechecked \N +62516 f tobechecked \N +62517 f tobechecked \N +62518 f tobechecked \N +62519 f tobechecked \N +62520 f tobechecked \N +62521 f tobechecked \N +62522 f tobechecked \N +62523 f tobechecked \N +62524 f tobechecked \N +62525 f tobechecked \N +62526 f tobechecked \N +62527 f tobechecked \N +62528 f tobechecked \N +62529 f tobechecked \N +62530 f tobechecked \N +62531 f tobechecked \N +62532 f tobechecked \N +62533 f tobechecked \N +62534 f tobechecked \N +62535 f tobechecked \N +62536 f tobechecked \N +62537 f tobechecked \N +62538 f tobechecked \N +62539 f tobechecked \N +62540 f tobechecked \N +62541 f tobechecked \N +62542 f tobechecked \N +62543 f tobechecked \N +62544 f tobechecked \N +62545 f tobechecked \N +62546 f tobechecked \N +62547 f tobechecked \N +62548 f tobechecked \N +62549 f tobechecked \N +62550 f tobechecked \N +62551 f tobechecked \N +62552 f tobechecked \N +62553 f tobechecked \N +62554 f tobechecked \N +62555 f tobechecked \N +62556 f tobechecked \N +62557 f tobechecked \N +62558 f tobechecked \N +62559 f tobechecked \N +62560 f tobechecked \N +62561 f tobechecked \N +62562 f tobechecked \N +62563 f tobechecked \N +62564 f tobechecked \N +62565 f tobechecked \N +62566 f tobechecked \N +62567 f tobechecked \N +62568 f tobechecked \N +62569 f tobechecked \N +62570 f tobechecked \N +62571 f tobechecked \N +62572 f tobechecked \N +62573 f tobechecked \N +62574 f tobechecked \N +62575 f tobechecked \N +62576 f tobechecked \N +62577 f tobechecked \N +62578 f tobechecked \N +62579 f tobechecked \N +62580 f tobechecked \N +62581 f tobechecked \N +62582 f tobechecked \N +62583 f tobechecked \N +62584 f tobechecked \N +62585 f tobechecked \N +62586 f tobechecked \N +62587 f tobechecked \N +62588 f tobechecked \N +62589 f tobechecked \N +62590 f tobechecked \N +62591 f tobechecked \N +62592 f tobechecked \N +62593 f tobechecked \N +62594 f tobechecked \N +62597 f tobechecked \N +62600 f tobechecked \N +62601 f tobechecked \N +62610 f tobechecked \N +62615 f tobechecked \N +62617 f tobechecked \N +62648 f tobechecked \N +62662 t tobechecked \N +62667 f tobechecked \N +62668 f tobechecked \N +62669 f tobechecked \N +62670 f tobechecked \N +62671 f tobechecked \N +62672 f tobechecked \N +62673 f tobechecked \N +62674 f tobechecked \N +62675 f tobechecked \N +62676 f tobechecked \N +62677 f tobechecked \N +62678 f tobechecked \N +62679 f tobechecked \N +62680 f tobechecked \N +62681 f tobechecked \N +62682 f tobechecked \N +62683 f tobechecked \N +62684 f tobechecked \N +62685 f tobechecked \N +62686 f tobechecked \N +62687 f tobechecked \N +62688 f tobechecked \N +62689 f tobechecked \N +62690 f tobechecked \N +62691 f tobechecked \N +62692 f tobechecked \N +62693 f tobechecked \N +62694 f tobechecked \N +62695 f tobechecked \N +62696 f tobechecked \N +62697 f tobechecked \N +62698 f tobechecked \N +62699 f tobechecked \N +62700 f tobechecked \N +62701 f tobechecked \N +62702 f tobechecked \N +62703 f tobechecked \N +62704 f tobechecked \N +62705 f tobechecked \N +62706 f tobechecked \N +62707 f tobechecked \N +62708 f tobechecked \N +62709 f tobechecked \N +62710 f tobechecked \N +62711 f tobechecked \N +62712 f tobechecked \N +62713 f tobechecked \N +62714 f tobechecked \N +62715 f tobechecked \N +62716 f tobechecked \N +62717 f tobechecked \N +62718 f tobechecked \N +62719 f tobechecked \N +62720 f tobechecked \N +62721 f tobechecked \N +62722 f tobechecked \N +62723 f tobechecked \N +62724 f tobechecked \N +62725 f tobechecked \N +62726 f tobechecked \N +62727 f tobechecked \N +62728 f tobechecked \N +62729 f tobechecked \N +62730 f tobechecked \N +62731 f tobechecked \N +62732 f tobechecked \N +62733 f tobechecked \N +62734 f tobechecked \N +62735 f tobechecked \N +62736 f tobechecked \N +62737 f tobechecked \N +62738 f tobechecked \N +62739 f tobechecked \N +62740 f tobechecked \N +62741 f tobechecked \N +62742 f tobechecked \N +62743 f tobechecked \N +62744 f tobechecked \N +62745 f tobechecked \N +62746 f tobechecked \N +62747 f tobechecked \N +62748 f tobechecked \N +62749 f tobechecked \N +62750 f tobechecked \N +62751 f tobechecked \N +62752 f tobechecked \N +62753 f tobechecked \N +62754 f tobechecked \N +62755 f tobechecked \N +62756 f tobechecked \N +62757 f tobechecked \N +62758 f tobechecked \N +62759 f tobechecked \N +62760 f tobechecked \N +62761 f tobechecked \N +62762 f tobechecked \N +62763 f tobechecked \N +62764 f tobechecked \N +62765 f tobechecked \N +62766 f tobechecked \N +62767 f tobechecked \N +62768 f tobechecked \N +62769 f tobechecked \N +62770 f tobechecked \N +62771 f tobechecked \N +62772 f tobechecked \N +62773 f tobechecked \N +62774 f tobechecked \N +62775 f tobechecked \N +62776 f tobechecked \N +62777 f tobechecked \N +62778 f tobechecked \N +62779 f tobechecked \N +62780 f tobechecked \N +62781 f tobechecked \N +62782 f tobechecked \N +62783 f tobechecked \N +62784 f tobechecked \N +62785 f tobechecked \N +62786 f tobechecked \N +62787 f tobechecked \N +62788 f tobechecked \N +62789 f tobechecked \N +62790 f tobechecked \N +62791 f tobechecked \N +62792 f tobechecked \N +62793 f tobechecked \N +62794 f tobechecked \N +62795 f tobechecked \N +62796 f tobechecked \N +62797 f tobechecked \N +62798 f tobechecked \N +62799 f tobechecked \N +62800 f tobechecked \N +62801 f tobechecked \N +62802 f tobechecked \N +62803 f tobechecked \N +62804 f tobechecked \N +62805 f tobechecked \N +62806 f tobechecked \N +62807 f tobechecked \N +62808 f tobechecked \N +62809 f tobechecked \N +62810 f tobechecked \N +62811 f tobechecked \N +62812 f tobechecked \N +62813 f tobechecked \N +62814 f tobechecked \N +62815 f tobechecked \N +62816 f tobechecked \N +62817 f tobechecked \N +62818 f tobechecked \N +62819 f tobechecked \N +62820 f tobechecked \N +62821 f tobechecked \N +62822 f tobechecked \N +62823 f tobechecked \N +62824 f tobechecked \N +62838 f tobechecked \N +62847 t tobechecked \N +62855 t tobechecked \N +62880 t tobechecked \N +62881 t tobechecked \N +62890 f tobechecked \N +62891 t tobechecked \N +62892 t tobechecked \N +62893 t tobechecked \N +62894 t tobechecked \N +62895 t tobechecked \N +62896 t tobechecked \N +62897 t tobechecked \N +62898 t tobechecked \N +62928 f tobechecked \N +62935 t tobechecked \N +62936 t tobechecked \N +62937 t tobechecked \N +62946 t tobechecked \N +62947 t tobechecked \N +62950 t tobechecked \N +62952 t tobechecked \N +62953 t tobechecked \N +62963 t tobechecked \N +62964 f tobechecked \N +62965 f tobechecked \N +62966 f tobechecked \N +62967 f tobechecked \N +62968 f tobechecked \N +62969 f tobechecked \N +62970 f tobechecked \N +62971 f tobechecked \N +62972 f tobechecked \N +63045 t tobechecked \N +63059 t tobechecked \N +63060 f tobechecked \N +63061 f tobechecked \N +63062 f tobechecked \N +63063 f tobechecked \N +63064 f tobechecked \N +63065 f tobechecked \N +63066 f tobechecked \N +63067 f tobechecked \N +63068 f tobechecked \N +63069 f tobechecked \N +63070 f tobechecked \N +63071 f tobechecked \N +63072 f tobechecked \N +63073 f tobechecked \N +63074 f tobechecked \N +63075 f tobechecked \N +63076 f tobechecked \N +63077 f tobechecked \N +63078 f tobechecked \N +63079 f tobechecked \N +63080 f tobechecked \N +63081 f tobechecked \N +63082 f tobechecked \N +63083 f tobechecked \N +63084 f tobechecked \N +63085 f tobechecked \N +63086 f tobechecked \N +63087 f tobechecked \N +63088 f tobechecked \N +63089 f tobechecked \N +63090 f tobechecked \N +63091 f tobechecked \N +63092 f tobechecked \N +63093 f tobechecked \N +63094 f tobechecked \N +63095 f tobechecked \N +63096 f tobechecked \N +63097 f tobechecked \N +63098 f tobechecked \N +63099 f tobechecked \N +63100 f tobechecked \N +63101 f tobechecked \N +63102 f tobechecked \N +63103 f tobechecked \N +63104 f tobechecked \N +63105 f tobechecked \N +63106 f tobechecked \N +63107 f tobechecked \N +63108 f tobechecked \N +63109 f tobechecked \N +63110 f tobechecked \N +63111 f tobechecked \N +63112 f tobechecked \N +63113 f tobechecked \N +63114 f tobechecked \N +63115 f tobechecked \N +63116 f tobechecked \N +63117 f tobechecked \N +63118 f tobechecked \N +63119 f tobechecked \N +63120 f tobechecked \N +63121 f tobechecked \N +63122 f tobechecked \N +63123 f tobechecked \N +63124 f tobechecked \N +63125 f tobechecked \N +63126 f tobechecked \N +63127 f tobechecked \N +63128 f tobechecked \N +63129 f tobechecked \N +63130 f tobechecked \N +63131 f tobechecked \N +63132 f tobechecked \N +63133 f tobechecked \N +63134 f tobechecked \N +63135 f tobechecked \N +63136 f tobechecked \N +63137 f tobechecked \N +63138 f tobechecked \N +63139 f tobechecked \N +63140 f tobechecked \N +63141 f tobechecked \N +63142 f tobechecked \N +63143 f tobechecked \N +63144 f tobechecked \N +63145 f tobechecked \N +63146 f tobechecked \N +63147 f tobechecked \N +63148 f tobechecked \N +63149 f tobechecked \N +63151 f tobechecked \N +63152 t tobechecked \N +63153 t tobechecked \N +63154 t tobechecked \N +63155 t tobechecked \N +63156 t tobechecked \N +63157 t tobechecked \N +63158 t tobechecked \N +63159 t tobechecked \N +63160 t tobechecked \N +63161 f tobechecked \N +63162 f tobechecked \N +63163 f tobechecked \N +63164 t tobechecked \N +63166 t tobechecked \N +63167 t tobechecked \N +63168 t tobechecked \N +63169 t tobechecked \N +63170 t tobechecked \N +63171 t tobechecked \N +63172 t tobechecked \N +63173 t tobechecked \N +63174 t tobechecked \N +63175 t tobechecked \N +63176 t tobechecked \N +63177 t tobechecked \N +63178 t tobechecked \N +63179 t tobechecked \N +63180 t tobechecked \N +63181 t tobechecked \N +63182 t tobechecked \N +63183 t tobechecked \N +63184 t tobechecked \N +63185 t tobechecked \N +63186 t tobechecked \N +63187 t tobechecked \N +63188 t tobechecked \N +63189 t tobechecked \N +63190 t tobechecked \N +63191 t tobechecked \N +63192 t tobechecked \N +63193 t tobechecked \N +63194 t tobechecked \N +63195 f tobechecked \N +63196 f tobechecked \N +63197 f tobechecked \N +63198 f tobechecked \N +63199 f tobechecked \N +63200 f tobechecked \N +63201 f tobechecked \N +63202 f tobechecked \N +63203 f tobechecked \N +63204 f tobechecked \N +63205 f tobechecked \N +63206 f tobechecked \N +63207 f tobechecked \N +63208 f tobechecked \N +63209 f tobechecked \N +63210 f tobechecked \N +63211 f tobechecked \N +63212 f tobechecked \N +63213 f tobechecked \N +63214 t tobechecked \N +63215 t tobechecked \N +63216 t tobechecked \N +63217 t tobechecked \N +63218 t tobechecked \N +63219 t tobechecked \N +63220 f tobechecked \N +63221 f tobechecked \N +63222 f tobechecked \N +63223 f tobechecked \N +63224 f tobechecked \N +63225 f tobechecked \N +63226 f tobechecked \N +63227 f tobechecked \N +63228 f tobechecked \N +63229 f tobechecked \N +63230 f tobechecked \N +63231 f tobechecked \N +63232 f tobechecked \N +63233 f tobechecked \N +63234 f tobechecked \N +63235 f tobechecked \N +63236 f tobechecked \N +63237 f tobechecked \N +63238 f tobechecked \N +63239 f tobechecked \N +63246 t tobechecked \N +63289 t tobechecked \N +63308 t tobechecked \N +63326 t tobechecked \N +63339 t tobechecked \N +63346 t tobechecked \N +63358 t tobechecked \N +63362 t tobechecked \N +63363 t tobechecked \N +63365 t tobechecked \N +63434 t tobechecked \N +63442 t tobechecked \N +63445 t tobechecked \N +63448 f tobechecked \N +63456 t tobechecked \N +63459 t tobechecked \N +63464 t tobechecked \N +63465 t tobechecked \N +63480 t tobechecked \N +63481 t tobechecked \N +63482 t tobechecked \N +63485 t tobechecked \N +63494 t tobechecked \N +63496 t tobechecked \N +63498 t tobechecked \N +63506 t tobechecked \N +63572 t tobechecked \N +63587 f tobechecked \N +63588 f tobechecked \N +63589 f tobechecked \N +63590 f tobechecked \N +63642 t tobechecked \N +63663 t tobechecked \N +63664 t tobechecked \N +63665 t tobechecked \N +63673 t tobechecked \N +63675 t tobechecked \N +63695 t tobechecked \N +63696 t tobechecked \N +63697 t tobechecked \N +63698 t tobechecked \N +63699 t tobechecked \N +63700 t tobechecked \N +63701 t tobechecked \N +63702 t tobechecked \N +63703 t tobechecked \N +63704 t tobechecked \N +63705 t tobechecked \N +63706 t tobechecked \N +63707 t tobechecked \N +63708 t tobechecked \N +63709 t tobechecked \N +63713 f tobechecked \N +63724 f tobechecked \N +63736 f tobechecked \N +63737 f tobechecked \N +63738 f tobechecked \N +63739 f tobechecked \N +63740 t tobechecked \N +63741 t tobechecked \N +63742 f tobechecked \N +63743 t tobechecked \N +63744 t tobechecked \N +63745 t tobechecked \N +63746 t tobechecked \N +63747 t tobechecked \N +63748 t tobechecked \N +63749 f tobechecked \N +63750 t tobechecked \N +63751 t tobechecked \N +63752 t tobechecked \N +63753 t tobechecked \N +63754 f tobechecked \N +63755 t tobechecked \N +63756 t tobechecked \N +63757 t tobechecked \N +63758 t tobechecked \N +63759 t tobechecked \N +63760 t tobechecked \N +63761 f tobechecked \N +63762 f tobechecked \N +63763 f tobechecked \N +63764 f tobechecked \N +63765 f tobechecked \N +63766 t tobechecked \N +63767 t tobechecked \N +63768 t tobechecked \N +63769 t tobechecked \N +63774 f tobechecked \N +63784 t tobechecked \N +63785 t tobechecked \N +63786 t tobechecked \N +63787 t tobechecked \N +63824 t tobechecked \N +63828 t tobechecked \N +63837 t tobechecked \N +63839 t tobechecked \N +63841 t tobechecked \N +63842 t tobechecked \N +63844 t tobechecked \N +63848 t tobechecked \N +63849 t tobechecked \N +63874 t tobechecked \N +63892 t tobechecked \N +63893 t tobechecked \N +63895 t tobechecked \N +63902 t tobechecked \N +63903 t tobechecked \N +63904 t tobechecked \N +63905 t tobechecked \N +63906 f tobechecked \N +63907 t tobechecked \N +63908 t tobechecked \N +63909 t tobechecked \N +63910 t tobechecked \N +63911 t tobechecked \N +63912 t tobechecked \N +63913 t tobechecked \N +63914 t tobechecked \N +63915 t tobechecked \N +63916 t tobechecked \N +63920 t tobechecked \N +63921 t tobechecked \N +63922 t tobechecked \N +63923 t tobechecked \N +63924 t tobechecked \N +63925 t tobechecked \N +63926 t tobechecked \N +63927 t tobechecked \N +63928 t tobechecked \N +63929 t tobechecked \N +63930 t tobechecked \N +63931 t tobechecked \N +63932 t tobechecked \N +63933 t tobechecked \N +63934 t tobechecked \N +63935 t tobechecked \N +63936 t tobechecked \N +63937 t tobechecked \N +63938 t tobechecked \N +63939 t tobechecked \N +63940 t tobechecked \N +63941 t tobechecked \N +63942 t tobechecked \N +63943 t tobechecked \N +63944 t tobechecked \N +63945 t tobechecked \N +63946 t tobechecked \N +63947 t tobechecked \N +63948 t tobechecked \N +63949 t tobechecked \N +63950 t tobechecked \N +63951 t tobechecked \N +63952 t tobechecked \N +63953 t tobechecked \N +63954 t tobechecked \N +63955 t tobechecked \N +63956 t tobechecked \N +63957 t tobechecked \N +63984 t tobechecked \N +63987 t tobechecked \N +63997 t tobechecked \N +64006 t tobechecked \N +64029 t tobechecked \N +64036 t tobechecked \N +64050 f tobechecked \N +64055 t tobechecked \N +64072 t tobechecked \N +64073 t tobechecked \N +64074 t tobechecked \N +64075 t tobechecked \N +64078 f tobechecked \N +64109 t tobechecked \N +64110 t tobechecked \N +64111 t tobechecked \N +64112 t tobechecked \N +64113 t tobechecked \N +64114 t tobechecked \N +64115 t tobechecked \N +64116 t tobechecked \N +64117 t tobechecked \N +64118 t tobechecked \N +64119 t tobechecked \N +64120 t tobechecked \N +64121 t tobechecked \N +64122 t tobechecked \N +64123 t tobechecked \N +64124 t tobechecked \N +64125 t tobechecked \N +64126 t tobechecked \N +64127 t tobechecked \N +64128 t tobechecked \N +64129 t tobechecked \N +64130 t tobechecked \N +64131 t tobechecked \N +64132 t tobechecked \N +64133 t tobechecked \N +64134 t tobechecked \N +64135 t tobechecked \N +64136 t tobechecked \N +64137 t tobechecked \N +64138 t tobechecked \N +64139 t tobechecked \N +64140 t tobechecked \N +64141 t tobechecked \N +64142 t tobechecked \N +64143 t tobechecked \N +64144 t tobechecked \N +64145 t tobechecked \N +64146 t tobechecked \N +64147 t tobechecked \N +64148 t tobechecked \N +64149 t tobechecked \N +64150 t tobechecked \N +64151 t tobechecked \N +64152 t tobechecked \N +64153 t tobechecked \N +64154 t tobechecked \N +64155 t tobechecked \N +64156 t tobechecked \N +64157 t tobechecked \N +64158 t tobechecked \N +64159 t tobechecked \N +64160 t tobechecked \N +64161 t tobechecked \N +64162 t tobechecked \N +64163 t tobechecked \N +64164 t tobechecked \N +64165 t tobechecked \N +64166 t tobechecked \N +64167 t tobechecked \N +64168 t tobechecked \N +64169 t tobechecked \N +64170 t tobechecked \N +64171 t tobechecked \N +64172 t tobechecked \N +64173 t tobechecked \N +64174 t tobechecked \N +64175 t tobechecked \N +64176 t tobechecked \N +64177 t tobechecked \N +64178 t tobechecked \N +64179 t tobechecked \N +64180 t tobechecked \N +64181 t tobechecked \N +64183 t tobechecked \N +64184 t tobechecked \N +64185 t tobechecked \N +64186 t tobechecked \N +64187 t tobechecked \N +64188 t tobechecked \N +64189 t tobechecked \N +64190 t tobechecked \N +64191 t tobechecked \N +64192 t tobechecked \N +64193 t tobechecked \N +64194 t tobechecked \N +64195 t tobechecked \N +64196 t tobechecked \N +64197 t tobechecked \N +64198 t tobechecked \N +64199 t tobechecked \N +64200 t tobechecked \N +64201 t tobechecked \N +64202 t tobechecked \N +64203 t tobechecked \N +64204 t tobechecked \N +64205 t tobechecked \N +64206 t tobechecked \N +64207 t tobechecked \N +64208 t tobechecked \N +64209 t tobechecked \N +64210 t tobechecked \N +64211 t tobechecked \N +64212 t tobechecked \N +64213 t tobechecked \N +64214 t tobechecked \N +64215 t tobechecked \N +64216 t tobechecked \N +64217 t tobechecked \N +64218 t tobechecked \N +64219 t tobechecked \N +64220 t tobechecked \N +64221 t tobechecked \N +64222 t tobechecked \N +64223 t tobechecked \N +64224 t tobechecked \N +64225 t tobechecked \N +64226 t tobechecked \N +64227 t tobechecked \N +64228 t tobechecked \N +64229 t tobechecked \N +64230 t tobechecked \N +64231 t tobechecked \N +64232 t tobechecked \N +64233 t tobechecked \N +64234 t tobechecked \N +64235 t tobechecked \N +64236 t tobechecked \N +64237 t tobechecked \N +64238 t tobechecked \N +64239 t tobechecked \N +64240 t tobechecked \N +64241 t tobechecked \N +64242 t tobechecked \N +64243 t tobechecked \N +64244 t tobechecked \N +64245 t tobechecked \N +64246 t tobechecked \N +64247 t tobechecked \N +64248 t tobechecked \N +64249 t tobechecked \N +64250 t tobechecked \N +64251 t tobechecked \N +64252 t tobechecked \N +64253 t tobechecked \N +64254 t tobechecked \N +64255 t tobechecked \N +64256 t tobechecked \N +64257 t tobechecked \N +64258 t tobechecked \N +64259 t tobechecked \N +64260 t tobechecked \N +64261 t tobechecked \N +64262 t tobechecked \N +64263 t tobechecked \N +64264 t tobechecked \N +64265 t tobechecked \N +64266 t tobechecked \N +64267 t tobechecked \N +64268 t tobechecked \N +64269 t tobechecked \N +64270 t tobechecked \N +64271 t tobechecked \N +64272 t tobechecked \N +64273 t tobechecked \N +64274 t tobechecked \N +64275 t tobechecked \N +64276 t tobechecked \N +64277 t tobechecked \N +64278 t tobechecked \N +64279 t tobechecked \N +64280 t tobechecked \N +64281 t tobechecked \N +64282 t tobechecked \N +64283 t tobechecked \N +64284 t tobechecked \N +64285 t tobechecked \N +64286 t tobechecked \N +64287 t tobechecked \N +64288 t tobechecked \N +64289 t tobechecked \N +64290 t tobechecked \N +64291 t tobechecked \N +64292 t tobechecked \N +64293 t tobechecked \N +64294 t tobechecked \N +64295 t tobechecked \N +64296 t tobechecked \N +64298 f tobechecked \N +64299 f tobechecked \N +64300 f tobechecked \N +64301 f tobechecked \N +64302 f tobechecked \N +64303 f tobechecked \N +64304 f tobechecked \N +64305 f tobechecked \N +64306 f tobechecked \N +64307 f tobechecked \N +64308 f tobechecked \N +64309 f tobechecked \N +64310 f tobechecked \N +64311 f tobechecked \N +64312 f tobechecked \N +64313 f tobechecked \N +64314 f tobechecked \N +64315 f tobechecked \N +64316 f tobechecked \N +64317 f tobechecked \N +64318 f tobechecked \N +64319 f tobechecked \N +64320 f tobechecked \N +64321 f tobechecked \N +64322 f tobechecked \N +64323 f tobechecked \N +64324 f tobechecked \N +64325 f tobechecked \N +64326 f tobechecked \N +64327 f tobechecked \N +64328 f tobechecked \N +64329 f tobechecked \N +64330 f tobechecked \N +64331 f tobechecked \N +64332 f tobechecked \N +64333 f tobechecked \N +64334 f tobechecked \N +64335 f tobechecked \N +64336 f tobechecked \N +64337 f tobechecked \N +64338 f tobechecked \N +64339 f tobechecked \N +64340 f tobechecked \N +64341 f tobechecked \N +64342 f tobechecked \N +64343 f tobechecked \N +64344 f tobechecked \N +64345 f tobechecked \N +64346 f tobechecked \N +64347 f tobechecked \N +64348 f tobechecked \N +64349 f tobechecked \N +64350 f tobechecked \N +64351 f tobechecked \N +64352 f tobechecked \N +64353 f tobechecked \N +64354 f tobechecked \N +64355 f tobechecked \N +64356 f tobechecked \N +64357 f tobechecked \N +64358 f tobechecked \N +64359 f tobechecked \N +64360 f tobechecked \N +64361 f tobechecked \N +64362 f tobechecked \N +64363 f tobechecked \N +64364 f tobechecked \N +64365 f tobechecked \N +64366 f tobechecked \N +64367 f tobechecked \N +64383 t tobechecked \N +64384 t tobechecked \N +64403 t tobechecked \N +64405 t tobechecked \N +64408 t tobechecked \N +64433 t tobechecked \N +64451 t tobechecked \N +64453 t tobechecked \N +64456 t tobechecked \N +64460 t tobechecked \N +64465 f tobechecked \N +64490 t tobechecked \N +64530 f tobechecked \N +64537 t tobechecked \N +64548 t tobechecked \N +64556 t tobechecked \N +64557 t tobechecked \N +64563 t tobechecked \N +64564 t tobechecked \N +64569 t tobechecked \N +64574 t tobechecked \N +64589 t tobechecked \N +64595 t tobechecked \N +64596 t tobechecked \N +64598 t tobechecked \N +64600 t tobechecked \N +64603 t tobechecked \N +64604 t tobechecked \N +64613 t tobechecked \N +64614 t tobechecked \N +64617 f tobechecked \N +64618 f tobechecked \N +64619 f tobechecked \N +64620 f tobechecked \N +64621 f tobechecked \N +64622 f tobechecked \N +64623 f tobechecked \N +64624 f tobechecked \N +64627 t tobechecked \N +64628 t tobechecked \N +64629 t tobechecked \N +64630 t tobechecked \N +64631 t tobechecked \N +64632 t tobechecked \N +64633 f tobechecked \N +64652 t tobechecked \N +64656 t tobechecked \N +64661 t tobechecked \N +64663 t tobechecked \N +64664 f tobechecked \N +64690 t tobechecked \N +64708 t tobechecked \N +64712 t tobechecked \N +64749 t tobechecked \N +64752 t tobechecked \N +64758 t tobechecked \N +64762 t tobechecked \N +64769 t tobechecked \N +64779 t tobechecked \N +64800 t tobechecked \N +64809 f tobechecked \N +64811 t tobechecked \N +64812 t tobechecked \N +64815 t tobechecked \N +64816 t tobechecked \N +64818 t tobechecked \N +64819 t tobechecked \N +64827 t tobechecked \N +64833 t tobechecked \N +64839 t tobechecked \N +64853 t tobechecked \N +64860 t tobechecked \N +64870 t tobechecked \N +64871 t tobechecked \N +64886 f tobechecked \N +64902 f tobechecked \N +64904 f tobechecked \N +64909 f tobechecked \N +64912 f tobechecked \N +64913 f tobechecked \N +64914 f tobechecked \N +64915 f tobechecked \N +64916 f tobechecked \N +64917 f tobechecked \N +64918 f tobechecked \N +64919 f tobechecked \N +64920 f tobechecked \N +64921 f tobechecked \N +64923 f tobechecked \N +64924 f tobechecked \N +64925 f tobechecked \N +64926 f tobechecked \N +64927 t tobechecked \N +64928 f tobechecked \N +64929 t tobechecked \N +64930 f tobechecked \N +64931 t tobechecked \N +64932 f tobechecked \N +64934 t tobechecked \N +64935 t tobechecked \N +64936 t tobechecked \N +64944 t tobechecked \N +64945 t tobechecked \N +64946 t tobechecked \N +64947 t tobechecked \N +64948 t tobechecked \N +64949 t tobechecked \N +64973 f tobechecked \N +64985 t tobechecked \N +64989 t tobechecked \N +64996 t tobechecked \N +64998 t tobechecked \N +65033 t tobechecked \N +65045 f tobechecked \N +65053 t tobechecked \N +65059 f tobechecked \N +65060 f tobechecked \N +65065 f tobechecked \N +65077 f tobechecked \N +65086 f tobechecked \N +65087 f tobechecked \N +65088 f tobechecked \N +65089 f tobechecked \N +65090 f tobechecked \N +65091 f tobechecked \N +65092 f tobechecked \N +65093 t tobechecked \N +65095 t tobechecked \N +65096 t tobechecked \N +65135 t tobechecked \N +65152 t tobechecked \N +65166 t tobechecked \N +65204 f tobechecked \N +65241 t tobechecked \N +65242 t tobechecked \N +65243 t tobechecked \N +65277 f tobechecked \N +65280 t tobechecked \N +65281 t tobechecked \N +65282 t tobechecked \N +65283 t tobechecked \N +65284 t tobechecked \N +65285 t tobechecked \N +65286 t tobechecked \N +65287 t tobechecked \N +65288 t tobechecked \N +65289 t tobechecked \N +65290 t tobechecked \N +65297 t tobechecked \N +65330 t tobechecked \N +65331 f tobechecked \N +65341 t tobechecked \N +65342 t tobechecked \N +65346 t tobechecked \N +65348 t tobechecked \N +65349 f tobechecked \N +65352 f tobechecked \N +65360 f tobechecked \N +65371 f tobechecked \N +65372 f tobechecked \N +65373 f tobechecked \N +65374 f tobechecked \N +65375 f tobechecked \N +65394 t tobechecked \N +65396 t tobechecked \N +65397 t tobechecked \N +65399 t tobechecked \N +65400 t tobechecked \N +65401 t tobechecked \N +65402 f tobechecked \N +65403 t tobechecked \N +65404 t tobechecked \N +65406 f tobechecked \N +65407 f tobechecked \N +65408 f tobechecked \N +65409 f tobechecked \N +65410 f tobechecked \N +65411 f tobechecked \N +65412 f tobechecked \N +65413 f tobechecked \N +65415 f tobechecked \N +65417 t tobechecked \N +65418 f tobechecked \N +65419 f tobechecked \N +65421 t tobechecked \N +65422 t tobechecked \N +65423 t tobechecked \N +65424 t tobechecked \N +65425 t tobechecked \N +65426 t tobechecked \N +65427 t tobechecked \N +65428 t tobechecked \N +65429 t tobechecked \N +65430 t tobechecked \N +65431 t tobechecked \N +65432 t tobechecked \N +65433 t tobechecked \N +65434 t tobechecked \N +65435 t tobechecked \N +65436 t tobechecked \N +65437 t tobechecked \N +65438 t tobechecked \N +65439 t tobechecked \N +65440 t tobechecked \N +65441 t tobechecked \N +65442 t tobechecked \N +65449 t tobechecked \N +65457 t tobechecked \N +65458 t tobechecked \N +65463 t tobechecked \N +65466 t tobechecked \N +65467 t tobechecked \N +65495 t tobechecked \N +65496 t tobechecked \N +65508 t tobechecked \N +65515 f tobechecked \N +65519 t tobechecked \N +65526 f tobechecked \N +65536 t tobechecked \N +65539 t tobechecked \N +65550 t tobechecked \N +65573 t tobechecked \N +65575 f tobechecked \N +65579 t tobechecked \N +65584 t tobechecked \N +65600 t tobechecked \N +65605 f tobechecked \N +65610 t tobechecked \N +65626 t tobechecked \N +65627 t tobechecked \N +65628 t tobechecked \N +65639 t tobechecked \N +65641 t tobechecked \N +65647 t tobechecked \N +65648 t tobechecked \N +65669 t tobechecked \N +65689 f tobechecked \N +65699 t tobechecked \N +65720 t tobechecked \N +65726 t tobechecked \N +65733 t tobechecked \N +65747 t tobechecked \N +65755 t tobechecked \N +65784 f tobechecked \N +65788 t tobechecked \N +65794 t tobechecked \N +65806 t tobechecked \N +65807 t tobechecked \N +65808 t tobechecked \N +65809 t tobechecked \N +65810 t tobechecked \N +65811 f tobechecked \N +65812 t tobechecked \N +65813 t tobechecked \N +65814 f tobechecked \N +65815 t tobechecked \N +65816 f tobechecked \N +65817 f tobechecked \N +65818 f tobechecked \N +65819 f tobechecked \N +65820 f tobechecked \N +65821 f tobechecked \N +65831 f tobechecked \N +65834 t tobechecked \N +65838 f tobechecked \N +65839 f tobechecked \N +65840 t tobechecked \N +65841 t tobechecked \N +65842 t tobechecked \N +65845 t tobechecked \N +65852 t tobechecked \N +65853 t tobechecked \N +65854 t tobechecked \N +65857 t tobechecked \N +65860 t tobechecked \N +65886 t tobechecked \N +65889 t tobechecked \N +65913 t tobechecked \N +65919 t tobechecked \N +65925 t tobechecked \N +65926 t tobechecked \N +65927 t tobechecked \N +65928 t tobechecked \N +65929 t tobechecked \N +65930 t tobechecked \N +65931 t tobechecked \N +65932 t tobechecked \N +65933 t tobechecked \N +65934 t tobechecked \N +65935 f tobechecked \N +65936 t tobechecked \N +65937 t tobechecked \N +65938 f tobechecked \N +65939 f tobechecked \N +65940 f tobechecked \N +65941 f tobechecked \N +65942 f tobechecked \N +65943 f tobechecked \N +65944 f tobechecked \N +65945 f tobechecked \N +65952 f tobechecked \N +65954 t tobechecked \N +66014 t tobechecked \N +66015 t tobechecked \N +66027 t tobechecked \N +66028 t tobechecked \N +66029 t tobechecked \N +66030 t tobechecked \N +66031 t tobechecked \N +66032 t tobechecked \N +66033 t tobechecked \N +66034 t tobechecked \N +66035 t tobechecked \N +66036 t tobechecked \N +66037 t tobechecked \N +66038 f tobechecked \N +66039 t tobechecked \N +66040 f tobechecked \N +66041 t tobechecked \N +66042 t tobechecked \N +66043 t tobechecked \N +66044 t tobechecked \N +66045 t tobechecked \N +66046 t tobechecked \N +66047 t tobechecked \N +66048 t tobechecked \N +66049 t tobechecked \N +66050 t tobechecked \N +66051 t tobechecked \N +66052 t tobechecked \N +66053 t tobechecked \N +66054 t tobechecked \N +66055 t tobechecked \N +66056 t tobechecked \N +66057 t tobechecked \N +66058 t tobechecked \N +66059 t tobechecked \N +66060 t tobechecked \N +66061 t tobechecked \N +66062 t tobechecked \N +66063 t tobechecked \N +66064 t tobechecked \N +66065 t tobechecked \N +66066 t tobechecked \N +66067 t tobechecked \N +66068 t tobechecked \N +66069 t tobechecked \N +66070 t tobechecked \N +66071 t tobechecked \N +66072 t tobechecked \N +66073 t tobechecked \N +66074 t tobechecked \N +66075 t tobechecked \N +66076 t tobechecked \N +66077 t tobechecked \N +66078 t tobechecked \N +66079 t tobechecked \N +66080 t tobechecked \N +66081 t tobechecked \N +66082 t tobechecked \N +66083 f tobechecked \N +66084 f tobechecked \N +66087 f tobechecked \N +66088 f tobechecked \N +66093 f tobechecked \N +66100 f tobechecked \N +66113 f tobechecked \N +66128 t tobechecked \N +66133 t tobechecked \N +66137 f tobechecked \N +66146 f tobechecked \N +66151 t tobechecked \N +66152 t tobechecked \N +66153 t tobechecked \N +66154 t tobechecked \N +66155 t tobechecked \N +66156 t tobechecked \N +66157 t tobechecked \N +66167 f tobechecked \N +66194 t tobechecked \N +66196 t tobechecked \N +66209 f tobechecked \N +66210 t tobechecked \N +66211 t tobechecked \N +66212 t tobechecked \N +66213 t tobechecked \N +66229 t tobechecked \N +66239 t tobechecked \N +66240 t tobechecked \N +66242 t tobechecked \N +66255 t tobechecked \N +66271 t tobechecked \N +66307 t tobechecked \N +66311 t tobechecked \N +66318 t tobechecked \N +66319 t tobechecked \N +66322 t tobechecked \N +66323 t tobechecked \N +66324 t tobechecked \N +66325 t tobechecked \N +66326 t tobechecked \N +66327 t tobechecked \N +66328 t tobechecked \N +66329 t tobechecked \N +66330 t tobechecked \N +66331 t tobechecked \N +66332 t tobechecked \N +66333 f tobechecked \N +66334 t tobechecked \N +66335 f tobechecked \N +66336 f tobechecked \N +66337 f tobechecked \N +66338 t tobechecked \N +66339 t tobechecked \N +66340 f tobechecked \N +66341 t tobechecked \N +66342 t tobechecked \N +66343 f tobechecked \N +66344 f tobechecked \N +66345 f tobechecked \N +66347 t tobechecked \N +66363 t tobechecked \N +66378 t tobechecked \N +66379 t tobechecked \N +66383 f tobechecked \N +66384 t tobechecked \N +66392 t tobechecked \N +66400 t tobechecked \N +66401 t tobechecked \N +66402 t tobechecked \N +66403 t tobechecked \N +66404 t tobechecked \N +66405 t tobechecked \N +66406 t tobechecked \N +66407 t tobechecked \N +66408 t tobechecked \N +66409 t tobechecked \N +66410 t tobechecked \N +66411 t tobechecked \N +66412 t tobechecked \N +66413 t tobechecked \N +66414 t tobechecked \N +66415 t tobechecked \N +66416 t tobechecked \N +66417 t tobechecked \N +66418 t tobechecked \N +66419 t tobechecked \N +66420 t tobechecked \N +66421 t tobechecked \N +66422 t tobechecked \N +66423 t tobechecked \N +66424 t tobechecked \N +66425 t tobechecked \N +66426 t tobechecked \N +66427 t tobechecked \N +66428 t tobechecked \N +66430 t tobechecked \N +66431 t tobechecked \N +66432 t tobechecked \N +66433 t tobechecked \N +66435 t tobechecked \N +66437 f tobechecked \N +66438 t tobechecked \N +66440 f tobechecked \N +66441 f tobechecked \N +66443 t tobechecked \N +66444 t tobechecked \N +66445 t tobechecked \N +66446 t tobechecked \N +66469 t tobechecked \N +66471 t tobechecked \N +66472 t tobechecked \N +66473 t tobechecked \N +66474 t tobechecked \N +66475 t tobechecked \N +66480 t tobechecked \N +66489 t tobechecked \N +66493 t tobechecked \N +66494 t tobechecked \N +66518 t tobechecked \N +66520 t tobechecked \N +66534 t tobechecked \N +66535 f tobechecked \N +66536 f tobechecked \N +66538 f tobechecked \N +66540 f tobechecked \N +66550 f tobechecked \N +66551 f tobechecked \N +66552 t tobechecked \N +66562 f tobechecked \N +66567 f tobechecked \N +66569 f tobechecked \N +66570 f tobechecked \N +66571 f tobechecked \N +66572 t tobechecked \N +66573 t tobechecked \N +66574 t tobechecked \N +66575 t tobechecked \N +66576 t tobechecked \N +66577 t tobechecked \N +66578 f tobechecked \N +66579 f tobechecked \N +66580 f tobechecked \N +66581 f tobechecked \N +66582 f tobechecked \N +66583 t tobechecked \N +66584 t tobechecked \N +66585 t tobechecked \N +66586 t tobechecked \N +66587 t tobechecked \N +66588 t tobechecked \N +66589 t tobechecked \N +66590 t tobechecked \N +66591 t tobechecked \N +66592 t tobechecked \N +66593 t tobechecked \N +66594 t tobechecked \N +66595 f tobechecked \N +66596 t tobechecked \N +66597 f tobechecked \N +66598 t tobechecked \N +66599 t tobechecked \N +66600 f tobechecked \N +66601 f tobechecked \N +66602 t tobechecked \N +66603 t tobechecked \N +66604 t tobechecked \N +66605 t tobechecked \N +66608 t tobechecked \N +66611 f tobechecked \N +66612 t tobechecked \N +66613 t tobechecked \N +66615 f tobechecked \N +66617 f tobechecked \N +66631 f tobechecked \N +66635 f tobechecked \N +66640 t tobechecked \N +66641 t tobechecked \N +66642 t tobechecked \N +66643 t tobechecked \N +66644 f tobechecked \N +66645 f tobechecked \N +66646 f tobechecked \N +66647 f tobechecked \N +66648 f tobechecked \N +66649 f tobechecked \N +66650 f tobechecked \N +66651 f tobechecked \N +66652 f tobechecked \N +66653 f tobechecked \N +66654 f tobechecked \N +66655 t tobechecked \N +66656 t tobechecked \N +66657 t tobechecked \N +66658 t tobechecked \N +66659 t tobechecked \N +66660 t tobechecked \N +66661 t tobechecked \N +66662 t tobechecked \N +66663 t tobechecked \N +66664 t tobechecked \N +66665 t tobechecked \N +66666 t tobechecked \N +66667 t tobechecked \N +66668 t tobechecked \N +66669 t tobechecked \N +66671 t tobechecked \N +66708 f tobechecked \N +66711 t tobechecked \N +66712 t tobechecked \N +66713 t tobechecked \N +66714 t tobechecked \N +66715 f tobechecked \N +66716 f tobechecked \N +66717 t tobechecked \N +66718 t tobechecked \N +66719 t tobechecked \N +66720 t tobechecked \N +66721 t tobechecked \N +66722 f tobechecked \N +66723 t tobechecked \N +66724 t tobechecked \N +66725 t tobechecked \N +66726 t tobechecked \N +66727 t tobechecked \N +66728 t tobechecked \N +66729 f tobechecked \N +66730 f tobechecked \N +66731 t tobechecked \N +66732 t tobechecked \N +66733 t tobechecked \N +66734 t tobechecked \N +66735 f tobechecked \N +66736 f tobechecked \N +66737 t tobechecked \N +66738 f tobechecked \N +66739 f tobechecked \N +66741 f tobechecked \N +66742 f tobechecked \N +66743 f tobechecked \N +66744 f tobechecked \N +66745 f tobechecked \N +66746 f tobechecked \N +66747 f tobechecked \N +66748 f tobechecked \N +66749 f tobechecked \N +66750 f tobechecked \N +66751 f tobechecked \N +66752 f tobechecked \N +66753 f tobechecked \N +66754 f tobechecked \N +66755 f tobechecked \N +66756 f tobechecked \N +66757 f tobechecked \N +66758 f tobechecked \N +66759 f tobechecked \N +66760 f tobechecked \N +66761 f tobechecked \N +66762 f tobechecked \N +66763 f tobechecked \N +66764 f tobechecked \N +66765 f tobechecked \N +66766 f tobechecked \N +66767 f tobechecked \N +66768 f tobechecked \N +66769 f tobechecked \N +66770 f tobechecked \N +66771 f tobechecked \N +66772 f tobechecked \N +66774 t tobechecked \N +66784 f tobechecked \N +66786 f tobechecked \N +66787 f tobechecked \N +66801 t tobechecked \N +66804 t tobechecked \N +66808 t tobechecked \N +66809 f tobechecked \N +66810 f tobechecked \N +66811 f tobechecked \N +66812 f tobechecked \N +66813 f tobechecked \N +66814 f tobechecked \N +66815 f tobechecked \N +66816 f tobechecked \N +66817 f tobechecked \N +66818 f tobechecked \N +66819 f tobechecked \N +66820 f tobechecked \N +66821 t tobechecked \N +66822 t tobechecked \N +66825 t tobechecked \N +66826 t tobechecked \N +66833 f tobechecked \N +66834 f tobechecked \N +66859 t tobechecked \N +66860 t tobechecked \N +66861 t tobechecked \N +66862 t tobechecked \N +66863 t tobechecked \N +66864 t tobechecked \N +66865 t tobechecked \N +66869 t tobechecked \N +66870 t tobechecked \N +66873 t tobechecked \N +66881 t tobechecked \N +66885 t tobechecked \N +66886 t tobechecked \N +66898 t tobechecked \N +66899 t tobechecked \N +66900 t tobechecked \N +66901 t tobechecked \N +66902 t tobechecked \N +66903 t tobechecked \N +66904 t tobechecked \N +66905 t tobechecked \N +66906 t tobechecked \N +66907 t tobechecked \N +66908 t tobechecked \N +66909 t tobechecked \N +66910 t tobechecked \N +66911 t tobechecked \N +66912 t tobechecked \N +66913 t tobechecked \N +66914 t tobechecked \N +66915 t tobechecked \N +66916 t tobechecked \N +66917 t tobechecked \N +66918 t tobechecked \N +66919 t tobechecked \N +66920 t tobechecked \N +66921 t tobechecked \N +66922 t tobechecked \N +66923 t tobechecked \N +66924 t tobechecked \N +66925 t tobechecked \N +66926 t tobechecked \N +66927 t tobechecked \N +66928 t tobechecked \N +66929 t tobechecked \N +66930 t tobechecked \N +66931 t tobechecked \N +66932 f tobechecked \N +66933 t tobechecked \N +66934 t tobechecked \N +66935 t tobechecked \N +66936 t tobechecked \N +66937 t tobechecked \N +66938 t tobechecked \N +66939 f tobechecked \N +66943 f tobechecked \N +66944 f tobechecked \N +66945 f tobechecked \N +66946 f tobechecked \N +66947 f tobechecked \N +66948 f tobechecked \N +66949 f tobechecked \N +66950 f tobechecked \N +66951 f tobechecked \N +66952 f tobechecked \N +66953 f tobechecked \N +66954 f tobechecked \N +66955 f tobechecked \N +66956 f tobechecked \N +66957 f tobechecked \N +66958 f tobechecked \N +66959 f tobechecked \N +66960 f tobechecked \N +66961 f tobechecked \N +66962 f tobechecked \N +66963 f tobechecked \N +66964 f tobechecked \N +66965 f tobechecked \N +66966 f tobechecked \N +66967 f tobechecked \N +66968 f tobechecked \N +66993 f tobechecked \N +66994 f tobechecked \N +66995 f tobechecked \N +67015 f tobechecked \N +67036 t tobechecked \N +67037 t tobechecked \N +67051 f tobechecked \N +67053 f tobechecked \N +67054 f tobechecked \N +67055 f tobechecked \N +67070 f tobechecked \N +67071 f tobechecked \N +67072 f tobechecked \N +67073 f tobechecked \N +67074 f tobechecked \N +67075 f tobechecked \N +67076 f tobechecked \N +67077 f tobechecked \N +67078 f tobechecked \N +67079 f tobechecked \N +67086 t tobechecked \N +67089 f tobechecked \N +67092 t tobechecked \N +67095 t tobechecked \N +67096 t tobechecked \N +67101 t tobechecked \N +67103 t tobechecked \N +67104 t tobechecked \N +67105 t tobechecked \N +67106 t tobechecked \N +67107 t tobechecked \N +67108 t tobechecked \N +67109 t tobechecked \N +67110 t tobechecked \N +67111 t tobechecked \N +67112 t tobechecked \N +67113 t tobechecked \N +67114 t tobechecked \N +67115 t tobechecked \N +67116 t tobechecked \N +67117 t tobechecked \N +67118 t tobechecked \N +67119 t tobechecked \N +67120 t tobechecked \N +67121 t tobechecked \N +67122 t tobechecked \N +67123 t tobechecked \N +67124 t tobechecked \N +67125 t tobechecked \N +67126 t tobechecked \N +67127 t tobechecked \N +67128 t tobechecked \N +67129 t tobechecked \N +67130 t tobechecked \N +67131 t tobechecked \N +67132 t tobechecked \N +67133 t tobechecked \N +67134 t tobechecked \N +67135 t tobechecked \N +67136 t tobechecked \N +67137 t tobechecked \N +67138 t tobechecked \N +67139 t tobechecked \N +67140 t tobechecked \N +67141 t tobechecked \N +67142 t tobechecked \N +67143 t tobechecked \N +67149 t tobechecked \N +67150 f tobechecked \N +67151 t tobechecked \N +67152 t tobechecked \N +67153 t tobechecked \N +67154 t tobechecked \N +67155 t tobechecked \N +67156 t tobechecked \N +67157 t tobechecked \N +67158 t tobechecked \N +67159 t tobechecked \N +67160 t tobechecked \N +67161 t tobechecked \N +67162 t tobechecked \N +67163 t tobechecked \N +67164 t tobechecked \N +67165 t tobechecked \N +67166 t tobechecked \N +67167 t tobechecked \N +67168 t tobechecked \N +67169 t tobechecked \N +67170 t tobechecked \N +67171 t tobechecked \N +67172 t tobechecked \N +67173 t tobechecked \N +67174 t tobechecked \N +67175 t tobechecked \N +67176 t tobechecked \N +67177 t tobechecked \N +67178 t tobechecked \N +67179 t tobechecked \N +67180 t tobechecked \N +67181 t tobechecked \N +67182 t tobechecked \N +67209 t tobechecked \N +67215 t tobechecked \N +67227 f tobechecked \N +67228 f tobechecked \N +67229 f tobechecked \N +67230 f tobechecked \N +67231 f tobechecked \N +67232 f tobechecked \N +67233 f tobechecked \N +67234 f tobechecked \N +67235 f tobechecked \N +67236 f tobechecked \N +67237 f tobechecked \N +67238 t tobechecked \N +67239 f tobechecked \N +67249 f tobechecked \N +67258 f tobechecked \N +67266 f tobechecked \N +67273 f tobechecked \N +67274 f tobechecked \N +67275 f tobechecked \N +67285 f tobechecked \N +67291 t tobechecked \N +67293 t tobechecked \N +67294 t tobechecked \N +67295 f tobechecked \N +67296 t tobechecked \N +67297 t tobechecked \N +67298 t tobechecked \N +67299 t tobechecked \N +67300 t tobechecked \N +67301 t tobechecked \N +67302 t tobechecked \N +67303 t tobechecked \N +67304 t tobechecked \N +67305 t tobechecked \N +67306 f tobechecked \N +67307 t tobechecked \N +67308 t tobechecked \N +67309 t tobechecked \N +67310 t tobechecked \N +67311 t tobechecked \N +67312 t tobechecked \N +67313 t tobechecked \N +67314 t tobechecked \N +67315 t tobechecked \N +67316 t tobechecked \N +67317 t tobechecked \N +67322 t tobechecked \N +67325 t tobechecked \N +67329 f tobechecked \N +67330 f tobechecked \N +67331 f tobechecked \N +67332 f tobechecked \N +67333 f tobechecked \N +67334 f tobechecked \N +67335 f tobechecked \N +67336 f tobechecked \N +67337 f tobechecked \N +67338 f tobechecked \N +67339 t tobechecked \N +67340 t tobechecked \N +67341 t tobechecked \N +67342 t tobechecked \N +67343 t tobechecked \N +67344 t tobechecked \N +67345 t tobechecked \N +67346 t tobechecked \N +67347 t tobechecked \N +67348 t tobechecked \N +67349 t tobechecked \N +67350 t tobechecked \N +67351 t tobechecked \N +67352 t tobechecked \N +67353 t tobechecked \N +67354 t tobechecked \N +67355 t tobechecked \N +67356 t tobechecked \N +67357 t tobechecked \N +67358 t tobechecked \N +67359 t tobechecked \N +67360 t tobechecked \N +67361 t tobechecked \N +67362 t tobechecked \N +67363 t tobechecked \N +67364 t tobechecked \N +67365 t tobechecked \N +67366 t tobechecked \N +67367 t tobechecked \N +67368 t tobechecked \N +67369 t tobechecked \N +67370 t tobechecked \N +67371 t tobechecked \N +67372 t tobechecked \N +67373 t tobechecked \N +67374 t tobechecked \N +67375 t tobechecked \N +67376 t tobechecked \N +67377 t tobechecked \N +67378 t tobechecked \N +67379 t tobechecked \N +67380 t tobechecked \N +67381 t tobechecked \N +67382 t tobechecked \N +67383 t tobechecked \N +67384 t tobechecked \N +67385 t tobechecked \N +67386 t tobechecked \N +67387 t tobechecked \N +67388 t tobechecked \N +67389 t tobechecked \N +67390 t tobechecked \N +67391 t tobechecked \N +67392 t tobechecked \N +67393 t tobechecked \N +67394 t tobechecked \N +67395 t tobechecked \N +67396 t tobechecked \N +67397 t tobechecked \N +67398 t tobechecked \N +67399 t tobechecked \N +67400 t tobechecked \N +67401 t tobechecked \N +67402 t tobechecked \N +67403 t tobechecked \N +67404 t tobechecked \N +67405 t tobechecked \N +67406 t tobechecked \N +67407 t tobechecked \N +67408 t tobechecked \N +67409 t tobechecked \N +67410 t tobechecked \N +67411 t tobechecked \N +67412 t tobechecked \N +67413 t tobechecked \N +67414 t tobechecked \N +67415 t tobechecked \N +67416 t tobechecked \N +67417 t tobechecked \N +67418 t tobechecked \N +67419 t tobechecked \N +67420 t tobechecked \N +67421 t tobechecked \N +67422 t tobechecked \N +67423 t tobechecked \N +67424 t tobechecked \N +67425 t tobechecked \N +67426 t tobechecked \N +67427 t tobechecked \N +67428 t tobechecked \N +67429 t tobechecked \N +67430 t tobechecked \N +67431 t tobechecked \N +67432 t tobechecked \N +67433 t tobechecked \N +67434 t tobechecked \N +67435 t tobechecked \N +67436 t tobechecked \N +67437 t tobechecked \N +67438 t tobechecked \N +67439 t tobechecked \N +67440 t tobechecked \N +67441 t tobechecked \N +67442 t tobechecked \N +67443 t tobechecked \N +67444 t tobechecked \N +67445 t tobechecked \N +67446 t tobechecked \N +67447 t tobechecked \N +67448 t tobechecked \N +67449 t tobechecked \N +67450 t tobechecked \N +67451 t tobechecked \N +67452 t tobechecked \N +67453 t tobechecked \N +67454 t tobechecked \N +67455 t tobechecked \N +67456 t tobechecked \N +67457 t tobechecked \N +67458 t tobechecked \N +67459 t tobechecked \N +67460 t tobechecked \N +67461 t tobechecked \N +67462 t tobechecked \N +67463 t tobechecked \N +67464 t tobechecked \N +67465 t tobechecked \N +67466 f tobechecked \N +67467 f tobechecked \N +67468 f tobechecked \N +67469 t tobechecked \N +67470 t tobechecked \N +67471 t tobechecked \N +67472 t tobechecked \N +67473 t tobechecked \N +67474 t tobechecked \N +67475 t tobechecked \N +67476 t tobechecked \N +67477 t tobechecked \N +67478 t tobechecked \N +67479 t tobechecked \N +67480 t tobechecked \N +67481 t tobechecked \N +67482 t tobechecked \N +67483 t tobechecked \N +67484 t tobechecked \N +67485 f tobechecked \N +67486 t tobechecked \N +67487 t tobechecked \N +67488 t tobechecked \N +67489 t tobechecked \N +67490 t tobechecked \N +67504 f tobechecked \N +67511 f tobechecked \N +67512 f tobechecked \N +67513 f tobechecked \N +67514 f tobechecked \N +67515 f tobechecked \N +67516 f tobechecked \N +67517 f tobechecked \N +67518 f tobechecked \N +67519 f tobechecked \N +67520 t tobechecked \N +67528 t tobechecked \N +67530 f tobechecked \N +67540 t tobechecked \N +67543 t tobechecked \N +67545 f tobechecked \N +67552 t tobechecked \N +67563 f tobechecked \N +67568 f tobechecked \N +67569 t tobechecked \N +67570 t tobechecked \N +67571 t tobechecked \N +67572 t tobechecked \N +67573 t tobechecked \N +67574 t tobechecked \N +67575 t tobechecked \N +67576 t tobechecked \N +67577 f tobechecked 2027-02-23 00:00:00 +67578 t tobechecked \N +67579 t tobechecked \N +67580 t tobechecked \N +67581 t tobechecked \N +67582 t tobechecked \N +67583 t tobechecked \N +67584 t tobechecked \N +67587 t tobechecked \N +67610 t tobechecked \N +67623 t tobechecked \N +67653 t tobechecked \N +67657 t tobechecked \N +67674 t tobechecked \N +67675 t tobechecked \N +67678 t tobechecked \N +67687 t tobechecked \N +67703 t tobechecked \N +67708 t tobechecked \N +67744 t tobechecked \N +67767 f tobechecked \N +67768 f tobechecked \N +67769 f tobechecked \N +67770 f tobechecked \N +67771 f tobechecked \N +67772 f tobechecked \N +67773 f tobechecked \N +67774 f tobechecked \N +67789 t tobechecked \N +67801 t tobechecked \N +67802 t tobechecked \N +67803 t tobechecked \N +67807 t tobechecked \N +67808 t tobechecked \N +67809 t tobechecked \N +67810 t tobechecked \N +67816 t tobechecked \N +67819 f tobechecked \N +67820 f tobechecked \N +67830 f tobechecked \N +67833 t tobechecked \N +67834 f tobechecked \N +67836 t tobechecked \N +67841 t tobechecked \N +67842 t tobechecked \N +67843 t tobechecked \N +67844 t tobechecked \N +67845 t tobechecked \N +67846 t tobechecked \N +67847 t tobechecked \N +67848 t tobechecked \N +67849 t tobechecked \N +67850 t tobechecked \N +67851 t tobechecked \N +67852 t tobechecked \N +67853 t tobechecked \N +67854 t tobechecked \N +67855 t tobechecked \N +67856 t tobechecked \N +67857 t tobechecked \N +67858 t tobechecked \N +67859 t tobechecked \N +67861 t tobechecked \N +67862 t tobechecked \N +67866 f tobechecked \N +67868 f tobechecked \N +67871 f tobechecked \N +67872 t tobechecked \N +67877 t tobechecked \N +67878 t tobechecked \N +67879 t tobechecked \N +67888 f tobechecked \N +67889 f tobechecked \N +67891 f tobechecked \N +67892 f tobechecked \N +67900 t tobechecked \N +67901 t tobechecked \N +67902 t tobechecked \N +67903 t tobechecked \N +67904 t tobechecked \N +67905 t tobechecked \N +67906 t tobechecked \N +67964 t tobechecked \N +67973 f tobechecked \N +67985 t tobechecked \N +67990 f tobechecked \N +67996 f tobechecked \N +68003 f tobechecked \N +68010 f tobechecked \N +68012 f tobechecked \N +68014 f tobechecked \N +68016 f tobechecked \N +68023 f tobechecked \N +68024 t tobechecked \N +68085 t tobechecked \N +68088 t tobechecked \N +68089 t tobechecked \N +68090 t tobechecked \N +68097 f tobechecked \N +68098 t tobechecked \N +68104 t tobechecked \N +68107 t tobechecked \N +68129 t tobechecked \N +68137 t tobechecked \N +68139 t tobechecked \N +68144 f tobechecked \N +68145 f tobechecked \N +68146 f tobechecked \N +68147 f tobechecked \N +68148 f tobechecked \N +68149 f tobechecked \N +68150 f tobechecked \N +68151 f tobechecked \N +68152 f tobechecked \N +68153 f tobechecked \N +68154 f tobechecked \N +68155 f tobechecked \N +68156 f tobechecked \N +68157 f tobechecked \N +68158 f tobechecked \N +68159 f tobechecked \N +68160 f tobechecked \N +68161 f tobechecked \N +68162 f tobechecked \N +68163 f tobechecked \N +68164 f tobechecked \N +68165 f tobechecked \N +68166 f tobechecked \N +68167 f tobechecked \N +68168 f tobechecked \N +68169 f tobechecked \N +68170 f tobechecked \N +68176 f tobechecked \N +68177 f tobechecked \N +68178 f tobechecked \N +68179 f tobechecked \N +68180 f tobechecked \N +68181 f tobechecked \N +68182 f tobechecked \N +68183 f tobechecked \N +68184 f tobechecked \N +68185 f tobechecked \N +68186 f tobechecked \N +68187 f tobechecked \N +68188 f tobechecked \N +68189 f tobechecked \N +68190 f tobechecked \N +68191 f tobechecked \N +68192 f tobechecked \N +68193 f tobechecked \N +68194 f tobechecked \N +68195 f tobechecked \N +68196 f tobechecked \N +68205 t tobechecked \N +68206 t tobechecked \N +68209 t tobechecked \N +68212 t tobechecked \N +68213 t tobechecked \N +68218 t tobechecked \N +68219 t tobechecked \N +68222 t tobechecked \N +68225 t tobechecked \N +68227 t tobechecked \N +68228 t tobechecked \N +68231 t tobechecked \N +68233 t tobechecked \N +68236 t tobechecked \N +68244 t tobechecked \N +68245 t tobechecked \N +68246 t tobechecked \N +68247 f tobechecked \N +68248 f tobechecked \N +68249 f tobechecked \N +68254 t tobechecked \N +68255 t tobechecked \N +68256 t tobechecked \N +68257 t tobechecked \N +68258 t tobechecked \N +68259 t tobechecked \N +68260 t tobechecked \N +68261 t tobechecked \N +68262 t tobechecked \N +68263 t tobechecked \N +68264 t tobechecked \N +68265 t tobechecked \N +68266 t tobechecked \N +68267 t tobechecked \N +68268 t tobechecked \N +68269 t tobechecked \N +68270 f tobechecked \N +68271 t tobechecked \N +68272 t tobechecked \N +68273 t tobechecked \N +68274 t tobechecked \N +68275 t tobechecked \N +68276 t tobechecked \N +68277 t tobechecked \N +68278 t tobechecked \N +68279 t tobechecked \N +68280 t tobechecked \N +68281 t tobechecked \N +68282 t tobechecked \N +68283 t tobechecked \N +68284 t tobechecked \N +68285 t tobechecked \N +68286 t tobechecked \N +68287 t tobechecked \N +68288 t tobechecked \N +68289 t tobechecked \N +68290 t tobechecked \N +68291 t tobechecked \N +68292 t tobechecked \N +68293 t tobechecked \N +68294 t tobechecked \N +68295 t tobechecked \N +68296 t tobechecked \N +68297 t tobechecked \N +68298 t tobechecked \N +68299 t tobechecked \N +68300 t tobechecked \N +68301 t tobechecked \N +68302 t tobechecked \N +68303 t tobechecked \N +68304 t tobechecked \N +68305 t tobechecked \N +68306 t tobechecked \N +68307 t tobechecked \N +68308 t tobechecked \N +68309 t tobechecked \N +68310 t tobechecked \N +68311 t tobechecked \N +68312 t tobechecked \N +68313 t tobechecked \N +68314 t tobechecked \N +68315 t tobechecked \N +68316 t tobechecked \N +68317 t tobechecked \N +68318 t tobechecked \N +68319 t tobechecked \N +68320 t tobechecked \N +68321 t tobechecked \N +68322 t tobechecked \N +68323 t tobechecked \N +68324 t tobechecked \N +68325 t tobechecked \N +68326 t tobechecked \N +68327 t tobechecked \N +68328 t tobechecked \N +68329 t tobechecked \N +68330 t tobechecked \N +68331 t tobechecked \N +68332 t tobechecked \N +68333 t tobechecked \N +68334 t tobechecked \N +68335 t tobechecked \N +68336 t tobechecked \N +68337 t tobechecked \N +68338 t tobechecked \N +68339 t tobechecked \N +68340 t tobechecked \N +68341 t tobechecked \N +68342 t tobechecked \N +68343 t tobechecked \N +68344 t tobechecked \N +68345 t tobechecked \N +68346 t tobechecked \N +68347 t tobechecked \N +68348 t tobechecked \N +68349 t tobechecked \N +68350 t tobechecked \N +68351 t tobechecked \N +68352 t tobechecked \N +68353 t tobechecked \N +68354 t tobechecked \N +68355 t tobechecked \N +68356 t tobechecked \N +68357 t tobechecked \N +68358 t tobechecked \N +68359 t tobechecked \N +68360 t tobechecked \N +68361 t tobechecked \N +68362 t tobechecked \N +68363 t tobechecked \N +68364 t tobechecked \N +68365 t tobechecked \N +68366 t tobechecked \N +68367 t tobechecked \N +68368 t tobechecked \N +68369 t tobechecked \N +68370 t tobechecked \N +68371 t tobechecked \N +68372 f tobechecked \N +68373 f tobechecked \N +68377 f tobechecked \N +68378 f tobechecked \N +68379 f tobechecked 2038-12-31 00:00:00 +68380 f tobechecked 2038-12-31 00:00:00 +68387 t tobechecked \N +68392 t tobechecked \N +68398 t tobechecked \N +68404 t tobechecked \N +68405 t tobechecked \N +68451 t tobechecked \N +68452 t tobechecked \N +68453 t tobechecked \N +68454 t tobechecked \N +68455 t tobechecked \N +68456 t tobechecked \N +68457 t tobechecked \N +68458 t tobechecked \N +68459 t tobechecked \N +68460 t tobechecked \N +68461 t tobechecked \N +68462 t tobechecked \N +68463 t tobechecked \N +68465 t tobechecked \N +68475 t tobechecked \N +68476 t tobechecked \N +68477 t tobechecked \N +68478 t tobechecked \N +68479 t tobechecked \N +68480 t tobechecked \N +68481 t tobechecked \N +68482 t tobechecked \N +68483 t tobechecked \N +68484 t tobechecked \N +68485 t tobechecked \N +68486 t tobechecked \N +68487 t tobechecked \N +68488 t tobechecked \N +68489 f tobechecked \N +68490 t tobechecked \N +68491 t tobechecked \N +68492 t tobechecked \N +68493 t tobechecked \N +68494 t tobechecked \N +68495 t tobechecked \N +68496 t tobechecked \N +68497 t tobechecked \N +68498 t tobechecked \N +68499 t tobechecked \N +68500 t tobechecked \N +68501 t tobechecked \N +68502 t tobechecked \N +68503 t tobechecked \N +68504 t tobechecked \N +68505 t tobechecked \N +68506 t tobechecked \N +68507 t tobechecked \N +68508 t tobechecked \N +68509 t tobechecked \N +68510 t tobechecked \N +68511 t tobechecked \N +68512 t tobechecked \N +68513 t tobechecked \N +68514 t tobechecked \N +68515 t tobechecked \N +68516 t tobechecked \N +68517 t tobechecked \N +68541 f tobechecked \N +68544 f tobechecked \N +68559 f tobechecked \N +68560 t tobechecked \N +68583 t tobechecked \N +68584 t tobechecked \N +68585 t tobechecked \N +68586 t tobechecked \N +68587 t tobechecked \N +68588 t tobechecked \N +68589 t tobechecked \N +68590 t tobechecked \N +68591 t tobechecked \N +68592 t tobechecked \N +68593 t tobechecked \N +68594 t tobechecked \N +68595 t tobechecked \N +68596 t tobechecked \N +68597 t tobechecked \N +68598 t tobechecked \N +68599 t tobechecked \N +68602 t tobechecked \N +68603 t tobechecked \N +68604 t tobechecked \N +68608 f tobechecked \N +68612 t tobechecked \N +68613 t tobechecked \N +68614 t tobechecked \N +68615 t tobechecked \N +68616 t tobechecked \N +68617 t tobechecked \N +68618 t tobechecked \N +68619 t tobechecked \N +68620 t tobechecked \N +68657 t tobechecked \N +68658 t tobechecked \N +68659 t tobechecked \N +68660 t tobechecked \N +68661 t tobechecked \N +68662 t tobechecked \N +68663 t tobechecked \N +68664 t tobechecked \N +68665 t tobechecked \N +68666 t tobechecked \N +68667 t tobechecked \N +68668 t tobechecked \N +68669 t tobechecked \N +68670 t tobechecked \N +68671 t tobechecked \N +68672 t tobechecked \N +68673 t tobechecked \N +68674 t tobechecked \N +68675 t tobechecked \N +68676 t tobechecked \N +68677 t tobechecked \N +68678 t tobechecked \N +68679 t tobechecked \N +68680 t tobechecked \N +68681 t tobechecked \N +68682 t tobechecked \N +68683 t tobechecked \N +68684 t tobechecked \N +68685 t tobechecked \N +68686 t tobechecked \N +68687 t tobechecked \N +68688 t tobechecked \N +68689 t tobechecked \N +68690 t tobechecked \N +68691 t tobechecked \N +68692 t tobechecked \N +68693 t tobechecked \N +68694 t tobechecked \N +68695 t tobechecked \N +68696 t tobechecked \N +68697 t tobechecked \N +68698 t tobechecked \N +68699 t tobechecked \N +68700 t tobechecked \N +68701 t tobechecked \N +68702 t tobechecked \N +68703 t tobechecked \N +68704 t tobechecked \N +68705 t tobechecked \N +68706 t tobechecked \N +68707 t tobechecked \N +68708 t tobechecked \N +68709 t tobechecked \N +68710 t tobechecked \N +68711 t tobechecked \N +68712 t tobechecked \N +68713 t tobechecked \N +68714 t tobechecked \N +68715 t tobechecked \N +68718 f tobechecked \N +68719 f tobechecked \N +68720 f tobechecked \N +68730 f tobechecked \N +68735 f tobechecked \N +68738 f tobechecked \N +68742 t tobechecked \N +68743 t tobechecked \N +68744 t tobechecked \N +68745 t tobechecked \N +68746 t tobechecked \N +68747 t tobechecked \N +68748 t tobechecked \N +68749 t tobechecked \N +68750 t tobechecked \N +68751 t tobechecked \N +68752 t tobechecked \N +68753 t tobechecked \N +68754 t tobechecked \N +68755 t tobechecked \N +68756 t tobechecked \N +68757 t tobechecked \N +68758 t tobechecked \N +68759 f tobechecked \N +68760 t tobechecked \N +68761 t tobechecked \N +68762 t tobechecked \N +68763 t tobechecked \N +68764 t tobechecked \N +68765 t tobechecked \N +68766 t tobechecked \N +68769 t tobechecked \N +68772 t tobechecked \N +68776 t tobechecked \N +68779 t tobechecked \N +68784 t tobechecked \N +68792 t tobechecked \N +68797 f tobechecked \N +68798 f tobechecked \N +68799 f tobechecked \N +68800 f tobechecked \N +68801 f tobechecked \N +68802 t tobechecked \N +68803 t tobechecked \N +68804 t tobechecked \N +68805 f tobechecked \N +68806 f tobechecked \N +68807 f tobechecked \N +68808 f tobechecked \N +68809 f tobechecked \N +68810 t tobechecked \N +68811 t tobechecked \N +68812 t tobechecked \N +68813 t tobechecked \N +68814 t tobechecked \N +68815 t tobechecked \N +68816 f tobechecked \N +68817 t tobechecked \N +68818 t tobechecked \N +68819 f tobechecked \N +68820 f tobechecked \N +68821 f tobechecked \N +68822 t tobechecked \N +68823 t tobechecked \N +68824 t tobechecked \N +68825 t tobechecked \N +68826 t tobechecked \N +68827 t tobechecked \N +68828 t tobechecked \N +68829 f tobechecked \N +68830 f tobechecked \N +68831 f tobechecked \N +68832 t tobechecked \N +68833 t tobechecked \N +68834 t tobechecked \N +68835 t tobechecked \N +68836 t tobechecked \N +68837 t tobechecked \N +68838 f tobechecked \N +68839 f tobechecked \N +68840 t tobechecked \N +68841 f tobechecked \N +68842 f tobechecked \N +68843 t tobechecked \N +68844 t tobechecked \N +68845 t tobechecked \N +68846 t tobechecked \N +68847 f tobechecked \N +68848 f tobechecked \N +68849 t tobechecked \N +68850 t tobechecked \N +68851 f tobechecked \N +68852 t tobechecked \N +68853 f tobechecked \N +68854 f tobechecked \N +68855 t tobechecked \N +68856 t tobechecked \N +68857 t tobechecked \N +68858 t tobechecked \N +68859 f tobechecked \N +68860 f tobechecked \N +68861 t tobechecked \N +68862 f tobechecked \N +68863 t tobechecked \N +68864 f tobechecked \N +68865 f tobechecked \N +68866 t tobechecked \N +68867 f tobechecked \N +68868 f tobechecked \N +68869 f tobechecked \N +68870 f tobechecked \N +68871 f tobechecked \N +68872 f tobechecked \N +68873 t tobechecked \N +68874 f tobechecked \N +68875 f tobechecked \N +68876 t tobechecked \N +68877 t tobechecked \N +68878 f tobechecked \N +68879 f tobechecked \N +68880 t tobechecked \N +68881 t tobechecked \N +68882 t tobechecked \N +68883 t tobechecked \N +68884 t tobechecked \N +68885 t tobechecked \N +68886 t tobechecked \N +68887 t tobechecked \N +68888 t tobechecked \N +68889 t tobechecked \N +68890 t tobechecked \N +68891 t tobechecked \N +68892 t tobechecked \N +68893 f tobechecked \N +68894 f tobechecked \N +68895 f tobechecked \N +68896 f tobechecked \N +68897 f tobechecked \N +68898 f tobechecked \N +68899 f tobechecked \N +68900 f tobechecked \N +68901 f tobechecked \N +68902 f tobechecked \N +68903 f tobechecked \N +68904 f tobechecked \N +68905 f tobechecked \N +68906 f tobechecked \N +68907 f tobechecked \N +68908 f tobechecked \N +68909 f tobechecked \N +68910 f tobechecked \N +68911 f tobechecked \N +68912 f tobechecked \N +68913 t tobechecked \N +68914 f tobechecked \N +68915 f tobechecked \N +68916 f tobechecked \N +68917 f tobechecked \N +68918 f tobechecked \N +68919 f tobechecked \N +68920 f tobechecked \N +68921 f tobechecked \N +68922 f tobechecked \N +68923 f tobechecked \N +68924 f tobechecked \N +68925 f tobechecked \N +68926 f tobechecked \N +68927 f tobechecked \N +68928 f tobechecked \N +68929 f tobechecked \N +68930 f tobechecked \N +68931 f tobechecked \N +68932 t tobechecked \N +68933 t tobechecked \N +68934 f tobechecked \N +68935 t tobechecked \N +68936 t tobechecked \N +68937 t tobechecked \N +68938 t tobechecked \N +68939 t tobechecked \N +68940 t tobechecked \N +68941 t tobechecked \N +68942 f tobechecked \N +68943 f tobechecked \N +68944 f tobechecked \N +68945 f tobechecked \N +68946 f tobechecked \N +68947 f tobechecked \N +68948 f tobechecked \N +68949 f tobechecked \N +68950 f tobechecked \N +68951 f tobechecked \N +68952 f tobechecked \N +68953 f tobechecked \N +68954 f tobechecked \N +68955 f tobechecked \N +68956 f tobechecked \N +68957 f tobechecked \N +68958 f tobechecked \N +68959 f tobechecked \N +68960 f tobechecked \N +68961 f tobechecked \N +68962 f tobechecked \N +68963 f tobechecked \N +68964 f tobechecked \N +68965 f tobechecked \N +68966 f tobechecked \N +68967 f tobechecked \N +68968 f tobechecked \N +68969 f tobechecked \N +68970 f tobechecked \N +68971 f tobechecked \N +68972 f tobechecked \N +68973 f tobechecked \N +68974 f tobechecked \N +68975 f tobechecked \N +68976 f tobechecked \N +68977 f tobechecked \N +68978 f tobechecked \N +68979 f tobechecked \N +68980 f tobechecked \N +68981 f tobechecked \N +68982 f tobechecked \N +68983 f tobechecked \N +68984 f tobechecked \N +68985 f tobechecked \N +68986 f tobechecked \N +68987 f tobechecked \N +68988 f tobechecked \N +68989 f tobechecked \N +68990 f tobechecked \N +68991 f tobechecked \N +68992 f tobechecked \N +68993 f tobechecked \N +68994 f tobechecked \N +68995 f tobechecked \N +68996 f tobechecked \N +68997 f tobechecked \N +68998 f tobechecked \N +68999 t tobechecked \N +69000 t tobechecked \N +69001 f tobechecked \N +69002 f tobechecked \N +69003 f tobechecked \N +69004 f tobechecked \N +69005 f tobechecked \N +69006 t tobechecked \N +69007 t tobechecked \N +69008 f tobechecked \N +69009 f tobechecked \N +69010 f tobechecked \N +69011 f tobechecked \N +69012 f tobechecked \N +69013 f tobechecked \N +69014 t tobechecked \N +69015 t tobechecked \N +69016 t tobechecked \N +69017 t tobechecked \N +69018 t tobechecked \N +69019 t tobechecked \N +69020 t tobechecked \N +69021 t tobechecked \N +69022 t tobechecked \N +69023 t tobechecked \N +69024 t tobechecked \N +69025 f tobechecked \N +69026 f tobechecked \N +69027 t tobechecked \N +69028 f tobechecked \N +69029 f tobechecked \N +69030 f tobechecked \N +69038 t tobechecked \N +69057 t tobechecked \N +69058 t tobechecked \N +69059 t tobechecked \N +69060 t tobechecked \N +69061 t tobechecked \N +69065 t tobechecked \N +69067 t tobechecked \N +69068 t tobechecked \N +69069 t tobechecked \N +69070 t tobechecked \N +69071 t tobechecked \N +69072 t tobechecked \N +69073 t tobechecked \N +69074 t tobechecked \N +69075 t tobechecked \N +69076 t tobechecked \N +69077 t tobechecked \N +69078 t tobechecked \N +69079 t tobechecked \N +69080 t tobechecked \N +69081 t tobechecked \N +69082 t tobechecked \N +69083 t tobechecked \N +69084 t tobechecked \N +69085 t tobechecked \N +69086 t tobechecked \N +69087 t tobechecked \N +69095 t tobechecked \N +69107 f tobechecked 2022-06-03 00:00:00 +69108 f tobechecked 2022-10-09 00:00:00 +69109 f tobechecked 2022-06-26 00:00:00 +69110 f tobechecked 2022-07-10 00:00:00 +69111 f tobechecked 2022-10-29 00:00:00 +69112 t tobechecked \N +69113 f tobechecked 2022-10-31 00:00:00 +69114 t tobechecked \N +69116 t tobechecked \N +69120 t tobechecked \N +69121 f tobechecked \N +69122 f tobechecked \N +69123 t tobechecked \N +69124 f tobechecked \N +69125 f tobechecked \N +69126 t tobechecked \N +69127 t tobechecked \N +69128 t tobechecked \N +69129 f tobechecked \N +69130 f tobechecked \N +69131 t tobechecked \N +69132 t tobechecked \N +69133 t tobechecked \N +69134 t tobechecked \N +69135 f tobechecked \N +69136 f tobechecked \N +69137 f tobechecked \N +69138 f tobechecked \N +69139 t tobechecked \N +69140 t tobechecked \N +69141 t tobechecked \N +69142 t tobechecked \N +69143 t tobechecked \N +69144 t tobechecked \N +69146 t tobechecked \N +69148 t tobechecked \N +69149 t tobechecked \N +69167 t tobechecked \N +69168 t tobechecked \N +69169 f tobechecked \N +69170 f tobechecked \N +69205 f tobechecked \N +69208 f tobechecked \N +69210 f tobechecked \N +69230 t tobechecked \N +69231 t tobechecked \N +69232 t tobechecked \N +69233 t tobechecked \N +69234 t tobechecked \N +69235 t tobechecked \N +69236 t tobechecked \N +69237 t tobechecked \N +69238 t tobechecked \N +69239 t tobechecked \N +69240 t tobechecked \N +69241 t tobechecked \N +69242 t tobechecked \N +69243 t tobechecked \N +69244 t tobechecked \N +69245 f tobechecked \N +69246 t tobechecked \N +69247 t tobechecked \N +69248 t tobechecked \N +69249 t tobechecked \N +69250 t tobechecked \N +69251 t tobechecked \N +69252 t tobechecked \N +69253 t tobechecked \N +69254 t tobechecked \N +69255 t tobechecked \N +69256 t tobechecked \N +69267 f tobechecked \N +69274 f tobechecked \N +69280 f tobechecked \N +69281 f tobechecked \N +69282 f tobechecked \N +69283 f tobechecked \N +69285 f tobechecked \N +69286 f tobechecked \N +69295 t tobechecked \N +69301 f tobechecked \N +69303 f tobechecked \N +69304 f tobechecked \N +69311 f tobechecked \N +69338 t tobechecked \N +69339 f tobechecked \N +69340 f tobechecked \N +69341 t tobechecked \N +69342 t tobechecked \N +69343 t tobechecked \N +69344 t tobechecked \N +69345 t tobechecked \N +69346 t tobechecked \N +69347 t tobechecked \N +69348 t tobechecked \N +69349 t tobechecked \N +69350 t tobechecked \N +69351 t tobechecked \N +69352 t tobechecked \N +69353 t tobechecked \N +69354 t tobechecked \N +69355 t tobechecked \N +69356 t tobechecked \N +69357 t tobechecked \N +69358 t tobechecked \N +69359 t tobechecked \N +69360 t tobechecked \N +69361 t tobechecked \N +69362 t tobechecked \N +69363 t tobechecked \N +69364 t tobechecked \N +69365 t tobechecked \N +69366 t tobechecked \N +69367 t tobechecked \N +69368 t tobechecked \N +69369 t tobechecked \N +69370 t tobechecked \N +69371 t tobechecked \N +69372 t tobechecked \N +69373 t tobechecked \N +69374 t tobechecked \N +69375 t tobechecked \N +69376 t tobechecked \N +69377 t tobechecked \N +69378 t tobechecked \N +69379 t tobechecked \N +69380 t tobechecked \N +69381 t tobechecked \N +69382 t tobechecked \N +69383 t tobechecked \N +69384 t tobechecked \N +69385 t tobechecked \N +69386 t tobechecked \N +69387 t tobechecked \N +69388 t tobechecked \N +69389 t tobechecked \N +69390 t tobechecked \N +69391 t tobechecked \N +69392 t tobechecked \N +69393 t tobechecked \N +69394 t tobechecked \N +69395 t tobechecked \N +69396 t tobechecked \N +69397 t tobechecked \N +69398 t tobechecked \N +69399 t tobechecked \N +69408 f tobechecked \N +69409 f tobechecked \N +69417 f tobechecked 2023-04-30 00:00:00 +69418 t tobechecked \N +69419 t tobechecked \N +69420 t tobechecked \N +69421 t tobechecked \N +69422 t tobechecked \N +69427 t tobechecked \N +69428 t tobechecked \N +69435 t tobechecked \N +69454 t tobechecked \N +69455 t tobechecked \N +69498 t tobechecked \N +69504 t tobechecked \N +69506 t tobechecked \N +69508 f tobechecked \N +69510 f tobechecked \N +69514 t tobechecked \N +69515 f tobechecked \N +69522 t tobechecked \N +69523 f tobechecked \N +69524 f tobechecked \N +69530 t tobechecked \N +69531 t tobechecked \N +69532 t tobechecked \N +69533 t tobechecked \N +69534 t tobechecked \N +69540 t tobechecked \N +69548 t tobechecked \N +69549 t tobechecked \N +69550 t tobechecked \N +69551 t tobechecked \N +69562 t tobechecked \N +69563 t tobechecked \N +69564 t tobechecked \N +69565 f tobechecked \N +69566 t tobechecked \N +69567 t tobechecked \N +69568 t tobechecked \N +69569 t tobechecked \N +69570 t tobechecked \N +69571 t tobechecked \N +69572 t tobechecked \N +69573 t tobechecked \N +69574 t tobechecked \N +69575 t tobechecked \N +69576 f tobechecked \N +69577 t tobechecked \N +69578 t tobechecked \N +69579 t tobechecked \N +69580 t tobechecked \N +69581 t tobechecked \N +69582 t tobechecked \N +69584 t tobechecked \N +69585 t tobechecked \N +69586 f tobechecked \N +69587 f tobechecked \N +69588 f tobechecked \N +69589 f tobechecked \N +69590 f tobechecked \N +69591 f tobechecked \N +69592 f tobechecked \N +69593 f tobechecked \N +69594 f tobechecked \N +69595 f tobechecked \N +69596 f tobechecked \N +69597 f tobechecked \N +69598 f tobechecked \N +69599 f tobechecked \N +69600 f tobechecked \N +69601 f tobechecked \N +69602 f tobechecked \N +69641 t tobechecked \N +69642 t tobechecked \N +69643 t tobechecked \N +69654 f tobechecked 2023-08-31 00:00:00 +69655 f tobechecked 2022-06-11 00:00:00 +69656 f tobechecked 2023-04-28 00:00:00 +69657 f tobechecked 2023-07-31 00:00:00 +69658 t tobechecked \N +69666 t tobechecked \N +69670 t tobechecked \N +69674 f tobechecked \N +69676 t tobechecked \N +69677 t tobechecked \N +69678 t tobechecked \N +69679 t tobechecked \N +69680 t tobechecked \N +69681 t tobechecked \N +69682 t tobechecked \N +69683 t tobechecked \N +69684 t tobechecked \N +69685 t tobechecked \N +69686 t tobechecked \N +69687 t tobechecked \N +69688 t tobechecked \N +69689 t tobechecked \N +69690 t tobechecked \N +69691 t tobechecked \N +69692 t tobechecked \N +69693 t tobechecked \N +69694 t tobechecked \N +69695 t tobechecked \N +69696 t tobechecked \N +69697 t tobechecked \N +69698 t tobechecked \N +69699 t tobechecked \N +69700 t tobechecked \N +69701 t tobechecked \N +69702 t tobechecked \N +69703 t tobechecked \N +69704 t tobechecked \N +69705 t tobechecked \N +69706 t tobechecked \N +69707 t tobechecked \N +69708 t tobechecked \N +69709 t tobechecked \N +69710 t tobechecked \N +69711 t tobechecked \N +69712 t tobechecked \N +69713 t tobechecked \N +69714 t tobechecked \N +69715 t tobechecked \N +69716 t tobechecked \N +69717 t tobechecked \N +69718 t tobechecked \N +69719 t tobechecked \N +69720 t tobechecked \N +69721 t tobechecked \N +69722 t tobechecked \N +69723 t tobechecked \N +69724 t tobechecked \N +69725 t tobechecked \N +69726 t tobechecked \N +69727 t tobechecked \N +69728 t tobechecked \N +69729 t tobechecked \N +69730 t tobechecked \N +69731 t tobechecked \N +69732 t tobechecked \N +69733 t tobechecked \N +69734 t tobechecked \N +69735 t tobechecked \N +69736 t tobechecked \N +69737 t tobechecked \N +69738 t tobechecked \N +69739 t tobechecked \N +69740 t tobechecked \N +69741 t tobechecked \N +69742 t tobechecked \N +69743 t tobechecked \N +69744 t tobechecked \N +69745 t tobechecked \N +69746 t tobechecked \N +69747 t tobechecked \N +69748 t tobechecked \N +69749 t tobechecked \N +69750 t tobechecked \N +69751 t tobechecked \N +69752 t tobechecked \N +69753 t tobechecked \N +69754 t tobechecked \N +69755 t tobechecked \N +69756 t tobechecked \N +69757 t tobechecked \N +69758 t tobechecked \N +69759 t tobechecked \N +69760 t tobechecked \N +69761 t tobechecked \N +69762 t tobechecked \N +69763 t tobechecked \N +69764 t tobechecked \N +69765 t tobechecked \N +69766 t tobechecked \N +69767 t tobechecked \N +69768 t tobechecked \N +69769 t tobechecked \N +69770 t tobechecked \N +69771 t tobechecked \N +69772 t tobechecked \N +69773 t tobechecked \N +69774 t tobechecked \N +69777 f tobechecked \N +69778 f tobechecked \N +69779 f tobechecked \N +69816 f tobechecked \N +69926 f tobechecked \N +69937 f tobechecked \N +69948 f tobechecked \N +69952 f tobechecked \N +69953 f tobechecked \N +69976 f tobechecked \N +69977 f tobechecked \N +69978 f tobechecked \N +70005 f tobechecked \N +70008 f tobechecked \N +70010 f tobechecked \N +70013 f tobechecked \N +70019 f tobechecked \N +70032 t tobechecked \N +70085 t tobechecked \N +70092 t tobechecked \N +70116 f tobechecked \N +70118 f tobechecked \N +70120 f tobechecked \N +70122 f tobechecked \N +70126 f tobechecked \N +70127 f tobechecked \N +70143 f tobechecked 2024-01-29 00:00:00 +70144 f tobechecked 2024-01-29 00:00:00 +70145 t tobechecked \N +70146 f tobechecked 2022-10-03 00:00:00 +70148 f tobechecked 2024-02-05 00:00:00 +70152 t tobechecked \N +70153 t tobechecked \N +70157 t tobechecked \N +70159 t tobechecked \N +70161 t tobechecked \N +70197 t tobechecked \N +70201 t tobechecked \N +70203 t tobechecked \N +70204 t tobechecked \N +70205 t tobechecked \N +70206 f tobechecked \N +70211 f tobechecked \N +70213 f tobechecked \N +70220 t tobechecked \N +70223 t tobechecked \N +70228 t tobechecked \N +70232 t tobechecked \N +70235 t tobechecked \N +70236 t tobechecked \N +70237 t tobechecked \N +70238 t tobechecked \N +70239 t tobechecked \N +70240 t tobechecked \N +70241 t tobechecked \N +70242 t tobechecked \N +70243 t tobechecked \N +70244 t tobechecked \N +70245 t tobechecked \N +70246 t tobechecked \N +70247 t tobechecked \N +70248 t tobechecked \N +70249 t tobechecked \N +70250 t tobechecked \N +70251 t tobechecked \N +70252 t tobechecked \N +70253 t tobechecked \N +70254 t tobechecked \N +70255 t tobechecked \N +70256 t tobechecked \N +70257 t tobechecked \N +70258 t tobechecked \N +70259 t tobechecked \N +70260 t tobechecked \N +70261 t tobechecked \N +70262 t tobechecked \N +70269 t tobechecked \N +70275 t tobechecked \N +70277 f tobechecked \N +70278 f tobechecked \N +70279 f tobechecked \N +70280 f tobechecked \N +70281 f tobechecked \N +70282 f tobechecked \N +70283 f tobechecked \N +70284 t tobechecked \N +70285 f tobechecked \N +70286 t tobechecked \N +70287 t tobechecked \N +70288 t tobechecked \N +70289 f tobechecked \N +70290 t tobechecked \N +70291 f tobechecked \N +70292 f tobechecked \N +70293 f tobechecked \N +70294 f tobechecked \N +70295 f tobechecked \N +70296 f tobechecked \N +70297 f tobechecked \N +70298 f tobechecked \N +70299 f tobechecked \N +70300 t tobechecked \N +70301 f tobechecked \N +70302 t tobechecked \N +70303 f tobechecked \N +70304 f tobechecked \N +70305 f tobechecked \N +70306 f tobechecked \N +70307 f tobechecked \N +70308 f tobechecked \N +70309 f tobechecked \N +70310 f tobechecked \N +70311 f tobechecked \N +70312 f tobechecked \N +70313 f tobechecked \N +70314 f tobechecked \N +70315 f tobechecked \N +70316 f tobechecked \N +70317 f tobechecked \N +70318 f tobechecked \N +70319 f tobechecked \N +70320 f tobechecked \N +70321 f tobechecked \N +70322 f tobechecked \N +70323 f tobechecked \N +70324 f tobechecked \N +70325 f tobechecked \N +70326 f tobechecked \N +70327 f tobechecked \N +70328 f tobechecked \N +70329 f tobechecked \N +70330 f tobechecked \N +70331 f tobechecked \N +70332 t tobechecked \N +70333 t tobechecked \N +70334 t tobechecked \N +70335 f tobechecked \N +70336 f tobechecked \N +70337 f tobechecked \N +70338 f tobechecked \N +70339 f tobechecked \N +70340 f tobechecked \N +70341 f tobechecked \N +70342 f tobechecked \N +70343 f tobechecked \N +70344 f tobechecked \N +70345 f tobechecked \N +70346 f tobechecked \N +70347 f tobechecked \N +70348 f tobechecked \N +70349 f tobechecked \N +70350 f tobechecked \N +70351 f tobechecked \N +70352 f tobechecked \N +70353 f tobechecked \N +70354 f tobechecked \N +70355 f tobechecked \N +70356 f tobechecked \N +70357 f tobechecked \N +70358 f tobechecked \N +70359 f tobechecked \N +70360 f tobechecked \N +70361 f tobechecked \N +70376 f tobechecked \N +70377 f tobechecked \N +70378 t tobechecked \N +70379 t tobechecked \N +70380 t tobechecked \N +70381 t tobechecked \N +70382 t tobechecked \N +70383 t tobechecked \N +70384 t tobechecked \N +70385 t tobechecked \N +70386 t tobechecked \N +70387 t tobechecked \N +70399 f tobechecked \N +70401 f tobechecked \N +70402 f tobechecked \N +70403 f tobechecked \N +70404 f tobechecked \N +70405 f tobechecked \N +70406 f tobechecked \N +70407 f tobechecked \N +70408 f tobechecked \N +70409 f tobechecked \N +70410 f tobechecked \N +70411 f tobechecked \N +70412 f tobechecked \N +70413 f tobechecked \N +70414 f tobechecked \N +70415 f tobechecked \N +70416 f tobechecked \N +70417 f tobechecked \N +70418 f tobechecked \N +70419 f tobechecked \N +70420 f tobechecked \N +70421 f tobechecked \N +70422 f tobechecked \N +70423 f tobechecked \N +70424 f tobechecked \N +70425 f tobechecked \N +70426 f tobechecked \N +70427 f tobechecked \N +70428 f tobechecked \N +70450 t tobechecked \N +70451 t tobechecked \N +70452 t tobechecked \N +70453 t tobechecked \N +70454 t tobechecked \N +70455 t tobechecked \N +70456 t tobechecked \N +70457 t tobechecked \N +70459 t tobechecked \N +70460 t tobechecked \N +70461 t tobechecked \N +70462 t tobechecked \N +70463 t tobechecked \N +70467 t tobechecked \N +70468 t tobechecked \N +70469 t tobechecked \N +70471 t tobechecked \N +70476 t tobechecked \N +70478 t tobechecked \N +70479 t tobechecked \N +70480 t tobechecked \N +70481 f tobechecked \N +70482 t tobechecked \N +70483 t tobechecked \N +70484 t tobechecked \N +70485 t tobechecked \N +70486 t tobechecked \N +70487 t tobechecked \N +70488 t tobechecked \N +70489 t tobechecked \N +70490 t tobechecked \N +70491 t tobechecked \N +70492 t tobechecked \N +70493 t tobechecked \N +70494 t tobechecked \N +70495 t tobechecked \N +70496 t tobechecked \N +70497 t tobechecked \N +70498 t tobechecked \N +70500 t tobechecked \N +70502 t tobechecked \N +70503 t tobechecked \N +70504 t tobechecked \N +70505 t tobechecked \N +70507 t tobechecked \N +70509 t tobechecked \N +70510 t tobechecked \N +70511 t tobechecked \N +70512 t tobechecked \N +70513 t tobechecked \N +70514 t tobechecked \N +70515 t tobechecked \N +70516 t tobechecked \N +70517 t tobechecked \N +70518 t tobechecked \N +70519 t tobechecked \N +70520 t tobechecked \N +70521 t tobechecked \N +70522 t tobechecked \N +70523 t tobechecked \N +70524 t tobechecked \N +70525 t tobechecked \N +70526 t tobechecked \N +70530 t tobechecked \N +70531 t tobechecked \N +70532 t tobechecked \N +70533 t tobechecked \N +70534 t tobechecked \N +70535 t tobechecked \N +70536 t tobechecked \N +70538 t tobechecked \N +70542 t tobechecked \N +70543 t tobechecked \N +70544 t tobechecked \N +70545 t tobechecked \N +70546 t tobechecked \N +70550 t tobechecked \N +70554 t tobechecked \N +70555 t tobechecked \N +70556 t tobechecked \N +70557 t tobechecked \N +70560 t tobechecked \N +70561 t tobechecked \N +70562 t tobechecked \N +70563 t tobechecked \N +70564 t tobechecked \N +70565 t tobechecked \N +70566 t tobechecked \N +70567 t tobechecked \N +70568 t tobechecked \N +70569 t tobechecked \N +70570 t tobechecked \N +70571 t tobechecked \N +70572 t tobechecked \N +70573 t tobechecked \N +70574 t tobechecked \N +70575 t tobechecked \N +70576 t tobechecked \N +70577 t tobechecked \N +70578 t tobechecked \N +70579 t tobechecked \N +70580 t tobechecked \N +70581 t tobechecked \N +70582 t tobechecked \N +70583 t tobechecked \N +70585 t tobechecked \N +70586 t tobechecked \N +70588 t tobechecked \N +70589 t tobechecked \N +70590 t tobechecked \N +70591 t tobechecked \N +70592 t tobechecked \N +70594 t tobechecked \N +70595 t tobechecked \N +70596 t tobechecked \N +70597 t tobechecked \N +70598 t tobechecked \N +70599 t tobechecked \N +70600 t tobechecked \N +70601 t tobechecked \N +70602 t tobechecked \N +70603 t tobechecked \N +70604 t tobechecked \N +70605 t tobechecked \N +70606 t tobechecked \N +70607 t tobechecked \N +70608 t tobechecked \N +70609 t tobechecked \N +70610 t tobechecked \N +70611 t tobechecked \N +70612 t tobechecked \N +70613 t tobechecked \N +70614 t tobechecked \N +70615 t tobechecked \N +70616 t tobechecked \N +70617 t tobechecked \N +70618 t tobechecked \N +70619 t tobechecked \N +70620 t tobechecked \N +70621 t tobechecked \N +70622 t tobechecked \N +70623 t tobechecked \N +70624 t tobechecked \N +70625 t tobechecked \N +70626 t tobechecked \N +70627 t tobechecked \N +70628 t tobechecked \N +70629 t tobechecked \N +70630 t tobechecked \N +70631 t tobechecked \N +70632 t tobechecked \N +70633 t tobechecked \N +70634 t tobechecked \N +70636 t tobechecked \N +70637 t tobechecked \N +70640 t tobechecked \N +70641 t tobechecked \N +70649 t tobechecked \N +70650 t tobechecked \N +70651 t tobechecked \N +70652 t tobechecked \N +70653 t tobechecked \N +70655 t tobechecked \N +70656 t tobechecked \N +70657 t tobechecked \N +70658 t tobechecked \N +70659 t tobechecked \N +70660 t tobechecked \N +70661 t tobechecked \N +70662 t tobechecked \N +70664 t tobechecked \N +70665 t tobechecked \N +70666 t tobechecked \N +70667 t tobechecked \N +70668 t tobechecked \N +70669 t tobechecked \N +70670 t tobechecked \N +70671 t tobechecked \N +70672 t tobechecked \N +70673 t tobechecked \N +70674 t tobechecked \N +70675 t tobechecked \N +70676 t tobechecked \N +70677 t tobechecked \N +70678 t tobechecked \N +70679 t tobechecked \N +70680 t tobechecked \N +70681 t tobechecked \N +70682 t tobechecked \N +70683 t tobechecked \N +70684 t tobechecked \N +70685 t tobechecked \N +70686 t tobechecked \N +70687 t tobechecked \N +70689 t tobechecked \N +70691 t tobechecked \N +70698 t tobechecked \N +70701 t tobechecked \N +70702 t tobechecked \N +70703 t tobechecked \N +70705 t tobechecked \N +70706 t tobechecked \N +70709 t tobechecked \N +70710 t tobechecked \N +70712 f tobechecked \N +70713 f tobechecked \N +70714 f tobechecked \N +70715 t tobechecked \N +70716 t tobechecked \N +70717 t tobechecked \N +70718 t tobechecked \N +70719 t tobechecked \N +70720 t tobechecked \N +70721 t tobechecked \N +70722 t tobechecked \N +70723 f tobechecked \N +70724 f tobechecked \N +70725 f tobechecked \N +70726 f tobechecked \N +70727 f tobechecked \N +70728 f tobechecked \N +70729 f tobechecked \N +70730 t tobechecked \N +70731 f tobechecked \N +70732 f tobechecked \N +70733 f tobechecked \N +70734 f tobechecked \N +70735 f tobechecked \N +70736 f tobechecked \N +70737 f tobechecked \N +70738 f tobechecked \N +70739 f tobechecked \N +70740 f tobechecked \N +70741 f tobechecked \N +70742 f tobechecked \N +70743 f tobechecked \N +70744 f tobechecked \N +70745 f tobechecked \N +70746 f tobechecked \N +70756 t tobechecked \N +70757 t tobechecked \N +70758 t tobechecked \N +70759 t tobechecked \N +70760 t tobechecked \N +70761 t tobechecked \N +70762 t tobechecked \N +70763 t tobechecked \N +70764 t tobechecked \N +70765 t tobechecked \N +70766 t tobechecked \N +70767 t tobechecked \N +70768 t tobechecked \N +70769 t tobechecked \N +70770 t tobechecked \N +70771 t tobechecked \N +70773 t tobechecked \N +70775 t tobechecked \N +70778 f tobechecked \N +70781 t tobechecked \N +70794 t tobechecked \N +70819 t tobechecked \N +70822 t tobechecked \N +70824 t tobechecked \N +70829 t tobechecked \N +70832 t tobechecked \N +70836 t tobechecked \N +70838 f tobechecked \N +70840 t tobechecked \N +70842 t tobechecked \N +70843 t tobechecked \N +70844 t tobechecked \N +70845 t tobechecked \N +70846 t tobechecked \N +70848 t tobechecked \N +70849 t tobechecked \N +70852 t tobechecked \N +70855 t tobechecked \N +70865 f tobechecked \N +70866 t tobechecked \N +70867 f tobechecked \N +70896 t tobechecked \N +70897 t tobechecked \N +70898 t tobechecked \N +70899 t tobechecked \N +70900 t tobechecked \N +70920 t tobechecked \N +70929 f tobechecked \N +70930 f tobechecked 2024-09-17 00:00:00 +70931 f tobechecked 2024-03-01 00:00:00 +70932 f tobechecked 2025-03-30 00:00:00 +70933 t tobechecked \N +70934 f tobechecked 2024-05-12 00:00:00 +70935 t tobechecked \N +70936 f tobechecked 2023-10-06 00:00:00 +70937 f tobechecked 2023-11-27 00:00:00 +70938 f tobechecked 2024-03-23 00:00:00 +70939 f tobechecked 2024-07-06 00:00:00 +70940 f tobechecked 2023-05-22 00:00:00 +70943 t tobechecked \N +70947 t tobechecked \N +70948 t tobechecked \N +70949 t tobechecked \N +70950 t tobechecked \N +70952 f tobechecked \N +70953 f tobechecked \N +70954 f tobechecked \N +70955 f tobechecked \N +70956 f tobechecked \N +70957 f tobechecked \N +70958 f tobechecked \N +70959 f tobechecked \N +70960 f tobechecked \N +70961 f tobechecked \N +70962 f tobechecked \N +70963 f tobechecked \N +70964 f tobechecked \N +70965 f tobechecked \N +70966 f tobechecked \N +70967 f tobechecked \N +70968 f tobechecked \N +70969 f tobechecked \N +70970 f tobechecked \N +70971 f tobechecked \N +70972 f tobechecked \N +70973 f tobechecked \N +70974 f tobechecked \N +70975 f tobechecked \N +70976 f tobechecked \N +70978 t tobechecked \N +70979 t tobechecked \N +70980 t tobechecked \N +70981 t tobechecked \N +70982 t tobechecked \N +70983 t tobechecked \N +70984 t tobechecked \N +70985 t tobechecked \N +70986 t tobechecked \N +70987 t tobechecked \N +70988 t tobechecked \N +70989 t tobechecked \N +70990 t tobechecked \N +70991 t tobechecked \N +70992 t tobechecked \N +70993 t tobechecked \N +70994 t tobechecked \N +70995 t tobechecked \N +70996 t tobechecked \N +70997 t tobechecked \N +70998 f tobechecked \N +70999 f tobechecked \N +71008 t tobechecked \N +71010 t tobechecked \N +71023 t tobechecked \N +71026 t tobechecked \N +71029 t tobechecked \N +71038 t tobechecked \N +71040 t tobechecked \N +71042 t tobechecked \N +71046 t tobechecked \N +71047 t tobechecked \N +71048 t tobechecked \N +71057 t tobechecked \N +71058 t tobechecked \N +71063 t tobechecked \N +71064 t tobechecked \N +71081 t tobechecked \N +71092 t tobechecked \N +71098 f tobechecked \N +71101 t tobechecked \N +71105 t tobechecked \N +71106 t tobechecked \N +71107 t tobechecked \N +71109 t tobechecked \N +71110 t tobechecked \N +71113 t tobechecked \N +71114 t tobechecked \N +71115 t tobechecked \N +71116 t tobechecked \N +71117 t tobechecked \N +71118 t tobechecked \N +71119 t tobechecked \N +71120 t tobechecked \N +71121 t tobechecked \N +71122 t tobechecked \N +71123 t tobechecked \N +71124 t tobechecked \N +71130 t tobechecked \N +71131 t tobechecked \N +71132 t tobechecked \N +71133 t tobechecked \N +71140 t tobechecked \N +71164 t tobechecked \N +71167 t tobechecked \N +71189 t tobechecked \N +71213 t tobechecked \N +71214 t tobechecked \N +71215 t tobechecked \N +71216 t tobechecked \N +71217 t tobechecked \N +71218 t tobechecked \N +71219 t tobechecked \N +71220 t tobechecked \N +71221 t tobechecked \N +71222 t tobechecked \N +71223 t tobechecked \N +71224 t tobechecked \N +71225 t tobechecked \N +71226 t tobechecked \N +71227 t tobechecked \N +71234 t tobechecked \N +71242 t tobechecked \N +71246 t tobechecked \N +71248 t tobechecked \N +71249 t tobechecked \N +71251 t tobechecked \N +71252 t tobechecked \N +71254 t tobechecked \N +71255 t tobechecked \N +71256 t tobechecked \N +71257 t tobechecked \N +71258 t tobechecked \N +71259 t tobechecked \N +71260 t tobechecked \N +71261 t tobechecked \N +71262 t tobechecked \N +71264 t tobechecked \N +71267 t tobechecked \N +71269 t tobechecked \N +71272 t tobechecked \N +71273 t tobechecked \N +71274 t tobechecked \N +71279 t tobechecked \N +71280 t tobechecked \N +71282 t tobechecked \N +71285 f tobechecked \N +71292 t tobechecked \N +71293 t tobechecked \N +71294 t tobechecked \N +71309 t tobechecked \N +71310 t tobechecked \N +71312 f tobechecked \N +71314 t tobechecked \N +71316 f tobechecked \N +71338 f tobechecked \N +71340 f tobechecked \N +71341 f tobechecked \N +71342 t tobechecked \N +71343 t tobechecked \N +71344 t tobechecked \N +71345 t tobechecked \N +71346 t tobechecked \N +71347 t tobechecked \N +71348 t tobechecked \N +71349 t tobechecked \N +71350 f tobechecked \N +71351 t tobechecked \N +71352 t tobechecked \N +71353 t tobechecked \N +71354 t tobechecked \N +71355 t tobechecked \N +71356 t tobechecked \N +71357 t tobechecked \N +71358 t tobechecked \N +71359 t tobechecked \N +71360 t tobechecked \N +71361 t tobechecked \N +71362 t tobechecked \N +71363 t tobechecked \N +71364 t tobechecked \N +71365 f tobechecked \N +71374 t tobechecked \N +71418 t tobechecked \N +71419 t tobechecked \N +71420 t tobechecked \N +71421 t tobechecked \N +71422 t tobechecked \N +71423 t tobechecked \N +71424 t tobechecked \N +71425 t tobechecked \N +71426 t tobechecked \N +71427 t tobechecked \N +71428 t tobechecked \N +71429 t tobechecked \N +71430 t tobechecked \N +71431 t tobechecked \N +71432 t tobechecked \N +71433 t tobechecked \N +71434 t tobechecked \N +71435 t tobechecked \N +71436 t tobechecked \N +71437 t tobechecked \N +71438 t tobechecked \N +71439 t tobechecked \N +71440 t tobechecked \N +71441 t tobechecked \N +71442 t tobechecked \N +71443 t tobechecked \N +71444 t tobechecked \N +71445 t tobechecked \N +71446 t tobechecked \N +71447 t tobechecked \N +71448 t tobechecked \N +71449 t tobechecked \N +71450 t tobechecked \N +71451 t tobechecked \N +71452 t tobechecked \N +71453 t tobechecked \N +71454 t tobechecked \N +71455 t tobechecked \N +71456 t tobechecked \N +71457 t tobechecked \N +71458 t tobechecked \N +71459 t tobechecked \N +71460 t tobechecked \N +71461 t tobechecked \N +71462 t tobechecked \N +71463 t tobechecked \N +71464 t tobechecked \N +71465 t tobechecked \N +71466 t tobechecked \N +71467 t tobechecked \N +71468 t tobechecked \N +71469 t tobechecked \N +71470 t tobechecked \N +71471 t tobechecked \N +71472 t tobechecked \N +71473 t tobechecked \N +71474 t tobechecked \N +71475 t tobechecked \N +71476 t tobechecked \N +71477 t tobechecked \N +71478 t tobechecked \N +71479 t tobechecked \N +71480 t tobechecked \N +71481 t tobechecked \N +71482 t tobechecked \N +71483 t tobechecked \N +71484 t tobechecked \N +71485 t tobechecked \N +71486 t tobechecked \N +71487 t tobechecked \N +71488 t tobechecked \N +71489 t tobechecked \N +71490 t tobechecked \N +71491 t tobechecked \N +71492 t tobechecked \N +71493 t tobechecked \N +71494 t tobechecked \N +71495 t tobechecked \N +71496 t tobechecked \N +71497 t tobechecked \N +71498 t tobechecked \N +71499 t tobechecked \N +71500 t tobechecked \N +71501 t tobechecked \N +71502 t tobechecked \N +71503 t tobechecked \N +71504 t tobechecked \N +71505 t tobechecked \N +71506 t tobechecked \N +71507 t tobechecked \N +71508 t tobechecked \N +71509 t tobechecked \N +71510 t tobechecked \N +71511 t tobechecked \N +71512 t tobechecked \N +71513 t tobechecked \N +71514 t tobechecked \N +71515 t tobechecked \N +71516 t tobechecked \N +71517 t tobechecked \N +71518 t tobechecked \N +71519 t tobechecked \N +71520 t tobechecked \N +71521 t tobechecked \N +71522 t tobechecked \N +71523 t tobechecked \N +71524 t tobechecked \N +71525 t tobechecked \N +71526 t tobechecked \N +71527 t tobechecked \N +71528 t tobechecked \N +71529 t tobechecked \N +71530 t tobechecked \N +71531 t tobechecked \N +71532 t tobechecked \N +71533 t tobechecked \N +71534 t tobechecked \N +71535 t tobechecked \N +71536 t tobechecked \N +71537 t tobechecked \N +71538 t tobechecked \N +71539 t tobechecked \N +71540 t tobechecked \N +71541 t tobechecked \N +71542 t tobechecked \N +71543 t tobechecked \N +71544 t tobechecked \N +71545 t tobechecked \N +71546 t tobechecked \N +71547 t tobechecked \N +71548 t tobechecked \N +71549 t tobechecked \N +71550 t tobechecked \N +71551 t tobechecked \N +71552 t tobechecked \N +71553 t tobechecked \N +71554 t tobechecked \N +71555 t tobechecked \N +71556 t tobechecked \N +71557 t tobechecked \N +71558 t tobechecked \N +71559 t tobechecked \N +71560 t tobechecked \N +71561 t tobechecked \N +71562 t tobechecked \N +71563 t tobechecked \N +71564 t tobechecked \N +71565 t tobechecked \N +71566 t tobechecked \N +71567 t tobechecked \N +71568 t tobechecked \N +71569 t tobechecked \N +71570 t tobechecked \N +71571 t tobechecked \N +71572 t tobechecked \N +71573 t tobechecked \N +71574 t tobechecked \N +71575 t tobechecked \N +71576 t tobechecked \N +71577 t tobechecked \N +71578 t tobechecked \N +71579 t tobechecked \N +71580 t tobechecked \N +71581 t tobechecked \N +71582 t tobechecked \N +71583 t tobechecked \N +71584 t tobechecked \N +71585 t tobechecked \N +71586 t tobechecked \N +71587 t tobechecked \N +71588 t tobechecked \N +71589 t tobechecked \N +71590 t tobechecked \N +71591 t tobechecked \N +71592 t tobechecked \N +71593 t tobechecked \N +71594 t tobechecked \N +71595 t tobechecked \N +71596 t tobechecked \N +71597 t tobechecked \N +71598 t tobechecked \N +71602 f tobechecked \N +71603 t tobechecked \N +71604 t tobechecked \N +71605 t tobechecked \N +71606 t tobechecked \N +71607 t tobechecked \N +71608 t tobechecked \N +71609 t tobechecked \N +71610 t tobechecked \N +71611 t tobechecked \N +71612 t tobechecked \N +71613 t tobechecked \N +71614 t tobechecked \N +71615 t tobechecked \N +71616 t tobechecked \N +71617 t tobechecked \N +71618 t tobechecked \N +71619 t tobechecked \N +71620 t tobechecked \N +71621 f tobechecked \N +71622 f tobechecked \N +71623 f tobechecked \N +71624 f tobechecked \N +71625 f tobechecked \N +71626 f tobechecked \N +71627 f tobechecked \N +71628 f tobechecked \N +71629 f tobechecked \N +71630 f tobechecked \N +71631 f tobechecked \N +71632 f tobechecked \N +71633 f tobechecked \N +71634 f tobechecked \N +71668 t tobechecked \N +71669 t tobechecked \N +71670 t tobechecked \N +71671 t tobechecked \N +71672 t tobechecked \N +71673 t tobechecked \N +71674 t tobechecked \N +71675 t tobechecked \N +71676 t tobechecked \N +71677 t tobechecked \N +71678 t tobechecked \N +71679 t tobechecked \N +71680 t tobechecked \N +71681 t tobechecked \N +71682 t tobechecked \N +71683 t tobechecked \N +71690 t tobechecked \N +71691 t tobechecked \N +71692 t tobechecked \N +71693 t tobechecked \N +71694 t tobechecked \N +71695 t tobechecked \N +71696 t tobechecked \N +71697 t tobechecked \N +71698 t tobechecked \N +71699 t tobechecked \N +71700 t tobechecked \N +71701 t tobechecked \N +71702 t tobechecked \N +71703 t tobechecked \N +71704 t tobechecked \N +71705 t tobechecked \N +71706 t tobechecked \N +71707 t tobechecked \N +71708 t tobechecked \N +71709 t tobechecked \N +71710 t tobechecked \N +71711 t tobechecked \N +71712 t tobechecked \N +71713 t tobechecked \N +71714 t tobechecked \N +71715 t tobechecked \N +71716 t tobechecked \N +71717 t tobechecked \N +71718 t tobechecked \N +71719 t tobechecked \N +71720 t tobechecked \N +71721 t tobechecked \N +71722 t tobechecked \N +71723 t tobechecked \N +71724 t tobechecked \N +71725 t tobechecked \N +71726 t tobechecked \N +71727 t tobechecked \N +71728 t tobechecked \N +71729 t tobechecked \N +71730 t tobechecked \N +71731 t tobechecked \N +71732 t tobechecked \N +71733 t tobechecked \N +71734 t tobechecked \N +71735 t tobechecked \N +71736 t tobechecked \N +71737 t tobechecked \N +71738 t tobechecked \N +71739 t tobechecked \N +71740 t tobechecked \N +71741 t tobechecked \N +71742 t tobechecked \N +71743 t tobechecked \N +71744 t tobechecked \N +71745 t tobechecked \N +71746 t tobechecked \N +71747 t tobechecked \N +71748 t tobechecked \N +71749 t tobechecked \N +71750 t tobechecked \N +71751 t tobechecked \N +71752 t tobechecked \N +71753 t tobechecked \N +71754 t tobechecked \N +71755 t tobechecked \N +71756 t tobechecked \N +71757 t tobechecked \N +71758 t tobechecked \N +71759 t tobechecked \N +71760 t tobechecked \N +71761 t tobechecked \N +71762 t tobechecked \N +71763 t tobechecked \N +71764 t tobechecked \N +71765 t tobechecked \N +71766 t tobechecked \N +71767 t tobechecked \N +71768 t tobechecked \N +71769 t tobechecked \N +71770 t tobechecked \N +71771 t tobechecked \N +71772 t tobechecked \N +71773 t tobechecked \N +71774 t tobechecked \N +71775 t tobechecked \N +71776 t tobechecked \N +71777 t tobechecked \N +71778 t tobechecked \N +71779 t tobechecked \N +71780 t tobechecked \N +71781 t tobechecked \N +71782 t tobechecked \N +71783 t tobechecked \N +71784 t tobechecked \N +71785 t tobechecked \N +71786 t tobechecked \N +71787 t tobechecked \N +71788 t tobechecked \N +71789 t tobechecked \N +71790 t tobechecked \N +71791 t tobechecked \N +71792 t tobechecked \N +71793 t tobechecked \N +71794 t tobechecked \N +71795 t tobechecked \N +71796 t tobechecked \N +71797 t tobechecked \N +71798 t tobechecked \N +71799 t tobechecked \N +71800 t tobechecked \N +71801 t tobechecked \N +71802 t tobechecked \N +71803 t tobechecked \N +71804 t tobechecked \N +71805 t tobechecked \N +71806 t tobechecked \N +71807 t tobechecked \N +71808 t tobechecked \N +71809 t tobechecked \N +71810 t tobechecked \N +71811 t tobechecked \N +71812 t tobechecked \N +71813 t tobechecked \N +71814 t tobechecked \N +71815 t tobechecked \N +71816 t tobechecked \N +71817 t tobechecked \N +71818 t tobechecked \N +71819 t tobechecked \N +71820 t tobechecked \N +71821 t tobechecked \N +71822 t tobechecked \N +71823 t tobechecked \N +71824 t tobechecked \N +71825 t tobechecked \N +71826 t tobechecked \N +71827 t tobechecked \N +71828 t tobechecked \N +71829 t tobechecked \N +71830 t tobechecked \N +71831 t tobechecked \N +71832 t tobechecked \N +71833 t tobechecked \N +71834 t tobechecked \N +71835 t tobechecked \N +71836 t tobechecked \N +71837 t tobechecked \N +71838 t tobechecked \N +71839 t tobechecked \N +71840 t tobechecked \N +71841 t tobechecked \N +71842 t tobechecked \N +71843 t tobechecked \N +71844 t tobechecked \N +71845 t tobechecked \N +71846 t tobechecked \N +71847 t tobechecked \N +71848 t tobechecked \N +71849 t tobechecked \N +71850 t tobechecked \N +71851 t tobechecked \N +71852 t tobechecked \N +71853 t tobechecked \N +71854 t tobechecked \N +71855 t tobechecked \N +71856 t tobechecked \N +71857 t tobechecked \N +71858 t tobechecked \N +71859 t tobechecked \N +71860 t tobechecked \N +71861 t tobechecked \N +71862 t tobechecked \N +71863 t tobechecked \N +71864 t tobechecked \N +71865 t tobechecked \N +71866 t tobechecked \N +71867 t tobechecked \N +71868 t tobechecked \N +71869 t tobechecked \N +71870 t tobechecked \N +71871 t tobechecked \N +71872 t tobechecked \N +71873 t tobechecked \N +71874 t tobechecked \N +71875 t tobechecked \N +71876 t tobechecked \N +71877 t tobechecked \N +71878 t tobechecked \N +71879 t tobechecked \N +71880 t tobechecked \N +71881 t tobechecked \N +71882 t tobechecked \N +71883 t tobechecked \N +71884 t tobechecked \N +71885 t tobechecked \N +71886 t tobechecked \N +71887 t tobechecked \N +71888 t tobechecked \N +71889 t tobechecked \N +71890 t tobechecked \N +71891 t tobechecked \N +71892 t tobechecked \N +71893 t tobechecked \N +71894 t tobechecked \N +71895 t tobechecked \N +71896 t tobechecked \N +71897 t tobechecked \N +71898 t tobechecked \N +71899 t tobechecked \N +71900 t tobechecked \N +71901 t tobechecked \N +71902 t tobechecked \N +71903 t tobechecked \N +71904 t tobechecked \N +71905 t tobechecked \N +71906 t tobechecked \N +71907 t tobechecked \N +71908 t tobechecked \N +71909 t tobechecked \N +71910 t tobechecked \N +71911 t tobechecked \N +71912 t tobechecked \N +71913 t tobechecked \N +71914 t tobechecked \N +71915 t tobechecked \N +71916 t tobechecked \N +71917 t tobechecked \N +71918 t tobechecked \N +71919 t tobechecked \N +71920 t tobechecked \N +71921 t tobechecked \N +71935 t tobechecked \N +71937 t tobechecked \N +71952 t tobechecked \N +71954 t tobechecked \N +72006 t tobechecked \N +72042 t tobechecked \N +72044 t tobechecked \N +72046 t tobechecked \N +72047 t tobechecked \N +72054 t tobechecked \N +72058 t tobechecked \N +72063 t tobechecked \N +72064 t tobechecked \N +72073 t tobechecked \N +72074 t tobechecked \N +72077 t tobechecked \N +72083 t tobechecked \N +72085 f tobechecked \N +72086 t tobechecked \N +72087 t tobechecked \N +72091 f tobechecked \N +72097 t tobechecked \N +72098 t tobechecked \N +72110 f tobechecked 2027-05-03 00:00:00 +72111 f tobechecked \N +72112 f tobechecked \N +72114 f tobechecked \N +72115 f tobechecked \N +72117 f tobechecked \N +72120 f tobechecked \N +72124 t tobechecked \N +72182 f tobechecked \N +72204 t tobechecked \N +72207 t tobechecked \N +72209 t tobechecked \N +72218 t tobechecked \N +72237 t tobechecked \N +72238 t tobechecked \N +72239 t tobechecked \N +72240 t tobechecked \N +72241 t tobechecked \N +72248 t tobechecked \N +72249 t tobechecked \N +72250 t tobechecked \N +72283 t tobechecked \N +72284 t tobechecked \N +72285 t tobechecked \N +72286 t tobechecked \N +72297 t tobechecked \N +72305 f tobechecked \N +72308 f tobechecked \N +72320 t tobechecked \N +72327 t tobechecked \N +72330 t tobechecked \N +72331 t tobechecked \N +72332 f tobechecked \N +72333 t tobechecked \N +72335 t tobechecked \N +72341 t tobechecked \N +72342 f tobechecked \N +72358 t tobechecked \N +72359 t tobechecked \N +72360 f tobechecked \N +72361 t tobechecked \N +72362 t tobechecked \N +72363 t tobechecked \N +72364 t tobechecked \N +72365 t tobechecked \N +72366 t tobechecked \N +72367 t tobechecked \N +72368 t tobechecked \N +72369 t tobechecked \N +72370 t tobechecked \N +72371 t tobechecked \N +72372 t tobechecked \N +72410 t tobechecked \N +72411 t tobechecked \N +72414 t tobechecked \N +72416 f tobechecked 2026-01-17 00:00:00 +72417 f tobechecked 2025-11-17 00:00:00 +72418 f tobechecked 2024-02-03 00:00:00 +72419 f tobechecked 2025-02-02 00:00:00 +72426 t tobechecked \N +72440 t tobechecked \N +72441 t tobechecked \N +72442 t tobechecked \N +72443 t tobechecked \N +72444 t tobechecked \N +72445 t tobechecked \N +72446 t tobechecked \N +72472 t tobechecked \N +72493 f tobechecked \N +72495 f tobechecked \N +72496 f tobechecked \N +72508 f tobechecked \N +72517 t tobechecked \N +72518 t tobechecked \N +72519 t tobechecked \N +72520 t tobechecked \N +72521 t tobechecked \N +72522 t tobechecked \N +72523 t tobechecked \N +72524 t tobechecked \N +72525 t tobechecked \N +72526 t tobechecked \N +72527 t tobechecked \N +72528 t tobechecked \N +72529 t tobechecked \N +72530 t tobechecked \N +72531 t tobechecked \N +72532 t tobechecked \N +72533 t tobechecked \N +72534 t tobechecked \N +72535 t tobechecked \N +72536 t tobechecked \N +72537 t tobechecked \N +72538 t tobechecked \N +72539 t tobechecked \N +72540 t tobechecked \N +72541 t tobechecked \N +72542 t tobechecked \N +72543 t tobechecked \N +72544 t tobechecked \N +72545 t tobechecked \N +72546 t tobechecked \N +72547 t tobechecked \N +72548 t tobechecked \N +72549 t tobechecked \N +72550 t tobechecked \N +72551 t tobechecked \N +72552 t tobechecked \N +72553 t tobechecked \N +72554 t tobechecked \N +72555 t tobechecked \N +72556 t tobechecked \N +72557 t tobechecked \N +72558 t tobechecked \N +72559 t tobechecked \N +72560 t tobechecked \N +72561 t tobechecked \N +72562 t tobechecked \N +72563 t tobechecked \N +72564 t tobechecked \N +72565 t tobechecked \N +72566 t tobechecked \N +72567 t tobechecked \N +72568 t tobechecked \N +72569 t tobechecked \N +72570 t tobechecked \N +72571 t tobechecked \N +72572 t tobechecked \N +72573 t tobechecked \N +72574 t tobechecked \N +72575 t tobechecked \N +72576 t tobechecked \N +72577 t tobechecked \N +72587 f tobechecked \N +72596 t tobechecked \N +72600 f tobechecked \N +72603 t tobechecked \N +72610 t tobechecked \N +72611 t tobechecked \N +72614 f tobechecked \N +72618 t tobechecked \N +72619 t tobechecked \N +72620 t tobechecked \N +72621 t tobechecked \N +72622 t tobechecked \N +72624 t tobechecked \N +72630 t tobechecked \N +72631 t tobechecked \N +72632 f tobechecked \N +72633 f tobechecked \N +72634 f tobechecked \N +72635 f tobechecked \N +72636 f tobechecked \N +72637 f tobechecked \N +72655 f tobechecked 2026-10-31 00:00:00 +72656 f tobechecked 2024-11-25 00:00:00 +72657 f tobechecked 2026-11-16 00:00:00 +72658 f tobechecked 2025-01-28 00:00:00 +72678 t tobechecked \N +72679 t tobechecked \N +72680 t tobechecked \N +72681 t tobechecked \N +72682 f tobechecked \N +72683 f tobechecked \N +72684 f tobechecked \N +72685 f tobechecked \N +72686 f tobechecked \N +72687 f tobechecked \N +72688 t tobechecked \N +72689 t tobechecked \N +72690 t tobechecked \N +72691 t tobechecked \N +72692 t tobechecked \N +72693 t tobechecked \N +72694 t tobechecked \N +72695 t tobechecked \N +72696 t tobechecked \N +72697 t tobechecked \N +72698 f tobechecked \N +72699 t tobechecked \N +72700 t tobechecked \N +72701 t tobechecked \N +72702 t tobechecked \N +72703 t tobechecked \N +72704 t tobechecked \N +72705 t tobechecked \N +72706 t tobechecked \N +72707 t tobechecked \N +72708 t tobechecked \N +72709 t tobechecked \N +72710 t tobechecked \N +72711 t tobechecked \N +72712 t tobechecked \N +72713 t tobechecked \N +72714 t tobechecked \N +72715 t tobechecked \N +72716 t tobechecked \N +72717 t tobechecked \N +72718 t tobechecked \N +72719 t tobechecked \N +72720 t tobechecked \N +72721 t tobechecked \N +72727 t tobechecked \N +72736 t tobechecked \N +72739 t tobechecked \N +72740 t tobechecked \N +72798 t tobechecked \N +72804 t tobechecked \N +72809 t tobechecked \N +72829 t tobechecked \N +72830 t tobechecked \N +72831 t tobechecked \N +72832 t tobechecked \N +72833 t tobechecked \N +72834 t tobechecked \N +72835 t tobechecked \N +72836 t tobechecked \N +72837 t tobechecked \N +72839 t tobechecked \N +72840 t tobechecked \N +72841 t tobechecked \N +72842 t tobechecked \N +72843 t tobechecked \N +72844 t tobechecked \N +72845 t tobechecked \N +72861 t tobechecked \N +72905 f tobechecked \N +72914 t tobechecked \N +72916 t tobechecked \N +72918 t tobechecked \N +72921 t tobechecked \N +72922 t tobechecked \N +72923 t tobechecked \N +72944 t tobechecked \N +72948 t tobechecked \N +72986 f tobechecked \N +72987 f tobechecked \N +72988 f tobechecked \N +72992 f tobechecked \N +72993 f tobechecked \N +72994 f tobechecked \N +72995 f tobechecked 2026-12-19 00:00:00 +72996 f tobechecked 2027-07-12 00:00:00 +72997 f tobechecked 2027-06-17 00:00:00 +72998 f tobechecked 2025-10-27 00:00:00 +72999 f tobechecked 2025-10-27 00:00:00 +73000 f tobechecked 2026-03-09 00:00:00 +73001 f tobechecked 2026-06-19 00:00:00 +73002 f tobechecked 2026-07-04 00:00:00 +73003 f tobechecked 2026-12-13 00:00:00 +73004 f tobechecked 2027-07-12 00:00:00 +73005 f tobechecked 2027-07-12 00:00:00 +73006 f tobechecked 2029-04-28 00:00:00 +73007 f tobechecked 2026-03-09 00:00:00 +73008 f tobechecked 2025-12-12 00:00:00 +73009 f tobechecked 2026-05-18 00:00:00 +73010 f tobechecked 2027-04-30 00:00:00 +73011 f tobechecked 2026-01-25 00:00:00 +73012 f tobechecked 2028-01-15 00:00:00 +73016 t tobechecked \N +103745 t tobechecked \N +103800 t tobechecked \N +103802 t tobechecked \N +103822 t tobechecked \N +103824 t tobechecked \N +103828 t tobechecked \N +103830 t tobechecked \N +103832 t tobechecked \N +103838 t tobechecked \N +103840 t tobechecked \N +103842 t tobechecked \N +103844 t tobechecked \N +103846 t tobechecked \N +103850 t tobechecked \N +103854 t tobechecked \N +103856 t tobechecked \N +103858 t tobechecked \N +103860 t tobechecked \N +103862 t tobechecked \N +103864 t tobechecked \N +103866 t tobechecked \N +103874 t tobechecked \N +103876 t tobechecked \N +103880 t tobechecked \N +103882 t tobechecked \N +103884 t tobechecked \N +103886 t tobechecked \N +103894 t tobechecked \N +103914 t tobechecked \N +103916 t tobechecked \N +103918 t tobechecked \N +103920 t tobechecked \N +103922 t tobechecked \N +103924 t tobechecked \N +103926 t tobechecked \N +103938 t tobechecked \N +103942 t tobechecked \N +103944 t tobechecked \N +103948 t tobechecked \N +103970 f tobechecked \N +103972 t tobechecked \N +103974 t tobechecked \N +103976 t tobechecked \N +103978 t tobechecked \N +103980 t tobechecked \N +103982 t tobechecked \N +103984 t tobechecked \N +103986 t tobechecked \N +103988 t tobechecked \N +103990 t tobechecked \N +103992 t tobechecked \N +103994 t tobechecked \N +103996 t tobechecked \N +103998 t tobechecked \N +104000 t tobechecked \N +104010 t tobechecked \N +104024 t tobechecked \N +104026 t tobechecked \N +104028 t tobechecked \N +104038 t tobechecked \N +104070 t tobechecked \N +104072 f tobechecked \N +104074 t tobechecked \N +104086 t tobechecked \N +104094 t tobechecked \N +104116 t tobechecked \N +104130 t tobechecked \N +104132 t tobechecked \N +104156 t tobechecked \N +104184 t tobechecked \N +104200 f tobechecked \N +104258 f tobechecked \N +104268 f tobechecked \N +104270 f tobechecked \N +104272 t tobechecked \N +104274 t tobechecked \N +104278 t tobechecked \N +104280 t tobechecked \N +104292 t tobechecked \N +104374 t tobechecked \N +104404 t tobechecked \N +104406 t tobechecked \N +104428 t tobechecked \N +104430 t tobechecked \N +104432 t tobechecked \N +104438 t tobechecked \N +104510 f tobechecked \N +104512 f tobechecked \N +104514 f tobechecked \N +104516 f tobechecked \N +104530 f tobechecked \N +104532 f tobechecked \N +104540 t tobechecked \N +104586 t tobechecked \N +104600 f tobechecked \N +104614 t tobechecked \N +104618 f tobechecked \N +104620 f tobechecked \N +104622 f tobechecked \N +104624 f tobechecked \N +104626 f tobechecked \N +104628 f tobechecked \N +104630 f tobechecked \N +104632 f tobechecked \N +104634 f tobechecked \N +103764 t tobechecked \N +103762 t tobechecked \N +103788 t tobechecked \N +103790 t tobechecked \N +103733 f tobechecked \N +103798 t tobechecked \N +103796 t tobechecked \N +104636 f tobechecked \N +104638 f tobechecked \N +104640 f tobechecked \N +104642 f tobechecked \N +104644 f tobechecked \N +104646 f tobechecked \N +104648 f tobechecked \N +104650 f tobechecked \N +104652 f tobechecked \N +104654 t tobechecked \N +104656 t tobechecked \N +104658 t tobechecked \N +104660 f tobechecked \N +104662 t tobechecked \N +104664 t tobechecked \N +104666 t tobechecked \N +104668 t tobechecked \N +104670 t tobechecked \N +104672 t tobechecked \N +104674 t tobechecked \N +104676 t tobechecked \N +104678 t tobechecked \N +104680 t tobechecked \N +104682 t tobechecked \N +104684 t tobechecked \N +104686 t tobechecked \N +104688 t tobechecked \N +104690 f tobechecked \N +104692 f tobechecked \N +104694 t tobechecked \N +104696 t tobechecked \N +104698 t tobechecked \N +104700 t tobechecked \N +104702 t tobechecked \N +104704 t tobechecked \N +104706 t tobechecked \N +104708 t tobechecked \N +104710 f tobechecked \N +104712 t tobechecked \N +104714 t tobechecked \N +104716 t tobechecked \N +104718 t tobechecked \N +104720 t tobechecked \N +104722 f tobechecked \N +104724 f tobechecked \N +104726 t tobechecked \N +104728 t tobechecked \N +104730 t tobechecked \N +104732 t tobechecked \N +104734 f tobechecked \N +104736 f tobechecked \N +104738 t tobechecked \N +104740 t tobechecked \N +104742 f tobechecked \N +104746 t tobechecked \N +104748 f tobechecked \N +104750 t tobechecked \N +104756 t tobechecked \N +104778 t tobechecked \N +104780 t tobechecked \N +104785 t tobechecked \N +104818 t tobechecked \N +104839 t tobechecked \N +104851 t tobechecked \N +113278 f tobechecked \N +113281 t tobechecked \N +113282 t tobechecked \N +113283 t tobechecked \N +113289 t tobechecked \N +113291 t tobechecked \N +113297 t tobechecked \N +113298 t tobechecked \N +113299 t tobechecked \N +113300 t tobechecked \N +113301 t tobechecked \N +113302 t tobechecked \N +113303 t tobechecked \N +113304 t tobechecked \N +113305 t tobechecked \N +113306 t tobechecked \N +113307 t tobechecked \N +113308 t tobechecked \N +113309 t tobechecked \N +113310 t tobechecked \N +113313 t tobechecked \N +113314 t tobechecked \N +113316 t tobechecked \N +113317 t tobechecked \N +113318 t tobechecked \N +113319 t tobechecked \N +113320 t tobechecked \N +113321 t tobechecked \N +113322 t tobechecked \N +113323 t tobechecked \N +113324 t tobechecked \N +113325 t tobechecked \N +113326 t tobechecked \N +113327 t tobechecked \N +113328 t tobechecked \N +113329 t tobechecked \N +113330 t tobechecked \N +113331 t tobechecked \N +113332 t tobechecked \N +113333 t tobechecked \N +113334 t tobechecked \N +113335 t tobechecked \N +113336 t tobechecked \N +113337 t tobechecked \N +113341 t tobechecked \N +113342 t tobechecked \N +113343 t tobechecked \N +113352 t tobechecked \N +113353 t tobechecked \N +113354 t tobechecked \N +113356 t tobechecked \N +113360 t tobechecked \N +113361 t tobechecked \N +113362 t tobechecked \N +113363 t tobechecked \N +113364 t tobechecked \N +113365 t tobechecked \N +113368 t tobechecked \N +113382 f tobechecked \N +113384 t tobechecked \N +113385 t tobechecked \N +113386 t tobechecked \N +113387 t tobechecked \N +113388 t tobechecked \N +113389 t tobechecked \N +113390 t tobechecked \N +113391 t tobechecked \N +113392 t tobechecked \N +113393 t tobechecked \N +113394 t tobechecked \N +113395 t tobechecked \N +113396 f tobechecked \N +113397 f tobechecked \N +113398 t tobechecked \N +113399 t tobechecked \N +113400 t tobechecked \N +113401 t tobechecked \N +113402 t tobechecked \N +113403 t tobechecked \N +113404 t tobechecked \N +113405 t tobechecked \N +113406 t tobechecked \N +113407 t tobechecked \N +113408 t tobechecked \N +113409 t tobechecked \N +113410 t tobechecked \N +113411 t tobechecked \N +113412 t tobechecked \N +113275 t approved \N +113279 t tobechecked \N +113277 t tobechecked \N +113415 f tobechecked \N +113416 t tobechecked \N +113417 t tobechecked \N +113418 f tobechecked \N +113419 t tobechecked \N +113420 t tobechecked \N +113421 t tobechecked \N +113422 t tobechecked \N +113423 t tobechecked \N +113424 t tobechecked \N +113425 t tobechecked \N +113426 t tobechecked \N +113427 f tobechecked \N +113428 t tobechecked \N +113429 f tobechecked \N +113430 t tobechecked \N +113431 f tobechecked \N +113432 f tobechecked \N +113433 t tobechecked \N +113434 t tobechecked \N +113435 t tobechecked \N +113436 t tobechecked \N +113437 t tobechecked \N +113438 t tobechecked \N +113439 t tobechecked \N +113440 t tobechecked \N +113441 t tobechecked \N +113442 t tobechecked \N +113443 t tobechecked \N +113444 t tobechecked \N +113445 t tobechecked \N +113446 t tobechecked \N +113447 t tobechecked \N +113448 t tobechecked \N +113449 t tobechecked \N +113450 t tobechecked \N +113451 t tobechecked \N +113452 t tobechecked \N +113453 t tobechecked \N +113454 f tobechecked \N +113455 t tobechecked \N +113456 t tobechecked \N +113457 t tobechecked \N +113458 t tobechecked \N +113459 t tobechecked \N +113460 t tobechecked \N +113461 t tobechecked \N +113462 t tobechecked \N +113463 t tobechecked \N +113464 t tobechecked \N +113465 t tobechecked \N +113466 f tobechecked \N +113467 t tobechecked \N +113468 t tobechecked \N +113469 t tobechecked \N +113470 t tobechecked \N +113471 t tobechecked \N +113472 t tobechecked \N +113473 t tobechecked \N +113474 t tobechecked \N +113475 t tobechecked \N +113476 t tobechecked \N +113477 t tobechecked \N +113478 t tobechecked \N +113479 t tobechecked \N +113480 t tobechecked \N +113481 t tobechecked \N +113482 t tobechecked \N +113483 t tobechecked \N +113484 t tobechecked \N +113485 t tobechecked \N +113486 t tobechecked \N +113487 t tobechecked \N +113488 t tobechecked \N +113489 t tobechecked \N +113490 t tobechecked \N +113491 t tobechecked \N +113492 t tobechecked \N +113493 t tobechecked \N +113500 t tobechecked \N +113501 t tobechecked \N +113502 t tobechecked \N +113503 t tobechecked \N +113504 t tobechecked \N +113505 t tobechecked \N +113506 t tobechecked \N +113507 f tobechecked \N +113508 t tobechecked \N +113509 t tobechecked \N +113510 t tobechecked \N +113511 t tobechecked \N +113512 t tobechecked \N +113513 t tobechecked \N +113514 t tobechecked \N +113515 t tobechecked \N +113516 t tobechecked \N +113517 t tobechecked \N +113518 t tobechecked \N +113519 t tobechecked \N +113520 t tobechecked \N +113521 t tobechecked \N +113524 t tobechecked \N +113525 t tobechecked \N +113526 t tobechecked \N +113527 t tobechecked \N +113528 t tobechecked \N +113529 t tobechecked \N +113530 t tobechecked \N +113531 t tobechecked \N +113532 t tobechecked \N +113533 t tobechecked \N +113534 t tobechecked \N +113535 t tobechecked \N +113536 t tobechecked \N +113537 t tobechecked \N +113538 t tobechecked \N +113539 t tobechecked \N +113540 t tobechecked \N +113541 t tobechecked \N +113542 t tobechecked \N +113543 t tobechecked \N +113544 f tobechecked \N +113549 t tobechecked \N +113550 t tobechecked \N +113551 t tobechecked \N +113552 t tobechecked \N +113553 t tobechecked \N +113554 t tobechecked \N +113555 t tobechecked \N +113556 t tobechecked \N +113557 t tobechecked \N +113558 t tobechecked \N +113559 t tobechecked \N +113560 t tobechecked \N +113561 t tobechecked \N +113562 t tobechecked \N +113563 t tobechecked \N +113564 f tobechecked \N +113565 f tobechecked \N +113566 f tobechecked \N +113567 f tobechecked \N +113568 f tobechecked \N +113569 f tobechecked \N +113570 t tobechecked \N +113571 t tobechecked \N +113578 t tobechecked \N +113579 t tobechecked \N +113580 t tobechecked \N +113581 t tobechecked \N +113582 t tobechecked \N +113583 t tobechecked \N +113584 t tobechecked \N +113585 t tobechecked \N +113586 t tobechecked \N +113587 t tobechecked \N +113588 t tobechecked \N +113589 t tobechecked \N +113590 t tobechecked \N +113591 t tobechecked \N +113592 t tobechecked \N +113593 t tobechecked \N +113594 t tobechecked \N +113595 t tobechecked \N +113596 t tobechecked \N +113597 t tobechecked \N +113598 t tobechecked \N +113599 t tobechecked \N +113600 t tobechecked \N +113601 t tobechecked \N +113602 t tobechecked \N +113603 t tobechecked \N +113604 t tobechecked \N +113605 t tobechecked \N +113606 t tobechecked \N +113607 t tobechecked \N +113608 t tobechecked \N +113609 t tobechecked \N +113610 t tobechecked \N +113611 t tobechecked \N +113612 t tobechecked \N +113613 t tobechecked \N +113614 t tobechecked \N +113615 t tobechecked \N +113616 t tobechecked \N +113617 t tobechecked \N +113618 t tobechecked \N +113619 t tobechecked \N +113620 t tobechecked \N +113621 t tobechecked \N +113622 t tobechecked \N +113623 t tobechecked \N +113624 t tobechecked \N +113625 t tobechecked \N +113626 t tobechecked \N +113627 t tobechecked \N +113628 t tobechecked \N +113629 t tobechecked \N +113630 t tobechecked \N +113631 t tobechecked \N +113632 t tobechecked \N +113633 t tobechecked \N +113634 t tobechecked \N +113635 t tobechecked \N +113636 t tobechecked \N +113637 t tobechecked \N +113638 t tobechecked \N +113639 t tobechecked \N +113640 t tobechecked \N +113641 t tobechecked \N +113642 t tobechecked \N +113643 t tobechecked \N +113644 t tobechecked \N +113645 t tobechecked \N +113646 t tobechecked \N +113647 t tobechecked \N +113648 t tobechecked \N +113649 t tobechecked \N +113650 t tobechecked \N +113651 t tobechecked \N +113652 t tobechecked \N +113653 t tobechecked \N +113654 t tobechecked \N +113655 t tobechecked \N +113656 t tobechecked \N +113657 t tobechecked \N +113658 t tobechecked \N +113659 t tobechecked \N +113660 t tobechecked \N +113661 t tobechecked \N +113662 t tobechecked \N +113663 t tobechecked \N +113664 t tobechecked \N +113665 t tobechecked \N +113666 t tobechecked \N +113667 t tobechecked \N +113668 t tobechecked \N +113669 t tobechecked \N +113670 t tobechecked \N +113671 t tobechecked \N +113672 t tobechecked \N +113673 t tobechecked \N +113674 t tobechecked \N +113675 t tobechecked \N +113676 t tobechecked \N +113677 t tobechecked \N +113678 t tobechecked \N +113679 t tobechecked \N +113680 t tobechecked \N +113681 t tobechecked \N +113682 t tobechecked \N +113683 t tobechecked \N +113684 t tobechecked \N +113685 t tobechecked \N +113686 t tobechecked \N +113687 t tobechecked \N +113688 t tobechecked \N +113689 t tobechecked \N +113690 t tobechecked \N +113691 t tobechecked \N +113692 t tobechecked \N +113693 t tobechecked \N +113694 t tobechecked \N +113695 f tobechecked \N +113697 t tobechecked \N +113698 t tobechecked \N +113699 t tobechecked \N +113700 t tobechecked \N +113701 t tobechecked \N +113702 t tobechecked \N +113703 t tobechecked \N +113704 t tobechecked \N +113705 t tobechecked \N +113706 t tobechecked \N +113707 t tobechecked \N +113708 t tobechecked \N +113709 t tobechecked \N +113710 t tobechecked \N +113711 t tobechecked \N +113712 t tobechecked \N +113713 t tobechecked \N +113714 t tobechecked \N +113715 t tobechecked \N +113716 t tobechecked \N +113717 t tobechecked \N +113718 t tobechecked \N +113719 t tobechecked \N +113720 t tobechecked \N +113721 t tobechecked \N +113722 t tobechecked \N +113723 t tobechecked \N +113724 t tobechecked \N +113725 t tobechecked \N +113726 t tobechecked \N +113727 t tobechecked \N +113728 t tobechecked \N +113729 t tobechecked \N +113730 t tobechecked \N +113731 t tobechecked \N +113732 t tobechecked \N +113733 t tobechecked \N +113734 t tobechecked \N +113735 t tobechecked \N +113736 t tobechecked \N +113737 t tobechecked \N +113738 t tobechecked \N +113739 t tobechecked \N +113740 t tobechecked \N +113741 t tobechecked \N +113742 t tobechecked \N +113743 t tobechecked \N +113744 t tobechecked \N +113745 t tobechecked \N +113746 t tobechecked \N +113747 t tobechecked \N +113748 t tobechecked \N +113749 t tobechecked \N +113750 t tobechecked \N +113751 t tobechecked \N +113752 t tobechecked \N +113753 t tobechecked \N +113754 t tobechecked \N +113755 t tobechecked \N +113756 t tobechecked \N +113757 t tobechecked \N +113758 t tobechecked \N +113759 t tobechecked \N +113760 t tobechecked \N +113761 t tobechecked \N +113762 t tobechecked \N +113763 t tobechecked \N +113764 t tobechecked \N +113765 t tobechecked \N +113766 t tobechecked \N +113767 t tobechecked \N +113768 t tobechecked \N +113769 t tobechecked \N +113770 t tobechecked \N +113781 t tobechecked \N +113782 t tobechecked \N +113784 f tobechecked \N +113785 t tobechecked \N +113817 f tobechecked \N +113842 t tobechecked \N +113852 f tobechecked \N +113853 f tobechecked \N +113857 f tobechecked \N +113865 f tobechecked \N +113881 f tobechecked \N +113926 f tobechecked \N +113930 f tobechecked \N +113956 f tobechecked \N +113980 t tobechecked \N +113981 f tobechecked \N +114007 t tobechecked \N +114008 t tobechecked \N +114009 t tobechecked \N +114033 f tobechecked \N +114049 t tobechecked \N +114050 t tobechecked \N +114051 f tobechecked \N +114056 f tobechecked \N +114057 f tobechecked \N +114086 t tobechecked \N +114105 f tobechecked \N +114116 f tobechecked \N +114117 f tobechecked \N +114118 f tobechecked \N +114122 f tobechecked 2024-12-31 00:00:00 +114123 f tobechecked 2024-12-31 00:00:00 +114124 f tobechecked 2024-12-31 00:00:00 +114125 f tobechecked 2024-12-31 00:00:00 +114126 f tobechecked 2024-12-31 00:00:00 +114127 f tobechecked 2024-12-31 00:00:00 +114128 f tobechecked 2024-12-31 00:00:00 +114129 f tobechecked 2024-12-31 00:00:00 +114130 f tobechecked 2024-12-31 00:00:00 +114131 f tobechecked 2024-12-31 00:00:00 +114137 f tobechecked \N +114161 t tobechecked \N +114165 f tobechecked \N +114276 t tobechecked \N +114277 t tobechecked \N +114278 t tobechecked \N +114279 t tobechecked \N +114280 t tobechecked \N +114281 t tobechecked \N +114282 t tobechecked \N +114283 t tobechecked \N +114284 t tobechecked \N +114285 t tobechecked \N +114286 t tobechecked \N +114305 t tobechecked \N +114316 t tobechecked \N +114325 t tobechecked \N +114326 t tobechecked \N +114328 t tobechecked \N +114329 t tobechecked \N +114334 t tobechecked \N +114336 f tobechecked \N +114337 f tobechecked \N +114338 f tobechecked \N +114339 f tobechecked \N +114340 f tobechecked \N +114341 t tobechecked \N +114342 t tobechecked \N +114343 t tobechecked \N +114344 t tobechecked \N +114345 t tobechecked \N +114346 t tobechecked \N +114347 t tobechecked \N +114348 t tobechecked \N +114349 t tobechecked \N +114350 t tobechecked \N +114351 t tobechecked \N +114352 t tobechecked \N +114353 t tobechecked \N +114354 t tobechecked \N +114355 t tobechecked \N +114356 t tobechecked \N +114357 t tobechecked \N +114358 f tobechecked \N +114359 t tobechecked \N +114360 t tobechecked \N +114361 t tobechecked \N +114362 t tobechecked \N +114363 t tobechecked \N +114364 t tobechecked \N +114365 t tobechecked \N +114404 t tobechecked \N +114415 f tobechecked \N +114427 f tobechecked \N +114430 f tobechecked \N +114433 f tobechecked \N +114437 t tobechecked \N +114446 f tobechecked \N +114453 f tobechecked \N +114454 f tobechecked \N +114455 f tobechecked \N +114456 f tobechecked \N +114460 t tobechecked \N +114461 f tobechecked \N +114464 f tobechecked \N +114465 f tobechecked \N +114466 t tobechecked \N +114467 t tobechecked \N +114468 t tobechecked \N +114469 t tobechecked \N +114471 t tobechecked \N +114472 t tobechecked \N +114476 f tobechecked \N +114477 f tobechecked \N +114478 f tobechecked \N +114479 f tobechecked \N +114481 t tobechecked \N +114483 t tobechecked \N +114484 f tobechecked \N +114485 f tobechecked \N +114486 f tobechecked \N +114508 t tobechecked \N +114509 t tobechecked \N +114574 f tobechecked \N +114591 f tobechecked \N +114607 t tobechecked \N +114613 f tobechecked \N +114617 t tobechecked \N +114619 t tobechecked \N +114620 t tobechecked \N +114633 t tobechecked \N +114701 f tobechecked \N +114706 f tobechecked \N +114716 f tobechecked \N +114719 f tobechecked \N +114721 t tobechecked \N +114722 t tobechecked \N +114724 f tobechecked \N +114731 t tobechecked \N +114733 t tobechecked \N +114737 t tobechecked \N +114755 t tobechecked \N +114756 t tobechecked \N +114757 t tobechecked \N +114778 t tobechecked \N +114786 t tobechecked \N +114792 t tobechecked \N +114796 t tobechecked \N +114797 t tobechecked \N +114798 t tobechecked \N +114799 t tobechecked \N +114800 t tobechecked \N +114809 t tobechecked \N +114810 t tobechecked \N +114811 t tobechecked \N +114818 f tobechecked \N +114826 t tobechecked \N +114847 t tobechecked \N +114848 t tobechecked \N +114851 t tobechecked \N +114856 t tobechecked \N +114869 t tobechecked \N +114877 t tobechecked \N +114878 t tobechecked \N +114883 f tobechecked \N +114884 f tobechecked \N +114885 f tobechecked \N +114894 f tobechecked \N +114895 f tobechecked \N +114897 f tobechecked \N +114901 f tobechecked \N +114935 t tobechecked \N +114937 t tobechecked \N +114946 t tobechecked \N +114950 t tobechecked \N +114952 t tobechecked \N +114955 t tobechecked \N +114956 t tobechecked \N +114957 t tobechecked \N +114958 t tobechecked \N +114962 t tobechecked \N +114967 t tobechecked \N +114971 t tobechecked \N +114991 t tobechecked \N +115012 t tobechecked \N +115014 t tobechecked \N +115024 t tobechecked \N +115035 t tobechecked \N +115037 t tobechecked \N +115038 t tobechecked \N +115039 t tobechecked \N +115040 t tobechecked \N +115041 t tobechecked \N +115042 t tobechecked \N +115043 t tobechecked \N +115045 t tobechecked \N +115050 t tobechecked \N +115051 t tobechecked \N +115055 t tobechecked \N +115062 t tobechecked \N +115082 t tobechecked \N +115085 f tobechecked \N +115087 f tobechecked 2025-03-15 00:00:00 +115088 f tobechecked 2026-05-28 00:00:00 +115089 f tobechecked 2027-07-15 00:00:00 +115090 f tobechecked 2028-03-28 00:00:00 +115091 f tobechecked 2031-03-31 00:00:00 +115092 f tobechecked 2031-02-17 00:00:00 +115094 f tobechecked 2025-12-18 00:00:00 +115097 f tobechecked 2025-10-26 00:00:00 +115098 f tobechecked 2025-06-08 00:00:00 +115099 f tobechecked 2027-09-04 00:00:00 +115100 t tobechecked \N +115114 f tobechecked \N +115146 f tobechecked \N +115150 t tobechecked \N +115154 f tobechecked \N +115187 f tobechecked \N +115192 f tobechecked \N +115193 f tobechecked \N +115228 t tobechecked \N +115246 t tobechecked \N +115247 t tobechecked \N +115248 t tobechecked \N +115254 t tobechecked \N +115256 t tobechecked \N +115266 t tobechecked \N +115267 t tobechecked \N +115268 t tobechecked \N +115269 t tobechecked \N +115270 t tobechecked \N +115271 t tobechecked \N +115273 t tobechecked \N +115275 t tobechecked \N +115276 t tobechecked \N +115277 t tobechecked \N +115278 t tobechecked \N +115280 t tobechecked \N +115281 t tobechecked \N +115282 t tobechecked \N +115283 t tobechecked \N +115284 t tobechecked \N +115285 t tobechecked \N +115286 t tobechecked \N +115287 t tobechecked \N +115288 t tobechecked \N +115289 t tobechecked \N +115290 t tobechecked \N +115291 t tobechecked \N +115293 t tobechecked \N +115294 t tobechecked \N +115295 t tobechecked \N +115296 t tobechecked \N +115297 t tobechecked \N +115298 t tobechecked \N +115300 t tobechecked \N +115301 t tobechecked \N +115302 t tobechecked \N +115331 t tobechecked \N +115341 f tobechecked \N +115342 f tobechecked \N +115343 f tobechecked \N +115346 f tobechecked \N +115351 f tobechecked \N +115357 f tobechecked \N +115386 t tobechecked \N +115411 f tobechecked \N +115440 f tobechecked 2032-07-01 00:00:00 +115441 f tobechecked 2028-08-06 00:00:00 +115442 f tobechecked 2028-10-29 00:00:00 +115443 f tobechecked 2028-11-12 00:00:00 +115444 f tobechecked 2029-01-07 00:00:00 +115445 f tobechecked 2029-01-07 00:00:00 +115446 f tobechecked 2029-01-07 00:00:00 +115447 f tobechecked 2029-01-12 00:00:00 +115448 f tobechecked 2029-03-19 00:00:00 +115449 f tobechecked 2029-03-19 00:00:00 +115450 f tobechecked 2029-12-15 00:00:00 +115451 f tobechecked 2025-11-14 00:00:00 +115452 f tobechecked 2026-10-26 00:00:00 +115453 f tobechecked 2026-04-20 00:00:00 +115454 f tobechecked 2026-08-21 00:00:00 +115455 f tobechecked 2026-10-16 00:00:00 +115456 f tobechecked 2029-10-28 00:00:00 +115457 f tobechecked 2029-04-13 00:00:00 +115458 f tobechecked 2026-05-21 00:00:00 +115460 f tobechecked 2027-02-22 00:00:00 +115461 f tobechecked 2028-03-04 00:00:00 +115462 f tobechecked 2028-11-18 00:00:00 +115473 f tobechecked 2026-10-01 00:00:00 +115503 f tobechecked \N +115537 f tobechecked \N +115539 f tobechecked \N +115540 f tobechecked \N +115541 f tobechecked \N +115542 f tobechecked \N +115543 f tobechecked \N +115544 f tobechecked \N +115546 f tobechecked \N +115549 f tobechecked \N +115550 f tobechecked \N +115551 f tobechecked \N +115552 f tobechecked \N +115556 f tobechecked \N +115557 f tobechecked \N +115559 f tobechecked \N +115560 f tobechecked \N +115562 f tobechecked \N +115563 f tobechecked \N +115574 t tobechecked \N +115575 t tobechecked \N +115576 t tobechecked \N +115577 t tobechecked \N +115578 t tobechecked \N +115579 t tobechecked \N +115580 t tobechecked \N +115581 t tobechecked \N +115582 t tobechecked \N +115583 t tobechecked \N +115584 t tobechecked \N +115594 f tobechecked \N +115604 t tobechecked \N +115605 t tobechecked \N +115606 t tobechecked \N +115607 t tobechecked \N +115608 t tobechecked \N +115609 t tobechecked \N +115610 t tobechecked \N +115611 t tobechecked \N +115640 t tobechecked \N +115645 t tobechecked \N +115647 t tobechecked \N +115649 t tobechecked \N +115654 t tobechecked \N +115657 t tobechecked \N +115658 t tobechecked \N +115659 t tobechecked \N +115660 t tobechecked \N +115661 f tobechecked \N +115662 t tobechecked \N +115663 t tobechecked \N +115664 t tobechecked \N +115665 t tobechecked \N +115666 t tobechecked \N +115667 t tobechecked \N +115670 f tobechecked \N +115765 f tobechecked \N +115766 f tobechecked \N +115772 f tobechecked \N +115773 f tobechecked \N +115782 t tobechecked \N +115783 t tobechecked \N +115800 t tobechecked \N +115840 t tobechecked \N +115841 t tobechecked \N +115842 t tobechecked \N +115843 t tobechecked \N +115845 f tobechecked \N +115846 f tobechecked \N +115857 f tobechecked \N +115858 f tobechecked \N +115859 f tobechecked \N +115860 f tobechecked \N +115861 f tobechecked \N +115862 f tobechecked \N +115887 f tobechecked \N +115889 f tobechecked \N +115892 f tobechecked \N +115893 f tobechecked \N +115894 f tobechecked 2059-12-31 00:00:00 +115897 f tobechecked \N +115901 f tobechecked \N +115903 f tobechecked \N +115905 f tobechecked \N +115909 f tobechecked \N +115910 f tobechecked \N +115911 f tobechecked \N +115912 f tobechecked \N +115913 f tobechecked \N +115914 f tobechecked \N +115915 f tobechecked \N +115917 f tobechecked \N +115920 f tobechecked \N +115921 f tobechecked \N +115922 f tobechecked \N +115923 f tobechecked \N +115924 f tobechecked \N +115926 f tobechecked \N +115927 f tobechecked \N +115928 f tobechecked \N +115929 f tobechecked 2034-12-31 00:00:00 +115930 f tobechecked \N +115946 t tobechecked \N +115959 t tobechecked \N +115961 f tobechecked \N +115964 t tobechecked \N +115967 t tobechecked \N +115968 t tobechecked \N +115969 t tobechecked \N +115970 t tobechecked \N +115971 t tobechecked \N +115972 t tobechecked \N +115973 t tobechecked \N +115980 t tobechecked \N +115981 t tobechecked \N +115982 t tobechecked \N +115989 t tobechecked \N +115990 t tobechecked \N +115991 t tobechecked \N +115992 t tobechecked \N +115993 t tobechecked \N +115994 t tobechecked \N +115995 t tobechecked \N +116000 t tobechecked \N +116003 t tobechecked \N +116049 f tobechecked 2027-03-11 00:00:00 +116050 f tobechecked 2027-05-13 00:00:00 +116051 f tobechecked 2027-08-29 00:00:00 +116052 f tobechecked 2027-06-18 00:00:00 +116053 f tobechecked 2027-06-24 00:00:00 +116054 f tobechecked 2030-02-28 00:00:00 +116055 f tobechecked 2027-07-19 00:00:00 +116056 f tobechecked 2028-11-21 00:00:00 +116057 f tobechecked 2028-02-17 00:00:00 +116058 f tobechecked 2028-03-04 00:00:00 +116059 f tobechecked 2028-08-18 00:00:00 +116060 f tobechecked 2031-04-24 00:00:00 +116061 f tobechecked 2027-10-25 00:00:00 +116062 f tobechecked 2028-03-13 00:00:00 +116070 t tobechecked \N +116071 t tobechecked \N +116072 t tobechecked \N +116073 t tobechecked \N +116074 f tobechecked 2026-11-28 00:00:00 +116075 f tobechecked 2029-07-15 00:00:00 +116122 f tobechecked \N +116123 f tobechecked \N +116150 f tobechecked \N +116152 f tobechecked \N +116153 f tobechecked \N +116157 f tobechecked \N +116240 t tobechecked \N +116241 f tobechecked \N +116249 t tobechecked \N +116252 t tobechecked \N +116260 t tobechecked \N +116285 t tobechecked \N +116286 t tobechecked \N +116290 t tobechecked \N +116323 t tobechecked \N +116324 t tobechecked \N +116325 t tobechecked \N +116326 t tobechecked \N +116327 t tobechecked \N +116328 t tobechecked \N +116329 t tobechecked \N +116330 t tobechecked \N +116331 t tobechecked \N +116332 t tobechecked \N +116333 t tobechecked \N +116334 t tobechecked \N +116335 t tobechecked \N +116336 t tobechecked \N +116337 t tobechecked \N +116338 t tobechecked \N +116339 t tobechecked \N +116340 t tobechecked \N +116341 t tobechecked \N +116342 t tobechecked \N +116343 t tobechecked \N +116344 t tobechecked \N +116345 t tobechecked \N +116346 t tobechecked \N +116352 f tobechecked \N +116360 f tobechecked \N +116364 f tobechecked \N +116365 f tobechecked \N +116370 f tobechecked \N +116377 f tobechecked \N +116382 f tobechecked \N +116389 f tobechecked \N +116402 f tobechecked \N +116473 f tobechecked 2029-01-12 00:00:00 +116474 f tobechecked 2028-12-18 00:00:00 +116475 f tobechecked 2029-04-05 00:00:00 +116476 f tobechecked 2029-12-24 00:00:00 +116477 f tobechecked 2030-02-11 00:00:00 +116478 f tobechecked 2030-02-08 00:00:00 +116479 f tobechecked 2029-12-15 00:00:00 +116480 f tobechecked 2030-04-28 00:00:00 +116481 f tobechecked 2030-05-12 00:00:00 +116482 f tobechecked 2030-05-27 00:00:00 +116483 f tobechecked 2030-08-22 00:00:00 +116486 t tobechecked \N +116487 t tobechecked \N +116563 f tobechecked \N +116564 f tobechecked \N +116566 f tobechecked \N +116569 f tobechecked \N +116585 f tobechecked \N +116612 f tobechecked \N +116613 f tobechecked \N +116615 f tobechecked \N +116616 f tobechecked \N +116617 f tobechecked \N +116618 f tobechecked \N +116621 f tobechecked \N +116622 f tobechecked \N +116623 f tobechecked \N +116624 f tobechecked \N +116625 f tobechecked \N +116626 f tobechecked \N +116628 f tobechecked 2024-12-31 00:00:00 +116629 f tobechecked \N +116630 f tobechecked \N +116631 f tobechecked \N +116632 f tobechecked \N +116633 f tobechecked \N +116634 f tobechecked \N +116637 f tobechecked \N +116639 f tobechecked \N +116641 f tobechecked \N +116642 f tobechecked \N +116643 f tobechecked \N +116644 f tobechecked \N +116645 f tobechecked \N +116647 f tobechecked \N +116648 f tobechecked \N +116650 f tobechecked \N +116651 f tobechecked \N +116652 f tobechecked \N +116653 f tobechecked \N +116654 f tobechecked \N +116655 f tobechecked \N +116656 f tobechecked \N +116657 f tobechecked \N +116658 f tobechecked \N +116659 f tobechecked \N +116660 f tobechecked \N +116661 f tobechecked \N +116664 f tobechecked \N +116665 f tobechecked \N +116666 f tobechecked \N +116667 f tobechecked \N +116668 f tobechecked \N +116669 f tobechecked \N +116670 f tobechecked \N +116671 f tobechecked \N +116672 f tobechecked \N +116673 f tobechecked \N +116674 f tobechecked \N +116675 t tobechecked \N +116676 f tobechecked \N +116677 f tobechecked \N +116678 f tobechecked \N +116679 f tobechecked \N +116680 f tobechecked \N +116681 f tobechecked \N +116682 f tobechecked \N +116683 f tobechecked \N +116684 f tobechecked \N +116685 t tobechecked \N +116686 f tobechecked \N +116687 f tobechecked \N +116688 t tobechecked \N +116689 t tobechecked \N +116690 f tobechecked \N +116691 f tobechecked \N +116692 f tobechecked \N +116693 f tobechecked \N +116694 f tobechecked \N +116695 f tobechecked \N +116696 f tobechecked \N +116697 t tobechecked \N +116698 f tobechecked \N +116699 t tobechecked \N +116700 t tobechecked \N +116701 f tobechecked \N +116702 t tobechecked \N +116703 t tobechecked \N +116704 t tobechecked \N +116705 t tobechecked \N +116706 t tobechecked \N +116707 t tobechecked \N +116708 t tobechecked \N +116709 t tobechecked \N +116710 t tobechecked \N +116711 f tobechecked \N +116712 f tobechecked \N +116713 f tobechecked \N +116714 t tobechecked \N +116715 f tobechecked \N +116716 t tobechecked \N +116717 t tobechecked \N +116718 t tobechecked \N +116719 f tobechecked \N +116720 f tobechecked \N +116721 f tobechecked \N +116722 f tobechecked \N +116723 f tobechecked \N +116724 f tobechecked \N +116725 f tobechecked \N +116726 f tobechecked \N +116727 t tobechecked \N +116728 f tobechecked \N +116729 f tobechecked \N +116730 t tobechecked \N +116731 t tobechecked \N +116732 t tobechecked \N +116733 t tobechecked \N +116734 t tobechecked \N +116735 t tobechecked \N +116736 t tobechecked \N +116737 f tobechecked \N +116738 f tobechecked \N +116739 t tobechecked \N +116740 t tobechecked \N +116741 t tobechecked \N +116742 f tobechecked \N +116743 t tobechecked \N +116744 t tobechecked \N +116745 t tobechecked \N +116746 t tobechecked \N +116747 t tobechecked \N +116748 t tobechecked \N +116749 f tobechecked \N +116750 f tobechecked \N +116751 f tobechecked \N +116752 f tobechecked \N +116753 f tobechecked \N +116754 f tobechecked \N +116755 f tobechecked \N +116756 f tobechecked \N +116757 f tobechecked \N +116758 t tobechecked \N +116759 t tobechecked \N +116760 f tobechecked \N +116761 f tobechecked \N +116762 f tobechecked \N +116763 f tobechecked \N +116764 f tobechecked \N +116765 f tobechecked \N +116766 f tobechecked \N +116767 f tobechecked \N +116768 f tobechecked \N +116769 f tobechecked \N +116770 f tobechecked \N +116771 f tobechecked \N +116772 f tobechecked \N +116773 f tobechecked \N +116774 f tobechecked \N +116775 f tobechecked \N +116776 f tobechecked \N +116777 f tobechecked \N +116778 f tobechecked \N +116779 f tobechecked \N +116780 f tobechecked \N +116781 f tobechecked \N +116782 f tobechecked \N +116783 f tobechecked \N +116784 f tobechecked \N +116785 f tobechecked \N +116786 f tobechecked \N +116787 f tobechecked \N +116788 f tobechecked \N +116789 f tobechecked \N +116790 f tobechecked \N +116791 f tobechecked \N +116792 f tobechecked \N +116793 f tobechecked \N +116794 f tobechecked \N +116795 f tobechecked \N +116796 f tobechecked \N +116797 f tobechecked \N +116798 f tobechecked \N +116799 f tobechecked \N +116800 f tobechecked \N +116801 f tobechecked \N +116802 f tobechecked \N +116803 f tobechecked \N +116804 f tobechecked \N +116805 f tobechecked \N +116806 f tobechecked \N +116807 f tobechecked \N +116808 f tobechecked \N +116809 f tobechecked \N +116810 f tobechecked \N +116811 f tobechecked \N +116812 f tobechecked \N +116813 f tobechecked \N +116814 f tobechecked \N +116815 f tobechecked \N +116816 f tobechecked \N +116817 f tobechecked \N +116818 f tobechecked \N +116819 f tobechecked \N +116820 f tobechecked \N +116821 f tobechecked \N +116822 f tobechecked \N +116823 f tobechecked \N +116824 f tobechecked \N +116825 f tobechecked \N +116826 f tobechecked \N +116827 f tobechecked \N +116828 f tobechecked \N +116829 f tobechecked \N +116830 f tobechecked \N +116831 f tobechecked \N +116832 f tobechecked \N +116833 f tobechecked \N +116834 t tobechecked \N +116835 t tobechecked \N +116836 t tobechecked \N +116837 t tobechecked \N +116838 t tobechecked \N +116839 t tobechecked \N +116840 t tobechecked \N +116841 t tobechecked \N +116842 t tobechecked \N +116843 t tobechecked \N +116844 t tobechecked \N +116845 t tobechecked \N +116846 t tobechecked \N +116847 f tobechecked \N +116848 f tobechecked \N +116849 f tobechecked \N +116850 f tobechecked \N +116851 f tobechecked \N +116852 f tobechecked \N +116853 f tobechecked \N +116854 f tobechecked \N +116855 f tobechecked \N +116856 f tobechecked \N +116857 f tobechecked \N +116858 f tobechecked \N +116859 f tobechecked \N +116860 f tobechecked \N +116861 f tobechecked \N +116862 f tobechecked \N +116863 f tobechecked \N +116864 f tobechecked \N +116865 f tobechecked \N +116866 f tobechecked \N +116869 t tobechecked \N +116870 t tobechecked \N +116871 t tobechecked \N +116872 t tobechecked \N +116918 f tobechecked \N +116921 f tobechecked \N +116924 t tobechecked \N +116934 t tobechecked \N +116935 t tobechecked \N +116969 f tobechecked \N +116970 f tobechecked \N +116971 f tobechecked \N +116992 f tobechecked \N +116993 f tobechecked \N +116994 f tobechecked \N +116995 f tobechecked \N +117018 t tobechecked \N +117019 t tobechecked \N +117029 t tobechecked \N +117031 t tobechecked \N +117041 t tobechecked \N +117049 t tobechecked \N +117050 t tobechecked \N +117052 t tobechecked \N +117053 f tobechecked \N +117054 t tobechecked \N +117055 t tobechecked \N +117078 t tobechecked \N +117138 f tobechecked \N +117147 f tobechecked \N +117149 f tobechecked \N +117150 f tobechecked \N +117168 f tobechecked \N +117169 f tobechecked \N +117177 f tobechecked \N +117180 f tobechecked \N +117181 f tobechecked \N +117182 t tobechecked \N +117183 t tobechecked \N +117184 t tobechecked \N +117198 t tobechecked \N +117204 t tobechecked \N +117206 t tobechecked \N +117217 t tobechecked \N +117218 t tobechecked \N +117220 t tobechecked \N +117223 t tobechecked \N +117225 t tobechecked \N +117229 t tobechecked \N +117230 t tobechecked \N +117234 t tobechecked \N +117237 t tobechecked \N +117243 t tobechecked \N +117255 t tobechecked \N +117262 f tobechecked \N +117309 f tobechecked \N +117313 f tobechecked 2099-12-31 00:00:00 +117317 f tobechecked \N +117319 f tobechecked \N +117322 f tobechecked \N +117331 t tobechecked \N +117332 t tobechecked \N +117333 f tobechecked 2030-09-08 00:00:00 +117334 f tobechecked 2031-07-05 00:00:00 +117335 f tobechecked 2032-10-03 00:00:00 +117336 f tobechecked 2030-09-20 00:00:00 +117337 f tobechecked 2032-04-29 00:00:00 +117338 f tobechecked 2030-12-19 00:00:00 +117339 f tobechecked 2031-05-03 00:00:00 +117340 f tobechecked 2032-05-25 00:00:00 +117341 f tobechecked 2031-09-27 00:00:00 +117342 f tobechecked 2031-06-07 00:00:00 +117343 f tobechecked 2030-12-22 00:00:00 +117344 f tobechecked 2031-03-10 00:00:00 +117345 f tobechecked 2031-06-20 00:00:00 +117346 f tobechecked 2033-02-28 00:00:00 +117388 t tobechecked \N +117390 f tobechecked \N +117431 f tobechecked \N +117459 t tobechecked \N +117470 t tobechecked \N +117499 t tobechecked \N +117542 t tobechecked \N +117543 t tobechecked \N +117544 t tobechecked \N +117545 t tobechecked \N +117546 t tobechecked \N +117547 t tobechecked \N +117548 t tobechecked \N +117549 t tobechecked \N +117551 t tobechecked \N +117554 t tobechecked \N +117555 t tobechecked \N +117557 t tobechecked \N +117558 t tobechecked \N +117559 t tobechecked \N +117560 t tobechecked \N +117561 t tobechecked \N +117562 t tobechecked \N +117563 t tobechecked \N +117564 t tobechecked \N +117565 t tobechecked \N +117566 t tobechecked \N +117637 f tobechecked \N +117638 f tobechecked \N +117639 f tobechecked \N +117687 t tobechecked \N +117699 t tobechecked \N +117700 t tobechecked \N +117701 t tobechecked \N +117702 t tobechecked \N +117703 f tobechecked \N +117712 f tobechecked 2034-02-01 00:00:00 +117721 t tobechecked \N +117724 t tobechecked \N +117729 t tobechecked \N +117730 t tobechecked \N +117742 f tobechecked \N +117746 t tobechecked \N +117752 t tobechecked \N +117754 t tobechecked \N +117755 t tobechecked \N +117756 t tobechecked \N +117757 t tobechecked \N +117758 t tobechecked \N +117773 t tobechecked \N +117774 t tobechecked \N +117775 t tobechecked \N +117776 t tobechecked \N +117778 t tobechecked \N +117779 t tobechecked \N +117780 t tobechecked \N +117781 t tobechecked \N +117782 t tobechecked \N +117783 t tobechecked \N +117784 t tobechecked \N +117785 t tobechecked \N +117786 t tobechecked \N +117787 t tobechecked \N +117788 t tobechecked \N +117789 t tobechecked \N +117793 t tobechecked \N +117794 t tobechecked \N +117797 t tobechecked \N +117798 t tobechecked \N +117799 t tobechecked \N +117800 t tobechecked \N +117801 t tobechecked \N +117802 t tobechecked \N +117803 t tobechecked \N +117804 t tobechecked \N +117805 t tobechecked \N +117806 t tobechecked \N +117807 t tobechecked \N +117808 t tobechecked \N +117809 t tobechecked \N +117810 t tobechecked \N +117811 t tobechecked \N +117812 t tobechecked \N +117813 t tobechecked \N +117814 t tobechecked \N +117815 t tobechecked \N +117816 t tobechecked \N +117817 t tobechecked \N +117818 t tobechecked \N +117819 t tobechecked \N +117820 t tobechecked \N +117821 t tobechecked \N +117822 t tobechecked \N +117823 t tobechecked \N +117824 t tobechecked \N +117825 t tobechecked \N +117826 t tobechecked \N +117827 t tobechecked \N +117828 t tobechecked \N +117829 t tobechecked \N +117830 t tobechecked \N +117831 t tobechecked \N +117832 t tobechecked \N +117833 t tobechecked \N +117834 t tobechecked \N +117835 t tobechecked \N +117836 t tobechecked \N +117837 t tobechecked \N +117838 t tobechecked \N +117839 t tobechecked \N +117840 t tobechecked \N +117841 t tobechecked \N +117842 t tobechecked \N +117843 t tobechecked \N +117844 t tobechecked \N +117845 t tobechecked \N +117846 t tobechecked \N +117847 t tobechecked \N +117848 t tobechecked \N +117849 t tobechecked \N +117850 t tobechecked \N +117851 t tobechecked \N +117853 t tobechecked \N +117854 t tobechecked \N +117855 t tobechecked \N +117856 t tobechecked \N +117857 t tobechecked \N +117858 t tobechecked \N +117859 t tobechecked \N +117860 t tobechecked \N +117861 t tobechecked \N +117862 t tobechecked \N +117863 t tobechecked \N +117864 t tobechecked \N +117865 t tobechecked \N +117866 t tobechecked \N +117867 t tobechecked \N +117868 t tobechecked \N +117869 t tobechecked \N +117870 t tobechecked \N +117871 t tobechecked \N +117872 t tobechecked \N +117873 t tobechecked \N +117874 t tobechecked \N +117875 t tobechecked \N +117876 t tobechecked \N +117877 t tobechecked \N +117878 t tobechecked \N +117879 t tobechecked \N +117880 t tobechecked \N +117881 t tobechecked \N +117882 t tobechecked \N +117883 t tobechecked \N +117884 t tobechecked \N +117885 t tobechecked \N +117886 t tobechecked \N +117887 t tobechecked \N +117888 t tobechecked \N +117889 t tobechecked \N +117891 t tobechecked \N +117892 t tobechecked \N +117893 t tobechecked \N +117894 t tobechecked \N +117895 t tobechecked \N +117896 t tobechecked \N +117897 t tobechecked \N +117907 t tobechecked \N +117910 t tobechecked \N +117916 t tobechecked \N +117917 t tobechecked \N +117918 t tobechecked \N +117944 t tobechecked \N +117970 t tobechecked \N +117972 t tobechecked \N +117975 t tobechecked \N +117977 t tobechecked \N +118033 t tobechecked \N +118056 t tobechecked \N +118066 t tobechecked \N +118088 t tobechecked \N +118089 t tobechecked \N +118099 t tobechecked \N +118148 f tobechecked \N +118149 f tobechecked \N +118159 f tobechecked \N +118161 f tobechecked \N +118162 f tobechecked \N +118163 f tobechecked \N +118168 f tobechecked \N +118170 f tobechecked \N +118171 f tobechecked \N +118173 f tobechecked \N +118175 f tobechecked \N +118176 f tobechecked \N +118177 f tobechecked \N +118178 f tobechecked \N +118179 f tobechecked \N +118180 f tobechecked \N +118181 f tobechecked \N +118182 f tobechecked \N +118183 f tobechecked \N +118184 f tobechecked \N +118185 f tobechecked \N +118187 f tobechecked \N +118188 f tobechecked \N +118190 f tobechecked \N +118191 f tobechecked \N +118193 f tobechecked \N +118194 f tobechecked \N +118195 f tobechecked \N +118196 f tobechecked \N +118197 f tobechecked \N +118199 f tobechecked \N +118200 f tobechecked \N +118201 f tobechecked \N +118202 f tobechecked \N +118203 f tobechecked \N +118204 f tobechecked \N +118205 f tobechecked \N +118206 f tobechecked \N +118207 f tobechecked \N +118208 f tobechecked \N +118209 f tobechecked \N +118210 f tobechecked \N +118211 f tobechecked \N +118212 f tobechecked \N +118213 f tobechecked \N +118214 f tobechecked \N +118215 f tobechecked \N +118216 f tobechecked \N +118217 f tobechecked \N +118231 t tobechecked \N +118234 t tobechecked \N +118235 t tobechecked \N +118238 t tobechecked \N +118240 t tobechecked \N +118251 t tobechecked \N +118252 t tobechecked \N +118253 t tobechecked \N +118255 t tobechecked \N +118256 t tobechecked \N +118257 t tobechecked \N +118258 t tobechecked \N +118260 t tobechecked \N +118262 f tobechecked \N +118265 t tobechecked \N +118266 f tobechecked \N +118271 t tobechecked \N +118272 t tobechecked \N +118273 t tobechecked \N +118276 t tobechecked \N +118277 t tobechecked \N +118297 t tobechecked \N +118302 t tobechecked \N +118309 t tobechecked \N +118321 f tobechecked \N +118323 f tobechecked \N +118327 f tobechecked \N +118336 f tobechecked 2031-06-29 00:00:00 +118337 f tobechecked 2031-08-28 00:00:00 +118338 f tobechecked 2032-09-28 00:00:00 +118339 f tobechecked 2033-04-30 00:00:00 +118340 f tobechecked 2026-03-07 00:00:00 +118341 f tobechecked 2027-08-02 00:00:00 +118342 f tobechecked 2031-12-19 00:00:00 +118343 f tobechecked 2026-01-06 00:00:00 +118344 f tobechecked 2037-01-26 00:00:00 +118345 f tobechecked 2032-07-11 00:00:00 +118346 f tobechecked 2026-09-04 00:00:00 +118377 f tobechecked 2032-06-27 00:00:00 +118508 t tobechecked \N +118534 t tobechecked \N +118539 f tobechecked \N +118573 t tobechecked \N +118574 t tobechecked \N +118576 t tobechecked \N +118577 t tobechecked \N +118578 t tobechecked \N +118588 t tobechecked \N +118593 t tobechecked \N +118680 t tobechecked \N +118693 t tobechecked \N +118695 t tobechecked \N +118812 t tobechecked \N +118813 t tobechecked \N +118814 t tobechecked \N +118817 t tobechecked \N +118818 t tobechecked \N +118820 t tobechecked \N +118821 t tobechecked \N +118822 t tobechecked \N +118823 t tobechecked \N +118824 t tobechecked \N +118826 t tobechecked \N +118827 t tobechecked \N +118829 t tobechecked \N +118830 t tobechecked \N +118832 t tobechecked \N +118833 t tobechecked \N +118835 t tobechecked \N +118836 t tobechecked \N +118837 t tobechecked \N +118843 t tobechecked \N +118844 t tobechecked \N +118845 t tobechecked \N +118847 t tobechecked \N +118944 t tobechecked \N +118989 t tobechecked \N +118990 t tobechecked \N +119073 t tobechecked \N +119077 t tobechecked \N +119078 t tobechecked \N +119089 t tobechecked \N +119108 t tobechecked \N +119109 t tobechecked \N +119137 t tobechecked \N +119301 t tobechecked \N +119302 t tobechecked \N +119305 t tobechecked \N +119322 t tobechecked \N +119330 t tobechecked \N +119332 t tobechecked \N +119335 t tobechecked \N +119336 t tobechecked \N +119337 t tobechecked \N +119342 t tobechecked \N +119343 t tobechecked \N +119344 t tobechecked \N +119351 t tobechecked \N +119367 t tobechecked \N +119371 t tobechecked \N +119372 t tobechecked \N +119373 t tobechecked \N +119374 t tobechecked \N +119375 t tobechecked \N +119377 t tobechecked \N +119385 t tobechecked \N +119387 t tobechecked \N +119388 t tobechecked \N +119389 t tobechecked \N +119390 t tobechecked \N +119391 t tobechecked \N +119392 t tobechecked \N +119393 t tobechecked \N +119394 t tobechecked \N +119395 t tobechecked \N +119396 t tobechecked \N +119397 t tobechecked \N +119398 t tobechecked \N +119399 t tobechecked \N +119400 t tobechecked \N +119401 t tobechecked \N +119402 t tobechecked \N +119405 f tobechecked \N +119406 f tobechecked \N +119407 f tobechecked \N +119408 f tobechecked \N +119409 f tobechecked \N +119444 t tobechecked \N +119446 t tobechecked \N +119447 t tobechecked \N +119473 t tobechecked \N +119474 t tobechecked \N +119517 t tobechecked \N +119579 t tobechecked \N +119580 t tobechecked \N +119581 t tobechecked \N +119585 t tobechecked \N +119586 f tobechecked 2034-11-16 00:00:00 +119587 f tobechecked 2035-01-30 00:00:00 +119588 f tobechecked 2035-01-13 00:00:00 +119589 f tobechecked 2034-09-10 00:00:00 +119590 f tobechecked 2036-07-21 00:00:00 +119591 f tobechecked 2036-12-16 00:00:00 +119592 f tobechecked 2036-12-27 00:00:00 +119593 f tobechecked 2034-07-07 00:00:00 +119594 t tobechecked \N +119598 f tobechecked 2034-01-01 00:00:00 +119652 t tobechecked \N +119653 t tobechecked \N +119779 t tobechecked \N +119782 t tobechecked \N +119783 t tobechecked \N +119793 f tobechecked \N +119795 t tobechecked \N +119799 t tobechecked \N +119802 t tobechecked \N +119804 t tobechecked \N +119807 t tobechecked \N +119809 f tobechecked \N +119812 f tobechecked \N +119814 f tobechecked \N +119819 t tobechecked \N +119824 f tobechecked \N +119834 f tobechecked \N +119838 f tobechecked \N +119839 f tobechecked \N +119840 f tobechecked \N +119841 f tobechecked \N +119842 f tobechecked \N +119843 f tobechecked \N +119864 f tobechecked \N +119923 t tobechecked \N +119960 t tobechecked \N +119972 t tobechecked \N +119990 t tobechecked \N +119991 t tobechecked \N +120005 t tobechecked \N +120006 t tobechecked \N +120078 t tobechecked \N +120087 t tobechecked \N +120096 t tobechecked \N +120102 t tobechecked \N +120104 t tobechecked \N +120112 t tobechecked \N +120124 t tobechecked \N +120179 t tobechecked \N +120189 t tobechecked \N +120190 t tobechecked \N +120191 t tobechecked \N +120210 t tobechecked \N +120218 t tobechecked \N +120235 t tobechecked \N +120315 t tobechecked \N +120321 t tobechecked \N +120322 t tobechecked \N +120327 t tobechecked \N +120328 t tobechecked \N +120329 t tobechecked \N +120330 t tobechecked \N +120331 t tobechecked \N +120332 t tobechecked \N +120334 t tobechecked \N +120335 t tobechecked \N +120349 t tobechecked \N +120350 t tobechecked \N +120351 t tobechecked \N +120353 t tobechecked \N +120354 t tobechecked \N +120355 t tobechecked \N +120359 t tobechecked \N +120360 t tobechecked \N +120361 t tobechecked \N +120370 t tobechecked \N +120411 t tobechecked \N +120471 f tobechecked \N +120626 t tobechecked \N +120627 t tobechecked \N +120628 t tobechecked \N +120629 t tobechecked \N +120634 t tobechecked \N +120670 f tobechecked \N +120671 f tobechecked \N +120672 f tobechecked \N +120673 f tobechecked \N +120674 f tobechecked \N +120691 t tobechecked \N +120692 t tobechecked \N +120705 f tobechecked \N +120725 f tobechecked \N +120730 f tobechecked \N +120787 f tobechecked 2036-01-05 00:00:00 +120788 f tobechecked 2036-01-05 00:00:00 +120789 f tobechecked 2036-01-05 00:00:00 +120790 f tobechecked 2035-12-03 00:00:00 +120791 f tobechecked 2035-06-04 00:00:00 +120792 f tobechecked 2035-12-23 00:00:00 +120793 f tobechecked 2034-06-09 00:00:00 +120837 t tobechecked \N +120838 t tobechecked \N +120840 t tobechecked \N +120841 t tobechecked \N +120857 t tobechecked \N +120858 f tobechecked \N +120859 t tobechecked \N +120860 t tobechecked \N +120861 f tobechecked 2025-12-31 00:00:00 +120862 f tobechecked 2025-12-31 00:00:00 +120863 f tobechecked 2025-12-31 00:00:00 +121005 t tobechecked \N +121012 t tobechecked \N +121021 f tobechecked \N +121077 t tobechecked \N +121078 t tobechecked \N +121079 t tobechecked \N +121080 t tobechecked \N +121091 t tobechecked \N +121104 t tobechecked \N +121123 t tobechecked \N +121124 t tobechecked \N +121125 t tobechecked \N +121128 t tobechecked \N +121140 t tobechecked \N +121179 f tobechecked 2025-01-01 00:00:00 +121190 f tobechecked 2025-01-01 00:00:00 +121192 t tobechecked \N +121193 t tobechecked \N +121194 t tobechecked \N +121195 t tobechecked \N +121196 t tobechecked \N +121198 t tobechecked \N +121203 t tobechecked \N +121204 t tobechecked \N +121205 t tobechecked \N +121208 f tobechecked \N +121215 t tobechecked \N +121216 t tobechecked \N +121226 t tobechecked \N +121228 t tobechecked \N +121229 t tobechecked \N +121237 t tobechecked \N +121249 t tobechecked \N +121262 t tobechecked \N +121266 f tobechecked \N +121267 f tobechecked \N +121276 t tobechecked \N +121280 t tobechecked \N +121288 t tobechecked \N +121326 f tobechecked \N +121327 f tobechecked \N +121340 t tobechecked \N +121341 f tobechecked 2034-11-05 00:00:00 +121342 f tobechecked 2038-03-14 00:00:00 +121343 f tobechecked 2039-06-05 00:00:00 +121344 f tobechecked 2035-10-01 00:00:00 +121345 f tobechecked 2037-06-13 00:00:00 +121346 f tobechecked 2038-06-25 00:00:00 +121347 f tobechecked 2037-10-04 00:00:00 +121348 f tobechecked \N +121349 f tobechecked 2036-02-28 00:00:00 +121350 t tobechecked \N +121351 f tobechecked 2038-10-31 00:00:00 +121353 t tobechecked \N +121356 f tobechecked 2035-12-14 00:00:00 +121357 f tobechecked 2037-04-18 00:00:00 +121362 f tobechecked \N +121363 f tobechecked \N +121369 f tobechecked \N +121370 f tobechecked \N +121371 t tobechecked \N +121372 t tobechecked \N +121373 t tobechecked \N +121374 t tobechecked \N +121375 t tobechecked \N +121376 t tobechecked \N +121377 t tobechecked \N +121379 t tobechecked \N +121380 t tobechecked \N +121381 t tobechecked \N +121382 t tobechecked \N +121383 t tobechecked \N +121384 t tobechecked \N +121385 t tobechecked \N +121386 t tobechecked \N +121389 t tobechecked \N +121390 t tobechecked \N +121391 t tobechecked \N +121393 f tobechecked 2028-09-15 00:00:00 +121394 f tobechecked 2030-03-01 00:00:00 +121395 f tobechecked 2024-04-11 00:00:00 +121396 f tobechecked 2026-10-31 00:00:00 +121397 f tobechecked 2025-09-29 00:00:00 +121398 f tobechecked 2025-09-18 00:00:00 +121399 f tobechecked 2027-03-01 00:00:00 +121400 f tobechecked 2028-11-28 00:00:00 +121401 f tobechecked 2027-05-27 00:00:00 +121402 f tobechecked 2027-06-17 00:00:00 +121403 f tobechecked 2029-02-20 00:00:00 +121404 f tobechecked 2029-04-05 00:00:00 +121405 f tobechecked 2028-05-27 00:00:00 +121406 f tobechecked 2029-11-12 00:00:00 +121407 t tobechecked \N +121408 t tobechecked \N +121409 t tobechecked \N +121410 t tobechecked \N +121411 t tobechecked \N +121413 t tobechecked \N +121414 t tobechecked \N +121415 f tobechecked \N +121416 t tobechecked \N +121417 t tobechecked \N +121418 t tobechecked \N +121419 f tobechecked \N +121420 t tobechecked \N +121421 t tobechecked \N +121422 t tobechecked \N +121423 t tobechecked \N +121424 t tobechecked \N +121425 t tobechecked \N +121426 f tobechecked \N +121427 t tobechecked \N +121428 t tobechecked \N +121429 f tobechecked \N +121430 f tobechecked \N +121431 f tobechecked \N +121432 f tobechecked \N +121433 f tobechecked \N +121434 t tobechecked \N +121435 t tobechecked \N +121436 t tobechecked \N +121437 t tobechecked \N +121438 t tobechecked \N +121439 t tobechecked \N +121440 t tobechecked \N +121441 t tobechecked \N +121442 t tobechecked \N +121443 f tobechecked \N +121444 f tobechecked \N +121445 f tobechecked \N +121446 t tobechecked \N +121447 f tobechecked \N +121448 t tobechecked \N +121449 t tobechecked \N +121450 t tobechecked \N +121451 t tobechecked \N +121452 t tobechecked \N +121453 t tobechecked \N +121454 f tobechecked \N +121455 t tobechecked \N +121456 t tobechecked \N +121457 t tobechecked \N +121458 t tobechecked \N +121459 t tobechecked \N +121460 t tobechecked \N +121461 f tobechecked \N +121462 t tobechecked \N +121463 t tobechecked \N +121464 t tobechecked \N +121465 t tobechecked \N +121466 t tobechecked \N +121467 t tobechecked \N +121468 t tobechecked \N +121469 t tobechecked \N +121470 t tobechecked \N +121471 t tobechecked \N +121472 t tobechecked \N +121473 t tobechecked \N +121474 t tobechecked \N +121475 t tobechecked \N +121476 t tobechecked \N +121477 t tobechecked \N +121478 t tobechecked \N +121479 t tobechecked \N +121480 t tobechecked \N +121481 f tobechecked \N +121482 t tobechecked \N +121483 t tobechecked \N +121484 t tobechecked \N +121485 t tobechecked \N +121486 t tobechecked \N +121487 t tobechecked \N +121488 t tobechecked \N +121489 t tobechecked \N +121490 t tobechecked \N +121491 t tobechecked \N +121492 t tobechecked \N +121493 t tobechecked \N +121494 t tobechecked \N +121495 t tobechecked \N +121496 t tobechecked \N +121497 t tobechecked \N +121498 t tobechecked \N +121499 t tobechecked \N +121500 t tobechecked \N +121501 t tobechecked \N +121502 t tobechecked \N +121503 t tobechecked \N +121504 t tobechecked \N +121505 t tobechecked \N +121506 t tobechecked \N +121507 t tobechecked \N +121508 t tobechecked \N +121509 t tobechecked \N +121510 t tobechecked \N +121511 t tobechecked \N +121512 t tobechecked \N +121513 t tobechecked \N +121514 t tobechecked \N +121515 f tobechecked \N +121516 f tobechecked \N +121517 f tobechecked \N +121518 f tobechecked \N +121519 f tobechecked \N +121520 f tobechecked \N +121521 f tobechecked \N +121522 f tobechecked \N +121523 f tobechecked \N +121524 f tobechecked \N +121525 t tobechecked \N +121526 t tobechecked \N +121527 t tobechecked \N +121528 t tobechecked \N +121529 t tobechecked \N +121530 t tobechecked \N +121531 t tobechecked \N +121532 f tobechecked \N +121533 f tobechecked \N +121534 f tobechecked \N +121535 f tobechecked \N +121536 f tobechecked \N +121537 t tobechecked \N +121538 t tobechecked \N +121539 f tobechecked \N +121540 t tobechecked \N +121541 f tobechecked \N +121542 t tobechecked \N +121543 f tobechecked \N +121544 t tobechecked \N +121545 t tobechecked \N +121546 t tobechecked \N +121547 t tobechecked \N +121548 t tobechecked \N +121549 t tobechecked \N +121550 t tobechecked \N +121551 t tobechecked \N +121552 t tobechecked \N +121553 t tobechecked \N +121554 t tobechecked \N +121555 t tobechecked \N +121556 t tobechecked \N +121557 t tobechecked \N +121558 t tobechecked \N +121559 t tobechecked \N +121560 t tobechecked \N +121561 t tobechecked \N +121562 t tobechecked \N +121563 t tobechecked \N +121564 f tobechecked \N +121565 t tobechecked \N +121566 f tobechecked \N +121567 t tobechecked \N +121568 t tobechecked \N +121569 t tobechecked \N +121570 f tobechecked \N +121571 f tobechecked \N +121572 f tobechecked \N +121573 f tobechecked \N +121574 f tobechecked \N +121575 f tobechecked \N +121576 t tobechecked \N +121577 t tobechecked \N +121578 t tobechecked \N +121579 t tobechecked \N +121580 t tobechecked \N +121584 t tobechecked \N +121585 t tobechecked \N +121591 t tobechecked \N +121592 t tobechecked \N +121593 t tobechecked \N +121600 t tobechecked \N +121602 t tobechecked \N +121606 t tobechecked \N +121607 t tobechecked \N +121608 t tobechecked \N +121644 t tobechecked \N +121648 t tobechecked \N +121653 t tobechecked \N +121654 t tobechecked \N +121661 t tobechecked \N +121662 t tobechecked \N +121663 t tobechecked \N +121664 t tobechecked \N +121665 t tobechecked \N +121672 t tobechecked \N +130099 t tobechecked \N +130101 f tobechecked \N +42753 t approved \N +43034 t tobechecked \N +42550 t approved \N +42547 t approved \N +130102 t tobechecked \N +42551 f approved \N +42576 t approved \N +42314 t approved \N +43469 t tobechecked \N +64182 t tobechecked \N +42565 t approved \N +113273 t tobechecked \N +42754 t approved \N +42570 t approved \N +43176 t tobechecked \N +61321 t tobechecked \N +42755 t approved \N +43901 t tobechecked \N +42758 t approved \N +42759 t approved \N +8322 t approved \N +42760 t approved \N +44027 t approved \N +130103 t tobechecked \N +42779 t approved \N +103760 t tobechecked \N +43239 f tobechecked \N +43242 t tobechecked \N +43481 t tobechecked \N +8324 t approved \N +43700 t tobechecked \N +8330 t approved \N +44036 t tobechecked \N +103770 t tobechecked \N +44076 t approved \N +42308 t approved \N +43841 t tobechecked \N +43088 t tobechecked \N +43948 t approved \N +4767 t approved \N +43400 t tobechecked \N +43856 t tobechecked \N +44196 t tobechecked \N +42932 t tobechecked \N +10386 t tobechecked \N +10608 t tobechecked \N +42983 t tobechecked \N +43401 t tobechecked \N +42418 t approved \N +43869 t tobechecked \N +43915 t tobechecked \N +43883 t tobechecked \N +43361 t tobechecked \N +43424 t tobechecked \N +43425 t tobechecked \N +43440 t tobechecked \N +43453 t tobechecked \N +44214 t tobechecked \N +44219 t tobechecked \N +44221 t tobechecked \N +44222 t tobechecked \N +44224 t tobechecked \N +44225 t tobechecked \N +8592 t tobechecked \N +44226 t tobechecked \N +43997 t approved \N +44000 t approved \N +43998 t approved \N +42536 t approved \N +43999 t approved \N +42537 t approved \N +42538 t approved \N +42539 t approved \N +42540 t approved \N +42543 t approved \N +42545 t approved \N +42546 t approved \N +42548 t approved \N +43275 t tobechecked \N +43299 t tobechecked \N +43355 t tobechecked \N +43384 t tobechecked \N +43399 t tobechecked \N +43446 t tobechecked \N +43447 t tobechecked \N +43448 t tobechecked \N +43455 t tobechecked \N +42864 t approved \N +43495 t tobechecked \N +42906 t approved \N +44001 t approved \N +44002 t approved \N +44546 t tobechecked \N +44003 t approved \N +44005 t approved \N +44004 t approved \N +44547 t tobechecked \N +44006 t approved \N +44007 t approved \N +44008 t approved \N +44009 t approved \N +43880 t tobechecked \N +44548 t tobechecked \N +43938 t tobechecked \N +43939 t tobechecked \N +43940 t tobechecked \N +43941 t tobechecked \N +44549 t tobechecked \N +43942 t tobechecked \N +44550 t tobechecked \N +4927 t tobechecked \N +44562 t tobechecked \N +44575 t tobechecked \N +4966 t tobechecked \N +43339 t tobechecked \N +43943 t tobechecked \N +43508 t tobechecked \N +44596 t tobechecked \N +43944 t tobechecked \N +43945 t tobechecked \N +44238 t tobechecked \N +8610 t tobechecked \N +44612 t tobechecked \N +44624 t tobechecked \N +43946 t tobechecked \N +43947 t tobechecked \N +44350 t tobechecked \N +8638 t tobechecked \N +44644 t tobechecked \N +43521 t tobechecked \N +113276 t tobechecked \N +44254 t tobechecked \N +43533 t tobechecked \N +4832 t tobechecked \N +44386 t tobechecked \N +43546 t tobechecked \N +44399 t tobechecked \N +43565 t tobechecked \N +43587 t tobechecked \N +44433 t tobechecked \N +4875 t tobechecked \N +60120 t tobechecked \N +8664 t tobechecked \N +4982 t tobechecked \N +44282 t tobechecked \N +4985 t tobechecked \N +43603 t tobechecked \N +44467 t tobechecked \N +44304 t tobechecked \N +44316 t tobechecked \N +44487 t tobechecked \N +44490 t tobechecked \N +43633 t tobechecked \N +44503 t tobechecked \N +44508 t tobechecked \N +44510 t tobechecked \N +43635 t tobechecked \N +44173 t tobechecked \N +43634 t tobechecked \N +44511 t tobechecked \N +43637 t tobechecked \N +44512 t tobechecked \N +43643 t tobechecked \N +43644 t tobechecked \N +43647 t tobechecked \N +43648 t tobechecked \N +43649 t tobechecked \N +43657 t tobechecked \N +43658 t tobechecked \N +43669 t tobechecked \N +130104 t tobechecked \N +130105 t tobechecked \N +130106 f tobechecked \N +130107 f tobechecked \N +130108 f tobechecked \N +130109 f tobechecked \N +\. + + +-- +-- TOC entry 4688 (class 0 OID 17658) +-- Dependencies: 267 +-- Data for Name: language_item; Type: TABLE DATA; Schema: public; Owner: asset-swissgeol +-- + +COPY public.language_item (language_item_code, geol_code, name, name_de, name_fr, name_rm, name_it, name_en, description, description_de, description_fr, description_rm, description_it, description_en) FROM stdin; +EN No-GeolCode-specified english englisch anglais englais inglese english Asset in English Asset in Englisch Asset en anglais Asset in inglese Asset in English +IT No-GeolCode-specified italian italienisch italien talian italiano italian Asset in Italian Asset in Italienisch Asset en italien Elemento in italiano Asset in Italian +FR No-GeolCode-specified french französisch français franzos francese french Asset in French Asset in Französisch Asset en français Elemento in francese Asset in French +DE No-GeolCode-specified german deutsch allemand tudestg tedesco german Asset in German Asset in Deutsch Asset en allemand Elemento in tedesco Asset in German +other No-GeolCode-specified other languages andere Sprachen autres langues autras linguas altre lingue other languages Asset in other languages Asset in anderer Sprachen Assets dans d'autres langues Elemento in altre lingue Asset in other languages +NUM No-GeolCode-specified numeric numerisch numérique numerico numeric Asset with numerical structure, e.g. programme code, configurations Asset mit numerischem Aufbau, wie z.B. Programmcode, Konfigurationen Asset à structure numérique, p. ex. code de programme, configurations Elemento con struttura numerica, ad es. codice programma, configurazioni Asset with numerical structure, e.g. programme code, configurations +\. + + +-- +-- TOC entry 4689 (class 0 OID 17663) +-- Dependencies: 268 +-- Data for Name: legal_doc; Type: TABLE DATA; Schema: public; Owner: asset-swissgeol +-- + +COPY public.legal_doc (legal_doc_id, asset_id, title, legal_doc_item_code) FROM stdin; +\. + + +-- +-- TOC entry 4690 (class 0 OID 17668) +-- Dependencies: 269 +-- Data for Name: legal_doc_item; Type: TABLE DATA; Schema: public; Owner: asset-swissgeol +-- + +COPY public.legal_doc_item (legal_doc_item_code, geol_code, name, name_de, name_fr, name_rm, name_it, name_en, description, description_de, description_fr, description_rm, description_it, description_en) FROM stdin; +federalData No-GeolCode-specified Federal data Bundesdaten Données fédérales Dati federali Federal data Data to which the Confederation holds the rights Daten, an welchen der Bund die Rechte besitzt Données pour lesquelles la Confédération possède des droits Dati di cui la Confederazione detiene i diritti Data to which the Confederation holds the rights +permissionForm No-GeolCode-specified permissionForm Einwilligungsformular Formulaire de consentement Modulo di consenso Consent form Legally binding consent form Rechtlich verbindliches Einwilligungsformular Formulaire de consentement juridiquement contraignant Modulo di consenso legalmente vincolante Legally binding consent form +contract No-GeolCode-specified contract Vertrag Contrat Contratto Contract Legally binding contract Rechtlich verbindlicher Vertrag Contrat juridiquement contraignant Contratto legalmente vincolante Legally binding contract +other No-GeolCode-specified other Andere Autres Altro Other Other legally binding document (e.g. e-mail) Anderes rechtsgültiges Dokument (z.B. E-Mail) Autre document juridiquement valable (par ex. e-mail) Altro documento giuridicamente vincolante (ad es. e-mail) Other legally binding document (e.g. e-mail) +\. + + +-- +-- TOC entry 4692 (class 0 OID 17674) +-- Dependencies: 271 +-- Data for Name: man_cat_label_item; Type: TABLE DATA; Schema: public; Owner: asset-swissgeol +-- + +COPY public.man_cat_label_item (man_cat_label_item_code, geol_code, name, name_de, name_fr, name_rm, name_it, name_en, description, description_de, description_fr, description_rm, description_it, description_en) FROM stdin; +energyRessources No-GeolCode-specified Energy ressources Geoenergie, Geothermie, Energierohstoffe (Erdöl/Erdgas/Kohle) Géoénergie, géothermie, matières premières énergétiques (pétrole/gaz naturel/charbon) Geoenergia, energia geotermica, risorse energetiche (petrolio/gas naturale/carbone) Geoenergy, geothermal energy, energy resources (oil/natural gas/coal) Geoenergy assets, e.g. geothermal energy, energy resources (oil, gas, coal), etc. Assets zum Thema Geoenergie, wie z.B. Geothermie, Energierohstoffe (Erdöl, Erdgas, Kohle), etc. Assets sur le thème des géoénergies, p. ex. géothermie, matières premières énergétiques (pétrole, gaz naturel, charbon), etc. Elementi sul tema della geoenergia, ad esempio energia geotermica, risorse energetiche (petrolio, gas, carbone), ecc. Geoenergy assets, e.g. geothermal energy, energy resources (oil, gas, coal), etc. +science No-GeolCode-specified Science Wissenschaftl. Abschlussarbeiten Travaux scientifiques de fin d'études Tesi scientifiche Scientific theses Assets in the form of a scientific thesis Assets ins Form einer wissenschaftl. Abschlussarbeiten Assets sous la forme d'un travail scientifique de fin d'études Elementi in forma di tesi scientifica Assets in the form of a scientific thesis +geotechnics No-GeolCode-specified Geotechnics Geotechnik Géotechnique Geotecnica Geotechnics Assets on the topic of geotechnics Assets zum Thema Geotechnik Assets sur le thème de la géotechnique Elementi sul tema della geotecnica Assets on the topic of geotechnics +geophysics No-GeolCode-specified Geophysics Geophysik Géophysique Geofisica Geophysics Assets on the topic of geophysics Assets zum Thema Geophysik Assets sur le thème de la géophysique Elementi sul tema della geofisica Assets on the topic of geophysics +borehole No-GeolCode-specified Borehole Bohrungen Forages Perforazioni Boreholes Assets on the topic of boreholes, e.g. borehole profiles and reports Assets zum Thema Bohrungen, z.B. Bohrprofile und Berichte zu Bohrungen Assets sur le thème des forages, p. ex. profils et rapports de forage Elementi sul tema della perforazione, ad esempio profili e rpporti di perforazione. Assets on the topic of boreholes, e.g. borehole profiles and reports +other No-GeolCode-specified Other Andere Autres Altro Other Assets on other topics not covered by the values in this list Assets zu anderen Themen, die nicht mit den Werten dieser Liste abgedeckt sind Assets sur d'autres thèmes qui ne sont pas couverts par les valeurs de cette liste Elementi su altri argomenti non coperti dai valori di questo elenco Assets on other topics not covered by the values in this list +naturalHazards No-GeolCode-specified Natural hazards Naturgefahren Dangers naturels Rischi naturali Natural hazards Assets on the topic of natural hazards Assets zum Thema Naturgefahren Assets sur le thème des dangers naturels Elementi sul tema dei rischi naturali Assets on the topic of natural hazards +hydrogeology No-GeolCode-specified Hydrogeology Hydrogeologie Hydrogéologie Idrogeologia Hydrogeology Assets on the topic of hydrogeology Assets zum Thema Hydrogeologie Assets sur le thème de l'hydrogéologie Elementi sul tema dell'idrogeologia Assets on the topic of hydrogeology +pollution No-GeolCode-specified Pollution Altlasten Sites contaminés Siti contaminati Contaminated sites Assets on the topic of contaminated sites Assets zum Thema Altlasten Assets sur le thème des sites contaminés Elementi sul tema dei siti contaminati Assets on the topic of contaminated sites +mineralRessources No-GeolCode-specified Mineralressources Mineralische Rohstoffe Matières premières minérales Risorse minerali Mineral Resources Assets on the topic of mineral resources (incl. mining, quarries, gravel pits, etc.) Assets zum Thema Mineralische Rohstoffe (inkl. Bergbau, Steinbruch, Kiesgrube etc.) Assets sur le thème des ressources minérales (y compris exploitation minière, carrières, gravières, etc.) Elementi sul tema delle risorse minerali (incluse miniere, cave di roccia, cave di ghiaia, ecc.) Assets on the topic of mineral resources (incl. mining, quarries, gravel pits, etc.) +prospection No-GeolCode-specified Prospection Prospektion (z.B. Rohstoffe) Prospection (p. ex. matières premières) Prospezione (ad es. materie prime) Prospecting (e.g. raw materials) Assets on the topic of prospecting, e.g. of mineral raw materials Assets zum Thema Prospektion, wie z.B. von mineralischen Rohstoffen Assets sur le thème de la prospection, p. ex. matières premières minérales Elementi sul tema della prospezione, ad esempio di materie prime minerali Assets on the topic of prospecting, e.g. of mineral raw materials +exploration No-GeolCode-specified Exploration Exploration Exploration Esplorazione Exploration Assets on the topic of exploration, e.g. of minerals and raw materials Assets zum Thema Exploration, wie z.B. von mineralischen Rohstoffen Assets sur le thème de l'exploration, p. ex. ressources minérales Elementi sul tema dell'esplorazione, ad es. di materie prime minerali Assets on the topic of exploration, e.g. of minerals and raw materials +\. + + +-- +-- TOC entry 4693 (class 0 OID 17679) +-- Dependencies: 272 +-- Data for Name: man_cat_label_ref; Type: TABLE DATA; Schema: public; Owner: asset-swissgeol +-- + +COPY public.man_cat_label_ref (asset_id, man_cat_label_item_code) FROM stdin; +44382 geotechnics +44382 hydrogeology +\. + + +-- +-- TOC entry 4694 (class 0 OID 17684) +-- Dependencies: 273 +-- Data for Name: nat_rel_item; Type: TABLE DATA; Schema: public; Owner: asset-swissgeol +-- + +COPY public.nat_rel_item (nat_rel_item_code, geol_code, name, name_de, name_fr, name_rm, name_it, name_en, description, description_de, description_fr, description_rm, description_it, description_en) FROM stdin; +geolWasteDisp No-GeolCode-specified geolWasteDisp Geologisches Tiefenlager Dépôts en couches géologiques profondes Deposito geologico profondo Deep geological repository Asset is related to deep geological repositories in Switzerland Asset steht im Zusammenahng mit Geologischen Tiefenlagern in der Schweiz Asset en relation avec des dépôts en couches géologiques profondes en Suisse L'elemento è associato ai depositi geologici profondi in Svizzera Asset is related to deep geological repositories in Switzerland +partiConf No-GeolCode-specified partiConf Projekte mit Bundesbeteiligung Projets avec participation de la Confédération Progetti a partecipazione federale Projects with federal participation Asset has been constructed on behalf of or with the participation of the federal government (federal participation). Asset ist im Auftrag oder mit Beteiligung des Bundes (Bundesbeteiligung) erstellt worden Asset réalisé sur mandat ou avec la participation de la Confédération (participation fédérale). L'elemento è stato realizzato per conto o con la partecipazione del governo federale (partecipazione federale). Asset has been constructed on behalf of or with the participation of the federal government (federal participation). +projConfEnterprise No-GeolCode-specified projConfEnterprise Projekte bundesnaher Betriebe Projets d'entreprises proches de la Confédération Progetti di aziende prossime alla Confederazione Projects with federally associated participation Asset has been constructed on behalf of or with the participation of a government-affiliated company, e.g. the Swiss Federal Railways (SBB). Asset ist im Auftrag oder mit Beteiligung eines bundesnahen Betriebes, wie z.B. der SBB, erstellt worden Asset réalisé sur mandat ou avec la participation d'une entreprise proche de la Confédération, p. ex. CFF L'elemento è stato realizzato per conto o con la partecipazione di un'azienda pubblica, ad esempio le Ferrovie Federali Svizzere (FFS). Asset has been constructed on behalf of or with the participation of a government-affiliated company, e.g. the Swiss Federal Railways (SBB). +boreholesGt100 No-GeolCode-specified boreholesGt100 Bohrungen grösser 100 m Forages de plus de 100 m Perforazioni superiori a 100 m Boreholes greater than 100 m Asset is associated with a borehole >100 m deep. Asset steht im Zusammenhang mit einer Bohrung >100 m Tiefe Asset en relation avec un forage >100 m de profondeur L'elemento è associato a una perforazione profonda oltre i 100 metri. Asset is associated with a borehole >100 m deep. +sgtk_FGS No-GeolCode-specified sgtk_FGS Resultate der SGTK und FGS Résultats de la SGTK et de la FGS Risultati della SGTK o 'FGS Results of the SGTK and FGS Asset is related to results of the SGTK and the FGS Asset steht im Zusammenhang mit Resultaten der SGTK und der FGS Asset en relation avec des résultats de la SGTK et de la FGS L'elemento è legato ai risultati della SGTK o FGS. Asset is related to results of the SGTK and the FGS +sgpk No-GeolCode-specified sgpk Resultate SGPK Résultats de la SGPK Risultati della SGPK Results of SGPK Asset is related to the results of the SGPK Asset steht im Zusammenhang mit Resultaten der SGPK Asset en relation avec les résultats de la SGPK L'elemento è legato ai risultati della SGPK Asset is related to the results of the SGPK +prospecExplor No-GeolCode-specified prospecExplor Prospektion und Förderung von Rohstoffen aus dem Energiebereich Prospection et extraction de matières premières dans le domaine de l'énergie Prospezione o estrazione di materie prime per il settore energetico Prospecting and extraction of raw materials from the energy sector Asset is related to the prospecting and extraction of raw materials in the energy sector. Asset steht im Zusammenhang mit der Prospektion und Förderung von Rohstoffen aus dem Energiebereich Asset en relation avec la prospection et l'extraction de matières premières dans le domaine de l'énergie L'elemento è legato alla ricerca o all'estrazione di materie prime per il settore energetico. Asset is related to the prospecting and extraction of raw materials in the energy sector. +projNatRel No-GeolCode-specified projNatRel Projekte mit nationaler Ausstrahlung Projets d'envergure nationale Progetti con impatto nazionale Projects with national impact Asset is related to projects with national impact Asset steht im Zusammenhang mit Projekten mit nationaler Ausstrahlung Asset lié à des projets d'envergure nationale L'elemento è legato a progetti con impatto nazionale Asset is related to projects with national impact +specScienInt No-GeolCode-specified specScienInt Besonderes wissenschaftliches Interesse Intérêt scientifique particulier Interesse scientifico speciale Special scientific interest Asset has a specific scientific interest Asset hat ein besonderes wissenschaftliches Interesse Asset avec un intérêt scientifique particulier L'elemento ha un interesse scientifico particolare Asset has a specific scientific interest +\. + + +-- +-- TOC entry 4695 (class 0 OID 17689) +-- Dependencies: 274 +-- Data for Name: pub_channel_item; Type: TABLE DATA; Schema: public; Owner: asset-swissgeol +-- + +COPY public.pub_channel_item (pub_channel_item_code, geol_code, name, name_de, name_fr, name_rm, name_it, name_en, description, description_de, description_fr, description_rm, description_it, description_en) FROM stdin; +conference No-GeolCode-specified conference Konferenz Conférence Conferenza Conference Conference Konferenz Conférence Conferenza Conference +professionalJournal No-GeolCode-specified professionalJournal Fachzeitschrift Revue spécialisée Rivista specializzata Journal Technical journal Fachzeitschrift Revue spécialisée Rivista specializzata Technical journal +monograph No-GeolCode-specified monograph Monographie Monographie Monografia Monograph Monograph, e.g. book, textbook, reports of national geology, etc. Monografie, z.B. Buch, Lehrbuch, Berichte der Landesgeologie, etc. Monographie, p. ex. livre, manuel, rapports du Service géologique national, etc. Monografia, ad esempio libro, libro di testo, rapporti del servizion geologico nazionale, ecc. Monograph, e.g. book, textbook, reports of national geology, etc. +internet No-GeolCode-specified internet Internet Internet Internet Internet Internet Internet Internet Internet Internet +mapGeoAdmin No-GeolCode-specified mapGeoAdmin map.geo.admin.ch map.geo.admin.ch map.geo.admin.ch map.geo.admin.ch map.geo.admin.ch Federal Geoportal: https://map.geo.admin.ch Geoportal des Bundes: https://map.geo.admin.ch Géoportail de la Confédération : https://map.geo.admin.ch Geoportale federale: https://map.geo.admin.ch Federal Geoportal: https://map.geo.admin.ch +opendataSwiss No-GeolCode-specified opendata.swiss opendata.swiss opendata.swiss opendata.swiss opendata.swiss opendata.swiss OpenData portal: https://opendata.swiss OpenData-Portal: https://opendata.swiss Portail OpenData : https://opendata.swiss Portale OpenData: https://opendata.swiss OpenData portal: https://opendata.swiss +undiff No-GeolCode-specified undiff Undifferenziert Indifférencié Indifferenziato Undifferentiated Unspecifiable publication channel Nicht spezifizierbarer Publikationskanal Canal de publication non précisé Canale di pubblicazione non specificabile Unspecifiable publication channel +swissgeol No-GeolCode-specified swissgeol swissgeol.ch swissgeol.ch swissgeol.ch swissgeol.ch swissgeol.ch Data viewer of the swiss subsurface: https://swissgeol.ch Datenviewer des Schweizer Untergrunds: https://swissgeol.ch Visualiseur de données du sous-sol suisse: https://swissgeol.ch Visualizzatore di dati del sottosuolo svizzero: https://swissgeol.ch Data viewer of the swiss subsurface: https://swissgeol.ch +\. + + +-- +-- TOC entry 4696 (class 0 OID 17694) +-- Dependencies: 275 +-- Data for Name: public_use; Type: TABLE DATA; Schema: public; Owner: asset-swissgeol +-- + +COPY public.public_use (public_use_id, is_available, status_asset_use_item_code, start_availability_date) FROM stdin; +130108 f tobechecked \N +\. + + +-- +-- TOC entry 4698 (class 0 OID 17700) +-- Dependencies: 277 +-- Data for Name: publication; Type: TABLE DATA; Schema: public; Owner: asset-swissgeol +-- + +COPY public.publication (publication_id, pub_channel_item_code, publication_date, description, link) FROM stdin; +\. + + +-- +-- TOC entry 4310 (class 0 OID 16705) +-- Dependencies: 218 +-- Data for Name: spatial_ref_sys; Type: TABLE DATA; Schema: public; Owner: postgres +-- + +COPY public.spatial_ref_sys (srid, auth_name, auth_srid, srtext, proj4text) FROM stdin; +\. + + +-- +-- TOC entry 4700 (class 0 OID 17706) +-- Dependencies: 279 +-- Data for Name: status_asset_use_item; Type: TABLE DATA; Schema: public; Owner: asset-swissgeol +-- + +COPY public.status_asset_use_item (status_asset_use_item_code, geol_code, name, name_de, name_fr, name_rm, name_it, name_en, description, description_de, description_fr, description_rm, description_it, description_en) FROM stdin; +tobechecked No-GeolCode-specified to be checked Zu prüfen À vérifier Da testare To be checked Terms of use of the asset need to be checked Nutzungsbedingungen des Assets müssen geprüft werden Les conditions d'utilisation de l'asset doivent être vérifiées Le condizioni di utilizzo dell'elemento devono essere valutate. Terms of use of the asset need to be checked +underclarification No-GeolCode-specified under clarification In Prüfung En cours de vérification In esame Currently being checked Terms of use of the asset are currently being checked Nutzungsbedingungen des Assets werden zurzeit geprüft Les conditions d'utilisation de l'asset sont en cours de vérification Le condizioni di utilizzo dell'elemento sono attualmente in fase di valutazione Terms of use of the asset are currently being checked +approved No-GeolCode-specified approved Finalisiert Finalisé Finalizzato Finalised Terms of use of the asset are available and confirmed Nutzungsbedingungen des Assets liegen vor und sind bestätigt Les conditions d'utilisation de l'asset sont disponibles et confirmées Le condizioni di utilizzo dell'elemento sono disponibili e confermate Terms of use of the asset are available and confirmed +\. + + +-- +-- TOC entry 4701 (class 0 OID 17711) +-- Dependencies: 280 +-- Data for Name: status_work; Type: TABLE DATA; Schema: public; Owner: asset-swissgeol +-- + +COPY public.status_work (status_work_id, asset_id, status_work_item_code, status_work_date, processor) FROM stdin; +219886 44382 initiateAsset 2024-02-20 15:20:33.928 \N +\. + + +-- +-- TOC entry 4702 (class 0 OID 17716) +-- Dependencies: 281 +-- Data for Name: status_work_item; Type: TABLE DATA; Schema: public; Owner: asset-swissgeol +-- + +COPY public.status_work_item (status_work_item_code, geol_code, name, name_de, name_fr, name_rm, name_it, name_en, description, description_de, description_fr, description_rm, description_it, description_en) FROM stdin; +initiateAsset No-GeolCode-specified Initially edited Ersterfassung Asset Saisie initiale Acquisizione iniziale dell'elemento Initial capture asset Asset is derived from initial capture in the system Ersterfassung des Assets im System Première saisie de l'asset dans le système L'elemento é inserito per la prima volta nel sistema Asset is derived from initial capture in the system +edited No-GeolCode-specified Edited Bearbeitet Traité dans le système Modificato Processed Asset is processed in the system Asset ist im System bearbeitet L'asset a été traité dans le système L'elemento é elaborato dal sistema Asset is processed in the system +importedOld No-GeolCode-specified Old data imported Importierte Altdaten Import d'anciennes données Importazione di dati legacy Imported legacy data Asset originates from imported legacy data (InfoGeol) Asset stammt von importieren Altdaten (InfoGeol) ab L'asset provient de données anciennes importées (InfoGeol) L'elemento proviene da dati legacy importati (InfoGeol) Asset originates from imported legacy data (InfoGeol) +docClassified No-GeolCode-specified Document classified Dokument klassifiziert Document classé Documento classificato Document classified Asset is assigned to a thematic class Asset ist einer thematischen Klasse zugewiesen L'asset a été attribué à une classe thématique L'elemento è assegnato a una classe tematica Asset is assigned to a thematic class +objectsExtracted No-GeolCode-specified Objects extracted Objekte extrahiert Objets extraits Oggetti estratti Objects extracted Objects extracted from asset Aus Asset wurden Objekte extrahiert Des objets ont été extraits de l'asset Degli oggetti sono stati estratti dall'elemento Objects extracted from asset +OCRprocessed No-GeolCode-specified OCR processed OCR prozessiert Traité par OCR Elaborazione OCR OCR processed OCR has been performed for asset Für Asset wurde OCR ausgeführt L'asset a été traité par OCR L'OCR è stato eseguito per gli elementi OCR has been performed for asset +importedDigi No-GeolCode-specified Imported digitisation Importierte Digitalisierung Numérisation importée Digitalizzazione importata Imported digitised Asset is derived from imported digital data (digi.swissgeol.ch) Asset stammt von importierten digitalen Daten ab (digi.swissgeol.ch) L'asset provient de données numériques importées (digi.swissgeol.ch) L'elemento deriva da dati digitali importati (digi.swissgeol.ch) Asset is derived from imported digital data (digi.swissgeol.ch) +published No-GeolCode-specified published Publiziert Publié Pubblicato Published Asset is published Asset ist publiziert L'asset est publié L'elemento è pubblicato Asset is published +\. + + +-- +-- TOC entry 4652 (class 0 OID 17522) +-- Dependencies: 230 +-- Data for Name: study_area; Type: TABLE DATA; Schema: public; Owner: asset-swissgeol +-- + +COPY public.study_area (study_area_id, asset_id, geom_quality_item_code, geom) FROM stdin; +\. + + +-- +-- TOC entry 4653 (class 0 OID 17527) +-- Dependencies: 231 +-- Data for Name: study_location; Type: TABLE DATA; Schema: public; Owner: asset-swissgeol +-- + +COPY public.study_location (study_location_id, asset_id, geom_quality_item_code, geom) FROM stdin; +53107 44382 unkown 0101000020080800002731088C8C4D4441D34D6250A9193241 +\. + + +-- +-- TOC entry 4654 (class 0 OID 17532) +-- Dependencies: 232 +-- Data for Name: study_trace; Type: TABLE DATA; Schema: public; Owner: asset-swissgeol +-- + +COPY public.study_trace (study_trace_id, asset_id, geom_quality_item_code, geom) FROM stdin; +\. + + +-- +-- TOC entry 4707 (class 0 OID 17725) +-- Dependencies: 286 +-- Data for Name: type_nat_rel; Type: TABLE DATA; Schema: public; Owner: asset-swissgeol +-- + +COPY public.type_nat_rel (type_nat_rel_id, asset_id, nat_rel_item_code) FROM stdin; +\. + + +-- +-- TOC entry 4735 (class 0 OID 0) +-- Dependencies: 226 +-- Name: refresh_tokens_id_seq; Type: SEQUENCE SET; Schema: auth; Owner: asset-swissgeol +-- + +SELECT pg_catalog.setval('auth.refresh_tokens_id_seq', 1162, true); + + +-- +-- TOC entry 4736 (class 0 OID 0) +-- Dependencies: 235 +-- Name: asset_asset_id_seq; Type: SEQUENCE SET; Schema: public; Owner: asset-swissgeol +-- + +SELECT pg_catalog.setval('public.asset_asset_id_seq', 44382, true); + + +-- +-- TOC entry 4737 (class 0 OID 0) +-- Dependencies: 239 +-- Name: asset_format_composition_asset_format_composition_id_seq; Type: SEQUENCE SET; Schema: public; Owner: asset-swissgeol +-- + +SELECT pg_catalog.setval('public.asset_format_composition_asset_format_composition_id_seq', 1, true); + + +-- +-- TOC entry 4738 (class 0 OID 0) +-- Dependencies: 243 +-- Name: asset_kind_composition_asset_kind_composition_id_seq; Type: SEQUENCE SET; Schema: public; Owner: asset-swissgeol +-- + +SELECT pg_catalog.setval('public.asset_kind_composition_asset_kind_composition_id_seq', 1, true); + + +-- +-- TOC entry 4739 (class 0 OID 0) +-- Dependencies: 246 +-- Name: asset_object_info_asset_object_info_id_seq; Type: SEQUENCE SET; Schema: public; Owner: asset-swissgeol +-- + +SELECT pg_catalog.setval('public.asset_object_info_asset_object_info_id_seq', 1, true); + + +-- +-- TOC entry 4740 (class 0 OID 0) +-- Dependencies: 252 +-- Name: auto_cat_auto_cat_id_seq; Type: SEQUENCE SET; Schema: public; Owner: asset-swissgeol +-- + +SELECT pg_catalog.setval('public.auto_cat_auto_cat_id_seq', 1, true); + + +-- +-- TOC entry 4741 (class 0 OID 0) +-- Dependencies: 256 +-- Name: contact_contact_id_seq; Type: SEQUENCE SET; Schema: public; Owner: asset-swissgeol +-- + +SELECT pg_catalog.setval('public.contact_contact_id_seq', 1854, true); + + +-- +-- TOC entry 4742 (class 0 OID 0) +-- Dependencies: 259 +-- Name: file_file_id_seq; Type: SEQUENCE SET; Schema: public; Owner: asset-swissgeol +-- + +SELECT pg_catalog.setval('public.file_file_id_seq', 14824, true); + + +-- +-- TOC entry 4743 (class 0 OID 0) +-- Dependencies: 262 +-- Name: id_id_id_seq; Type: SEQUENCE SET; Schema: public; Owner: asset-swissgeol +-- + +SELECT pg_catalog.setval('public.id_id_id_seq', 130305, true); + + +-- +-- TOC entry 4744 (class 0 OID 0) +-- Dependencies: 264 +-- Name: internal_project_internal_project_id_seq; Type: SEQUENCE SET; Schema: public; Owner: asset-swissgeol +-- + +SELECT pg_catalog.setval('public.internal_project_internal_project_id_seq', 1, true); + + +-- +-- TOC entry 4745 (class 0 OID 0) +-- Dependencies: 266 +-- Name: internal_use_internal_use_id_seq; Type: SEQUENCE SET; Schema: public; Owner: asset-swissgeol +-- + +SELECT pg_catalog.setval('public.internal_use_internal_use_id_seq', 130109, true); + + +-- +-- TOC entry 4746 (class 0 OID 0) +-- Dependencies: 270 +-- Name: legal_doc_legal_doc_id_seq; Type: SEQUENCE SET; Schema: public; Owner: asset-swissgeol +-- + +SELECT pg_catalog.setval('public.legal_doc_legal_doc_id_seq', 1, true); + + +-- +-- TOC entry 4747 (class 0 OID 0) +-- Dependencies: 276 +-- Name: public_use_public_use_id_seq; Type: SEQUENCE SET; Schema: public; Owner: asset-swissgeol +-- + +SELECT pg_catalog.setval('public.public_use_public_use_id_seq', 130108, true); + + +-- +-- TOC entry 4748 (class 0 OID 0) +-- Dependencies: 278 +-- Name: publication_publication_id_seq; Type: SEQUENCE SET; Schema: public; Owner: asset-swissgeol +-- + +SELECT pg_catalog.setval('public.publication_publication_id_seq', 1, true); + + +-- +-- TOC entry 4749 (class 0 OID 0) +-- Dependencies: 282 +-- Name: status_work_status_work_id_seq; Type: SEQUENCE SET; Schema: public; Owner: asset-swissgeol +-- + +SELECT pg_catalog.setval('public.status_work_status_work_id_seq', 219886, true); + + +-- +-- TOC entry 4750 (class 0 OID 0) +-- Dependencies: 283 +-- Name: study_area_study_area_id_seq; Type: SEQUENCE SET; Schema: public; Owner: asset-swissgeol +-- + +SELECT pg_catalog.setval('public.study_area_study_area_id_seq', 33658, true); + + +-- +-- TOC entry 4751 (class 0 OID 0) +-- Dependencies: 284 +-- Name: study_location_study_location_id_seq; Type: SEQUENCE SET; Schema: public; Owner: asset-swissgeol +-- + +SELECT pg_catalog.setval('public.study_location_study_location_id_seq', 53107, true); + + +-- +-- TOC entry 4752 (class 0 OID 0) +-- Dependencies: 285 +-- Name: study_trace_study_trace_id_seq; Type: SEQUENCE SET; Schema: public; Owner: asset-swissgeol +-- + +SELECT pg_catalog.setval('public.study_trace_study_trace_id_seq', 331, true); + + +-- +-- TOC entry 4753 (class 0 OID 0) +-- Dependencies: 287 +-- Name: type_nat_rel_type_nat_rel_id_seq; Type: SEQUENCE SET; Schema: public; Owner: asset-swissgeol +-- + +SELECT pg_catalog.setval('public.type_nat_rel_type_nat_rel_id_seq', 4214, true); + + +-- +-- TOC entry 4344 (class 2606 OID 17751) +-- Name: audit_log_entries audit_log_entries_pkey; Type: CONSTRAINT; Schema: auth; Owner: asset-swissgeol +-- + +ALTER TABLE ONLY auth.audit_log_entries + ADD CONSTRAINT audit_log_entries_pkey PRIMARY KEY (id); + + +-- +-- TOC entry 4347 (class 2606 OID 17753) +-- Name: identities identities_pkey; Type: CONSTRAINT; Schema: auth; Owner: asset-swissgeol +-- + +ALTER TABLE ONLY auth.identities + ADD CONSTRAINT identities_pkey PRIMARY KEY (provider, id); + + +-- +-- TOC entry 4350 (class 2606 OID 17755) +-- Name: instances instances_pkey; Type: CONSTRAINT; Schema: auth; Owner: asset-swissgeol +-- + +ALTER TABLE ONLY auth.instances + ADD CONSTRAINT instances_pkey PRIMARY KEY (id); + + +-- +-- TOC entry 4355 (class 2606 OID 17757) +-- Name: refresh_tokens refresh_tokens_pkey; Type: CONSTRAINT; Schema: auth; Owner: asset-swissgeol +-- + +ALTER TABLE ONLY auth.refresh_tokens + ADD CONSTRAINT refresh_tokens_pkey PRIMARY KEY (id); + + +-- +-- TOC entry 4363 (class 2606 OID 17759) +-- Name: users users_pkey; Type: CONSTRAINT; Schema: auth; Owner: asset-swissgeol +-- + +ALTER TABLE ONLY auth.users + ADD CONSTRAINT users_pkey PRIMARY KEY (id); + + +-- +-- TOC entry 4365 (class 2606 OID 17761) +-- Name: _prisma_migrations _prisma_migrations_pkey; Type: CONSTRAINT; Schema: public; Owner: asset-swissgeol +-- + +ALTER TABLE ONLY public._prisma_migrations + ADD CONSTRAINT _prisma_migrations_pkey PRIMARY KEY (id); + + +-- +-- TOC entry 4378 (class 2606 OID 17763) +-- Name: asset_contact asset_contact_pkey; Type: CONSTRAINT; Schema: public; Owner: asset-swissgeol +-- + +ALTER TABLE ONLY public.asset_contact + ADD CONSTRAINT asset_contact_pkey PRIMARY KEY (asset_id, contact_id, role); + + +-- +-- TOC entry 4380 (class 2606 OID 17765) +-- Name: asset_file asset_file_pkey; Type: CONSTRAINT; Schema: public; Owner: asset-swissgeol +-- + +ALTER TABLE ONLY public.asset_file + ADD CONSTRAINT asset_file_pkey PRIMARY KEY (asset_id, file_id); + + +-- +-- TOC entry 4382 (class 2606 OID 17767) +-- Name: asset_format_composition asset_format_composition_pkey; Type: CONSTRAINT; Schema: public; Owner: asset-swissgeol +-- + +ALTER TABLE ONLY public.asset_format_composition + ADD CONSTRAINT asset_format_composition_pkey PRIMARY KEY (asset_format_composition_id); + + +-- +-- TOC entry 4384 (class 2606 OID 17769) +-- Name: asset_format_item asset_format_item_pkey; Type: CONSTRAINT; Schema: public; Owner: asset-swissgeol +-- + +ALTER TABLE ONLY public.asset_format_item + ADD CONSTRAINT asset_format_item_pkey PRIMARY KEY (asset_format_item_code); + + +-- +-- TOC entry 4386 (class 2606 OID 17771) +-- Name: asset_internal_project asset_internal_project_pkey; Type: CONSTRAINT; Schema: public; Owner: asset-swissgeol +-- + +ALTER TABLE ONLY public.asset_internal_project + ADD CONSTRAINT asset_internal_project_pkey PRIMARY KEY (asset_id, internal_project_id); + + +-- +-- TOC entry 4388 (class 2606 OID 17773) +-- Name: asset_kind_composition asset_kind_composition_pkey; Type: CONSTRAINT; Schema: public; Owner: asset-swissgeol +-- + +ALTER TABLE ONLY public.asset_kind_composition + ADD CONSTRAINT asset_kind_composition_pkey PRIMARY KEY (asset_kind_composition_id); + + +-- +-- TOC entry 4390 (class 2606 OID 17775) +-- Name: asset_kind_item asset_kind_item_pkey; Type: CONSTRAINT; Schema: public; Owner: asset-swissgeol +-- + +ALTER TABLE ONLY public.asset_kind_item + ADD CONSTRAINT asset_kind_item_pkey PRIMARY KEY (asset_kind_item_code); + + +-- +-- TOC entry 4392 (class 2606 OID 17777) +-- Name: asset_object_info asset_object_info_pkey; Type: CONSTRAINT; Schema: public; Owner: asset-swissgeol +-- + +ALTER TABLE ONLY public.asset_object_info + ADD CONSTRAINT asset_object_info_pkey PRIMARY KEY (asset_object_info_id); + + +-- +-- TOC entry 4376 (class 2606 OID 17779) +-- Name: asset asset_pkey; Type: CONSTRAINT; Schema: public; Owner: asset-swissgeol +-- + +ALTER TABLE ONLY public.asset + ADD CONSTRAINT asset_pkey PRIMARY KEY (asset_id); + + +-- +-- TOC entry 4394 (class 2606 OID 17781) +-- Name: asset_publication asset_publication_pkey; Type: CONSTRAINT; Schema: public; Owner: asset-swissgeol +-- + +ALTER TABLE ONLY public.asset_publication + ADD CONSTRAINT asset_publication_pkey PRIMARY KEY (asset_id, publication_id); + + +-- +-- TOC entry 4398 (class 2606 OID 17783) +-- Name: asset_user_favourite asset_user_favourite_pkey; Type: CONSTRAINT; Schema: public; Owner: asset-swissgeol +-- + +ALTER TABLE ONLY public.asset_user_favourite + ADD CONSTRAINT asset_user_favourite_pkey PRIMARY KEY (asset_user_id, asset_id); + + +-- +-- TOC entry 4396 (class 2606 OID 17785) +-- Name: asset_user asset_user_pkey; Type: CONSTRAINT; Schema: public; Owner: asset-swissgeol +-- + +ALTER TABLE ONLY public.asset_user + ADD CONSTRAINT asset_user_pkey PRIMARY KEY (id); + + +-- +-- TOC entry 4400 (class 2606 OID 17787) +-- Name: asset_x_asset_y asset_x_asset_y_pkey; Type: CONSTRAINT; Schema: public; Owner: asset-swissgeol +-- + +ALTER TABLE ONLY public.asset_x_asset_y + ADD CONSTRAINT asset_x_asset_y_pkey PRIMARY KEY (asset_x_id, asset_y_id); + + +-- +-- TOC entry 4404 (class 2606 OID 17789) +-- Name: auto_cat_label_item auto_cat_label_item_pkey; Type: CONSTRAINT; Schema: public; Owner: asset-swissgeol +-- + +ALTER TABLE ONLY public.auto_cat_label_item + ADD CONSTRAINT auto_cat_label_item_pkey PRIMARY KEY (asset_cat_label_item_code); + + +-- +-- TOC entry 4402 (class 2606 OID 17791) +-- Name: auto_cat auto_cat_pkey; Type: CONSTRAINT; Schema: public; Owner: asset-swissgeol +-- + +ALTER TABLE ONLY public.auto_cat + ADD CONSTRAINT auto_cat_pkey PRIMARY KEY (auto_cat_id); + + +-- +-- TOC entry 4406 (class 2606 OID 17793) +-- Name: auto_object_cat_item auto_object_cat_item_pkey; Type: CONSTRAINT; Schema: public; Owner: asset-swissgeol +-- + +ALTER TABLE ONLY public.auto_object_cat_item + ADD CONSTRAINT auto_object_cat_item_pkey PRIMARY KEY (auto_object_cat_item_code); + + +-- +-- TOC entry 4410 (class 2606 OID 17795) +-- Name: contact_kind_item contact_kind_item_pkey; Type: CONSTRAINT; Schema: public; Owner: asset-swissgeol +-- + +ALTER TABLE ONLY public.contact_kind_item + ADD CONSTRAINT contact_kind_item_pkey PRIMARY KEY (contact_kind_item_code); + + +-- +-- TOC entry 4408 (class 2606 OID 17797) +-- Name: contact contact_pkey; Type: CONSTRAINT; Schema: public; Owner: asset-swissgeol +-- + +ALTER TABLE ONLY public.contact + ADD CONSTRAINT contact_pkey PRIMARY KEY (contact_id); + + +-- +-- TOC entry 4413 (class 2606 OID 17799) +-- Name: file file_pkey; Type: CONSTRAINT; Schema: public; Owner: asset-swissgeol +-- + +ALTER TABLE ONLY public.file + ADD CONSTRAINT file_pkey PRIMARY KEY (file_id); + + +-- +-- TOC entry 4415 (class 2606 OID 17801) +-- Name: geom_quality_item geom_quality_item_pkey; Type: CONSTRAINT; Schema: public; Owner: asset-swissgeol +-- + +ALTER TABLE ONLY public.geom_quality_item + ADD CONSTRAINT geom_quality_item_pkey PRIMARY KEY (geom_quality_item_code); + + +-- +-- TOC entry 4417 (class 2606 OID 17803) +-- Name: id id_pkey; Type: CONSTRAINT; Schema: public; Owner: asset-swissgeol +-- + +ALTER TABLE ONLY public.id + ADD CONSTRAINT id_pkey PRIMARY KEY (id_id); + + +-- +-- TOC entry 4419 (class 2606 OID 17805) +-- Name: internal_project internal_project_pkey; Type: CONSTRAINT; Schema: public; Owner: asset-swissgeol +-- + +ALTER TABLE ONLY public.internal_project + ADD CONSTRAINT internal_project_pkey PRIMARY KEY (internal_project_id); + + +-- +-- TOC entry 4421 (class 2606 OID 17807) +-- Name: internal_use internal_use_pkey; Type: CONSTRAINT; Schema: public; Owner: asset-swissgeol +-- + +ALTER TABLE ONLY public.internal_use + ADD CONSTRAINT internal_use_pkey PRIMARY KEY (internal_use_id); + + +-- +-- TOC entry 4423 (class 2606 OID 17809) +-- Name: language_item language_item_pkey; Type: CONSTRAINT; Schema: public; Owner: asset-swissgeol +-- + +ALTER TABLE ONLY public.language_item + ADD CONSTRAINT language_item_pkey PRIMARY KEY (language_item_code); + + +-- +-- TOC entry 4427 (class 2606 OID 17811) +-- Name: legal_doc_item legal_doc_item_pkey; Type: CONSTRAINT; Schema: public; Owner: asset-swissgeol +-- + +ALTER TABLE ONLY public.legal_doc_item + ADD CONSTRAINT legal_doc_item_pkey PRIMARY KEY (legal_doc_item_code); + + +-- +-- TOC entry 4425 (class 2606 OID 17813) +-- Name: legal_doc legal_doc_pkey; Type: CONSTRAINT; Schema: public; Owner: asset-swissgeol +-- + +ALTER TABLE ONLY public.legal_doc + ADD CONSTRAINT legal_doc_pkey PRIMARY KEY (legal_doc_id); + + +-- +-- TOC entry 4429 (class 2606 OID 17815) +-- Name: man_cat_label_item man_cat_label_item_pkey; Type: CONSTRAINT; Schema: public; Owner: asset-swissgeol +-- + +ALTER TABLE ONLY public.man_cat_label_item + ADD CONSTRAINT man_cat_label_item_pkey PRIMARY KEY (man_cat_label_item_code); + + +-- +-- TOC entry 4432 (class 2606 OID 17817) +-- Name: nat_rel_item nat_rel_item_pkey; Type: CONSTRAINT; Schema: public; Owner: asset-swissgeol +-- + +ALTER TABLE ONLY public.nat_rel_item + ADD CONSTRAINT nat_rel_item_pkey PRIMARY KEY (nat_rel_item_code); + + +-- +-- TOC entry 4434 (class 2606 OID 17819) +-- Name: pub_channel_item pub_channel_item_pkey; Type: CONSTRAINT; Schema: public; Owner: asset-swissgeol +-- + +ALTER TABLE ONLY public.pub_channel_item + ADD CONSTRAINT pub_channel_item_pkey PRIMARY KEY (pub_channel_item_code); + + +-- +-- TOC entry 4436 (class 2606 OID 17821) +-- Name: public_use public_use_pkey; Type: CONSTRAINT; Schema: public; Owner: asset-swissgeol +-- + +ALTER TABLE ONLY public.public_use + ADD CONSTRAINT public_use_pkey PRIMARY KEY (public_use_id); + + +-- +-- TOC entry 4438 (class 2606 OID 17823) +-- Name: publication publication_pkey; Type: CONSTRAINT; Schema: public; Owner: asset-swissgeol +-- + +ALTER TABLE ONLY public.publication + ADD CONSTRAINT publication_pkey PRIMARY KEY (publication_id); + + +-- +-- TOC entry 4440 (class 2606 OID 17825) +-- Name: status_asset_use_item status_asset_use_item_pkey; Type: CONSTRAINT; Schema: public; Owner: asset-swissgeol +-- + +ALTER TABLE ONLY public.status_asset_use_item + ADD CONSTRAINT status_asset_use_item_pkey PRIMARY KEY (status_asset_use_item_code); + + +-- +-- TOC entry 4444 (class 2606 OID 17827) +-- Name: status_work_item status_work_item_pkey; Type: CONSTRAINT; Schema: public; Owner: asset-swissgeol +-- + +ALTER TABLE ONLY public.status_work_item + ADD CONSTRAINT status_work_item_pkey PRIMARY KEY (status_work_item_code); + + +-- +-- TOC entry 4442 (class 2606 OID 17829) +-- Name: status_work status_work_pkey; Type: CONSTRAINT; Schema: public; Owner: asset-swissgeol +-- + +ALTER TABLE ONLY public.status_work + ADD CONSTRAINT status_work_pkey PRIMARY KEY (status_work_id); + + +-- +-- TOC entry 4368 (class 2606 OID 17831) +-- Name: study_area study_area_pkey; Type: CONSTRAINT; Schema: public; Owner: asset-swissgeol +-- + +ALTER TABLE ONLY public.study_area + ADD CONSTRAINT study_area_pkey PRIMARY KEY (study_area_id); + + +-- +-- TOC entry 4371 (class 2606 OID 17833) +-- Name: study_location study_location_pkey; Type: CONSTRAINT; Schema: public; Owner: asset-swissgeol +-- + +ALTER TABLE ONLY public.study_location + ADD CONSTRAINT study_location_pkey PRIMARY KEY (study_location_id); + + +-- +-- TOC entry 4374 (class 2606 OID 17835) +-- Name: study_trace study_trace_pkey; Type: CONSTRAINT; Schema: public; Owner: asset-swissgeol +-- + +ALTER TABLE ONLY public.study_trace + ADD CONSTRAINT study_trace_pkey PRIMARY KEY (study_trace_id); + + +-- +-- TOC entry 4446 (class 2606 OID 17837) +-- Name: type_nat_rel type_nat_rel_pkey; Type: CONSTRAINT; Schema: public; Owner: asset-swissgeol +-- + +ALTER TABLE ONLY public.type_nat_rel + ADD CONSTRAINT type_nat_rel_pkey PRIMARY KEY (type_nat_rel_id); + + +-- +-- TOC entry 4345 (class 1259 OID 17838) +-- Name: audit_logs_instance_id_idx; Type: INDEX; Schema: auth; Owner: asset-swissgeol +-- + +CREATE INDEX audit_logs_instance_id_idx ON auth.audit_log_entries USING btree (instance_id); + + +-- +-- TOC entry 4348 (class 1259 OID 17839) +-- Name: identities_user_id_idx; Type: INDEX; Schema: auth; Owner: asset-swissgeol +-- + +CREATE INDEX identities_user_id_idx ON auth.identities USING btree (user_id); + + +-- +-- TOC entry 4351 (class 1259 OID 17840) +-- Name: refresh_tokens_instance_id_idx; Type: INDEX; Schema: auth; Owner: asset-swissgeol +-- + +CREATE INDEX refresh_tokens_instance_id_idx ON auth.refresh_tokens USING btree (instance_id); + + +-- +-- TOC entry 4352 (class 1259 OID 17841) +-- Name: refresh_tokens_instance_id_user_id_idx; Type: INDEX; Schema: auth; Owner: asset-swissgeol +-- + +CREATE INDEX refresh_tokens_instance_id_user_id_idx ON auth.refresh_tokens USING btree (instance_id, user_id); + + +-- +-- TOC entry 4353 (class 1259 OID 17842) +-- Name: refresh_tokens_parent_idx; Type: INDEX; Schema: auth; Owner: asset-swissgeol +-- + +CREATE INDEX refresh_tokens_parent_idx ON auth.refresh_tokens USING btree (parent); + + +-- +-- TOC entry 4356 (class 1259 OID 17843) +-- Name: refresh_tokens_token_idx; Type: INDEX; Schema: auth; Owner: asset-swissgeol +-- + +CREATE INDEX refresh_tokens_token_idx ON auth.refresh_tokens USING btree (token); + + +-- +-- TOC entry 4357 (class 1259 OID 17844) +-- Name: refresh_tokens_token_unique; Type: INDEX; Schema: auth; Owner: asset-swissgeol +-- + +CREATE UNIQUE INDEX refresh_tokens_token_unique ON auth.refresh_tokens USING btree (token); + + +-- +-- TOC entry 4358 (class 1259 OID 17845) +-- Name: schema_migrations_version_idx; Type: INDEX; Schema: auth; Owner: asset-swissgeol +-- + +CREATE UNIQUE INDEX schema_migrations_version_idx ON auth.schema_migrations USING btree (version); + + +-- +-- TOC entry 4359 (class 1259 OID 17846) +-- Name: users_email_key; Type: INDEX; Schema: auth; Owner: asset-swissgeol +-- + +CREATE UNIQUE INDEX users_email_key ON auth.users USING btree (email); + + +-- +-- TOC entry 4360 (class 1259 OID 17847) +-- Name: users_instance_id_idx; Type: INDEX; Schema: auth; Owner: asset-swissgeol +-- + +CREATE INDEX users_instance_id_idx ON auth.users USING btree (instance_id); + + +-- +-- TOC entry 4361 (class 1259 OID 17848) +-- Name: users_phone_key; Type: INDEX; Schema: auth; Owner: asset-swissgeol +-- + +CREATE UNIQUE INDEX users_phone_key ON auth.users USING btree (phone); + + +-- +-- TOC entry 4411 (class 1259 OID 17849) +-- Name: file_file_name_key; Type: INDEX; Schema: public; Owner: asset-swissgeol +-- + +CREATE UNIQUE INDEX file_file_name_key ON public.file USING btree (file_name); + + +-- +-- TOC entry 4430 (class 1259 OID 17850) +-- Name: man_cat_label_ref_asset_id_man_cat_label_item_code_key; Type: INDEX; Schema: public; Owner: asset-swissgeol +-- + +CREATE UNIQUE INDEX man_cat_label_ref_asset_id_man_cat_label_item_code_key ON public.man_cat_label_ref USING btree (asset_id, man_cat_label_item_code); + + +-- +-- TOC entry 4366 (class 1259 OID 17851) +-- Name: study_area_geom_idx; Type: INDEX; Schema: public; Owner: asset-swissgeol +-- + +CREATE INDEX study_area_geom_idx ON public.study_area USING gist (geom); + + +-- +-- TOC entry 4369 (class 1259 OID 17852) +-- Name: study_location_geom_idx; Type: INDEX; Schema: public; Owner: asset-swissgeol +-- + +CREATE INDEX study_location_geom_idx ON public.study_location USING gist (geom); + + +-- +-- TOC entry 4372 (class 1259 OID 17853) +-- Name: study_trace_geom_idx; Type: INDEX; Schema: public; Owner: asset-swissgeol +-- + +CREATE INDEX study_trace_geom_idx ON public.study_trace USING gist (geom); + + +-- +-- TOC entry 4447 (class 2606 OID 17854) +-- Name: identities identities_user_id_fkey; Type: FK CONSTRAINT; Schema: auth; Owner: asset-swissgeol +-- + +ALTER TABLE ONLY auth.identities + ADD CONSTRAINT identities_user_id_fkey FOREIGN KEY (user_id) REFERENCES auth.users(id) ON DELETE CASCADE; + + +-- +-- TOC entry 4448 (class 2606 OID 17859) +-- Name: refresh_tokens refresh_tokens_parent_fkey; Type: FK CONSTRAINT; Schema: auth; Owner: asset-swissgeol +-- + +ALTER TABLE ONLY auth.refresh_tokens + ADD CONSTRAINT refresh_tokens_parent_fkey FOREIGN KEY (parent) REFERENCES auth.refresh_tokens(token); + + +-- +-- TOC entry 4455 (class 2606 OID 17864) +-- Name: asset asset_asset_format_item_code_fkey; Type: FK CONSTRAINT; Schema: public; Owner: asset-swissgeol +-- + +ALTER TABLE ONLY public.asset + ADD CONSTRAINT asset_asset_format_item_code_fkey FOREIGN KEY (asset_format_item_code) REFERENCES public.asset_format_item(asset_format_item_code) ON UPDATE CASCADE ON DELETE RESTRICT; + + +-- +-- TOC entry 4456 (class 2606 OID 17869) +-- Name: asset asset_asset_kind_item_code_fkey; Type: FK CONSTRAINT; Schema: public; Owner: asset-swissgeol +-- + +ALTER TABLE ONLY public.asset + ADD CONSTRAINT asset_asset_kind_item_code_fkey FOREIGN KEY (asset_kind_item_code) REFERENCES public.asset_kind_item(asset_kind_item_code) ON UPDATE CASCADE ON DELETE RESTRICT; + + +-- +-- TOC entry 4457 (class 2606 OID 17874) +-- Name: asset asset_asset_main_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: asset-swissgeol +-- + +ALTER TABLE ONLY public.asset + ADD CONSTRAINT asset_asset_main_id_fkey FOREIGN KEY (asset_main_id) REFERENCES public.asset(asset_id) ON UPDATE CASCADE ON DELETE SET NULL; + + +-- +-- TOC entry 4461 (class 2606 OID 17879) +-- Name: asset_contact asset_contact_asset_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: asset-swissgeol +-- + +ALTER TABLE ONLY public.asset_contact + ADD CONSTRAINT asset_contact_asset_id_fkey FOREIGN KEY (asset_id) REFERENCES public.asset(asset_id) ON UPDATE CASCADE ON DELETE RESTRICT; + + +-- +-- TOC entry 4462 (class 2606 OID 17884) +-- Name: asset_contact asset_contact_contact_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: asset-swissgeol +-- + +ALTER TABLE ONLY public.asset_contact + ADD CONSTRAINT asset_contact_contact_id_fkey FOREIGN KEY (contact_id) REFERENCES public.contact(contact_id) ON UPDATE CASCADE ON DELETE RESTRICT; + + +-- +-- TOC entry 4463 (class 2606 OID 17889) +-- Name: asset_file asset_file_asset_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: asset-swissgeol +-- + +ALTER TABLE ONLY public.asset_file + ADD CONSTRAINT asset_file_asset_id_fkey FOREIGN KEY (asset_id) REFERENCES public.asset(asset_id) ON UPDATE CASCADE ON DELETE RESTRICT; + + +-- +-- TOC entry 4464 (class 2606 OID 17894) +-- Name: asset_file asset_file_file_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: asset-swissgeol +-- + +ALTER TABLE ONLY public.asset_file + ADD CONSTRAINT asset_file_file_id_fkey FOREIGN KEY (file_id) REFERENCES public.file(file_id) ON UPDATE CASCADE ON DELETE CASCADE; + + +-- +-- TOC entry 4465 (class 2606 OID 17899) +-- Name: asset_format_composition asset_format_composition_asset_format_item_code_fkey; Type: FK CONSTRAINT; Schema: public; Owner: asset-swissgeol +-- + +ALTER TABLE ONLY public.asset_format_composition + ADD CONSTRAINT asset_format_composition_asset_format_item_code_fkey FOREIGN KEY (asset_format_item_code) REFERENCES public.asset_format_item(asset_format_item_code) ON UPDATE CASCADE ON DELETE RESTRICT; + + +-- +-- TOC entry 4466 (class 2606 OID 17904) +-- Name: asset_format_composition asset_format_composition_asset_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: asset-swissgeol +-- + +ALTER TABLE ONLY public.asset_format_composition + ADD CONSTRAINT asset_format_composition_asset_id_fkey FOREIGN KEY (asset_id) REFERENCES public.asset(asset_id) ON UPDATE CASCADE ON DELETE RESTRICT; + + +-- +-- TOC entry 4467 (class 2606 OID 17909) +-- Name: asset_internal_project asset_internal_project_asset_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: asset-swissgeol +-- + +ALTER TABLE ONLY public.asset_internal_project + ADD CONSTRAINT asset_internal_project_asset_id_fkey FOREIGN KEY (asset_id) REFERENCES public.asset(asset_id) ON UPDATE CASCADE ON DELETE RESTRICT; + + +-- +-- TOC entry 4468 (class 2606 OID 17914) +-- Name: asset_internal_project asset_internal_project_internal_project_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: asset-swissgeol +-- + +ALTER TABLE ONLY public.asset_internal_project + ADD CONSTRAINT asset_internal_project_internal_project_id_fkey FOREIGN KEY (internal_project_id) REFERENCES public.internal_project(internal_project_id) ON UPDATE CASCADE ON DELETE RESTRICT; + + +-- +-- TOC entry 4458 (class 2606 OID 17919) +-- Name: asset asset_internal_use_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: asset-swissgeol +-- + +ALTER TABLE ONLY public.asset + ADD CONSTRAINT asset_internal_use_id_fkey FOREIGN KEY (internal_use_id) REFERENCES public.internal_use(internal_use_id) ON UPDATE CASCADE ON DELETE RESTRICT; + + +-- +-- TOC entry 4469 (class 2606 OID 17924) +-- Name: asset_kind_composition asset_kind_composition_asset_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: asset-swissgeol +-- + +ALTER TABLE ONLY public.asset_kind_composition + ADD CONSTRAINT asset_kind_composition_asset_id_fkey FOREIGN KEY (asset_id) REFERENCES public.asset(asset_id) ON UPDATE CASCADE ON DELETE RESTRICT; + + +-- +-- TOC entry 4470 (class 2606 OID 17929) +-- Name: asset_kind_composition asset_kind_composition_asset_kind_item_code_fkey; Type: FK CONSTRAINT; Schema: public; Owner: asset-swissgeol +-- + +ALTER TABLE ONLY public.asset_kind_composition + ADD CONSTRAINT asset_kind_composition_asset_kind_item_code_fkey FOREIGN KEY (asset_kind_item_code) REFERENCES public.asset_kind_item(asset_kind_item_code) ON UPDATE CASCADE ON DELETE RESTRICT; + + +-- +-- TOC entry 4459 (class 2606 OID 17934) +-- Name: asset asset_language_item_code_fkey; Type: FK CONSTRAINT; Schema: public; Owner: asset-swissgeol +-- + +ALTER TABLE ONLY public.asset + ADD CONSTRAINT asset_language_item_code_fkey FOREIGN KEY (language_item_code) REFERENCES public.language_item(language_item_code) ON UPDATE CASCADE ON DELETE RESTRICT; + + +-- +-- TOC entry 4471 (class 2606 OID 17939) +-- Name: asset_object_info asset_object_info_auto_object_cat_item_code_fkey; Type: FK CONSTRAINT; Schema: public; Owner: asset-swissgeol +-- + +ALTER TABLE ONLY public.asset_object_info + ADD CONSTRAINT asset_object_info_auto_object_cat_item_code_fkey FOREIGN KEY (auto_object_cat_item_code) REFERENCES public.auto_object_cat_item(auto_object_cat_item_code) ON UPDATE CASCADE ON DELETE RESTRICT; + + +-- +-- TOC entry 4472 (class 2606 OID 17944) +-- Name: asset_object_info asset_object_info_file_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: asset-swissgeol +-- + +ALTER TABLE ONLY public.asset_object_info + ADD CONSTRAINT asset_object_info_file_id_fkey FOREIGN KEY (file_id) REFERENCES public.file(file_id) ON UPDATE CASCADE ON DELETE RESTRICT; + + +-- +-- TOC entry 4460 (class 2606 OID 17949) +-- Name: asset asset_public_use_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: asset-swissgeol +-- + +ALTER TABLE ONLY public.asset + ADD CONSTRAINT asset_public_use_id_fkey FOREIGN KEY (public_use_id) REFERENCES public.public_use(public_use_id) ON UPDATE CASCADE ON DELETE RESTRICT; + + +-- +-- TOC entry 4473 (class 2606 OID 17954) +-- Name: asset_publication asset_publication_asset_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: asset-swissgeol +-- + +ALTER TABLE ONLY public.asset_publication + ADD CONSTRAINT asset_publication_asset_id_fkey FOREIGN KEY (asset_id) REFERENCES public.asset(asset_id) ON UPDATE CASCADE ON DELETE RESTRICT; + + +-- +-- TOC entry 4474 (class 2606 OID 17959) +-- Name: asset_publication asset_publication_publication_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: asset-swissgeol +-- + +ALTER TABLE ONLY public.asset_publication + ADD CONSTRAINT asset_publication_publication_id_fkey FOREIGN KEY (publication_id) REFERENCES public.publication(publication_id) ON UPDATE CASCADE ON DELETE RESTRICT; + + +-- +-- TOC entry 4476 (class 2606 OID 17964) +-- Name: asset_user_favourite asset_user_favourite_asset_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: asset-swissgeol +-- + +ALTER TABLE ONLY public.asset_user_favourite + ADD CONSTRAINT asset_user_favourite_asset_id_fkey FOREIGN KEY (asset_id) REFERENCES public.asset(asset_id) ON UPDATE CASCADE ON DELETE RESTRICT; + + +-- +-- TOC entry 4477 (class 2606 OID 17969) +-- Name: asset_user_favourite asset_user_favourite_asset_user_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: asset-swissgeol +-- + +ALTER TABLE ONLY public.asset_user_favourite + ADD CONSTRAINT asset_user_favourite_asset_user_id_fkey FOREIGN KEY (asset_user_id) REFERENCES public.asset_user(id) ON UPDATE CASCADE ON DELETE RESTRICT; + + +-- +-- TOC entry 4475 (class 2606 OID 17974) +-- Name: asset_user asset_user_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: asset-swissgeol +-- + +ALTER TABLE ONLY public.asset_user + ADD CONSTRAINT asset_user_id_fkey FOREIGN KEY (id) REFERENCES auth.users(id) ON UPDATE CASCADE ON DELETE RESTRICT; + + +-- +-- TOC entry 4478 (class 2606 OID 17979) +-- Name: asset_x_asset_y asset_x_asset_y_asset_x_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: asset-swissgeol +-- + +ALTER TABLE ONLY public.asset_x_asset_y + ADD CONSTRAINT asset_x_asset_y_asset_x_id_fkey FOREIGN KEY (asset_x_id) REFERENCES public.asset(asset_id) ON UPDATE CASCADE ON DELETE RESTRICT; + + +-- +-- TOC entry 4479 (class 2606 OID 17984) +-- Name: asset_x_asset_y asset_x_asset_y_asset_y_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: asset-swissgeol +-- + +ALTER TABLE ONLY public.asset_x_asset_y + ADD CONSTRAINT asset_x_asset_y_asset_y_id_fkey FOREIGN KEY (asset_y_id) REFERENCES public.asset(asset_id) ON UPDATE CASCADE ON DELETE RESTRICT; + + +-- +-- TOC entry 4480 (class 2606 OID 17989) +-- Name: auto_cat auto_cat_asset_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: asset-swissgeol +-- + +ALTER TABLE ONLY public.auto_cat + ADD CONSTRAINT auto_cat_asset_id_fkey FOREIGN KEY (asset_id) REFERENCES public.asset(asset_id) ON UPDATE CASCADE ON DELETE RESTRICT; + + +-- +-- TOC entry 4481 (class 2606 OID 17994) +-- Name: auto_cat auto_cat_auto_cat_label_item_code_fkey; Type: FK CONSTRAINT; Schema: public; Owner: asset-swissgeol +-- + +ALTER TABLE ONLY public.auto_cat + ADD CONSTRAINT auto_cat_auto_cat_label_item_code_fkey FOREIGN KEY (auto_cat_label_item_code) REFERENCES public.auto_cat_label_item(asset_cat_label_item_code) ON UPDATE CASCADE ON DELETE RESTRICT; + + +-- +-- TOC entry 4482 (class 2606 OID 17999) +-- Name: contact contact_contact_kind_item_code_fkey; Type: FK CONSTRAINT; Schema: public; Owner: asset-swissgeol +-- + +ALTER TABLE ONLY public.contact + ADD CONSTRAINT contact_contact_kind_item_code_fkey FOREIGN KEY (contact_kind_item_code) REFERENCES public.contact_kind_item(contact_kind_item_code) ON UPDATE CASCADE ON DELETE RESTRICT; + + +-- +-- TOC entry 4483 (class 2606 OID 18004) +-- Name: id id_asset_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: asset-swissgeol +-- + +ALTER TABLE ONLY public.id + ADD CONSTRAINT id_asset_id_fkey FOREIGN KEY (asset_id) REFERENCES public.asset(asset_id) ON UPDATE CASCADE ON DELETE RESTRICT; + + +-- +-- TOC entry 4484 (class 2606 OID 18009) +-- Name: internal_use internal_use_status_asset_use_item_code_fkey; Type: FK CONSTRAINT; Schema: public; Owner: asset-swissgeol +-- + +ALTER TABLE ONLY public.internal_use + ADD CONSTRAINT internal_use_status_asset_use_item_code_fkey FOREIGN KEY (status_asset_use_item_code) REFERENCES public.status_asset_use_item(status_asset_use_item_code) ON UPDATE CASCADE ON DELETE RESTRICT; + + +-- +-- TOC entry 4485 (class 2606 OID 18014) +-- Name: legal_doc legal_doc_asset_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: asset-swissgeol +-- + +ALTER TABLE ONLY public.legal_doc + ADD CONSTRAINT legal_doc_asset_id_fkey FOREIGN KEY (asset_id) REFERENCES public.asset(asset_id) ON UPDATE CASCADE ON DELETE RESTRICT; + + +-- +-- TOC entry 4486 (class 2606 OID 18019) +-- Name: legal_doc legal_doc_legal_doc_item_code_fkey; Type: FK CONSTRAINT; Schema: public; Owner: asset-swissgeol +-- + +ALTER TABLE ONLY public.legal_doc + ADD CONSTRAINT legal_doc_legal_doc_item_code_fkey FOREIGN KEY (legal_doc_item_code) REFERENCES public.legal_doc_item(legal_doc_item_code) ON UPDATE CASCADE ON DELETE RESTRICT; + + +-- +-- TOC entry 4487 (class 2606 OID 18024) +-- Name: man_cat_label_ref man_cat_label_ref_asset_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: asset-swissgeol +-- + +ALTER TABLE ONLY public.man_cat_label_ref + ADD CONSTRAINT man_cat_label_ref_asset_id_fkey FOREIGN KEY (asset_id) REFERENCES public.asset(asset_id) ON UPDATE CASCADE ON DELETE RESTRICT; + + +-- +-- TOC entry 4488 (class 2606 OID 18029) +-- Name: man_cat_label_ref man_cat_label_ref_man_cat_label_item_code_fkey; Type: FK CONSTRAINT; Schema: public; Owner: asset-swissgeol +-- + +ALTER TABLE ONLY public.man_cat_label_ref + ADD CONSTRAINT man_cat_label_ref_man_cat_label_item_code_fkey FOREIGN KEY (man_cat_label_item_code) REFERENCES public.man_cat_label_item(man_cat_label_item_code) ON UPDATE CASCADE ON DELETE RESTRICT; + + +-- +-- TOC entry 4489 (class 2606 OID 18034) +-- Name: public_use public_use_status_asset_use_item_code_fkey; Type: FK CONSTRAINT; Schema: public; Owner: asset-swissgeol +-- + +ALTER TABLE ONLY public.public_use + ADD CONSTRAINT public_use_status_asset_use_item_code_fkey FOREIGN KEY (status_asset_use_item_code) REFERENCES public.status_asset_use_item(status_asset_use_item_code) ON UPDATE CASCADE ON DELETE RESTRICT; + + +-- +-- TOC entry 4490 (class 2606 OID 18039) +-- Name: publication publication_pub_channel_item_code_fkey; Type: FK CONSTRAINT; Schema: public; Owner: asset-swissgeol +-- + +ALTER TABLE ONLY public.publication + ADD CONSTRAINT publication_pub_channel_item_code_fkey FOREIGN KEY (pub_channel_item_code) REFERENCES public.pub_channel_item(pub_channel_item_code) ON UPDATE CASCADE ON DELETE RESTRICT; + + +-- +-- TOC entry 4491 (class 2606 OID 18044) +-- Name: status_work status_work_asset_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: asset-swissgeol +-- + +ALTER TABLE ONLY public.status_work + ADD CONSTRAINT status_work_asset_id_fkey FOREIGN KEY (asset_id) REFERENCES public.asset(asset_id) ON UPDATE CASCADE ON DELETE RESTRICT; + + +-- +-- TOC entry 4492 (class 2606 OID 18049) +-- Name: status_work status_work_status_work_item_code_fkey; Type: FK CONSTRAINT; Schema: public; Owner: asset-swissgeol +-- + +ALTER TABLE ONLY public.status_work + ADD CONSTRAINT status_work_status_work_item_code_fkey FOREIGN KEY (status_work_item_code) REFERENCES public.status_work_item(status_work_item_code) ON UPDATE CASCADE ON DELETE RESTRICT; + + +-- +-- TOC entry 4449 (class 2606 OID 18054) +-- Name: study_area study_area_asset_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: asset-swissgeol +-- + +ALTER TABLE ONLY public.study_area + ADD CONSTRAINT study_area_asset_id_fkey FOREIGN KEY (asset_id) REFERENCES public.asset(asset_id) ON UPDATE CASCADE ON DELETE RESTRICT; + + +-- +-- TOC entry 4450 (class 2606 OID 18059) +-- Name: study_area study_area_geom_quality_item_code_fkey; Type: FK CONSTRAINT; Schema: public; Owner: asset-swissgeol +-- + +ALTER TABLE ONLY public.study_area + ADD CONSTRAINT study_area_geom_quality_item_code_fkey FOREIGN KEY (geom_quality_item_code) REFERENCES public.geom_quality_item(geom_quality_item_code) ON UPDATE CASCADE ON DELETE RESTRICT; + + +-- +-- TOC entry 4451 (class 2606 OID 18064) +-- Name: study_location study_location_asset_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: asset-swissgeol +-- + +ALTER TABLE ONLY public.study_location + ADD CONSTRAINT study_location_asset_id_fkey FOREIGN KEY (asset_id) REFERENCES public.asset(asset_id) ON UPDATE CASCADE ON DELETE RESTRICT; + + +-- +-- TOC entry 4452 (class 2606 OID 18069) +-- Name: study_location study_location_geom_quality_item_code_fkey; Type: FK CONSTRAINT; Schema: public; Owner: asset-swissgeol +-- + +ALTER TABLE ONLY public.study_location + ADD CONSTRAINT study_location_geom_quality_item_code_fkey FOREIGN KEY (geom_quality_item_code) REFERENCES public.geom_quality_item(geom_quality_item_code) ON UPDATE CASCADE ON DELETE RESTRICT; + + +-- +-- TOC entry 4453 (class 2606 OID 18074) +-- Name: study_trace study_trace_asset_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: asset-swissgeol +-- + +ALTER TABLE ONLY public.study_trace + ADD CONSTRAINT study_trace_asset_id_fkey FOREIGN KEY (asset_id) REFERENCES public.asset(asset_id) ON UPDATE CASCADE ON DELETE RESTRICT; + + +-- +-- TOC entry 4454 (class 2606 OID 18079) +-- Name: study_trace study_trace_geom_quality_item_code_fkey; Type: FK CONSTRAINT; Schema: public; Owner: asset-swissgeol +-- + +ALTER TABLE ONLY public.study_trace + ADD CONSTRAINT study_trace_geom_quality_item_code_fkey FOREIGN KEY (geom_quality_item_code) REFERENCES public.geom_quality_item(geom_quality_item_code) ON UPDATE CASCADE ON DELETE RESTRICT; + + +-- +-- TOC entry 4493 (class 2606 OID 18084) +-- Name: type_nat_rel type_nat_rel_asset_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: asset-swissgeol +-- + +ALTER TABLE ONLY public.type_nat_rel + ADD CONSTRAINT type_nat_rel_asset_id_fkey FOREIGN KEY (asset_id) REFERENCES public.asset(asset_id) ON UPDATE CASCADE ON DELETE RESTRICT; + + +-- +-- TOC entry 4494 (class 2606 OID 18089) +-- Name: type_nat_rel type_nat_rel_nat_rel_item_code_fkey; Type: FK CONSTRAINT; Schema: public; Owner: asset-swissgeol +-- + +ALTER TABLE ONLY public.type_nat_rel + ADD CONSTRAINT type_nat_rel_nat_rel_item_code_fkey FOREIGN KEY (nat_rel_item_code) REFERENCES public.nat_rel_item(nat_rel_item_code) ON UPDATE CASCADE ON DELETE RESTRICT; + + +-- +-- TOC entry 4714 (class 0 OID 0) +-- Dependencies: 7 +-- Name: SCHEMA public; Type: ACL; Schema: -; Owner: pg_database_owner +-- + +REVOKE USAGE ON SCHEMA public FROM PUBLIC; +GRANT ALL ON SCHEMA public TO postgres; +GRANT ALL ON SCHEMA public TO PUBLIC; + + +-- Completed on 2024-02-29 18:46:57 UTC + +-- +-- PostgreSQL database dump complete +-- + diff --git a/development/init/elasticsearch/init.sh b/development/init/elasticsearch/init.sh new file mode 100644 index 00000000..7893a877 --- /dev/null +++ b/development/init/elasticsearch/init.sh @@ -0,0 +1,44 @@ +#!/usr/bin/bash + +# Elasticsearch URL +ELASTICSEARCH_URL="http://localhost:9200" + +# Check if Elasticsearch is ready. +check_elasticsearch() { + response=$(curl -s -o /dev/null -w "%{http_code}" "${ELASTICSEARCH_URL}/_cat/health") + if [ "$response" == "200" ]; then + return 0 + else + return 1 + fi +} + +# Create an index and define its mapping if it does not exist yet. +init_index() { + local INDEX_NAME="$1" + + response=$(curl -s -o /dev/null -w "%{http_code}" "${ELASTICSEARCH_URL}/${INDEX_NAME}") + + # If index does not exist (HTTP response code 404) + if [ "$response" != "404" ]; then + echo "Index ${INDEX_NAME} already exists, skipping initialization" + return 1 + fi + + echo "Initializing index ${INDEX_NAME}..." + + curl --silent -XPUT "${ELASTICSEARCH_URL}/${INDEX_NAME}" + curl --silent -XPUT "${ELASTICSEARCH_URL}/${INDEX_NAME}/_mapping" -d "@/init/mappings/${INDEX_NAME}.json" + + echo "Successfully initialized index ${INDEX_NAME}" +} + +# Wait until ElasticSearch is ready. +until check_elasticsearch; do + echo "Elasticsearch is not yet ready, retrying initialization in 5 seconds..." + sleep 5 +done + +echo "Elasticsearch is up and running, initializing indexes..." +init_index "swissgeol_asset_asset" +echo "Successfully initialized all indexes" diff --git a/development/init/elasticsearch/mappings/swissgeol_asset_asset.json b/development/init/elasticsearch/mappings/swissgeol_asset_asset.json new file mode 100644 index 00000000..efb28b6d --- /dev/null +++ b/development/init/elasticsearch/mappings/swissgeol_asset_asset.json @@ -0,0 +1,58 @@ +{ + "properties": { + "assetId": { + "type": "integer" + }, + "assetKindItemCode": { + "type": "keyword" + }, + "authorIds": { + "type": "integer" + }, + "contactNames": { + "type": "text", + "fields": { + "keyword": { + "type": "keyword", + "ignore_above": 256 + } + } + }, + "createDate": { + "type": "long" + }, + "createDateId": { + "type": "integer" + }, + "languageItemCode": { + "type": "keyword" + }, + "manCatLabelItemCodes": { + "type": "keyword" + }, + "sgsId": { + "type": "keyword" + }, + "titleOriginal": { + "type": "text", + "fields": { + "keyword": { + "type": "keyword", + "ignore_above": 256 + } + } + }, + "titlePublic": { + "type": "text", + "fields": { + "keyword": { + "type": "keyword", + "ignore_above": 256 + } + } + }, + "usageCode": { + "type": "keyword" + } + } +} diff --git a/development/init/oidc/oidc-mock-clients.json b/development/init/oidc/oidc-mock-clients.json new file mode 100644 index 00000000..1d4a1b3d --- /dev/null +++ b/development/init/oidc/oidc-mock-clients.json @@ -0,0 +1,29 @@ +[{ + "ClientId": "assets-client", + "Description": "Client for Authorization Code flow with PKCE", + "RequireClientSecret": false, + "AlwaysIncludeUserClaimsInIdToken": true, + "AllowedGrantTypes": [ + "authorization_code" + ], + "AllowedResponseTypes": [ + "code", + "id_token" + ], + "AllowAccessTokensViaBrowser": true, + "RedirectUris": [ + "http://localhost:4200" + ], + "PostLogoutRedirectUris" : [ + "http://localhost:4200" + ], + "AllowedScopes": [ + "openid", + "profile", + "local_groups_scope" + ], + "AccessTokenType": "JWT", + "IdentityTokenLifetime": 3600, + "AccessTokenLifetime": 3600 +} +] diff --git a/development/init/oidc/oidc-mock-users.json b/development/init/oidc/oidc-mock-users.json new file mode 100644 index 00000000..c2919e49 --- /dev/null +++ b/development/init/oidc/oidc-mock-users.json @@ -0,0 +1,76 @@ +[ + { + "SubjectId":"10f95aa3-fb95-41eb-b754-5f729a092e30", + "Username":"admin@swissgeol.assets", + "Password":"swissgeol_assets", + "Claims": [ + { + "Type": "name", + "Value": "Admin User", + "ValueType": "string" + }, + { + "Type": "family_name", + "Value": "User", + "ValueType": "string" + }, + { + "Type": "given_name", + "Value": "Admin", + "ValueType": "string" + }, + { + "Type": "email", + "Value": "admin.user@local.dev", + "ValueType": "string" + }, + { + "Type": "email_verified", + "Value": "true", + "ValueType": "boolean" + }, + { + "Type": "local_groups_claim", + "Value": "[\"boreholes_dev_group\"]", + "ValueType": "json" + } + ] + }, + { + "SubjectId":"sub_editor", + "Username":"editor", + "Password":"swissforages", + "Claims": [ + { + "Type": "name", + "Value": "Editor User", + "ValueType": "string" + }, + { + "Type": "family_name", + "Value": "User", + "ValueType": "string" + }, + { + "Type": "given_name", + "Value": "Editor", + "ValueType": "string" + }, + { + "Type": "email", + "Value": "editor.user@local.dev", + "ValueType": "string" + }, + { + "Type": "email_verified", + "Value": "true", + "ValueType": "boolean" + }, + { + "Type": "local_groups_claim", + "Value": "[\"boreholes_dev_group\"]", + "ValueType": "json" + } + ] + } +] diff --git a/docker/.env b/docker/.env deleted file mode 100644 index e9dbce5e..00000000 --- a/docker/.env +++ /dev/null @@ -1,7 +0,0 @@ -GOTRUE_SITE_URL="http://localhost:3000" -GOTRUE_JWT_SECRET="your-super-secret-jwt-token-with-at-least-32-characters-long" -GOTRUE_DB_DRIVER=postgres -NAMESPACE="auth" -DATABASE_URL=postgres://postgres:postgres@db:5432/postgres -GOTRUE_API_HOST=0.0.0.0 -PORT=9999 diff --git a/docker/create.sh b/docker/create.sh deleted file mode 100755 index 897c8a63..00000000 --- a/docker/create.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh - -docker-compose -p "asset-swissgeol-ch" up --no-start - diff --git a/docker/docker-compose-stage-test.yaml b/docker/docker-compose-stage-test.yaml deleted file mode 100644 index 695598f2..00000000 --- a/docker/docker-compose-stage-test.yaml +++ /dev/null @@ -1,15 +0,0 @@ -version: '3.7' - -# https://start.1password.com/open/i?a=SQMVORNVPRBJFOXHVQXATLEU24&v=7nuj5jugclm3ixkn2fbwmufkeu&i=6ngbn6kbzmpifw237nd6gadteu&h=my.1password.com -services: - server-asset-sg: - container_name: server-asset-sg - image: server-asset-sg:latest - environment: - PORT: 3333 - DATABASE_URL: - ELASTICSEARCH_URL: https://elastic.lambda-it.ch - ELASTICSEARCH_USERNAME: - ELASTICSEARCH_PASSWORD: - ports: - - 3333:3333 diff --git a/docker/docker-compose.yaml b/docker/docker-compose.yaml deleted file mode 100644 index dd6cbd52..00000000 --- a/docker/docker-compose.yaml +++ /dev/null @@ -1,114 +0,0 @@ -version: '3.7' - -services: - db: - container_name: asset-swissgeol-postgres - image: registry.lambda-it.ch/lambda/postgis-gotrue - environment: - POSTGRES_PASSWORD: postgres - ports: - - 5432:5432 - volumes: - - ./volumes/db/init:/docker-entrypoint-initdb.d - - # volumes: - # - ./volumes/pgadmin/config:/pgadmin4/config - - pgadmin: - container_name: asset-swissgeol-pgadmin - image: dpage/pgadmin4 - ports: - - 5051:5050 - depends_on: - - db - environment: - - PGADMIN_DEFAULT_EMAIL=postgres@lambda-it.ch - - PGADMIN_DEFAULT_PASSWORD=postgres - - PGADMIN_LISTEN_PORT=5050 - - PGADMIN_SERVER_JSON_FILE=/pgadmin4/config/servers.json - volumes: - - ./volumes/pgadmin/config:/pgadmin4/config - - ./volumes/pgadmin/data:/pgadmin4/data - - gdal: - container_name: asset-swissgeol-gdal - image: osgeo/gdal:ubuntu-full-latest - volumes: - - ./volumes/gdal:/home - command: tail -f /dev/null - - elasticsearch: - container_name: asset-swissgeol-elasticsearch - image: elasticsearch:8.4.3 - environment: - - ES_JAVA_OPTS=-Xms512m -Xmx512m - # IMPORTANT: do not disable xpack.security for staging or production - - xpack.security.enabled=false - - discovery.type=single-node - volumes: - - ./volumes/elasticsearch/data:/usr/share/elasticsearch/data - ports: - - 9200:9200 - - 9300:9300 - - kibana: - container_name: asset-swissgeol-kibana - image: kibana:8.4.3 - environment: - - ELASTICSEARCH_HOSTS=http://elasticsearch:9200 - ports: - - 5601:5601 - depends_on: - - elasticsearch - - auth: - container_name: asset-swissgeol-auth - image: supabase/gotrue@sha256:794d7df376329df93c0d9ed9237868363de5c858301147e08e6620fb67d1a2c6 - depends_on: - - db - restart: unless-stopped - ports: - - 8866:9999 - environment: - GOTRUE_API_HOST: 0.0.0.0 - PORT: 9999 - GOTRUE_SITE_URL: 'http://localhost:4200' - GOTRUE_JWT_SECRET: 'your-super-secret-jwt-token-with-at-least-32-characters-long' - GOTRUE_COOKIE_KEY: asset-sg - GOTRUE_DB_DRIVER: postgres - DB_NAMESPACE: auth - DATABASE_URL: postgres://swissgeol_asset:swissgeol_asset@db:5432/postgres?search_path=auth - GOTRUE_DISABLE_SIGNUP: false - GOTRUE_SMTP_ADMIN_EMAIL: info@digital-factory-bern.ch - GOTRUE_SMTP_HOST: smtp.swizzonic-mail.ch - GOTRUE_SMTP_PORT: 465 - GOTRUE_SMTP_USER: - GOTRUE_SMTP_PASS: - GOTRUE_SMTP_SENDER_NAME: asset-swissgeol - GOTRUE_MAILER_URLPATHS_INVITE: http://localhost:4200/auth/verify - GOTRUE_MAILER_URLPATHS_CONFIRMATION: /auth/v1/verify - GOTRUE_MAILER_URLPATHS_RECOVERY: http://localhost:4200/auth/verify - GOTRUE_MAILER_URLPATHS_EMAIL_CHANGE: /auth/v1/verify - GOTRUE_MAILER_SUBJECTS_INVITE: '{{if eq .Data.lang "de"}} Einladung für asset.swissgeol.ch Login {{else if eq .Data.lang "fr"}} Invitation à se connecter à asset.swissgeol.ch {{else if eq .Data.lang "it"}} Invito all''accesso a asset.swissgeol.ch {{else if eq .Data.lang "rm"}} RM TODO TRANSLATE Einladung für asset.swissgeol.ch Login {{else}} Invitation to asset.swissgeol.ch {{end}}' - GOTRUE_MAILER_TEMPLATES_INVITE: http://localhost:4200/assets/email-templates/invite.html - GOTRUE_MAILER_SUBJECTS_RECOVERY: '{{if eq .Data.lang "de"}} Passwort zurücksetzen für asset.swissgeol.ch {{else if eq .Data.lang "fr"}} Réinitialiser le mot de passe pour asset.swissgeol.ch {{else if eq .Data.lang "it"}} Reimpostare la password di asset.swissgeol.ch {{else if eq .Data.lang "rm"}} RM TODO TRANSLATE Passwort zurücksetzen für asset.swissgeol.ch {{else}} Password reset for asset.swissgeol.ch {{end}}' - GOTRUE_MAILER_TEMPLATES_RECOVERY: http://localhost:4200/assets/email-templates/recover.html - - ocr: - container_name: asset-swissgeol-ocr - image: 'registry.lambda-it.ch/swissgeol/ocr' - ports: - - '5000:5000' - environment: - - OCR_CPUS=2 - - OPTIMIZE_LEVEL=0 - - OMP_THREAD_LIMIT=1 - - # email-templates-website: - # container_name: asset-swissgeol-ch-email-templates-website - # image: halverneus/static-file-server - # restart: unless-stopped - # ports: - # - 8080:8080 - # volumes: - # - ./volumes/email-templates-website:/web diff --git a/docker/up-stage-test.sh b/docker/up-stage-test.sh deleted file mode 100755 index 64780fdf..00000000 --- a/docker/up-stage-test.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh - -docker-compose -p "asset-swissgeol-ch-stage-test" -f ./docker-compose-stage-test.yaml up diff --git a/docker/up.sh b/docker/up.sh deleted file mode 100755 index 2b3b0b6e..00000000 --- a/docker/up.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh - -docker-compose -p "asset-swissgeol-ch" up -d - diff --git a/docker/volumes/db/init/00_init_postgres.sql b/docker/volumes/db/init/00_init_postgres.sql deleted file mode 100644 index 15fc2a60..00000000 --- a/docker/volumes/db/init/00_init_postgres.sql +++ /dev/null @@ -1,7 +0,0 @@ -create user swissgeol_asset; -alter user swissgeol_asset with login superuser inherit nocreatedb nocreaterole noreplication; -alter user swissgeol_asset with password 'swissgeol_asset'; - -alter database postgres owner to swissgeol_asset; - -create schema auth; diff --git a/docker/volumes/pgadmin/config/servers.json b/docker/volumes/pgadmin/config/servers.json deleted file mode 100644 index 25e33c51..00000000 --- a/docker/volumes/pgadmin/config/servers.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "Servers": { - "1": { - "Name": "postgres", - "Group": "Servers", - "Host": "db", - "Port": 5432, - "MaintenanceDB": "postgres", - "Username": "postgres", - "SSLMode": "prefer", - "SSLCert": "/.postgresql/postgresql.crt", - "SSLKey": "/.postgresql/postgresql.key", - "SSLCompression": 0, - "Timeout": 10, - "UseSSHTunnel": 0, - "TunnelPort": "22", - "TunnelAuthentication": 0 - } - } -} diff --git a/envs.api.json b/envs.api.json deleted file mode 100644 index ab5f6971..00000000 --- a/envs.api.json +++ /dev/null @@ -1,107 +0,0 @@ -{ - "$schema": "https://sos-ch-dk-2.exo.io/lqd/json/env-schema.json", - "onePassword": [ - { - "itemUrl": "https://start.1password.com/open/i?v=q7jk2jxvqwnfjyxlitdnvz2xg4&i=bxw5lk4zwh4ouple6ulowqxste", - "mapping": [ - { - "field": "Benutzername", - "env": "POSTGRES_USER" - }, - { - "field": "Passwort", - "env": "POSTGRES_PASSWORD" - }, - { - "field": "database", - "env": "POSTGRES_DB" - }, - { - "field": "URL", - "env": "POSTGRES_URL" - }, - { - "field": "port", - "env": "POSTGRES_PORT" - } - ] - }, - { - "itemUrl": "https://start.1password.com/open/i?v=q7jk2jxvqwnfjyxlitdnvz2xg4&i=mjbcvmegzkd7qvxw2sndykowlm", - "mapping": [ - { - "field": "password", - "env": "GOTRUE_JWT_SECRET" - } - ] - }, - { - "itemUrl": "https://start.1password.com/open/i?v=q7jk2jxvqwnfjyxlitdnvz2xg4&i=3rilud3qyopmzgcdeonstmrvli", - "mapping": [ - { - "field": "username", - "env": "ELASTICSEARCH_USERNAME" - }, - { - "field": "password", - "env": "ELASTICSEARCH_PASSWORD" - } - ] - }, - { - "itemUrl": "https://start.1password.com/open/i?v=q7jk2jxvqwnfjyxlitdnvz2xg4&i=xbabbwscr5wtakuxj3lir2we3q", - "mapping": [ - { - "field": "region", - "env": "S3_REGION" - }, - { - "field": "endpoint", - "env": "S3_ENDPOINT" - }, - { - "field": "key", - "env": "S3_ACCESS_KEY_ID" - }, - { - "field": "secret", - "env": "S3_SECRET_ACCESS_KEY" - }, - { - "field": "bucket", - "env": "S3_BUCKET_NAME" - } - ] - } - ], - "envs": [ - { - "name": "DATABASE_URL", - "value": "postgres://$(POSTGRES_USER):$(POSTGRES_PASSWORD)@$(POSTGRES_URL):$(POSTGRES_PORT)/$(POSTGRES_DB)" - }, - { - "name": "ELASTICSEARCH_URL", - "value": "http://10.0.0.28:9200/" - }, - { - "name": "FRONTEND_URL", - "value": "https://asset-sg.lqd.lambda-it.ch/" - }, - { - "name": "AUTH_URL", - "value": "http://asset-swissgeol-ch-web-api-auth-deploy-dev:9999/" - }, - { - "name": "S3_ASSET_FOLDER", - "value": "asset_files" - }, - { - "name": "OCR_URL", - "value": "http://swissgeol-ocr-ocr-dev.swissgeol-dev.svc.6deaeb9f-e5ef-4f56-b232-d9cdf596da8a.cluster.local:5000" - }, - { - "name": "OCR_CALLBACK_URL", - "value": "https://asset-sg.lqd.lambda-it.ch/api" - } - ] -} diff --git a/envs.auth.json b/envs.auth.json deleted file mode 100644 index dd261035..00000000 --- a/envs.auth.json +++ /dev/null @@ -1,130 +0,0 @@ -{ - "$schema": "https://sos-ch-dk-2.exo.io/lqd/json/env-schema.json", - "onePassword": [ - { - "itemUrl": "https://start.1password.com/open/i?v=q7jk2jxvqwnfjyxlitdnvz2xg4&i=dyksefuvcfldcdpror57wxsubm", - "mapping": [ - { - "field": "Benutzername", - "env": "POSTGRES_USER" - }, - { - "field": "Passwort", - "env": "POSTGRES_PASSWORD" - }, - { - "field": "database", - "env": "POSTGRES_DB" - }, - { - "field": "URL", - "env": "POSTGRES_URL" - }, - { - "field": "port", - "env": "POSTGRES_PORT" - } - ] - }, - { - "itemUrl": "https://start.1password.com/open/i?v=q7jk2jxvqwnfjyxlitdnvz2xg4&i=mjbcvmegzkd7qvxw2sndykowlm", - "mapping": [ - { - "field": "password", - "env": "GOTRUE_JWT_SECRET" - } - ] - }, - { - "itemUrl": "https://start.1password.com/open/i?v=q7jk2jxvqwnfjyxlitdnvz2xg4&i=a3yrueev2j3yevg2bndukhm7ii", - "mapping": [ - { - "field": "username", - "env": "GOTRUE_SMTP_USER" - }, - { - "field": "password", - "env": "GOTRUE_SMTP_PASS" - } - ] - } - ], - "envs": [ - { - "name": "GOTRUE_API_HOST", - "value": "0.0.0.0" - }, - { - "name": "GOTRUE_SITE_URL", - "value": "https://asset-sg.lqd.lambda-it.ch" - }, - { - "name": "GOTRUE_COOKIE_KEY", - "value": "asset-sg" - }, - { - "name": "GOTRUE_DB_DRIVER", - "value": "postgres" - }, - { - "name": "DB_NAMESPACE", - "value": "auth" - }, - { - "name": "DATABASE_URL", - "value": "postgres://$(POSTGRES_USER):$(POSTGRES_PASSWORD)@$(POSTGRES_URL):$(POSTGRES_PORT)/$(POSTGRES_DB)" - }, - { - "name": "GOTRUE_DISABLE_SIGNUP", - "value": "false" - }, - { - "name": "GOTRUE_SMTP_HOST", - "value": "smtp.swizzonic-mail.ch" - }, - { - "name": "GOTRUE_SMTP_PORT", - "value": "465" - }, - { - "name": "GOTRUE_SMTP_ADMIN_EMAIL", - "value": "info@digital-factory-bern.ch" - }, - { - "name": "GOTRUE_SMTP_SENDER_NAME", - "value": "asset-swissgeol" - }, - { - "name": "GOTRUE_MAILER_URLPATHS_INVITE", - "value": "https://asset-sg.lqd.lambda-it.ch/auth/verify" - }, - { - "name": "GOTRUE_MAILER_URLPATHS_CONFIRMATION", - "value": "/auth/v1/verify" - }, - { - "name": "GOTRUE_MAILER_URLPATHS_RECOVERY", - "value": "https://asset-sg.lqd.lambda-it.ch/auth/verify" - }, - { - "name": "GOTRUE_MAILER_URLPATHS_EMAIL_CHANGE", - "value": "/auth/v1/verify" - }, - { - "name": "GOTRUE_MAILER_SUBJECTS_INVITE", - "value": "{{if eq .Data.language \"de\"}} Einladung für asset.swissgeol.ch Login {{else if eq .Data.language \"fr\"}} Invitation à se connecter à asset.swissgeol.ch {{else if eq .Data.language \"it\"}} Invito all''accesso a asset.swissgeol.ch {{else if eq .Data.language \"rm\"}} RM TODO TRANSLATE Einladung für asset.swissgeol.ch Login {{else}} Invitation to asset.swissgeol.ch {{end}}" - }, - { - "name": "GOTRUE_MAILER_TEMPLATES_INVITE", - "value": "https://asset-sg.lqd.lambda-it.ch/assets/email-templates/invite.html" - }, - { - "name": "GOTRUE_MAILER_SUBJECTS_RECOVERY", - "value": "{{if eq .Data.language \"de\"}} Passwort zurücksetzen für asset.swissgeol.ch {{else if eq .Data.language \"fr\"}} Réinitialiser le mot de passe pour asset.swissgeol.ch {{else if eq .Data.language \"it\"}} Reimpostare la password di asset.swissgeol.ch {{else if eq .Data.language \"rm\"}} RM TODO TRANSLATE Passwort zurücksetzen für asset.swissgeol.ch {{else}} Password reset for asset.swissgeol.ch {{end}}" - }, - { - "name": "GOTRUE_MAILER_TEMPLATES_RECOVERY", - "value": "https://asset-sg.lqd.lambda-it.ch/assets/email-templates/recover.html" - } - ] -} diff --git a/images/bulk-ocr/.gitignore b/images/bulk-ocr/.gitignore deleted file mode 100644 index c41c70e0..00000000 --- a/images/bulk-ocr/.gitignore +++ /dev/null @@ -1 +0,0 @@ -volumes/pdfs diff --git a/images/bulk-ocr/Dockerfile b/images/bulk-ocr/Dockerfile deleted file mode 100644 index 7980015c..00000000 --- a/images/bulk-ocr/Dockerfile +++ /dev/null @@ -1,14 +0,0 @@ -FROM registry.lambda-it.ch/proxy_cache/library/python:3.8-slim - -# limit tesseract to one thread -ENV OMP_THREAD_LIMIT=1 - -WORKDIR /app -COPY ./flask . - -RUN apt-get update \ - && apt-get install -y --no-install-recommends ghostscript icc-profiles-free libxml2 pngquant \ - poppler-utils tesseract-ocr zlib1g \ - && rm -rf /var/lib/apt/lists/* \ - && pip install olefile \ - && pip install -r ./requirements.txt diff --git a/images/bulk-ocr/build.sh b/images/bulk-ocr/build.sh deleted file mode 100755 index 43794181..00000000 --- a/images/bulk-ocr/build.sh +++ /dev/null @@ -1,2 +0,0 @@ -docker build --pull --rm -t registry.lambda-it.ch/lambda/asset-swissgeol/batch-ocr . - diff --git a/images/bulk-ocr/docker-compose.yaml b/images/bulk-ocr/docker-compose.yaml deleted file mode 100644 index 6213b0e5..00000000 --- a/images/bulk-ocr/docker-compose.yaml +++ /dev/null @@ -1,9 +0,0 @@ -version: '3.7' - -services: - batch-ocr: - container_name: asset-swissgeol-ch-batch-ocr - image: registry.lambda-it.ch/lambda/asset-swissgel-ch-batch-ocr - volumes: - - ./volumes/pdfs:/mnt/pdfs - - ./flask:/mnt/flask diff --git a/images/bulk-ocr/flask/ocr_pipeline.py b/images/bulk-ocr/flask/ocr_pipeline.py deleted file mode 100644 index dde2bf95..00000000 --- a/images/bulk-ocr/flask/ocr_pipeline.py +++ /dev/null @@ -1,85 +0,0 @@ -import gc -import requests -from requests_toolbelt import MultipartEncoder -import threading -from pdfCropMargins import crop -from pdf2image import convert_from_path -import numpy as np -import os -import logging -import cv2 -import subprocess - - -def ocr_pdf(logger: logging.Logger, name: str, pdfpath: str, lngs: str, cpus: int, optimize_level: int, sem): - filename = pdfpath - out_filename = filename - logger.info('Filename: ' + filename) - logger.info('OUT Filename: ' + out_filename) - - try: - file_ext = os.path.splitext(filename)[1] - if file_ext == '.pdf': - logger.info( - "Rescale the document if it is too small for the ocr process") - # Rescale the document if it is too small for the ocr process. - n_pages = len(convert_from_path(filename, 1)) - pages = convert_from_path( - filename, 10, first_page=1, last_page=min(5, n_pages + 1)) - if sum([page.width < 20 for page in pages]) > 0: - images = [] - for i in range(1, n_pages + 1): - logger.info(f"Rescaling page {i}") - page = convert_from_path( - filename, 10, first_page=i, last_page=i)[0] - if page.width < 20: - image = convert_from_path( - filename, 3000, first_page=i, last_page=i)[0] - (width, height) = (image.width * 2, image.height * 2) - images.append(image.resize((width, height))) - else: - images.append(convert_from_path( - filename, 300, first_page=i, last_page=i)[0]) - - images[0].save(filename, "PDF", resolution=300, - save_all=True, append_images=images[1:]) - del images - - del pages - del n_pages - gc.collect() - - logger.info("DONE - Rescaling the document: " + name) - - cmd = ['ocrmypdf', '-l', lngs, '--skip-big', '30', '--jobs', f"{cpus}", '--optimize', f'{optimize_level}', '--output-type', 'pdf', '--tesseract-pagesegmode', '1', '--skip-text', # '--clean', - filename, out_filename] - logger.info(f"running cmd {cmd}") - - cp = subprocess.run(cmd, capture_output=True, timeout=(60*180)) - returncode = cp.returncode - logger.info(f"DONE ocrmypdf: " + name) - logger.info(f"returncode: {returncode}") - logger.debug(f"stderr ocrmypdf {cp.stderr}") - logger.debug(f"stdout ocrmypdf {cp.stdout}") - - if returncode == 6: - logger.info( - "Skipped document because it already contained text") - - elif returncode == 0: - logger.info("OCR complete: " + name) - else: - logger.error(f'OCR Problem, returncode: {returncode}') - msg = "OCR Error: {0}; {1}".format(name, cp.stderr) - logger.error(msg) - - del cp - gc.collect() - return out_filename - except Exception as err: - msg = "{0}".format(err) - logger.error(msg) - raise err - finally: - logger.info('sem released') - sem.release() diff --git a/images/bulk-ocr/flask/readme.md b/images/bulk-ocr/flask/readme.md deleted file mode 100644 index 98b86e5d..00000000 --- a/images/bulk-ocr/flask/readme.md +++ /dev/null @@ -1,5 +0,0 @@ -`apt-get install ocrmypdf` - -`pip install -r ./requirements.txt` - -ev. Hilfe mit poppler: https://github.com/Belval/pdf2image diff --git a/images/bulk-ocr/flask/requirements.txt b/images/bulk-ocr/flask/requirements.txt deleted file mode 100644 index 98acfbf8..00000000 --- a/images/bulk-ocr/flask/requirements.txt +++ /dev/null @@ -1,7 +0,0 @@ -pdfCropMargins==1.0.5 -pdf2image==1.16.0 -opencv-python-headless==4.5.4.60 -ocrmypdf==13.1.0 -Flask==2.0.2 -requests==2.27.1 -requests-toolbelt==0.9.1 diff --git a/images/bulk-ocr/flask/run_ocr_pipeline.py b/images/bulk-ocr/flask/run_ocr_pipeline.py deleted file mode 100644 index 179fa281..00000000 --- a/images/bulk-ocr/flask/run_ocr_pipeline.py +++ /dev/null @@ -1,29 +0,0 @@ -from ocr_pipeline import ocr_pdf - -import sys -import logging -import threading - -sem = threading.Semaphore() - -root = logging.getLogger() -root.setLevel(logging.DEBUG) - -ch = logging.StreamHandler(sys.stdout) -ch.setLevel(logging.DEBUG) -formatter = logging.Formatter( - '%(asctime)s - %(name)s - %(levelname)s - %(message)s') -ch.setFormatter(formatter) -root.addHandler(ch) - -def program(filename): - try: - ocr_pdf(pdfpath=filename, logger=logging, name=filename, lngs='eng', cpus=256, optimize_level=0, sem=sem) - except Exception as error: - sem.release() - raise error - -if __name__ == '__main__': - globals()[sys.argv[1]](sys.argv[2]) - -# docker run -v /home/wayne/Projects/lambda-it/asset-swissgeol-ch/images/bulk-ocr/volumes/pdfs:/mnt/pdfs registry.lambda-it.ch/lambda/asset-swissgeol/batch-ocr python /app/run_ocr_pipeline.py program /mnt/pdfs/4.pdf diff --git a/images/bulk-ocr/flask/server.py b/images/bulk-ocr/flask/server.py deleted file mode 100644 index bdd24a92..00000000 --- a/images/bulk-ocr/flask/server.py +++ /dev/null @@ -1,136 +0,0 @@ -#!/usr/bin/python3 -from flask.helpers import send_file -from ocr_pipeline import ocr_pdf -from flask import Flask, abort, request, Response, jsonify, make_response, json - -import tempfile -import shutil -import argparse -import numpy as np -import cv2 -import os -import socket -import logging -import sys -import threading - -sem = threading.Semaphore() - - -class InvalidUsage(Exception): - status_code = 400 - - def __init__(self, message, status_code=None, payload=None): - Exception.__init__(self) - self.message = message - if status_code is not None: - self.status_code = status_code - self.payload = payload - - def to_dict(self): - rv = dict(self.payload or ()) - rv['message'] = self.message - return rv - - -# Initialize the Flask application -app = Flask(__name__) - -ap = argparse.ArgumentParser() -ap.add_argument("-p", "--port", type=int, required=False, help="port fo app") -ap.add_argument("-c", "--cpus", type=int, required=False, - help="number of cpu cores") -ap.add_argument("-o", "--optimize", type=int, required=False, - help="level of optimize, 0 for none") -args = vars(ap.parse_args()) - -PORT = args["port"] -if(PORT is None): - PORT = 9991 - -CPUS = args["cpus"] -if(CPUS is None): - CPUS = 1 - -optimize_level = args["optimize"] -if(optimize_level is None): - optimize_level = 0 - -print(f'>> running with optimize_level {optimize_level}') -print(f'>> running with {CPUS} cpus') -print(f'>> running on port {PORT}') - -# set up logging -root = logging.getLogger() -root.setLevel(logging.DEBUG) - -ch = logging.StreamHandler(sys.stdout) -ch.setLevel(logging.DEBUG) -formatter = logging.Formatter( - '%(asctime)s - %(name)s - %(levelname)s - %(message)s') -ch.setFormatter(formatter) -root.addHandler(ch) - - -@ app.errorhandler(InvalidUsage) -def handle_invalid_usage(error): - response = jsonify(error.to_dict()) - response.status_code = error.status_code - return response - - -@ app.route('/ocr', methods=['POST']) -def ocr(): - filename = request.headers.get('x-filename') - callback_success = request.headers.get('x-callback-success') - callback_error = request.headers.get('x-callback-error') - - if not sem.acquire(blocking=False): - return 'service is busy', 503 - - try: - logging.info(f'API ocr: {filename}') - logging.info(f'API ocr callback_success: {callback_success}') - logging.info(f'API ocr callback_error: {callback_error}') - - logging.info('saving file') - f = tempfile.NamedTemporaryFile(mode='wb', delete=False, suffix=".pdf") - f.write(request.data) - f.flush() - f.close() - file_name = f.name - del f - del request.data - - logging.info(f'DONE - saving file {file_name}') - logging.info('ocr_pdf') - - thread = threading.Thread(target=ocr_pdf, kwargs={ - 'logger': logging, 'name': filename, 'pdfpath': file_name, 'lngs': 'eng', 'cpus': CPUS, 'optimize_level': optimize_level, 'callback_success': callback_success, 'callback_error': callback_error, 'sem': sem}) - thread.start() - return 'Processing', 201 - - except Exception as error: - if hasattr(error, 'message'): - message = error.message - else: - message = str(error) - - logging.exception(f'API ocr ERROR {filename}') - sem.release() - raise InvalidUsage(message, status_code=500) - - -@ app.route('/') -def state(): - status = { - "host": socket.gethostname(), - "port": PORT, - "cpus": CPUS - } - - return status - - -if __name__ == '__main__': - app.run(host="0.0.0.0", port=PORT, threaded=True) diff --git a/libs/admin/src/lib/components/admin-page/admin-page.component.html b/libs/admin/src/lib/components/admin-page/admin-page.component.html index 36152ce6..67542516 100644 --- a/libs/admin/src/lib/components/admin-page/admin-page.component.html +++ b/libs/admin/src/lib/components/admin-page/admin-page.component.html @@ -5,14 +5,6 @@
- this._adminService.getUsers(), updateUser: user => this._adminService.updateUser(user), - createUser: user => this._adminService.createUser(user), deleteUser: id => this._adminService.deleteUser(id), }); @@ -66,7 +65,6 @@ export class AdminPageComponent { public handleUserExpandedOutput(output: UserExpandedOutput): void { UserExpandedOutput.match({ - userCreated: user => this.sm.saveCreatedUser(user), userEdited: user => this.sm.saveEditedUser(user), userExpandCanceled: () => this.sm.cancelEditOrSave(), userDelete: user => this.sm.deleteUser(user.id), diff --git a/libs/admin/src/lib/components/admin-page/admin-page.state-machine.ts b/libs/admin/src/lib/components/admin-page/admin-page.state-machine.ts index 6a369192..7aa52951 100644 --- a/libs/admin/src/lib/components/admin-page/admin-page.state-machine.ts +++ b/libs/admin/src/lib/components/admin-page/admin-page.state-machine.ts @@ -5,7 +5,7 @@ import { ReplaySubject, forkJoin, map } from 'rxjs'; import { ApiError } from '@asset-sg/client-shared'; import { ORD } from '@asset-sg/core'; -import { User, UserWithoutId, Users, byEmail } from '@asset-sg/shared'; +import { User, Users, byEmail } from '@asset-sg/shared'; type AdminPageState = Loading | StateApiError | ReadMode | EditMode | CreateMode; @@ -31,7 +31,6 @@ export class AdminPageStateMachine { rdUserId$: ORD.ObservableRemoteData; getUsers: () => ORD.ObservableRemoteData; updateUser: (user: User) => ORD.ObservableRemoteData; - createUser: (user: Omit) => ORD.ObservableRemoteData; deleteUser: (id: string) => ORD.ObservableRemoteData; }, ) { @@ -91,22 +90,6 @@ export class AdminPageStateMachine { } } - public createUser() { - if (AdminPageState.is.readMode(this._state)) { - this._state = AdminPageState.of.createMode({ - ...this._state, - usersVM: this._state.usersVM.map(u => ({ ...u, expanded: false, disableEdit: true })), - }); - } - } - - public saveCreatedUser(user: UserWithoutId) { - if (AdminPageState.is.createMode(this._state)) { - this._state = AdminPageState.as.createMode({ ...this._state, showProgressBar: true }); - this.modifyAndReload(this.effects.createUser(user), this._state._userId); - } - } - public deleteUser(id: string) { if (AdminPageState.is.editMode(this._state)) { this._state = AdminPageState.as.editMode({ ...this._state, showProgressBar: true }); diff --git a/libs/admin/src/lib/components/user-expanded/user-expanded.component.html b/libs/admin/src/lib/components/user-expanded/user-expanded.component.html index 64803c77..f8ec418f 100644 --- a/libs/admin/src/lib/components/user-expanded/user-expanded.component.html +++ b/libs/admin/src/lib/components/user-expanded/user-expanded.component.html @@ -1,6 +1,6 @@
-
+
@@ -20,13 +20,6 @@
- - - - Admin diff --git a/libs/admin/src/lib/components/user-expanded/user-expanded.component.ts b/libs/admin/src/lib/components/user-expanded/user-expanded.component.ts index 8e982d2d..ae734a1c 100644 --- a/libs/admin/src/lib/components/user-expanded/user-expanded.component.ts +++ b/libs/admin/src/lib/components/user-expanded/user-expanded.component.ts @@ -15,11 +15,7 @@ import { makeADT, ofType } from '@morphic-ts/adt'; import * as O from 'fp-ts/Option'; import { ButtonComponent, ViewChildMarker } from '@asset-sg/client-shared'; -import { User, UserRoleEnum, UserWithoutId } from '@asset-sg/shared'; - -interface UserCreated extends UserWithoutId { - _tag: 'userCreated'; -} +import { User, UserRoleEnum } from '@asset-sg/shared'; interface UserEdited extends User { _tag: 'userEdited'; @@ -34,13 +30,12 @@ interface UserExpandCanceled { } export const UserExpandedOutput = makeADT('_tag')({ - userCreated: ofType(), userEdited: ofType(), userExpandCanceled: ofType(), userDelete: ofType(), }); -export type UserExpandedOutput = UserCreated | UserEdited | UserDelete | UserExpandCanceled; +export type UserExpandedOutput = UserEdited | UserDelete | UserExpandCanceled; @Component({ selector: 'asset-sg-user-expanded', @@ -97,10 +92,6 @@ export class UserExpandedComponent { if (!role || !lang) return; this.userExpandedOutput.emit(UserExpandedOutput.of.userEdited({ ...this.user, role, lang })); - } else { - const { email, role, lang } = this.editForm.getRawValue(); - if (!email || !role || !lang) return; - this.userExpandedOutput.emit(UserExpandedOutput.of.userCreated({ email, role, lang })); } } diff --git a/libs/admin/src/lib/services/admin.service.ts b/libs/admin/src/lib/services/admin.service.ts index 257814fe..6516be10 100644 --- a/libs/admin/src/lib/services/admin.service.ts +++ b/libs/admin/src/lib/services/admin.service.ts @@ -25,22 +25,6 @@ export class AdminService { ); } - public createUser(user: Omit): ORD.ObservableRemoteData { - return this._httpClient - .post(`/api/admin/user`, { - email: user.email, - role: user.role, - lang: user.lang, - }) - .pipe( - map(() => E.right(undefined)), - // TODO need to test instance of HttpErrorResponse here - OE.catchErrorW(httpErrorResponseError), - map(RD.fromEither), - startWith(RD.pending), - ); - } - public updateUser(user: User): ORD.ObservableRemoteData { return this._httpClient .patch(`/api/admin/user/${user.id}`, { @@ -58,7 +42,6 @@ export class AdminService { public deleteUser(id: string): ORD.ObservableRemoteData { console.log('888', id); - // return delayObservable(2000, ORD.success(undefined)); return this._httpClient.delete(`/api/admin/user/${id}`).pipe( tap(a => console.log('deleteUser', a)), map(() => E.right(undefined)), diff --git a/libs/asset-editor/jest.config.ts b/libs/asset-editor/jest.config.ts index d3dbc386..ec24c907 100644 --- a/libs/asset-editor/jest.config.ts +++ b/libs/asset-editor/jest.config.ts @@ -13,7 +13,7 @@ export default { transform: { '^.+\\.(ts|mjs|js|html)$': 'jest-preset-angular', }, - transformIgnorePatterns: ['node_modules/(?!.*\\.mjs$)'], + transformIgnorePatterns: ['node_modules/(?!.*\\.mjs$|ol)'], snapshotSerializers: [ 'jest-preset-angular/build/serializers/no-ng-attributes', 'jest-preset-angular/build/serializers/ng-snapshot', diff --git a/libs/asset-editor/src/lib/components/asset-editor-launch/asset-editor-launch.component.html b/libs/asset-editor/src/lib/components/asset-editor-launch/asset-editor-launch.component.html index ca5674fa..7a96f11f 100644 --- a/libs/asset-editor/src/lib/components/asset-editor-launch/asset-editor-launch.component.html +++ b/libs/asset-editor/src/lib/components/asset-editor-launch/asset-editor-launch.component.html @@ -6,7 +6,23 @@

edit.adminInstructionsEditHeading

edit.adminInstructionsEdit

edit.adminInstructionsCreateHeading

- edit.adminInstructionsCreate + edit.adminInstructionsCreate +

edit.adminInstructionsSyncElasticAssetsHeading

+
+ +
+ {{ syncProgress }}% +
+
+

edit.adminInstructionsSyncElasticAssets

diff --git a/libs/asset-editor/src/lib/components/asset-editor-launch/asset-editor-launch.component.scss b/libs/asset-editor/src/lib/components/asset-editor-launch/asset-editor-launch.component.scss new file mode 100644 index 00000000..9599221f --- /dev/null +++ b/libs/asset-editor/src/lib/components/asset-editor-launch/asset-editor-launch.component.scss @@ -0,0 +1,35 @@ +@use '../../styles/variables' as variables; + +h3 { + margin: 1.5rem 0 0.25rem 0; +} + +// asset-sync +.asset-sync { + display: flex; +} + +.asset-sync.active > button { + border-top-right-radius: 0; + border-bottom-right-radius: 0; +} + +.asset-sync > .progress { + display: flex; + align-items: center; + padding-inline: 0.25rem; + + border: 2px solid variables.$cyan-09; + border-left: none; + border-top-right-radius: 4px; + border-bottom-right-radius: 4px; + + transition: 250ms ease-in; + transition-property: opacity, transform; + transform-origin: left; +} + +.asset-sync:not(.active) > .progress { + opacity: 0; + transform: scaleX(0); +} diff --git a/libs/asset-editor/src/lib/components/asset-editor-launch/asset-editor-launch.component.ts b/libs/asset-editor/src/lib/components/asset-editor-launch/asset-editor-launch.component.ts index b6eae63a..0c79017b 100644 --- a/libs/asset-editor/src/lib/components/asset-editor-launch/asset-editor-launch.component.ts +++ b/libs/asset-editor/src/lib/components/asset-editor-launch/asset-editor-launch.component.ts @@ -1,15 +1,17 @@ import { TemplatePortal } from '@angular/cdk/portal'; +import { HttpClient } from '@angular/common/http'; import { ChangeDetectionStrategy, ChangeDetectorRef, Component, + OnInit, TemplateRef, ViewChild, ViewContainerRef, inject, } from '@angular/core'; import { Store } from '@ngrx/store'; -import { asyncScheduler, observeOn } from 'rxjs'; +import { Observable, asyncScheduler, observeOn, take } from 'rxjs'; import { AppPortalService, @@ -24,8 +26,9 @@ import { templateUrl: './asset-editor-launch.component.html', changeDetection: ChangeDetectionStrategy.OnPush, hostDirectives: [LifecycleHooksDirective], + styleUrls: ['./asset-editor-launch.component.scss'], }) -export class AssetEditorLaunchComponent { +export class AssetEditorLaunchComponent implements OnInit { @ViewChild('templateDrawerPortalContent') _templateDrawerPortalContent!: TemplateRef; private _lc = inject(LifecycleHooks); @@ -33,6 +36,9 @@ export class AssetEditorLaunchComponent { private _viewContainerRef = inject(ViewContainerRef); private _cd = inject(ChangeDetectorRef); private _store = inject>(Store); + private _httpClient = inject(HttpClient); + + syncProgress: number | null = null; constructor() { this._lc.afterViewInit$.pipe(observeOn(asyncScheduler)).subscribe(() => { @@ -44,4 +50,43 @@ export class AssetEditorLaunchComponent { this._store.dispatch(appSharedStateActions.openPanel()); }); } + + ngOnInit() { + void this.refreshAssetSyncProgress().then(() => { + if (this.syncProgress != null) { + void this.loopAssetSyncProgress(); + } + }); + } + + async synchronizeElastic() { + if (this.syncProgress !== null) { + return; + } + this.syncProgress = 0; + await resolveFirst(this._httpClient.post('/api/assets/sync', null)) + await this.loopAssetSyncProgress(); + } + + private async loopAssetSyncProgress() { + while (this.syncProgress !== null) { + await this.refreshAssetSyncProgress(); + await new Promise((resolve) => setTimeout(resolve, 500)); + } + } + + private async refreshAssetSyncProgress() { + type Progress = { progress: number } | null | undefined; + const progress = await resolveFirst(this._httpClient.get('/api/assets/sync')) + this.syncProgress = progress == null ? null : Math.round(progress.progress * 100); + } } + +const resolveFirst = (value$: Observable): Promise => ( + new Promise((resolve, reject) => { + value$.pipe(take(1)).subscribe({ + next: resolve, + error: reject, + }) + }) +) diff --git a/libs/asset-editor/src/lib/components/asset-editor-tab-administration/asset-editor-tab-administration.component.html b/libs/asset-editor/src/lib/components/asset-editor-tab-administration/asset-editor-tab-administration.component.html index 87c64cf3..4a81d8ba 100644 --- a/libs/asset-editor/src/lib/components/asset-editor-tab-administration/asset-editor-tab-administration.component.html +++ b/libs/asset-editor/src/lib/components/asset-editor-tab-administration/asset-editor-tab-administration.component.html @@ -1,10 +1,10 @@
-
-
edit.tabs.administration.infoGeol
+
+
edit.tabs.administration.infoGeol
- edit.tabs.administration.sgsId + edit.tabs.administration.sgsId diff --git a/libs/asset-editor/src/lib/components/asset-editor-tab-administration/asset-editor-tab-administration.component.ts b/libs/asset-editor/src/lib/components/asset-editor-tab-administration/asset-editor-tab-administration.component.ts index e39a1620..2a7129e8 100644 --- a/libs/asset-editor/src/lib/components/asset-editor-tab-administration/asset-editor-tab-administration.component.ts +++ b/libs/asset-editor/src/lib/components/asset-editor-tab-administration/asset-editor-tab-administration.component.ts @@ -2,7 +2,7 @@ import { ChangeDetectionStrategy, Component, EventEmitter, Input, OnInit, Output import { FormBuilder, FormGroupDirective } from '@angular/forms'; import { RxState } from '@rx-angular/state'; import * as O from 'fp-ts/Option'; -import { Observable, map, take } from 'rxjs'; +import { Observable } from 'rxjs'; import { fromAppShared } from '@asset-sg/client-shared'; import { DateId } from '@asset-sg/shared'; @@ -55,7 +55,6 @@ export class AssetEditorTabAdministrationComponent implements OnInit { @Input() public set referenceDataVM$(value: Observable) { - // value.pipe(take(1)).subscribe(v => console.log(v)); this._state.connect('referenceDataVM', value); } @@ -69,7 +68,6 @@ export class AssetEditorTabAdministrationComponent implements OnInit { if (this._rootFormGroup.invalid) { this._rootFormGroup.markAllAsTouched(); } - // console.log(this._form); } public save() { diff --git a/libs/asset-editor/src/lib/components/asset-editor-tab-contacts/asset-editor-tab-contacts.component.html b/libs/asset-editor/src/lib/components/asset-editor-tab-contacts/asset-editor-tab-contacts.component.html index cc4ebf6b..4d94196d 100644 --- a/libs/asset-editor/src/lib/components/asset-editor-tab-contacts/asset-editor-tab-contacts.component.html +++ b/libs/asset-editor/src/lib/components/asset-editor-tab-contacts/asset-editor-tab-contacts.component.html @@ -71,8 +71,8 @@ -
-
+
+
diff --git a/libs/asset-editor/src/lib/components/asset-editor-tab-contacts/asset-editor-tab-contacts.component.ts b/libs/asset-editor/src/lib/components/asset-editor-tab-contacts/asset-editor-tab-contacts.component.ts index 70c97317..2aeb7bb8 100644 --- a/libs/asset-editor/src/lib/components/asset-editor-tab-contacts/asset-editor-tab-contacts.component.ts +++ b/libs/asset-editor/src/lib/components/asset-editor-tab-contacts/asset-editor-tab-contacts.component.ts @@ -1,6 +1,5 @@ import { ChangeDetectionStrategy, - ChangeDetectorRef, Component, EventEmitter, Input, diff --git a/libs/asset-editor/src/lib/components/asset-editor-tab-general/asset-editor-tab-general.component.html b/libs/asset-editor/src/lib/components/asset-editor-tab-general/asset-editor-tab-general.component.html index 709bb1ed..82d52b71 100644 --- a/libs/asset-editor/src/lib/components/asset-editor-tab-general/asset-editor-tab-general.component.html +++ b/libs/asset-editor/src/lib/components/asset-editor-tab-general/asset-editor-tab-general.component.html @@ -1,7 +1,7 @@
-
+
edit.tabs.general.title
edit.tabs.general.publicTitle @@ -89,7 +89,7 @@
-
+
edit.tabs.general.topic
0) { - this._form.controls.ids.setValue( - ids.filter((_, i) => i !== this._state.get().currentlyEditedIdIndex), - { emitEvent: false }, - ); - this._form.markAsDirty(); - } + } else if (ids.length > 0) { + this._form.controls.ids.setValue( + ids.filter((_, i) => i !== this._state.get().currentlyEditedIdIndex), + { emitEvent: false }, + ); + this._form.markAsDirty(); } + } }); } @@ -208,13 +205,12 @@ export class AssetEditorTabGeneralComponent implements OnInit { } public _saveIdFormClicked() { - const currentlyEditedIdIndex = this._state.get().currentlyEditedIdIndex; - if (currentlyEditedIdIndex !== -1) { - this._form.controls.ids.setValue( - this._form.controls.ids.value.map((v, i) => - i === currentlyEditedIdIndex ? { ...this.idForm.getRawValue(), idId: O.none } : v, - ), - ); + const i = this._state.get().currentlyEditedIdIndex; + this._state.set({ userInsertMode: false, currentlyEditedIdIndex: -1 }); + if (i >= 0) { + const newIds = [...this._form.controls.ids.value]; + newIds[i] = { ...this.idForm.getRawValue(), idId: O.none } + this._form.controls.ids.setValue(newIds); this._form.markAsDirty(); } else { this._form.controls.ids.setValue([ @@ -224,7 +220,6 @@ export class AssetEditorTabGeneralComponent implements OnInit { this._form.markAsDirty(); } this.idForm.reset(); - this._state.set({ userInsertMode: false, currentlyEditedIdIndex: -1 }); } public _deleteIdClicked(index: number) { @@ -240,7 +235,6 @@ export class AssetEditorTabGeneralComponent implements OnInit { public _fileInvalid$ = new BehaviorSubject(false); public _fileInputChange(inputElement: HTMLInputElement) { - // console.log('adsf', inputElement.files); const files = inputElement.files; if (files && files.length > 0) { if (Array.from(files).some(f => f.size > 250 * 1024 * 1024)) { diff --git a/libs/asset-editor/src/lib/components/asset-editor-tab-page/asset-editor-tab-page.component.scss b/libs/asset-editor/src/lib/components/asset-editor-tab-page/asset-editor-tab-page.component.scss index cffa04f9..a357fdd5 100644 --- a/libs/asset-editor/src/lib/components/asset-editor-tab-page/asset-editor-tab-page.component.scss +++ b/libs/asset-editor/src/lib/components/asset-editor-tab-page/asset-editor-tab-page.component.scss @@ -26,7 +26,7 @@ form { ::ng-deep { [role='tabpanel'] { - height: 100%; + height: calc(100% - 4rem); & > * { height: calc(100% - 1rem); } diff --git a/libs/asset-editor/src/lib/components/asset-editor-tab-references/asset-editor-tab-references.component.ts b/libs/asset-editor/src/lib/components/asset-editor-tab-references/asset-editor-tab-references.component.ts index 994504d9..6f19a7b9 100644 --- a/libs/asset-editor/src/lib/components/asset-editor-tab-references/asset-editor-tab-references.component.ts +++ b/libs/asset-editor/src/lib/components/asset-editor-tab-references/asset-editor-tab-references.component.ts @@ -2,7 +2,7 @@ import { HttpClient, HttpErrorResponse } from '@angular/common/http'; import { ChangeDetectionStrategy, Component, ElementRef, OnInit, ViewChild, inject } from '@angular/core'; import { FormBuilder, FormControl, FormGroupDirective, Validators } from '@angular/forms'; import { MatAutocompleteSelectedEvent } from '@angular/material/autocomplete'; -import { UntilDestroy, untilDestroyed } from '@ngneat/until-destroy'; +import { UntilDestroy } from '@ngneat/until-destroy'; import * as A from 'fp-ts/Array'; import * as E from 'fp-ts/Either'; import { flow, pipe } from 'fp-ts/function'; @@ -13,7 +13,6 @@ import { catchError, combineLatest, debounceTime, - delay, distinctUntilChanged, map, of, diff --git a/libs/asset-editor/src/lib/components/asset-editor-tab-usage/asset-editor-tab-usage.component.html b/libs/asset-editor/src/lib/components/asset-editor-tab-usage/asset-editor-tab-usage.component.html index e54dd3ad..f6bf9e4a 100644 --- a/libs/asset-editor/src/lib/components/asset-editor-tab-usage/asset-editor-tab-usage.component.html +++ b/libs/asset-editor/src/lib/components/asset-editor-tab-usage/asset-editor-tab-usage.component.html @@ -1,7 +1,7 @@ - +
-
+
edit.tabs.usage.internalUsage
-
+
+
@@ -173,6 +174,7 @@ – + diff --git a/libs/asset-viewer/src/lib/components/asset-search-results/asset-search-results.component.html b/libs/asset-viewer/src/lib/components/asset-search-results/asset-search-results.component.html index f5d328ea..077be62d 100644 --- a/libs/asset-viewer/src/lib/components/asset-search-results/asset-search-results.component.html +++ b/libs/asset-viewer/src/lib/components/asset-search-results/asset-search-results.component.html @@ -50,7 +50,7 @@ [routerLink]="['.']" [queryParams]="{ assetId: asset.assetId }" queryParamsHandling="merge" - class="asset-title-public" + class="asset-title-public break-word" [class.active]="currentAssetId._tag === 'Some' && asset.assetId === currentAssetId.value" [innerHTML]="asset.titlePublic">
diff --git a/libs/asset-viewer/src/lib/models/all-study-dto.ts b/libs/asset-viewer/src/lib/models/all-study-dto.ts index 438a6db7..fd6b9f66 100644 --- a/libs/asset-viewer/src/lib/models/all-study-dto.ts +++ b/libs/asset-viewer/src/lib/models/all-study-dto.ts @@ -2,7 +2,7 @@ import * as D from 'io-ts/Decoder'; import * as TEq from 'io-ts/Eq'; import { Equals, assert } from 'tsafe'; -import { AllStudyDTOFromAPI, eqLV95, LV95 } from '@asset-sg/shared'; +import { AllStudyDTOFromAPI, LV95, eqLV95 } from '@asset-sg/shared'; export const AllStudyDTO = D.struct({ studyId: D.string, diff --git a/libs/asset-viewer/src/lib/models/client-asset-search-params.ts b/libs/asset-viewer/src/lib/models/client-asset-search-params.ts index f1a9e679..a5cabc5f 100644 --- a/libs/asset-viewer/src/lib/models/client-asset-search-params.ts +++ b/libs/asset-viewer/src/lib/models/client-asset-search-params.ts @@ -9,7 +9,7 @@ import * as C from 'io-ts/Codec'; import * as D from 'io-ts/Decoder'; import { CT } from '@asset-sg/core'; -import { DateId, eqLV95, LV95 } from '@asset-sg/shared'; +import { DateId, LV95, eqLV95 } from '@asset-sg/shared'; export const RefinementGeomCode = C.fromDecoder( D.union(D.literal('Point'), D.literal('Polygon'), D.literal('LineString'), D.literal('None')), diff --git a/libs/auth/src/index.ts b/libs/auth/src/index.ts index 450bf6a4..2f757bd9 100644 --- a/libs/auth/src/index.ts +++ b/libs/auth/src/index.ts @@ -1,4 +1,3 @@ export * from './lib/auth.module'; export * from './lib/services/auth.interceptor'; export * from './lib/services/auth.service'; -export * from './lib/components/login'; diff --git a/libs/auth/src/lib/auth.module.ts b/libs/auth/src/lib/auth.module.ts index ffffd012..6e6d1ae3 100644 --- a/libs/auth/src/lib/auth.module.ts +++ b/libs/auth/src/lib/auth.module.ts @@ -11,27 +11,14 @@ import { TranslateModule } from '@ngx-translate/core'; import { ForModule } from '@rx-angular/template/for'; import { LetModule } from '@rx-angular/template/let'; import { PushModule } from '@rx-angular/template/push'; +import { OAuthModule } from 'angular-oauth2-oidc'; import { AnchorComponent, ButtonComponent, icons } from '@asset-sg/client-shared'; -import { ResetPasswordDialogComponent } from './components/reset-password-dialog'; -import { ResetPasswordPageComponent } from './components/reset-password-page'; -import { SetPasswordDialogComponent } from './components/set-password-dialog/set-password-dialog.component'; -import { SetPasswordPageComponent } from './components/set-password-page'; @NgModule({ imports: [ CommonModule, - RouterModule.forChild([ - { - path: 'reset-password', - component: ResetPasswordPageComponent, - }, - { - path: 'set-password', - component: SetPasswordPageComponent, - }, - ]), A11yModule, // TODO: This is not working. The translations are not loaded. TranslateModule.forChild({}), @@ -46,11 +33,17 @@ import { SetPasswordPageComponent } from './components/set-password-page'; MatFormFieldModule, MatInputModule, MatProgressBarModule, - ButtonComponent, AnchorComponent, + OAuthModule.forRoot({ + resourceServer: { + sendAccessToken: true, + allowedUrls: [], + customUrlValidation: (url: string) => !url.includes('oauth2/token'), + }, + }), ], + exports: [OAuthModule], providers: [provideSvgIcons(icons)], - declarations: [ResetPasswordDialogComponent, SetPasswordDialogComponent], }) export class AuthModule {} diff --git a/libs/auth/src/lib/components/login/index.ts b/libs/auth/src/lib/components/login/index.ts deleted file mode 100644 index 69c16441..00000000 --- a/libs/auth/src/lib/components/login/index.ts +++ /dev/null @@ -1 +0,0 @@ -export * from './login.component'; diff --git a/libs/auth/src/lib/components/login/login.component.html b/libs/auth/src/lib/components/login/login.component.html deleted file mode 100644 index 758225f9..00000000 --- a/libs/auth/src/lib/components/login/login.component.html +++ /dev/null @@ -1,93 +0,0 @@ - - - -
-

auth.forgotPassword

-

auth.recovery.enterEmail

-
- -

- auth.recovery.tooManyRequests -

- - - -
-
-

auth.recovery.recoverySuccess

-
- diff --git a/libs/auth/src/lib/components/login/login.component.scss b/libs/auth/src/lib/components/login/login.component.scss deleted file mode 100644 index f21088ed..00000000 --- a/libs/auth/src/lib/components/login/login.component.scss +++ /dev/null @@ -1,94 +0,0 @@ -@use '../../styles/variables'; - -mat-progress-bar { - position: absolute; - top: 0; - left: 2.5rem; - width: calc(100% - 5rem); -} - -h2 { - margin: 0 0 2rem 0; -} - -.state-enter-login-details { - form { - display: grid; - grid-template-areas: 'email' 'password' 'invalid-credentials' 'password-recover' 'login'; - } -} - -mat-form-field { - margin-bottom: 0.5rem; -} - -.invalid-credentials { - margin-top: -0.5rem; - margin-bottom: 0.5rem; -} - -.error { -} - -.email { - grid-area: email; -} - -.password { - grid-area: password; -} - -.invalid-credentials { - grid-area: invalid-credentials; - font-size: 0.875rem; - margin-left: 1rem; -} - -.login { - grid-area: login; - justify-self: flex-start; -} - -.password-recover { - grid-area: password-recover; - justify-self: flex-start; - margin-bottom: 1.75rem; -} - -.state-main { - animation: fadeIn 1.5s; -} - -.too-many-requests { - grid-area: too-many-requests; - font-size: 0.875rem; - margin: 0 0 1.75rem 1rem; - color: variables.$red-09; -} - -.send-email { - grid-area: submit-email; - justify-self: flex-start; - margin-bottom: 1.5rem; -} - -.back-to-login { - grid-area: back-to-login; - justify-self: flex-start; -} - -.state-enter-email-for-recovery { - form { - display: grid; - grid-template-areas: 'email' 'too-many-requests' 'submit-email' 'back-to-login'; - } -} - -@keyframes fadeIn { - 0% { - opacity: 0; - } - 100% { - opacity: 1; - } -} diff --git a/libs/auth/src/lib/components/login/login.component.ts b/libs/auth/src/lib/components/login/login.component.ts deleted file mode 100644 index e70dc482..00000000 --- a/libs/auth/src/lib/components/login/login.component.ts +++ /dev/null @@ -1,177 +0,0 @@ -import { A11yModule } from '@angular/cdk/a11y'; -import { DialogRef } from '@angular/cdk/dialog'; -import { DialogModule } from '@angular/cdk/dialog'; -import { CommonModule } from '@angular/common'; -import { ChangeDetectionStrategy, Component, inject } from '@angular/core'; -import { FormControl, FormsModule, ReactiveFormsModule } from '@angular/forms'; -import { FormBuilder } from '@angular/forms'; -import { MatFormFieldModule } from '@angular/material/form-field'; -import { MatInputModule } from '@angular/material/input'; -import { MatProgressBarModule } from '@angular/material/progress-bar'; -import * as RD from '@devexperts/remote-data-ts'; -import { ADTType, makeADT, ofType } from '@morphic-ts/adt'; -import { UntilDestroy, untilDestroyed } from '@ngneat/until-destroy'; -import { Store } from '@ngrx/store'; -import { TranslateModule } from '@ngx-translate/core'; -import { LetModule } from '@rx-angular/template/let'; -import { PushModule } from '@rx-angular/template/push'; -import { Observable, Subject, filter, map, merge, share, startWith, switchMap, withLatestFrom } from 'rxjs'; -import { Equals, assert } from 'tsafe'; - -import { - AnchorComponent, - AppState, - ButtonComponent, - appSharedStateActions, - isHttpErrorResponseError, -} from '@asset-sg/client-shared'; - -import { AuthService } from '../../services/auth.service'; - -@UntilDestroy() -@Component({ - standalone: true, - selector: 'asset-sg-login', - templateUrl: './login.component.html', - styleUrls: ['./login.component.scss'], - changeDetection: ChangeDetectionStrategy.OnPush, - imports: [ - FormsModule, - ReactiveFormsModule, - DialogModule, - MatFormFieldModule, - MatInputModule, - TranslateModule, - PushModule, - LetModule, - CommonModule, - AnchorComponent, - ButtonComponent, - A11yModule, - MatProgressBarModule, - ], - host: { - class: 'asset-sg-dialog', - }, -}) -export class LoginComponent { - public dialogRef = inject(DialogRef); - private authService = inject(AuthService); - private formBuilder = inject(FormBuilder); - private store: Store = inject(Store); - - form = this.formBuilder.group({ - email: new FormControl('', { nonNullable: true }), - password: new FormControl('', { nonNullable: true }), - }); - - public loginClicked$ = new Subject(); - public requestPasswordRecoverClicked$ = new Subject(); - public backToLoginClicked$ = new Subject(); - public submitPasswordRecoverClicked$ = new Subject(); - - public LoginState = LoginState; - public state$: Observable; - - constructor() { - const loginRequest$ = this.loginClicked$.pipe( - withLatestFrom(this.form.valueChanges), - switchMap(() => { - const { email, password } = this.form.getRawValue(); - return this.authService.login(email, password); - }), - share(), - ); - const loginResult$ = loginRequest$.pipe( - map( - RD.fold3( - () => LoginState.of.loginPending({}), - () => LoginState.of.loginFailure({}), - () => LoginState.of.loginSuccess({}), - ), - ), - share(), - ); - - const passwordRecoverClicked$ = this.submitPasswordRecoverClicked$.pipe( - switchMap(email => this.authService.recoverPassword(email)), - map( - RD.fold3( - () => LoginState.of.recoveryPending({}), - e => - isHttpErrorResponseError(e) && e.cause.status === 429 - ? LoginState.of.recoveryFailureTooManyRequests({}) - : LoginState.of.recoveryFailure({}), - () => LoginState.of.recoverySuccess({}), - ), - ), - ); - - this.state$ = merge( - loginResult$, - passwordRecoverClicked$, - this.requestPasswordRecoverClicked$.pipe(map(() => LoginState.of.enterEmailForRecovery({}))), - this.backToLoginClicked$.pipe(map(() => LoginState.of.enterLoginDetails({}))), - ).pipe(startWith(LoginState.of.enterLoginDetails({}))); - - loginRequest$.pipe(untilDestroyed(this)).subscribe(u => { - this.store.dispatch(appSharedStateActions.loadUserProfileResult(u)); - }); - - loginResult$.pipe(filter(LoginState.is.loginSuccess), untilDestroyed(this)).subscribe(() => { - this.dialogRef.close(); - }); - } -} - -interface EnterLoginDetails { - _tag: 'enterLoginDetails'; -} -interface LoginPending { - _tag: 'loginPending'; -} -interface LoginSuccess { - _tag: 'loginSuccess'; -} -interface LoginFailure { - _tag: 'loginFailure'; -} -interface EnterEmailForRecovery { - _tag: 'enterEmailForRecovery'; -} -interface RecoveryPending { - _tag: 'recoveryPending'; -} -interface RecoverySuccess { - _tag: 'recoverySuccess'; -} -interface RecoveryFailureTooManyRequests { - _tag: 'recoveryFailureTooManyRequests'; -} -interface RecoveryFailure { - _tag: 'recoveryFailure'; -} - -const LoginState = makeADT('_tag')({ - enterLoginDetails: ofType(), - loginPending: ofType(), - loginSuccess: ofType(), - loginFailure: ofType(), - enterEmailForRecovery: ofType(), - recoveryPending: ofType(), - recoverySuccess: ofType(), - recoveryFailureTooManyRequests: ofType(), - recoveryFailure: ofType(), -}); - -type LoginState = - | EnterLoginDetails - | LoginPending - | LoginSuccess - | LoginFailure - | EnterEmailForRecovery - | RecoveryPending - | RecoverySuccess - | RecoveryFailureTooManyRequests - | RecoveryFailure; -assert>>(); diff --git a/libs/auth/src/lib/components/reset-password-dialog/index.ts b/libs/auth/src/lib/components/reset-password-dialog/index.ts deleted file mode 100644 index cd2a6107..00000000 --- a/libs/auth/src/lib/components/reset-password-dialog/index.ts +++ /dev/null @@ -1 +0,0 @@ -export * from './reset-password-dialog.component'; diff --git a/libs/auth/src/lib/components/reset-password-dialog/reset-password-dialog.component.html b/libs/auth/src/lib/components/reset-password-dialog/reset-password-dialog.component.html deleted file mode 100644 index 4dc09506..00000000 --- a/libs/auth/src/lib/components/reset-password-dialog/reset-password-dialog.component.html +++ /dev/null @@ -1,41 +0,0 @@ - - -
initial
-
-

auth.reset.unauthorised

-

auth.reset.invalidEmailLink

- -
-
-

auth.reset.welcome

-

auth.reset.enterPassword

- - - - - -
-

passwordChangeFailure

-

{{ state.error.value.msg }}

-
-
passwordChangeSuccess
- diff --git a/libs/auth/src/lib/components/reset-password-dialog/reset-password-dialog.component.scss b/libs/auth/src/lib/components/reset-password-dialog/reset-password-dialog.component.scss deleted file mode 100644 index 61cffa41..00000000 --- a/libs/auth/src/lib/components/reset-password-dialog/reset-password-dialog.component.scss +++ /dev/null @@ -1,25 +0,0 @@ -@use '../../styles/variables'; - -:host { - display: block; - border-radius: 8px; - background-color: variables.$grey-01; - padding: 2rem 2.5rem; - min-height: 20rem; - width: 30rem; - box-shadow: 0px 3px 1px -2px rgba(0, 0, 0, 0.2), 0px 2px 2px 0px rgba(0, 0, 0, 0.14), - 0px 1px 5px 0px rgba(0, 0, 0, 0.12); -} - -.reset-password-main { - display: flex; - flex-direction: column; -} - -.submit-button { - align-self: flex-start; -} - -h2 { - margin: 0 2rem 0 0; -} diff --git a/libs/auth/src/lib/components/reset-password-dialog/reset-password-dialog.component.ts b/libs/auth/src/lib/components/reset-password-dialog/reset-password-dialog.component.ts deleted file mode 100644 index a0769bbc..00000000 --- a/libs/auth/src/lib/components/reset-password-dialog/reset-password-dialog.component.ts +++ /dev/null @@ -1,139 +0,0 @@ -import { DIALOG_DATA, DialogRef } from '@angular/cdk/dialog'; -import { DOCUMENT } from '@angular/common'; -import { ChangeDetectionStrategy, Component, inject } from '@angular/core'; -import { Router } from '@angular/router'; -import * as RD from '@devexperts/remote-data-ts'; -import { ADTType, makeADT, ofType } from '@morphic-ts/adt'; -import { UntilDestroy, untilDestroyed } from '@ngneat/until-destroy'; -import { RxState } from '@rx-angular/state'; -import { pipe } from 'fp-ts/function'; -import * as O from 'fp-ts/Option'; -import { Subject, filter, map, mergeMap, withLatestFrom } from 'rxjs'; -import { Equals, assert } from 'tsafe'; - -import { isHttpErrorResponseError } from '@asset-sg/client-shared'; -import { OO } from '@asset-sg/core'; - -import { PasswordHashParams } from '../../models'; -import { AuthErrorPayload } from '../../models/error-payload'; -import { AuthService } from '../../services/auth.service'; - -@UntilDestroy() -@Component({ - selector: 'asset-sg-reset-password-dialog', - templateUrl: './reset-password-dialog.component.html', - styleUrls: ['./reset-password-dialog.component.scss'], - changeDetection: ChangeDetectionStrategy.OnPush, - host: { - class: 'asset-sg-dialog', - }, -}) -export class ResetPasswordDialogComponent extends RxState { - public dialogRef = inject(DialogRef); - private router = inject(Router); - private authService = inject(AuthService); - private dcmnt = inject(DOCUMENT); - private data: { hashParams: PasswordHashParams } = inject(DIALOG_DATA); - - public state$ = this.select(); - public enterPassword$ = new Subject(); - public closeForUnauthorisedClientClicked$ = new Subject(); - - public ResetPasswordState = ResetPasswordState; - - constructor() { - super(); - - this.set(ResetPasswordState.of.initial({})); - - if (this.data.hashParams.hashParamsStatus === 'success') { - this.set(ResetPasswordState.of.enterNewPassword({ accessToken: this.data.hashParams.access_token })); - } else { - this.set(ResetPasswordState.of.unauthorisedClient({})); - } - - this.closeForUnauthorisedClientClicked$.pipe(untilDestroyed(this)).subscribe(() => { - this.dialogRef.close(); - this.router.navigate(['/']); - }); - - const newPasswordResult$ = this.enterPassword$.pipe( - withLatestFrom(this.state$), - map(([newPassword, state]) => - ResetPasswordState.is.enterNewPassword(state) - ? O.some({ newPassword, accessToken: state.accessToken }) - : O.none, - ), - OO.fromFilteredSome, - mergeMap(({ accessToken, newPassword }) => - this.authService.changePassword(accessToken, newPassword).pipe( - map( - RD.fold3( - () => ResetPasswordState.of.passwordChangePending({}), - e => { - return ResetPasswordState.of.passwordChangeFailure({ - error: pipe( - e, - O.fromPredicate(isHttpErrorResponseError), - O.chain(e => pipe(AuthErrorPayload.decode(e.cause.error), O.fromEither)), - ), - }); - }, - () => ResetPasswordState.of.passwordChangeSuccess({}), - ), - ), - ), - ), - ); - this.connect(newPasswordResult$, (_, nextState) => nextState); - - this.state$.pipe(filter(ResetPasswordState.is.passwordChangeSuccess), untilDestroyed(this)).subscribe(() => { - this.dialogRef.close(); - this.router.navigate(['/de']); - }); - } -} - -interface InitialState { - _tag: 'initial'; -} - -interface EnterNewPassword { - _tag: 'enterNewPassword'; - accessToken: string; -} - -interface UnauthorisedClient { - _tag: 'unauthorisedClient'; -} - -interface PasswordChangePending { - _tag: 'passwordChangePending'; -} - -interface PasswordChangeSuccess { - _tag: 'passwordChangeSuccess'; -} - -interface PasswordChangeFailure { - _tag: 'passwordChangeFailure'; - error: O.Option; -} - -const ResetPasswordState = makeADT('_tag')({ - initial: ofType(), - enterNewPassword: ofType(), - unauthorisedClient: ofType(), - passwordChangePending: ofType(), - passwordChangeSuccess: ofType(), - passwordChangeFailure: ofType(), -}); - -type ResetPasswordState = - | InitialState - | UnauthorisedClient - | EnterNewPassword - | PasswordChangePending - | PasswordChangeSuccess - | PasswordChangeFailure; -assert>>(); diff --git a/libs/auth/src/lib/components/reset-password-page/index.ts b/libs/auth/src/lib/components/reset-password-page/index.ts deleted file mode 100644 index 515df6f9..00000000 --- a/libs/auth/src/lib/components/reset-password-page/index.ts +++ /dev/null @@ -1 +0,0 @@ -export * from './reset-password-page.component'; diff --git a/libs/auth/src/lib/components/reset-password-page/reset-password-page.component.scss b/libs/auth/src/lib/components/reset-password-page/reset-password-page.component.scss deleted file mode 100644 index 4643f242..00000000 --- a/libs/auth/src/lib/components/reset-password-page/reset-password-page.component.scss +++ /dev/null @@ -1,5 +0,0 @@ -@use '../../styles/variables'; - -:host { - background-color: variables.$grey-03; -} diff --git a/libs/auth/src/lib/components/reset-password-page/reset-password-page.component.ts b/libs/auth/src/lib/components/reset-password-page/reset-password-page.component.ts deleted file mode 100644 index c0bac2c8..00000000 --- a/libs/auth/src/lib/components/reset-password-page/reset-password-page.component.ts +++ /dev/null @@ -1,31 +0,0 @@ -import { Dialog } from '@angular/cdk/dialog'; -import { DOCUMENT } from '@angular/common'; -import { ChangeDetectionStrategy, Component, inject } from '@angular/core'; -import { Router } from '@angular/router'; -import * as E from 'fp-ts/Either'; - -import { passwordHashParams } from '../../models/hash-params'; -import { ResetPasswordDialogComponent } from '../reset-password-dialog'; - -@Component({ - selector: 'asset-sg-reset-password-page', - template: '', - styleUrls: ['./reset-password-page.component.scss'], - changeDetection: ChangeDetectionStrategy.OnPush, -}) -export class ResetPasswordPageComponent { - private dcmnt = inject(DOCUMENT); - private router = inject(Router); - - constructor(private dialog: Dialog) { - const hashParamsDecoded = passwordHashParams('recovery').decode(this.dcmnt.location.hash); - if (E.isRight(hashParamsDecoded)) { - this.dialog.open(ResetPasswordDialogComponent, { - disableClose: true, - data: { hashParams: hashParamsDecoded.right }, - }); - } else { - this.router.navigate(['/']); - } - } -} diff --git a/libs/auth/src/lib/components/set-password-dialog/set-password-dialog.component.html b/libs/auth/src/lib/components/set-password-dialog/set-password-dialog.component.html deleted file mode 100644 index 300bd66f..00000000 --- a/libs/auth/src/lib/components/set-password-dialog/set-password-dialog.component.html +++ /dev/null @@ -1,41 +0,0 @@ - - -
initial
-
-

auth.reset.unauthorised

-

auth.reset.invalidEmailLink

- -
-
-

auth.set.welcome

-

auth.set.enterPassword

- - - - - -
-

passwordChangeFailure

-

{{ state.error.value.msg }}

-
-
passwordChangeSuccess
- diff --git a/libs/auth/src/lib/components/set-password-dialog/set-password-dialog.component.scss b/libs/auth/src/lib/components/set-password-dialog/set-password-dialog.component.scss deleted file mode 100644 index ba463bdb..00000000 --- a/libs/auth/src/lib/components/set-password-dialog/set-password-dialog.component.scss +++ /dev/null @@ -1,26 +0,0 @@ -@use '../../styles/variables'; - -:host { - display: block; - border-radius: 8px; - background-color: variables.$grey-01; - padding: 2rem 2.5rem; - box-shadow: 0px 3px 1px -2px rgba(0, 0, 0, 0.2), 0px 2px 2px 0px rgba(0, 0, 0, 0.14), - 0px 1px 5px 0px rgba(0, 0, 0, 0.12); - width: 30rem; - min-height: 20rem; - position: relative; -} - -.reset-password-main { - display: flex; - flex-direction: column; -} - -.submit-button { - align-self: flex-start; -} - -h2 { - margin: 0 2rem 0 0; -} diff --git a/libs/auth/src/lib/components/set-password-dialog/set-password-dialog.component.ts b/libs/auth/src/lib/components/set-password-dialog/set-password-dialog.component.ts deleted file mode 100644 index ffbcdd51..00000000 --- a/libs/auth/src/lib/components/set-password-dialog/set-password-dialog.component.ts +++ /dev/null @@ -1,139 +0,0 @@ -import { DIALOG_DATA, DialogRef } from '@angular/cdk/dialog'; -import { DOCUMENT } from '@angular/common'; -import { ChangeDetectionStrategy, Component, inject } from '@angular/core'; -import { Router } from '@angular/router'; -import * as RD from '@devexperts/remote-data-ts'; -import { ADTType, makeADT, ofType } from '@morphic-ts/adt'; -import { UntilDestroy, untilDestroyed } from '@ngneat/until-destroy'; -import { RxState } from '@rx-angular/state'; -import { pipe } from 'fp-ts/function'; -import * as O from 'fp-ts/Option'; -import { Subject, filter, map, mergeMap, withLatestFrom } from 'rxjs'; -import { Equals, assert } from 'tsafe'; - -import { isHttpErrorResponseError } from '@asset-sg/client-shared'; -import { OO } from '@asset-sg/core'; - -import { PasswordHashParams } from '../../models'; -import { AuthErrorPayload } from '../../models/error-payload'; -import { AuthService } from '../../services/auth.service'; - -@UntilDestroy() -@Component({ - selector: 'asset-sg-set-password-dialog', - templateUrl: './set-password-dialog.component.html', - styleUrls: ['./set-password-dialog.component.scss'], - changeDetection: ChangeDetectionStrategy.OnPush, - host: { - class: 'asset-sg-dialog', - }, -}) -export class SetPasswordDialogComponent extends RxState { - public dialogRef = inject(DialogRef); - private router = inject(Router); - private authService = inject(AuthService); - private dcmnt = inject(DOCUMENT); - private data: { hashParams: PasswordHashParams } = inject(DIALOG_DATA); - - public state$ = this.select(); - public enterPassword$ = new Subject(); - public closeForUnauthorisedClientClicked$ = new Subject(); - - public ResetPasswordState = ResetPasswordState; - - constructor() { - super(); - - this.set(ResetPasswordState.of.initial({})); - - if (this.data.hashParams.hashParamsStatus === 'success') { - this.set(ResetPasswordState.of.enterNewPassword({ accessToken: this.data.hashParams.access_token })); - } else { - this.set(ResetPasswordState.of.unauthorisedClient({})); - } - - this.closeForUnauthorisedClientClicked$.pipe(untilDestroyed(this)).subscribe(() => { - this.dialogRef.close(); - this.router.navigate(['/']); - }); - - const newPasswordResult$ = this.enterPassword$.pipe( - withLatestFrom(this.state$), - map(([newPassword, state]) => - ResetPasswordState.is.enterNewPassword(state) - ? O.some({ newPassword, accessToken: state.accessToken }) - : O.none, - ), - OO.fromFilteredSome, - mergeMap(({ accessToken, newPassword }) => - this.authService.changePassword(accessToken, newPassword).pipe( - map( - RD.fold3( - () => ResetPasswordState.of.passwordChangePending({}), - e => { - return ResetPasswordState.of.passwordChangeFailure({ - error: pipe( - e, - O.fromPredicate(isHttpErrorResponseError), - O.chain(e => pipe(AuthErrorPayload.decode(e.cause.error), O.fromEither)), - ), - }); - }, - () => ResetPasswordState.of.passwordChangeSuccess({}), - ), - ), - ), - ), - ); - this.connect(newPasswordResult$, (_, nextState) => nextState); - - this.state$.pipe(filter(ResetPasswordState.is.passwordChangeSuccess), untilDestroyed(this)).subscribe(() => { - this.dialogRef.close(); - this.router.navigate(['/de']); - }); - } -} - -interface InitialState { - _tag: 'initial'; -} - -interface EnterNewPassword { - _tag: 'enterNewPassword'; - accessToken: string; -} - -interface UnauthorisedClient { - _tag: 'unauthorisedClient'; -} - -interface PasswordChangePending { - _tag: 'passwordChangePending'; -} - -interface PasswordChangeSuccess { - _tag: 'passwordChangeSuccess'; -} - -interface PasswordChangeFailure { - _tag: 'passwordChangeFailure'; - error: O.Option; -} - -const ResetPasswordState = makeADT('_tag')({ - initial: ofType(), - enterNewPassword: ofType(), - unauthorisedClient: ofType(), - passwordChangePending: ofType(), - passwordChangeSuccess: ofType(), - passwordChangeFailure: ofType(), -}); - -type ResetPasswordState = - | InitialState - | UnauthorisedClient - | EnterNewPassword - | PasswordChangePending - | PasswordChangeSuccess - | PasswordChangeFailure; -assert>>(); diff --git a/libs/auth/src/lib/components/set-password-page/index.ts b/libs/auth/src/lib/components/set-password-page/index.ts deleted file mode 100644 index 821bf9df..00000000 --- a/libs/auth/src/lib/components/set-password-page/index.ts +++ /dev/null @@ -1 +0,0 @@ -export * from './set-password-page.component'; diff --git a/libs/auth/src/lib/components/set-password-page/set-password-page.component.scss b/libs/auth/src/lib/components/set-password-page/set-password-page.component.scss deleted file mode 100644 index 4643f242..00000000 --- a/libs/auth/src/lib/components/set-password-page/set-password-page.component.scss +++ /dev/null @@ -1,5 +0,0 @@ -@use '../../styles/variables'; - -:host { - background-color: variables.$grey-03; -} diff --git a/libs/auth/src/lib/components/set-password-page/set-password-page.component.ts b/libs/auth/src/lib/components/set-password-page/set-password-page.component.ts deleted file mode 100644 index 380e831e..00000000 --- a/libs/auth/src/lib/components/set-password-page/set-password-page.component.ts +++ /dev/null @@ -1,32 +0,0 @@ -import { Dialog } from '@angular/cdk/dialog'; -import { DOCUMENT } from '@angular/common'; -import { ChangeDetectionStrategy, Component, inject } from '@angular/core'; -import { Router } from '@angular/router'; -import * as E from 'fp-ts/Either'; - -import { passwordHashParams } from '../../models'; -import { SetPasswordDialogComponent } from '../set-password-dialog/set-password-dialog.component'; - -@Component({ - selector: 'asset-sg-aset-password-page', - template: '', - styleUrls: ['./set-password-page.component.scss'], - changeDetection: ChangeDetectionStrategy.OnPush, -}) -export class SetPasswordPageComponent { - private dcmnt = inject(DOCUMENT); - private router = inject(Router); - - constructor(private dialog: Dialog) { - const hashParamsDecoded = passwordHashParams('invite').decode(this.dcmnt.location.hash); - console.log({ hashParamsDecoded }); - if (E.isRight(hashParamsDecoded)) { - this.dialog.open(SetPasswordDialogComponent, { - disableClose: true, - data: { hashParams: hashParamsDecoded.right }, - }); - } else { - this.router.navigate(['/']); - } - } -} diff --git a/libs/auth/src/lib/services/auth.interceptor.ts b/libs/auth/src/lib/services/auth.interceptor.ts index f629c414..384f3488 100644 --- a/libs/auth/src/lib/services/auth.interceptor.ts +++ b/libs/auth/src/lib/services/auth.interceptor.ts @@ -1,62 +1,39 @@ -import { Dialog } from '@angular/cdk/dialog'; -import { - HttpErrorResponse, - HttpEvent, - HttpHandler, - HttpInterceptor, - HttpRequest, - HttpResponse, -} from '@angular/common/http'; +import { HttpErrorResponse, HttpEvent, HttpHandler, HttpInterceptor, HttpRequest } from '@angular/common/http'; import { Injectable, inject } from '@angular/core'; -import * as RD from '@devexperts/remote-data-ts'; -import { Observable, Subject, exhaustMap, filter, map, retry, shareReplay, startWith, take } from 'rxjs'; - -import { LoginComponent } from '../components/login'; +import { Router } from '@angular/router'; +import { OAuthService } from 'angular-oauth2-oidc'; +import { EMPTY, Observable, catchError } from 'rxjs'; @Injectable() export class AuthInterceptor implements HttpInterceptor { - private loginSignal$ = new Subject(); - private loginResult$ = this.loginSignal$.pipe( - exhaustMap(() => this.attemptRefreshTokenThenLoginFromComponent().pipe(map(RD.success), startWith(RD.pending))), - shareReplay({ bufferSize: 1, refCount: false }), - ); - - private dialog = inject(Dialog); - - intercept(req: HttpRequest, next: HttpHandler): Observable> { - return next.handle(req).pipe( - filter(event => event instanceof HttpResponse), - retry({ - delay: (error: HttpErrorResponse) => { - if (error.status !== 401) { - throw error; - } - return this.login(); - }, - }), - ); - } + private _oauthService = inject(OAuthService); + private _router: Router = inject(Router); - private login() { - setTimeout(() => { - this.loginSignal$.next(); - }); - return this.loginResult$.pipe(filter(RD.isSuccess), take(1)); - } - - private attemptRefreshTokenThenLoginFromComponent() { - return this.loginFromComponent(); - } + intercept(req: HttpRequest, next: HttpHandler): Observable> { + const token = sessionStorage.getItem('access_token'); - private loginFromComponent() { - try { - const dialogRef = this.dialog.open(LoginComponent, { - disableClose: true, - }); - return dialogRef.closed; - } catch (e) { - console.log(e); - throw e; - } + if ( + (this._oauthService.issuer && req.url.includes(this._oauthService.issuer)) || + (this._oauthService.tokenEndpoint && req.url.includes(this._oauthService.tokenEndpoint)) || + req.url.includes('oauth-config/config') + ) { + return next.handle(req); + } else if (token && !this._oauthService.hasValidAccessToken()) { + this._oauthService.logOut({ + client_id: this._oauthService.clientId, + redirect_uri: window.location.origin, + response_type: this._oauthService.responseType, + }); + return EMPTY; + } else if (!token) { + return EMPTY; + } else { + return next.handle(req).pipe( + catchError((error: HttpErrorResponse) => { + this._router.navigate(['de/error'], { state: { errorMessage: error.error.error } }); + return EMPTY; + }), + ); } + } } diff --git a/libs/auth/src/lib/services/auth.service.ts b/libs/auth/src/lib/services/auth.service.ts index 80045d64..1ce63ed9 100644 --- a/libs/auth/src/lib/services/auth.service.ts +++ b/libs/auth/src/lib/services/auth.service.ts @@ -1,131 +1,69 @@ -import { DOCUMENT } from '@angular/common'; import { HttpClient } from '@angular/common/http'; import { Injectable, inject } from '@angular/core'; import * as RD from '@devexperts/remote-data-ts'; -import { TranslateService } from '@ngx-translate/core'; -import * as E from 'fp-ts/Either'; -import { flow } from 'fp-ts/function'; +import { OAuthService } from 'angular-oauth2-oidc'; import * as D from 'io-ts/Decoder'; -import { catchError, map, of, startWith, tap } from 'rxjs'; +import { map, startWith } from 'rxjs'; import urlJoin from 'url-join'; import { ApiError, httpErrorResponseOrUnknownError } from '@asset-sg/client-shared'; import { OE, ORD, decode, decodeError } from '@asset-sg/core'; import { User } from '@asset-sg/shared'; -const TokenEndpointResponse = D.struct({ - access_token: D.string, - refresh_token: D.string, -}); -interface TokenEndpointResponse extends D.TypeOf {} + + @Injectable({ providedIn: 'root' }) export class AuthService { private _httpClient = inject(HttpClient); - private _dcmnt = inject(DOCUMENT); - private _translateService = inject(TranslateService); - private _getUserProfile() { - return this._httpClient - .get('/api/user') - .pipe(map(decode(User)), OE.catchErrorW(httpErrorResponseOrUnknownError)); + private _oauthService = inject(OAuthService); + + public async configureOAuth( + issuer: string, + clientId: string, + scope: string, + showDebugInformation: boolean, + tokenEndpoint: string, + ) { + this._oauthService.configure({ + issuer, + redirectUri: window.location.origin, + postLogoutRedirectUri: window.location.origin, + clientId, + scope, + responseType: 'code', + showDebugInformation, + strictDiscoveryDocumentValidation: false, + tokenEndpoint, + }); + await this._oauthService.loadDiscoveryDocumentAndLogin(); + this._oauthService.setupAutomaticSilentRefresh(); } getUserProfile(): ORD.ObservableRemoteData { return this._getUserProfile().pipe(map(RD.fromEither), startWith(RD.pending)); } - login(email: string, password: string): ORD.ObservableRemoteData { - return this._httpClient.post(this.buildAuthUrl('token?grant_type=password'), { email, password }).pipe( - map(E.right), - catchError(e => of(E.left(httpErrorResponseOrUnknownError(e)))), - OE.chainEitherW(flow(TokenEndpointResponse.decode, E.mapLeft(decodeError))), - tap(a => { - if (E.isRight(a)) { - localStorage.setItem('accessToken', a.right.access_token); - localStorage.setItem('refreshToken', a.right.refresh_token); - } else { - localStorage.removeItem('accessToken'); - localStorage.removeItem('refreshToken'); - } - }), - OE.chainSwitchMapW(() => this._getUserProfile()), - map(RD.fromEither), - startWith(RD.pending), - ); + isLoggedIn(): boolean { + return this._oauthService.hasValidAccessToken(); } - logout(): ORD.ObservableRemoteData { - const accessToken = localStorage.getItem('accessToken'); - return this._httpClient - .post( - this.buildAuthUrl('/logout'), - {}, - { - headers: { - Authorization: 'Bearer ' + accessToken, - }, - }, - ) - .pipe( - map(() => E.right(undefined)), - OE.catchErrorW(httpErrorResponseOrUnknownError), - map(RD.fromEither), - startWith(RD.pending), - ); - } - recoverPassword(email: string): ORD.ObservableRemoteData { - return this._httpClient - .post( - this.buildAuthUrl('recover'), - { email }, - { - headers: { - redirect_to: urlJoin( - this._dcmnt.location.origin, - this._translateService.currentLang || 'de', - '/a/reset-password', - ), - }, - }, - ) - .pipe( - map(() => E.right(undefined)), - OE.catchErrorW(httpErrorResponseOrUnknownError), - map(RD.fromEither), - startWith(RD.pending), - ); + logOut(): void { + this._oauthService.logOut({ + client_id: this._oauthService.clientId, + redirect_uri: window.location.origin, + response_type: this._oauthService.responseType, + }); } - // refreshAccessToken() { - // return this.httpClient.post('http://localhost:4200/auth/token?grant_type=refresh_token', {}); - // } - - // verifyRecoveryToken(email: string, token: string): ORD.ObservableRemoteData { - // return this.httpClient.post(buildAuthUrl('verify'), { type: 'recovery', token, email }).pipe( - // // return this.httpClient - // // .get(buildAuthUrl('verify?') + queryString.stringify({ type: 'recovery', token, email })) - // // .pipe( - // map(() => E.right(undefined)), - // catchError((err: HttpErrorResponse) => - // of(E.left(apiErrorResponseError({ status: err.status, statusText: err.statusText, error: err.error }))), - // ), - // map(RD.fromEither), - // startWith(RD.pending), - // ); - // } - - changePassword(accessToken: string, password: string): ORD.ObservableRemoteData { + private _getUserProfile() { return this._httpClient - .put(this.buildAuthUrl('user'), { password }, { headers: { Authorization: 'Bearer ' + accessToken } }) - .pipe( - map(() => E.right(undefined)), - OE.catchErrorW(httpErrorResponseOrUnknownError), - map(RD.fromEither), - startWith(RD.pending), - ); + .get('/api/user') + .pipe(map(decode(User)), OE.catchErrorW(httpErrorResponseOrUnknownError)); } + buildAuthUrl = (path: string) => urlJoin(`/auth`, path); } diff --git a/libs/client-shared/src/lib/components/button/button.component.scss b/libs/client-shared/src/lib/components/button/button.component.scss index ba728cb3..a4b49108 100644 --- a/libs/client-shared/src/lib/components/button/button.component.scss +++ b/libs/client-shared/src/lib/components/button/button.component.scss @@ -66,7 +66,7 @@ background-color: #87d7e6; color: #357183; } - &:active:not(focus) { + &:active:not(:focus) { box-shadow: none; background-color: variables.$cyan-06; color: variables.$white; @@ -110,7 +110,7 @@ &:focus { color: variables.$red; } - &:active:not(focus) { + &:active:not(:focus) { color: variables.$dark-red; } } @@ -135,7 +135,7 @@ &:focus { color: variables.$red; } - &:active:not(focus) { + &:active:not(:focus) { color: variables.$dark-red; } } diff --git a/libs/client-shared/src/lib/components/drag-handle/drag-handle.component.ts b/libs/client-shared/src/lib/components/drag-handle/drag-handle.component.ts index 4fe95032..9aac56f2 100644 --- a/libs/client-shared/src/lib/components/drag-handle/drag-handle.component.ts +++ b/libs/client-shared/src/lib/components/drag-handle/drag-handle.component.ts @@ -1,6 +1,6 @@ import { DOCUMENT } from '@angular/common'; import { Component, ElementRef, EventEmitter, NgZone, Output, inject } from '@angular/core'; -import { Observable, distinctUntilChanged, finalize, fromEvent, map, merge, of, share, switchMap } from 'rxjs'; +import { Observable, distinctUntilChanged, fromEvent, map, merge, of, share, switchMap } from 'rxjs'; export type DragHandleOffset = { offsetX: number; offsetY: number } | null; diff --git a/libs/core/src/lib/ngrx-store-logger/ngrx-store-logger.spec.ts b/libs/core/src/lib/ngrx-store-logger/ngrx-store-logger.spec.ts new file mode 100644 index 00000000..8107c3a8 --- /dev/null +++ b/libs/core/src/lib/ngrx-store-logger/ngrx-store-logger.spec.ts @@ -0,0 +1,17 @@ +import { ActionReducer } from '@ngrx/store'; + +import { storeLogger } from './ngrx-store-logger'; + +describe('storeLogger', () => { + + it('should log state and action', () => { + const consoleLogSpy = jest.spyOn(console, 'log').mockImplementation(() => { /* noop */ }); + const metaReducer = storeLogger(); + const actionReducer: ActionReducer = (state: string | undefined, action: any) => { return state || ''; }; + + metaReducer(actionReducer)('state', { type: 'test' }); + + expect(consoleLogSpy).toHaveBeenCalled(); + }); + +}); \ No newline at end of file diff --git a/libs/core/src/lib/serialize-error/serialize-error.spec.ts b/libs/core/src/lib/serialize-error/serialize-error.spec.ts new file mode 100644 index 00000000..47978365 --- /dev/null +++ b/libs/core/src/lib/serialize-error/serialize-error.spec.ts @@ -0,0 +1,68 @@ +import { NonError, deserializeError, isErrorLike, serializeError} from './serialize-error'; + +describe('serializeError', () => { + it('should serialize error objects', () => { + const error = new Error('Test error'); + const serialized = serializeError(error); + expect(serialized).toHaveProperty('name', 'Error'); + expect(serialized).toHaveProperty('message', 'Test error'); + expect(serialized).toHaveProperty('stack'); + }); + + it('should serialize non-error objects', () => { + const obj = { key: 'value' }; + const serialized = serializeError(obj); + expect(serialized).toEqual(obj); + }); + + it('should serialize primitive values', () => { + expect(serializeError('test')).toBe('test'); + expect(serializeError(123)).toBe(123); + }); +}); + +describe('deserializeError', () => { + it('should deserialize serialized error objects', () => { + const error = new Error('Test error'); + const serialized = serializeError(error); + const deserialized = deserializeError(serialized); + expect(deserialized).toBeInstanceOf(Error); + expect(deserialized.message).toBe('Test error'); + }); + + it('should return NonError for non-error objects', () => { + const obj = { key: 'value' }; + const deserialized = deserializeError(obj); + expect(deserialized).toBeInstanceOf(NonError); + expect(deserialized.message).toBe(JSON.stringify(obj)); + }); + + it('should return NonError for primitive string', () => { + const deserialized = deserializeError('test'); + expect(deserialized).toBeInstanceOf(NonError); + expect(deserialized.message).toBe('"test"'); + }); + + it('should return NonError for primitive number', () => { + const deserialized = deserializeError(123); + expect(deserialized).toBeInstanceOf(NonError); + expect(deserialized.message).toBe('123'); + }); +}); + +describe('isErrorLike', () => { + it('should return true for error objects', () => { + const error = new Error('Test error'); + expect(isErrorLike(error)).toBe(true); + }); + + it('should return false for non-error objects', () => { + const obj = { key: 'value' }; + expect(isErrorLike(obj)).toBe(false); + }); + + it('should return false for primitive values', () => { + expect(isErrorLike('test')).toBe(false); + expect(isErrorLike(123)).toBe(false); + }); +}); \ No newline at end of file diff --git a/libs/core/src/lib/utils/array.ts b/libs/core/src/lib/utils/array.ts index b802ef20..a11aed84 100644 --- a/libs/core/src/lib/utils/array.ts +++ b/libs/core/src/lib/utils/array.ts @@ -6,39 +6,3 @@ export const makePairs = (as: Array): Array<[A, A]> => { return bs; }; -type ClassType = string | string[] | Set | { [key: string]: unknown }; - -const addClass = (currentClass: ClassType, className: string): ClassType => { - if (!currentClass) { - return className; - } - if (typeof currentClass == 'string' && !currentClass.match(className)) { - return `${currentClass} ${className}`; - } - if (Array.isArray(currentClass) && !currentClass.includes(className)) { - return [...currentClass, className]; - } - if (currentClass instanceof Set) { - return currentClass.add(className); - } - if (typeof currentClass === 'object') { - return { ...currentClass, [className]: true }; - } - return currentClass; -}; - -const removeClass = (currentClass: ClassType, className: string): ClassType => { - if (typeof currentClass == 'string' && !currentClass.match(className)) { - return currentClass.replace(`\\s*${className}`, ''); - } - if (Array.isArray(currentClass) && !currentClass.includes(className)) { - return currentClass.filter(c => c !== className); - } - if (currentClass instanceof Set) { - return currentClass.add(className); - } - if (typeof currentClass === 'object') { - return { ...currentClass, [className]: true }; - } - return currentClass; -}; diff --git a/libs/favourite/src/lib/services/favourite.service.spec.ts b/libs/favourite/src/lib/services/favourite.service.spec.ts new file mode 100644 index 00000000..0c192f80 --- /dev/null +++ b/libs/favourite/src/lib/services/favourite.service.spec.ts @@ -0,0 +1,40 @@ +import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing'; +import { TestBed } from '@angular/core/testing'; + +import { Favourite, FavouriteService } from './favourite.service'; + +describe('FavouriteService', () => { + let service: FavouriteService; + let httpMock: HttpTestingController; + + beforeEach(() => { + TestBed.configureTestingModule({ + imports: [HttpClientTestingModule], + providers: [FavouriteService] + }); + + service = TestBed.inject(FavouriteService); + httpMock = TestBed.inject(HttpTestingController); + }); + + afterEach(() => { + httpMock.verify(); // Ensure that there are no outstanding requests + }); + + it('should be created', () => { + expect(service).toBeTruthy(); + }); + + it('should retrieve favourites from API via GET', () => { + const dummyFavourites: Favourite[] = [{}, {}, {}]; + + service.getFavourites().subscribe(favourites => { + expect(favourites.length).toBe(3); + expect(favourites).toEqual(dummyFavourites); + }); + + const request = httpMock.expectOne(`/api/user/favourite`); + expect(request.request.method).toBe('GET'); + request.flush(dummyFavourites); + }); +}); \ No newline at end of file diff --git a/libs/ngx-kobalte/src/lib/components/tabs.ts b/libs/ngx-kobalte/src/lib/components/tabs.ts index 18cf8a7d..76d26c3b 100644 --- a/libs/ngx-kobalte/src/lib/components/tabs.ts +++ b/libs/ngx-kobalte/src/lib/components/tabs.ts @@ -1,7 +1,7 @@ import { Tabs } from '@kobalte/core'; import type { TabsContentOptions, TabsRootOptions, TabsTriggerOptions } from '@kobalte/core/dist/types/tabs'; import { Observable } from 'rxjs'; -import { Accessor, createSignal } from 'solid-js'; +import { Accessor } from 'solid-js'; import h from 'solid-js/h'; import { render } from 'solid-js/web'; @@ -23,8 +23,7 @@ export interface KobalteTabProps { export function KobalteTabs(element: HTMLElement, props: KobalteTabsProps, tabs$: Observable) { const tabs = fromWithStartWith(tabs$, []); - // const [tabKey, setTabKey] = createSignal(undefined); - // setTimeout(() => setTabKey('usage')); + render( () => h(Tabs.Root, props, () => [ diff --git a/libs/ngx-kobalte/tsconfig.spec.json b/libs/ngx-kobalte/tsconfig.spec.json index 20c8d279..89870c6c 100644 --- a/libs/ngx-kobalte/tsconfig.spec.json +++ b/libs/ngx-kobalte/tsconfig.spec.json @@ -14,6 +14,7 @@ "src/**/*.spec.js", "src/**/*.test.jsx", "src/**/*.spec.jsx", - "src/**/*.d.ts" + "src/**/*.d.ts", + "src/lib/components/list-box.s.ts" ] } diff --git a/libs/profile/src/lib/components/profile/profile.component.ts b/libs/profile/src/lib/components/profile/profile.component.ts index 88d568b0..d43fcfc8 100644 --- a/libs/profile/src/lib/components/profile/profile.component.ts +++ b/libs/profile/src/lib/components/profile/profile.component.ts @@ -55,11 +55,9 @@ export class ProfileComponent extends RxState { this._cd.detectChanges(); }); - this.logoutClicked$.pipe(switchMap(() => this._authService.logout())).subscribe(rd => { - if (rdIsComplete(rd)) { + this.logoutClicked$.pipe(switchMap(async () => this._authService.logOut())).subscribe(rd => { this._store.dispatch(appSharedStateActions.logout()); this._router.navigate(['/']); - } }); } } diff --git a/libs/shared/src/lib/models/asset-usage.ts b/libs/shared/src/lib/models/asset-usage.ts index 383bfeb3..83968702 100644 --- a/libs/shared/src/lib/models/asset-usage.ts +++ b/libs/shared/src/lib/models/asset-usage.ts @@ -15,3 +15,4 @@ export const AssetUsage = C.struct({ statusAssetUseItemCode: StatusAssetUseCode, startAvailabilityDate: CT.optionFromNullable(DateId), }); +export type AssetUsage = C.TypeOf; diff --git a/libs/shared/src/lib/models/user.ts b/libs/shared/src/lib/models/user.ts index 4885a07d..70d0363e 100644 --- a/libs/shared/src/lib/models/user.ts +++ b/libs/shared/src/lib/models/user.ts @@ -42,6 +42,8 @@ export const UserPost = D.struct({ email: D.string, role: UserRoleDecoder, lang: D.string, + oidcId: D.string, + id: D.string }); export interface UserPost extends D.TypeOf {} diff --git a/package-lock.json b/package-lock.json index 33ea5b3b..75c7f717 100644 --- a/package-lock.json +++ b/package-lock.json @@ -21,12 +21,13 @@ "@angular/platform-browser": "15.1.0", "@angular/platform-browser-dynamic": "15.1.0", "@angular/router": "15.1.0", - "@aws-sdk/client-s3": "^3.241.0", + "@aws-sdk/client-s3": "^3.537.0", "@devexperts/remote-data-ts": "^2.1.1", "@elastic/elasticsearch": "^8.5.0", "@kobalte/core": "^0.4.0", "@morphic-ts/adt": "^3.0.0", "@nestjs/axios": "^2.0.0", + "@nestjs/cache-manager": "^2.2.2", "@nestjs/common": "^9.0.0", "@nestjs/core": "^9.0.0", "@nestjs/platform-express": "^9.0.0", @@ -45,12 +46,15 @@ "@turf/boolean-within": "^6.5.0", "@turf/helpers": "^6.5.0", "@turf/midpoint": "^6.5.0", + "angular-oauth2-oidc": "^17.0.1", "bezier-easing": "^2.1.0", + "cache-manager": "^5.4.0", "csv-parse": "^5.3.3", "cuid": "^3.0.0", "fp-ts": "^2.13.1", "io-ts": "^2.2.20", "jsonwebtoken": "^9.0.0", + "jwk-to-pem": "^2.0.5", "monocle-ts": "^2.3.13", "newtype-ts": "^0.3.5", "ngx-window-token": "^6.0.0", @@ -71,13 +75,14 @@ "zone.js": "~0.11.4" }, "devDependencies": { - "@angular-devkit/build-angular": "15.1.1", + "@angular-devkit/build-angular": "15.2.10", "@angular-eslint/eslint-plugin": "~15.0.0", "@angular-eslint/eslint-plugin-template": "~15.0.0", "@angular-eslint/template-parser": "~15.0.0", "@angular/cli": "~15.0.0", "@angular/compiler-cli": "15.1.0", "@angular/language-service": "15.1.0", + "@faker-js/faker": "^8.4.1", "@nestjs/schematics": "^9.0.0", "@nestjs/testing": "^9.0.0", "@nrwl/cypress": "15.5.2", @@ -91,6 +96,7 @@ "@nrwl/workspace": "15.5.2", "@types/jest": "28.1.1", "@types/jsonwebtoken": "^9.0.1", + "@types/jwk-to-pem": "^2.0.3", "@types/multer": "^1.4.7", "@types/node": "18.7.1", "@types/validator": "^13.7.10", @@ -100,6 +106,7 @@ "@vitest/ui": "^0.25.8", "concurrently": "^7.6.0", "cypress": "^11.0.0", + "dotenv-cli": "^7.4.1", "eslint": "~8.15.0", "eslint-config-prettier": "^8.6.0", "eslint-plugin-cypress": "^2.10.3", @@ -120,7 +127,7 @@ "ts-node": "10.9.1", "type-zoo": "^3.4.1", "typescript": "~4.8.2", - "vite": "^4.0.1", + "vite": "^4.5.2", "vite-plugin-dts": "~1.7.1", "vite-plugin-eslint": "^1.8.1", "vite-tsconfig-paths": "^4.0.2", @@ -140,12 +147,12 @@ } }, "node_modules/@angular-devkit/architect": { - "version": "0.1501.1", - "resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1501.1.tgz", - "integrity": "sha512-2uDa/+nVGwQ5X6UJtB14V37SbD/64WSg0hKyX5z1yp6wYrSuk7PWV8hddIsiYM3aIT5wTGqfLil6NkV4G/BzQw==", + "version": "0.1502.10", + "resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1502.10.tgz", + "integrity": "sha512-S8lN73WYCfpEpw1Q41ZcUinw7JfDeSM8LyGs797OVshnW75QcOkOecWj/3CKR23G44IgFrHN6sqtzWxKmMxLig==", "dev": true, "dependencies": { - "@angular-devkit/core": "15.1.1", + "@angular-devkit/core": "15.2.10", "rxjs": "6.6.7" }, "engines": { @@ -154,6 +161,32 @@ "yarn": ">= 1.13.0" } }, + "node_modules/@angular-devkit/architect/node_modules/@angular-devkit/core": { + "version": "15.2.10", + "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-15.2.10.tgz", + "integrity": "sha512-bFPm7wjvfBds9km2rCJxUhzkqe4h3h/199yJtzC1bNvwRr2LMHvtyoQAzftda+gs7Ulqac5wzUEZX/cVV3WrsA==", + "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/architect/node_modules/rxjs": { "version": "6.6.7", "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.7.tgz", @@ -173,38 +206,39 @@ "dev": true }, "node_modules/@angular-devkit/build-angular": { - "version": "15.1.1", - "resolved": "https://registry.npmjs.org/@angular-devkit/build-angular/-/build-angular-15.1.1.tgz", - "integrity": "sha512-9eziOA4uZwIg8OYjebkKz/yqQ1WIqajGrXr/goaAKcKhr8BprWXs5NhkIzMrELekA/dZOkR6Gpwz8d/XwplCww==", + "version": "15.2.10", + "resolved": "https://registry.npmjs.org/@angular-devkit/build-angular/-/build-angular-15.2.10.tgz", + "integrity": "sha512-3pCPVEJilVwHIJC6Su1/PIEqvFfU1Lxew9yItxX4s6dud8HY+fuKrsDnao4NNMFNqCLqL4el5QbSBKnnpWH1sg==", "dev": true, "dependencies": { "@ampproject/remapping": "2.2.0", - "@angular-devkit/architect": "0.1501.1", - "@angular-devkit/build-webpack": "0.1501.1", - "@angular-devkit/core": "15.1.1", + "@angular-devkit/architect": "0.1502.10", + "@angular-devkit/build-webpack": "0.1502.10", + "@angular-devkit/core": "15.2.10", "@babel/core": "7.20.12", - "@babel/generator": "7.20.7", + "@babel/generator": "7.20.14", "@babel/helper-annotate-as-pure": "7.18.6", + "@babel/helper-split-export-declaration": "7.18.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.7", + "@babel/runtime": "7.20.13", "@babel/template": "7.20.7", "@discoveryjs/json-ext": "0.5.7", - "@ngtools/webpack": "15.1.1", + "@ngtools/webpack": "15.2.10", "ansi-colors": "4.1.3", "autoprefixer": "10.4.13", "babel-loader": "9.1.2", "babel-plugin-istanbul": "6.1.1", - "browserslist": "4.21.4", + "browserslist": "4.21.5", "cacache": "17.0.4", "chokidar": "3.5.3", "copy-webpack-plugin": "11.0.0", "critters": "0.0.16", "css-loader": "6.7.3", - "esbuild-wasm": "0.16.17", - "glob": "8.0.3", + "esbuild-wasm": "0.17.8", + "glob": "8.1.0", "https-proxy-agent": "5.0.1", "inquirer": "8.2.4", "jsonc-parser": "3.2.0", @@ -213,26 +247,26 @@ "less-loader": "11.1.0", "license-webpack-plugin": "4.0.2", "loader-utils": "3.2.1", - "magic-string": "0.27.0", + "magic-string": "0.29.0", "mini-css-extract-plugin": "2.7.2", - "open": "8.4.0", + "open": "8.4.1", "ora": "5.4.1", - "parse5-html-rewriting-stream": "6.0.1", + "parse5-html-rewriting-stream": "7.0.0", "piscina": "3.2.0", - "postcss": "8.4.21", + "postcss": "8.4.31", "postcss-loader": "7.0.2", "resolve-url-loader": "5.0.0", "rxjs": "6.6.7", - "sass": "1.57.1", + "sass": "1.58.1", "sass-loader": "13.2.0", - "semver": "7.3.8", + "semver": "7.5.3", "source-map-loader": "4.0.1", "source-map-support": "0.5.21", - "terser": "5.16.1", + "terser": "5.16.3", "text-table": "0.2.0", "tree-kill": "1.2.2", - "tslib": "2.4.1", - "webpack": "5.75.0", + "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", @@ -244,7 +278,7 @@ "yarn": ">= 1.13.0" }, "optionalDependencies": { - "esbuild": "0.16.17" + "esbuild": "0.17.8" }, "peerDependencies": { "@angular/compiler-cli": "^15.0.0", @@ -281,6 +315,525 @@ } } }, + "node_modules/@angular-devkit/build-angular/node_modules/@angular-devkit/core": { + "version": "15.2.10", + "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-15.2.10.tgz", + "integrity": "sha512-bFPm7wjvfBds9km2rCJxUhzkqe4h3h/199yJtzC1bNvwRr2LMHvtyoQAzftda+gs7Ulqac5wzUEZX/cVV3WrsA==", + "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/build-angular/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==", + "dev": true, + "dependencies": { + "@babel/types": "^7.18.6" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@angular-devkit/build-angular/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==", + "cpu": [ + "arm" + ], + "dev": true, + "optional": true, + "os": [ + "android" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@angular-devkit/build-angular/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==", + "cpu": [ + "arm64" + ], + "dev": true, + "optional": true, + "os": [ + "android" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@angular-devkit/build-angular/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==", + "cpu": [ + "x64" + ], + "dev": true, + "optional": true, + "os": [ + "android" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@angular-devkit/build-angular/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==", + "cpu": [ + "arm64" + ], + "dev": true, + "optional": true, + "os": [ + "darwin" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@angular-devkit/build-angular/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==", + "cpu": [ + "x64" + ], + "dev": true, + "optional": true, + "os": [ + "darwin" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@angular-devkit/build-angular/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==", + "cpu": [ + "arm64" + ], + "dev": true, + "optional": true, + "os": [ + "freebsd" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@angular-devkit/build-angular/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==", + "cpu": [ + "x64" + ], + "dev": true, + "optional": true, + "os": [ + "freebsd" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@angular-devkit/build-angular/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==", + "cpu": [ + "arm" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@angular-devkit/build-angular/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==", + "cpu": [ + "arm64" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@angular-devkit/build-angular/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==", + "cpu": [ + "ia32" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@angular-devkit/build-angular/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==", + "cpu": [ + "loong64" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@angular-devkit/build-angular/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==", + "cpu": [ + "mips64el" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@angular-devkit/build-angular/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==", + "cpu": [ + "ppc64" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@angular-devkit/build-angular/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==", + "cpu": [ + "riscv64" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@angular-devkit/build-angular/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==", + "cpu": [ + "s390x" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@angular-devkit/build-angular/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==", + "cpu": [ + "x64" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@angular-devkit/build-angular/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==", + "cpu": [ + "x64" + ], + "dev": true, + "optional": true, + "os": [ + "netbsd" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@angular-devkit/build-angular/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==", + "cpu": [ + "x64" + ], + "dev": true, + "optional": true, + "os": [ + "openbsd" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@angular-devkit/build-angular/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==", + "cpu": [ + "x64" + ], + "dev": true, + "optional": true, + "os": [ + "sunos" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@angular-devkit/build-angular/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==", + "cpu": [ + "arm64" + ], + "dev": true, + "optional": true, + "os": [ + "win32" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@angular-devkit/build-angular/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==", + "cpu": [ + "ia32" + ], + "dev": true, + "optional": true, + "os": [ + "win32" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@angular-devkit/build-angular/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==", + "cpu": [ + "x64" + ], + "dev": true, + "optional": true, + "os": [ + "win32" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@angular-devkit/build-angular/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/@angular-devkit/build-angular/node_modules/esbuild": { + "version": "0.17.8", + "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.17.8.tgz", + "integrity": "sha512-g24ybC3fWhZddZK6R3uD2iF/RIPnRpwJAqLov6ouX3hMbY4+tKolP0VMF3zuIYCaXun+yHwS5IPQ91N2BT191g==", + "dev": true, + "hasInstallScript": true, + "optional": true, + "bin": { + "esbuild": "bin/esbuild" + }, + "engines": { + "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" + } + }, + "node_modules/@angular-devkit/build-angular/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==", + "dev": true, + "bin": { + "esbuild": "bin/esbuild" + }, + "engines": { + "node": ">=12" + } + }, + "node_modules/@angular-devkit/build-angular/node_modules/lru-cache": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", + "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", + "dev": true, + "dependencies": { + "yallist": "^4.0.0" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/@angular-devkit/build-angular/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==", + "dev": true, + "dependencies": { + "@jridgewell/sourcemap-codec": "^1.4.13" + }, + "engines": { + "node": ">=12" + } + }, + "node_modules/@angular-devkit/build-angular/node_modules/open": { + "version": "8.4.1", + "resolved": "https://registry.npmjs.org/open/-/open-8.4.1.tgz", + "integrity": "sha512-/4b7qZNhv6Uhd7jjnREh1NjnPxlTq+XNWPG88Ydkj5AILcA5m3ajvcg57pB24EQjKv0dK62XnDqk9c/hkIG5Kg==", + "dev": true, + "dependencies": { + "define-lazy-prop": "^2.0.0", + "is-docker": "^2.1.1", + "is-wsl": "^2.2.0" + }, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/@angular-devkit/build-angular/node_modules/parse5-html-rewriting-stream": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/parse5-html-rewriting-stream/-/parse5-html-rewriting-stream-7.0.0.tgz", + "integrity": "sha512-mazCyGWkmCRWDI15Zp+UiCqMp/0dgEmkZRvhlsqqKYr4SsVm/TvnSpD9fCvqCA2zoWJcfRym846ejWBBHRiYEg==", + "dev": true, + "dependencies": { + "entities": "^4.3.0", + "parse5": "^7.0.0", + "parse5-sax-parser": "^7.0.0" + }, + "funding": { + "url": "https://github.com/inikulin/parse5?sponsor=1" + } + }, + "node_modules/@angular-devkit/build-angular/node_modules/parse5-sax-parser": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/parse5-sax-parser/-/parse5-sax-parser-7.0.0.tgz", + "integrity": "sha512-5A+v2SNsq8T6/mG3ahcz8ZtQ0OUFTatxPbeidoMB7tkJSGDY3tdfl4MHovtLQHkEn5CGxijNWRQHhRQ6IRpXKg==", + "dev": true, + "dependencies": { + "parse5": "^7.0.0" + }, + "funding": { + "url": "https://github.com/inikulin/parse5?sponsor=1" + } + }, "node_modules/@angular-devkit/build-angular/node_modules/rxjs": { "version": "6.6.7", "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.7.tgz", @@ -299,13 +852,40 @@ "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==", "dev": true }, + "node_modules/@angular-devkit/build-angular/node_modules/semver": { + "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" + }, + "bin": { + "semver": "bin/semver.js" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/@angular-devkit/build-angular/node_modules/tslib": { + "version": "2.5.0", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.5.0.tgz", + "integrity": "sha512-336iVw3rtn2BUK7ORdIAHTyxHGRIHVReokCR3XjbckJMK7ms8FysBfhLR8IXnAgy7T0PTPNBWKiH514FOW/WSg==", + "dev": true + }, + "node_modules/@angular-devkit/build-angular/node_modules/yallist": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", + "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", + "dev": true + }, "node_modules/@angular-devkit/build-webpack": { - "version": "0.1501.1", - "resolved": "https://registry.npmjs.org/@angular-devkit/build-webpack/-/build-webpack-0.1501.1.tgz", - "integrity": "sha512-b2Vyhx3JRHi179kSB/zc7G+/uuWq7S/7pZAau0Ry17N6Ihg2BwpLxBe0mvKcDecLmw+1ozBv2WLRCnxKXLZ4mw==", + "version": "0.1502.10", + "resolved": "https://registry.npmjs.org/@angular-devkit/build-webpack/-/build-webpack-0.1502.10.tgz", + "integrity": "sha512-55b9WZIGU4DNgiIV2lkkN6iQxJrgWY5CDaNu0kJC/qazotJgBbcN/8jgBx2DD8HNE1V3iXxWk66pt1h946Po+Q==", "dev": true, "dependencies": { - "@angular-devkit/architect": "0.1501.1", + "@angular-devkit/architect": "0.1502.10", "rxjs": "6.6.7" }, "engines": { @@ -761,9 +1341,9 @@ } }, "node_modules/@angular/compiler-cli/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" @@ -949,12 +1529,12 @@ "dev": true }, "node_modules/@aws-crypto/crc32": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/@aws-crypto/crc32/-/crc32-2.0.0.tgz", - "integrity": "sha512-TvE1r2CUueyXOuHdEigYjIZVesInd9KN+K/TFFNfkkxRThiNxO6i4ZqqAVMoEjAamZZ1AA8WXJkjCz7YShHPQA==", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/@aws-crypto/crc32/-/crc32-3.0.0.tgz", + "integrity": "sha512-IzSgsrxUcsrejQbPVilIKy16kAT52EwB6zSaI+M3xxIhKh5+aldEyvI+z6erM7TCLB2BJsFrtHjp6/4/sr+3dA==", "dependencies": { - "@aws-crypto/util": "^2.0.0", - "@aws-sdk/types": "^3.1.0", + "@aws-crypto/util": "^3.0.0", + "@aws-sdk/types": "^3.222.0", "tslib": "^1.11.1" } }, @@ -964,12 +1544,12 @@ "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==" }, "node_modules/@aws-crypto/crc32c": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/@aws-crypto/crc32c/-/crc32c-2.0.0.tgz", - "integrity": "sha512-vF0eMdMHx3O3MoOXUfBZry8Y4ZDtcuskjjKgJz8YfIDjLStxTZrYXk+kZqtl6A0uCmmiN/Eb/JbC/CndTV1MHg==", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/@aws-crypto/crc32c/-/crc32c-3.0.0.tgz", + "integrity": "sha512-ENNPPManmnVJ4BTXlOjAgD7URidbAznURqD0KvfREyc4o20DPYdEldU1f5cQ7Jbj0CJJSPaMIk/9ZshdB3210w==", "dependencies": { - "@aws-crypto/util": "^2.0.0", - "@aws-sdk/types": "^3.1.0", + "@aws-crypto/util": "^3.0.0", + "@aws-sdk/types": "^3.222.0", "tslib": "^1.11.1" } }, @@ -979,9 +1559,9 @@ "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==" }, "node_modules/@aws-crypto/ie11-detection": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/@aws-crypto/ie11-detection/-/ie11-detection-2.0.2.tgz", - "integrity": "sha512-5XDMQY98gMAf/WRTic5G++jfmS/VLM0rwpiOpaainKi4L0nqWMSB1SzsrEG5rjFZGYN6ZAefO+/Yta2dFM0kMw==", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/@aws-crypto/ie11-detection/-/ie11-detection-3.0.0.tgz", + "integrity": "sha512-341lBBkiY1DfDNKai/wXM3aujNBkXR7tq1URPQDL9wi3AUbI80NR74uF1TXHMm7po1AcnFk8iu2S2IeU/+/A+Q==", "dependencies": { "tslib": "^1.11.1" } @@ -992,13 +1572,14 @@ "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==" }, "node_modules/@aws-crypto/sha1-browser": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/@aws-crypto/sha1-browser/-/sha1-browser-2.0.0.tgz", - "integrity": "sha512-3fIVRjPFY8EG5HWXR+ZJZMdWNRpwbxGzJ9IH9q93FpbgCH8u8GHRi46mZXp3cYD7gealmyqpm3ThZwLKJjWJhA==", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/@aws-crypto/sha1-browser/-/sha1-browser-3.0.0.tgz", + "integrity": "sha512-NJth5c997GLHs6nOYTzFKTbYdMNA6/1XlKVgnZoaZcQ7z7UJlOgj2JdbHE8tiYLS3fzXNCguct77SPGat2raSw==", "dependencies": { - "@aws-crypto/ie11-detection": "^2.0.0", - "@aws-crypto/supports-web-crypto": "^2.0.0", - "@aws-sdk/types": "^3.1.0", + "@aws-crypto/ie11-detection": "^3.0.0", + "@aws-crypto/supports-web-crypto": "^3.0.0", + "@aws-crypto/util": "^3.0.0", + "@aws-sdk/types": "^3.222.0", "@aws-sdk/util-locate-window": "^3.0.0", "@aws-sdk/util-utf8-browser": "^3.0.0", "tslib": "^1.11.1" @@ -1010,15 +1591,15 @@ "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==" }, "node_modules/@aws-crypto/sha256-browser": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/@aws-crypto/sha256-browser/-/sha256-browser-2.0.0.tgz", - "integrity": "sha512-rYXOQ8BFOaqMEHJrLHul/25ckWH6GTJtdLSajhlqGMx0PmSueAuvboCuZCTqEKlxR8CQOwRarxYMZZSYlhRA1A==", - "dependencies": { - "@aws-crypto/ie11-detection": "^2.0.0", - "@aws-crypto/sha256-js": "^2.0.0", - "@aws-crypto/supports-web-crypto": "^2.0.0", - "@aws-crypto/util": "^2.0.0", - "@aws-sdk/types": "^3.1.0", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/@aws-crypto/sha256-browser/-/sha256-browser-3.0.0.tgz", + "integrity": "sha512-8VLmW2B+gjFbU5uMeqtQM6Nj0/F1bro80xQXCW6CQBWgosFWXTx77aeOF5CAIAmbOK64SdMBJdNr6J41yP5mvQ==", + "dependencies": { + "@aws-crypto/ie11-detection": "^3.0.0", + "@aws-crypto/sha256-js": "^3.0.0", + "@aws-crypto/supports-web-crypto": "^3.0.0", + "@aws-crypto/util": "^3.0.0", + "@aws-sdk/types": "^3.222.0", "@aws-sdk/util-locate-window": "^3.0.0", "@aws-sdk/util-utf8-browser": "^3.0.0", "tslib": "^1.11.1" @@ -1030,12 +1611,12 @@ "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==" }, "node_modules/@aws-crypto/sha256-js": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/@aws-crypto/sha256-js/-/sha256-js-2.0.0.tgz", - "integrity": "sha512-VZY+mCY4Nmrs5WGfitmNqXzaE873fcIZDu54cbaDaaamsaTOP1DBImV9F4pICc3EHjQXujyE8jig+PFCaew9ig==", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/@aws-crypto/sha256-js/-/sha256-js-3.0.0.tgz", + "integrity": "sha512-PnNN7os0+yd1XvXAy23CFOmTbMaDxgxXtTKHybrJ39Y8kGzBATgBFibWJKH6BhytLI/Zyszs87xCOBNyBig6vQ==", "dependencies": { - "@aws-crypto/util": "^2.0.0", - "@aws-sdk/types": "^3.1.0", + "@aws-crypto/util": "^3.0.0", + "@aws-sdk/types": "^3.222.0", "tslib": "^1.11.1" } }, @@ -1045,9 +1626,9 @@ "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==" }, "node_modules/@aws-crypto/supports-web-crypto": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/@aws-crypto/supports-web-crypto/-/supports-web-crypto-2.0.2.tgz", - "integrity": "sha512-6mbSsLHwZ99CTOOswvCRP3C+VCWnzBf+1SnbWxzzJ9lR0mA0JnY2JEAhp8rqmTE0GPFy88rrM27ffgp62oErMQ==", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/@aws-crypto/supports-web-crypto/-/supports-web-crypto-3.0.0.tgz", + "integrity": "sha512-06hBdMwUAb2WFTuGG73LSC0wfPu93xWwo5vL2et9eymgmu3Id5vFAHBbajVWiGhPO37qcsdCap/FqXvJGJWPIg==", "dependencies": { "tslib": "^1.11.1" } @@ -1058,11 +1639,11 @@ "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==" }, "node_modules/@aws-crypto/util": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/@aws-crypto/util/-/util-2.0.2.tgz", - "integrity": "sha512-Lgu5v/0e/BcrZ5m/IWqzPUf3UYFTy/PpeED+uc9SWUR1iZQL8XXbGQg10UfllwwBryO3hFF5dizK+78aoXC1eA==", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/@aws-crypto/util/-/util-3.0.0.tgz", + "integrity": "sha512-2OJlpeJpCR48CC8r+uKVChzs9Iungj9wkZrl8Z041DWEWvyIHILYKCPNzJghKsivj+S3mLo6BVc7mBNzdxA46w==", "dependencies": { - "@aws-sdk/types": "^3.110.0", + "@aws-sdk/types": "^3.222.0", "@aws-sdk/util-utf8-browser": "^3.0.0", "tslib": "^1.11.1" } @@ -1072,1129 +1653,802 @@ "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==" }, - "node_modules/@aws-sdk/abort-controller": { - "version": "3.226.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/abort-controller/-/abort-controller-3.226.0.tgz", - "integrity": "sha512-cJVzr1xxPBd08voknXvR0RLgtZKGKt6WyDpH/BaPCu3rfSqWCDZKzwqe940eqosjmKrxC6pUZNKASIqHOQ8xxQ==", - "dependencies": { - "@aws-sdk/types": "3.226.0", - "tslib": "^2.3.1" - }, - "engines": { - "node": ">=14.0.0" - } - }, - "node_modules/@aws-sdk/chunked-blob-reader": { - "version": "3.188.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/chunked-blob-reader/-/chunked-blob-reader-3.188.0.tgz", - "integrity": "sha512-zkPRFZZPL3eH+kH86LDYYXImiClA1/sW60zYOjse9Pgka+eDJlvBN6hcYxwDEKjcwATYiSRR1aVQHcfCinlGXg==", - "dependencies": { - "tslib": "^2.3.1" - } - }, - "node_modules/@aws-sdk/chunked-blob-reader-native": { - "version": "3.208.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/chunked-blob-reader-native/-/chunked-blob-reader-native-3.208.0.tgz", - "integrity": "sha512-JeOZ95PW+fJ6bbuqPySYqLqHk1n4+4ueEEraJsiUrPBV0S1ZtyvOGHcnGztKUjr2PYNaiexmpWuvUve9K12HRA==", - "dependencies": { - "@aws-sdk/util-base64": "3.208.0", - "tslib": "^2.3.1" - } - }, "node_modules/@aws-sdk/client-s3": { - "version": "3.252.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/client-s3/-/client-s3-3.252.0.tgz", - "integrity": "sha512-VsTDuztgrwwBnkTZKm3t3cyXNTnWRCxDN4fCeEabw8/GB6KKSrs1a9pYXyWXuXtuvV5lFG4tIZMcXF7UkVXqyg==", - "dependencies": { - "@aws-crypto/sha1-browser": "2.0.0", - "@aws-crypto/sha256-browser": "2.0.0", - "@aws-crypto/sha256-js": "2.0.0", - "@aws-sdk/client-sts": "3.252.0", - "@aws-sdk/config-resolver": "3.234.0", - "@aws-sdk/credential-provider-node": "3.252.0", - "@aws-sdk/eventstream-serde-browser": "3.226.0", - "@aws-sdk/eventstream-serde-config-resolver": "3.226.0", - "@aws-sdk/eventstream-serde-node": "3.226.0", - "@aws-sdk/fetch-http-handler": "3.226.0", - "@aws-sdk/hash-blob-browser": "3.226.0", - "@aws-sdk/hash-node": "3.226.0", - "@aws-sdk/hash-stream-node": "3.226.0", - "@aws-sdk/invalid-dependency": "3.226.0", - "@aws-sdk/md5-js": "3.226.0", - "@aws-sdk/middleware-bucket-endpoint": "3.226.0", - "@aws-sdk/middleware-content-length": "3.226.0", - "@aws-sdk/middleware-endpoint": "3.226.0", - "@aws-sdk/middleware-expect-continue": "3.226.0", - "@aws-sdk/middleware-flexible-checksums": "3.226.0", - "@aws-sdk/middleware-host-header": "3.226.0", - "@aws-sdk/middleware-location-constraint": "3.226.0", - "@aws-sdk/middleware-logger": "3.226.0", - "@aws-sdk/middleware-recursion-detection": "3.226.0", - "@aws-sdk/middleware-retry": "3.235.0", - "@aws-sdk/middleware-sdk-s3": "3.231.0", - "@aws-sdk/middleware-serde": "3.226.0", - "@aws-sdk/middleware-signing": "3.226.0", - "@aws-sdk/middleware-ssec": "3.226.0", - "@aws-sdk/middleware-stack": "3.226.0", - "@aws-sdk/middleware-user-agent": "3.226.0", - "@aws-sdk/node-config-provider": "3.226.0", - "@aws-sdk/node-http-handler": "3.226.0", - "@aws-sdk/protocol-http": "3.226.0", - "@aws-sdk/signature-v4-multi-region": "3.226.0", - "@aws-sdk/smithy-client": "3.234.0", - "@aws-sdk/types": "3.226.0", - "@aws-sdk/url-parser": "3.226.0", - "@aws-sdk/util-base64": "3.208.0", - "@aws-sdk/util-body-length-browser": "3.188.0", - "@aws-sdk/util-body-length-node": "3.208.0", - "@aws-sdk/util-defaults-mode-browser": "3.234.0", - "@aws-sdk/util-defaults-mode-node": "3.234.0", - "@aws-sdk/util-endpoints": "3.245.0", - "@aws-sdk/util-retry": "3.229.0", - "@aws-sdk/util-stream-browser": "3.226.0", - "@aws-sdk/util-stream-node": "3.226.0", - "@aws-sdk/util-user-agent-browser": "3.226.0", - "@aws-sdk/util-user-agent-node": "3.226.0", - "@aws-sdk/util-utf8-browser": "3.188.0", - "@aws-sdk/util-utf8-node": "3.208.0", - "@aws-sdk/util-waiter": "3.226.0", - "@aws-sdk/xml-builder": "3.201.0", - "fast-xml-parser": "4.0.11", - "tslib": "^2.3.1" + "version": "3.537.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/client-s3/-/client-s3-3.537.0.tgz", + "integrity": "sha512-EMPN2toHz1QtSiDeLKS1zrazh+8J0g1Y5t5lCq25iTXqCSV9vB2jCKwG5+OB6L5tAKkwyl1uZofeWLmdFkztEg==", + "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.535.0", + "@aws-sdk/core": "3.535.0", + "@aws-sdk/credential-provider-node": "3.535.0", + "@aws-sdk/middleware-bucket-endpoint": "3.535.0", + "@aws-sdk/middleware-expect-continue": "3.535.0", + "@aws-sdk/middleware-flexible-checksums": "3.535.0", + "@aws-sdk/middleware-host-header": "3.535.0", + "@aws-sdk/middleware-location-constraint": "3.535.0", + "@aws-sdk/middleware-logger": "3.535.0", + "@aws-sdk/middleware-recursion-detection": "3.535.0", + "@aws-sdk/middleware-sdk-s3": "3.535.0", + "@aws-sdk/middleware-signing": "3.535.0", + "@aws-sdk/middleware-ssec": "3.537.0", + "@aws-sdk/middleware-user-agent": "3.535.0", + "@aws-sdk/region-config-resolver": "3.535.0", + "@aws-sdk/signature-v4-multi-region": "3.535.0", + "@aws-sdk/types": "3.535.0", + "@aws-sdk/util-endpoints": "3.535.0", + "@aws-sdk/util-user-agent-browser": "3.535.0", + "@aws-sdk/util-user-agent-node": "3.535.0", + "@aws-sdk/xml-builder": "3.535.0", + "@smithy/config-resolver": "^2.2.0", + "@smithy/core": "^1.4.0", + "@smithy/eventstream-serde-browser": "^2.2.0", + "@smithy/eventstream-serde-config-resolver": "^2.2.0", + "@smithy/eventstream-serde-node": "^2.2.0", + "@smithy/fetch-http-handler": "^2.5.0", + "@smithy/hash-blob-browser": "^2.2.0", + "@smithy/hash-node": "^2.2.0", + "@smithy/hash-stream-node": "^2.2.0", + "@smithy/invalid-dependency": "^2.2.0", + "@smithy/md5-js": "^2.2.0", + "@smithy/middleware-content-length": "^2.2.0", + "@smithy/middleware-endpoint": "^2.5.0", + "@smithy/middleware-retry": "^2.2.0", + "@smithy/middleware-serde": "^2.3.0", + "@smithy/middleware-stack": "^2.2.0", + "@smithy/node-config-provider": "^2.3.0", + "@smithy/node-http-handler": "^2.5.0", + "@smithy/protocol-http": "^3.3.0", + "@smithy/smithy-client": "^2.5.0", + "@smithy/types": "^2.12.0", + "@smithy/url-parser": "^2.2.0", + "@smithy/util-base64": "^2.3.0", + "@smithy/util-body-length-browser": "^2.2.0", + "@smithy/util-body-length-node": "^2.3.0", + "@smithy/util-defaults-mode-browser": "^2.2.0", + "@smithy/util-defaults-mode-node": "^2.3.0", + "@smithy/util-endpoints": "^1.2.0", + "@smithy/util-retry": "^2.2.0", + "@smithy/util-stream": "^2.2.0", + "@smithy/util-utf8": "^2.3.0", + "@smithy/util-waiter": "^2.2.0", + "tslib": "^2.6.2" }, "engines": { "node": ">=14.0.0" } }, + "node_modules/@aws-sdk/client-s3/node_modules/tslib": { + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz", + "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==" + }, "node_modules/@aws-sdk/client-sso": { - "version": "3.252.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/client-sso/-/client-sso-3.252.0.tgz", - "integrity": "sha512-VgBqJvvCU4y9zAHJwYj5nOeNGcCxKdCO4edUxWQVHcpLsVWu49maOVtWuteq9MOrHYeWfQi8bVWGt8MPvv9+bA==", - "dependencies": { - "@aws-crypto/sha256-browser": "2.0.0", - "@aws-crypto/sha256-js": "2.0.0", - "@aws-sdk/config-resolver": "3.234.0", - "@aws-sdk/fetch-http-handler": "3.226.0", - "@aws-sdk/hash-node": "3.226.0", - "@aws-sdk/invalid-dependency": "3.226.0", - "@aws-sdk/middleware-content-length": "3.226.0", - "@aws-sdk/middleware-endpoint": "3.226.0", - "@aws-sdk/middleware-host-header": "3.226.0", - "@aws-sdk/middleware-logger": "3.226.0", - "@aws-sdk/middleware-recursion-detection": "3.226.0", - "@aws-sdk/middleware-retry": "3.235.0", - "@aws-sdk/middleware-serde": "3.226.0", - "@aws-sdk/middleware-stack": "3.226.0", - "@aws-sdk/middleware-user-agent": "3.226.0", - "@aws-sdk/node-config-provider": "3.226.0", - "@aws-sdk/node-http-handler": "3.226.0", - "@aws-sdk/protocol-http": "3.226.0", - "@aws-sdk/smithy-client": "3.234.0", - "@aws-sdk/types": "3.226.0", - "@aws-sdk/url-parser": "3.226.0", - "@aws-sdk/util-base64": "3.208.0", - "@aws-sdk/util-body-length-browser": "3.188.0", - "@aws-sdk/util-body-length-node": "3.208.0", - "@aws-sdk/util-defaults-mode-browser": "3.234.0", - "@aws-sdk/util-defaults-mode-node": "3.234.0", - "@aws-sdk/util-endpoints": "3.245.0", - "@aws-sdk/util-retry": "3.229.0", - "@aws-sdk/util-user-agent-browser": "3.226.0", - "@aws-sdk/util-user-agent-node": "3.226.0", - "@aws-sdk/util-utf8-browser": "3.188.0", - "@aws-sdk/util-utf8-node": "3.208.0", - "tslib": "^2.3.1" + "version": "3.535.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/client-sso/-/client-sso-3.535.0.tgz", + "integrity": "sha512-h9eQRdFnjDRVBnPJIKXuX7D+isSAioIfZPC4PQwsL5BscTRlk4c90DX0R0uk64YUtp7LZu8TNtrosFZ/1HtTrQ==", + "dependencies": { + "@aws-crypto/sha256-browser": "3.0.0", + "@aws-crypto/sha256-js": "3.0.0", + "@aws-sdk/core": "3.535.0", + "@aws-sdk/middleware-host-header": "3.535.0", + "@aws-sdk/middleware-logger": "3.535.0", + "@aws-sdk/middleware-recursion-detection": "3.535.0", + "@aws-sdk/middleware-user-agent": "3.535.0", + "@aws-sdk/region-config-resolver": "3.535.0", + "@aws-sdk/types": "3.535.0", + "@aws-sdk/util-endpoints": "3.535.0", + "@aws-sdk/util-user-agent-browser": "3.535.0", + "@aws-sdk/util-user-agent-node": "3.535.0", + "@smithy/config-resolver": "^2.2.0", + "@smithy/core": "^1.4.0", + "@smithy/fetch-http-handler": "^2.5.0", + "@smithy/hash-node": "^2.2.0", + "@smithy/invalid-dependency": "^2.2.0", + "@smithy/middleware-content-length": "^2.2.0", + "@smithy/middleware-endpoint": "^2.5.0", + "@smithy/middleware-retry": "^2.2.0", + "@smithy/middleware-serde": "^2.3.0", + "@smithy/middleware-stack": "^2.2.0", + "@smithy/node-config-provider": "^2.3.0", + "@smithy/node-http-handler": "^2.5.0", + "@smithy/protocol-http": "^3.3.0", + "@smithy/smithy-client": "^2.5.0", + "@smithy/types": "^2.12.0", + "@smithy/url-parser": "^2.2.0", + "@smithy/util-base64": "^2.3.0", + "@smithy/util-body-length-browser": "^2.2.0", + "@smithy/util-body-length-node": "^2.3.0", + "@smithy/util-defaults-mode-browser": "^2.2.0", + "@smithy/util-defaults-mode-node": "^2.3.0", + "@smithy/util-endpoints": "^1.2.0", + "@smithy/util-middleware": "^2.2.0", + "@smithy/util-retry": "^2.2.0", + "@smithy/util-utf8": "^2.3.0", + "tslib": "^2.6.2" }, "engines": { "node": ">=14.0.0" } }, "node_modules/@aws-sdk/client-sso-oidc": { - "version": "3.252.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/client-sso-oidc/-/client-sso-oidc-3.252.0.tgz", - "integrity": "sha512-OOwfEXFS+UliGZorEleARsXXUp3ObZSXo9/YY+8XF7/8froAqYjKCEi0tflghgYlh7d6qe7wzD7/6gDL1a/qgA==", - "dependencies": { - "@aws-crypto/sha256-browser": "2.0.0", - "@aws-crypto/sha256-js": "2.0.0", - "@aws-sdk/config-resolver": "3.234.0", - "@aws-sdk/fetch-http-handler": "3.226.0", - "@aws-sdk/hash-node": "3.226.0", - "@aws-sdk/invalid-dependency": "3.226.0", - "@aws-sdk/middleware-content-length": "3.226.0", - "@aws-sdk/middleware-endpoint": "3.226.0", - "@aws-sdk/middleware-host-header": "3.226.0", - "@aws-sdk/middleware-logger": "3.226.0", - "@aws-sdk/middleware-recursion-detection": "3.226.0", - "@aws-sdk/middleware-retry": "3.235.0", - "@aws-sdk/middleware-serde": "3.226.0", - "@aws-sdk/middleware-stack": "3.226.0", - "@aws-sdk/middleware-user-agent": "3.226.0", - "@aws-sdk/node-config-provider": "3.226.0", - "@aws-sdk/node-http-handler": "3.226.0", - "@aws-sdk/protocol-http": "3.226.0", - "@aws-sdk/smithy-client": "3.234.0", - "@aws-sdk/types": "3.226.0", - "@aws-sdk/url-parser": "3.226.0", - "@aws-sdk/util-base64": "3.208.0", - "@aws-sdk/util-body-length-browser": "3.188.0", - "@aws-sdk/util-body-length-node": "3.208.0", - "@aws-sdk/util-defaults-mode-browser": "3.234.0", - "@aws-sdk/util-defaults-mode-node": "3.234.0", - "@aws-sdk/util-endpoints": "3.245.0", - "@aws-sdk/util-retry": "3.229.0", - "@aws-sdk/util-user-agent-browser": "3.226.0", - "@aws-sdk/util-user-agent-node": "3.226.0", - "@aws-sdk/util-utf8-browser": "3.188.0", - "@aws-sdk/util-utf8-node": "3.208.0", - "tslib": "^2.3.1" + "version": "3.535.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/client-sso-oidc/-/client-sso-oidc-3.535.0.tgz", + "integrity": "sha512-M2cG4EQXDpAJQyq33ORIr6abmdX9p9zX0ssVy8XwFNB7lrgoIKxuVoGL+fX+XMgecl24x7ELz6b4QlILOevbCw==", + "dependencies": { + "@aws-crypto/sha256-browser": "3.0.0", + "@aws-crypto/sha256-js": "3.0.0", + "@aws-sdk/client-sts": "3.535.0", + "@aws-sdk/core": "3.535.0", + "@aws-sdk/middleware-host-header": "3.535.0", + "@aws-sdk/middleware-logger": "3.535.0", + "@aws-sdk/middleware-recursion-detection": "3.535.0", + "@aws-sdk/middleware-user-agent": "3.535.0", + "@aws-sdk/region-config-resolver": "3.535.0", + "@aws-sdk/types": "3.535.0", + "@aws-sdk/util-endpoints": "3.535.0", + "@aws-sdk/util-user-agent-browser": "3.535.0", + "@aws-sdk/util-user-agent-node": "3.535.0", + "@smithy/config-resolver": "^2.2.0", + "@smithy/core": "^1.4.0", + "@smithy/fetch-http-handler": "^2.5.0", + "@smithy/hash-node": "^2.2.0", + "@smithy/invalid-dependency": "^2.2.0", + "@smithy/middleware-content-length": "^2.2.0", + "@smithy/middleware-endpoint": "^2.5.0", + "@smithy/middleware-retry": "^2.2.0", + "@smithy/middleware-serde": "^2.3.0", + "@smithy/middleware-stack": "^2.2.0", + "@smithy/node-config-provider": "^2.3.0", + "@smithy/node-http-handler": "^2.5.0", + "@smithy/protocol-http": "^3.3.0", + "@smithy/smithy-client": "^2.5.0", + "@smithy/types": "^2.12.0", + "@smithy/url-parser": "^2.2.0", + "@smithy/util-base64": "^2.3.0", + "@smithy/util-body-length-browser": "^2.2.0", + "@smithy/util-body-length-node": "^2.3.0", + "@smithy/util-defaults-mode-browser": "^2.2.0", + "@smithy/util-defaults-mode-node": "^2.3.0", + "@smithy/util-endpoints": "^1.2.0", + "@smithy/util-middleware": "^2.2.0", + "@smithy/util-retry": "^2.2.0", + "@smithy/util-utf8": "^2.3.0", + "tslib": "^2.6.2" }, "engines": { "node": ">=14.0.0" + }, + "peerDependencies": { + "@aws-sdk/credential-provider-node": "^3.535.0" } }, + "node_modules/@aws-sdk/client-sso-oidc/node_modules/tslib": { + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz", + "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==" + }, + "node_modules/@aws-sdk/client-sso/node_modules/tslib": { + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz", + "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==" + }, "node_modules/@aws-sdk/client-sts": { - "version": "3.252.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/client-sts/-/client-sts-3.252.0.tgz", - "integrity": "sha512-wzfsWOlDFLdmeML8R7DUJWGl9wcRKf2uiunfB1aWzpdlgms0Z7FkHWgkDYHjCPyYHL6EBm84ajGl1UkE7AcmqQ==", - "dependencies": { - "@aws-crypto/sha256-browser": "2.0.0", - "@aws-crypto/sha256-js": "2.0.0", - "@aws-sdk/config-resolver": "3.234.0", - "@aws-sdk/credential-provider-node": "3.252.0", - "@aws-sdk/fetch-http-handler": "3.226.0", - "@aws-sdk/hash-node": "3.226.0", - "@aws-sdk/invalid-dependency": "3.226.0", - "@aws-sdk/middleware-content-length": "3.226.0", - "@aws-sdk/middleware-endpoint": "3.226.0", - "@aws-sdk/middleware-host-header": "3.226.0", - "@aws-sdk/middleware-logger": "3.226.0", - "@aws-sdk/middleware-recursion-detection": "3.226.0", - "@aws-sdk/middleware-retry": "3.235.0", - "@aws-sdk/middleware-sdk-sts": "3.226.0", - "@aws-sdk/middleware-serde": "3.226.0", - "@aws-sdk/middleware-signing": "3.226.0", - "@aws-sdk/middleware-stack": "3.226.0", - "@aws-sdk/middleware-user-agent": "3.226.0", - "@aws-sdk/node-config-provider": "3.226.0", - "@aws-sdk/node-http-handler": "3.226.0", - "@aws-sdk/protocol-http": "3.226.0", - "@aws-sdk/smithy-client": "3.234.0", - "@aws-sdk/types": "3.226.0", - "@aws-sdk/url-parser": "3.226.0", - "@aws-sdk/util-base64": "3.208.0", - "@aws-sdk/util-body-length-browser": "3.188.0", - "@aws-sdk/util-body-length-node": "3.208.0", - "@aws-sdk/util-defaults-mode-browser": "3.234.0", - "@aws-sdk/util-defaults-mode-node": "3.234.0", - "@aws-sdk/util-endpoints": "3.245.0", - "@aws-sdk/util-retry": "3.229.0", - "@aws-sdk/util-user-agent-browser": "3.226.0", - "@aws-sdk/util-user-agent-node": "3.226.0", - "@aws-sdk/util-utf8-browser": "3.188.0", - "@aws-sdk/util-utf8-node": "3.208.0", - "fast-xml-parser": "4.0.11", - "tslib": "^2.3.1" + "version": "3.535.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/client-sts/-/client-sts-3.535.0.tgz", + "integrity": "sha512-ii9OOm3TJwP3JmO1IVJXKWIShVKPl0VtdlgROc/SkDglO/kuAw9eDdlROgc+qbFl+gm6bBTguOVTUXt3tS3flw==", + "dependencies": { + "@aws-crypto/sha256-browser": "3.0.0", + "@aws-crypto/sha256-js": "3.0.0", + "@aws-sdk/core": "3.535.0", + "@aws-sdk/middleware-host-header": "3.535.0", + "@aws-sdk/middleware-logger": "3.535.0", + "@aws-sdk/middleware-recursion-detection": "3.535.0", + "@aws-sdk/middleware-user-agent": "3.535.0", + "@aws-sdk/region-config-resolver": "3.535.0", + "@aws-sdk/types": "3.535.0", + "@aws-sdk/util-endpoints": "3.535.0", + "@aws-sdk/util-user-agent-browser": "3.535.0", + "@aws-sdk/util-user-agent-node": "3.535.0", + "@smithy/config-resolver": "^2.2.0", + "@smithy/core": "^1.4.0", + "@smithy/fetch-http-handler": "^2.5.0", + "@smithy/hash-node": "^2.2.0", + "@smithy/invalid-dependency": "^2.2.0", + "@smithy/middleware-content-length": "^2.2.0", + "@smithy/middleware-endpoint": "^2.5.0", + "@smithy/middleware-retry": "^2.2.0", + "@smithy/middleware-serde": "^2.3.0", + "@smithy/middleware-stack": "^2.2.0", + "@smithy/node-config-provider": "^2.3.0", + "@smithy/node-http-handler": "^2.5.0", + "@smithy/protocol-http": "^3.3.0", + "@smithy/smithy-client": "^2.5.0", + "@smithy/types": "^2.12.0", + "@smithy/url-parser": "^2.2.0", + "@smithy/util-base64": "^2.3.0", + "@smithy/util-body-length-browser": "^2.2.0", + "@smithy/util-body-length-node": "^2.3.0", + "@smithy/util-defaults-mode-browser": "^2.2.0", + "@smithy/util-defaults-mode-node": "^2.3.0", + "@smithy/util-endpoints": "^1.2.0", + "@smithy/util-middleware": "^2.2.0", + "@smithy/util-retry": "^2.2.0", + "@smithy/util-utf8": "^2.3.0", + "tslib": "^2.6.2" }, "engines": { "node": ">=14.0.0" + }, + "peerDependencies": { + "@aws-sdk/credential-provider-node": "^3.535.0" } }, - "node_modules/@aws-sdk/config-resolver": { - "version": "3.234.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/config-resolver/-/config-resolver-3.234.0.tgz", - "integrity": "sha512-uZxy4wzllfvgCQxVc+Iqhde0NGAnfmV2hWR6ejadJaAFTuYNvQiRg9IqJy3pkyDPqXySiJ8Bom5PoJfgn55J/A==", + "node_modules/@aws-sdk/client-sts/node_modules/tslib": { + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz", + "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==" + }, + "node_modules/@aws-sdk/core": { + "version": "3.535.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/core/-/core-3.535.0.tgz", + "integrity": "sha512-+Yusa9HziuaEDta1UaLEtMAtmgvxdxhPn7jgfRY6PplqAqgsfa5FR83sxy5qr2q7xjQTwHtV4MjQVuOjG9JsLw==", "dependencies": { - "@aws-sdk/signature-v4": "3.226.0", - "@aws-sdk/types": "3.226.0", - "@aws-sdk/util-config-provider": "3.208.0", - "@aws-sdk/util-middleware": "3.226.0", - "tslib": "^2.3.1" + "@smithy/core": "^1.4.0", + "@smithy/protocol-http": "^3.3.0", + "@smithy/signature-v4": "^2.2.0", + "@smithy/smithy-client": "^2.5.0", + "@smithy/types": "^2.12.0", + "fast-xml-parser": "4.2.5", + "tslib": "^2.6.2" }, "engines": { "node": ">=14.0.0" } }, + "node_modules/@aws-sdk/core/node_modules/tslib": { + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz", + "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==" + }, "node_modules/@aws-sdk/credential-provider-env": { - "version": "3.226.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-env/-/credential-provider-env-3.226.0.tgz", - "integrity": "sha512-sd8uK1ojbXxaZXlthzw/VXZwCPUtU3PjObOfr3Evj7MPIM2IH8h29foOlggx939MdLQGboJf9gKvLlvKDWtJRA==", + "version": "3.535.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-env/-/credential-provider-env-3.535.0.tgz", + "integrity": "sha512-XppwO8c0GCGSAvdzyJOhbtktSEaShg14VJKg8mpMa1XcgqzmcqqHQjtDWbx5rZheY1VdpXZhpEzJkB6LpQejpA==", "dependencies": { - "@aws-sdk/property-provider": "3.226.0", - "@aws-sdk/types": "3.226.0", - "tslib": "^2.3.1" + "@aws-sdk/types": "3.535.0", + "@smithy/property-provider": "^2.2.0", + "@smithy/types": "^2.12.0", + "tslib": "^2.6.2" }, "engines": { "node": ">=14.0.0" } }, - "node_modules/@aws-sdk/credential-provider-imds": { - "version": "3.226.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-imds/-/credential-provider-imds-3.226.0.tgz", - "integrity": "sha512-//z/COQm2AjYFI1Lb0wKHTQSrvLFTyuKLFQGPJsKS7DPoxGOCKB7hmYerlbl01IDoCxTdyL//TyyPxbZEOQD5Q==", + "node_modules/@aws-sdk/credential-provider-env/node_modules/tslib": { + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz", + "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==" + }, + "node_modules/@aws-sdk/credential-provider-http": { + "version": "3.535.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-http/-/credential-provider-http-3.535.0.tgz", + "integrity": "sha512-kdj1wCmOMZ29jSlUskRqN04S6fJ4dvt0Nq9Z32SA6wO7UG8ht6Ot9h/au/eTWJM3E1somZ7D771oK7dQt9b8yw==", "dependencies": { - "@aws-sdk/node-config-provider": "3.226.0", - "@aws-sdk/property-provider": "3.226.0", - "@aws-sdk/types": "3.226.0", - "@aws-sdk/url-parser": "3.226.0", - "tslib": "^2.3.1" + "@aws-sdk/types": "3.535.0", + "@smithy/fetch-http-handler": "^2.5.0", + "@smithy/node-http-handler": "^2.5.0", + "@smithy/property-provider": "^2.2.0", + "@smithy/protocol-http": "^3.3.0", + "@smithy/smithy-client": "^2.5.0", + "@smithy/types": "^2.12.0", + "@smithy/util-stream": "^2.2.0", + "tslib": "^2.6.2" }, "engines": { "node": ">=14.0.0" } }, + "node_modules/@aws-sdk/credential-provider-http/node_modules/tslib": { + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz", + "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==" + }, "node_modules/@aws-sdk/credential-provider-ini": { - "version": "3.252.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-ini/-/credential-provider-ini-3.252.0.tgz", - "integrity": "sha512-OfpU8xMYK7+6XQ2dUO4rN0gUhhb/ZLV7iwSL6Ji2pI9gglGhKdOSfmbn6fBfCB50kzWZRNoiQJVaBu/d0Kr0EQ==", - "dependencies": { - "@aws-sdk/credential-provider-env": "3.226.0", - "@aws-sdk/credential-provider-imds": "3.226.0", - "@aws-sdk/credential-provider-process": "3.226.0", - "@aws-sdk/credential-provider-sso": "3.252.0", - "@aws-sdk/credential-provider-web-identity": "3.226.0", - "@aws-sdk/property-provider": "3.226.0", - "@aws-sdk/shared-ini-file-loader": "3.226.0", - "@aws-sdk/types": "3.226.0", - "tslib": "^2.3.1" + "version": "3.535.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-ini/-/credential-provider-ini-3.535.0.tgz", + "integrity": "sha512-bm3XOYlyCjtAb8eeHXLrxqRxYVRw2Iqv9IufdJb4gM13TbNSYniUT1WKaHxGIZ5p+FuNlXVhvk1OpHFM13+gXA==", + "dependencies": { + "@aws-sdk/client-sts": "3.535.0", + "@aws-sdk/credential-provider-env": "3.535.0", + "@aws-sdk/credential-provider-process": "3.535.0", + "@aws-sdk/credential-provider-sso": "3.535.0", + "@aws-sdk/credential-provider-web-identity": "3.535.0", + "@aws-sdk/types": "3.535.0", + "@smithy/credential-provider-imds": "^2.3.0", + "@smithy/property-provider": "^2.2.0", + "@smithy/shared-ini-file-loader": "^2.4.0", + "@smithy/types": "^2.12.0", + "tslib": "^2.6.2" }, "engines": { "node": ">=14.0.0" } }, + "node_modules/@aws-sdk/credential-provider-ini/node_modules/tslib": { + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz", + "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==" + }, "node_modules/@aws-sdk/credential-provider-node": { - "version": "3.252.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-node/-/credential-provider-node-3.252.0.tgz", - "integrity": "sha512-Jt854JnB7izkJ/gb3S0hBFqAQPUNUP3eL8gXX2uqk9A9bQFQdS57/Ci0FXaEPwOXzJwAAPazD8dTf6HXMhnm3w==", - "dependencies": { - "@aws-sdk/credential-provider-env": "3.226.0", - "@aws-sdk/credential-provider-imds": "3.226.0", - "@aws-sdk/credential-provider-ini": "3.252.0", - "@aws-sdk/credential-provider-process": "3.226.0", - "@aws-sdk/credential-provider-sso": "3.252.0", - "@aws-sdk/credential-provider-web-identity": "3.226.0", - "@aws-sdk/property-provider": "3.226.0", - "@aws-sdk/shared-ini-file-loader": "3.226.0", - "@aws-sdk/types": "3.226.0", - "tslib": "^2.3.1" + "version": "3.535.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-node/-/credential-provider-node-3.535.0.tgz", + "integrity": "sha512-6JXp/EuL6euUkH5k4d+lQFF6gBwukrcCOWfNHCmq14mNJf/cqT3HAX1VMtWFRSK20am0IxfYQGccb0/nZykdKg==", + "dependencies": { + "@aws-sdk/credential-provider-env": "3.535.0", + "@aws-sdk/credential-provider-http": "3.535.0", + "@aws-sdk/credential-provider-ini": "3.535.0", + "@aws-sdk/credential-provider-process": "3.535.0", + "@aws-sdk/credential-provider-sso": "3.535.0", + "@aws-sdk/credential-provider-web-identity": "3.535.0", + "@aws-sdk/types": "3.535.0", + "@smithy/credential-provider-imds": "^2.3.0", + "@smithy/property-provider": "^2.2.0", + "@smithy/shared-ini-file-loader": "^2.4.0", + "@smithy/types": "^2.12.0", + "tslib": "^2.6.2" }, "engines": { "node": ">=14.0.0" } }, + "node_modules/@aws-sdk/credential-provider-node/node_modules/tslib": { + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz", + "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==" + }, "node_modules/@aws-sdk/credential-provider-process": { - "version": "3.226.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-process/-/credential-provider-process-3.226.0.tgz", - "integrity": "sha512-iUDMdnrTvbvaCFhWwqyXrhvQ9+ojPqPqXhwZtY1X/Qaz+73S9gXBPJHZaZb2Ke0yKE1Ql3bJbKvmmxC/qLQMng==", + "version": "3.535.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-process/-/credential-provider-process-3.535.0.tgz", + "integrity": "sha512-9O1OaprGCnlb/kYl8RwmH7Mlg8JREZctB8r9sa1KhSsWFq/SWO0AuJTyowxD7zL5PkeS4eTvzFFHWCa3OO5epA==", "dependencies": { - "@aws-sdk/property-provider": "3.226.0", - "@aws-sdk/shared-ini-file-loader": "3.226.0", - "@aws-sdk/types": "3.226.0", - "tslib": "^2.3.1" + "@aws-sdk/types": "3.535.0", + "@smithy/property-provider": "^2.2.0", + "@smithy/shared-ini-file-loader": "^2.4.0", + "@smithy/types": "^2.12.0", + "tslib": "^2.6.2" }, "engines": { "node": ">=14.0.0" } }, + "node_modules/@aws-sdk/credential-provider-process/node_modules/tslib": { + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz", + "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==" + }, "node_modules/@aws-sdk/credential-provider-sso": { - "version": "3.252.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-sso/-/credential-provider-sso-3.252.0.tgz", - "integrity": "sha512-2JGoojMOBjG9/DenctEszjdPechq0uDTpH5nx+z1xxIAugA5+HYG/ncNfpwhmUBCrnOxpRaQViTNqXddEPHlAg==", - "dependencies": { - "@aws-sdk/client-sso": "3.252.0", - "@aws-sdk/property-provider": "3.226.0", - "@aws-sdk/shared-ini-file-loader": "3.226.0", - "@aws-sdk/token-providers": "3.252.0", - "@aws-sdk/types": "3.226.0", - "tslib": "^2.3.1" + "version": "3.535.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-sso/-/credential-provider-sso-3.535.0.tgz", + "integrity": "sha512-2Dw0YIr8ETdFpq65CC4zK8ZIEbX78rXoNRZXUGNQW3oSKfL0tj8O8ErY6kg1IdEnYbGnEQ35q6luZ5GGNKLgDg==", + "dependencies": { + "@aws-sdk/client-sso": "3.535.0", + "@aws-sdk/token-providers": "3.535.0", + "@aws-sdk/types": "3.535.0", + "@smithy/property-provider": "^2.2.0", + "@smithy/shared-ini-file-loader": "^2.4.0", + "@smithy/types": "^2.12.0", + "tslib": "^2.6.2" }, "engines": { "node": ">=14.0.0" } }, + "node_modules/@aws-sdk/credential-provider-sso/node_modules/tslib": { + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz", + "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==" + }, "node_modules/@aws-sdk/credential-provider-web-identity": { - "version": "3.226.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-web-identity/-/credential-provider-web-identity-3.226.0.tgz", - "integrity": "sha512-CCpv847rLB0SFOHz2igvUMFAzeT2fD3YnY4C8jltuJoEkn0ITn1Hlgt13nTJ5BUuvyti2mvyXZHmNzhMIMrIlw==", + "version": "3.535.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-web-identity/-/credential-provider-web-identity-3.535.0.tgz", + "integrity": "sha512-t2/JWrKY0H66A7JW7CqX06/DG2YkJddikt5ymdQvx/Q7dRMJ3d+o/vgjoKr7RvEx/pNruCeyM1599HCvwrVMrg==", "dependencies": { - "@aws-sdk/property-provider": "3.226.0", - "@aws-sdk/types": "3.226.0", - "tslib": "^2.3.1" + "@aws-sdk/client-sts": "3.535.0", + "@aws-sdk/types": "3.535.0", + "@smithy/property-provider": "^2.2.0", + "@smithy/types": "^2.12.0", + "tslib": "^2.6.2" }, "engines": { "node": ">=14.0.0" } }, - "node_modules/@aws-sdk/eventstream-codec": { - "version": "3.226.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/eventstream-codec/-/eventstream-codec-3.226.0.tgz", - "integrity": "sha512-6uPtR8vSwz3fqoZk9hrb6qBYdp3PJ22+JxV5Wimdesvow4kJXSgDQXIxEkxbv6SxB9tNRB4uJHD84RetHEi15Q==", - "dependencies": { - "@aws-crypto/crc32": "2.0.0", - "@aws-sdk/types": "3.226.0", - "@aws-sdk/util-hex-encoding": "3.201.0", - "tslib": "^2.3.1" - } + "node_modules/@aws-sdk/credential-provider-web-identity/node_modules/tslib": { + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz", + "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==" }, - "node_modules/@aws-sdk/eventstream-serde-browser": { - "version": "3.226.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/eventstream-serde-browser/-/eventstream-serde-browser-3.226.0.tgz", - "integrity": "sha512-otYC5aZE9eJUqAlKpy8w0rPDQ1eKGvZPtgxWXmFYSO2lDVGfI1nBBNmdZ4MdHqNuQ7ucsKMQYF8BFJ65K2tYPA==", + "node_modules/@aws-sdk/middleware-bucket-endpoint": { + "version": "3.535.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-bucket-endpoint/-/middleware-bucket-endpoint-3.535.0.tgz", + "integrity": "sha512-7sijlfQsc4UO9Fsl11mU26Y5f9E7g6UoNg/iJUBpC5pgvvmdBRO5UEhbB/gnqvOEPsBXyhmfzbstebq23Qdz7A==", "dependencies": { - "@aws-sdk/eventstream-serde-universal": "3.226.0", - "@aws-sdk/types": "3.226.0", - "tslib": "^2.3.1" + "@aws-sdk/types": "3.535.0", + "@aws-sdk/util-arn-parser": "3.535.0", + "@smithy/node-config-provider": "^2.3.0", + "@smithy/protocol-http": "^3.3.0", + "@smithy/types": "^2.12.0", + "@smithy/util-config-provider": "^2.3.0", + "tslib": "^2.6.2" }, "engines": { "node": ">=14.0.0" } }, - "node_modules/@aws-sdk/eventstream-serde-config-resolver": { - "version": "3.226.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/eventstream-serde-config-resolver/-/eventstream-serde-config-resolver-3.226.0.tgz", - "integrity": "sha512-A56Gypg+lyEfA5cna+EUH9XTrj0SvRG1gwNW7lrUzviN36SeA/LFTUIOEjxVML3Lowy+EPAcrSZ67h6aepoAig==", + "node_modules/@aws-sdk/middleware-bucket-endpoint/node_modules/tslib": { + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz", + "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==" + }, + "node_modules/@aws-sdk/middleware-expect-continue": { + "version": "3.535.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-expect-continue/-/middleware-expect-continue-3.535.0.tgz", + "integrity": "sha512-hFKyqUBky0NWCVku8iZ9+PACehx0p6vuMw5YnZf8FVgHP0fode0b/NwQY6UY7oor/GftvRsAlRUAWGNFEGUpwA==", "dependencies": { - "@aws-sdk/types": "3.226.0", - "tslib": "^2.3.1" + "@aws-sdk/types": "3.535.0", + "@smithy/protocol-http": "^3.3.0", + "@smithy/types": "^2.12.0", + "tslib": "^2.6.2" }, "engines": { "node": ">=14.0.0" } }, - "node_modules/@aws-sdk/eventstream-serde-node": { - "version": "3.226.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/eventstream-serde-node/-/eventstream-serde-node-3.226.0.tgz", - "integrity": "sha512-KWLnKkKDzI9RNkiK6OiSYpG/XjZfue6Bsp/vRG+H5z3fbXdHv4X2+iW+Efu2Kvn7jsUyUv82TCl57DyJ/HKYhQ==", + "node_modules/@aws-sdk/middleware-expect-continue/node_modules/tslib": { + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz", + "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==" + }, + "node_modules/@aws-sdk/middleware-flexible-checksums": { + "version": "3.535.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-flexible-checksums/-/middleware-flexible-checksums-3.535.0.tgz", + "integrity": "sha512-rBIzldY9jjRATxICDX7t77aW6ctqmVDgnuAOgbVT5xgHftt4o7PGWKoMvl/45hYqoQgxVFnCBof9bxkqSBebVA==", "dependencies": { - "@aws-sdk/eventstream-serde-universal": "3.226.0", - "@aws-sdk/types": "3.226.0", - "tslib": "^2.3.1" + "@aws-crypto/crc32": "3.0.0", + "@aws-crypto/crc32c": "3.0.0", + "@aws-sdk/types": "3.535.0", + "@smithy/is-array-buffer": "^2.2.0", + "@smithy/protocol-http": "^3.3.0", + "@smithy/types": "^2.12.0", + "@smithy/util-utf8": "^2.3.0", + "tslib": "^2.6.2" }, "engines": { "node": ">=14.0.0" } }, - "node_modules/@aws-sdk/eventstream-serde-universal": { - "version": "3.226.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/eventstream-serde-universal/-/eventstream-serde-universal-3.226.0.tgz", - "integrity": "sha512-Q8viYM1Sv90/yIUqyWNeG1GEvyVlAI3GIrInQcCMC+xT59jS+IKGy2y7ojCvSWXnhf5/HMXKcmG092QsqeKy0Q==", + "node_modules/@aws-sdk/middleware-flexible-checksums/node_modules/tslib": { + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz", + "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==" + }, + "node_modules/@aws-sdk/middleware-host-header": { + "version": "3.535.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-host-header/-/middleware-host-header-3.535.0.tgz", + "integrity": "sha512-0h6TWjBWtDaYwHMQJI9ulafeS4lLaw1vIxRjbpH0svFRt6Eve+Sy8NlVhECfTU2hNz/fLubvrUxsXoThaLBIew==", "dependencies": { - "@aws-sdk/eventstream-codec": "3.226.0", - "@aws-sdk/types": "3.226.0", - "tslib": "^2.3.1" + "@aws-sdk/types": "3.535.0", + "@smithy/protocol-http": "^3.3.0", + "@smithy/types": "^2.12.0", + "tslib": "^2.6.2" }, "engines": { "node": ">=14.0.0" } }, - "node_modules/@aws-sdk/fetch-http-handler": { - "version": "3.226.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/fetch-http-handler/-/fetch-http-handler-3.226.0.tgz", - "integrity": "sha512-JewZPMNEBXfi1xVnRa7pVtK/zgZD8/lQ/YnD8pq79WuMa2cwyhDtr8oqCoqsPW+WJT5ScXoMtuHxN78l8eKWgg==", - "dependencies": { - "@aws-sdk/protocol-http": "3.226.0", - "@aws-sdk/querystring-builder": "3.226.0", - "@aws-sdk/types": "3.226.0", - "@aws-sdk/util-base64": "3.208.0", - "tslib": "^2.3.1" - } - }, - "node_modules/@aws-sdk/hash-blob-browser": { - "version": "3.226.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/hash-blob-browser/-/hash-blob-browser-3.226.0.tgz", - "integrity": "sha512-5DCvWE6L4xGoViEHyjcPFuUe1G2EtNx8TqswWaoaKgyasP/yuRm4H99Ra7rqIrjCcSTAGD9NVsUQvVVw1bGt9w==", - "dependencies": { - "@aws-sdk/chunked-blob-reader": "3.188.0", - "@aws-sdk/chunked-blob-reader-native": "3.208.0", - "@aws-sdk/types": "3.226.0", - "tslib": "^2.3.1" - } - }, - "node_modules/@aws-sdk/hash-node": { - "version": "3.226.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/hash-node/-/hash-node-3.226.0.tgz", - "integrity": "sha512-MdlJhJ9/Espwd0+gUXdZRsHuostB2WxEVAszWxobP0FTT9PnicqnfK7ExmW+DUAc0ywxtEbR3e0UND65rlSTVw==", - "dependencies": { - "@aws-sdk/types": "3.226.0", - "@aws-sdk/util-buffer-from": "3.208.0", - "tslib": "^2.3.1" - }, - "engines": { - "node": ">=14.0.0" - } - }, - "node_modules/@aws-sdk/hash-stream-node": { - "version": "3.226.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/hash-stream-node/-/hash-stream-node-3.226.0.tgz", - "integrity": "sha512-cgNTGlF8SdHaQXtjEmuLXz2U8SLM2JDKtIVPku/lHTMsUsEn+fuv2C+h1f/hvd4aNw5t1zggym7sO1/h/rv56Q==", - "dependencies": { - "@aws-sdk/types": "3.226.0", - "tslib": "^2.3.1" - }, - "engines": { - "node": ">=14.0.0" - } - }, - "node_modules/@aws-sdk/invalid-dependency": { - "version": "3.226.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/invalid-dependency/-/invalid-dependency-3.226.0.tgz", - "integrity": "sha512-QXOYFmap8g9QzRjumcRCIo2GEZkdCwd7ePQW0OABWPhKHzlJ74vvBxywjU3s39EEBEluWXtZ7Iufg6GxZM4ifw==", - "dependencies": { - "@aws-sdk/types": "3.226.0", - "tslib": "^2.3.1" - } - }, - "node_modules/@aws-sdk/is-array-buffer": { - "version": "3.201.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/is-array-buffer/-/is-array-buffer-3.201.0.tgz", - "integrity": "sha512-UPez5qLh3dNgt0DYnPD/q0mVJY84rA17QE26hVNOW3fAji8W2wrwrxdacWOxyXvlxWsVRcKmr+lay1MDqpAMfg==", - "dependencies": { - "tslib": "^2.3.1" - }, - "engines": { - "node": ">=14.0.0" - } - }, - "node_modules/@aws-sdk/md5-js": { - "version": "3.226.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/md5-js/-/md5-js-3.226.0.tgz", - "integrity": "sha512-ENigJRNudqyh6xsch166SZ4gggHd3XzZJ8gkCU4CWPne04HcR3BkWSO774IuWooCHt8zkaEHKecPurRz6qR+Vw==", - "dependencies": { - "@aws-sdk/types": "3.226.0", - "@aws-sdk/util-utf8-browser": "3.188.0", - "@aws-sdk/util-utf8-node": "3.208.0", - "tslib": "^2.3.1" - } - }, - "node_modules/@aws-sdk/middleware-bucket-endpoint": { - "version": "3.226.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-bucket-endpoint/-/middleware-bucket-endpoint-3.226.0.tgz", - "integrity": "sha512-A1Vq5W2X7jgTfjqcKPmjoHohF0poP+9fxwL97fQMvzcwmjhtoCV3bLEpo6CGYx0pKPiSlRJXZkRwRPj2hDHDmA==", - "dependencies": { - "@aws-sdk/protocol-http": "3.226.0", - "@aws-sdk/types": "3.226.0", - "@aws-sdk/util-arn-parser": "3.208.0", - "@aws-sdk/util-config-provider": "3.208.0", - "tslib": "^2.3.1" - }, - "engines": { - "node": ">=14.0.0" - } - }, - "node_modules/@aws-sdk/middleware-content-length": { - "version": "3.226.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-content-length/-/middleware-content-length-3.226.0.tgz", - "integrity": "sha512-ksUzlHJN2JMuyavjA46a4sctvnrnITqt2tbGGWWrAuXY1mel2j+VbgnmJUiwHKUO6bTFBBeft5Vd1TSOb4JmiA==", - "dependencies": { - "@aws-sdk/protocol-http": "3.226.0", - "@aws-sdk/types": "3.226.0", - "tslib": "^2.3.1" - }, - "engines": { - "node": ">=14.0.0" - } - }, - "node_modules/@aws-sdk/middleware-endpoint": { - "version": "3.226.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-endpoint/-/middleware-endpoint-3.226.0.tgz", - "integrity": "sha512-EvLFafjtUxTT0AC9p3aBQu1/fjhWdIeK58jIXaNFONfZ3F8QbEYUPuF/SqZvJM6cWfOO9qwYKkRDbCSTYhprIg==", - "dependencies": { - "@aws-sdk/middleware-serde": "3.226.0", - "@aws-sdk/protocol-http": "3.226.0", - "@aws-sdk/signature-v4": "3.226.0", - "@aws-sdk/types": "3.226.0", - "@aws-sdk/url-parser": "3.226.0", - "@aws-sdk/util-config-provider": "3.208.0", - "@aws-sdk/util-middleware": "3.226.0", - "tslib": "^2.3.1" - }, - "engines": { - "node": ">=14.0.0" - } - }, - "node_modules/@aws-sdk/middleware-expect-continue": { - "version": "3.226.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-expect-continue/-/middleware-expect-continue-3.226.0.tgz", - "integrity": "sha512-YxvQKTV/eA9P8AgW0hXOgj5Qa+TSnNFfyOkfeP089aP3f6p92b1cESf33TEOKsddive2mHT5LRCN6MuPcgWWrA==", - "dependencies": { - "@aws-sdk/protocol-http": "3.226.0", - "@aws-sdk/types": "3.226.0", - "tslib": "^2.3.1" - }, - "engines": { - "node": ">=14.0.0" - } - }, - "node_modules/@aws-sdk/middleware-flexible-checksums": { - "version": "3.226.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-flexible-checksums/-/middleware-flexible-checksums-3.226.0.tgz", - "integrity": "sha512-8A9Ot9A7794UP5tMGl2MnfTW/UM/jYy1wRWF9YkR/hPIcPb7OmE0hmlwIQGzb/7grxpYw66ETKf0WeH/41YfeQ==", - "dependencies": { - "@aws-crypto/crc32": "2.0.0", - "@aws-crypto/crc32c": "2.0.0", - "@aws-sdk/is-array-buffer": "3.201.0", - "@aws-sdk/protocol-http": "3.226.0", - "@aws-sdk/types": "3.226.0", - "tslib": "^2.3.1" - }, - "engines": { - "node": ">=14.0.0" - } - }, - "node_modules/@aws-sdk/middleware-host-header": { - "version": "3.226.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-host-header/-/middleware-host-header-3.226.0.tgz", - "integrity": "sha512-haVkWVh6BUPwKgWwkL6sDvTkcZWvJjv8AgC8jiQuSl8GLZdzHTB8Qhi3IsfFta9HAuoLjxheWBE5Z/L0UrfhLA==", - "dependencies": { - "@aws-sdk/protocol-http": "3.226.0", - "@aws-sdk/types": "3.226.0", - "tslib": "^2.3.1" - }, - "engines": { - "node": ">=14.0.0" - } + "node_modules/@aws-sdk/middleware-host-header/node_modules/tslib": { + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz", + "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==" }, "node_modules/@aws-sdk/middleware-location-constraint": { - "version": "3.226.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-location-constraint/-/middleware-location-constraint-3.226.0.tgz", - "integrity": "sha512-qHiYaBYPc2R37KxG2uqsUUwh4usrQMHfGkrpTUnx5d4rGzM3mC+muPsTpSHnAL63K2/yJOHQJFjss3GGwV4SSA==", + "version": "3.535.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-location-constraint/-/middleware-location-constraint-3.535.0.tgz", + "integrity": "sha512-SxfS9wfidUZZ+WnlKRTCRn3h+XTsymXRXPJj8VV6hNRNeOwzNweoG3YhQbTowuuNfXf89m9v6meYkBBtkdacKw==", "dependencies": { - "@aws-sdk/types": "3.226.0", - "tslib": "^2.3.1" + "@aws-sdk/types": "3.535.0", + "@smithy/types": "^2.12.0", + "tslib": "^2.6.2" }, "engines": { "node": ">=14.0.0" } }, + "node_modules/@aws-sdk/middleware-location-constraint/node_modules/tslib": { + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz", + "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==" + }, "node_modules/@aws-sdk/middleware-logger": { - "version": "3.226.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-logger/-/middleware-logger-3.226.0.tgz", - "integrity": "sha512-m9gtLrrYnpN6yckcQ09rV7ExWOLMuq8mMPF/K3DbL/YL0TuILu9i2T1W+JuxSX+K9FMG2HrLAKivE/kMLr55xA==", + "version": "3.535.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-logger/-/middleware-logger-3.535.0.tgz", + "integrity": "sha512-huNHpONOrEDrdRTvSQr1cJiRMNf0S52NDXtaPzdxiubTkP+vni2MohmZANMOai/qT0olmEVX01LhZ0ZAOgmg6A==", "dependencies": { - "@aws-sdk/types": "3.226.0", - "tslib": "^2.3.1" + "@aws-sdk/types": "3.535.0", + "@smithy/types": "^2.12.0", + "tslib": "^2.6.2" }, "engines": { "node": ">=14.0.0" } }, + "node_modules/@aws-sdk/middleware-logger/node_modules/tslib": { + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz", + "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==" + }, "node_modules/@aws-sdk/middleware-recursion-detection": { - "version": "3.226.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-recursion-detection/-/middleware-recursion-detection-3.226.0.tgz", - "integrity": "sha512-mwRbdKEUeuNH5TEkyZ5FWxp6bL2UC1WbY+LDv6YjHxmSMKpAoOueEdtU34PqDOLrpXXxIGHDFmjeGeMfktyEcA==", + "version": "3.535.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-recursion-detection/-/middleware-recursion-detection-3.535.0.tgz", + "integrity": "sha512-am2qgGs+gwqmR4wHLWpzlZ8PWhm4ktj5bYSgDrsOfjhdBlWNxvPoID9/pDAz5RWL48+oH7I6SQzMqxXsFDikrw==", "dependencies": { - "@aws-sdk/protocol-http": "3.226.0", - "@aws-sdk/types": "3.226.0", - "tslib": "^2.3.1" + "@aws-sdk/types": "3.535.0", + "@smithy/protocol-http": "^3.3.0", + "@smithy/types": "^2.12.0", + "tslib": "^2.6.2" }, "engines": { "node": ">=14.0.0" } }, - "node_modules/@aws-sdk/middleware-retry": { - "version": "3.235.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-retry/-/middleware-retry-3.235.0.tgz", - "integrity": "sha512-50WHbJGpD3SNp9763MAlHqIhXil++JdQbKejNpHg7HsJne/ao3ub+fDOfx//mMBjpzBV25BGd5UlfL6blrClSg==", - "dependencies": { - "@aws-sdk/protocol-http": "3.226.0", - "@aws-sdk/service-error-classification": "3.229.0", - "@aws-sdk/types": "3.226.0", - "@aws-sdk/util-middleware": "3.226.0", - "@aws-sdk/util-retry": "3.229.0", - "tslib": "^2.3.1", - "uuid": "^8.3.2" - }, - "engines": { - "node": ">=14.0.0" - } + "node_modules/@aws-sdk/middleware-recursion-detection/node_modules/tslib": { + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz", + "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==" }, "node_modules/@aws-sdk/middleware-sdk-s3": { - "version": "3.231.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-sdk-s3/-/middleware-sdk-s3-3.231.0.tgz", - "integrity": "sha512-UGaSvevd2TanfKgStF46dDSHkh4bxOr1gdUkyHm9i+1pF5lx4KdbnBZv/5SKnn7XifhHRXrs1M3lTzemXREhTA==", + "version": "3.535.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-sdk-s3/-/middleware-sdk-s3-3.535.0.tgz", + "integrity": "sha512-/dLG/E3af6ohxkQ5GBHT8tZfuPIg6eItKxCXuulvYj0Tqgf3Mb+xTsvSkxQsJF06RS4sH7Qsg/PnB8ZfrJrXpg==", "dependencies": { - "@aws-sdk/protocol-http": "3.226.0", - "@aws-sdk/types": "3.226.0", - "@aws-sdk/util-arn-parser": "3.208.0", - "tslib": "^2.3.1" + "@aws-sdk/types": "3.535.0", + "@aws-sdk/util-arn-parser": "3.535.0", + "@smithy/node-config-provider": "^2.3.0", + "@smithy/protocol-http": "^3.3.0", + "@smithy/signature-v4": "^2.2.0", + "@smithy/smithy-client": "^2.5.0", + "@smithy/types": "^2.12.0", + "@smithy/util-config-provider": "^2.3.0", + "tslib": "^2.6.2" }, "engines": { "node": ">=14.0.0" } }, - "node_modules/@aws-sdk/middleware-sdk-sts": { - "version": "3.226.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-sdk-sts/-/middleware-sdk-sts-3.226.0.tgz", - "integrity": "sha512-NN9T/qoSD1kZvAT+VLny3NnlqgylYQcsgV3rvi/8lYzw/G/2s8VS6sm/VTWGGZhx08wZRv20MWzYu3bftcyqUg==", - "dependencies": { - "@aws-sdk/middleware-signing": "3.226.0", - "@aws-sdk/property-provider": "3.226.0", - "@aws-sdk/protocol-http": "3.226.0", - "@aws-sdk/signature-v4": "3.226.0", - "@aws-sdk/types": "3.226.0", - "tslib": "^2.3.1" - }, - "engines": { - "node": ">=14.0.0" - } + "node_modules/@aws-sdk/middleware-sdk-s3/node_modules/tslib": { + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz", + "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==" }, - "node_modules/@aws-sdk/middleware-serde": { - "version": "3.226.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-serde/-/middleware-serde-3.226.0.tgz", - "integrity": "sha512-nPuOOAkSfx9TxzdKFx0X2bDlinOxGrqD7iof926K/AEflxGD1DBdcaDdjlYlPDW2CVE8LV/rAgbYuLxh/E/1VA==", + "node_modules/@aws-sdk/middleware-signing": { + "version": "3.535.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-signing/-/middleware-signing-3.535.0.tgz", + "integrity": "sha512-Rb4sfus1Gc5paRl9JJgymJGsb/i3gJKK/rTuFZICdd1PBBE5osIOHP5CpzWYBtc5LlyZE1a2QoxPMCyG+QUGPw==", "dependencies": { - "@aws-sdk/types": "3.226.0", - "tslib": "^2.3.1" + "@aws-sdk/types": "3.535.0", + "@smithy/property-provider": "^2.2.0", + "@smithy/protocol-http": "^3.3.0", + "@smithy/signature-v4": "^2.2.0", + "@smithy/types": "^2.12.0", + "@smithy/util-middleware": "^2.2.0", + "tslib": "^2.6.2" }, "engines": { "node": ">=14.0.0" } }, - "node_modules/@aws-sdk/middleware-signing": { - "version": "3.226.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-signing/-/middleware-signing-3.226.0.tgz", - "integrity": "sha512-E6HmtPcl+IjYDDzi1xI2HpCbBq2avNWcjvCriMZWuTAtRVpnA6XDDGW5GY85IfS3A8G8vuWqEVPr8JcYUcjfew==", - "dependencies": { - "@aws-sdk/property-provider": "3.226.0", - "@aws-sdk/protocol-http": "3.226.0", - "@aws-sdk/signature-v4": "3.226.0", - "@aws-sdk/types": "3.226.0", - "@aws-sdk/util-middleware": "3.226.0", - "tslib": "^2.3.1" - }, - "engines": { - "node": ">=14.0.0" - } + "node_modules/@aws-sdk/middleware-signing/node_modules/tslib": { + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz", + "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==" }, "node_modules/@aws-sdk/middleware-ssec": { - "version": "3.226.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-ssec/-/middleware-ssec-3.226.0.tgz", - "integrity": "sha512-DR97oWoLHiMdaUP/wu99HtzG7/ijvCrjZGDH37WBO1rxFtEti6L7T09wgHzwxMN8gtL8FJA7dU8IrffGSC9VmA==", + "version": "3.537.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-ssec/-/middleware-ssec-3.537.0.tgz", + "integrity": "sha512-2QWMrbwd5eBy5KCYn9a15JEWBgrK2qFEKQN2lqb/6z0bhtevIOxIRfC99tzvRuPt6nixFQ+ynKuBjcfT4ZFrdQ==", "dependencies": { - "@aws-sdk/types": "3.226.0", - "tslib": "^2.3.1" + "@aws-sdk/types": "3.535.0", + "@smithy/types": "^2.12.0", + "tslib": "^2.6.2" }, "engines": { "node": ">=14.0.0" } }, - "node_modules/@aws-sdk/middleware-stack": { - "version": "3.226.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-stack/-/middleware-stack-3.226.0.tgz", - "integrity": "sha512-85wF29LvPvpoed60fZGDYLwv1Zpd/cM0C22WSSFPw1SSJeqO4gtFYyCg2squfT3KI6kF43IIkOCJ+L7GtryPug==", - "dependencies": { - "tslib": "^2.3.1" - }, - "engines": { - "node": ">=14.0.0" - } + "node_modules/@aws-sdk/middleware-ssec/node_modules/tslib": { + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz", + "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==" }, "node_modules/@aws-sdk/middleware-user-agent": { - "version": "3.226.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-user-agent/-/middleware-user-agent-3.226.0.tgz", - "integrity": "sha512-N1WnfzCW1Y5yWhVAphf8OPGTe8Df3vmV7/LdsoQfmpkCZgLZeK2o0xITkUQhRj1mbw7yp8tVFLFV3R2lMurdAQ==", + "version": "3.535.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-user-agent/-/middleware-user-agent-3.535.0.tgz", + "integrity": "sha512-Uvb2WJ+zdHdCOtsWVPI/M0BcfNrjOYsicDZWtaljucRJKLclY5gNWwD+RwIC+8b5TvfnVOlH+N5jhvpi5Impog==", "dependencies": { - "@aws-sdk/protocol-http": "3.226.0", - "@aws-sdk/types": "3.226.0", - "tslib": "^2.3.1" + "@aws-sdk/types": "3.535.0", + "@aws-sdk/util-endpoints": "3.535.0", + "@smithy/protocol-http": "^3.3.0", + "@smithy/types": "^2.12.0", + "tslib": "^2.6.2" }, "engines": { "node": ">=14.0.0" } }, - "node_modules/@aws-sdk/node-config-provider": { - "version": "3.226.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/node-config-provider/-/node-config-provider-3.226.0.tgz", - "integrity": "sha512-B8lQDqiRk7X5izFEUMXmi8CZLOKCTWQJU9HQf3ako+sF0gexo4nHN3jhoRWyLtcgC5S3on/2jxpAcqtm7kuY3w==", - "dependencies": { - "@aws-sdk/property-provider": "3.226.0", - "@aws-sdk/shared-ini-file-loader": "3.226.0", - "@aws-sdk/types": "3.226.0", - "tslib": "^2.3.1" - }, - "engines": { - "node": ">=14.0.0" - } - }, - "node_modules/@aws-sdk/node-http-handler": { - "version": "3.226.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/node-http-handler/-/node-http-handler-3.226.0.tgz", - "integrity": "sha512-xQCddnZNMiPmjr3W7HYM+f5ir4VfxgJh37eqZwX6EZmyItFpNNeVzKUgA920ka1VPz/ZUYB+2OFGiX3LCLkkaA==", - "dependencies": { - "@aws-sdk/abort-controller": "3.226.0", - "@aws-sdk/protocol-http": "3.226.0", - "@aws-sdk/querystring-builder": "3.226.0", - "@aws-sdk/types": "3.226.0", - "tslib": "^2.3.1" - }, - "engines": { - "node": ">=14.0.0" - } - }, - "node_modules/@aws-sdk/property-provider": { - "version": "3.226.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/property-provider/-/property-provider-3.226.0.tgz", - "integrity": "sha512-TsljjG+Sg0LmdgfiAlWohluWKnxB/k8xenjeozZfzOr5bHmNHtdbWv6BtNvD/R83hw7SFXxbJHlD5H4u9p2NFg==", - "dependencies": { - "@aws-sdk/types": "3.226.0", - "tslib": "^2.3.1" - }, - "engines": { - "node": ">=14.0.0" - } - }, - "node_modules/@aws-sdk/protocol-http": { - "version": "3.226.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/protocol-http/-/protocol-http-3.226.0.tgz", - "integrity": "sha512-zWkVqiTA9RXL6y0hhfZc9bcU4DX2NI6Hw9IhQmSPeM59mdbPjJlY4bLlMr5YxywqO3yQ/ylNoAfrEzrDjlOSRg==", - "dependencies": { - "@aws-sdk/types": "3.226.0", - "tslib": "^2.3.1" - }, - "engines": { - "node": ">=14.0.0" - } - }, - "node_modules/@aws-sdk/querystring-builder": { - "version": "3.226.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/querystring-builder/-/querystring-builder-3.226.0.tgz", - "integrity": "sha512-LVurypuNeotO4lmirKXRC4NYrZRAyMJXuwO0f2a5ZAUJCjauwYrifKue6yCfU7bls7gut7nfcR6B99WBYpHs3g==", - "dependencies": { - "@aws-sdk/types": "3.226.0", - "@aws-sdk/util-uri-escape": "3.201.0", - "tslib": "^2.3.1" - }, - "engines": { - "node": ">=14.0.0" - } + "node_modules/@aws-sdk/middleware-user-agent/node_modules/tslib": { + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz", + "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==" }, - "node_modules/@aws-sdk/querystring-parser": { - "version": "3.226.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/querystring-parser/-/querystring-parser-3.226.0.tgz", - "integrity": "sha512-FzB+VrQ47KAFxiPt2YXrKZ8AOLZQqGTLCKHzx4bjxGmwgsjV8yIbtJiJhZLMcUQV4LtGeIY9ixIqQhGvnZHE4A==", + "node_modules/@aws-sdk/region-config-resolver": { + "version": "3.535.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/region-config-resolver/-/region-config-resolver-3.535.0.tgz", + "integrity": "sha512-IXOznDiaItBjsQy4Fil0kzX/J3HxIOknEphqHbOfUf+LpA5ugcsxuQQONrbEQusCBnfJyymrldBvBhFmtlU9Wg==", "dependencies": { - "@aws-sdk/types": "3.226.0", - "tslib": "^2.3.1" + "@aws-sdk/types": "3.535.0", + "@smithy/node-config-provider": "^2.3.0", + "@smithy/types": "^2.12.0", + "@smithy/util-config-provider": "^2.3.0", + "@smithy/util-middleware": "^2.2.0", + "tslib": "^2.6.2" }, "engines": { "node": ">=14.0.0" } }, - "node_modules/@aws-sdk/service-error-classification": { - "version": "3.229.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/service-error-classification/-/service-error-classification-3.229.0.tgz", - "integrity": "sha512-dnzWWQ0/NoWMUZ5C0DW3dPm0wC1O76Y/SpKbuJzWPkx1EYy6r8p32Ly4D9vUzrKDbRGf48YHIF2kOkBmu21CLg==", - "engines": { - "node": ">=14.0.0" - } - }, - "node_modules/@aws-sdk/shared-ini-file-loader": { - "version": "3.226.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/shared-ini-file-loader/-/shared-ini-file-loader-3.226.0.tgz", - "integrity": "sha512-661VQefsARxVyyV2FX9V61V+nNgImk7aN2hYlFKla6BCwZfMng+dEtD0xVGyg1PfRw0qvEv5LQyxMVgHcUSevA==", - "dependencies": { - "@aws-sdk/types": "3.226.0", - "tslib": "^2.3.1" - }, - "engines": { - "node": ">=14.0.0" - } + "node_modules/@aws-sdk/region-config-resolver/node_modules/tslib": { + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz", + "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==" }, - "node_modules/@aws-sdk/signature-v4": { - "version": "3.226.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/signature-v4/-/signature-v4-3.226.0.tgz", - "integrity": "sha512-/R5q5agdPd7HJB68XMzpxrNPk158EHUvkFkuRu5Qf3kkkHebEzWEBlWoVpUe6ss4rP9Tqcue6xPuaftEmhjpYw==", + "node_modules/@aws-sdk/signature-v4-multi-region": { + "version": "3.535.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/signature-v4-multi-region/-/signature-v4-multi-region-3.535.0.tgz", + "integrity": "sha512-tqCsEsEj8icW0SAh3NvyhRUq54Gz2pu4NM2tOSrFp7SO55heUUaRLSzYteNZCTOupH//AAaZvbN/UUTO/DrOog==", "dependencies": { - "@aws-sdk/is-array-buffer": "3.201.0", - "@aws-sdk/types": "3.226.0", - "@aws-sdk/util-hex-encoding": "3.201.0", - "@aws-sdk/util-middleware": "3.226.0", - "@aws-sdk/util-uri-escape": "3.201.0", - "tslib": "^2.3.1" + "@aws-sdk/middleware-sdk-s3": "3.535.0", + "@aws-sdk/types": "3.535.0", + "@smithy/protocol-http": "^3.3.0", + "@smithy/signature-v4": "^2.2.0", + "@smithy/types": "^2.12.0", + "tslib": "^2.6.2" }, "engines": { "node": ">=14.0.0" } }, - "node_modules/@aws-sdk/signature-v4-multi-region": { - "version": "3.226.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/signature-v4-multi-region/-/signature-v4-multi-region-3.226.0.tgz", - "integrity": "sha512-QHxNuf9ynK208v7Y3imdsa3Cz8ynYV7ZOf3sBJdItuEtHN6uy/KxaOrtvpF8I5Hyn48Hc8z5miTSMujFKT7GEw==", - "dependencies": { - "@aws-sdk/protocol-http": "3.226.0", - "@aws-sdk/signature-v4": "3.226.0", - "@aws-sdk/types": "3.226.0", - "@aws-sdk/util-arn-parser": "3.208.0", - "tslib": "^2.3.1" - }, - "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/signature-v4-multi-region/node_modules/tslib": { + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz", + "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==" }, - "node_modules/@aws-sdk/smithy-client": { - "version": "3.234.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/smithy-client/-/smithy-client-3.234.0.tgz", - "integrity": "sha512-8AtR/k4vsFvjXeQbIzq/Wy7Nbk48Ou0wUEeVYPHWHPSU8QamFWORkOwmKtKMfHAyZvmqiAPeQqHFkq+UJhWyyQ==", + "node_modules/@aws-sdk/token-providers": { + "version": "3.535.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/token-providers/-/token-providers-3.535.0.tgz", + "integrity": "sha512-4g+l/B9h1H/SiDtFRosW3pMwc+3PTXljZit+5NUBcET2XqcdUyHmgj3lBdu+CJ9CHdIMggRalYMAFXnRFe3Psg==", "dependencies": { - "@aws-sdk/middleware-stack": "3.226.0", - "@aws-sdk/types": "3.226.0", - "tslib": "^2.3.1" + "@aws-sdk/client-sso-oidc": "3.535.0", + "@aws-sdk/types": "3.535.0", + "@smithy/property-provider": "^2.2.0", + "@smithy/shared-ini-file-loader": "^2.4.0", + "@smithy/types": "^2.12.0", + "tslib": "^2.6.2" }, "engines": { "node": ">=14.0.0" } }, - "node_modules/@aws-sdk/token-providers": { - "version": "3.252.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/token-providers/-/token-providers-3.252.0.tgz", - "integrity": "sha512-xi3pUP31tyKF4lJFCOgtkwSWESE9W1vE23Vybsq53wzXEYfnRql8RP+C9FFkUouAR6ixPHEcEYplB+l92CY49g==", - "dependencies": { - "@aws-sdk/client-sso-oidc": "3.252.0", - "@aws-sdk/property-provider": "3.226.0", - "@aws-sdk/shared-ini-file-loader": "3.226.0", - "@aws-sdk/types": "3.226.0", - "tslib": "^2.3.1" - }, - "engines": { - "node": ">=14.0.0" - } + "node_modules/@aws-sdk/token-providers/node_modules/tslib": { + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz", + "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==" }, "node_modules/@aws-sdk/types": { - "version": "3.226.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/types/-/types-3.226.0.tgz", - "integrity": "sha512-MmmNHrWeO4man7wpOwrAhXlevqtOV9ZLcH4RhnG5LmRce0RFOApx24HoKENfFCcOyCm5LQBlsXCqi0dZWDWU0A==", + "version": "3.535.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/types/-/types-3.535.0.tgz", + "integrity": "sha512-aY4MYfduNj+sRR37U7XxYR8wemfbKP6lx00ze2M2uubn7mZotuVrWYAafbMSXrdEMSToE5JDhr28vArSOoLcSg==", "dependencies": { - "tslib": "^2.3.1" + "@smithy/types": "^2.12.0", + "tslib": "^2.6.2" }, "engines": { "node": ">=14.0.0" } }, - "node_modules/@aws-sdk/url-parser": { - "version": "3.226.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/url-parser/-/url-parser-3.226.0.tgz", - "integrity": "sha512-p5RLE0QWyP0OcTOLmFcLdVgUcUEzmEfmdrnOxyNzomcYb0p3vUagA5zfa1HVK2azsQJFBv28GfvMnba9bGhObg==", - "dependencies": { - "@aws-sdk/querystring-parser": "3.226.0", - "@aws-sdk/types": "3.226.0", - "tslib": "^2.3.1" - } + "node_modules/@aws-sdk/types/node_modules/tslib": { + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz", + "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==" }, "node_modules/@aws-sdk/util-arn-parser": { - "version": "3.208.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/util-arn-parser/-/util-arn-parser-3.208.0.tgz", - "integrity": "sha512-QV4af+kscova9dv4VuHOgH8wEr/IIYHDGcnyVtkUEqahCejWr1Kuk+SBK0xMwnZY5LSycOtQ8aeqHOn9qOjZtA==", + "version": "3.535.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/util-arn-parser/-/util-arn-parser-3.535.0.tgz", + "integrity": "sha512-smVo29nUPAOprp8Z5Y3GHuhiOtw6c8/EtLCm5AVMtRsTPw4V414ZXL2H66tzmb5kEeSzQlbfBSBEdIFZoxO9kg==", "dependencies": { - "tslib": "^2.3.1" + "tslib": "^2.6.2" }, "engines": { "node": ">=14.0.0" } }, - "node_modules/@aws-sdk/util-base64": { - "version": "3.208.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/util-base64/-/util-base64-3.208.0.tgz", - "integrity": "sha512-PQniZph5A6N7uuEOQi+1hnMz/FSOK/8kMFyFO+4DgA1dZ5pcKcn5wiFwHkcTb/BsgVqQa3Jx0VHNnvhlS8JyTg==", - "dependencies": { - "@aws-sdk/util-buffer-from": "3.208.0", - "tslib": "^2.3.1" - }, - "engines": { - "node": ">=14.0.0" - } - }, - "node_modules/@aws-sdk/util-body-length-browser": { - "version": "3.188.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/util-body-length-browser/-/util-body-length-browser-3.188.0.tgz", - "integrity": "sha512-8VpnwFWXhnZ/iRSl9mTf+VKOX9wDE8QtN4bj9pBfxwf90H1X7E8T6NkiZD3k+HubYf2J94e7DbeHs7fuCPW5Qg==", - "dependencies": { - "tslib": "^2.3.1" - } - }, - "node_modules/@aws-sdk/util-body-length-node": { - "version": "3.208.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/util-body-length-node/-/util-body-length-node-3.208.0.tgz", - "integrity": "sha512-3zj50e5g7t/MQf53SsuuSf0hEELzMtD8RX8C76f12OSRo2Bca4FLLYHe0TZbxcfQHom8/hOaeZEyTyMogMglqg==", - "dependencies": { - "tslib": "^2.3.1" - }, - "engines": { - "node": ">=14.0.0" - } - }, - "node_modules/@aws-sdk/util-buffer-from": { - "version": "3.208.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/util-buffer-from/-/util-buffer-from-3.208.0.tgz", - "integrity": "sha512-7L0XUixNEFcLUGPeBF35enCvB9Xl+K6SQsmbrPk1P3mlV9mguWSDQqbOBwY1Ir0OVbD6H/ZOQU7hI/9RtRI0Zw==", - "dependencies": { - "@aws-sdk/is-array-buffer": "3.201.0", - "tslib": "^2.3.1" - }, - "engines": { - "node": ">=14.0.0" - } - }, - "node_modules/@aws-sdk/util-config-provider": { - "version": "3.208.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/util-config-provider/-/util-config-provider-3.208.0.tgz", - "integrity": "sha512-DSRqwrERUsT34ug+anlMBIFooBEGwM8GejC7q00Y/9IPrQy50KnG5PW2NiTjuLKNi7pdEOlwTSEocJE15eDZIg==", - "dependencies": { - "tslib": "^2.3.1" - }, - "engines": { - "node": ">=14.0.0" - } - }, - "node_modules/@aws-sdk/util-defaults-mode-browser": { - "version": "3.234.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/util-defaults-mode-browser/-/util-defaults-mode-browser-3.234.0.tgz", - "integrity": "sha512-IHMKXjTbOD8XMz5+2oCOsVP94BYb9YyjXdns0aAXr2NAo7k2+RCzXQ2DebJXppGda1F6opFutoKwyVSN0cmbMw==", - "dependencies": { - "@aws-sdk/property-provider": "3.226.0", - "@aws-sdk/types": "3.226.0", - "bowser": "^2.11.0", - "tslib": "^2.3.1" - }, - "engines": { - "node": ">= 10.0.0" - } - }, - "node_modules/@aws-sdk/util-defaults-mode-node": { - "version": "3.234.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/util-defaults-mode-node/-/util-defaults-mode-node-3.234.0.tgz", - "integrity": "sha512-UGjQ+OjBYYhxFVtUY+jtr0ZZgzZh6OHtYwRhFt8IHewJXFCfZTyfsbX20szBj5y1S4HRIUJ7cwBLIytTqMbI5w==", - "dependencies": { - "@aws-sdk/config-resolver": "3.234.0", - "@aws-sdk/credential-provider-imds": "3.226.0", - "@aws-sdk/node-config-provider": "3.226.0", - "@aws-sdk/property-provider": "3.226.0", - "@aws-sdk/types": "3.226.0", - "tslib": "^2.3.1" - }, - "engines": { - "node": ">= 10.0.0" - } + "node_modules/@aws-sdk/util-arn-parser/node_modules/tslib": { + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz", + "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==" }, "node_modules/@aws-sdk/util-endpoints": { - "version": "3.245.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/util-endpoints/-/util-endpoints-3.245.0.tgz", - "integrity": "sha512-UNOFquB1tKx+8RT8n82Zb5tIwDyZHVPBg/m0LB0RsLETjr6krien5ASpqWezsXKIR1hftN9uaxN4bvf2dZrWHg==", + "version": "3.535.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/util-endpoints/-/util-endpoints-3.535.0.tgz", + "integrity": "sha512-c8TlaQsiPchOOmTTR6qvHCO2O7L7NJwlKWAoQJ2GqWDZuC5es/fyuF2rp1h+ZRrUVraUomS0YdGkAmaDC7hJQg==", "dependencies": { - "@aws-sdk/types": "3.226.0", - "tslib": "^2.3.1" + "@aws-sdk/types": "3.535.0", + "@smithy/types": "^2.12.0", + "@smithy/util-endpoints": "^1.2.0", + "tslib": "^2.6.2" }, "engines": { "node": ">=14.0.0" } }, - "node_modules/@aws-sdk/util-hex-encoding": { - "version": "3.201.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/util-hex-encoding/-/util-hex-encoding-3.201.0.tgz", - "integrity": "sha512-7t1vR1pVxKx0motd3X9rI3m/xNp78p3sHtP5yo4NP4ARpxyJ0fokBomY8ScaH2D/B+U5o9ARxldJUdMqyBlJcA==", - "dependencies": { - "tslib": "^2.3.1" - }, - "engines": { - "node": ">=14.0.0" - } + "node_modules/@aws-sdk/util-endpoints/node_modules/tslib": { + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz", + "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==" }, "node_modules/@aws-sdk/util-locate-window": { - "version": "3.208.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/util-locate-window/-/util-locate-window-3.208.0.tgz", - "integrity": "sha512-iua1A2+P7JJEDHVgvXrRJSvsnzG7stYSGQnBVphIUlemwl6nN5D+QrgbjECtrbxRz8asYFHSzhdhECqN+tFiBg==", - "dependencies": { - "tslib": "^2.3.1" - }, - "engines": { - "node": ">=14.0.0" - } - }, - "node_modules/@aws-sdk/util-middleware": { - "version": "3.226.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/util-middleware/-/util-middleware-3.226.0.tgz", - "integrity": "sha512-B96CQnwX4gRvQdaQkdUtqvDPkrptV5+va6FVeJOocU/DbSYMAScLxtR3peMS8cnlOT6nL1Eoa42OI9AfZz1VwQ==", - "dependencies": { - "tslib": "^2.3.1" - }, - "engines": { - "node": ">=14.0.0" - } - }, - "node_modules/@aws-sdk/util-retry": { - "version": "3.229.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/util-retry/-/util-retry-3.229.0.tgz", - "integrity": "sha512-0zKTqi0P1inD0LzIMuXRIYYQ/8c1lWMg/cfiqUcIAF1TpatlpZuN7umU0ierpBFud7S+zDgg0oemh+Nj8xliJw==", - "dependencies": { - "@aws-sdk/service-error-classification": "3.229.0", - "tslib": "^2.3.1" - }, - "engines": { - "node": ">= 14.0.0" - } - }, - "node_modules/@aws-sdk/util-stream-browser": { - "version": "3.226.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/util-stream-browser/-/util-stream-browser-3.226.0.tgz", - "integrity": "sha512-ZvjlA1ySaLd0DqUWTKmL7LsxfPhroAONpzsinaHmw9aZVL40s2cADU9eWgBdHTuAOeFklL7NP0cc6UiTFHKe8g==", + "version": "3.535.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/util-locate-window/-/util-locate-window-3.535.0.tgz", + "integrity": "sha512-PHJ3SL6d2jpcgbqdgiPxkXpu7Drc2PYViwxSIqvvMKhDwzSB1W3mMvtpzwKM4IE7zLFodZo0GKjJ9AsoXndXhA==", "dependencies": { - "@aws-sdk/fetch-http-handler": "3.226.0", - "@aws-sdk/types": "3.226.0", - "@aws-sdk/util-base64": "3.208.0", - "@aws-sdk/util-hex-encoding": "3.201.0", - "@aws-sdk/util-utf8-browser": "3.188.0", - "tslib": "^2.3.1" - } - }, - "node_modules/@aws-sdk/util-stream-node": { - "version": "3.226.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/util-stream-node/-/util-stream-node-3.226.0.tgz", - "integrity": "sha512-HADXiIgDGoXcCLSKuPnjCLENf0iC0lzqqnymZu9H2FoACZhJB7DvJ9LnP51Pvw9lfCu+yvLzbMqSPdbXtMbRWg==", - "dependencies": { - "@aws-sdk/node-http-handler": "3.226.0", - "@aws-sdk/types": "3.226.0", - "@aws-sdk/util-buffer-from": "3.208.0", - "tslib": "^2.3.1" + "tslib": "^2.6.2" }, "engines": { "node": ">=14.0.0" } }, - "node_modules/@aws-sdk/util-uri-escape": { - "version": "3.201.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/util-uri-escape/-/util-uri-escape-3.201.0.tgz", - "integrity": "sha512-TeTWbGx4LU2c5rx0obHeDFeO9HvwYwQtMh1yniBz00pQb6Qt6YVOETVQikRZ+XRQwEyCg/dA375UplIpiy54mA==", - "dependencies": { - "tslib": "^2.3.1" - }, - "engines": { - "node": ">=14.0.0" - } + "node_modules/@aws-sdk/util-locate-window/node_modules/tslib": { + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz", + "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==" }, "node_modules/@aws-sdk/util-user-agent-browser": { - "version": "3.226.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/util-user-agent-browser/-/util-user-agent-browser-3.226.0.tgz", - "integrity": "sha512-PhBIu2h6sPJPcv2I7ELfFizdl5pNiL4LfxrasMCYXQkJvVnoXztHA1x+CQbXIdtZOIlpjC+6BjDcE0uhnpvfcA==", + "version": "3.535.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/util-user-agent-browser/-/util-user-agent-browser-3.535.0.tgz", + "integrity": "sha512-RWMcF/xV5n+nhaA/Ff5P3yNP3Kur/I+VNZngog4TEs92oB/nwOdAg/2JL8bVAhUbMrjTjpwm7PItziYFQoqyig==", "dependencies": { - "@aws-sdk/types": "3.226.0", + "@aws-sdk/types": "3.535.0", + "@smithy/types": "^2.12.0", "bowser": "^2.11.0", - "tslib": "^2.3.1" + "tslib": "^2.6.2" } }, + "node_modules/@aws-sdk/util-user-agent-browser/node_modules/tslib": { + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz", + "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==" + }, "node_modules/@aws-sdk/util-user-agent-node": { - "version": "3.226.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/util-user-agent-node/-/util-user-agent-node-3.226.0.tgz", - "integrity": "sha512-othPc5Dz/pkYkxH+nZPhc1Al0HndQT8zHD4e9h+EZ+8lkd8n+IsnLfTS/mSJWrfiC6UlNRVw55cItstmJyMe/A==", + "version": "3.535.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/util-user-agent-node/-/util-user-agent-node-3.535.0.tgz", + "integrity": "sha512-dRek0zUuIT25wOWJlsRm97nTkUlh1NDcLsQZIN2Y8KxhwoXXWtJs5vaDPT+qAg+OpcNj80i1zLR/CirqlFg/TQ==", "dependencies": { - "@aws-sdk/node-config-provider": "3.226.0", - "@aws-sdk/types": "3.226.0", - "tslib": "^2.3.1" + "@aws-sdk/types": "3.535.0", + "@smithy/node-config-provider": "^2.3.0", + "@smithy/types": "^2.12.0", + "tslib": "^2.6.2" }, "engines": { "node": ">=14.0.0" @@ -2208,56 +2462,43 @@ } } }, - "node_modules/@aws-sdk/util-utf8-browser": { - "version": "3.188.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/util-utf8-browser/-/util-utf8-browser-3.188.0.tgz", - "integrity": "sha512-jt627x0+jE+Ydr9NwkFstg3cUvgWh56qdaqAMDsqgRlKD21md/6G226z/Qxl7lb1VEW2LlmCx43ai/37Qwcj2Q==", - "dependencies": { - "tslib": "^2.3.1" - } + "node_modules/@aws-sdk/util-user-agent-node/node_modules/tslib": { + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz", + "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==" }, - "node_modules/@aws-sdk/util-utf8-node": { - "version": "3.208.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/util-utf8-node/-/util-utf8-node-3.208.0.tgz", - "integrity": "sha512-jKY87Acv0yWBdFxx6bveagy5FYjz+dtV8IPT7ay1E2WPWH1czoIdMAkc8tSInK31T6CRnHWkLZ1qYwCbgRfERQ==", + "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", + "integrity": "sha512-UvFa/vR+e19XookZF8RzFZBrw2EUkQWxiBW0yYQAhvk3C+QVGl0H3ouca8LDBlBfQKXwmW3huo/59H8rwb1wJw==", "dependencies": { - "@aws-sdk/util-buffer-from": "3.208.0", "tslib": "^2.3.1" - }, - "engines": { - "node": ">=14.0.0" - } - }, - "node_modules/@aws-sdk/util-waiter": { - "version": "3.226.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/util-waiter/-/util-waiter-3.226.0.tgz", - "integrity": "sha512-qYQMRxnu5k8qQihJXoIWMkBOj0+XkHHj/drLdbRnwL6ni6NcG8++cs9M3DSjIcxmxgF/7SLpDjn1H3sC7cYo4g==", - "dependencies": { - "@aws-sdk/abort-controller": "3.226.0", - "@aws-sdk/types": "3.226.0", - "tslib": "^2.3.1" - }, - "engines": { - "node": ">=14.0.0" } }, "node_modules/@aws-sdk/xml-builder": { - "version": "3.201.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/xml-builder/-/xml-builder-3.201.0.tgz", - "integrity": "sha512-brRdB1wwMgjWEnOQsv7zSUhIQuh7DEicrfslAqHop4S4FtSI3GQAShpQqgOpMTNFYcpaWKmE/Y1MJmNY7xLCnw==", + "version": "3.535.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/xml-builder/-/xml-builder-3.535.0.tgz", + "integrity": "sha512-VXAq/Jz8KIrU84+HqsOJhIKZqG0PNTdi6n6PFQ4xJf44ZQHD/5C7ouH4qCFX5XgZXcgbRIcMVVYGC6Jye0dRng==", "dependencies": { - "tslib": "^2.3.1" + "@smithy/types": "^2.12.0", + "tslib": "^2.6.2" }, "engines": { "node": ">=14.0.0" } }, + "node_modules/@aws-sdk/xml-builder/node_modules/tslib": { + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz", + "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==" + }, "node_modules/@babel/code-frame": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.18.6.tgz", - "integrity": "sha512-TDCmlK5eOvH+eH7cdAFlNXeVJqWIQ7gW9tY1GJIpUtFb6CmjVyq2VM3u71bOyR8CRihcCgMUYoDNyLXao3+70Q==", + "version": "7.23.5", + "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.23.5.tgz", + "integrity": "sha512-CgH3s1a96LipHCmSUmYFPwY7MNx8C3avkq7i4Wl3cfa662ldtUe4VM1TPXX70pfmrlWTb6jLqTYrZyT2ZTJBgA==", "dependencies": { - "@babel/highlight": "^7.18.6" + "@babel/highlight": "^7.23.4", + "chalk": "^2.4.2" }, "engines": { "node": ">=6.9.0" @@ -2301,17 +2542,17 @@ } }, "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==", "bin": { "semver": "bin/semver.js" } }, "node_modules/@babel/generator": { - "version": "7.20.7", - "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.20.7.tgz", - "integrity": "sha512-7wqMOJq8doJMZmP4ApXTzLxSr7+oO2jroJURrVEp6XShrQUObV8Tq/D0NCcoYg2uHqUrjzO0zwBjoYzelxK+sw==", + "version": "7.20.14", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.20.14.tgz", + "integrity": "sha512-AEmuXHdcD3A52HHXxaTmYlb8q/xMEhoRP67B3T4Oq7lbmSoqroMZzjnGj3+i1io3pdnF8iBYVu4Ilj+c4hBxYg==", "dependencies": { "@babel/types": "^7.20.7", "@jridgewell/gen-mapping": "^0.3.2", @@ -2377,9 +2618,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==", "bin": { "semver": "bin/semver.js" } @@ -2439,18 +2680,18 @@ } }, "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==", + "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.18.9", - "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.18.9.tgz", - "integrity": "sha512-3r/aACDJ3fhQ/EVgFy0hpj8oHyHpQc+LPtJoY9SzTThAsStm4Ptegq92vqKoE3vD706ZVFWITnMnxucw+S9Ipg==", + "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==", "engines": { "node": ">=6.9.0" } @@ -2468,23 +2709,36 @@ } }, "node_modules/@babel/helper-function-name": { - "version": "7.19.0", - "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.19.0.tgz", - "integrity": "sha512-WAwHBINyrpqywkUH0nTnNgI5ina5TFn85HKS0pbPDfxFfhyR/aNQEn4hGi1P1JyT//I0t4OgXUlofzWILRvS5w==", + "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==", "dependencies": { - "@babel/template": "^7.18.10", - "@babel/types": "^7.19.0" + "@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.24.0", + "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.24.0.tgz", + "integrity": "sha512-Bkf2q8lMB0AFpX0NFEqSbx1OkTHf0f+0j82mkw+ZpzBnkk7e9Ql0891vlfgi+kHwOk8tQjiQHpqh4LaSa0fKEA==", + "dependencies": { + "@babel/code-frame": "^7.23.5", + "@babel/parser": "^7.24.0", + "@babel/types": "^7.24.0" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-hoist-variables": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.18.6.tgz", - "integrity": "sha512-UlJQPkFqFULIcyW5sbzgbkxn2FKRgwWiRexcuaR8RNJRy8+LLveqPjwZV/bwrLZCN0eUHD/x8D0heK1ozuoo6Q==", + "version": "7.22.5", + "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.22.5.tgz", + "integrity": "sha512-wGjk9QZVzvknA6yKIUURb8zY3grXCcOZt+/7Wcy8O2uctxhplmUPkOdlgoNhmdVee2c92JXbf1xpMtVNbfoxRw==", "dependencies": { - "@babel/types": "^7.18.6" + "@babel/types": "^7.22.5" }, "engines": { "node": ">=6.9.0" @@ -2606,28 +2860,28 @@ } }, "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==", "dependencies": { - "@babel/types": "^7.18.6" + "@babel/types": "^7.22.5" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-string-parser": { - "version": "7.19.4", - "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.19.4.tgz", - "integrity": "sha512-nHtDoQcuqFmwYNYPz3Rah5ph2p8PFeFCsZk9A/48dPc/rGocJ5J3hAAZ7pb76VWX3fZKu+uEr/FhH5jLx7umrw==", + "version": "7.23.4", + "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.23.4.tgz", + "integrity": "sha512-803gmbQdqwdf4olxrX4AJyFBV/RTr3rSmOj0rKwesmzlfhYNDEs+/iOcznzpNWlJlIlTJC2QfPFcHB6DlzdVLQ==", "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-validator-identifier": { - "version": "7.19.1", - "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.19.1.tgz", - "integrity": "sha512-awrNfaMtnHUr653GgGEs++LlAvW6w+DcPrOliSMXWCKo597CwL5Acf/wWdNkf/tfEQE3mjkeD1YOVZOUV/od1w==", + "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==", "engines": { "node": ">=6.9.0" } @@ -2669,12 +2923,12 @@ } }, "node_modules/@babel/highlight": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.18.6.tgz", - "integrity": "sha512-u7stbOuYjaPezCuLj29hNW1v64M2Md2qupEKP1fHc7WdOA3DgLh37suiSrZYY7haUB7iBeQZ9P1uiRF359do3g==", + "version": "7.23.4", + "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.23.4.tgz", + "integrity": "sha512-acGdbYSfp2WheJoJm/EBBBLh/ID8KDc64ISZ9DYtBmC8/Q204PZJLHyzeB5qMzJ5trcOkybd78M4x2KWsUq++A==", "dependencies": { - "@babel/helper-validator-identifier": "^7.18.6", - "chalk": "^2.0.0", + "@babel/helper-validator-identifier": "^7.22.20", + "chalk": "^2.4.2", "js-tokens": "^4.0.0" }, "engines": { @@ -2682,9 +2936,9 @@ } }, "node_modules/@babel/parser": { - "version": "7.20.7", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.20.7.tgz", - "integrity": "sha512-T3Z9oHybU+0vZlY9CiDSJQTD5ZapcW18ZctFMi0MOAl/4BjFF4ul7NVSARLdbGO5vDqy9eQiGTV0LtKfvCYvcg==", + "version": "7.24.0", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.24.0.tgz", + "integrity": "sha512-QuP/FxEAzMSjXygs8v4N9dvdXzEHN4W1oF3PxuWAtPo08UdM17u89RDMgjLn/mlc56iM0HlLmVkO/wgR+rDgHg==", "bin": { "parser": "bin/babel-parser.js" }, @@ -3626,9 +3880,9 @@ } }, "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" @@ -3847,9 +4101,9 @@ } }, "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" @@ -3888,9 +4142,9 @@ } }, "node_modules/@babel/runtime": { - "version": "7.20.7", - "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.20.7.tgz", - "integrity": "sha512-UF0tvkUtxwAgZ5W/KrkHf0Rn0fdnLDU9ScxBrEVNUprE/MzirjK4MJUX1/BVDv00Sv8cljtukVK1aky++X1SjQ==", + "version": "7.20.13", + "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.20.13.tgz", + "integrity": "sha512-gt3PKXs0DBoL9xCvOIIZ2NEqAGZqHjAnmVbfQtB620V0uReIQutpel14KcneZuer7UioY8ALKZ7iocavvzTNFA==", "dev": true, "dependencies": { "regenerator-runtime": "^0.13.11" @@ -3913,32 +4167,59 @@ } }, "node_modules/@babel/traverse": { - "version": "7.20.12", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.20.12.tgz", - "integrity": "sha512-MsIbFN0u+raeja38qboyF8TIT7K0BFzz/Yd/77ta4MsUsmP2RAnidIlwq7d5HFQrH/OZJecGV6B71C4zAgpoSQ==", - "dependencies": { - "@babel/code-frame": "^7.18.6", - "@babel/generator": "^7.20.7", - "@babel/helper-environment-visitor": "^7.18.9", - "@babel/helper-function-name": "^7.19.0", - "@babel/helper-hoist-variables": "^7.18.6", - "@babel/helper-split-export-declaration": "^7.18.6", - "@babel/parser": "^7.20.7", - "@babel/types": "^7.20.7", - "debug": "^4.1.0", + "version": "7.24.0", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.24.0.tgz", + "integrity": "sha512-HfuJlI8qq3dEDmNU5ChzzpZRWq+oxCZQyMzIMEqLho+AQnhMnKQUzH6ydo3RBl/YjPCuk68Y6s0Gx0AeyULiWw==", + "dependencies": { + "@babel/code-frame": "^7.23.5", + "@babel/generator": "^7.23.6", + "@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.24.0", + "@babel/types": "^7.24.0", + "debug": "^4.3.1", "globals": "^11.1.0" }, "engines": { "node": ">=6.9.0" } }, + "node_modules/@babel/traverse/node_modules/@babel/generator": { + "version": "7.23.6", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.23.6.tgz", + "integrity": "sha512-qrSfCYxYQB5owCmGLbl8XRpX1ytXlpueOb0N0UmQwA073KZxejgQTzAmJezxvpwQD9uGtK2shHdi55QT+MbjIw==", + "dependencies": { + "@babel/types": "^7.23.6", + "@jridgewell/gen-mapping": "^0.3.2", + "@jridgewell/trace-mapping": "^0.3.17", + "jsesc": "^2.5.1" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/traverse/node_modules/@jridgewell/gen-mapping": { + "version": "0.3.5", + "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.5.tgz", + "integrity": "sha512-IzL8ZoEDIBRWEzlCcRhOaCupYyN5gdIK+Q6fbFdPDg6HqX6jpkItn7DFIpW9LQzXG6Df9sA7+OKnq0qlz/GaQg==", + "dependencies": { + "@jridgewell/set-array": "^1.2.1", + "@jridgewell/sourcemap-codec": "^1.4.10", + "@jridgewell/trace-mapping": "^0.3.24" + }, + "engines": { + "node": ">=6.0.0" + } + }, "node_modules/@babel/types": { - "version": "7.20.7", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.20.7.tgz", - "integrity": "sha512-69OnhBxSSgK0OzTJai4kyPDiKTIe3j+ctaHdIGVbRahTLAT7L3R9oeXHC2aVSuGYt3cVnoAMDmOCgJ2yaiLMvg==", + "version": "7.24.0", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.24.0.tgz", + "integrity": "sha512-+j7a5c253RfKh8iABBhywc8NSfP5LURe7Uh4qpsh6jc+aLJguvmIUBdjSdEMQv2bENrCR5MfRdjGo7vzS/ob7w==", "dependencies": { - "@babel/helper-string-parser": "^7.19.4", - "@babel/helper-validator-identifier": "^7.19.1", + "@babel/helper-string-parser": "^7.23.4", + "@babel/helper-validator-identifier": "^7.22.20", "to-fast-properties": "^2.0.0" }, "engines": { @@ -4185,9 +4466,9 @@ } }, "node_modules/@cypress/request": { - "version": "2.88.11", - "resolved": "https://registry.npmjs.org/@cypress/request/-/request-2.88.11.tgz", - "integrity": "sha512-M83/wfQ1EkspjkE2lNWNV5ui2Cv7UCv1swW1DqljahbzLVWltcsexQh8jYtuS/vzFXP+HySntGM83ZXA9fn17w==", + "version": "2.88.12", + "resolved": "https://registry.npmjs.org/@cypress/request/-/request-2.88.12.tgz", + "integrity": "sha512-tOn+0mDZxASFM+cuAP9szGUGPI1HwWVSvdzm7V4cCsPdFTx6qMj29CwaQmRAMIEhORIUBFBsYROYJcveK4uOjA==", "devOptional": true, "dependencies": { "aws-sign2": "~0.7.0", @@ -4205,7 +4486,7 @@ "performance-now": "^2.1.0", "qs": "~6.10.3", "safe-buffer": "^5.1.2", - "tough-cookie": "~2.5.0", + "tough-cookie": "^4.1.3", "tunnel-agent": "^0.6.0", "uuid": "^8.3.2" }, @@ -4301,6 +4582,7 @@ "cpu": [ "arm" ], + "dev": true, "optional": true, "os": [ "android" @@ -4316,6 +4598,7 @@ "cpu": [ "arm64" ], + "dev": true, "optional": true, "os": [ "android" @@ -4331,6 +4614,7 @@ "cpu": [ "x64" ], + "dev": true, "optional": true, "os": [ "android" @@ -4346,6 +4630,7 @@ "cpu": [ "arm64" ], + "dev": true, "optional": true, "os": [ "darwin" @@ -4361,6 +4646,7 @@ "cpu": [ "x64" ], + "dev": true, "optional": true, "os": [ "darwin" @@ -4376,6 +4662,7 @@ "cpu": [ "arm64" ], + "dev": true, "optional": true, "os": [ "freebsd" @@ -4391,6 +4678,7 @@ "cpu": [ "x64" ], + "dev": true, "optional": true, "os": [ "freebsd" @@ -4406,6 +4694,7 @@ "cpu": [ "arm" ], + "dev": true, "optional": true, "os": [ "linux" @@ -4421,6 +4710,7 @@ "cpu": [ "arm64" ], + "dev": true, "optional": true, "os": [ "linux" @@ -4436,6 +4726,7 @@ "cpu": [ "ia32" ], + "dev": true, "optional": true, "os": [ "linux" @@ -4451,6 +4742,7 @@ "cpu": [ "loong64" ], + "dev": true, "optional": true, "os": [ "linux" @@ -4466,6 +4758,7 @@ "cpu": [ "mips64el" ], + "dev": true, "optional": true, "os": [ "linux" @@ -4481,6 +4774,7 @@ "cpu": [ "ppc64" ], + "dev": true, "optional": true, "os": [ "linux" @@ -4496,6 +4790,7 @@ "cpu": [ "riscv64" ], + "dev": true, "optional": true, "os": [ "linux" @@ -4511,6 +4806,7 @@ "cpu": [ "s390x" ], + "dev": true, "optional": true, "os": [ "linux" @@ -4526,6 +4822,7 @@ "cpu": [ "x64" ], + "dev": true, "optional": true, "os": [ "linux" @@ -4541,6 +4838,7 @@ "cpu": [ "x64" ], + "dev": true, "optional": true, "os": [ "netbsd" @@ -4556,6 +4854,7 @@ "cpu": [ "x64" ], + "dev": true, "optional": true, "os": [ "openbsd" @@ -4571,6 +4870,7 @@ "cpu": [ "x64" ], + "dev": true, "optional": true, "os": [ "sunos" @@ -4586,6 +4886,7 @@ "cpu": [ "arm64" ], + "dev": true, "optional": true, "os": [ "win32" @@ -4601,6 +4902,7 @@ "cpu": [ "ia32" ], + "dev": true, "optional": true, "os": [ "win32" @@ -4616,6 +4918,7 @@ "cpu": [ "x64" ], + "dev": true, "optional": true, "os": [ "win32" @@ -4726,6 +5029,30 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/@faker-js/faker": { + "version": "8.4.1", + "resolved": "https://registry.npmjs.org/@faker-js/faker/-/faker-8.4.1.tgz", + "integrity": "sha512-XQ3cU+Q8Uqmrbf2e0cIC/QN43sTBSC8KF12u29Mb47tWrt2hAgBXSgpZMj4Ao8Uk0iJcU99QsOCaIL8934obCg==", + "dev": true, + "funding": [ + { + "type": "opencollective", + "url": "https://opencollective.com/fakerjs" + } + ], + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0", + "npm": ">=6.14.13" + } + }, + "node_modules/@fastify/busboy": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/@fastify/busboy/-/busboy-2.1.1.tgz", + "integrity": "sha512-vBZP4NlzfOlerQTnba4aqZoMhE/a9HY7HRqoOPaETQcSQuWEIyZMHGfVu6w9wGtGK5fED5qRs2DteVCjOH60sA==", + "engines": { + "node": ">=14" + } + }, "node_modules/@floating-ui/core": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/@floating-ui/core/-/core-1.1.0.tgz", @@ -5787,9 +6114,9 @@ } }, "node_modules/@jridgewell/set-array": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.1.2.tgz", - "integrity": "sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw==", + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.2.1.tgz", + "integrity": "sha512-R8gLRTZeyp03ymzP/6Lil/28tGeGEzhx1q2k703KGWRAI1VdvPIXdG70VJc2pAMw3NA6JKL5hhFu1sJX0Mnn/A==", "engines": { "node": ">=6.0.0" } @@ -5822,12 +6149,12 @@ "integrity": "sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw==" }, "node_modules/@jridgewell/trace-mapping": { - "version": "0.3.17", - "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.17.tgz", - "integrity": "sha512-MCNzAp77qzKca9+W/+I0+sEpaUnZoeasnghNeVc41VZCEKaCH73Vq3BZZ/SzWIgrqE4H4ceI+p+b6C0mHf9T4g==", + "version": "0.3.25", + "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.25.tgz", + "integrity": "sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ==", "dependencies": { - "@jridgewell/resolve-uri": "3.1.0", - "@jridgewell/sourcemap-codec": "1.4.14" + "@jridgewell/resolve-uri": "^3.1.0", + "@jridgewell/sourcemap-codec": "^1.4.14" } }, "node_modules/@kobalte/core": { @@ -6770,6 +7097,17 @@ "rxjs": "^6.0.0 || ^7.0.0" } }, + "node_modules/@nestjs/cache-manager": { + "version": "2.2.2", + "resolved": "https://registry.npmjs.org/@nestjs/cache-manager/-/cache-manager-2.2.2.tgz", + "integrity": "sha512-+n7rpU1QABeW2WV17Dl1vZCG3vWjJU1MaamWgZvbGxYE9EeCM0lVLfw3z7acgDTNwOy+K68xuQPoIMxD0bhjlA==", + "peerDependencies": { + "@nestjs/common": "^9.0.0 || ^10.0.0", + "@nestjs/core": "^9.0.0 || ^10.0.0", + "cache-manager": "<=5", + "rxjs": "^7.0.0" + } + }, "node_modules/@nestjs/common": { "version": "9.2.1", "resolved": "https://registry.npmjs.org/@nestjs/common/-/common-9.2.1.tgz", @@ -7095,9 +7433,9 @@ } }, "node_modules/@ngtools/webpack": { - "version": "15.1.1", - "resolved": "https://registry.npmjs.org/@ngtools/webpack/-/webpack-15.1.1.tgz", - "integrity": "sha512-pHkVE4IfIGcrIqxxrBQJV62GBqXF+LU4sPY5MLNWIfKSctW6AdTVoO9ilx8pclaFJkMLkPMbrmfGosYw47L+lg==", + "version": "15.2.10", + "resolved": "https://registry.npmjs.org/@ngtools/webpack/-/webpack-15.2.10.tgz", + "integrity": "sha512-ZExB4rKh/Saad31O/Ofd2XvRuILuCNTYs0+qJL697Be2pzeewvzBhE4Xe1Mm7Jg13aWSPeuIdzSGOqCdwxxxFQ==", "dev": true, "engines": { "node": "^14.20.0 || ^16.13.0 || >=18.10.0", @@ -8323,9 +8661,9 @@ } }, "node_modules/@nrwl/webpack/node_modules/less/node_modules/semver": { - "version": "5.7.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", - "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==", + "version": "5.7.2", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz", + "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==", "optional": true, "bin": { "semver": "bin/semver" @@ -9188,6 +9526,889 @@ "@sinonjs/commons": "^1.7.0" } }, + "node_modules/@smithy/abort-controller": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/@smithy/abort-controller/-/abort-controller-2.2.0.tgz", + "integrity": "sha512-wRlta7GuLWpTqtFfGo+nZyOO1vEvewdNR1R4rTxpC8XU6vG/NDyrFBhwLZsqg1NUoR1noVaXJPC/7ZK47QCySw==", + "dependencies": { + "@smithy/types": "^2.12.0", + "tslib": "^2.6.2" + }, + "engines": { + "node": ">=14.0.0" + } + }, + "node_modules/@smithy/abort-controller/node_modules/tslib": { + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz", + "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==" + }, + "node_modules/@smithy/chunked-blob-reader": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/@smithy/chunked-blob-reader/-/chunked-blob-reader-2.2.0.tgz", + "integrity": "sha512-3GJNvRwXBGdkDZZOGiziVYzDpn4j6zfyULHMDKAGIUo72yHALpE9CbhfQp/XcLNVoc1byfMpn6uW5H2BqPjgaQ==", + "dependencies": { + "tslib": "^2.6.2" + } + }, + "node_modules/@smithy/chunked-blob-reader-native": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/@smithy/chunked-blob-reader-native/-/chunked-blob-reader-native-2.2.0.tgz", + "integrity": "sha512-VNB5+1oCgX3Fzs072yuRsUoC2N4Zg/LJ11DTxX3+Qu+Paa6AmbIF0E9sc2wthz9Psrk/zcOlTCyuposlIhPjZQ==", + "dependencies": { + "@smithy/util-base64": "^2.3.0", + "tslib": "^2.6.2" + } + }, + "node_modules/@smithy/chunked-blob-reader-native/node_modules/tslib": { + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz", + "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==" + }, + "node_modules/@smithy/chunked-blob-reader/node_modules/tslib": { + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz", + "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==" + }, + "node_modules/@smithy/config-resolver": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/@smithy/config-resolver/-/config-resolver-2.2.0.tgz", + "integrity": "sha512-fsiMgd8toyUba6n1WRmr+qACzXltpdDkPTAaDqc8QqPBUzO+/JKwL6bUBseHVi8tu9l+3JOK+tSf7cay+4B3LA==", + "dependencies": { + "@smithy/node-config-provider": "^2.3.0", + "@smithy/types": "^2.12.0", + "@smithy/util-config-provider": "^2.3.0", + "@smithy/util-middleware": "^2.2.0", + "tslib": "^2.6.2" + }, + "engines": { + "node": ">=14.0.0" + } + }, + "node_modules/@smithy/config-resolver/node_modules/tslib": { + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz", + "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==" + }, + "node_modules/@smithy/core": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/@smithy/core/-/core-1.4.0.tgz", + "integrity": "sha512-uu9ZDI95Uij4qk+L6kyFjdk11zqBkcJ3Lv0sc6jZrqHvLyr0+oeekD3CnqMafBn/5PRI6uv6ulW3kNLRBUHeVw==", + "dependencies": { + "@smithy/middleware-endpoint": "^2.5.0", + "@smithy/middleware-retry": "^2.2.0", + "@smithy/middleware-serde": "^2.3.0", + "@smithy/protocol-http": "^3.3.0", + "@smithy/smithy-client": "^2.5.0", + "@smithy/types": "^2.12.0", + "@smithy/util-middleware": "^2.2.0", + "tslib": "^2.6.2" + }, + "engines": { + "node": ">=14.0.0" + } + }, + "node_modules/@smithy/core/node_modules/tslib": { + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz", + "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==" + }, + "node_modules/@smithy/credential-provider-imds": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/@smithy/credential-provider-imds/-/credential-provider-imds-2.3.0.tgz", + "integrity": "sha512-BWB9mIukO1wjEOo1Ojgl6LrG4avcaC7T/ZP6ptmAaW4xluhSIPZhY+/PI5YKzlk+jsm+4sQZB45Bt1OfMeQa3w==", + "dependencies": { + "@smithy/node-config-provider": "^2.3.0", + "@smithy/property-provider": "^2.2.0", + "@smithy/types": "^2.12.0", + "@smithy/url-parser": "^2.2.0", + "tslib": "^2.6.2" + }, + "engines": { + "node": ">=14.0.0" + } + }, + "node_modules/@smithy/credential-provider-imds/node_modules/tslib": { + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz", + "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==" + }, + "node_modules/@smithy/eventstream-codec": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/@smithy/eventstream-codec/-/eventstream-codec-2.2.0.tgz", + "integrity": "sha512-8janZoJw85nJmQZc4L8TuePp2pk1nxLgkxIR0TUjKJ5Dkj5oelB9WtiSSGXCQvNsJl0VSTvK/2ueMXxvpa9GVw==", + "dependencies": { + "@aws-crypto/crc32": "3.0.0", + "@smithy/types": "^2.12.0", + "@smithy/util-hex-encoding": "^2.2.0", + "tslib": "^2.6.2" + } + }, + "node_modules/@smithy/eventstream-codec/node_modules/tslib": { + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz", + "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==" + }, + "node_modules/@smithy/eventstream-serde-browser": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/@smithy/eventstream-serde-browser/-/eventstream-serde-browser-2.2.0.tgz", + "integrity": "sha512-UaPf8jKbcP71BGiO0CdeLmlg+RhWnlN8ipsMSdwvqBFigl5nil3rHOI/5GE3tfiuX8LvY5Z9N0meuU7Rab7jWw==", + "dependencies": { + "@smithy/eventstream-serde-universal": "^2.2.0", + "@smithy/types": "^2.12.0", + "tslib": "^2.6.2" + }, + "engines": { + "node": ">=14.0.0" + } + }, + "node_modules/@smithy/eventstream-serde-browser/node_modules/tslib": { + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz", + "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==" + }, + "node_modules/@smithy/eventstream-serde-config-resolver": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/@smithy/eventstream-serde-config-resolver/-/eventstream-serde-config-resolver-2.2.0.tgz", + "integrity": "sha512-RHhbTw/JW3+r8QQH7PrganjNCiuiEZmpi6fYUAetFfPLfZ6EkiA08uN3EFfcyKubXQxOwTeJRZSQmDDCdUshaA==", + "dependencies": { + "@smithy/types": "^2.12.0", + "tslib": "^2.6.2" + }, + "engines": { + "node": ">=14.0.0" + } + }, + "node_modules/@smithy/eventstream-serde-config-resolver/node_modules/tslib": { + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz", + "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==" + }, + "node_modules/@smithy/eventstream-serde-node": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/@smithy/eventstream-serde-node/-/eventstream-serde-node-2.2.0.tgz", + "integrity": "sha512-zpQMtJVqCUMn+pCSFcl9K/RPNtQE0NuMh8sKpCdEHafhwRsjP50Oq/4kMmvxSRy6d8Jslqd8BLvDngrUtmN9iA==", + "dependencies": { + "@smithy/eventstream-serde-universal": "^2.2.0", + "@smithy/types": "^2.12.0", + "tslib": "^2.6.2" + }, + "engines": { + "node": ">=14.0.0" + } + }, + "node_modules/@smithy/eventstream-serde-node/node_modules/tslib": { + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz", + "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==" + }, + "node_modules/@smithy/eventstream-serde-universal": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/@smithy/eventstream-serde-universal/-/eventstream-serde-universal-2.2.0.tgz", + "integrity": "sha512-pvoe/vvJY0mOpuF84BEtyZoYfbehiFj8KKWk1ds2AT0mTLYFVs+7sBJZmioOFdBXKd48lfrx1vumdPdmGlCLxA==", + "dependencies": { + "@smithy/eventstream-codec": "^2.2.0", + "@smithy/types": "^2.12.0", + "tslib": "^2.6.2" + }, + "engines": { + "node": ">=14.0.0" + } + }, + "node_modules/@smithy/eventstream-serde-universal/node_modules/tslib": { + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz", + "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==" + }, + "node_modules/@smithy/fetch-http-handler": { + "version": "2.5.0", + "resolved": "https://registry.npmjs.org/@smithy/fetch-http-handler/-/fetch-http-handler-2.5.0.tgz", + "integrity": "sha512-BOWEBeppWhLn/no/JxUL/ghTfANTjT7kg3Ww2rPqTUY9R4yHPXxJ9JhMe3Z03LN3aPwiwlpDIUcVw1xDyHqEhw==", + "dependencies": { + "@smithy/protocol-http": "^3.3.0", + "@smithy/querystring-builder": "^2.2.0", + "@smithy/types": "^2.12.0", + "@smithy/util-base64": "^2.3.0", + "tslib": "^2.6.2" + } + }, + "node_modules/@smithy/fetch-http-handler/node_modules/tslib": { + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz", + "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==" + }, + "node_modules/@smithy/hash-blob-browser": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/@smithy/hash-blob-browser/-/hash-blob-browser-2.2.0.tgz", + "integrity": "sha512-SGPoVH8mdXBqrkVCJ1Hd1X7vh1zDXojNN1yZyZTZsCno99hVue9+IYzWDjq/EQDDXxmITB0gBmuyPh8oAZSTcg==", + "dependencies": { + "@smithy/chunked-blob-reader": "^2.2.0", + "@smithy/chunked-blob-reader-native": "^2.2.0", + "@smithy/types": "^2.12.0", + "tslib": "^2.6.2" + } + }, + "node_modules/@smithy/hash-blob-browser/node_modules/tslib": { + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz", + "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==" + }, + "node_modules/@smithy/hash-node": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/@smithy/hash-node/-/hash-node-2.2.0.tgz", + "integrity": "sha512-zLWaC/5aWpMrHKpoDF6nqpNtBhlAYKF/7+9yMN7GpdR8CzohnWfGtMznPybnwSS8saaXBMxIGwJqR4HmRp6b3g==", + "dependencies": { + "@smithy/types": "^2.12.0", + "@smithy/util-buffer-from": "^2.2.0", + "@smithy/util-utf8": "^2.3.0", + "tslib": "^2.6.2" + }, + "engines": { + "node": ">=14.0.0" + } + }, + "node_modules/@smithy/hash-node/node_modules/tslib": { + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz", + "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==" + }, + "node_modules/@smithy/hash-stream-node": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/@smithy/hash-stream-node/-/hash-stream-node-2.2.0.tgz", + "integrity": "sha512-aT+HCATOSRMGpPI7bi7NSsTNVZE/La9IaxLXWoVAYMxHT5hGO3ZOGEMZQg8A6nNL+pdFGtZQtND1eoY084HgHQ==", + "dependencies": { + "@smithy/types": "^2.12.0", + "@smithy/util-utf8": "^2.3.0", + "tslib": "^2.6.2" + }, + "engines": { + "node": ">=14.0.0" + } + }, + "node_modules/@smithy/hash-stream-node/node_modules/tslib": { + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz", + "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==" + }, + "node_modules/@smithy/invalid-dependency": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/@smithy/invalid-dependency/-/invalid-dependency-2.2.0.tgz", + "integrity": "sha512-nEDASdbKFKPXN2O6lOlTgrEEOO9NHIeO+HVvZnkqc8h5U9g3BIhWsvzFo+UcUbliMHvKNPD/zVxDrkP1Sbgp8Q==", + "dependencies": { + "@smithy/types": "^2.12.0", + "tslib": "^2.6.2" + } + }, + "node_modules/@smithy/invalid-dependency/node_modules/tslib": { + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz", + "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==" + }, + "node_modules/@smithy/is-array-buffer": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/@smithy/is-array-buffer/-/is-array-buffer-2.2.0.tgz", + "integrity": "sha512-GGP3O9QFD24uGeAXYUjwSTXARoqpZykHadOmA8G5vfJPK0/DC67qa//0qvqrJzL1xc8WQWX7/yc7fwudjPHPhA==", + "dependencies": { + "tslib": "^2.6.2" + }, + "engines": { + "node": ">=14.0.0" + } + }, + "node_modules/@smithy/is-array-buffer/node_modules/tslib": { + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz", + "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==" + }, + "node_modules/@smithy/md5-js": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/@smithy/md5-js/-/md5-js-2.2.0.tgz", + "integrity": "sha512-M26XTtt9IIusVMOWEAhIvFIr9jYj4ISPPGJROqw6vXngO3IYJCnVVSMFn4Tx1rUTG5BiKJNg9u2nxmBiZC5IlQ==", + "dependencies": { + "@smithy/types": "^2.12.0", + "@smithy/util-utf8": "^2.3.0", + "tslib": "^2.6.2" + } + }, + "node_modules/@smithy/md5-js/node_modules/tslib": { + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz", + "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==" + }, + "node_modules/@smithy/middleware-content-length": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/@smithy/middleware-content-length/-/middleware-content-length-2.2.0.tgz", + "integrity": "sha512-5bl2LG1Ah/7E5cMSC+q+h3IpVHMeOkG0yLRyQT1p2aMJkSrZG7RlXHPuAgb7EyaFeidKEnnd/fNaLLaKlHGzDQ==", + "dependencies": { + "@smithy/protocol-http": "^3.3.0", + "@smithy/types": "^2.12.0", + "tslib": "^2.6.2" + }, + "engines": { + "node": ">=14.0.0" + } + }, + "node_modules/@smithy/middleware-content-length/node_modules/tslib": { + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz", + "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==" + }, + "node_modules/@smithy/middleware-endpoint": { + "version": "2.5.0", + "resolved": "https://registry.npmjs.org/@smithy/middleware-endpoint/-/middleware-endpoint-2.5.0.tgz", + "integrity": "sha512-OBhI9ZEAG8Xen0xsFJwwNOt44WE2CWkfYIxTognC8x42Lfsdf0VN/wCMqpdkySMDio/vts10BiovAxQp0T0faA==", + "dependencies": { + "@smithy/middleware-serde": "^2.3.0", + "@smithy/node-config-provider": "^2.3.0", + "@smithy/shared-ini-file-loader": "^2.4.0", + "@smithy/types": "^2.12.0", + "@smithy/url-parser": "^2.2.0", + "@smithy/util-middleware": "^2.2.0", + "tslib": "^2.6.2" + }, + "engines": { + "node": ">=14.0.0" + } + }, + "node_modules/@smithy/middleware-endpoint/node_modules/tslib": { + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz", + "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==" + }, + "node_modules/@smithy/middleware-retry": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/@smithy/middleware-retry/-/middleware-retry-2.2.0.tgz", + "integrity": "sha512-PsjDOLpbevgn37yJbawmfVoanru40qVA8UEf2+YA1lvOefmhuhL6ZbKtGsLAWDRnE1OlAmedsbA/htH6iSZjNA==", + "dependencies": { + "@smithy/node-config-provider": "^2.3.0", + "@smithy/protocol-http": "^3.3.0", + "@smithy/service-error-classification": "^2.1.5", + "@smithy/smithy-client": "^2.5.0", + "@smithy/types": "^2.12.0", + "@smithy/util-middleware": "^2.2.0", + "@smithy/util-retry": "^2.2.0", + "tslib": "^2.6.2", + "uuid": "^8.3.2" + }, + "engines": { + "node": ">=14.0.0" + } + }, + "node_modules/@smithy/middleware-retry/node_modules/tslib": { + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz", + "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==" + }, + "node_modules/@smithy/middleware-serde": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/@smithy/middleware-serde/-/middleware-serde-2.3.0.tgz", + "integrity": "sha512-sIADe7ojwqTyvEQBe1nc/GXB9wdHhi9UwyX0lTyttmUWDJLP655ZYE1WngnNyXREme8I27KCaUhyhZWRXL0q7Q==", + "dependencies": { + "@smithy/types": "^2.12.0", + "tslib": "^2.6.2" + }, + "engines": { + "node": ">=14.0.0" + } + }, + "node_modules/@smithy/middleware-serde/node_modules/tslib": { + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz", + "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==" + }, + "node_modules/@smithy/middleware-stack": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/@smithy/middleware-stack/-/middleware-stack-2.2.0.tgz", + "integrity": "sha512-Qntc3jrtwwrsAC+X8wms8zhrTr0sFXnyEGhZd9sLtsJ/6gGQKFzNB+wWbOcpJd7BR8ThNCoKt76BuQahfMvpeA==", + "dependencies": { + "@smithy/types": "^2.12.0", + "tslib": "^2.6.2" + }, + "engines": { + "node": ">=14.0.0" + } + }, + "node_modules/@smithy/middleware-stack/node_modules/tslib": { + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz", + "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==" + }, + "node_modules/@smithy/node-config-provider": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/@smithy/node-config-provider/-/node-config-provider-2.3.0.tgz", + "integrity": "sha512-0elK5/03a1JPWMDPaS726Iw6LpQg80gFut1tNpPfxFuChEEklo2yL823V94SpTZTxmKlXFtFgsP55uh3dErnIg==", + "dependencies": { + "@smithy/property-provider": "^2.2.0", + "@smithy/shared-ini-file-loader": "^2.4.0", + "@smithy/types": "^2.12.0", + "tslib": "^2.6.2" + }, + "engines": { + "node": ">=14.0.0" + } + }, + "node_modules/@smithy/node-config-provider/node_modules/tslib": { + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz", + "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==" + }, + "node_modules/@smithy/node-http-handler": { + "version": "2.5.0", + "resolved": "https://registry.npmjs.org/@smithy/node-http-handler/-/node-http-handler-2.5.0.tgz", + "integrity": "sha512-mVGyPBzkkGQsPoxQUbxlEfRjrj6FPyA3u3u2VXGr9hT8wilsoQdZdvKpMBFMB8Crfhv5dNkKHIW0Yyuc7eABqA==", + "dependencies": { + "@smithy/abort-controller": "^2.2.0", + "@smithy/protocol-http": "^3.3.0", + "@smithy/querystring-builder": "^2.2.0", + "@smithy/types": "^2.12.0", + "tslib": "^2.6.2" + }, + "engines": { + "node": ">=14.0.0" + } + }, + "node_modules/@smithy/node-http-handler/node_modules/tslib": { + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz", + "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==" + }, + "node_modules/@smithy/property-provider": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/@smithy/property-provider/-/property-provider-2.2.0.tgz", + "integrity": "sha512-+xiil2lFhtTRzXkx8F053AV46QnIw6e7MV8od5Mi68E1ICOjCeCHw2XfLnDEUHnT9WGUIkwcqavXjfwuJbGlpg==", + "dependencies": { + "@smithy/types": "^2.12.0", + "tslib": "^2.6.2" + }, + "engines": { + "node": ">=14.0.0" + } + }, + "node_modules/@smithy/property-provider/node_modules/tslib": { + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz", + "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==" + }, + "node_modules/@smithy/protocol-http": { + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/@smithy/protocol-http/-/protocol-http-3.3.0.tgz", + "integrity": "sha512-Xy5XK1AFWW2nlY/biWZXu6/krgbaf2dg0q492D8M5qthsnU2H+UgFeZLbM76FnH7s6RO/xhQRkj+T6KBO3JzgQ==", + "dependencies": { + "@smithy/types": "^2.12.0", + "tslib": "^2.6.2" + }, + "engines": { + "node": ">=14.0.0" + } + }, + "node_modules/@smithy/protocol-http/node_modules/tslib": { + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz", + "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==" + }, + "node_modules/@smithy/querystring-builder": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/@smithy/querystring-builder/-/querystring-builder-2.2.0.tgz", + "integrity": "sha512-L1kSeviUWL+emq3CUVSgdogoM/D9QMFaqxL/dd0X7PCNWmPXqt+ExtrBjqT0V7HLN03Vs9SuiLrG3zy3JGnE5A==", + "dependencies": { + "@smithy/types": "^2.12.0", + "@smithy/util-uri-escape": "^2.2.0", + "tslib": "^2.6.2" + }, + "engines": { + "node": ">=14.0.0" + } + }, + "node_modules/@smithy/querystring-builder/node_modules/tslib": { + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz", + "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==" + }, + "node_modules/@smithy/querystring-parser": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/@smithy/querystring-parser/-/querystring-parser-2.2.0.tgz", + "integrity": "sha512-BvHCDrKfbG5Yhbpj4vsbuPV2GgcpHiAkLeIlcA1LtfpMz3jrqizP1+OguSNSj1MwBHEiN+jwNisXLGdajGDQJA==", + "dependencies": { + "@smithy/types": "^2.12.0", + "tslib": "^2.6.2" + }, + "engines": { + "node": ">=14.0.0" + } + }, + "node_modules/@smithy/querystring-parser/node_modules/tslib": { + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz", + "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==" + }, + "node_modules/@smithy/service-error-classification": { + "version": "2.1.5", + "resolved": "https://registry.npmjs.org/@smithy/service-error-classification/-/service-error-classification-2.1.5.tgz", + "integrity": "sha512-uBDTIBBEdAQryvHdc5W8sS5YX7RQzF683XrHePVdFmAgKiMofU15FLSM0/HU03hKTnazdNRFa0YHS7+ArwoUSQ==", + "dependencies": { + "@smithy/types": "^2.12.0" + }, + "engines": { + "node": ">=14.0.0" + } + }, + "node_modules/@smithy/shared-ini-file-loader": { + "version": "2.4.0", + "resolved": "https://registry.npmjs.org/@smithy/shared-ini-file-loader/-/shared-ini-file-loader-2.4.0.tgz", + "integrity": "sha512-WyujUJL8e1B6Z4PBfAqC/aGY1+C7T0w20Gih3yrvJSk97gpiVfB+y7c46T4Nunk+ZngLq0rOIdeVeIklk0R3OA==", + "dependencies": { + "@smithy/types": "^2.12.0", + "tslib": "^2.6.2" + }, + "engines": { + "node": ">=14.0.0" + } + }, + "node_modules/@smithy/shared-ini-file-loader/node_modules/tslib": { + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz", + "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==" + }, + "node_modules/@smithy/signature-v4": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/@smithy/signature-v4/-/signature-v4-2.2.0.tgz", + "integrity": "sha512-+B5TNzj/fRZzVW3z8UUJOkNx15+4E0CLuvJmJUA1JUIZFp3rdJ/M2H5r2SqltaVPXL0oIxv/6YK92T9TsFGbFg==", + "dependencies": { + "@smithy/eventstream-codec": "^2.2.0", + "@smithy/is-array-buffer": "^2.2.0", + "@smithy/types": "^2.12.0", + "@smithy/util-hex-encoding": "^2.2.0", + "@smithy/util-middleware": "^2.2.0", + "@smithy/util-uri-escape": "^2.2.0", + "@smithy/util-utf8": "^2.3.0", + "tslib": "^2.6.2" + }, + "engines": { + "node": ">=14.0.0" + } + }, + "node_modules/@smithy/signature-v4/node_modules/tslib": { + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz", + "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==" + }, + "node_modules/@smithy/smithy-client": { + "version": "2.5.0", + "resolved": "https://registry.npmjs.org/@smithy/smithy-client/-/smithy-client-2.5.0.tgz", + "integrity": "sha512-DDXWHWdimtS3y/Kw1Jo46KQ0ZYsDKcldFynQERUGBPDpkW1lXOTHy491ALHjwfiBQvzsVKVxl5+ocXNIgJuX4g==", + "dependencies": { + "@smithy/middleware-endpoint": "^2.5.0", + "@smithy/middleware-stack": "^2.2.0", + "@smithy/protocol-http": "^3.3.0", + "@smithy/types": "^2.12.0", + "@smithy/util-stream": "^2.2.0", + "tslib": "^2.6.2" + }, + "engines": { + "node": ">=14.0.0" + } + }, + "node_modules/@smithy/smithy-client/node_modules/tslib": { + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz", + "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==" + }, + "node_modules/@smithy/types": { + "version": "2.12.0", + "resolved": "https://registry.npmjs.org/@smithy/types/-/types-2.12.0.tgz", + "integrity": "sha512-QwYgloJ0sVNBeBuBs65cIkTbfzV/Q6ZNPCJ99EICFEdJYG50nGIY/uYXp+TbsdJReIuPr0a0kXmCvren3MbRRw==", + "dependencies": { + "tslib": "^2.6.2" + }, + "engines": { + "node": ">=14.0.0" + } + }, + "node_modules/@smithy/types/node_modules/tslib": { + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz", + "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==" + }, + "node_modules/@smithy/url-parser": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/@smithy/url-parser/-/url-parser-2.2.0.tgz", + "integrity": "sha512-hoA4zm61q1mNTpksiSWp2nEl1dt3j726HdRhiNgVJQMj7mLp7dprtF57mOB6JvEk/x9d2bsuL5hlqZbBuHQylQ==", + "dependencies": { + "@smithy/querystring-parser": "^2.2.0", + "@smithy/types": "^2.12.0", + "tslib": "^2.6.2" + } + }, + "node_modules/@smithy/url-parser/node_modules/tslib": { + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz", + "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==" + }, + "node_modules/@smithy/util-base64": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/@smithy/util-base64/-/util-base64-2.3.0.tgz", + "integrity": "sha512-s3+eVwNeJuXUwuMbusncZNViuhv2LjVJ1nMwTqSA0XAC7gjKhqqxRdJPhR8+YrkoZ9IiIbFk/yK6ACe/xlF+hw==", + "dependencies": { + "@smithy/util-buffer-from": "^2.2.0", + "@smithy/util-utf8": "^2.3.0", + "tslib": "^2.6.2" + }, + "engines": { + "node": ">=14.0.0" + } + }, + "node_modules/@smithy/util-base64/node_modules/tslib": { + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz", + "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==" + }, + "node_modules/@smithy/util-body-length-browser": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/@smithy/util-body-length-browser/-/util-body-length-browser-2.2.0.tgz", + "integrity": "sha512-dtpw9uQP7W+n3vOtx0CfBD5EWd7EPdIdsQnWTDoFf77e3VUf05uA7R7TGipIo8e4WL2kuPdnsr3hMQn9ziYj5w==", + "dependencies": { + "tslib": "^2.6.2" + } + }, + "node_modules/@smithy/util-body-length-browser/node_modules/tslib": { + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz", + "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==" + }, + "node_modules/@smithy/util-body-length-node": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/@smithy/util-body-length-node/-/util-body-length-node-2.3.0.tgz", + "integrity": "sha512-ITWT1Wqjubf2CJthb0BuT9+bpzBfXeMokH/AAa5EJQgbv9aPMVfnM76iFIZVFf50hYXGbtiV71BHAthNWd6+dw==", + "dependencies": { + "tslib": "^2.6.2" + }, + "engines": { + "node": ">=14.0.0" + } + }, + "node_modules/@smithy/util-body-length-node/node_modules/tslib": { + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz", + "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==" + }, + "node_modules/@smithy/util-buffer-from": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/@smithy/util-buffer-from/-/util-buffer-from-2.2.0.tgz", + "integrity": "sha512-IJdWBbTcMQ6DA0gdNhh/BwrLkDR+ADW5Kr1aZmd4k3DIF6ezMV4R2NIAmT08wQJ3yUK82thHWmC/TnK/wpMMIA==", + "dependencies": { + "@smithy/is-array-buffer": "^2.2.0", + "tslib": "^2.6.2" + }, + "engines": { + "node": ">=14.0.0" + } + }, + "node_modules/@smithy/util-buffer-from/node_modules/tslib": { + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz", + "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==" + }, + "node_modules/@smithy/util-config-provider": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/@smithy/util-config-provider/-/util-config-provider-2.3.0.tgz", + "integrity": "sha512-HZkzrRcuFN1k70RLqlNK4FnPXKOpkik1+4JaBoHNJn+RnJGYqaa3c5/+XtLOXhlKzlRgNvyaLieHTW2VwGN0VQ==", + "dependencies": { + "tslib": "^2.6.2" + }, + "engines": { + "node": ">=14.0.0" + } + }, + "node_modules/@smithy/util-config-provider/node_modules/tslib": { + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz", + "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==" + }, + "node_modules/@smithy/util-defaults-mode-browser": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/@smithy/util-defaults-mode-browser/-/util-defaults-mode-browser-2.2.0.tgz", + "integrity": "sha512-2okTdZaCBvOJszAPU/KSvlimMe35zLOKbQpHhamFJmR7t95HSe0K3C92jQPjKY3PmDBD+7iMkOnuW05F5OlF4g==", + "dependencies": { + "@smithy/property-provider": "^2.2.0", + "@smithy/smithy-client": "^2.5.0", + "@smithy/types": "^2.12.0", + "bowser": "^2.11.0", + "tslib": "^2.6.2" + }, + "engines": { + "node": ">= 10.0.0" + } + }, + "node_modules/@smithy/util-defaults-mode-browser/node_modules/tslib": { + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz", + "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==" + }, + "node_modules/@smithy/util-defaults-mode-node": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/@smithy/util-defaults-mode-node/-/util-defaults-mode-node-2.3.0.tgz", + "integrity": "sha512-hfKXnNLmsW9cmLb/JXKIvtuO6Cf4SuqN5PN1C2Ru/TBIws+m1wSgb+A53vo0r66xzB6E82inKG2J7qtwdi+Kkw==", + "dependencies": { + "@smithy/config-resolver": "^2.2.0", + "@smithy/credential-provider-imds": "^2.3.0", + "@smithy/node-config-provider": "^2.3.0", + "@smithy/property-provider": "^2.2.0", + "@smithy/smithy-client": "^2.5.0", + "@smithy/types": "^2.12.0", + "tslib": "^2.6.2" + }, + "engines": { + "node": ">= 10.0.0" + } + }, + "node_modules/@smithy/util-defaults-mode-node/node_modules/tslib": { + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz", + "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==" + }, + "node_modules/@smithy/util-endpoints": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/@smithy/util-endpoints/-/util-endpoints-1.2.0.tgz", + "integrity": "sha512-BuDHv8zRjsE5zXd3PxFXFknzBG3owCpjq8G3FcsXW3CykYXuEqM3nTSsmLzw5q+T12ZYuDlVUZKBdpNbhVtlrQ==", + "dependencies": { + "@smithy/node-config-provider": "^2.3.0", + "@smithy/types": "^2.12.0", + "tslib": "^2.6.2" + }, + "engines": { + "node": ">= 14.0.0" + } + }, + "node_modules/@smithy/util-endpoints/node_modules/tslib": { + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz", + "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==" + }, + "node_modules/@smithy/util-hex-encoding": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/@smithy/util-hex-encoding/-/util-hex-encoding-2.2.0.tgz", + "integrity": "sha512-7iKXR+/4TpLK194pVjKiasIyqMtTYJsgKgM242Y9uzt5dhHnUDvMNb+3xIhRJ9QhvqGii/5cRUt4fJn3dtXNHQ==", + "dependencies": { + "tslib": "^2.6.2" + }, + "engines": { + "node": ">=14.0.0" + } + }, + "node_modules/@smithy/util-hex-encoding/node_modules/tslib": { + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz", + "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==" + }, + "node_modules/@smithy/util-middleware": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/@smithy/util-middleware/-/util-middleware-2.2.0.tgz", + "integrity": "sha512-L1qpleXf9QD6LwLCJ5jddGkgWyuSvWBkJwWAZ6kFkdifdso+sk3L3O1HdmPvCdnCK3IS4qWyPxev01QMnfHSBw==", + "dependencies": { + "@smithy/types": "^2.12.0", + "tslib": "^2.6.2" + }, + "engines": { + "node": ">=14.0.0" + } + }, + "node_modules/@smithy/util-middleware/node_modules/tslib": { + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz", + "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==" + }, + "node_modules/@smithy/util-retry": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/@smithy/util-retry/-/util-retry-2.2.0.tgz", + "integrity": "sha512-q9+pAFPTfftHXRytmZ7GzLFFrEGavqapFc06XxzZFcSIGERXMerXxCitjOG1prVDR9QdjqotF40SWvbqcCpf8g==", + "dependencies": { + "@smithy/service-error-classification": "^2.1.5", + "@smithy/types": "^2.12.0", + "tslib": "^2.6.2" + }, + "engines": { + "node": ">= 14.0.0" + } + }, + "node_modules/@smithy/util-retry/node_modules/tslib": { + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz", + "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==" + }, + "node_modules/@smithy/util-stream": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/@smithy/util-stream/-/util-stream-2.2.0.tgz", + "integrity": "sha512-17faEXbYWIRst1aU9SvPZyMdWmqIrduZjVOqCPMIsWFNxs5yQQgFrJL6b2SdiCzyW9mJoDjFtgi53xx7EH+BXA==", + "dependencies": { + "@smithy/fetch-http-handler": "^2.5.0", + "@smithy/node-http-handler": "^2.5.0", + "@smithy/types": "^2.12.0", + "@smithy/util-base64": "^2.3.0", + "@smithy/util-buffer-from": "^2.2.0", + "@smithy/util-hex-encoding": "^2.2.0", + "@smithy/util-utf8": "^2.3.0", + "tslib": "^2.6.2" + }, + "engines": { + "node": ">=14.0.0" + } + }, + "node_modules/@smithy/util-stream/node_modules/tslib": { + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz", + "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==" + }, + "node_modules/@smithy/util-uri-escape": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/@smithy/util-uri-escape/-/util-uri-escape-2.2.0.tgz", + "integrity": "sha512-jtmJMyt1xMD/d8OtbVJ2gFZOSKc+ueYJZPW20ULW1GOp/q/YIM0wNh+u8ZFao9UaIGz4WoPW8hC64qlWLIfoDA==", + "dependencies": { + "tslib": "^2.6.2" + }, + "engines": { + "node": ">=14.0.0" + } + }, + "node_modules/@smithy/util-uri-escape/node_modules/tslib": { + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz", + "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==" + }, + "node_modules/@smithy/util-utf8": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/@smithy/util-utf8/-/util-utf8-2.3.0.tgz", + "integrity": "sha512-R8Rdn8Hy72KKcebgLiv8jQcQkXoLMOGGv5uI1/k0l+snqkOzQ1R0ChUBCxWMlBsFMekWjq0wRudIweFs7sKT5A==", + "dependencies": { + "@smithy/util-buffer-from": "^2.2.0", + "tslib": "^2.6.2" + }, + "engines": { + "node": ">=14.0.0" + } + }, + "node_modules/@smithy/util-utf8/node_modules/tslib": { + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz", + "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==" + }, + "node_modules/@smithy/util-waiter": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/@smithy/util-waiter/-/util-waiter-2.2.0.tgz", + "integrity": "sha512-IHk53BVw6MPMi2Gsn+hCng8rFA3ZmR3Rk7GllxDUW9qFJl/hiSvskn7XldkECapQVkIg/1dHpMAxI9xSTaLLSA==", + "dependencies": { + "@smithy/abort-controller": "^2.2.0", + "@smithy/types": "^2.12.0", + "tslib": "^2.6.2" + }, + "engines": { + "node": ">=14.0.0" + } + }, + "node_modules/@smithy/util-waiter/node_modules/tslib": { + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz", + "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==" + }, "node_modules/@solid-primitives/event-listener": { "version": "2.2.5", "resolved": "https://registry.npmjs.org/@solid-primitives/event-listener/-/event-listener-2.2.5.tgz", @@ -9569,24 +10790,25 @@ "integrity": "sha512-WulqXMDUTYAXCjZnk6JtIHPigp55cVtDgDrO2gHRwhyJto21+1zbVCtOYB2L1F9w4qCQ0rOGWBnBe0FNTiEJIQ==" }, "node_modules/@types/express": { - "version": "4.17.15", - "resolved": "https://registry.npmjs.org/@types/express/-/express-4.17.15.tgz", - "integrity": "sha512-Yv0k4bXGOH+8a+7bELd2PqHQsuiANB+A8a4gnQrkRWzrkKlb6KHaVvyXhqs04sVW/OWlbPyYxRgYlIXLfrufMQ==", + "version": "4.17.21", + "resolved": "https://registry.npmjs.org/@types/express/-/express-4.17.21.tgz", + "integrity": "sha512-ejlPM315qwLpaQlQDTjPdsUFSc6ZsP4AN6AlWnogPjQ7CVi7PYF3YVz+CY3jE2pwYf7E/7HlDAN0rV2GxTG0HQ==", "dependencies": { "@types/body-parser": "*", - "@types/express-serve-static-core": "^4.17.31", + "@types/express-serve-static-core": "^4.17.33", "@types/qs": "*", "@types/serve-static": "*" } }, "node_modules/@types/express-serve-static-core": { - "version": "4.17.32", - "resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.32.tgz", - "integrity": "sha512-aI5h/VOkxOF2Z1saPy0Zsxs5avets/iaiAJYznQFm5By/pamU31xWKL//epiF4OfUA2qTOc9PV6tCUjhO8wlZA==", + "version": "4.17.43", + "resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.43.tgz", + "integrity": "sha512-oaYtiBirUOPQGSWNGPWnzyAFJ0BP3cwvN4oWZQY+zUBwpVIGsKUkpBpSztp74drYcjavs7SKFZ4DX1V2QeN8rg==", "dependencies": { "@types/node": "*", "@types/qs": "*", - "@types/range-parser": "*" + "@types/range-parser": "*", + "@types/send": "*" } }, "node_modules/@types/graceful-fs": { @@ -9659,14 +10881,20 @@ "dev": true }, "node_modules/@types/jsonwebtoken": { - "version": "9.0.1", - "resolved": "https://registry.npmjs.org/@types/jsonwebtoken/-/jsonwebtoken-9.0.1.tgz", - "integrity": "sha512-c5ltxazpWabia/4UzhIoaDcIza4KViOQhdbjRlfcIGVnsE3c3brkz9Z+F/EeJIECOQP7W7US2hNE930cWWkPiw==", + "version": "9.0.5", + "resolved": "https://registry.npmjs.org/@types/jsonwebtoken/-/jsonwebtoken-9.0.5.tgz", + "integrity": "sha512-VRLSGzik+Unrup6BsouBeHsf4d1hOEgYWTm/7Nmw1sXoN1+tRly/Gy/po3yeahnP4jfnQWWAhQAqcNfH7ngOkA==", "dev": true, "dependencies": { "@types/node": "*" } }, + "node_modules/@types/jwk-to-pem": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/@types/jwk-to-pem/-/jwk-to-pem-2.0.3.tgz", + "integrity": "sha512-I/WFyFgk5GrNbkpmt14auGO3yFK1Wt4jXzkLuI+fDBNtO5ZI2rbymyGd6bKzfSBEuyRdM64ZUwxU1+eDcPSOEQ==", + "dev": true + }, "node_modules/@types/mime": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/@types/mime/-/mime-3.0.1.tgz", @@ -9734,6 +10962,20 @@ "integrity": "sha512-21cFJr9z3g5dW8B0CVI9g2O9beqaThGQ6ZFBqHfwhzLDKUxaqTIy3vnfah/UPkfOiF2pLq+tGz+W8RyCskuslw==", "dev": true }, + "node_modules/@types/send": { + "version": "0.17.4", + "resolved": "https://registry.npmjs.org/@types/send/-/send-0.17.4.tgz", + "integrity": "sha512-x2EM6TJOybec7c52BX0ZspPodMsQUd5L6PRwOunVyVUhXiBSKf3AezDL8Dgvgt5o0UfKNfuA0eMLr2wLT4AiBA==", + "dependencies": { + "@types/mime": "^1", + "@types/node": "*" + } + }, + "node_modules/@types/send/node_modules/@types/mime": { + "version": "1.3.5", + "resolved": "https://registry.npmjs.org/@types/mime/-/mime-1.3.5.tgz", + "integrity": "sha512-/pyBZWSLD2n0dcHE3hq8s8ZvcETHtEuF+3E7XVt0Ig2nvsVQXdghHVcEkIWjy9A0wKfTn97a/PSDYohKIlnP/w==" + }, "node_modules/@types/serve-index": { "version": "1.9.1", "resolved": "https://registry.npmjs.org/@types/serve-index/-/serve-index-1.9.1.tgz", @@ -10616,6 +11858,23 @@ "ajv": "^8.8.2" } }, + "node_modules/angular-oauth2-oidc": { + "version": "17.0.1", + "resolved": "https://registry.npmjs.org/angular-oauth2-oidc/-/angular-oauth2-oidc-17.0.1.tgz", + "integrity": "sha512-Yl4It9zFsYmoNS73sUvNJstbMW1x73ejKonzXLgU4XnSuBCt/0x8PnY5R3mHX4ZC/WmXBqQ/RfFwClrYW9Ywcg==", + "dependencies": { + "tslib": "^2.5.2" + }, + "peerDependencies": { + "@angular/common": ">=14.0.0", + "@angular/core": ">=14.0.0" + } + }, + "node_modules/angular-oauth2-oidc/node_modules/tslib": { + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz", + "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==" + }, "node_modules/ansi-colors": { "version": "4.1.3", "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.3.tgz", @@ -10864,6 +12123,17 @@ "safer-buffer": "~2.1.0" } }, + "node_modules/asn1.js": { + "version": "5.4.1", + "resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-5.4.1.tgz", + "integrity": "sha512-+I//4cYPccV8LdmBLiX8CYvf9Sp3vQsrqu2QNXRcrbiWvcx/UdlFiqUJJzxRQxgsZmvhXhn4cSKeSmoFjVdupA==", + "dependencies": { + "bn.js": "^4.0.0", + "inherits": "^2.0.1", + "minimalistic-assert": "^1.0.0", + "safer-buffer": "^2.1.0" + } + }, "node_modules/assert-plus": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz", @@ -10981,11 +12251,11 @@ "devOptional": true }, "node_modules/axios": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/axios/-/axios-1.4.0.tgz", - "integrity": "sha512-S4XCWMEmzvo64T9GfvQDOXgYRDJ/wsSZc7Jvdgx5u1sd0JwsuPLqb3SYmusag+edF6ziyMensPVqLTSc1PiSEA==", + "version": "1.6.7", + "resolved": "https://registry.npmjs.org/axios/-/axios-1.6.7.tgz", + "integrity": "sha512-/hDJGff6/c7u0hDkvkGxR/oy6CbCs8ziCsC7SqmhjfozqiJGc8Z11wrv9z9lYfY4K8l+H9TpjcMDX0xOZmx+RA==", "dependencies": { - "follow-redirects": "^1.15.0", + "follow-redirects": "^1.15.4", "form-data": "^4.0.0", "proxy-from-env": "^1.1.0" } @@ -11177,9 +12447,9 @@ } }, "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" @@ -11368,6 +12638,11 @@ "integrity": "sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==", "devOptional": true }, + "node_modules/bn.js": { + "version": "4.12.0", + "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz", + "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==" + }, "node_modules/body-parser": { "version": "1.20.1", "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.1.tgz", @@ -11450,6 +12725,11 @@ "node": ">=8" } }, + "node_modules/brorand": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/brorand/-/brorand-1.1.0.tgz", + "integrity": "sha512-cKV8tMCEpQs4hK/ik71d6LrPOnpkpGBR0wzxqr68g2m/LB2GxVYQroAjMJZRVM1Y4BCjCKc3vAamxSzOY2RP+w==" + }, "node_modules/browser-process-hrtime": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/browser-process-hrtime/-/browser-process-hrtime-1.0.0.tgz", @@ -11457,9 +12737,9 @@ "dev": true }, "node_modules/browserslist": { - "version": "4.21.4", - "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.21.4.tgz", - "integrity": "sha512-CBHJJdDmgjl3daYjN5Cp5kbTf1mUhZoS+beLklHIvkOWscs83YAhLlF3Wsh/lciQYAcbBJgTOD44VtG31ZM4Hw==", + "version": "4.21.5", + "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.21.5.tgz", + "integrity": "sha512-tUkiguQGW7S3IhB7N+c2MV/HZPSCPAAiYBZXLsBhFB/PCy6ZKKsZrmBayHV9fdGV/ARIfJ14NkxKzRDjvp7L6w==", "funding": [ { "type": "opencollective", @@ -11471,10 +12751,10 @@ } ], "dependencies": { - "caniuse-lite": "^1.0.30001400", - "electron-to-chromium": "^1.4.251", - "node-releases": "^2.0.6", - "update-browserslist-db": "^1.0.9" + "caniuse-lite": "^1.0.30001449", + "electron-to-chromium": "^1.4.284", + "node-releases": "^2.0.8", + "update-browserslist-db": "^1.0.10" }, "bin": { "browserslist": "cli.js" @@ -11717,6 +12997,24 @@ "node": ">=12" } }, + "node_modules/cache-manager": { + "version": "5.4.0", + "resolved": "https://registry.npmjs.org/cache-manager/-/cache-manager-5.4.0.tgz", + "integrity": "sha512-FS7o8vqJosnLpu9rh2gQTo8EOzCRJLF1BJ4XDEUDMqcfvs7SJZs5iuoFTXLauzQ3S5v8sBAST1pCwMaurpyi1A==", + "dependencies": { + "lodash.clonedeep": "^4.5.0", + "lru-cache": "^10.1.0", + "promise-coalesce": "^1.1.2" + } + }, + "node_modules/cache-manager/node_modules/lru-cache": { + "version": "10.2.0", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.2.0.tgz", + "integrity": "sha512-2bIM8x+VAf6JT4bKAljS1qUWgMsqZRPGJS6FSahIMPVvctcNhyVp7AJu7quxOW9jwkryBReKZY5tY5JYv2n/7Q==", + "engines": { + "node": "14 || >=16.14" + } + }, "node_modules/cachedir": { "version": "2.3.0", "resolved": "https://registry.npmjs.org/cachedir/-/cachedir-2.3.0.tgz", @@ -11766,9 +13064,9 @@ } }, "node_modules/caniuse-lite": { - "version": "1.0.30001445", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001445.tgz", - "integrity": "sha512-8sdQIdMztYmzfTMO6KfLny878Ln9c2M0fc7EH60IjlP4Dc4PiCy7K2Vl3ITmWgOyPgVQKa5x+UP/KqFsxj4mBg==", + "version": "1.0.30001597", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001597.tgz", + "integrity": "sha512-7LjJvmQU6Sj7bL0j5b5WY/3n7utXUJvAe1lxhsHDbLmwX9mdL86Yjtr+5SRCyf8qME4M7pU2hswj0FpyBVCv9w==", "funding": [ { "type": "opencollective", @@ -11777,6 +13075,10 @@ { "type": "tidelift", "url": "https://tidelift.com/funding/github/npm/caniuse-lite" + }, + { + "type": "github", + "url": "https://github.com/sponsors/ai" } ] }, @@ -13592,6 +14894,42 @@ "node": ">=10" } }, + "node_modules/dotenv-cli": { + "version": "7.4.1", + "resolved": "https://registry.npmjs.org/dotenv-cli/-/dotenv-cli-7.4.1.tgz", + "integrity": "sha512-fE1aywjRrWGxV3miaiUr3d2zC/VAiuzEGghi+QzgIA9fEf/M5hLMaRSXb4IxbUAwGmaLi0IozdZddnVU96acag==", + "dev": true, + "dependencies": { + "cross-spawn": "^7.0.3", + "dotenv": "^16.3.0", + "dotenv-expand": "^10.0.0", + "minimist": "^1.2.6" + }, + "bin": { + "dotenv": "cli.js" + } + }, + "node_modules/dotenv-cli/node_modules/dotenv": { + "version": "16.4.5", + "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-16.4.5.tgz", + "integrity": "sha512-ZmdL2rui+eB2YwhsWzjInR8LldtZHGDoQ1ugH85ppHKwpUHL7j7rN0Ti9NCnGiQbhaZ11FpR+7ao1dNsmduNUg==", + "dev": true, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://dotenvx.com" + } + }, + "node_modules/dotenv-expand": { + "version": "10.0.0", + "resolved": "https://registry.npmjs.org/dotenv-expand/-/dotenv-expand-10.0.0.tgz", + "integrity": "sha512-GopVGCpVS1UKH75VKHGuQFqS1Gusej0z4FyQkPdwjil2gNIv+LNsqBlboOzpJFZKVT95GkCyWJbBSdFEFUWI2A==", + "dev": true, + "engines": { + "node": ">=12" + } + }, "node_modules/duplexer": { "version": "0.1.2", "resolved": "https://registry.npmjs.org/duplexer/-/duplexer-0.1.2.tgz", @@ -13644,6 +14982,20 @@ "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.284.tgz", "integrity": "sha512-M8WEXFuKXMYMVr45fo8mq0wUrrJHheiKZf6BArTKk9ZBYCKJEOU5H8cdWgDT+qCVZf7Na4lVUaZsA+h6uA9+PA==" }, + "node_modules/elliptic": { + "version": "6.5.5", + "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.5.tgz", + "integrity": "sha512-7EjbcmUm17NQFu4Pmgmq2olYMj8nwMnpcddByChSUjArp8F5DQWcIcpriwO4ZToLNAJig0yiyjswfyGNje/ixw==", + "dependencies": { + "bn.js": "^4.11.9", + "brorand": "^1.1.0", + "hash.js": "^1.0.0", + "hmac-drbg": "^1.0.1", + "inherits": "^2.0.4", + "minimalistic-assert": "^1.0.1", + "minimalistic-crypto-utils": "^1.0.1" + } + }, "node_modules/emittery": { "version": "0.10.2", "resolved": "https://registry.npmjs.org/emittery/-/emittery-0.10.2.tgz", @@ -13887,7 +15239,9 @@ "version": "0.16.17", "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.16.17.tgz", "integrity": "sha512-G8LEkV0XzDMNwXKgM0Jwu3nY3lSTwSGY6XbxM9cr9+s0T/qSV1q1JVPBGzm3dcjhCic9+emZDmMffkwgPeOeLg==", + "dev": true, "hasInstallScript": true, + "optional": true, "bin": { "esbuild": "bin/esbuild" }, @@ -14232,9 +15586,9 @@ } }, "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" @@ -14951,18 +16305,24 @@ "integrity": "sha512-W+KJc2dmILlPplD/H4K9l9LcAHAfPtP6BY84uVLXQ6Evcz9Lcg33Y2z1IVblT6xdY54PXYVHEv+0Wpq8Io6zkA==" }, "node_modules/fast-xml-parser": { - "version": "4.0.11", - "resolved": "https://registry.npmjs.org/fast-xml-parser/-/fast-xml-parser-4.0.11.tgz", - "integrity": "sha512-4aUg3aNRR/WjQAcpceODG1C3x3lFANXRo8+1biqfieHmg9pyMt7qB4lQV/Ta6sJCTbA5vfD8fnA8S54JATiFUA==", + "version": "4.2.5", + "resolved": "https://registry.npmjs.org/fast-xml-parser/-/fast-xml-parser-4.2.5.tgz", + "integrity": "sha512-B9/wizE4WngqQftFPmdaMYlXoJlJOYxGQOanC77fq9k8+Z0v5dDSVh+3glErdIROP//s/jgb7ZuxKfB8nVyo0g==", + "funding": [ + { + "type": "paypal", + "url": "https://paypal.me/naturalintelligence" + }, + { + "type": "github", + "url": "https://github.com/sponsors/NaturalIntelligence" + } + ], "dependencies": { "strnum": "^1.0.5" }, "bin": { "fxparser": "src/cli/cli.js" - }, - "funding": { - "type": "paypal", - "url": "https://paypal.me/naturalintelligence" } }, "node_modules/fastq": { @@ -15261,9 +16621,9 @@ "devOptional": 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.6", + "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.6.tgz", + "integrity": "sha512-wWN62YITEaOpSK584EZXJafH1AGpO8RVgElfkuXbTOrPX4fIfOyEpW/CsiNd8JdYrAoOvafRTOEnvsO++qCqFA==", "funding": [ { "type": "individual", @@ -15499,9 +16859,9 @@ } }, "node_modules/fp-ts": { - "version": "2.13.1", - "resolved": "https://registry.npmjs.org/fp-ts/-/fp-ts-2.13.1.tgz", - "integrity": "sha512-0eu5ULPS2c/jsa1lGFneEFFEdTbembJv8e4QKXeVJ3lm/5hyve06dlKZrpxmMwJt6rYen7sxmHHK2CLaXvWuWQ==" + "version": "2.16.5", + "resolved": "https://registry.npmjs.org/fp-ts/-/fp-ts-2.16.5.tgz", + "integrity": "sha512-N8T8PwMSeTKKtkm9lkj/zSTAnPC/aJIIrQhnHxxkL0KLsRCNUPANksJOlMXxcKKCo7H1ORP3No9EMD+fP0tsdA==" }, "node_modules/fraction.js": { "version": "4.2.0", @@ -15746,9 +17106,9 @@ } }, "node_modules/glob": { - "version": "8.0.3", - "resolved": "https://registry.npmjs.org/glob/-/glob-8.0.3.tgz", - "integrity": "sha512-ull455NHSHI/Y1FqGaaYFaLGkNMMJbavMrEGFXG/PGrg6y7sutWHUHrz6gy6WEBH6akM1M414dWKCNs+IhKdiQ==", + "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", @@ -16001,6 +17361,15 @@ "integrity": "sha512-8Rf9Y83NBReMnx0gFzA8JImQACstCYWUplepDa9xprwwtmgEZUF0h/i5xSA625zB/I37EtrswSST6OXxwaaIJQ==", "dev": true }, + "node_modules/hash.js": { + "version": "1.1.7", + "resolved": "https://registry.npmjs.org/hash.js/-/hash.js-1.1.7.tgz", + "integrity": "sha512-taOaskGt4z4SOANNseOviYDvjEJinIkRgmp7LbKP2YTTmVxWBl87s/uzK9r+44BclBSp2X7K1hqeNfz9JbBeXA==", + "dependencies": { + "inherits": "^2.0.3", + "minimalistic-assert": "^1.0.1" + } + }, "node_modules/hdr-histogram-js": { "version": "2.0.3", "resolved": "https://registry.npmjs.org/hdr-histogram-js/-/hdr-histogram-js-2.0.3.tgz", @@ -16032,6 +17401,16 @@ "he": "bin/he" } }, + "node_modules/hmac-drbg": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/hmac-drbg/-/hmac-drbg-1.0.1.tgz", + "integrity": "sha512-Tti3gMqLdZfhOQY1Mzf/AanLiqh1WTiJgEj26ZuYQ9fbkLomzGchCws4FyrSd4VkpBfiNhaE1On+lOz894jvXg==", + "dependencies": { + "hash.js": "^1.0.3", + "minimalistic-assert": "^1.0.0", + "minimalistic-crypto-utils": "^1.0.1" + } + }, "node_modules/hosted-git-info": { "version": "5.2.1", "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-5.2.1.tgz", @@ -16661,9 +18040,9 @@ } }, "node_modules/ip": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ip/-/ip-2.0.0.tgz", - "integrity": "sha512-WKa+XuLG1A1R0UWhl2+1XQSi+fZWMsYKffMZTTYsiZaUD8k2yDAj5atimTUD2TZkyCkNEeYE5NhFZmupOGtjYQ==", + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/ip/-/ip-2.0.1.tgz", + "integrity": "sha512-lJUL9imLTNi1ZfXT+DU6rBBdbiKGBuay9B6xGSPVjUeQwaH1RIGqef8RZkUtHioLmSNpPR5M4HVKJGm1j8FWVQ==", "dev": true }, "node_modules/ipaddr.js": { @@ -17192,9 +18571,9 @@ } }, "node_modules/istanbul-lib-instrument/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==", "bin": { "semver": "bin/semver.js" } @@ -18417,30 +19796,6 @@ "node": ">=10" } }, - "node_modules/jest-environment-jsdom/node_modules/tough-cookie": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.1.2.tgz", - "integrity": "sha512-G9fqXWoYFZgTc2z8Q5zaHy/vJMjm+WV0AkAeHxVCQiEB1b+dGvWzFW6QV07cY5jQ5gRkeid2qIkzkxUnmoQZUQ==", - "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/jest-environment-jsdom/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/jest-environment-jsdom/node_modules/w3c-xmlserializer": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/w3c-xmlserializer/-/w3c-xmlserializer-3.0.0.tgz", @@ -20107,30 +21462,6 @@ "node": ">= 6" } }, - "node_modules/jsdom/node_modules/tough-cookie": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.1.2.tgz", - "integrity": "sha512-G9fqXWoYFZgTc2z8Q5zaHy/vJMjm+WV0AkAeHxVCQiEB1b+dGvWzFW6QV07cY5jQ5gRkeid2qIkzkxUnmoQZUQ==", - "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/jsdom/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/jsesc": { "version": "2.5.2", "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz", @@ -20212,20 +21543,56 @@ ] }, "node_modules/jsonwebtoken": { - "version": "9.0.0", - "resolved": "https://registry.npmjs.org/jsonwebtoken/-/jsonwebtoken-9.0.0.tgz", - "integrity": "sha512-tuGfYXxkQGDPnLJ7SibiQgVgeDgfbPq2k2ICcbgqW8WxWLBAxKQM/ZCu/IT8SOSwmaYl4dpTFCW5xZv7YbbWUw==", + "version": "9.0.2", + "resolved": "https://registry.npmjs.org/jsonwebtoken/-/jsonwebtoken-9.0.2.tgz", + "integrity": "sha512-PRp66vJ865SSqOlgqS8hujT5U4AOgMfhrwYIuIhfKaoSCZcirrmASQr8CX7cUg+RMih+hgznrjp99o+W4pJLHQ==", "dependencies": { "jws": "^3.2.2", - "lodash": "^4.17.21", + "lodash.includes": "^4.3.0", + "lodash.isboolean": "^3.0.3", + "lodash.isinteger": "^4.0.4", + "lodash.isnumber": "^3.0.3", + "lodash.isplainobject": "^4.0.6", + "lodash.isstring": "^4.0.1", + "lodash.once": "^4.0.0", "ms": "^2.1.1", - "semver": "^7.3.8" + "semver": "^7.5.4" }, "engines": { "node": ">=12", "npm": ">=6" } }, + "node_modules/jsonwebtoken/node_modules/lru-cache": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", + "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", + "dependencies": { + "yallist": "^4.0.0" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/jsonwebtoken/node_modules/semver": { + "version": "7.6.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.0.tgz", + "integrity": "sha512-EnwXhrlwXMk9gKu5/flx5sv/an57AkRplG3hTK68W7FRDN+k+OWBj65M7719OkA82XLBxrcX0KSHj+X5COhOVg==", + "dependencies": { + "lru-cache": "^6.0.0" + }, + "bin": { + "semver": "bin/semver.js" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/jsonwebtoken/node_modules/yallist": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", + "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==" + }, "node_modules/jsprim": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-2.0.2.tgz", @@ -20251,6 +21618,16 @@ "safe-buffer": "^5.0.1" } }, + "node_modules/jwk-to-pem": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/jwk-to-pem/-/jwk-to-pem-2.0.5.tgz", + "integrity": "sha512-L90jwellhO8jRKYwbssU9ifaMVqajzj3fpRjDKcsDzrslU9syRbFqfkXtT4B89HYAap+xsxNcxgBSB09ig+a7A==", + "dependencies": { + "asn1.js": "^5.3.0", + "elliptic": "^6.5.4", + "safe-buffer": "^5.0.1" + } + }, "node_modules/jws": { "version": "3.2.2", "resolved": "https://registry.npmjs.org/jws/-/jws-3.2.2.tgz", @@ -20381,9 +21758,9 @@ } }, "node_modules/less/node_modules/semver": { - "version": "5.7.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", - "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==", + "version": "5.7.2", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz", + "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==", "optional": true, "bin": { "semver": "bin/semver" @@ -20523,6 +21900,11 @@ "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz", "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==" }, + "node_modules/lodash.clonedeep": { + "version": "4.5.0", + "resolved": "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz", + "integrity": "sha512-H5ZhCF25riFd9uB5UCkVKo61m3S/xZk1x4wA6yp/L3RFP6Z/eHH1ymQcGLo7J3GMPfm0V/7m1tryHuGVxpqEBQ==" + }, "node_modules/lodash.debounce": { "version": "4.0.8", "resolved": "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-4.0.8.tgz", @@ -20535,12 +21917,42 @@ "integrity": "sha512-z+Uw/vLuy6gQe8cfaFWD7p0wVv8fJl3mbzXh33RS+0oW2wvUqiRXiQ69gLWSLpgB5/6sU+r6BlQR0MBILadqTQ==", "dev": true }, + "node_modules/lodash.includes": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/lodash.includes/-/lodash.includes-4.3.0.tgz", + "integrity": "sha512-W3Bx6mdkRTGtlJISOvVD/lbqjTlPPUDTMnlXZFnVwi9NKJ6tiAk6LVdlhZMm17VZisqhKcgzpO5Wz91PCt5b0w==" + }, + "node_modules/lodash.isboolean": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/lodash.isboolean/-/lodash.isboolean-3.0.3.tgz", + "integrity": "sha512-Bz5mupy2SVbPHURB98VAcw+aHh4vRV5IPNhILUCsOzRmsTmSQ17jIuqopAentWoehktxGd9e/hbIXq980/1QJg==" + }, "node_modules/lodash.isequal": { "version": "4.5.0", "resolved": "https://registry.npmjs.org/lodash.isequal/-/lodash.isequal-4.5.0.tgz", "integrity": "sha512-pDo3lu8Jhfjqls6GkMgpahsF9kCyayhgykjyLMNFTKWrpVdAQtYyB4muAMWozBB4ig/dtWAmsMxLEI8wuz+DYQ==", "dev": true }, + "node_modules/lodash.isinteger": { + "version": "4.0.4", + "resolved": "https://registry.npmjs.org/lodash.isinteger/-/lodash.isinteger-4.0.4.tgz", + "integrity": "sha512-DBwtEWN2caHQ9/imiNeEA5ys1JoRtRfY3d7V9wkqtbycnAmTvRRmbHKDV4a0EYc678/dia0jrte4tjYwVBaZUA==" + }, + "node_modules/lodash.isnumber": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/lodash.isnumber/-/lodash.isnumber-3.0.3.tgz", + "integrity": "sha512-QYqzpfwO3/CWf3XP+Z+tkQsfaLL/EnUlXWVkIk5FUPc4sBdTehEqZONuyRt2P67PXAk+NXmTBcc97zw9t1FQrw==" + }, + "node_modules/lodash.isplainobject": { + "version": "4.0.6", + "resolved": "https://registry.npmjs.org/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz", + "integrity": "sha512-oSXzaWypCMHkPC3NvBEaPHf0KsA5mvPrOPgQWDsbg8n7orZ290M0BmC/jgRZ4vcJ6DTAhjrsSYgdsW/F+MFOBA==" + }, + "node_modules/lodash.isstring": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/lodash.isstring/-/lodash.isstring-4.0.1.tgz", + "integrity": "sha512-0wJxfxH1wgO3GrbuP+dTTk7op+6L41QCXbGINEmD+ny/G/eCqGzxyCsh7159S+mgDDcoarnBw6PC1PS5+wUGgw==" + }, "node_modules/lodash.memoize": { "version": "4.1.2", "resolved": "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-4.1.2.tgz", @@ -20555,8 +21967,7 @@ "node_modules/lodash.once": { "version": "4.1.1", "resolved": "https://registry.npmjs.org/lodash.once/-/lodash.once-4.1.1.tgz", - "integrity": "sha512-Sb487aTOCr9drQVL8pIxOzVhafOjZN9UU54hiN8PU3uAiSV7lx1yYNpbNmex2PK6dSJoNTSJUUswT651yww3Mg==", - "devOptional": true + "integrity": "sha512-Sb487aTOCr9drQVL8pIxOzVhafOjZN9UU54hiN8PU3uAiSV7lx1yYNpbNmex2PK6dSJoNTSJUUswT651yww3Mg==" }, "node_modules/lodash.uniq": { "version": "4.5.0", @@ -20776,9 +22187,9 @@ } }, "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==", + "version": "6.3.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", + "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", "bin": { "semver": "bin/semver.js" } @@ -21106,6 +22517,11 @@ "resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz", "integrity": "sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A==" }, + "node_modules/minimalistic-crypto-utils": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz", + "integrity": "sha512-JIYlbt6g8i5jKfJ3xz7rF0LXmv2TkDxBLUkiBeZ7bAx4GnnNMr8xFpGnOxn6GhTEHx3SjRrZEoU+j04prX1ktg==" + }, "node_modules/minimatch": { "version": "3.0.5", "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.5.tgz", @@ -21444,9 +22860,15 @@ "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.7", + "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.7.tgz", + "integrity": "sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g==", + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/ai" + } + ], "bin": { "nanoid": "bin/nanoid.cjs" }, @@ -23131,9 +24553,9 @@ } }, "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.31", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.31.tgz", + "integrity": "sha512-PS08Iboia9mts/2ygV3eLpY5ghnUcfLV/EXTOW1E2qYxJKGGBUtNjN76FYHnMs36RmARn41bC0AZmn+rR0OVpQ==", "funding": [ { "type": "opencollective", @@ -23142,10 +24564,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" }, @@ -24299,6 +25725,14 @@ "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz", "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==" }, + "node_modules/promise-coalesce": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/promise-coalesce/-/promise-coalesce-1.1.2.tgz", + "integrity": "sha512-zLaJ9b8hnC564fnJH6NFSOGZYYdzrAJn2JUUIwzoQb32fG2QAakpDNM+CZo1km6keXkRXRM+hml1BFAPVnPkxg==", + "engines": { + "node": ">=16" + } + }, "node_modules/promise-inflight": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/promise-inflight/-/promise-inflight-1.0.1.tgz", @@ -24418,7 +25852,7 @@ "version": "2.2.0", "resolved": "https://registry.npmjs.org/querystringify/-/querystringify-2.2.0.tgz", "integrity": "sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ==", - "dev": true + "devOptional": true }, "node_modules/queue-microtask": { "version": "1.2.3", @@ -24907,9 +26341,9 @@ } }, "node_modules/rollup": { - "version": "3.10.0", - "resolved": "https://registry.npmjs.org/rollup/-/rollup-3.10.0.tgz", - "integrity": "sha512-JmRYz44NjC1MjVF2VKxc0M1a97vn+cDxeqWmnwyAF4FvpjK8YFdHpaqvQB+3IxCvX05vJxKZkoMDU8TShhmJVA==", + "version": "3.29.4", + "resolved": "https://registry.npmjs.org/rollup/-/rollup-3.29.4.tgz", + "integrity": "sha512-oWzmBZwvYrU0iJHtDmhsm662rC15FRXmcjCk1xD771dFDx5jJ02ufAQQTn0etB2emNk4J9EZg/yWKpsn9BWGRw==", "bin": { "rollup": "dist/bin/rollup" }, @@ -25009,9 +26443,9 @@ "integrity": "sha512-LRneZZRXNgjzwG4bDQdOTSbze3fHm1EAKN/8bePxnlEZiBmkYEDggaHbuvHI9/hoqHbGfsEA7tWS9GhYHZBBsw==" }, "node_modules/sass": { - "version": "1.57.1", - "resolved": "https://registry.npmjs.org/sass/-/sass-1.57.1.tgz", - "integrity": "sha512-O2+LwLS79op7GI0xZ8fqzF7X2m/m8WFfI02dHOdsK5R2ECeS5F62zrwg/relM1rjSLy7Vd/DiMNIvPrQGsA0jw==", + "version": "1.58.1", + "resolved": "https://registry.npmjs.org/sass/-/sass-1.58.1.tgz", + "integrity": "sha512-bnINi6nPXbP1XNRaranMFEBZWUfdW/AF16Ql5+ypRxfTvCRTTKrLsMIakyDcayUt2t/RZotmL4kgJwNH5xO+bg==", "dependencies": { "chokidar": ">=3.0.0 <4.0.0", "immutable": "^4.0.0", @@ -26109,9 +27543,9 @@ "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==" }, "node_modules/stylus/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==", "bin": { "semver": "bin/semver.js" } @@ -26323,9 +27757,9 @@ } }, "node_modules/terser": { - "version": "5.16.1", - "resolved": "https://registry.npmjs.org/terser/-/terser-5.16.1.tgz", - "integrity": "sha512-xvQfyfA1ayT0qdK47zskQgRZeWLoOQ8JQ6mIgRGVNwZKdQMU+5FkCBjmv4QjcrTzyZquRw2FVtlJSRUmMKQslw==", + "version": "5.16.3", + "resolved": "https://registry.npmjs.org/terser/-/terser-5.16.3.tgz", + "integrity": "sha512-v8wWLaS/xt3nE9dgKEWhNUFP6q4kngO5B8eYFUuebsu7Dw/UNAnpUod6UHo04jSSkv8TzKHjZDSd7EXdDQAl8Q==", "dependencies": { "@jridgewell/source-map": "^0.3.2", "acorn": "^8.5.0", @@ -26599,16 +28033,27 @@ } }, "node_modules/tough-cookie": { - "version": "2.5.0", - "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz", - "integrity": "sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==", + "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==", "devOptional": true, "dependencies": { - "psl": "^1.1.28", - "punycode": "^2.1.1" + "psl": "^1.1.33", + "punycode": "^2.1.1", + "universalify": "^0.2.0", + "url-parse": "^1.5.3" }, "engines": { - "node": ">=0.8" + "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==", + "devOptional": true, + "engines": { + "node": ">= 4.0.0" } }, "node_modules/tr46": { @@ -27072,11 +28517,11 @@ } }, "node_modules/undici": { - "version": "5.22.1", - "resolved": "https://registry.npmjs.org/undici/-/undici-5.22.1.tgz", - "integrity": "sha512-Ji2IJhFXZY0x/0tVBXeQwgPlLWw13GVzpsWPQ3rV50IFMMof2I55PZZxtm4P6iNq+L5znYN9nSTAq0ZyE6lSJw==", + "version": "5.28.3", + "resolved": "https://registry.npmjs.org/undici/-/undici-5.28.3.tgz", + "integrity": "sha512-3ItfzbrhDlINjaP0duwnNsKpDQk3acHI3gVJ1z4fmwMK31k5G9OVIAMLSIaP6w4FaGkaAkN6zaQO9LUvZ1t7VA==", "dependencies": { - "busboy": "^1.6.0" + "@fastify/busboy": "^2.0.0" }, "engines": { "node": ">=14.0" @@ -27227,7 +28672,7 @@ "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, + "devOptional": true, "dependencies": { "querystringify": "^2.1.1", "requires-port": "^1.0.0" @@ -27341,14 +28786,13 @@ "devOptional": true }, "node_modules/vite": { - "version": "4.0.4", - "resolved": "https://registry.npmjs.org/vite/-/vite-4.0.4.tgz", - "integrity": "sha512-xevPU7M8FU0i/80DMR+YhgrzR5KS2ORy1B4xcX/cXLsvnUWvfHuqMmVU6N0YiJ4JWGRJJsLCgjEzKjG9/GKoSw==", + "version": "4.5.2", + "resolved": "https://registry.npmjs.org/vite/-/vite-4.5.2.tgz", + "integrity": "sha512-tBCZBNSBbHQkaGyhGCDUGqeo2ph8Fstyp6FMSvTtsXeZSPpSMGlviAOav2hxVTqFcx8Hj/twtWKsMJXNY0xI8w==", "dependencies": { - "esbuild": "^0.16.3", - "postcss": "^8.4.20", - "resolve": "^1.22.1", - "rollup": "^3.7.0" + "esbuild": "^0.18.10", + "postcss": "^8.4.27", + "rollup": "^3.27.1" }, "bin": { "vite": "bin/vite.js" @@ -27356,12 +28800,16 @@ "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": "*", @@ -27374,6 +28822,9 @@ "less": { "optional": true }, + "lightningcss": { + "optional": true + }, "sass": { "optional": true }, @@ -27572,6 +29023,372 @@ "tsconfck": "^2.0.1" } }, + "node_modules/vite/node_modules/@esbuild/android-arm": { + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.18.20.tgz", + "integrity": "sha512-fyi7TDI/ijKKNZTUJAQqiG5T7YjJXgnzkURqmGj13C6dCqckZBLdl4h7bkhHt/t0WP+zO9/zwroDvANaOqO5Sw==", + "cpu": [ + "arm" + ], + "optional": true, + "os": [ + "android" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/vite/node_modules/@esbuild/android-arm64": { + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.18.20.tgz", + "integrity": "sha512-Nz4rJcchGDtENV0eMKUNa6L12zz2zBDXuhj/Vjh18zGqB44Bi7MBMSXjgunJgjRhCmKOjnPuZp4Mb6OKqtMHLQ==", + "cpu": [ + "arm64" + ], + "optional": true, + "os": [ + "android" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/vite/node_modules/@esbuild/android-x64": { + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.18.20.tgz", + "integrity": "sha512-8GDdlePJA8D6zlZYJV/jnrRAi6rOiNaCC/JclcXpB+KIuvfBN4owLtgzY2bsxnx666XjJx2kDPUmnTtR8qKQUg==", + "cpu": [ + "x64" + ], + "optional": true, + "os": [ + "android" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/vite/node_modules/@esbuild/darwin-arm64": { + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.18.20.tgz", + "integrity": "sha512-bxRHW5kHU38zS2lPTPOyuyTm+S+eobPUnTNkdJEfAddYgEcll4xkT8DB9d2008DtTbl7uJag2HuE5NZAZgnNEA==", + "cpu": [ + "arm64" + ], + "optional": true, + "os": [ + "darwin" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/vite/node_modules/@esbuild/darwin-x64": { + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.18.20.tgz", + "integrity": "sha512-pc5gxlMDxzm513qPGbCbDukOdsGtKhfxD1zJKXjCCcU7ju50O7MeAZ8c4krSJcOIJGFR+qx21yMMVYwiQvyTyQ==", + "cpu": [ + "x64" + ], + "optional": true, + "os": [ + "darwin" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/vite/node_modules/@esbuild/freebsd-arm64": { + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.18.20.tgz", + "integrity": "sha512-yqDQHy4QHevpMAaxhhIwYPMv1NECwOvIpGCZkECn8w2WFHXjEwrBn3CeNIYsibZ/iZEUemj++M26W3cNR5h+Tw==", + "cpu": [ + "arm64" + ], + "optional": true, + "os": [ + "freebsd" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/vite/node_modules/@esbuild/freebsd-x64": { + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.18.20.tgz", + "integrity": "sha512-tgWRPPuQsd3RmBZwarGVHZQvtzfEBOreNuxEMKFcd5DaDn2PbBxfwLcj4+aenoh7ctXcbXmOQIn8HI6mCSw5MQ==", + "cpu": [ + "x64" + ], + "optional": true, + "os": [ + "freebsd" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/vite/node_modules/@esbuild/linux-arm": { + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.18.20.tgz", + "integrity": "sha512-/5bHkMWnq1EgKr1V+Ybz3s1hWXok7mDFUMQ4cG10AfW3wL02PSZi5kFpYKrptDsgb2WAJIvRcDm+qIvXf/apvg==", + "cpu": [ + "arm" + ], + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/vite/node_modules/@esbuild/linux-arm64": { + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.18.20.tgz", + "integrity": "sha512-2YbscF+UL7SQAVIpnWvYwM+3LskyDmPhe31pE7/aoTMFKKzIc9lLbyGUpmmb8a8AixOL61sQ/mFh3jEjHYFvdA==", + "cpu": [ + "arm64" + ], + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/vite/node_modules/@esbuild/linux-ia32": { + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.18.20.tgz", + "integrity": "sha512-P4etWwq6IsReT0E1KHU40bOnzMHoH73aXp96Fs8TIT6z9Hu8G6+0SHSw9i2isWrD2nbx2qo5yUqACgdfVGx7TA==", + "cpu": [ + "ia32" + ], + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/vite/node_modules/@esbuild/linux-loong64": { + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.18.20.tgz", + "integrity": "sha512-nXW8nqBTrOpDLPgPY9uV+/1DjxoQ7DoB2N8eocyq8I9XuqJ7BiAMDMf9n1xZM9TgW0J8zrquIb/A7s3BJv7rjg==", + "cpu": [ + "loong64" + ], + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/vite/node_modules/@esbuild/linux-mips64el": { + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.18.20.tgz", + "integrity": "sha512-d5NeaXZcHp8PzYy5VnXV3VSd2D328Zb+9dEq5HE6bw6+N86JVPExrA6O68OPwobntbNJ0pzCpUFZTo3w0GyetQ==", + "cpu": [ + "mips64el" + ], + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/vite/node_modules/@esbuild/linux-ppc64": { + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.18.20.tgz", + "integrity": "sha512-WHPyeScRNcmANnLQkq6AfyXRFr5D6N2sKgkFo2FqguP44Nw2eyDlbTdZwd9GYk98DZG9QItIiTlFLHJHjxP3FA==", + "cpu": [ + "ppc64" + ], + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/vite/node_modules/@esbuild/linux-riscv64": { + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.18.20.tgz", + "integrity": "sha512-WSxo6h5ecI5XH34KC7w5veNnKkju3zBRLEQNY7mv5mtBmrP/MjNBCAlsM2u5hDBlS3NGcTQpoBvRzqBcRtpq1A==", + "cpu": [ + "riscv64" + ], + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/vite/node_modules/@esbuild/linux-s390x": { + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.18.20.tgz", + "integrity": "sha512-+8231GMs3mAEth6Ja1iK0a1sQ3ohfcpzpRLH8uuc5/KVDFneH6jtAJLFGafpzpMRO6DzJ6AvXKze9LfFMrIHVQ==", + "cpu": [ + "s390x" + ], + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/vite/node_modules/@esbuild/linux-x64": { + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.18.20.tgz", + "integrity": "sha512-UYqiqemphJcNsFEskc73jQ7B9jgwjWrSayxawS6UVFZGWrAAtkzjxSqnoclCXxWtfwLdzU+vTpcNYhpn43uP1w==", + "cpu": [ + "x64" + ], + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/vite/node_modules/@esbuild/netbsd-x64": { + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.18.20.tgz", + "integrity": "sha512-iO1c++VP6xUBUmltHZoMtCUdPlnPGdBom6IrO4gyKPFFVBKioIImVooR5I83nTew5UOYrk3gIJhbZh8X44y06A==", + "cpu": [ + "x64" + ], + "optional": true, + "os": [ + "netbsd" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/vite/node_modules/@esbuild/openbsd-x64": { + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.18.20.tgz", + "integrity": "sha512-e5e4YSsuQfX4cxcygw/UCPIEP6wbIL+se3sxPdCiMbFLBWu0eiZOJ7WoD+ptCLrmjZBK1Wk7I6D/I3NglUGOxg==", + "cpu": [ + "x64" + ], + "optional": true, + "os": [ + "openbsd" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/vite/node_modules/@esbuild/sunos-x64": { + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.18.20.tgz", + "integrity": "sha512-kDbFRFp0YpTQVVrqUd5FTYmWo45zGaXe0X8E1G/LKFC0v8x0vWrhOWSLITcCn63lmZIxfOMXtCfti/RxN/0wnQ==", + "cpu": [ + "x64" + ], + "optional": true, + "os": [ + "sunos" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/vite/node_modules/@esbuild/win32-arm64": { + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.18.20.tgz", + "integrity": "sha512-ddYFR6ItYgoaq4v4JmQQaAI5s7npztfV4Ag6NrhiaW0RrnOXqBkgwZLofVTlq1daVTQNhtI5oieTvkRPfZrePg==", + "cpu": [ + "arm64" + ], + "optional": true, + "os": [ + "win32" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/vite/node_modules/@esbuild/win32-ia32": { + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.18.20.tgz", + "integrity": "sha512-Wv7QBi3ID/rROT08SABTS7eV4hX26sVduqDOTe1MvGMjNd3EjOz4b7zeexIR62GTIEKrfJXKL9LFxTYgkyeu7g==", + "cpu": [ + "ia32" + ], + "optional": true, + "os": [ + "win32" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/vite/node_modules/@esbuild/win32-x64": { + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.18.20.tgz", + "integrity": "sha512-kTdfRcSiDfQca/y9QIkng02avJ+NCaQvrMejlsB3RRv5sE9rRoeBPISaZpKxHELzRxZyLvNts1P27W3wV+8geQ==", + "cpu": [ + "x64" + ], + "optional": true, + "os": [ + "win32" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/vite/node_modules/esbuild": { + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.18.20.tgz", + "integrity": "sha512-ceqxoedUrcayh7Y7ZX6NdbbDzGROiyVBgC4PriJThBKSVPWnnFHZAkfI1lJT8QFkOwH4qOS2SJkS4wvpGl8BpA==", + "hasInstallScript": true, + "bin": { + "esbuild": "bin/esbuild" + }, + "engines": { + "node": ">=12" + }, + "optionalDependencies": { + "@esbuild/android-arm": "0.18.20", + "@esbuild/android-arm64": "0.18.20", + "@esbuild/android-x64": "0.18.20", + "@esbuild/darwin-arm64": "0.18.20", + "@esbuild/darwin-x64": "0.18.20", + "@esbuild/freebsd-arm64": "0.18.20", + "@esbuild/freebsd-x64": "0.18.20", + "@esbuild/linux-arm": "0.18.20", + "@esbuild/linux-arm64": "0.18.20", + "@esbuild/linux-ia32": "0.18.20", + "@esbuild/linux-loong64": "0.18.20", + "@esbuild/linux-mips64el": "0.18.20", + "@esbuild/linux-ppc64": "0.18.20", + "@esbuild/linux-riscv64": "0.18.20", + "@esbuild/linux-s390x": "0.18.20", + "@esbuild/linux-x64": "0.18.20", + "@esbuild/netbsd-x64": "0.18.20", + "@esbuild/openbsd-x64": "0.18.20", + "@esbuild/sunos-x64": "0.18.20", + "@esbuild/win32-arm64": "0.18.20", + "@esbuild/win32-ia32": "0.18.20", + "@esbuild/win32-x64": "0.18.20" + } + }, "node_modules/vitefu": { "version": "0.2.4", "resolved": "https://registry.npmjs.org/vitefu/-/vitefu-0.2.4.tgz", @@ -27730,9 +29547,9 @@ } }, "node_modules/webpack": { - "version": "5.75.0", - "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.75.0.tgz", - "integrity": "sha512-piaIaoVJlqMsPtX/+3KTTO6jfvrSYgauFVdt8cr9LTHKmcq/AMd4mhzsiP7ZF/PGRNPGA8336jldh9l2Kt2ogQ==", + "version": "5.76.1", + "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.76.1.tgz", + "integrity": "sha512-4+YIK4Abzv8172/SGqObnUjaIHjLEuUasz9EwQj/9xmPPkYJy2Mh03Q/lJfSD3YLzbxy5FeTq5Uw0323Oh6SJQ==", "dependencies": { "@types/eslint-scope": "^3.7.3", "@types/estree": "^0.0.51", @@ -28145,9 +29962,9 @@ "integrity": "sha512-JcKqAHLPxcdb9KM49dufGXn2x3ssnfjbcaQdLlfZsL9rH9wgDQjUtDxbo8NE0F6SFvydeu1VhZe7hZuHsB2/pw==" }, "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==", + "version": "1.2.5", + "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.5.tgz", + "integrity": "sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA==", "devOptional": true, "engines": { "node": ">=0.10.0" @@ -28411,15 +30228,28 @@ } }, "@angular-devkit/architect": { - "version": "0.1501.1", - "resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1501.1.tgz", - "integrity": "sha512-2uDa/+nVGwQ5X6UJtB14V37SbD/64WSg0hKyX5z1yp6wYrSuk7PWV8hddIsiYM3aIT5wTGqfLil6NkV4G/BzQw==", + "version": "0.1502.10", + "resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1502.10.tgz", + "integrity": "sha512-S8lN73WYCfpEpw1Q41ZcUinw7JfDeSM8LyGs797OVshnW75QcOkOecWj/3CKR23G44IgFrHN6sqtzWxKmMxLig==", "dev": true, "requires": { - "@angular-devkit/core": "15.1.1", + "@angular-devkit/core": "15.2.10", "rxjs": "6.6.7" }, "dependencies": { + "@angular-devkit/core": { + "version": "15.2.10", + "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-15.2.10.tgz", + "integrity": "sha512-bFPm7wjvfBds9km2rCJxUhzkqe4h3h/199yJtzC1bNvwRr2LMHvtyoQAzftda+gs7Ulqac5wzUEZX/cVV3WrsA==", + "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" + } + }, "rxjs": { "version": "6.6.7", "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.7.tgz", @@ -28438,39 +30268,40 @@ } }, "@angular-devkit/build-angular": { - "version": "15.1.1", - "resolved": "https://registry.npmjs.org/@angular-devkit/build-angular/-/build-angular-15.1.1.tgz", - "integrity": "sha512-9eziOA4uZwIg8OYjebkKz/yqQ1WIqajGrXr/goaAKcKhr8BprWXs5NhkIzMrELekA/dZOkR6Gpwz8d/XwplCww==", + "version": "15.2.10", + "resolved": "https://registry.npmjs.org/@angular-devkit/build-angular/-/build-angular-15.2.10.tgz", + "integrity": "sha512-3pCPVEJilVwHIJC6Su1/PIEqvFfU1Lxew9yItxX4s6dud8HY+fuKrsDnao4NNMFNqCLqL4el5QbSBKnnpWH1sg==", "dev": true, "requires": { "@ampproject/remapping": "2.2.0", - "@angular-devkit/architect": "0.1501.1", - "@angular-devkit/build-webpack": "0.1501.1", - "@angular-devkit/core": "15.1.1", + "@angular-devkit/architect": "0.1502.10", + "@angular-devkit/build-webpack": "0.1502.10", + "@angular-devkit/core": "15.2.10", "@babel/core": "7.20.12", - "@babel/generator": "7.20.7", + "@babel/generator": "7.20.14", "@babel/helper-annotate-as-pure": "7.18.6", + "@babel/helper-split-export-declaration": "7.18.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.7", + "@babel/runtime": "7.20.13", "@babel/template": "7.20.7", "@discoveryjs/json-ext": "0.5.7", - "@ngtools/webpack": "15.1.1", + "@ngtools/webpack": "15.2.10", "ansi-colors": "4.1.3", "autoprefixer": "10.4.13", "babel-loader": "9.1.2", "babel-plugin-istanbul": "6.1.1", - "browserslist": "4.21.4", + "browserslist": "4.21.5", "cacache": "17.0.4", "chokidar": "3.5.3", "copy-webpack-plugin": "11.0.0", "critters": "0.0.16", "css-loader": "6.7.3", - "esbuild": "0.16.17", - "esbuild-wasm": "0.16.17", - "glob": "8.0.3", + "esbuild": "0.17.8", + "esbuild-wasm": "0.17.8", + "glob": "8.1.0", "https-proxy-agent": "5.0.1", "inquirer": "8.2.4", "jsonc-parser": "3.2.0", @@ -28479,32 +30310,300 @@ "less-loader": "11.1.0", "license-webpack-plugin": "4.0.2", "loader-utils": "3.2.1", - "magic-string": "0.27.0", + "magic-string": "0.29.0", "mini-css-extract-plugin": "2.7.2", - "open": "8.4.0", + "open": "8.4.1", "ora": "5.4.1", - "parse5-html-rewriting-stream": "6.0.1", + "parse5-html-rewriting-stream": "7.0.0", "piscina": "3.2.0", - "postcss": "8.4.21", + "postcss": "8.4.31", "postcss-loader": "7.0.2", "resolve-url-loader": "5.0.0", "rxjs": "6.6.7", - "sass": "1.57.1", + "sass": "1.58.1", "sass-loader": "13.2.0", - "semver": "7.3.8", + "semver": "7.5.3", "source-map-loader": "4.0.1", "source-map-support": "0.5.21", - "terser": "5.16.1", + "terser": "5.16.3", "text-table": "0.2.0", "tree-kill": "1.2.2", - "tslib": "2.4.1", - "webpack": "5.75.0", + "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", "webpack-subresource-integrity": "5.1.0" }, "dependencies": { + "@angular-devkit/core": { + "version": "15.2.10", + "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-15.2.10.tgz", + "integrity": "sha512-bFPm7wjvfBds9km2rCJxUhzkqe4h3h/199yJtzC1bNvwRr2LMHvtyoQAzftda+gs7Ulqac5wzUEZX/cVV3WrsA==", + "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" + } + }, + "@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==", + "dev": true, + "requires": { + "@babel/types": "^7.18.6" + } + }, + "@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==", + "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==", + "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==", + "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==", + "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==", + "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==", + "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==", + "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==", + "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==", + "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==", + "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==", + "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==", + "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==", + "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==", + "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==", + "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==", + "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==", + "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==", + "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==", + "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==", + "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==", + "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==", + "dev": true, + "optional": true + }, + "entities": { + "version": "4.5.0", + "resolved": "https://registry.npmjs.org/entities/-/entities-4.5.0.tgz", + "integrity": "sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==", + "dev": true + }, + "esbuild": { + "version": "0.17.8", + "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.17.8.tgz", + "integrity": "sha512-g24ybC3fWhZddZK6R3uD2iF/RIPnRpwJAqLov6ouX3hMbY4+tKolP0VMF3zuIYCaXun+yHwS5IPQ91N2BT191g==", + "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-wasm": { + "version": "0.17.8", + "resolved": "https://registry.npmjs.org/esbuild-wasm/-/esbuild-wasm-0.17.8.tgz", + "integrity": "sha512-zCmpxv95E0FuCmvdw1K836UHnj4EdiQnFfjTby35y3LAjRPtXMj3sbHDRHjbD8Mqg5lTwq3knacr/1qIFU51CQ==", + "dev": true + }, + "lru-cache": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", + "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", + "dev": true, + "requires": { + "yallist": "^4.0.0" + } + }, + "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==", + "dev": true, + "requires": { + "@jridgewell/sourcemap-codec": "^1.4.13" + } + }, + "open": { + "version": "8.4.1", + "resolved": "https://registry.npmjs.org/open/-/open-8.4.1.tgz", + "integrity": "sha512-/4b7qZNhv6Uhd7jjnREh1NjnPxlTq+XNWPG88Ydkj5AILcA5m3ajvcg57pB24EQjKv0dK62XnDqk9c/hkIG5Kg==", + "dev": true, + "requires": { + "define-lazy-prop": "^2.0.0", + "is-docker": "^2.1.1", + "is-wsl": "^2.2.0" + } + }, + "parse5-html-rewriting-stream": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/parse5-html-rewriting-stream/-/parse5-html-rewriting-stream-7.0.0.tgz", + "integrity": "sha512-mazCyGWkmCRWDI15Zp+UiCqMp/0dgEmkZRvhlsqqKYr4SsVm/TvnSpD9fCvqCA2zoWJcfRym846ejWBBHRiYEg==", + "dev": true, + "requires": { + "entities": "^4.3.0", + "parse5": "^7.0.0", + "parse5-sax-parser": "^7.0.0" + } + }, + "parse5-sax-parser": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/parse5-sax-parser/-/parse5-sax-parser-7.0.0.tgz", + "integrity": "sha512-5A+v2SNsq8T6/mG3ahcz8ZtQ0OUFTatxPbeidoMB7tkJSGDY3tdfl4MHovtLQHkEn5CGxijNWRQHhRQ6IRpXKg==", + "dev": true, + "requires": { + "parse5": "^7.0.0" + } + }, "rxjs": { "version": "6.6.7", "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.7.tgz", @@ -28521,16 +30620,37 @@ "dev": true } } + }, + "semver": { + "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" + } + }, + "tslib": { + "version": "2.5.0", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.5.0.tgz", + "integrity": "sha512-336iVw3rtn2BUK7ORdIAHTyxHGRIHVReokCR3XjbckJMK7ms8FysBfhLR8IXnAgy7T0PTPNBWKiH514FOW/WSg==", + "dev": true + }, + "yallist": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", + "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", + "dev": true } } }, "@angular-devkit/build-webpack": { - "version": "0.1501.1", - "resolved": "https://registry.npmjs.org/@angular-devkit/build-webpack/-/build-webpack-0.1501.1.tgz", - "integrity": "sha512-b2Vyhx3JRHi179kSB/zc7G+/uuWq7S/7pZAau0Ry17N6Ihg2BwpLxBe0mvKcDecLmw+1ozBv2WLRCnxKXLZ4mw==", + "version": "0.1502.10", + "resolved": "https://registry.npmjs.org/@angular-devkit/build-webpack/-/build-webpack-0.1502.10.tgz", + "integrity": "sha512-55b9WZIGU4DNgiIV2lkkN6iQxJrgWY5CDaNu0kJC/qazotJgBbcN/8jgBx2DD8HNE1V3iXxWk66pt1h946Po+Q==", "dev": true, "requires": { - "@angular-devkit/architect": "0.1501.1", + "@angular-devkit/architect": "0.1502.10", "rxjs": "6.6.7" }, "dependencies": { @@ -28839,9 +30959,9 @@ }, "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 } } @@ -28964,12 +31084,12 @@ "dev": true }, "@aws-crypto/crc32": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/@aws-crypto/crc32/-/crc32-2.0.0.tgz", - "integrity": "sha512-TvE1r2CUueyXOuHdEigYjIZVesInd9KN+K/TFFNfkkxRThiNxO6i4ZqqAVMoEjAamZZ1AA8WXJkjCz7YShHPQA==", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/@aws-crypto/crc32/-/crc32-3.0.0.tgz", + "integrity": "sha512-IzSgsrxUcsrejQbPVilIKy16kAT52EwB6zSaI+M3xxIhKh5+aldEyvI+z6erM7TCLB2BJsFrtHjp6/4/sr+3dA==", "requires": { - "@aws-crypto/util": "^2.0.0", - "@aws-sdk/types": "^3.1.0", + "@aws-crypto/util": "^3.0.0", + "@aws-sdk/types": "^3.222.0", "tslib": "^1.11.1" }, "dependencies": { @@ -28981,12 +31101,12 @@ } }, "@aws-crypto/crc32c": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/@aws-crypto/crc32c/-/crc32c-2.0.0.tgz", - "integrity": "sha512-vF0eMdMHx3O3MoOXUfBZry8Y4ZDtcuskjjKgJz8YfIDjLStxTZrYXk+kZqtl6A0uCmmiN/Eb/JbC/CndTV1MHg==", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/@aws-crypto/crc32c/-/crc32c-3.0.0.tgz", + "integrity": "sha512-ENNPPManmnVJ4BTXlOjAgD7URidbAznURqD0KvfREyc4o20DPYdEldU1f5cQ7Jbj0CJJSPaMIk/9ZshdB3210w==", "requires": { - "@aws-crypto/util": "^2.0.0", - "@aws-sdk/types": "^3.1.0", + "@aws-crypto/util": "^3.0.0", + "@aws-sdk/types": "^3.222.0", "tslib": "^1.11.1" }, "dependencies": { @@ -28998,9 +31118,9 @@ } }, "@aws-crypto/ie11-detection": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/@aws-crypto/ie11-detection/-/ie11-detection-2.0.2.tgz", - "integrity": "sha512-5XDMQY98gMAf/WRTic5G++jfmS/VLM0rwpiOpaainKi4L0nqWMSB1SzsrEG5rjFZGYN6ZAefO+/Yta2dFM0kMw==", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/@aws-crypto/ie11-detection/-/ie11-detection-3.0.0.tgz", + "integrity": "sha512-341lBBkiY1DfDNKai/wXM3aujNBkXR7tq1URPQDL9wi3AUbI80NR74uF1TXHMm7po1AcnFk8iu2S2IeU/+/A+Q==", "requires": { "tslib": "^1.11.1" }, @@ -29013,13 +31133,14 @@ } }, "@aws-crypto/sha1-browser": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/@aws-crypto/sha1-browser/-/sha1-browser-2.0.0.tgz", - "integrity": "sha512-3fIVRjPFY8EG5HWXR+ZJZMdWNRpwbxGzJ9IH9q93FpbgCH8u8GHRi46mZXp3cYD7gealmyqpm3ThZwLKJjWJhA==", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/@aws-crypto/sha1-browser/-/sha1-browser-3.0.0.tgz", + "integrity": "sha512-NJth5c997GLHs6nOYTzFKTbYdMNA6/1XlKVgnZoaZcQ7z7UJlOgj2JdbHE8tiYLS3fzXNCguct77SPGat2raSw==", "requires": { - "@aws-crypto/ie11-detection": "^2.0.0", - "@aws-crypto/supports-web-crypto": "^2.0.0", - "@aws-sdk/types": "^3.1.0", + "@aws-crypto/ie11-detection": "^3.0.0", + "@aws-crypto/supports-web-crypto": "^3.0.0", + "@aws-crypto/util": "^3.0.0", + "@aws-sdk/types": "^3.222.0", "@aws-sdk/util-locate-window": "^3.0.0", "@aws-sdk/util-utf8-browser": "^3.0.0", "tslib": "^1.11.1" @@ -29033,15 +31154,15 @@ } }, "@aws-crypto/sha256-browser": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/@aws-crypto/sha256-browser/-/sha256-browser-2.0.0.tgz", - "integrity": "sha512-rYXOQ8BFOaqMEHJrLHul/25ckWH6GTJtdLSajhlqGMx0PmSueAuvboCuZCTqEKlxR8CQOwRarxYMZZSYlhRA1A==", - "requires": { - "@aws-crypto/ie11-detection": "^2.0.0", - "@aws-crypto/sha256-js": "^2.0.0", - "@aws-crypto/supports-web-crypto": "^2.0.0", - "@aws-crypto/util": "^2.0.0", - "@aws-sdk/types": "^3.1.0", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/@aws-crypto/sha256-browser/-/sha256-browser-3.0.0.tgz", + "integrity": "sha512-8VLmW2B+gjFbU5uMeqtQM6Nj0/F1bro80xQXCW6CQBWgosFWXTx77aeOF5CAIAmbOK64SdMBJdNr6J41yP5mvQ==", + "requires": { + "@aws-crypto/ie11-detection": "^3.0.0", + "@aws-crypto/sha256-js": "^3.0.0", + "@aws-crypto/supports-web-crypto": "^3.0.0", + "@aws-crypto/util": "^3.0.0", + "@aws-sdk/types": "^3.222.0", "@aws-sdk/util-locate-window": "^3.0.0", "@aws-sdk/util-utf8-browser": "^3.0.0", "tslib": "^1.11.1" @@ -29055,12 +31176,12 @@ } }, "@aws-crypto/sha256-js": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/@aws-crypto/sha256-js/-/sha256-js-2.0.0.tgz", - "integrity": "sha512-VZY+mCY4Nmrs5WGfitmNqXzaE873fcIZDu54cbaDaaamsaTOP1DBImV9F4pICc3EHjQXujyE8jig+PFCaew9ig==", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/@aws-crypto/sha256-js/-/sha256-js-3.0.0.tgz", + "integrity": "sha512-PnNN7os0+yd1XvXAy23CFOmTbMaDxgxXtTKHybrJ39Y8kGzBATgBFibWJKH6BhytLI/Zyszs87xCOBNyBig6vQ==", "requires": { - "@aws-crypto/util": "^2.0.0", - "@aws-sdk/types": "^3.1.0", + "@aws-crypto/util": "^3.0.0", + "@aws-sdk/types": "^3.222.0", "tslib": "^1.11.1" }, "dependencies": { @@ -29072,9 +31193,9 @@ } }, "@aws-crypto/supports-web-crypto": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/@aws-crypto/supports-web-crypto/-/supports-web-crypto-2.0.2.tgz", - "integrity": "sha512-6mbSsLHwZ99CTOOswvCRP3C+VCWnzBf+1SnbWxzzJ9lR0mA0JnY2JEAhp8rqmTE0GPFy88rrM27ffgp62oErMQ==", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/@aws-crypto/supports-web-crypto/-/supports-web-crypto-3.0.0.tgz", + "integrity": "sha512-06hBdMwUAb2WFTuGG73LSC0wfPu93xWwo5vL2et9eymgmu3Id5vFAHBbajVWiGhPO37qcsdCap/FqXvJGJWPIg==", "requires": { "tslib": "^1.11.1" }, @@ -29087,11 +31208,11 @@ } }, "@aws-crypto/util": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/@aws-crypto/util/-/util-2.0.2.tgz", - "integrity": "sha512-Lgu5v/0e/BcrZ5m/IWqzPUf3UYFTy/PpeED+uc9SWUR1iZQL8XXbGQg10UfllwwBryO3hFF5dizK+78aoXC1eA==", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/@aws-crypto/util/-/util-3.0.0.tgz", + "integrity": "sha512-2OJlpeJpCR48CC8r+uKVChzs9Iungj9wkZrl8Z041DWEWvyIHILYKCPNzJghKsivj+S3mLo6BVc7mBNzdxA46w==", "requires": { - "@aws-sdk/types": "^3.110.0", + "@aws-sdk/types": "^3.222.0", "@aws-sdk/util-utf8-browser": "^3.0.0", "tslib": "^1.11.1" }, @@ -29103,1143 +31224,991 @@ } } }, - "@aws-sdk/abort-controller": { - "version": "3.226.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/abort-controller/-/abort-controller-3.226.0.tgz", - "integrity": "sha512-cJVzr1xxPBd08voknXvR0RLgtZKGKt6WyDpH/BaPCu3rfSqWCDZKzwqe940eqosjmKrxC6pUZNKASIqHOQ8xxQ==", - "requires": { - "@aws-sdk/types": "3.226.0", - "tslib": "^2.3.1" - } - }, - "@aws-sdk/chunked-blob-reader": { - "version": "3.188.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/chunked-blob-reader/-/chunked-blob-reader-3.188.0.tgz", - "integrity": "sha512-zkPRFZZPL3eH+kH86LDYYXImiClA1/sW60zYOjse9Pgka+eDJlvBN6hcYxwDEKjcwATYiSRR1aVQHcfCinlGXg==", - "requires": { - "tslib": "^2.3.1" - } - }, - "@aws-sdk/chunked-blob-reader-native": { - "version": "3.208.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/chunked-blob-reader-native/-/chunked-blob-reader-native-3.208.0.tgz", - "integrity": "sha512-JeOZ95PW+fJ6bbuqPySYqLqHk1n4+4ueEEraJsiUrPBV0S1ZtyvOGHcnGztKUjr2PYNaiexmpWuvUve9K12HRA==", - "requires": { - "@aws-sdk/util-base64": "3.208.0", - "tslib": "^2.3.1" - } - }, "@aws-sdk/client-s3": { - "version": "3.252.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/client-s3/-/client-s3-3.252.0.tgz", - "integrity": "sha512-VsTDuztgrwwBnkTZKm3t3cyXNTnWRCxDN4fCeEabw8/GB6KKSrs1a9pYXyWXuXtuvV5lFG4tIZMcXF7UkVXqyg==", - "requires": { - "@aws-crypto/sha1-browser": "2.0.0", - "@aws-crypto/sha256-browser": "2.0.0", - "@aws-crypto/sha256-js": "2.0.0", - "@aws-sdk/client-sts": "3.252.0", - "@aws-sdk/config-resolver": "3.234.0", - "@aws-sdk/credential-provider-node": "3.252.0", - "@aws-sdk/eventstream-serde-browser": "3.226.0", - "@aws-sdk/eventstream-serde-config-resolver": "3.226.0", - "@aws-sdk/eventstream-serde-node": "3.226.0", - "@aws-sdk/fetch-http-handler": "3.226.0", - "@aws-sdk/hash-blob-browser": "3.226.0", - "@aws-sdk/hash-node": "3.226.0", - "@aws-sdk/hash-stream-node": "3.226.0", - "@aws-sdk/invalid-dependency": "3.226.0", - "@aws-sdk/md5-js": "3.226.0", - "@aws-sdk/middleware-bucket-endpoint": "3.226.0", - "@aws-sdk/middleware-content-length": "3.226.0", - "@aws-sdk/middleware-endpoint": "3.226.0", - "@aws-sdk/middleware-expect-continue": "3.226.0", - "@aws-sdk/middleware-flexible-checksums": "3.226.0", - "@aws-sdk/middleware-host-header": "3.226.0", - "@aws-sdk/middleware-location-constraint": "3.226.0", - "@aws-sdk/middleware-logger": "3.226.0", - "@aws-sdk/middleware-recursion-detection": "3.226.0", - "@aws-sdk/middleware-retry": "3.235.0", - "@aws-sdk/middleware-sdk-s3": "3.231.0", - "@aws-sdk/middleware-serde": "3.226.0", - "@aws-sdk/middleware-signing": "3.226.0", - "@aws-sdk/middleware-ssec": "3.226.0", - "@aws-sdk/middleware-stack": "3.226.0", - "@aws-sdk/middleware-user-agent": "3.226.0", - "@aws-sdk/node-config-provider": "3.226.0", - "@aws-sdk/node-http-handler": "3.226.0", - "@aws-sdk/protocol-http": "3.226.0", - "@aws-sdk/signature-v4-multi-region": "3.226.0", - "@aws-sdk/smithy-client": "3.234.0", - "@aws-sdk/types": "3.226.0", - "@aws-sdk/url-parser": "3.226.0", - "@aws-sdk/util-base64": "3.208.0", - "@aws-sdk/util-body-length-browser": "3.188.0", - "@aws-sdk/util-body-length-node": "3.208.0", - "@aws-sdk/util-defaults-mode-browser": "3.234.0", - "@aws-sdk/util-defaults-mode-node": "3.234.0", - "@aws-sdk/util-endpoints": "3.245.0", - "@aws-sdk/util-retry": "3.229.0", - "@aws-sdk/util-stream-browser": "3.226.0", - "@aws-sdk/util-stream-node": "3.226.0", - "@aws-sdk/util-user-agent-browser": "3.226.0", - "@aws-sdk/util-user-agent-node": "3.226.0", - "@aws-sdk/util-utf8-browser": "3.188.0", - "@aws-sdk/util-utf8-node": "3.208.0", - "@aws-sdk/util-waiter": "3.226.0", - "@aws-sdk/xml-builder": "3.201.0", - "fast-xml-parser": "4.0.11", - "tslib": "^2.3.1" + "version": "3.537.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/client-s3/-/client-s3-3.537.0.tgz", + "integrity": "sha512-EMPN2toHz1QtSiDeLKS1zrazh+8J0g1Y5t5lCq25iTXqCSV9vB2jCKwG5+OB6L5tAKkwyl1uZofeWLmdFkztEg==", + "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.535.0", + "@aws-sdk/core": "3.535.0", + "@aws-sdk/credential-provider-node": "3.535.0", + "@aws-sdk/middleware-bucket-endpoint": "3.535.0", + "@aws-sdk/middleware-expect-continue": "3.535.0", + "@aws-sdk/middleware-flexible-checksums": "3.535.0", + "@aws-sdk/middleware-host-header": "3.535.0", + "@aws-sdk/middleware-location-constraint": "3.535.0", + "@aws-sdk/middleware-logger": "3.535.0", + "@aws-sdk/middleware-recursion-detection": "3.535.0", + "@aws-sdk/middleware-sdk-s3": "3.535.0", + "@aws-sdk/middleware-signing": "3.535.0", + "@aws-sdk/middleware-ssec": "3.537.0", + "@aws-sdk/middleware-user-agent": "3.535.0", + "@aws-sdk/region-config-resolver": "3.535.0", + "@aws-sdk/signature-v4-multi-region": "3.535.0", + "@aws-sdk/types": "3.535.0", + "@aws-sdk/util-endpoints": "3.535.0", + "@aws-sdk/util-user-agent-browser": "3.535.0", + "@aws-sdk/util-user-agent-node": "3.535.0", + "@aws-sdk/xml-builder": "3.535.0", + "@smithy/config-resolver": "^2.2.0", + "@smithy/core": "^1.4.0", + "@smithy/eventstream-serde-browser": "^2.2.0", + "@smithy/eventstream-serde-config-resolver": "^2.2.0", + "@smithy/eventstream-serde-node": "^2.2.0", + "@smithy/fetch-http-handler": "^2.5.0", + "@smithy/hash-blob-browser": "^2.2.0", + "@smithy/hash-node": "^2.2.0", + "@smithy/hash-stream-node": "^2.2.0", + "@smithy/invalid-dependency": "^2.2.0", + "@smithy/md5-js": "^2.2.0", + "@smithy/middleware-content-length": "^2.2.0", + "@smithy/middleware-endpoint": "^2.5.0", + "@smithy/middleware-retry": "^2.2.0", + "@smithy/middleware-serde": "^2.3.0", + "@smithy/middleware-stack": "^2.2.0", + "@smithy/node-config-provider": "^2.3.0", + "@smithy/node-http-handler": "^2.5.0", + "@smithy/protocol-http": "^3.3.0", + "@smithy/smithy-client": "^2.5.0", + "@smithy/types": "^2.12.0", + "@smithy/url-parser": "^2.2.0", + "@smithy/util-base64": "^2.3.0", + "@smithy/util-body-length-browser": "^2.2.0", + "@smithy/util-body-length-node": "^2.3.0", + "@smithy/util-defaults-mode-browser": "^2.2.0", + "@smithy/util-defaults-mode-node": "^2.3.0", + "@smithy/util-endpoints": "^1.2.0", + "@smithy/util-retry": "^2.2.0", + "@smithy/util-stream": "^2.2.0", + "@smithy/util-utf8": "^2.3.0", + "@smithy/util-waiter": "^2.2.0", + "tslib": "^2.6.2" + }, + "dependencies": { + "tslib": { + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz", + "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==" + } } }, "@aws-sdk/client-sso": { - "version": "3.252.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/client-sso/-/client-sso-3.252.0.tgz", - "integrity": "sha512-VgBqJvvCU4y9zAHJwYj5nOeNGcCxKdCO4edUxWQVHcpLsVWu49maOVtWuteq9MOrHYeWfQi8bVWGt8MPvv9+bA==", - "requires": { - "@aws-crypto/sha256-browser": "2.0.0", - "@aws-crypto/sha256-js": "2.0.0", - "@aws-sdk/config-resolver": "3.234.0", - "@aws-sdk/fetch-http-handler": "3.226.0", - "@aws-sdk/hash-node": "3.226.0", - "@aws-sdk/invalid-dependency": "3.226.0", - "@aws-sdk/middleware-content-length": "3.226.0", - "@aws-sdk/middleware-endpoint": "3.226.0", - "@aws-sdk/middleware-host-header": "3.226.0", - "@aws-sdk/middleware-logger": "3.226.0", - "@aws-sdk/middleware-recursion-detection": "3.226.0", - "@aws-sdk/middleware-retry": "3.235.0", - "@aws-sdk/middleware-serde": "3.226.0", - "@aws-sdk/middleware-stack": "3.226.0", - "@aws-sdk/middleware-user-agent": "3.226.0", - "@aws-sdk/node-config-provider": "3.226.0", - "@aws-sdk/node-http-handler": "3.226.0", - "@aws-sdk/protocol-http": "3.226.0", - "@aws-sdk/smithy-client": "3.234.0", - "@aws-sdk/types": "3.226.0", - "@aws-sdk/url-parser": "3.226.0", - "@aws-sdk/util-base64": "3.208.0", - "@aws-sdk/util-body-length-browser": "3.188.0", - "@aws-sdk/util-body-length-node": "3.208.0", - "@aws-sdk/util-defaults-mode-browser": "3.234.0", - "@aws-sdk/util-defaults-mode-node": "3.234.0", - "@aws-sdk/util-endpoints": "3.245.0", - "@aws-sdk/util-retry": "3.229.0", - "@aws-sdk/util-user-agent-browser": "3.226.0", - "@aws-sdk/util-user-agent-node": "3.226.0", - "@aws-sdk/util-utf8-browser": "3.188.0", - "@aws-sdk/util-utf8-node": "3.208.0", - "tslib": "^2.3.1" + "version": "3.535.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/client-sso/-/client-sso-3.535.0.tgz", + "integrity": "sha512-h9eQRdFnjDRVBnPJIKXuX7D+isSAioIfZPC4PQwsL5BscTRlk4c90DX0R0uk64YUtp7LZu8TNtrosFZ/1HtTrQ==", + "requires": { + "@aws-crypto/sha256-browser": "3.0.0", + "@aws-crypto/sha256-js": "3.0.0", + "@aws-sdk/core": "3.535.0", + "@aws-sdk/middleware-host-header": "3.535.0", + "@aws-sdk/middleware-logger": "3.535.0", + "@aws-sdk/middleware-recursion-detection": "3.535.0", + "@aws-sdk/middleware-user-agent": "3.535.0", + "@aws-sdk/region-config-resolver": "3.535.0", + "@aws-sdk/types": "3.535.0", + "@aws-sdk/util-endpoints": "3.535.0", + "@aws-sdk/util-user-agent-browser": "3.535.0", + "@aws-sdk/util-user-agent-node": "3.535.0", + "@smithy/config-resolver": "^2.2.0", + "@smithy/core": "^1.4.0", + "@smithy/fetch-http-handler": "^2.5.0", + "@smithy/hash-node": "^2.2.0", + "@smithy/invalid-dependency": "^2.2.0", + "@smithy/middleware-content-length": "^2.2.0", + "@smithy/middleware-endpoint": "^2.5.0", + "@smithy/middleware-retry": "^2.2.0", + "@smithy/middleware-serde": "^2.3.0", + "@smithy/middleware-stack": "^2.2.0", + "@smithy/node-config-provider": "^2.3.0", + "@smithy/node-http-handler": "^2.5.0", + "@smithy/protocol-http": "^3.3.0", + "@smithy/smithy-client": "^2.5.0", + "@smithy/types": "^2.12.0", + "@smithy/url-parser": "^2.2.0", + "@smithy/util-base64": "^2.3.0", + "@smithy/util-body-length-browser": "^2.2.0", + "@smithy/util-body-length-node": "^2.3.0", + "@smithy/util-defaults-mode-browser": "^2.2.0", + "@smithy/util-defaults-mode-node": "^2.3.0", + "@smithy/util-endpoints": "^1.2.0", + "@smithy/util-middleware": "^2.2.0", + "@smithy/util-retry": "^2.2.0", + "@smithy/util-utf8": "^2.3.0", + "tslib": "^2.6.2" + }, + "dependencies": { + "tslib": { + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz", + "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==" + } } }, "@aws-sdk/client-sso-oidc": { - "version": "3.252.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/client-sso-oidc/-/client-sso-oidc-3.252.0.tgz", - "integrity": "sha512-OOwfEXFS+UliGZorEleARsXXUp3ObZSXo9/YY+8XF7/8froAqYjKCEi0tflghgYlh7d6qe7wzD7/6gDL1a/qgA==", - "requires": { - "@aws-crypto/sha256-browser": "2.0.0", - "@aws-crypto/sha256-js": "2.0.0", - "@aws-sdk/config-resolver": "3.234.0", - "@aws-sdk/fetch-http-handler": "3.226.0", - "@aws-sdk/hash-node": "3.226.0", - "@aws-sdk/invalid-dependency": "3.226.0", - "@aws-sdk/middleware-content-length": "3.226.0", - "@aws-sdk/middleware-endpoint": "3.226.0", - "@aws-sdk/middleware-host-header": "3.226.0", - "@aws-sdk/middleware-logger": "3.226.0", - "@aws-sdk/middleware-recursion-detection": "3.226.0", - "@aws-sdk/middleware-retry": "3.235.0", - "@aws-sdk/middleware-serde": "3.226.0", - "@aws-sdk/middleware-stack": "3.226.0", - "@aws-sdk/middleware-user-agent": "3.226.0", - "@aws-sdk/node-config-provider": "3.226.0", - "@aws-sdk/node-http-handler": "3.226.0", - "@aws-sdk/protocol-http": "3.226.0", - "@aws-sdk/smithy-client": "3.234.0", - "@aws-sdk/types": "3.226.0", - "@aws-sdk/url-parser": "3.226.0", - "@aws-sdk/util-base64": "3.208.0", - "@aws-sdk/util-body-length-browser": "3.188.0", - "@aws-sdk/util-body-length-node": "3.208.0", - "@aws-sdk/util-defaults-mode-browser": "3.234.0", - "@aws-sdk/util-defaults-mode-node": "3.234.0", - "@aws-sdk/util-endpoints": "3.245.0", - "@aws-sdk/util-retry": "3.229.0", - "@aws-sdk/util-user-agent-browser": "3.226.0", - "@aws-sdk/util-user-agent-node": "3.226.0", - "@aws-sdk/util-utf8-browser": "3.188.0", - "@aws-sdk/util-utf8-node": "3.208.0", - "tslib": "^2.3.1" + "version": "3.535.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/client-sso-oidc/-/client-sso-oidc-3.535.0.tgz", + "integrity": "sha512-M2cG4EQXDpAJQyq33ORIr6abmdX9p9zX0ssVy8XwFNB7lrgoIKxuVoGL+fX+XMgecl24x7ELz6b4QlILOevbCw==", + "requires": { + "@aws-crypto/sha256-browser": "3.0.0", + "@aws-crypto/sha256-js": "3.0.0", + "@aws-sdk/client-sts": "3.535.0", + "@aws-sdk/core": "3.535.0", + "@aws-sdk/middleware-host-header": "3.535.0", + "@aws-sdk/middleware-logger": "3.535.0", + "@aws-sdk/middleware-recursion-detection": "3.535.0", + "@aws-sdk/middleware-user-agent": "3.535.0", + "@aws-sdk/region-config-resolver": "3.535.0", + "@aws-sdk/types": "3.535.0", + "@aws-sdk/util-endpoints": "3.535.0", + "@aws-sdk/util-user-agent-browser": "3.535.0", + "@aws-sdk/util-user-agent-node": "3.535.0", + "@smithy/config-resolver": "^2.2.0", + "@smithy/core": "^1.4.0", + "@smithy/fetch-http-handler": "^2.5.0", + "@smithy/hash-node": "^2.2.0", + "@smithy/invalid-dependency": "^2.2.0", + "@smithy/middleware-content-length": "^2.2.0", + "@smithy/middleware-endpoint": "^2.5.0", + "@smithy/middleware-retry": "^2.2.0", + "@smithy/middleware-serde": "^2.3.0", + "@smithy/middleware-stack": "^2.2.0", + "@smithy/node-config-provider": "^2.3.0", + "@smithy/node-http-handler": "^2.5.0", + "@smithy/protocol-http": "^3.3.0", + "@smithy/smithy-client": "^2.5.0", + "@smithy/types": "^2.12.0", + "@smithy/url-parser": "^2.2.0", + "@smithy/util-base64": "^2.3.0", + "@smithy/util-body-length-browser": "^2.2.0", + "@smithy/util-body-length-node": "^2.3.0", + "@smithy/util-defaults-mode-browser": "^2.2.0", + "@smithy/util-defaults-mode-node": "^2.3.0", + "@smithy/util-endpoints": "^1.2.0", + "@smithy/util-middleware": "^2.2.0", + "@smithy/util-retry": "^2.2.0", + "@smithy/util-utf8": "^2.3.0", + "tslib": "^2.6.2" + }, + "dependencies": { + "tslib": { + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz", + "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==" + } } }, "@aws-sdk/client-sts": { - "version": "3.252.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/client-sts/-/client-sts-3.252.0.tgz", - "integrity": "sha512-wzfsWOlDFLdmeML8R7DUJWGl9wcRKf2uiunfB1aWzpdlgms0Z7FkHWgkDYHjCPyYHL6EBm84ajGl1UkE7AcmqQ==", - "requires": { - "@aws-crypto/sha256-browser": "2.0.0", - "@aws-crypto/sha256-js": "2.0.0", - "@aws-sdk/config-resolver": "3.234.0", - "@aws-sdk/credential-provider-node": "3.252.0", - "@aws-sdk/fetch-http-handler": "3.226.0", - "@aws-sdk/hash-node": "3.226.0", - "@aws-sdk/invalid-dependency": "3.226.0", - "@aws-sdk/middleware-content-length": "3.226.0", - "@aws-sdk/middleware-endpoint": "3.226.0", - "@aws-sdk/middleware-host-header": "3.226.0", - "@aws-sdk/middleware-logger": "3.226.0", - "@aws-sdk/middleware-recursion-detection": "3.226.0", - "@aws-sdk/middleware-retry": "3.235.0", - "@aws-sdk/middleware-sdk-sts": "3.226.0", - "@aws-sdk/middleware-serde": "3.226.0", - "@aws-sdk/middleware-signing": "3.226.0", - "@aws-sdk/middleware-stack": "3.226.0", - "@aws-sdk/middleware-user-agent": "3.226.0", - "@aws-sdk/node-config-provider": "3.226.0", - "@aws-sdk/node-http-handler": "3.226.0", - "@aws-sdk/protocol-http": "3.226.0", - "@aws-sdk/smithy-client": "3.234.0", - "@aws-sdk/types": "3.226.0", - "@aws-sdk/url-parser": "3.226.0", - "@aws-sdk/util-base64": "3.208.0", - "@aws-sdk/util-body-length-browser": "3.188.0", - "@aws-sdk/util-body-length-node": "3.208.0", - "@aws-sdk/util-defaults-mode-browser": "3.234.0", - "@aws-sdk/util-defaults-mode-node": "3.234.0", - "@aws-sdk/util-endpoints": "3.245.0", - "@aws-sdk/util-retry": "3.229.0", - "@aws-sdk/util-user-agent-browser": "3.226.0", - "@aws-sdk/util-user-agent-node": "3.226.0", - "@aws-sdk/util-utf8-browser": "3.188.0", - "@aws-sdk/util-utf8-node": "3.208.0", - "fast-xml-parser": "4.0.11", - "tslib": "^2.3.1" + "version": "3.535.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/client-sts/-/client-sts-3.535.0.tgz", + "integrity": "sha512-ii9OOm3TJwP3JmO1IVJXKWIShVKPl0VtdlgROc/SkDglO/kuAw9eDdlROgc+qbFl+gm6bBTguOVTUXt3tS3flw==", + "requires": { + "@aws-crypto/sha256-browser": "3.0.0", + "@aws-crypto/sha256-js": "3.0.0", + "@aws-sdk/core": "3.535.0", + "@aws-sdk/middleware-host-header": "3.535.0", + "@aws-sdk/middleware-logger": "3.535.0", + "@aws-sdk/middleware-recursion-detection": "3.535.0", + "@aws-sdk/middleware-user-agent": "3.535.0", + "@aws-sdk/region-config-resolver": "3.535.0", + "@aws-sdk/types": "3.535.0", + "@aws-sdk/util-endpoints": "3.535.0", + "@aws-sdk/util-user-agent-browser": "3.535.0", + "@aws-sdk/util-user-agent-node": "3.535.0", + "@smithy/config-resolver": "^2.2.0", + "@smithy/core": "^1.4.0", + "@smithy/fetch-http-handler": "^2.5.0", + "@smithy/hash-node": "^2.2.0", + "@smithy/invalid-dependency": "^2.2.0", + "@smithy/middleware-content-length": "^2.2.0", + "@smithy/middleware-endpoint": "^2.5.0", + "@smithy/middleware-retry": "^2.2.0", + "@smithy/middleware-serde": "^2.3.0", + "@smithy/middleware-stack": "^2.2.0", + "@smithy/node-config-provider": "^2.3.0", + "@smithy/node-http-handler": "^2.5.0", + "@smithy/protocol-http": "^3.3.0", + "@smithy/smithy-client": "^2.5.0", + "@smithy/types": "^2.12.0", + "@smithy/url-parser": "^2.2.0", + "@smithy/util-base64": "^2.3.0", + "@smithy/util-body-length-browser": "^2.2.0", + "@smithy/util-body-length-node": "^2.3.0", + "@smithy/util-defaults-mode-browser": "^2.2.0", + "@smithy/util-defaults-mode-node": "^2.3.0", + "@smithy/util-endpoints": "^1.2.0", + "@smithy/util-middleware": "^2.2.0", + "@smithy/util-retry": "^2.2.0", + "@smithy/util-utf8": "^2.3.0", + "tslib": "^2.6.2" + }, + "dependencies": { + "tslib": { + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz", + "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==" + } } }, - "@aws-sdk/config-resolver": { - "version": "3.234.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/config-resolver/-/config-resolver-3.234.0.tgz", - "integrity": "sha512-uZxy4wzllfvgCQxVc+Iqhde0NGAnfmV2hWR6ejadJaAFTuYNvQiRg9IqJy3pkyDPqXySiJ8Bom5PoJfgn55J/A==", + "@aws-sdk/core": { + "version": "3.535.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/core/-/core-3.535.0.tgz", + "integrity": "sha512-+Yusa9HziuaEDta1UaLEtMAtmgvxdxhPn7jgfRY6PplqAqgsfa5FR83sxy5qr2q7xjQTwHtV4MjQVuOjG9JsLw==", "requires": { - "@aws-sdk/signature-v4": "3.226.0", - "@aws-sdk/types": "3.226.0", - "@aws-sdk/util-config-provider": "3.208.0", - "@aws-sdk/util-middleware": "3.226.0", - "tslib": "^2.3.1" + "@smithy/core": "^1.4.0", + "@smithy/protocol-http": "^3.3.0", + "@smithy/signature-v4": "^2.2.0", + "@smithy/smithy-client": "^2.5.0", + "@smithy/types": "^2.12.0", + "fast-xml-parser": "4.2.5", + "tslib": "^2.6.2" + }, + "dependencies": { + "tslib": { + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz", + "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==" + } } }, "@aws-sdk/credential-provider-env": { - "version": "3.226.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-env/-/credential-provider-env-3.226.0.tgz", - "integrity": "sha512-sd8uK1ojbXxaZXlthzw/VXZwCPUtU3PjObOfr3Evj7MPIM2IH8h29foOlggx939MdLQGboJf9gKvLlvKDWtJRA==", + "version": "3.535.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-env/-/credential-provider-env-3.535.0.tgz", + "integrity": "sha512-XppwO8c0GCGSAvdzyJOhbtktSEaShg14VJKg8mpMa1XcgqzmcqqHQjtDWbx5rZheY1VdpXZhpEzJkB6LpQejpA==", "requires": { - "@aws-sdk/property-provider": "3.226.0", - "@aws-sdk/types": "3.226.0", - "tslib": "^2.3.1" + "@aws-sdk/types": "3.535.0", + "@smithy/property-provider": "^2.2.0", + "@smithy/types": "^2.12.0", + "tslib": "^2.6.2" + }, + "dependencies": { + "tslib": { + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz", + "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==" + } } }, - "@aws-sdk/credential-provider-imds": { - "version": "3.226.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-imds/-/credential-provider-imds-3.226.0.tgz", - "integrity": "sha512-//z/COQm2AjYFI1Lb0wKHTQSrvLFTyuKLFQGPJsKS7DPoxGOCKB7hmYerlbl01IDoCxTdyL//TyyPxbZEOQD5Q==", + "@aws-sdk/credential-provider-http": { + "version": "3.535.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-http/-/credential-provider-http-3.535.0.tgz", + "integrity": "sha512-kdj1wCmOMZ29jSlUskRqN04S6fJ4dvt0Nq9Z32SA6wO7UG8ht6Ot9h/au/eTWJM3E1somZ7D771oK7dQt9b8yw==", "requires": { - "@aws-sdk/node-config-provider": "3.226.0", - "@aws-sdk/property-provider": "3.226.0", - "@aws-sdk/types": "3.226.0", - "@aws-sdk/url-parser": "3.226.0", - "tslib": "^2.3.1" + "@aws-sdk/types": "3.535.0", + "@smithy/fetch-http-handler": "^2.5.0", + "@smithy/node-http-handler": "^2.5.0", + "@smithy/property-provider": "^2.2.0", + "@smithy/protocol-http": "^3.3.0", + "@smithy/smithy-client": "^2.5.0", + "@smithy/types": "^2.12.0", + "@smithy/util-stream": "^2.2.0", + "tslib": "^2.6.2" + }, + "dependencies": { + "tslib": { + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz", + "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==" + } } }, "@aws-sdk/credential-provider-ini": { - "version": "3.252.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-ini/-/credential-provider-ini-3.252.0.tgz", - "integrity": "sha512-OfpU8xMYK7+6XQ2dUO4rN0gUhhb/ZLV7iwSL6Ji2pI9gglGhKdOSfmbn6fBfCB50kzWZRNoiQJVaBu/d0Kr0EQ==", - "requires": { - "@aws-sdk/credential-provider-env": "3.226.0", - "@aws-sdk/credential-provider-imds": "3.226.0", - "@aws-sdk/credential-provider-process": "3.226.0", - "@aws-sdk/credential-provider-sso": "3.252.0", - "@aws-sdk/credential-provider-web-identity": "3.226.0", - "@aws-sdk/property-provider": "3.226.0", - "@aws-sdk/shared-ini-file-loader": "3.226.0", - "@aws-sdk/types": "3.226.0", - "tslib": "^2.3.1" + "version": "3.535.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-ini/-/credential-provider-ini-3.535.0.tgz", + "integrity": "sha512-bm3XOYlyCjtAb8eeHXLrxqRxYVRw2Iqv9IufdJb4gM13TbNSYniUT1WKaHxGIZ5p+FuNlXVhvk1OpHFM13+gXA==", + "requires": { + "@aws-sdk/client-sts": "3.535.0", + "@aws-sdk/credential-provider-env": "3.535.0", + "@aws-sdk/credential-provider-process": "3.535.0", + "@aws-sdk/credential-provider-sso": "3.535.0", + "@aws-sdk/credential-provider-web-identity": "3.535.0", + "@aws-sdk/types": "3.535.0", + "@smithy/credential-provider-imds": "^2.3.0", + "@smithy/property-provider": "^2.2.0", + "@smithy/shared-ini-file-loader": "^2.4.0", + "@smithy/types": "^2.12.0", + "tslib": "^2.6.2" + }, + "dependencies": { + "tslib": { + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz", + "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==" + } } }, "@aws-sdk/credential-provider-node": { - "version": "3.252.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-node/-/credential-provider-node-3.252.0.tgz", - "integrity": "sha512-Jt854JnB7izkJ/gb3S0hBFqAQPUNUP3eL8gXX2uqk9A9bQFQdS57/Ci0FXaEPwOXzJwAAPazD8dTf6HXMhnm3w==", - "requires": { - "@aws-sdk/credential-provider-env": "3.226.0", - "@aws-sdk/credential-provider-imds": "3.226.0", - "@aws-sdk/credential-provider-ini": "3.252.0", - "@aws-sdk/credential-provider-process": "3.226.0", - "@aws-sdk/credential-provider-sso": "3.252.0", - "@aws-sdk/credential-provider-web-identity": "3.226.0", - "@aws-sdk/property-provider": "3.226.0", - "@aws-sdk/shared-ini-file-loader": "3.226.0", - "@aws-sdk/types": "3.226.0", - "tslib": "^2.3.1" + "version": "3.535.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-node/-/credential-provider-node-3.535.0.tgz", + "integrity": "sha512-6JXp/EuL6euUkH5k4d+lQFF6gBwukrcCOWfNHCmq14mNJf/cqT3HAX1VMtWFRSK20am0IxfYQGccb0/nZykdKg==", + "requires": { + "@aws-sdk/credential-provider-env": "3.535.0", + "@aws-sdk/credential-provider-http": "3.535.0", + "@aws-sdk/credential-provider-ini": "3.535.0", + "@aws-sdk/credential-provider-process": "3.535.0", + "@aws-sdk/credential-provider-sso": "3.535.0", + "@aws-sdk/credential-provider-web-identity": "3.535.0", + "@aws-sdk/types": "3.535.0", + "@smithy/credential-provider-imds": "^2.3.0", + "@smithy/property-provider": "^2.2.0", + "@smithy/shared-ini-file-loader": "^2.4.0", + "@smithy/types": "^2.12.0", + "tslib": "^2.6.2" + }, + "dependencies": { + "tslib": { + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz", + "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==" + } } }, "@aws-sdk/credential-provider-process": { - "version": "3.226.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-process/-/credential-provider-process-3.226.0.tgz", - "integrity": "sha512-iUDMdnrTvbvaCFhWwqyXrhvQ9+ojPqPqXhwZtY1X/Qaz+73S9gXBPJHZaZb2Ke0yKE1Ql3bJbKvmmxC/qLQMng==", + "version": "3.535.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-process/-/credential-provider-process-3.535.0.tgz", + "integrity": "sha512-9O1OaprGCnlb/kYl8RwmH7Mlg8JREZctB8r9sa1KhSsWFq/SWO0AuJTyowxD7zL5PkeS4eTvzFFHWCa3OO5epA==", "requires": { - "@aws-sdk/property-provider": "3.226.0", - "@aws-sdk/shared-ini-file-loader": "3.226.0", - "@aws-sdk/types": "3.226.0", - "tslib": "^2.3.1" + "@aws-sdk/types": "3.535.0", + "@smithy/property-provider": "^2.2.0", + "@smithy/shared-ini-file-loader": "^2.4.0", + "@smithy/types": "^2.12.0", + "tslib": "^2.6.2" + }, + "dependencies": { + "tslib": { + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz", + "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==" + } } }, "@aws-sdk/credential-provider-sso": { - "version": "3.252.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-sso/-/credential-provider-sso-3.252.0.tgz", - "integrity": "sha512-2JGoojMOBjG9/DenctEszjdPechq0uDTpH5nx+z1xxIAugA5+HYG/ncNfpwhmUBCrnOxpRaQViTNqXddEPHlAg==", - "requires": { - "@aws-sdk/client-sso": "3.252.0", - "@aws-sdk/property-provider": "3.226.0", - "@aws-sdk/shared-ini-file-loader": "3.226.0", - "@aws-sdk/token-providers": "3.252.0", - "@aws-sdk/types": "3.226.0", - "tslib": "^2.3.1" + "version": "3.535.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-sso/-/credential-provider-sso-3.535.0.tgz", + "integrity": "sha512-2Dw0YIr8ETdFpq65CC4zK8ZIEbX78rXoNRZXUGNQW3oSKfL0tj8O8ErY6kg1IdEnYbGnEQ35q6luZ5GGNKLgDg==", + "requires": { + "@aws-sdk/client-sso": "3.535.0", + "@aws-sdk/token-providers": "3.535.0", + "@aws-sdk/types": "3.535.0", + "@smithy/property-provider": "^2.2.0", + "@smithy/shared-ini-file-loader": "^2.4.0", + "@smithy/types": "^2.12.0", + "tslib": "^2.6.2" + }, + "dependencies": { + "tslib": { + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz", + "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==" + } } }, "@aws-sdk/credential-provider-web-identity": { - "version": "3.226.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-web-identity/-/credential-provider-web-identity-3.226.0.tgz", - "integrity": "sha512-CCpv847rLB0SFOHz2igvUMFAzeT2fD3YnY4C8jltuJoEkn0ITn1Hlgt13nTJ5BUuvyti2mvyXZHmNzhMIMrIlw==", + "version": "3.535.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-web-identity/-/credential-provider-web-identity-3.535.0.tgz", + "integrity": "sha512-t2/JWrKY0H66A7JW7CqX06/DG2YkJddikt5ymdQvx/Q7dRMJ3d+o/vgjoKr7RvEx/pNruCeyM1599HCvwrVMrg==", "requires": { - "@aws-sdk/property-provider": "3.226.0", - "@aws-sdk/types": "3.226.0", - "tslib": "^2.3.1" + "@aws-sdk/client-sts": "3.535.0", + "@aws-sdk/types": "3.535.0", + "@smithy/property-provider": "^2.2.0", + "@smithy/types": "^2.12.0", + "tslib": "^2.6.2" + }, + "dependencies": { + "tslib": { + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz", + "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==" + } } }, - "@aws-sdk/eventstream-codec": { - "version": "3.226.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/eventstream-codec/-/eventstream-codec-3.226.0.tgz", - "integrity": "sha512-6uPtR8vSwz3fqoZk9hrb6qBYdp3PJ22+JxV5Wimdesvow4kJXSgDQXIxEkxbv6SxB9tNRB4uJHD84RetHEi15Q==", + "@aws-sdk/middleware-bucket-endpoint": { + "version": "3.535.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-bucket-endpoint/-/middleware-bucket-endpoint-3.535.0.tgz", + "integrity": "sha512-7sijlfQsc4UO9Fsl11mU26Y5f9E7g6UoNg/iJUBpC5pgvvmdBRO5UEhbB/gnqvOEPsBXyhmfzbstebq23Qdz7A==", "requires": { - "@aws-crypto/crc32": "2.0.0", - "@aws-sdk/types": "3.226.0", - "@aws-sdk/util-hex-encoding": "3.201.0", - "tslib": "^2.3.1" + "@aws-sdk/types": "3.535.0", + "@aws-sdk/util-arn-parser": "3.535.0", + "@smithy/node-config-provider": "^2.3.0", + "@smithy/protocol-http": "^3.3.0", + "@smithy/types": "^2.12.0", + "@smithy/util-config-provider": "^2.3.0", + "tslib": "^2.6.2" + }, + "dependencies": { + "tslib": { + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz", + "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==" + } } }, - "@aws-sdk/eventstream-serde-browser": { - "version": "3.226.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/eventstream-serde-browser/-/eventstream-serde-browser-3.226.0.tgz", - "integrity": "sha512-otYC5aZE9eJUqAlKpy8w0rPDQ1eKGvZPtgxWXmFYSO2lDVGfI1nBBNmdZ4MdHqNuQ7ucsKMQYF8BFJ65K2tYPA==", + "@aws-sdk/middleware-expect-continue": { + "version": "3.535.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-expect-continue/-/middleware-expect-continue-3.535.0.tgz", + "integrity": "sha512-hFKyqUBky0NWCVku8iZ9+PACehx0p6vuMw5YnZf8FVgHP0fode0b/NwQY6UY7oor/GftvRsAlRUAWGNFEGUpwA==", "requires": { - "@aws-sdk/eventstream-serde-universal": "3.226.0", - "@aws-sdk/types": "3.226.0", - "tslib": "^2.3.1" + "@aws-sdk/types": "3.535.0", + "@smithy/protocol-http": "^3.3.0", + "@smithy/types": "^2.12.0", + "tslib": "^2.6.2" + }, + "dependencies": { + "tslib": { + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz", + "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==" + } } }, - "@aws-sdk/eventstream-serde-config-resolver": { - "version": "3.226.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/eventstream-serde-config-resolver/-/eventstream-serde-config-resolver-3.226.0.tgz", - "integrity": "sha512-A56Gypg+lyEfA5cna+EUH9XTrj0SvRG1gwNW7lrUzviN36SeA/LFTUIOEjxVML3Lowy+EPAcrSZ67h6aepoAig==", + "@aws-sdk/middleware-flexible-checksums": { + "version": "3.535.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-flexible-checksums/-/middleware-flexible-checksums-3.535.0.tgz", + "integrity": "sha512-rBIzldY9jjRATxICDX7t77aW6ctqmVDgnuAOgbVT5xgHftt4o7PGWKoMvl/45hYqoQgxVFnCBof9bxkqSBebVA==", "requires": { - "@aws-sdk/types": "3.226.0", - "tslib": "^2.3.1" + "@aws-crypto/crc32": "3.0.0", + "@aws-crypto/crc32c": "3.0.0", + "@aws-sdk/types": "3.535.0", + "@smithy/is-array-buffer": "^2.2.0", + "@smithy/protocol-http": "^3.3.0", + "@smithy/types": "^2.12.0", + "@smithy/util-utf8": "^2.3.0", + "tslib": "^2.6.2" + }, + "dependencies": { + "tslib": { + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz", + "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==" + } } }, - "@aws-sdk/eventstream-serde-node": { - "version": "3.226.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/eventstream-serde-node/-/eventstream-serde-node-3.226.0.tgz", - "integrity": "sha512-KWLnKkKDzI9RNkiK6OiSYpG/XjZfue6Bsp/vRG+H5z3fbXdHv4X2+iW+Efu2Kvn7jsUyUv82TCl57DyJ/HKYhQ==", + "@aws-sdk/middleware-host-header": { + "version": "3.535.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-host-header/-/middleware-host-header-3.535.0.tgz", + "integrity": "sha512-0h6TWjBWtDaYwHMQJI9ulafeS4lLaw1vIxRjbpH0svFRt6Eve+Sy8NlVhECfTU2hNz/fLubvrUxsXoThaLBIew==", "requires": { - "@aws-sdk/eventstream-serde-universal": "3.226.0", - "@aws-sdk/types": "3.226.0", - "tslib": "^2.3.1" + "@aws-sdk/types": "3.535.0", + "@smithy/protocol-http": "^3.3.0", + "@smithy/types": "^2.12.0", + "tslib": "^2.6.2" + }, + "dependencies": { + "tslib": { + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz", + "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==" + } } }, - "@aws-sdk/eventstream-serde-universal": { - "version": "3.226.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/eventstream-serde-universal/-/eventstream-serde-universal-3.226.0.tgz", - "integrity": "sha512-Q8viYM1Sv90/yIUqyWNeG1GEvyVlAI3GIrInQcCMC+xT59jS+IKGy2y7ojCvSWXnhf5/HMXKcmG092QsqeKy0Q==", + "@aws-sdk/middleware-location-constraint": { + "version": "3.535.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-location-constraint/-/middleware-location-constraint-3.535.0.tgz", + "integrity": "sha512-SxfS9wfidUZZ+WnlKRTCRn3h+XTsymXRXPJj8VV6hNRNeOwzNweoG3YhQbTowuuNfXf89m9v6meYkBBtkdacKw==", "requires": { - "@aws-sdk/eventstream-codec": "3.226.0", - "@aws-sdk/types": "3.226.0", - "tslib": "^2.3.1" + "@aws-sdk/types": "3.535.0", + "@smithy/types": "^2.12.0", + "tslib": "^2.6.2" + }, + "dependencies": { + "tslib": { + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz", + "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==" + } } }, - "@aws-sdk/fetch-http-handler": { - "version": "3.226.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/fetch-http-handler/-/fetch-http-handler-3.226.0.tgz", - "integrity": "sha512-JewZPMNEBXfi1xVnRa7pVtK/zgZD8/lQ/YnD8pq79WuMa2cwyhDtr8oqCoqsPW+WJT5ScXoMtuHxN78l8eKWgg==", + "@aws-sdk/middleware-logger": { + "version": "3.535.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-logger/-/middleware-logger-3.535.0.tgz", + "integrity": "sha512-huNHpONOrEDrdRTvSQr1cJiRMNf0S52NDXtaPzdxiubTkP+vni2MohmZANMOai/qT0olmEVX01LhZ0ZAOgmg6A==", "requires": { - "@aws-sdk/protocol-http": "3.226.0", - "@aws-sdk/querystring-builder": "3.226.0", - "@aws-sdk/types": "3.226.0", - "@aws-sdk/util-base64": "3.208.0", - "tslib": "^2.3.1" + "@aws-sdk/types": "3.535.0", + "@smithy/types": "^2.12.0", + "tslib": "^2.6.2" + }, + "dependencies": { + "tslib": { + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz", + "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==" + } } }, - "@aws-sdk/hash-blob-browser": { - "version": "3.226.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/hash-blob-browser/-/hash-blob-browser-3.226.0.tgz", - "integrity": "sha512-5DCvWE6L4xGoViEHyjcPFuUe1G2EtNx8TqswWaoaKgyasP/yuRm4H99Ra7rqIrjCcSTAGD9NVsUQvVVw1bGt9w==", + "@aws-sdk/middleware-recursion-detection": { + "version": "3.535.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-recursion-detection/-/middleware-recursion-detection-3.535.0.tgz", + "integrity": "sha512-am2qgGs+gwqmR4wHLWpzlZ8PWhm4ktj5bYSgDrsOfjhdBlWNxvPoID9/pDAz5RWL48+oH7I6SQzMqxXsFDikrw==", "requires": { - "@aws-sdk/chunked-blob-reader": "3.188.0", - "@aws-sdk/chunked-blob-reader-native": "3.208.0", - "@aws-sdk/types": "3.226.0", - "tslib": "^2.3.1" + "@aws-sdk/types": "3.535.0", + "@smithy/protocol-http": "^3.3.0", + "@smithy/types": "^2.12.0", + "tslib": "^2.6.2" + }, + "dependencies": { + "tslib": { + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz", + "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==" + } } }, - "@aws-sdk/hash-node": { - "version": "3.226.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/hash-node/-/hash-node-3.226.0.tgz", - "integrity": "sha512-MdlJhJ9/Espwd0+gUXdZRsHuostB2WxEVAszWxobP0FTT9PnicqnfK7ExmW+DUAc0ywxtEbR3e0UND65rlSTVw==", + "@aws-sdk/middleware-sdk-s3": { + "version": "3.535.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-sdk-s3/-/middleware-sdk-s3-3.535.0.tgz", + "integrity": "sha512-/dLG/E3af6ohxkQ5GBHT8tZfuPIg6eItKxCXuulvYj0Tqgf3Mb+xTsvSkxQsJF06RS4sH7Qsg/PnB8ZfrJrXpg==", "requires": { - "@aws-sdk/types": "3.226.0", - "@aws-sdk/util-buffer-from": "3.208.0", - "tslib": "^2.3.1" + "@aws-sdk/types": "3.535.0", + "@aws-sdk/util-arn-parser": "3.535.0", + "@smithy/node-config-provider": "^2.3.0", + "@smithy/protocol-http": "^3.3.0", + "@smithy/signature-v4": "^2.2.0", + "@smithy/smithy-client": "^2.5.0", + "@smithy/types": "^2.12.0", + "@smithy/util-config-provider": "^2.3.0", + "tslib": "^2.6.2" + }, + "dependencies": { + "tslib": { + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz", + "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==" + } } }, - "@aws-sdk/hash-stream-node": { - "version": "3.226.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/hash-stream-node/-/hash-stream-node-3.226.0.tgz", - "integrity": "sha512-cgNTGlF8SdHaQXtjEmuLXz2U8SLM2JDKtIVPku/lHTMsUsEn+fuv2C+h1f/hvd4aNw5t1zggym7sO1/h/rv56Q==", + "@aws-sdk/middleware-signing": { + "version": "3.535.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-signing/-/middleware-signing-3.535.0.tgz", + "integrity": "sha512-Rb4sfus1Gc5paRl9JJgymJGsb/i3gJKK/rTuFZICdd1PBBE5osIOHP5CpzWYBtc5LlyZE1a2QoxPMCyG+QUGPw==", "requires": { - "@aws-sdk/types": "3.226.0", - "tslib": "^2.3.1" + "@aws-sdk/types": "3.535.0", + "@smithy/property-provider": "^2.2.0", + "@smithy/protocol-http": "^3.3.0", + "@smithy/signature-v4": "^2.2.0", + "@smithy/types": "^2.12.0", + "@smithy/util-middleware": "^2.2.0", + "tslib": "^2.6.2" + }, + "dependencies": { + "tslib": { + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz", + "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==" + } } }, - "@aws-sdk/invalid-dependency": { - "version": "3.226.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/invalid-dependency/-/invalid-dependency-3.226.0.tgz", - "integrity": "sha512-QXOYFmap8g9QzRjumcRCIo2GEZkdCwd7ePQW0OABWPhKHzlJ74vvBxywjU3s39EEBEluWXtZ7Iufg6GxZM4ifw==", + "@aws-sdk/middleware-ssec": { + "version": "3.537.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-ssec/-/middleware-ssec-3.537.0.tgz", + "integrity": "sha512-2QWMrbwd5eBy5KCYn9a15JEWBgrK2qFEKQN2lqb/6z0bhtevIOxIRfC99tzvRuPt6nixFQ+ynKuBjcfT4ZFrdQ==", "requires": { - "@aws-sdk/types": "3.226.0", - "tslib": "^2.3.1" + "@aws-sdk/types": "3.535.0", + "@smithy/types": "^2.12.0", + "tslib": "^2.6.2" + }, + "dependencies": { + "tslib": { + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz", + "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==" + } } }, - "@aws-sdk/is-array-buffer": { - "version": "3.201.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/is-array-buffer/-/is-array-buffer-3.201.0.tgz", - "integrity": "sha512-UPez5qLh3dNgt0DYnPD/q0mVJY84rA17QE26hVNOW3fAji8W2wrwrxdacWOxyXvlxWsVRcKmr+lay1MDqpAMfg==", + "@aws-sdk/middleware-user-agent": { + "version": "3.535.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-user-agent/-/middleware-user-agent-3.535.0.tgz", + "integrity": "sha512-Uvb2WJ+zdHdCOtsWVPI/M0BcfNrjOYsicDZWtaljucRJKLclY5gNWwD+RwIC+8b5TvfnVOlH+N5jhvpi5Impog==", "requires": { - "tslib": "^2.3.1" + "@aws-sdk/types": "3.535.0", + "@aws-sdk/util-endpoints": "3.535.0", + "@smithy/protocol-http": "^3.3.0", + "@smithy/types": "^2.12.0", + "tslib": "^2.6.2" + }, + "dependencies": { + "tslib": { + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz", + "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==" + } } }, - "@aws-sdk/md5-js": { - "version": "3.226.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/md5-js/-/md5-js-3.226.0.tgz", - "integrity": "sha512-ENigJRNudqyh6xsch166SZ4gggHd3XzZJ8gkCU4CWPne04HcR3BkWSO774IuWooCHt8zkaEHKecPurRz6qR+Vw==", + "@aws-sdk/region-config-resolver": { + "version": "3.535.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/region-config-resolver/-/region-config-resolver-3.535.0.tgz", + "integrity": "sha512-IXOznDiaItBjsQy4Fil0kzX/J3HxIOknEphqHbOfUf+LpA5ugcsxuQQONrbEQusCBnfJyymrldBvBhFmtlU9Wg==", "requires": { - "@aws-sdk/types": "3.226.0", - "@aws-sdk/util-utf8-browser": "3.188.0", - "@aws-sdk/util-utf8-node": "3.208.0", - "tslib": "^2.3.1" + "@aws-sdk/types": "3.535.0", + "@smithy/node-config-provider": "^2.3.0", + "@smithy/types": "^2.12.0", + "@smithy/util-config-provider": "^2.3.0", + "@smithy/util-middleware": "^2.2.0", + "tslib": "^2.6.2" + }, + "dependencies": { + "tslib": { + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz", + "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==" + } } }, - "@aws-sdk/middleware-bucket-endpoint": { - "version": "3.226.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-bucket-endpoint/-/middleware-bucket-endpoint-3.226.0.tgz", - "integrity": "sha512-A1Vq5W2X7jgTfjqcKPmjoHohF0poP+9fxwL97fQMvzcwmjhtoCV3bLEpo6CGYx0pKPiSlRJXZkRwRPj2hDHDmA==", - "requires": { - "@aws-sdk/protocol-http": "3.226.0", - "@aws-sdk/types": "3.226.0", - "@aws-sdk/util-arn-parser": "3.208.0", - "@aws-sdk/util-config-provider": "3.208.0", - "tslib": "^2.3.1" + "@aws-sdk/signature-v4-multi-region": { + "version": "3.535.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/signature-v4-multi-region/-/signature-v4-multi-region-3.535.0.tgz", + "integrity": "sha512-tqCsEsEj8icW0SAh3NvyhRUq54Gz2pu4NM2tOSrFp7SO55heUUaRLSzYteNZCTOupH//AAaZvbN/UUTO/DrOog==", + "requires": { + "@aws-sdk/middleware-sdk-s3": "3.535.0", + "@aws-sdk/types": "3.535.0", + "@smithy/protocol-http": "^3.3.0", + "@smithy/signature-v4": "^2.2.0", + "@smithy/types": "^2.12.0", + "tslib": "^2.6.2" + }, + "dependencies": { + "tslib": { + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz", + "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==" + } } }, - "@aws-sdk/middleware-content-length": { - "version": "3.226.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-content-length/-/middleware-content-length-3.226.0.tgz", - "integrity": "sha512-ksUzlHJN2JMuyavjA46a4sctvnrnITqt2tbGGWWrAuXY1mel2j+VbgnmJUiwHKUO6bTFBBeft5Vd1TSOb4JmiA==", + "@aws-sdk/token-providers": { + "version": "3.535.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/token-providers/-/token-providers-3.535.0.tgz", + "integrity": "sha512-4g+l/B9h1H/SiDtFRosW3pMwc+3PTXljZit+5NUBcET2XqcdUyHmgj3lBdu+CJ9CHdIMggRalYMAFXnRFe3Psg==", "requires": { - "@aws-sdk/protocol-http": "3.226.0", - "@aws-sdk/types": "3.226.0", - "tslib": "^2.3.1" + "@aws-sdk/client-sso-oidc": "3.535.0", + "@aws-sdk/types": "3.535.0", + "@smithy/property-provider": "^2.2.0", + "@smithy/shared-ini-file-loader": "^2.4.0", + "@smithy/types": "^2.12.0", + "tslib": "^2.6.2" + }, + "dependencies": { + "tslib": { + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz", + "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==" + } } }, - "@aws-sdk/middleware-endpoint": { - "version": "3.226.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-endpoint/-/middleware-endpoint-3.226.0.tgz", - "integrity": "sha512-EvLFafjtUxTT0AC9p3aBQu1/fjhWdIeK58jIXaNFONfZ3F8QbEYUPuF/SqZvJM6cWfOO9qwYKkRDbCSTYhprIg==", + "@aws-sdk/types": { + "version": "3.535.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/types/-/types-3.535.0.tgz", + "integrity": "sha512-aY4MYfduNj+sRR37U7XxYR8wemfbKP6lx00ze2M2uubn7mZotuVrWYAafbMSXrdEMSToE5JDhr28vArSOoLcSg==", "requires": { - "@aws-sdk/middleware-serde": "3.226.0", - "@aws-sdk/protocol-http": "3.226.0", - "@aws-sdk/signature-v4": "3.226.0", - "@aws-sdk/types": "3.226.0", - "@aws-sdk/url-parser": "3.226.0", - "@aws-sdk/util-config-provider": "3.208.0", - "@aws-sdk/util-middleware": "3.226.0", - "tslib": "^2.3.1" + "@smithy/types": "^2.12.0", + "tslib": "^2.6.2" + }, + "dependencies": { + "tslib": { + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz", + "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==" + } } }, - "@aws-sdk/middleware-expect-continue": { - "version": "3.226.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-expect-continue/-/middleware-expect-continue-3.226.0.tgz", - "integrity": "sha512-YxvQKTV/eA9P8AgW0hXOgj5Qa+TSnNFfyOkfeP089aP3f6p92b1cESf33TEOKsddive2mHT5LRCN6MuPcgWWrA==", + "@aws-sdk/util-arn-parser": { + "version": "3.535.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/util-arn-parser/-/util-arn-parser-3.535.0.tgz", + "integrity": "sha512-smVo29nUPAOprp8Z5Y3GHuhiOtw6c8/EtLCm5AVMtRsTPw4V414ZXL2H66tzmb5kEeSzQlbfBSBEdIFZoxO9kg==", "requires": { - "@aws-sdk/protocol-http": "3.226.0", - "@aws-sdk/types": "3.226.0", - "tslib": "^2.3.1" + "tslib": "^2.6.2" + }, + "dependencies": { + "tslib": { + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz", + "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==" + } } }, - "@aws-sdk/middleware-flexible-checksums": { - "version": "3.226.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-flexible-checksums/-/middleware-flexible-checksums-3.226.0.tgz", - "integrity": "sha512-8A9Ot9A7794UP5tMGl2MnfTW/UM/jYy1wRWF9YkR/hPIcPb7OmE0hmlwIQGzb/7grxpYw66ETKf0WeH/41YfeQ==", - "requires": { - "@aws-crypto/crc32": "2.0.0", - "@aws-crypto/crc32c": "2.0.0", - "@aws-sdk/is-array-buffer": "3.201.0", - "@aws-sdk/protocol-http": "3.226.0", - "@aws-sdk/types": "3.226.0", - "tslib": "^2.3.1" + "@aws-sdk/util-endpoints": { + "version": "3.535.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/util-endpoints/-/util-endpoints-3.535.0.tgz", + "integrity": "sha512-c8TlaQsiPchOOmTTR6qvHCO2O7L7NJwlKWAoQJ2GqWDZuC5es/fyuF2rp1h+ZRrUVraUomS0YdGkAmaDC7hJQg==", + "requires": { + "@aws-sdk/types": "3.535.0", + "@smithy/types": "^2.12.0", + "@smithy/util-endpoints": "^1.2.0", + "tslib": "^2.6.2" + }, + "dependencies": { + "tslib": { + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz", + "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==" + } } }, - "@aws-sdk/middleware-host-header": { - "version": "3.226.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-host-header/-/middleware-host-header-3.226.0.tgz", - "integrity": "sha512-haVkWVh6BUPwKgWwkL6sDvTkcZWvJjv8AgC8jiQuSl8GLZdzHTB8Qhi3IsfFta9HAuoLjxheWBE5Z/L0UrfhLA==", + "@aws-sdk/util-locate-window": { + "version": "3.535.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/util-locate-window/-/util-locate-window-3.535.0.tgz", + "integrity": "sha512-PHJ3SL6d2jpcgbqdgiPxkXpu7Drc2PYViwxSIqvvMKhDwzSB1W3mMvtpzwKM4IE7zLFodZo0GKjJ9AsoXndXhA==", "requires": { - "@aws-sdk/protocol-http": "3.226.0", - "@aws-sdk/types": "3.226.0", - "tslib": "^2.3.1" + "tslib": "^2.6.2" + }, + "dependencies": { + "tslib": { + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz", + "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==" + } } }, - "@aws-sdk/middleware-location-constraint": { - "version": "3.226.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-location-constraint/-/middleware-location-constraint-3.226.0.tgz", - "integrity": "sha512-qHiYaBYPc2R37KxG2uqsUUwh4usrQMHfGkrpTUnx5d4rGzM3mC+muPsTpSHnAL63K2/yJOHQJFjss3GGwV4SSA==", + "@aws-sdk/util-user-agent-browser": { + "version": "3.535.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/util-user-agent-browser/-/util-user-agent-browser-3.535.0.tgz", + "integrity": "sha512-RWMcF/xV5n+nhaA/Ff5P3yNP3Kur/I+VNZngog4TEs92oB/nwOdAg/2JL8bVAhUbMrjTjpwm7PItziYFQoqyig==", "requires": { - "@aws-sdk/types": "3.226.0", - "tslib": "^2.3.1" + "@aws-sdk/types": "3.535.0", + "@smithy/types": "^2.12.0", + "bowser": "^2.11.0", + "tslib": "^2.6.2" + }, + "dependencies": { + "tslib": { + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz", + "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==" + } } }, - "@aws-sdk/middleware-logger": { - "version": "3.226.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-logger/-/middleware-logger-3.226.0.tgz", - "integrity": "sha512-m9gtLrrYnpN6yckcQ09rV7ExWOLMuq8mMPF/K3DbL/YL0TuILu9i2T1W+JuxSX+K9FMG2HrLAKivE/kMLr55xA==", + "@aws-sdk/util-user-agent-node": { + "version": "3.535.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/util-user-agent-node/-/util-user-agent-node-3.535.0.tgz", + "integrity": "sha512-dRek0zUuIT25wOWJlsRm97nTkUlh1NDcLsQZIN2Y8KxhwoXXWtJs5vaDPT+qAg+OpcNj80i1zLR/CirqlFg/TQ==", "requires": { - "@aws-sdk/types": "3.226.0", - "tslib": "^2.3.1" + "@aws-sdk/types": "3.535.0", + "@smithy/node-config-provider": "^2.3.0", + "@smithy/types": "^2.12.0", + "tslib": "^2.6.2" + }, + "dependencies": { + "tslib": { + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz", + "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==" + } } }, - "@aws-sdk/middleware-recursion-detection": { - "version": "3.226.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-recursion-detection/-/middleware-recursion-detection-3.226.0.tgz", - "integrity": "sha512-mwRbdKEUeuNH5TEkyZ5FWxp6bL2UC1WbY+LDv6YjHxmSMKpAoOueEdtU34PqDOLrpXXxIGHDFmjeGeMfktyEcA==", + "@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", + "integrity": "sha512-UvFa/vR+e19XookZF8RzFZBrw2EUkQWxiBW0yYQAhvk3C+QVGl0H3ouca8LDBlBfQKXwmW3huo/59H8rwb1wJw==", "requires": { - "@aws-sdk/protocol-http": "3.226.0", - "@aws-sdk/types": "3.226.0", "tslib": "^2.3.1" } }, - "@aws-sdk/middleware-retry": { - "version": "3.235.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-retry/-/middleware-retry-3.235.0.tgz", - "integrity": "sha512-50WHbJGpD3SNp9763MAlHqIhXil++JdQbKejNpHg7HsJne/ao3ub+fDOfx//mMBjpzBV25BGd5UlfL6blrClSg==", + "@aws-sdk/xml-builder": { + "version": "3.535.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/xml-builder/-/xml-builder-3.535.0.tgz", + "integrity": "sha512-VXAq/Jz8KIrU84+HqsOJhIKZqG0PNTdi6n6PFQ4xJf44ZQHD/5C7ouH4qCFX5XgZXcgbRIcMVVYGC6Jye0dRng==", "requires": { - "@aws-sdk/protocol-http": "3.226.0", - "@aws-sdk/service-error-classification": "3.229.0", - "@aws-sdk/types": "3.226.0", - "@aws-sdk/util-middleware": "3.226.0", - "@aws-sdk/util-retry": "3.229.0", - "tslib": "^2.3.1", - "uuid": "^8.3.2" + "@smithy/types": "^2.12.0", + "tslib": "^2.6.2" + }, + "dependencies": { + "tslib": { + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz", + "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==" + } } }, - "@aws-sdk/middleware-sdk-s3": { - "version": "3.231.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-sdk-s3/-/middleware-sdk-s3-3.231.0.tgz", - "integrity": "sha512-UGaSvevd2TanfKgStF46dDSHkh4bxOr1gdUkyHm9i+1pF5lx4KdbnBZv/5SKnn7XifhHRXrs1M3lTzemXREhTA==", + "@babel/code-frame": { + "version": "7.23.5", + "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.23.5.tgz", + "integrity": "sha512-CgH3s1a96LipHCmSUmYFPwY7MNx8C3avkq7i4Wl3cfa662ldtUe4VM1TPXX70pfmrlWTb6jLqTYrZyT2ZTJBgA==", "requires": { - "@aws-sdk/protocol-http": "3.226.0", - "@aws-sdk/types": "3.226.0", - "@aws-sdk/util-arn-parser": "3.208.0", - "tslib": "^2.3.1" + "@babel/highlight": "^7.23.4", + "chalk": "^2.4.2" } }, - "@aws-sdk/middleware-sdk-sts": { - "version": "3.226.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-sdk-sts/-/middleware-sdk-sts-3.226.0.tgz", - "integrity": "sha512-NN9T/qoSD1kZvAT+VLny3NnlqgylYQcsgV3rvi/8lYzw/G/2s8VS6sm/VTWGGZhx08wZRv20MWzYu3bftcyqUg==", - "requires": { - "@aws-sdk/middleware-signing": "3.226.0", - "@aws-sdk/property-provider": "3.226.0", - "@aws-sdk/protocol-http": "3.226.0", - "@aws-sdk/signature-v4": "3.226.0", - "@aws-sdk/types": "3.226.0", - "tslib": "^2.3.1" - } + "@babel/compat-data": { + "version": "7.20.10", + "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.20.10.tgz", + "integrity": "sha512-sEnuDPpOJR/fcafHMjpcpGN5M2jbUGUHwmuWKM/YdPzeEDJg8bgmbcWQFUfE32MQjti1koACvoPVsDe8Uq+idg==" }, - "@aws-sdk/middleware-serde": { - "version": "3.226.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-serde/-/middleware-serde-3.226.0.tgz", - "integrity": "sha512-nPuOOAkSfx9TxzdKFx0X2bDlinOxGrqD7iof926K/AEflxGD1DBdcaDdjlYlPDW2CVE8LV/rAgbYuLxh/E/1VA==", + "@babel/core": { + "version": "7.20.12", + "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.20.12.tgz", + "integrity": "sha512-XsMfHovsUYHFMdrIHkZphTN/2Hzzi78R08NuHfDBehym2VsPDL6Zn/JAD/JQdnRvbSsbQc4mVaU1m6JgtTEElg==", "requires": { - "@aws-sdk/types": "3.226.0", - "tslib": "^2.3.1" + "@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", + "convert-source-map": "^1.7.0", + "debug": "^4.1.0", + "gensync": "^1.0.0-beta.2", + "json5": "^2.2.2", + "semver": "^6.3.0" + }, + "dependencies": { + "semver": { + "version": "6.3.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", + "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==" + } } }, - "@aws-sdk/middleware-signing": { - "version": "3.226.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-signing/-/middleware-signing-3.226.0.tgz", - "integrity": "sha512-E6HmtPcl+IjYDDzi1xI2HpCbBq2avNWcjvCriMZWuTAtRVpnA6XDDGW5GY85IfS3A8G8vuWqEVPr8JcYUcjfew==", - "requires": { - "@aws-sdk/property-provider": "3.226.0", - "@aws-sdk/protocol-http": "3.226.0", - "@aws-sdk/signature-v4": "3.226.0", - "@aws-sdk/types": "3.226.0", - "@aws-sdk/util-middleware": "3.226.0", - "tslib": "^2.3.1" + "@babel/generator": { + "version": "7.20.14", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.20.14.tgz", + "integrity": "sha512-AEmuXHdcD3A52HHXxaTmYlb8q/xMEhoRP67B3T4Oq7lbmSoqroMZzjnGj3+i1io3pdnF8iBYVu4Ilj+c4hBxYg==", + "requires": { + "@babel/types": "^7.20.7", + "@jridgewell/gen-mapping": "^0.3.2", + "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==", + "requires": { + "@jridgewell/set-array": "^1.0.1", + "@jridgewell/sourcemap-codec": "^1.4.10", + "@jridgewell/trace-mapping": "^0.3.9" + } + } } }, - "@aws-sdk/middleware-ssec": { - "version": "3.226.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-ssec/-/middleware-ssec-3.226.0.tgz", - "integrity": "sha512-DR97oWoLHiMdaUP/wu99HtzG7/ijvCrjZGDH37WBO1rxFtEti6L7T09wgHzwxMN8gtL8FJA7dU8IrffGSC9VmA==", + "@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==", "requires": { - "@aws-sdk/types": "3.226.0", - "tslib": "^2.3.1" + "@babel/types": "^7.18.6" } }, - "@aws-sdk/middleware-stack": { - "version": "3.226.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-stack/-/middleware-stack-3.226.0.tgz", - "integrity": "sha512-85wF29LvPvpoed60fZGDYLwv1Zpd/cM0C22WSSFPw1SSJeqO4gtFYyCg2squfT3KI6kF43IIkOCJ+L7GtryPug==", + "@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==", + "dev": true, "requires": { - "tslib": "^2.3.1" + "@babel/helper-explode-assignable-expression": "^7.18.6", + "@babel/types": "^7.18.9" } }, - "@aws-sdk/middleware-user-agent": { - "version": "3.226.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-user-agent/-/middleware-user-agent-3.226.0.tgz", - "integrity": "sha512-N1WnfzCW1Y5yWhVAphf8OPGTe8Df3vmV7/LdsoQfmpkCZgLZeK2o0xITkUQhRj1mbw7yp8tVFLFV3R2lMurdAQ==", + "@babel/helper-compilation-targets": { + "version": "7.20.7", + "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.20.7.tgz", + "integrity": "sha512-4tGORmfQcrc+bvrjb5y3dG9Mx1IOZjsHqQVUz7XCNHO+iTmqxWnVg3KRygjGmpRLJGdQSKuvFinbIb0CnZwHAQ==", "requires": { - "@aws-sdk/protocol-http": "3.226.0", - "@aws-sdk/types": "3.226.0", - "tslib": "^2.3.1" + "@babel/compat-data": "^7.20.5", + "@babel/helper-validator-option": "^7.18.6", + "browserslist": "^4.21.3", + "lru-cache": "^5.1.1", + "semver": "^6.3.0" + }, + "dependencies": { + "semver": { + "version": "6.3.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", + "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==" + } } }, - "@aws-sdk/node-config-provider": { - "version": "3.226.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/node-config-provider/-/node-config-provider-3.226.0.tgz", - "integrity": "sha512-B8lQDqiRk7X5izFEUMXmi8CZLOKCTWQJU9HQf3ako+sF0gexo4nHN3jhoRWyLtcgC5S3on/2jxpAcqtm7kuY3w==", + "@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==", "requires": { - "@aws-sdk/property-provider": "3.226.0", - "@aws-sdk/shared-ini-file-loader": "3.226.0", - "@aws-sdk/types": "3.226.0", - "tslib": "^2.3.1" + "@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" } }, - "@aws-sdk/node-http-handler": { - "version": "3.226.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/node-http-handler/-/node-http-handler-3.226.0.tgz", - "integrity": "sha512-xQCddnZNMiPmjr3W7HYM+f5ir4VfxgJh37eqZwX6EZmyItFpNNeVzKUgA920ka1VPz/ZUYB+2OFGiX3LCLkkaA==", + "@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": { - "@aws-sdk/abort-controller": "3.226.0", - "@aws-sdk/protocol-http": "3.226.0", - "@aws-sdk/querystring-builder": "3.226.0", - "@aws-sdk/types": "3.226.0", - "tslib": "^2.3.1" + "@babel/helper-annotate-as-pure": "^7.18.6", + "regexpu-core": "^5.2.1" } }, - "@aws-sdk/property-provider": { - "version": "3.226.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/property-provider/-/property-provider-3.226.0.tgz", - "integrity": "sha512-TsljjG+Sg0LmdgfiAlWohluWKnxB/k8xenjeozZfzOr5bHmNHtdbWv6BtNvD/R83hw7SFXxbJHlD5H4u9p2NFg==", + "@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": { - "@aws-sdk/types": "3.226.0", - "tslib": "^2.3.1" + "@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" + }, + "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 + } } }, - "@aws-sdk/protocol-http": { - "version": "3.226.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/protocol-http/-/protocol-http-3.226.0.tgz", - "integrity": "sha512-zWkVqiTA9RXL6y0hhfZc9bcU4DX2NI6Hw9IhQmSPeM59mdbPjJlY4bLlMr5YxywqO3yQ/ylNoAfrEzrDjlOSRg==", + "@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==" + }, + "@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==", + "dev": true, "requires": { - "@aws-sdk/types": "3.226.0", - "tslib": "^2.3.1" + "@babel/types": "^7.18.6" } }, - "@aws-sdk/querystring-builder": { - "version": "3.226.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/querystring-builder/-/querystring-builder-3.226.0.tgz", - "integrity": "sha512-LVurypuNeotO4lmirKXRC4NYrZRAyMJXuwO0f2a5ZAUJCjauwYrifKue6yCfU7bls7gut7nfcR6B99WBYpHs3g==", + "@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==", "requires": { - "@aws-sdk/types": "3.226.0", - "@aws-sdk/util-uri-escape": "3.201.0", - "tslib": "^2.3.1" + "@babel/template": "^7.22.15", + "@babel/types": "^7.23.0" + }, + "dependencies": { + "@babel/template": { + "version": "7.24.0", + "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.24.0.tgz", + "integrity": "sha512-Bkf2q8lMB0AFpX0NFEqSbx1OkTHf0f+0j82mkw+ZpzBnkk7e9Ql0891vlfgi+kHwOk8tQjiQHpqh4LaSa0fKEA==", + "requires": { + "@babel/code-frame": "^7.23.5", + "@babel/parser": "^7.24.0", + "@babel/types": "^7.24.0" + } + } } }, - "@aws-sdk/querystring-parser": { - "version": "3.226.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/querystring-parser/-/querystring-parser-3.226.0.tgz", - "integrity": "sha512-FzB+VrQ47KAFxiPt2YXrKZ8AOLZQqGTLCKHzx4bjxGmwgsjV8yIbtJiJhZLMcUQV4LtGeIY9ixIqQhGvnZHE4A==", + "@babel/helper-hoist-variables": { + "version": "7.22.5", + "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.22.5.tgz", + "integrity": "sha512-wGjk9QZVzvknA6yKIUURb8zY3grXCcOZt+/7Wcy8O2uctxhplmUPkOdlgoNhmdVee2c92JXbf1xpMtVNbfoxRw==", "requires": { - "@aws-sdk/types": "3.226.0", - "tslib": "^2.3.1" - } - }, - "@aws-sdk/service-error-classification": { - "version": "3.229.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/service-error-classification/-/service-error-classification-3.229.0.tgz", - "integrity": "sha512-dnzWWQ0/NoWMUZ5C0DW3dPm0wC1O76Y/SpKbuJzWPkx1EYy6r8p32Ly4D9vUzrKDbRGf48YHIF2kOkBmu21CLg==" - }, - "@aws-sdk/shared-ini-file-loader": { - "version": "3.226.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/shared-ini-file-loader/-/shared-ini-file-loader-3.226.0.tgz", - "integrity": "sha512-661VQefsARxVyyV2FX9V61V+nNgImk7aN2hYlFKla6BCwZfMng+dEtD0xVGyg1PfRw0qvEv5LQyxMVgHcUSevA==", - "requires": { - "@aws-sdk/types": "3.226.0", - "tslib": "^2.3.1" - } - }, - "@aws-sdk/signature-v4": { - "version": "3.226.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/signature-v4/-/signature-v4-3.226.0.tgz", - "integrity": "sha512-/R5q5agdPd7HJB68XMzpxrNPk158EHUvkFkuRu5Qf3kkkHebEzWEBlWoVpUe6ss4rP9Tqcue6xPuaftEmhjpYw==", - "requires": { - "@aws-sdk/is-array-buffer": "3.201.0", - "@aws-sdk/types": "3.226.0", - "@aws-sdk/util-hex-encoding": "3.201.0", - "@aws-sdk/util-middleware": "3.226.0", - "@aws-sdk/util-uri-escape": "3.201.0", - "tslib": "^2.3.1" - } - }, - "@aws-sdk/signature-v4-multi-region": { - "version": "3.226.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/signature-v4-multi-region/-/signature-v4-multi-region-3.226.0.tgz", - "integrity": "sha512-QHxNuf9ynK208v7Y3imdsa3Cz8ynYV7ZOf3sBJdItuEtHN6uy/KxaOrtvpF8I5Hyn48Hc8z5miTSMujFKT7GEw==", - "requires": { - "@aws-sdk/protocol-http": "3.226.0", - "@aws-sdk/signature-v4": "3.226.0", - "@aws-sdk/types": "3.226.0", - "@aws-sdk/util-arn-parser": "3.208.0", - "tslib": "^2.3.1" - } - }, - "@aws-sdk/smithy-client": { - "version": "3.234.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/smithy-client/-/smithy-client-3.234.0.tgz", - "integrity": "sha512-8AtR/k4vsFvjXeQbIzq/Wy7Nbk48Ou0wUEeVYPHWHPSU8QamFWORkOwmKtKMfHAyZvmqiAPeQqHFkq+UJhWyyQ==", - "requires": { - "@aws-sdk/middleware-stack": "3.226.0", - "@aws-sdk/types": "3.226.0", - "tslib": "^2.3.1" - } - }, - "@aws-sdk/token-providers": { - "version": "3.252.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/token-providers/-/token-providers-3.252.0.tgz", - "integrity": "sha512-xi3pUP31tyKF4lJFCOgtkwSWESE9W1vE23Vybsq53wzXEYfnRql8RP+C9FFkUouAR6ixPHEcEYplB+l92CY49g==", - "requires": { - "@aws-sdk/client-sso-oidc": "3.252.0", - "@aws-sdk/property-provider": "3.226.0", - "@aws-sdk/shared-ini-file-loader": "3.226.0", - "@aws-sdk/types": "3.226.0", - "tslib": "^2.3.1" - } - }, - "@aws-sdk/types": { - "version": "3.226.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/types/-/types-3.226.0.tgz", - "integrity": "sha512-MmmNHrWeO4man7wpOwrAhXlevqtOV9ZLcH4RhnG5LmRce0RFOApx24HoKENfFCcOyCm5LQBlsXCqi0dZWDWU0A==", - "requires": { - "tslib": "^2.3.1" - } - }, - "@aws-sdk/url-parser": { - "version": "3.226.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/url-parser/-/url-parser-3.226.0.tgz", - "integrity": "sha512-p5RLE0QWyP0OcTOLmFcLdVgUcUEzmEfmdrnOxyNzomcYb0p3vUagA5zfa1HVK2azsQJFBv28GfvMnba9bGhObg==", - "requires": { - "@aws-sdk/querystring-parser": "3.226.0", - "@aws-sdk/types": "3.226.0", - "tslib": "^2.3.1" - } - }, - "@aws-sdk/util-arn-parser": { - "version": "3.208.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/util-arn-parser/-/util-arn-parser-3.208.0.tgz", - "integrity": "sha512-QV4af+kscova9dv4VuHOgH8wEr/IIYHDGcnyVtkUEqahCejWr1Kuk+SBK0xMwnZY5LSycOtQ8aeqHOn9qOjZtA==", - "requires": { - "tslib": "^2.3.1" - } - }, - "@aws-sdk/util-base64": { - "version": "3.208.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/util-base64/-/util-base64-3.208.0.tgz", - "integrity": "sha512-PQniZph5A6N7uuEOQi+1hnMz/FSOK/8kMFyFO+4DgA1dZ5pcKcn5wiFwHkcTb/BsgVqQa3Jx0VHNnvhlS8JyTg==", - "requires": { - "@aws-sdk/util-buffer-from": "3.208.0", - "tslib": "^2.3.1" - } - }, - "@aws-sdk/util-body-length-browser": { - "version": "3.188.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/util-body-length-browser/-/util-body-length-browser-3.188.0.tgz", - "integrity": "sha512-8VpnwFWXhnZ/iRSl9mTf+VKOX9wDE8QtN4bj9pBfxwf90H1X7E8T6NkiZD3k+HubYf2J94e7DbeHs7fuCPW5Qg==", - "requires": { - "tslib": "^2.3.1" - } - }, - "@aws-sdk/util-body-length-node": { - "version": "3.208.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/util-body-length-node/-/util-body-length-node-3.208.0.tgz", - "integrity": "sha512-3zj50e5g7t/MQf53SsuuSf0hEELzMtD8RX8C76f12OSRo2Bca4FLLYHe0TZbxcfQHom8/hOaeZEyTyMogMglqg==", - "requires": { - "tslib": "^2.3.1" - } - }, - "@aws-sdk/util-buffer-from": { - "version": "3.208.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/util-buffer-from/-/util-buffer-from-3.208.0.tgz", - "integrity": "sha512-7L0XUixNEFcLUGPeBF35enCvB9Xl+K6SQsmbrPk1P3mlV9mguWSDQqbOBwY1Ir0OVbD6H/ZOQU7hI/9RtRI0Zw==", - "requires": { - "@aws-sdk/is-array-buffer": "3.201.0", - "tslib": "^2.3.1" - } - }, - "@aws-sdk/util-config-provider": { - "version": "3.208.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/util-config-provider/-/util-config-provider-3.208.0.tgz", - "integrity": "sha512-DSRqwrERUsT34ug+anlMBIFooBEGwM8GejC7q00Y/9IPrQy50KnG5PW2NiTjuLKNi7pdEOlwTSEocJE15eDZIg==", - "requires": { - "tslib": "^2.3.1" - } - }, - "@aws-sdk/util-defaults-mode-browser": { - "version": "3.234.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/util-defaults-mode-browser/-/util-defaults-mode-browser-3.234.0.tgz", - "integrity": "sha512-IHMKXjTbOD8XMz5+2oCOsVP94BYb9YyjXdns0aAXr2NAo7k2+RCzXQ2DebJXppGda1F6opFutoKwyVSN0cmbMw==", - "requires": { - "@aws-sdk/property-provider": "3.226.0", - "@aws-sdk/types": "3.226.0", - "bowser": "^2.11.0", - "tslib": "^2.3.1" - } - }, - "@aws-sdk/util-defaults-mode-node": { - "version": "3.234.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/util-defaults-mode-node/-/util-defaults-mode-node-3.234.0.tgz", - "integrity": "sha512-UGjQ+OjBYYhxFVtUY+jtr0ZZgzZh6OHtYwRhFt8IHewJXFCfZTyfsbX20szBj5y1S4HRIUJ7cwBLIytTqMbI5w==", - "requires": { - "@aws-sdk/config-resolver": "3.234.0", - "@aws-sdk/credential-provider-imds": "3.226.0", - "@aws-sdk/node-config-provider": "3.226.0", - "@aws-sdk/property-provider": "3.226.0", - "@aws-sdk/types": "3.226.0", - "tslib": "^2.3.1" - } - }, - "@aws-sdk/util-endpoints": { - "version": "3.245.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/util-endpoints/-/util-endpoints-3.245.0.tgz", - "integrity": "sha512-UNOFquB1tKx+8RT8n82Zb5tIwDyZHVPBg/m0LB0RsLETjr6krien5ASpqWezsXKIR1hftN9uaxN4bvf2dZrWHg==", - "requires": { - "@aws-sdk/types": "3.226.0", - "tslib": "^2.3.1" - } - }, - "@aws-sdk/util-hex-encoding": { - "version": "3.201.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/util-hex-encoding/-/util-hex-encoding-3.201.0.tgz", - "integrity": "sha512-7t1vR1pVxKx0motd3X9rI3m/xNp78p3sHtP5yo4NP4ARpxyJ0fokBomY8ScaH2D/B+U5o9ARxldJUdMqyBlJcA==", - "requires": { - "tslib": "^2.3.1" - } - }, - "@aws-sdk/util-locate-window": { - "version": "3.208.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/util-locate-window/-/util-locate-window-3.208.0.tgz", - "integrity": "sha512-iua1A2+P7JJEDHVgvXrRJSvsnzG7stYSGQnBVphIUlemwl6nN5D+QrgbjECtrbxRz8asYFHSzhdhECqN+tFiBg==", - "requires": { - "tslib": "^2.3.1" - } - }, - "@aws-sdk/util-middleware": { - "version": "3.226.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/util-middleware/-/util-middleware-3.226.0.tgz", - "integrity": "sha512-B96CQnwX4gRvQdaQkdUtqvDPkrptV5+va6FVeJOocU/DbSYMAScLxtR3peMS8cnlOT6nL1Eoa42OI9AfZz1VwQ==", - "requires": { - "tslib": "^2.3.1" - } - }, - "@aws-sdk/util-retry": { - "version": "3.229.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/util-retry/-/util-retry-3.229.0.tgz", - "integrity": "sha512-0zKTqi0P1inD0LzIMuXRIYYQ/8c1lWMg/cfiqUcIAF1TpatlpZuN7umU0ierpBFud7S+zDgg0oemh+Nj8xliJw==", - "requires": { - "@aws-sdk/service-error-classification": "3.229.0", - "tslib": "^2.3.1" - } - }, - "@aws-sdk/util-stream-browser": { - "version": "3.226.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/util-stream-browser/-/util-stream-browser-3.226.0.tgz", - "integrity": "sha512-ZvjlA1ySaLd0DqUWTKmL7LsxfPhroAONpzsinaHmw9aZVL40s2cADU9eWgBdHTuAOeFklL7NP0cc6UiTFHKe8g==", - "requires": { - "@aws-sdk/fetch-http-handler": "3.226.0", - "@aws-sdk/types": "3.226.0", - "@aws-sdk/util-base64": "3.208.0", - "@aws-sdk/util-hex-encoding": "3.201.0", - "@aws-sdk/util-utf8-browser": "3.188.0", - "tslib": "^2.3.1" - } - }, - "@aws-sdk/util-stream-node": { - "version": "3.226.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/util-stream-node/-/util-stream-node-3.226.0.tgz", - "integrity": "sha512-HADXiIgDGoXcCLSKuPnjCLENf0iC0lzqqnymZu9H2FoACZhJB7DvJ9LnP51Pvw9lfCu+yvLzbMqSPdbXtMbRWg==", - "requires": { - "@aws-sdk/node-http-handler": "3.226.0", - "@aws-sdk/types": "3.226.0", - "@aws-sdk/util-buffer-from": "3.208.0", - "tslib": "^2.3.1" - } - }, - "@aws-sdk/util-uri-escape": { - "version": "3.201.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/util-uri-escape/-/util-uri-escape-3.201.0.tgz", - "integrity": "sha512-TeTWbGx4LU2c5rx0obHeDFeO9HvwYwQtMh1yniBz00pQb6Qt6YVOETVQikRZ+XRQwEyCg/dA375UplIpiy54mA==", - "requires": { - "tslib": "^2.3.1" - } - }, - "@aws-sdk/util-user-agent-browser": { - "version": "3.226.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/util-user-agent-browser/-/util-user-agent-browser-3.226.0.tgz", - "integrity": "sha512-PhBIu2h6sPJPcv2I7ELfFizdl5pNiL4LfxrasMCYXQkJvVnoXztHA1x+CQbXIdtZOIlpjC+6BjDcE0uhnpvfcA==", - "requires": { - "@aws-sdk/types": "3.226.0", - "bowser": "^2.11.0", - "tslib": "^2.3.1" - } - }, - "@aws-sdk/util-user-agent-node": { - "version": "3.226.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/util-user-agent-node/-/util-user-agent-node-3.226.0.tgz", - "integrity": "sha512-othPc5Dz/pkYkxH+nZPhc1Al0HndQT8zHD4e9h+EZ+8lkd8n+IsnLfTS/mSJWrfiC6UlNRVw55cItstmJyMe/A==", - "requires": { - "@aws-sdk/node-config-provider": "3.226.0", - "@aws-sdk/types": "3.226.0", - "tslib": "^2.3.1" - } - }, - "@aws-sdk/util-utf8-browser": { - "version": "3.188.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/util-utf8-browser/-/util-utf8-browser-3.188.0.tgz", - "integrity": "sha512-jt627x0+jE+Ydr9NwkFstg3cUvgWh56qdaqAMDsqgRlKD21md/6G226z/Qxl7lb1VEW2LlmCx43ai/37Qwcj2Q==", - "requires": { - "tslib": "^2.3.1" - } - }, - "@aws-sdk/util-utf8-node": { - "version": "3.208.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/util-utf8-node/-/util-utf8-node-3.208.0.tgz", - "integrity": "sha512-jKY87Acv0yWBdFxx6bveagy5FYjz+dtV8IPT7ay1E2WPWH1czoIdMAkc8tSInK31T6CRnHWkLZ1qYwCbgRfERQ==", - "requires": { - "@aws-sdk/util-buffer-from": "3.208.0", - "tslib": "^2.3.1" - } - }, - "@aws-sdk/util-waiter": { - "version": "3.226.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/util-waiter/-/util-waiter-3.226.0.tgz", - "integrity": "sha512-qYQMRxnu5k8qQihJXoIWMkBOj0+XkHHj/drLdbRnwL6ni6NcG8++cs9M3DSjIcxmxgF/7SLpDjn1H3sC7cYo4g==", - "requires": { - "@aws-sdk/abort-controller": "3.226.0", - "@aws-sdk/types": "3.226.0", - "tslib": "^2.3.1" - } - }, - "@aws-sdk/xml-builder": { - "version": "3.201.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/xml-builder/-/xml-builder-3.201.0.tgz", - "integrity": "sha512-brRdB1wwMgjWEnOQsv7zSUhIQuh7DEicrfslAqHop4S4FtSI3GQAShpQqgOpMTNFYcpaWKmE/Y1MJmNY7xLCnw==", - "requires": { - "tslib": "^2.3.1" - } - }, - "@babel/code-frame": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.18.6.tgz", - "integrity": "sha512-TDCmlK5eOvH+eH7cdAFlNXeVJqWIQ7gW9tY1GJIpUtFb6CmjVyq2VM3u71bOyR8CRihcCgMUYoDNyLXao3+70Q==", - "requires": { - "@babel/highlight": "^7.18.6" - } - }, - "@babel/compat-data": { - "version": "7.20.10", - "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.20.10.tgz", - "integrity": "sha512-sEnuDPpOJR/fcafHMjpcpGN5M2jbUGUHwmuWKM/YdPzeEDJg8bgmbcWQFUfE32MQjti1koACvoPVsDe8Uq+idg==" - }, - "@babel/core": { - "version": "7.20.12", - "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.20.12.tgz", - "integrity": "sha512-XsMfHovsUYHFMdrIHkZphTN/2Hzzi78R08NuHfDBehym2VsPDL6Zn/JAD/JQdnRvbSsbQc4mVaU1m6JgtTEElg==", - "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", - "convert-source-map": "^1.7.0", - "debug": "^4.1.0", - "gensync": "^1.0.0-beta.2", - "json5": "^2.2.2", - "semver": "^6.3.0" - }, - "dependencies": { - "semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==" - } - } - }, - "@babel/generator": { - "version": "7.20.7", - "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.20.7.tgz", - "integrity": "sha512-7wqMOJq8doJMZmP4ApXTzLxSr7+oO2jroJURrVEp6XShrQUObV8Tq/D0NCcoYg2uHqUrjzO0zwBjoYzelxK+sw==", - "requires": { - "@babel/types": "^7.20.7", - "@jridgewell/gen-mapping": "^0.3.2", - "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==", - "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==", - "requires": { - "@babel/types": "^7.18.6" - } - }, - "@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==", - "dev": true, - "requires": { - "@babel/helper-explode-assignable-expression": "^7.18.6", - "@babel/types": "^7.18.9" - } - }, - "@babel/helper-compilation-targets": { - "version": "7.20.7", - "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.20.7.tgz", - "integrity": "sha512-4tGORmfQcrc+bvrjb5y3dG9Mx1IOZjsHqQVUz7XCNHO+iTmqxWnVg3KRygjGmpRLJGdQSKuvFinbIb0CnZwHAQ==", - "requires": { - "@babel/compat-data": "^7.20.5", - "@babel/helper-validator-option": "^7.18.6", - "browserslist": "^4.21.3", - "lru-cache": "^5.1.1", - "semver": "^6.3.0" - }, - "dependencies": { - "semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==" - } - } - }, - "@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==", - "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" - }, - "dependencies": { - "semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", - "dev": true - } - } - }, - "@babel/helper-environment-visitor": { - "version": "7.18.9", - "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.18.9.tgz", - "integrity": "sha512-3r/aACDJ3fhQ/EVgFy0hpj8oHyHpQc+LPtJoY9SzTThAsStm4Ptegq92vqKoE3vD706ZVFWITnMnxucw+S9Ipg==" - }, - "@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==", - "dev": true, - "requires": { - "@babel/types": "^7.18.6" - } - }, - "@babel/helper-function-name": { - "version": "7.19.0", - "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.19.0.tgz", - "integrity": "sha512-WAwHBINyrpqywkUH0nTnNgI5ina5TFn85HKS0pbPDfxFfhyR/aNQEn4hGi1P1JyT//I0t4OgXUlofzWILRvS5w==", - "requires": { - "@babel/template": "^7.18.10", - "@babel/types": "^7.19.0" - } - }, - "@babel/helper-hoist-variables": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.18.6.tgz", - "integrity": "sha512-UlJQPkFqFULIcyW5sbzgbkxn2FKRgwWiRexcuaR8RNJRy8+LLveqPjwZV/bwrLZCN0eUHD/x8D0heK1ozuoo6Q==", - "requires": { - "@babel/types": "^7.18.6" + "@babel/types": "^7.22.5" } }, "@babel/helper-member-expression-to-functions": { @@ -30328,22 +32297,22 @@ } }, "@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==", "requires": { - "@babel/types": "^7.18.6" + "@babel/types": "^7.22.5" } }, "@babel/helper-string-parser": { - "version": "7.19.4", - "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.19.4.tgz", - "integrity": "sha512-nHtDoQcuqFmwYNYPz3Rah5ph2p8PFeFCsZk9A/48dPc/rGocJ5J3hAAZ7pb76VWX3fZKu+uEr/FhH5jLx7umrw==" + "version": "7.23.4", + "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.23.4.tgz", + "integrity": "sha512-803gmbQdqwdf4olxrX4AJyFBV/RTr3rSmOj0rKwesmzlfhYNDEs+/iOcznzpNWlJlIlTJC2QfPFcHB6DlzdVLQ==" }, "@babel/helper-validator-identifier": { - "version": "7.19.1", - "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.19.1.tgz", - "integrity": "sha512-awrNfaMtnHUr653GgGEs++LlAvW6w+DcPrOliSMXWCKo597CwL5Acf/wWdNkf/tfEQE3mjkeD1YOVZOUV/od1w==" + "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==" }, "@babel/helper-validator-option": { "version": "7.18.6", @@ -30373,19 +32342,19 @@ } }, "@babel/highlight": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.18.6.tgz", - "integrity": "sha512-u7stbOuYjaPezCuLj29hNW1v64M2Md2qupEKP1fHc7WdOA3DgLh37suiSrZYY7haUB7iBeQZ9P1uiRF359do3g==", + "version": "7.23.4", + "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.23.4.tgz", + "integrity": "sha512-acGdbYSfp2WheJoJm/EBBBLh/ID8KDc64ISZ9DYtBmC8/Q204PZJLHyzeB5qMzJ5trcOkybd78M4x2KWsUq++A==", "requires": { - "@babel/helper-validator-identifier": "^7.18.6", - "chalk": "^2.0.0", + "@babel/helper-validator-identifier": "^7.22.20", + "chalk": "^2.4.2", "js-tokens": "^4.0.0" } }, "@babel/parser": { - "version": "7.20.7", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.20.7.tgz", - "integrity": "sha512-T3Z9oHybU+0vZlY9CiDSJQTD5ZapcW18ZctFMi0MOAl/4BjFF4ul7NVSARLdbGO5vDqy9eQiGTV0LtKfvCYvcg==" + "version": "7.24.0", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.24.0.tgz", + "integrity": "sha512-QuP/FxEAzMSjXygs8v4N9dvdXzEHN4W1oF3PxuWAtPo08UdM17u89RDMgjLn/mlc56iM0HlLmVkO/wgR+rDgHg==" }, "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": { "version": "7.18.6", @@ -30988,9 +32957,9 @@ }, "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 } } @@ -31154,9 +33123,9 @@ }, "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 } } @@ -31185,9 +33154,9 @@ } }, "@babel/runtime": { - "version": "7.20.7", - "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.20.7.tgz", - "integrity": "sha512-UF0tvkUtxwAgZ5W/KrkHf0Rn0fdnLDU9ScxBrEVNUprE/MzirjK4MJUX1/BVDv00Sv8cljtukVK1aky++X1SjQ==", + "version": "7.20.13", + "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.20.13.tgz", + "integrity": "sha512-gt3PKXs0DBoL9xCvOIIZ2NEqAGZqHjAnmVbfQtB620V0uReIQutpel14KcneZuer7UioY8ALKZ7iocavvzTNFA==", "dev": true, "requires": { "regenerator-runtime": "^0.13.11" @@ -31204,29 +33173,52 @@ } }, "@babel/traverse": { - "version": "7.20.12", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.20.12.tgz", - "integrity": "sha512-MsIbFN0u+raeja38qboyF8TIT7K0BFzz/Yd/77ta4MsUsmP2RAnidIlwq7d5HFQrH/OZJecGV6B71C4zAgpoSQ==", - "requires": { - "@babel/code-frame": "^7.18.6", - "@babel/generator": "^7.20.7", - "@babel/helper-environment-visitor": "^7.18.9", - "@babel/helper-function-name": "^7.19.0", - "@babel/helper-hoist-variables": "^7.18.6", - "@babel/helper-split-export-declaration": "^7.18.6", - "@babel/parser": "^7.20.7", - "@babel/types": "^7.20.7", - "debug": "^4.1.0", + "version": "7.24.0", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.24.0.tgz", + "integrity": "sha512-HfuJlI8qq3dEDmNU5ChzzpZRWq+oxCZQyMzIMEqLho+AQnhMnKQUzH6ydo3RBl/YjPCuk68Y6s0Gx0AeyULiWw==", + "requires": { + "@babel/code-frame": "^7.23.5", + "@babel/generator": "^7.23.6", + "@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.24.0", + "@babel/types": "^7.24.0", + "debug": "^4.3.1", "globals": "^11.1.0" + }, + "dependencies": { + "@babel/generator": { + "version": "7.23.6", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.23.6.tgz", + "integrity": "sha512-qrSfCYxYQB5owCmGLbl8XRpX1ytXlpueOb0N0UmQwA073KZxejgQTzAmJezxvpwQD9uGtK2shHdi55QT+MbjIw==", + "requires": { + "@babel/types": "^7.23.6", + "@jridgewell/gen-mapping": "^0.3.2", + "@jridgewell/trace-mapping": "^0.3.17", + "jsesc": "^2.5.1" + } + }, + "@jridgewell/gen-mapping": { + "version": "0.3.5", + "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.5.tgz", + "integrity": "sha512-IzL8ZoEDIBRWEzlCcRhOaCupYyN5gdIK+Q6fbFdPDg6HqX6jpkItn7DFIpW9LQzXG6Df9sA7+OKnq0qlz/GaQg==", + "requires": { + "@jridgewell/set-array": "^1.2.1", + "@jridgewell/sourcemap-codec": "^1.4.10", + "@jridgewell/trace-mapping": "^0.3.24" + } + } } }, "@babel/types": { - "version": "7.20.7", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.20.7.tgz", - "integrity": "sha512-69OnhBxSSgK0OzTJai4kyPDiKTIe3j+ctaHdIGVbRahTLAT7L3R9oeXHC2aVSuGYt3cVnoAMDmOCgJ2yaiLMvg==", + "version": "7.24.0", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.24.0.tgz", + "integrity": "sha512-+j7a5c253RfKh8iABBhywc8NSfP5LURe7Uh4qpsh6jc+aLJguvmIUBdjSdEMQv2bENrCR5MfRdjGo7vzS/ob7w==", "requires": { - "@babel/helper-string-parser": "^7.19.4", - "@babel/helper-validator-identifier": "^7.19.1", + "@babel/helper-string-parser": "^7.23.4", + "@babel/helper-validator-identifier": "^7.22.20", "to-fast-properties": "^2.0.0" } }, @@ -31361,9 +33353,9 @@ "requires": {} }, "@cypress/request": { - "version": "2.88.11", - "resolved": "https://registry.npmjs.org/@cypress/request/-/request-2.88.11.tgz", - "integrity": "sha512-M83/wfQ1EkspjkE2lNWNV5ui2Cv7UCv1swW1DqljahbzLVWltcsexQh8jYtuS/vzFXP+HySntGM83ZXA9fn17w==", + "version": "2.88.12", + "resolved": "https://registry.npmjs.org/@cypress/request/-/request-2.88.12.tgz", + "integrity": "sha512-tOn+0mDZxASFM+cuAP9szGUGPI1HwWVSvdzm7V4cCsPdFTx6qMj29CwaQmRAMIEhORIUBFBsYROYJcveK4uOjA==", "devOptional": true, "requires": { "aws-sign2": "~0.7.0", @@ -31381,7 +33373,7 @@ "performance-now": "^2.1.0", "qs": "~6.10.3", "safe-buffer": "^5.1.2", - "tough-cookie": "~2.5.0", + "tough-cookie": "^4.1.3", "tunnel-agent": "^0.6.0", "uuid": "^8.3.2" }, @@ -31456,132 +33448,154 @@ "version": "0.16.17", "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.16.17.tgz", "integrity": "sha512-N9x1CMXVhtWEAMS7pNNONyA14f71VPQN9Cnavj1XQh6T7bskqiLLrSca4O0Vr8Wdcga943eThxnVp3JLnBMYtw==", + "dev": true, "optional": true }, "@esbuild/android-arm64": { "version": "0.16.17", "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.16.17.tgz", "integrity": "sha512-MIGl6p5sc3RDTLLkYL1MyL8BMRN4tLMRCn+yRJJmEDvYZ2M7tmAf80hx1kbNEUX2KJ50RRtxZ4JHLvCfuB6kBg==", + "dev": true, "optional": true }, "@esbuild/android-x64": { "version": "0.16.17", "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.16.17.tgz", "integrity": "sha512-a3kTv3m0Ghh4z1DaFEuEDfz3OLONKuFvI4Xqczqx4BqLyuFaFkuaG4j2MtA6fuWEFeC5x9IvqnX7drmRq/fyAQ==", + "dev": true, "optional": true }, "@esbuild/darwin-arm64": { "version": "0.16.17", "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.16.17.tgz", "integrity": "sha512-/2agbUEfmxWHi9ARTX6OQ/KgXnOWfsNlTeLcoV7HSuSTv63E4DqtAc+2XqGw1KHxKMHGZgbVCZge7HXWX9Vn+w==", + "dev": true, "optional": true }, "@esbuild/darwin-x64": { "version": "0.16.17", "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.16.17.tgz", "integrity": "sha512-2By45OBHulkd9Svy5IOCZt376Aa2oOkiE9QWUK9fe6Tb+WDr8hXL3dpqi+DeLiMed8tVXspzsTAvd0jUl96wmg==", + "dev": true, "optional": true }, "@esbuild/freebsd-arm64": { "version": "0.16.17", "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.16.17.tgz", "integrity": "sha512-mt+cxZe1tVx489VTb4mBAOo2aKSnJ33L9fr25JXpqQqzbUIw/yzIzi+NHwAXK2qYV1lEFp4OoVeThGjUbmWmdw==", + "dev": true, "optional": true }, "@esbuild/freebsd-x64": { "version": "0.16.17", "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.16.17.tgz", "integrity": "sha512-8ScTdNJl5idAKjH8zGAsN7RuWcyHG3BAvMNpKOBaqqR7EbUhhVHOqXRdL7oZvz8WNHL2pr5+eIT5c65kA6NHug==", + "dev": true, "optional": true }, "@esbuild/linux-arm": { "version": "0.16.17", "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.16.17.tgz", "integrity": "sha512-iihzrWbD4gIT7j3caMzKb/RsFFHCwqqbrbH9SqUSRrdXkXaygSZCZg1FybsZz57Ju7N/SHEgPyaR0LZ8Zbe9gQ==", + "dev": true, "optional": true }, "@esbuild/linux-arm64": { "version": "0.16.17", "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.16.17.tgz", "integrity": "sha512-7S8gJnSlqKGVJunnMCrXHU9Q8Q/tQIxk/xL8BqAP64wchPCTzuM6W3Ra8cIa1HIflAvDnNOt2jaL17vaW+1V0g==", + "dev": true, "optional": true }, "@esbuild/linux-ia32": { "version": "0.16.17", "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.16.17.tgz", "integrity": "sha512-kiX69+wcPAdgl3Lonh1VI7MBr16nktEvOfViszBSxygRQqSpzv7BffMKRPMFwzeJGPxcio0pdD3kYQGpqQ2SSg==", + "dev": true, "optional": true }, "@esbuild/linux-loong64": { "version": "0.16.17", "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.16.17.tgz", "integrity": "sha512-dTzNnQwembNDhd654cA4QhbS9uDdXC3TKqMJjgOWsC0yNCbpzfWoXdZvp0mY7HU6nzk5E0zpRGGx3qoQg8T2DQ==", + "dev": true, "optional": true }, "@esbuild/linux-mips64el": { "version": "0.16.17", "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.16.17.tgz", "integrity": "sha512-ezbDkp2nDl0PfIUn0CsQ30kxfcLTlcx4Foz2kYv8qdC6ia2oX5Q3E/8m6lq84Dj/6b0FrkgD582fJMIfHhJfSw==", + "dev": true, "optional": true }, "@esbuild/linux-ppc64": { "version": "0.16.17", "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.16.17.tgz", "integrity": "sha512-dzS678gYD1lJsW73zrFhDApLVdM3cUF2MvAa1D8K8KtcSKdLBPP4zZSLy6LFZ0jYqQdQ29bjAHJDgz0rVbLB3g==", + "dev": true, "optional": true }, "@esbuild/linux-riscv64": { "version": "0.16.17", "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.16.17.tgz", "integrity": "sha512-ylNlVsxuFjZK8DQtNUwiMskh6nT0vI7kYl/4fZgV1llP5d6+HIeL/vmmm3jpuoo8+NuXjQVZxmKuhDApK0/cKw==", + "dev": true, "optional": true }, "@esbuild/linux-s390x": { "version": "0.16.17", "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.16.17.tgz", "integrity": "sha512-gzy7nUTO4UA4oZ2wAMXPNBGTzZFP7mss3aKR2hH+/4UUkCOyqmjXiKpzGrY2TlEUhbbejzXVKKGazYcQTZWA/w==", + "dev": true, "optional": true }, "@esbuild/linux-x64": { "version": "0.16.17", "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.16.17.tgz", "integrity": "sha512-mdPjPxfnmoqhgpiEArqi4egmBAMYvaObgn4poorpUaqmvzzbvqbowRllQ+ZgzGVMGKaPkqUmPDOOFQRUFDmeUw==", + "dev": true, "optional": true }, "@esbuild/netbsd-x64": { "version": "0.16.17", "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.16.17.tgz", "integrity": "sha512-/PzmzD/zyAeTUsduZa32bn0ORug+Jd1EGGAUJvqfeixoEISYpGnAezN6lnJoskauoai0Jrs+XSyvDhppCPoKOA==", + "dev": true, "optional": true }, "@esbuild/openbsd-x64": { "version": "0.16.17", "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.16.17.tgz", "integrity": "sha512-2yaWJhvxGEz2RiftSk0UObqJa/b+rIAjnODJgv2GbGGpRwAfpgzyrg1WLK8rqA24mfZa9GvpjLcBBg8JHkoodg==", + "dev": true, "optional": true }, "@esbuild/sunos-x64": { "version": "0.16.17", "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.16.17.tgz", "integrity": "sha512-xtVUiev38tN0R3g8VhRfN7Zl42YCJvyBhRKw1RJjwE1d2emWTVToPLNEQj/5Qxc6lVFATDiy6LjVHYhIPrLxzw==", + "dev": true, "optional": true }, "@esbuild/win32-arm64": { "version": "0.16.17", "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.16.17.tgz", "integrity": "sha512-ga8+JqBDHY4b6fQAmOgtJJue36scANy4l/rL97W+0wYmijhxKetzZdKOJI7olaBaMhWt8Pac2McJdZLxXWUEQw==", + "dev": true, "optional": true }, "@esbuild/win32-ia32": { "version": "0.16.17", "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.16.17.tgz", "integrity": "sha512-WnsKaf46uSSF/sZhwnqE4L/F89AYNMiD4YtEcYekBt9Q7nj0DiId2XH2Ng2PHM54qi5oPrQ8luuzGszqi/veig==", + "dev": true, "optional": true }, "@esbuild/win32-x64": { "version": "0.16.17", "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.16.17.tgz", "integrity": "sha512-y+EHuSchhL7FjHgvQL/0fnnFmO4T1bhvWANX6gcnqTjtnKWbTvUMCpGnv2+t+31d7RzyEAYAd4u2fnIhHL6N/Q==", + "dev": true, "optional": true }, "@eslint/eslintrc": { @@ -31660,6 +33674,17 @@ } } }, + "@faker-js/faker": { + "version": "8.4.1", + "resolved": "https://registry.npmjs.org/@faker-js/faker/-/faker-8.4.1.tgz", + "integrity": "sha512-XQ3cU+Q8Uqmrbf2e0cIC/QN43sTBSC8KF12u29Mb47tWrt2hAgBXSgpZMj4Ao8Uk0iJcU99QsOCaIL8934obCg==", + "dev": true + }, + "@fastify/busboy": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/@fastify/busboy/-/busboy-2.1.1.tgz", + "integrity": "sha512-vBZP4NlzfOlerQTnba4aqZoMhE/a9HY7HRqoOPaETQcSQuWEIyZMHGfVu6w9wGtGK5fED5qRs2DteVCjOH60sA==" + }, "@floating-ui/core": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/@floating-ui/core/-/core-1.1.0.tgz", @@ -32464,9 +34489,9 @@ "integrity": "sha512-F2msla3tad+Mfht5cJq7LSXcdudKTWCVYUgw6pLFOOHSTtZlj6SWNYAp+AhuqLmWdBO2X5hPrLcu8cVP8fy28w==" }, "@jridgewell/set-array": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.1.2.tgz", - "integrity": "sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw==" + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.2.1.tgz", + "integrity": "sha512-R8gLRTZeyp03ymzP/6Lil/28tGeGEzhx1q2k703KGWRAI1VdvPIXdG70VJc2pAMw3NA6JKL5hhFu1sJX0Mnn/A==" }, "@jridgewell/source-map": { "version": "0.3.2", @@ -32495,12 +34520,12 @@ "integrity": "sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw==" }, "@jridgewell/trace-mapping": { - "version": "0.3.17", - "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.17.tgz", - "integrity": "sha512-MCNzAp77qzKca9+W/+I0+sEpaUnZoeasnghNeVc41VZCEKaCH73Vq3BZZ/SzWIgrqE4H4ceI+p+b6C0mHf9T4g==", + "version": "0.3.25", + "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.25.tgz", + "integrity": "sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ==", "requires": { - "@jridgewell/resolve-uri": "3.1.0", - "@jridgewell/sourcemap-codec": "1.4.14" + "@jridgewell/resolve-uri": "^3.1.0", + "@jridgewell/sourcemap-codec": "^1.4.14" } }, "@kobalte/core": { @@ -33414,6 +35439,12 @@ "integrity": "sha512-F6oceoQLEn031uun8NiommeMkRIojQqVryxQy/mK7fx0CI0KbgkJL3SloCQcsOD+agoEnqKJKXZpEvL6FNswJg==", "requires": {} }, + "@nestjs/cache-manager": { + "version": "2.2.2", + "resolved": "https://registry.npmjs.org/@nestjs/cache-manager/-/cache-manager-2.2.2.tgz", + "integrity": "sha512-+n7rpU1QABeW2WV17Dl1vZCG3vWjJU1MaamWgZvbGxYE9EeCM0lVLfw3z7acgDTNwOy+K68xuQPoIMxD0bhjlA==", + "requires": {} + }, "@nestjs/common": { "version": "9.2.1", "resolved": "https://registry.npmjs.org/@nestjs/common/-/common-9.2.1.tgz", @@ -33607,9 +35638,9 @@ } }, "@ngtools/webpack": { - "version": "15.1.1", - "resolved": "https://registry.npmjs.org/@ngtools/webpack/-/webpack-15.1.1.tgz", - "integrity": "sha512-pHkVE4IfIGcrIqxxrBQJV62GBqXF+LU4sPY5MLNWIfKSctW6AdTVoO9ilx8pclaFJkMLkPMbrmfGosYw47L+lg==", + "version": "15.2.10", + "resolved": "https://registry.npmjs.org/@ngtools/webpack/-/webpack-15.2.10.tgz", + "integrity": "sha512-ZExB4rKh/Saad31O/Ofd2XvRuILuCNTYs0+qJL697Be2pzeewvzBhE4Xe1Mm7Jg13aWSPeuIdzSGOqCdwxxxFQ==", "dev": true, "requires": {} }, @@ -34509,9 +36540,9 @@ } }, "semver": { - "version": "5.7.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", - "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==", + "version": "5.7.2", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz", + "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==", "optional": true }, "tslib": { @@ -34823,283 +36854,1141 @@ } } }, - "@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==", + "@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==", + "requires": { + "node-addon-api": "^3.2.1", + "node-gyp-build": "^4.3.0" + } + }, + "@petamoriken/float16": { + "version": "3.7.1", + "resolved": "https://registry.npmjs.org/@petamoriken/float16/-/float16-3.7.1.tgz", + "integrity": "sha512-oXZOc+aePd0FnhTWk15pyqK+Do87n0TyLV1nxdEougE95X/WXWDqmQobfhgnSY7QsWn5euZUWuDVeTQvoQ5VNw==" + }, + "@phenomnomnominal/tsquery": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/@phenomnomnominal/tsquery/-/tsquery-4.1.1.tgz", + "integrity": "sha512-jjMmK1tnZbm1Jq5a7fBliM4gQwjxMU7TFoRNwIyzwlO+eHPRCFv/Nv+H/Gi1jc3WR7QURG8D5d0Tn12YGrUqBQ==", + "requires": { + "esquery": "^1.0.1" + } + }, + "@polka/url": { + "version": "1.0.0-next.21", + "resolved": "https://registry.npmjs.org/@polka/url/-/url-1.0.0-next.21.tgz", + "integrity": "sha512-a5Sab1C4/icpTZVzZc5Ghpz88yQtGOyNqYXcZgOssB2uuAr+wF/MvN6bgtW32q7HHrvBki+BsZ0OuNv6EV3K9g==", + "dev": true + }, + "@prisma/client": { + "version": "4.12.0", + "resolved": "https://registry.npmjs.org/@prisma/client/-/client-4.12.0.tgz", + "integrity": "sha512-j9/ighfWwux97J2dS15nqhl60tYoH8V0IuSsgZDb6bCFcQD3fXbXmxjYC8GHhIgOk3lB7Pq+8CwElz2MiDpsSg==", + "requires": { + "@prisma/engines-version": "4.12.0-67.659ef412370fa3b41cd7bf6e94587c1dfb7f67e7" + } + }, + "@prisma/engines": { + "version": "4.12.0", + "resolved": "https://registry.npmjs.org/@prisma/engines/-/engines-4.12.0.tgz", + "integrity": "sha512-0alKtnxhNB5hYU+ymESBlGI4b9XrGGSdv7Ud+8TE/fBNOEhIud0XQsAR+TrvUZgS4na5czubiMsODw0TUrgkIA==" + }, + "@prisma/engines-version": { + "version": "4.12.0-67.659ef412370fa3b41cd7bf6e94587c1dfb7f67e7", + "resolved": "https://registry.npmjs.org/@prisma/engines-version/-/engines-version-4.12.0-67.659ef412370fa3b41cd7bf6e94587c1dfb7f67e7.tgz", + "integrity": "sha512-JIHNj5jlXb9mcaJwakM0vpgRYJIAurxTUqM0iX0tfEQA5XLZ9ONkIckkhuAKdAzocZ+80GYg7QSsfpjg7OxbOA==" + }, + "@prisma/prisma-fmt-wasm": { + "version": "4.8.0-62.351fb726ff78e50c7d6db6331d66d4db0e378c53", + "resolved": "https://registry.npmjs.org/@prisma/prisma-fmt-wasm/-/prisma-fmt-wasm-4.8.0-62.351fb726ff78e50c7d6db6331d66d4db0e378c53.tgz", + "integrity": "sha512-OISxCNdlZ02u2NwQt99pQqpW+8elKaV0HNszJ6QVEZJZJNjnTmYIjSWycVWt+Ul3m1V0DWY4OEKCxwjpqwnjcQ==", + "dev": true + }, + "@rollup/plugin-json": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/@rollup/plugin-json/-/plugin-json-6.0.0.tgz", + "integrity": "sha512-i/4C5Jrdr1XUarRhVu27EEwjt4GObltD7c+MkCIpO2QIbojw8MUs+CCTqOphQi3Qtg1FLmYt+l+6YeoIf51J7w==", + "dev": true, + "requires": { + "@rollup/pluginutils": "^5.0.1" + } + }, + "@rollup/plugin-node-resolve": { + "version": "15.0.1", + "resolved": "https://registry.npmjs.org/@rollup/plugin-node-resolve/-/plugin-node-resolve-15.0.1.tgz", + "integrity": "sha512-ReY88T7JhJjeRVbfCyNj+NXAG3IIsVMsX9b5/9jC98dRP8/yxlZdz7mHZbHk5zHr24wZZICS5AcXsFZAXYUQEg==", + "dev": true, + "requires": { + "@rollup/pluginutils": "^5.0.1", + "@types/resolve": "1.20.2", + "deepmerge": "^4.2.2", + "is-builtin-module": "^3.2.0", + "is-module": "^1.0.0", + "resolve": "^1.22.1" + } + }, + "@rollup/pluginutils": { + "version": "5.0.2", + "resolved": "https://registry.npmjs.org/@rollup/pluginutils/-/pluginutils-5.0.2.tgz", + "integrity": "sha512-pTd9rIsP92h+B6wWwFbW8RkZv4hiR/xKsqre4SIuAOaOEQRxi0lqLke9k2/7WegC85GgUs9pjmOjCUi3In4vwA==", + "dev": true, + "requires": { + "@types/estree": "^1.0.0", + "estree-walker": "^2.0.2", + "picomatch": "^2.3.1" + } + }, + "@rushstack/node-core-library": { + "version": "3.53.3", + "resolved": "https://registry.npmjs.org/@rushstack/node-core-library/-/node-core-library-3.53.3.tgz", + "integrity": "sha512-H0+T5koi5MFhJUd5ND3dI3bwLhvlABetARl78L3lWftJVQEPyzcgTStvTTRiIM5mCltyTM8VYm6BuCtNUuxD0Q==", + "dev": true, + "requires": { + "@types/node": "12.20.24", + "colors": "~1.2.1", + "fs-extra": "~7.0.1", + "import-lazy": "~4.0.0", + "jju": "~1.4.0", + "resolve": "~1.17.0", + "semver": "~7.3.0", + "z-schema": "~5.0.2" + }, + "dependencies": { + "@types/node": { + "version": "12.20.24", + "resolved": "https://registry.npmjs.org/@types/node/-/node-12.20.24.tgz", + "integrity": "sha512-yxDeaQIAJlMav7fH5AQqPH1u8YIuhYJXYBzxaQ4PifsU0GDO38MSdmEDeRlIxrKbC6NbEaaEHDanWb+y30U8SQ==", + "dev": true + }, + "fs-extra": { + "version": "7.0.1", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-7.0.1.tgz", + "integrity": "sha512-YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw==", + "dev": true, + "requires": { + "graceful-fs": "^4.1.2", + "jsonfile": "^4.0.0", + "universalify": "^0.1.0" + } + }, + "jsonfile": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz", + "integrity": "sha512-m6F1R3z8jjlf2imQHS2Qez5sjKWQzbuuhuJ/FKYFRZvPE3PuHcSMVZzfsLhGVOkfd20obL5SWEBew5ShlquNxg==", + "dev": true, + "requires": { + "graceful-fs": "^4.1.6" + } + }, + "resolve": { + "version": "1.17.0", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.17.0.tgz", + "integrity": "sha512-ic+7JYiV8Vi2yzQGFWOkiZD5Z9z7O2Zhm9XMaTxdJExKasieFCr+yXZ/WmXsckHiKl12ar0y6XiXDx3m4RHn1w==", + "dev": true, + "requires": { + "path-parse": "^1.0.6" + } + }, + "universalify": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz", + "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==", + "dev": true + } + } + }, + "@rushstack/rig-package": { + "version": "0.3.17", + "resolved": "https://registry.npmjs.org/@rushstack/rig-package/-/rig-package-0.3.17.tgz", + "integrity": "sha512-nxvAGeIMnHl1LlZSQmacgcRV4y1EYtgcDIrw6KkeVjudOMonlxO482PhDj3LVZEp6L7emSf6YSO2s5JkHlwfZA==", + "dev": true, + "requires": { + "resolve": "~1.17.0", + "strip-json-comments": "~3.1.1" + }, + "dependencies": { + "resolve": { + "version": "1.17.0", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.17.0.tgz", + "integrity": "sha512-ic+7JYiV8Vi2yzQGFWOkiZD5Z9z7O2Zhm9XMaTxdJExKasieFCr+yXZ/WmXsckHiKl12ar0y6XiXDx3m4RHn1w==", + "dev": true, + "requires": { + "path-parse": "^1.0.6" + } + } + } + }, + "@rushstack/ts-command-line": { + "version": "4.13.1", + "resolved": "https://registry.npmjs.org/@rushstack/ts-command-line/-/ts-command-line-4.13.1.tgz", + "integrity": "sha512-UTQMRyy/jH1IS2U+6pyzyn9xQ2iMcoUKkTcZUzOP/aaMiKlWLwCTDiBVwhw/M1crDx6apF9CwyjuWO9r1SBdJQ==", + "dev": true, + "requires": { + "@types/argparse": "1.0.38", + "argparse": "~1.0.9", + "colors": "~1.2.1", + "string-argv": "~0.3.1" + } + }, + "@rx-angular/cdk": { + "version": "1.0.0-rc.4", + "resolved": "https://registry.npmjs.org/@rx-angular/cdk/-/cdk-1.0.0-rc.4.tgz", + "integrity": "sha512-uFl6vCTcPf52Y0mfYxGwSkl6d/wDjCI33iXM8/J0VblGitNsiVdjxGWAbleh2eLlIVZOyYTuvi3N4sA9wwymRw==", + "requires": { + "ng-morph": "^2.1.1", + "tslib": "^2.4.1" + } + }, + "@rx-angular/state": { + "version": "1.7.0", + "resolved": "https://registry.npmjs.org/@rx-angular/state/-/state-1.7.0.tgz", + "integrity": "sha512-rrM5qlI6lDsSbTVo+uBoGpOuZ//msi2q72WYvw1MESPDrb9TnOLtVceDaYL0FBMDBhcqtmUsdOs6OoICaroSew==", + "requires": { + "ng-morph": "^2.0.0", + "tslib": "^2.0.0" + } + }, + "@rx-angular/template": { + "version": "1.0.0-rc.5", + "resolved": "https://registry.npmjs.org/@rx-angular/template/-/template-1.0.0-rc.5.tgz", + "integrity": "sha512-ldL3obon1IkmZi2M+/rcwYAcNP9xGY787Ssj8SiPKdmxTJOaCn8pRxE9ss4sLg6NJrIku4/7jVPfKFKJKol9LA==", + "requires": { + "ng-morph": "^2.1.1", + "tslib": "^2.4.1" + } + }, + "@schematics/angular": { + "version": "15.0.5", + "resolved": "https://registry.npmjs.org/@schematics/angular/-/angular-15.0.5.tgz", + "integrity": "sha512-lmns1eJM42RFlv1GPrNwe7TV70hyrIiadyPhuJmeT8qp8cxGPRJ3yHFUdtB7qPv0OkwfI/HVSeZwlnfNXQhiQg==", + "dev": true, + "requires": { + "@angular-devkit/core": "15.0.5", + "@angular-devkit/schematics": "15.0.5", + "jsonc-parser": "3.2.0" + }, + "dependencies": { + "@angular-devkit/core": { + "version": "15.0.5", + "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-15.0.5.tgz", + "integrity": "sha512-SxLvbpqcQfb1qRykZjqRUG/8uC1FYpneyNV9S9YglXg4JhCFhfc9AnKxuu9Bm/O8V7FghOIlGWGglCdPHra0pw==", + "dev": true, + "requires": { + "ajv": "8.11.0", + "ajv-formats": "2.1.1", + "jsonc-parser": "3.2.0", + "rxjs": "6.6.7", + "source-map": "0.7.4" + } + }, + "ajv": { + "version": "8.11.0", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.11.0.tgz", + "integrity": "sha512-wGgprdCvMalC0BztXvitD2hC04YffAvtsUn93JbGXYLAtCUO4xd17mCCZQxUOItiBwZvJScWo8NIvQMQ71rdpg==", + "dev": true, + "requires": { + "fast-deep-equal": "^3.1.1", + "json-schema-traverse": "^1.0.0", + "require-from-string": "^2.0.2", + "uri-js": "^4.2.2" + } + }, + "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 + } + } + }, + "@sinclair/typebox": { + "version": "0.24.51", + "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.24.51.tgz", + "integrity": "sha512-1P1OROm/rdubP5aFDSZQILU0vrLCJ4fvHt6EoqHEM+2D/G5MK3bIaymUKLit8Js9gbns5UyJnkP/TZROLw4tUA==" + }, + "@sinonjs/commons": { + "version": "1.8.6", + "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-1.8.6.tgz", + "integrity": "sha512-Ky+XkAkqPZSm3NLBeUng77EBQl3cmeJhITaGHdYH8kjVB+aun3S4XBRti2zt17mtt0mIUDiNxYeoJm6drVvBJQ==", + "requires": { + "type-detect": "4.0.8" + } + }, + "@sinonjs/fake-timers": { + "version": "9.1.2", + "resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-9.1.2.tgz", + "integrity": "sha512-BPS4ynJW/o92PUR4wgriz2Ud5gpST5vz6GQfMixEDK0Z8ZCUv2M7SkBLykH56T++Xs+8ln9zTGbOvNGIe02/jw==", + "requires": { + "@sinonjs/commons": "^1.7.0" + } + }, + "@smithy/abort-controller": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/@smithy/abort-controller/-/abort-controller-2.2.0.tgz", + "integrity": "sha512-wRlta7GuLWpTqtFfGo+nZyOO1vEvewdNR1R4rTxpC8XU6vG/NDyrFBhwLZsqg1NUoR1noVaXJPC/7ZK47QCySw==", + "requires": { + "@smithy/types": "^2.12.0", + "tslib": "^2.6.2" + }, + "dependencies": { + "tslib": { + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz", + "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==" + } + } + }, + "@smithy/chunked-blob-reader": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/@smithy/chunked-blob-reader/-/chunked-blob-reader-2.2.0.tgz", + "integrity": "sha512-3GJNvRwXBGdkDZZOGiziVYzDpn4j6zfyULHMDKAGIUo72yHALpE9CbhfQp/XcLNVoc1byfMpn6uW5H2BqPjgaQ==", + "requires": { + "tslib": "^2.6.2" + }, + "dependencies": { + "tslib": { + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz", + "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==" + } + } + }, + "@smithy/chunked-blob-reader-native": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/@smithy/chunked-blob-reader-native/-/chunked-blob-reader-native-2.2.0.tgz", + "integrity": "sha512-VNB5+1oCgX3Fzs072yuRsUoC2N4Zg/LJ11DTxX3+Qu+Paa6AmbIF0E9sc2wthz9Psrk/zcOlTCyuposlIhPjZQ==", + "requires": { + "@smithy/util-base64": "^2.3.0", + "tslib": "^2.6.2" + }, + "dependencies": { + "tslib": { + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz", + "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==" + } + } + }, + "@smithy/config-resolver": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/@smithy/config-resolver/-/config-resolver-2.2.0.tgz", + "integrity": "sha512-fsiMgd8toyUba6n1WRmr+qACzXltpdDkPTAaDqc8QqPBUzO+/JKwL6bUBseHVi8tu9l+3JOK+tSf7cay+4B3LA==", + "requires": { + "@smithy/node-config-provider": "^2.3.0", + "@smithy/types": "^2.12.0", + "@smithy/util-config-provider": "^2.3.0", + "@smithy/util-middleware": "^2.2.0", + "tslib": "^2.6.2" + }, + "dependencies": { + "tslib": { + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz", + "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==" + } + } + }, + "@smithy/core": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/@smithy/core/-/core-1.4.0.tgz", + "integrity": "sha512-uu9ZDI95Uij4qk+L6kyFjdk11zqBkcJ3Lv0sc6jZrqHvLyr0+oeekD3CnqMafBn/5PRI6uv6ulW3kNLRBUHeVw==", + "requires": { + "@smithy/middleware-endpoint": "^2.5.0", + "@smithy/middleware-retry": "^2.2.0", + "@smithy/middleware-serde": "^2.3.0", + "@smithy/protocol-http": "^3.3.0", + "@smithy/smithy-client": "^2.5.0", + "@smithy/types": "^2.12.0", + "@smithy/util-middleware": "^2.2.0", + "tslib": "^2.6.2" + }, + "dependencies": { + "tslib": { + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz", + "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==" + } + } + }, + "@smithy/credential-provider-imds": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/@smithy/credential-provider-imds/-/credential-provider-imds-2.3.0.tgz", + "integrity": "sha512-BWB9mIukO1wjEOo1Ojgl6LrG4avcaC7T/ZP6ptmAaW4xluhSIPZhY+/PI5YKzlk+jsm+4sQZB45Bt1OfMeQa3w==", + "requires": { + "@smithy/node-config-provider": "^2.3.0", + "@smithy/property-provider": "^2.2.0", + "@smithy/types": "^2.12.0", + "@smithy/url-parser": "^2.2.0", + "tslib": "^2.6.2" + }, + "dependencies": { + "tslib": { + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz", + "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==" + } + } + }, + "@smithy/eventstream-codec": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/@smithy/eventstream-codec/-/eventstream-codec-2.2.0.tgz", + "integrity": "sha512-8janZoJw85nJmQZc4L8TuePp2pk1nxLgkxIR0TUjKJ5Dkj5oelB9WtiSSGXCQvNsJl0VSTvK/2ueMXxvpa9GVw==", + "requires": { + "@aws-crypto/crc32": "3.0.0", + "@smithy/types": "^2.12.0", + "@smithy/util-hex-encoding": "^2.2.0", + "tslib": "^2.6.2" + }, + "dependencies": { + "tslib": { + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz", + "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==" + } + } + }, + "@smithy/eventstream-serde-browser": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/@smithy/eventstream-serde-browser/-/eventstream-serde-browser-2.2.0.tgz", + "integrity": "sha512-UaPf8jKbcP71BGiO0CdeLmlg+RhWnlN8ipsMSdwvqBFigl5nil3rHOI/5GE3tfiuX8LvY5Z9N0meuU7Rab7jWw==", + "requires": { + "@smithy/eventstream-serde-universal": "^2.2.0", + "@smithy/types": "^2.12.0", + "tslib": "^2.6.2" + }, + "dependencies": { + "tslib": { + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz", + "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==" + } + } + }, + "@smithy/eventstream-serde-config-resolver": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/@smithy/eventstream-serde-config-resolver/-/eventstream-serde-config-resolver-2.2.0.tgz", + "integrity": "sha512-RHhbTw/JW3+r8QQH7PrganjNCiuiEZmpi6fYUAetFfPLfZ6EkiA08uN3EFfcyKubXQxOwTeJRZSQmDDCdUshaA==", + "requires": { + "@smithy/types": "^2.12.0", + "tslib": "^2.6.2" + }, + "dependencies": { + "tslib": { + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz", + "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==" + } + } + }, + "@smithy/eventstream-serde-node": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/@smithy/eventstream-serde-node/-/eventstream-serde-node-2.2.0.tgz", + "integrity": "sha512-zpQMtJVqCUMn+pCSFcl9K/RPNtQE0NuMh8sKpCdEHafhwRsjP50Oq/4kMmvxSRy6d8Jslqd8BLvDngrUtmN9iA==", + "requires": { + "@smithy/eventstream-serde-universal": "^2.2.0", + "@smithy/types": "^2.12.0", + "tslib": "^2.6.2" + }, + "dependencies": { + "tslib": { + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz", + "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==" + } + } + }, + "@smithy/eventstream-serde-universal": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/@smithy/eventstream-serde-universal/-/eventstream-serde-universal-2.2.0.tgz", + "integrity": "sha512-pvoe/vvJY0mOpuF84BEtyZoYfbehiFj8KKWk1ds2AT0mTLYFVs+7sBJZmioOFdBXKd48lfrx1vumdPdmGlCLxA==", + "requires": { + "@smithy/eventstream-codec": "^2.2.0", + "@smithy/types": "^2.12.0", + "tslib": "^2.6.2" + }, + "dependencies": { + "tslib": { + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz", + "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==" + } + } + }, + "@smithy/fetch-http-handler": { + "version": "2.5.0", + "resolved": "https://registry.npmjs.org/@smithy/fetch-http-handler/-/fetch-http-handler-2.5.0.tgz", + "integrity": "sha512-BOWEBeppWhLn/no/JxUL/ghTfANTjT7kg3Ww2rPqTUY9R4yHPXxJ9JhMe3Z03LN3aPwiwlpDIUcVw1xDyHqEhw==", + "requires": { + "@smithy/protocol-http": "^3.3.0", + "@smithy/querystring-builder": "^2.2.0", + "@smithy/types": "^2.12.0", + "@smithy/util-base64": "^2.3.0", + "tslib": "^2.6.2" + }, + "dependencies": { + "tslib": { + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz", + "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==" + } + } + }, + "@smithy/hash-blob-browser": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/@smithy/hash-blob-browser/-/hash-blob-browser-2.2.0.tgz", + "integrity": "sha512-SGPoVH8mdXBqrkVCJ1Hd1X7vh1zDXojNN1yZyZTZsCno99hVue9+IYzWDjq/EQDDXxmITB0gBmuyPh8oAZSTcg==", + "requires": { + "@smithy/chunked-blob-reader": "^2.2.0", + "@smithy/chunked-blob-reader-native": "^2.2.0", + "@smithy/types": "^2.12.0", + "tslib": "^2.6.2" + }, + "dependencies": { + "tslib": { + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz", + "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==" + } + } + }, + "@smithy/hash-node": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/@smithy/hash-node/-/hash-node-2.2.0.tgz", + "integrity": "sha512-zLWaC/5aWpMrHKpoDF6nqpNtBhlAYKF/7+9yMN7GpdR8CzohnWfGtMznPybnwSS8saaXBMxIGwJqR4HmRp6b3g==", + "requires": { + "@smithy/types": "^2.12.0", + "@smithy/util-buffer-from": "^2.2.0", + "@smithy/util-utf8": "^2.3.0", + "tslib": "^2.6.2" + }, + "dependencies": { + "tslib": { + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz", + "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==" + } + } + }, + "@smithy/hash-stream-node": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/@smithy/hash-stream-node/-/hash-stream-node-2.2.0.tgz", + "integrity": "sha512-aT+HCATOSRMGpPI7bi7NSsTNVZE/La9IaxLXWoVAYMxHT5hGO3ZOGEMZQg8A6nNL+pdFGtZQtND1eoY084HgHQ==", + "requires": { + "@smithy/types": "^2.12.0", + "@smithy/util-utf8": "^2.3.0", + "tslib": "^2.6.2" + }, + "dependencies": { + "tslib": { + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz", + "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==" + } + } + }, + "@smithy/invalid-dependency": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/@smithy/invalid-dependency/-/invalid-dependency-2.2.0.tgz", + "integrity": "sha512-nEDASdbKFKPXN2O6lOlTgrEEOO9NHIeO+HVvZnkqc8h5U9g3BIhWsvzFo+UcUbliMHvKNPD/zVxDrkP1Sbgp8Q==", + "requires": { + "@smithy/types": "^2.12.0", + "tslib": "^2.6.2" + }, + "dependencies": { + "tslib": { + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz", + "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==" + } + } + }, + "@smithy/is-array-buffer": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/@smithy/is-array-buffer/-/is-array-buffer-2.2.0.tgz", + "integrity": "sha512-GGP3O9QFD24uGeAXYUjwSTXARoqpZykHadOmA8G5vfJPK0/DC67qa//0qvqrJzL1xc8WQWX7/yc7fwudjPHPhA==", + "requires": { + "tslib": "^2.6.2" + }, + "dependencies": { + "tslib": { + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz", + "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==" + } + } + }, + "@smithy/md5-js": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/@smithy/md5-js/-/md5-js-2.2.0.tgz", + "integrity": "sha512-M26XTtt9IIusVMOWEAhIvFIr9jYj4ISPPGJROqw6vXngO3IYJCnVVSMFn4Tx1rUTG5BiKJNg9u2nxmBiZC5IlQ==", + "requires": { + "@smithy/types": "^2.12.0", + "@smithy/util-utf8": "^2.3.0", + "tslib": "^2.6.2" + }, + "dependencies": { + "tslib": { + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz", + "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==" + } + } + }, + "@smithy/middleware-content-length": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/@smithy/middleware-content-length/-/middleware-content-length-2.2.0.tgz", + "integrity": "sha512-5bl2LG1Ah/7E5cMSC+q+h3IpVHMeOkG0yLRyQT1p2aMJkSrZG7RlXHPuAgb7EyaFeidKEnnd/fNaLLaKlHGzDQ==", + "requires": { + "@smithy/protocol-http": "^3.3.0", + "@smithy/types": "^2.12.0", + "tslib": "^2.6.2" + }, + "dependencies": { + "tslib": { + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz", + "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==" + } + } + }, + "@smithy/middleware-endpoint": { + "version": "2.5.0", + "resolved": "https://registry.npmjs.org/@smithy/middleware-endpoint/-/middleware-endpoint-2.5.0.tgz", + "integrity": "sha512-OBhI9ZEAG8Xen0xsFJwwNOt44WE2CWkfYIxTognC8x42Lfsdf0VN/wCMqpdkySMDio/vts10BiovAxQp0T0faA==", + "requires": { + "@smithy/middleware-serde": "^2.3.0", + "@smithy/node-config-provider": "^2.3.0", + "@smithy/shared-ini-file-loader": "^2.4.0", + "@smithy/types": "^2.12.0", + "@smithy/url-parser": "^2.2.0", + "@smithy/util-middleware": "^2.2.0", + "tslib": "^2.6.2" + }, + "dependencies": { + "tslib": { + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz", + "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==" + } + } + }, + "@smithy/middleware-retry": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/@smithy/middleware-retry/-/middleware-retry-2.2.0.tgz", + "integrity": "sha512-PsjDOLpbevgn37yJbawmfVoanru40qVA8UEf2+YA1lvOefmhuhL6ZbKtGsLAWDRnE1OlAmedsbA/htH6iSZjNA==", + "requires": { + "@smithy/node-config-provider": "^2.3.0", + "@smithy/protocol-http": "^3.3.0", + "@smithy/service-error-classification": "^2.1.5", + "@smithy/smithy-client": "^2.5.0", + "@smithy/types": "^2.12.0", + "@smithy/util-middleware": "^2.2.0", + "@smithy/util-retry": "^2.2.0", + "tslib": "^2.6.2", + "uuid": "^8.3.2" + }, + "dependencies": { + "tslib": { + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz", + "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==" + } + } + }, + "@smithy/middleware-serde": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/@smithy/middleware-serde/-/middleware-serde-2.3.0.tgz", + "integrity": "sha512-sIADe7ojwqTyvEQBe1nc/GXB9wdHhi9UwyX0lTyttmUWDJLP655ZYE1WngnNyXREme8I27KCaUhyhZWRXL0q7Q==", + "requires": { + "@smithy/types": "^2.12.0", + "tslib": "^2.6.2" + }, + "dependencies": { + "tslib": { + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz", + "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==" + } + } + }, + "@smithy/middleware-stack": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/@smithy/middleware-stack/-/middleware-stack-2.2.0.tgz", + "integrity": "sha512-Qntc3jrtwwrsAC+X8wms8zhrTr0sFXnyEGhZd9sLtsJ/6gGQKFzNB+wWbOcpJd7BR8ThNCoKt76BuQahfMvpeA==", + "requires": { + "@smithy/types": "^2.12.0", + "tslib": "^2.6.2" + }, + "dependencies": { + "tslib": { + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz", + "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==" + } + } + }, + "@smithy/node-config-provider": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/@smithy/node-config-provider/-/node-config-provider-2.3.0.tgz", + "integrity": "sha512-0elK5/03a1JPWMDPaS726Iw6LpQg80gFut1tNpPfxFuChEEklo2yL823V94SpTZTxmKlXFtFgsP55uh3dErnIg==", + "requires": { + "@smithy/property-provider": "^2.2.0", + "@smithy/shared-ini-file-loader": "^2.4.0", + "@smithy/types": "^2.12.0", + "tslib": "^2.6.2" + }, + "dependencies": { + "tslib": { + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz", + "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==" + } + } + }, + "@smithy/node-http-handler": { + "version": "2.5.0", + "resolved": "https://registry.npmjs.org/@smithy/node-http-handler/-/node-http-handler-2.5.0.tgz", + "integrity": "sha512-mVGyPBzkkGQsPoxQUbxlEfRjrj6FPyA3u3u2VXGr9hT8wilsoQdZdvKpMBFMB8Crfhv5dNkKHIW0Yyuc7eABqA==", + "requires": { + "@smithy/abort-controller": "^2.2.0", + "@smithy/protocol-http": "^3.3.0", + "@smithy/querystring-builder": "^2.2.0", + "@smithy/types": "^2.12.0", + "tslib": "^2.6.2" + }, + "dependencies": { + "tslib": { + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz", + "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==" + } + } + }, + "@smithy/property-provider": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/@smithy/property-provider/-/property-provider-2.2.0.tgz", + "integrity": "sha512-+xiil2lFhtTRzXkx8F053AV46QnIw6e7MV8od5Mi68E1ICOjCeCHw2XfLnDEUHnT9WGUIkwcqavXjfwuJbGlpg==", + "requires": { + "@smithy/types": "^2.12.0", + "tslib": "^2.6.2" + }, + "dependencies": { + "tslib": { + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz", + "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==" + } + } + }, + "@smithy/protocol-http": { + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/@smithy/protocol-http/-/protocol-http-3.3.0.tgz", + "integrity": "sha512-Xy5XK1AFWW2nlY/biWZXu6/krgbaf2dg0q492D8M5qthsnU2H+UgFeZLbM76FnH7s6RO/xhQRkj+T6KBO3JzgQ==", + "requires": { + "@smithy/types": "^2.12.0", + "tslib": "^2.6.2" + }, + "dependencies": { + "tslib": { + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz", + "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==" + } + } + }, + "@smithy/querystring-builder": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/@smithy/querystring-builder/-/querystring-builder-2.2.0.tgz", + "integrity": "sha512-L1kSeviUWL+emq3CUVSgdogoM/D9QMFaqxL/dd0X7PCNWmPXqt+ExtrBjqT0V7HLN03Vs9SuiLrG3zy3JGnE5A==", + "requires": { + "@smithy/types": "^2.12.0", + "@smithy/util-uri-escape": "^2.2.0", + "tslib": "^2.6.2" + }, + "dependencies": { + "tslib": { + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz", + "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==" + } + } + }, + "@smithy/querystring-parser": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/@smithy/querystring-parser/-/querystring-parser-2.2.0.tgz", + "integrity": "sha512-BvHCDrKfbG5Yhbpj4vsbuPV2GgcpHiAkLeIlcA1LtfpMz3jrqizP1+OguSNSj1MwBHEiN+jwNisXLGdajGDQJA==", + "requires": { + "@smithy/types": "^2.12.0", + "tslib": "^2.6.2" + }, + "dependencies": { + "tslib": { + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz", + "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==" + } + } + }, + "@smithy/service-error-classification": { + "version": "2.1.5", + "resolved": "https://registry.npmjs.org/@smithy/service-error-classification/-/service-error-classification-2.1.5.tgz", + "integrity": "sha512-uBDTIBBEdAQryvHdc5W8sS5YX7RQzF683XrHePVdFmAgKiMofU15FLSM0/HU03hKTnazdNRFa0YHS7+ArwoUSQ==", + "requires": { + "@smithy/types": "^2.12.0" + } + }, + "@smithy/shared-ini-file-loader": { + "version": "2.4.0", + "resolved": "https://registry.npmjs.org/@smithy/shared-ini-file-loader/-/shared-ini-file-loader-2.4.0.tgz", + "integrity": "sha512-WyujUJL8e1B6Z4PBfAqC/aGY1+C7T0w20Gih3yrvJSk97gpiVfB+y7c46T4Nunk+ZngLq0rOIdeVeIklk0R3OA==", + "requires": { + "@smithy/types": "^2.12.0", + "tslib": "^2.6.2" + }, + "dependencies": { + "tslib": { + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz", + "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==" + } + } + }, + "@smithy/signature-v4": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/@smithy/signature-v4/-/signature-v4-2.2.0.tgz", + "integrity": "sha512-+B5TNzj/fRZzVW3z8UUJOkNx15+4E0CLuvJmJUA1JUIZFp3rdJ/M2H5r2SqltaVPXL0oIxv/6YK92T9TsFGbFg==", + "requires": { + "@smithy/eventstream-codec": "^2.2.0", + "@smithy/is-array-buffer": "^2.2.0", + "@smithy/types": "^2.12.0", + "@smithy/util-hex-encoding": "^2.2.0", + "@smithy/util-middleware": "^2.2.0", + "@smithy/util-uri-escape": "^2.2.0", + "@smithy/util-utf8": "^2.3.0", + "tslib": "^2.6.2" + }, + "dependencies": { + "tslib": { + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz", + "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==" + } + } + }, + "@smithy/smithy-client": { + "version": "2.5.0", + "resolved": "https://registry.npmjs.org/@smithy/smithy-client/-/smithy-client-2.5.0.tgz", + "integrity": "sha512-DDXWHWdimtS3y/Kw1Jo46KQ0ZYsDKcldFynQERUGBPDpkW1lXOTHy491ALHjwfiBQvzsVKVxl5+ocXNIgJuX4g==", + "requires": { + "@smithy/middleware-endpoint": "^2.5.0", + "@smithy/middleware-stack": "^2.2.0", + "@smithy/protocol-http": "^3.3.0", + "@smithy/types": "^2.12.0", + "@smithy/util-stream": "^2.2.0", + "tslib": "^2.6.2" + }, + "dependencies": { + "tslib": { + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz", + "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==" + } + } + }, + "@smithy/types": { + "version": "2.12.0", + "resolved": "https://registry.npmjs.org/@smithy/types/-/types-2.12.0.tgz", + "integrity": "sha512-QwYgloJ0sVNBeBuBs65cIkTbfzV/Q6ZNPCJ99EICFEdJYG50nGIY/uYXp+TbsdJReIuPr0a0kXmCvren3MbRRw==", + "requires": { + "tslib": "^2.6.2" + }, + "dependencies": { + "tslib": { + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz", + "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==" + } + } + }, + "@smithy/url-parser": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/@smithy/url-parser/-/url-parser-2.2.0.tgz", + "integrity": "sha512-hoA4zm61q1mNTpksiSWp2nEl1dt3j726HdRhiNgVJQMj7mLp7dprtF57mOB6JvEk/x9d2bsuL5hlqZbBuHQylQ==", "requires": { - "node-addon-api": "^3.2.1", - "node-gyp-build": "^4.3.0" + "@smithy/querystring-parser": "^2.2.0", + "@smithy/types": "^2.12.0", + "tslib": "^2.6.2" + }, + "dependencies": { + "tslib": { + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz", + "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==" + } } }, - "@petamoriken/float16": { - "version": "3.7.1", - "resolved": "https://registry.npmjs.org/@petamoriken/float16/-/float16-3.7.1.tgz", - "integrity": "sha512-oXZOc+aePd0FnhTWk15pyqK+Do87n0TyLV1nxdEougE95X/WXWDqmQobfhgnSY7QsWn5euZUWuDVeTQvoQ5VNw==" - }, - "@phenomnomnominal/tsquery": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/@phenomnomnominal/tsquery/-/tsquery-4.1.1.tgz", - "integrity": "sha512-jjMmK1tnZbm1Jq5a7fBliM4gQwjxMU7TFoRNwIyzwlO+eHPRCFv/Nv+H/Gi1jc3WR7QURG8D5d0Tn12YGrUqBQ==", + "@smithy/util-base64": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/@smithy/util-base64/-/util-base64-2.3.0.tgz", + "integrity": "sha512-s3+eVwNeJuXUwuMbusncZNViuhv2LjVJ1nMwTqSA0XAC7gjKhqqxRdJPhR8+YrkoZ9IiIbFk/yK6ACe/xlF+hw==", "requires": { - "esquery": "^1.0.1" + "@smithy/util-buffer-from": "^2.2.0", + "@smithy/util-utf8": "^2.3.0", + "tslib": "^2.6.2" + }, + "dependencies": { + "tslib": { + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz", + "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==" + } } }, - "@polka/url": { - "version": "1.0.0-next.21", - "resolved": "https://registry.npmjs.org/@polka/url/-/url-1.0.0-next.21.tgz", - "integrity": "sha512-a5Sab1C4/icpTZVzZc5Ghpz88yQtGOyNqYXcZgOssB2uuAr+wF/MvN6bgtW32q7HHrvBki+BsZ0OuNv6EV3K9g==", - "dev": true - }, - "@prisma/client": { - "version": "4.12.0", - "resolved": "https://registry.npmjs.org/@prisma/client/-/client-4.12.0.tgz", - "integrity": "sha512-j9/ighfWwux97J2dS15nqhl60tYoH8V0IuSsgZDb6bCFcQD3fXbXmxjYC8GHhIgOk3lB7Pq+8CwElz2MiDpsSg==", + "@smithy/util-body-length-browser": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/@smithy/util-body-length-browser/-/util-body-length-browser-2.2.0.tgz", + "integrity": "sha512-dtpw9uQP7W+n3vOtx0CfBD5EWd7EPdIdsQnWTDoFf77e3VUf05uA7R7TGipIo8e4WL2kuPdnsr3hMQn9ziYj5w==", "requires": { - "@prisma/engines-version": "4.12.0-67.659ef412370fa3b41cd7bf6e94587c1dfb7f67e7" + "tslib": "^2.6.2" + }, + "dependencies": { + "tslib": { + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz", + "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==" + } } }, - "@prisma/engines": { - "version": "4.12.0", - "resolved": "https://registry.npmjs.org/@prisma/engines/-/engines-4.12.0.tgz", - "integrity": "sha512-0alKtnxhNB5hYU+ymESBlGI4b9XrGGSdv7Ud+8TE/fBNOEhIud0XQsAR+TrvUZgS4na5czubiMsODw0TUrgkIA==" - }, - "@prisma/engines-version": { - "version": "4.12.0-67.659ef412370fa3b41cd7bf6e94587c1dfb7f67e7", - "resolved": "https://registry.npmjs.org/@prisma/engines-version/-/engines-version-4.12.0-67.659ef412370fa3b41cd7bf6e94587c1dfb7f67e7.tgz", - "integrity": "sha512-JIHNj5jlXb9mcaJwakM0vpgRYJIAurxTUqM0iX0tfEQA5XLZ9ONkIckkhuAKdAzocZ+80GYg7QSsfpjg7OxbOA==" - }, - "@prisma/prisma-fmt-wasm": { - "version": "4.8.0-62.351fb726ff78e50c7d6db6331d66d4db0e378c53", - "resolved": "https://registry.npmjs.org/@prisma/prisma-fmt-wasm/-/prisma-fmt-wasm-4.8.0-62.351fb726ff78e50c7d6db6331d66d4db0e378c53.tgz", - "integrity": "sha512-OISxCNdlZ02u2NwQt99pQqpW+8elKaV0HNszJ6QVEZJZJNjnTmYIjSWycVWt+Ul3m1V0DWY4OEKCxwjpqwnjcQ==", - "dev": true - }, - "@rollup/plugin-json": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/@rollup/plugin-json/-/plugin-json-6.0.0.tgz", - "integrity": "sha512-i/4C5Jrdr1XUarRhVu27EEwjt4GObltD7c+MkCIpO2QIbojw8MUs+CCTqOphQi3Qtg1FLmYt+l+6YeoIf51J7w==", - "dev": true, + "@smithy/util-body-length-node": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/@smithy/util-body-length-node/-/util-body-length-node-2.3.0.tgz", + "integrity": "sha512-ITWT1Wqjubf2CJthb0BuT9+bpzBfXeMokH/AAa5EJQgbv9aPMVfnM76iFIZVFf50hYXGbtiV71BHAthNWd6+dw==", "requires": { - "@rollup/pluginutils": "^5.0.1" + "tslib": "^2.6.2" + }, + "dependencies": { + "tslib": { + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz", + "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==" + } } }, - "@rollup/plugin-node-resolve": { - "version": "15.0.1", - "resolved": "https://registry.npmjs.org/@rollup/plugin-node-resolve/-/plugin-node-resolve-15.0.1.tgz", - "integrity": "sha512-ReY88T7JhJjeRVbfCyNj+NXAG3IIsVMsX9b5/9jC98dRP8/yxlZdz7mHZbHk5zHr24wZZICS5AcXsFZAXYUQEg==", - "dev": true, + "@smithy/util-buffer-from": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/@smithy/util-buffer-from/-/util-buffer-from-2.2.0.tgz", + "integrity": "sha512-IJdWBbTcMQ6DA0gdNhh/BwrLkDR+ADW5Kr1aZmd4k3DIF6ezMV4R2NIAmT08wQJ3yUK82thHWmC/TnK/wpMMIA==", "requires": { - "@rollup/pluginutils": "^5.0.1", - "@types/resolve": "1.20.2", - "deepmerge": "^4.2.2", - "is-builtin-module": "^3.2.0", - "is-module": "^1.0.0", - "resolve": "^1.22.1" + "@smithy/is-array-buffer": "^2.2.0", + "tslib": "^2.6.2" + }, + "dependencies": { + "tslib": { + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz", + "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==" + } } }, - "@rollup/pluginutils": { - "version": "5.0.2", - "resolved": "https://registry.npmjs.org/@rollup/pluginutils/-/pluginutils-5.0.2.tgz", - "integrity": "sha512-pTd9rIsP92h+B6wWwFbW8RkZv4hiR/xKsqre4SIuAOaOEQRxi0lqLke9k2/7WegC85GgUs9pjmOjCUi3In4vwA==", - "dev": true, + "@smithy/util-config-provider": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/@smithy/util-config-provider/-/util-config-provider-2.3.0.tgz", + "integrity": "sha512-HZkzrRcuFN1k70RLqlNK4FnPXKOpkik1+4JaBoHNJn+RnJGYqaa3c5/+XtLOXhlKzlRgNvyaLieHTW2VwGN0VQ==", "requires": { - "@types/estree": "^1.0.0", - "estree-walker": "^2.0.2", - "picomatch": "^2.3.1" + "tslib": "^2.6.2" + }, + "dependencies": { + "tslib": { + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz", + "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==" + } } }, - "@rushstack/node-core-library": { - "version": "3.53.3", - "resolved": "https://registry.npmjs.org/@rushstack/node-core-library/-/node-core-library-3.53.3.tgz", - "integrity": "sha512-H0+T5koi5MFhJUd5ND3dI3bwLhvlABetARl78L3lWftJVQEPyzcgTStvTTRiIM5mCltyTM8VYm6BuCtNUuxD0Q==", - "dev": true, + "@smithy/util-defaults-mode-browser": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/@smithy/util-defaults-mode-browser/-/util-defaults-mode-browser-2.2.0.tgz", + "integrity": "sha512-2okTdZaCBvOJszAPU/KSvlimMe35zLOKbQpHhamFJmR7t95HSe0K3C92jQPjKY3PmDBD+7iMkOnuW05F5OlF4g==", "requires": { - "@types/node": "12.20.24", - "colors": "~1.2.1", - "fs-extra": "~7.0.1", - "import-lazy": "~4.0.0", - "jju": "~1.4.0", - "resolve": "~1.17.0", - "semver": "~7.3.0", - "z-schema": "~5.0.2" + "@smithy/property-provider": "^2.2.0", + "@smithy/smithy-client": "^2.5.0", + "@smithy/types": "^2.12.0", + "bowser": "^2.11.0", + "tslib": "^2.6.2" }, "dependencies": { - "@types/node": { - "version": "12.20.24", - "resolved": "https://registry.npmjs.org/@types/node/-/node-12.20.24.tgz", - "integrity": "sha512-yxDeaQIAJlMav7fH5AQqPH1u8YIuhYJXYBzxaQ4PifsU0GDO38MSdmEDeRlIxrKbC6NbEaaEHDanWb+y30U8SQ==", - "dev": true - }, - "fs-extra": { - "version": "7.0.1", - "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-7.0.1.tgz", - "integrity": "sha512-YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw==", - "dev": true, - "requires": { - "graceful-fs": "^4.1.2", - "jsonfile": "^4.0.0", - "universalify": "^0.1.0" - } - }, - "jsonfile": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz", - "integrity": "sha512-m6F1R3z8jjlf2imQHS2Qez5sjKWQzbuuhuJ/FKYFRZvPE3PuHcSMVZzfsLhGVOkfd20obL5SWEBew5ShlquNxg==", - "dev": true, - "requires": { - "graceful-fs": "^4.1.6" - } - }, - "resolve": { - "version": "1.17.0", - "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.17.0.tgz", - "integrity": "sha512-ic+7JYiV8Vi2yzQGFWOkiZD5Z9z7O2Zhm9XMaTxdJExKasieFCr+yXZ/WmXsckHiKl12ar0y6XiXDx3m4RHn1w==", - "dev": true, - "requires": { - "path-parse": "^1.0.6" - } - }, - "universalify": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz", - "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==", - "dev": true + "tslib": { + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz", + "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==" } } }, - "@rushstack/rig-package": { - "version": "0.3.17", - "resolved": "https://registry.npmjs.org/@rushstack/rig-package/-/rig-package-0.3.17.tgz", - "integrity": "sha512-nxvAGeIMnHl1LlZSQmacgcRV4y1EYtgcDIrw6KkeVjudOMonlxO482PhDj3LVZEp6L7emSf6YSO2s5JkHlwfZA==", - "dev": true, + "@smithy/util-defaults-mode-node": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/@smithy/util-defaults-mode-node/-/util-defaults-mode-node-2.3.0.tgz", + "integrity": "sha512-hfKXnNLmsW9cmLb/JXKIvtuO6Cf4SuqN5PN1C2Ru/TBIws+m1wSgb+A53vo0r66xzB6E82inKG2J7qtwdi+Kkw==", "requires": { - "resolve": "~1.17.0", - "strip-json-comments": "~3.1.1" + "@smithy/config-resolver": "^2.2.0", + "@smithy/credential-provider-imds": "^2.3.0", + "@smithy/node-config-provider": "^2.3.0", + "@smithy/property-provider": "^2.2.0", + "@smithy/smithy-client": "^2.5.0", + "@smithy/types": "^2.12.0", + "tslib": "^2.6.2" }, "dependencies": { - "resolve": { - "version": "1.17.0", - "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.17.0.tgz", - "integrity": "sha512-ic+7JYiV8Vi2yzQGFWOkiZD5Z9z7O2Zhm9XMaTxdJExKasieFCr+yXZ/WmXsckHiKl12ar0y6XiXDx3m4RHn1w==", - "dev": true, - "requires": { - "path-parse": "^1.0.6" - } + "tslib": { + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz", + "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==" } } }, - "@rushstack/ts-command-line": { - "version": "4.13.1", - "resolved": "https://registry.npmjs.org/@rushstack/ts-command-line/-/ts-command-line-4.13.1.tgz", - "integrity": "sha512-UTQMRyy/jH1IS2U+6pyzyn9xQ2iMcoUKkTcZUzOP/aaMiKlWLwCTDiBVwhw/M1crDx6apF9CwyjuWO9r1SBdJQ==", - "dev": true, + "@smithy/util-endpoints": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/@smithy/util-endpoints/-/util-endpoints-1.2.0.tgz", + "integrity": "sha512-BuDHv8zRjsE5zXd3PxFXFknzBG3owCpjq8G3FcsXW3CykYXuEqM3nTSsmLzw5q+T12ZYuDlVUZKBdpNbhVtlrQ==", "requires": { - "@types/argparse": "1.0.38", - "argparse": "~1.0.9", - "colors": "~1.2.1", - "string-argv": "~0.3.1" + "@smithy/node-config-provider": "^2.3.0", + "@smithy/types": "^2.12.0", + "tslib": "^2.6.2" + }, + "dependencies": { + "tslib": { + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz", + "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==" + } } }, - "@rx-angular/cdk": { - "version": "1.0.0-rc.4", - "resolved": "https://registry.npmjs.org/@rx-angular/cdk/-/cdk-1.0.0-rc.4.tgz", - "integrity": "sha512-uFl6vCTcPf52Y0mfYxGwSkl6d/wDjCI33iXM8/J0VblGitNsiVdjxGWAbleh2eLlIVZOyYTuvi3N4sA9wwymRw==", + "@smithy/util-hex-encoding": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/@smithy/util-hex-encoding/-/util-hex-encoding-2.2.0.tgz", + "integrity": "sha512-7iKXR+/4TpLK194pVjKiasIyqMtTYJsgKgM242Y9uzt5dhHnUDvMNb+3xIhRJ9QhvqGii/5cRUt4fJn3dtXNHQ==", "requires": { - "ng-morph": "^2.1.1", - "tslib": "^2.4.1" + "tslib": "^2.6.2" + }, + "dependencies": { + "tslib": { + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz", + "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==" + } } }, - "@rx-angular/state": { - "version": "1.7.0", - "resolved": "https://registry.npmjs.org/@rx-angular/state/-/state-1.7.0.tgz", - "integrity": "sha512-rrM5qlI6lDsSbTVo+uBoGpOuZ//msi2q72WYvw1MESPDrb9TnOLtVceDaYL0FBMDBhcqtmUsdOs6OoICaroSew==", + "@smithy/util-middleware": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/@smithy/util-middleware/-/util-middleware-2.2.0.tgz", + "integrity": "sha512-L1qpleXf9QD6LwLCJ5jddGkgWyuSvWBkJwWAZ6kFkdifdso+sk3L3O1HdmPvCdnCK3IS4qWyPxev01QMnfHSBw==", "requires": { - "ng-morph": "^2.0.0", - "tslib": "^2.0.0" + "@smithy/types": "^2.12.0", + "tslib": "^2.6.2" + }, + "dependencies": { + "tslib": { + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz", + "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==" + } } }, - "@rx-angular/template": { - "version": "1.0.0-rc.5", - "resolved": "https://registry.npmjs.org/@rx-angular/template/-/template-1.0.0-rc.5.tgz", - "integrity": "sha512-ldL3obon1IkmZi2M+/rcwYAcNP9xGY787Ssj8SiPKdmxTJOaCn8pRxE9ss4sLg6NJrIku4/7jVPfKFKJKol9LA==", + "@smithy/util-retry": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/@smithy/util-retry/-/util-retry-2.2.0.tgz", + "integrity": "sha512-q9+pAFPTfftHXRytmZ7GzLFFrEGavqapFc06XxzZFcSIGERXMerXxCitjOG1prVDR9QdjqotF40SWvbqcCpf8g==", "requires": { - "ng-morph": "^2.1.1", - "tslib": "^2.4.1" + "@smithy/service-error-classification": "^2.1.5", + "@smithy/types": "^2.12.0", + "tslib": "^2.6.2" + }, + "dependencies": { + "tslib": { + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz", + "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==" + } } }, - "@schematics/angular": { - "version": "15.0.5", - "resolved": "https://registry.npmjs.org/@schematics/angular/-/angular-15.0.5.tgz", - "integrity": "sha512-lmns1eJM42RFlv1GPrNwe7TV70hyrIiadyPhuJmeT8qp8cxGPRJ3yHFUdtB7qPv0OkwfI/HVSeZwlnfNXQhiQg==", - "dev": true, + "@smithy/util-stream": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/@smithy/util-stream/-/util-stream-2.2.0.tgz", + "integrity": "sha512-17faEXbYWIRst1aU9SvPZyMdWmqIrduZjVOqCPMIsWFNxs5yQQgFrJL6b2SdiCzyW9mJoDjFtgi53xx7EH+BXA==", "requires": { - "@angular-devkit/core": "15.0.5", - "@angular-devkit/schematics": "15.0.5", - "jsonc-parser": "3.2.0" + "@smithy/fetch-http-handler": "^2.5.0", + "@smithy/node-http-handler": "^2.5.0", + "@smithy/types": "^2.12.0", + "@smithy/util-base64": "^2.3.0", + "@smithy/util-buffer-from": "^2.2.0", + "@smithy/util-hex-encoding": "^2.2.0", + "@smithy/util-utf8": "^2.3.0", + "tslib": "^2.6.2" }, "dependencies": { - "@angular-devkit/core": { - "version": "15.0.5", - "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-15.0.5.tgz", - "integrity": "sha512-SxLvbpqcQfb1qRykZjqRUG/8uC1FYpneyNV9S9YglXg4JhCFhfc9AnKxuu9Bm/O8V7FghOIlGWGglCdPHra0pw==", - "dev": true, - "requires": { - "ajv": "8.11.0", - "ajv-formats": "2.1.1", - "jsonc-parser": "3.2.0", - "rxjs": "6.6.7", - "source-map": "0.7.4" - } - }, - "ajv": { - "version": "8.11.0", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.11.0.tgz", - "integrity": "sha512-wGgprdCvMalC0BztXvitD2hC04YffAvtsUn93JbGXYLAtCUO4xd17mCCZQxUOItiBwZvJScWo8NIvQMQ71rdpg==", - "dev": true, - "requires": { - "fast-deep-equal": "^3.1.1", - "json-schema-traverse": "^1.0.0", - "require-from-string": "^2.0.2", - "uri-js": "^4.2.2" - } - }, - "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 + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz", + "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==" } } }, - "@sinclair/typebox": { - "version": "0.24.51", - "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.24.51.tgz", - "integrity": "sha512-1P1OROm/rdubP5aFDSZQILU0vrLCJ4fvHt6EoqHEM+2D/G5MK3bIaymUKLit8Js9gbns5UyJnkP/TZROLw4tUA==" + "@smithy/util-uri-escape": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/@smithy/util-uri-escape/-/util-uri-escape-2.2.0.tgz", + "integrity": "sha512-jtmJMyt1xMD/d8OtbVJ2gFZOSKc+ueYJZPW20ULW1GOp/q/YIM0wNh+u8ZFao9UaIGz4WoPW8hC64qlWLIfoDA==", + "requires": { + "tslib": "^2.6.2" + }, + "dependencies": { + "tslib": { + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz", + "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==" + } + } }, - "@sinonjs/commons": { - "version": "1.8.6", - "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-1.8.6.tgz", - "integrity": "sha512-Ky+XkAkqPZSm3NLBeUng77EBQl3cmeJhITaGHdYH8kjVB+aun3S4XBRti2zt17mtt0mIUDiNxYeoJm6drVvBJQ==", + "@smithy/util-utf8": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/@smithy/util-utf8/-/util-utf8-2.3.0.tgz", + "integrity": "sha512-R8Rdn8Hy72KKcebgLiv8jQcQkXoLMOGGv5uI1/k0l+snqkOzQ1R0ChUBCxWMlBsFMekWjq0wRudIweFs7sKT5A==", "requires": { - "type-detect": "4.0.8" + "@smithy/util-buffer-from": "^2.2.0", + "tslib": "^2.6.2" + }, + "dependencies": { + "tslib": { + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz", + "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==" + } } }, - "@sinonjs/fake-timers": { - "version": "9.1.2", - "resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-9.1.2.tgz", - "integrity": "sha512-BPS4ynJW/o92PUR4wgriz2Ud5gpST5vz6GQfMixEDK0Z8ZCUv2M7SkBLykH56T++Xs+8ln9zTGbOvNGIe02/jw==", + "@smithy/util-waiter": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/@smithy/util-waiter/-/util-waiter-2.2.0.tgz", + "integrity": "sha512-IHk53BVw6MPMi2Gsn+hCng8rFA3ZmR3Rk7GllxDUW9qFJl/hiSvskn7XldkECapQVkIg/1dHpMAxI9xSTaLLSA==", "requires": { - "@sinonjs/commons": "^1.7.0" + "@smithy/abort-controller": "^2.2.0", + "@smithy/types": "^2.12.0", + "tslib": "^2.6.2" + }, + "dependencies": { + "tslib": { + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz", + "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==" + } } }, "@solid-primitives/event-listener": { @@ -35423,24 +38312,25 @@ "integrity": "sha512-WulqXMDUTYAXCjZnk6JtIHPigp55cVtDgDrO2gHRwhyJto21+1zbVCtOYB2L1F9w4qCQ0rOGWBnBe0FNTiEJIQ==" }, "@types/express": { - "version": "4.17.15", - "resolved": "https://registry.npmjs.org/@types/express/-/express-4.17.15.tgz", - "integrity": "sha512-Yv0k4bXGOH+8a+7bELd2PqHQsuiANB+A8a4gnQrkRWzrkKlb6KHaVvyXhqs04sVW/OWlbPyYxRgYlIXLfrufMQ==", + "version": "4.17.21", + "resolved": "https://registry.npmjs.org/@types/express/-/express-4.17.21.tgz", + "integrity": "sha512-ejlPM315qwLpaQlQDTjPdsUFSc6ZsP4AN6AlWnogPjQ7CVi7PYF3YVz+CY3jE2pwYf7E/7HlDAN0rV2GxTG0HQ==", "requires": { "@types/body-parser": "*", - "@types/express-serve-static-core": "^4.17.31", + "@types/express-serve-static-core": "^4.17.33", "@types/qs": "*", "@types/serve-static": "*" } }, "@types/express-serve-static-core": { - "version": "4.17.32", - "resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.32.tgz", - "integrity": "sha512-aI5h/VOkxOF2Z1saPy0Zsxs5avets/iaiAJYznQFm5By/pamU31xWKL//epiF4OfUA2qTOc9PV6tCUjhO8wlZA==", + "version": "4.17.43", + "resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.43.tgz", + "integrity": "sha512-oaYtiBirUOPQGSWNGPWnzyAFJ0BP3cwvN4oWZQY+zUBwpVIGsKUkpBpSztp74drYcjavs7SKFZ4DX1V2QeN8rg==", "requires": { "@types/node": "*", "@types/qs": "*", - "@types/range-parser": "*" + "@types/range-parser": "*", + "@types/send": "*" } }, "@types/graceful-fs": { @@ -35513,14 +38403,20 @@ "dev": true }, "@types/jsonwebtoken": { - "version": "9.0.1", - "resolved": "https://registry.npmjs.org/@types/jsonwebtoken/-/jsonwebtoken-9.0.1.tgz", - "integrity": "sha512-c5ltxazpWabia/4UzhIoaDcIza4KViOQhdbjRlfcIGVnsE3c3brkz9Z+F/EeJIECOQP7W7US2hNE930cWWkPiw==", + "version": "9.0.5", + "resolved": "https://registry.npmjs.org/@types/jsonwebtoken/-/jsonwebtoken-9.0.5.tgz", + "integrity": "sha512-VRLSGzik+Unrup6BsouBeHsf4d1hOEgYWTm/7Nmw1sXoN1+tRly/Gy/po3yeahnP4jfnQWWAhQAqcNfH7ngOkA==", "dev": true, "requires": { "@types/node": "*" } }, + "@types/jwk-to-pem": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/@types/jwk-to-pem/-/jwk-to-pem-2.0.3.tgz", + "integrity": "sha512-I/WFyFgk5GrNbkpmt14auGO3yFK1Wt4jXzkLuI+fDBNtO5ZI2rbymyGd6bKzfSBEuyRdM64ZUwxU1+eDcPSOEQ==", + "dev": true + }, "@types/mime": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/@types/mime/-/mime-3.0.1.tgz", @@ -35588,6 +38484,22 @@ "integrity": "sha512-21cFJr9z3g5dW8B0CVI9g2O9beqaThGQ6ZFBqHfwhzLDKUxaqTIy3vnfah/UPkfOiF2pLq+tGz+W8RyCskuslw==", "dev": true }, + "@types/send": { + "version": "0.17.4", + "resolved": "https://registry.npmjs.org/@types/send/-/send-0.17.4.tgz", + "integrity": "sha512-x2EM6TJOybec7c52BX0ZspPodMsQUd5L6PRwOunVyVUhXiBSKf3AezDL8Dgvgt5o0UfKNfuA0eMLr2wLT4AiBA==", + "requires": { + "@types/mime": "^1", + "@types/node": "*" + }, + "dependencies": { + "@types/mime": { + "version": "1.3.5", + "resolved": "https://registry.npmjs.org/@types/mime/-/mime-1.3.5.tgz", + "integrity": "sha512-/pyBZWSLD2n0dcHE3hq8s8ZvcETHtEuF+3E7XVt0Ig2nvsVQXdghHVcEkIWjy9A0wKfTn97a/PSDYohKIlnP/w==" + } + } + }, "@types/serve-index": { "version": "1.9.1", "resolved": "https://registry.npmjs.org/@types/serve-index/-/serve-index-1.9.1.tgz", @@ -36239,6 +39151,21 @@ "fast-deep-equal": "^3.1.3" } }, + "angular-oauth2-oidc": { + "version": "17.0.1", + "resolved": "https://registry.npmjs.org/angular-oauth2-oidc/-/angular-oauth2-oidc-17.0.1.tgz", + "integrity": "sha512-Yl4It9zFsYmoNS73sUvNJstbMW1x73ejKonzXLgU4XnSuBCt/0x8PnY5R3mHX4ZC/WmXBqQ/RfFwClrYW9Ywcg==", + "requires": { + "tslib": "^2.5.2" + }, + "dependencies": { + "tslib": { + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz", + "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==" + } + } + }, "ansi-colors": { "version": "4.1.3", "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.3.tgz", @@ -36414,6 +39341,17 @@ "safer-buffer": "~2.1.0" } }, + "asn1.js": { + "version": "5.4.1", + "resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-5.4.1.tgz", + "integrity": "sha512-+I//4cYPccV8LdmBLiX8CYvf9Sp3vQsrqu2QNXRcrbiWvcx/UdlFiqUJJzxRQxgsZmvhXhn4cSKeSmoFjVdupA==", + "requires": { + "bn.js": "^4.0.0", + "inherits": "^2.0.1", + "minimalistic-assert": "^1.0.0", + "safer-buffer": "^2.1.0" + } + }, "assert-plus": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz", @@ -36485,11 +39423,11 @@ "devOptional": true }, "axios": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/axios/-/axios-1.4.0.tgz", - "integrity": "sha512-S4XCWMEmzvo64T9GfvQDOXgYRDJ/wsSZc7Jvdgx5u1sd0JwsuPLqb3SYmusag+edF6ziyMensPVqLTSc1PiSEA==", + "version": "1.6.7", + "resolved": "https://registry.npmjs.org/axios/-/axios-1.6.7.tgz", + "integrity": "sha512-/hDJGff6/c7u0hDkvkGxR/oy6CbCs8ziCsC7SqmhjfozqiJGc8Z11wrv9z9lYfY4K8l+H9TpjcMDX0xOZmx+RA==", "requires": { - "follow-redirects": "^1.15.0", + "follow-redirects": "^1.15.4", "form-data": "^4.0.0", "proxy-from-env": "^1.1.0" }, @@ -36636,9 +39574,9 @@ }, "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 } } @@ -36786,6 +39724,11 @@ "integrity": "sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==", "devOptional": true }, + "bn.js": { + "version": "4.12.0", + "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz", + "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==" + }, "body-parser": { "version": "1.20.1", "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.1.tgz", @@ -36865,6 +39808,11 @@ "fill-range": "^7.0.1" } }, + "brorand": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/brorand/-/brorand-1.1.0.tgz", + "integrity": "sha512-cKV8tMCEpQs4hK/ik71d6LrPOnpkpGBR0wzxqr68g2m/LB2GxVYQroAjMJZRVM1Y4BCjCKc3vAamxSzOY2RP+w==" + }, "browser-process-hrtime": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/browser-process-hrtime/-/browser-process-hrtime-1.0.0.tgz", @@ -36872,14 +39820,14 @@ "dev": true }, "browserslist": { - "version": "4.21.4", - "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.21.4.tgz", - "integrity": "sha512-CBHJJdDmgjl3daYjN5Cp5kbTf1mUhZoS+beLklHIvkOWscs83YAhLlF3Wsh/lciQYAcbBJgTOD44VtG31ZM4Hw==", + "version": "4.21.5", + "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.21.5.tgz", + "integrity": "sha512-tUkiguQGW7S3IhB7N+c2MV/HZPSCPAAiYBZXLsBhFB/PCy6ZKKsZrmBayHV9fdGV/ARIfJ14NkxKzRDjvp7L6w==", "requires": { - "caniuse-lite": "^1.0.30001400", - "electron-to-chromium": "^1.4.251", - "node-releases": "^2.0.6", - "update-browserslist-db": "^1.0.9" + "caniuse-lite": "^1.0.30001449", + "electron-to-chromium": "^1.4.284", + "node-releases": "^2.0.8", + "update-browserslist-db": "^1.0.10" } }, "bs-logger": { @@ -37052,6 +40000,23 @@ } } }, + "cache-manager": { + "version": "5.4.0", + "resolved": "https://registry.npmjs.org/cache-manager/-/cache-manager-5.4.0.tgz", + "integrity": "sha512-FS7o8vqJosnLpu9rh2gQTo8EOzCRJLF1BJ4XDEUDMqcfvs7SJZs5iuoFTXLauzQ3S5v8sBAST1pCwMaurpyi1A==", + "requires": { + "lodash.clonedeep": "^4.5.0", + "lru-cache": "^10.1.0", + "promise-coalesce": "^1.1.2" + }, + "dependencies": { + "lru-cache": { + "version": "10.2.0", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.2.0.tgz", + "integrity": "sha512-2bIM8x+VAf6JT4bKAljS1qUWgMsqZRPGJS6FSahIMPVvctcNhyVp7AJu7quxOW9jwkryBReKZY5tY5JYv2n/7Q==" + } + } + }, "cachedir": { "version": "2.3.0", "resolved": "https://registry.npmjs.org/cachedir/-/cachedir-2.3.0.tgz", @@ -37089,9 +40054,9 @@ } }, "caniuse-lite": { - "version": "1.0.30001445", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001445.tgz", - "integrity": "sha512-8sdQIdMztYmzfTMO6KfLny878Ln9c2M0fc7EH60IjlP4Dc4PiCy7K2Vl3ITmWgOyPgVQKa5x+UP/KqFsxj4mBg==" + "version": "1.0.30001597", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001597.tgz", + "integrity": "sha512-7LjJvmQU6Sj7bL0j5b5WY/3n7utXUJvAe1lxhsHDbLmwX9mdL86Yjtr+5SRCyf8qME4M7pU2hswj0FpyBVCv9w==" }, "caseless": { "version": "0.12.0", @@ -38415,6 +41380,32 @@ "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-10.0.0.tgz", "integrity": "sha512-rlBi9d8jpv9Sf1klPjNfFAuWDjKLwTIJJ/VxtoTwIR6hnZxcEOQCZg2oIL3MWBYw5GpUDKOEnND7LXTbIpQ03Q==" }, + "dotenv-cli": { + "version": "7.4.1", + "resolved": "https://registry.npmjs.org/dotenv-cli/-/dotenv-cli-7.4.1.tgz", + "integrity": "sha512-fE1aywjRrWGxV3miaiUr3d2zC/VAiuzEGghi+QzgIA9fEf/M5hLMaRSXb4IxbUAwGmaLi0IozdZddnVU96acag==", + "dev": true, + "requires": { + "cross-spawn": "^7.0.3", + "dotenv": "^16.3.0", + "dotenv-expand": "^10.0.0", + "minimist": "^1.2.6" + }, + "dependencies": { + "dotenv": { + "version": "16.4.5", + "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-16.4.5.tgz", + "integrity": "sha512-ZmdL2rui+eB2YwhsWzjInR8LldtZHGDoQ1ugH85ppHKwpUHL7j7rN0Ti9NCnGiQbhaZ11FpR+7ao1dNsmduNUg==", + "dev": true + } + } + }, + "dotenv-expand": { + "version": "10.0.0", + "resolved": "https://registry.npmjs.org/dotenv-expand/-/dotenv-expand-10.0.0.tgz", + "integrity": "sha512-GopVGCpVS1UKH75VKHGuQFqS1Gusej0z4FyQkPdwjil2gNIv+LNsqBlboOzpJFZKVT95GkCyWJbBSdFEFUWI2A==", + "dev": true + }, "duplexer": { "version": "0.1.2", "resolved": "https://registry.npmjs.org/duplexer/-/duplexer-0.1.2.tgz", @@ -38461,6 +41452,20 @@ "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.284.tgz", "integrity": "sha512-M8WEXFuKXMYMVr45fo8mq0wUrrJHheiKZf6BArTKk9ZBYCKJEOU5H8cdWgDT+qCVZf7Na4lVUaZsA+h6uA9+PA==" }, + "elliptic": { + "version": "6.5.5", + "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.5.tgz", + "integrity": "sha512-7EjbcmUm17NQFu4Pmgmq2olYMj8nwMnpcddByChSUjArp8F5DQWcIcpriwO4ZToLNAJig0yiyjswfyGNje/ixw==", + "requires": { + "bn.js": "^4.11.9", + "brorand": "^1.1.0", + "hash.js": "^1.0.0", + "hmac-drbg": "^1.0.1", + "inherits": "^2.0.4", + "minimalistic-assert": "^1.0.1", + "minimalistic-crypto-utils": "^1.0.1" + } + }, "emittery": { "version": "0.10.2", "resolved": "https://registry.npmjs.org/emittery/-/emittery-0.10.2.tgz", @@ -38658,6 +41663,8 @@ "version": "0.16.17", "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.16.17.tgz", "integrity": "sha512-G8LEkV0XzDMNwXKgM0Jwu3nY3lSTwSGY6XbxM9cr9+s0T/qSV1q1JVPBGzm3dcjhCic9+emZDmMffkwgPeOeLg==", + "dev": true, + "optional": true, "requires": { "@esbuild/android-arm": "0.16.17", "@esbuild/android-arm64": "0.16.17", @@ -39049,9 +42056,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 }, "strip-bom": { @@ -39472,9 +42479,9 @@ "integrity": "sha512-W+KJc2dmILlPplD/H4K9l9LcAHAfPtP6BY84uVLXQ6Evcz9Lcg33Y2z1IVblT6xdY54PXYVHEv+0Wpq8Io6zkA==" }, "fast-xml-parser": { - "version": "4.0.11", - "resolved": "https://registry.npmjs.org/fast-xml-parser/-/fast-xml-parser-4.0.11.tgz", - "integrity": "sha512-4aUg3aNRR/WjQAcpceODG1C3x3lFANXRo8+1biqfieHmg9pyMt7qB4lQV/Ta6sJCTbA5vfD8fnA8S54JATiFUA==", + "version": "4.2.5", + "resolved": "https://registry.npmjs.org/fast-xml-parser/-/fast-xml-parser-4.2.5.tgz", + "integrity": "sha512-B9/wizE4WngqQftFPmdaMYlXoJlJOYxGQOanC77fq9k8+Z0v5dDSVh+3glErdIROP//s/jgb7ZuxKfB8nVyo0g==", "requires": { "strnum": "^1.0.5" } @@ -39700,9 +42707,9 @@ "devOptional": 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.6", + "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.6.tgz", + "integrity": "sha512-wWN62YITEaOpSK584EZXJafH1AGpO8RVgElfkuXbTOrPX4fIfOyEpW/CsiNd8JdYrAoOvafRTOEnvsO++qCqFA==" }, "for-each": { "version": "0.3.3", @@ -39860,9 +42867,9 @@ "integrity": "sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow==" }, "fp-ts": { - "version": "2.13.1", - "resolved": "https://registry.npmjs.org/fp-ts/-/fp-ts-2.13.1.tgz", - "integrity": "sha512-0eu5ULPS2c/jsa1lGFneEFFEdTbembJv8e4QKXeVJ3lm/5hyve06dlKZrpxmMwJt6rYen7sxmHHK2CLaXvWuWQ==" + "version": "2.16.5", + "resolved": "https://registry.npmjs.org/fp-ts/-/fp-ts-2.16.5.tgz", + "integrity": "sha512-N8T8PwMSeTKKtkm9lkj/zSTAnPC/aJIIrQhnHxxkL0KLsRCNUPANksJOlMXxcKKCo7H1ORP3No9EMD+fP0tsdA==" }, "fraction.js": { "version": "4.2.0", @@ -40042,9 +43049,9 @@ } }, "glob": { - "version": "8.0.3", - "resolved": "https://registry.npmjs.org/glob/-/glob-8.0.3.tgz", - "integrity": "sha512-ull455NHSHI/Y1FqGaaYFaLGkNMMJbavMrEGFXG/PGrg6y7sutWHUHrz6gy6WEBH6akM1M414dWKCNs+IhKdiQ==", + "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", @@ -40231,6 +43238,15 @@ "integrity": "sha512-8Rf9Y83NBReMnx0gFzA8JImQACstCYWUplepDa9xprwwtmgEZUF0h/i5xSA625zB/I37EtrswSST6OXxwaaIJQ==", "dev": true }, + "hash.js": { + "version": "1.1.7", + "resolved": "https://registry.npmjs.org/hash.js/-/hash.js-1.1.7.tgz", + "integrity": "sha512-taOaskGt4z4SOANNseOviYDvjEJinIkRgmp7LbKP2YTTmVxWBl87s/uzK9r+44BclBSp2X7K1hqeNfz9JbBeXA==", + "requires": { + "inherits": "^2.0.3", + "minimalistic-assert": "^1.0.1" + } + }, "hdr-histogram-js": { "version": "2.0.3", "resolved": "https://registry.npmjs.org/hdr-histogram-js/-/hdr-histogram-js-2.0.3.tgz", @@ -40261,6 +43277,16 @@ "resolved": "https://registry.npmjs.org/he/-/he-1.2.0.tgz", "integrity": "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==" }, + "hmac-drbg": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/hmac-drbg/-/hmac-drbg-1.0.1.tgz", + "integrity": "sha512-Tti3gMqLdZfhOQY1Mzf/AanLiqh1WTiJgEj26ZuYQ9fbkLomzGchCws4FyrSd4VkpBfiNhaE1On+lOz894jvXg==", + "requires": { + "hash.js": "^1.0.3", + "minimalistic-assert": "^1.0.0", + "minimalistic-crypto-utils": "^1.0.1" + } + }, "hosted-git-info": { "version": "5.2.1", "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-5.2.1.tgz", @@ -40728,9 +43754,9 @@ "requires": {} }, "ip": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ip/-/ip-2.0.0.tgz", - "integrity": "sha512-WKa+XuLG1A1R0UWhl2+1XQSi+fZWMsYKffMZTTYsiZaUD8k2yDAj5atimTUD2TZkyCkNEeYE5NhFZmupOGtjYQ==", + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/ip/-/ip-2.0.1.tgz", + "integrity": "sha512-lJUL9imLTNi1ZfXT+DU6rBBdbiKGBuay9B6xGSPVjUeQwaH1RIGqef8RZkUtHioLmSNpPR5M4HVKJGm1j8FWVQ==", "dev": true }, "ipaddr.js": { @@ -41088,9 +44114,9 @@ }, "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==" } } }, @@ -41986,24 +45012,6 @@ "xmlchars": "^2.2.0" } }, - "tough-cookie": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.1.2.tgz", - "integrity": "sha512-G9fqXWoYFZgTc2z8Q5zaHy/vJMjm+WV0AkAeHxVCQiEB1b+dGvWzFW6QV07cY5jQ5gRkeid2qIkzkxUnmoQZUQ==", - "dev": true, - "requires": { - "psl": "^1.1.33", - "punycode": "^2.1.1", - "universalify": "^0.2.0", - "url-parse": "^1.5.3" - } - }, - "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 - }, "w3c-xmlserializer": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/w3c-xmlserializer/-/w3c-xmlserializer-3.0.0.tgz", @@ -43243,24 +46251,6 @@ "combined-stream": "^1.0.8", "mime-types": "^2.1.12" } - }, - "tough-cookie": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.1.2.tgz", - "integrity": "sha512-G9fqXWoYFZgTc2z8Q5zaHy/vJMjm+WV0AkAeHxVCQiEB1b+dGvWzFW6QV07cY5jQ5gRkeid2qIkzkxUnmoQZUQ==", - "dev": true, - "requires": { - "psl": "^1.1.33", - "punycode": "^2.1.1", - "universalify": "^0.2.0", - "url-parse": "^1.5.3" - } - }, - "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 } } }, @@ -43328,14 +46318,43 @@ "dev": true }, "jsonwebtoken": { - "version": "9.0.0", - "resolved": "https://registry.npmjs.org/jsonwebtoken/-/jsonwebtoken-9.0.0.tgz", - "integrity": "sha512-tuGfYXxkQGDPnLJ7SibiQgVgeDgfbPq2k2ICcbgqW8WxWLBAxKQM/ZCu/IT8SOSwmaYl4dpTFCW5xZv7YbbWUw==", + "version": "9.0.2", + "resolved": "https://registry.npmjs.org/jsonwebtoken/-/jsonwebtoken-9.0.2.tgz", + "integrity": "sha512-PRp66vJ865SSqOlgqS8hujT5U4AOgMfhrwYIuIhfKaoSCZcirrmASQr8CX7cUg+RMih+hgznrjp99o+W4pJLHQ==", "requires": { "jws": "^3.2.2", - "lodash": "^4.17.21", + "lodash.includes": "^4.3.0", + "lodash.isboolean": "^3.0.3", + "lodash.isinteger": "^4.0.4", + "lodash.isnumber": "^3.0.3", + "lodash.isplainobject": "^4.0.6", + "lodash.isstring": "^4.0.1", + "lodash.once": "^4.0.0", "ms": "^2.1.1", - "semver": "^7.3.8" + "semver": "^7.5.4" + }, + "dependencies": { + "lru-cache": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", + "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", + "requires": { + "yallist": "^4.0.0" + } + }, + "semver": { + "version": "7.6.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.0.tgz", + "integrity": "sha512-EnwXhrlwXMk9gKu5/flx5sv/an57AkRplG3hTK68W7FRDN+k+OWBj65M7719OkA82XLBxrcX0KSHj+X5COhOVg==", + "requires": { + "lru-cache": "^6.0.0" + } + }, + "yallist": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", + "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==" + } } }, "jsprim": { @@ -43360,6 +46379,16 @@ "safe-buffer": "^5.0.1" } }, + "jwk-to-pem": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/jwk-to-pem/-/jwk-to-pem-2.0.5.tgz", + "integrity": "sha512-L90jwellhO8jRKYwbssU9ifaMVqajzj3fpRjDKcsDzrslU9syRbFqfkXtT4B89HYAap+xsxNcxgBSB09ig+a7A==", + "requires": { + "asn1.js": "^5.3.0", + "elliptic": "^6.5.4", + "safe-buffer": "^5.0.1" + } + }, "jws": { "version": "3.2.2", "resolved": "https://registry.npmjs.org/jws/-/jws-3.2.2.tgz", @@ -43445,9 +46474,9 @@ "optional": true }, "semver": { - "version": "5.7.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", - "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==", + "version": "5.7.2", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz", + "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==", "optional": true }, "source-map": { @@ -43545,6 +46574,11 @@ "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz", "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==" }, + "lodash.clonedeep": { + "version": "4.5.0", + "resolved": "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz", + "integrity": "sha512-H5ZhCF25riFd9uB5UCkVKo61m3S/xZk1x4wA6yp/L3RFP6Z/eHH1ymQcGLo7J3GMPfm0V/7m1tryHuGVxpqEBQ==" + }, "lodash.debounce": { "version": "4.0.8", "resolved": "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-4.0.8.tgz", @@ -43557,12 +46591,42 @@ "integrity": "sha512-z+Uw/vLuy6gQe8cfaFWD7p0wVv8fJl3mbzXh33RS+0oW2wvUqiRXiQ69gLWSLpgB5/6sU+r6BlQR0MBILadqTQ==", "dev": true }, + "lodash.includes": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/lodash.includes/-/lodash.includes-4.3.0.tgz", + "integrity": "sha512-W3Bx6mdkRTGtlJISOvVD/lbqjTlPPUDTMnlXZFnVwi9NKJ6tiAk6LVdlhZMm17VZisqhKcgzpO5Wz91PCt5b0w==" + }, + "lodash.isboolean": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/lodash.isboolean/-/lodash.isboolean-3.0.3.tgz", + "integrity": "sha512-Bz5mupy2SVbPHURB98VAcw+aHh4vRV5IPNhILUCsOzRmsTmSQ17jIuqopAentWoehktxGd9e/hbIXq980/1QJg==" + }, "lodash.isequal": { "version": "4.5.0", "resolved": "https://registry.npmjs.org/lodash.isequal/-/lodash.isequal-4.5.0.tgz", "integrity": "sha512-pDo3lu8Jhfjqls6GkMgpahsF9kCyayhgykjyLMNFTKWrpVdAQtYyB4muAMWozBB4ig/dtWAmsMxLEI8wuz+DYQ==", "dev": true }, + "lodash.isinteger": { + "version": "4.0.4", + "resolved": "https://registry.npmjs.org/lodash.isinteger/-/lodash.isinteger-4.0.4.tgz", + "integrity": "sha512-DBwtEWN2caHQ9/imiNeEA5ys1JoRtRfY3d7V9wkqtbycnAmTvRRmbHKDV4a0EYc678/dia0jrte4tjYwVBaZUA==" + }, + "lodash.isnumber": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/lodash.isnumber/-/lodash.isnumber-3.0.3.tgz", + "integrity": "sha512-QYqzpfwO3/CWf3XP+Z+tkQsfaLL/EnUlXWVkIk5FUPc4sBdTehEqZONuyRt2P67PXAk+NXmTBcc97zw9t1FQrw==" + }, + "lodash.isplainobject": { + "version": "4.0.6", + "resolved": "https://registry.npmjs.org/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz", + "integrity": "sha512-oSXzaWypCMHkPC3NvBEaPHf0KsA5mvPrOPgQWDsbg8n7orZ290M0BmC/jgRZ4vcJ6DTAhjrsSYgdsW/F+MFOBA==" + }, + "lodash.isstring": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/lodash.isstring/-/lodash.isstring-4.0.1.tgz", + "integrity": "sha512-0wJxfxH1wgO3GrbuP+dTTk7op+6L41QCXbGINEmD+ny/G/eCqGzxyCsh7159S+mgDDcoarnBw6PC1PS5+wUGgw==" + }, "lodash.memoize": { "version": "4.1.2", "resolved": "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-4.1.2.tgz", @@ -43577,8 +46641,7 @@ "lodash.once": { "version": "4.1.1", "resolved": "https://registry.npmjs.org/lodash.once/-/lodash.once-4.1.1.tgz", - "integrity": "sha512-Sb487aTOCr9drQVL8pIxOzVhafOjZN9UU54hiN8PU3uAiSV7lx1yYNpbNmex2PK6dSJoNTSJUUswT651yww3Mg==", - "devOptional": true + "integrity": "sha512-Sb487aTOCr9drQVL8pIxOzVhafOjZN9UU54hiN8PU3uAiSV7lx1yYNpbNmex2PK6dSJoNTSJUUswT651yww3Mg==" }, "lodash.uniq": { "version": "4.5.0", @@ -43739,9 +46802,9 @@ }, "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==" } } }, @@ -43987,6 +47050,11 @@ "resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz", "integrity": "sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A==" }, + "minimalistic-crypto-utils": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz", + "integrity": "sha512-JIYlbt6g8i5jKfJ3xz7rF0LXmv2TkDxBLUkiBeZ7bAx4GnnNMr8xFpGnOxn6GhTEHx3SjRrZEoU+j04prX1ktg==" + }, "minimatch": { "version": "3.0.5", "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.5.tgz", @@ -44271,9 +47339,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.7", + "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.7.tgz", + "integrity": "sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g==" }, "native-request": { "version": "1.1.0", @@ -45536,11 +48604,11 @@ } }, "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.31", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.31.tgz", + "integrity": "sha512-PS08Iboia9mts/2ygV3eLpY5ghnUcfLV/EXTOW1E2qYxJKGGBUtNjN76FYHnMs36RmARn41bC0AZmn+rR0OVpQ==", "requires": { - "nanoid": "^3.3.4", + "nanoid": "^3.3.6", "picocolors": "^1.0.0", "source-map-js": "^1.0.2" } @@ -46213,6 +49281,11 @@ "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz", "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==" }, + "promise-coalesce": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/promise-coalesce/-/promise-coalesce-1.1.2.tgz", + "integrity": "sha512-zLaJ9b8hnC564fnJH6NFSOGZYYdzrAJn2JUUIwzoQb32fG2QAakpDNM+CZo1km6keXkRXRM+hml1BFAPVnPkxg==" + }, "promise-inflight": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/promise-inflight/-/promise-inflight-1.0.1.tgz", @@ -46308,7 +49381,7 @@ "version": "2.2.0", "resolved": "https://registry.npmjs.org/querystringify/-/querystringify-2.2.0.tgz", "integrity": "sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ==", - "dev": true + "devOptional": true }, "queue-microtask": { "version": "1.2.3", @@ -46689,9 +49762,9 @@ } }, "rollup": { - "version": "3.10.0", - "resolved": "https://registry.npmjs.org/rollup/-/rollup-3.10.0.tgz", - "integrity": "sha512-JmRYz44NjC1MjVF2VKxc0M1a97vn+cDxeqWmnwyAF4FvpjK8YFdHpaqvQB+3IxCvX05vJxKZkoMDU8TShhmJVA==", + "version": "3.29.4", + "resolved": "https://registry.npmjs.org/rollup/-/rollup-3.29.4.tgz", + "integrity": "sha512-oWzmBZwvYrU0iJHtDmhsm662rC15FRXmcjCk1xD771dFDx5jJ02ufAQQTn0etB2emNk4J9EZg/yWKpsn9BWGRw==", "requires": { "fsevents": "~2.3.2" } @@ -46750,9 +49823,9 @@ "integrity": "sha512-LRneZZRXNgjzwG4bDQdOTSbze3fHm1EAKN/8bePxnlEZiBmkYEDggaHbuvHI9/hoqHbGfsEA7tWS9GhYHZBBsw==" }, "sass": { - "version": "1.57.1", - "resolved": "https://registry.npmjs.org/sass/-/sass-1.57.1.tgz", - "integrity": "sha512-O2+LwLS79op7GI0xZ8fqzF7X2m/m8WFfI02dHOdsK5R2ECeS5F62zrwg/relM1rjSLy7Vd/DiMNIvPrQGsA0jw==", + "version": "1.58.1", + "resolved": "https://registry.npmjs.org/sass/-/sass-1.58.1.tgz", + "integrity": "sha512-bnINi6nPXbP1XNRaranMFEBZWUfdW/AF16Ql5+ypRxfTvCRTTKrLsMIakyDcayUt2t/RZotmL4kgJwNH5xO+bg==", "requires": { "chokidar": ">=3.0.0 <4.0.0", "immutable": "^4.0.0", @@ -47555,9 +50628,9 @@ "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==" }, "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==" } } }, @@ -47742,9 +50815,9 @@ } }, "terser": { - "version": "5.16.1", - "resolved": "https://registry.npmjs.org/terser/-/terser-5.16.1.tgz", - "integrity": "sha512-xvQfyfA1ayT0qdK47zskQgRZeWLoOQ8JQ6mIgRGVNwZKdQMU+5FkCBjmv4QjcrTzyZquRw2FVtlJSRUmMKQslw==", + "version": "5.16.3", + "resolved": "https://registry.npmjs.org/terser/-/terser-5.16.3.tgz", + "integrity": "sha512-v8wWLaS/xt3nE9dgKEWhNUFP6q4kngO5B8eYFUuebsu7Dw/UNAnpUod6UHo04jSSkv8TzKHjZDSd7EXdDQAl8Q==", "requires": { "@jridgewell/source-map": "^0.3.2", "acorn": "^8.5.0", @@ -47939,13 +51012,23 @@ "dev": true }, "tough-cookie": { - "version": "2.5.0", - "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz", - "integrity": "sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==", + "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==", "devOptional": true, "requires": { - "psl": "^1.1.28", - "punycode": "^2.1.1" + "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==", + "devOptional": true + } } }, "tr46": { @@ -48257,11 +51340,11 @@ } }, "undici": { - "version": "5.22.1", - "resolved": "https://registry.npmjs.org/undici/-/undici-5.22.1.tgz", - "integrity": "sha512-Ji2IJhFXZY0x/0tVBXeQwgPlLWw13GVzpsWPQ3rV50IFMMof2I55PZZxtm4P6iNq+L5znYN9nSTAq0ZyE6lSJw==", + "version": "5.28.3", + "resolved": "https://registry.npmjs.org/undici/-/undici-5.28.3.tgz", + "integrity": "sha512-3ItfzbrhDlINjaP0duwnNsKpDQk3acHI3gVJ1z4fmwMK31k5G9OVIAMLSIaP6w4FaGkaAkN6zaQO9LUvZ1t7VA==", "requires": { - "busboy": "^1.6.0" + "@fastify/busboy": "^2.0.0" } }, "unicode-canonical-property-names-ecmascript": { @@ -48360,7 +51443,7 @@ "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, + "devOptional": true, "requires": { "querystringify": "^2.1.1", "requires-port": "^1.0.0" @@ -48455,15 +51538,177 @@ } }, "vite": { - "version": "4.0.4", - "resolved": "https://registry.npmjs.org/vite/-/vite-4.0.4.tgz", - "integrity": "sha512-xevPU7M8FU0i/80DMR+YhgrzR5KS2ORy1B4xcX/cXLsvnUWvfHuqMmVU6N0YiJ4JWGRJJsLCgjEzKjG9/GKoSw==", + "version": "4.5.2", + "resolved": "https://registry.npmjs.org/vite/-/vite-4.5.2.tgz", + "integrity": "sha512-tBCZBNSBbHQkaGyhGCDUGqeo2ph8Fstyp6FMSvTtsXeZSPpSMGlviAOav2hxVTqFcx8Hj/twtWKsMJXNY0xI8w==", "requires": { - "esbuild": "^0.16.3", + "esbuild": "^0.18.10", "fsevents": "~2.3.2", - "postcss": "^8.4.20", - "resolve": "^1.22.1", - "rollup": "^3.7.0" + "postcss": "^8.4.27", + "rollup": "^3.27.1" + }, + "dependencies": { + "@esbuild/android-arm": { + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.18.20.tgz", + "integrity": "sha512-fyi7TDI/ijKKNZTUJAQqiG5T7YjJXgnzkURqmGj13C6dCqckZBLdl4h7bkhHt/t0WP+zO9/zwroDvANaOqO5Sw==", + "optional": true + }, + "@esbuild/android-arm64": { + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.18.20.tgz", + "integrity": "sha512-Nz4rJcchGDtENV0eMKUNa6L12zz2zBDXuhj/Vjh18zGqB44Bi7MBMSXjgunJgjRhCmKOjnPuZp4Mb6OKqtMHLQ==", + "optional": true + }, + "@esbuild/android-x64": { + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.18.20.tgz", + "integrity": "sha512-8GDdlePJA8D6zlZYJV/jnrRAi6rOiNaCC/JclcXpB+KIuvfBN4owLtgzY2bsxnx666XjJx2kDPUmnTtR8qKQUg==", + "optional": true + }, + "@esbuild/darwin-arm64": { + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.18.20.tgz", + "integrity": "sha512-bxRHW5kHU38zS2lPTPOyuyTm+S+eobPUnTNkdJEfAddYgEcll4xkT8DB9d2008DtTbl7uJag2HuE5NZAZgnNEA==", + "optional": true + }, + "@esbuild/darwin-x64": { + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.18.20.tgz", + "integrity": "sha512-pc5gxlMDxzm513qPGbCbDukOdsGtKhfxD1zJKXjCCcU7ju50O7MeAZ8c4krSJcOIJGFR+qx21yMMVYwiQvyTyQ==", + "optional": true + }, + "@esbuild/freebsd-arm64": { + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.18.20.tgz", + "integrity": "sha512-yqDQHy4QHevpMAaxhhIwYPMv1NECwOvIpGCZkECn8w2WFHXjEwrBn3CeNIYsibZ/iZEUemj++M26W3cNR5h+Tw==", + "optional": true + }, + "@esbuild/freebsd-x64": { + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.18.20.tgz", + "integrity": "sha512-tgWRPPuQsd3RmBZwarGVHZQvtzfEBOreNuxEMKFcd5DaDn2PbBxfwLcj4+aenoh7ctXcbXmOQIn8HI6mCSw5MQ==", + "optional": true + }, + "@esbuild/linux-arm": { + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.18.20.tgz", + "integrity": "sha512-/5bHkMWnq1EgKr1V+Ybz3s1hWXok7mDFUMQ4cG10AfW3wL02PSZi5kFpYKrptDsgb2WAJIvRcDm+qIvXf/apvg==", + "optional": true + }, + "@esbuild/linux-arm64": { + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.18.20.tgz", + "integrity": "sha512-2YbscF+UL7SQAVIpnWvYwM+3LskyDmPhe31pE7/aoTMFKKzIc9lLbyGUpmmb8a8AixOL61sQ/mFh3jEjHYFvdA==", + "optional": true + }, + "@esbuild/linux-ia32": { + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.18.20.tgz", + "integrity": "sha512-P4etWwq6IsReT0E1KHU40bOnzMHoH73aXp96Fs8TIT6z9Hu8G6+0SHSw9i2isWrD2nbx2qo5yUqACgdfVGx7TA==", + "optional": true + }, + "@esbuild/linux-loong64": { + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.18.20.tgz", + "integrity": "sha512-nXW8nqBTrOpDLPgPY9uV+/1DjxoQ7DoB2N8eocyq8I9XuqJ7BiAMDMf9n1xZM9TgW0J8zrquIb/A7s3BJv7rjg==", + "optional": true + }, + "@esbuild/linux-mips64el": { + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.18.20.tgz", + "integrity": "sha512-d5NeaXZcHp8PzYy5VnXV3VSd2D328Zb+9dEq5HE6bw6+N86JVPExrA6O68OPwobntbNJ0pzCpUFZTo3w0GyetQ==", + "optional": true + }, + "@esbuild/linux-ppc64": { + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.18.20.tgz", + "integrity": "sha512-WHPyeScRNcmANnLQkq6AfyXRFr5D6N2sKgkFo2FqguP44Nw2eyDlbTdZwd9GYk98DZG9QItIiTlFLHJHjxP3FA==", + "optional": true + }, + "@esbuild/linux-riscv64": { + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.18.20.tgz", + "integrity": "sha512-WSxo6h5ecI5XH34KC7w5veNnKkju3zBRLEQNY7mv5mtBmrP/MjNBCAlsM2u5hDBlS3NGcTQpoBvRzqBcRtpq1A==", + "optional": true + }, + "@esbuild/linux-s390x": { + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.18.20.tgz", + "integrity": "sha512-+8231GMs3mAEth6Ja1iK0a1sQ3ohfcpzpRLH8uuc5/KVDFneH6jtAJLFGafpzpMRO6DzJ6AvXKze9LfFMrIHVQ==", + "optional": true + }, + "@esbuild/linux-x64": { + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.18.20.tgz", + "integrity": "sha512-UYqiqemphJcNsFEskc73jQ7B9jgwjWrSayxawS6UVFZGWrAAtkzjxSqnoclCXxWtfwLdzU+vTpcNYhpn43uP1w==", + "optional": true + }, + "@esbuild/netbsd-x64": { + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.18.20.tgz", + "integrity": "sha512-iO1c++VP6xUBUmltHZoMtCUdPlnPGdBom6IrO4gyKPFFVBKioIImVooR5I83nTew5UOYrk3gIJhbZh8X44y06A==", + "optional": true + }, + "@esbuild/openbsd-x64": { + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.18.20.tgz", + "integrity": "sha512-e5e4YSsuQfX4cxcygw/UCPIEP6wbIL+se3sxPdCiMbFLBWu0eiZOJ7WoD+ptCLrmjZBK1Wk7I6D/I3NglUGOxg==", + "optional": true + }, + "@esbuild/sunos-x64": { + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.18.20.tgz", + "integrity": "sha512-kDbFRFp0YpTQVVrqUd5FTYmWo45zGaXe0X8E1G/LKFC0v8x0vWrhOWSLITcCn63lmZIxfOMXtCfti/RxN/0wnQ==", + "optional": true + }, + "@esbuild/win32-arm64": { + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.18.20.tgz", + "integrity": "sha512-ddYFR6ItYgoaq4v4JmQQaAI5s7npztfV4Ag6NrhiaW0RrnOXqBkgwZLofVTlq1daVTQNhtI5oieTvkRPfZrePg==", + "optional": true + }, + "@esbuild/win32-ia32": { + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.18.20.tgz", + "integrity": "sha512-Wv7QBi3ID/rROT08SABTS7eV4hX26sVduqDOTe1MvGMjNd3EjOz4b7zeexIR62GTIEKrfJXKL9LFxTYgkyeu7g==", + "optional": true + }, + "@esbuild/win32-x64": { + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.18.20.tgz", + "integrity": "sha512-kTdfRcSiDfQca/y9QIkng02avJ+NCaQvrMejlsB3RRv5sE9rRoeBPISaZpKxHELzRxZyLvNts1P27W3wV+8geQ==", + "optional": true + }, + "esbuild": { + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.18.20.tgz", + "integrity": "sha512-ceqxoedUrcayh7Y7ZX6NdbbDzGROiyVBgC4PriJThBKSVPWnnFHZAkfI1lJT8QFkOwH4qOS2SJkS4wvpGl8BpA==", + "requires": { + "@esbuild/android-arm": "0.18.20", + "@esbuild/android-arm64": "0.18.20", + "@esbuild/android-x64": "0.18.20", + "@esbuild/darwin-arm64": "0.18.20", + "@esbuild/darwin-x64": "0.18.20", + "@esbuild/freebsd-arm64": "0.18.20", + "@esbuild/freebsd-x64": "0.18.20", + "@esbuild/linux-arm": "0.18.20", + "@esbuild/linux-arm64": "0.18.20", + "@esbuild/linux-ia32": "0.18.20", + "@esbuild/linux-loong64": "0.18.20", + "@esbuild/linux-mips64el": "0.18.20", + "@esbuild/linux-ppc64": "0.18.20", + "@esbuild/linux-riscv64": "0.18.20", + "@esbuild/linux-s390x": "0.18.20", + "@esbuild/linux-x64": "0.18.20", + "@esbuild/netbsd-x64": "0.18.20", + "@esbuild/openbsd-x64": "0.18.20", + "@esbuild/sunos-x64": "0.18.20", + "@esbuild/win32-arm64": "0.18.20", + "@esbuild/win32-ia32": "0.18.20", + "@esbuild/win32-x64": "0.18.20" + } + } } }, "vite-plugin-dts": { @@ -48720,9 +51965,9 @@ "dev": true }, "webpack": { - "version": "5.75.0", - "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.75.0.tgz", - "integrity": "sha512-piaIaoVJlqMsPtX/+3KTTO6jfvrSYgauFVdt8cr9LTHKmcq/AMd4mhzsiP7ZF/PGRNPGA8336jldh9l2Kt2ogQ==", + "version": "5.76.1", + "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.76.1.tgz", + "integrity": "sha512-4+YIK4Abzv8172/SGqObnUjaIHjLEuUasz9EwQj/9xmPPkYJy2Mh03Q/lJfSD3YLzbxy5FeTq5Uw0323Oh6SJQ==", "requires": { "@types/eslint-scope": "^3.7.3", "@types/estree": "^0.0.51", @@ -49009,9 +52254,9 @@ "integrity": "sha512-JcKqAHLPxcdb9KM49dufGXn2x3ssnfjbcaQdLlfZsL9rH9wgDQjUtDxbo8NE0F6SFvydeu1VhZe7hZuHsB2/pw==" }, "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": "1.2.5", + "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.5.tgz", + "integrity": "sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA==", "devOptional": true }, "wrap-ansi": { diff --git a/package.json b/package.json index 3e845f04..386fadfc 100644 --- a/package.json +++ b/package.json @@ -4,9 +4,12 @@ "license": "MIT", "scripts": { "ng": "nx", - "start": "concurrently \"nx serve server-asset-sg\" \"nx serve client-asset-sg --disableHostCheck=true\"", - "build": "nx build", - "postinstall": "node ./decorate-angular-cli.js" + "start": "concurrently \"npx nx serve server-asset-sg\" \"npx nx serve client-asset-sg --disableHostCheck=true\"", + "build": "concurrently \"npx nx build server-asset-sg\" \"npx nx build client-asset-sg\"", + "test": "npx nx run-many --target=test --all", + "lint": "npx nx run-many --target=lint --all", + "postinstall": "node ./decorate-angular-cli.js", + "prisma": "dotenv -e apps/server-asset-sg/.env.local -- npx prisma" }, "private": true, "dependencies": { @@ -21,12 +24,13 @@ "@angular/platform-browser": "15.1.0", "@angular/platform-browser-dynamic": "15.1.0", "@angular/router": "15.1.0", - "@aws-sdk/client-s3": "^3.241.0", + "@aws-sdk/client-s3": "^3.537.0", "@devexperts/remote-data-ts": "^2.1.1", "@elastic/elasticsearch": "^8.5.0", "@kobalte/core": "^0.4.0", "@morphic-ts/adt": "^3.0.0", "@nestjs/axios": "^2.0.0", + "@nestjs/cache-manager": "^2.2.2", "@nestjs/common": "^9.0.0", "@nestjs/core": "^9.0.0", "@nestjs/platform-express": "^9.0.0", @@ -45,12 +49,15 @@ "@turf/boolean-within": "^6.5.0", "@turf/helpers": "^6.5.0", "@turf/midpoint": "^6.5.0", + "angular-oauth2-oidc": "^17.0.1", "bezier-easing": "^2.1.0", + "cache-manager": "^5.4.0", "csv-parse": "^5.3.3", "cuid": "^3.0.0", "fp-ts": "^2.13.1", "io-ts": "^2.2.20", "jsonwebtoken": "^9.0.0", + "jwk-to-pem": "^2.0.5", "monocle-ts": "^2.3.13", "newtype-ts": "^0.3.5", "ngx-window-token": "^6.0.0", @@ -71,13 +78,14 @@ "zone.js": "~0.11.4" }, "devDependencies": { - "@angular-devkit/build-angular": "15.1.1", + "@angular-devkit/build-angular": "15.2.10", "@angular-eslint/eslint-plugin": "~15.0.0", "@angular-eslint/eslint-plugin-template": "~15.0.0", "@angular-eslint/template-parser": "~15.0.0", "@angular/cli": "~15.0.0", "@angular/compiler-cli": "15.1.0", "@angular/language-service": "15.1.0", + "@faker-js/faker": "^8.4.1", "@nestjs/schematics": "^9.0.0", "@nestjs/testing": "^9.0.0", "@nrwl/cypress": "15.5.2", @@ -91,6 +99,7 @@ "@nrwl/workspace": "15.5.2", "@types/jest": "28.1.1", "@types/jsonwebtoken": "^9.0.1", + "@types/jwk-to-pem": "^2.0.3", "@types/multer": "^1.4.7", "@types/node": "18.7.1", "@types/validator": "^13.7.10", @@ -100,6 +109,7 @@ "@vitest/ui": "^0.25.8", "concurrently": "^7.6.0", "cypress": "^11.0.0", + "dotenv-cli": "^7.4.1", "eslint": "~8.15.0", "eslint-config-prettier": "^8.6.0", "eslint-plugin-cypress": "^2.10.3", @@ -120,10 +130,13 @@ "ts-node": "10.9.1", "type-zoo": "^3.4.1", "typescript": "~4.8.2", - "vite": "^4.0.1", + "vite": "^4.5.2", "vite-plugin-dts": "~1.7.1", "vite-plugin-eslint": "^1.8.1", "vite-tsconfig-paths": "^4.0.2", "vitest": "^0.25.8" + }, + "prisma": { + "schema": "apps/server-asset-sg/src/app/prisma/schema.prisma" } } diff --git a/postgres-docker-image/build.sh b/postgres-docker-image/build.sh deleted file mode 100755 index 3f117eb6..00000000 --- a/postgres-docker-image/build.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh - -docker build -t registry.lambda-it.ch/lambda/postgis-gotrue . diff --git a/postgres-docker-image/postgres-readme.md b/postgres-docker-image/postgres-readme.md deleted file mode 100644 index 002d389c..00000000 --- a/postgres-docker-image/postgres-readme.md +++ /dev/null @@ -1,5 +0,0 @@ -- first build the image using build.sh -- then login to docker registry: - - docker login registry.lambda-it.ch -u username -- push the image to the registry: - - docker push registry.lambda-it.ch/lambda/postgis-gotrue diff --git a/test/data/asset-format-item.ts b/test/data/asset-format-item.ts new file mode 100644 index 00000000..40acdff7 --- /dev/null +++ b/test/data/asset-format-item.ts @@ -0,0 +1,169 @@ +import { AssetFormatItem } from '@prisma/client'; +import { faker } from '@faker-js/faker'; + +export const fakeAssetFormatItemCode = (): string => faker.helpers.arrayElement( + assetFormatItems.map((item) => item.assetFormatItemCode), +); + +export const assetFormatItems: AssetFormatItem[] = [ + { + assetFormatItemCode: 'archive', + geolCode: 'No-GeolCode-specified', + name: 'Archive', + nameDe: 'Archive-Format', + nameFr: 'Format d\'archive', + nameRm: '', + nameIt: 'Formato d\'archivio', + nameEn: 'Archive format', + description: 'Archive format resp. compression format, such as zip, tar, gz, bz2 etc.', + descriptionDe: 'Archivformat resp. Komprimierungsformat, wie z.B. zip, tar, gz, bz2 etc.', + descriptionFr: 'Format d\'archivage ou de compression, p. ex. zip, tar, gz, bz2, etc.', + descriptionRm: '', + descriptionIt: 'Formato d\'archivio o formato di compressione, come zip, tar, gz, bz2 ecc.', + descriptionEn: 'Archive format resp. compression format, such as zip, tar, gz, bz2 etc.', + }, + { + assetFormatItemCode: 'other', + geolCode: 'No-GeolCode-specified', + name: 'Other', + nameDe: 'Andere', + nameFr: 'Autres', + nameRm: '', + nameIt: 'Altro', + nameEn: 'Other', + description: 'Other formats of assets not covered by the values in this list', + descriptionDe: 'Andere Formate von Assets, die nicht mit den Werten dieser Liste abgedeckt sind', + descriptionFr: 'Autres formats d\'assets non couverts par les valeurs de cette liste', + descriptionRm: '', + descriptionIt: 'Altri formati di elementi non coperti dai valori di questo elenco', + descriptionEn: 'Other formats of assets not covered by the values in this list', + }, + { + assetFormatItemCode: 'textAnalog', + geolCode: 'No-GeolCode-specified', + name: 'Text analog', + nameDe: 'Analoge Dokumente (Papier, Mikrofichen etc.)', + nameFr: 'Documents analogiques (papier, microfiches, etc.)', + nameRm: '', + nameIt: 'Documenti analogici (cartaceo, microfiche, ecc.)', + nameEn: 'Analogue documents (paper, microfiche etc.)', + description: 'Analogue asset, on e.g. paper, microfiche etc.', + descriptionDe: 'Analoges Asset, auf z.B. Papier, Mikrofichen etc.', + descriptionFr: 'Asset analogique, p. ex. sur papier, microfiches, etc.', + descriptionRm: '', + descriptionIt: 'Elemento in formato analogico, ad esempio cartaceo, microfiche, ecc.', + descriptionEn: 'Analogue asset, on e.g. paper, microfiche etc.', + }, + { + assetFormatItemCode: 'graphicVector', + geolCode: 'No-GeolCode-specified', + name: 'Graphic vector', + nameDe: 'Digitale Vektorgrafik', + nameFr: 'Format graphique numérique vectoriel', + nameRm: '', + nameIt: 'Grafica digitale vettoriale', + nameEn: 'Digital vector graphics', + description: 'Vector graphics format, such as eps, ai, svg etc.', + descriptionDe: 'Vektorgrafikformat, wie z.B. eps, ai, svg etc.', + descriptionFr: 'Format graphique vectoriel, p. ex. eps, ai, svg, etc.', + descriptionRm: '', + descriptionIt: 'Formato grafico vettoriale, come eps, ai, svg ecc.', + descriptionEn: 'Vector graphics format, such as eps, ai, svg etc.', + }, + { + assetFormatItemCode: 'graphicRaster', + geolCode: 'No-GeolCode-specified', + name: 'Graphic raster', + nameDe: 'Digitale Rastergrafik', + nameFr: 'Format graphique numérique raster', + nameRm: '', + nameIt: 'Grafica digitale raster', + nameEn: 'Digital raster graphics', + description: 'Raster graphics format, such as tiff, jpeg, png etc.', + descriptionDe: 'Rastergrafikformat, wie z.B. tiff, jpeg, png etc.', + descriptionFr: 'Format graphique raster, p. ex. tiff, jpeg, png, etc.', + descriptionRm: '', + descriptionIt: 'Formato grafico raster, come tiff, jpeg, png ecc.', + descriptionEn: 'Raster graphics format, such as tiff, jpeg, png etc.', + }, + { + assetFormatItemCode: 'binary', + geolCode: 'No-GeolCode-specified', + name: 'Binary', + nameDe: 'Digitales binäres Format', + nameFr: 'Format binaire numérique', + nameRm: '', + nameIt: 'Formato binario digitale', + nameEn: 'Digital binary format', + description: 'Binary format', + descriptionDe: 'Binäres Format', + descriptionFr: 'Format binaire', + descriptionRm: '', + descriptionIt: 'Formato binario', + descriptionEn: 'Binary format', + }, + { + assetFormatItemCode: 'textDigital', + geolCode: 'No-GeolCode-specified', + name: 'Text digital', + nameDe: 'Textformat digital', + nameFr: 'Format texte numérique', + nameRm: '', + nameIt: 'Formato testo digitale', + nameEn: 'Digital text format', + description: 'Text or ASCII format, such as txt, doc, docx, xls, xlsx, xml, csv etc.', + descriptionDe: 'Textformat, wie z.B. txt, doc, docx, xls, xlsx, xml, csv etc.', + descriptionFr: 'Format texte, p. ex. txt, doc, docx, xls, xlsx, xml, csv etc.', + descriptionRm: '', + descriptionIt: 'Formato di testo, come txt, doc, docx, xls, xlsx, xml, csv ecc.', + descriptionEn: 'Text or ASCII format, such as txt, doc, docx, xls, xlsx, xml, csv etc.', + }, + { + assetFormatItemCode: 'seismic', + geolCode: 'No-GeolCode-specified', + name: 'Seismic', + nameDe: 'Seismikspezifisches Format', + nameFr: 'Format spécifique à la sismique', + nameRm: '', + nameIt: 'Formato specifico per il sismica', + nameEn: 'Seismic specific format', + description: 'Seismic-specific format, such as SPS, SEG2, SEGD, etc.', + descriptionDe: 'Seismikspezifisches Format, wie z.B. SPS, SEG2, SEGD etc.', + descriptionFr: 'Format spécifique à la sismologie, p. ex. SPS, SEG2, SEGD, etc.', + descriptionRm: '', + descriptionIt: 'Formato specifico per la sismica, come SPS, SEG2, SEGD, ecc.', + descriptionEn: 'Seismic-specific format, such as SPS, SEG2, SEGD, etc.', + }, + { + assetFormatItemCode: 'segy', + geolCode: 'No-GeolCode-specified', + name: 'SEGY', + nameDe: 'SEGY', + nameFr: 'SEGY', + nameRm: '', + nameIt: 'SEGY', + nameEn: 'SEGY', + description: 'Seismic-specific format SEGY', + descriptionDe: 'Seismikspezifisches Format SEGY', + descriptionFr: 'Format spécifique à la sismologie SEGY', + descriptionRm: '', + descriptionIt: 'Formato specifico sismico SEGY', + descriptionEn: 'Seismic-specific format SEGY', + }, + { + assetFormatItemCode: 'segyExported', + geolCode: 'No-GeolCode-specified', + name: 'SEGY exported', + nameDe: 'SEGY exportiert', + nameFr: 'SEGY exporté', + nameRm: '', + nameIt: 'SEGY esportato', + nameEn: 'SEGY exported', + description: 'Seismic-specific format SEGY exported', + descriptionDe: 'Seismikspezifisches Format SEGY exportiert', + descriptionFr: 'Format spécifique à la sismologie SEGY exporté', + descriptionRm: '', + descriptionIt: 'Formato specifico sismico SEGY esportato', + descriptionEn: 'Seismic-specific format SEGY exported', + }, +]; diff --git a/test/data/asset-kind-item.ts b/test/data/asset-kind-item.ts new file mode 100644 index 00000000..5277a144 --- /dev/null +++ b/test/data/asset-kind-item.ts @@ -0,0 +1,505 @@ +import { AssetKindItem } from '@prisma/client'; +import { faker } from '@faker-js/faker'; + +export const fakeAssetKindItemCode = (): string => faker.helpers.arrayElement( + assetKindItems.map((item) => item.assetKindItemCode), +); + +export const assetKindItems: AssetKindItem[] = [ + { + assetKindItemCode: "package", + geolCode: "No-GeolCode-specified", + name: "Asset package", + nameDe: "Asset-Paket", + nameFr: "Collection d'assets", + nameRm: "", + nameIt: "Raccolta di elementi", + nameEn: "Asset package", + description: "Collection/package of assets of different types", + descriptionDe: "Sammlung/Paket von Assets verschiedener Arten", + descriptionFr: "Collection/paquet d'assets de différents types", + descriptionRm: "", + descriptionIt: "Raccolta di elementi di diverso tipo", + descriptionEn: "Collection/package of assets of different types" + }, + { + assetKindItemCode: "other", + geolCode: "No-GeolCode-specified", + name: "Other", + nameDe: "Andere", + nameFr: "Autre", + nameRm: "", + nameIt: "Altro", + nameEn: "Other", + description: "Other types of assets not covered by the values in this list", + descriptionDe: "Andere Arten von Assets, die nicht mit den Werten dieser Liste abgedeckt sind", + descriptionFr: "Autres types d'assets non couverts par les valeurs de cette liste", + descriptionRm: "", + descriptionIt: "Altri tipi di elementi non coperti dai valori di questo elenco", + descriptionEn: "Other types of assets not covered by the values in this list" + }, + { + assetKindItemCode: "rawData", + geolCode: "No-GeolCode-specified", + name: "Raw data", + nameDe: "Rohdaten", + nameFr: "Données brutes", + nameRm: "", + nameIt: "Dati grezzi", + nameEn: "Raw data", + description: "Raw data", + descriptionDe: "Rohdaten", + descriptionFr: "Données brutes", + descriptionRm: "", + descriptionIt: "Dati grezzi", + descriptionEn: "Raw data" + }, + { + assetKindItemCode: "report", + geolCode: "No-GeolCode-specified", + name: "Report", + nameDe: "Bericht", + nameFr: "Rapport", + nameRm: "", + nameIt: "Rapporto", + nameEn: "Report", + description: "Geological reports or other documentation of geological investigations", + descriptionDe: "Geologsiche Berichte oder sonstige Dokumentationen von geologischen Untersuchungen", + descriptionFr: "Rapports géologiques ou autres documentations d'études géologiques", + descriptionRm: "", + descriptionIt: "Rapporti geologici o altra documentazione di indagini geologiche", + descriptionEn: "Geological reports or other documentation of geological investigations" + }, + { + assetKindItemCode: "measurements", + geolCode: "No-GeolCode-specified", + name: "Measurements", + nameDe: "Messungen allgemein", + nameFr: "Mesures en général", + nameRm: "", + nameIt: "Misure", + nameEn: "Measurements", + description: "Any type of measurements, if not further specifiable", + descriptionDe: "Jegliche Arten von Messungen, wenn nicht genauer spezifizierbar", + descriptionFr: "Tout type de mesures, en l'absence d'autres précisions", + descriptionRm: "", + descriptionIt: "Qualsiasi tipo di misura, se non ulteriormente specificabile", + descriptionEn: "Any type of measurements, if not further specifiable" + }, + { + assetKindItemCode: "log", + geolCode: "No-GeolCode-specified", + name: "Log", + nameDe: "LOG", + nameFr: "Log", + nameRm: "", + nameIt: "Log", + nameEn: "Log", + description: "Borehole log or other log data", + descriptionDe: "Bohr-Log oder andere Log-Daten", + descriptionFr: "Log de forage ou autres données de log", + descriptionRm: "", + descriptionIt: "Log di perforazione o altri dati di log", + descriptionEn: "Borehole log or other log data" + }, + { + assetKindItemCode: "deviceOutput", + geolCode: "No-GeolCode-specified", + name: "Device output", + nameDe: "Geräteoutput", + nameFr: "Données de sortie de l'appareil", + nameRm: "", + nameIt: "Output del dispositivo", + nameEn: "Device output", + description: "Data output directly from an instrument", + descriptionDe: "Daten, die direkt aus einem Gerät ausgegeben wurden", + descriptionFr: "Données sortant directement d'un appareil", + descriptionRm: "", + descriptionIt: "Dati di output ottenuti direttamente da uno strumento", + descriptionEn: "Data output directly from an instrument" + }, + { + assetKindItemCode: "manualFieldRecord", + geolCode: "No-GeolCode-specified", + name: "Manual field record", + nameDe: "Feldaufzeichnung", + nameFr: "Enregistrement de terrain", + nameRm: "", + nameIt: "Registrazione manuale sul campo", + nameEn: "Manual field record", + description: "Records made during fieldwork", + descriptionDe: "Aufzeichnungen, die bei der Feldarbeit gemacht wurden", + descriptionFr: "Enregistrements réalisés lors du travail sur le terrain", + descriptionRm: "", + descriptionIt: "Registrazioni effettuate durante i lavori sul campo", + descriptionEn: "Records made during fieldwork" + }, + { + assetKindItemCode: "labData", + geolCode: "No-GeolCode-specified", + name: "Lab data", + nameDe: "Labormessung", + nameFr: "Mesure en laboratoire", + nameRm: "", + nameIt: "Dati di laboratorio", + nameEn: "Laboratory data", + description: "Data collected in the laboratory, e.g. grain distribution, compressive strength tests, etc.", + descriptionDe: "Daten, die im Labor erhoben wurden, wie z.B. Kornverteilung, Druckversuche, etc.", + descriptionFr: "Données collectées en laboratoire, p. ex. répartition granulométrique, essais de compression, etc.", + descriptionRm: "", + descriptionIt: "Dati raccolti in laboratorio, ad esempio distribuzione granulometrica, prove di pressione, ecc.", + descriptionEn: "Data collected in the laboratory, e.g. grain distribution, compressive strength tests, etc." + }, + { + assetKindItemCode: "map", + geolCode: "No-GeolCode-specified", + name: "Map", + nameDe: "Karte allgemein", + nameFr: "Carte en général", + nameRm: "", + nameIt: "Mappa", + nameEn: "Map", + description: "Any type of maps, if not specifiable", + descriptionDe: "Jegliche Arten von Karten, wenn nicht genauer spezifizierbar", + descriptionFr: "Tout type de carte, en l'absence d'autres précisions", + descriptionRm: "", + descriptionIt: "Qualsiasi tipo di mappa, se non specificabile", + descriptionEn: "Any type of maps, if not specifiable" + }, + { + assetKindItemCode: "shotpointmap", + geolCode: "No-GeolCode-specified", + name: "Shotpoint map", + nameDe: "Schusspunktkarte", + nameFr: "Carte des points de tir", + nameRm: "", + nameIt: "Mappa dei punti di tiro", + nameEn: "Shotpoint map", + description: "Map of seismic survey shot points", + descriptionDe: "Karte der Schusspunkte bei einer Seismischen Untersuchung", + descriptionFr: "Carte des points de tir lors d'une étude sismique", + descriptionRm: "", + descriptionIt: "Mappa dei punti di tiro durante un'indagine sismica", + descriptionEn: "Map of seismic survey shot points" + }, + { + assetKindItemCode: "basemap", + geolCode: "No-GeolCode-specified", + name: "Basemap", + nameDe: "Basemap", + nameFr: "Carte de base", + nameRm: "", + nameIt: "Mappa di base", + nameEn: "Basemap", + description: "Base map", + descriptionDe: "Grundkarte", + descriptionFr: "Carte de base", + descriptionRm: "", + descriptionIt: "Mappa di base", + descriptionEn: "Base map" + }, + { + assetKindItemCode: "wellLocationmap", + geolCode: "No-GeolCode-specified", + name: "Well location map", + nameDe: "Bohrstandortkarte", + nameFr: "Carte du site de forage", + nameRm: "", + nameIt: "Mappa della posizione della perforazione", + nameEn: "Borehole location map", + description: "Map showing locations of one or more boreholes", + descriptionDe: "Karte mit den Standorten von einer oder mehrer Bohrungen", + descriptionFr: "Carte montrant l'emplacement d'un ou de plusieurs forages", + descriptionRm: "", + descriptionIt: "Mappa che mostra l'ubicazione di uno o più perforazioni", + descriptionEn: "Map showing locations of one or more boreholes" + }, + { + assetKindItemCode: "geologicalMap", + geolCode: "No-GeolCode-specified", + name: "Geological map", + nameDe: "Geologische Karte", + nameFr: "Carte géologique", + nameRm: "", + nameIt: "Carta geologica", + nameEn: "Geological map", + description: "Geological map", + descriptionDe: "Geologische Karte", + descriptionFr: "Carte géologique", + descriptionRm: "", + descriptionIt: "Carta geologica", + descriptionEn: "Geological map" + }, + { + assetKindItemCode: "location", + geolCode: "No-GeolCode-specified", + name: "Location", + nameDe: "Situationsplan", + nameFr: "Plan de situation", + nameRm: "", + nameIt: "Posizione", + nameEn: "Location", + description: "Site plan,locality plan of an investigation", + descriptionDe: "Situationsplan, Lageplan einer Untersuchung", + descriptionFr: "Plan de situation, plan d'implantation d'une étude", + descriptionRm: "", + descriptionIt: "Localizzazone del sito o di un'indagine", + descriptionEn: "Site plan,locality plan of an investigation" + }, + { + assetKindItemCode: "crossSection", + geolCode: "No-GeolCode-specified", + name: "Cross section", + nameDe: "Geologischer Profilschnitt", + nameFr: "Coupe géologique", + nameRm: "", + nameIt: "Sezione geologica trasversale", + nameEn: "Cross section", + description: "Geological cross section or profile", + descriptionDe: "Geologische Längen- oder Querprofile", + descriptionFr: "Coupes géologiques longitudinales ou transversales", + descriptionRm: "", + descriptionIt: "Profili geologici longitudinali o trasversali", + descriptionEn: "Geological cross section or profile" + }, + { + assetKindItemCode: "seismicSection", + geolCode: "No-GeolCode-specified", + name: "Seismic section", + nameDe: "Seismische Section", + nameFr: "Section sismique", + nameRm: "", + nameIt: "Sezione sismica", + nameEn: "Seismic section", + description: "Seismic section", + descriptionDe: "Seismische Sektion", + descriptionFr: "Section sismique", + descriptionRm: "", + descriptionIt: "Sezione sismica", + descriptionEn: "Seismic section" + }, + { + assetKindItemCode: "drillPath", + geolCode: "No-GeolCode-specified", + name: "Drill path", + nameDe: "Bohrpfad", + nameFr: "Trajectoire de forage", + nameRm: "", + nameIt: "Percorso di perforazione", + nameEn: "Borehole path", + description: "Borehole path: information on the spatial course of the borehole", + descriptionDe: "Bohrpfad: Angaben zum räumlichen Verlauf der Bohrung", + descriptionFr: "Trajectoire de forage : indications sur le tracé spatial du forage", + descriptionRm: "", + descriptionIt: "Percorso della perforazione: informazioni sulla traccia della perforazione", + descriptionEn: "Borehole path: information on the spatial course of the borehole" + }, + { + assetKindItemCode: "softwareCode", + geolCode: "No-GeolCode-specified", + name: "Software / code", + nameDe: "Software-Code", + nameFr: "Code du logiciel", + nameRm: "", + nameIt: "Software / codice", + nameEn: "Software / code", + description: "Software, script, code/coding", + descriptionDe: "Software, Skript, Code/Codierung", + descriptionFr: "Logiciel, script, code/codage", + descriptionRm: "", + descriptionIt: "Software, script, codice", + descriptionEn: "Software, script, code/coding" + }, + { + assetKindItemCode: "model", + geolCode: "No-GeolCode-specified", + name: "Model", + nameDe: "Modell", + nameFr: "Modèle", + nameRm: "", + nameIt: "Modello", + nameEn: "Model", + description: "Models, e.g. 3D model, block model, etc.", + descriptionDe: "Modelle, z.B. 3D-Modell, Blocksturzmodell, etc.", + descriptionFr: "Modèles, p. ex. modèle 3D, modèle de chute de blocs, etc.", + descriptionRm: "", + descriptionIt: "Modelli, ad esempio modello 3D, modello di scivolamento di blocchi, ecc.", + descriptionEn: "Models, e.g. 3D model, block model, etc." + }, + { + assetKindItemCode: "photo", + geolCode: "No-GeolCode-specified", + name: "Photo", + nameDe: "Foto", + nameFr: "Photo", + nameRm: "", + nameIt: "Foto", + nameEn: "Photo", + description: "Any kind of photos", + descriptionDe: "Jegliche Art von Fotos", + descriptionFr: "Tout type de photos", + descriptionRm: "", + descriptionIt: "Qualsiasi tipo di foto", + descriptionEn: "Any kind of photos" + }, + { + assetKindItemCode: "seismic3D", + geolCode: "No-GeolCode-specified", + name: "Seismic 3D", + nameDe: "Seismische 3D Untersuchung", + nameFr: "Étude sismique 3D", + nameRm: "", + nameIt: "Sismica 3D", + nameEn: "Seismic 3D", + description: "Data from 3D seismic surveys (3D seismic)", + descriptionDe: "Daten aus 3D-seismischen Untersuchungen (3D-Seismik)", + descriptionFr: "Données d'études sismiques 3D", + descriptionRm: "", + descriptionIt: "Dati provenienti da indagini sismiche 3D (sismica 3D)", + descriptionEn: "Data from 3D seismic surveys (3D seismic)" + }, + { + assetKindItemCode: "profileSection", + geolCode: "No-GeolCode-specified", + name: "Profile / section", + nameDe: "Profil / Profilschnitt", + nameFr: "Profil / Coupe", + nameRm: "", + nameIt: "Profilo / sezione", + nameEn: "Profile / section", + description: "Any kind of sections or profiles, if not further specifiable", + descriptionDe: "Jegliche Arten von Profilen, wenn nicht genauer spezifizierbar", + descriptionFr: "Tout type de profil ou de coupe, en l'absence d'autres précisions", + descriptionRm: "", + descriptionIt: "Qualsiasi tipo di profilo, se non ulteriormente specificabile", + descriptionEn: "Any kind of sections or profiles, if not further specifiable" + }, + { + assetKindItemCode: "seismicInterpretation", + geolCode: "No-GeolCode-specified", + name: "Seismic interpretation", + nameDe: "Seismische Interpretation", + nameFr: "Interprétation sismique", + nameRm: "", + nameIt: "Interpretazione sismica", + nameEn: "Seismic interpretation", + description: "Profile with seismic interpretation", + descriptionDe: "Profil mit seismischer Interpretation", + descriptionFr: "Profil avec interprétation sismique", + descriptionRm: "", + descriptionIt: "Profilo con interpretazione sismica", + descriptionEn: "Profile with seismic interpretation" + }, + { + assetKindItemCode: "boreholeProfile", + geolCode: "No-GeolCode-specified", + name: "Borehole profile", + nameDe: "Bohrprofil", + nameFr: "Profil de forage", + nameRm: "", + nameIt: "Profilo della perforazione", + nameEn: "Borehole profile", + description: "Borehole profile: representation of the drilled layers, layer interpretations and further information on the borehole", + descriptionDe: "Bohrprofil: Darstellung der erbohrten Schichten, Schichtinterpretationen und weiteren Angaben zur Bohrung", + descriptionFr: "Profil de forage : représentation des couches forées, interprétations des couches et autres indications sur le forage.", + descriptionRm: "", + descriptionIt: "Profilo della perforazione: rappresentazione degli strati perforati, interpretazione degli strati e ulteriori informazioni sulla perforazione", + descriptionEn: "Borehole profile: representation of the drilled layers, layer interpretations and further information on the borehole" + }, + { + assetKindItemCode: "boreholeCompletion", + geolCode: "No-GeolCode-specified", + name: "Borehole completion", + nameDe: "Bohrlochausbau", + nameFr: "Aménagement du forage", + nameRm: "", + nameIt: "Completamento della perforazione", + nameEn: "Borehole completion", + description: "Borehole completion: details of casing, backfill, internals (e.g. piezometer), etc.", + descriptionDe: "Bohrlochausbau: Angaben zu Verrohrung, Hinterfüllung, Einbauten (z.B. Piezometer), etc.", + descriptionFr: "Aménagement du trou de forage : indications sur le tubage, le remblayage, les installations (p. ex. piézomètre), etc.", + descriptionRm: "", + descriptionIt: "Completamento dela perforazione: dettagli del tipo di tubatura, del riempimento, dei componenti interni (ad es. piezometro), ecc.", + descriptionEn: "Borehole completion: details of casing, backfill, internals (e.g. piezometer), etc." + }, + { + assetKindItemCode: "configuration", + geolCode: "No-GeolCode-specified", + name: "configuration", + nameDe: "Konfiguration", + nameFr: "Configuration", + nameRm: "", + nameIt: "Configurazione", + nameEn: "configuration", + description: "Configurations of modelling or other calculations", + descriptionDe: "Konfigurationen von Modellierungen oder sonstigen Berechnungen", + descriptionFr: "Configurations de modélisations ou autres calculs", + descriptionRm: "", + descriptionIt: "Configurazioni di modellazione o altri calcoli", + descriptionEn: "Configurations of modelling or other calculations" + }, + { + assetKindItemCode: "multmedia", + geolCode: "No-GeolCode-specified", + name: "Multmedia", + nameDe: "Multimediadatei", + nameFr: "Fichier multimédia", + nameRm: "", + nameIt: "File multimediale", + nameEn: "Multmedia", + description: "Any type of multimedia files, if not further specifiable.", + descriptionDe: "Jegliche Art von Multimediadateien, wenn nicht genauer spezifizierbar", + descriptionFr: "Tout type de fichier multimédia, en l'absence d'autres précisions", + descriptionRm: "", + descriptionIt: "Qualsiasi tipo di file multimediale, se non ulteriormente specificabile.", + descriptionEn: "Any type of multimedia files, if not further specifiable." + }, + { + assetKindItemCode: "video", + geolCode: "No-GeolCode-specified", + name: "Video", + nameDe: "Video", + nameFr: "Vidéo", + nameRm: "", + nameIt: "Video", + nameEn: "Video", + description: "Any type of video", + descriptionDe: "Jegliche Art von Videos", + descriptionFr: "Tout type de vidéos", + descriptionRm: "", + descriptionIt: "Qualsiasi tipo di video", + descriptionEn: "Any type of video" + }, + { + assetKindItemCode: "unknown", + geolCode: "No-GeolCode-specified", + name: "Unknown", + nameDe: "Unbekannt", + nameFr: "Inconnu", + nameRm: "", + nameIt: "Sconosciuto", + nameEn: "Unknown", + description: "Assets whose nature/type is not known", + descriptionDe: "Assets, deren Art/Typ nicht bekannt ist", + descriptionFr: "Assets dont la nature/le type n'est pas connu/e", + descriptionRm: "", + descriptionIt: "Attività la cui natura/tipo non è nota", + descriptionEn: "Assets whose nature/type is not known" + }, + { + assetKindItemCode: "inSitu", + geolCode: "No-GeolCode-specified", + name: "In-situ measurment", + nameDe: "In-situ Messung", + nameFr: "Mesure in situ", + nameRm: "", + nameIt: "Misurazione in situ", + nameEn: "In-situ measurement", + description: "Any kind of in-situ measurements, such as pump test, well test, etc.", + descriptionDe: "Jegliche Art von In-situ Messungen, wie z.B. Pumpversuch, Well-Test, etc.", + descriptionFr: "Tout type de mesures in situ, p. ex. essai de pompage, test de puits, etc.", + descriptionRm: "", + descriptionIt: "Qualsiasi tipo di misurazione in situ, come un test di pompaggio, il test del pozzo, ecc.", + descriptionEn: "Any kind of in-situ measurements, such as pump test, well test, etc." + } +] diff --git a/test/data/language-items.ts b/test/data/language-items.ts new file mode 100644 index 00000000..e22e39b8 --- /dev/null +++ b/test/data/language-items.ts @@ -0,0 +1,105 @@ +import { LanguageItem } from '@prisma/client'; +import { faker } from '@faker-js/faker'; + +export const fakeLanguageItemCode = (): string => faker.helpers.arrayElement( + languageItems.map((item) => item.languageItemCode), +); + +export const languageItems: LanguageItem[] = [ + { + languageItemCode: 'EN', + geolCode: 'No-GeolCode-specified', + name: 'english', + nameDe: 'englisch', + nameFr: 'anglais', + nameRm: 'englais', + nameIt: 'inglese', + nameEn: 'english', + description: 'Asset in English', + descriptionDe: 'Asset in Englisch', + descriptionFr: 'Asset en anglais', + descriptionRm: '', + descriptionIt: 'Asset in inglese', + descriptionEn: 'Asset in English', + }, + { + languageItemCode: 'IT', + geolCode: 'No-GeolCode-specified', + name: 'italian', + nameDe: 'italienisch', + nameFr: 'italien', + nameRm: 'talian', + nameIt: 'italiano', + nameEn: 'italian', + description: 'Asset in Italian', + descriptionDe: 'Asset in Italienisch', + descriptionFr: 'Asset en italien', + descriptionRm: '', + descriptionIt: 'Elemento in italiano', + descriptionEn: 'Asset in Italian', + }, + { + languageItemCode: 'FR', + geolCode: 'No-GeolCode-specified', + name: 'french', + nameDe: 'französisch', + nameFr: 'français', + nameRm: 'franzos', + nameIt: 'francese', + nameEn: 'french', + description: 'Asset in French', + descriptionDe: 'Asset in Französisch', + descriptionFr: 'Asset en français', + descriptionRm: '', + descriptionIt: 'Elemento in francese', + descriptionEn: 'Asset in French', + }, + { + languageItemCode: 'DE', + geolCode: 'No-GeolCode-specified', + name: 'german', + nameDe: 'deutsch', + nameFr: 'allemand', + nameRm: 'tudestg', + nameIt: 'tedesco', + nameEn: 'german', + description: 'Asset in German', + descriptionDe: 'Asset in Deutsch', + descriptionFr: 'Asset en allemand', + descriptionRm: '', + descriptionIt: 'Elemento in tedesco', + descriptionEn: 'Asset in German', + }, + { + languageItemCode: 'other', + geolCode: 'No-GeolCode-specified', + name: 'other languages', + nameDe: 'andere Sprachen', + nameFr: 'autres langues', + nameRm: 'autras linguas', + nameIt: 'altre lingue', + nameEn: 'other languages', + description: 'Asset in other languages', + descriptionDe: 'Asset in anderer Sprachen', + descriptionFr: 'Assets dans d\'autres langues', + descriptionRm: '', + descriptionIt: 'Elemento in altre lingue', + descriptionEn: 'Asset in other languages', + }, + { + languageItemCode: 'NUM', + geolCode: 'No-GeolCode-specified', + name: 'numeric', + nameDe: 'numerisch', + nameFr: 'numérique', + nameRm: '', + nameIt: 'numerico', + nameEn: 'numeric', + description: 'Asset with numerical structure, e.g. programme code, configurations', + descriptionDe: 'Asset mit numerischem Aufbau, wie z.B. Programmcode, Konfigurationen', + descriptionFr: 'Asset à structure numérique, p. ex. code de programme, configurations', + descriptionRm: '', + descriptionIt: 'Elemento con struttura numerica, ad es. codice programma, configurazioni', + descriptionEn: 'Asset with numerical structure, e.g. programme code, configurations', + }, +]; diff --git a/test/data/man-cat-label-item.ts b/test/data/man-cat-label-item.ts new file mode 100644 index 00000000..cdbc8aa4 --- /dev/null +++ b/test/data/man-cat-label-item.ts @@ -0,0 +1,201 @@ +import { ManCatLabelItem } from '@prisma/client'; +import { faker } from '@faker-js/faker'; + +export const fakeManCatLabelItemCode = (): string => faker.helpers.arrayElement( + manCatLabelItems.map((item) => item.manCatLabelItemCode), +); + +export const manCatLabelItems: ManCatLabelItem[] = [ + { + manCatLabelItemCode: 'energyRessources', + geolCode: 'No-GeolCode-specified', + name: 'Energy ressources', + nameDe: 'Geoenergie, Geothermie, Energierohstoffe (Erdöl/Erdgas/Kohle)', + nameFr: 'Géoénergie, géothermie, matières premières énergétiques (pétrole/gaz naturel/charbon)', + nameRm: '', + nameIt: 'Geoenergia, energia geotermica, risorse energetiche (petrolio/gas naturale/carbone)', + nameEn: 'Geoenergy, geothermal energy, energy resources (oil/natural gas/coal)', + description: 'Geoenergy assets, e.g. geothermal energy, energy resources (oil, gas, coal), etc.', + descriptionDe: 'Assets zum Thema Geoenergie, wie z.B. Geothermie, Energierohstoffe (Erdöl, Erdgas, Kohle), etc.', + descriptionFr: 'Assets sur le thème des géoénergies, p. ex. géothermie, matières premières énergétiques (pétrole, gaz naturel, charbon), etc.', + descriptionRm: '', + descriptionIt: 'Elementi sul tema della geoenergia, ad esempio energia geotermica, risorse energetiche (petrolio, gas, carbone), ecc.', + descriptionEn: 'Geoenergy assets, e.g. geothermal energy, energy resources (oil, gas, coal), etc.', + }, + { + manCatLabelItemCode: 'science', + geolCode: 'No-GeolCode-specified', + name: 'Science', + nameDe: 'Wissenschaftl. Abschlussarbeiten', + nameFr: 'Travaux scientifiques de fin d\'études', + nameRm: '', + nameIt: 'Tesi scientifiche', + nameEn: 'Scientific theses', + description: 'Assets in the form of a scientific thesis', + descriptionDe: 'Assets ins Form einer wissenschaftl. Abschlussarbeiten', + descriptionFr: 'Assets sous la forme d\'un travail scientifique de fin d\'études', + descriptionRm: '', + descriptionIt: 'Elementi in forma di tesi scientifica', + descriptionEn: 'Assets in the form of a scientific thesis', + }, + { + manCatLabelItemCode: 'geotechnics', + geolCode: 'No-GeolCode-specified', + name: 'Geotechnics', + nameDe: 'Geotechnik', + nameFr: 'Géotechnique', + nameRm: '', + nameIt: 'Geotecnica', + nameEn: 'Geotechnics', + description: 'Assets on the topic of geotechnics', + descriptionDe: 'Assets zum Thema Geotechnik', + descriptionFr: 'Assets sur le thème de la géotechnique', + descriptionRm: '', + descriptionIt: 'Elementi sul tema della geotecnica', + descriptionEn: 'Assets on the topic of geotechnics', + }, + { + manCatLabelItemCode: 'geophysics', + geolCode: 'No-GeolCode-specified', + name: 'Geophysics', + nameDe: 'Geophysik', + nameFr: 'Géophysique', + nameRm: '', + nameIt: 'Geofisica', + nameEn: 'Geophysics', + description: 'Assets on the topic of geophysics', + descriptionDe: 'Assets zum Thema Geophysik', + descriptionFr: 'Assets sur le thème de la géophysique', + descriptionRm: '', + descriptionIt: 'Elementi sul tema della geofisica', + descriptionEn: 'Assets on the topic of geophysics', + }, + { + manCatLabelItemCode: 'borehole', + geolCode: 'No-GeolCode-specified', + name: 'Borehole', + nameDe: 'Bohrungen', + nameFr: 'Forages', + nameRm: '', + nameIt: 'Perforazioni', + nameEn: 'Boreholes', + description: 'Assets on the topic of boreholes, e.g. borehole profiles and reports', + descriptionDe: 'Assets zum Thema Bohrungen, z.B. Bohrprofile und Berichte zu Bohrungen', + descriptionFr: 'Assets sur le thème des forages, p. ex. profils et rapports de forage', + descriptionRm: '', + descriptionIt: 'Elementi sul tema della perforazione, ad esempio profili e rpporti di perforazione.', + descriptionEn: 'Assets on the topic of boreholes, e.g. borehole profiles and reports', + }, + { + manCatLabelItemCode: 'other', + geolCode: 'No-GeolCode-specified', + name: 'Other', + nameDe: 'Andere', + nameFr: 'Autres', + nameRm: '', + nameIt: 'Altro', + nameEn: 'Other', + description: 'Assets on other topics not covered by the values in this list', + descriptionDe: 'Assets zu anderen Themen, die nicht mit den Werten dieser Liste abgedeckt sind', + descriptionFr: 'Assets sur d\'autres thèmes qui ne sont pas couverts par les valeurs de cette liste', + descriptionRm: '', + descriptionIt: 'Elementi su altri argomenti non coperti dai valori di questo elenco', + descriptionEn: 'Assets on other topics not covered by the values in this list', + }, + { + manCatLabelItemCode: 'naturalHazards', + geolCode: 'No-GeolCode-specified', + name: 'Natural hazards', + nameDe: 'Naturgefahren', + nameFr: 'Dangers naturels', + nameRm: '', + nameIt: 'Rischi naturali', + nameEn: 'Natural hazards', + description: 'Assets on the topic of natural hazards', + descriptionDe: 'Assets zum Thema Naturgefahren', + descriptionFr: 'Assets sur le thème des dangers naturels', + descriptionRm: '', + descriptionIt: 'Elementi sul tema dei rischi naturali', + descriptionEn: 'Assets on the topic of natural hazards', + }, + { + manCatLabelItemCode: 'hydrogeology', + geolCode: 'No-GeolCode-specified', + name: 'Hydrogeology', + nameDe: 'Hydrogeologie', + nameFr: 'Hydrogéologie', + nameRm: '', + nameIt: 'Idrogeologia', + nameEn: 'Hydrogeology', + description: 'Assets on the topic of hydrogeology', + descriptionDe: 'Assets zum Thema Hydrogeologie', + descriptionFr: 'Assets sur le thème de l\'hydrogéologie', + descriptionRm: '', + descriptionIt: 'Elementi sul tema dell\'idrogeologia', + descriptionEn: 'Assets on the topic of hydrogeology', + }, + { + manCatLabelItemCode: 'pollution', + geolCode: 'No-GeolCode-specified', + name: 'Pollution', + nameDe: 'Altlasten', + nameFr: 'Sites contaminés', + nameRm: '', + nameIt: 'Siti contaminati', + nameEn: 'Contaminated sites', + description: 'Assets on the topic of contaminated sites', + descriptionDe: 'Assets zum Thema Altlasten', + descriptionFr: 'Assets sur le thème des sites contaminés', + descriptionRm: '', + descriptionIt: 'Elementi sul tema dei siti contaminati', + descriptionEn: 'Assets on the topic of contaminated sites', + }, + { + manCatLabelItemCode: 'mineralRessources', + geolCode: 'No-GeolCode-specified', + name: 'Mineralressources', + nameDe: 'Mineralische Rohstoffe', + nameFr: 'Matières premières minérales', + nameRm: '', + nameIt: 'Risorse minerali', + nameEn: 'Mineral Resources', + description: 'Assets on the topic of mineral resources (incl. mining, quarries, gravel pits, etc.)', + descriptionDe: 'Assets zum Thema Mineralische Rohstoffe (inkl. Bergbau, Steinbruch, Kiesgrube etc.)', + descriptionFr: 'Assets sur le thème des ressources minérales (y compris exploitation minière, carrières, gravières, etc.)', + descriptionRm: '', + descriptionIt: 'Elementi sul tema delle risorse minerali (incluse miniere, cave di roccia, cave di ghiaia, ecc.)', + descriptionEn: 'Assets on the topic of mineral resources (incl. mining, quarries, gravel pits, etc.)', + }, + { + manCatLabelItemCode: 'prospection', + geolCode: 'No-GeolCode-specified', + name: 'Prospection', + nameDe: 'Prospektion (z.B. Rohstoffe)', + nameFr: 'Prospection (p. ex. matières premières)', + nameRm: '', + nameIt: 'Prospezione (ad es. materie prime)', + nameEn: 'Prospecting (e.g. raw materials)', + description: 'Assets on the topic of prospecting, e.g. of mineral raw materials', + descriptionDe: 'Assets zum Thema Prospektion, wie z.B. von mineralischen Rohstoffen', + descriptionFr: 'Assets sur le thème de la prospection, p. ex. matières premières minérales', + descriptionRm: '', + descriptionIt: 'Elementi sul tema della prospezione, ad esempio di materie prime minerali', + descriptionEn: 'Assets on the topic of prospecting, e.g. of mineral raw materials', + }, + { + manCatLabelItemCode: 'exploration', + geolCode: 'No-GeolCode-specified', + name: 'Exploration', + nameDe: 'Exploration', + nameFr: 'Exploration', + nameRm: '', + nameIt: 'Esplorazione', + nameEn: 'Exploration', + description: 'Assets on the topic of exploration, e.g. of minerals and raw materials', + descriptionDe: 'Assets zum Thema Exploration, wie z.B. von mineralischen Rohstoffen', + descriptionFr: 'Assets sur le thème de l\'exploration, p. ex. ressources minérales', + descriptionRm: '', + descriptionIt: 'Elementi sul tema dell\'esplorazione, ad es. di materie prime minerali', + descriptionEn: 'Assets on the topic of exploration, e.g. of minerals and raw materials', + }, +]; diff --git a/test/data/status-asset-use-item.ts b/test/data/status-asset-use-item.ts new file mode 100644 index 00000000..ee666588 --- /dev/null +++ b/test/data/status-asset-use-item.ts @@ -0,0 +1,52 @@ +import { StatusAssetUseItem } from '@prisma/client'; + +export const statusAssetUseItems: StatusAssetUseItem[] = [ + { + statusAssetUseItemCode: "tobechecked", + geolCode: "No-GeolCode-specified", + name: "to be checked", + nameDe: "Zu prüfen", + nameFr: "À vérifier", + nameRm: "", + nameIt: "Da testare", + nameEn: "To be checked", + description: "Terms of use of the asset need to be checked", + descriptionDe: "Nutzungsbedingungen des Assets müssen geprüft werden", + descriptionFr: "Les conditions d'utilisation de l'asset doivent être vérifiées", + descriptionRm: "", + descriptionIt: "Le condizioni di utilizzo dell'elemento devono essere valutate.", + descriptionEn: "Terms of use of the asset need to be checked" + }, + { + statusAssetUseItemCode: "underclarification", + geolCode: "No-GeolCode-specified", + name: "under clarification", + nameDe: "In Prüfung", + nameFr: "En cours de vérification", + nameRm: "", + nameIt: "In esame", + nameEn: "Currently being checked", + description: "Terms of use of the asset are currently being checked", + descriptionDe: "Nutzungsbedingungen des Assets werden zurzeit geprüft", + descriptionFr: "Les conditions d'utilisation de l'asset sont en cours de vérification", + descriptionRm: "", + descriptionIt: "Le condizioni di utilizzo dell'elemento sono attualmente in fase di valutazione", + descriptionEn: "Terms of use of the asset are currently being checked" + }, + { + statusAssetUseItemCode: "approved", + geolCode: "No-GeolCode-specified", + name: "approved", + nameDe: "Finalisiert", + nameFr: "Finalisé", + nameRm: "", + nameIt: "Finalizzato", + nameEn: "Finalised", + description: "Terms of use of the asset are available and confirmed", + descriptionDe: "Nutzungsbedingungen des Assets liegen vor und sind bestätigt", + descriptionFr: "Les conditions d'utilisation de l'asset sont disponibles et confirmées", + descriptionRm: "", + descriptionIt: "Le condizioni di utilizzo dell'elemento sono disponibili e confermate", + descriptionEn: "Terms of use of the asset are available and confirmed" + } +] diff --git a/test/data/status-work-item.ts b/test/data/status-work-item.ts new file mode 100644 index 00000000..18245b94 --- /dev/null +++ b/test/data/status-work-item.ts @@ -0,0 +1,132 @@ +import { StatusWorkItem } from '@prisma/client'; + +export const statusWorkItems: StatusWorkItem[] = [ + { + statusWorkItemCode: 'initiateAsset', + geolCode: 'No-GeolCode-specified', + name: 'Initially edited', + nameDe: 'Ersterfassung Asset', + nameFr: 'Saisie initiale', + nameRm: '', + nameIt: 'Acquisizione iniziale dell\'elemento', + nameEn: 'Initial capture asset', + description: 'Asset is derived from initial capture in the system', + descriptionDe: 'Ersterfassung des Assets im System', + descriptionFr: 'Première saisie de l\'asset dans le système', + descriptionRm: '', + descriptionIt: 'L\'elemento é inserito per la prima volta nel sistema', + descriptionEn: 'Asset is derived from initial capture in the system', + }, + { + statusWorkItemCode: 'edited', + geolCode: 'No-GeolCode-specified', + name: 'Edited', + nameDe: 'Bearbeitet', + nameFr: 'Traité dans le système', + nameRm: '', + nameIt: 'Modificato', + nameEn: 'Processed', + description: 'Asset is processed in the system', + descriptionDe: 'Asset ist im System bearbeitet', + descriptionFr: 'L\'asset a été traité dans le système', + descriptionRm: '', + descriptionIt: 'L\'elemento é elaborato dal sistema', + descriptionEn: 'Asset is processed in the system', + }, + { + statusWorkItemCode: 'importedOld', + geolCode: 'No-GeolCode-specified', + name: 'Old data imported', + nameDe: 'Importierte Altdaten', + nameFr: 'Import d\'anciennes données', + nameRm: '', + nameIt: 'Importazione di dati legacy', + nameEn: 'Imported legacy data', + description: 'Asset originates from imported legacy data (InfoGeol)', + descriptionDe: 'Asset stammt von importieren Altdaten (InfoGeol) ab', + descriptionFr: 'L\'asset provient de données anciennes importées (InfoGeol)', + descriptionRm: '', + descriptionIt: 'L\'elemento proviene da dati legacy importati (InfoGeol)', + descriptionEn: 'Asset originates from imported legacy data (InfoGeol)', + }, + { + statusWorkItemCode: 'docClassified', + geolCode: 'No-GeolCode-specified', + name: 'Document classified', + nameDe: 'Dokument klassifiziert', + nameFr: 'Document classé', + nameRm: '', + nameIt: 'Documento classificato', + nameEn: 'Document classified', + description: 'Asset is assigned to a thematic class', + descriptionDe: 'Asset ist einer thematischen Klasse zugewiesen', + descriptionFr: 'L\'asset a été attribué à une classe thématique', + descriptionRm: '', + descriptionIt: 'L\'elemento è assegnato a una classe tematica', + descriptionEn: 'Asset is assigned to a thematic class', + }, + { + statusWorkItemCode: 'objectsExtracted', + geolCode: 'No-GeolCode-specified', + name: 'Objects extracted', + nameDe: 'Objekte extrahiert', + nameFr: 'Objets extraits', + nameRm: '', + nameIt: 'Oggetti estratti', + nameEn: 'Objects extracted', + description: 'Objects extracted from asset', + descriptionDe: 'Aus Asset wurden Objekte extrahiert', + descriptionFr: 'Des objets ont été extraits de l\'asset', + descriptionRm: '', + descriptionIt: 'Degli oggetti sono stati estratti dall\'elemento', + descriptionEn: 'Objects extracted from asset', + }, + { + statusWorkItemCode: 'OCRprocessed', + geolCode: 'No-GeolCode-specified', + name: 'OCR processed', + nameDe: 'OCR prozessiert', + nameFr: 'Traité par OCR', + nameRm: '', + nameIt: 'Elaborazione OCR', + nameEn: 'OCR processed', + description: 'OCR has been performed for asset', + descriptionDe: 'Für Asset wurde OCR ausgeführt', + descriptionFr: 'L\'asset a été traité par OCR', + descriptionRm: '', + descriptionIt: 'L\'OCR è stato eseguito per gli elementi', + descriptionEn: 'OCR has been performed for asset', + }, + { + statusWorkItemCode: 'importedDigi', + geolCode: 'No-GeolCode-specified', + name: 'Imported digitisation', + nameDe: 'Importierte Digitalisierung', + nameFr: 'Numérisation importée', + nameRm: '', + nameIt: 'Digitalizzazione importata', + nameEn: 'Imported digitised', + description: 'Asset is derived from imported digital data (digi.swissgeol.ch)', + descriptionDe: 'Asset stammt von importierten digitalen Daten ab (digi.swissgeol.ch)', + descriptionFr: 'L\'asset provient de données numériques importées (digi.swissgeol.ch)', + descriptionRm: '', + descriptionIt: 'L\'elemento deriva da dati digitali importati (digi.swissgeol.ch)', + descriptionEn: 'Asset is derived from imported digital data (digi.swissgeol.ch)', + }, + { + statusWorkItemCode: 'published', + geolCode: 'No-GeolCode-specified', + name: 'published', + nameDe: 'Publiziert', + nameFr: 'Publié', + nameRm: '', + nameIt: 'Pubblicato', + nameEn: 'Published', + description: 'Asset is published', + descriptionDe: 'Asset ist publiziert', + descriptionFr: 'L\'asset est publié', + descriptionRm: '', + descriptionIt: 'L\'elemento è pubblicato', + descriptionEn: 'Asset is published', + }, +]; diff --git a/test/setup-db.ts b/test/setup-db.ts new file mode 100644 index 00000000..ca8a8e24 --- /dev/null +++ b/test/setup-db.ts @@ -0,0 +1,48 @@ +import { PrismaClient } from '@prisma/client'; +import { assetKindItems } from './data/asset-kind-item'; +import { statusAssetUseItems } from './data/status-asset-use-item'; +import { assetFormatItems } from './data/asset-format-item'; +import { languageItems } from './data/language-items'; +import { statusWorkItems } from './data/status-work-item'; +import { manCatLabelItems } from './data/man-cat-label-item'; + +const clearDB = async (prisma: PrismaClient, dbName: string): Promise => { + const tables = await prisma.$queryRawUnsafe(` + SELECT table_name + FROM information_schema.tables + WHERE table_schema = '${dbName}' + AND table_type = 'BASE TABLE' + `); + + // Iterate over each table and delete all data + for (const table of tables as Array<{ table_name: string }>) { + const tableName = table.table_name; + if (tableName === 'schema_migrations') { + continue; + } + await prisma.$executeRawUnsafe(`TRUNCATE TABLE ${dbName}.${tableName} CASCADE`); + } +} + +export const setupDB = async (prisma: PrismaClient): Promise => { + await clearDB(prisma, 'auth'); + await clearDB(prisma, 'public'); + + await prisma.statusAssetUseItem.createMany({ data: statusAssetUseItems, skipDuplicates: true }); + await prisma.assetKindItem.createMany({ data: assetKindItems, skipDuplicates: true }); + await prisma.assetFormatItem.createMany({ data: assetFormatItems, skipDuplicates: true }) + await prisma.languageItem.createMany({ data: languageItems, skipDuplicates: true }); + await prisma.statusWorkItem.createMany({ data: statusWorkItems, skipDuplicates: true }) + await prisma.manCatLabelItem.createMany({ data: manCatLabelItems, skipDuplicates: true }); +}; + +export const clearPrismaAssets = async (prisma: PrismaClient): Promise => { + await prisma.manCatLabelRef.deleteMany(); + await prisma.assetContact.deleteMany(); + await prisma.id.deleteMany(); + await prisma.typeNatRel.deleteMany(); + await prisma.statusWork.deleteMany(); + await prisma.asset.deleteMany(); + await prisma.internalUse.deleteMany(); + await prisma.publicUse.deleteMany(); +} diff --git a/tools/BatchOCR/BatchOCR.ts b/tools/BatchOCR/BatchOCR.ts deleted file mode 100644 index ccda2c14..00000000 --- a/tools/BatchOCR/BatchOCR.ts +++ /dev/null @@ -1,145 +0,0 @@ -import * as TE from 'fp-ts/TaskEither'; -import * as E from 'fp-ts/Either'; -import * as fs from 'fs/promises'; -import { exec } from 'node:child_process'; -import path from 'node:path'; -import { pipe } from 'fp-ts/function'; -import * as A from 'fp-ts/Array'; -import * as S from 'fp-ts/string'; -import * as N from 'fp-ts/number'; -import { contramap } from 'fp-ts/Ord'; -import { promisify } from 'util'; -import * as C from 'io-ts/Codec'; - -const execP = promisify(exec); - -const srcDir = '/home/wayne/Ubuntu_20.04_general_Projects/lambda-it/asset-swissgeol-ch/images/bulk-ocr/volumes/pdfs'; -const progressFile = '/tmp/batch-ocr-progress.json'; - -const dockerRun = (filename: string) => - `docker run --rm -v ${srcDir}:/mnt/pdfs registry.lambda-it.ch/lambda/asset-swissgeol/batch-ocr python /app/run_ocr_pipeline.py program /mnt/pdfs/${filename}`; - -// docker run --rm -v /home/wayne/Ubuntu_20.04_general_Projects/lambda-it/asset-swissgeol-ch/tools/BatchOCR/pdfs:/mnt/pdfs registry.lambda-it.ch/lambda/asset-swissgeol/batch-ocr python /app/run_ocr_pipeline.py program /mnt/pdfs/23639.pdf - -function unknownToError(e: unknown): Error { - return typeof e === 'string' ? new Error(e) : e instanceof Error ? e : new Error('Unknown error'); -} - -const stat = (path: string) => TE.tryCatch(() => fs.stat(path), unknownToError); -const readdir = (path: string) => TE.tryCatch(() => fs.readdir(path), unknownToError); -const readFile = (filename: string) => TE.tryCatch(() => fs.readFile(filename, 'utf8'), unknownToError); -const writeFile = (filename: string, s: string) => TE.tryCatch(() => fs.writeFile(filename, s, 'utf8'), unknownToError); - -const processFile = (filename: string) => pipe(TE.tryCatch(() => execP(dockerRun(filename)), unknownToError)); - -const OrdBySize = pipe( - N.Ord, - contramap((a: { size: number }) => a.size), -); - -const orderByFileSize = (files: string[]) => - pipe( - files, - A.map(filename => - pipe( - stat(path.join(srcDir, filename)), - TE.map(({ size }) => ({ filename, size: size })), - ), - ), - A.sequence(TE.ApplicativeSeq), - TE.map(A.sort(OrdBySize)), - ); - -const SuccessfullyProcessed = C.struct({ - _tag: C.literal('SuccessfullyProcessed'), - filename: C.string, - startTs: C.number, - endTs: C.number, - startSize: C.number, - endSize: C.number, - duration: C.string, - result: C.UnknownRecord, -}); -const Failed = C.struct({ - _tag: C.literal('Failed'), - reason: C.string, -}); - -const Result = C.sum('_tag')({ - SuccessfullyProcessed, - Failed, -}); -type Result = C.TypeOf; - -const ProgressFileContents = C.record(Result); - -const readProgress = pipe( - readFile(progressFile), - TE.alt(() => TE.right('{}')), - TE.chain(s => TE.fromEither(E.tryCatch(() => JSON.parse(s), unknownToError))), - TE.chainW(a => TE.fromEither(ProgressFileContents.decode(a))), -); - -const writeProgress = (filename: string, result: Result) => - pipe( - readProgress, - TE.map(a => ({ ...a, [filename]: result })), - TE.chainW(a => writeFile(progressFile, JSON.stringify(a, null, 2))), - ); - -const processFileAndWriteProgress = (f: { filename: string; size: number }) => { - return pipe( - TE.of({ filename: f.filename, startSize: f.size }), - TE.chain(a => - pipe( - TE.of({ startTs: Date.now() }), - TE.bind('result', () => processFile(a.filename)), - TE.map(b => { - const endTs = new Date().getTime(); - return { - ...a, - ...b, - _tag: 'SuccessfullyProcessed' as const, - endTs, - duration: (endTs - b.startTs) / 1000 + 's', - }; - }), - TE.bind('endSize', () => - pipe( - stat(path.join(srcDir, f.filename)), - TE.map(({ size }) => size), - ), - ), - ), - ), - TE.orElseW(e => - TE.right({ - _tag: 'Failed' as const, - reason: JSON.stringify(e, null, 2), - }), - ), - TE.map(Result.encode), - TE.chain(result => writeProgress(f.filename, result)), - ); -}; - -const program = pipe( - readdir(srcDir), - TE.map(A.filter(S.endsWith('.pdf'))), - TE.chain(orderByFileSize), - TE.bindTo('srcFiles'), - TE.bind('progress', () => readProgress), - TE.map(({ srcFiles, progress }) => - srcFiles.filter(f => !progress[f.filename] || progress[f.filename]._tag === 'Failed'), - ), - TE.map(files => files.map(processFileAndWriteProgress)), - TE.chainW(A.sequence(TE.ApplicativeSeq)), -); - -program().then(a => { - if (E.isLeft(a)) { - console.log(JSON.stringify(a.left, null, 2)); - } else { - console.log(a.right); - } -}); diff --git a/tools/BatchOCR/ExractText.ts b/tools/BatchOCR/ExractText.ts deleted file mode 100644 index a7ea4029..00000000 --- a/tools/BatchOCR/ExractText.ts +++ /dev/null @@ -1,60 +0,0 @@ -/// - -import * as TE from 'fp-ts/TaskEither'; -import * as fs from 'fs/promises'; -import { pipe, flow } from 'fp-ts/function'; -import * as A from 'fp-ts/Array'; -import * as S from 'fp-ts/string'; -import * as E from 'fp-ts/Either'; -import extract from 'pdf-text-extract'; -import { spawn, exec } from 'node:child_process'; -import { promisify } from 'util'; -import path from 'node:path'; - -//sudo apt-get install poppler-utils - -const srcDir = '/mnt/f/assetsNatRel4Cloud_ocr'; - -function unknownToError(e: unknown): Error { - return typeof e === 'string' ? new Error(e) : e instanceof Error ? e : new Error('Unknown error'); -} - -const stat = (path: string) => TE.tryCatch(() => fs.stat(path), unknownToError); -const readdir = (path: string) => TE.tryCatch(() => fs.readdir(path), unknownToError); -const readFile = (filename: string) => TE.tryCatch(() => fs.readFile(filename), unknownToError); -const writeFile = (filename: string, data: Buffer) => - TE.tryCatch(() => fs.writeFile(filename, data, { encoding: 'utf8' }), unknownToError); - -const extractP = promisify(extract) as (f: string, options: { splitPages: false }) => Promise; -const spawnP = promisify(spawn); -const execP = promisify(exec); - -const processFile = (filename: string) => - pipe( - // TE.of(filename), - TE.tryCatch( - () => execP(`pdftotext ${path.join(srcDir, filename)} ${path.parse(filename).name + '.txt'}`), - unknownToError, - ), - // TE.chain((a: string) => writeFile(path.parse(filename).name + '.txt', Buffer.from(a))), - ); - -const program = pipe( - readdir(srcDir), - TE.map(A.filter(S.endsWith('.pdf'))), - TE.chainW( - flow( - // A.filter(a => a === '38613.pdf'), - A.map(processFile), - A.sequence(TE.ApplicativeSeq), - ), - ), -); - -program().then(a => { - if (E.isLeft(a)) { - console.log('call error', a); - } else { - console.log('call success', a.right); - } -}); diff --git a/tools/BatchOCR/decs.d.ts b/tools/BatchOCR/decs.d.ts deleted file mode 100644 index 79f50430..00000000 --- a/tools/BatchOCR/decs.d.ts +++ /dev/null @@ -1 +0,0 @@ -declare module 'pdf-text-extract'; diff --git a/tools/BatchOCR/docker-compose.yaml b/tools/BatchOCR/docker-compose.yaml deleted file mode 100644 index 6cf1c9a8..00000000 --- a/tools/BatchOCR/docker-compose.yaml +++ /dev/null @@ -1,29 +0,0 @@ -version: '3.9' -services: - ocr: - image: 'registry.lambda-it.ch/swissgeol/ocr:1.1.0' - ports: - - '5000:5000' - environment: - - OCR_CPUS=4 - # - OCR_CPUS=2 - - OPTIMIZE_LEVEL=0 - - OMP_THREAD_LIMIT=1 - deploy: - restart_policy: - condition: on-failure - delay: 10s - max_attempts: 10 - window: 10s - labels: - registry: 'ghcr' - resources: - limits: - # cpus: '1' - cpus: '3' - memory: 32G - reservations: - # cpus: '1' - # memory: 2048M - cpus: '3' - memory: 16G diff --git a/tools/generators/.gitkeep b/tools/generators/.gitkeep deleted file mode 100644 index e69de29b..00000000 diff --git a/tools/github/.gitignore b/tools/github/.gitignore deleted file mode 100644 index 94a2dd14..00000000 --- a/tools/github/.gitignore +++ /dev/null @@ -1 +0,0 @@ -*.json \ No newline at end of file diff --git a/tools/github/export-issues.sh b/tools/github/export-issues.sh deleted file mode 100755 index 1083de1e..00000000 --- a/tools/github/export-issues.sh +++ /dev/null @@ -1,3 +0,0 @@ -MAX_NUM=`gh issue list --repo Lambda-IT/asset-swissgeol-ch --limit 1 --json number \ - | jq ".[].number"`; for n in `seq 1 $MAX_NUM`; do gh issue view $n --repo Lambda-IT/asset-swissgeol-ch \ - --json assignees,author,body,closed,closedAt,comments,createdAt,id,labels,milestone,number,projectCards,reactionGroups,state,title,updatedAt,url >> github-dump.json; done diff --git a/tools/scripts/gdal-it b/tools/scripts/gdal-it deleted file mode 100755 index da01ce40..00000000 --- a/tools/scripts/gdal-it +++ /dev/null @@ -1 +0,0 @@ -docker run --rm osgeo/gdal:alpine-small-3.5.1 tail -f /dev/null diff --git a/tools/scripts/ogr2ogr b/tools/scripts/ogr2ogr deleted file mode 100755 index 437dd62d..00000000 --- a/tools/scripts/ogr2ogr +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh - -docker run --rm osgeo/gdal:alpine-small-3.5.1 ogr2ogr - diff --git a/tools/scripts/publish.mjs b/tools/scripts/publish.mjs deleted file mode 100644 index 9a489d82..00000000 --- a/tools/scripts/publish.mjs +++ /dev/null @@ -1,56 +0,0 @@ -/** - * This is a minimal script to publish your package to "npm". - * This is meant to be used as-is or customize as you see fit. - * - * This script is executed on "dist/path/to/library" as "cwd" by default. - * - * You might need to authenticate with NPM before running this script. - */ - -import { readCachedProjectGraph } from '@nrwl/devkit'; -import { execSync } from 'child_process'; -import { readFileSync, writeFileSync } from 'fs'; -import chalk from 'chalk'; - -function invariant(condition, message) { - if (!condition) { - console.error(chalk.bold.red(message)); - process.exit(1); - } -} - -// Executing publish script: node path/to/publish.mjs {name} --version {version} --tag {tag} -// Default "tag" to "next" so we won't publish the "latest" tag by accident. -const [, , name, version, tag = 'next'] = process.argv; - -// A simple SemVer validation to validate the version -const validVersion = /^\d+\.\d+\.\d+(-\w+\.\d+)?/; -invariant( - version && validVersion.test(version), - `No version provided or version did not match Semantic Versioning, expected: #.#.#-tag.# or #.#.#, got ${version}.`, -); - -const graph = readCachedProjectGraph(); -const project = graph.nodes[name]; - -invariant(project, `Could not find project "${name}" in the workspace. Is the project.json configured correctly?`); - -const outputPath = project.data?.targets?.build?.options?.outputPath; -invariant( - outputPath, - `Could not find "build.options.outputPath" of project "${name}". Is project.json configured correctly?`, -); - -process.chdir(outputPath); - -// Updating the version in "package.json" before publishing -try { - const json = JSON.parse(readFileSync(`package.json`).toString()); - json.version = version; - writeFileSync(`package.json`, JSON.stringify(json, null, 2)); -} catch (e) { - console.error(chalk.bold.red(`Error reading package.json file from library build output.`)); -} - -// Execute "npm publish" to publish -execSync(`npm publish --access public --tag ${tag}`); diff --git a/tools/tsconfig.tools.json b/tools/tsconfig.tools.json deleted file mode 100644 index a8090724..00000000 --- a/tools/tsconfig.tools.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "extends": "../tsconfig.base.json", - "compilerOptions": { - "outDir": "../dist/out-tsc/tools", - "rootDir": ".", - "module": "commonjs", - "target": "es5", - "types": ["node"], - "importHelpers": false - }, - "include": ["**/*.ts"] -}
{{ statusWork.statusWorkDate | assetSgDate }} {{ statusWork.statusWork | valueItemName }}