From 8cb92854628890180a5914bce21f684ef4706c06 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thea=20Sch=C3=B6bl?= Date: Wed, 22 Mar 2023 11:45:30 +0100 Subject: [PATCH] refactor: build system --- .../backend/.editorconfig => .editorconfig | 0 .../backend/.gitattributes => .gitattributes | 0 .gitignore | 99 +- packages/core/.mailmap => .mailmap | 1 - .pnpmfile.cjs | 38 + .syncpackrc.json | 91 +- .../core/CONTRIBUTING.md => CONTRIBUTING.md | 0 backend/backend/.eslintignore | 2 - backend/backend/.eslintrc.json | 3 - backend/backend/.gitlab-ci.yml | 4 +- .../backend/.gitlab/issue_templates/bug.md | 5 - .../.gitlab/issue_templates/feature.md | 5 +- backend/backend/CHANGELOG.md | 140 +- backend/backend/LICENSE | 619 ------- backend/backend/README.md | 34 +- backend/backend/ROUTES.md | 47 +- backend/backend/app.js | 2 +- backend/backend/config/prometheus.json | 3 +- backend/backend/integration-test.yml | 24 +- backend/backend/package.json | 81 +- backend/backend/src/common.ts | 2 +- .../src/notification/backend-transport.ts | 4 +- .../backend/src/notification/mail-queue.ts | 3 +- .../src/routes/virtual-plugin-route.ts | 6 +- backend/backend/tsconfig.json | 7 +- backend/proxy/.editorconfig | 17 - backend/proxy/.eslintrc.json | 3 - backend/proxy/.gitlab/issue_templates/bug.md | 6 - .../proxy/.gitlab/issue_templates/feature.md | 3 - backend/proxy/CHANGELOG.md | 65 +- backend/proxy/LICENSE | 200 --- backend/proxy/README.md | 26 +- backend/proxy/app.js | 2 +- backend/proxy/package.json | 72 +- backend/proxy/src/{cli.ts => app.ts} | 0 backend/proxy/src/common.ts | 3 +- backend/proxy/src/main.ts | 2 +- backend/proxy/test/common.spec.ts | 16 +- backend/proxy/tsconfig.json | 8 +- configuration/configuration/.editorconfig | 15 - configuration/configuration/.eslintignore | 2 - configuration/configuration/.eslintrc.json | 3 - configuration/configuration/.gitignore | 91 - configuration/configuration/.gitlab-ci.yml | 59 - .../.gitlab/issue_templates/bug.md | 32 - .../.gitlab/issue_templates/feature.md | 13 - configuration/configuration/.npmignore | 18 - configuration/configuration/CHANGELOG.md | 243 --- configuration/configuration/LICENSE | 200 --- configuration/configuration/README.md | 28 - configuration/configuration/app.js | 2 - configuration/configuration/package.json | 57 - configuration/configuration/src/cli.ts | 121 -- configuration/configuration/src/common.ts | 844 --------- .../templates/template-.gitignore | 91 - .../templates/template-.npmignore | 11 - .../templates/template-tsconfig.json | 3 - configuration/eslint-config/.editorconfig | 15 - configuration/eslint-config/.gitignore | 91 - configuration/eslint-config/.gitlab-ci.yml | 40 - configuration/eslint-config/.npmignore | 17 - configuration/eslint-config/LICENSE | 674 -------- configuration/eslint-config/index.js | 1 + configuration/eslint-config/package.json | 23 +- configuration/nyc-config/index.json | 29 + configuration/nyc-config/package.json | 10 + configuration/prettier-config/.editorconfig | 15 - configuration/prettier-config/LICENSE | 621 ------- configuration/prettier-config/package.json | 3 + configuration/projectmanagement/.editorconfig | 15 - configuration/projectmanagement/.eslintignore | 2 - .../projectmanagement/.eslintrc.json | 3 - configuration/projectmanagement/LICENSE | 200 --- configuration/projectmanagement/package.json | 73 +- configuration/projectmanagement/src/common.ts | 3 +- configuration/projectmanagement/tsconfig.json | 2 +- configuration/tsconfig/package.json | 10 + .../{configuration => tsconfig}/tsconfig.json | 0 examples/minimal-connector/.editorconfig | 15 - .../.gitlab/issue_templates/bug.md | 6 - .../.gitlab/issue_templates/feature.md | 3 - examples/minimal-connector/CHANGELOG.md | 12 +- examples/minimal-connector/README.md | 38 +- examples/minimal-connector/app.js | 2 +- examples/minimal-connector/package.json | 64 +- examples/minimal-connector/src/cli.ts | 41 +- examples/minimal-connector/src/common.ts | 19 +- .../minimal-connector/test/common.spec.ts | 25 +- .../minimal-connector/test/connector.spec.ts | 7 +- .../test/minimal-connector.spec.ts | 12 +- examples/minimal-connector/tsconfig.json | 2 +- examples/minimal-plugin/.editorconfig | 15 - examples/minimal-plugin/.gitattributes | 17 - examples/minimal-plugin/LICENSE | 200 --- examples/minimal-plugin/README.md | 42 +- examples/minimal-plugin/app.js | 2 +- examples/minimal-plugin/package.json | 40 +- .../minimal-plugin/src/{cli.ts => app.ts} | 68 +- .../src/plugin/minimal-plugin.ts | 3 +- .../src/plugin/protocol/tsconfig.json | 2 +- examples/minimal-plugin/tsconfig.json | 2 +- examples/minimal-plugin/tslint.json | 6 - frontend/app/angular.json | 2 +- frontend/app/icons.config.ts | 2 +- frontend/app/package.json | 39 +- frontend/app/scripts/accumulate-licenses.ts | 4 +- .../app/scripts/check-icon-correctness.ts | 2 +- frontend/app/scripts/gather-used-icons.ts | 2 +- frontend/app/scripts/minify-icon-font.ts | 2 +- .../app/_helpers/collections/chunk.spec.ts | 2 +- .../_helpers/collections/difference.spec.ts | 2 +- .../src/app/_helpers/collections/get.spec.ts | 2 +- .../app/_helpers/collections/group-by.spec.ts | 2 +- .../app/_helpers/collections/key-by.spec.ts | 2 +- .../_helpers/collections/map-values.spec.ts | 2 +- .../src/app/_helpers/collections/min.spec.ts | 2 +- .../src/app/_helpers/collections/omit.spec.ts | 2 +- .../_helpers/collections/partition.spec.ts | 2 +- .../src/app/_helpers/collections/pick.spec.ts | 2 +- .../app/_helpers/collections/shuffle.spec.ts | 2 +- .../_helpers/collections/string-sort.spec.ts | 2 +- .../src/app/_helpers/collections/sum.spec.ts | 2 +- .../_helpers/collections/tree-group.spec.ts | 2 +- .../src/app/_helpers/collections/uniq.spec.ts | 2 +- .../src/app/_helpers/collections/zip.spec.ts | 2 +- frontend/app/src/app/_helpers/data/filters.ts | 2 +- .../src/app/_helpers/data/sample-things.ts | 4 +- .../app/animation/animation-choreographer.ts | 2 +- frontend/app/src/app/app.component.spec.ts | 2 +- frontend/app/src/app/app.component.ts | 2 +- frontend/app/src/app/app.module.ts | 4 +- .../assessments/assessments.provider.ts | 4 +- .../page/assessments-page.component.ts | 8 +- .../assessment/assessment-base-info.html | 16 +- .../types/assessment/assessment-detail.html | 5 +- .../assessment/assessment-list-item.html | 5 +- .../course-of-study-assessment.html | 4 +- .../app/modules/auth/auth-helper.service.ts | 2 +- .../app/modules/auth/auth-routing.module.ts | 2 +- .../app/src/app/modules/auth/auth.module.ts | 2 +- .../app/modules/auth/auth.provider.methods.ts | 4 +- .../modules/auth/factories/http.factory.ts | 2 +- .../modules/auth/factories/storage.factory.ts | 2 +- .../paia/authorization-request-handler.ts | 6 +- .../paia/authorization-request-response.ts | 2 +- .../app/modules/auth/paia/paia-auth-action.ts | 2 +- .../modules/auth/paia/paia-auth.service.ts | 14 +- .../auth/paia/paia-authorization-listener.ts | 2 +- .../auth/paia/paia-authorization-notifier.ts | 4 +- .../auth/paia/paia-user-info-handler.ts | 2 +- .../auth/paia/token-request-handler.ts | 4 +- .../schedule/schedule-sync.service.ts | 8 +- .../add-event-review-modal.component.ts | 6 +- .../calendar/add-event-review-modal.html | 7 +- .../app/modules/calendar/calendar.service.ts | 4 +- .../app/modules/calendar/ical/ical.spec.ts | 4 +- .../app/src/app/modules/calendar/ical/ical.ts | 15 +- .../app/modules/calendar/schedule.provider.ts | 2 +- .../modules/config/config.provider.spec.ts | 4 +- .../src/app/modules/config/config.provider.ts | 6 +- frontend/app/src/app/modules/config/errors.ts | 2 +- .../modules/dashboard/dashboard.component.ts | 2 +- .../data/add-event-action-chip.component.ts | 2 +- .../data/add-event-action-chip.config.ts | 2 +- .../chips/edit-event-selection.component.ts | 12 +- .../modules/data/data-facets.provider.spec.ts | 4 +- .../src/app/modules/data/data-icon.config.ts | 2 +- .../app/modules/data/data.provider.spec.ts | 2 +- .../app/src/app/modules/data/data.provider.ts | 6 +- .../data/detail/data-detail.component.spec.ts | 2 +- .../app/modules/data/detail/data-detail.html | 8 +- .../modules/data/elements/address-detail.html | 24 +- .../modules/data/elements/offers-detail.html | 14 +- .../modules/data/elements/origin-detail.html | 28 +- .../data/elements/title-card.component.ts | 2 +- .../list/data-list-item-host-default.html | 4 +- ...-item-virtual-scroll-strategy.directive.ts | 2 +- .../data/list/search-page.component.ts | 2 +- .../modules/data/list/simple-data-list.html | 10 +- .../data/list/tree-list-fragment.component.ts | 2 +- .../modules/data/list/tree-list.component.ts | 2 +- .../data/stapps-web-http-client.provider.ts | 2 +- .../data/types/article/article-content.html | 5 +- .../data/types/article/article-list-item.html | 19 +- .../data/types/book/book-detail-content.html | 5 +- .../data/types/book/book-list-item.html | 19 +- .../data/types/catalog/catalog-list-item.html | 8 +- .../date-series-detail-content.html | 8 +- .../date-series/date-series-list-item.html | 10 +- .../types/event/event-detail-content.html | 6 +- .../data/types/event/event-route-path.html | 6 +- .../types/favorite/favorite-list-item.html | 3 +- .../types/message/message-detail-content.html | 4 +- .../organization-detail-content.html | 4 +- .../organization/organization-list-item.html | 4 +- .../periodical/periodical-detail-content.html | 5 +- .../periodical/periodical-list-item.html | 19 +- .../types/person/person-detail-content.html | 6 +- .../mensa/place-mensa-detail.component.ts | 2 +- .../special/mensa/place-mensa-service.ts | 2 +- .../place/special/mensa/place-mensa.html | 22 +- .../data/types/video/video-list-item.html | 4 +- .../daia-availability.component.spec.ts | 2 +- .../daia-availability.component.ts | 4 +- .../daia-availability/daia-availability.html | 8 +- .../daia-holding.component.ts | 2 +- .../modules/hebis/daia-data.provider.spec.ts | 2 +- .../app/modules/hebis/daia-data.provider.ts | 2 +- .../app/modules/hebis/hebis-data.provider.ts | 8 +- .../hebis-detail.component.spec.ts | 2 +- .../hebis-detail/hebis-detail.component.ts | 2 +- .../modules/hebis/list/hebis-search-page.html | 4 +- .../modules/library/account/account.page.html | 21 +- .../checked-out/checked-out-page.component.ts | 2 +- .../elements/fee-item/fee-item.component.ts | 2 +- .../account/elements/fee-item/fee-item.html | 11 +- .../elements/paia-item/paiaitem.component.ts | 2 +- .../account/elements/paia-item/paiaitem.html | 4 +- .../account/fines/fines-page.component.ts | 2 +- .../library/account/fines/fines-page.html | 4 +- .../account/holds/holds-page.component.ts | 2 +- .../account/library-account.service.ts | 6 +- .../account/profile/profile-page.component.ts | 2 +- .../library/account/profile/profile-page.html | 5 +- .../src/app/modules/map/map.provider.spec.ts | 2 +- .../app/src/app/modules/map/map.provider.ts | 4 +- .../context/context-menu.component.spec.ts | 2 +- .../modules/menu/navigation/navigation.html | 8 +- .../menu/navigation/root-link.directive.ts | 2 +- .../app/modules/menu/navigation/tabs.spec.ts | 2 +- .../news-settings-filter.component.ts | 2 +- .../src/app/modules/news/item/news-item.html | 10 +- .../app/src/app/modules/news/news.provider.ts | 2 +- .../modules/profile/page/profile-page.spec.ts | 2 +- .../schedule/page/calendar-view.component.ts | 4 +- .../page/components/calendar.component.ts | 10 +- .../page/grid/infinite-swiper.component.ts | 4 +- .../schedule/page/grid/range-overlap.spec.ts | 4 +- .../schedule/page/grid/range-overlap.ts | 2 +- .../page/grid/schedule-card.component.ts | 2 +- .../schedule/page/grid/schedule-card.html | 13 +- .../page/grid/schedule-cursor.component.ts | 4 +- .../page/grid/schedule-day.component.ts | 6 +- .../schedule/page/grid/schedule-day.html | 4 +- .../modules/schedule/page/schedule-page.html | 18 +- .../page/schedule-single-events.component.ts | 10 +- .../schedule/page/schedule-single-events.html | 8 +- .../schedule/page/schedule-view.component.ts | 4 +- .../page/calendar-sync-settings.component.ts | 4 +- .../app/translation/common-string-pipes.ts | 2 +- .../app/translation/thing-translate.module.ts | 2 +- .../app/translation/translate-simple.pipe.ts | 2 +- .../app/src/app/util/edit-modal.component.ts | 2 +- frontend/app/src/app/util/edit-modal.html | 6 +- .../src/app/util/ion-icon/icon-match.spec.ts | 2 +- .../ion-icon/ion-back-button.directive.ts | 4 +- .../util/ion-icon/ion-breadcrumb.directive.ts | 4 +- .../util/ion-icon/ion-reorder.directive.ts | 4 +- .../util/ion-icon/ion-searchbar.directive.ts | 4 +- frontend/app/src/app/util/lazy.pipe.ts | 2 +- frontend/app/src/app/util/opening-hours.html | 8 +- frontend/app/src/main.ts | 2 +- frontend/app/tsconfig.json | 7 +- package-template.json | 28 + package.json | 11 +- packages/api/.gitlab/issue_templates/bug.md | 6 - .../api/.gitlab/issue_templates/feature.md | 3 - packages/api/CHANGELOG.md | 154 +- packages/api/app.js | 2 +- packages/api/package.json | 79 +- packages/api/src/{cli.ts => app.ts} | 0 packages/api/src/index.ts | 10 + packages/api/src/plugin.ts | 2 +- packages/api/test/bulk.spec.ts | 31 +- packages/api/test/client.spec.ts | 167 +- packages/api/test/connector-client.spec.ts | 250 +-- packages/api/test/copy.spec.ts | 222 +-- packages/api/test/e2e.spec.ts | 151 +- packages/api/test/http-client.spec.ts | 27 +- packages/api/test/plugin-client.spec.ts | 24 +- .../plugin-resources/test-plugin-response.ts | 4 +- packages/api/test/plugin.spec.ts | 47 +- packages/api/tsconfig.json | 2 +- packages/collection-utils/.editorconfig | 15 - packages/collection-utils/.eslintignore | 2 - packages/collection-utils/.eslintrc.json | 3 - packages/collection-utils/.gitignore | 95 -- packages/collection-utils/LICENSE | 200 --- packages/collection-utils/package.json | 36 +- packages/collection-utils/src/difference.ts | 8 +- packages/collection-utils/src/get.ts | 4 +- packages/collection-utils/src/group-by.ts | 21 +- packages/collection-utils/src/index.ts | 16 + packages/collection-utils/src/key-by.ts | 5 +- packages/collection-utils/src/map-values.ts | 6 +- packages/collection-utils/src/min.ts | 7 +- packages/collection-utils/src/omit.ts | 7 +- packages/collection-utils/src/partition.ts | 7 +- packages/collection-utils/src/pick.ts | 7 +- packages/collection-utils/src/string-sort.ts | 10 +- packages/collection-utils/src/sum.ts | 12 +- packages/collection-utils/src/tree-group.ts | 5 +- packages/collection-utils/src/uniq.ts | 7 +- packages/collection-utils/test/chunk.spec.ts | 15 +- .../collection-utils/test/difference.spec.ts | 10 +- packages/collection-utils/test/get.spec.ts | 18 +- .../collection-utils/test/group-by.spec.ts | 128 +- packages/collection-utils/test/key-by.spec.ts | 18 +- .../collection-utils/test/map-values.spec.ts | 14 +- packages/collection-utils/test/min.spec.ts | 34 +- packages/collection-utils/test/omit.spec.ts | 14 +- .../collection-utils/test/partition.spec.ts | 10 +- packages/collection-utils/test/pick.spec.ts | 14 +- .../collection-utils/test/shuffle.spec.ts | 10 +- .../collection-utils/test/string-sort.spec.ts | 30 +- packages/collection-utils/test/sum.spec.ts | 16 +- .../collection-utils/test/tree-group.spec.ts | 26 +- packages/collection-utils/test/uniq.spec.ts | 14 +- packages/collection-utils/test/zip.spec.ts | 8 +- packages/collection-utils/tsconfig.json | 2 +- packages/core-tools/.editorconfig | 15 - packages/core-tools/.eslintignore | 2 - packages/core-tools/.eslintrc.json | 3 - packages/core-tools/.gitlab-ci.yml | 1 - .../core-tools/.gitlab/issue_templates/bug.md | 6 - .../.gitlab/issue_templates/feature.md | 3 - packages/core-tools/CHANGELOG.md | 207 +-- packages/core-tools/README.md | 24 +- packages/core-tools/app.js | 2 +- packages/core-tools/package.json | 76 +- packages/core-tools/src/{cli.ts => app.ts} | 15 +- .../core-tools/src/better-ajv-errors.d.ts | 10 +- packages/core-tools/src/index.ts | 11 + packages/core-tools/src/pack.ts | 465 ----- .../src/resources/openapi-303-template.ts | 44 +- packages/core-tools/src/routes.ts | 68 +- packages/core-tools/src/schema.ts | 5 +- packages/core-tools/src/uml/create-diagram.ts | 18 +- packages/core-tools/src/util/collections.ts | 4 +- packages/core-tools/src/util/io.ts | 2 +- .../core-tools/test/create-diagram.spec.ts | 3 +- packages/core-tools/tsconfig.json | 2 +- packages/core/.editorconfig | 15 - packages/core/.eslintignore | 2 - packages/core/.eslintrc.json | 29 - packages/core/.gitlab/issue_templates/bug.md | 13 - .../core/.gitlab/issue_templates/change.md | 17 - .../core/.gitlab/issue_templates/feature.md | 15 - packages/core/CHANGELOG.md | 387 +---- packages/core/LICENSE | 200 --- packages/core/README.md | 2 +- packages/core/package.json | 121 +- .../core/src/protocol/errors/validation.ts | 2 +- packages/core/src/translator.ts | 44 +- packages/core/tsconfig.json | 2 +- packages/easy-ast/README.md | 8 + packages/easy-ast/package.json | 61 + .../src}/ast-internal-util.ts | 4 +- .../src/easy-ast => easy-ast/src}/ast-util.ts | 16 +- .../src/easy-ast => easy-ast/src}/easy-ast.ts | 24 +- .../types/pack.ts => easy-ast/src/index.ts} | 36 +- .../types/lightweight-alias-definition.ts | 0 .../types/lightweight-class-definition.ts | 0 .../src}/types/lightweight-comment.ts | 0 .../src}/types/lightweight-definition-kind.ts | 0 .../src}/types/lightweight-definition.ts | 0 .../src}/types/lightweight-project.ts | 6 +- .../src}/types/lightweight-property.ts | 0 .../src}/types/lightweight-type.ts | 0 packages/easy-ast/src/util.ts | 61 + .../test}/alias-like.ast-test.ts | 0 .../test}/array-like.ast-test.ts | 0 .../test}/class-like.ast-test.ts | 0 .../test}/comment.ast-test.ts | 0 .../test}/default-generics.ast-test.ts | 0 .../test}/easy-ast-spec-type.ts | 0 .../test}/enum-specified-value.ast-test.ts | 0 .../test}/generics.ast-test.ts | 0 .../test}/index-signature.ast-test.ts | 0 .../test/index.ts} | 7 +- .../test}/ineritance.ast-test.ts | 0 .../test}/nested.ast-test.ts | 0 .../test}/primitive-types.ast-test.ts | 0 .../test}/stack-overflow.ast-test.ts | 0 packages/easy-ast/tsconfig.json | 3 + packages/es-mapping-generator/.editorconfig | 15 - packages/es-mapping-generator/CHANGELOG.md | 27 +- packages/es-mapping-generator/LICENSE | 200 --- packages/es-mapping-generator/README.md | 11 +- packages/es-mapping-generator/app.js | 2 +- packages/es-mapping-generator/package.json | 25 +- .../src/{cli.ts => app.ts} | 1 - packages/es-mapping-generator/src/index.ts | 6 + packages/es-mapping-generator/src/mapping.ts | 18 +- packages/es-mapping-generator/tsconfig.json | 5 +- packages/gitlab-api/.editorconfig | 15 - packages/gitlab-api/.eslintignore | 2 - packages/gitlab-api/.eslintrc.json | 3 - .../gitlab-api/.gitlab/issue_templates/bug.md | 6 - packages/gitlab-api/CHANGELOG.md | 89 +- packages/gitlab-api/LICENSE | 200 --- packages/gitlab-api/app.js | 2 +- packages/gitlab-api/package.json | 41 +- packages/gitlab-api/src/api.ts | 34 +- packages/gitlab-api/src/{cli.ts => app.ts} | 6 +- packages/gitlab-api/tsconfig.json | 2 +- packages/logger/.editorconfig | 15 - packages/logger/.eslintignore | 2 - packages/logger/.eslintrc.json | 3 - .../logger/.gitlab/issue_templates/bug.md | 6 - packages/logger/CHANGELOG.md | 66 +- packages/logger/LICENSE | 200 --- packages/logger/README.md | 25 +- packages/logger/package.json | 76 +- packages/logger/src/index.ts | 9 + packages/logger/src/transformation.ts | 2 +- packages/logger/test/common.spec.ts | 46 +- packages/logger/test/dummyTransport.ts | 2 +- packages/logger/test/logger.spec.ts | 32 +- .../transformations/add-log-level.spec.ts | 2 +- .../test/transformations/colorize.spec.ts | 6 +- .../test/transformations/timestamp.spec.ts | 3 +- packages/logger/tsconfig.json | 2 +- pnpm-lock.yaml | 1520 ++++++++++++++--- sync.mjs | 113 ++ turbo.json | 3 + typedoc.json | 15 + 427 files changed, 3978 insertions(+), 9810 deletions(-) rename backend/backend/.editorconfig => .editorconfig (100%) rename backend/backend/.gitattributes => .gitattributes (100%) rename packages/core/.mailmap => .mailmap (89%) create mode 100644 .pnpmfile.cjs rename packages/core/CONTRIBUTING.md => CONTRIBUTING.md (100%) delete mode 100644 backend/backend/.eslintignore delete mode 100644 backend/backend/.eslintrc.json delete mode 100644 backend/backend/LICENSE delete mode 100644 backend/proxy/.editorconfig delete mode 100644 backend/proxy/.eslintrc.json delete mode 100644 backend/proxy/LICENSE rename backend/proxy/src/{cli.ts => app.ts} (100%) delete mode 100644 configuration/configuration/.editorconfig delete mode 100644 configuration/configuration/.eslintignore delete mode 100644 configuration/configuration/.eslintrc.json delete mode 100644 configuration/configuration/.gitignore delete mode 100644 configuration/configuration/.gitlab-ci.yml delete mode 100644 configuration/configuration/.gitlab/issue_templates/bug.md delete mode 100644 configuration/configuration/.gitlab/issue_templates/feature.md delete mode 100644 configuration/configuration/.npmignore delete mode 100644 configuration/configuration/CHANGELOG.md delete mode 100644 configuration/configuration/LICENSE delete mode 100644 configuration/configuration/README.md delete mode 100644 configuration/configuration/app.js delete mode 100644 configuration/configuration/package.json delete mode 100644 configuration/configuration/src/cli.ts delete mode 100644 configuration/configuration/src/common.ts delete mode 100644 configuration/configuration/templates/template-.gitignore delete mode 100644 configuration/configuration/templates/template-.npmignore delete mode 100644 configuration/configuration/templates/template-tsconfig.json delete mode 100644 configuration/eslint-config/.editorconfig delete mode 100644 configuration/eslint-config/.gitignore delete mode 100644 configuration/eslint-config/.gitlab-ci.yml delete mode 100644 configuration/eslint-config/.npmignore delete mode 100644 configuration/eslint-config/LICENSE create mode 100644 configuration/nyc-config/index.json create mode 100644 configuration/nyc-config/package.json delete mode 100644 configuration/prettier-config/.editorconfig delete mode 100644 configuration/prettier-config/LICENSE delete mode 100644 configuration/projectmanagement/.editorconfig delete mode 100644 configuration/projectmanagement/.eslintignore delete mode 100644 configuration/projectmanagement/.eslintrc.json delete mode 100644 configuration/projectmanagement/LICENSE create mode 100644 configuration/tsconfig/package.json rename configuration/{configuration => tsconfig}/tsconfig.json (100%) delete mode 100644 examples/minimal-connector/.editorconfig delete mode 100644 examples/minimal-plugin/.editorconfig delete mode 100644 examples/minimal-plugin/.gitattributes delete mode 100644 examples/minimal-plugin/LICENSE rename examples/minimal-plugin/src/{cli.ts => app.ts} (56%) delete mode 100644 examples/minimal-plugin/tslint.json create mode 100644 package-template.json rename packages/api/src/{cli.ts => app.ts} (100%) create mode 100644 packages/api/src/index.ts delete mode 100644 packages/collection-utils/.editorconfig delete mode 100644 packages/collection-utils/.eslintignore delete mode 100644 packages/collection-utils/.eslintrc.json delete mode 100644 packages/collection-utils/.gitignore delete mode 100644 packages/collection-utils/LICENSE create mode 100644 packages/collection-utils/src/index.ts delete mode 100644 packages/core-tools/.editorconfig delete mode 100644 packages/core-tools/.eslintignore delete mode 100644 packages/core-tools/.eslintrc.json rename packages/core-tools/src/{cli.ts => app.ts} (96%) create mode 100644 packages/core-tools/src/index.ts delete mode 100644 packages/core-tools/src/pack.ts delete mode 100644 packages/core/.editorconfig delete mode 100644 packages/core/.eslintignore delete mode 100644 packages/core/.eslintrc.json delete mode 100644 packages/core/.gitlab/issue_templates/bug.md delete mode 100644 packages/core/.gitlab/issue_templates/change.md delete mode 100644 packages/core/.gitlab/issue_templates/feature.md delete mode 100644 packages/core/LICENSE create mode 100644 packages/easy-ast/README.md create mode 100644 packages/easy-ast/package.json rename packages/{core-tools/src/easy-ast => easy-ast/src}/ast-internal-util.ts (97%) rename packages/{core-tools/src/easy-ast => easy-ast/src}/ast-util.ts (82%) rename packages/{core-tools/src/easy-ast => easy-ast/src}/easy-ast.ts (91%) rename packages/{core-tools/src/types/pack.ts => easy-ast/src/index.ts} (54%) rename packages/{core-tools/src/easy-ast => easy-ast/src}/types/lightweight-alias-definition.ts (100%) rename packages/{core-tools/src/easy-ast => easy-ast/src}/types/lightweight-class-definition.ts (100%) rename packages/{core-tools/src/easy-ast => easy-ast/src}/types/lightweight-comment.ts (100%) rename packages/{core-tools/src/easy-ast => easy-ast/src}/types/lightweight-definition-kind.ts (100%) rename packages/{core-tools/src/easy-ast => easy-ast/src}/types/lightweight-definition.ts (100%) rename packages/{core-tools/src/easy-ast => easy-ast/src}/types/lightweight-project.ts (94%) rename packages/{core-tools/src/easy-ast => easy-ast/src}/types/lightweight-property.ts (100%) rename packages/{core-tools/src/easy-ast => easy-ast/src}/types/lightweight-type.ts (100%) create mode 100644 packages/easy-ast/src/util.ts rename packages/{core-tools/test/easy-ast => easy-ast/test}/alias-like.ast-test.ts (100%) rename packages/{core-tools/test/easy-ast => easy-ast/test}/array-like.ast-test.ts (100%) rename packages/{core-tools/test/easy-ast => easy-ast/test}/class-like.ast-test.ts (100%) rename packages/{core-tools/test/easy-ast => easy-ast/test}/comment.ast-test.ts (100%) rename packages/{core-tools/test/easy-ast => easy-ast/test}/default-generics.ast-test.ts (100%) rename packages/{core-tools/test/easy-ast => easy-ast/test}/easy-ast-spec-type.ts (100%) rename packages/{core-tools/test/easy-ast => easy-ast/test}/enum-specified-value.ast-test.ts (100%) rename packages/{core-tools/test/easy-ast => easy-ast/test}/generics.ast-test.ts (100%) rename packages/{core-tools/test/easy-ast => easy-ast/test}/index-signature.ast-test.ts (100%) rename packages/{core-tools/test/easy-ast.spec.ts => easy-ast/test/index.ts} (83%) rename packages/{core-tools/test/easy-ast => easy-ast/test}/ineritance.ast-test.ts (100%) rename packages/{core-tools/test/easy-ast => easy-ast/test}/nested.ast-test.ts (100%) rename packages/{core-tools/test/easy-ast => easy-ast/test}/primitive-types.ast-test.ts (100%) rename packages/{core-tools/test/easy-ast => easy-ast/test}/stack-overflow.ast-test.ts (100%) create mode 100644 packages/easy-ast/tsconfig.json delete mode 100644 packages/es-mapping-generator/.editorconfig delete mode 100644 packages/es-mapping-generator/LICENSE rename packages/es-mapping-generator/src/{cli.ts => app.ts} (99%) create mode 100644 packages/es-mapping-generator/src/index.ts delete mode 100644 packages/gitlab-api/.editorconfig delete mode 100644 packages/gitlab-api/.eslintignore delete mode 100644 packages/gitlab-api/.eslintrc.json delete mode 100644 packages/gitlab-api/LICENSE rename packages/gitlab-api/src/{cli.ts => app.ts} (95%) delete mode 100644 packages/logger/.editorconfig delete mode 100644 packages/logger/.eslintignore delete mode 100644 packages/logger/.eslintrc.json delete mode 100644 packages/logger/LICENSE create mode 100644 packages/logger/src/index.ts create mode 100644 sync.mjs create mode 100644 typedoc.json diff --git a/backend/backend/.editorconfig b/.editorconfig similarity index 100% rename from backend/backend/.editorconfig rename to .editorconfig diff --git a/backend/backend/.gitattributes b/.gitattributes similarity index 100% rename from backend/backend/.gitattributes rename to .gitattributes diff --git a/.gitignore b/.gitignore index a23a55a6..7c2254fd 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,98 @@ +# Logs +logs +*.log +npm-debug.log* +yarn-debug.log* +yarn-error.log* + +# Runtime data +pids +*.pid +*.seed +*.pid.lock +.DS_Store + +# Directory for instrumented libs generated by jscoverage/JSCover +lib-cov + +# Coverage directory used by tools like istanbul +coverage + +# nyc test coverage +.nyc_output + +# Grunt intermediate storage (https://gruntjs.com/creating-plugins#storing-task-files) +.grunt + +# Bower dependency directory (https://bower.io/) +bower_components + +# node-waf configuration +.lock-wscript + +# Compiled binary addons (https://nodejs.org/api/addons.html) +build/Release + +# Dependency directories +node_modules/ +jspm_packages/ + +# TypeScript v1 declaration files +typings/ + +# Optional npm cache directory +.npm + +# Optional eslint cache +.eslintcache + +# Optional REPL history +.node_repl_history + +# Output of 'npm pack' +*.tgz + +# Yarn Integrity file +.yarn-integrity + +# dotenv environment variables file +.env.local + +# parcel-bundler cache (https://parceljs.org/) +.cache + +# next.js build output +.next + +# nuxt.js build output +.nuxt + +# vuepress build output +.vuepress/dist + +# Serverless directories +.serverless/ + +# FuseBox cache +.fusebox/ + +#DynamoDB Local files +.dynamodb/ + +########## end of https://github.com/github/gitignore/blob/master/Node.gitignore + +# ignore ide files .idea .vscode -.turbo -node_modules -.env.local \ No newline at end of file + +# ignore lib +lib + +# ignore docs +docs + +# report directory +report + +# turbo cache +.turbo/ diff --git a/packages/core/.mailmap b/.mailmap similarity index 89% rename from packages/core/.mailmap rename to .mailmap index d9a6df76..7c8ab89b 100644 --- a/packages/core/.mailmap +++ b/.mailmap @@ -1,4 +1,3 @@ Rainer Killinger Rainer Killinger Rainer Killinger Rainer Killinger Rainer Killinger Rainer Killinger -Thea Schöbl diff --git a/.pnpmfile.cjs b/.pnpmfile.cjs new file mode 100644 index 00000000..21e7fc6b --- /dev/null +++ b/.pnpmfile.cjs @@ -0,0 +1,38 @@ +const path = require("path"); +const merge = require("deepmerge"); + +function readPackage(pkg, context) { + const eslintDeps = require('./configuration/eslint-config/package.json').peerDependencies; + const prettierDeps = require('./configuration/prettier-config/package.json').peerDependencies; + + pkg.devDependencies = { + ...eslintDeps, + ...prettierDeps, + ...(pkg.devDependencies || {}), + } + + // const targetConfig = defaultConfig + // .provideFields + // ?.map(it => it.split('.')) + // .reduce((acc, curr) => { + // let target = acc; + // let from = defaultConfig; + // for (const fragment of curr.slice(0, -1)) { + // target[fragment] = target[fragment] || {} + // target = target[fragment] + // from = from[fragment] + // } + // const fragment = curr[curr.length - 1] + // target[fragment] = from[fragment]; + // return acc; + // }, {}) ?? {} + // return merge(targetConfig, pkg); + + return pkg +} + +module.exports = { + hooks: { + readPackage, + } +} diff --git a/.syncpackrc.json b/.syncpackrc.json index 5de877ef..69c9640d 100644 --- a/.syncpackrc.json +++ b/.syncpackrc.json @@ -14,77 +14,84 @@ "repository", "author", "contributors", - "prettier", + "keywords", "main", "types", "bin", "scripts", "dependencies", "devDependencies", - "peerDependencies" + "peerDependencies", + "tsup", + "prettier", + "eslintConfig", + "eslintIgnore", + "nyc" ], "versionGroups": [ { "label": "ES Mapping Generator Special Dependencies", - "dependencies": ["typescript", "typedoc", "ts-node", "@types/node", "got"], - "packages": ["@openstapps/es-mapping-generator"], + "dependencies": [ + "typescript", + "typedoc", + "ts-node", + "@types/node", + "got" + ], + "packages": [ + "@openstapps/es-mapping-generator" + ], + "isIgnored": true + }, + { + "label": "App Special Dependencies", + "dependencies": [ + "typescript" + ], + "packages": [ + "@openstapps/app" + ], "isIgnored": true }, { "label": "Should have the same version", - "dependencies": ["**"], - "dependencyTypes": ["workspace"], - "packages": ["**"], + "dependencies": [ + "**" + ], + "dependencyTypes": [ + "workspace" + ], + "packages": [ + "**" + ], "pinVersion": "2.1.0" }, { "label": "Packages should use workspace version", - "dependencies": ["@openstapps/**"], - "dependencyTypes": ["prod", "dev"], - "packages": ["**"], + "dependencies": [ + "@openstapps/**" + ], + "dependencyTypes": [ + "prod", + "dev" + ], + "packages": [ + "**" + ], "pinVersion": "workspace:*" }, { - "label": "Packages should be synced to configuration", + "label": "Packages should be synced to app", "dependencies": [ "typescript", - "ts-node", - "eslint", - "prettier" + "ts-node" ], "packages": [ "**" ], "snapTo": [ - "@openstapps/configuration", - "@openstapps/prettier-config", - "@openstapps/eslint-config", "@openstapps/app" ] - }, - { - "label": "No Banned Dependencies", - "dependencies": [ - "tslint", - "lodash", - "@types/lodash" - ], - "packages": [ - "**" - ], - "isBanned": true - }, - { - "label": "No @types package in prod dependencies of applications", - "dependencies": ["@types/**"], - "dependencyTypes": ["prod"], - "packages": [ - "@openstapps/app", - "@openstapps/backend", - "@openstapps/proxy", - "@openstapps/minimal**" - ], - "isBanned": true } ] -} \ No newline at end of file +} diff --git a/packages/core/CONTRIBUTING.md b/CONTRIBUTING.md similarity index 100% rename from packages/core/CONTRIBUTING.md rename to CONTRIBUTING.md diff --git a/backend/backend/.eslintignore b/backend/backend/.eslintignore deleted file mode 100644 index 3d0a9346..00000000 --- a/backend/backend/.eslintignore +++ /dev/null @@ -1,2 +0,0 @@ -resources -openapi diff --git a/backend/backend/.eslintrc.json b/backend/backend/.eslintrc.json deleted file mode 100644 index 31d47702..00000000 --- a/backend/backend/.eslintrc.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "extends": "@openstapps" -} diff --git a/backend/backend/.gitlab-ci.yml b/backend/backend/.gitlab-ci.yml index e2df294b..06118b44 100644 --- a/backend/backend/.gitlab-ci.yml +++ b/backend/backend/.gitlab-ci.yml @@ -122,7 +122,7 @@ ci: - secrecy .publish_version_template: &publish_version_template - script: + script: - export CORE_VERSION=$(openstapps-projectmanagement get-used-version @openstapps/core) - export VERSION=$(echo -n "$CI_COMMIT_REF_NAME" | cut -c 2-) - export IMAGETAG_BASE=$CI_REGISTRY_IMAGE @@ -134,7 +134,7 @@ ci: - docker push $IMAGETAG_BASE .publish_branch_template: &publish_branch_template - script: + script: - export CORE_VERSION=$(openstapps-projectmanagement get-used-version @openstapps/core) - export IMAGETAG_BASE=$CI_REGISTRY_IMAGE/$CI_COMMIT_REF_NAME - export IMAGETAG_CORE_VERSION=$IMAGETAG_BASE:core-$CORE_VERSION diff --git a/backend/backend/.gitlab/issue_templates/bug.md b/backend/backend/.gitlab/issue_templates/bug.md index b31312d7..d360f418 100644 --- a/backend/backend/.gitlab/issue_templates/bug.md +++ b/backend/backend/.gitlab/issue_templates/bug.md @@ -2,12 +2,10 @@ (Summarize the bug encountered concisely) - ## Steps to reproduce (How one can reproduce the issue - this is very important) - ## Example Project (If possible, please create an example project here on GitLab.com that exhibits the problematic behaviour, and link to it here in the bug report) @@ -22,18 +20,15 @@ (What actually happens) - ## What is the expected correct behavior? (What you should see instead) - ## Relevant logs and/or screenshots (Paste any relevant logs - please use code blocks (```) to format console output, logs, and code as it's very hard to read otherwise.) - ## Possible fixes (If you can, link to the line of code that might be responsible for the problem) diff --git a/backend/backend/.gitlab/issue_templates/feature.md b/backend/backend/.gitlab/issue_templates/feature.md index e601cd15..e844e6e8 100644 --- a/backend/backend/.gitlab/issue_templates/feature.md +++ b/backend/backend/.gitlab/issue_templates/feature.md @@ -2,19 +2,16 @@ (Describe the feature that you're requesting concisely) - ## Explanation (Explain why the feature is necessary) - ## Mockups/Data (If possible, provide mockups or examples of communication, which demonstrate the feature) - ## Dependencies, issues to be resolved beforehand (List issues or dependencies that need to be resolved before this feature can be implemented) -/label ~feature ~meeting \ No newline at end of file +/label ~feature ~meeting diff --git a/backend/backend/CHANGELOG.md b/backend/backend/CHANGELOG.md index 891efe8e..c5a49585 100644 --- a/backend/backend/CHANGELOG.md +++ b/backend/backend/CHANGELOG.md @@ -16,105 +16,85 @@ # [0.6.0](https://gitlab.com/openstapps/backend/compare/v0.5.0...v0.6.0) (2023-01-30) - - # [0.5.0](https://gitlab.com/openstapps/backend/compare/v0.4.1...v0.5.0) (2022-12-06) - - ## [0.4.1](https://gitlab.com/openstapps/backend/compare/v0.4.0...v0.4.1) (2022-11-02) - - # [0.4.0](https://gitlab.com/openstapps/backend/compare/v0.3.1...v0.4.0) (2022-10-21) - - ## [0.3.1](https://gitlab.com/openstapps/backend/compare/v0.3.0...v0.3.1) (2022-09-02) - - # [0.3.0](https://gitlab.com/openstapps/backend/compare/v0.2.0...v0.3.0) (2022-08-24) - - # [0.2.0](https://gitlab.com/openstapps/backend/compare/v0.1.0...v0.2.0) (2022-08-22) - ### Bug Fixes -* update PAIA API URL ([a20200e](https://gitlab.com/openstapps/backend/commit/a20200e52a725ede42cb5e026a5a693b1ba3d149)) - - +- update PAIA API URL ([a20200e](https://gitlab.com/openstapps/backend/commit/a20200e52a725ede42cb5e026a5a693b1ba3d149)) # [0.1.0](https://gitlab.com/openstapps/backend/compare/16bbb7e9e36b7adf27452e1b09f7970e98aa27df...v0.1.0) (2022-06-30) - ### Bug Fixes -* Add default configuration file for prometheus monitoring ([7ed2921](https://gitlab.com/openstapps/backend/commit/7ed2921efbce7fa5134206763eea986c6ef9a919)) -* add prefix to schema names ([90822f5](https://gitlab.com/openstapps/backend/commit/90822f5888ed34d594b02df3f5cd9ec8ce74251e)) -* apply correct types and tslint rules ([0cbf9b2](https://gitlab.com/openstapps/backend/commit/0cbf9b26a972563ad9483d78cea9ba809381f7dd)) -* automatically remove invalid characters for aliases generated from index names ([6f7e23d](https://gitlab.com/openstapps/backend/commit/6f7e23df20af54abf2459da8aaebe236b82a5f1c)) -* Don't force Mapping generation with 'npm start' ([4cfb560](https://gitlab.com/openstapps/backend/commit/4cfb560954ca97e22091e13d515475218885b1de)) -* enhance default search query generation ([24a9122](https://gitlab.com/openstapps/backend/commit/24a91229f28fb17cb4941aab688a08266437c1eb)) -* error thrown on consecutive connector executions ([2259da3](https://gitlab.com/openstapps/backend/commit/2259da317a848660fc2b0a14e50e2ae5ae329889)), closes [#73](https://gitlab.com/openstapps/backend/issues/73) -* esacpe mappin template filename ([496e6c5](https://gitlab.com/openstapps/backend/commit/496e6c5bd0563bd2dc0c6eff45c9bd685d95b453)) -* fix markdown formatting in config ([9c5581a](https://gitlab.com/openstapps/backend/commit/9c5581af2cc131b81c288eadc39827124963ce55)) -* fix reading url path as parameters ([9b889c8](https://gitlab.com/openstapps/backend/commit/9b889c873624d43baed4769a788db39528b143d8)) -* imports from src in config files lead to crash ([f6003d7](https://gitlab.com/openstapps/backend/commit/f6003d7f8709d4424acd261cc7804e4d2684a9f4)) -* invalid monthly cron execution time ([7a9f3ea](https://gitlab.com/openstapps/backend/commit/7a9f3eaca4667870ed19b17fd26c3c6d8e1fadd5)) -* make config compatible with core, update database version ([f11376e](https://gitlab.com/openstapps/backend/commit/f11376ecf8c4997f6d0a85b3f3fde9e8b02bd61b)) -* make facets work again ([d917627](https://gitlab.com/openstapps/backend/commit/d917627d588783d8734bd1d0c30d3d2782d02761)) -* make index route work correctly ([fa2c9d7](https://gitlab.com/openstapps/backend/commit/fa2c9d7a881d9e94da8512349056b69206e4e3d0)) -* properly check if an object exists before update ([e165837](https://gitlab.com/openstapps/backend/commit/e165837a154243305dc300acaa29605732290f6a)), closes [#70](https://gitlab.com/openstapps/backend/issues/70) -* remove onlyOnTypes from mustMatch ([1d5f99b](https://gitlab.com/openstapps/backend/commit/1d5f99b1fa74c486dc4df29daf9c0aa453935821)), closes [#83](https://gitlab.com/openstapps/backend/issues/83) -* replace isProductiveEnvironment with isTestEnvironment ([8c48552](https://gitlab.com/openstapps/backend/commit/8c48552abf7b7983e966ebc22299b334cae46167)) -* return syntax error when receiving bad json ([12b71ba](https://gitlab.com/openstapps/backend/commit/12b71ba1f1f3e45a84b001b395dcfa1578355276)), closes [#3](https://gitlab.com/openstapps/backend/issues/3) -* return validation error instead of internal server error ([24e27c1](https://gitlab.com/openstapps/backend/commit/24e27c1d9e002db3b8f4afb4a31ad994c0eaad42)) -* route for news ([7e35fae](https://gitlab.com/openstapps/backend/commit/7e35fae34e02bf2e12cf0d0b960d48de97fd4200)) -* set config file before accessing it ([e17db52](https://gitlab.com/openstapps/backend/commit/e17db521e2a3f4f15dc5e5b758bd1ada10c78161)), closes [#27](https://gitlab.com/openstapps/backend/issues/27) -* stapps core version in config ([32c8a21](https://gitlab.com/openstapps/backend/commit/32c8a2149ad18179610af02483b794b426b7b9dc)), closes [#74](https://gitlab.com/openstapps/backend/issues/74) -* take coordinates in right order ([bb3be5a](https://gitlab.com/openstapps/backend/commit/bb3be5a816f7e4eb85b69ec558572bed9c3b6b39)), closes [#116](https://gitlab.com/openstapps/backend/issues/116) -* use SCRequestBodyTooLargeError ([e70e50a](https://gitlab.com/openstapps/backend/commit/e70e50a1eab00cd180479c5e0299f974da92fe94)), closes [#20](https://gitlab.com/openstapps/backend/issues/20) -* use specific time from filter if defined ([80e6249](https://gitlab.com/openstapps/backend/commit/80e62496f0731af721193875d5a6cdbf10b34607)) -* wait for config file validation ([30082f8](https://gitlab.com/openstapps/backend/commit/30082f87262fa7428172fcbb6710b66d4bfe6261)) -* wrong way alias names are generated ([9488451](https://gitlab.com/openstapps/backend/commit/94884510802906cdbfdd3490fac5fc9401937da7)), closes [#79](https://gitlab.com/openstapps/backend/issues/79) - +- Add default configuration file for prometheus monitoring ([7ed2921](https://gitlab.com/openstapps/backend/commit/7ed2921efbce7fa5134206763eea986c6ef9a919)) +- add prefix to schema names ([90822f5](https://gitlab.com/openstapps/backend/commit/90822f5888ed34d594b02df3f5cd9ec8ce74251e)) +- apply correct types and tslint rules ([0cbf9b2](https://gitlab.com/openstapps/backend/commit/0cbf9b26a972563ad9483d78cea9ba809381f7dd)) +- automatically remove invalid characters for aliases generated from index names ([6f7e23d](https://gitlab.com/openstapps/backend/commit/6f7e23df20af54abf2459da8aaebe236b82a5f1c)) +- Don't force Mapping generation with 'npm start' ([4cfb560](https://gitlab.com/openstapps/backend/commit/4cfb560954ca97e22091e13d515475218885b1de)) +- enhance default search query generation ([24a9122](https://gitlab.com/openstapps/backend/commit/24a91229f28fb17cb4941aab688a08266437c1eb)) +- error thrown on consecutive connector executions ([2259da3](https://gitlab.com/openstapps/backend/commit/2259da317a848660fc2b0a14e50e2ae5ae329889)), closes [#73](https://gitlab.com/openstapps/backend/issues/73) +- esacpe mappin template filename ([496e6c5](https://gitlab.com/openstapps/backend/commit/496e6c5bd0563bd2dc0c6eff45c9bd685d95b453)) +- fix markdown formatting in config ([9c5581a](https://gitlab.com/openstapps/backend/commit/9c5581af2cc131b81c288eadc39827124963ce55)) +- fix reading url path as parameters ([9b889c8](https://gitlab.com/openstapps/backend/commit/9b889c873624d43baed4769a788db39528b143d8)) +- imports from src in config files lead to crash ([f6003d7](https://gitlab.com/openstapps/backend/commit/f6003d7f8709d4424acd261cc7804e4d2684a9f4)) +- invalid monthly cron execution time ([7a9f3ea](https://gitlab.com/openstapps/backend/commit/7a9f3eaca4667870ed19b17fd26c3c6d8e1fadd5)) +- make config compatible with core, update database version ([f11376e](https://gitlab.com/openstapps/backend/commit/f11376ecf8c4997f6d0a85b3f3fde9e8b02bd61b)) +- make facets work again ([d917627](https://gitlab.com/openstapps/backend/commit/d917627d588783d8734bd1d0c30d3d2782d02761)) +- make index route work correctly ([fa2c9d7](https://gitlab.com/openstapps/backend/commit/fa2c9d7a881d9e94da8512349056b69206e4e3d0)) +- properly check if an object exists before update ([e165837](https://gitlab.com/openstapps/backend/commit/e165837a154243305dc300acaa29605732290f6a)), closes [#70](https://gitlab.com/openstapps/backend/issues/70) +- remove onlyOnTypes from mustMatch ([1d5f99b](https://gitlab.com/openstapps/backend/commit/1d5f99b1fa74c486dc4df29daf9c0aa453935821)), closes [#83](https://gitlab.com/openstapps/backend/issues/83) +- replace isProductiveEnvironment with isTestEnvironment ([8c48552](https://gitlab.com/openstapps/backend/commit/8c48552abf7b7983e966ebc22299b334cae46167)) +- return syntax error when receiving bad json ([12b71ba](https://gitlab.com/openstapps/backend/commit/12b71ba1f1f3e45a84b001b395dcfa1578355276)), closes [#3](https://gitlab.com/openstapps/backend/issues/3) +- return validation error instead of internal server error ([24e27c1](https://gitlab.com/openstapps/backend/commit/24e27c1d9e002db3b8f4afb4a31ad994c0eaad42)) +- route for news ([7e35fae](https://gitlab.com/openstapps/backend/commit/7e35fae34e02bf2e12cf0d0b960d48de97fd4200)) +- set config file before accessing it ([e17db52](https://gitlab.com/openstapps/backend/commit/e17db521e2a3f4f15dc5e5b758bd1ada10c78161)), closes [#27](https://gitlab.com/openstapps/backend/issues/27) +- stapps core version in config ([32c8a21](https://gitlab.com/openstapps/backend/commit/32c8a2149ad18179610af02483b794b426b7b9dc)), closes [#74](https://gitlab.com/openstapps/backend/issues/74) +- take coordinates in right order ([bb3be5a](https://gitlab.com/openstapps/backend/commit/bb3be5a816f7e4eb85b69ec558572bed9c3b6b39)), closes [#116](https://gitlab.com/openstapps/backend/issues/116) +- use SCRequestBodyTooLargeError ([e70e50a](https://gitlab.com/openstapps/backend/commit/e70e50a1eab00cd180479c5e0299f974da92fe94)), closes [#20](https://gitlab.com/openstapps/backend/issues/20) +- use specific time from filter if defined ([80e6249](https://gitlab.com/openstapps/backend/commit/80e62496f0731af721193875d5a6cdbf10b34607)) +- wait for config file validation ([30082f8](https://gitlab.com/openstapps/backend/commit/30082f87262fa7428172fcbb6710b66d4bfe6261)) +- wrong way alias names are generated ([9488451](https://gitlab.com/openstapps/backend/commit/94884510802906cdbfdd3490fac5fc9401937da7)), closes [#79](https://gitlab.com/openstapps/backend/issues/79) ### Features -* add backend ([16bbb7e](https://gitlab.com/openstapps/backend/commit/16bbb7e9e36b7adf27452e1b09f7970e98aa27df)) -* add boosting to context based search ([dd4be92](https://gitlab.com/openstapps/backend/commit/dd4be92f90c6e7047eea0d00a2442b75673329f6)) -* add catalog menu entry and rearrange ([4e42772](https://gitlab.com/openstapps/backend/commit/4e42772ca3788d3ee7af78266ee223e05fe6a8f3)) -* add default app settings and menus ([54301ae](https://gitlab.com/openstapps/backend/commit/54301ae8fb656db17e231197c3a64fc27f541024)) -* add dummy about config ([d6f126f](https://gitlab.com/openstapps/backend/commit/d6f126f19776ee7902e65d9248501b4986657ed9)) -* add favorites to personal menu ([de0617b](https://gitlab.com/openstapps/backend/commit/de0617b8dd51182326094543110b8ed294a6e940)) -* add feedback to config as menu item ([7ba6472](https://gitlab.com/openstapps/backend/commit/7ba647271efd87c422ce302bd5baf5760671e1a1)) -* add functionality to register plugins via http ([3d51ccf](https://gitlab.com/openstapps/backend/commit/3d51ccfac26b2c3ad1271c29c1e736aaf7fcd88f)), closes [#2](https://gitlab.com/openstapps/backend/issues/2) [#37](https://gitlab.com/openstapps/backend/issues/37) -* add hebis proxy url ([ca1d244](https://gitlab.com/openstapps/backend/commit/ca1d2444e03aacad37219d93d657968b7a933f78)), closes [#120](https://gitlab.com/openstapps/backend/issues/120) -* add openapi docs generation to api ([614a1b1](https://gitlab.com/openstapps/backend/commit/614a1b1e9b3c525d5524065851689f793a4b3b4b)) -* Add prometheus middleware to express ([b42e911](https://gitlab.com/openstapps/backend/commit/b42e911a117c59b2d70c1587f9e9b20a846e92d0)) -* add routes doc generation to npm documentation script ([4a64f26](https://gitlab.com/openstapps/backend/commit/4a64f26e43979cdd4390bad796e1b7dc3f8c7027)) -* add schedule route ([785813c](https://gitlab.com/openstapps/backend/commit/785813c3fb92bbebd7b07246bbcec77a9a4520e3)) -* Add start-debug npm run script ([23eb1e2](https://gitlab.com/openstapps/backend/commit/23eb1e2263d2dd9d55f9a6ac5fca2a8fad7f1e84)) -* add support for generated elasticsearch mappings ([8eab6b8](https://gitlab.com/openstapps/backend/commit/8eab6b8531d91d4569fe13743624f5ce91a7dc1e)), closes [#38](https://gitlab.com/openstapps/backend/issues/38) -* add support for multiple values in value filter ([de60311](https://gitlab.com/openstapps/backend/commit/de60311bd072db01eaf50965f3fdc307bfedc4c2)) -* add support for new availability filter ([47f3232](https://gitlab.com/openstapps/backend/commit/47f3232f155a13ea39abb2aaaecafd54fa7d98ce)) -* add support for range filters ([dc16974](https://gitlab.com/openstapps/backend/commit/dc169746e7fa0f50a1f969653043e5a4d5fa0f01)) -* add support for range filters ([dcf7906](https://gitlab.com/openstapps/backend/commit/dcf7906f79f07d9cfee704454eedddb452a1f255)) -* adjust to changes of SCFacet in core v0.12.0 ([2f13010](https://gitlab.com/openstapps/backend/commit/2f13010480b87a4a06634084033b3b0822eb78ee)), closes [#30](https://gitlab.com/openstapps/backend/issues/30) -* allow for searching illegal elasticsearch characters ([b629d05](https://gitlab.com/openstapps/backend/commit/b629d058eb64c7a785648fab0a7073eeaa37e895)) -* boost academic terms dynamically ([13938ec](https://gitlab.com/openstapps/backend/commit/13938ecf211060a3f50747ac7fed343b71a6aa4b)) -* log registration and removal of plugins ([006bbeb](https://gitlab.com/openstapps/backend/commit/006bbebe60b7f5015d80ac825622cefbc25cd959)), closes [#71](https://gitlab.com/openstapps/backend/issues/71) -* make backend work with automatically generated aggregations ([ba2c6f6](https://gitlab.com/openstapps/backend/commit/ba2c6f655c263f0b1d1e55b739adde0004bbf408)) -* move EXTERNAL_REQUEST_TIMEOUT to config file ([5d6d4b5](https://gitlab.com/openstapps/backend/commit/5d6d4b53f01550365a330daecbcb4e0f6bdb8aef)) -* move up and enable cors ([6483221](https://gitlab.com/openstapps/backend/commit/6483221b62d84c5871ee4ec82158f8b9ef1ed54e)) -* support geo shape filter ([dd8a6b3](https://gitlab.com/openstapps/backend/commit/dd8a6b3abcc90c50a16167054e2f3cdcee40c863)) -* use config file for maxRequestBodySize ([d110d60](https://gitlab.com/openstapps/backend/commit/d110d60123a28563fe0c58ab903f61255a9644a2)) -* use config for MultiSearchRoute ([8278279](https://gitlab.com/openstapps/backend/commit/827827905b71c71dfa9299a9deb92a8c9cfc0e20)) -* use new Elasticsearch package ([1bad092](https://gitlab.com/openstapps/backend/commit/1bad092185d989078badc66f9c138d2e1baa27e4)) -* utilize api-cli for e2e integration test ([ce06e73](https://gitlab.com/openstapps/backend/commit/ce06e735bea379c9ad955a627e3e1cead37c85fe)) - - - +- add backend ([16bbb7e](https://gitlab.com/openstapps/backend/commit/16bbb7e9e36b7adf27452e1b09f7970e98aa27df)) +- add boosting to context based search ([dd4be92](https://gitlab.com/openstapps/backend/commit/dd4be92f90c6e7047eea0d00a2442b75673329f6)) +- add catalog menu entry and rearrange ([4e42772](https://gitlab.com/openstapps/backend/commit/4e42772ca3788d3ee7af78266ee223e05fe6a8f3)) +- add default app settings and menus ([54301ae](https://gitlab.com/openstapps/backend/commit/54301ae8fb656db17e231197c3a64fc27f541024)) +- add dummy about config ([d6f126f](https://gitlab.com/openstapps/backend/commit/d6f126f19776ee7902e65d9248501b4986657ed9)) +- add favorites to personal menu ([de0617b](https://gitlab.com/openstapps/backend/commit/de0617b8dd51182326094543110b8ed294a6e940)) +- add feedback to config as menu item ([7ba6472](https://gitlab.com/openstapps/backend/commit/7ba647271efd87c422ce302bd5baf5760671e1a1)) +- add functionality to register plugins via http ([3d51ccf](https://gitlab.com/openstapps/backend/commit/3d51ccfac26b2c3ad1271c29c1e736aaf7fcd88f)), closes [#2](https://gitlab.com/openstapps/backend/issues/2) [#37](https://gitlab.com/openstapps/backend/issues/37) +- add hebis proxy url ([ca1d244](https://gitlab.com/openstapps/backend/commit/ca1d2444e03aacad37219d93d657968b7a933f78)), closes [#120](https://gitlab.com/openstapps/backend/issues/120) +- add openapi docs generation to api ([614a1b1](https://gitlab.com/openstapps/backend/commit/614a1b1e9b3c525d5524065851689f793a4b3b4b)) +- Add prometheus middleware to express ([b42e911](https://gitlab.com/openstapps/backend/commit/b42e911a117c59b2d70c1587f9e9b20a846e92d0)) +- add routes doc generation to npm documentation script ([4a64f26](https://gitlab.com/openstapps/backend/commit/4a64f26e43979cdd4390bad796e1b7dc3f8c7027)) +- add schedule route ([785813c](https://gitlab.com/openstapps/backend/commit/785813c3fb92bbebd7b07246bbcec77a9a4520e3)) +- Add start-debug npm run script ([23eb1e2](https://gitlab.com/openstapps/backend/commit/23eb1e2263d2dd9d55f9a6ac5fca2a8fad7f1e84)) +- add support for generated elasticsearch mappings ([8eab6b8](https://gitlab.com/openstapps/backend/commit/8eab6b8531d91d4569fe13743624f5ce91a7dc1e)), closes [#38](https://gitlab.com/openstapps/backend/issues/38) +- add support for multiple values in value filter ([de60311](https://gitlab.com/openstapps/backend/commit/de60311bd072db01eaf50965f3fdc307bfedc4c2)) +- add support for new availability filter ([47f3232](https://gitlab.com/openstapps/backend/commit/47f3232f155a13ea39abb2aaaecafd54fa7d98ce)) +- add support for range filters ([dc16974](https://gitlab.com/openstapps/backend/commit/dc169746e7fa0f50a1f969653043e5a4d5fa0f01)) +- add support for range filters ([dcf7906](https://gitlab.com/openstapps/backend/commit/dcf7906f79f07d9cfee704454eedddb452a1f255)) +- adjust to changes of SCFacet in core v0.12.0 ([2f13010](https://gitlab.com/openstapps/backend/commit/2f13010480b87a4a06634084033b3b0822eb78ee)), closes [#30](https://gitlab.com/openstapps/backend/issues/30) +- allow for searching illegal elasticsearch characters ([b629d05](https://gitlab.com/openstapps/backend/commit/b629d058eb64c7a785648fab0a7073eeaa37e895)) +- boost academic terms dynamically ([13938ec](https://gitlab.com/openstapps/backend/commit/13938ecf211060a3f50747ac7fed343b71a6aa4b)) +- log registration and removal of plugins ([006bbeb](https://gitlab.com/openstapps/backend/commit/006bbebe60b7f5015d80ac825622cefbc25cd959)), closes [#71](https://gitlab.com/openstapps/backend/issues/71) +- make backend work with automatically generated aggregations ([ba2c6f6](https://gitlab.com/openstapps/backend/commit/ba2c6f655c263f0b1d1e55b739adde0004bbf408)) +- move EXTERNAL_REQUEST_TIMEOUT to config file ([5d6d4b5](https://gitlab.com/openstapps/backend/commit/5d6d4b53f01550365a330daecbcb4e0f6bdb8aef)) +- move up and enable cors ([6483221](https://gitlab.com/openstapps/backend/commit/6483221b62d84c5871ee4ec82158f8b9ef1ed54e)) +- support geo shape filter ([dd8a6b3](https://gitlab.com/openstapps/backend/commit/dd8a6b3abcc90c50a16167054e2f3cdcee40c863)) +- use config file for maxRequestBodySize ([d110d60](https://gitlab.com/openstapps/backend/commit/d110d60123a28563fe0c58ab903f61255a9644a2)) +- use config for MultiSearchRoute ([8278279](https://gitlab.com/openstapps/backend/commit/827827905b71c71dfa9299a9deb92a8c9cfc0e20)) +- use new Elasticsearch package ([1bad092](https://gitlab.com/openstapps/backend/commit/1bad092185d989078badc66f9c138d2e1baa27e4)) +- utilize api-cli for e2e integration test ([ce06e73](https://gitlab.com/openstapps/backend/commit/ce06e735bea379c9ad955a627e3e1cead37c85fe)) diff --git a/backend/backend/LICENSE b/backend/backend/LICENSE deleted file mode 100644 index 4f3a4263..00000000 --- a/backend/backend/LICENSE +++ /dev/null @@ -1,619 +0,0 @@ - GNU AFFERO GENERAL PUBLIC LICENSE - Version 3, 19 November 2007 - - Copyright (C) 2007 Free Software Foundation, Inc. - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - -Preamble - -The GNU Affero General Public License is a free, copyleft license for -software and other kinds of works, specifically designed to ensure -cooperation with the community in the case of network server software. - -The licenses for most software and other practical works are designed -to take away your freedom to share and change the works. By contrast, -our General Public Licenses are intended to guarantee your freedom to -share and change all versions of a program--to make sure it remains free -software for all its users. - -When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -them if you wish), that you receive source code or can get it if you -want it, that you can change the software or use pieces of it in new -free programs, and that you know you can do these things. - -Developers that use our General Public Licenses protect your rights -with two steps: (1) assert copyright on the software, and (2) offer -you this License which gives you legal permission to copy, distribute -and/or modify the software. - -A secondary benefit of defending all users' freedom is that -improvements made in alternate versions of the program, if they -receive widespread use, become available for other developers to -incorporate. Many developers of free software are heartened and -encouraged by the resulting cooperation. However, in the case of -software used on network servers, this result may fail to come about. -The GNU General Public License permits making a modified version and -letting the public access it on a server without ever releasing its -source code to the public. - -The GNU Affero General Public License is designed specifically to -ensure that, in such cases, the modified source code becomes available -to the community. It requires the operator of a network server to -provide the source code of the modified version running there to the -users of that server. Therefore, public use of a modified version, on -a publicly accessible server, gives the public access to the source -code of the modified version. - -An older license, called the Affero General Public License and -published by Affero, was designed to accomplish similar goals. This is -a different license, not a version of the Affero GPL, but Affero has -released a new version of the Affero GPL which permits relicensing under -this license. - -The precise terms and conditions for copying, distribution and -modification follow. - -TERMS AND CONDITIONS - -0. Definitions. - -"This License" refers to version 3 of the GNU Affero General Public License. - -"Copyright" also means copyright-like laws that apply to other kinds of -works, such as semiconductor masks. - -"The Program" refers to any copyrightable work licensed under this -License. Each licensee is addressed as "you". "Licensees" and -"recipients" may be individuals or organizations. - -To "modify" a work means to copy from or adapt all or part of the work -in a fashion requiring copyright permission, other than the making of an -exact copy. The resulting work is called a "modified version" of the -earlier work or a work "based on" the earlier work. - -A "covered work" means either the unmodified Program or a work based -on the Program. - -To "propagate" a work means to do anything with it that, without -permission, would make you directly or secondarily liable for -infringement under applicable copyright law, except executing it on a -computer or modifying a private copy. Propagation includes copying, -distribution (with or without modification), making available to the -public, and in some countries other activities as well. - -To "convey" a work means any kind of propagation that enables other -parties to make or receive copies. Mere interaction with a user through -a computer network, with no transfer of a copy, is not conveying. - -An interactive user interface displays "Appropriate Legal Notices" -to the extent that it includes a convenient and prominently visible -feature that (1) displays an appropriate copyright notice, and (2) -tells the user that there is no warranty for the work (except to the -extent that warranties are provided), that licensees may convey the -work under this License, and how to view a copy of this License. If -the interface presents a list of user commands or options, such as a -menu, a prominent item in the list meets this criterion. - -1. Source Code. - -The "source code" for a work means the preferred form of the work -for making modifications to it. "Object code" means any non-source -form of a work. - -A "Standard Interface" means an interface that either is an official -standard defined by a recognized standards body, or, in the case of -interfaces specified for a particular programming language, one that -is widely used among developers working in that language. - -The "System Libraries" of an executable work include anything, other -than the work as a whole, that (a) is included in the normal form of -packaging a Major Component, but which is not part of that Major -Component, and (b) serves only to enable use of the work with that -Major Component, or to implement a Standard Interface for which an -implementation is available to the public in source code form. A -"Major Component", in this context, means a major essential component -(kernel, window system, and so on) of the specific operating system -(if any) on which the executable work runs, or a compiler used to -produce the work, or an object code interpreter used to run it. - -The "Corresponding Source" for a work in object code form means all -the source code needed to generate, install, and (for an executable -work) run the object code and to modify the work, including scripts to -control those activities. However, it does not include the work's -System Libraries, or general-purpose tools or generally available free -programs which are used unmodified in performing those activities but -which are not part of the work. For example, Corresponding Source -includes interface definition files associated with source files for -the work, and the source code for shared libraries and dynamically -linked subprograms that the work is specifically designed to require, -such as by intimate data communication or control flow between those -subprograms and other parts of the work. - -The Corresponding Source need not include anything that users -can regenerate automatically from other parts of the Corresponding -Source. - -The Corresponding Source for a work in source code form is that -same work. - -2. Basic Permissions. - -All rights granted under this License are granted for the term of -copyright on the Program, and are irrevocable provided the stated -conditions are met. This License explicitly affirms your unlimited -permission to run the unmodified Program. The output from running a -covered work is covered by this License only if the output, given its -content, constitutes a covered work. This License acknowledges your -rights of fair use or other equivalent, as provided by copyright law. - -You may make, run and propagate covered works that you do not -convey, without conditions so long as your license otherwise remains -in force. You may convey covered works to others for the sole purpose -of having them make modifications exclusively for you, or provide you -with facilities for running those works, provided that you comply with -the terms of this License in conveying all material for which you do -not control copyright. Those thus making or running the covered works -for you must do so exclusively on your behalf, under your direction -and control, on terms that prohibit them from making any copies of -your copyrighted material outside their relationship with you. - -Conveying under any other circumstances is permitted solely under -the conditions stated below. Sublicensing is not allowed; section 10 -makes it unnecessary. - -3. Protecting Users' Legal Rights From Anti-Circumvention Law. - -No covered work shall be deemed part of an effective technological -measure under any applicable law fulfilling obligations under article -11 of the WIPO copyright treaty adopted on 20 December 1996, or -similar laws prohibiting or restricting circumvention of such -measures. - -When you convey a covered work, you waive any legal power to forbid -circumvention of technological measures to the extent such circumvention -is effected by exercising rights under this License with respect to -the covered work, and you disclaim any intention to limit operation or -modification of the work as a means of enforcing, against the work's -users, your or third parties' legal rights to forbid circumvention of -technological measures. - -4. Conveying Verbatim Copies. - -You may convey verbatim copies of the Program's source code as you -receive it, in any medium, provided that you conspicuously and -appropriately publish on each copy an appropriate copyright notice; -keep intact all notices stating that this License and any -non-permissive terms added in accord with section 7 apply to the code; -keep intact all notices of the absence of any warranty; and give all -recipients a copy of this License along with the Program. - -You may charge any price or no price for each copy that you convey, -and you may offer support or warranty protection for a fee. - -5. Conveying Modified Source Versions. - -You may convey a work based on the Program, or the modifications to -produce it from the Program, in the form of source code under the -terms of section 4, provided that you also meet all of these conditions: - - a) The work must carry prominent notices stating that you modified - it, and giving a relevant date. - - b) The work must carry prominent notices stating that it is - released under this License and any conditions added under section - 7. This requirement modifies the requirement in section 4 to - "keep intact all notices". - - c) You must license the entire work, as a whole, under this - License to anyone who comes into possession of a copy. This - License will therefore apply, along with any applicable section 7 - additional terms, to the whole of the work, and all its parts, - regardless of how they are packaged. This License gives no - permission to license the work in any other way, but it does not - invalidate such permission if you have separately received it. - - d) If the work has interactive user interfaces, each must display - Appropriate Legal Notices; however, if the Program has interactive - interfaces that do not display Appropriate Legal Notices, your - work need not make them do so. - -A compilation of a covered work with other separate and independent -works, which are not by their nature extensions of the covered work, -and which are not combined with it such as to form a larger program, -in or on a volume of a storage or distribution medium, is called an -"aggregate" if the compilation and its resulting copyright are not -used to limit the access or legal rights of the compilation's users -beyond what the individual works permit. Inclusion of a covered work -in an aggregate does not cause this License to apply to the other -parts of the aggregate. - -6. Conveying Non-Source Forms. - -You may convey a covered work in object code form under the terms -of sections 4 and 5, provided that you also convey the -machine-readable Corresponding Source under the terms of this License, -in one of these ways: - - a) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by the - Corresponding Source fixed on a durable physical medium - customarily used for software interchange. - - b) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by a - written offer, valid for at least three years and valid for as - long as you offer spare parts or customer support for that product - model, to give anyone who possesses the object code either (1) a - copy of the Corresponding Source for all the software in the - product that is covered by this License, on a durable physical - medium customarily used for software interchange, for a price no - more than your reasonable cost of physically performing this - conveying of source, or (2) access to copy the - Corresponding Source from a network server at no charge. - - c) Convey individual copies of the object code with a copy of the - written offer to provide the Corresponding Source. This - alternative is allowed only occasionally and noncommercially, and - only if you received the object code with such an offer, in accord - with subsection 6b. - - d) Convey the object code by offering access from a designated - place (gratis or for a charge), and offer equivalent access to the - Corresponding Source in the same way through the same place at no - further charge. You need not require recipients to copy the - Corresponding Source along with the object code. If the place to - copy the object code is a network server, the Corresponding Source - may be on a different server (operated by you or a third party) - that supports equivalent copying facilities, provided you maintain - clear directions next to the object code saying where to find the - Corresponding Source. Regardless of what server hosts the - Corresponding Source, you remain obligated to ensure that it is - available for as long as needed to satisfy these requirements. - - e) Convey the object code using peer-to-peer transmission, provided - you inform other peers where the object code and Corresponding - Source of the work are being offered to the general public at no - charge under subsection 6d. - -A separable portion of the object code, whose source code is excluded -from the Corresponding Source as a System Library, need not be -included in conveying the object code work. - -A "User Product" is either (1) a "consumer product", which means any -tangible personal property which is normally used for personal, family, -or household purposes, or (2) anything designed or sold for incorporation -into a dwelling. In determining whether a product is a consumer product, -doubtful cases shall be resolved in favor of coverage. For a particular -product received by a particular user, "normally used" refers to a -typical or common use of that class of product, regardless of the status -of the particular user or of the way in which the particular user -actually uses, or expects or is expected to use, the product. A product -is a consumer product regardless of whether the product has substantial -commercial, industrial or non-consumer uses, unless such uses represent -the only significant mode of use of the product. - -"Installation Information" for a User Product means any methods, -procedures, authorization keys, or other information required to install -and execute modified versions of a covered work in that User Product from -a modified version of its Corresponding Source. The information must -suffice to ensure that the continued functioning of the modified object -code is in no case prevented or interfered with solely because -modification has been made. - -If you convey an object code work under this section in, or with, or -specifically for use in, a User Product, and the conveying occurs as -part of a transaction in which the right of possession and use of the -User Product is transferred to the recipient in perpetuity or for a -fixed term (regardless of how the transaction is characterized), the -Corresponding Source conveyed under this section must be accompanied -by the Installation Information. But this requirement does not apply -if neither you nor any third party retains the ability to install -modified object code on the User Product (for example, the work has -been installed in ROM). - -The requirement to provide Installation Information does not include a -requirement to continue to provide support service, warranty, or updates -for a work that has been modified or installed by the recipient, or for -the User Product in which it has been modified or installed. Access to a -network may be denied when the modification itself materially and -adversely affects the operation of the network or violates the rules and -protocols for communication across the network. - - Corresponding Source conveyed, and Installation Information provided, -in accord with this section must be in a format that is publicly -documented (and with an implementation available to the public in -source code form), and must require no special password or key for -unpacking, reading or copying. - - 7. Additional Terms. - -"Additional permissions" are terms that supplement the terms of this -License by making exceptions from one or more of its conditions. -Additional permissions that are applicable to the entire Program shall -be treated as though they were included in this License, to the extent -that they are valid under applicable law. If additional permissions -apply only to part of the Program, that part may be used separately -under those permissions, but the entire Program remains governed by -this License without regard to the additional permissions. - -When you convey a copy of a covered work, you may at your option -remove any additional permissions from that copy, or from any part of -it. (Additional permissions may be written to require their own -removal in certain cases when you modify the work.) You may place -additional permissions on material, added by you to a covered work, -for which you have or can give appropriate copyright permission. - -Notwithstanding any other provision of this License, for material you -add to a covered work, you may (if authorized by the copyright holders of -that material) supplement the terms of this License with terms: - - a) Disclaiming warranty or limiting liability differently from the - terms of sections 15 and 16 of this License; or - - b) Requiring preservation of specified reasonable legal notices or - author attributions in that material or in the Appropriate Legal - Notices displayed by works containing it; or - - c) Prohibiting misrepresentation of the origin of that material, or - requiring that modified versions of such material be marked in - reasonable ways as different from the original version; or - - d) Limiting the use for publicity purposes of names of licensors or - authors of the material; or - - e) Declining to grant rights under trademark law for use of some - trade names, trademarks, or service marks; or - - f) Requiring indemnification of licensors and authors of that - material by anyone who conveys the material (or modified versions of - it) with contractual assumptions of liability to the recipient, for - any liability that these contractual assumptions directly impose on - those licensors and authors. - -All other non-permissive additional terms are considered "further -restrictions" within the meaning of section 10. If the Program as you -received it, or any part of it, contains a notice stating that it is -governed by this License along with a term that is a further -restriction, you may remove that term. If a license document contains -a further restriction but permits relicensing or conveying under this -License, you may add to a covered work material governed by the terms -of that license document, provided that the further restriction does -not survive such relicensing or conveying. - -If you add terms to a covered work in accord with this section, you -must place, in the relevant source files, a statement of the -additional terms that apply to those files, or a notice indicating -where to find the applicable terms. - -Additional terms, permissive or non-permissive, may be stated in the -form of a separately written license, or stated as exceptions; -the above requirements apply either way. - -8. Termination. - -You may not propagate or modify a covered work except as expressly -provided under this License. Any attempt otherwise to propagate or -modify it is void, and will automatically terminate your rights under -this License (including any patent licenses granted under the third -paragraph of section 11). - -However, if you cease all violation of this License, then your -license from a particular copyright holder is reinstated (a) -provisionally, unless and until the copyright holder explicitly and -finally terminates your license, and (b) permanently, if the copyright -holder fails to notify you of the violation by some reasonable means -prior to 60 days after the cessation. - -Moreover, your license from a particular copyright holder is -reinstated permanently if the copyright holder notifies you of the -violation by some reasonable means, this is the first time you have -received notice of violation of this License (for any work) from that -copyright holder, and you cure the violation prior to 30 days after -your receipt of the notice. - -Termination of your rights under this section does not terminate the -licenses of parties who have received copies or rights from you under -this License. If your rights have been terminated and not permanently -reinstated, you do not qualify to receive new licenses for the same -material under section 10. - -9. Acceptance Not Required for Having Copies. - -You are not required to accept this License in order to receive or -run a copy of the Program. Ancillary propagation of a covered work -occurring solely as a consequence of using peer-to-peer transmission -to receive a copy likewise does not require acceptance. However, -nothing other than this License grants you permission to propagate or -modify any covered work. These actions infringe copyright if you do -not accept this License. Therefore, by modifying or propagating a -covered work, you indicate your acceptance of this License to do so. - -10. Automatic Licensing of Downstream Recipients. - -Each time you convey a covered work, the recipient automatically -receives a license from the original licensors, to run, modify and -propagate that work, subject to this License. You are not responsible -for enforcing compliance by third parties with this License. - -An "entity transaction" is a transaction transferring control of an -organization, or substantially all assets of one, or subdividing an -organization, or merging organizations. If propagation of a covered -work results from an entity transaction, each party to that -transaction who receives a copy of the work also receives whatever -licenses to the work the party's predecessor in interest had or could -give under the previous paragraph, plus a right to possession of the -Corresponding Source of the work from the predecessor in interest, if -the predecessor has it or can get it with reasonable efforts. - -You may not impose any further restrictions on the exercise of the -rights granted or affirmed under this License. For example, you may -not impose a license fee, royalty, or other charge for exercise of -rights granted under this License, and you may not initiate litigation -(including a cross-claim or counterclaim in a lawsuit) alleging that -any patent claim is infringed by making, using, selling, offering for -sale, or importing the Program or any portion of it. - -11. Patents. - -A "contributor" is a copyright holder who authorizes use under this -License of the Program or a work on which the Program is based. The -work thus licensed is called the contributor's "contributor version". - -A contributor's "essential patent claims" are all patent claims -owned or controlled by the contributor, whether already acquired or -hereafter acquired, that would be infringed by some manner, permitted -by this License, of making, using, or selling its contributor version, -but do not include claims that would be infringed only as a -consequence of further modification of the contributor version. For -purposes of this definition, "control" includes the right to grant -patent sublicenses in a manner consistent with the requirements of -this License. - -Each contributor grants you a non-exclusive, worldwide, royalty-free -patent license under the contributor's essential patent claims, to -make, use, sell, offer for sale, import and otherwise run, modify and -propagate the contents of its contributor version. - -In the following three paragraphs, a "patent license" is any express -agreement or commitment, however denominated, not to enforce a patent -(such as an express permission to practice a patent or covenant not to -sue for patent infringement). To "grant" such a patent license to a -party means to make such an agreement or commitment not to enforce a -patent against the party. - -If you convey a covered work, knowingly relying on a patent license, -and the Corresponding Source of the work is not available for anyone -to copy, free of charge and under the terms of this License, through a -publicly available network server or other readily accessible means, -then you must either (1) cause the Corresponding Source to be so -available, or (2) arrange to deprive yourself of the benefit of the -patent license for this particular work, or (3) arrange, in a manner -consistent with the requirements of this License, to extend the patent -license to downstream recipients. "Knowingly relying" means you have -actual knowledge that, but for the patent license, your conveying the -covered work in a country, or your recipient's use of the covered work -in a country, would infringe one or more identifiable patents in that -country that you have reason to believe are valid. - -If, pursuant to or in connection with a single transaction or -arrangement, you convey, or propagate by procuring conveyance of, a -covered work, and grant a patent license to some of the parties -receiving the covered work authorizing them to use, propagate, modify -or convey a specific copy of the covered work, then the patent license -you grant is automatically extended to all recipients of the covered -work and works based on it. - -A patent license is "discriminatory" if it does not include within -the scope of its coverage, prohibits the exercise of, or is -conditioned on the non-exercise of one or more of the rights that are -specifically granted under this License. You may not convey a covered -work if you are a party to an arrangement with a third party that is -in the business of distributing software, under which you make payment -to the third party based on the extent of your activity of conveying -the work, and under which the third party grants, to any of the -parties who would receive the covered work from you, a discriminatory -patent license (a) in connection with copies of the covered work -conveyed by you (or copies made from those copies), or (b) primarily -for and in connection with specific products or compilations that -contain the covered work, unless you entered into that arrangement, -or that patent license was granted, prior to 28 March 2007. - -Nothing in this License shall be construed as excluding or limiting -any implied license or other defenses to infringement that may -otherwise be available to you under applicable patent law. - -12. No Surrender of Others' Freedom. - -If conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot convey a -covered work so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you may -not convey it at all. For example, if you agree to terms that obligate you -to collect a royalty for further conveying from those to whom you convey -the Program, the only way you could satisfy both those terms and this -License would be to refrain entirely from conveying the Program. - -13. Remote Network Interaction; Use with the GNU General Public License. - -Notwithstanding any other provision of this License, if you modify the -Program, your modified version must prominently offer all users -interacting with it remotely through a computer network (if your version -supports such interaction) an opportunity to receive the Corresponding -Source of your version by providing access to the Corresponding Source -from a network server at no charge, through some standard or customary -means of facilitating copying of software. This Corresponding Source -shall include the Corresponding Source for any work covered by version 3 -of the GNU General Public License that is incorporated pursuant to the -following paragraph. - -Notwithstanding any other provision of this License, you have -permission to link or combine any covered work with a work licensed -under version 3 of the GNU General Public License into a single -combined work, and to convey the resulting work. The terms of this -License will continue to apply to the part which is the covered work, -but the work with which it is combined will remain governed by version -3 of the GNU General Public License. - -14. Revised Versions of this License. - -The Free Software Foundation may publish revised and/or new versions of -the GNU Affero General Public License from time to time. Such new versions -will be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - -Each version is given a distinguishing version number. If the -Program specifies that a certain numbered version of the GNU Affero General -Public License "or any later version" applies to it, you have the -option of following the terms and conditions either of that numbered -version or of any later version published by the Free Software -Foundation. If the Program does not specify a version number of the -GNU Affero General Public License, you may choose any version ever published -by the Free Software Foundation. - -If the Program specifies that a proxy can decide which future -versions of the GNU Affero General Public License can be used, that proxy's -public statement of acceptance of a version permanently authorizes you -to choose that version for the Program. - -Later license versions may give you additional or different -permissions. However, no additional obligations are imposed on any -author or copyright holder as a result of your choosing to follow a -later version. - -15. Disclaimer of Warranty. - -THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY -APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT -HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY -OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, -THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM -IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF -ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - -16. Limitation of Liability. - -IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS -THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY -GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE -USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF -DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD -PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), -EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF -SUCH DAMAGES. - -17. Interpretation of Sections 15 and 16. - -If the disclaimer of warranty and limitation of liability provided -above cannot be given local legal effect according to their terms, -reviewing courts shall apply local law that most closely approximates -an absolute waiver of all civil liability in connection with the -Program, unless a warranty or assumption of liability accompanies a -copy of the Program in return for a fee. - -END OF TERMS AND CONDITIONS diff --git a/backend/backend/README.md b/backend/backend/README.md index ceb956fb..515dbd5f 100644 --- a/backend/backend/README.md +++ b/backend/backend/README.md @@ -1,5 +1,7 @@ [![pipeline status](https://img.shields.io/gitlab/pipeline/openstapps/backend.svg?style=flat-square)](https://gitlab.com/openstapps/backend/commits/master) + # backend (a reference implementation of a StApps backend) + This project is a reference implementation for a StApps backend. It provides an HTTP API to index data into a database, perform full text search, sorts and filters. It also delivers the configuration needed by the app. The API is specified within the [@openstapps/core](https://gitlab.com/openstapps/core). @@ -10,6 +12,7 @@ If you want to perform requests, index data or search within JavaScript or TypeS Or generate your own client using the openapi/swagger definitions you can get form the [API documentation](https://openstapps.gitlab.io/backend). # Usage + This backend is not a standalone software. It needs a database like Elasticsearch to work. If you just want to use the backend you should consider using @@ -17,19 +20,21 @@ If you just want to use the backend you should consider using you with everything you need to run this backend. # Local usage for development purposes + ## Requirements -* Elasticsearch (8.4) - - [ICU analysis plugin](https://www.elastic.co/guide/en/elasticsearch/plugins/current/analysis-icu.html) - - OR Docker -* Node.js (~14) / NPM +- Elasticsearch (8.4) + * [ICU analysis plugin](https://www.elastic.co/guide/en/elasticsearch/plugins/current/analysis-icu.html) + * OR Docker +- Node.js (~14) / NPM ### Startup Behaviour -*This might be important if you work on the Core* +_This might be important if you work on the Core_ The backend is using Elasticsearch Mappings and Aggregations from its currently used `core` dependency. ## Start Database (Elasticsearch) + Elasticsearch needs some configuration and plugins to be able to work with the backend. To save you some work we provide a [docker image](https://gitlab.com/openstapps/database) which @@ -43,6 +48,7 @@ getting elasticsearch to work, have a look in the first. ## Metrics collection + The backend contains an express middleware which can be optionally enabled by setting the environment variable `PROMETHEUS_MIDDLEWARE` to `true`. The middleware collects metrics and provides a [Prometheus](https://prometheus.io/) compatible endpoint from which the metrics may be scraped by Prometheus. @@ -58,12 +64,15 @@ The middleware may be configured with JSON provided in `config/prometheus.json`, "responseLengthBuckets": [512, 1024, 5120, 10240, 51200, 102400] } ``` + The available options are documented on [npmjs](https://www.npmjs.com/package/express-prometheus-middleware) or the [homepage](https://github.com/joao-fontenele/express-prometheus-middleware#readme) of the express-prometheus-middleware project. You may get a compatible grafana dashboard at [grafana.com](https://grafana.com/grafana/dashboards/14565). ## Start backend + Run `npm install` and `npm run build`, then start with `npm start`. The server should now be accepting connections at `http://localhost:3000`. # Environment Variables + To select a database implementation you have to set the `NODE_CONFIG_ENV` variable. At the time only `NODE_CONFIG_ENV=elasticsearch` is supported. Set `NODE_ENV=production` to run backend for production usages. In production the backend expects some kind of monitoring to be set via the environment. At the time only SMTP is being implemented. The backend wouldn't start if you don't provide SMTP authentification. Alternatively @@ -71,14 +80,16 @@ you can set `ALLOW_NO_TRANSPORT=true`. To set up an SMTP configuration have a lo [@openstapps/logger](https://gitlab.com/openstapps/logger). The list of environment variables includes: -* `NODE_ENV` when set to `production`, there will be a reduced amount of output from the logger -* `PORT` when this is not set, the backend will default to port 3000 -* `ES_ADDR` the Elasticsearch address, if not set it will default the Elasticsearch address to `http://localhost:9200` -* `ALLOW_NO_TRANSPORT` if set to true, the backend will allow starting without an Email configured that receives critical errors. -* `ES_DEBUG` setting this to `true` will result in Elasticsearch logging to be **VERY** extensive, in almost all situation this should no be enabled. -* `PROMETHEUS_MIDDLEWARE` if set to `true` will enable metrics collection with [Express Prometheus Middleware](https://www.npmjs.com/package/express-prometheus-middleware) + +- `NODE_ENV` when set to `production`, there will be a reduced amount of output from the logger +- `PORT` when this is not set, the backend will default to port 3000 +- `ES_ADDR` the Elasticsearch address, if not set it will default the Elasticsearch address to `http://localhost:9200` +- `ALLOW_NO_TRANSPORT` if set to true, the backend will allow starting without an Email configured that receives critical errors. +- `ES_DEBUG` setting this to `true` will result in Elasticsearch logging to be **VERY** extensive, in almost all situation this should no be enabled. +- `PROMETHEUS_MIDDLEWARE` if set to `true` will enable metrics collection with [Express Prometheus Middleware](https://www.npmjs.com/package/express-prometheus-middleware) ## Config files + Each university can have it's specific config for the general backend and app and for all databases. All config files can be found in `./config/`. There is a `default.ts` which is used by default. You can create an @@ -95,6 +106,7 @@ To create your university specific config file for the elasticsearch you have to scheme: `elasticsearch-.ts`. ## Debugging + Set `ES_DEBUG=true` to enable verbose Elasticsearch tracing information. This can be useful to debug some issues between backend and elasticsearch. diff --git a/backend/backend/ROUTES.md b/backend/backend/ROUTES.md index 06b8a6cd..02853304 100644 --- a/backend/backend/ROUTES.md +++ b/backend/backend/ROUTES.md @@ -15,27 +15,23 @@ This checks if a book is available in a library.
} ``` - ### Definition | parameter | value | -|--------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| +| ------------ | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | | request | [SCBookAvailabilityRequest](https://openstapps.gitlab.io/core/modules/_index.d_.html#scbookavailabilityrequest) | | response | [SCBookAvailabilityResponse](https://openstapps.gitlab.io/core/modules/_index.d_.html#scbookavailabilityresponse) | | success code | 200 | | errors | [SCInternalServerErrorResponse](https://openstapps.gitlab.io/core/classes/_index.d_.scinternalservererrorresponse.html)
[SCMethodNotAllowedErrorResponse](https://openstapps.gitlab.io/core/classes/_index.d_.scmethodnotallowederrorresponse.html)
[SCNotFoundErrorResponse](https://openstapps.gitlab.io/core/classes/_index.d_.scnotfounderrorresponse.html)
[SCRequestBodyTooLargeErrorResponse](https://openstapps.gitlab.io/core/classes/_index.d_.screquestbodytoolargeerrorresponse.html)
[SCSyntaxErrorResponse](https://openstapps.gitlab.io/core/classes/_index.d_.scsyntaxerrorresponse.html)
[SCUnsupportedMediaTypeErrorResponse](https://openstapps.gitlab.io/core/classes/_index.d_.scunsupportedmediatypeerrorresponse.html)
[SCValidationErrorResponse](https://openstapps.gitlab.io/core/classes/_index.d_.scvalidationerrorresponse.html) | - ## `POST /bulk/:UID` [Bulk add route](https://openstapps.gitlab.io/core/classes/_index.d_.scbulkaddroute.html) **Route for indexing SC things in a bulk** - - ### Definition | parameter | value | -|-----------------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| +| --------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | | request | [SCBulkAddRequest](https://openstapps.gitlab.io/core/modules/_index.d_.html#scbulkaddrequest) | | response | [SCBulkAddResponse](https://openstapps.gitlab.io/core/interfaces/_index.d_.scbulkaddresponse.html) | | success code | 201 | @@ -46,12 +42,10 @@ This checks if a book is available in a library.
**Route for closing bulks** - - ### Definition | parameter | value | -|-----------------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| +| --------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | | request | [SCBulkDoneRequest](https://openstapps.gitlab.io/core/interfaces/_index.d_.scbulkdonerequest.html) | | response | [SCBulkDoneResponse](https://openstapps.gitlab.io/core/interfaces/_index.d_.scbulkdoneresponse.html) | | success code | 204 | @@ -62,111 +56,90 @@ This checks if a book is available in a library.
**Route for bulk creation** - - ### Definition | parameter | value | -|--------------|------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| +| ------------ | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | | request | [SCBulkRequest](https://openstapps.gitlab.io/core/interfaces/_index.d_.scbulkrequest.html) | | response | [SCBulkResponse](https://openstapps.gitlab.io/core/interfaces/_index.d_.scbulkresponse.html) | | success code | 200 | | errors | [SCInternalServerErrorResponse](https://openstapps.gitlab.io/core/classes/_index.d_.scinternalservererrorresponse.html)
[SCMethodNotAllowedErrorResponse](https://openstapps.gitlab.io/core/classes/_index.d_.scmethodnotallowederrorresponse.html)
[SCRequestBodyTooLargeErrorResponse](https://openstapps.gitlab.io/core/classes/_index.d_.screquestbodytoolargeerrorresponse.html)
[SCSyntaxErrorResponse](https://openstapps.gitlab.io/core/classes/_index.d_.scsyntaxerrorresponse.html)
[SCUnsupportedMediaTypeErrorResponse](https://openstapps.gitlab.io/core/classes/_index.d_.scunsupportedmediatypeerrorresponse.html)
[SCValidationErrorResponse](https://openstapps.gitlab.io/core/classes/_index.d_.scvalidationerrorresponse.html) | - ## `POST /feedback` [Feedback route](https://openstapps.gitlab.io/core/classes/_index.d_.scfeedbackroute.html) **Route for feedback submission** - - ### Definition | parameter | value | -|--------------|------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| +| ------------ | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | | request | [SCFeedbackRequest](https://openstapps.gitlab.io/core/interfaces/_index.d_.scfeedbackrequest.html) | | response | [SCFeedbackResponse](https://openstapps.gitlab.io/core/interfaces/_index.d_.scfeedbackresponse.html) | | success code | 204 | | errors | [SCInternalServerErrorResponse](https://openstapps.gitlab.io/core/classes/_index.d_.scinternalservererrorresponse.html)
[SCMethodNotAllowedErrorResponse](https://openstapps.gitlab.io/core/classes/_index.d_.scmethodnotallowederrorresponse.html)
[SCRequestBodyTooLargeErrorResponse](https://openstapps.gitlab.io/core/classes/_index.d_.screquestbodytoolargeerrorresponse.html)
[SCSyntaxErrorResponse](https://openstapps.gitlab.io/core/classes/_index.d_.scsyntaxerrorresponse.html)
[SCUnsupportedMediaTypeErrorResponse](https://openstapps.gitlab.io/core/classes/_index.d_.scunsupportedmediatypeerrorresponse.html)
[SCValidationErrorResponse](https://openstapps.gitlab.io/core/classes/_index.d_.scvalidationerrorresponse.html) | - ## `POST /` [Index route](https://openstapps.gitlab.io/core/classes/_index.d_.scindexroute.html) **Route to request meta information about the deployment** - - ### Definition | parameter | value | -|--------------|------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| +| ------------ | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | | request | [SCIndexRequest](https://openstapps.gitlab.io/core/interfaces/_index.d_.scindexrequest.html) | | response | [SCIndexResponse](https://openstapps.gitlab.io/core/interfaces/_index.d_.scindexresponse.html) | | success code | 200 | | errors | [SCInternalServerErrorResponse](https://openstapps.gitlab.io/core/classes/_index.d_.scinternalservererrorresponse.html)
[SCMethodNotAllowedErrorResponse](https://openstapps.gitlab.io/core/classes/_index.d_.scmethodnotallowederrorresponse.html)
[SCRequestBodyTooLargeErrorResponse](https://openstapps.gitlab.io/core/classes/_index.d_.screquestbodytoolargeerrorresponse.html)
[SCSyntaxErrorResponse](https://openstapps.gitlab.io/core/classes/_index.d_.scsyntaxerrorresponse.html)
[SCUnsupportedMediaTypeErrorResponse](https://openstapps.gitlab.io/core/classes/_index.d_.scunsupportedmediatypeerrorresponse.html)
[SCValidationErrorResponse](https://openstapps.gitlab.io/core/classes/_index.d_.scvalidationerrorresponse.html) | - ## `POST /search/multi` [Multi search route](https://openstapps.gitlab.io/core/classes/_index.d_.scmultisearchroute.html) **Route for submission of multiple search requests at once** - - ### Definition | parameter | value | -|--------------|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| +| ------------ | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | | request | [SCMultiSearchRequest](https://openstapps.gitlab.io/core/modules/_index.d_.html#scmultisearchrequest) | | response | [SCMultiSearchResponse](https://openstapps.gitlab.io/core/modules/_index.d_.html#scmultisearchresponse) | | success code | 200 | | errors | [SCInternalServerErrorResponse](https://openstapps.gitlab.io/core/classes/_index.d_.scinternalservererrorresponse.html)
[SCMethodNotAllowedErrorResponse](https://openstapps.gitlab.io/core/classes/_index.d_.scmethodnotallowederrorresponse.html)
[SCRequestBodyTooLargeErrorResponse](https://openstapps.gitlab.io/core/classes/_index.d_.screquestbodytoolargeerrorresponse.html)
[SCSyntaxErrorResponse](https://openstapps.gitlab.io/core/classes/_index.d_.scsyntaxerrorresponse.html)
[SCTooManyRequestsErrorResponse](https://openstapps.gitlab.io/core/classes/_index.d_.sctoomanyrequestserrorresponse.html)
[SCUnsupportedMediaTypeErrorResponse](https://openstapps.gitlab.io/core/classes/_index.d_.scunsupportedmediatypeerrorresponse.html)
[SCValidationErrorResponse](https://openstapps.gitlab.io/core/classes/_index.d_.scvalidationerrorresponse.html) | - ## `POST /plugin/register` [Plugin register route](https://openstapps.gitlab.io/core/classes/_index.d_.scpluginregisterroute.html) **Route to register plugins** - - ### Definition | parameter | value | -|--------------|------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| +| ------------ | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | | request | [SCPluginRegisterRequest](https://openstapps.gitlab.io/core/modules/_index.d_.html#scpluginregisterrequest) | | response | [SCPluginRegisterResponse](https://openstapps.gitlab.io/core/interfaces/_index.d_.scpluginregisterresponse.html) | | success code | 200 | | errors | [SCInternalServerErrorResponse](https://openstapps.gitlab.io/core/classes/_index.d_.scinternalservererrorresponse.html)
[SCMethodNotAllowedErrorResponse](https://openstapps.gitlab.io/core/classes/_index.d_.scmethodnotallowederrorresponse.html)
[SCNotFoundErrorResponse](https://openstapps.gitlab.io/core/classes/_index.d_.scnotfounderrorresponse.html)
[SCParametersNotAcceptable](https://openstapps.gitlab.io/core/classes/_index.d_.scparametersnotacceptable.html)
[SCPluginAlreadyRegisteredErrorResponse](https://openstapps.gitlab.io/core/classes/_index.d_.scpluginalreadyregisterederrorresponse.html)
[SCPluginRegisteringFailedErrorResponse](https://openstapps.gitlab.io/core/classes/_index.d_.scpluginregisteringfailederrorresponse.html)
[SCRequestBodyTooLargeErrorResponse](https://openstapps.gitlab.io/core/classes/_index.d_.screquestbodytoolargeerrorresponse.html)
[SCSyntaxErrorResponse](https://openstapps.gitlab.io/core/classes/_index.d_.scsyntaxerrorresponse.html) | - ## `POST /search` [Search route](https://openstapps.gitlab.io/core/classes/_index.d_.scsearchroute.html) **Route for searching things** - - ### Definition | parameter | value | -|--------------|------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| +| ------------ | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | | request | [SCSearchRequest](https://openstapps.gitlab.io/core/interfaces/_index.d_.scsearchrequest.html) | | response | [SCSearchResponse](https://openstapps.gitlab.io/core/interfaces/_index.d_.scsearchresponse.html) | | success code | 200 | | errors | [SCInternalServerErrorResponse](https://openstapps.gitlab.io/core/classes/_index.d_.scinternalservererrorresponse.html)
[SCMethodNotAllowedErrorResponse](https://openstapps.gitlab.io/core/classes/_index.d_.scmethodnotallowederrorresponse.html)
[SCRequestBodyTooLargeErrorResponse](https://openstapps.gitlab.io/core/classes/_index.d_.screquestbodytoolargeerrorresponse.html)
[SCSyntaxErrorResponse](https://openstapps.gitlab.io/core/classes/_index.d_.scsyntaxerrorresponse.html)
[SCUnsupportedMediaTypeErrorResponse](https://openstapps.gitlab.io/core/classes/_index.d_.scunsupportedmediatypeerrorresponse.html)
[SCValidationErrorResponse](https://openstapps.gitlab.io/core/classes/_index.d_.scvalidationerrorresponse.html) | - ## `PUT /:TYPE/:UID` [Thing update route](https://openstapps.gitlab.io/core/classes/_index.d_.scthingupdateroute.html) **Route for updating existing things** - - ### Definition | parameter | value | -|-----------------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| +| --------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | | request | [SCThingUpdateRequest](https://openstapps.gitlab.io/core/modules/_index.d_.html#scthingupdaterequest) | | response | [SCThingUpdateResponse](https://openstapps.gitlab.io/core/interfaces/_index.d_.scthingupdateresponse.html) | | success code | 200 | | errors | [SCInternalServerErrorResponse](https://openstapps.gitlab.io/core/classes/_index.d_.scinternalservererrorresponse.html)
[SCMethodNotAllowedErrorResponse](https://openstapps.gitlab.io/core/classes/_index.d_.scmethodnotallowederrorresponse.html)
[SCNotFoundErrorResponse](https://openstapps.gitlab.io/core/classes/_index.d_.scnotfounderrorresponse.html)
[SCRequestBodyTooLargeErrorResponse](https://openstapps.gitlab.io/core/classes/_index.d_.screquestbodytoolargeerrorresponse.html)
[SCSyntaxErrorResponse](https://openstapps.gitlab.io/core/classes/_index.d_.scsyntaxerrorresponse.html)
[SCUnsupportedMediaTypeErrorResponse](https://openstapps.gitlab.io/core/classes/_index.d_.scunsupportedmediatypeerrorresponse.html)
[SCValidationErrorResponse](https://openstapps.gitlab.io/core/classes/_index.d_.scvalidationerrorresponse.html) | | obligatory parameters |
parametertype
TYPESCThingTypes
UID[SCUuid](https://openstapps.gitlab.io/core/modules/_index.d_.html#scuuid)
| - diff --git a/backend/backend/app.js b/backend/backend/app.js index d233e644..1bda7715 100644 --- a/backend/backend/app.js +++ b/backend/backend/app.js @@ -1,2 +1,2 @@ #!/usr/bin/env node -import './lib/cli.js' +import './lib/cli.js'; diff --git a/backend/backend/config/prometheus.json b/backend/backend/config/prometheus.json index 0a485daf..62e94fd2 100644 --- a/backend/backend/config/prometheus.json +++ b/backend/backend/config/prometheus.json @@ -3,8 +3,7 @@ "includeMethod": true, "includePath": true, "promClient": { - "collectDefaultMetrics": { - } + "collectDefaultMetrics": {} }, "for-more-options-see": "https://github.com/jochen-schweizer/express-prom-bundle#options" } diff --git a/backend/backend/integration-test.yml b/backend/backend/integration-test.yml index 1ee6e824..9c61b8be 100644 --- a/backend/backend/integration-test.yml +++ b/backend/backend/integration-test.yml @@ -2,26 +2,26 @@ version: '3' services: backend: ports: - - "3000:3000" + - '3000:3000' build: . environment: - STAPPS_LOG_LEVEL: "31" - STAPPS_EXIT_LEVEL: "8" - NODE_CONFIG_ENV: "elasticsearch" - NODE_ENV: "integration-test" - ALLOW_NO_TRANSPORT: "true" - ES_ADDR: "http://elasticsearch:9200" + STAPPS_LOG_LEVEL: '31' + STAPPS_EXIT_LEVEL: '8' + NODE_CONFIG_ENV: 'elasticsearch' + NODE_ENV: 'integration-test' + ALLOW_NO_TRANSPORT: 'true' + ES_ADDR: 'http://elasticsearch:9200' elasticsearch: ports: - - "9200:9200" - image: "registry.gitlab.com/openstapps/database:latest" + - '9200:9200' + image: 'registry.gitlab.com/openstapps/database:latest' apicli: - image: "registry.gitlab.com/openstapps/api/cli:latest" + image: 'registry.gitlab.com/openstapps/api/cli:latest' environment: - STAPPS_LOG_LEVEL: "31" - STAPPS_EXIT_LEVEL: "8" + STAPPS_LOG_LEVEL: '31' + STAPPS_EXIT_LEVEL: '8' volumes: - ./node_modules/@openstapps/core/test/resources:/@openstapps/core/test/resources:ro command: e2e http://backend:3000 --waiton tcp:backend:3000 --samples /@openstapps/core/test/resources/indexable diff --git a/backend/backend/package.json b/backend/backend/package.json index 5cb17b32..a9579f7e 100644 --- a/backend/backend/package.json +++ b/backend/backend/package.json @@ -15,24 +15,20 @@ "Sebastian Lange", "Thea Schöbl " ], + "main": "lib/app.js", + "bin": "app.js", "scripts": { - "build": "npm run lint && npm run compile", - "changelog": "conventional-changelog -p angular -i CHANGELOG.md -s -r 0 && git add CHANGELOG.md", - "check-configuration": "openstapps-configuration", - "compile": "rimraf lib && tsc", - "documentation": "typedoc --includeVersion --out docs --readme README.md --listInvalidSymbolLinks --entryPointStrategy expand src && openstapps-core-tools openapi ./node_modules/@openstapps/core/lib ./docs/openapi && openapi build-docs docs/openapi/openapi.json -o docs/openapi/index.html", - "lint": "eslint -c .eslintrc.json --ignore-path .eslintignore --ext .ts src/ test/", - "lint:fix": "eslint --fix -c .eslintrc.json --ignore-path .eslintignore --ext .ts src/ test/", - "prepublishOnly": "npm ci && npm run build", - "preversion": "npm run prepublishOnly", - "push": "git push && git push origin \"v$npm_package_version\"", + "build": "tsup --dts", + "dev": "tsup --watch", + "format": "prettier .", + "format:fix": "prettier --write .", + "lint": "eslint --ext .ts src/", + "lint:fix": "eslint --fix --ext .ts src/", "start": "NODE_CONFIG_ENV=elasticsearch ALLOW_NO_TRANSPORT=true node ./lib/cli.js", "start-debug": "STAPPS_LOG_LEVEL=31 NODE_CONFIG_ENV=elasticsearch ALLOW_NO_TRANSPORT=true node ./lib/cli.js --require ts-node/register", - "test": "npm run test-unit && npm run test-integration", - "test-unit": "cross-env NODE_CONFIG_ENV=elasticsearch ALLOW_NO_TRANSPORT=true STAPPS_LOG_LEVEL=0 nyc mocha --require ts-node/register --exit 'test/**/*.spec.ts'", + "test": "pnpm run test-unit && pnpm run test-integration", "test-integration": "docker-compose -f integration-test.yml pull && docker-compose -f integration-test.yml up --build --abort-on-container-exit --exit-code-from apicli", - "test-unit": "env NODE_CONFIG_ENV=elasticsearch ALLOW_NO_TRANSPORT=true STAPPS_LOG_LEVEL=0 nyc mocha --require ts-node/register --exit 'test/**/*.spec.ts'", - "version": "npm run changelog" + "test-unit": "cross-env NODE_CONFIG_ENV=elasticsearch ALLOW_NO_TRANSPORT=true STAPPS_LOG_LEVEL=0 nyc mocha --require ts-node/register --exit 'test/**/*.spec.ts'" }, "dependencies": { "@elastic/elasticsearch": "8.4.0", @@ -59,9 +55,11 @@ "uuid": "8.3.2" }, "devDependencies": { - "@openstapps/configuration": "workspace:*", "@openstapps/es-mapping-generator": "workspace:*", "@openstapps/eslint-config": "workspace:*", + "@openstapps/nyc-config": "workspace:*", + "@openstapps/prettier-config": "workspace:*", + "@openstapps/tsconfig": "workspace:*", "@testdeck/mocha": "0.3.3", "@types/chai": "4.3.4", "@types/chai-as-promised": "7.1.5", @@ -78,8 +76,6 @@ "@types/sinon-express-mock": "1.3.9", "@types/supertest": "2.0.12", "@types/uuid": "8.3.4", - "@typescript-eslint/eslint-plugin": "5.49.0", - "@typescript-eslint/parser": "5.49.0", "chai": "4.3.7", "chai-as-promised": "7.1.1", "conventional-changelog-cli": "2.2.2", @@ -93,38 +89,37 @@ "mocha": "10.2.0", "mocked-env": "1.3.5", "nyc": "15.1.0", - "prettier": "2.8.8", - "rimraf": "4.4.0", + "redoc-cli": "0.13.20", "sinon": "14.0.2", "sinon-express-mock": "2.2.1", "supertest": "6.3.3", - "typedoc": "0.23.26", + "tsup": "6.7.0", + "typedoc": "0.23.28", "typescript": "4.8.4" }, + "tsup": { + "entry": [ + "src/app.ts", + "src/app.ts" + ], + "sourcemap": true, + "clean": true, + "format": "esm", + "outDir": "lib" + }, + "prettier": "@openstapps/prettier-config", + "eslintConfig": { + "extends": [ + "@openstapps" + ] + }, "nyc": { - "all": true, - "branches": 85, - "check-coverage": true, - "exclude": [ - "src/cli.ts" - ], - "extension": [ - ".ts" - ], - "functions": 95, - "include": [ - "src" - ], - "lines": 95, - "reporter": [ - "cobertura", - "html", - "text-summary" - ], - "require": [ - "ts-node/register" - ], - "statements": 95 + "extends": "@openstapps/nyc-config" + }, + "openstapps-configuration": { + "overrides": [ + "test" + ] }, "pnpm": { "peerDependencyRules": { diff --git a/backend/backend/src/common.ts b/backend/backend/src/common.ts index 624109f5..f63dd90b 100644 --- a/backend/backend/src/common.ts +++ b/backend/backend/src/common.ts @@ -14,7 +14,7 @@ * along with this program. If not, see . */ import {SCConfigFile, SCPluginMetaData} from '@openstapps/core'; -import {Validator} from '@openstapps/core-tools/lib/validate.js'; +import {Validator} from '@openstapps/core-tools'; import config from 'config'; import {BackendTransport} from './notification/backend-transport.js'; diff --git a/backend/backend/src/notification/backend-transport.ts b/backend/backend/src/notification/backend-transport.ts index 12f577fe..8584c56e 100644 --- a/backend/backend/src/notification/backend-transport.ts +++ b/backend/backend/src/notification/backend-transport.ts @@ -13,9 +13,7 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -import {Logger} from '@openstapps/logger'; -import {SMTP} from '@openstapps/logger/lib/smtp.js'; -import {Transport, VerifiableTransport} from '@openstapps/logger/lib/transport.js'; +import {Logger, SMTP, Transport, VerifiableTransport} from '@openstapps/logger'; /** * Provides information if a transport is a verifiable transport diff --git a/backend/backend/src/notification/mail-queue.ts b/backend/backend/src/notification/mail-queue.ts index 5c2f0580..54717593 100644 --- a/backend/backend/src/notification/mail-queue.ts +++ b/backend/backend/src/notification/mail-queue.ts @@ -14,8 +14,7 @@ * along with this program. If not, see .nse along with * this program. If not, see . */ -import {Logger} from '@openstapps/logger'; -import {SMTP} from '@openstapps/logger/lib/smtp.js'; +import {Logger, SMTP} from '@openstapps/logger'; import {MailOptions} from 'nodemailer/lib/sendmail-transport'; import Queue from 'promise-queue'; /** diff --git a/backend/backend/src/routes/virtual-plugin-route.ts b/backend/backend/src/routes/virtual-plugin-route.ts index 4802ba41..8561f407 100644 --- a/backend/backend/src/routes/virtual-plugin-route.ts +++ b/backend/backend/src/routes/virtual-plugin-route.ts @@ -38,17 +38,17 @@ export async function virtualPluginRoute(request: Request, plugin: SCPluginMetaD prefixUrl: plugin.address, json: request.body, timeout: { - response: configFile.backend.externalRequestTimeout + response: configFile.backend.externalRequestTimeout, }, responseType: 'json', }); - const responseBody = response.body + const responseBody = response.body; const responseValidation = validator.validate(responseBody, plugin.responseSchema); if (responseValidation.errors.length > 0) { // noinspection ExceptionCaughtLocallyJS throw new SCValidationErrorResponse(responseValidation.errors, isTestEnvironment); } - return response + return response; } catch (error) { // wrap exact error inside of the internal server error response throw new SCInternalServerErrorResponse(error, isTestEnvironment); diff --git a/backend/backend/tsconfig.json b/backend/backend/tsconfig.json index c4b40d1f..d4e77b68 100644 --- a/backend/backend/tsconfig.json +++ b/backend/backend/tsconfig.json @@ -1,13 +1,10 @@ { - "extends": "./node_modules/@openstapps/configuration/tsconfig.json", + "extends": "@openstapps/tsconfig", "compilerOptions": { "resolveJsonModule": true, "skipLibCheck": true, "useUnknownInCatchVariables": false, "lib": ["ES2020"] }, - "exclude": [ - "./config/", - "./test" - ] + "exclude": ["./config/", "./test"] } diff --git a/backend/proxy/.editorconfig b/backend/proxy/.editorconfig deleted file mode 100644 index 251c64e6..00000000 --- a/backend/proxy/.editorconfig +++ /dev/null @@ -1,17 +0,0 @@ -# EditorConfig helps developers define and maintain consistent coding styles between different editors and IDEs -# editorconfig.org - -root = true - -[*] -indent_style = space -indent_size = 2 - -# We recommend you to keep these unchanged -end_of_line = lf -charset = utf-8 -trim_trailing_whitespace = true -insert_final_newline = true - -[*.md] -trim_trailing_whitespace = false diff --git a/backend/proxy/.eslintrc.json b/backend/proxy/.eslintrc.json deleted file mode 100644 index 31d47702..00000000 --- a/backend/proxy/.eslintrc.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "extends": "@openstapps" -} diff --git a/backend/proxy/.gitlab/issue_templates/bug.md b/backend/proxy/.gitlab/issue_templates/bug.md index c3fb037c..fe866128 100644 --- a/backend/proxy/.gitlab/issue_templates/bug.md +++ b/backend/proxy/.gitlab/issue_templates/bug.md @@ -2,35 +2,29 @@ (Summarize the bug encountered concisely) - ## Steps to reproduce (How one can reproduce the issue - this is very important) - ## Example Project (If possible, please create an example project here on GitLab.com that exhibits the problematic behaviour, and link to it here in the bug report) (If you are using an older version of GitLab, this will also determine whether the bug has been fixed in a more recent version) - ## What is the current bug behavior? (What actually happens) - ## What is the expected correct behavior? (What you should see instead) - ## Relevant logs and/or screenshots (Paste any relevant logs - please use code blocks (```) to format console output, logs, and code as it's very hard to read otherwise.) - ## Possible fixes (If you can, link to the line of code that might be responsible for the problem) diff --git a/backend/proxy/.gitlab/issue_templates/feature.md b/backend/proxy/.gitlab/issue_templates/feature.md index 7b669ac7..6c2e94be 100644 --- a/backend/proxy/.gitlab/issue_templates/feature.md +++ b/backend/proxy/.gitlab/issue_templates/feature.md @@ -2,15 +2,12 @@ (Describe the feature that you're requesting concisely) - ## Explanation (Explain why the feature is necessary) - ## Dependencies, issues to be resolved beforehand (List issues or dependencies that need to be resolved before this feature can be implemented) - /label ~meeting ~feature diff --git a/backend/proxy/CHANGELOG.md b/backend/proxy/CHANGELOG.md index 5c4b2ece..d41af510 100644 --- a/backend/proxy/CHANGELOG.md +++ b/backend/proxy/CHANGELOG.md @@ -1,90 +1,61 @@ ## [1.5.1](https://gitlab.com/openstapps/proxy/compare/v1.5.0...v1.5.1) (2023-01-16) - - # [1.5.0](https://gitlab.com/openstapps/proxy/compare/v1.4.1...v1.5.0) (2022-11-29) - ### Bug Fixes -* SVGs treated as plain texts ([25e506f](https://gitlab.com/openstapps/proxy/commit/25e506f54d56f49bf5201b76076bc167fafce290)), closes [#14](https://gitlab.com/openstapps/proxy/issues/14) - - +- SVGs treated as plain texts ([25e506f](https://gitlab.com/openstapps/proxy/commit/25e506f54d56f49bf5201b76076bc167fafce290)), closes [#14](https://gitlab.com/openstapps/proxy/issues/14) ## [1.4.1](https://gitlab.com/openstapps/proxy/compare/v1.4.0...v1.4.1) (2022-11-09) - ### Bug Fixes -* include uri path in json log verbatim ([5f77877](https://gitlab.com/openstapps/proxy/commit/5f77877bb4239a437ff3f2eea1c0dfd51c7d4818)) - - +- include uri path in json log verbatim ([5f77877](https://gitlab.com/openstapps/proxy/commit/5f77877bb4239a437ff3f2eea1c0dfd51c7d4818)) # [1.4.0](https://gitlab.com/openstapps/proxy/compare/v1.3.0...v1.4.0) (2022-11-09) - ### Features -* add support for log aggregators ([8c49c31](https://gitlab.com/openstapps/proxy/commit/8c49c317603b1a2964708ed377a5a7c687f829cd)) - - +- add support for log aggregators ([8c49c31](https://gitlab.com/openstapps/proxy/commit/8c49c317603b1a2964708ed377a5a7c687f829cd)) # [1.3.0](https://gitlab.com/openstapps/proxy/compare/v1.2.0...v1.3.0) (2022-08-22) - - # [1.2.0](https://gitlab.com/openstapps/proxy/compare/v1.1.0...v1.2.0) (2022-06-08) - ### Features -* added prometheus metrics support ([5522ac5](https://gitlab.com/openstapps/proxy/commit/5522ac55ac00d4b809d942d0a8c58d15b0432fb8)) -* reload nginx on proxyconfig change ([1fcf734](https://gitlab.com/openstapps/proxy/commit/1fcf7340d49bde993b3acc7bdc90e6a637a05321)) -* support docker swarm deployments ([4bb46d8](https://gitlab.com/openstapps/proxy/commit/4bb46d8a06ff7829b6908bd03c1cf4240767fcc2)) - - +- added prometheus metrics support ([5522ac5](https://gitlab.com/openstapps/proxy/commit/5522ac55ac00d4b809d942d0a8c58d15b0432fb8)) +- reload nginx on proxyconfig change ([1fcf734](https://gitlab.com/openstapps/proxy/commit/1fcf7340d49bde993b3acc7bdc90e6a637a05321)) +- support docker swarm deployments ([4bb46d8](https://gitlab.com/openstapps/proxy/commit/4bb46d8a06ff7829b6908bd03c1cf4240767fcc2)) # [1.1.0](https://gitlab.com/openstapps/proxy/compare/v1.0.1...v1.1.0) (2022-03-10) - - ## [1.0.1](https://gitlab.com/openstapps/proxy/compare/v1.0.0...v1.0.1) (2022-03-10) - ### Bug Fixes -* nginx deleting its own conifg ([edbd739](https://gitlab.com/openstapps/proxy/commit/edbd739db995b72fd3f5b5bec7558442a329f719)) - - +- nginx deleting its own conifg ([edbd739](https://gitlab.com/openstapps/proxy/commit/edbd739db995b72fd3f5b5bec7558442a329f719)) # [1.0.0](https://gitlab.com/openstapps/proxy/compare/v0.4.0...v1.0.0) (2022-03-09) - ### Features -* add rate limit allow list ([f10cd6c](https://gitlab.com/openstapps/proxy/commit/f10cd6c4314ee8b5f4bddc54b61231335116376d)) - - +- add rate limit allow list ([f10cd6c](https://gitlab.com/openstapps/proxy/commit/f10cd6c4314ee8b5f4bddc54b61231335116376d)) # [0.4.0](https://gitlab.com/openstapps/proxy/compare/fbe1a65cd1cfed81c26af14690c620c4cb4fbdc0...v0.4.0) (2021-09-06) - ### Bug Fixes -* deny PUT method requests ([61ad5ab](https://gitlab.com/openstapps/proxy/commit/61ad5abc2bc45b7cb405b59d6bc095ff1e12a5cf)) -* fix ci job dependencies and caching ([f59cc58](https://gitlab.com/openstapps/proxy/commit/f59cc5832c0b1cfc4b43889e1cedc360e42850e8)) -* handle patch & duplicate versions correctly ([8dffe29](https://gitlab.com/openstapps/proxy/commit/8dffe29146f00b8da98b505b41ab374daf093af2)) -* increase nginx transport security ([8fe6a27](https://gitlab.com/openstapps/proxy/commit/8fe6a2795f0c6f9107662ef9e5a43c6a3c8c066c)) -* remove reasons of linting errors ([b624ed3](https://gitlab.com/openstapps/proxy/commit/b624ed342657f6a574059734f0399ba8539d6c82)) -* remove superfluous visible routes ([96741f3](https://gitlab.com/openstapps/proxy/commit/96741f3789d4a0785124a95475a2ad05b41c9dad)), closes [#10](https://gitlab.com/openstapps/proxy/issues/10) - +- deny PUT method requests ([61ad5ab](https://gitlab.com/openstapps/proxy/commit/61ad5abc2bc45b7cb405b59d6bc095ff1e12a5cf)) +- fix ci job dependencies and caching ([f59cc58](https://gitlab.com/openstapps/proxy/commit/f59cc5832c0b1cfc4b43889e1cedc360e42850e8)) +- handle patch & duplicate versions correctly ([8dffe29](https://gitlab.com/openstapps/proxy/commit/8dffe29146f00b8da98b505b41ab374daf093af2)) +- increase nginx transport security ([8fe6a27](https://gitlab.com/openstapps/proxy/commit/8fe6a2795f0c6f9107662ef9e5a43c6a3c8c066c)) +- remove reasons of linting errors ([b624ed3](https://gitlab.com/openstapps/proxy/commit/b624ed342657f6a574059734f0399ba8539d6c82)) +- remove superfluous visible routes ([96741f3](https://gitlab.com/openstapps/proxy/commit/96741f3789d4a0785124a95475a2ad05b41c9dad)), closes [#10](https://gitlab.com/openstapps/proxy/issues/10) ### Features -* accept PUT method ([59db3b5](https://gitlab.com/openstapps/proxy/commit/59db3b5c50be42ef2d2a4acbad8da2e7d813efd6)) -* add issues templates ([9637574](https://gitlab.com/openstapps/proxy/commit/96375740719191850238dca975a153a37fe7d4e6)), closes [#4](https://gitlab.com/openstapps/proxy/issues/4) -* add proxy ([fbe1a65](https://gitlab.com/openstapps/proxy/commit/fbe1a65cd1cfed81c26af14690c620c4cb4fbdc0)) -* add systemd service examples ([c54aa25](https://gitlab.com/openstapps/proxy/commit/c54aa25f3460e0d08ac4f66621e639a2b46ccc6d)) - - - +- accept PUT method ([59db3b5](https://gitlab.com/openstapps/proxy/commit/59db3b5c50be42ef2d2a4acbad8da2e7d813efd6)) +- add issues templates ([9637574](https://gitlab.com/openstapps/proxy/commit/96375740719191850238dca975a153a37fe7d4e6)), closes [#4](https://gitlab.com/openstapps/proxy/issues/4) +- add proxy ([fbe1a65](https://gitlab.com/openstapps/proxy/commit/fbe1a65cd1cfed81c26af14690c620c4cb4fbdc0)) +- add systemd service examples ([c54aa25](https://gitlab.com/openstapps/proxy/commit/c54aa25f3460e0d08ac4f66621e639a2b46ccc6d)) diff --git a/backend/proxy/LICENSE b/backend/proxy/LICENSE deleted file mode 100644 index 9df63ccc..00000000 --- a/backend/proxy/LICENSE +++ /dev/null @@ -1,200 +0,0 @@ -GNU GENERAL PUBLIC LICENSE -Version 3, 29 June 2007 - -Copyright © 2007 Free Software Foundation, Inc. - -Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. - -Preamble - -The GNU General Public License is a free, copyleft license for software and other kinds of works. - -The licenses for most software and other practical works are designed to take away your freedom to share and change the works. By contrast, the GNU General Public License is intended to guarantee your freedom to share and change all versions of a program--to make sure it remains free software for all its users. We, the Free Software Foundation, use the GNU General Public License for most of our software; it applies also to any other work released this way by its authors. You can apply it to your programs, too. - -When we speak of free software, we are referring to freedom, not price. Our General Public Licenses are designed to make sure that you have the freedom to distribute copies of free software (and charge for them if you wish), that you receive source code or can get it if you want it, that you can change the software or use pieces of it in new free programs, and that you know you can do these things. - -To protect your rights, we need to prevent others from denying you these rights or asking you to surrender the rights. Therefore, you have certain responsibilities if you distribute copies of the software, or if you modify it: responsibilities to respect the freedom of others. - -For example, if you distribute copies of such a program, whether gratis or for a fee, you must pass on to the recipients the same freedoms that you received. You must make sure that they, too, receive or can get the source code. And you must show them these terms so they know their rights. - -Developers that use the GNU GPL protect your rights with two steps: (1) assert copyright on the software, and (2) offer you this License giving you legal permission to copy, distribute and/or modify it. - -For the developers' and authors' protection, the GPL clearly explains that there is no warranty for this free software. For both users' and authors' sake, the GPL requires that modified versions be marked as changed, so that their problems will not be attributed erroneously to authors of previous versions. - -Some devices are designed to deny users access to install or run modified versions of the software inside them, although the manufacturer can do so. This is fundamentally incompatible with the aim of protecting users' freedom to change the software. The systematic pattern of such abuse occurs in the area of products for individuals to use, which is precisely where it is most unacceptable. Therefore, we have designed this version of the GPL to prohibit the practice for those products. If such problems arise substantially in other domains, we stand ready to extend this provision to those domains in future versions of the GPL, as needed to protect the freedom of users. - -Finally, every program is threatened constantly by software patents. States should not allow patents to restrict development and use of software on general-purpose computers, but in those that do, we wish to avoid the special danger that patents applied to a free program could make it effectively proprietary. To prevent this, the GPL assures that patents cannot be used to render the program non-free. - -The precise terms and conditions for copying, distribution and modification follow. - -TERMS AND CONDITIONS - -0. Definitions. -"This License" refers to version 3 of the GNU General Public License. - -"Copyright" also means copyright-like laws that apply to other kinds of works, such as semiconductor masks. - -"The Program" refers to any copyrightable work licensed under this License. Each licensee is addressed as "you". "Licensees" and "recipients" may be individuals or organizations. - -To "modify" a work means to copy from or adapt all or part of the work in a fashion requiring copyright permission, other than the making of an exact copy. The resulting work is called a "modified version" of the earlier work or a work "based on" the earlier work. - -A "covered work" means either the unmodified Program or a work based on the Program. - -To "propagate" a work means to do anything with it that, without permission, would make you directly or secondarily liable for infringement under applicable copyright law, except executing it on a computer or modifying a private copy. Propagation includes copying, distribution (with or without modification), making available to the public, and in some countries other activities as well. - -To "convey" a work means any kind of propagation that enables other parties to make or receive copies. Mere interaction with a user through a computer network, with no transfer of a copy, is not conveying. - -An interactive user interface displays "Appropriate Legal Notices" to the extent that it includes a convenient and prominently visible feature that (1) displays an appropriate copyright notice, and (2) tells the user that there is no warranty for the work (except to the extent that warranties are provided), that licensees may convey the work under this License, and how to view a copy of this License. If the interface presents a list of user commands or options, such as a menu, a prominent item in the list meets this criterion. - -1. Source Code. -The "source code" for a work means the preferred form of the work for making modifications to it. "Object code" means any non-source form of a work. -A "Standard Interface" means an interface that either is an official standard defined by a recognized standards body, or, in the case of interfaces specified for a particular programming language, one that is widely used among developers working in that language. - -The "System Libraries" of an executable work include anything, other than the work as a whole, that (a) is included in the normal form of packaging a Major Component, but which is not part of that Major Component, and (b) serves only to enable use of the work with that Major Component, or to implement a Standard Interface for which an implementation is available to the public in source code form. A "Major Component", in this context, means a major essential component (kernel, window system, and so on) of the specific operating system (if any) on which the executable work runs, or a compiler used to produce the work, or an object code interpreter used to run it. - -The "Corresponding Source" for a work in object code form means all the source code needed to generate, install, and (for an executable work) run the object code and to modify the work, including scripts to control those activities. However, it does not include the work's System Libraries, or general-purpose tools or generally available free programs which are used unmodified in performing those activities but which are not part of the work. For example, Corresponding Source includes interface definition files associated with source files for the work, and the source code for shared libraries and dynamically linked subprograms that the work is specifically designed to require, such as by intimate data communication or control flow between those subprograms and other parts of the work. - -The Corresponding Source need not include anything that users can regenerate automatically from other parts of the Corresponding Source. - -The Corresponding Source for a work in source code form is that same work. - -2. Basic Permissions. -All rights granted under this License are granted for the term of copyright on the Program, and are irrevocable provided the stated conditions are met. This License explicitly affirms your unlimited permission to run the unmodified Program. The output from running a covered work is covered by this License only if the output, given its content, constitutes a covered work. This License acknowledges your rights of fair use or other equivalent, as provided by copyright law. -You may make, run and propagate covered works that you do not convey, without conditions so long as your license otherwise remains in force. You may convey covered works to others for the sole purpose of having them make modifications exclusively for you, or provide you with facilities for running those works, provided that you comply with the terms of this License in conveying all material for which you do not control copyright. Those thus making or running the covered works for you must do so exclusively on your behalf, under your direction and control, on terms that prohibit them from making any copies of your copyrighted material outside their relationship with you. - -Conveying under any other circumstances is permitted solely under the conditions stated below. Sublicensing is not allowed; section 10 makes it unnecessary. - -3. Protecting Users' Legal Rights From Anti-Circumvention Law. -No covered work shall be deemed part of an effective technological measure under any applicable law fulfilling obligations under article 11 of the WIPO copyright treaty adopted on 20 December 1996, or similar laws prohibiting or restricting circumvention of such measures. -When you convey a covered work, you waive any legal power to forbid circumvention of technological measures to the extent such circumvention is effected by exercising rights under this License with respect to the covered work, and you disclaim any intention to limit operation or modification of the work as a means of enforcing, against the work's users, your or third parties' legal rights to forbid circumvention of technological measures. - -4. Conveying Verbatim Copies. -You may convey verbatim copies of the Program's source code as you receive it, in any medium, provided that you conspicuously and appropriately publish on each copy an appropriate copyright notice; keep intact all notices stating that this License and any non-permissive terms added in accord with section 7 apply to the code; keep intact all notices of the absence of any warranty; and give all recipients a copy of this License along with the Program. -You may charge any price or no price for each copy that you convey, and you may offer support or warranty protection for a fee. - -5. Conveying Modified Source Versions. -You may convey a work based on the Program, or the modifications to produce it from the Program, in the form of source code under the terms of section 4, provided that you also meet all of these conditions: -a) The work must carry prominent notices stating that you modified it, and giving a relevant date. -b) The work must carry prominent notices stating that it is released under this License and any conditions added under section 7. This requirement modifies the requirement in section 4 to "keep intact all notices". -c) You must license the entire work, as a whole, under this License to anyone who comes into possession of a copy. This License will therefore apply, along with any applicable section 7 additional terms, to the whole of the work, and all its parts, regardless of how they are packaged. This License gives no permission to license the work in any other way, but it does not invalidate such permission if you have separately received it. -d) If the work has interactive user interfaces, each must display Appropriate Legal Notices; however, if the Program has interactive interfaces that do not display Appropriate Legal Notices, your work need not make them do so. -A compilation of a covered work with other separate and independent works, which are not by their nature extensions of the covered work, and which are not combined with it such as to form a larger program, in or on a volume of a storage or distribution medium, is called an "aggregate" if the compilation and its resulting copyright are not used to limit the access or legal rights of the compilation's users beyond what the individual works permit. Inclusion of a covered work in an aggregate does not cause this License to apply to the other parts of the aggregate. - -6. Conveying Non-Source Forms. -You may convey a covered work in object code form under the terms of sections 4 and 5, provided that you also convey the machine-readable Corresponding Source under the terms of this License, in one of these ways: -a) Convey the object code in, or embodied in, a physical product (including a physical distribution medium), accompanied by the Corresponding Source fixed on a durable physical medium customarily used for software interchange. -b) Convey the object code in, or embodied in, a physical product (including a physical distribution medium), accompanied by a written offer, valid for at least three years and valid for as long as you offer spare parts or customer support for that product model, to give anyone who possesses the object code either (1) a copy of the Corresponding Source for all the software in the product that is covered by this License, on a durable physical medium customarily used for software interchange, for a price no more than your reasonable cost of physically performing this conveying of source, or (2) access to copy the Corresponding Source from a network server at no charge. -c) Convey individual copies of the object code with a copy of the written offer to provide the Corresponding Source. This alternative is allowed only occasionally and noncommercially, and only if you received the object code with such an offer, in accord with subsection 6b. -d) Convey the object code by offering access from a designated place (gratis or for a charge), and offer equivalent access to the Corresponding Source in the same way through the same place at no further charge. You need not require recipients to copy the Corresponding Source along with the object code. If the place to copy the object code is a network server, the Corresponding Source may be on a different server (operated by you or a third party) that supports equivalent copying facilities, provided you maintain clear directions next to the object code saying where to find the Corresponding Source. Regardless of what server hosts the Corresponding Source, you remain obligated to ensure that it is available for as long as needed to satisfy these requirements. -e) Convey the object code using peer-to-peer transmission, provided you inform other peers where the object code and Corresponding Source of the work are being offered to the general public at no charge under subsection 6d. -A separable portion of the object code, whose source code is excluded from the Corresponding Source as a System Library, need not be included in conveying the object code work. - -A "User Product" is either (1) a "consumer product", which means any tangible personal property which is normally used for personal, family, or household purposes, or (2) anything designed or sold for incorporation into a dwelling. In determining whether a product is a consumer product, doubtful cases shall be resolved in favor of coverage. For a particular product received by a particular user, "normally used" refers to a typical or common use of that class of product, regardless of the status of the particular user or of the way in which the particular user actually uses, or expects or is expected to use, the product. A product is a consumer product regardless of whether the product has substantial commercial, industrial or non-consumer uses, unless such uses represent the only significant mode of use of the product. - -"Installation Information" for a User Product means any methods, procedures, authorization keys, or other information required to install and execute modified versions of a covered work in that User Product from a modified version of its Corresponding Source. The information must suffice to ensure that the continued functioning of the modified object code is in no case prevented or interfered with solely because modification has been made. - -If you convey an object code work under this section in, or with, or specifically for use in, a User Product, and the conveying occurs as part of a transaction in which the right of possession and use of the User Product is transferred to the recipient in perpetuity or for a fixed term (regardless of how the transaction is characterized), the Corresponding Source conveyed under this section must be accompanied by the Installation Information. But this requirement does not apply if neither you nor any third party retains the ability to install modified object code on the User Product (for example, the work has been installed in ROM). - -The requirement to provide Installation Information does not include a requirement to continue to provide support service, warranty, or updates for a work that has been modified or installed by the recipient, or for the User Product in which it has been modified or installed. Access to a network may be denied when the modification itself materially and adversely affects the operation of the network or violates the rules and protocols for communication across the network. - -Corresponding Source conveyed, and Installation Information provided, in accord with this section must be in a format that is publicly documented (and with an implementation available to the public in source code form), and must require no special password or key for unpacking, reading or copying. - -7. Additional Terms. -"Additional permissions" are terms that supplement the terms of this License by making exceptions from one or more of its conditions. Additional permissions that are applicable to the entire Program shall be treated as though they were included in this License, to the extent that they are valid under applicable law. If additional permissions apply only to part of the Program, that part may be used separately under those permissions, but the entire Program remains governed by this License without regard to the additional permissions. -When you convey a copy of a covered work, you may at your option remove any additional permissions from that copy, or from any part of it. (Additional permissions may be written to require their own removal in certain cases when you modify the work.) You may place additional permissions on material, added by you to a covered work, for which you have or can give appropriate copyright permission. - -Notwithstanding any other provision of this License, for material you add to a covered work, you may (if authorized by the copyright holders of that material) supplement the terms of this License with terms: - -a) Disclaiming warranty or limiting liability differently from the terms of sections 15 and 16 of this License; or -b) Requiring preservation of specified reasonable legal notices or author attributions in that material or in the Appropriate Legal Notices displayed by works containing it; or -c) Prohibiting misrepresentation of the origin of that material, or requiring that modified versions of such material be marked in reasonable ways as different from the original version; or -d) Limiting the use for publicity purposes of names of licensors or authors of the material; or -e) Declining to grant rights under trademark law for use of some trade names, trademarks, or service marks; or -f) Requiring indemnification of licensors and authors of that material by anyone who conveys the material (or modified versions of it) with contractual assumptions of liability to the recipient, for any liability that these contractual assumptions directly impose on those licensors and authors. -All other non-permissive additional terms are considered "further restrictions" within the meaning of section 10. If the Program as you received it, or any part of it, contains a notice stating that it is governed by this License along with a term that is a further restriction, you may remove that term. If a license document contains a further restriction but permits relicensing or conveying under this License, you may add to a covered work material governed by the terms of that license document, provided that the further restriction does not survive such relicensing or conveying. - -If you add terms to a covered work in accord with this section, you must place, in the relevant source files, a statement of the additional terms that apply to those files, or a notice indicating where to find the applicable terms. - -Additional terms, permissive or non-permissive, may be stated in the form of a separately written license, or stated as exceptions; the above requirements apply either way. - -8. Termination. -You may not propagate or modify a covered work except as expressly provided under this License. Any attempt otherwise to propagate or modify it is void, and will automatically terminate your rights under this License (including any patent licenses granted under the third paragraph of section 11). -However, if you cease all violation of this License, then your license from a particular copyright holder is reinstated (a) provisionally, unless and until the copyright holder explicitly and finally terminates your license, and (b) permanently, if the copyright holder fails to notify you of the violation by some reasonable means prior to 60 days after the cessation. - -Moreover, your license from a particular copyright holder is reinstated permanently if the copyright holder notifies you of the violation by some reasonable means, this is the first time you have received notice of violation of this License (for any work) from that copyright holder, and you cure the violation prior to 30 days after your receipt of the notice. - -Termination of your rights under this section does not terminate the licenses of parties who have received copies or rights from you under this License. If your rights have been terminated and not permanently reinstated, you do not qualify to receive new licenses for the same material under section 10. - -9. Acceptance Not Required for Having Copies. -You are not required to accept this License in order to receive or run a copy of the Program. Ancillary propagation of a covered work occurring solely as a consequence of using peer-to-peer transmission to receive a copy likewise does not require acceptance. However, nothing other than this License grants you permission to propagate or modify any covered work. These actions infringe copyright if you do not accept this License. Therefore, by modifying or propagating a covered work, you indicate your acceptance of this License to do so. -10. Automatic Licensing of Downstream Recipients. -Each time you convey a covered work, the recipient automatically receives a license from the original licensors, to run, modify and propagate that work, subject to this License. You are not responsible for enforcing compliance by third parties with this License. -An "entity transaction" is a transaction transferring control of an organization, or substantially all assets of one, or subdividing an organization, or merging organizations. If propagation of a covered work results from an entity transaction, each party to that transaction who receives a copy of the work also receives whatever licenses to the work the party's predecessor in interest had or could give under the previous paragraph, plus a right to possession of the Corresponding Source of the work from the predecessor in interest, if the predecessor has it or can get it with reasonable efforts. - -You may not impose any further restrictions on the exercise of the rights granted or affirmed under this License. For example, you may not impose a license fee, royalty, or other charge for exercise of rights granted under this License, and you may not initiate litigation (including a cross-claim or counterclaim in a lawsuit) alleging that any patent claim is infringed by making, using, selling, offering for sale, or importing the Program or any portion of it. - -11. Patents. -A "contributor" is a copyright holder who authorizes use under this License of the Program or a work on which the Program is based. The work thus licensed is called the contributor's "contributor version". -A contributor's "essential patent claims" are all patent claims owned or controlled by the contributor, whether already acquired or hereafter acquired, that would be infringed by some manner, permitted by this License, of making, using, or selling its contributor version, but do not include claims that would be infringed only as a consequence of further modification of the contributor version. For purposes of this definition, "control" includes the right to grant patent sublicenses in a manner consistent with the requirements of this License. - -Each contributor grants you a non-exclusive, worldwide, royalty-free patent license under the contributor's essential patent claims, to make, use, sell, offer for sale, import and otherwise run, modify and propagate the contents of its contributor version. - -In the following three paragraphs, a "patent license" is any express agreement or commitment, however denominated, not to enforce a patent (such as an express permission to practice a patent or covenant not to sue for patent infringement). To "grant" such a patent license to a party means to make such an agreement or commitment not to enforce a patent against the party. - -If you convey a covered work, knowingly relying on a patent license, and the Corresponding Source of the work is not available for anyone to copy, free of charge and under the terms of this License, through a publicly available network server or other readily accessible means, then you must either (1) cause the Corresponding Source to be so available, or (2) arrange to deprive yourself of the benefit of the patent license for this particular work, or (3) arrange, in a manner consistent with the requirements of this License, to extend the patent license to downstream recipients. "Knowingly relying" means you have actual knowledge that, but for the patent license, your conveying the covered work in a country, or your recipient's use of the covered work in a country, would infringe one or more identifiable patents in that country that you have reason to believe are valid. - -If, pursuant to or in connection with a single transaction or arrangement, you convey, or propagate by procuring conveyance of, a covered work, and grant a patent license to some of the parties receiving the covered work authorizing them to use, propagate, modify or convey a specific copy of the covered work, then the patent license you grant is automatically extended to all recipients of the covered work and works based on it. - -A patent license is "discriminatory" if it does not include within the scope of its coverage, prohibits the exercise of, or is conditioned on the non-exercise of one or more of the rights that are specifically granted under this License. You may not convey a covered work if you are a party to an arrangement with a third party that is in the business of distributing software, under which you make payment to the third party based on the extent of your activity of conveying the work, and under which the third party grants, to any of the parties who would receive the covered work from you, a discriminatory patent license (a) in connection with copies of the covered work conveyed by you (or copies made from those copies), or (b) primarily for and in connection with specific products or compilations that contain the covered work, unless you entered into that arrangement, or that patent license was granted, prior to 28 March 2007. - -Nothing in this License shall be construed as excluding or limiting any implied license or other defenses to infringement that may otherwise be available to you under applicable patent law. - -12. No Surrender of Others' Freedom. -If conditions are imposed on you (whether by court order, agreement or otherwise) that contradict the conditions of this License, they do not excuse you from the conditions of this License. If you cannot convey a covered work so as to satisfy simultaneously your obligations under this License and any other pertinent obligations, then as a consequence you may not convey it at all. For example, if you agree to terms that obligate you to collect a royalty for further conveying from those to whom you convey the Program, the only way you could satisfy both those terms and this License would be to refrain entirely from conveying the Program. -13. Use with the GNU Affero General Public License. -Notwithstanding any other provision of this License, you have permission to link or combine any covered work with a work licensed under version 3 of the GNU Affero General Public License into a single combined work, and to convey the resulting work. The terms of this License will continue to apply to the part which is the covered work, but the special requirements of the GNU Affero General Public License, section 13, concerning interaction through a network will apply to the combination as such. -14. Revised Versions of this License. -The Free Software Foundation may publish revised and/or new versions of the GNU General Public License from time to time. Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns. -Each version is given a distinguishing version number. If the Program specifies that a certain numbered version of the GNU General Public License "or any later version" applies to it, you have the option of following the terms and conditions either of that numbered version or of any later version published by the Free Software Foundation. If the Program does not specify a version number of the GNU General Public License, you may choose any version ever published by the Free Software Foundation. - -If the Program specifies that a proxy can decide which future versions of the GNU General Public License can be used, that proxy's public statement of acceptance of a version permanently authorizes you to choose that version for the Program. - -Later license versions may give you additional or different permissions. However, no additional obligations are imposed on any author or copyright holder as a result of your choosing to follow a later version. - -15. Disclaimer of Warranty. -THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. -16. Limitation of Liability. -IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. -17. Interpretation of Sections 15 and 16. -If the disclaimer of warranty and limitation of liability provided above cannot be given local legal effect according to their terms, reviewing courts shall apply local law that most closely approximates an absolute waiver of all civil liability in connection with the Program, unless a warranty or assumption of liability accompanies a copy of the Program in return for a fee. - -END OF TERMS AND CONDITIONS - -How to Apply These Terms to Your New Programs - -If you develop a new program, and you want it to be of the greatest possible use to the public, the best way to achieve this is to make it free software which everyone can redistribute and change under these terms. - -To do so, attach the following notices to the program. It is safest to attach them to the start of each source file to most effectively state the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found. - - -Copyright (C) - -This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. - -This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - -You should have received a copy of the GNU General Public License along with this program. If not, see . - -Also add information on how to contact you by electronic and paper mail. - -If the program does terminal interaction, make it output a short notice like this when it starts in an interactive mode: - - Copyright (C) -This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. -This is free software, and you are welcome to redistribute it under certain conditions; type `show c' for details. - -The hypothetical commands `show w' and `show c' should show the appropriate parts of the General Public License. Of course, your program's commands might be different; for a GUI interface, you would use an "about box". - -You should also get your employer (if you work as a programmer) or school, if any, to sign a "copyright disclaimer" for the program, if necessary. For more information on this, and how to apply and follow the GNU GPL, see . - -The GNU General Public License does not permit incorporating your program into proprietary programs. If your program is a subroutine library, you may consider it more useful to permit linking proprietary applications with the library. If this is what you want to do, use the GNU Lesser General Public License instead of this License. But first, please read . diff --git a/backend/proxy/README.md b/backend/proxy/README.md index db108d82..f3ec7fba 100644 --- a/backend/proxy/README.md +++ b/backend/proxy/README.md @@ -3,23 +3,23 @@ This proxy is based on NGINX. The NGINX configuration is generated by a simple Node.js script which parses the docker socket. NGINX acts as a reverse proxy server. The Node.js script reads the docker socket file to generate a configuration for each running docker container. The base template for configuration is `nginx.conf.template` -All `*.template` files are written with [mustache-js](https://github.com/janl/mustache.js "GitHub") syntax. +All `*.template` files are written with [mustache-js](https://github.com/janl/mustache.js 'GitHub') syntax. The templates are assembled by the Node.js program. **Important:** The proxy expects your backend containers to provide following structure: -* Service name for the backend container has to be `backend` in docker-compose.yml. If you don't use docker-compose -set `com.docker.compose.service`-label to `backend`. -* Set the `stapps.version`-label of the container/service to coresponing the backend version -* The proxy container has to be executed with `--net=host` -* Port 80 or 443 being free for exclusive use by the proxy container -* Always publish the backend container ports to the host machines internal loopback interface or an interace you control. This is the only way communication with the internet is restricted to going through the proxy. E.g this can be achieved by the `ports` syntax `127.0.0.1:3000-4000:3000` in the docker-compose file (here with a random port to avoid collisions). +- Service name for the backend container has to be `backend` in docker-compose.yml. If you don't use docker-compose + set `com.docker.compose.service`-label to `backend`. +- Set the `stapps.version`-label of the container/service to coresponing the backend version +- The proxy container has to be executed with `--net=host` +- Port 80 or 443 being free for exclusive use by the proxy container +- Always publish the backend container ports to the host machines internal loopback interface or an interace you control. This is the only way communication with the internet is restricted to going through the proxy. E.g this can be achieved by the `ports` syntax `127.0.0.1:3000-4000:3000` in the docker-compose file (here with a random port to avoid collisions). ## SSL/TLS -For a working https configuration you need to have a valid certificate ***including the intemediate certificas without the root*** (*.crt file ) and its private key (*.key file) in two ***seperate*** files. In addition to your certificate you need to provide the certificate chain ***including*** the root certificate. [Read up on](https://medium.com/@superseb/get-your-certificate-chain-right-4b117a9c0fce) how to [create this chain](https://blog.pki.dfn.de/2015/06/ocsp-stapling-in-nginx/) (*.crt file) or ask your admins to provide you one. The final and easiest requirement of the ssl setup is to create custom Diffie-Hellman parameters in a file: +For a working https configuration you need to have a valid certificate **_including the intemediate certificas without the root_** (_.crt file ) and its private key (_.key file) in two **_seperate_** files. In addition to your certificate you need to provide the certificate chain **_including_** the root certificate. [Read up on](https://medium.com/@superseb/get-your-certificate-chain-right-4b117a9c0fce) how to [create this chain](https://blog.pki.dfn.de/2015/06/ocsp-stapling-in-nginx/) (\*.crt file) or ask your admins to provide you one. The final and easiest requirement of the ssl setup is to create custom Diffie-Hellman parameters in a file: ```sh openssl dhparam -out dhparams.pem 4096 @@ -31,10 +31,10 @@ To Provide your own configuration file you can create a `default.json` file in t ## Status Codes -* OutdatedVersions return a `HTTP 404` -* ActiveVersions return a `HTTP 503` if currently unavailable or the given code by running backend-node -* Unsupported versions (not configured as outdated or active) return a `HTTP 404` -* No version header given returns a `HTTP 300` +- OutdatedVersions return a `HTTP 404` +- ActiveVersions return a `HTTP 503` if currently unavailable or the given code by running backend-node +- Unsupported versions (not configured as outdated or active) return a `HTTP 404` +- No version header given returns a `HTTP 300` **NOTE:** The default configuration expects the client to set a version header: `X-StApps-Version=` @@ -46,7 +46,7 @@ and SMTP-Configuration via environment-variables for monitoring in production us ## Usage The Node.js script reads out the `/var/run/docker.sock` to get the containers of the host system via -[dockerode](https://github.com/apocas/dockerode "GitHub"). +[dockerode](https://github.com/apocas/dockerode 'GitHub'). Without ssl: diff --git a/backend/proxy/app.js b/backend/proxy/app.js index d233e644..5ca3fea3 100644 --- a/backend/proxy/app.js +++ b/backend/proxy/app.js @@ -1,2 +1,2 @@ #!/usr/bin/env node -import './lib/cli.js' +import './lib/app.js'; diff --git a/backend/proxy/package.json b/backend/proxy/package.json index d1bb9441..5588aa69 100644 --- a/backend/proxy/package.json +++ b/backend/proxy/package.json @@ -14,18 +14,14 @@ "Michel Jonathan Schmitz ", "Rainer Killinger " ], - "main": "app.js", + "bin": "app.js", "scripts": { - "build": "rimraf lib && tsc", - "changelog": "conventional-changelog -p angular -i CHANGELOG.md -s -r 0 && git add CHANGELOG.md && git commit -m 'docs: update changelog'", - "check-configuration": "openstapps-configuration", - "documentation": "typedoc --includeVersion --out docs --readme README.md --entryPointStrategy expand src", + "build": "tsup --dts", + "format": "prettier .", + "format:fix": "prettier --write .", "lint": "eslint --ext .ts src/", - "postversion": "npm run changelog", - "prepublishOnly": "npm ci && npm run build", - "preversion": "npm run prepublishOnly", - "push": "git push && git push origin \"v$npm_package_version\"", - "test": "nyc mocha --require ts-node/register 'test/**/*.spec.ts'" + "lint:fix": "eslint --fix --ext .ts src/", + "test": "nyc mocha 'test/**/*.spec.ts'" }, "dependencies": { "@openstapps/logger": "workspace:*", @@ -41,8 +37,10 @@ "semver": "7.3.8" }, "devDependencies": { - "@openstapps/configuration": "workspace:*", "@openstapps/eslint-config": "workspace:*", + "@openstapps/nyc-config": "workspace:*", + "@openstapps/prettier-config": "workspace:*", + "@openstapps/tsconfig": "workspace:*", "@testdeck/mocha": "0.3.3", "@types/chai": "4.3.5", "@types/chai-spies": "1.0.3", @@ -53,52 +51,34 @@ "@types/proxyquire": "1.3.28", "@types/semver": "7.3.13", "@types/sha1": "1.1.3", - "@typescript-eslint/eslint-plugin": "5.49.0", - "@typescript-eslint/parser": "5.49.0", "chai": "4.3.7", "chai-spies": "1.0.0", - "conventional-changelog-cli": "2.2.2", - "eslint": "8.33.0", - "eslint-config-prettier": "8.6.0", - "eslint-plugin-jsdoc": "39.7.4", - "eslint-plugin-prettier": "4.2.1", - "eslint-plugin-unicorn": "45.0.2", "mocha": "10.2.0", "nyc": "15.1.0", - "prettier": "2.8.3", "proxyquire": "2.1.3", "rimraf": "3.0.2", "ts-node": "10.9.1", - "typedoc": "0.23.26", + "tsup": "6.7.0", + "typedoc": "0.23.28", "typescript": "4.8.4" }, - "nyc": { - "all": true, - "branches": 95, - "check-coverage": true, - "exclude": [ - "src/cli.ts" + "tsup": { + "entry": [ + "src/app.ts", + "src/app.ts" ], - "extension": [ - ".ts" - ], - "functions": 95, - "include": [ - "src" - ], - "lines": 95, - "per-file": true, - "reporter": [ - "cobertura", - "html", - "text-summary" - ], - "statements": 95 + "sourcemap": true, + "clean": true, + "format": "esm", + "outDir": "lib" }, - "openstappsConfiguration": { - "forPackaging": false, - "ignoreCiEntries": [ - "package" + "prettier": "@openstapps/prettier-config", + "eslintConfig": { + "extends": [ + "@openstapps" ] + }, + "nyc": { + "extends": "@openstapps/nyc-config" } } diff --git a/backend/proxy/src/cli.ts b/backend/proxy/src/app.ts similarity index 100% rename from backend/proxy/src/cli.ts rename to backend/proxy/src/app.ts diff --git a/backend/proxy/src/common.ts b/backend/proxy/src/common.ts index f1507dfe..b72ebb98 100644 --- a/backend/proxy/src/common.ts +++ b/backend/proxy/src/common.ts @@ -13,8 +13,7 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -import {Logger} from '@openstapps/logger'; -import {SMTP} from '@openstapps/logger/lib/smtp.js'; +import {Logger, SMTP} from '@openstapps/logger'; import config from 'config'; import {existsSync, readFile, writeFile} from 'fs'; import {promisify} from 'util'; diff --git a/backend/proxy/src/main.ts b/backend/proxy/src/main.ts index 6168923b..5a85aaf7 100644 --- a/backend/proxy/src/main.ts +++ b/backend/proxy/src/main.ts @@ -191,7 +191,7 @@ export async function generateUpstreamMap( }) .join('\n'); - result += '\n\}'; + result += '\n}'; if (!foundMatchingContainer) { await Logger.error( diff --git a/backend/proxy/test/common.spec.ts b/backend/proxy/test/common.spec.ts index b6ee8f19..89d4ba2c 100644 --- a/backend/proxy/test/common.spec.ts +++ b/backend/proxy/test/common.spec.ts @@ -22,30 +22,28 @@ import {suite, test} from '@testdeck/mocha'; import {Logger} from '@openstapps/logger'; import {expect} from 'chai'; import {mkdirSync, writeFileSync, unlinkSync, rmdirSync} from 'fs'; -import { resolve } from 'path'; -import { isFileType } from '../src/common.js'; +import {resolve} from 'path'; +import {isFileType} from '../src/common.js'; -process.on('unhandledRejection', async (error) => { +process.on('unhandledRejection', async error => { await Logger.error(error); process.exit(1); }); - @suite export class CommonSpec { - @test async testSSLCert() { const testCertDir = resolve(__dirname, 'certs'); mkdirSync(testCertDir); const notAnExptectedFileTypeFilePath = resolve(testCertDir, 'notAnExptectedFileType.txt'); const anExptectedFileTypeFilePath = resolve(testCertDir, 'notARealCert.crt'); - writeFileSync(notAnExptectedFileTypeFilePath,'Test'); - writeFileSync(anExptectedFileTypeFilePath,'Test'); + writeFileSync(notAnExptectedFileTypeFilePath, 'Test'); + writeFileSync(anExptectedFileTypeFilePath, 'Test'); - expect(isFileType(notAnExptectedFileTypeFilePath,'crt')).to.equal(false) - expect(isFileType(anExptectedFileTypeFilePath,'crt')).to.equal(true) + expect(isFileType(notAnExptectedFileTypeFilePath, 'crt')).to.equal(false); + expect(isFileType(anExptectedFileTypeFilePath, 'crt')).to.equal(true); unlinkSync(notAnExptectedFileTypeFilePath); unlinkSync(anExptectedFileTypeFilePath); diff --git a/backend/proxy/tsconfig.json b/backend/proxy/tsconfig.json index 44dae5f0..42e619ec 100644 --- a/backend/proxy/tsconfig.json +++ b/backend/proxy/tsconfig.json @@ -1,8 +1,4 @@ { - "extends": "./node_modules/@openstapps/configuration/tsconfig.json", - "exclude": [ - "./config/", - "./lib/", - "./test/" - ] + "extends": "@openstapps/tsconfig", + "exclude": ["./config/", "./lib/", "./test/"] } diff --git a/configuration/configuration/.editorconfig b/configuration/configuration/.editorconfig deleted file mode 100644 index 9a4062a7..00000000 --- a/configuration/configuration/.editorconfig +++ /dev/null @@ -1,15 +0,0 @@ -# editorconfig.org - -root = true - -[*] -indent_style = space -indent_size = 2 - -end_of_line = lf -charset = utf-8 -trim_trailing_whitespace = true -insert_final_newline = true - -[*.md] -trim_trailing_whitespace = false diff --git a/configuration/configuration/.eslintignore b/configuration/configuration/.eslintignore deleted file mode 100644 index 3d0a9346..00000000 --- a/configuration/configuration/.eslintignore +++ /dev/null @@ -1,2 +0,0 @@ -resources -openapi diff --git a/configuration/configuration/.eslintrc.json b/configuration/configuration/.eslintrc.json deleted file mode 100644 index 31d47702..00000000 --- a/configuration/configuration/.eslintrc.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "extends": "@openstapps" -} diff --git a/configuration/configuration/.gitignore b/configuration/configuration/.gitignore deleted file mode 100644 index c07b9dc8..00000000 --- a/configuration/configuration/.gitignore +++ /dev/null @@ -1,91 +0,0 @@ -# Logs -logs -*.log -npm-debug.log* -yarn-debug.log* -yarn-error.log* - -# Runtime data -pids -*.pid -*.seed -*.pid.lock - -# Directory for instrumented libs generated by jscoverage/JSCover -lib-cov - -# Coverage directory used by tools like istanbul -coverage - -# nyc test coverage -.nyc_output - -# Grunt intermediate storage (https://gruntjs.com/creating-plugins#storing-task-files) -.grunt - -# Bower dependency directory (https://bower.io/) -bower_components - -# node-waf configuration -.lock-wscript - -# Compiled binary addons (https://nodejs.org/api/addons.html) -build/Release - -# Dependency directories -node_modules/ -jspm_packages/ - -# TypeScript v1 declaration files -typings/ - -# Optional npm cache directory -.npm - -# Optional eslint cache -.eslintcache - -# Optional REPL history -.node_repl_history - -# Output of 'npm pack' -*.tgz - -# Yarn Integrity file -.yarn-integrity - -# dotenv environment variables file -.env - -# parcel-bundler cache (https://parceljs.org/) -.cache - -# next.js build output -.next - -# nuxt.js build output -.nuxt - -# vuepress build output -.vuepress/dist - -# Serverless directories -.serverless/ - -# FuseBox cache -.fusebox/ - -#DynamoDB Local files -.dynamodb/ - -########## end of https://github.com/github/gitignore/blob/master/Node.gitignore - -# ignore ide files -.idea -.vscode - -# ignore lib -lib - -# ignore docs -docs diff --git a/configuration/configuration/.gitlab-ci.yml b/configuration/configuration/.gitlab-ci.yml deleted file mode 100644 index 0a28bf93..00000000 --- a/configuration/configuration/.gitlab-ci.yml +++ /dev/null @@ -1,59 +0,0 @@ -image: registry.gitlab.com/openstapps/projectmanagement/node - -before_script: - - npm ci - -stages: - - build - - audit - - publish - - deploy - -build: - stage: build - script: - - npm run build - artifacts: - paths: - - lib - -audit: - stage: audit - script: - - npm audit - allow_failure: true - except: - - schedules - -scheduled-audit: - stage: audit - script: - - npm audit --audit-level=high - only: - - schedules - -package: - dependencies: - - build - tags: - - secrecy - stage: publish - script: - - echo "//registry.npmjs.org/:_authToken=$NPM_AUTH_TOKEN" > ~/.npmrc - - npm publish - only: - - /^v[0-9]+\.[0-9]+\.[0-9]+$/ - artifacts: - paths: - - lib - -pages: - stage: deploy - script: - - npm run documentation - - mv docs public - only: - - /^v[0-9]+\.[0-9]+\.[0-9]+$/ - artifacts: - paths: - - public diff --git a/configuration/configuration/.gitlab/issue_templates/bug.md b/configuration/configuration/.gitlab/issue_templates/bug.md deleted file mode 100644 index fe866128..00000000 --- a/configuration/configuration/.gitlab/issue_templates/bug.md +++ /dev/null @@ -1,32 +0,0 @@ -## Summary - -(Summarize the bug encountered concisely) - -## Steps to reproduce - -(How one can reproduce the issue - this is very important) - -## Example Project - -(If possible, please create an example project here on GitLab.com that exhibits the problematic behaviour, and link to it here in the bug report) - -(If you are using an older version of GitLab, this will also determine whether the bug has been fixed in a more recent version) - -## What is the current bug behavior? - -(What actually happens) - -## What is the expected correct behavior? - -(What you should see instead) - -## Relevant logs and/or screenshots - -(Paste any relevant logs - please use code blocks (```) to format console output, -logs, and code as it's very hard to read otherwise.) - -## Possible fixes - -(If you can, link to the line of code that might be responsible for the problem) - -/label ~meeting ~bug diff --git a/configuration/configuration/.gitlab/issue_templates/feature.md b/configuration/configuration/.gitlab/issue_templates/feature.md deleted file mode 100644 index 6c2e94be..00000000 --- a/configuration/configuration/.gitlab/issue_templates/feature.md +++ /dev/null @@ -1,13 +0,0 @@ -## Description - -(Describe the feature that you're requesting concisely) - -## Explanation - -(Explain why the feature is necessary) - -## Dependencies, issues to be resolved beforehand - -(List issues or dependencies that need to be resolved before this feature can be implemented) - -/label ~meeting ~feature diff --git a/configuration/configuration/.npmignore b/configuration/configuration/.npmignore deleted file mode 100644 index 30ca73ff..00000000 --- a/configuration/configuration/.npmignore +++ /dev/null @@ -1,18 +0,0 @@ -# Ignore all files/folders by default -# See https://stackoverflow.com/a/29932318 -/* -# Except these files/folders -!.editorconfig -!.gitignore -!.npmignore -!lib -lib/tsconfig.tsbuildinfo -!LICENSE -!package.json -!package-lock.json -!README.md -!scripts -!templates -!tsconfig.json -!.eslintrc.json -!.eslintignore diff --git a/configuration/configuration/CHANGELOG.md b/configuration/configuration/CHANGELOG.md deleted file mode 100644 index 8195242e..00000000 --- a/configuration/configuration/CHANGELOG.md +++ /dev/null @@ -1,243 +0,0 @@ -# [0.34.0](https://gitlab.com/openstapps/configuration/compare/v0.33.0...v0.34.0) (2023-01-17) - -# [0.33.0](https://gitlab.com/openstapps/configuration/compare/v0.32.2...v0.33.0) (2022-08-17) - -### Features - -- add proper coverage to ci templates ([35b4b6c](https://gitlab.com/openstapps/configuration/commit/35b4b6c8237a167518f0edb7326578095c935764)) - -## [0.32.2](https://gitlab.com/openstapps/configuration/compare/v0.32.1...v0.32.2) (2022-07-05) - -### Bug Fixes - -- recommended CI settings ([0753ab9](https://gitlab.com/openstapps/configuration/commit/0753ab9f33d13eb2cd7d6512934fd285906f2c47)) - -## [0.32.1](https://gitlab.com/openstapps/configuration/compare/v0.32.0...v0.32.1) (2022-07-05) - -### Bug Fixes - -- simplify dependency version checking ([df92e97](https://gitlab.com/openstapps/configuration/commit/df92e97cb65df3088b090ba76320d05938948514)) - -# [0.32.0](https://gitlab.com/openstapps/configuration/compare/v0.31.0...v0.32.0) (2022-06-27) - -### Features - -- copyright notice year replacement ([17a796e](https://gitlab.com/openstapps/configuration/commit/17a796e97b95694ee39dae0958c99279a1936d74)) - -# [0.31.0](https://gitlab.com/openstapps/configuration/compare/v0.30.0...v0.31.0) (2022-06-02) - -### Bug Fixes - -- npmignore eslint exceptions ([405f8cf](https://gitlab.com/openstapps/configuration/commit/405f8cf496aee4f8f44ef61ee2b61c4a98343114)) - -# [0.30.0](https://gitlab.com/openstapps/configuration/compare/v0.29.1...v0.30.0) (2022-06-01) - -### Features - -- transition from TSLint to ESLint ([9430e10](https://gitlab.com/openstapps/configuration/commit/9430e103874e2c9c41a8c29b13e1ae56d2379af3)) - -## [0.29.1](https://gitlab.com/openstapps/configuration/compare/v0.29.0...v0.29.1) (2022-05-27) - -# [0.29.0](https://gitlab.com/openstapps/configuration/compare/v0.28.1...v0.29.0) (2021-12-14) - -## [0.28.1](https://gitlab.com/openstapps/configuration/compare/v0.28.0...v0.28.1) (2021-09-13) - -### Bug Fixes - -- adjust command of typedoc (upgrade typescript) ([7d396f9](https://gitlab.com/openstapps/configuration/commit/7d396f92026ae84888e1b2246f11d3995a4bf11f)) - -# [0.28.0](https://gitlab.com/openstapps/configuration/compare/v0.27.0...v0.28.0) (2021-09-13) - -# [0.27.0](https://gitlab.com/openstapps/configuration/compare/v0.26.0...v0.27.0) (2021-04-06) - -# [0.26.0](https://gitlab.com/openstapps/configuration/compare/v0.25.0...v0.26.0) (2021-02-22) - -# [0.25.0](https://gitlab.com/openstapps/configuration/compare/v0.24.0...v0.25.0) (2020-09-17) - -### Bug Fixes - -- exclude test dir and its subdirs for tslint ([ec15ebe](https://gitlab.com/openstapps/configuration/commit/ec15ebe5c5fb30e638cc721ca916c84186b1d1e0)), closes [#34](https://gitlab.com/openstapps/configuration/issues/34) - -### Features - -- Change 'npm audit' failure behaviour ([c11b1da](https://gitlab.com/openstapps/configuration/commit/c11b1da9a6546e006bea29cc7f524b94736f7bfb)) - -# [0.24.0](https://gitlab.com/openstapps/configuration/compare/v0.23.0...v0.24.0) (2020-03-03) - -# [0.23.0](https://gitlab.com/openstapps/configuration/compare/v0.22.0...v0.23.0) (2020-02-10) - -# [0.22.0](https://gitlab.com/openstapps/configuration/compare/v0.21.1...v0.22.0) (2019-11-25) - -## [0.21.1](https://gitlab.com/openstapps/configuration/compare/v0.21.0...v0.21.1) (2019-07-15) - -### Bug Fixes - -- remove package-job when forPackaging is false ([b8cefa4](https://gitlab.com/openstapps/configuration/commit/b8cefa42543b0c370b9b23ca7d1a60b45907771c)) - -# [0.21.0](https://gitlab.com/openstapps/configuration/compare/v0.20.0...v0.21.0) (2019-06-24) - -### Bug Fixes - -- update the nyc configuration ([8ece33b](https://gitlab.com/openstapps/configuration/commit/8ece33b6e6902040d42e8eb0b18237065697673e)) - -# [0.20.0](https://gitlab.com/openstapps/configuration/compare/v0.19.0...v0.20.0) (2019-06-06) - -### Bug Fixes - -- only check copyright years for TypeScript files ([1a4ec52](https://gitlab.com/openstapps/configuration/commit/1a4ec52712a2bc6b58c766141816110292f433ef)), closes [#25](https://gitlab.com/openstapps/configuration/issues/25) -- skip template lines to avoid parser errors ([b995bb5](https://gitlab.com/openstapps/configuration/commit/b995bb5c1439bb2860c04d18cfc485eda7ad110f)), closes [#26](https://gitlab.com/openstapps/configuration/issues/26) - -# [0.19.0](https://gitlab.com/openstapps/configuration/compare/v0.18.0...v0.19.0) (2019-06-04) - -# [0.18.0](https://gitlab.com/openstapps/configuration/compare/v0.17.2...v0.18.0) (2019-05-29) - -### Features - -- automatically generate changelog after version bump ([cbee9b8](https://gitlab.com/openstapps/configuration/commit/cbee9b888cccd2192e6725c7f36e3826becae95b)), closes [#23](https://gitlab.com/openstapps/configuration/issues/23) - -## [0.17.2](https://gitlab.com/openstapps/configuration/compare/v0.17.1...v0.17.2) (2019-05-28) - -### Features - -- exclude tests from linting ([9e7f467](https://gitlab.com/openstapps/configuration/commit/9e7f46707026239875848048ddffdad3cf4f8c0d)) - -## [0.17.1](https://gitlab.com/openstapps/configuration/compare/v0.17.0...v0.17.1) (2019-05-28) - -### Bug Fixes - -- fix regression with copyright years ([5659295](https://gitlab.com/openstapps/configuration/commit/5659295b883034296d84aaefc3b00072797a63f9)) - -# [0.17.0](https://gitlab.com/openstapps/configuration/compare/v0.16.1...v0.17.0) (2019-05-28) - -### Features - -- add rule to enforce completed docs ([527a6f9](https://gitlab.com/openstapps/configuration/commit/527a6f9364113405786ffb7e6533842e4d8898ac)), closes [#20](https://gitlab.com/openstapps/configuration/issues/20) -- add sctricter TSLint rules ([76ebbfa](https://gitlab.com/openstapps/configuration/commit/76ebbfab5376c9954c7e9d4e0d9c715089ef1c8b)), closes [#21](https://gitlab.com/openstapps/configuration/issues/21) -- adjust TSLint command to enable advanced rules ([14b6420](https://gitlab.com/openstapps/configuration/commit/14b6420c33aec90d55023aa9b64fd0e69758fffa)), closes [#21](https://gitlab.com/openstapps/configuration/issues/21) - -## [0.16.1](https://gitlab.com/openstapps/configuration/compare/v0.16.0...v0.16.1) (2019-05-24) - -### Bug Fixes - -- make sure that npmrc is created in correct home directory ([60f7e4c](https://gitlab.com/openstapps/configuration/commit/60f7e4cae28775b67b48aae5624a8062951c5264)) - -# [0.16.0](https://gitlab.com/openstapps/configuration/compare/v0.15.0...v0.16.0) (2019-05-22) - -### Bug Fixes - -- use lib as artifacts path ([ec8c891](https://gitlab.com/openstapps/configuration/commit/ec8c891a7a41c5308ad8a3d0acf8ff5c17754a93)), closes [#19](https://gitlab.com/openstapps/configuration/issues/19) - -# [0.15.0](https://gitlab.com/openstapps/configuration/compare/v0.14.0...v0.15.0) (2019-05-20) - -### Bug Fixes - -- remove incremental flag ([73e6f24](https://gitlab.com/openstapps/configuration/commit/73e6f2413b462ddcea6b30e432822a2431384647)), closes [#15](https://gitlab.com/openstapps/configuration/issues/15) -- remove wrong excluded path from nyc config ([cf81c1e](https://gitlab.com/openstapps/configuration/commit/cf81c1e5201213dd9302ecf302b372073f1c480e)), closes [#16](https://gitlab.com/openstapps/configuration/issues/16) - -### Features - -- add check for copyright years ([44c82ad](https://gitlab.com/openstapps/configuration/commit/44c82ade69938157f6b8dfc9a709d33ac73c8da5)), closes [#17](https://gitlab.com/openstapps/configuration/issues/17) -- add rules to enforce automatic package publishing ([1e3e7df](https://gitlab.com/openstapps/configuration/commit/1e3e7dfac8c0887bc3c5758c35fce5ad9b4ebef3)), closes [#18](https://gitlab.com/openstapps/configuration/issues/18) -- warn about extraneous copyright years ([1c826a4](https://gitlab.com/openstapps/configuration/commit/1c826a41e0738f2863809f56edd8be53fdfd6e35)), closes [#17](https://gitlab.com/openstapps/configuration/issues/17) - -# [0.14.0](https://gitlab.com/openstapps/configuration/compare/v0.13.0...v0.14.0) (2019-04-30) - -### Features - -- add possibility to ignore CI entries ([116ddeb](https://gitlab.com/openstapps/configuration/commit/116ddebfb8714aca85612a55fc0ee398022eb0d3)), closes [#14](https://gitlab.com/openstapps/configuration/issues/14) - -# [0.13.0](https://gitlab.com/openstapps/configuration/compare/v0.12.0...v0.13.0) (2019-04-18) - -### Features - -- add configuration for configuration checks ([da2d7f6](https://gitlab.com/openstapps/configuration/commit/da2d7f6f91ccfc91d3560c1e380daa4282f1aeb5)), closes [#13](https://gitlab.com/openstapps/configuration/issues/13) - -# [0.12.0](https://gitlab.com/openstapps/configuration/compare/v0.11.0...v0.12.0) (2019-04-16) - -### Bug Fixes - -- do not escape newlines in scripts ([77bed07](https://gitlab.com/openstapps/configuration/commit/77bed076bbf439a301b6ce4eb4a536ab2b000570)) - -### Features - -- add expected build script ([34d3d43](https://gitlab.com/openstapps/configuration/commit/34d3d43ff5963bc2dae95cd8d6eb5def8023f7fc)), closes [#12](https://gitlab.com/openstapps/configuration/issues/12) - -# [0.11.0](https://gitlab.com/openstapps/configuration/compare/v0.10.0...v0.11.0) (2019-04-15) - -### Bug Fixes - -- exclude docs from packages ([d7b6ecb](https://gitlab.com/openstapps/configuration/commit/d7b6ecb734c008fbad5a9615bf35665fdac20fac)), closes [#11](https://gitlab.com/openstapps/configuration/issues/11) - -# [0.10.0](https://gitlab.com/openstapps/configuration/compare/v0.9.0...v0.10.0) (2019-04-09) - -### Features - -- add check for contributors ([ab81aab](https://gitlab.com/openstapps/configuration/commit/ab81aab046248e8b8379576914b58e23a03fec45)) -- check entries in CI config ([61d2285](https://gitlab.com/openstapps/configuration/commit/61d2285a1fd76dee1c02fd2318a92cd2fbe4df71)), closes [#10](https://gitlab.com/openstapps/configuration/issues/10) - -# [0.9.0](https://gitlab.com/openstapps/configuration/compare/v0.8.0...v0.9.0) (2019-04-08) - -# [0.8.0](https://gitlab.com/openstapps/configuration/compare/v0.7.0...v0.8.0) (2019-04-01) - -### Bug Fixes - -- remove @types/chalk ([bf26eff](https://gitlab.com/openstapps/configuration/commit/bf26effe688299ba18047ca3a8c412ddd162b9c1)) - -# [0.7.0](https://gitlab.com/openstapps/configuration/compare/v0.6.0...v0.7.0) (2019-02-26) - -### Features - -- add ability to check scripts ([662f534](https://gitlab.com/openstapps/configuration/commit/662f53455097ba13c84e20111d99bf60c3f967c2)), closes [#6](https://gitlab.com/openstapps/configuration/issues/6) - -# [0.6.0](https://gitlab.com/openstapps/configuration/compare/v0.5.1...v0.6.0) (2019-02-13) - -### Bug Fixes - -- correctly check tslint.json ([9c8ce48](https://gitlab.com/openstapps/configuration/commit/9c8ce486ce03ebff344b53b566afa3e164c60647)), closes [#3](https://gitlab.com/openstapps/configuration/issues/3) [#4](https://gitlab.com/openstapps/configuration/issues/4) - -## [0.5.1](https://gitlab.com/openstapps/configuration/compare/v0.5.0...v0.5.1) (2019-01-28) - -### Bug Fixes - -- exclude CLI file in nyc configuration ([c46dc18](https://gitlab.com/openstapps/configuration/commit/c46dc1828c826c7025017314fdf2fdce70a58772)), closes [#5](https://gitlab.com/openstapps/configuration/issues/5) - -# [0.5.0](https://gitlab.com/openstapps/configuration/compare/v0.4.0...v0.5.0) (2018-12-18) - -### Bug Fixes - -- use template for .gitignore ([04b6154](https://gitlab.com/openstapps/configuration/commit/04b6154f9a13e68db00a2d80f54a719482c9a4f9)) - -# [0.4.0](https://gitlab.com/openstapps/configuration/compare/v0.3.1...v0.4.0) (2018-12-11) - -### Features - -- disallow spaces in curly braces ([4e14415](https://gitlab.com/openstapps/configuration/commit/4e1441564b6785c118f14ac94659cf1339c0dac3)), closes [#2](https://gitlab.com/openstapps/configuration/issues/2) - -## [0.3.1](https://gitlab.com/openstapps/configuration/compare/v0.3.0...v0.3.1) (2018-12-04) - -# [0.3.0](https://gitlab.com/openstapps/configuration/compare/v0.2.0...v0.3.0) (2018-12-04) - -### Features - -- add cli to copy configurations ([98aa5a5](https://gitlab.com/openstapps/configuration/commit/98aa5a5f70bb17ca05574a291831158eea7920ef)), closes [#1](https://gitlab.com/openstapps/configuration/issues/1) -- add script to check configuration ([adfc5aa](https://gitlab.com/openstapps/configuration/commit/adfc5aa5dc149cb6d634015baceea5839ae29190)) - -# [0.2.0](https://gitlab.com/openstapps/configuration/compare/v0.1.1...v0.2.0) (2018-11-30) - -### Features - -- copy .editorconfig during installation ([f228af2](https://gitlab.com/openstapps/configuration/commit/f228af24f9a20457f89719c093cc9239f35cf0b3)) - -## [0.1.1](https://gitlab.com/openstapps/configuration/compare/v0.1.0...v0.1.1) (2018-11-30) - -# [0.1.0](https://gitlab.com/openstapps/configuration/compare/v0.0.1...v0.1.0) (2018-11-30) - -### Features - -- add editor config ([ecbc768](https://gitlab.com/openstapps/configuration/commit/ecbc768b32daab5f32c5f91aeac9252937586465)) - -## [0.0.1](https://gitlab.com/openstapps/configuration/compare/e2bb08d1e879f8e2aac0f59930f50ff9dfe7526b...v0.0.1) (2018-11-28) - -### Features - -- add tslint and tsconfig ([e2bb08d](https://gitlab.com/openstapps/configuration/commit/e2bb08d1e879f8e2aac0f59930f50ff9dfe7526b)) diff --git a/configuration/configuration/LICENSE b/configuration/configuration/LICENSE deleted file mode 100644 index 9df63ccc..00000000 --- a/configuration/configuration/LICENSE +++ /dev/null @@ -1,200 +0,0 @@ -GNU GENERAL PUBLIC LICENSE -Version 3, 29 June 2007 - -Copyright © 2007 Free Software Foundation, Inc. - -Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. - -Preamble - -The GNU General Public License is a free, copyleft license for software and other kinds of works. - -The licenses for most software and other practical works are designed to take away your freedom to share and change the works. By contrast, the GNU General Public License is intended to guarantee your freedom to share and change all versions of a program--to make sure it remains free software for all its users. We, the Free Software Foundation, use the GNU General Public License for most of our software; it applies also to any other work released this way by its authors. You can apply it to your programs, too. - -When we speak of free software, we are referring to freedom, not price. Our General Public Licenses are designed to make sure that you have the freedom to distribute copies of free software (and charge for them if you wish), that you receive source code or can get it if you want it, that you can change the software or use pieces of it in new free programs, and that you know you can do these things. - -To protect your rights, we need to prevent others from denying you these rights or asking you to surrender the rights. Therefore, you have certain responsibilities if you distribute copies of the software, or if you modify it: responsibilities to respect the freedom of others. - -For example, if you distribute copies of such a program, whether gratis or for a fee, you must pass on to the recipients the same freedoms that you received. You must make sure that they, too, receive or can get the source code. And you must show them these terms so they know their rights. - -Developers that use the GNU GPL protect your rights with two steps: (1) assert copyright on the software, and (2) offer you this License giving you legal permission to copy, distribute and/or modify it. - -For the developers' and authors' protection, the GPL clearly explains that there is no warranty for this free software. For both users' and authors' sake, the GPL requires that modified versions be marked as changed, so that their problems will not be attributed erroneously to authors of previous versions. - -Some devices are designed to deny users access to install or run modified versions of the software inside them, although the manufacturer can do so. This is fundamentally incompatible with the aim of protecting users' freedom to change the software. The systematic pattern of such abuse occurs in the area of products for individuals to use, which is precisely where it is most unacceptable. Therefore, we have designed this version of the GPL to prohibit the practice for those products. If such problems arise substantially in other domains, we stand ready to extend this provision to those domains in future versions of the GPL, as needed to protect the freedom of users. - -Finally, every program is threatened constantly by software patents. States should not allow patents to restrict development and use of software on general-purpose computers, but in those that do, we wish to avoid the special danger that patents applied to a free program could make it effectively proprietary. To prevent this, the GPL assures that patents cannot be used to render the program non-free. - -The precise terms and conditions for copying, distribution and modification follow. - -TERMS AND CONDITIONS - -0. Definitions. -"This License" refers to version 3 of the GNU General Public License. - -"Copyright" also means copyright-like laws that apply to other kinds of works, such as semiconductor masks. - -"The Program" refers to any copyrightable work licensed under this License. Each licensee is addressed as "you". "Licensees" and "recipients" may be individuals or organizations. - -To "modify" a work means to copy from or adapt all or part of the work in a fashion requiring copyright permission, other than the making of an exact copy. The resulting work is called a "modified version" of the earlier work or a work "based on" the earlier work. - -A "covered work" means either the unmodified Program or a work based on the Program. - -To "propagate" a work means to do anything with it that, without permission, would make you directly or secondarily liable for infringement under applicable copyright law, except executing it on a computer or modifying a private copy. Propagation includes copying, distribution (with or without modification), making available to the public, and in some countries other activities as well. - -To "convey" a work means any kind of propagation that enables other parties to make or receive copies. Mere interaction with a user through a computer network, with no transfer of a copy, is not conveying. - -An interactive user interface displays "Appropriate Legal Notices" to the extent that it includes a convenient and prominently visible feature that (1) displays an appropriate copyright notice, and (2) tells the user that there is no warranty for the work (except to the extent that warranties are provided), that licensees may convey the work under this License, and how to view a copy of this License. If the interface presents a list of user commands or options, such as a menu, a prominent item in the list meets this criterion. - -1. Source Code. -The "source code" for a work means the preferred form of the work for making modifications to it. "Object code" means any non-source form of a work. -A "Standard Interface" means an interface that either is an official standard defined by a recognized standards body, or, in the case of interfaces specified for a particular programming language, one that is widely used among developers working in that language. - -The "System Libraries" of an executable work include anything, other than the work as a whole, that (a) is included in the normal form of packaging a Major Component, but which is not part of that Major Component, and (b) serves only to enable use of the work with that Major Component, or to implement a Standard Interface for which an implementation is available to the public in source code form. A "Major Component", in this context, means a major essential component (kernel, window system, and so on) of the specific operating system (if any) on which the executable work runs, or a compiler used to produce the work, or an object code interpreter used to run it. - -The "Corresponding Source" for a work in object code form means all the source code needed to generate, install, and (for an executable work) run the object code and to modify the work, including scripts to control those activities. However, it does not include the work's System Libraries, or general-purpose tools or generally available free programs which are used unmodified in performing those activities but which are not part of the work. For example, Corresponding Source includes interface definition files associated with source files for the work, and the source code for shared libraries and dynamically linked subprograms that the work is specifically designed to require, such as by intimate data communication or control flow between those subprograms and other parts of the work. - -The Corresponding Source need not include anything that users can regenerate automatically from other parts of the Corresponding Source. - -The Corresponding Source for a work in source code form is that same work. - -2. Basic Permissions. -All rights granted under this License are granted for the term of copyright on the Program, and are irrevocable provided the stated conditions are met. This License explicitly affirms your unlimited permission to run the unmodified Program. The output from running a covered work is covered by this License only if the output, given its content, constitutes a covered work. This License acknowledges your rights of fair use or other equivalent, as provided by copyright law. -You may make, run and propagate covered works that you do not convey, without conditions so long as your license otherwise remains in force. You may convey covered works to others for the sole purpose of having them make modifications exclusively for you, or provide you with facilities for running those works, provided that you comply with the terms of this License in conveying all material for which you do not control copyright. Those thus making or running the covered works for you must do so exclusively on your behalf, under your direction and control, on terms that prohibit them from making any copies of your copyrighted material outside their relationship with you. - -Conveying under any other circumstances is permitted solely under the conditions stated below. Sublicensing is not allowed; section 10 makes it unnecessary. - -3. Protecting Users' Legal Rights From Anti-Circumvention Law. -No covered work shall be deemed part of an effective technological measure under any applicable law fulfilling obligations under article 11 of the WIPO copyright treaty adopted on 20 December 1996, or similar laws prohibiting or restricting circumvention of such measures. -When you convey a covered work, you waive any legal power to forbid circumvention of technological measures to the extent such circumvention is effected by exercising rights under this License with respect to the covered work, and you disclaim any intention to limit operation or modification of the work as a means of enforcing, against the work's users, your or third parties' legal rights to forbid circumvention of technological measures. - -4. Conveying Verbatim Copies. -You may convey verbatim copies of the Program's source code as you receive it, in any medium, provided that you conspicuously and appropriately publish on each copy an appropriate copyright notice; keep intact all notices stating that this License and any non-permissive terms added in accord with section 7 apply to the code; keep intact all notices of the absence of any warranty; and give all recipients a copy of this License along with the Program. -You may charge any price or no price for each copy that you convey, and you may offer support or warranty protection for a fee. - -5. Conveying Modified Source Versions. -You may convey a work based on the Program, or the modifications to produce it from the Program, in the form of source code under the terms of section 4, provided that you also meet all of these conditions: -a) The work must carry prominent notices stating that you modified it, and giving a relevant date. -b) The work must carry prominent notices stating that it is released under this License and any conditions added under section 7. This requirement modifies the requirement in section 4 to "keep intact all notices". -c) You must license the entire work, as a whole, under this License to anyone who comes into possession of a copy. This License will therefore apply, along with any applicable section 7 additional terms, to the whole of the work, and all its parts, regardless of how they are packaged. This License gives no permission to license the work in any other way, but it does not invalidate such permission if you have separately received it. -d) If the work has interactive user interfaces, each must display Appropriate Legal Notices; however, if the Program has interactive interfaces that do not display Appropriate Legal Notices, your work need not make them do so. -A compilation of a covered work with other separate and independent works, which are not by their nature extensions of the covered work, and which are not combined with it such as to form a larger program, in or on a volume of a storage or distribution medium, is called an "aggregate" if the compilation and its resulting copyright are not used to limit the access or legal rights of the compilation's users beyond what the individual works permit. Inclusion of a covered work in an aggregate does not cause this License to apply to the other parts of the aggregate. - -6. Conveying Non-Source Forms. -You may convey a covered work in object code form under the terms of sections 4 and 5, provided that you also convey the machine-readable Corresponding Source under the terms of this License, in one of these ways: -a) Convey the object code in, or embodied in, a physical product (including a physical distribution medium), accompanied by the Corresponding Source fixed on a durable physical medium customarily used for software interchange. -b) Convey the object code in, or embodied in, a physical product (including a physical distribution medium), accompanied by a written offer, valid for at least three years and valid for as long as you offer spare parts or customer support for that product model, to give anyone who possesses the object code either (1) a copy of the Corresponding Source for all the software in the product that is covered by this License, on a durable physical medium customarily used for software interchange, for a price no more than your reasonable cost of physically performing this conveying of source, or (2) access to copy the Corresponding Source from a network server at no charge. -c) Convey individual copies of the object code with a copy of the written offer to provide the Corresponding Source. This alternative is allowed only occasionally and noncommercially, and only if you received the object code with such an offer, in accord with subsection 6b. -d) Convey the object code by offering access from a designated place (gratis or for a charge), and offer equivalent access to the Corresponding Source in the same way through the same place at no further charge. You need not require recipients to copy the Corresponding Source along with the object code. If the place to copy the object code is a network server, the Corresponding Source may be on a different server (operated by you or a third party) that supports equivalent copying facilities, provided you maintain clear directions next to the object code saying where to find the Corresponding Source. Regardless of what server hosts the Corresponding Source, you remain obligated to ensure that it is available for as long as needed to satisfy these requirements. -e) Convey the object code using peer-to-peer transmission, provided you inform other peers where the object code and Corresponding Source of the work are being offered to the general public at no charge under subsection 6d. -A separable portion of the object code, whose source code is excluded from the Corresponding Source as a System Library, need not be included in conveying the object code work. - -A "User Product" is either (1) a "consumer product", which means any tangible personal property which is normally used for personal, family, or household purposes, or (2) anything designed or sold for incorporation into a dwelling. In determining whether a product is a consumer product, doubtful cases shall be resolved in favor of coverage. For a particular product received by a particular user, "normally used" refers to a typical or common use of that class of product, regardless of the status of the particular user or of the way in which the particular user actually uses, or expects or is expected to use, the product. A product is a consumer product regardless of whether the product has substantial commercial, industrial or non-consumer uses, unless such uses represent the only significant mode of use of the product. - -"Installation Information" for a User Product means any methods, procedures, authorization keys, or other information required to install and execute modified versions of a covered work in that User Product from a modified version of its Corresponding Source. The information must suffice to ensure that the continued functioning of the modified object code is in no case prevented or interfered with solely because modification has been made. - -If you convey an object code work under this section in, or with, or specifically for use in, a User Product, and the conveying occurs as part of a transaction in which the right of possession and use of the User Product is transferred to the recipient in perpetuity or for a fixed term (regardless of how the transaction is characterized), the Corresponding Source conveyed under this section must be accompanied by the Installation Information. But this requirement does not apply if neither you nor any third party retains the ability to install modified object code on the User Product (for example, the work has been installed in ROM). - -The requirement to provide Installation Information does not include a requirement to continue to provide support service, warranty, or updates for a work that has been modified or installed by the recipient, or for the User Product in which it has been modified or installed. Access to a network may be denied when the modification itself materially and adversely affects the operation of the network or violates the rules and protocols for communication across the network. - -Corresponding Source conveyed, and Installation Information provided, in accord with this section must be in a format that is publicly documented (and with an implementation available to the public in source code form), and must require no special password or key for unpacking, reading or copying. - -7. Additional Terms. -"Additional permissions" are terms that supplement the terms of this License by making exceptions from one or more of its conditions. Additional permissions that are applicable to the entire Program shall be treated as though they were included in this License, to the extent that they are valid under applicable law. If additional permissions apply only to part of the Program, that part may be used separately under those permissions, but the entire Program remains governed by this License without regard to the additional permissions. -When you convey a copy of a covered work, you may at your option remove any additional permissions from that copy, or from any part of it. (Additional permissions may be written to require their own removal in certain cases when you modify the work.) You may place additional permissions on material, added by you to a covered work, for which you have or can give appropriate copyright permission. - -Notwithstanding any other provision of this License, for material you add to a covered work, you may (if authorized by the copyright holders of that material) supplement the terms of this License with terms: - -a) Disclaiming warranty or limiting liability differently from the terms of sections 15 and 16 of this License; or -b) Requiring preservation of specified reasonable legal notices or author attributions in that material or in the Appropriate Legal Notices displayed by works containing it; or -c) Prohibiting misrepresentation of the origin of that material, or requiring that modified versions of such material be marked in reasonable ways as different from the original version; or -d) Limiting the use for publicity purposes of names of licensors or authors of the material; or -e) Declining to grant rights under trademark law for use of some trade names, trademarks, or service marks; or -f) Requiring indemnification of licensors and authors of that material by anyone who conveys the material (or modified versions of it) with contractual assumptions of liability to the recipient, for any liability that these contractual assumptions directly impose on those licensors and authors. -All other non-permissive additional terms are considered "further restrictions" within the meaning of section 10. If the Program as you received it, or any part of it, contains a notice stating that it is governed by this License along with a term that is a further restriction, you may remove that term. If a license document contains a further restriction but permits relicensing or conveying under this License, you may add to a covered work material governed by the terms of that license document, provided that the further restriction does not survive such relicensing or conveying. - -If you add terms to a covered work in accord with this section, you must place, in the relevant source files, a statement of the additional terms that apply to those files, or a notice indicating where to find the applicable terms. - -Additional terms, permissive or non-permissive, may be stated in the form of a separately written license, or stated as exceptions; the above requirements apply either way. - -8. Termination. -You may not propagate or modify a covered work except as expressly provided under this License. Any attempt otherwise to propagate or modify it is void, and will automatically terminate your rights under this License (including any patent licenses granted under the third paragraph of section 11). -However, if you cease all violation of this License, then your license from a particular copyright holder is reinstated (a) provisionally, unless and until the copyright holder explicitly and finally terminates your license, and (b) permanently, if the copyright holder fails to notify you of the violation by some reasonable means prior to 60 days after the cessation. - -Moreover, your license from a particular copyright holder is reinstated permanently if the copyright holder notifies you of the violation by some reasonable means, this is the first time you have received notice of violation of this License (for any work) from that copyright holder, and you cure the violation prior to 30 days after your receipt of the notice. - -Termination of your rights under this section does not terminate the licenses of parties who have received copies or rights from you under this License. If your rights have been terminated and not permanently reinstated, you do not qualify to receive new licenses for the same material under section 10. - -9. Acceptance Not Required for Having Copies. -You are not required to accept this License in order to receive or run a copy of the Program. Ancillary propagation of a covered work occurring solely as a consequence of using peer-to-peer transmission to receive a copy likewise does not require acceptance. However, nothing other than this License grants you permission to propagate or modify any covered work. These actions infringe copyright if you do not accept this License. Therefore, by modifying or propagating a covered work, you indicate your acceptance of this License to do so. -10. Automatic Licensing of Downstream Recipients. -Each time you convey a covered work, the recipient automatically receives a license from the original licensors, to run, modify and propagate that work, subject to this License. You are not responsible for enforcing compliance by third parties with this License. -An "entity transaction" is a transaction transferring control of an organization, or substantially all assets of one, or subdividing an organization, or merging organizations. If propagation of a covered work results from an entity transaction, each party to that transaction who receives a copy of the work also receives whatever licenses to the work the party's predecessor in interest had or could give under the previous paragraph, plus a right to possession of the Corresponding Source of the work from the predecessor in interest, if the predecessor has it or can get it with reasonable efforts. - -You may not impose any further restrictions on the exercise of the rights granted or affirmed under this License. For example, you may not impose a license fee, royalty, or other charge for exercise of rights granted under this License, and you may not initiate litigation (including a cross-claim or counterclaim in a lawsuit) alleging that any patent claim is infringed by making, using, selling, offering for sale, or importing the Program or any portion of it. - -11. Patents. -A "contributor" is a copyright holder who authorizes use under this License of the Program or a work on which the Program is based. The work thus licensed is called the contributor's "contributor version". -A contributor's "essential patent claims" are all patent claims owned or controlled by the contributor, whether already acquired or hereafter acquired, that would be infringed by some manner, permitted by this License, of making, using, or selling its contributor version, but do not include claims that would be infringed only as a consequence of further modification of the contributor version. For purposes of this definition, "control" includes the right to grant patent sublicenses in a manner consistent with the requirements of this License. - -Each contributor grants you a non-exclusive, worldwide, royalty-free patent license under the contributor's essential patent claims, to make, use, sell, offer for sale, import and otherwise run, modify and propagate the contents of its contributor version. - -In the following three paragraphs, a "patent license" is any express agreement or commitment, however denominated, not to enforce a patent (such as an express permission to practice a patent or covenant not to sue for patent infringement). To "grant" such a patent license to a party means to make such an agreement or commitment not to enforce a patent against the party. - -If you convey a covered work, knowingly relying on a patent license, and the Corresponding Source of the work is not available for anyone to copy, free of charge and under the terms of this License, through a publicly available network server or other readily accessible means, then you must either (1) cause the Corresponding Source to be so available, or (2) arrange to deprive yourself of the benefit of the patent license for this particular work, or (3) arrange, in a manner consistent with the requirements of this License, to extend the patent license to downstream recipients. "Knowingly relying" means you have actual knowledge that, but for the patent license, your conveying the covered work in a country, or your recipient's use of the covered work in a country, would infringe one or more identifiable patents in that country that you have reason to believe are valid. - -If, pursuant to or in connection with a single transaction or arrangement, you convey, or propagate by procuring conveyance of, a covered work, and grant a patent license to some of the parties receiving the covered work authorizing them to use, propagate, modify or convey a specific copy of the covered work, then the patent license you grant is automatically extended to all recipients of the covered work and works based on it. - -A patent license is "discriminatory" if it does not include within the scope of its coverage, prohibits the exercise of, or is conditioned on the non-exercise of one or more of the rights that are specifically granted under this License. You may not convey a covered work if you are a party to an arrangement with a third party that is in the business of distributing software, under which you make payment to the third party based on the extent of your activity of conveying the work, and under which the third party grants, to any of the parties who would receive the covered work from you, a discriminatory patent license (a) in connection with copies of the covered work conveyed by you (or copies made from those copies), or (b) primarily for and in connection with specific products or compilations that contain the covered work, unless you entered into that arrangement, or that patent license was granted, prior to 28 March 2007. - -Nothing in this License shall be construed as excluding or limiting any implied license or other defenses to infringement that may otherwise be available to you under applicable patent law. - -12. No Surrender of Others' Freedom. -If conditions are imposed on you (whether by court order, agreement or otherwise) that contradict the conditions of this License, they do not excuse you from the conditions of this License. If you cannot convey a covered work so as to satisfy simultaneously your obligations under this License and any other pertinent obligations, then as a consequence you may not convey it at all. For example, if you agree to terms that obligate you to collect a royalty for further conveying from those to whom you convey the Program, the only way you could satisfy both those terms and this License would be to refrain entirely from conveying the Program. -13. Use with the GNU Affero General Public License. -Notwithstanding any other provision of this License, you have permission to link or combine any covered work with a work licensed under version 3 of the GNU Affero General Public License into a single combined work, and to convey the resulting work. The terms of this License will continue to apply to the part which is the covered work, but the special requirements of the GNU Affero General Public License, section 13, concerning interaction through a network will apply to the combination as such. -14. Revised Versions of this License. -The Free Software Foundation may publish revised and/or new versions of the GNU General Public License from time to time. Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns. -Each version is given a distinguishing version number. If the Program specifies that a certain numbered version of the GNU General Public License "or any later version" applies to it, you have the option of following the terms and conditions either of that numbered version or of any later version published by the Free Software Foundation. If the Program does not specify a version number of the GNU General Public License, you may choose any version ever published by the Free Software Foundation. - -If the Program specifies that a proxy can decide which future versions of the GNU General Public License can be used, that proxy's public statement of acceptance of a version permanently authorizes you to choose that version for the Program. - -Later license versions may give you additional or different permissions. However, no additional obligations are imposed on any author or copyright holder as a result of your choosing to follow a later version. - -15. Disclaimer of Warranty. -THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. -16. Limitation of Liability. -IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. -17. Interpretation of Sections 15 and 16. -If the disclaimer of warranty and limitation of liability provided above cannot be given local legal effect according to their terms, reviewing courts shall apply local law that most closely approximates an absolute waiver of all civil liability in connection with the Program, unless a warranty or assumption of liability accompanies a copy of the Program in return for a fee. - -END OF TERMS AND CONDITIONS - -How to Apply These Terms to Your New Programs - -If you develop a new program, and you want it to be of the greatest possible use to the public, the best way to achieve this is to make it free software which everyone can redistribute and change under these terms. - -To do so, attach the following notices to the program. It is safest to attach them to the start of each source file to most effectively state the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found. - - -Copyright (C) - -This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. - -This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - -You should have received a copy of the GNU General Public License along with this program. If not, see . - -Also add information on how to contact you by electronic and paper mail. - -If the program does terminal interaction, make it output a short notice like this when it starts in an interactive mode: - - Copyright (C) -This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. -This is free software, and you are welcome to redistribute it under certain conditions; type `show c' for details. - -The hypothetical commands `show w' and `show c' should show the appropriate parts of the General Public License. Of course, your program's commands might be different; for a GUI interface, you would use an "about box". - -You should also get your employer (if you work as a programmer) or school, if any, to sign a "copyright disclaimer" for the program, if necessary. For more information on this, and how to apply and follow the GNU GPL, see . - -The GNU General Public License does not permit incorporating your program into proprietary programs. If your program is a subroutine library, you may consider it more useful to permit linking proprietary applications with the library. If this is what you want to do, use the GNU Lesser General Public License instead of this License. But first, please read . diff --git a/configuration/configuration/README.md b/configuration/configuration/README.md deleted file mode 100644 index 72a0561c..00000000 --- a/configuration/configuration/README.md +++ /dev/null @@ -1,28 +0,0 @@ -# @openstapps/configuration - -[![pipeline status](https://img.shields.io/gitlab/pipeline/openstapps/configuration.svg?style=flat-square)](https://gitlab.com/openstapps/configuration/commits/master) -[![npm](https://img.shields.io/npm/v/@openstapps/configuration.svg?style=flat-square)](https://npmjs.com/package/@openstapps/configuration) -[![license)](https://img.shields.io/npm/l/@openstapps/configuration.svg?style=flat-square)](https://www.gnu.org/licenses/gpl-3.0.en.html) -[![documentation](https://img.shields.io/badge/documentation-online-blue.svg?style=flat-square)](https://openstapps.gitlab.io/configuration) - -Checks your `@openstapps` project's configuration and automatically adjusts it to adhere to the suggested defaults. - -## Installation - -Install it as a dev dependency in your project and it will check your configuration and add a script in your `package.json` to check the configuration again easily afterwards. - -```shell -npm install --save-dev @openstapps/configuration -npm run check-configuration -``` - -You can also install it globally and use it as a cli. - -```shell -npm install -g @openstapps/configuration -openstapps-configuration --help -``` - -## Configuration - -To configure how your project's configuration is checked add a property `"openstappsConfiguration"` to your `package.json` with all or some properties of the [configuration](https://openstapps.gitlab.io/configuration/interfaces/_common_.configuration.html). diff --git a/configuration/configuration/app.js b/configuration/configuration/app.js deleted file mode 100644 index 1bda7715..00000000 --- a/configuration/configuration/app.js +++ /dev/null @@ -1,2 +0,0 @@ -#!/usr/bin/env node -import './lib/cli.js'; diff --git a/configuration/configuration/package.json b/configuration/configuration/package.json deleted file mode 100644 index d3e57eaf..00000000 --- a/configuration/configuration/package.json +++ /dev/null @@ -1,57 +0,0 @@ -{ - "name": "@openstapps/configuration", - "description": "A collection of configuration base files for StApps projects.", - "version": "2.1.0", - "type": "module", - "license": "GPL-3.0-only", - "repository": "git@gitlab.com:openstapps/configuration.git", - "author": "Karl-Philipp Wulfert ", - "contributors": [ - "Anselm Rochus Stordeur", - "Jovan Krunic", - "Rainer Killinger ", - "Thea Schöbl" - ], - "prettier": "@openstapps/prettier-config", - "bin": { - "openstapps-configuration": "app.js" - }, - "scripts": { - "build": "rimraf lib && tsc --outDir lib", - "documentation": "typedoc --out docs --readme README.md --includeVersion --listInvalidSymbolLinks --entryPointStrategy expand src", - "format:fix": "prettier --write .", - "lint": "eslint -c .eslintrc.json --ignore-path .eslintignore --ext .ts src/", - "prepublishOnly": "npm ci && npm run build", - "preversion": "npm run prepublishOnly", - "push": "git push && git push origin \"v$npm_package_version\"", - "test": "echo \"Error: no test specified\" && exit 1", - "version": "conventional-changelog -p angular -i CHANGELOG.md -s -r 0 && git add CHANGELOG.md" - }, - "dependencies": { - "chalk": "4.1.2", - "commander": "10.0.0", - "semver": "7.3.8", - "yaml": "1.10.2" - }, - "devDependencies": { - "@openstapps/eslint-config": "workspace:*", - "@openstapps/prettier-config": "workspace:*", - "@types/node": "18.15.3", - "@types/semver": "7.3.13", - "@typescript-eslint/eslint-plugin": "5.49.0", - "@typescript-eslint/parser": "5.49.0", - "conventional-changelog-cli": "2.2.2", - "eslint": "8.33.0", - "eslint-config-prettier": "8.6.0", - "eslint-plugin-jsdoc": "39.7.4", - "eslint-plugin-prettier": "4.2.1", - "eslint-plugin-unicorn": "45.0.2", - "prettier": "2.8.3", - "rimraf": "4.4.0", - "typedoc": "0.23.26", - "typescript": "4.8.4" - }, - "peerDependencies": { - "typescript": "4.8.4" - } -} diff --git a/configuration/configuration/src/cli.ts b/configuration/configuration/src/cli.ts deleted file mode 100644 index 4cba61e8..00000000 --- a/configuration/configuration/src/cli.ts +++ /dev/null @@ -1,121 +0,0 @@ -/* - * Copyright (C) 2018-2022 Open StApps - * This program is free software: you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the Free - * Software Foundation, version 3. - * - * This program is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for - * more details. - * - * You should have received a copy of the GNU General Public License along with - * this program. If not, see . - */ -import {Command} from 'commander'; -import {existsSync, readFileSync, writeFileSync} from 'fs'; -import path from 'path'; -import {cwd} from 'process'; -import { - checkCIConfig, - checkConfigurationFilesAreExtended, - checkContributors, - checkCopyrightYears, - checkDependencies, - checkLicenses, - checkNeededFiles, - checkNYCConfiguration, - checkScripts, - consoleInfo, - consoleLog, - getConfiguration, - getRules, -} from './common.js'; - -// current working directory -const currentWorkingDirectory = cwd(); - -// instantiate new commander -const commander = new Command('openstapps-configuration'); - -// configure commander -// eslint-disable-next-line unicorn/prefer-module -commander.version(JSON.parse(readFileSync(path.resolve(__dirname, '..', 'package.json')).toString()).version); - -commander - .option( - '-p, --path ', - `Path of project to add files to (${currentWorkingDirectory})`, - currentWorkingDirectory, - ) - .option('-r, --replace', 'Whether to replace existing files or not', false) - .parse(process.argv); - -// make path absolute -const projectPath = path.resolve(commander.opts().path); - -// check for existing package.json in provided path -if (!existsSync(path.resolve(projectPath, 'package.json'))) { - throw new Error(`No 'package.json' in '${projectPath}'.`); -} - -// path to examined package.json -const packageJsonPath = path.resolve(projectPath, 'package.json'); - -// read package.json in provided path -const packageJson = JSON.parse(readFileSync(packageJsonPath).toString()); - -// check if provided path is this package -if (packageJson.name === '@openstapps/configuration') { - consoleInfo("I'm not going to check myself!"); - process.exit(0); -} - -// whether the contents of the package.json were changed -let packageJsonChanged = false; - -// whether to suggest an overwrite -let suggestOverwrite = false; - -const configuration = getConfiguration(packageJson); - -const rules = getRules(configuration); - -checkDependencies(rules, packageJson); - -checkLicenses(rules, packageJson); - -checkConfigurationFilesAreExtended(projectPath); - -suggestOverwrite = suggestOverwrite || checkNeededFiles(rules, projectPath, commander.opts().replace); - -const checkedNYCConfiguration = checkNYCConfiguration(rules, packageJson, commander.opts().replace); - -packageJsonChanged = packageJsonChanged || checkedNYCConfiguration[0]; -suggestOverwrite = suggestOverwrite || checkedNYCConfiguration[1]; - -packageJsonChanged = packageJsonChanged || checkScripts(rules, packageJson, commander.opts().replace); - -checkContributors(projectPath, packageJson); - -checkCIConfig(rules, projectPath); - -checkCopyrightYears(projectPath, 'src', commander.opts().replace); - -const indentation = 2; - -if (packageJsonChanged) { - writeFileSync( - path.resolve(projectPath, 'package.json'), - // eslint-disable-next-line unicorn/no-null - `${JSON.stringify(packageJson, null, indentation)}\n`, - ); - consoleLog(`Changes were written to '${packageJsonPath}'.`); -} - -if (suggestOverwrite) { - consoleInfo(`You should consider to overwrite your configuration files and check for intended derivations: -npm run check-configuration -- -r`); -} - -consoleLog(`Done checking the configuration in '${projectPath}'.`); diff --git a/configuration/configuration/src/common.ts b/configuration/configuration/src/common.ts deleted file mode 100644 index af50b8df..00000000 --- a/configuration/configuration/src/common.ts +++ /dev/null @@ -1,844 +0,0 @@ -/* eslint-disable unicorn/prefer-module */ -/* - * Copyright (C) 2018-2022 Open StApps - * This program is free software: you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the Free - * Software Foundation, version 3. - * - * This program is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for - * more details. - * - * You should have received a copy of the GNU General Public License along with - * this program. If not, see . - */ -import chalk from 'chalk'; -import {execSync} from 'child_process'; -import {copyFileSync, existsSync, lstatSync, PathLike, readdirSync, readFileSync, writeFileSync} from 'fs'; -import path from 'path'; -import {satisfies, valid} from 'semver'; -import {isDeepStrictEqual} from 'util'; -import {parse, stringify} from 'yaml'; - -interface NYCConfiguration { - [prop: string]: boolean | number | string[]; -} - -interface PackageJSONPerson { - /** - * Email of the author - */ - email?: string; - /** - * Name of the author - */ - name: string; - /** - * URL of the author - */ - url?: string; -} - -interface PackageJSON { - /** - * Author of the package - */ - author: string | PackageJSONPerson; - - /** - * Contributors of the package - */ - contributors: Array; - - /** - * Dependencies - */ - dependencies?: { - [dependency: string]: string; - }; - - /** - * Development dependencies - */ - devDependencies?: { - [devDependency: string]: string; - }; - - /** - * License - */ - license: string; - - /** - * NYC configuration - */ - nyc: NYCConfiguration; - - /** - * Openstapps configuration - */ - openstappsConfiguration: Configuration; - - /** - * Scripts - */ - scripts: { - [name: string]: string; - }; -} - -/** - * Configuration for the configuration check - */ -export interface Configuration { - /** - * Whether or not the project is meant to be packaged - */ - forPackaging: boolean; - /** - * Whether or not the project has a CLI - */ - hasCli: boolean; - /** - * A list of CI entries to ignore while checking - */ - ignoreCiEntries: string[]; - /** - * A list of script names to ignore while checking - */ - ignoreScripts: string[]; - /** - * Whether or not the project is meant to be executed server side - */ - serverSide: boolean; - /** - * Whether or not the standard build procedure is meant to be used - */ - standardBuild: boolean; - /** - * Whether or not the standard documentation procedure is meant to be used - */ - standardDocumentation: boolean; -} - -/** - * Rules for the configuration check - */ -export interface Rules { - /** - * Expected CI config - */ - ciConfig: {[k: string]: string | object}; - /** - * Expected dependencies - */ - dependencies: string[]; - /** - * Expected dev dependencies - */ - devDependencies: string[]; - /** - * Expected files - */ - files: string[]; - /** - * Expected licenses - */ - licenses: string[]; - /** - * Expected NYC configuration - */ - nycConfiguration: NYCConfiguration; - /** - * Expected scripts - */ - scripts: {[k: string]: string}; -} - -/** - * Wrapper for console.info that outputs every argument in cyan - * - * @param arguments_ Arguments to output - */ -export function consoleInfo(...arguments_: string[]): void { - for (const argument of arguments_) { - // eslint-disable-next-line no-console - console.info(`\n${chalk.cyan(argument)}`); - } -} - -/** - * Wrapper for console.warn that outputs every argument in red - * - * @param arguments_ Arguments to output - */ -export function consoleWarn(...arguments_: string[]): void { - for (const argument of arguments_) { - const lines = argument.split('\n'); - // eslint-disable-next-line no-console - console.warn(`\n${chalk.red.bold(lines[0])}`); - for (const line of lines.slice(1)) { - // eslint-disable-next-line no-console - console.info(line); - } - } -} - -/** - * Wrapper for console.log that outputs every argument in green - * - * @param arguments_ Arguments to output - */ -export function consoleLog(...arguments_: string[]): void { - for (const argument of arguments_) { - // eslint-disable-next-line no-console - console.log(`\n${chalk.green.bold(argument)}`); - } -} - -/** - * Check dependencies are installed - * - * @param rules Rules for check - * @param packageJson package.json to check dependencies in - */ -export function checkDependencies(rules: Rules, packageJson: PackageJSON): void { - checkPackages(rules.dependencies, packageJson.dependencies, false); - checkPackages(rules.devDependencies, packageJson.devDependencies, true); -} - -/** - * Check dependencies are installed - * - * @param expected Expected npm package entries - * @param acutal Actual entries within package.json - * @param development Indicator if this concerns dev dependencies - */ -export function checkPackages( - expected: string[] | undefined, - acutal: {[key: string]: string} | undefined, - development = false, -): void { - if (typeof expected === 'undefined') { - return; - } - if (typeof acutal === 'undefined') { - reportPackage(expected, development); - return; - } - for (let npmPackage of expected) { - const [name, expectedVersion] = npmPackage.split(':'); - const installedVersion = acutal[name]; - if (typeof installedVersion === 'undefined') { - reportPackage(npmPackage, development); - continue; - } - if (typeof expectedVersion === 'undefined') { - continue; - } - if (typeof valid(expectedVersion) === 'string' && !satisfies(installedVersion, expectedVersion)) { - npmPackage = npmPackage.replace(':', '@'); - consoleWarn( - `Version '${installedVersion}' of ${ - development ? 'dev ' : ' ' - }dependency '${name}' does not satisfy constraint '${expectedVersion}'. -Please install with 'npm install --save-exact ${development ? '--save-dev ' : ''}${npmPackage}'.`, - ); - } - } -} - -/** - * Reports truly missing npm packages - * - * @param missing Missing npm package entries - * @param development Indicator if this concerns dev dependencies - */ -export function reportPackage(missing: string[] | string, development = false) { - if (!Array.isArray(missing)) { - missing = [missing]; - } - for (let npmPackage of missing) { - npmPackage = npmPackage.replace(':', '@'); - consoleWarn(`${development ? 'Dev dependency' : 'Dependency'} '${npmPackage}' is missing. -Please install with 'npm install --save-exact ${development ? '--save-dev ' : ''}${npmPackage}'.`); - } -} - -/** - * Check that configuration files are extended - * - * @param configPath Path, where configuration files are located - */ -export function checkConfigurationFilesAreExtended(configPath: string): void { - // check if configuration files are extended - for (const file of ['tsconfig.json', 'eslintrc.json']) { - const fileToCheck = path.resolve(configPath, file); - const expectedPath = `./node_modules/@openstapps/configuration/${file}`; - - if (existsSync(fileToCheck)) { - const configFile = JSON.parse(readFileSync(fileToCheck).toString()); - - const configFileExtended = - (typeof configFile.extends === 'string' && configFile.extends === expectedPath) || - (file === 'eslintrc.json' && - Array.isArray(configFile.extends) && - configFile.extends.includes('@openstapps')); - - if (!configFileExtended) { - consoleWarn(`File '${fileToCheck}' should extend '${expectedPath}'! - -Example: -${readFileSync(path.resolve(__dirname, '..', 'templates', `template-${file}`))}`); - } - } - } -} - -/** - * Check needed files - * - * @param rules Rules for check - * @param filePath Path to files to check - * @param replaceFlag Whether or not to replace files - * @returns Whether or not overwrite is suggested - */ -export function checkNeededFiles(rules: Rules, filePath: string, replaceFlag: boolean): boolean { - let suggestOverwrite = false; - - // copy needed files - for (let file of rules.files) { - let destinationFile = file; - - // remove templates directory for destination files - if (destinationFile.indexOf('templates') === 0) { - destinationFile = destinationFile.split(path.sep).slice(1).join(path.sep); - file = path.join('templates', `template-${destinationFile}`); - } - - const source = path.resolve(__dirname, '..', file); - const destination = path.resolve(filePath, destinationFile); - - // check if file exists or replace flag is set - if (!existsSync(destination) || replaceFlag) { - copyFileSync(source, destination); - consoleInfo(`Copied file '${source}' to '${destination}'.`); - } else if (destinationFile === '.npmignore') { - const npmIgnore = readFileSync(destination).toString(); - - const ignoredPatterns = npmIgnore.split('\n'); - - let ignoresEverything = false; - // eslint-disable-next-line unicorn/prevent-abbreviations - let includeDocs = false; - - for (const ignoredPattern of ignoredPatterns) { - if (ignoredPattern === '/*') { - ignoresEverything = true; - } - - if (ignoredPattern === '!docs') { - includeDocs = true; - } - } - - if (!ignoresEverything) { - consoleWarn(`'.npmignore' should have '/*' as first pattern to ignore everything.`); - - suggestOverwrite = true; - } - - if (includeDocs) { - consoleWarn(`'.npmignore' contains '!docs' and thus the package will contain the documentation. -Consider creating a CI job to publish those files, rather than committing this folder to the npm repo. -Please double check that this is desired behavior since the docs can become huge: -https://gitlab.com/openstapps/configuration/issues/11`); - - suggestOverwrite = true; - } - } - } - - return suggestOverwrite; -} - -/** - * Check licenses - * - * @param rules Rules for check - * @param packageJson package.json to check license in - */ -export function checkLicenses(rules: Rules, packageJson: PackageJSON): void { - // check if license is one of the expected ones - if (!rules.licenses.includes(packageJson.license)) { - consoleWarn(`License should be one of '${rules.licenses.join(', ')}'!`); - } -} - -/** - * Check NYC configuration - * - * @param rules Rules for check - * @param packageJson package.json to check NYC configuration in - * @param replaceFlag Whether or not to replace NYC configuration - * @returns Whether or not package.json was changed and if overwrite is suggested - */ -export function checkNYCConfiguration( - rules: Rules, - packageJson: PackageJSON, - replaceFlag: boolean, -): [boolean, boolean] { - let packageJsonChanged = false; - let suggestOverwrite = false; - - // check if nyc is a dependency - if ( - typeof packageJson.devDependencies === 'object' && - Object.keys(packageJson.devDependencies).includes('nyc') - ) { - if (typeof packageJson.nyc === 'undefined' || replaceFlag) { - // add NYC configuration - packageJson.nyc = rules.nycConfiguration; - - packageJsonChanged = true; - - consoleLog(`Added NYC configuration in to 'package.json'.`); - } else if (!isDeepStrictEqual(packageJson.nyc, rules.nycConfiguration)) { - consoleInfo( - `NYC configuration in 'package.json' differs from the proposed one. Please check manually.`, - ); - - suggestOverwrite = true; - } - } - - return [packageJsonChanged, suggestOverwrite]; -} - -/** - * Check scripts - * - * @param rules Rules for check - * @param packageJson package.json to check scripts in - * @param replaceFlag Whether or not to replace scripts - * @returns Whether or not the package.json was changed - */ -export function checkScripts(rules: Rules, packageJson: PackageJSON, replaceFlag: boolean): boolean { - let packageJsonChanged = false; - - // check if scripts is a map - if (typeof packageJson.scripts !== 'object') { - packageJson.scripts = {}; - - packageJsonChanged = true; - } - - for (const scriptName in rules.scripts) { - if (!rules.scripts.hasOwnProperty(scriptName)) { - continue; - } - - const scriptToCheck = packageJson.scripts[scriptName]; - - // check if script exists - if (typeof scriptToCheck === 'undefined' || replaceFlag) { - packageJson.scripts[scriptName] = rules.scripts[scriptName]; - - packageJsonChanged = true; - - consoleInfo(`Added '${scriptName}' script to 'package.json'.`); - } else if (typeof scriptToCheck === 'string' && scriptToCheck !== rules.scripts[scriptName]) { - consoleWarn(`Script '${scriptName}' in 'package.json' should be: -\"${rules.scripts[scriptName].replace('\n', '\\n')}\" .`); - } - } - - return packageJsonChanged; -} - -/** - * Check contributors - * - * @param path Path to directory - * @param packageJson package.json to check contributors in - */ -export function checkContributors(path: PathLike, packageJson: PackageJSON): void { - const execBuffer = execSync( - `git --git-dir=${path}/.git --work-tree=${path} log --format=\'%aN\' | sort -u`, - ); - for (let person of execBuffer.toString().split('\n')) { - person = person.trim(); - - if (person === '') { - continue; - } - - let authorIsAttributed = false; - - authorIsAttributed = - authorIsAttributed || - (typeof packageJson.author === 'string' && packageJson.author.includes(person)) || - (Array.isArray(packageJson.contributors) && - packageJson.contributors.findIndex(contributor => { - return typeof contributor === 'string' && contributor.includes(person); - }) >= 0); - - if (!authorIsAttributed) { - consoleWarn(`'${person}' should be attributed as author or contributor.`); - } - } -} - -/** - * Check CI config - * - * @param rules Rules for check - * @param configPath Path to CI config - */ -export function checkCIConfig(rules: Rules, configPath: string): void { - const pathToCiConfig = path.resolve(configPath, '.gitlab-ci.yml'); - - // check CI config if it exists - if (existsSync(pathToCiConfig)) { - // read CI config - const content = readFileSync(pathToCiConfig).toString(); - - let ciConfigWithoutTemplates = ''; - - for (const line of content.split('\n')) { - const match = line.trim().match(/^< Number.parseInt(date.split('-')[0], 10)) - .filter(year => { - const stringYear = year.toString(); - if (seen.includes(year) || stringYear.match(/[0-9]{4}/) === null) { - return false; - } - - seen.push(year); - - return true; - }) - .sort(); - changedYears = [changedYears[0], changedYears[changedYears.length - 1]]; - changedYears = [...new Set(changedYears)].sort(); - - const fileStats = lstatSync(fileSystemObjectPath); - - if (fileStats.isFile()) { - if (fileSystemObject.match(/\.ts$/) === null) { - continue; - } - - const content = readFileSync(fileSystemObjectPath).toString(); - - let copyrightYearsString = ''; - const match = content.match(/^ \* Copyright \(C\) ([0-9]{4})-?([0-9]{4})?.*StApps\n/im); - const expectedMatchLength = 2; - - if (Array.isArray(match) && match.length >= expectedMatchLength) { - copyrightYearsString = [match[1], match[2]].filter(year => typeof year !== 'undefined').join('-'); - } - - if (copyrightYearsString === '') { - consoleWarn(`Copyright line for file '${fileSystemObjectPath}' could not be found!`); - } else { - const copyrightYearsWithIntervals = copyrightYearsString.split('-').map(year => year.trim()); - const copyrightYears: number[] = copyrightYearsWithIntervals - .map(year => Number.parseInt(year, 10)) - .sort(); - - let copyrightYearNeedsUpdate = false; - if (typeof copyrightYears[0] !== 'undefined' && typeof changedYears[0] !== 'undefined') { - copyrightYearNeedsUpdate = copyrightYears[0] !== changedYears[0]; - } - if ( - typeof copyrightYears[1] !== 'undefined' && - typeof changedYears[1] !== 'undefined' && - !copyrightYearNeedsUpdate - ) { - copyrightYearNeedsUpdate = copyrightYears[1] !== changedYears[1]; - } - if (copyrightYears.length !== changedYears.length) { - copyrightYearNeedsUpdate = true; - } - - if (copyrightYearNeedsUpdate) { - if (replaceFlag) { - const correctedContent = content.replace( - /^( \* Copyright \(C\) )(.*)(Open )?(StApps)$/gim, - `$1${changedYears.join('-')} Open StApps`, - ); - writeFileSync(fileSystemObjectPath, correctedContent, {mode: fileStats.mode}); - consoleWarn( - `Corrected copyright years in '${path.join( - checkPathFragment.toString(), - fileSystemObject, - )}' to ${changedYears.join('-')}'`, - ); - } else { - consoleWarn( - `File '${path.join( - checkPathFragment.toString(), - fileSystemObject, - )}' has to specify '${changedYears.join('-')}' as year(s) in the copyright line.`, - ); - } - } - } - } else if (fileStats.isDirectory()) { - checkCopyrightYears( - projectPath, - path.join(checkPathFragment.toString(), fileSystemObject), - replaceFlag, - ); - } - } -} - -/** - * Get configuration - * - * @param packageJson package.json to get configuration from - */ -export function getConfiguration(packageJson: PackageJSON): Configuration { - const defaultConfiguration: Configuration = { - forPackaging: true, - hasCli: true, - ignoreCiEntries: [], - ignoreScripts: [], - serverSide: true, - standardBuild: true, - standardDocumentation: true, - }; - - if (typeof packageJson.openstappsConfiguration !== 'undefined') { - return { - ...defaultConfiguration, - ...packageJson.openstappsConfiguration, - }; - } - - return defaultConfiguration; -} - -/** - * Get rules for check - * - * @param configuration Configuration for check - */ -export function getRules(configuration: Configuration): Rules { - // expected dependencies - const dependencies: string[] = []; - - // expected dev dependencies - const devDependencies = [ - '@typescript-eslint/eslint-plugin', - '@typescript-eslint/parser', - '@openstapps/eslint-config', - 'conventional-changelog-cli', - 'eslint', - 'eslint-config-prettier', - 'eslint-plugin-jsdoc', - 'eslint-plugin-prettier', - 'eslint-plugin-unicorn', - 'prettier', - 'typescript:4.4.4', - ]; - - // files that need to be copied - const files = [ - '.editorconfig', - '.eslintrc.json', - '.eslintignore', - path.join('templates', '.gitignore'), - path.join('templates', 'tsconfig.json'), - ]; - - // configuration for nyc to add to package.json - const nycConfiguration: NYCConfiguration = { - 'all': true, - 'branches': 95, - 'check-coverage': true, - 'exclude': ['src/cli.ts'], - 'extension': ['.ts'], - 'functions': 95, - 'include': ['src'], - 'lines': 95, - 'per-file': true, - 'reporter': ['cobertura', 'html', 'text-summary'], - 'require': ['ts-node/register'], - 'statements': 95, - }; - - // expected scripts - const scripts: {[k: string]: string} = { - 'version': 'conventional-changelog -p angular -i CHANGELOG.md -s -r 0 && git add CHANGELOG.md', - 'check-configuration': 'openstapps-configuration', - 'preversion': 'npm run prepublishOnly', - 'push': 'git push && git push origin "v$npm_package_version"', - 'lint': 'eslint --ext .ts src/', - }; - - // list of expected licenses - const licenses = ['AGPL-3.0-only', 'GPL-3.0-only']; - - // expected values in CI config - const ciConfig = { - 'image': 'registry.gitlab.com/openstapps/projectmanagement/node', - 'before_script': ['npm ci'], - 'npm build': { - stage: 'build', - script: ['npm run build'], - artifacts: { - paths: ['lib'], - }, - }, - 'npm test': { - stage: 'test', - script: ['npm run test'], - coverage: '/Statements[^:]*\\:[^:]*\\s+([\\d\\.]+)%/', - artifacts: { - reports: { - coverage_report: { - coverage_format: 'cobertura', - path: 'coverage/cobertura-coverage.xml', - }, - }, - }, - }, - 'npm audit': { - allow_failure: true, - except: ['schedules'], - script: ['npm audit --production'], - stage: 'audit', - }, - 'scheduled npm audit': { - only: ['schedules'], - script: ['npm audit --production'], - stage: 'audit', - }, - 'npm package': { - dependencies: ['npm build'], - tags: ['secrecy'], - stage: 'publish', - script: ['echo "//registry.npmjs.org/:_authToken=$NPM_AUTH_TOKEN" > ~/.npmrc', 'npm publish'], - only: ['/^v[0-9]+.[0-9]+.[0-9]+$/'], - artifacts: { - paths: ['lib'], - }, - }, - 'pages': { - artifacts: { - paths: ['public'], - }, - only: ['/^v[0-9]+\\.[0-9]+\\.[0-9]+$/'], - script: ['npm run documentation', 'mv docs public'], - stage: 'deploy', - }, - }; - - for (const ignoreCiEntry of configuration.ignoreCiEntries) { - // @ts-expect-error can't be used to index - delete ciConfig[ignoreCiEntry]; - } - - if (configuration.forPackaging) { - scripts.prepublishOnly = 'npm ci && npm run build && npm run test'; - - files.push(path.join('templates', '.npmignore')); - } else { - // @ts-expect-error can't be used to index - delete ciConfig[`package`]; - } - - if (configuration.serverSide) { - devDependencies.push('@types/node:^14.0.0'); - } - - if (configuration.standardBuild || configuration.hasCli) { - scripts.build = 'npm run lint && npm run compile'; - scripts.compile = 'rimraf lib && tsc'; - devDependencies.push('rimraf'); - } - - if (configuration.standardDocumentation) { - devDependencies.push('typedoc:0.22.x'); - scripts.documentation = - 'typedoc --out docs --readme README.md --listInvalidSymbolLinks --entryPointStrategy expand src'; - } - - for (const ignoreScript of configuration.ignoreScripts) { - consoleInfo(`Ignoring script '${ignoreScript}'.`); - delete scripts[ignoreScript]; - } - - return { - ciConfig, - dependencies, - devDependencies, - files, - licenses, - nycConfiguration, - scripts, - }; -} diff --git a/configuration/configuration/templates/template-.gitignore b/configuration/configuration/templates/template-.gitignore deleted file mode 100644 index c07b9dc8..00000000 --- a/configuration/configuration/templates/template-.gitignore +++ /dev/null @@ -1,91 +0,0 @@ -# Logs -logs -*.log -npm-debug.log* -yarn-debug.log* -yarn-error.log* - -# Runtime data -pids -*.pid -*.seed -*.pid.lock - -# Directory for instrumented libs generated by jscoverage/JSCover -lib-cov - -# Coverage directory used by tools like istanbul -coverage - -# nyc test coverage -.nyc_output - -# Grunt intermediate storage (https://gruntjs.com/creating-plugins#storing-task-files) -.grunt - -# Bower dependency directory (https://bower.io/) -bower_components - -# node-waf configuration -.lock-wscript - -# Compiled binary addons (https://nodejs.org/api/addons.html) -build/Release - -# Dependency directories -node_modules/ -jspm_packages/ - -# TypeScript v1 declaration files -typings/ - -# Optional npm cache directory -.npm - -# Optional eslint cache -.eslintcache - -# Optional REPL history -.node_repl_history - -# Output of 'npm pack' -*.tgz - -# Yarn Integrity file -.yarn-integrity - -# dotenv environment variables file -.env - -# parcel-bundler cache (https://parceljs.org/) -.cache - -# next.js build output -.next - -# nuxt.js build output -.nuxt - -# vuepress build output -.vuepress/dist - -# Serverless directories -.serverless/ - -# FuseBox cache -.fusebox/ - -#DynamoDB Local files -.dynamodb/ - -########## end of https://github.com/github/gitignore/blob/master/Node.gitignore - -# ignore ide files -.idea -.vscode - -# ignore lib -lib - -# ignore docs -docs diff --git a/configuration/configuration/templates/template-.npmignore b/configuration/configuration/templates/template-.npmignore deleted file mode 100644 index 87e0b4cf..00000000 --- a/configuration/configuration/templates/template-.npmignore +++ /dev/null @@ -1,11 +0,0 @@ -# Ignore all files/folders by default -# See https://stackoverflow.com/a/29932318 -/* -# Except these files/folders -!lib -lib/tsconfig.tsbuildinfo -!LICENSE -!package.json -!package-lock.json -!README.md -!src diff --git a/configuration/configuration/templates/template-tsconfig.json b/configuration/configuration/templates/template-tsconfig.json deleted file mode 100644 index 066a5f38..00000000 --- a/configuration/configuration/templates/template-tsconfig.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "extends": "./node_modules/@openstapps/configuration/tsconfig.json" -} diff --git a/configuration/eslint-config/.editorconfig b/configuration/eslint-config/.editorconfig deleted file mode 100644 index 9a4062a7..00000000 --- a/configuration/eslint-config/.editorconfig +++ /dev/null @@ -1,15 +0,0 @@ -# editorconfig.org - -root = true - -[*] -indent_style = space -indent_size = 2 - -end_of_line = lf -charset = utf-8 -trim_trailing_whitespace = true -insert_final_newline = true - -[*.md] -trim_trailing_whitespace = false diff --git a/configuration/eslint-config/.gitignore b/configuration/eslint-config/.gitignore deleted file mode 100644 index c07b9dc8..00000000 --- a/configuration/eslint-config/.gitignore +++ /dev/null @@ -1,91 +0,0 @@ -# Logs -logs -*.log -npm-debug.log* -yarn-debug.log* -yarn-error.log* - -# Runtime data -pids -*.pid -*.seed -*.pid.lock - -# Directory for instrumented libs generated by jscoverage/JSCover -lib-cov - -# Coverage directory used by tools like istanbul -coverage - -# nyc test coverage -.nyc_output - -# Grunt intermediate storage (https://gruntjs.com/creating-plugins#storing-task-files) -.grunt - -# Bower dependency directory (https://bower.io/) -bower_components - -# node-waf configuration -.lock-wscript - -# Compiled binary addons (https://nodejs.org/api/addons.html) -build/Release - -# Dependency directories -node_modules/ -jspm_packages/ - -# TypeScript v1 declaration files -typings/ - -# Optional npm cache directory -.npm - -# Optional eslint cache -.eslintcache - -# Optional REPL history -.node_repl_history - -# Output of 'npm pack' -*.tgz - -# Yarn Integrity file -.yarn-integrity - -# dotenv environment variables file -.env - -# parcel-bundler cache (https://parceljs.org/) -.cache - -# next.js build output -.next - -# nuxt.js build output -.nuxt - -# vuepress build output -.vuepress/dist - -# Serverless directories -.serverless/ - -# FuseBox cache -.fusebox/ - -#DynamoDB Local files -.dynamodb/ - -########## end of https://github.com/github/gitignore/blob/master/Node.gitignore - -# ignore ide files -.idea -.vscode - -# ignore lib -lib - -# ignore docs -docs diff --git a/configuration/eslint-config/.gitlab-ci.yml b/configuration/eslint-config/.gitlab-ci.yml deleted file mode 100644 index b724743f..00000000 --- a/configuration/eslint-config/.gitlab-ci.yml +++ /dev/null @@ -1,40 +0,0 @@ -image: registry.gitlab.com/openstapps/projectmanagement/node - -before_script: - - npm ci - -stages: - - test - - audit - - publish - - deploy - -eslint-config: - stage: test - script: - - npm test - -audit: - stage: audit - script: - - npm audit - allow_failure: true - except: - - schedules - -scheduled-audit: - stage: audit - script: - - npm audit --audit-level=high - only: - - schedules - -package: - tags: - - secrecy - stage: publish - script: - - echo "//registry.npmjs.org/:_authToken=$NPM_AUTH_TOKEN" > ~/.npmrc - - npm publish --access=public - only: - - /^v[0-9]+\.[0-9]+\.[0-9]+$/ diff --git a/configuration/eslint-config/.npmignore b/configuration/eslint-config/.npmignore deleted file mode 100644 index 38d0e6f9..00000000 --- a/configuration/eslint-config/.npmignore +++ /dev/null @@ -1,17 +0,0 @@ -# Ignore all files/folders by default -# See https://stackoverflow.com/a/29932318 -/* -# Except these files/folders -!.editorconfig -!.gitignore -!.npmignore -!lib -lib/tsconfig.tsbuildinfo -!LICENSE -!package.json -!package-lock.json -!README.md -!scripts -!templates -!tsconfig.json -!tslint.json diff --git a/configuration/eslint-config/LICENSE b/configuration/eslint-config/LICENSE deleted file mode 100644 index 524e18a3..00000000 --- a/configuration/eslint-config/LICENSE +++ /dev/null @@ -1,674 +0,0 @@ - GNU GENERAL PUBLIC LICENSE - Version 3, 29 June 2007 - - Copyright (C) 2007 Free Software Foundation, Inc. - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The GNU General Public License is a free, copyleft license for -software and other kinds of works. - - The licenses for most software and other practical works are designed -to take away your freedom to share and change the works. By contrast, -the GNU General Public License is intended to guarantee your freedom to -share and change all versions of a program--to make sure it remains free -software for all its users. We, the Free Software Foundation, use the -GNU General Public License for most of our software; it applies also to -any other work released this way by its authors. You can apply it to -your programs, too. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -them if you wish), that you receive source code or can get it if you -want it, that you can change the software or use pieces of it in new -free programs, and that you know you can do these things. - - To protect your rights, we need to prevent others from denying you -these rights or asking you to surrender the rights. Therefore, you have -certain responsibilities if you distribute copies of the software, or if -you modify it: responsibilities to respect the freedom of others. - - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must pass on to the recipients the same -freedoms that you received. You must make sure that they, too, receive -or can get the source code. And you must show them these terms so they -know their rights. - - Developers that use the GNU GPL protect your rights with two steps: -(1) assert copyright on the software, and (2) offer you this License -giving you legal permission to copy, distribute and/or modify it. - - For the developers' and authors' protection, the GPL clearly explains -that there is no warranty for this free software. For both users' and -authors' sake, the GPL requires that modified versions be marked as -changed, so that their problems will not be attributed erroneously to -authors of previous versions. - - Some devices are designed to deny users access to install or run -modified versions of the software inside them, although the manufacturer -can do so. This is fundamentally incompatible with the aim of -protecting users' freedom to change the software. The systematic -pattern of such abuse occurs in the area of products for individuals to -use, which is precisely where it is most unacceptable. Therefore, we -have designed this version of the GPL to prohibit the practice for those -products. If such problems arise substantially in other domains, we -stand ready to extend this provision to those domains in future versions -of the GPL, as needed to protect the freedom of users. - - Finally, every program is threatened constantly by software patents. -States should not allow patents to restrict development and use of -software on general-purpose computers, but in those that do, we wish to -avoid the special danger that patents applied to a free program could -make it effectively proprietary. To prevent this, the GPL assures that -patents cannot be used to render the program non-free. - - The precise terms and conditions for copying, distribution and -modification follow. - - TERMS AND CONDITIONS - - 0. Definitions. - - "This License" refers to version 3 of the GNU General Public License. - - "Copyright" also means copyright-like laws that apply to other kinds of -works, such as semiconductor masks. - - "The Program" refers to any copyrightable work licensed under this -License. Each licensee is addressed as "you". "Licensees" and -"recipients" may be individuals or organizations. - - To "modify" a work means to copy from or adapt all or part of the work -in a fashion requiring copyright permission, other than the making of an -exact copy. The resulting work is called a "modified version" of the -earlier work or a work "based on" the earlier work. - - A "covered work" means either the unmodified Program or a work based -on the Program. - - To "propagate" a work means to do anything with it that, without -permission, would make you directly or secondarily liable for -infringement under applicable copyright law, except executing it on a -computer or modifying a private copy. Propagation includes copying, -distribution (with or without modification), making available to the -public, and in some countries other activities as well. - - To "convey" a work means any kind of propagation that enables other -parties to make or receive copies. Mere interaction with a user through -a computer network, with no transfer of a copy, is not conveying. - - An interactive user interface displays "Appropriate Legal Notices" -to the extent that it includes a convenient and prominently visible -feature that (1) displays an appropriate copyright notice, and (2) -tells the user that there is no warranty for the work (except to the -extent that warranties are provided), that licensees may convey the -work under this License, and how to view a copy of this License. If -the interface presents a list of user commands or options, such as a -menu, a prominent item in the list meets this criterion. - - 1. Source Code. - - The "source code" for a work means the preferred form of the work -for making modifications to it. "Object code" means any non-source -form of a work. - - A "Standard Interface" means an interface that either is an official -standard defined by a recognized standards body, or, in the case of -interfaces specified for a particular programming language, one that -is widely used among developers working in that language. - - The "System Libraries" of an executable work include anything, other -than the work as a whole, that (a) is included in the normal form of -packaging a Major Component, but which is not part of that Major -Component, and (b) serves only to enable use of the work with that -Major Component, or to implement a Standard Interface for which an -implementation is available to the public in source code form. A -"Major Component", in this context, means a major essential component -(kernel, window system, and so on) of the specific operating system -(if any) on which the executable work runs, or a compiler used to -produce the work, or an object code interpreter used to run it. - - The "Corresponding Source" for a work in object code form means all -the source code needed to generate, install, and (for an executable -work) run the object code and to modify the work, including scripts to -control those activities. However, it does not include the work's -System Libraries, or general-purpose tools or generally available free -programs which are used unmodified in performing those activities but -which are not part of the work. For example, Corresponding Source -includes interface definition files associated with source files for -the work, and the source code for shared libraries and dynamically -linked subprograms that the work is specifically designed to require, -such as by intimate data communication or control flow between those -subprograms and other parts of the work. - - The Corresponding Source need not include anything that users -can regenerate automatically from other parts of the Corresponding -Source. - - The Corresponding Source for a work in source code form is that -same work. - - 2. Basic Permissions. - - All rights granted under this License are granted for the term of -copyright on the Program, and are irrevocable provided the stated -conditions are met. This License explicitly affirms your unlimited -permission to run the unmodified Program. The output from running a -covered work is covered by this License only if the output, given its -content, constitutes a covered work. This License acknowledges your -rights of fair use or other equivalent, as provided by copyright law. - - You may make, run and propagate covered works that you do not -convey, without conditions so long as your license otherwise remains -in force. You may convey covered works to others for the sole purpose -of having them make modifications exclusively for you, or provide you -with facilities for running those works, provided that you comply with -the terms of this License in conveying all material for which you do -not control copyright. Those thus making or running the covered works -for you must do so exclusively on your behalf, under your direction -and control, on terms that prohibit them from making any copies of -your copyrighted material outside their relationship with you. - - Conveying under any other circumstances is permitted solely under -the conditions stated below. Sublicensing is not allowed; section 10 -makes it unnecessary. - - 3. Protecting Users' Legal Rights From Anti-Circumvention Law. - - No covered work shall be deemed part of an effective technological -measure under any applicable law fulfilling obligations under article -11 of the WIPO copyright treaty adopted on 20 December 1996, or -similar laws prohibiting or restricting circumvention of such -measures. - - When you convey a covered work, you waive any legal power to forbid -circumvention of technological measures to the extent such circumvention -is effected by exercising rights under this License with respect to -the covered work, and you disclaim any intention to limit operation or -modification of the work as a means of enforcing, against the work's -users, your or third parties' legal rights to forbid circumvention of -technological measures. - - 4. Conveying Verbatim Copies. - - You may convey verbatim copies of the Program's source code as you -receive it, in any medium, provided that you conspicuously and -appropriately publish on each copy an appropriate copyright notice; -keep intact all notices stating that this License and any -non-permissive terms added in accord with section 7 apply to the code; -keep intact all notices of the absence of any warranty; and give all -recipients a copy of this License along with the Program. - - You may charge any price or no price for each copy that you convey, -and you may offer support or warranty protection for a fee. - - 5. Conveying Modified Source Versions. - - You may convey a work based on the Program, or the modifications to -produce it from the Program, in the form of source code under the -terms of section 4, provided that you also meet all of these conditions: - - a) The work must carry prominent notices stating that you modified - it, and giving a relevant date. - - b) The work must carry prominent notices stating that it is - released under this License and any conditions added under section - 7. This requirement modifies the requirement in section 4 to - "keep intact all notices". - - c) You must license the entire work, as a whole, under this - License to anyone who comes into possession of a copy. This - License will therefore apply, along with any applicable section 7 - additional terms, to the whole of the work, and all its parts, - regardless of how they are packaged. This License gives no - permission to license the work in any other way, but it does not - invalidate such permission if you have separately received it. - - d) If the work has interactive user interfaces, each must display - Appropriate Legal Notices; however, if the Program has interactive - interfaces that do not display Appropriate Legal Notices, your - work need not make them do so. - - A compilation of a covered work with other separate and independent -works, which are not by their nature extensions of the covered work, -and which are not combined with it such as to form a larger program, -in or on a volume of a storage or distribution medium, is called an -"aggregate" if the compilation and its resulting copyright are not -used to limit the access or legal rights of the compilation's users -beyond what the individual works permit. Inclusion of a covered work -in an aggregate does not cause this License to apply to the other -parts of the aggregate. - - 6. Conveying Non-Source Forms. - - You may convey a covered work in object code form under the terms -of sections 4 and 5, provided that you also convey the -machine-readable Corresponding Source under the terms of this License, -in one of these ways: - - a) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by the - Corresponding Source fixed on a durable physical medium - customarily used for software interchange. - - b) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by a - written offer, valid for at least three years and valid for as - long as you offer spare parts or customer support for that product - model, to give anyone who possesses the object code either (1) a - copy of the Corresponding Source for all the software in the - product that is covered by this License, on a durable physical - medium customarily used for software interchange, for a price no - more than your reasonable cost of physically performing this - conveying of source, or (2) access to copy the - Corresponding Source from a network server at no charge. - - c) Convey individual copies of the object code with a copy of the - written offer to provide the Corresponding Source. This - alternative is allowed only occasionally and noncommercially, and - only if you received the object code with such an offer, in accord - with subsection 6b. - - d) Convey the object code by offering access from a designated - place (gratis or for a charge), and offer equivalent access to the - Corresponding Source in the same way through the same place at no - further charge. You need not require recipients to copy the - Corresponding Source along with the object code. If the place to - copy the object code is a network server, the Corresponding Source - may be on a different server (operated by you or a third party) - that supports equivalent copying facilities, provided you maintain - clear directions next to the object code saying where to find the - Corresponding Source. Regardless of what server hosts the - Corresponding Source, you remain obligated to ensure that it is - available for as long as needed to satisfy these requirements. - - e) Convey the object code using peer-to-peer transmission, provided - you inform other peers where the object code and Corresponding - Source of the work are being offered to the general public at no - charge under subsection 6d. - - A separable portion of the object code, whose source code is excluded -from the Corresponding Source as a System Library, need not be -included in conveying the object code work. - - A "User Product" is either (1) a "consumer product", which means any -tangible personal property which is normally used for personal, family, -or household purposes, or (2) anything designed or sold for incorporation -into a dwelling. In determining whether a product is a consumer product, -doubtful cases shall be resolved in favor of coverage. For a particular -product received by a particular user, "normally used" refers to a -typical or common use of that class of product, regardless of the status -of the particular user or of the way in which the particular user -actually uses, or expects or is expected to use, the product. A product -is a consumer product regardless of whether the product has substantial -commercial, industrial or non-consumer uses, unless such uses represent -the only significant mode of use of the product. - - "Installation Information" for a User Product means any methods, -procedures, authorization keys, or other information required to install -and execute modified versions of a covered work in that User Product from -a modified version of its Corresponding Source. The information must -suffice to ensure that the continued functioning of the modified object -code is in no case prevented or interfered with solely because -modification has been made. - - If you convey an object code work under this section in, or with, or -specifically for use in, a User Product, and the conveying occurs as -part of a transaction in which the right of possession and use of the -User Product is transferred to the recipient in perpetuity or for a -fixed term (regardless of how the transaction is characterized), the -Corresponding Source conveyed under this section must be accompanied -by the Installation Information. But this requirement does not apply -if neither you nor any third party retains the ability to install -modified object code on the User Product (for example, the work has -been installed in ROM). - - The requirement to provide Installation Information does not include a -requirement to continue to provide support service, warranty, or updates -for a work that has been modified or installed by the recipient, or for -the User Product in which it has been modified or installed. Access to a -network may be denied when the modification itself materially and -adversely affects the operation of the network or violates the rules and -protocols for communication across the network. - - Corresponding Source conveyed, and Installation Information provided, -in accord with this section must be in a format that is publicly -documented (and with an implementation available to the public in -source code form), and must require no special password or key for -unpacking, reading or copying. - - 7. Additional Terms. - - "Additional permissions" are terms that supplement the terms of this -License by making exceptions from one or more of its conditions. -Additional permissions that are applicable to the entire Program shall -be treated as though they were included in this License, to the extent -that they are valid under applicable law. If additional permissions -apply only to part of the Program, that part may be used separately -under those permissions, but the entire Program remains governed by -this License without regard to the additional permissions. - - When you convey a copy of a covered work, you may at your option -remove any additional permissions from that copy, or from any part of -it. (Additional permissions may be written to require their own -removal in certain cases when you modify the work.) You may place -additional permissions on material, added by you to a covered work, -for which you have or can give appropriate copyright permission. - - Notwithstanding any other provision of this License, for material you -add to a covered work, you may (if authorized by the copyright holders of -that material) supplement the terms of this License with terms: - - a) Disclaiming warranty or limiting liability differently from the - terms of sections 15 and 16 of this License; or - - b) Requiring preservation of specified reasonable legal notices or - author attributions in that material or in the Appropriate Legal - Notices displayed by works containing it; or - - c) Prohibiting misrepresentation of the origin of that material, or - requiring that modified versions of such material be marked in - reasonable ways as different from the original version; or - - d) Limiting the use for publicity purposes of names of licensors or - authors of the material; or - - e) Declining to grant rights under trademark law for use of some - trade names, trademarks, or service marks; or - - f) Requiring indemnification of licensors and authors of that - material by anyone who conveys the material (or modified versions of - it) with contractual assumptions of liability to the recipient, for - any liability that these contractual assumptions directly impose on - those licensors and authors. - - All other non-permissive additional terms are considered "further -restrictions" within the meaning of section 10. If the Program as you -received it, or any part of it, contains a notice stating that it is -governed by this License along with a term that is a further -restriction, you may remove that term. If a license document contains -a further restriction but permits relicensing or conveying under this -License, you may add to a covered work material governed by the terms -of that license document, provided that the further restriction does -not survive such relicensing or conveying. - - If you add terms to a covered work in accord with this section, you -must place, in the relevant source files, a statement of the -additional terms that apply to those files, or a notice indicating -where to find the applicable terms. - - Additional terms, permissive or non-permissive, may be stated in the -form of a separately written license, or stated as exceptions; -the above requirements apply either way. - - 8. Termination. - - You may not propagate or modify a covered work except as expressly -provided under this License. Any attempt otherwise to propagate or -modify it is void, and will automatically terminate your rights under -this License (including any patent licenses granted under the third -paragraph of section 11). - - However, if you cease all violation of this License, then your -license from a particular copyright holder is reinstated (a) -provisionally, unless and until the copyright holder explicitly and -finally terminates your license, and (b) permanently, if the copyright -holder fails to notify you of the violation by some reasonable means -prior to 60 days after the cessation. - - Moreover, your license from a particular copyright holder is -reinstated permanently if the copyright holder notifies you of the -violation by some reasonable means, this is the first time you have -received notice of violation of this License (for any work) from that -copyright holder, and you cure the violation prior to 30 days after -your receipt of the notice. - - Termination of your rights under this section does not terminate the -licenses of parties who have received copies or rights from you under -this License. If your rights have been terminated and not permanently -reinstated, you do not qualify to receive new licenses for the same -material under section 10. - - 9. Acceptance Not Required for Having Copies. - - You are not required to accept this License in order to receive or -run a copy of the Program. Ancillary propagation of a covered work -occurring solely as a consequence of using peer-to-peer transmission -to receive a copy likewise does not require acceptance. However, -nothing other than this License grants you permission to propagate or -modify any covered work. These actions infringe copyright if you do -not accept this License. Therefore, by modifying or propagating a -covered work, you indicate your acceptance of this License to do so. - - 10. Automatic Licensing of Downstream Recipients. - - Each time you convey a covered work, the recipient automatically -receives a license from the original licensors, to run, modify and -propagate that work, subject to this License. You are not responsible -for enforcing compliance by third parties with this License. - - An "entity transaction" is a transaction transferring control of an -organization, or substantially all assets of one, or subdividing an -organization, or merging organizations. If propagation of a covered -work results from an entity transaction, each party to that -transaction who receives a copy of the work also receives whatever -licenses to the work the party's predecessor in interest had or could -give under the previous paragraph, plus a right to possession of the -Corresponding Source of the work from the predecessor in interest, if -the predecessor has it or can get it with reasonable efforts. - - You may not impose any further restrictions on the exercise of the -rights granted or affirmed under this License. For example, you may -not impose a license fee, royalty, or other charge for exercise of -rights granted under this License, and you may not initiate litigation -(including a cross-claim or counterclaim in a lawsuit) alleging that -any patent claim is infringed by making, using, selling, offering for -sale, or importing the Program or any portion of it. - - 11. Patents. - - A "contributor" is a copyright holder who authorizes use under this -License of the Program or a work on which the Program is based. The -work thus licensed is called the contributor's "contributor version". - - A contributor's "essential patent claims" are all patent claims -owned or controlled by the contributor, whether already acquired or -hereafter acquired, that would be infringed by some manner, permitted -by this License, of making, using, or selling its contributor version, -but do not include claims that would be infringed only as a -consequence of further modification of the contributor version. For -purposes of this definition, "control" includes the right to grant -patent sublicenses in a manner consistent with the requirements of -this License. - - Each contributor grants you a non-exclusive, worldwide, royalty-free -patent license under the contributor's essential patent claims, to -make, use, sell, offer for sale, import and otherwise run, modify and -propagate the contents of its contributor version. - - In the following three paragraphs, a "patent license" is any express -agreement or commitment, however denominated, not to enforce a patent -(such as an express permission to practice a patent or covenant not to -sue for patent infringement). To "grant" such a patent license to a -party means to make such an agreement or commitment not to enforce a -patent against the party. - - If you convey a covered work, knowingly relying on a patent license, -and the Corresponding Source of the work is not available for anyone -to copy, free of charge and under the terms of this License, through a -publicly available network server or other readily accessible means, -then you must either (1) cause the Corresponding Source to be so -available, or (2) arrange to deprive yourself of the benefit of the -patent license for this particular work, or (3) arrange, in a manner -consistent with the requirements of this License, to extend the patent -license to downstream recipients. "Knowingly relying" means you have -actual knowledge that, but for the patent license, your conveying the -covered work in a country, or your recipient's use of the covered work -in a country, would infringe one or more identifiable patents in that -country that you have reason to believe are valid. - - If, pursuant to or in connection with a single transaction or -arrangement, you convey, or propagate by procuring conveyance of, a -covered work, and grant a patent license to some of the parties -receiving the covered work authorizing them to use, propagate, modify -or convey a specific copy of the covered work, then the patent license -you grant is automatically extended to all recipients of the covered -work and works based on it. - - A patent license is "discriminatory" if it does not include within -the scope of its coverage, prohibits the exercise of, or is -conditioned on the non-exercise of one or more of the rights that are -specifically granted under this License. You may not convey a covered -work if you are a party to an arrangement with a third party that is -in the business of distributing software, under which you make payment -to the third party based on the extent of your activity of conveying -the work, and under which the third party grants, to any of the -parties who would receive the covered work from you, a discriminatory -patent license (a) in connection with copies of the covered work -conveyed by you (or copies made from those copies), or (b) primarily -for and in connection with specific products or compilations that -contain the covered work, unless you entered into that arrangement, -or that patent license was granted, prior to 28 March 2007. - - Nothing in this License shall be construed as excluding or limiting -any implied license or other defenses to infringement that may -otherwise be available to you under applicable patent law. - - 12. No Surrender of Others' Freedom. - - If conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot convey a -covered work so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you may -not convey it at all. For example, if you agree to terms that obligate you -to collect a royalty for further conveying from those to whom you convey -the Program, the only way you could satisfy both those terms and this -License would be to refrain entirely from conveying the Program. - - 13. Use with the GNU Affero General Public License. - - Notwithstanding any other provision of this License, you have -permission to link or combine any covered work with a work licensed -under version 3 of the GNU Affero General Public License into a single -combined work, and to convey the resulting work. The terms of this -License will continue to apply to the part which is the covered work, -but the special requirements of the GNU Affero General Public License, -section 13, concerning interaction through a network will apply to the -combination as such. - - 14. Revised Versions of this License. - - The Free Software Foundation may publish revised and/or new versions of -the GNU General Public License from time to time. Such new versions will -be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - - Each version is given a distinguishing version number. If the -Program specifies that a certain numbered version of the GNU General -Public License "or any later version" applies to it, you have the -option of following the terms and conditions either of that numbered -version or of any later version published by the Free Software -Foundation. If the Program does not specify a version number of the -GNU General Public License, you may choose any version ever published -by the Free Software Foundation. - - If the Program specifies that a proxy can decide which future -versions of the GNU General Public License can be used, that proxy's -public statement of acceptance of a version permanently authorizes you -to choose that version for the Program. - - Later license versions may give you additional or different -permissions. However, no additional obligations are imposed on any -author or copyright holder as a result of your choosing to follow a -later version. - - 15. Disclaimer of Warranty. - - THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY -APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT -HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY -OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, -THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM -IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF -ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - - 16. Limitation of Liability. - - IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS -THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY -GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE -USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF -DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD -PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), -EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF -SUCH DAMAGES. - - 17. Interpretation of Sections 15 and 16. - - If the disclaimer of warranty and limitation of liability provided -above cannot be given local legal effect according to their terms, -reviewing courts shall apply local law that most closely approximates -an absolute waiver of all civil liability in connection with the -Program, unless a warranty or assumption of liability accompanies a -copy of the Program in return for a fee. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest -to attach them to the start of each source file to most effectively -state the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. - - ESLint Config - Copyright (C) 2022 Open StApps - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program. If not, see . - -Also add information on how to contact you by electronic and paper mail. - - If the program does terminal interaction, make it output a short -notice like this when it starts in an interactive mode: - - Copyright (C) 2022 Open StApps - This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. - This is free software, and you are welcome to redistribute it - under certain conditions; type `show c' for details. - -The hypothetical commands `show w' and `show c' should show the appropriate -parts of the General Public License. Of course, your program's commands -might be different; for a GUI interface, you would use an "about box". - - You should also get your employer (if you work as a programmer) or school, -if any, to sign a "copyright disclaimer" for the program, if necessary. -For more information on this, and how to apply and follow the GNU GPL, see -. - - The GNU General Public License does not permit incorporating your program -into proprietary programs. If your program is a subroutine library, you -may consider it more useful to permit linking proprietary applications with -the library. If this is what you want to do, use the GNU Lesser General -Public License instead of this License. But first, please read -. diff --git a/configuration/eslint-config/index.js b/configuration/eslint-config/index.js index b074185e..911386d1 100644 --- a/configuration/eslint-config/index.js +++ b/configuration/eslint-config/index.js @@ -34,6 +34,7 @@ module.exports = { 'unicorn/no-useless-undefined': 'off', 'unicorn/prefer-node-protocol': 'off', 'unicorn/no-process-exit': 'off', + 'unicorn/no-array-reduce': 'off', 'unicorn/prevent-abbreviations': [ 'error', { diff --git a/configuration/eslint-config/package.json b/configuration/eslint-config/package.json index 895d0e19..034cad3e 100644 --- a/configuration/eslint-config/package.json +++ b/configuration/eslint-config/package.json @@ -10,26 +10,6 @@ "Rainer Killinger " ], "main": "index.js", - "scripts": { - "changelog": "conventional-changelog -p angular -i CHANGELOG.md -s -r 0 && git add CHANGELOG.md && git commit -m 'docs: update changelog'", - "postversion": "npm run changelog", - "prepublishOnly": "npm ci && npm test", - "preversion": "npm run prepublishOnly", - "push": "git push && git push origin \"v$npm_package_version\"", - "test": "eslint -c index.js test/test-file.ts" - }, - "devDependencies": { - "@typescript-eslint/eslint-plugin": "5.49.0", - "@typescript-eslint/parser": "5.49.0", - "conventional-changelog-cli": "2.2.2", - "eslint": "8.33.0", - "eslint-config-prettier": "8.6.0", - "eslint-plugin-jsdoc": "39.7.4", - "eslint-plugin-prettier": "4.2.1", - "eslint-plugin-unicorn": "45.0.2", - "prettier": "2.8.3", - "typescript": "4.8.4" - }, "peerDependencies": { "@typescript-eslint/eslint-plugin": "5.49.0", "@typescript-eslint/parser": "5.49.0", @@ -37,7 +17,6 @@ "eslint-config-prettier": "8.6.0", "eslint-plugin-jsdoc": "39.7.4", "eslint-plugin-prettier": "4.2.1", - "eslint-plugin-unicorn": "45.0.2", - "prettier": "2.8.3" + "eslint-plugin-unicorn": "45.0.2" } } diff --git a/configuration/nyc-config/index.json b/configuration/nyc-config/index.json new file mode 100644 index 00000000..1e4aba93 --- /dev/null +++ b/configuration/nyc-config/index.json @@ -0,0 +1,29 @@ +{ + "all": true, + "branches": 90, + "check-coverage": true, + "exclude": [], + "extension": [ + ".ts" + ], + "functions": 95, + "include": [ + "src/protocol/route.ts", + "src/things/abstract/thing.ts", + "src/things/abstract/thing-that-can-be-offered.ts", + "src/things/abstract/thing-with-categories.ts", + "src/translator.ts", + "src/guards.ts" + ], + "lines": 95, + "per-file": true, + "reporter": [ + "cobertura", + "html", + "text-summary" + ], + "require": [ + "ts-node/register" + ], + "statements": 95 +} diff --git a/configuration/nyc-config/package.json b/configuration/nyc-config/package.json new file mode 100644 index 00000000..4f074b31 --- /dev/null +++ b/configuration/nyc-config/package.json @@ -0,0 +1,10 @@ +{ + "name": "@openstapps/nyc-config", + "description": "The nyc coverage reporter config for the openstapps project", + "version": "2.1.0", + "type": "commonjs", + "license": "GPL-3.0-only", + "repository": "git@gitlab.com:openstapps/eslint-config.git", + "author": "Thea Schöbl", + "main": "index.json" +} diff --git a/configuration/prettier-config/.editorconfig b/configuration/prettier-config/.editorconfig deleted file mode 100644 index 9a4062a7..00000000 --- a/configuration/prettier-config/.editorconfig +++ /dev/null @@ -1,15 +0,0 @@ -# editorconfig.org - -root = true - -[*] -indent_style = space -indent_size = 2 - -end_of_line = lf -charset = utf-8 -trim_trailing_whitespace = true -insert_final_newline = true - -[*.md] -trim_trailing_whitespace = false diff --git a/configuration/prettier-config/LICENSE b/configuration/prettier-config/LICENSE deleted file mode 100644 index 810fce6e..00000000 --- a/configuration/prettier-config/LICENSE +++ /dev/null @@ -1,621 +0,0 @@ - GNU GENERAL PUBLIC LICENSE - Version 3, 29 June 2007 - - Copyright (C) 2007 Free Software Foundation, Inc. - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The GNU General Public License is a free, copyleft license for -software and other kinds of works. - - The licenses for most software and other practical works are designed -to take away your freedom to share and change the works. By contrast, -the GNU General Public License is intended to guarantee your freedom to -share and change all versions of a program--to make sure it remains free -software for all its users. We, the Free Software Foundation, use the -GNU General Public License for most of our software; it applies also to -any other work released this way by its authors. You can apply it to -your programs, too. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -them if you wish), that you receive source code or can get it if you -want it, that you can change the software or use pieces of it in new -free programs, and that you know you can do these things. - - To protect your rights, we need to prevent others from denying you -these rights or asking you to surrender the rights. Therefore, you have -certain responsibilities if you distribute copies of the software, or if -you modify it: responsibilities to respect the freedom of others. - - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must pass on to the recipients the same -freedoms that you received. You must make sure that they, too, receive -or can get the source code. And you must show them these terms so they -know their rights. - - Developers that use the GNU GPL protect your rights with two steps: -(1) assert copyright on the software, and (2) offer you this License -giving you legal permission to copy, distribute and/or modify it. - - For the developers' and authors' protection, the GPL clearly explains -that there is no warranty for this free software. For both users' and -authors' sake, the GPL requires that modified versions be marked as -changed, so that their problems will not be attributed erroneously to -authors of previous versions. - - Some devices are designed to deny users access to install or run -modified versions of the software inside them, although the manufacturer -can do so. This is fundamentally incompatible with the aim of -protecting users' freedom to change the software. The systematic -pattern of such abuse occurs in the area of products for individuals to -use, which is precisely where it is most unacceptable. Therefore, we -have designed this version of the GPL to prohibit the practice for those -products. If such problems arise substantially in other domains, we -stand ready to extend this provision to those domains in future versions -of the GPL, as needed to protect the freedom of users. - - Finally, every program is threatened constantly by software patents. -States should not allow patents to restrict development and use of -software on general-purpose computers, but in those that do, we wish to -avoid the special danger that patents applied to a free program could -make it effectively proprietary. To prevent this, the GPL assures that -patents cannot be used to render the program non-free. - - The precise terms and conditions for copying, distribution and -modification follow. - - TERMS AND CONDITIONS - - 0. Definitions. - - "This License" refers to version 3 of the GNU General Public License. - - "Copyright" also means copyright-like laws that apply to other kinds of -works, such as semiconductor masks. - - "The Program" refers to any copyrightable work licensed under this -License. Each licensee is addressed as "you". "Licensees" and -"recipients" may be individuals or organizations. - - To "modify" a work means to copy from or adapt all or part of the work -in a fashion requiring copyright permission, other than the making of an -exact copy. The resulting work is called a "modified version" of the -earlier work or a work "based on" the earlier work. - - A "covered work" means either the unmodified Program or a work based -on the Program. - - To "propagate" a work means to do anything with it that, without -permission, would make you directly or secondarily liable for -infringement under applicable copyright law, except executing it on a -computer or modifying a private copy. Propagation includes copying, -distribution (with or without modification), making available to the -public, and in some countries other activities as well. - - To "convey" a work means any kind of propagation that enables other -parties to make or receive copies. Mere interaction with a user through -a computer network, with no transfer of a copy, is not conveying. - - An interactive user interface displays "Appropriate Legal Notices" -to the extent that it includes a convenient and prominently visible -feature that (1) displays an appropriate copyright notice, and (2) -tells the user that there is no warranty for the work (except to the -extent that warranties are provided), that licensees may convey the -work under this License, and how to view a copy of this License. If -the interface presents a list of user commands or options, such as a -menu, a prominent item in the list meets this criterion. - - 1. Source Code. - - The "source code" for a work means the preferred form of the work -for making modifications to it. "Object code" means any non-source -form of a work. - - A "Standard Interface" means an interface that either is an official -standard defined by a recognized standards body, or, in the case of -interfaces specified for a particular programming language, one that -is widely used among developers working in that language. - - The "System Libraries" of an executable work include anything, other -than the work as a whole, that (a) is included in the normal form of -packaging a Major Component, but which is not part of that Major -Component, and (b) serves only to enable use of the work with that -Major Component, or to implement a Standard Interface for which an -implementation is available to the public in source code form. A -"Major Component", in this context, means a major essential component -(kernel, window system, and so on) of the specific operating system -(if any) on which the executable work runs, or a compiler used to -produce the work, or an object code interpreter used to run it. - - The "Corresponding Source" for a work in object code form means all -the source code needed to generate, install, and (for an executable -work) run the object code and to modify the work, including scripts to -control those activities. However, it does not include the work's -System Libraries, or general-purpose tools or generally available free -programs which are used unmodified in performing those activities but -which are not part of the work. For example, Corresponding Source -includes interface definition files associated with source files for -the work, and the source code for shared libraries and dynamically -linked subprograms that the work is specifically designed to require, -such as by intimate data communication or control flow between those -subprograms and other parts of the work. - - The Corresponding Source need not include anything that users -can regenerate automatically from other parts of the Corresponding -Source. - - The Corresponding Source for a work in source code form is that -same work. - - 2. Basic Permissions. - - All rights granted under this License are granted for the term of -copyright on the Program, and are irrevocable provided the stated -conditions are met. This License explicitly affirms your unlimited -permission to run the unmodified Program. The output from running a -covered work is covered by this License only if the output, given its -content, constitutes a covered work. This License acknowledges your -rights of fair use or other equivalent, as provided by copyright law. - - You may make, run and propagate covered works that you do not -convey, without conditions so long as your license otherwise remains -in force. You may convey covered works to others for the sole purpose -of having them make modifications exclusively for you, or provide you -with facilities for running those works, provided that you comply with -the terms of this License in conveying all material for which you do -not control copyright. Those thus making or running the covered works -for you must do so exclusively on your behalf, under your direction -and control, on terms that prohibit them from making any copies of -your copyrighted material outside their relationship with you. - - Conveying under any other circumstances is permitted solely under -the conditions stated below. Sublicensing is not allowed; section 10 -makes it unnecessary. - - 3. Protecting Users' Legal Rights From Anti-Circumvention Law. - - No covered work shall be deemed part of an effective technological -measure under any applicable law fulfilling obligations under article -11 of the WIPO copyright treaty adopted on 20 December 1996, or -similar laws prohibiting or restricting circumvention of such -measures. - - When you convey a covered work, you waive any legal power to forbid -circumvention of technological measures to the extent such circumvention -is effected by exercising rights under this License with respect to -the covered work, and you disclaim any intention to limit operation or -modification of the work as a means of enforcing, against the work's -users, your or third parties' legal rights to forbid circumvention of -technological measures. - - 4. Conveying Verbatim Copies. - - You may convey verbatim copies of the Program's source code as you -receive it, in any medium, provided that you conspicuously and -appropriately publish on each copy an appropriate copyright notice; -keep intact all notices stating that this License and any -non-permissive terms added in accord with section 7 apply to the code; -keep intact all notices of the absence of any warranty; and give all -recipients a copy of this License along with the Program. - - You may charge any price or no price for each copy that you convey, -and you may offer support or warranty protection for a fee. - - 5. Conveying Modified Source Versions. - - You may convey a work based on the Program, or the modifications to -produce it from the Program, in the form of source code under the -terms of section 4, provided that you also meet all of these conditions: - - a) The work must carry prominent notices stating that you modified - it, and giving a relevant date. - - b) The work must carry prominent notices stating that it is - released under this License and any conditions added under section - 7. This requirement modifies the requirement in section 4 to - "keep intact all notices". - - c) You must license the entire work, as a whole, under this - License to anyone who comes into possession of a copy. This - License will therefore apply, along with any applicable section 7 - additional terms, to the whole of the work, and all its parts, - regardless of how they are packaged. This License gives no - permission to license the work in any other way, but it does not - invalidate such permission if you have separately received it. - - d) If the work has interactive user interfaces, each must display - Appropriate Legal Notices; however, if the Program has interactive - interfaces that do not display Appropriate Legal Notices, your - work need not make them do so. - - A compilation of a covered work with other separate and independent -works, which are not by their nature extensions of the covered work, -and which are not combined with it such as to form a larger program, -in or on a volume of a storage or distribution medium, is called an -"aggregate" if the compilation and its resulting copyright are not -used to limit the access or legal rights of the compilation's users -beyond what the individual works permit. Inclusion of a covered work -in an aggregate does not cause this License to apply to the other -parts of the aggregate. - - 6. Conveying Non-Source Forms. - - You may convey a covered work in object code form under the terms -of sections 4 and 5, provided that you also convey the -machine-readable Corresponding Source under the terms of this License, -in one of these ways: - - a) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by the - Corresponding Source fixed on a durable physical medium - customarily used for software interchange. - - b) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by a - written offer, valid for at least three years and valid for as - long as you offer spare parts or customer support for that product - model, to give anyone who possesses the object code either (1) a - copy of the Corresponding Source for all the software in the - product that is covered by this License, on a durable physical - medium customarily used for software interchange, for a price no - more than your reasonable cost of physically performing this - conveying of source, or (2) access to copy the - Corresponding Source from a network server at no charge. - - c) Convey individual copies of the object code with a copy of the - written offer to provide the Corresponding Source. This - alternative is allowed only occasionally and noncommercially, and - only if you received the object code with such an offer, in accord - with subsection 6b. - - d) Convey the object code by offering access from a designated - place (gratis or for a charge), and offer equivalent access to the - Corresponding Source in the same way through the same place at no - further charge. You need not require recipients to copy the - Corresponding Source along with the object code. If the place to - copy the object code is a network server, the Corresponding Source - may be on a different server (operated by you or a third party) - that supports equivalent copying facilities, provided you maintain - clear directions next to the object code saying where to find the - Corresponding Source. Regardless of what server hosts the - Corresponding Source, you remain obligated to ensure that it is - available for as long as needed to satisfy these requirements. - - e) Convey the object code using peer-to-peer transmission, provided - you inform other peers where the object code and Corresponding - Source of the work are being offered to the general public at no - charge under subsection 6d. - - A separable portion of the object code, whose source code is excluded -from the Corresponding Source as a System Library, need not be -included in conveying the object code work. - - A "User Product" is either (1) a "consumer product", which means any -tangible personal property which is normally used for personal, family, -or household purposes, or (2) anything designed or sold for incorporation -into a dwelling. In determining whether a product is a consumer product, -doubtful cases shall be resolved in favor of coverage. For a particular -product received by a particular user, "normally used" refers to a -typical or common use of that class of product, regardless of the status -of the particular user or of the way in which the particular user -actually uses, or expects or is expected to use, the product. A product -is a consumer product regardless of whether the product has substantial -commercial, industrial or non-consumer uses, unless such uses represent -the only significant mode of use of the product. - - "Installation Information" for a User Product means any methods, -procedures, authorization keys, or other information required to install -and execute modified versions of a covered work in that User Product from -a modified version of its Corresponding Source. The information must -suffice to ensure that the continued functioning of the modified object -code is in no case prevented or interfered with solely because -modification has been made. - - If you convey an object code work under this section in, or with, or -specifically for use in, a User Product, and the conveying occurs as -part of a transaction in which the right of possession and use of the -User Product is transferred to the recipient in perpetuity or for a -fixed term (regardless of how the transaction is characterized), the -Corresponding Source conveyed under this section must be accompanied -by the Installation Information. But this requirement does not apply -if neither you nor any third party retains the ability to install -modified object code on the User Product (for example, the work has -been installed in ROM). - - The requirement to provide Installation Information does not include a -requirement to continue to provide support service, warranty, or updates -for a work that has been modified or installed by the recipient, or for -the User Product in which it has been modified or installed. Access to a -network may be denied when the modification itself materially and -adversely affects the operation of the network or violates the rules and -protocols for communication across the network. - - Corresponding Source conveyed, and Installation Information provided, -in accord with this section must be in a format that is publicly -documented (and with an implementation available to the public in -source code form), and must require no special password or key for -unpacking, reading or copying. - - 7. Additional Terms. - - "Additional permissions" are terms that supplement the terms of this -License by making exceptions from one or more of its conditions. -Additional permissions that are applicable to the entire Program shall -be treated as though they were included in this License, to the extent -that they are valid under applicable law. If additional permissions -apply only to part of the Program, that part may be used separately -under those permissions, but the entire Program remains governed by -this License without regard to the additional permissions. - - When you convey a copy of a covered work, you may at your option -remove any additional permissions from that copy, or from any part of -it. (Additional permissions may be written to require their own -removal in certain cases when you modify the work.) You may place -additional permissions on material, added by you to a covered work, -for which you have or can give appropriate copyright permission. - - Notwithstanding any other provision of this License, for material you -add to a covered work, you may (if authorized by the copyright holders of -that material) supplement the terms of this License with terms: - - a) Disclaiming warranty or limiting liability differently from the - terms of sections 15 and 16 of this License; or - - b) Requiring preservation of specified reasonable legal notices or - author attributions in that material or in the Appropriate Legal - Notices displayed by works containing it; or - - c) Prohibiting misrepresentation of the origin of that material, or - requiring that modified versions of such material be marked in - reasonable ways as different from the original version; or - - d) Limiting the use for publicity purposes of names of licensors or - authors of the material; or - - e) Declining to grant rights under trademark law for use of some - trade names, trademarks, or service marks; or - - f) Requiring indemnification of licensors and authors of that - material by anyone who conveys the material (or modified versions of - it) with contractual assumptions of liability to the recipient, for - any liability that these contractual assumptions directly impose on - those licensors and authors. - - All other non-permissive additional terms are considered "further -restrictions" within the meaning of section 10. If the Program as you -received it, or any part of it, contains a notice stating that it is -governed by this License along with a term that is a further -restriction, you may remove that term. If a license document contains -a further restriction but permits relicensing or conveying under this -License, you may add to a covered work material governed by the terms -of that license document, provided that the further restriction does -not survive such relicensing or conveying. - - If you add terms to a covered work in accord with this section, you -must place, in the relevant source files, a statement of the -additional terms that apply to those files, or a notice indicating -where to find the applicable terms. - - Additional terms, permissive or non-permissive, may be stated in the -form of a separately written license, or stated as exceptions; -the above requirements apply either way. - - 8. Termination. - - You may not propagate or modify a covered work except as expressly -provided under this License. Any attempt otherwise to propagate or -modify it is void, and will automatically terminate your rights under -this License (including any patent licenses granted under the third -paragraph of section 11). - - However, if you cease all violation of this License, then your -license from a particular copyright holder is reinstated (a) -provisionally, unless and until the copyright holder explicitly and -finally terminates your license, and (b) permanently, if the copyright -holder fails to notify you of the violation by some reasonable means -prior to 60 days after the cessation. - - Moreover, your license from a particular copyright holder is -reinstated permanently if the copyright holder notifies you of the -violation by some reasonable means, this is the first time you have -received notice of violation of this License (for any work) from that -copyright holder, and you cure the violation prior to 30 days after -your receipt of the notice. - - Termination of your rights under this section does not terminate the -licenses of parties who have received copies or rights from you under -this License. If your rights have been terminated and not permanently -reinstated, you do not qualify to receive new licenses for the same -material under section 10. - - 9. Acceptance Not Required for Having Copies. - - You are not required to accept this License in order to receive or -run a copy of the Program. Ancillary propagation of a covered work -occurring solely as a consequence of using peer-to-peer transmission -to receive a copy likewise does not require acceptance. However, -nothing other than this License grants you permission to propagate or -modify any covered work. These actions infringe copyright if you do -not accept this License. Therefore, by modifying or propagating a -covered work, you indicate your acceptance of this License to do so. - - 10. Automatic Licensing of Downstream Recipients. - - Each time you convey a covered work, the recipient automatically -receives a license from the original licensors, to run, modify and -propagate that work, subject to this License. You are not responsible -for enforcing compliance by third parties with this License. - - An "entity transaction" is a transaction transferring control of an -organization, or substantially all assets of one, or subdividing an -organization, or merging organizations. If propagation of a covered -work results from an entity transaction, each party to that -transaction who receives a copy of the work also receives whatever -licenses to the work the party's predecessor in interest had or could -give under the previous paragraph, plus a right to possession of the -Corresponding Source of the work from the predecessor in interest, if -the predecessor has it or can get it with reasonable efforts. - - You may not impose any further restrictions on the exercise of the -rights granted or affirmed under this License. For example, you may -not impose a license fee, royalty, or other charge for exercise of -rights granted under this License, and you may not initiate litigation -(including a cross-claim or counterclaim in a lawsuit) alleging that -any patent claim is infringed by making, using, selling, offering for -sale, or importing the Program or any portion of it. - - 11. Patents. - - A "contributor" is a copyright holder who authorizes use under this -License of the Program or a work on which the Program is based. The -work thus licensed is called the contributor's "contributor version". - - A contributor's "essential patent claims" are all patent claims -owned or controlled by the contributor, whether already acquired or -hereafter acquired, that would be infringed by some manner, permitted -by this License, of making, using, or selling its contributor version, -but do not include claims that would be infringed only as a -consequence of further modification of the contributor version. For -purposes of this definition, "control" includes the right to grant -patent sublicenses in a manner consistent with the requirements of -this License. - - Each contributor grants you a non-exclusive, worldwide, royalty-free -patent license under the contributor's essential patent claims, to -make, use, sell, offer for sale, import and otherwise run, modify and -propagate the contents of its contributor version. - - In the following three paragraphs, a "patent license" is any express -agreement or commitment, however denominated, not to enforce a patent -(such as an express permission to practice a patent or covenant not to -sue for patent infringement). To "grant" such a patent license to a -party means to make such an agreement or commitment not to enforce a -patent against the party. - - If you convey a covered work, knowingly relying on a patent license, -and the Corresponding Source of the work is not available for anyone -to copy, free of charge and under the terms of this License, through a -publicly available network server or other readily accessible means, -then you must either (1) cause the Corresponding Source to be so -available, or (2) arrange to deprive yourself of the benefit of the -patent license for this particular work, or (3) arrange, in a manner -consistent with the requirements of this License, to extend the patent -license to downstream recipients. "Knowingly relying" means you have -actual knowledge that, but for the patent license, your conveying the -covered work in a country, or your recipient's use of the covered work -in a country, would infringe one or more identifiable patents in that -country that you have reason to believe are valid. - - If, pursuant to or in connection with a single transaction or -arrangement, you convey, or propagate by procuring conveyance of, a -covered work, and grant a patent license to some of the parties -receiving the covered work authorizing them to use, propagate, modify -or convey a specific copy of the covered work, then the patent license -you grant is automatically extended to all recipients of the covered -work and works based on it. - - A patent license is "discriminatory" if it does not include within -the scope of its coverage, prohibits the exercise of, or is -conditioned on the non-exercise of one or more of the rights that are -specifically granted under this License. You may not convey a covered -work if you are a party to an arrangement with a third party that is -in the business of distributing software, under which you make payment -to the third party based on the extent of your activity of conveying -the work, and under which the third party grants, to any of the -parties who would receive the covered work from you, a discriminatory -patent license (a) in connection with copies of the covered work -conveyed by you (or copies made from those copies), or (b) primarily -for and in connection with specific products or compilations that -contain the covered work, unless you entered into that arrangement, -or that patent license was granted, prior to 28 March 2007. - - Nothing in this License shall be construed as excluding or limiting -any implied license or other defenses to infringement that may -otherwise be available to you under applicable patent law. - - 12. No Surrender of Others' Freedom. - - If conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot convey a -covered work so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you may -not convey it at all. For example, if you agree to terms that obligate you -to collect a royalty for further conveying from those to whom you convey -the Program, the only way you could satisfy both those terms and this -License would be to refrain entirely from conveying the Program. - - 13. Use with the GNU Affero General Public License. - - Notwithstanding any other provision of this License, you have -permission to link or combine any covered work with a work licensed -under version 3 of the GNU Affero General Public License into a single -combined work, and to convey the resulting work. The terms of this -License will continue to apply to the part which is the covered work, -but the special requirements of the GNU Affero General Public License, -section 13, concerning interaction through a network will apply to the -combination as such. - - 14. Revised Versions of this License. - - The Free Software Foundation may publish revised and/or new versions of -the GNU General Public License from time to time. Such new versions will -be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - - Each version is given a distinguishing version number. If the -Program specifies that a certain numbered version of the GNU General -Public License "or any later version" applies to it, you have the -option of following the terms and conditions either of that numbered -version or of any later version published by the Free Software -Foundation. If the Program does not specify a version number of the -GNU General Public License, you may choose any version ever published -by the Free Software Foundation. - - If the Program specifies that a proxy can decide which future -versions of the GNU General Public License can be used, that proxy's -public statement of acceptance of a version permanently authorizes you -to choose that version for the Program. - - Later license versions may give you additional or different -permissions. However, no additional obligations are imposed on any -author or copyright holder as a result of your choosing to follow a -later version. - - 15. Disclaimer of Warranty. - - THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY -APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT -HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY -OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, -THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM -IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF -ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - - 16. Limitation of Liability. - - IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS -THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY -GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE -USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF -DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD -PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), -EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF -SUCH DAMAGES. - - 17. Interpretation of Sections 15 and 16. - - If the disclaimer of warranty and limitation of liability provided -above cannot be given local legal effect according to their terms, -reviewing courts shall apply local law that most closely approximates -an absolute waiver of all civil liability in connection with the -Program, unless a warranty or assumption of liability accompanies a -copy of the Program in return for a fee. - - END OF TERMS AND CONDITIONS diff --git a/configuration/prettier-config/package.json b/configuration/prettier-config/package.json index fb4a05c7..34bd0a5a 100644 --- a/configuration/prettier-config/package.json +++ b/configuration/prettier-config/package.json @@ -17,5 +17,8 @@ "preversion": "npm run prepublishOnly", "push": "git push && git push origin \"v$npm_package_version\"", "test": "npx prettier --config index.json --check \"test/*.js\"" + }, + "peerDependencies": { + "prettier": "2.8.6" } } diff --git a/configuration/projectmanagement/.editorconfig b/configuration/projectmanagement/.editorconfig deleted file mode 100644 index 9a4062a7..00000000 --- a/configuration/projectmanagement/.editorconfig +++ /dev/null @@ -1,15 +0,0 @@ -# editorconfig.org - -root = true - -[*] -indent_style = space -indent_size = 2 - -end_of_line = lf -charset = utf-8 -trim_trailing_whitespace = true -insert_final_newline = true - -[*.md] -trim_trailing_whitespace = false diff --git a/configuration/projectmanagement/.eslintignore b/configuration/projectmanagement/.eslintignore deleted file mode 100644 index 3d0a9346..00000000 --- a/configuration/projectmanagement/.eslintignore +++ /dev/null @@ -1,2 +0,0 @@ -resources -openapi diff --git a/configuration/projectmanagement/.eslintrc.json b/configuration/projectmanagement/.eslintrc.json deleted file mode 100644 index 31d47702..00000000 --- a/configuration/projectmanagement/.eslintrc.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "extends": "@openstapps" -} diff --git a/configuration/projectmanagement/LICENSE b/configuration/projectmanagement/LICENSE deleted file mode 100644 index 9df63ccc..00000000 --- a/configuration/projectmanagement/LICENSE +++ /dev/null @@ -1,200 +0,0 @@ -GNU GENERAL PUBLIC LICENSE -Version 3, 29 June 2007 - -Copyright © 2007 Free Software Foundation, Inc. - -Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. - -Preamble - -The GNU General Public License is a free, copyleft license for software and other kinds of works. - -The licenses for most software and other practical works are designed to take away your freedom to share and change the works. By contrast, the GNU General Public License is intended to guarantee your freedom to share and change all versions of a program--to make sure it remains free software for all its users. We, the Free Software Foundation, use the GNU General Public License for most of our software; it applies also to any other work released this way by its authors. You can apply it to your programs, too. - -When we speak of free software, we are referring to freedom, not price. Our General Public Licenses are designed to make sure that you have the freedom to distribute copies of free software (and charge for them if you wish), that you receive source code or can get it if you want it, that you can change the software or use pieces of it in new free programs, and that you know you can do these things. - -To protect your rights, we need to prevent others from denying you these rights or asking you to surrender the rights. Therefore, you have certain responsibilities if you distribute copies of the software, or if you modify it: responsibilities to respect the freedom of others. - -For example, if you distribute copies of such a program, whether gratis or for a fee, you must pass on to the recipients the same freedoms that you received. You must make sure that they, too, receive or can get the source code. And you must show them these terms so they know their rights. - -Developers that use the GNU GPL protect your rights with two steps: (1) assert copyright on the software, and (2) offer you this License giving you legal permission to copy, distribute and/or modify it. - -For the developers' and authors' protection, the GPL clearly explains that there is no warranty for this free software. For both users' and authors' sake, the GPL requires that modified versions be marked as changed, so that their problems will not be attributed erroneously to authors of previous versions. - -Some devices are designed to deny users access to install or run modified versions of the software inside them, although the manufacturer can do so. This is fundamentally incompatible with the aim of protecting users' freedom to change the software. The systematic pattern of such abuse occurs in the area of products for individuals to use, which is precisely where it is most unacceptable. Therefore, we have designed this version of the GPL to prohibit the practice for those products. If such problems arise substantially in other domains, we stand ready to extend this provision to those domains in future versions of the GPL, as needed to protect the freedom of users. - -Finally, every program is threatened constantly by software patents. States should not allow patents to restrict development and use of software on general-purpose computers, but in those that do, we wish to avoid the special danger that patents applied to a free program could make it effectively proprietary. To prevent this, the GPL assures that patents cannot be used to render the program non-free. - -The precise terms and conditions for copying, distribution and modification follow. - -TERMS AND CONDITIONS - -0. Definitions. -"This License" refers to version 3 of the GNU General Public License. - -"Copyright" also means copyright-like laws that apply to other kinds of works, such as semiconductor masks. - -"The Program" refers to any copyrightable work licensed under this License. Each licensee is addressed as "you". "Licensees" and "recipients" may be individuals or organizations. - -To "modify" a work means to copy from or adapt all or part of the work in a fashion requiring copyright permission, other than the making of an exact copy. The resulting work is called a "modified version" of the earlier work or a work "based on" the earlier work. - -A "covered work" means either the unmodified Program or a work based on the Program. - -To "propagate" a work means to do anything with it that, without permission, would make you directly or secondarily liable for infringement under applicable copyright law, except executing it on a computer or modifying a private copy. Propagation includes copying, distribution (with or without modification), making available to the public, and in some countries other activities as well. - -To "convey" a work means any kind of propagation that enables other parties to make or receive copies. Mere interaction with a user through a computer network, with no transfer of a copy, is not conveying. - -An interactive user interface displays "Appropriate Legal Notices" to the extent that it includes a convenient and prominently visible feature that (1) displays an appropriate copyright notice, and (2) tells the user that there is no warranty for the work (except to the extent that warranties are provided), that licensees may convey the work under this License, and how to view a copy of this License. If the interface presents a list of user commands or options, such as a menu, a prominent item in the list meets this criterion. - -1. Source Code. -The "source code" for a work means the preferred form of the work for making modifications to it. "Object code" means any non-source form of a work. -A "Standard Interface" means an interface that either is an official standard defined by a recognized standards body, or, in the case of interfaces specified for a particular programming language, one that is widely used among developers working in that language. - -The "System Libraries" of an executable work include anything, other than the work as a whole, that (a) is included in the normal form of packaging a Major Component, but which is not part of that Major Component, and (b) serves only to enable use of the work with that Major Component, or to implement a Standard Interface for which an implementation is available to the public in source code form. A "Major Component", in this context, means a major essential component (kernel, window system, and so on) of the specific operating system (if any) on which the executable work runs, or a compiler used to produce the work, or an object code interpreter used to run it. - -The "Corresponding Source" for a work in object code form means all the source code needed to generate, install, and (for an executable work) run the object code and to modify the work, including scripts to control those activities. However, it does not include the work's System Libraries, or general-purpose tools or generally available free programs which are used unmodified in performing those activities but which are not part of the work. For example, Corresponding Source includes interface definition files associated with source files for the work, and the source code for shared libraries and dynamically linked subprograms that the work is specifically designed to require, such as by intimate data communication or control flow between those subprograms and other parts of the work. - -The Corresponding Source need not include anything that users can regenerate automatically from other parts of the Corresponding Source. - -The Corresponding Source for a work in source code form is that same work. - -2. Basic Permissions. -All rights granted under this License are granted for the term of copyright on the Program, and are irrevocable provided the stated conditions are met. This License explicitly affirms your unlimited permission to run the unmodified Program. The output from running a covered work is covered by this License only if the output, given its content, constitutes a covered work. This License acknowledges your rights of fair use or other equivalent, as provided by copyright law. -You may make, run and propagate covered works that you do not convey, without conditions so long as your license otherwise remains in force. You may convey covered works to others for the sole purpose of having them make modifications exclusively for you, or provide you with facilities for running those works, provided that you comply with the terms of this License in conveying all material for which you do not control copyright. Those thus making or running the covered works for you must do so exclusively on your behalf, under your direction and control, on terms that prohibit them from making any copies of your copyrighted material outside their relationship with you. - -Conveying under any other circumstances is permitted solely under the conditions stated below. Sublicensing is not allowed; section 10 makes it unnecessary. - -3. Protecting Users' Legal Rights From Anti-Circumvention Law. -No covered work shall be deemed part of an effective technological measure under any applicable law fulfilling obligations under article 11 of the WIPO copyright treaty adopted on 20 December 1996, or similar laws prohibiting or restricting circumvention of such measures. -When you convey a covered work, you waive any legal power to forbid circumvention of technological measures to the extent such circumvention is effected by exercising rights under this License with respect to the covered work, and you disclaim any intention to limit operation or modification of the work as a means of enforcing, against the work's users, your or third parties' legal rights to forbid circumvention of technological measures. - -4. Conveying Verbatim Copies. -You may convey verbatim copies of the Program's source code as you receive it, in any medium, provided that you conspicuously and appropriately publish on each copy an appropriate copyright notice; keep intact all notices stating that this License and any non-permissive terms added in accord with section 7 apply to the code; keep intact all notices of the absence of any warranty; and give all recipients a copy of this License along with the Program. -You may charge any price or no price for each copy that you convey, and you may offer support or warranty protection for a fee. - -5. Conveying Modified Source Versions. -You may convey a work based on the Program, or the modifications to produce it from the Program, in the form of source code under the terms of section 4, provided that you also meet all of these conditions: -a) The work must carry prominent notices stating that you modified it, and giving a relevant date. -b) The work must carry prominent notices stating that it is released under this License and any conditions added under section 7. This requirement modifies the requirement in section 4 to "keep intact all notices". -c) You must license the entire work, as a whole, under this License to anyone who comes into possession of a copy. This License will therefore apply, along with any applicable section 7 additional terms, to the whole of the work, and all its parts, regardless of how they are packaged. This License gives no permission to license the work in any other way, but it does not invalidate such permission if you have separately received it. -d) If the work has interactive user interfaces, each must display Appropriate Legal Notices; however, if the Program has interactive interfaces that do not display Appropriate Legal Notices, your work need not make them do so. -A compilation of a covered work with other separate and independent works, which are not by their nature extensions of the covered work, and which are not combined with it such as to form a larger program, in or on a volume of a storage or distribution medium, is called an "aggregate" if the compilation and its resulting copyright are not used to limit the access or legal rights of the compilation's users beyond what the individual works permit. Inclusion of a covered work in an aggregate does not cause this License to apply to the other parts of the aggregate. - -6. Conveying Non-Source Forms. -You may convey a covered work in object code form under the terms of sections 4 and 5, provided that you also convey the machine-readable Corresponding Source under the terms of this License, in one of these ways: -a) Convey the object code in, or embodied in, a physical product (including a physical distribution medium), accompanied by the Corresponding Source fixed on a durable physical medium customarily used for software interchange. -b) Convey the object code in, or embodied in, a physical product (including a physical distribution medium), accompanied by a written offer, valid for at least three years and valid for as long as you offer spare parts or customer support for that product model, to give anyone who possesses the object code either (1) a copy of the Corresponding Source for all the software in the product that is covered by this License, on a durable physical medium customarily used for software interchange, for a price no more than your reasonable cost of physically performing this conveying of source, or (2) access to copy the Corresponding Source from a network server at no charge. -c) Convey individual copies of the object code with a copy of the written offer to provide the Corresponding Source. This alternative is allowed only occasionally and noncommercially, and only if you received the object code with such an offer, in accord with subsection 6b. -d) Convey the object code by offering access from a designated place (gratis or for a charge), and offer equivalent access to the Corresponding Source in the same way through the same place at no further charge. You need not require recipients to copy the Corresponding Source along with the object code. If the place to copy the object code is a network server, the Corresponding Source may be on a different server (operated by you or a third party) that supports equivalent copying facilities, provided you maintain clear directions next to the object code saying where to find the Corresponding Source. Regardless of what server hosts the Corresponding Source, you remain obligated to ensure that it is available for as long as needed to satisfy these requirements. -e) Convey the object code using peer-to-peer transmission, provided you inform other peers where the object code and Corresponding Source of the work are being offered to the general public at no charge under subsection 6d. -A separable portion of the object code, whose source code is excluded from the Corresponding Source as a System Library, need not be included in conveying the object code work. - -A "User Product" is either (1) a "consumer product", which means any tangible personal property which is normally used for personal, family, or household purposes, or (2) anything designed or sold for incorporation into a dwelling. In determining whether a product is a consumer product, doubtful cases shall be resolved in favor of coverage. For a particular product received by a particular user, "normally used" refers to a typical or common use of that class of product, regardless of the status of the particular user or of the way in which the particular user actually uses, or expects or is expected to use, the product. A product is a consumer product regardless of whether the product has substantial commercial, industrial or non-consumer uses, unless such uses represent the only significant mode of use of the product. - -"Installation Information" for a User Product means any methods, procedures, authorization keys, or other information required to install and execute modified versions of a covered work in that User Product from a modified version of its Corresponding Source. The information must suffice to ensure that the continued functioning of the modified object code is in no case prevented or interfered with solely because modification has been made. - -If you convey an object code work under this section in, or with, or specifically for use in, a User Product, and the conveying occurs as part of a transaction in which the right of possession and use of the User Product is transferred to the recipient in perpetuity or for a fixed term (regardless of how the transaction is characterized), the Corresponding Source conveyed under this section must be accompanied by the Installation Information. But this requirement does not apply if neither you nor any third party retains the ability to install modified object code on the User Product (for example, the work has been installed in ROM). - -The requirement to provide Installation Information does not include a requirement to continue to provide support service, warranty, or updates for a work that has been modified or installed by the recipient, or for the User Product in which it has been modified or installed. Access to a network may be denied when the modification itself materially and adversely affects the operation of the network or violates the rules and protocols for communication across the network. - -Corresponding Source conveyed, and Installation Information provided, in accord with this section must be in a format that is publicly documented (and with an implementation available to the public in source code form), and must require no special password or key for unpacking, reading or copying. - -7. Additional Terms. -"Additional permissions" are terms that supplement the terms of this License by making exceptions from one or more of its conditions. Additional permissions that are applicable to the entire Program shall be treated as though they were included in this License, to the extent that they are valid under applicable law. If additional permissions apply only to part of the Program, that part may be used separately under those permissions, but the entire Program remains governed by this License without regard to the additional permissions. -When you convey a copy of a covered work, you may at your option remove any additional permissions from that copy, or from any part of it. (Additional permissions may be written to require their own removal in certain cases when you modify the work.) You may place additional permissions on material, added by you to a covered work, for which you have or can give appropriate copyright permission. - -Notwithstanding any other provision of this License, for material you add to a covered work, you may (if authorized by the copyright holders of that material) supplement the terms of this License with terms: - -a) Disclaiming warranty or limiting liability differently from the terms of sections 15 and 16 of this License; or -b) Requiring preservation of specified reasonable legal notices or author attributions in that material or in the Appropriate Legal Notices displayed by works containing it; or -c) Prohibiting misrepresentation of the origin of that material, or requiring that modified versions of such material be marked in reasonable ways as different from the original version; or -d) Limiting the use for publicity purposes of names of licensors or authors of the material; or -e) Declining to grant rights under trademark law for use of some trade names, trademarks, or service marks; or -f) Requiring indemnification of licensors and authors of that material by anyone who conveys the material (or modified versions of it) with contractual assumptions of liability to the recipient, for any liability that these contractual assumptions directly impose on those licensors and authors. -All other non-permissive additional terms are considered "further restrictions" within the meaning of section 10. If the Program as you received it, or any part of it, contains a notice stating that it is governed by this License along with a term that is a further restriction, you may remove that term. If a license document contains a further restriction but permits relicensing or conveying under this License, you may add to a covered work material governed by the terms of that license document, provided that the further restriction does not survive such relicensing or conveying. - -If you add terms to a covered work in accord with this section, you must place, in the relevant source files, a statement of the additional terms that apply to those files, or a notice indicating where to find the applicable terms. - -Additional terms, permissive or non-permissive, may be stated in the form of a separately written license, or stated as exceptions; the above requirements apply either way. - -8. Termination. -You may not propagate or modify a covered work except as expressly provided under this License. Any attempt otherwise to propagate or modify it is void, and will automatically terminate your rights under this License (including any patent licenses granted under the third paragraph of section 11). -However, if you cease all violation of this License, then your license from a particular copyright holder is reinstated (a) provisionally, unless and until the copyright holder explicitly and finally terminates your license, and (b) permanently, if the copyright holder fails to notify you of the violation by some reasonable means prior to 60 days after the cessation. - -Moreover, your license from a particular copyright holder is reinstated permanently if the copyright holder notifies you of the violation by some reasonable means, this is the first time you have received notice of violation of this License (for any work) from that copyright holder, and you cure the violation prior to 30 days after your receipt of the notice. - -Termination of your rights under this section does not terminate the licenses of parties who have received copies or rights from you under this License. If your rights have been terminated and not permanently reinstated, you do not qualify to receive new licenses for the same material under section 10. - -9. Acceptance Not Required for Having Copies. -You are not required to accept this License in order to receive or run a copy of the Program. Ancillary propagation of a covered work occurring solely as a consequence of using peer-to-peer transmission to receive a copy likewise does not require acceptance. However, nothing other than this License grants you permission to propagate or modify any covered work. These actions infringe copyright if you do not accept this License. Therefore, by modifying or propagating a covered work, you indicate your acceptance of this License to do so. -10. Automatic Licensing of Downstream Recipients. -Each time you convey a covered work, the recipient automatically receives a license from the original licensors, to run, modify and propagate that work, subject to this License. You are not responsible for enforcing compliance by third parties with this License. -An "entity transaction" is a transaction transferring control of an organization, or substantially all assets of one, or subdividing an organization, or merging organizations. If propagation of a covered work results from an entity transaction, each party to that transaction who receives a copy of the work also receives whatever licenses to the work the party's predecessor in interest had or could give under the previous paragraph, plus a right to possession of the Corresponding Source of the work from the predecessor in interest, if the predecessor has it or can get it with reasonable efforts. - -You may not impose any further restrictions on the exercise of the rights granted or affirmed under this License. For example, you may not impose a license fee, royalty, or other charge for exercise of rights granted under this License, and you may not initiate litigation (including a cross-claim or counterclaim in a lawsuit) alleging that any patent claim is infringed by making, using, selling, offering for sale, or importing the Program or any portion of it. - -11. Patents. -A "contributor" is a copyright holder who authorizes use under this License of the Program or a work on which the Program is based. The work thus licensed is called the contributor's "contributor version". -A contributor's "essential patent claims" are all patent claims owned or controlled by the contributor, whether already acquired or hereafter acquired, that would be infringed by some manner, permitted by this License, of making, using, or selling its contributor version, but do not include claims that would be infringed only as a consequence of further modification of the contributor version. For purposes of this definition, "control" includes the right to grant patent sublicenses in a manner consistent with the requirements of this License. - -Each contributor grants you a non-exclusive, worldwide, royalty-free patent license under the contributor's essential patent claims, to make, use, sell, offer for sale, import and otherwise run, modify and propagate the contents of its contributor version. - -In the following three paragraphs, a "patent license" is any express agreement or commitment, however denominated, not to enforce a patent (such as an express permission to practice a patent or covenant not to sue for patent infringement). To "grant" such a patent license to a party means to make such an agreement or commitment not to enforce a patent against the party. - -If you convey a covered work, knowingly relying on a patent license, and the Corresponding Source of the work is not available for anyone to copy, free of charge and under the terms of this License, through a publicly available network server or other readily accessible means, then you must either (1) cause the Corresponding Source to be so available, or (2) arrange to deprive yourself of the benefit of the patent license for this particular work, or (3) arrange, in a manner consistent with the requirements of this License, to extend the patent license to downstream recipients. "Knowingly relying" means you have actual knowledge that, but for the patent license, your conveying the covered work in a country, or your recipient's use of the covered work in a country, would infringe one or more identifiable patents in that country that you have reason to believe are valid. - -If, pursuant to or in connection with a single transaction or arrangement, you convey, or propagate by procuring conveyance of, a covered work, and grant a patent license to some of the parties receiving the covered work authorizing them to use, propagate, modify or convey a specific copy of the covered work, then the patent license you grant is automatically extended to all recipients of the covered work and works based on it. - -A patent license is "discriminatory" if it does not include within the scope of its coverage, prohibits the exercise of, or is conditioned on the non-exercise of one or more of the rights that are specifically granted under this License. You may not convey a covered work if you are a party to an arrangement with a third party that is in the business of distributing software, under which you make payment to the third party based on the extent of your activity of conveying the work, and under which the third party grants, to any of the parties who would receive the covered work from you, a discriminatory patent license (a) in connection with copies of the covered work conveyed by you (or copies made from those copies), or (b) primarily for and in connection with specific products or compilations that contain the covered work, unless you entered into that arrangement, or that patent license was granted, prior to 28 March 2007. - -Nothing in this License shall be construed as excluding or limiting any implied license or other defenses to infringement that may otherwise be available to you under applicable patent law. - -12. No Surrender of Others' Freedom. -If conditions are imposed on you (whether by court order, agreement or otherwise) that contradict the conditions of this License, they do not excuse you from the conditions of this License. If you cannot convey a covered work so as to satisfy simultaneously your obligations under this License and any other pertinent obligations, then as a consequence you may not convey it at all. For example, if you agree to terms that obligate you to collect a royalty for further conveying from those to whom you convey the Program, the only way you could satisfy both those terms and this License would be to refrain entirely from conveying the Program. -13. Use with the GNU Affero General Public License. -Notwithstanding any other provision of this License, you have permission to link or combine any covered work with a work licensed under version 3 of the GNU Affero General Public License into a single combined work, and to convey the resulting work. The terms of this License will continue to apply to the part which is the covered work, but the special requirements of the GNU Affero General Public License, section 13, concerning interaction through a network will apply to the combination as such. -14. Revised Versions of this License. -The Free Software Foundation may publish revised and/or new versions of the GNU General Public License from time to time. Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns. -Each version is given a distinguishing version number. If the Program specifies that a certain numbered version of the GNU General Public License "or any later version" applies to it, you have the option of following the terms and conditions either of that numbered version or of any later version published by the Free Software Foundation. If the Program does not specify a version number of the GNU General Public License, you may choose any version ever published by the Free Software Foundation. - -If the Program specifies that a proxy can decide which future versions of the GNU General Public License can be used, that proxy's public statement of acceptance of a version permanently authorizes you to choose that version for the Program. - -Later license versions may give you additional or different permissions. However, no additional obligations are imposed on any author or copyright holder as a result of your choosing to follow a later version. - -15. Disclaimer of Warranty. -THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. -16. Limitation of Liability. -IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. -17. Interpretation of Sections 15 and 16. -If the disclaimer of warranty and limitation of liability provided above cannot be given local legal effect according to their terms, reviewing courts shall apply local law that most closely approximates an absolute waiver of all civil liability in connection with the Program, unless a warranty or assumption of liability accompanies a copy of the Program in return for a fee. - -END OF TERMS AND CONDITIONS - -How to Apply These Terms to Your New Programs - -If you develop a new program, and you want it to be of the greatest possible use to the public, the best way to achieve this is to make it free software which everyone can redistribute and change under these terms. - -To do so, attach the following notices to the program. It is safest to attach them to the start of each source file to most effectively state the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found. - - -Copyright (C) - -This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. - -This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - -You should have received a copy of the GNU General Public License along with this program. If not, see . - -Also add information on how to contact you by electronic and paper mail. - -If the program does terminal interaction, make it output a short notice like this when it starts in an interactive mode: - - Copyright (C) -This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. -This is free software, and you are welcome to redistribute it under certain conditions; type `show c' for details. - -The hypothetical commands `show w' and `show c' should show the appropriate parts of the General Public License. Of course, your program's commands might be different; for a GUI interface, you would use an "about box". - -You should also get your employer (if you work as a programmer) or school, if any, to sign a "copyright disclaimer" for the program, if necessary. For more information on this, and how to apply and follow the GNU GPL, see . - -The GNU General Public License does not permit incorporating your program into proprietary programs. If your program is a subroutine library, you may consider it more useful to permit linking proprietary applications with the library. If this is what you want to do, use the GNU Lesser General Public License instead of this License. But first, please read . diff --git a/configuration/projectmanagement/package.json b/configuration/projectmanagement/package.json index 8ab2e167..ecafb40f 100644 --- a/configuration/projectmanagement/package.json +++ b/configuration/projectmanagement/package.json @@ -13,23 +13,18 @@ "Rainer Killinger ", "Thea Schöbl " ], - "prettier": "@openstapps/prettier-config", "main": "lib/common.js", + "types": "lib/common.d.ts", "bin": { "openstapps-projectmanagement": "app.js" }, "scripts": { - "build": "npm run lint && npm run compile", - "check-configuration": "openstapps-configuration", - "compile": "rimraf lib && tsc", - "documentation": "typedoc --out docs --readme README.md --listInvalidSymbolLinks --entryPointStrategy expand src", + "build": "tsup --dts", + "format": "prettier .", "format:fix": "prettier --write .", "lint": "eslint --ext .ts src/", - "prepublishOnly": "npm ci && npm run build && npm run test", - "preversion": "npm run prepublishOnly", - "push": "git push && git push origin \"v$npm_package_version\"", - "test": "nyc mocha --require ts-node/register 'test/**/*.spec.ts'", - "version": "conventional-changelog -p angular -i CHANGELOG.md -s -r 0 && git add CHANGELOG.md" + "lint:fix": "eslint --fix --ext .ts src/", + "test": "nyc mocha 'test/**/*.spec.ts'" }, "dependencies": { "@openstapps/gitlab-api": "workspace:*", @@ -37,14 +32,15 @@ "@slack/web-api": "6.8.1", "commander": "10.0.0", "date-fns": "2.29.3", - "glob": "8.1.0", + "glob": "10.2.1", "mustache": "4.2.0", "tmp": "0.2.1" }, "devDependencies": { - "@openstapps/configuration": "workspace:*", "@openstapps/eslint-config": "workspace:*", + "@openstapps/nyc-config": "workspace:*", "@openstapps/prettier-config": "workspace:*", + "@openstapps/tsconfig": "workspace:*", "@testdeck/mocha": "0.3.3", "@types/chai": "4.3.4", "@types/chai-as-promised": "7.1.5", @@ -53,48 +49,31 @@ "@types/mustache": "4.2.2", "@types/node": "18.15.3", "@types/tmp": "0.2.3", - "@typescript-eslint/eslint-plugin": "5.49.0", - "@typescript-eslint/parser": "5.49.0", "chai": "4.3.7", "chai-as-promised": "7.1.1", - "conventional-changelog-cli": "2.2.2", - "eslint": "8.33.0", - "eslint-config-prettier": "8.6.0", - "eslint-plugin-jsdoc": "39.7.4", - "eslint-plugin-prettier": "4.2.1", - "eslint-plugin-unicorn": "45.0.2", "mocha": "10.2.0", "nyc": "15.1.0", - "prettier": "2.8.3", - "rimraf": "4.4.0", "ts-node": "10.9.1", - "typedoc": "0.23.26", + "tsup": "6.7.0", "typescript": "4.8.4" }, - "nyc": { - "all": true, - "branches": 95, - "check-coverage": true, - "exclude": [ - "src/cli.ts" + "tsup": { + "entry": [ + "src/app.ts", + "src/common.ts" ], - "extension": [ - ".ts" - ], - "functions": 95, - "include": [ - "src/tasks/get-used-version.ts" - ], - "lines": 95, - "per-file": true, - "reporter": [ - "html", - "text-summary" - ], - "require": [ - "ts-node/register" - ], - "statements": 95 + "sourcemap": true, + "clean": true, + "format": "esm", + "outDir": "lib" }, - "typings": "lib/common.d.ts" + "prettier": "@openstapps/prettier-config", + "eslintConfig": { + "extends": [ + "@openstapps" + ] + }, + "nyc": { + "extends": "@openstapps/nyc-config" + } } diff --git a/configuration/projectmanagement/src/common.ts b/configuration/projectmanagement/src/common.ts index c6b75677..2ae6c61d 100644 --- a/configuration/projectmanagement/src/common.ts +++ b/configuration/projectmanagement/src/common.ts @@ -12,8 +12,7 @@ * You should have received a copy of the GNU General Public License along with * this program. If not, see . */ -import {Api} from '@openstapps/gitlab-api'; -import {Project} from '@openstapps/gitlab-api/lib/types.js'; +import {Api, Project} from '@openstapps/gitlab-api'; import {Logger} from '@openstapps/logger'; /** diff --git a/configuration/projectmanagement/tsconfig.json b/configuration/projectmanagement/tsconfig.json index 066a5f38..579a39ff 100644 --- a/configuration/projectmanagement/tsconfig.json +++ b/configuration/projectmanagement/tsconfig.json @@ -1,3 +1,3 @@ { - "extends": "./node_modules/@openstapps/configuration/tsconfig.json" + "extends": "@openstapps/tsconfig" } diff --git a/configuration/tsconfig/package.json b/configuration/tsconfig/package.json new file mode 100644 index 00000000..777362ba --- /dev/null +++ b/configuration/tsconfig/package.json @@ -0,0 +1,10 @@ +{ + "name": "@openstapps/tsconfig", + "description": "The tsconfig for the openstapps project", + "version": "2.1.0", + "type": "commonjs", + "license": "GPL-3.0-only", + "repository": "git@gitlab.com:openstapps/eslint-config.git", + "author": "Thea Schöbl", + "main": "tsconfig.json" +} diff --git a/configuration/configuration/tsconfig.json b/configuration/tsconfig/tsconfig.json similarity index 100% rename from configuration/configuration/tsconfig.json rename to configuration/tsconfig/tsconfig.json diff --git a/examples/minimal-connector/.editorconfig b/examples/minimal-connector/.editorconfig deleted file mode 100644 index 9a4062a7..00000000 --- a/examples/minimal-connector/.editorconfig +++ /dev/null @@ -1,15 +0,0 @@ -# editorconfig.org - -root = true - -[*] -indent_style = space -indent_size = 2 - -end_of_line = lf -charset = utf-8 -trim_trailing_whitespace = true -insert_final_newline = true - -[*.md] -trim_trailing_whitespace = false diff --git a/examples/minimal-connector/.gitlab/issue_templates/bug.md b/examples/minimal-connector/.gitlab/issue_templates/bug.md index f46f50ae..4ef365a8 100644 --- a/examples/minimal-connector/.gitlab/issue_templates/bug.md +++ b/examples/minimal-connector/.gitlab/issue_templates/bug.md @@ -2,35 +2,29 @@ (Summarize the bug encountered concisely) - ## Steps to reproduce (How one can reproduce the issue - this is very important) - ## Example Project (If possible, please create an example project here on GitLab.com that exhibits the problematic behaviour, and link to it here in the bug report) (If you are using an older version of GitLab, this will also determine whether the bug has been fixed in a more recent version) - ## What is the current bug behavior? (What actually happens) - ## What is the expected correct behavior? (What you should see instead) - ## Relevant logs and/or screenshots (Paste any relevant logs - please use code blocks (```) to format console output, logs, and code as it's very hard to read otherwise.) - ## Possible fixes (If you can, link to the line of code that might be responsible for the problem) diff --git a/examples/minimal-connector/.gitlab/issue_templates/feature.md b/examples/minimal-connector/.gitlab/issue_templates/feature.md index cb9b0517..e80ae1df 100644 --- a/examples/minimal-connector/.gitlab/issue_templates/feature.md +++ b/examples/minimal-connector/.gitlab/issue_templates/feature.md @@ -2,15 +2,12 @@ (Describe the feature that you're requesting concisely) - ## Explanation (Explain why the feature is necessary) - ## Dependencies, issues to be resolved beforehand (List issues or dependencies that need to be resolved before this feature can be implemented) - /label ~meeting diff --git a/examples/minimal-connector/CHANGELOG.md b/examples/minimal-connector/CHANGELOG.md index e6f75043..6b1f9113 100644 --- a/examples/minimal-connector/CHANGELOG.md +++ b/examples/minimal-connector/CHANGELOG.md @@ -1,21 +1,11 @@ # [0.2.0](https://gitlab.com/openstapps/minimal-connector/compare/v0.1.0...v0.2.0) (2019-02-07) - - # [0.1.0](https://gitlab.com/openstapps/minimal-connector/compare/v0.0.2...v0.1.0) (2019-01-30) - - ## [0.0.2](https://gitlab.com/openstapps/minimal-connector/compare/v0.0.1...v0.0.2) (2018-12-03) - - ## [0.0.1](https://gitlab.com/openstapps/minimal-connector/compare/d332f6e...v0.0.1) (2018-12-03) - ### Features -* add minimal connector ([d332f6e](https://gitlab.com/openstapps/minimal-connector/commit/d332f6e)) - - - +- add minimal connector ([d332f6e](https://gitlab.com/openstapps/minimal-connector/commit/d332f6e)) diff --git a/examples/minimal-connector/README.md b/examples/minimal-connector/README.md index 41993322..af89f593 100644 --- a/examples/minimal-connector/README.md +++ b/examples/minimal-connector/README.md @@ -2,23 +2,26 @@ ## Prerequisites: -* `node` (version 10 LTS) and `npm` installed +- `node` (version 10 LTS) and `npm` installed -* a backend, which is running locally (on http://localhost:3000) – for testing purposes, it is advisable to use `minimal-deployment` project +- a backend, which is running locally (on http://localhost:3000) – for testing purposes, it is advisable to use `minimal-deployment` project ## How to get started To install all needed `npm` packages: + ```shell npm install ``` To prepare the script to be executed, run: + ```shell npm run build ``` To execute the code in "CLI" script (basically to execute the connector): + ```shell node lib/cli.js run e.g.: @@ -26,6 +29,7 @@ node lib/cli.js run http://localhost:3000 minimal-connector f-u ``` To run some sample tests, use: + ```shell npm test ``` @@ -33,11 +37,13 @@ npm test The `npm` scripts are defined in `package.json` file. After building the project once, the connector image can be build. + ```shell docker build . ``` Use the following command to run the container of this connector. Assuming there is a local backend running. + ```shell docker run --network host e.g.: @@ -53,8 +59,9 @@ docker run --network host registry.gitlab.com/openstapps/minimal-connector http: ## Next steps You may want to: -* modify the convenience methods in the `minimal-connector/api` to your needs. -* add additional options to your cli. + +- modify the convenience methods in the `minimal-connector/api` to your needs. +- add additional options to your cli. Explore open source connectors from other schools to get some ideas. @@ -66,16 +73,17 @@ Explore open source connectors from other schools to get some ideas. ## Code structure Folder [src](src/) contains: -* Reference implementations for CLI and a connector, using the api-classes. -* [/cli.ts](src/cli.ts) - * minimal CLI to start your connector, that uses CLI-args, so that there are no hard coded values for configuration. - * will execute the specified connectors and push the data to the backend -* [/common.ts](src/api/Connector.ts) - * `createUUID`, that will generate a unique id for a given identifying object - * `executeConnector`, that will execute the connector, which will fetch the items and push them to the backend -* [/Connector.ts](src/api/Connector.ts) abstracts the process of executing your specific connector and creating unique ids for the imported items -* [/MinimalConnector.ts](src/MinimalConnector.ts) example connector with mock-up data - * shows how to instantiate things - * shows how to use the convenience functions + +- Reference implementations for CLI and a connector, using the api-classes. +- [/cli.ts](src/cli.ts) + - minimal CLI to start your connector, that uses CLI-args, so that there are no hard coded values for configuration. + - will execute the specified connectors and push the data to the backend +- [/common.ts](src/api/Connector.ts) + - `createUUID`, that will generate a unique id for a given identifying object + - `executeConnector`, that will execute the connector, which will fetch the items and push them to the backend +- [/Connector.ts](src/api/Connector.ts) abstracts the process of executing your specific connector and creating unique ids for the imported items +- [/MinimalConnector.ts](src/MinimalConnector.ts) example connector with mock-up data + - shows how to instantiate things + - shows how to use the convenience functions File [test/MinimalConnector.spec.ts](test/MinimalConnector.spec.ts) contains sample test suite using `mocha` and `chai`. diff --git a/examples/minimal-connector/app.js b/examples/minimal-connector/app.js index d233e644..1bda7715 100644 --- a/examples/minimal-connector/app.js +++ b/examples/minimal-connector/app.js @@ -1,2 +1,2 @@ #!/usr/bin/env node -import './lib/cli.js' +import './lib/cli.js'; diff --git a/examples/minimal-connector/package.json b/examples/minimal-connector/package.json index 621c73ae..2202d804 100644 --- a/examples/minimal-connector/package.json +++ b/examples/minimal-connector/package.json @@ -15,17 +15,12 @@ "main": "lib/cli.js", "types": "lib/index.d.ts", "scripts": { - "build": "npm run compile", - "changelog": "conventional-changelog -p angular -i CHANGELOG.md -s -r 0 && git add CHANGELOG.md && git commit -m 'docs: update changelog'", - "check-configuration": "openstapps-configuration", - "compile": "rimraf lib && tsc", - "documentation": "typedoc --includeDeclarations --mode modules --out docs --readme README.md --listInvalidSymbolLinks src", - "lint": "tslint -p tsconfig.json -c tslint.json 'src/**/*.ts'", - "postversion": "npm run changelog", - "prepublishOnly": "npm ci && npm run build", - "preversion": "npm run prepublishOnly", - "push": "git push && git push origin \"v$npm_package_version\"", - "test": "nyc mocha --require ts-node/register --require source-map-support/register --recursive 'test/*.spec.ts'" + "build": "tsup --dts", + "format": "prettier .", + "format:fix": "prettier --write .", + "lint": "eslint --ext .ts src/", + "lint:fix": "eslint --fix --ext .ts src/", + "test": "nyc mocha 'test/**/*.spec.ts'" }, "dependencies": { "@openstapps/api": "workspace:*", @@ -34,8 +29,11 @@ "commander": "10.0.0" }, "devDependencies": { - "@openstapps/configuration": "workspace:*", "@openstapps/core-tools": "workspace:*", + "@openstapps/eslint-config": "workspace:*", + "@openstapps/nyc-config": "workspace:*", + "@openstapps/prettier-config": "workspace:*", + "@openstapps/tsconfig": "workspace:*", "@testdeck/mocha": "0.3.3", "@types/chai": "4.3.4", "@types/chai-as-promised": "7.1.5", @@ -47,38 +45,26 @@ "mocha": "10.2.0", "nock": "13.3.0", "nyc": "15.1.0", - "rimraf": "4.4.0", "ts-node": "10.9.1", - "typedoc": "0.23.26", + "tsup": "6.7.0", "typescript": "4.8.4" }, - "nyc": { - "all": true, - "branches": 95, - "check-coverage": true, - "exclude": [ - "src/test/**/*.spec.ts", + "tsup": { + "entry": [ "src/cli.ts" ], - "extension": [ - ".ts" - ], - "functions": 95, - "include": [ - "src" - ], - "lines": 95, - "per-file": true, - "reporter": [ - "html", - "text-summary" - ], - "require": [ - "ts-node/register" - ], - "statements": 95 + "sourcemap": true, + "clean": true, + "format": "esm", + "outDir": "lib" }, - "openstappsConfiguration": { - "forPackaging": false + "prettier": "@openstapps/prettier-config", + "eslintConfig": { + "extends": [ + "@openstapps" + ] + }, + "nyc": { + "extends": "@openstapps/nyc-config" } } diff --git a/examples/minimal-connector/src/cli.ts b/examples/minimal-connector/src/cli.ts index 988e28df..572e8ffe 100644 --- a/examples/minimal-connector/src/cli.ts +++ b/examples/minimal-connector/src/cli.ts @@ -19,14 +19,11 @@ import {join} from 'path'; import {executeConnector, isValidSCNamespace} from './common.js'; import {MinimalConnector} from './minimal-connector.js'; -process.on('unhandledRejection', (error) => { +process.on('unhandledRejection', error => { throw error; }); -const connectorVersion = JSON.parse( - readFileSync(join(__dirname, '..', 'package.json')) - .toString(), -).version; +const connectorVersion = JSON.parse(readFileSync(join(__dirname, '..', 'package.json')).toString()).version; const commander = new Command(); @@ -41,25 +38,25 @@ commander .command('run ') .version(connectorVersion) .action(async (backendURL: string, origin: string, licensePlate: string) => { + if (backendURL.length === 0) { + throw new Error('Param "backend" needs to have a length greater zero.'); + } + const originRegex = /^[a-z\-\_0-9]+$/; + if (!originRegex.test(origin)) { + throw new Error( + 'Origin name can only consist of lowercase letters from a-z, "-", "_" and integer numbers.', + ); + } - if (backendURL.length === 0) { - throw new Error('Param "backend" needs to have a length greater zero.'); - } - const originRegex = /^[a-z\-\_0-9]+$/; - if (!originRegex.test(origin)) { - throw new Error('Origin name can only consist of lowercase letters from a-z, "-", "_" and integer numbers.'); - } + if (!isValidSCNamespace(licensePlate)) { + throw new Error('Not a valid license plate. Please register a namespace with a unique-id in "core"'); + } - if (!isValidSCNamespace(licensePlate)) { - throw new Error('Not a valid license plate. Please register a namespace with a unique-id in "core"'); - } + // TODO for connector-developers: set your connector here + const connector = new MinimalConnector(licensePlate, origin); - // TODO for connector-developers: set your connector here - const connector = new MinimalConnector(licensePlate, origin); - - await executeConnector(backendURL, connector); - Logger.ok('Done'); - }, - ); + await executeConnector(backendURL, connector); + Logger.ok('Done'); + }); commander.parse(process.argv); diff --git a/examples/minimal-connector/src/common.ts b/examples/minimal-connector/src/common.ts index 8c291f93..56906819 100644 --- a/examples/minimal-connector/src/common.ts +++ b/examples/minimal-connector/src/common.ts @@ -14,11 +14,7 @@ */ import {ConnectorClient} from '@openstapps/api/lib/connector-client.js'; import {HttpClient} from '@openstapps/api/lib/http-client.js'; -import { - SCLicensePlate, - SCNamespaces, - SCThings, -} from '@openstapps/core'; +import {SCLicensePlate, SCNamespaces, SCThings} from '@openstapps/core'; import {Connector} from './connector.js'; /** @@ -27,8 +23,7 @@ import {Connector} from './connector.js'; * @param input Name of the potential SCNamespace */ export function isValidSCNamespace(input: string): input is SCLicensePlate { - return Object.keys(SCNamespaces) - .indexOf(input) > 0; + return Object.keys(SCNamespaces).indexOf(input) > 0; } /** @@ -50,15 +45,9 @@ export function createUUID(itemIdentifier: unknown, licensePlate: SCLicensePlate * @param backend URL of the StApps backend eployment * @param connector Connector to be executed */ -export async function executeConnector( - backend: string, - connector: Connector, -) { +export async function executeConnector(backend: string, connector: Connector) { const items: T[] = await connector.getItems(); - const client: ConnectorClient = new ConnectorClient( - new HttpClient(), - backend, - ); + const client: ConnectorClient = new ConnectorClient(new HttpClient(), backend); try { await client.index(items, connector.origin); } catch (err) { diff --git a/examples/minimal-connector/test/common.spec.ts b/examples/minimal-connector/test/common.spec.ts index 9bc2917f..349b57ec 100644 --- a/examples/minimal-connector/test/common.spec.ts +++ b/examples/minimal-connector/test/common.spec.ts @@ -40,9 +40,9 @@ export class CommonSpec { @test testCreateUUID() { const item = { - type: 'Not even a thing' + type: 'Not even a thing', }; - expect(createUUID(item,'f-u')).to.equal('3ac2b548-75d3-5326-920a-241e514fe445'); + expect(createUUID(item, 'f-u')).to.equal('3ac2b548-75d3-5326-920a-241e514fe445'); // ID was generated once before! } @@ -57,18 +57,14 @@ export class CommonSpec { uid: '744321ca-cc95-4967-b8df-42c98b792db6', }; - nock('http://localhost:3000') - .post('/bulk') - .reply(200, bulkOpen); + nock('http://localhost:3000').post('/bulk').reply(200, bulkOpen); const nockBulkAdd = nock('http://localhost:3000') - .post('/bulk/744321ca-cc95-4967-b8df-42c98b792db6') - .reply(201, {}) - .persist(); // otherwise consumed! + .post('/bulk/744321ca-cc95-4967-b8df-42c98b792db6') + .reply(201, {}) + .persist(); // otherwise consumed! - nock('http://localhost:3000') - .post('/bulk/744321ca-cc95-4967-b8df-42c98b792db6/done') - .reply(204, {}); + nock('http://localhost:3000').post('/bulk/744321ca-cc95-4967-b8df-42c98b792db6/done').reply(204, {}); // should succeed expect(await CommonSpec.runExecuteConnector()).to.equal(true); @@ -77,17 +73,16 @@ export class CommonSpec { // should fail due to nockBulkAdd being consumed expect(await CommonSpec.runExecuteConnector()).to.equal(false); - } /** * Executes the connector */ static async runExecuteConnector(): Promise { - try{ - await executeConnector('http://localhost:3000', CommonSpec.connector) + try { + await executeConnector('http://localhost:3000', CommonSpec.connector); return true; - }catch(err){ + } catch (err) { return false; } } diff --git a/examples/minimal-connector/test/connector.spec.ts b/examples/minimal-connector/test/connector.spec.ts index c694160a..05168611 100644 --- a/examples/minimal-connector/test/connector.spec.ts +++ b/examples/minimal-connector/test/connector.spec.ts @@ -35,11 +35,12 @@ export class ConnectorSpec { @test async testAutomaticMissingUIDGeneration() { - const uuidRegExp = new RegExp('^[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$'); + const uuidRegExp = new RegExp( + '^[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$', + ); const messages = await ConnectorSpec.connector.getItems(); - for(const message of messages){ + for (const message of messages) { expect(message.uid).to.match(uuidRegExp); } } - } diff --git a/examples/minimal-connector/test/minimal-connector.spec.ts b/examples/minimal-connector/test/minimal-connector.spec.ts index dd5b2dc5..434021a4 100644 --- a/examples/minimal-connector/test/minimal-connector.spec.ts +++ b/examples/minimal-connector/test/minimal-connector.spec.ts @@ -66,12 +66,10 @@ export class MinimalConnectorSpec { @test getSampleThings() { - return MinimalConnectorSpec.connector - .getItems() - .then((items: T[]) => { - if (items.length > 0) { - MinimalConnectorSpec.validateThings(items); - } - }); + return MinimalConnectorSpec.connector.getItems().then((items: T[]) => { + if (items.length > 0) { + MinimalConnectorSpec.validateThings(items); + } + }); } } diff --git a/examples/minimal-connector/tsconfig.json b/examples/minimal-connector/tsconfig.json index 066a5f38..579a39ff 100644 --- a/examples/minimal-connector/tsconfig.json +++ b/examples/minimal-connector/tsconfig.json @@ -1,3 +1,3 @@ { - "extends": "./node_modules/@openstapps/configuration/tsconfig.json" + "extends": "@openstapps/tsconfig" } diff --git a/examples/minimal-plugin/.editorconfig b/examples/minimal-plugin/.editorconfig deleted file mode 100644 index 9a4062a7..00000000 --- a/examples/minimal-plugin/.editorconfig +++ /dev/null @@ -1,15 +0,0 @@ -# editorconfig.org - -root = true - -[*] -indent_style = space -indent_size = 2 - -end_of_line = lf -charset = utf-8 -trim_trailing_whitespace = true -insert_final_newline = true - -[*.md] -trim_trailing_whitespace = false diff --git a/examples/minimal-plugin/.gitattributes b/examples/minimal-plugin/.gitattributes deleted file mode 100644 index bdb0cabc..00000000 --- a/examples/minimal-plugin/.gitattributes +++ /dev/null @@ -1,17 +0,0 @@ -# Auto detect text files and perform LF normalization -* text=auto - -# Custom for Visual Studio -*.cs diff=csharp - -# Standard to msysgit -*.doc diff=astextplain -*.DOC diff=astextplain -*.docx diff=astextplain -*.DOCX diff=astextplain -*.dot diff=astextplain -*.DOT diff=astextplain -*.pdf diff=astextplain -*.PDF diff=astextplain -*.rtf diff=astextplain -*.RTF diff=astextplain diff --git a/examples/minimal-plugin/LICENSE b/examples/minimal-plugin/LICENSE deleted file mode 100644 index 9df63ccc..00000000 --- a/examples/minimal-plugin/LICENSE +++ /dev/null @@ -1,200 +0,0 @@ -GNU GENERAL PUBLIC LICENSE -Version 3, 29 June 2007 - -Copyright © 2007 Free Software Foundation, Inc. - -Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. - -Preamble - -The GNU General Public License is a free, copyleft license for software and other kinds of works. - -The licenses for most software and other practical works are designed to take away your freedom to share and change the works. By contrast, the GNU General Public License is intended to guarantee your freedom to share and change all versions of a program--to make sure it remains free software for all its users. We, the Free Software Foundation, use the GNU General Public License for most of our software; it applies also to any other work released this way by its authors. You can apply it to your programs, too. - -When we speak of free software, we are referring to freedom, not price. Our General Public Licenses are designed to make sure that you have the freedom to distribute copies of free software (and charge for them if you wish), that you receive source code or can get it if you want it, that you can change the software or use pieces of it in new free programs, and that you know you can do these things. - -To protect your rights, we need to prevent others from denying you these rights or asking you to surrender the rights. Therefore, you have certain responsibilities if you distribute copies of the software, or if you modify it: responsibilities to respect the freedom of others. - -For example, if you distribute copies of such a program, whether gratis or for a fee, you must pass on to the recipients the same freedoms that you received. You must make sure that they, too, receive or can get the source code. And you must show them these terms so they know their rights. - -Developers that use the GNU GPL protect your rights with two steps: (1) assert copyright on the software, and (2) offer you this License giving you legal permission to copy, distribute and/or modify it. - -For the developers' and authors' protection, the GPL clearly explains that there is no warranty for this free software. For both users' and authors' sake, the GPL requires that modified versions be marked as changed, so that their problems will not be attributed erroneously to authors of previous versions. - -Some devices are designed to deny users access to install or run modified versions of the software inside them, although the manufacturer can do so. This is fundamentally incompatible with the aim of protecting users' freedom to change the software. The systematic pattern of such abuse occurs in the area of products for individuals to use, which is precisely where it is most unacceptable. Therefore, we have designed this version of the GPL to prohibit the practice for those products. If such problems arise substantially in other domains, we stand ready to extend this provision to those domains in future versions of the GPL, as needed to protect the freedom of users. - -Finally, every program is threatened constantly by software patents. States should not allow patents to restrict development and use of software on general-purpose computers, but in those that do, we wish to avoid the special danger that patents applied to a free program could make it effectively proprietary. To prevent this, the GPL assures that patents cannot be used to render the program non-free. - -The precise terms and conditions for copying, distribution and modification follow. - -TERMS AND CONDITIONS - -0. Definitions. -"This License" refers to version 3 of the GNU General Public License. - -"Copyright" also means copyright-like laws that apply to other kinds of works, such as semiconductor masks. - -"The Program" refers to any copyrightable work licensed under this License. Each licensee is addressed as "you". "Licensees" and "recipients" may be individuals or organizations. - -To "modify" a work means to copy from or adapt all or part of the work in a fashion requiring copyright permission, other than the making of an exact copy. The resulting work is called a "modified version" of the earlier work or a work "based on" the earlier work. - -A "covered work" means either the unmodified Program or a work based on the Program. - -To "propagate" a work means to do anything with it that, without permission, would make you directly or secondarily liable for infringement under applicable copyright law, except executing it on a computer or modifying a private copy. Propagation includes copying, distribution (with or without modification), making available to the public, and in some countries other activities as well. - -To "convey" a work means any kind of propagation that enables other parties to make or receive copies. Mere interaction with a user through a computer network, with no transfer of a copy, is not conveying. - -An interactive user interface displays "Appropriate Legal Notices" to the extent that it includes a convenient and prominently visible feature that (1) displays an appropriate copyright notice, and (2) tells the user that there is no warranty for the work (except to the extent that warranties are provided), that licensees may convey the work under this License, and how to view a copy of this License. If the interface presents a list of user commands or options, such as a menu, a prominent item in the list meets this criterion. - -1. Source Code. -The "source code" for a work means the preferred form of the work for making modifications to it. "Object code" means any non-source form of a work. -A "Standard Interface" means an interface that either is an official standard defined by a recognized standards body, or, in the case of interfaces specified for a particular programming language, one that is widely used among developers working in that language. - -The "System Libraries" of an executable work include anything, other than the work as a whole, that (a) is included in the normal form of packaging a Major Component, but which is not part of that Major Component, and (b) serves only to enable use of the work with that Major Component, or to implement a Standard Interface for which an implementation is available to the public in source code form. A "Major Component", in this context, means a major essential component (kernel, window system, and so on) of the specific operating system (if any) on which the executable work runs, or a compiler used to produce the work, or an object code interpreter used to run it. - -The "Corresponding Source" for a work in object code form means all the source code needed to generate, install, and (for an executable work) run the object code and to modify the work, including scripts to control those activities. However, it does not include the work's System Libraries, or general-purpose tools or generally available free programs which are used unmodified in performing those activities but which are not part of the work. For example, Corresponding Source includes interface definition files associated with source files for the work, and the source code for shared libraries and dynamically linked subprograms that the work is specifically designed to require, such as by intimate data communication or control flow between those subprograms and other parts of the work. - -The Corresponding Source need not include anything that users can regenerate automatically from other parts of the Corresponding Source. - -The Corresponding Source for a work in source code form is that same work. - -2. Basic Permissions. -All rights granted under this License are granted for the term of copyright on the Program, and are irrevocable provided the stated conditions are met. This License explicitly affirms your unlimited permission to run the unmodified Program. The output from running a covered work is covered by this License only if the output, given its content, constitutes a covered work. This License acknowledges your rights of fair use or other equivalent, as provided by copyright law. -You may make, run and propagate covered works that you do not convey, without conditions so long as your license otherwise remains in force. You may convey covered works to others for the sole purpose of having them make modifications exclusively for you, or provide you with facilities for running those works, provided that you comply with the terms of this License in conveying all material for which you do not control copyright. Those thus making or running the covered works for you must do so exclusively on your behalf, under your direction and control, on terms that prohibit them from making any copies of your copyrighted material outside their relationship with you. - -Conveying under any other circumstances is permitted solely under the conditions stated below. Sublicensing is not allowed; section 10 makes it unnecessary. - -3. Protecting Users' Legal Rights From Anti-Circumvention Law. -No covered work shall be deemed part of an effective technological measure under any applicable law fulfilling obligations under article 11 of the WIPO copyright treaty adopted on 20 December 1996, or similar laws prohibiting or restricting circumvention of such measures. -When you convey a covered work, you waive any legal power to forbid circumvention of technological measures to the extent such circumvention is effected by exercising rights under this License with respect to the covered work, and you disclaim any intention to limit operation or modification of the work as a means of enforcing, against the work's users, your or third parties' legal rights to forbid circumvention of technological measures. - -4. Conveying Verbatim Copies. -You may convey verbatim copies of the Program's source code as you receive it, in any medium, provided that you conspicuously and appropriately publish on each copy an appropriate copyright notice; keep intact all notices stating that this License and any non-permissive terms added in accord with section 7 apply to the code; keep intact all notices of the absence of any warranty; and give all recipients a copy of this License along with the Program. -You may charge any price or no price for each copy that you convey, and you may offer support or warranty protection for a fee. - -5. Conveying Modified Source Versions. -You may convey a work based on the Program, or the modifications to produce it from the Program, in the form of source code under the terms of section 4, provided that you also meet all of these conditions: -a) The work must carry prominent notices stating that you modified it, and giving a relevant date. -b) The work must carry prominent notices stating that it is released under this License and any conditions added under section 7. This requirement modifies the requirement in section 4 to "keep intact all notices". -c) You must license the entire work, as a whole, under this License to anyone who comes into possession of a copy. This License will therefore apply, along with any applicable section 7 additional terms, to the whole of the work, and all its parts, regardless of how they are packaged. This License gives no permission to license the work in any other way, but it does not invalidate such permission if you have separately received it. -d) If the work has interactive user interfaces, each must display Appropriate Legal Notices; however, if the Program has interactive interfaces that do not display Appropriate Legal Notices, your work need not make them do so. -A compilation of a covered work with other separate and independent works, which are not by their nature extensions of the covered work, and which are not combined with it such as to form a larger program, in or on a volume of a storage or distribution medium, is called an "aggregate" if the compilation and its resulting copyright are not used to limit the access or legal rights of the compilation's users beyond what the individual works permit. Inclusion of a covered work in an aggregate does not cause this License to apply to the other parts of the aggregate. - -6. Conveying Non-Source Forms. -You may convey a covered work in object code form under the terms of sections 4 and 5, provided that you also convey the machine-readable Corresponding Source under the terms of this License, in one of these ways: -a) Convey the object code in, or embodied in, a physical product (including a physical distribution medium), accompanied by the Corresponding Source fixed on a durable physical medium customarily used for software interchange. -b) Convey the object code in, or embodied in, a physical product (including a physical distribution medium), accompanied by a written offer, valid for at least three years and valid for as long as you offer spare parts or customer support for that product model, to give anyone who possesses the object code either (1) a copy of the Corresponding Source for all the software in the product that is covered by this License, on a durable physical medium customarily used for software interchange, for a price no more than your reasonable cost of physically performing this conveying of source, or (2) access to copy the Corresponding Source from a network server at no charge. -c) Convey individual copies of the object code with a copy of the written offer to provide the Corresponding Source. This alternative is allowed only occasionally and noncommercially, and only if you received the object code with such an offer, in accord with subsection 6b. -d) Convey the object code by offering access from a designated place (gratis or for a charge), and offer equivalent access to the Corresponding Source in the same way through the same place at no further charge. You need not require recipients to copy the Corresponding Source along with the object code. If the place to copy the object code is a network server, the Corresponding Source may be on a different server (operated by you or a third party) that supports equivalent copying facilities, provided you maintain clear directions next to the object code saying where to find the Corresponding Source. Regardless of what server hosts the Corresponding Source, you remain obligated to ensure that it is available for as long as needed to satisfy these requirements. -e) Convey the object code using peer-to-peer transmission, provided you inform other peers where the object code and Corresponding Source of the work are being offered to the general public at no charge under subsection 6d. -A separable portion of the object code, whose source code is excluded from the Corresponding Source as a System Library, need not be included in conveying the object code work. - -A "User Product" is either (1) a "consumer product", which means any tangible personal property which is normally used for personal, family, or household purposes, or (2) anything designed or sold for incorporation into a dwelling. In determining whether a product is a consumer product, doubtful cases shall be resolved in favor of coverage. For a particular product received by a particular user, "normally used" refers to a typical or common use of that class of product, regardless of the status of the particular user or of the way in which the particular user actually uses, or expects or is expected to use, the product. A product is a consumer product regardless of whether the product has substantial commercial, industrial or non-consumer uses, unless such uses represent the only significant mode of use of the product. - -"Installation Information" for a User Product means any methods, procedures, authorization keys, or other information required to install and execute modified versions of a covered work in that User Product from a modified version of its Corresponding Source. The information must suffice to ensure that the continued functioning of the modified object code is in no case prevented or interfered with solely because modification has been made. - -If you convey an object code work under this section in, or with, or specifically for use in, a User Product, and the conveying occurs as part of a transaction in which the right of possession and use of the User Product is transferred to the recipient in perpetuity or for a fixed term (regardless of how the transaction is characterized), the Corresponding Source conveyed under this section must be accompanied by the Installation Information. But this requirement does not apply if neither you nor any third party retains the ability to install modified object code on the User Product (for example, the work has been installed in ROM). - -The requirement to provide Installation Information does not include a requirement to continue to provide support service, warranty, or updates for a work that has been modified or installed by the recipient, or for the User Product in which it has been modified or installed. Access to a network may be denied when the modification itself materially and adversely affects the operation of the network or violates the rules and protocols for communication across the network. - -Corresponding Source conveyed, and Installation Information provided, in accord with this section must be in a format that is publicly documented (and with an implementation available to the public in source code form), and must require no special password or key for unpacking, reading or copying. - -7. Additional Terms. -"Additional permissions" are terms that supplement the terms of this License by making exceptions from one or more of its conditions. Additional permissions that are applicable to the entire Program shall be treated as though they were included in this License, to the extent that they are valid under applicable law. If additional permissions apply only to part of the Program, that part may be used separately under those permissions, but the entire Program remains governed by this License without regard to the additional permissions. -When you convey a copy of a covered work, you may at your option remove any additional permissions from that copy, or from any part of it. (Additional permissions may be written to require their own removal in certain cases when you modify the work.) You may place additional permissions on material, added by you to a covered work, for which you have or can give appropriate copyright permission. - -Notwithstanding any other provision of this License, for material you add to a covered work, you may (if authorized by the copyright holders of that material) supplement the terms of this License with terms: - -a) Disclaiming warranty or limiting liability differently from the terms of sections 15 and 16 of this License; or -b) Requiring preservation of specified reasonable legal notices or author attributions in that material or in the Appropriate Legal Notices displayed by works containing it; or -c) Prohibiting misrepresentation of the origin of that material, or requiring that modified versions of such material be marked in reasonable ways as different from the original version; or -d) Limiting the use for publicity purposes of names of licensors or authors of the material; or -e) Declining to grant rights under trademark law for use of some trade names, trademarks, or service marks; or -f) Requiring indemnification of licensors and authors of that material by anyone who conveys the material (or modified versions of it) with contractual assumptions of liability to the recipient, for any liability that these contractual assumptions directly impose on those licensors and authors. -All other non-permissive additional terms are considered "further restrictions" within the meaning of section 10. If the Program as you received it, or any part of it, contains a notice stating that it is governed by this License along with a term that is a further restriction, you may remove that term. If a license document contains a further restriction but permits relicensing or conveying under this License, you may add to a covered work material governed by the terms of that license document, provided that the further restriction does not survive such relicensing or conveying. - -If you add terms to a covered work in accord with this section, you must place, in the relevant source files, a statement of the additional terms that apply to those files, or a notice indicating where to find the applicable terms. - -Additional terms, permissive or non-permissive, may be stated in the form of a separately written license, or stated as exceptions; the above requirements apply either way. - -8. Termination. -You may not propagate or modify a covered work except as expressly provided under this License. Any attempt otherwise to propagate or modify it is void, and will automatically terminate your rights under this License (including any patent licenses granted under the third paragraph of section 11). -However, if you cease all violation of this License, then your license from a particular copyright holder is reinstated (a) provisionally, unless and until the copyright holder explicitly and finally terminates your license, and (b) permanently, if the copyright holder fails to notify you of the violation by some reasonable means prior to 60 days after the cessation. - -Moreover, your license from a particular copyright holder is reinstated permanently if the copyright holder notifies you of the violation by some reasonable means, this is the first time you have received notice of violation of this License (for any work) from that copyright holder, and you cure the violation prior to 30 days after your receipt of the notice. - -Termination of your rights under this section does not terminate the licenses of parties who have received copies or rights from you under this License. If your rights have been terminated and not permanently reinstated, you do not qualify to receive new licenses for the same material under section 10. - -9. Acceptance Not Required for Having Copies. -You are not required to accept this License in order to receive or run a copy of the Program. Ancillary propagation of a covered work occurring solely as a consequence of using peer-to-peer transmission to receive a copy likewise does not require acceptance. However, nothing other than this License grants you permission to propagate or modify any covered work. These actions infringe copyright if you do not accept this License. Therefore, by modifying or propagating a covered work, you indicate your acceptance of this License to do so. -10. Automatic Licensing of Downstream Recipients. -Each time you convey a covered work, the recipient automatically receives a license from the original licensors, to run, modify and propagate that work, subject to this License. You are not responsible for enforcing compliance by third parties with this License. -An "entity transaction" is a transaction transferring control of an organization, or substantially all assets of one, or subdividing an organization, or merging organizations. If propagation of a covered work results from an entity transaction, each party to that transaction who receives a copy of the work also receives whatever licenses to the work the party's predecessor in interest had or could give under the previous paragraph, plus a right to possession of the Corresponding Source of the work from the predecessor in interest, if the predecessor has it or can get it with reasonable efforts. - -You may not impose any further restrictions on the exercise of the rights granted or affirmed under this License. For example, you may not impose a license fee, royalty, or other charge for exercise of rights granted under this License, and you may not initiate litigation (including a cross-claim or counterclaim in a lawsuit) alleging that any patent claim is infringed by making, using, selling, offering for sale, or importing the Program or any portion of it. - -11. Patents. -A "contributor" is a copyright holder who authorizes use under this License of the Program or a work on which the Program is based. The work thus licensed is called the contributor's "contributor version". -A contributor's "essential patent claims" are all patent claims owned or controlled by the contributor, whether already acquired or hereafter acquired, that would be infringed by some manner, permitted by this License, of making, using, or selling its contributor version, but do not include claims that would be infringed only as a consequence of further modification of the contributor version. For purposes of this definition, "control" includes the right to grant patent sublicenses in a manner consistent with the requirements of this License. - -Each contributor grants you a non-exclusive, worldwide, royalty-free patent license under the contributor's essential patent claims, to make, use, sell, offer for sale, import and otherwise run, modify and propagate the contents of its contributor version. - -In the following three paragraphs, a "patent license" is any express agreement or commitment, however denominated, not to enforce a patent (such as an express permission to practice a patent or covenant not to sue for patent infringement). To "grant" such a patent license to a party means to make such an agreement or commitment not to enforce a patent against the party. - -If you convey a covered work, knowingly relying on a patent license, and the Corresponding Source of the work is not available for anyone to copy, free of charge and under the terms of this License, through a publicly available network server or other readily accessible means, then you must either (1) cause the Corresponding Source to be so available, or (2) arrange to deprive yourself of the benefit of the patent license for this particular work, or (3) arrange, in a manner consistent with the requirements of this License, to extend the patent license to downstream recipients. "Knowingly relying" means you have actual knowledge that, but for the patent license, your conveying the covered work in a country, or your recipient's use of the covered work in a country, would infringe one or more identifiable patents in that country that you have reason to believe are valid. - -If, pursuant to or in connection with a single transaction or arrangement, you convey, or propagate by procuring conveyance of, a covered work, and grant a patent license to some of the parties receiving the covered work authorizing them to use, propagate, modify or convey a specific copy of the covered work, then the patent license you grant is automatically extended to all recipients of the covered work and works based on it. - -A patent license is "discriminatory" if it does not include within the scope of its coverage, prohibits the exercise of, or is conditioned on the non-exercise of one or more of the rights that are specifically granted under this License. You may not convey a covered work if you are a party to an arrangement with a third party that is in the business of distributing software, under which you make payment to the third party based on the extent of your activity of conveying the work, and under which the third party grants, to any of the parties who would receive the covered work from you, a discriminatory patent license (a) in connection with copies of the covered work conveyed by you (or copies made from those copies), or (b) primarily for and in connection with specific products or compilations that contain the covered work, unless you entered into that arrangement, or that patent license was granted, prior to 28 March 2007. - -Nothing in this License shall be construed as excluding or limiting any implied license or other defenses to infringement that may otherwise be available to you under applicable patent law. - -12. No Surrender of Others' Freedom. -If conditions are imposed on you (whether by court order, agreement or otherwise) that contradict the conditions of this License, they do not excuse you from the conditions of this License. If you cannot convey a covered work so as to satisfy simultaneously your obligations under this License and any other pertinent obligations, then as a consequence you may not convey it at all. For example, if you agree to terms that obligate you to collect a royalty for further conveying from those to whom you convey the Program, the only way you could satisfy both those terms and this License would be to refrain entirely from conveying the Program. -13. Use with the GNU Affero General Public License. -Notwithstanding any other provision of this License, you have permission to link or combine any covered work with a work licensed under version 3 of the GNU Affero General Public License into a single combined work, and to convey the resulting work. The terms of this License will continue to apply to the part which is the covered work, but the special requirements of the GNU Affero General Public License, section 13, concerning interaction through a network will apply to the combination as such. -14. Revised Versions of this License. -The Free Software Foundation may publish revised and/or new versions of the GNU General Public License from time to time. Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns. -Each version is given a distinguishing version number. If the Program specifies that a certain numbered version of the GNU General Public License "or any later version" applies to it, you have the option of following the terms and conditions either of that numbered version or of any later version published by the Free Software Foundation. If the Program does not specify a version number of the GNU General Public License, you may choose any version ever published by the Free Software Foundation. - -If the Program specifies that a proxy can decide which future versions of the GNU General Public License can be used, that proxy's public statement of acceptance of a version permanently authorizes you to choose that version for the Program. - -Later license versions may give you additional or different permissions. However, no additional obligations are imposed on any author or copyright holder as a result of your choosing to follow a later version. - -15. Disclaimer of Warranty. -THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. -16. Limitation of Liability. -IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. -17. Interpretation of Sections 15 and 16. -If the disclaimer of warranty and limitation of liability provided above cannot be given local legal effect according to their terms, reviewing courts shall apply local law that most closely approximates an absolute waiver of all civil liability in connection with the Program, unless a warranty or assumption of liability accompanies a copy of the Program in return for a fee. - -END OF TERMS AND CONDITIONS - -How to Apply These Terms to Your New Programs - -If you develop a new program, and you want it to be of the greatest possible use to the public, the best way to achieve this is to make it free software which everyone can redistribute and change under these terms. - -To do so, attach the following notices to the program. It is safest to attach them to the start of each source file to most effectively state the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found. - - -Copyright (C) - -This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. - -This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - -You should have received a copy of the GNU General Public License along with this program. If not, see . - -Also add information on how to contact you by electronic and paper mail. - -If the program does terminal interaction, make it output a short notice like this when it starts in an interactive mode: - - Copyright (C) -This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. -This is free software, and you are welcome to redistribute it under certain conditions; type `show c' for details. - -The hypothetical commands `show w' and `show c' should show the appropriate parts of the General Public License. Of course, your program's commands might be different; for a GUI interface, you would use an "about box". - -You should also get your employer (if you work as a programmer) or school, if any, to sign a "copyright disclaimer" for the program, if necessary. For more information on this, and how to apply and follow the GNU GPL, see . - -The GNU General Public License does not permit incorporating your program into proprietary programs. If your program is a subroutine library, you may consider it more useful to permit linking proprietary applications with the library. If this is what you want to do, use the GNU Lesser General Public License instead of this License. But first, please read . diff --git a/examples/minimal-plugin/README.md b/examples/minimal-plugin/README.md index cc50e3cd..c47be739 100644 --- a/examples/minimal-plugin/README.md +++ b/examples/minimal-plugin/README.md @@ -2,8 +2,8 @@ ## Prerequisites -* `node` and `npm` installed -* a backend, which is running locally (e.g. on http://localhost:3000) +- `node` and `npm` installed +- a backend, which is running locally (e.g. on http://localhost:3000) ## How to get started @@ -25,7 +25,7 @@ To start the plugin, you need to execute the code in "CLI" script: node lib/cli.js -b -n -r -u -p With fallback values being: -backendURL = http://localhost:3000 , pluginName = minimal-plugin , +backendURL = http://localhost:3000 , pluginName = minimal-plugin , routeName = minimalplugin , URL = http://localhost, port = 4000 ``` @@ -33,26 +33,26 @@ Using environment variables you can set backendURL via `STAPPS_BACKEND`, URL via ## Creating your own plugin -* Modify the default values in `cli.ts` to your needs: - * update the name - * update the port - * update the route - * update your request and response names (You need these in a bit) -* Rename the `minimal-plugin.ts` and the `MinimalPlugin` class to a more suitable name and adjust the imports in other files -* Delete the `sum` function in `minimal-plugin.ts` and write your own logic inside the `onRouteInvoke` function -* Define the layout of your http requests and responses inside the `/plugin/protocol` folder. The names of the interfaces -need to be the same as the request and response names you defined in the `cli.ts` +- Modify the default values in `cli.ts` to your needs: + - update the name + - update the port + - update the route + - update your request and response names (You need these in a bit) +- Rename the `minimal-plugin.ts` and the `MinimalPlugin` class to a more suitable name and adjust the imports in other files +- Delete the `sum` function in `minimal-plugin.ts` and write your own logic inside the `onRouteInvoke` function +- Define the layout of your http requests and responses inside the `/plugin/protocol` folder. The names of the interfaces + need to be the same as the request and response names you defined in the `cli.ts` ## Code structure Folder `src` contains: -* Reference implementations for CLI and a plugin -* [/cli.ts](src/cli.ts) - * minimal CLI to start your connector, that uses CLI-args, so that there are no hard coded values for configuration - * will execute the specified connectors and push the data to the backend -* [/common.ts](src/common.ts) blank file for commonly used values across files to put in -* [/plugin/minimal-connector.ts](src/plugin/minimal-plugin.ts) minimal plugin class with some example logic -* [/plugin/protocol/request.ts](src/plugin/protocol/request.ts) the interface for any incoming http requests -* [/plugin/protocol/response.ts](src/plugin/protocol/response.ts) the interface for responses by the plugin to the backend -* [/plugin/protocol/tsconfig.json](src/plugin/protocol/response.ts) required by schema generator +- Reference implementations for CLI and a plugin +- [/cli.ts](src/cli.ts) + - minimal CLI to start your connector, that uses CLI-args, so that there are no hard coded values for configuration + - will execute the specified connectors and push the data to the backend +- [/common.ts](src/common.ts) blank file for commonly used values across files to put in +- [/plugin/minimal-connector.ts](src/plugin/minimal-plugin.ts) minimal plugin class with some example logic +- [/plugin/protocol/request.ts](src/plugin/protocol/request.ts) the interface for any incoming http requests +- [/plugin/protocol/response.ts](src/plugin/protocol/response.ts) the interface for responses by the plugin to the backend +- [/plugin/protocol/tsconfig.json](src/plugin/protocol/response.ts) required by schema generator diff --git a/examples/minimal-plugin/app.js b/examples/minimal-plugin/app.js index d233e644..1bda7715 100644 --- a/examples/minimal-plugin/app.js +++ b/examples/minimal-plugin/app.js @@ -1,2 +1,2 @@ #!/usr/bin/env node -import './lib/cli.js' +import './lib/cli.js'; diff --git a/examples/minimal-plugin/package.json b/examples/minimal-plugin/package.json index a5e63cf2..b371eedf 100644 --- a/examples/minimal-plugin/package.json +++ b/examples/minimal-plugin/package.json @@ -9,17 +9,13 @@ "Jovan Krunić ", "Rainer Killinger " ], + "bin": "app.js", "scripts": { - "build": "npm run compile", - "changelog": "conventional-changelog -p angular -i CHANGELOG.md -s -r 0 && git add CHANGELOG.md && git commit -m 'docs: update changelog'", - "check-configuration": "openstapps-configuration", - "compile": "rimraf lib && tsc", - "documentation": "typedoc --includeVersion --out docs src", - "lint": "tslint -p tsconfig.json -c tslint.json 'src/**/*.ts'", - "postversion": "npm run changelog", - "prepublishOnly": "npm ci && npm run build", - "preversion": "npm run prepublishOnly", - "push": "git push && git push origin \"v$npm_package_version\"", + "build": "tsup --dts", + "format": "prettier .", + "format:fix": "prettier --write .", + "lint": "eslint --ext .ts src/", + "lint:fix": "eslint --fix --ext .ts src/", "start": "node lib/cli.js" }, "dependencies": { @@ -32,12 +28,28 @@ "ts-node": "10.9.1" }, "devDependencies": { - "@openstapps/configuration": "workspace:*", + "@openstapps/eslint-config": "workspace:*", + "@openstapps/prettier-config": "workspace:*", + "@openstapps/tsconfig": "workspace:*", "@types/express": "4.17.16", "@types/node": "18.15.3", - "conventional-changelog-cli": "2.2.2", - "rimraf": "4.4.0", - "typedoc": "0.23.26", + "tsup": "6.7.0", + "typedoc": "0.23.28", "typescript": "4.8.4" + }, + "tsup": { + "entry": [ + "src/app.ts" + ], + "sourcemap": true, + "clean": true, + "format": "esm", + "outDir": "lib" + }, + "prettier": "@openstapps/prettier-config", + "eslintConfig": { + "extends": [ + "@openstapps" + ] } } diff --git a/examples/minimal-plugin/src/cli.ts b/examples/minimal-plugin/src/app.ts similarity index 56% rename from examples/minimal-plugin/src/cli.ts rename to examples/minimal-plugin/src/app.ts index ebc864fc..53c49f70 100644 --- a/examples/minimal-plugin/src/cli.ts +++ b/examples/minimal-plugin/src/app.ts @@ -1,3 +1,4 @@ +/* eslint-disable unicorn/prefer-module */ /* * Copyright (C) 2019-2021 StApps * This program is free software: you can redistribute it and/or modify it @@ -13,35 +14,36 @@ * this program. If not, see . */ -import {HttpClient} from '@openstapps/api/lib/http-client.js'; -import {PluginClient} from '@openstapps/api/lib/plugin-client.js'; -import {Converter} from '@openstapps/core-tools/lib/schema.js'; +import {HttpClient, PluginClient} from '@openstapps/api'; +import {Converter} from '@openstapps/core-tools'; import {Logger} from '@openstapps/logger'; import {Command, Option} from 'commander'; import {readFileSync} from 'fs'; -import {join, resolve} from 'path'; +import path from 'path'; import {MinimalPlugin} from './plugin/minimal-plugin.js'; - -process.on('unhandledRejection', (error) => { +process.on('unhandledRejection', error => { throw error; }); -const pluginVersion = JSON.parse( - readFileSync(join(__dirname, '..', 'package.json')) - .toString(), -).version; +const pluginVersion = JSON.parse(readFileSync(path.join(__dirname, '..', 'package.json')).toString()).version; const program = new Command() .version(pluginVersion) // tslint:disable: newline-per-chained-call - .addOption(new Option('-b, --backend-url ', 'URL of the StApps backend deployment').default('http://localhost:3000').env('STAPPS_BACKEND')) + .addOption( + new Option('-b, --backend-url ', 'URL of the StApps backend deployment') + .default('http://localhost:3000') + .env('STAPPS_BACKEND'), + ) .addOption(new Option('-n, --plugin-name ', 'The name of the plugin').default('minimal-plugin')) // TODO: adjust default .addOption(new Option('-r, --route-name ', 'The name of the route').default('minimalplugin')) // TODO: adjust default - .addOption(new Option('-u, --url ', 'The url of the plugin').default('http://localhost').env('PLUGIN_URL')) // TODO: adjust default + .addOption( + new Option('-u, --url ', 'The url of the plugin').default('http://localhost').env('PLUGIN_URL'), + ) // TODO: adjust default .addOption(new Option('-p, --port ', 'The port of the plugin').default('4000').env('PLUGIN_PORT')) // TODO: adjust default .parse(process.argv); - // tslint:enable: newline-per-chained-call +// tslint:enable: newline-per-chained-call const options = program.opts(); @@ -51,32 +53,38 @@ const pluginClient = new PluginClient(new HttpClient(), options.backendUrl); // create an instance of your plugin const plugin = new MinimalPlugin( // tslint:disable-next-line:no-magic-numbers - Number.parseInt(options.port, 10), options.pluginName, options.url, `/${options.routeName}`, options.backendUrl, - new Converter(resolve(__dirname, '..', 'src', 'plugin', 'protocol')), // an instance of the converter. Required + Number.parseInt(options.port, 10), + options.pluginName, + options.url, + `/${options.routeName}`, + options.backendUrl, + new Converter(path.resolve(__dirname, '..', 'src', 'plugin', 'protocol')), // an instance of the converter. Required // because your requests and response schemas are defined in the plugin. The path should lead to your request and // response interfaces 'SCMinimalRequest', // TODO: adjust name of the request interface 'SCMinimalResponse', // TODO: adjust name of the response interface - JSON.parse(readFileSync(resolve(__dirname, '..', 'package.json')) - .toString()).version, // get the version of the plugin from the package.json + JSON.parse(readFileSync(path.resolve(__dirname, '..', 'package.json')).toString()).version, // get the version of the plugin from the package.json ); -pluginClient.registerPlugin(plugin) +pluginClient + .registerPlugin(plugin) .then(() => { Logger.ok(`Successfully registered plugin '${options.pluginName}' on /${options.routeName} .`); }) - .catch((err: Error) => { - throw err; + // eslint-disable-next-line unicorn/prefer-top-level-await + .catch((error: Error) => { + throw error; }); -[`exit`, `SIGINT`, `SIGUSR1`, `SIGUSR2`, `SIGTERM`].forEach((signal) => { +for (const signal of [`exit`, `SIGINT`, `SIGUSR1`, `SIGUSR2`, `SIGTERM`]) { process.once(signal as NodeJS.Signals, () => { - pluginClient.unregisterPlugin(plugin) - .then(() => { - Logger.ok(`Successfully unregistered plugin '${options.pluginName}' from /${options.routeName} .`); - }) - .catch((err: Error) => { - throw err; - }); - }) ; -}); + pluginClient + .unregisterPlugin(plugin) + .then(() => { + Logger.ok(`Successfully unregistered plugin '${options.pluginName}' from /${options.routeName} .`); + }) + .catch((error: Error) => { + throw error; + }); + }); +} diff --git a/examples/minimal-plugin/src/plugin/minimal-plugin.ts b/examples/minimal-plugin/src/plugin/minimal-plugin.ts index f6606eb2..3375da02 100644 --- a/examples/minimal-plugin/src/plugin/minimal-plugin.ts +++ b/examples/minimal-plugin/src/plugin/minimal-plugin.ts @@ -12,7 +12,7 @@ * You should have received a copy of the GNU General Public License along with * this program. If not, see . */ -import {Plugin} from '@openstapps/api/lib/plugin.js'; +import {Plugin} from '@openstapps/api'; import * as express from 'express'; import {SCMinimalRequest} from './protocol/request.js'; import {SCMinimalResponse} from './protocol/response.js'; @@ -24,7 +24,6 @@ import {SCMinimalResponse} from './protocol/response.js'; * TODO: rename the class */ export class MinimalPlugin extends Plugin { - /** * Calculates the sum of a list of numbers * diff --git a/examples/minimal-plugin/src/plugin/protocol/tsconfig.json b/examples/minimal-plugin/src/plugin/protocol/tsconfig.json index c7a33719..579a39ff 100644 --- a/examples/minimal-plugin/src/plugin/protocol/tsconfig.json +++ b/examples/minimal-plugin/src/plugin/protocol/tsconfig.json @@ -1,3 +1,3 @@ { - "extends": "../../../node_modules/@openstapps/configuration/tsconfig.json" + "extends": "@openstapps/tsconfig" } diff --git a/examples/minimal-plugin/tsconfig.json b/examples/minimal-plugin/tsconfig.json index 066a5f38..579a39ff 100644 --- a/examples/minimal-plugin/tsconfig.json +++ b/examples/minimal-plugin/tsconfig.json @@ -1,3 +1,3 @@ { - "extends": "./node_modules/@openstapps/configuration/tsconfig.json" + "extends": "@openstapps/tsconfig" } diff --git a/examples/minimal-plugin/tslint.json b/examples/minimal-plugin/tslint.json deleted file mode 100644 index 900794ab..00000000 --- a/examples/minimal-plugin/tslint.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "extends": "./node_modules/@openstapps/configuration/tslint.json", - "rules": { - "no-empty-interface": false - } -} diff --git a/frontend/app/angular.json b/frontend/app/angular.json index 7db07c51..eee85d1f 100644 --- a/frontend/app/angular.json +++ b/frontend/app/angular.json @@ -1,5 +1,5 @@ { - "$schema": "./node_modules/@angular-devkit/core/src/workspace/workspace-schema.json", + "$schema": "./node_modules/@angular/cli/lib/config/schema.json", "version": 1, "defaultProject": "app", "newProjectRoot": "projects", diff --git a/frontend/app/icons.config.ts b/frontend/app/icons.config.ts index 220066a2..0ba30ecc 100644 --- a/frontend/app/icons.config.ts +++ b/frontend/app/icons.config.ts @@ -12,7 +12,7 @@ * You should have received a copy of the GNU General Public License along with * this program. If not, see . */ -import type {IconConfig} from './scripts/icon-config.js'; +import type {IconConfig} from './scripts/icon-config'; const config: IconConfig = { inputPath: 'node_modules/material-symbols/material-symbols-rounded.woff2', diff --git a/frontend/app/package.json b/frontend/app/package.json index 9739409b..a62c6dad 100644 --- a/frontend/app/package.json +++ b/frontend/app/package.json @@ -2,6 +2,7 @@ "name": "@openstapps/app", "description": "The generic app tailored to fulfill needs of German universities, written using Ionic Framework.", "version": "2.1.0", + "type": "module", "license": "GPL-3.0-only", "author": "Karl-Philipp Wulfert ", "contributors": [ @@ -20,7 +21,6 @@ "build:prod": "ng build --configuration=production", "build:stats": "ng build --configuration=production --stats-json", "changelog": "conventional-changelog -p angular -i src/assets/about/CHANGELOG.md -s -r 0", - "check-configuration": "openstapps-configuration", "check-icons": "ts-node scripts/check-icon-correctness.ts", "cypress:open": "cypress open", "cypress:run": "cypress run", @@ -30,9 +30,8 @@ "docker:pull": "sudo docker pull registry.gitlab.com/openstapps/app", "docker:run:android": "sudo docker run -v $PWD:/app --privileged -v /dev/bus/usb:/dev/bus/usb --net=host -it registry.gitlab.com/openstapps/app bash -c \"npm run run:android\"", "docker:serve": "sudo docker run -p 8100:8100 -p 35729:35729 -p 53703:53703 -v $PWD:/app -it registry.gitlab.com/openstapps/app bash -c \"npm run start:external\"", - "documentation": "compodoc -p tsconfig.json -d docs", "e2e": "ng e2e", - "format:check": "prettier --check .", + "format": "prettier .", "format:fix": "prettier --write .", "licenses": "license-checker --json > src/assets/about/licenses.json && ts-node ./scripts/accumulate-licenses.ts && git add src/assets/about/licenses.json", "lint": "ng lint", @@ -40,8 +39,6 @@ "minify-icons": "ts-node scripts/minify-icon-font.ts", "ng": "ng", "postinstall": "npx jetify", - "prepublishOnly": "npm ci && npm run build && npm run lint && npm run format:check", - "preversion": "npm run prepublishOnly", "push": "git push && git push origin \"v$npm_package_version\"", "resources:android": "cordova-res android --skip-config --copy", "resources:ios": "cordova-res ios --skip-config --copy", @@ -49,8 +46,7 @@ "start": "ionic serve", "start:external": "ionic serve --external", "start:prod": "ionic serve -- --configuration=production", - "test": "ng test", - "version": "npm run changelog && npm run licenses && npm run format:fix" + "test": "ng test" }, "dependencies": { "@angular/animations": "13.3.11", @@ -89,12 +85,11 @@ "@ngx-translate/http-loader": "7.0.0", "@openid/appauth": "1.3.1", "@openstapps/api": "workspace:*", - "@openstapps/configuration": "workspace:*", "@openstapps/core": "workspace:*", "@transistorsoft/capacitor-background-fetch": "1.0.2", "capacitor-secure-storage-plugin": "0.8.1", "cordova-plugin-calendar": "5.1.6", - "deepmerge": "4.3.0", + "deepmerge": "4.3.1", "form-data": "4.0.0", "geojson": "0.5.0", "ionic-appauth": "0.9.0", @@ -134,6 +129,7 @@ "@ionic/angular-toolkit": "6.1.0", "@ionic/cli": "6.20.4", "@openstapps/prettier-config": "workspace:*", + "@openstapps/tsconfig": "workspace:*", "@types/fontkit": "1.8.0", "@types/geojson": "1.0.6", "@types/glob": "8.0.1", @@ -145,16 +141,14 @@ "@types/node": "18.15.3", "@typescript-eslint/eslint-plugin": "5.49.0", "@typescript-eslint/parser": "5.49.0", - "conventional-changelog-cli": "2.2.2", "cordova-res": "0.15.4", "cypress": "12.0.1", "eslint": "8.33.0", - "eslint-config-prettier": "8.6.0", "eslint-plugin-jsdoc": "39.7.4", "eslint-plugin-prettier": "4.2.1", "eslint-plugin-unicorn": "45.0.2", "fontkit": "2.0.2", - "glob": "8.1.0", + "glob": "10.2.1", "is-docker": "2.2.1", "jasmine-core": "4.5.0", "jasmine-spec-reporter": "7.0.0", @@ -166,13 +160,13 @@ "karma-jasmine-html-reporter": "2.0.0", "karma-mocha-reporter": "2.2.5", "license-checker": "25.0.1", - "prettier": "2.8.3", "protractor": "7.0.0", "surge": "0.23.1", "ts-node": "10.9.1", - "typescript": "4.8.4", + "typescript": "4.6.4", "webpack-bundle-analyzer": "4.7.0" }, + "prettier": "@openstapps/prettier-config", "cordova": { "plugins": {}, "platforms": [ @@ -180,22 +174,5 @@ "browser", "android" ] - }, - "openstappsConfiguration": { - "forPackaging": false, - "hasCli": false, - "ignoreCiEntries": [ - "build", - "image", - "package", - "pages" - ], - "ignoreScripts": [ - "prepublishOnly", - "compile" - ], - "serverSide": false, - "standardBuild": false, - "standardDocumentation": false } } diff --git a/frontend/app/scripts/accumulate-licenses.ts b/frontend/app/scripts/accumulate-licenses.ts index 28b1c6ff..2f796328 100644 --- a/frontend/app/scripts/accumulate-licenses.ts +++ b/frontend/app/scripts/accumulate-licenses.ts @@ -13,8 +13,8 @@ * this program. If not, see . */ import fs from 'fs'; -import {omit} from '../src/app/_helpers/collections/omit.js'; -import {pickBy} from '../src/app/_helpers/collections/pick.js'; +import {omit} from '../src/app/_helpers/collections/omit'; +import {pickBy} from '../src/app/_helpers/collections/pick'; /** * accumulate and transform licenses based on two license files diff --git a/frontend/app/scripts/check-icon-correctness.ts b/frontend/app/scripts/check-icon-correctness.ts index a181ef56..5582c8e1 100644 --- a/frontend/app/scripts/check-icon-correctness.ts +++ b/frontend/app/scripts/check-icon-correctness.ts @@ -15,7 +15,7 @@ import fontkit, {Font} from 'fontkit'; import config from '../icons.config'; import {existsSync} from 'fs'; -import {getUsedIconsHtml, getUsedIconsTS} from './gather-used-icons.js'; +import {getUsedIconsHtml, getUsedIconsTS} from './gather-used-icons'; const commandName = '"npm run minify-icons"'; const originalFont = fontkit.openSync(config.inputPath); diff --git a/frontend/app/scripts/gather-used-icons.ts b/frontend/app/scripts/gather-used-icons.ts index 1dc5ff22..5b1fc2ea 100644 --- a/frontend/app/scripts/gather-used-icons.ts +++ b/frontend/app/scripts/gather-used-icons.ts @@ -14,7 +14,7 @@ */ import glob from 'glob'; import {readFileSync} from 'fs'; -import {matchPropertyContent, matchTagProperties} from '../src/app/util/ion-icon/icon-match.js'; +import {matchPropertyContent, matchTagProperties} from '../src/app/util/ion-icon/icon-match'; const globPromise = (pattern: string) => new Promise((resolve, reject) => diff --git a/frontend/app/scripts/minify-icon-font.ts b/frontend/app/scripts/minify-icon-font.ts index 9ff1efe5..9dfa8713 100644 --- a/frontend/app/scripts/minify-icon-font.ts +++ b/frontend/app/scripts/minify-icon-font.ts @@ -18,7 +18,7 @@ import fontkit from 'fontkit'; import {exec} from 'child_process'; import config from '../icons.config'; import {statSync} from 'fs'; -import {getUsedIconsHtml, getUsedIconsTS} from './gather-used-icons.js'; +import {getUsedIconsHtml, getUsedIconsTS} from './gather-used-icons'; /** * diff --git a/frontend/app/src/app/_helpers/collections/chunk.spec.ts b/frontend/app/src/app/_helpers/collections/chunk.spec.ts index 5f834b1c..4c53d402 100644 --- a/frontend/app/src/app/_helpers/collections/chunk.spec.ts +++ b/frontend/app/src/app/_helpers/collections/chunk.spec.ts @@ -13,7 +13,7 @@ * this program. If not, see . */ -import {chunk} from './chunk.js'; +import {chunk} from './chunk'; describe('chunk', function () { it('should chunk items in the correct sizes', function () { diff --git a/frontend/app/src/app/_helpers/collections/difference.spec.ts b/frontend/app/src/app/_helpers/collections/difference.spec.ts index 2fd21e52..ea9fab3d 100644 --- a/frontend/app/src/app/_helpers/collections/difference.spec.ts +++ b/frontend/app/src/app/_helpers/collections/difference.spec.ts @@ -13,7 +13,7 @@ * this program. If not, see . */ -import {differenceBy} from './difference.js'; +import {differenceBy} from './difference'; describe('differenceBy', function () { it('should return the difference of two arrays', function () { diff --git a/frontend/app/src/app/_helpers/collections/get.spec.ts b/frontend/app/src/app/_helpers/collections/get.spec.ts index 141a4207..5682f2c5 100644 --- a/frontend/app/src/app/_helpers/collections/get.spec.ts +++ b/frontend/app/src/app/_helpers/collections/get.spec.ts @@ -12,7 +12,7 @@ * You should have received a copy of the GNU General Public License along with * this program. If not, see . */ -import {get} from './get.js'; +import {get} from './get'; describe('get', function () { it('should get a simple path', function () { diff --git a/frontend/app/src/app/_helpers/collections/group-by.spec.ts b/frontend/app/src/app/_helpers/collections/group-by.spec.ts index 8e3919a8..5d165257 100644 --- a/frontend/app/src/app/_helpers/collections/group-by.spec.ts +++ b/frontend/app/src/app/_helpers/collections/group-by.spec.ts @@ -13,7 +13,7 @@ * this program. If not, see . */ -import {groupBy, groupByStable, groupByProperty} from './group-by.js'; +import {groupBy, groupByStable, groupByProperty} from './group-by'; describe('groupBy', () => { it('should group an array by a key', () => { diff --git a/frontend/app/src/app/_helpers/collections/key-by.spec.ts b/frontend/app/src/app/_helpers/collections/key-by.spec.ts index ec6893e1..104ce6dc 100644 --- a/frontend/app/src/app/_helpers/collections/key-by.spec.ts +++ b/frontend/app/src/app/_helpers/collections/key-by.spec.ts @@ -12,7 +12,7 @@ * You should have received a copy of the GNU General Public License along with * this program. If not, see . */ -import {keyBy} from './key-by.js'; +import {keyBy} from './key-by'; describe('keyBy', function () { it('should key objects', function () { diff --git a/frontend/app/src/app/_helpers/collections/map-values.spec.ts b/frontend/app/src/app/_helpers/collections/map-values.spec.ts index 4b273e12..1a8a7fe7 100644 --- a/frontend/app/src/app/_helpers/collections/map-values.spec.ts +++ b/frontend/app/src/app/_helpers/collections/map-values.spec.ts @@ -13,7 +13,7 @@ * this program. If not, see . */ -import {mapValues} from './map-values.js'; +import {mapValues} from './map-values'; describe('map-values', () => { it('should map values', () => { diff --git a/frontend/app/src/app/_helpers/collections/min.spec.ts b/frontend/app/src/app/_helpers/collections/min.spec.ts index 1ae71a1d..c88cda33 100644 --- a/frontend/app/src/app/_helpers/collections/min.spec.ts +++ b/frontend/app/src/app/_helpers/collections/min.spec.ts @@ -13,7 +13,7 @@ * this program. If not, see . */ -import {minBy} from './min.js'; +import {minBy} from './min'; describe('minBy', function () { it('should pick the minimum value based on transform', function () { diff --git a/frontend/app/src/app/_helpers/collections/omit.spec.ts b/frontend/app/src/app/_helpers/collections/omit.spec.ts index a9a888c5..7c7adfd7 100644 --- a/frontend/app/src/app/_helpers/collections/omit.spec.ts +++ b/frontend/app/src/app/_helpers/collections/omit.spec.ts @@ -12,7 +12,7 @@ * You should have received a copy of the GNU General Public License along with * this program. If not, see . */ -import {omit} from './omit.js'; +import {omit} from './omit'; describe('omit', function () { it('should omit keys', function () { diff --git a/frontend/app/src/app/_helpers/collections/partition.spec.ts b/frontend/app/src/app/_helpers/collections/partition.spec.ts index c1d7c688..c64b568a 100644 --- a/frontend/app/src/app/_helpers/collections/partition.spec.ts +++ b/frontend/app/src/app/_helpers/collections/partition.spec.ts @@ -13,7 +13,7 @@ * this program. If not, see . */ -import {partition} from './partition.js'; +import {partition} from './partition'; describe('partition', function () { it('should partition an array', function () { diff --git a/frontend/app/src/app/_helpers/collections/pick.spec.ts b/frontend/app/src/app/_helpers/collections/pick.spec.ts index 62923762..6db203eb 100644 --- a/frontend/app/src/app/_helpers/collections/pick.spec.ts +++ b/frontend/app/src/app/_helpers/collections/pick.spec.ts @@ -12,7 +12,7 @@ * You should have received a copy of the GNU General Public License along with * this program. If not, see . */ -import {pick} from './pick.js'; +import {pick} from './pick'; describe('pick', function () { it('should pick properties', function () { diff --git a/frontend/app/src/app/_helpers/collections/shuffle.spec.ts b/frontend/app/src/app/_helpers/collections/shuffle.spec.ts index c730d48b..d2e8d0c3 100644 --- a/frontend/app/src/app/_helpers/collections/shuffle.spec.ts +++ b/frontend/app/src/app/_helpers/collections/shuffle.spec.ts @@ -12,7 +12,7 @@ * You should have received a copy of the GNU General Public License along with * this program. If not, see . */ -import {shuffle} from './shuffle.js'; +import {shuffle} from './shuffle'; describe('shuffle', function () { it('should shuffle an array', function () { diff --git a/frontend/app/src/app/_helpers/collections/string-sort.spec.ts b/frontend/app/src/app/_helpers/collections/string-sort.spec.ts index 59d95414..d20744a4 100644 --- a/frontend/app/src/app/_helpers/collections/string-sort.spec.ts +++ b/frontend/app/src/app/_helpers/collections/string-sort.spec.ts @@ -13,7 +13,7 @@ * this program. If not, see . */ -import {stringSort, stringSortBy} from './string-sort.js'; +import {stringSort, stringSortBy} from './string-sort'; describe('stringSort', () => { it('should sort an array of strings', () => { diff --git a/frontend/app/src/app/_helpers/collections/sum.spec.ts b/frontend/app/src/app/_helpers/collections/sum.spec.ts index ed4db00c..0b1b43d7 100644 --- a/frontend/app/src/app/_helpers/collections/sum.spec.ts +++ b/frontend/app/src/app/_helpers/collections/sum.spec.ts @@ -12,7 +12,7 @@ * You should have received a copy of the GNU General Public License along with * this program. If not, see . */ -import {sum, sumBy} from './sum.js'; +import {sum, sumBy} from './sum'; describe('sum', () => { it('should return the sum of all elements in the collection', () => { diff --git a/frontend/app/src/app/_helpers/collections/tree-group.spec.ts b/frontend/app/src/app/_helpers/collections/tree-group.spec.ts index 72e30e24..31f762ba 100644 --- a/frontend/app/src/app/_helpers/collections/tree-group.spec.ts +++ b/frontend/app/src/app/_helpers/collections/tree-group.spec.ts @@ -13,7 +13,7 @@ * this program. If not, see . */ -import {Tree, treeGroupBy} from './tree-group.js'; +import {Tree, treeGroupBy} from './tree-group'; interface TestItem { id: number; diff --git a/frontend/app/src/app/_helpers/collections/uniq.spec.ts b/frontend/app/src/app/_helpers/collections/uniq.spec.ts index 33f55985..37cf55be 100644 --- a/frontend/app/src/app/_helpers/collections/uniq.spec.ts +++ b/frontend/app/src/app/_helpers/collections/uniq.spec.ts @@ -13,7 +13,7 @@ * this program. If not, see . */ -import {uniqBy} from './uniq.js'; +import {uniqBy} from './uniq'; describe('uniq', function () { it('should return an array with unique values', function () { diff --git a/frontend/app/src/app/_helpers/collections/zip.spec.ts b/frontend/app/src/app/_helpers/collections/zip.spec.ts index ece47ea7..35f7c6bc 100644 --- a/frontend/app/src/app/_helpers/collections/zip.spec.ts +++ b/frontend/app/src/app/_helpers/collections/zip.spec.ts @@ -12,7 +12,7 @@ * You should have received a copy of the GNU General Public License along with * this program. If not, see . */ -import {zip} from './zip.js'; +import {zip} from './zip'; describe('zip', function () { it('should zip arrays together', function () { diff --git a/frontend/app/src/app/_helpers/data/filters.ts b/frontend/app/src/app/_helpers/data/filters.ts index b73e098c..bd02eb88 100644 --- a/frontend/app/src/app/_helpers/data/filters.ts +++ b/frontend/app/src/app/_helpers/data/filters.ts @@ -14,7 +14,7 @@ */ import {SCSearchBooleanFilter, SCSearchFilter, SCSearchValueFilter, SCThing} from '@openstapps/core'; -import {logger} from '../ts-logger.js'; +import {logger} from '../ts-logger'; /** * Checks if any filter applies to an SCThing diff --git a/frontend/app/src/app/_helpers/data/sample-things.ts b/frontend/app/src/app/_helpers/data/sample-things.ts index 2d320036..d14e6711 100644 --- a/frontend/app/src/app/_helpers/data/sample-things.ts +++ b/frontend/app/src/app/_helpers/data/sample-things.ts @@ -34,8 +34,8 @@ import { SCToDoPriority, } from '@openstapps/core'; import {Observable, of} from 'rxjs'; -import {checkFilter} from './filters.js'; -import {sampleResources} from './resources/test-resources.js'; +import {checkFilter} from './filters'; +import {sampleResources} from './resources/test-resources'; /* eslint-disable */ const sampleMessages: SCMessage[] = [ diff --git a/frontend/app/src/app/animation/animation-choreographer.ts b/frontend/app/src/app/animation/animation-choreographer.ts index 5d2a6163..cb7b49f6 100644 --- a/frontend/app/src/app/animation/animation-choreographer.ts +++ b/frontend/app/src/app/animation/animation-choreographer.ts @@ -13,7 +13,7 @@ * this program. If not, see . */ -import {SHARED_AXIS_DIRECTIONS} from './material-motion.js'; +import {SHARED_AXIS_DIRECTIONS} from './material-motion'; /** * /** diff --git a/frontend/app/src/app/app.component.spec.ts b/frontend/app/src/app/app.component.spec.ts index 38375df2..073828a1 100644 --- a/frontend/app/src/app/app.component.spec.ts +++ b/frontend/app/src/app/app.component.spec.ts @@ -29,7 +29,7 @@ import {SettingsProvider} from './modules/settings/settings.provider'; import {NGXLogger} from 'ngx-logger'; import {RouterTestingModule} from '@angular/router/testing'; import {ScheduleSyncService} from './modules/background/schedule/schedule-sync.service'; -import {sampleAuthConfiguration} from './_helpers/data/sample-configuration.js'; +import {sampleAuthConfiguration} from './_helpers/data/sample-configuration'; import {StorageProvider} from './modules/storage/storage.provider'; import {SimpleBrowser} from './util/browser.factory'; diff --git a/frontend/app/src/app/app.component.ts b/frontend/app/src/app/app.component.ts index c7d2124e..8006ca65 100644 --- a/frontend/app/src/app/app.component.ts +++ b/frontend/app/src/app/app.component.ts @@ -18,7 +18,7 @@ import {App, URLOpenListenerEvent} from '@capacitor/app'; import {Platform, ToastController} from '@ionic/angular'; import {SettingsProvider} from './modules/settings/settings.provider'; import {AuthHelperService} from './modules/auth/auth-helper.service'; -import {environment} from '../environments/environment.js'; +import {environment} from '../environments/environment'; import {StatusBar, Style} from '@capacitor/status-bar'; import {Capacitor} from '@capacitor/core'; import {ScheduleSyncService} from './modules/background/schedule/schedule-sync.service'; diff --git a/frontend/app/src/app/app.module.ts b/frontend/app/src/app/app.module.ts index 65f6caeb..4c2b97bf 100644 --- a/frontend/app/src/app/app.module.ts +++ b/frontend/app/src/app/app.module.ts @@ -26,7 +26,7 @@ import 'moment/min/locales'; import {LoggerModule, NGXLogger, NgxLoggerLevel} from 'ngx-logger'; import SwiperCore, {FreeMode, Navigation} from 'swiper'; -import {environment} from '../environments/environment.js'; +import {environment} from '../environments/environment'; import {AppRoutingModule} from './app-routing.module'; import {AppComponent} from './app.component'; import {CatalogModule} from './modules/catalog/catalog.module'; @@ -44,7 +44,7 @@ import {SettingsProvider} from './modules/settings/settings.provider'; import {StorageModule} from './modules/storage/storage.module'; import {ThingTranslateModule} from './translation/thing-translate.module'; import {UtilModule} from './util/util.module'; -import {initLogger} from './_helpers/ts-logger.js'; +import {initLogger} from './_helpers/ts-logger'; import {BrowserAnimationsModule} from '@angular/platform-browser/animations'; import {AboutModule} from './modules/about/about.module'; import {FavoritesModule} from './modules/favorites/favorites.module'; diff --git a/frontend/app/src/app/modules/assessments/assessments.provider.ts b/frontend/app/src/app/modules/assessments/assessments.provider.ts index 78b21259..5fde0e6e 100644 --- a/frontend/app/src/app/modules/assessments/assessments.provider.ts +++ b/frontend/app/src/app/modules/assessments/assessments.provider.ts @@ -18,8 +18,8 @@ import {ConfigProvider} from '../config/config.provider'; import {SCAssessment, SCUuid} from '@openstapps/core'; import {DefaultAuthService} from '../auth/default-auth.service'; import {HttpClient} from '@angular/common/http'; -import {uniqBy} from '../../_helpers/collections/uniq.js'; -import {keyBy} from '../../_helpers/collections/key-by.js'; +import {uniqBy} from '../../_helpers/collections/uniq'; +import {keyBy} from '../../_helpers/collections/key-by'; /** * diff --git a/frontend/app/src/app/modules/assessments/page/assessments-page.component.ts b/frontend/app/src/app/modules/assessments/page/assessments-page.component.ts index 6c30891d..a5db3129 100644 --- a/frontend/app/src/app/modules/assessments/page/assessments-page.component.ts +++ b/frontend/app/src/app/modules/assessments/page/assessments-page.component.ts @@ -19,12 +19,12 @@ import {SCAssessment, SCCourseOfStudy} from '@openstapps/core'; import {ActivatedRoute, Router} from '@angular/router'; import {Subscription} from 'rxjs'; import {NGXLogger} from 'ngx-logger'; -import {materialSharedAxisX} from '../../../animation/material-motion.js'; -import {SharedAxisChoreographer} from '../../../animation/animation-choreographer.js'; +import {materialSharedAxisX} from '../../../animation/material-motion'; +import {SharedAxisChoreographer} from '../../../animation/animation-choreographer'; import {DataProvider, DataScope} from '../../data/data.provider'; import {DataRoutingService} from '../../data/data-routing.service'; -import {groupBy} from '../../../_helpers/collections/group-by.js'; -import {mapValues} from '../../../_helpers/collections/map-values.js'; +import {groupBy} from '../../../_helpers/collections/group-by'; +import {mapValues} from '../../../_helpers/collections/map-values'; @Component({ selector: 'app-assessments-page', diff --git a/frontend/app/src/app/modules/assessments/types/assessment/assessment-base-info.html b/frontend/app/src/app/modules/assessments/types/assessment/assessment-base-info.html index 83379dde..ca8073c3 100644 --- a/frontend/app/src/app/modules/assessments/types/assessment/assessment-base-info.html +++ b/frontend/app/src/app/modules/assessments/types/assessment/assessment-base-info.html @@ -14,16 +14,8 @@ --> {{ - (_item.grade | isNumeric) - ? (_item.grade | numberLocalized : 'minimumFractionDigits:1,maximumFractionDigits:1') - : '' - }} - {{ 'status' | thingTranslate : _item | titlecase }}, - {{ 'attempt' | propertyNameTranslate : _item }} - {{ _item.attempt }} + >{{ (_item.grade | isNumeric) ? (_item.grade | numberLocalized : + 'minimumFractionDigits:1,maximumFractionDigits:1') : '' }} {{ 'status' | thingTranslate : _item | titlecase + }}, {{ 'attempt' | propertyNameTranslate : _item }} {{ _item.attempt }} - - {{ _item.ects }} - {{ 'ects' | propertyNameTranslate : _item }} + {{ _item.ects }} {{ 'ects' | propertyNameTranslate : _item }} diff --git a/frontend/app/src/app/modules/assessments/types/assessment/assessment-detail.html b/frontend/app/src/app/modules/assessments/types/assessment/assessment-detail.html index b4a7b20c..128d96ca 100644 --- a/frontend/app/src/app/modules/assessments/types/assessment/assessment-detail.html +++ b/frontend/app/src/app/modules/assessments/types/assessment/assessment-detail.html @@ -16,9 +16,8 @@ - {{ $any('courseOfStudy' | propertyNameTranslate : item) | titlecase }}: - {{ 'name' | thingTranslate : $any(courseOfStudy) }} - ({{ 'academicDegree' | thingTranslate : $any(courseOfStudy) }}) + {{ $any('courseOfStudy' | propertyNameTranslate : item) | titlecase }}: {{ 'name' | thingTranslate : + $any(courseOfStudy) }} ({{ 'academicDegree' | thingTranslate : $any(courseOfStudy) }}) diff --git a/frontend/app/src/app/modules/assessments/types/assessment/assessment-list-item.html b/frontend/app/src/app/modules/assessments/types/assessment/assessment-list-item.html index d86c2fd0..cb76aee5 100644 --- a/frontend/app/src/app/modules/assessments/types/assessment/assessment-list-item.html +++ b/frontend/app/src/app/modules/assessments/types/assessment/assessment-list-item.html @@ -14,9 +14,6 @@ -->
-

- {{ 'name' | thingTranslate : item }} - {{ item.date ? (item.date | amDateFormat) : '' }} -

+

{{ 'name' | thingTranslate : item }} {{ item.date ? (item.date | amDateFormat) : '' }}

diff --git a/frontend/app/src/app/modules/assessments/types/course-of-study/course-of-study-assessment.html b/frontend/app/src/app/modules/assessments/types/course-of-study/course-of-study-assessment.html index f0a5b05a..6822e9c5 100644 --- a/frontend/app/src/app/modules/assessments/types/course-of-study/course-of-study-assessment.html +++ b/frontend/app/src/app/modules/assessments/types/course-of-study/course-of-study-assessment.html @@ -14,9 +14,7 @@ -->
-

- {{ 'assessments.courseOfStudyAssessments.ASSESSMENTS' | translate }} -

+

{{ 'assessments.courseOfStudyAssessments.ASSESSMENTS' | translate }}

diff --git a/frontend/app/src/app/modules/auth/auth-helper.service.ts b/frontend/app/src/app/modules/auth/auth-helper.service.ts index 5106abe1..f0df0148 100644 --- a/frontend/app/src/app/modules/auth/auth-helper.service.ts +++ b/frontend/app/src/app/modules/auth/auth-helper.service.ts @@ -14,7 +14,7 @@ */ import {Injectable} from '@angular/core'; -import {IPAIAAuthAction} from './paia/paia-auth-action.js'; +import {IPAIAAuthAction} from './paia/paia-auth-action'; import {AuthActions, IAuthAction} from 'ionic-appauth'; import {TranslateService} from '@ngx-translate/core'; import {JSONPath} from 'jsonpath-plus'; diff --git a/frontend/app/src/app/modules/auth/auth-routing.module.ts b/frontend/app/src/app/modules/auth/auth-routing.module.ts index d8b185e1..d8c5f9e5 100644 --- a/frontend/app/src/app/modules/auth/auth-routing.module.ts +++ b/frontend/app/src/app/modules/auth/auth-routing.module.ts @@ -15,7 +15,7 @@ import {RouterModule, Routes} from '@angular/router'; import {NgModule} from '@angular/core'; -import {authPaths} from './auth-paths.js'; +import {authPaths} from './auth-paths'; import {AuthCallbackPageComponent} from './auth-callback/page/auth-callback-page.component'; import {PAIAAuthCallbackPageComponent} from './paia/auth-callback/page/paiaauth-callback-page.component'; diff --git a/frontend/app/src/app/modules/auth/auth.module.ts b/frontend/app/src/app/modules/auth/auth.module.ts index 6b0dc2c5..17708add 100644 --- a/frontend/app/src/app/modules/auth/auth.module.ts +++ b/frontend/app/src/app/modules/auth/auth.module.ts @@ -2,7 +2,7 @@ import {NgModule} from '@angular/core'; import {CommonModule} from '@angular/common'; import {Platform} from '@ionic/angular'; import {Requestor, StorageBackend} from '@openid/appauth'; -import {storageFactory} from './factories.js'; +import {storageFactory} from './factories'; import {Browser} from 'ionic-appauth'; import {CapacitorBrowser} from 'ionic-appauth/lib/capacitor'; import {httpFactory} from './factories/http.factory'; diff --git a/frontend/app/src/app/modules/auth/auth.provider.methods.ts b/frontend/app/src/app/modules/auth/auth.provider.methods.ts index da6ed0a0..5fc4dec0 100644 --- a/frontend/app/src/app/modules/auth/auth.provider.methods.ts +++ b/frontend/app/src/app/modules/auth/auth.provider.methods.ts @@ -17,8 +17,8 @@ import {AuthorizationServiceConfigurationJson} from '@openid/appauth'; import {IAuthConfig} from 'ionic-appauth'; import {SCAuthorizationProvider, SCAuthorizationProviderType} from '@openstapps/core'; import {Capacitor} from '@capacitor/core'; -import {authPaths} from './auth-paths.js'; -import {environment} from '../../../environments/environment.js'; +import {authPaths} from './auth-paths'; +import {environment} from '../../../environments/environment'; /** * Get configuration of an OAuth2 client diff --git a/frontend/app/src/app/modules/auth/factories/http.factory.ts b/frontend/app/src/app/modules/auth/factories/http.factory.ts index 7a368788..6ba5e276 100644 --- a/frontend/app/src/app/modules/auth/factories/http.factory.ts +++ b/frontend/app/src/app/modules/auth/factories/http.factory.ts @@ -15,7 +15,7 @@ import {HttpClient} from '@angular/common/http'; import {Platform} from '@ionic/angular'; -import {CapacitorRequestor} from '../capacitor-requestor.js'; +import {CapacitorRequestor} from '../capacitor-requestor'; import {NgHttpService} from '../ng-http.service'; export const httpFactory = (platform: Platform, httpClient: HttpClient) => { diff --git a/frontend/app/src/app/modules/auth/factories/storage.factory.ts b/frontend/app/src/app/modules/auth/factories/storage.factory.ts index 9dd15b6e..0bb5f194 100644 --- a/frontend/app/src/app/modules/auth/factories/storage.factory.ts +++ b/frontend/app/src/app/modules/auth/factories/storage.factory.ts @@ -15,7 +15,7 @@ import {Platform} from '@ionic/angular'; import {IonicStorage} from 'ionic-appauth/lib'; -import {SafeCapacitorSecureStorage} from '../../storage/capacitor-secure-storage.js'; +import {SafeCapacitorSecureStorage} from '../../storage/capacitor-secure-storage'; export const storageFactory = (platform: Platform) => { return platform.is('capacitor') ? new SafeCapacitorSecureStorage() : new IonicStorage(); diff --git a/frontend/app/src/app/modules/auth/paia/authorization-request-handler.ts b/frontend/app/src/app/modules/auth/paia/authorization-request-handler.ts index 2d066b58..5c85b329 100644 --- a/frontend/app/src/app/modules/auth/paia/authorization-request-handler.ts +++ b/frontend/app/src/app/modules/auth/paia/authorization-request-handler.ts @@ -25,9 +25,9 @@ import { BUILT_IN_PARAMETERS, } from '@openid/appauth'; import {Browser} from 'ionic-appauth'; -import {PAIAAuthorizationNotifier} from './paia-authorization-notifier.js'; -import {PAIAAuthorizationRequestResponse} from './authorization-request-response.js'; -import {PAIAAuthorizationResponse, PAIAAuthorizationResponseJson} from './paia-authorization-response.js'; +import {PAIAAuthorizationNotifier} from './paia-authorization-notifier'; +import {PAIAAuthorizationRequestResponse} from './authorization-request-response'; +import {PAIAAuthorizationResponse, PAIAAuthorizationResponseJson} from './paia-authorization-response'; /** key for authorization request. */ const authorizationRequestKey = (handle: string) => { diff --git a/frontend/app/src/app/modules/auth/paia/authorization-request-response.ts b/frontend/app/src/app/modules/auth/paia/authorization-request-response.ts index 91fbf496..d9dd73ac 100644 --- a/frontend/app/src/app/modules/auth/paia/authorization-request-response.ts +++ b/frontend/app/src/app/modules/auth/paia/authorization-request-response.ts @@ -14,7 +14,7 @@ */ import {AuthorizationError, AuthorizationRequest} from '@openid/appauth'; -import {PAIAAuthorizationResponse} from './paia-authorization-response.js'; +import {PAIAAuthorizationResponse} from './paia-authorization-response'; /** * Represents a structural type holding both authorization request and response. diff --git a/frontend/app/src/app/modules/auth/paia/paia-auth-action.ts b/frontend/app/src/app/modules/auth/paia/paia-auth-action.ts index b1959984..ec8cae9d 100644 --- a/frontend/app/src/app/modules/auth/paia/paia-auth-action.ts +++ b/frontend/app/src/app/modules/auth/paia/paia-auth-action.ts @@ -13,7 +13,7 @@ * this program. If not, see . */ -import {PAIATokenResponse} from './paia-token-response.js'; +import {PAIATokenResponse} from './paia-token-response'; import {AuthActionBuilder, IAuthAction} from 'ionic-appauth'; export interface IPAIAAuthAction extends IAuthAction { diff --git a/frontend/app/src/app/modules/auth/paia/paia-auth.service.ts b/frontend/app/src/app/modules/auth/paia/paia-auth.service.ts index 98f5e8cb..252ab1eb 100644 --- a/frontend/app/src/app/modules/auth/paia/paia-auth.service.ts +++ b/frontend/app/src/app/modules/auth/paia/paia-auth.service.ts @@ -40,13 +40,13 @@ import { UserInfoHandler, } from 'ionic-appauth'; import {BehaviorSubject, Observable} from 'rxjs'; -import {PAIATokenRequestHandler} from './token-request-handler.js'; -import {PAIAAuthorizationRequestHandler} from './authorization-request-handler.js'; -import {PAIATokenRequest, PAIATokenRequestJson} from './paia-token-request.js'; -import {PAIAAuthorizationResponse} from './paia-authorization-response.js'; -import {PAIAAuthorizationNotifier} from './paia-authorization-notifier.js'; -import {PAIATokenResponse} from './paia-token-response.js'; -import {IPAIAAuthAction, PAIAAuthActionBuilder} from './paia-auth-action.js'; +import {PAIATokenRequestHandler} from './token-request-handler'; +import {PAIAAuthorizationRequestHandler} from './authorization-request-handler'; +import {PAIATokenRequest, PAIATokenRequestJson} from './paia-token-request'; +import {PAIAAuthorizationResponse} from './paia-authorization-response'; +import {PAIAAuthorizationNotifier} from './paia-authorization-notifier'; +import {PAIATokenResponse} from './paia-token-response'; +import {IPAIAAuthAction, PAIAAuthActionBuilder} from './paia-auth-action'; import {SCAuthorizationProvider} from '@openstapps/core'; import {ConfigProvider} from '../../config/config.provider'; import {getClientConfig, getEndpointsConfig} from '../auth.provider.methods'; diff --git a/frontend/app/src/app/modules/auth/paia/paia-authorization-listener.ts b/frontend/app/src/app/modules/auth/paia/paia-authorization-listener.ts index c254b673..c2d346d0 100644 --- a/frontend/app/src/app/modules/auth/paia/paia-authorization-listener.ts +++ b/frontend/app/src/app/modules/auth/paia/paia-authorization-listener.ts @@ -14,7 +14,7 @@ */ import {AuthorizationError, AuthorizationRequest} from '@openid/appauth'; -import {PAIAAuthorizationResponse} from './paia-authorization-response.js'; +import {PAIAAuthorizationResponse} from './paia-authorization-response'; export type PAIAAuthorizationListener = ( request: AuthorizationRequest, diff --git a/frontend/app/src/app/modules/auth/paia/paia-authorization-notifier.ts b/frontend/app/src/app/modules/auth/paia/paia-authorization-notifier.ts index 5edda424..4b2b5613 100644 --- a/frontend/app/src/app/modules/auth/paia/paia-authorization-notifier.ts +++ b/frontend/app/src/app/modules/auth/paia/paia-authorization-notifier.ts @@ -12,9 +12,9 @@ * You should have received a copy of the GNU General Public License along with * this program. If not, see . */ -import {PAIAAuthorizationListener} from './paia-authorization-listener.js'; +import {PAIAAuthorizationListener} from './paia-authorization-listener'; import {AuthorizationError, AuthorizationRequest} from '@openid/appauth'; -import {PAIAAuthorizationResponse} from './paia-authorization-response.js'; +import {PAIAAuthorizationResponse} from './paia-authorization-response'; export class PAIAAuthorizationNotifier { // eslint-disable-next-line unicorn/no-null diff --git a/frontend/app/src/app/modules/auth/paia/paia-user-info-handler.ts b/frontend/app/src/app/modules/auth/paia/paia-user-info-handler.ts index f39463fe..7ab2101f 100644 --- a/frontend/app/src/app/modules/auth/paia/paia-user-info-handler.ts +++ b/frontend/app/src/app/modules/auth/paia/paia-user-info-handler.ts @@ -13,7 +13,7 @@ * this program. If not, see . */ import {AuthorizationServiceConfiguration, Requestor} from '@openid/appauth'; -import {PAIATokenResponse} from './paia-token-response.js'; +import {PAIATokenResponse} from './paia-token-response'; export interface UserInfoHandler { performUserInfoRequest( diff --git a/frontend/app/src/app/modules/auth/paia/token-request-handler.ts b/frontend/app/src/app/modules/auth/paia/token-request-handler.ts index 1f652996..cf0da436 100644 --- a/frontend/app/src/app/modules/auth/paia/token-request-handler.ts +++ b/frontend/app/src/app/modules/auth/paia/token-request-handler.ts @@ -23,8 +23,8 @@ import { AppAuthError, TokenError, } from '@openid/appauth'; -import {PAIATokenRequest} from './paia-token-request.js'; -import {PAIATokenResponse, PAIATokenResponseJson} from './paia-token-response.js'; +import {PAIATokenRequest} from './paia-token-request'; +import {PAIATokenResponse, PAIATokenResponseJson} from './paia-token-response'; export class PAIATokenRequestHandler { constructor( diff --git a/frontend/app/src/app/modules/background/schedule/schedule-sync.service.ts b/frontend/app/src/app/modules/background/schedule/schedule-sync.service.ts index c1356618..da88dc54 100644 --- a/frontend/app/src/app/modules/background/schedule/schedule-sync.service.ts +++ b/frontend/app/src/app/modules/background/schedule/schedule-sync.service.ts @@ -27,15 +27,15 @@ import {DateFormatPipe, DurationPipe} from 'ngx-moment'; import {BackgroundFetch} from '@transistorsoft/capacitor-background-fetch'; import {StorageProvider} from '../../storage/storage.provider'; import {CalendarService} from '../../calendar/calendar.service'; -import {toICal} from '../../calendar/ical/ical.js'; +import {toICal} from '../../calendar/ical/ical'; import {Subscription} from 'rxjs'; -import {ChangesOf} from './changes.js'; -import {hashStringToInt} from './hash.js'; +import {ChangesOf} from './changes'; +import {hashStringToInt} from './hash'; import { CALENDAR_NOTIFICATIONS_ENABLED_KEY, CALENDAR_SYNC_ENABLED_KEY, getCalendarSetting, -} from '../../settings/page/calendar-sync-settings-keys.js'; +} from '../../settings/page/calendar-sync-settings-keys'; import {filter} from 'rxjs/operators'; import {Capacitor} from '@capacitor/core'; diff --git a/frontend/app/src/app/modules/calendar/add-event-review-modal.component.ts b/frontend/app/src/app/modules/calendar/add-event-review-modal.component.ts index 1de4a9d3..23361c19 100644 --- a/frontend/app/src/app/modules/calendar/add-event-review-modal.component.ts +++ b/frontend/app/src/app/modules/calendar/add-event-review-modal.component.ts @@ -20,7 +20,7 @@ import { serializeICal, toICal, toICalUpdates, -} from './ical/ical.js'; +} from './ical/ical'; import moment from 'moment'; import {Share} from '@capacitor/share'; import {Directory, Encoding, Filesystem} from '@capacitor/filesystem'; @@ -30,7 +30,7 @@ import {Dialog} from '@capacitor/dialog'; import {SCDateSeries} from '@openstapps/core'; import {ThingTranslateService} from '../../translation/thing-translate.service'; import {TranslateService} from '@ngx-translate/core'; -import {NewShareData, NewShareNavigator} from './new-share.js'; +import {NewShareData, NewShareNavigator} from './new-share'; interface ICalInfo { title: string; @@ -68,7 +68,7 @@ export class AddEventReviewModalComponent implements OnInit { }); this.iCalEvents = this.dateSeries.map(event => ({ - title: this.translator.translator.translatedAccess(event).event.name() ?? 'error', + title: this.translator.translator.translatedAccess(event).event?.name ?? 'error', events: toICal(event, this.translator.translator, { allowRRuleExceptions: true, excludeCancelledEvents: false, diff --git a/frontend/app/src/app/modules/calendar/add-event-review-modal.html b/frontend/app/src/app/modules/calendar/add-event-review-modal.html index 1f7e5097..56e4c690 100644 --- a/frontend/app/src/app/modules/calendar/add-event-review-modal.html +++ b/frontend/app/src/app/modules/calendar/add-event-review-modal.html @@ -34,13 +34,10 @@ - - {{ moment(iCalEvent.start) | amDateFormat : 'll, HH:mm' }} - + {{ moment(iCalEvent.start) | amDateFormat : 'll, HH:mm' }} - {{ iCalEvent.rrule.interval }} - {{ iCalEvent.rrule.freq | sentencecase }} + {{ iCalEvent.rrule.interval }} {{ iCalEvent.rrule.freq | sentencecase }} diff --git a/frontend/app/src/app/modules/calendar/calendar.service.ts b/frontend/app/src/app/modules/calendar/calendar.service.ts index ae5bb836..984665b9 100644 --- a/frontend/app/src/app/modules/calendar/calendar.service.ts +++ b/frontend/app/src/app/modules/calendar/calendar.service.ts @@ -15,10 +15,10 @@ import {Calendar} from '@awesome-cordova-plugins/calendar/ngx'; import {Injectable} from '@angular/core'; -import {ICalEvent} from './ical/ical.js'; +import {ICalEvent} from './ical/ical'; import moment, {duration, Moment, unitOfTime} from 'moment'; import {Dialog} from '@capacitor/dialog'; -import {CalendarInfo} from './calendar-info.js'; +import {CalendarInfo} from './calendar-info'; import {Subject} from 'rxjs'; import {ConfigProvider} from '../config/config.provider'; diff --git a/frontend/app/src/app/modules/calendar/ical/ical.spec.ts b/frontend/app/src/app/modules/calendar/ical/ical.spec.ts index 380ae948..752026d5 100644 --- a/frontend/app/src/app/modules/calendar/ical/ical.spec.ts +++ b/frontend/app/src/app/modules/calendar/ical/ical.spec.ts @@ -13,10 +13,10 @@ * this program. If not, see . */ -import {findRRules, RRule} from './ical.js'; +import {findRRules, RRule} from './ical'; import moment, {unitOfTime} from 'moment'; import {SCISO8601Date} from '@openstapps/core'; -import {shuffle} from '../../../_helpers/collections/shuffle.js'; +import {shuffle} from '../../../_helpers/collections/shuffle'; /** * diff --git a/frontend/app/src/app/modules/calendar/ical/ical.ts b/frontend/app/src/app/modules/calendar/ical/ical.ts index 3cdeabbf..92c47537 100644 --- a/frontend/app/src/app/modules/calendar/ical/ical.ts +++ b/frontend/app/src/app/modules/calendar/ical/ical.ts @@ -21,8 +21,8 @@ import { SCUuid, } from '@openstapps/core'; import moment, {unitOfTime} from 'moment'; -import {minBy} from '../../../_helpers/collections/min.js'; -import {mapValues} from '../../../_helpers/collections/map-values.js'; +import {minBy} from '../../../_helpers/collections/min'; +import {mapValues} from '../../../_helpers/collections/map-values'; export interface ICalEvent { name?: string; @@ -165,14 +165,11 @@ function getICalData( const translated = translator.translatedAccess(dateSeries); return { - name: translated.event()?.name, + name: translated.event?.name, uuid: dateSeries.uid, - categories: [ - 'stapps', - ...((translated.event() as SCThingWithCategories)?.categories ?? []), - ], - description: translated.event()?.description ?? translated.description(), - geo: translated.inPlace()?.name, + categories: ['stapps', ...((translated.event as SCThingWithCategories)?.categories ?? [])], + description: translated.event?.description ?? translated.description, + geo: translated.inPlace?.name, }; } diff --git a/frontend/app/src/app/modules/calendar/schedule.provider.ts b/frontend/app/src/app/modules/calendar/schedule.provider.ts index 2a6fee5e..46e18ea7 100644 --- a/frontend/app/src/app/modules/calendar/schedule.provider.ts +++ b/frontend/app/src/app/modules/calendar/schedule.provider.ts @@ -28,7 +28,7 @@ import {BehaviorSubject, Observable, Subscription} from 'rxjs'; import {DataProvider} from '../data/data.provider'; import {map} from 'rxjs/operators'; import {DateFormatPipe, DurationPipe} from 'ngx-moment'; -import {pick} from '../../_helpers/collections/pick.js'; +import {pick} from '../../_helpers/collections/pick'; /** * diff --git a/frontend/app/src/app/modules/config/config.provider.spec.ts b/frontend/app/src/app/modules/config/config.provider.spec.ts index 45bc90f8..c271f153 100644 --- a/frontend/app/src/app/modules/config/config.provider.spec.ts +++ b/frontend/app/src/app/modules/config/config.provider.spec.ts @@ -21,9 +21,9 @@ import { ConfigInitError, SavedConfigNotAvailable, WrongConfigVersionInStorage, -} from './errors.js'; +} from './errors'; import {NGXLogger} from 'ngx-logger'; -import {sampleIndexResponse} from '../../_helpers/data/sample-configuration.js'; +import {sampleIndexResponse} from '../../_helpers/data/sample-configuration'; describe('ConfigProvider', () => { let configProvider: ConfigProvider; diff --git a/frontend/app/src/app/modules/config/config.provider.ts b/frontend/app/src/app/modules/config/config.provider.ts index 76fe7cec..040c460f 100644 --- a/frontend/app/src/app/modules/config/config.provider.ts +++ b/frontend/app/src/app/modules/config/config.provider.ts @@ -13,11 +13,11 @@ * this program. If not, see . */ import {Injectable} from '@angular/core'; -import {Client} from '@openstapps/api/lib/client'; +import {Client} from '@openstapps/api'; import {SCAppConfiguration, SCIndexResponse} from '@openstapps/core'; import {NGXLogger} from 'ngx-logger'; import packageJson from '../../../../package.json'; -import {environment} from '../../../environments/environment.js'; +import {environment} from '../../../environments/environment'; import {StAppsWebHttpClient} from '../data/stapps-web-http-client.provider'; import {StorageProvider} from '../storage/storage.provider'; import { @@ -26,7 +26,7 @@ import { ConfigValueNotAvailable, SavedConfigNotAvailable, WrongConfigVersionInStorage, -} from './errors.js'; +} from './errors'; /** * Key to store config in storage module diff --git a/frontend/app/src/app/modules/config/errors.ts b/frontend/app/src/app/modules/config/errors.ts index acea4f44..f9fcd84d 100644 --- a/frontend/app/src/app/modules/config/errors.ts +++ b/frontend/app/src/app/modules/config/errors.ts @@ -13,7 +13,7 @@ * this program. If not, see . */ -import {AppError} from '../../_helpers/errors.js'; +import {AppError} from '../../_helpers/errors'; /** * Error that is thrown when fetching from backend fails diff --git a/frontend/app/src/app/modules/dashboard/dashboard.component.ts b/frontend/app/src/app/modules/dashboard/dashboard.component.ts index 329f57ed..e4fe0f3d 100644 --- a/frontend/app/src/app/modules/dashboard/dashboard.component.ts +++ b/frontend/app/src/app/modules/dashboard/dashboard.component.ts @@ -23,7 +23,7 @@ import {SplashScreen} from '@capacitor/splash-screen'; import {DataRoutingService} from '../data/data-routing.service'; import {ScheduleProvider} from '../calendar/schedule.provider'; import {AnimationController, IonContent} from '@ionic/angular'; -import {DashboardCollapse} from './dashboard-collapse.js'; +import {DashboardCollapse} from './dashboard-collapse'; import {BreakpointObserver} from '@angular/cdk/layout'; // const scrollTimeline = new ScrollTimeline(); diff --git a/frontend/app/src/app/modules/data/chips/data/add-event-action-chip.component.ts b/frontend/app/src/app/modules/data/chips/data/add-event-action-chip.component.ts index 0db81406..39a2dfe1 100644 --- a/frontend/app/src/app/modules/data/chips/data/add-event-action-chip.component.ts +++ b/frontend/app/src/app/modules/data/chips/data/add-event-action-chip.component.ts @@ -23,7 +23,7 @@ import {CoordinatedSearchProvider} from '../../coordinated-search.provider'; import { chipSkeletonTransition, chipTransition, -} from '../../../../animation/skeleton-transitions/chip-loading-transition.js'; +} from '../../../../animation/skeleton-transitions/chip-loading-transition'; import {AddEventStates, AddEventStatesMap} from './add-event-action-chip.config'; import {EditEventSelectionComponent} from '../edit-event-selection.component'; import {AddEventReviewModalComponent} from '../../../calendar/add-event-review-modal.component'; diff --git a/frontend/app/src/app/modules/data/chips/data/add-event-action-chip.config.ts b/frontend/app/src/app/modules/data/chips/data/add-event-action-chip.config.ts index 0902a44c..8d7b0330 100644 --- a/frontend/app/src/app/modules/data/chips/data/add-event-action-chip.config.ts +++ b/frontend/app/src/app/modules/data/chips/data/add-event-action-chip.config.ts @@ -13,7 +13,7 @@ * this program. If not, see . */ -import {SCIcon} from '../../../../util/ion-icon/icon.js'; +import {SCIcon} from '../../../../util/ion-icon/icon'; export enum AddEventStates { ADDED_ALL, diff --git a/frontend/app/src/app/modules/data/chips/edit-event-selection.component.ts b/frontend/app/src/app/modules/data/chips/edit-event-selection.component.ts index c438d56c..182e1f56 100644 --- a/frontend/app/src/app/modules/data/chips/edit-event-selection.component.ts +++ b/frontend/app/src/app/modules/data/chips/edit-event-selection.component.ts @@ -22,12 +22,12 @@ import { } from '../../calendar/schedule.provider'; import {CalendarService} from '../../calendar/calendar.service'; import {ThingTranslatePipe} from '../../../translation/thing-translate.pipe'; -import {groupBy, groupByProperty} from '../../../_helpers/collections/group-by.js'; -import {mapValues} from '../../../_helpers/collections/map-values.js'; -import {stringSortBy} from '../../../_helpers/collections/string-sort.js'; -import {uniqBy} from '../../../_helpers/collections/uniq.js'; -import {differenceBy} from '../../../_helpers/collections/difference.js'; -import {SelectionValue, TreeNode} from './tree-node.js'; +import {groupBy, groupByProperty} from '../../../_helpers/collections/group-by'; +import {mapValues} from '../../../_helpers/collections/map-values'; +import {stringSortBy} from '../../../_helpers/collections/string-sort'; +import {uniqBy} from '../../../_helpers/collections/uniq'; +import {differenceBy} from '../../../_helpers/collections/difference'; +import {SelectionValue, TreeNode} from './tree-node'; /** * Shows a horizontal list of action chips diff --git a/frontend/app/src/app/modules/data/data-facets.provider.spec.ts b/frontend/app/src/app/modules/data/data-facets.provider.spec.ts index 4bab876e..f3660e77 100644 --- a/frontend/app/src/app/modules/data/data-facets.provider.spec.ts +++ b/frontend/app/src/app/modules/data/data-facets.provider.spec.ts @@ -14,8 +14,8 @@ */ import {TestBed} from '@angular/core/testing'; import {SCFacet, SCThing, SCFacetBucket} from '@openstapps/core'; -import {sampleAggregations} from '../../_helpers/data/sample-configuration.js'; -import {sampleThingsMap} from '../../_helpers/data/sample-things.js'; +import {sampleAggregations} from '../../_helpers/data/sample-configuration'; +import {sampleThingsMap} from '../../_helpers/data/sample-things'; import {DataFacetsProvider} from './data-facets.provider'; import {DataModule} from './data.module'; import {DataProvider} from './data.provider'; diff --git a/frontend/app/src/app/modules/data/data-icon.config.ts b/frontend/app/src/app/modules/data/data-icon.config.ts index c4779bbf..6484e63f 100644 --- a/frontend/app/src/app/modules/data/data-icon.config.ts +++ b/frontend/app/src/app/modules/data/data-icon.config.ts @@ -14,7 +14,7 @@ */ import {SCThingType} from '@openstapps/core'; -import {SCIcon} from '../../util/ion-icon/icon.js'; +import {SCIcon} from '../../util/ion-icon/icon'; export const DataIcons: Record = { 'academic event': SCIcon`school`, diff --git a/frontend/app/src/app/modules/data/data.provider.spec.ts b/frontend/app/src/app/modules/data/data.provider.spec.ts index 34389efc..d7cfadfb 100644 --- a/frontend/app/src/app/modules/data/data.provider.spec.ts +++ b/frontend/app/src/app/modules/data/data.provider.spec.ts @@ -26,7 +26,7 @@ import { SCThingOriginType, SCThingType, } from '@openstapps/core'; -import {sampleThingsMap} from '../../_helpers/data/sample-things.js'; +import {sampleThingsMap} from '../../_helpers/data/sample-things'; import {StorageProvider} from '../storage/storage.provider'; import {DataModule} from './data.module'; import {DataProvider, DataScope} from './data.provider'; diff --git a/frontend/app/src/app/modules/data/data.provider.ts b/frontend/app/src/app/modules/data/data.provider.ts index cfe6e57a..17a730f2 100644 --- a/frontend/app/src/app/modules/data/data.provider.ts +++ b/frontend/app/src/app/modules/data/data.provider.ts @@ -13,7 +13,7 @@ * this program. If not, see . */ import {Injectable} from '@angular/core'; -import {Client} from '@openstapps/api/lib/client'; +import {Client} from '@openstapps/api'; import { SCFacet, SCIndexableThings, @@ -32,10 +32,10 @@ import { SCFeedbackResponse, SCUuid, } from '@openstapps/core'; -import {environment} from '../../../environments/environment.js'; +import {environment} from '../../../environments/environment'; import {StorageProvider} from '../storage/storage.provider'; import {StAppsWebHttpClient} from './stapps-web-http-client.provider'; -import {chunk} from '../../_helpers/collections/chunk.js'; +import {chunk} from '../../_helpers/collections/chunk'; export enum DataScope { Local = 'local', diff --git a/frontend/app/src/app/modules/data/detail/data-detail.component.spec.ts b/frontend/app/src/app/modules/data/detail/data-detail.component.spec.ts index 57519ec4..c471b7a3 100644 --- a/frontend/app/src/app/modules/data/detail/data-detail.component.spec.ts +++ b/frontend/app/src/app/modules/data/detail/data-detail.component.spec.ts @@ -19,7 +19,7 @@ import {ComponentFixture, TestBed} from '@angular/core/testing'; import {ActivatedRoute, RouterModule} from '@angular/router'; import {IonTitle} from '@ionic/angular'; import {TranslateLoader, TranslateModule, TranslateService} from '@ngx-translate/core'; -import {sampleThingsMap} from '../../../_helpers/data/sample-things.js'; +import {sampleThingsMap} from '../../../_helpers/data/sample-things'; import {DataRoutingModule} from '../data-routing.module'; import {DataModule} from '../data.module'; import {DataProvider} from '../data.provider'; diff --git a/frontend/app/src/app/modules/data/detail/data-detail.html b/frontend/app/src/app/modules/data/detail/data-detail.html index 5819dc54..dc5eb02e 100644 --- a/frontend/app/src/app/modules/data/detail/data-detail.html +++ b/frontend/app/src/app/modules/data/detail/data-detail.html @@ -35,17 +35,13 @@
- - {{ 'data.detail.COULD_NOT_CONNECT' | translate }} - + {{ 'data.detail.COULD_NOT_CONNECT' | translate }}
- - {{ 'data.detail.NOT_FOUND' | translate }} - + {{ 'data.detail.NOT_FOUND' | translate }}
diff --git a/frontend/app/src/app/modules/data/elements/address-detail.html b/frontend/app/src/app/modules/data/elements/address-detail.html index 5fef6cef..01f433af 100644 --- a/frontend/app/src/app/modules/data/elements/address-detail.html +++ b/frontend/app/src/app/modules/data/elements/address-detail.html @@ -19,39 +19,27 @@ {{ 'data.detail.address.STREET' | translate | titlecase }}: - - {{ address.streetAddress }} - + {{ address.streetAddress }} {{ 'data.detail.address.POSTCODE' | translate | titlecase }}: - - {{ address.postalCode }} - + {{ address.postalCode }} {{ 'data.detail.address.CITY' | translate | titlecase }}: - - {{ address.addressLocality }} - + {{ address.addressLocality }} {{ 'data.detail.address.REGION' | translate | titlecase }}: - - {{ address.addressRegion }} - + {{ address.addressRegion }} {{ 'data.detail.address.COUNTRY' | translate | titlecase }}: - - {{ address.addressCountry }} - + {{ address.addressCountry }} {{ 'data.detail.address.POST_OFFICE_BOX' | translate | titlecase }} - - {{ address.postOfficeBoxNumber }} - + {{ address.postOfficeBoxNumber }} diff --git a/frontend/app/src/app/modules/data/elements/offers-detail.html b/frontend/app/src/app/modules/data/elements/offers-detail.html index 168cff77..42620693 100644 --- a/frontend/app/src/app/modules/data/elements/offers-detail.html +++ b/frontend/app/src/app/modules/data/elements/offers-detail.html @@ -29,10 +29,8 @@ - {{ - (offer.availabilityRange.gt ? offer.availabilityRange.gt : offer.availabilityRange.gte) - | amDateFormat : 'll' - }} + {{ (offer.availabilityRange.gt ? offer.availabilityRange.gt : offer.availabilityRange.gte) | + amDateFormat : 'll' }} @@ -41,9 +39,7 @@ {{ 'data.detail.offers.' + group | translate }} -

- {{ offer.prices[group] | currency : 'EUR' : 'symbol' : undefined : 'de' }} -

+

{{ offer.prices[group] | currency : 'EUR' : 'symbol' : undefined : 'de' }}

 @@ -52,9 +48,7 @@ -

- {{ 'data.detail.offers.sold_out' | translate }} -

+

{{ 'data.detail.offers.sold_out' | translate }}

 diff --git a/frontend/app/src/app/modules/data/elements/origin-detail.html b/frontend/app/src/app/modules/data/elements/origin-detail.html index 56607830..1e4e67d5 100644 --- a/frontend/app/src/app/modules/data/elements/origin-detail.html +++ b/frontend/app/src/app/modules/data/elements/origin-detail.html @@ -15,21 +15,21 @@ {{ 'data.types.origin.TITLE' | translate | titlecase }}: - {{ 'data.types.origin.USER' | translate | titlecase }}{{ 'data.types.origin.TITLE' | translate | titlecase }}: {{ 'data.types.origin.USER' | translate | + titlecase }}

- {{ 'data.types.origin.detail.CREATED' | translate | titlecase }}: - {{ origin.created | amDateFormat : 'll' }} + {{ 'data.types.origin.detail.CREATED' | translate | titlecase }}: {{ origin.created | amDateFormat : + 'll' }}

- {{ 'data.types.origin.detail.UPDATED' | translate | titlecase }}: - {{ origin.updated | amDateFormat : 'll' }} + {{ 'data.types.origin.detail.UPDATED' | translate | titlecase }}: {{ origin.updated | amDateFormat : + 'll' }}

- {{ 'data.types.origin.detail.MODIFIED' | translate | titlecase }}: - {{ origin.modified | amDateFormat : 'll' }} + {{ 'data.types.origin.detail.MODIFIED' | translate | titlecase }}: {{ origin.modified | amDateFormat : + 'll' }}

{{ 'data.types.origin.detail.MAINTAINER' | translate }}: {{ origin.name }}

@@ -41,17 +41,17 @@ {{ 'data.types.origin.TITLE' | translate | titlecase }}: - {{ 'data.types.origin.REMOTE' | translate | titlecase }}{{ 'data.types.origin.TITLE' | translate | titlecase }}: {{ 'data.types.origin.REMOTE' | translate | + titlecase }}

- {{ 'data.types.origin.detail.INDEXED' | translate | titlecase }}: - {{ origin.indexed | amDateFormat : 'll' }} + {{ 'data.types.origin.detail.INDEXED' | translate | titlecase }}: {{ origin.indexed | amDateFormat : + 'll' }}

- {{ 'data.types.origin.detail.MODIFIED' | translate | titlecase }}: - {{ origin.modified | amDateFormat : 'll' }} + {{ 'data.types.origin.detail.MODIFIED' | translate | titlecase }}: {{ origin.modified | amDateFormat : + 'll' }}

{{ 'data.types.origin.detail.MAINTAINER' | translate }}: {{ origin.name }}

diff --git a/frontend/app/src/app/modules/data/elements/title-card.component.ts b/frontend/app/src/app/modules/data/elements/title-card.component.ts index f31c2a35..9c18fc9e 100644 --- a/frontend/app/src/app/modules/data/elements/title-card.component.ts +++ b/frontend/app/src/app/modules/data/elements/title-card.component.ts @@ -15,7 +15,7 @@ import {Component, ElementRef, HostListener, Input, OnChanges, OnInit, ViewChild} from '@angular/core'; import {SCThings} from '@openstapps/core'; -import {SCIcon} from '../../../util/ion-icon/icon.js'; +import {SCIcon} from '../../../util/ion-icon/icon'; const AccordionButtonState = { collapsed: SCIcon`expand_more`, diff --git a/frontend/app/src/app/modules/data/list/data-list-item-host-default.html b/frontend/app/src/app/modules/data/list/data-list-item-host-default.html index b4dd5645..f857a588 100644 --- a/frontend/app/src/app/modules/data/list/data-list-item-host-default.html +++ b/frontend/app/src/app/modules/data/list/data-list-item-host-default.html @@ -13,9 +13,7 @@ ~ this program. If not, see . --> -

- {{ 'name' | thingTranslate : item }} -

+

{{ 'name' | thingTranslate : item }}

- {{ - emptyListMessage - }} + {{ emptyListMessage }} @@ -38,9 +38,7 @@ -

- {{ listHeader }} -

+

{{ listHeader }}

diff --git a/frontend/app/src/app/modules/data/list/tree-list-fragment.component.ts b/frontend/app/src/app/modules/data/list/tree-list-fragment.component.ts index d7b643e2..9e19a89f 100644 --- a/frontend/app/src/app/modules/data/list/tree-list-fragment.component.ts +++ b/frontend/app/src/app/modules/data/list/tree-list-fragment.component.ts @@ -14,7 +14,7 @@ */ import {Component, Input, TemplateRef} from '@angular/core'; import {SCThings, SCThingWithoutReferences, SCUuid} from '@openstapps/core'; -import {Tree} from '../../../_helpers/collections/tree-group.js'; +import {Tree} from '../../../_helpers/collections/tree-group'; import {DataListContext} from './data-list.component'; @Component({ diff --git a/frontend/app/src/app/modules/data/list/tree-list.component.ts b/frontend/app/src/app/modules/data/list/tree-list.component.ts index 9d13380c..ba57e2af 100644 --- a/frontend/app/src/app/modules/data/list/tree-list.component.ts +++ b/frontend/app/src/app/modules/data/list/tree-list.component.ts @@ -15,7 +15,7 @@ import {Component, ContentChild, Input, TemplateRef} from '@angular/core'; import {DataListContext} from './data-list.component'; import {SCThings, SCThingWithoutReferences, SCUuid} from '@openstapps/core'; -import {Tree, treeGroupBy} from '../../../_helpers/collections/tree-group.js'; +import {Tree, treeGroupBy} from '../../../_helpers/collections/tree-group'; @Component({ selector: 'tree-list', diff --git a/frontend/app/src/app/modules/data/stapps-web-http-client.provider.ts b/frontend/app/src/app/modules/data/stapps-web-http-client.provider.ts index 17240f21..17f79aec 100644 --- a/frontend/app/src/app/modules/data/stapps-web-http-client.provider.ts +++ b/frontend/app/src/app/modules/data/stapps-web-http-client.provider.ts @@ -14,7 +14,7 @@ */ import {HttpClient, HttpResponse} from '@angular/common/http'; import {Injectable} from '@angular/core'; -import {HttpClientInterface, HttpClientRequest} from '@openstapps/api/lib/http-client-interface'; +import {HttpClientInterface, HttpClientRequest} from '@openstapps/api'; import {map, retry} from 'rxjs/operators'; import {lastValueFrom, Observable} from 'rxjs'; import {InternetConnectionService} from '../../util/internet-connection.service'; diff --git a/frontend/app/src/app/modules/data/types/article/article-content.html b/frontend/app/src/app/modules/data/types/article/article-content.html index 2ffdfb7a..b0a6f9ea 100644 --- a/frontend/app/src/app/modules/data/types/article/article-content.html +++ b/frontend/app/src/app/modules/data/types/article/article-content.html @@ -64,9 +64,8 @@ {{ 'publications' | propertyNameTranslate : item | sentencecase }}

- {{ publication.locations | join : ', ' }} - {{ publication.locations && publication.publisher ? ':' : '' }} - {{ publication.publisher }} + {{ publication.locations | join : ', ' }} {{ publication.locations && publication.publisher ? ':' : '' + }} {{ publication.publisher }}

diff --git a/frontend/app/src/app/modules/data/types/article/article-list-item.html b/frontend/app/src/app/modules/data/types/article/article-list-item.html index 402b6522..df44e480 100644 --- a/frontend/app/src/app/modules/data/types/article/article-list-item.html +++ b/frontend/app/src/app/modules/data/types/article/article-list-item.html @@ -16,25 +16,20 @@ -

- {{ 'name' | thingTranslate : item }} -

+

{{ 'name' | thingTranslate : item }}

{{ 'name' | thingTranslate : author }},  - {{ - item.firstPublished - }}{{ item.firstPublished }}{{ - [item.firstPublished, item.lastPublished] | join : ' - ' - }}{{ [item.firstPublished, item.lastPublished] | join : ' - ' }}

- - {{ 'categories' | thingTranslate : item }} - + {{ 'categories' | thingTranslate : item }} diff --git a/frontend/app/src/app/modules/data/types/book/book-detail-content.html b/frontend/app/src/app/modules/data/types/book/book-detail-content.html index 1c60b855..17008f15 100644 --- a/frontend/app/src/app/modules/data/types/book/book-detail-content.html +++ b/frontend/app/src/app/modules/data/types/book/book-detail-content.html @@ -75,9 +75,8 @@ {{ 'publications' | propertyNameTranslate : item | sentencecase }}

- {{ publication.locations | join : ', ' }} - {{ publication.locations && publication.publisher ? ':' : '' }} - {{ publication.publisher }} + {{ publication.locations | join : ', ' }} {{ publication.locations && publication.publisher ? ':' : '' + }} {{ publication.publisher }}

diff --git a/frontend/app/src/app/modules/data/types/book/book-list-item.html b/frontend/app/src/app/modules/data/types/book/book-list-item.html index 402b6522..df44e480 100644 --- a/frontend/app/src/app/modules/data/types/book/book-list-item.html +++ b/frontend/app/src/app/modules/data/types/book/book-list-item.html @@ -16,25 +16,20 @@ -

- {{ 'name' | thingTranslate : item }} -

+

{{ 'name' | thingTranslate : item }}

{{ 'name' | thingTranslate : author }},  - {{ - item.firstPublished - }}{{ item.firstPublished }}{{ - [item.firstPublished, item.lastPublished] | join : ' - ' - }}{{ [item.firstPublished, item.lastPublished] | join : ' - ' }}

- - {{ 'categories' | thingTranslate : item }} - + {{ 'categories' | thingTranslate : item }} diff --git a/frontend/app/src/app/modules/data/types/catalog/catalog-list-item.html b/frontend/app/src/app/modules/data/types/catalog/catalog-list-item.html index bc739631..ebc5aacf 100644 --- a/frontend/app/src/app/modules/data/types/catalog/catalog-list-item.html +++ b/frontend/app/src/app/modules/data/types/catalog/catalog-list-item.html @@ -2,12 +2,8 @@
- - {{ 'name' | thingTranslate : item }} - -

- {{ item.academicTerm.name }} -

+ {{ 'name' | thingTranslate : item }} +

{{ item.academicTerm.name }}

 diff --git a/frontend/app/src/app/modules/data/types/date-series/date-series-detail-content.html b/frontend/app/src/app/modules/data/types/date-series/date-series-detail-content.html index 0464fad0..b4fc33f8 100644 --- a/frontend/app/src/app/modules/data/types/date-series/date-series-detail-content.html +++ b/frontend/app/src/app/modules/data/types/date-series/date-series-detail-content.html @@ -13,17 +13,13 @@ ~ this program. If not, see . --> - - {{ 'event' | propertyNameTranslate : item | titlecase }} - + {{ 'event' | propertyNameTranslate : item | titlecase }} {{ 'name' | thingTranslate : item.event }} - - {{ 'inPlace' | propertyNameTranslate : item | titlecase }} - + {{ 'inPlace' | propertyNameTranslate : item | titlecase }} {{ 'name' | thingTranslate : item.inPlace }} diff --git a/frontend/app/src/app/modules/data/types/date-series/date-series-list-item.html b/frontend/app/src/app/modules/data/types/date-series/date-series-list-item.html index 465329e2..5629c02a 100644 --- a/frontend/app/src/app/modules/data/types/date-series/date-series-list-item.html +++ b/frontend/app/src/app/modules/data/types/date-series/date-series-list-item.html @@ -22,17 +22,17 @@ - {{ item.repeatFrequency | durationLocalized : true | sentencecase }}, - {{ item.dates[0] | dateFormat : 'weekday:long' }} + {{ item.repeatFrequency | durationLocalized : true | sentencecase }}, {{ item.dates[0] | + dateFormat : 'weekday:long' }} ({{ item.dates[0] | dateFormat }} - {{ item.dates[item.dates.length - 1] | dateFormat }})

- {{ - 'categories' | thingTranslate : item.event | join : ', ' - }} + {{ 'categories' | thingTranslate : item.event | join : ', ' }} diff --git a/frontend/app/src/app/modules/data/types/event/event-detail-content.html b/frontend/app/src/app/modules/data/types/event/event-detail-content.html index 7b59c688..5ceb0989 100644 --- a/frontend/app/src/app/modules/data/types/event/event-detail-content.html +++ b/frontend/app/src/app/modules/data/types/event/event-detail-content.html @@ -39,9 +39,9 @@ [content]="item.majors" > - {{ - $any('superCatalogs' | propertyNameTranslate : 'catalog') | titlecase - }} + {{ $any('superCatalogs' | propertyNameTranslate : 'catalog') | titlecase }} - {{ - 'name' | thingTranslate : $any(item) - }} + {{ 'name' | thingTranslate : $any(item) }} diff --git a/frontend/app/src/app/modules/data/types/favorite/favorite-list-item.html b/frontend/app/src/app/modules/data/types/favorite/favorite-list-item.html index 8b86b2aa..1ea37092 100644 --- a/frontend/app/src/app/modules/data/types/favorite/favorite-list-item.html +++ b/frontend/app/src/app/modules/data/types/favorite/favorite-list-item.html @@ -18,8 +18,7 @@
- {{ 'name' | thingTranslate : item }}: - {{ 'name' | thingTranslate : item.data }} + {{ 'name' | thingTranslate : item }}: {{ 'name' | thingTranslate : item.data }}

- - {{ 'sameAs' | propertyNameTranslate : item | titlecase }} - + {{ 'sameAs' | propertyNameTranslate : item | titlecase }} diff --git a/frontend/app/src/app/modules/data/types/organization/organization-detail-content.html b/frontend/app/src/app/modules/data/types/organization/organization-detail-content.html index ef914268..d1f95481 100644 --- a/frontend/app/src/app/modules/data/types/organization/organization-detail-content.html +++ b/frontend/app/src/app/modules/data/types/organization/organization-detail-content.html @@ -14,9 +14,7 @@ --> - - {{ 'inPlace' | propertyNameTranslate : item | titlecase }} - + {{ 'inPlace' | propertyNameTranslate : item | titlecase }} {{ 'name' | thingTranslate : item.inPlace }} diff --git a/frontend/app/src/app/modules/data/types/organization/organization-list-item.html b/frontend/app/src/app/modules/data/types/organization/organization-list-item.html index cb5e5977..9bd34aaf 100644 --- a/frontend/app/src/app/modules/data/types/organization/organization-list-item.html +++ b/frontend/app/src/app/modules/data/types/organization/organization-list-item.html @@ -18,9 +18,7 @@

{{ 'name' | thingTranslate : item }} -

- {{ 'description' | thingTranslate : item }} -

+

{{ 'description' | thingTranslate : item }}

{{ 'type' | thingTranslate : item }}
diff --git a/frontend/app/src/app/modules/data/types/periodical/periodical-detail-content.html b/frontend/app/src/app/modules/data/types/periodical/periodical-detail-content.html index db6d3011..8cc02743 100644 --- a/frontend/app/src/app/modules/data/types/periodical/periodical-detail-content.html +++ b/frontend/app/src/app/modules/data/types/periodical/periodical-detail-content.html @@ -62,9 +62,8 @@ {{ 'publications' | propertyNameTranslate : item | sentencecase }}

- {{ publication.locations | join : ', ' }} - {{ publication.locations && publication.publisher ? ':' : '' }} - {{ publication.publisher }} + {{ publication.locations | join : ', ' }} {{ publication.locations && publication.publisher ? ':' : '' + }} {{ publication.publisher }}

diff --git a/frontend/app/src/app/modules/data/types/periodical/periodical-list-item.html b/frontend/app/src/app/modules/data/types/periodical/periodical-list-item.html index 402b6522..df44e480 100644 --- a/frontend/app/src/app/modules/data/types/periodical/periodical-list-item.html +++ b/frontend/app/src/app/modules/data/types/periodical/periodical-list-item.html @@ -16,25 +16,20 @@ -

- {{ 'name' | thingTranslate : item }} -

+

{{ 'name' | thingTranslate : item }}

{{ 'name' | thingTranslate : author }},  - {{ - item.firstPublished - }}{{ item.firstPublished }}{{ - [item.firstPublished, item.lastPublished] | join : ' - ' - }}{{ [item.firstPublished, item.lastPublished] | join : ' - ' }}

- - {{ 'categories' | thingTranslate : item }} - + {{ 'categories' | thingTranslate : item }} diff --git a/frontend/app/src/app/modules/data/types/person/person-detail-content.html b/frontend/app/src/app/modules/data/types/person/person-detail-content.html index f1c14a26..c145970f 100644 --- a/frontend/app/src/app/modules/data/types/person/person-detail-content.html +++ b/frontend/app/src/app/modules/data/types/person/person-detail-content.html @@ -29,12 +29,10 @@ {{ contactPoint.email }}

- {{ 'faxNumber' | propertyNameTranslate : contactPoint | titlecase }}: - {{ contactPoint.faxNumber }} + {{ 'faxNumber' | propertyNameTranslate : contactPoint | titlecase }}: {{ contactPoint.faxNumber }}

- {{ 'officeHours' | propertyNameTranslate : contactPoint | titlecase }}: - {{ contactPoint.officeHours }} + {{ 'officeHours' | propertyNameTranslate : contactPoint | titlecase }}: {{ contactPoint.officeHours }}

{{ 'url' | propertyNameTranslate : contactPoint | titlecase }}: diff --git a/frontend/app/src/app/modules/data/types/place/special/mensa/place-mensa-detail.component.ts b/frontend/app/src/app/modules/data/types/place/special/mensa/place-mensa-detail.component.ts index d1237163..63ddfc32 100644 --- a/frontend/app/src/app/modules/data/types/place/special/mensa/place-mensa-detail.component.ts +++ b/frontend/app/src/app/modules/data/types/place/special/mensa/place-mensa-detail.component.ts @@ -17,7 +17,7 @@ import moment, {Moment} from 'moment'; import {AfterViewInit, Component, Input, OnDestroy} from '@angular/core'; import {SCDish, SCISO8601Date, SCPlace} from '@openstapps/core'; -import {PlaceMensaService} from './place-mensa-service.js'; +import {PlaceMensaService} from './place-mensa-service'; import {Router} from '@angular/router'; import {Subscription} from 'rxjs'; import {IonRouterOutlet} from '@ionic/angular'; diff --git a/frontend/app/src/app/modules/data/types/place/special/mensa/place-mensa-service.ts b/frontend/app/src/app/modules/data/types/place/special/mensa/place-mensa-service.ts index 314c28b8..e18b4021 100644 --- a/frontend/app/src/app/modules/data/types/place/special/mensa/place-mensa-service.ts +++ b/frontend/app/src/app/modules/data/types/place/special/mensa/place-mensa-service.ts @@ -17,7 +17,7 @@ import {Injectable} from '@angular/core'; import {SCDish, SCISO8601Date, SCPlace, SCSearchQuery, SCThingType} from '@openstapps/core'; import moment from 'moment'; import {DataProvider} from '../../../../data.provider'; -import {mapValues} from '../../../../../../_helpers/collections/map-values.js'; +import {mapValues} from '../../../../../../_helpers/collections/map-values'; import {SettingsProvider} from '../../../../../settings/settings.provider'; /** diff --git a/frontend/app/src/app/modules/data/types/place/special/mensa/place-mensa.html b/frontend/app/src/app/modules/data/types/place/special/mensa/place-mensa.html index 28eb8bbb..04ff95bc 100644 --- a/frontend/app/src/app/modules/data/types/place/special/mensa/place-mensa.html +++ b/frontend/app/src/app/modules/data/types/place/special/mensa/place-mensa.html @@ -18,12 +18,12 @@ - {{ - day.key | dateFormat : 'weekday:long,month:numeric,day:numeric' - }} - {{ - day.key | dateFormat : 'weekday:short,month:numeric,day:numeric' - }} + {{ day.key | dateFormat : 'weekday:long,month:numeric,day:numeric' }} + {{ day.key | dateFormat : 'weekday:short,month:numeric,day:numeric' }} @@ -33,10 +33,8 @@ - {{ - 'data.types.dish.detail.' + section.value[0].menuSection.name | translate | titlecase - }} - {{ section.value[0].menuSection.servingHours }} + {{ 'data.types.dish.detail.' + section.value[0].menuSection.name | translate | titlecase + }} {{ section.value[0].menuSection.servingHours }} @@ -60,9 +58,7 @@ - - {{ 'data.types.dish.EMPTY_DISHES' | translate }} - + {{ 'data.types.dish.EMPTY_DISHES' | translate }} diff --git a/frontend/app/src/app/modules/data/types/video/video-list-item.html b/frontend/app/src/app/modules/data/types/video/video-list-item.html index 32270524..f2053e86 100644 --- a/frontend/app/src/app/modules/data/types/video/video-list-item.html +++ b/frontend/app/src/app/modules/data/types/video/video-list-item.html @@ -10,8 +10,8 @@ >

- {{ 'duration' | propertyNameTranslate : item | titlecase }}: - {{ item.duration | amDuration : 'seconds' }} + {{ 'duration' | propertyNameTranslate : item | titlecase }}: {{ item.duration | amDuration : + 'seconds' }}

{{ 'type' | thingTranslate : item }}
diff --git a/frontend/app/src/app/modules/hebis/daia-availability/daia-availability.component.spec.ts b/frontend/app/src/app/modules/hebis/daia-availability/daia-availability.component.spec.ts index 1e32e411..377bc32b 100644 --- a/frontend/app/src/app/modules/hebis/daia-availability/daia-availability.component.spec.ts +++ b/frontend/app/src/app/modules/hebis/daia-availability/daia-availability.component.spec.ts @@ -18,7 +18,7 @@ import {CUSTOM_ELEMENTS_SCHEMA} from '@angular/core'; import {ComponentFixture, TestBed} from '@angular/core/testing'; import {ActivatedRoute, RouterModule} from '@angular/router'; import {TranslateLoader, TranslateModule, TranslateService} from '@ngx-translate/core'; -import {sampleThingsMap} from '../../../_helpers/data/sample-things.js'; +import {sampleThingsMap} from '../../../_helpers/data/sample-things'; import {HebisRoutingModule} from '../hebis-routing.module'; import {HebisModule} from '../hebis.module'; import {DaiaAvailabilityComponent} from './daia-availability.component'; diff --git a/frontend/app/src/app/modules/hebis/daia-availability/daia-availability.component.ts b/frontend/app/src/app/modules/hebis/daia-availability/daia-availability.component.ts index 7a4003e4..1a709865 100644 --- a/frontend/app/src/app/modules/hebis/daia-availability/daia-availability.component.ts +++ b/frontend/app/src/app/modules/hebis/daia-availability/daia-availability.component.ts @@ -20,9 +20,9 @@ import {FavoritesService} from '../../favorites/favorites.service'; import {DataProvider} from '../../data/data.provider'; import {DataDetailComponent} from '../../data/detail/data-detail.component'; import {DaiaDataProvider} from '../daia-data.provider'; -import {DaiaHolding} from '../protocol/response.js'; +import {DaiaHolding} from '../protocol/response'; import {ModalController} from '@ionic/angular'; -import {groupByStable} from '../../../_helpers/collections/group-by.js'; +import {groupByStable} from '../../../_helpers/collections/group-by'; /** * A Component to display an SCThing detailed diff --git a/frontend/app/src/app/modules/hebis/daia-availability/daia-availability.html b/frontend/app/src/app/modules/hebis/daia-availability/daia-availability.html index 7224726f..ce0fdb33 100644 --- a/frontend/app/src/app/modules/hebis/daia-availability/daia-availability.html +++ b/frontend/app/src/app/modules/hebis/daia-availability/daia-availability.html @@ -15,9 +15,7 @@ - - {{ 'hebisSearch.daia.availability' | translate }} - + {{ 'hebisSearch.daia.availability' | translate }} @@ -34,9 +32,7 @@ - - {{ 'hebisSearch.daia.unavailableAvailability' | translate }} - + {{ 'hebisSearch.daia.unavailableAvailability' | translate }} {{ 'hebisSearch.daia.unknownAvailability' | translate }} diff --git a/frontend/app/src/app/modules/hebis/daia-availability/daia-holding.component.ts b/frontend/app/src/app/modules/hebis/daia-availability/daia-holding.component.ts index df095fee..f3c84298 100644 --- a/frontend/app/src/app/modules/hebis/daia-availability/daia-holding.component.ts +++ b/frontend/app/src/app/modules/hebis/daia-availability/daia-holding.component.ts @@ -14,7 +14,7 @@ */ import {Component, Input, OnInit} from '@angular/core'; -import {DaiaHolding} from '../protocol/response.js'; +import {DaiaHolding} from '../protocol/response'; import {DaiaDataProvider} from '../daia-data.provider'; @Component({ diff --git a/frontend/app/src/app/modules/hebis/daia-data.provider.spec.ts b/frontend/app/src/app/modules/hebis/daia-data.provider.spec.ts index a647e072..9fefb831 100644 --- a/frontend/app/src/app/modules/hebis/daia-data.provider.spec.ts +++ b/frontend/app/src/app/modules/hebis/daia-data.provider.spec.ts @@ -23,7 +23,7 @@ import {LoggerConfig, LoggerModule, NGXLogger} from 'ngx-logger'; import {MapModule} from '../map/map.module'; import {HttpClientModule} from '@angular/common/http'; import {StorageModule} from '../storage/storage.module'; -import {DaiaHolding, DaiaService} from './protocol/response.js'; +import {DaiaHolding, DaiaService} from './protocol/response'; import {Observable, of} from 'rxjs'; import {TranslateLoader, TranslateModule} from '@ngx-translate/core'; diff --git a/frontend/app/src/app/modules/hebis/daia-data.provider.ts b/frontend/app/src/app/modules/hebis/daia-data.provider.ts index 6df31a51..6ec60129 100644 --- a/frontend/app/src/app/modules/hebis/daia-data.provider.ts +++ b/frontend/app/src/app/modules/hebis/daia-data.provider.ts @@ -13,7 +13,7 @@ * this program. If not, see . */ import {Injectable} from '@angular/core'; -import {DaiaAvailabilityResponse, DaiaHolding, DaiaService} from './protocol/response.js'; +import {DaiaAvailabilityResponse, DaiaHolding, DaiaService} from './protocol/response'; import {StorageProvider} from '../storage/storage.provider'; import {HttpClient, HttpHeaders} from '@angular/common/http'; import {ConfigProvider} from '../config/config.provider'; diff --git a/frontend/app/src/app/modules/hebis/hebis-data.provider.ts b/frontend/app/src/app/modules/hebis/hebis-data.provider.ts index 71cc187c..72598f41 100644 --- a/frontend/app/src/app/modules/hebis/hebis-data.provider.ts +++ b/frontend/app/src/app/modules/hebis/hebis-data.provider.ts @@ -13,14 +13,14 @@ * this program. If not, see . */ import {Injectable} from '@angular/core'; -import {Client} from '@openstapps/api/lib/client'; -import {SCHebisSearchRequest} from './protocol/request.js'; -import {HebisSearchResponse} from './protocol/response.js'; +import {Client} from '@openstapps/api'; +import {SCHebisSearchRequest} from './protocol/request'; +import {HebisSearchResponse} from './protocol/response'; import {StorageProvider} from '../storage/storage.provider'; import {StAppsWebHttpClient} from '../data/stapps-web-http-client.provider'; import {HttpClient} from '@angular/common/http'; import {DataProvider} from '../data/data.provider'; -import {SCHebisSearchRoute} from './protocol/route.js'; +import {SCHebisSearchRoute} from './protocol/route'; const HEBIS_PREFIX = 'HEB'; diff --git a/frontend/app/src/app/modules/hebis/hebis-detail/hebis-detail.component.spec.ts b/frontend/app/src/app/modules/hebis/hebis-detail/hebis-detail.component.spec.ts index 69bb6e77..55a69a31 100644 --- a/frontend/app/src/app/modules/hebis/hebis-detail/hebis-detail.component.spec.ts +++ b/frontend/app/src/app/modules/hebis/hebis-detail/hebis-detail.component.spec.ts @@ -19,7 +19,7 @@ import {CUSTOM_ELEMENTS_SCHEMA} from '@angular/core'; import {ComponentFixture, TestBed} from '@angular/core/testing'; import {ActivatedRoute, RouterModule} from '@angular/router'; import {TranslateLoader, TranslateModule, TranslateService} from '@ngx-translate/core'; -import {sampleThingsMap} from '../../../_helpers/data/sample-things.js'; +import {sampleThingsMap} from '../../../_helpers/data/sample-things'; import {HebisRoutingModule} from '../hebis-routing.module'; import {HebisModule} from '../hebis.module'; import {HebisDataProvider} from '../hebis-data.provider'; diff --git a/frontend/app/src/app/modules/hebis/hebis-detail/hebis-detail.component.ts b/frontend/app/src/app/modules/hebis/hebis-detail/hebis-detail.component.ts index 884f7729..c0f486ce 100644 --- a/frontend/app/src/app/modules/hebis/hebis-detail/hebis-detail.component.ts +++ b/frontend/app/src/app/modules/hebis/hebis-detail/hebis-detail.component.ts @@ -20,7 +20,7 @@ import {HebisDataProvider} from '../hebis-data.provider'; import {FavoritesService} from '../../favorites/favorites.service'; import {DataProvider} from '../../data/data.provider'; import {DataDetailComponent} from '../../data/detail/data-detail.component'; -import {DaiaHolding} from '../protocol/response.js'; +import {DaiaHolding} from '../protocol/response'; import {ModalController} from '@ionic/angular'; /** diff --git a/frontend/app/src/app/modules/hebis/list/hebis-search-page.html b/frontend/app/src/app/modules/hebis/list/hebis-search-page.html index 251fbaaa..3f474d43 100644 --- a/frontend/app/src/app/modules/hebis/list/hebis-search-page.html +++ b/frontend/app/src/app/modules/hebis/list/hebis-search-page.html @@ -51,9 +51,7 @@
- - {{ 'hebisSearch.instruction' | translate }} - + {{ 'hebisSearch.instruction' | translate }}

- {{ 'library.account.greeting' | translate }} - {{ name | firstLastName }}! - {{ 'library.account.login.success' | translate }} + {{ 'library.account.greeting' | translate }} {{ name | firstLastName }}! {{ + 'library.account.login.success' | translate }}

- {{ 'library.account.pages.profile.title' | translate | titlecase }} + {{ 'library.account.pages.profile.title' | + translate | titlecase }} - {{ 'library.account.pages.holds.title' | translate | titlecase }} + {{ 'library.account.pages.holds.title' | + translate | titlecase }} - {{ 'library.account.pages.checked_out.title' | translate | titlecase }} + {{ 'library.account.pages.checked_out.title' | translate | + titlecase }} - {{ 'library.account.pages.fines.title' | translate | titlecase }} + {{ 'library.account.pages.fines.title' | translate + | titlecase }} diff --git a/frontend/app/src/app/modules/library/account/checked-out/checked-out-page.component.ts b/frontend/app/src/app/modules/library/account/checked-out/checked-out-page.component.ts index f18702f4..0c1a756b 100644 --- a/frontend/app/src/app/modules/library/account/checked-out/checked-out-page.component.ts +++ b/frontend/app/src/app/modules/library/account/checked-out/checked-out-page.component.ts @@ -14,7 +14,7 @@ */ import {Component} from '@angular/core'; -import {DocumentAction, PAIADocument, PAIADocumentStatus} from '../../types.js'; +import {DocumentAction, PAIADocument, PAIADocumentStatus} from '../../types'; import {LibraryAccountService} from '../library-account.service'; @Component({ diff --git a/frontend/app/src/app/modules/library/account/elements/fee-item/fee-item.component.ts b/frontend/app/src/app/modules/library/account/elements/fee-item/fee-item.component.ts index 790c89bb..c526007f 100644 --- a/frontend/app/src/app/modules/library/account/elements/fee-item/fee-item.component.ts +++ b/frontend/app/src/app/modules/library/account/elements/fee-item/fee-item.component.ts @@ -14,7 +14,7 @@ */ import {Component, Input} from '@angular/core'; -import {PAIAFee} from '../../../types.js'; +import {PAIAFee} from '../../../types'; import {SCArticle, SCBook, SCPeriodical} from '@openstapps/core'; import {LibraryAccountService} from '../../library-account.service'; diff --git a/frontend/app/src/app/modules/library/account/elements/fee-item/fee-item.html b/frontend/app/src/app/modules/library/account/elements/fee-item/fee-item.html index bb89d420..24f19c50 100644 --- a/frontend/app/src/app/modules/library/account/elements/fee-item/fee-item.html +++ b/frontend/app/src/app/modules/library/account/elements/fee-item/fee-item.html @@ -17,8 +17,7 @@

- {{ 'library.account.pages.fines.labels.edition' | translate }}: - {{ book.name }} + {{ 'library.account.pages.fines.labels.edition' | translate }}: {{ book.name }}

@@ -28,12 +27,8 @@

{{ 'library.account.pages.fines.labels' + '.' + property | translate }}: - - {{ fee[property] }} - - - {{ fee[property] | amDateFormat : 'll' }} - + {{ fee[property] }} + {{ fee[property] | amDateFormat : 'll' }}

diff --git a/frontend/app/src/app/modules/library/account/elements/paia-item/paiaitem.component.ts b/frontend/app/src/app/modules/library/account/elements/paia-item/paiaitem.component.ts index 484c89c0..e08546e6 100644 --- a/frontend/app/src/app/modules/library/account/elements/paia-item/paiaitem.component.ts +++ b/frontend/app/src/app/modules/library/account/elements/paia-item/paiaitem.component.ts @@ -14,7 +14,7 @@ */ import {Component, EventEmitter, Input, Output} from '@angular/core'; -import {DocumentAction, PAIADocument} from '../../../types.js'; +import {DocumentAction, PAIADocument} from '../../../types'; @Component({ selector: 'stapps-paia-item', diff --git a/frontend/app/src/app/modules/library/account/elements/paia-item/paiaitem.html b/frontend/app/src/app/modules/library/account/elements/paia-item/paiaitem.html index 2845a24d..c359ec6e 100644 --- a/frontend/app/src/app/modules/library/account/elements/paia-item/paiaitem.html +++ b/frontend/app/src/app/modules/library/account/elements/paia-item/paiaitem.html @@ -23,9 +23,7 @@ {{ item[property] }} - - {{ item[property] | amDateFormat : 'll' }} - + {{ item[property] | amDateFormat : 'll' }}

diff --git a/frontend/app/src/app/modules/library/account/fines/fines-page.component.ts b/frontend/app/src/app/modules/library/account/fines/fines-page.component.ts index 8fcd045a..f530bc12 100644 --- a/frontend/app/src/app/modules/library/account/fines/fines-page.component.ts +++ b/frontend/app/src/app/modules/library/account/fines/fines-page.component.ts @@ -1,6 +1,6 @@ import {Component} from '@angular/core'; import {LibraryAccountService} from '../library-account.service'; -import {PAIAFee} from '../../types.js'; +import {PAIAFee} from '../../types'; @Component({ selector: 'app-fines', diff --git a/frontend/app/src/app/modules/library/account/fines/fines-page.html b/frontend/app/src/app/modules/library/account/fines/fines-page.html index 6cad3e0d..a5cfd88d 100644 --- a/frontend/app/src/app/modules/library/account/fines/fines-page.html +++ b/frontend/app/src/app/modules/library/account/fines/fines-page.html @@ -32,9 +32,7 @@ {{ 'library.account.pages.fines.labels.total_amount' | translate }}: - - {{ amount }} - + {{ amount }} diff --git a/frontend/app/src/app/modules/library/account/holds/holds-page.component.ts b/frontend/app/src/app/modules/library/account/holds/holds-page.component.ts index 15da7a9b..0a0f2f2f 100644 --- a/frontend/app/src/app/modules/library/account/holds/holds-page.component.ts +++ b/frontend/app/src/app/modules/library/account/holds/holds-page.component.ts @@ -14,7 +14,7 @@ */ import {Component} from '@angular/core'; -import {DocumentAction, PAIADocument, PAIADocumentStatus} from '../../types.js'; +import {DocumentAction, PAIADocument, PAIADocumentStatus} from '../../types'; import {LibraryAccountService} from '../library-account.service'; type Segment = 'orders' | 'reservations'; diff --git a/frontend/app/src/app/modules/library/account/library-account.service.ts b/frontend/app/src/app/modules/library/account/library-account.service.ts index ea83aedb..f3d81d14 100644 --- a/frontend/app/src/app/modules/library/account/library-account.service.ts +++ b/frontend/app/src/app/modules/library/account/library-account.service.ts @@ -20,14 +20,14 @@ import { SCFeatureConfiguration, SCFeatureConfigurationExtern, } from '@openstapps/core'; -import {DocumentAction, PAIADocument, PAIADocumentStatus, PAIAFees, PAIAItems, PAIAPatron} from '../types.js'; +import {DocumentAction, PAIADocument, PAIADocumentStatus, PAIAFees, PAIAItems, PAIAPatron} from '../types'; import {HebisDataProvider} from '../../hebis/hebis-data.provider'; -import {PAIATokenResponse} from '../../auth/paia/paia-token-response.js'; +import {PAIATokenResponse} from '../../auth/paia/paia-token-response'; import {AuthHelperService} from '../../auth/auth-helper.service'; import {ConfigProvider} from '../../config/config.provider'; import {TranslateService} from '@ngx-translate/core'; import {AlertController, ToastController} from '@ionic/angular'; -import {HebisSearchResponse} from '../../hebis/protocol/response.js'; +import {HebisSearchResponse} from '../../hebis/protocol/response'; @Injectable({ providedIn: 'root', diff --git a/frontend/app/src/app/modules/library/account/profile/profile-page.component.ts b/frontend/app/src/app/modules/library/account/profile/profile-page.component.ts index 584f01ce..d3772aca 100644 --- a/frontend/app/src/app/modules/library/account/profile/profile-page.component.ts +++ b/frontend/app/src/app/modules/library/account/profile/profile-page.component.ts @@ -15,7 +15,7 @@ import {Component} from '@angular/core'; import {LibraryAccountService} from '../library-account.service'; -import {PAIAPatron} from '../../types.js'; +import {PAIAPatron} from '../../types'; @Component({ selector: 'app-profile', diff --git a/frontend/app/src/app/modules/library/account/profile/profile-page.html b/frontend/app/src/app/modules/library/account/profile/profile-page.html index d4914ffa..890f7623 100644 --- a/frontend/app/src/app/modules/library/account/profile/profile-page.html +++ b/frontend/app/src/app/modules/library/account/profile/profile-page.html @@ -37,9 +37,8 @@ {{ 'library.account.pages.profile.values.unlimited' | translate }} - {{ 'library.account.pages.profile.values.expires' | translate }}: {{ - patron[property] | amDateFormat : 'll' - }} + {{ 'library.account.pages.profile.values.expires' | translate }}: {{ patron[property] | + amDateFormat : 'll' }} diff --git a/frontend/app/src/app/modules/map/map.provider.spec.ts b/frontend/app/src/app/modules/map/map.provider.spec.ts index 608858e6..566eeaa5 100644 --- a/frontend/app/src/app/modules/map/map.provider.spec.ts +++ b/frontend/app/src/app/modules/map/map.provider.spec.ts @@ -22,7 +22,7 @@ import {MapModule} from './map.module'; import {StorageModule} from '../storage/storage.module'; import {LoggerModule, NGXLogger, NgxLoggerLevel} from 'ngx-logger'; import {ConfigProvider} from '../config/config.provider'; -import {sampleDefaultPolygon} from '../../_helpers/data/sample-configuration.js'; +import {sampleDefaultPolygon} from '../../_helpers/data/sample-configuration'; import {RouterModule} from '@angular/router'; describe('MapProvider', () => { diff --git a/frontend/app/src/app/modules/map/map.provider.ts b/frontend/app/src/app/modules/map/map.provider.ts index adfbda63..6ec931ae 100644 --- a/frontend/app/src/app/modules/map/map.provider.ts +++ b/frontend/app/src/app/modules/map/map.provider.ts @@ -25,9 +25,9 @@ import {Point, Polygon} from 'geojson'; import {divIcon, geoJSON, LatLng, Map, marker, Marker} from 'leaflet'; import {DataProvider} from '../data/data.provider'; import {MapPosition, PositionService} from './position.service'; -import {hasValidLocation} from '../data/types/place/place-types.js'; +import {hasValidLocation} from '../data/types/place/place-types'; import {ConfigProvider} from '../config/config.provider'; -import {SCIcon} from '../../util/ion-icon/icon.js'; +import {SCIcon} from '../../util/ion-icon/icon'; /** * Provides methods for presenting the map diff --git a/frontend/app/src/app/modules/menu/context/context-menu.component.spec.ts b/frontend/app/src/app/modules/menu/context/context-menu.component.spec.ts index 0ddaf7db..eade660a 100644 --- a/frontend/app/src/app/modules/menu/context/context-menu.component.spec.ts +++ b/frontend/app/src/app/modules/menu/context/context-menu.component.spec.ts @@ -23,7 +23,7 @@ import {SCFacet, SCThingType} from '@openstapps/core'; import {ContextMenuComponent} from './context-menu.component'; import {SettingsModule} from '../../settings/settings.module'; import {ContextMenuService} from './context-menu.service'; -import {FilterContext, SortContext} from './context-type.js'; +import {FilterContext, SortContext} from './context-type'; import {Component} from '@angular/core'; import {By} from '@angular/platform-browser'; diff --git a/frontend/app/src/app/modules/menu/navigation/navigation.html b/frontend/app/src/app/modules/menu/navigation/navigation.html index b6326dd9..965f5a00 100644 --- a/frontend/app/src/app/modules/menu/navigation/navigation.html +++ b/frontend/app/src/app/modules/menu/navigation/navigation.html @@ -34,15 +34,11 @@ class="menu-category" > - - {{ category.translations[language].title | titlecase }} - + {{ category.translations[language].title | titlecase }} - - {{ item.translations[language].title | titlecase }} - + {{ item.translations[language].title | titlecase }} diff --git a/frontend/app/src/app/modules/menu/navigation/root-link.directive.ts b/frontend/app/src/app/modules/menu/navigation/root-link.directive.ts index 4c2f8260..28345a40 100644 --- a/frontend/app/src/app/modules/menu/navigation/root-link.directive.ts +++ b/frontend/app/src/app/modules/menu/navigation/root-link.directive.ts @@ -15,7 +15,7 @@ import {Directive, ElementRef, Input, OnDestroy, OnInit, Renderer2} from '@angular/core'; import {AnimationController, NavController} from '@ionic/angular'; import {Router, RouterEvent} from '@angular/router'; -import {tabsTransition} from './tabs-transition.js'; +import {tabsTransition} from './tabs-transition'; import {Subscription} from 'rxjs'; @Directive({ diff --git a/frontend/app/src/app/modules/menu/navigation/tabs.spec.ts b/frontend/app/src/app/modules/menu/navigation/tabs.spec.ts index 48d3287a..3a350346 100644 --- a/frontend/app/src/app/modules/menu/navigation/tabs.spec.ts +++ b/frontend/app/src/app/modules/menu/navigation/tabs.spec.ts @@ -20,7 +20,7 @@ import {RouterTestingModule} from '@angular/router/testing'; import {TabsComponent} from './tabs.component'; import {ConfigProvider} from '../../config/config.provider'; -import {sampleAuthConfiguration} from '../../../_helpers/data/sample-configuration.js'; +import {sampleAuthConfiguration} from '../../../_helpers/data/sample-configuration'; import {TranslateModule, TranslateService} from '@ngx-translate/core'; import {NGXLogger} from 'ngx-logger'; import {Platform} from '@ionic/angular'; diff --git a/frontend/app/src/app/modules/news/elements/news-filter-settings/news-settings-filter.component.ts b/frontend/app/src/app/modules/news/elements/news-filter-settings/news-settings-filter.component.ts index 759aa5dc..8c3f7322 100644 --- a/frontend/app/src/app/modules/news/elements/news-filter-settings/news-settings-filter.component.ts +++ b/frontend/app/src/app/modules/news/elements/news-filter-settings/news-settings-filter.component.ts @@ -13,7 +13,7 @@ * this program. If not, see . */ import {Component, EventEmitter, Input, OnInit, Output} from '@angular/core'; -import {newsFilterSettingsFieldsMapping, NewsFilterSettingsNames} from '../../news-filter-settings.js'; +import {newsFilterSettingsFieldsMapping, NewsFilterSettingsNames} from '../../news-filter-settings'; import {SCSearchValueFilter, SCSetting} from '@openstapps/core'; import {DataProvider} from '../../../data/data.provider'; diff --git a/frontend/app/src/app/modules/news/item/news-item.html b/frontend/app/src/app/modules/news/item/news-item.html index 3ec8c828..73185de1 100644 --- a/frontend/app/src/app/modules/news/item/news-item.html +++ b/frontend/app/src/app/modules/news/item/news-item.html @@ -19,11 +19,9 @@ [style.--background]="item.image ? 'url(' + item.image + ')' : undefined" > - {{ - item.datePublished | amCalendar | sentencecase - }} - - {{ item.name }} - + {{ item.datePublished | amCalendar | sentencecase }} + {{ item.name }} diff --git a/frontend/app/src/app/modules/news/news.provider.ts b/frontend/app/src/app/modules/news/news.provider.ts index ee410b5c..c83c30aa 100644 --- a/frontend/app/src/app/modules/news/news.provider.ts +++ b/frontend/app/src/app/modules/news/news.provider.ts @@ -27,7 +27,7 @@ import { newsFilterSettingsCategory, newsFilterSettingsFieldsMapping, NewsFilterSettingsNames, -} from './news-filter-settings.js'; +} from './news-filter-settings'; import {SettingsProvider} from '../settings/settings.provider'; /** diff --git a/frontend/app/src/app/modules/profile/page/profile-page.spec.ts b/frontend/app/src/app/modules/profile/page/profile-page.spec.ts index 10c22f43..f2a60ace 100644 --- a/frontend/app/src/app/modules/profile/page/profile-page.spec.ts +++ b/frontend/app/src/app/modules/profile/page/profile-page.spec.ts @@ -21,7 +21,7 @@ import {AuthModule} from '../../auth/auth.module'; import {ProfilePageComponent} from './profile-page.component'; import {TranslateModule} from '@ngx-translate/core'; import {ConfigProvider} from '../../config/config.provider'; -import {sampleAuthConfiguration} from '../../../_helpers/data/sample-configuration.js'; +import {sampleAuthConfiguration} from '../../../_helpers/data/sample-configuration'; import {StorageProvider} from '../../storage/storage.provider'; import {ScheduleProvider} from '../../calendar/schedule.provider'; import {DataProvider} from '../../data/data.provider'; diff --git a/frontend/app/src/app/modules/schedule/page/calendar-view.component.ts b/frontend/app/src/app/modules/schedule/page/calendar-view.component.ts index 285e7be1..68faff56 100644 --- a/frontend/app/src/app/modules/schedule/page/calendar-view.component.ts +++ b/frontend/app/src/app/modules/schedule/page/calendar-view.component.ts @@ -15,8 +15,8 @@ import {AfterViewInit, Component, Input, OnDestroy, OnInit, ViewChild} from '@angular/core'; import {ActivatedRoute} from '@angular/router'; import moment from 'moment'; -import {materialFade, materialManualFade, materialSharedAxisX} from '../../../animation/material-motion.js'; -import {ScheduleResponsiveBreakpoint} from './schema/schema.js'; +import {materialFade, materialManualFade, materialSharedAxisX} from '../../../animation/material-motion'; +import {ScheduleResponsiveBreakpoint} from './schema/schema'; import {ScheduleProvider} from '../../calendar/schedule.provider'; import {CalendarComponent} from './components/calendar.component'; import {CalendarService} from '../../calendar/calendar.service'; diff --git a/frontend/app/src/app/modules/schedule/page/components/calendar.component.ts b/frontend/app/src/app/modules/schedule/page/components/calendar.component.ts index da37bced..092f5748 100644 --- a/frontend/app/src/app/modules/schedule/page/components/calendar.component.ts +++ b/frontend/app/src/app/modules/schedule/page/components/calendar.component.ts @@ -16,19 +16,15 @@ import {Component, Input, OnDestroy, OnInit} from '@angular/core'; import {ActivatedRoute} from '@angular/router'; import {SCISO8601Date, SCUuid} from '@openstapps/core'; import moment, {Moment} from 'moment'; -import { - materialFade, - materialManualFade, - materialSharedAxisX, -} from '../../../../animation/material-motion.js'; +import {materialFade, materialManualFade, materialSharedAxisX} from '../../../../animation/material-motion'; import {ScheduleProvider} from '../../../calendar/schedule.provider'; -import {ScheduleEvent, ScheduleResponsiveBreakpoint} from '../schema/schema.js'; +import {ScheduleEvent, ScheduleResponsiveBreakpoint} from '../schema/schema'; import {SwiperComponent} from 'swiper/angular'; import {InfiniteSwiperComponent} from '../grid/infinite-swiper.component'; import {IonContent, IonDatetime} from '@ionic/angular'; import {Subscription} from 'rxjs'; import {CalendarService} from '../../../calendar/calendar.service'; -import {getScheduleCursorOffset} from '../grid/schedule-cursor-offset.js'; +import {getScheduleCursorOffset} from '../grid/schedule-cursor-offset'; /** * Component that displays the schedule diff --git a/frontend/app/src/app/modules/schedule/page/grid/infinite-swiper.component.ts b/frontend/app/src/app/modules/schedule/page/grid/infinite-swiper.component.ts index 81ad3bc7..815f740e 100644 --- a/frontend/app/src/app/modules/schedule/page/grid/infinite-swiper.component.ts +++ b/frontend/app/src/app/modules/schedule/page/grid/infinite-swiper.component.ts @@ -33,8 +33,8 @@ import { ViewContainerRef, } from '@angular/core'; import Swiper from 'swiper'; -import {materialManualFade} from '../../../../animation/material-motion.js'; -import {zip} from '../../../../_helpers/collections/zip.js'; +import {materialManualFade} from '../../../../animation/material-motion'; +import {zip} from '../../../../_helpers/collections/zip'; export interface SlideContext { $implicit: number; diff --git a/frontend/app/src/app/modules/schedule/page/grid/range-overlap.spec.ts b/frontend/app/src/app/modules/schedule/page/grid/range-overlap.spec.ts index 0bb3c27c..c4883b59 100644 --- a/frontend/app/src/app/modules/schedule/page/grid/range-overlap.spec.ts +++ b/frontend/app/src/app/modules/schedule/page/grid/range-overlap.spec.ts @@ -14,8 +14,8 @@ */ /* eslint-disable @typescript-eslint/no-explicit-any */ -import {groupRangeOverlaps} from './range-overlap.js'; -import {shuffle} from '../../../../_helpers/collections/shuffle.js'; +import {groupRangeOverlaps} from './range-overlap'; +import {shuffle} from '../../../../_helpers/collections/shuffle'; interface SimpleRange { starty: number; diff --git a/frontend/app/src/app/modules/schedule/page/grid/range-overlap.ts b/frontend/app/src/app/modules/schedule/page/grid/range-overlap.ts index 08ba0ade..bba6a7b4 100644 --- a/frontend/app/src/app/modules/schedule/page/grid/range-overlap.ts +++ b/frontend/app/src/app/modules/schedule/page/grid/range-overlap.ts @@ -12,7 +12,7 @@ * You should have received a copy of the GNU General Public License along with * this program. If not, see . */ -import {partition} from '../../../../_helpers/collections/partition.js'; +import {partition} from '../../../../_helpers/collections/partition'; export interface RangeInfo { elements: T[]; diff --git a/frontend/app/src/app/modules/schedule/page/grid/schedule-card.component.ts b/frontend/app/src/app/modules/schedule/page/grid/schedule-card.component.ts index 8aeabcbb..41ae4ef6 100644 --- a/frontend/app/src/app/modules/schedule/page/grid/schedule-card.component.ts +++ b/frontend/app/src/app/modules/schedule/page/grid/schedule-card.component.ts @@ -15,7 +15,7 @@ import {Component, Input, OnInit} from '@angular/core'; import moment from 'moment'; import {ScheduleProvider} from '../../../calendar/schedule.provider'; -import {ScheduleEvent} from '../schema/schema.js'; +import {ScheduleEvent} from '../schema/schema'; /** * Component that can display a schedule event diff --git a/frontend/app/src/app/modules/schedule/page/grid/schedule-card.html b/frontend/app/src/app/modules/schedule/page/grid/schedule-card.html index 0b316ca0..bf219c2e 100644 --- a/frontend/app/src/app/modules/schedule/page/grid/schedule-card.html +++ b/frontend/app/src/app/modules/schedule/page/grid/schedule-card.html @@ -25,17 +25,14 @@ > - {{ - this.scheduleEvent?.dateSeries?.event?.name | nullishCoalesce : this.scheduleEvent?.dateSeries?.name + {{ this.scheduleEvent?.dateSeries?.event?.name | nullishCoalesce : this.scheduleEvent?.dateSeries?.name }} - - {{ getNote() }} - - {{ - scheduleEvent?.dateSeries?.inPlace?.name - }} + {{ getNote() }} + {{ scheduleEvent?.dateSeries?.inPlace?.name }} diff --git a/frontend/app/src/app/modules/schedule/page/grid/schedule-cursor.component.ts b/frontend/app/src/app/modules/schedule/page/grid/schedule-cursor.component.ts index 85e1c0b4..dab8764e 100644 --- a/frontend/app/src/app/modules/schedule/page/grid/schedule-cursor.component.ts +++ b/frontend/app/src/app/modules/schedule/page/grid/schedule-cursor.component.ts @@ -13,9 +13,9 @@ * this program. If not, see . */ import {Component, Input, OnInit} from '@angular/core'; -import {HoursRange} from '../schema/schema.js'; +import {HoursRange} from '../schema/schema'; import moment from 'moment'; -import {getScheduleCursorOffset} from './schedule-cursor-offset.js'; +import {getScheduleCursorOffset} from './schedule-cursor-offset'; /** * Component that displays the schedule diff --git a/frontend/app/src/app/modules/schedule/page/grid/schedule-day.component.ts b/frontend/app/src/app/modules/schedule/page/grid/schedule-day.component.ts index d1b50b29..f6e2d867 100644 --- a/frontend/app/src/app/modules/schedule/page/grid/schedule-day.component.ts +++ b/frontend/app/src/app/modules/schedule/page/grid/schedule-day.component.ts @@ -14,11 +14,11 @@ */ import {Component, HostListener, Input, OnInit} from '@angular/core'; import moment from 'moment'; -import {Range, ScheduleEvent, ScheduleResponsiveBreakpoint} from '../schema/schema.js'; +import {Range, ScheduleEvent, ScheduleResponsiveBreakpoint} from '../schema/schema'; import {ScheduleProvider} from '../../../calendar/schedule.provider'; import {SCISO8601Duration, SCUuid} from '@openstapps/core'; -import {materialFade} from '../../../../animation/material-motion.js'; -import {groupRangeOverlaps} from './range-overlap.js'; +import {materialFade} from '../../../../animation/material-motion'; +import {groupRangeOverlaps} from './range-overlap'; @Component({ selector: 'schedule-day', diff --git a/frontend/app/src/app/modules/schedule/page/grid/schedule-day.html b/frontend/app/src/app/modules/schedule/page/grid/schedule-day.html index ff2a35ef..4ffe18e6 100644 --- a/frontend/app/src/app/modules/schedule/page/grid/schedule-day.html +++ b/frontend/app/src/app/modules/schedule/page/grid/schedule-day.html @@ -13,9 +13,7 @@ ~ this program. If not, see . -->
-
- {{ day | amDateFormat : dateFormat }} -
+
{{ day | amDateFormat : dateFormat }}
- {{ - 'schedule.calendar' | translate | titlecase - }} - {{ - 'schedule.recurring' | translate | titlecase - }} - {{ - 'schedule.single' | translate | titlecase - }} + {{ 'schedule.calendar' | translate | titlecase }} + {{ 'schedule.recurring' | translate | titlecase }} + {{ 'schedule.single' | translate | titlecase }} diff --git a/frontend/app/src/app/modules/schedule/page/schedule-single-events.component.ts b/frontend/app/src/app/modules/schedule/page/schedule-single-events.component.ts index 1ab6bc02..01d3d42a 100644 --- a/frontend/app/src/app/modules/schedule/page/schedule-single-events.component.ts +++ b/frontend/app/src/app/modules/schedule/page/schedule-single-events.component.ts @@ -16,12 +16,12 @@ import {Component, Input, OnDestroy, OnInit} from '@angular/core'; import {SCDateSeries, SCUuid} from '@openstapps/core'; import moment from 'moment'; import {Subscription} from 'rxjs'; -import {materialFade} from '../../../animation/material-motion.js'; +import {materialFade} from '../../../animation/material-motion'; import {ScheduleProvider} from '../../calendar/schedule.provider'; -import {ScheduleEvent} from './schema/schema.js'; -import {groupBy} from '../../../_helpers/collections/group-by.js'; -import {omit} from '../../../_helpers/collections/omit.js'; -import {stringSortBy} from '../../../_helpers/collections/string-sort.js'; +import {ScheduleEvent} from './schema/schema'; +import {groupBy} from '../../../_helpers/collections/group-by'; +import {omit} from '../../../_helpers/collections/omit'; +import {stringSortBy} from '../../../_helpers/collections/string-sort'; /** * A single event diff --git a/frontend/app/src/app/modules/schedule/page/schedule-single-events.html b/frontend/app/src/app/modules/schedule/page/schedule-single-events.html index d75e905c..8ea2ccf0 100644 --- a/frontend/app/src/app/modules/schedule/page/schedule-single-events.html +++ b/frontend/app/src/app/modules/schedule/page/schedule-single-events.html @@ -16,14 +16,10 @@ - - {{ day[0].day | amDateFormat : 'LL' }} - + {{ day[0].day | amDateFormat : 'LL' }}
- - {{ event.event.time.startAsString }} - + {{ event.event.time.startAsString }} {{ event.event.time.endAsString }}
diff --git a/frontend/app/src/app/modules/schedule/page/schedule-view.component.ts b/frontend/app/src/app/modules/schedule/page/schedule-view.component.ts index 9ef9b06e..10729688 100644 --- a/frontend/app/src/app/modules/schedule/page/schedule-view.component.ts +++ b/frontend/app/src/app/modules/schedule/page/schedule-view.component.ts @@ -15,10 +15,10 @@ import {AfterViewInit, Component, Input, OnDestroy, OnInit, ViewChild} from '@angular/core'; import {ActivatedRoute} from '@angular/router'; import moment, {Moment} from 'moment'; -import {materialFade, materialManualFade, materialSharedAxisX} from '../../../animation/material-motion.js'; +import {materialFade, materialManualFade, materialSharedAxisX} from '../../../animation/material-motion'; import {ScheduleProvider} from '../../calendar/schedule.provider'; import {SCISO8601Date, SCUuid} from '@openstapps/core'; -import {ScheduleEvent, ScheduleResponsiveBreakpoint} from './schema/schema.js'; +import {ScheduleEvent, ScheduleResponsiveBreakpoint} from './schema/schema'; import {CalendarService} from '../../calendar/calendar.service'; import {CalendarComponent} from './components/calendar.component'; import {IonContent, IonDatetime} from '@ionic/angular'; diff --git a/frontend/app/src/app/modules/settings/page/calendar-sync-settings.component.ts b/frontend/app/src/app/modules/settings/page/calendar-sync-settings.component.ts index 2a86a298..ed7d4454 100644 --- a/frontend/app/src/app/modules/settings/page/calendar-sync-settings.component.ts +++ b/frontend/app/src/app/modules/settings/page/calendar-sync-settings.component.ts @@ -26,7 +26,7 @@ import {TranslateService} from '@ngx-translate/core'; import {StorageProvider} from '../../storage/storage.provider'; import {ScheduleSyncService} from '../../background/schedule/schedule-sync.service'; import {CalendarService} from '../../calendar/calendar.service'; -import {getNativeCalendarExport} from '../../calendar/ical/ical.js'; +import {getNativeCalendarExport} from '../../calendar/ical/ical'; import {ThingTranslateService} from '../../../translation/thing-translate.service'; import { CALENDAR_NOTIFICATIONS_ENABLED_KEY, @@ -34,7 +34,7 @@ import { CALENDAR_SYNC_KEYS, calendarSettingStorageKey, getCalendarSetting, -} from './calendar-sync-settings-keys.js'; +} from './calendar-sync-settings-keys'; @Component({ selector: 'calendar-sync-settings', diff --git a/frontend/app/src/app/translation/common-string-pipes.ts b/frontend/app/src/app/translation/common-string-pipes.ts index 36464a7d..1a6d3ca4 100644 --- a/frontend/app/src/app/translation/common-string-pipes.ts +++ b/frontend/app/src/app/translation/common-string-pipes.ts @@ -17,7 +17,7 @@ import {Injectable, OnDestroy, Pipe, PipeTransform} from '@angular/core'; import {LangChangeEvent, TranslateService} from '@ngx-translate/core'; import moment from 'moment'; import {Subscription} from 'rxjs'; -import {logger} from '../_helpers/ts-logger.js'; +import {logger} from '../_helpers/ts-logger'; import opening_hours from 'opening_hours'; @Injectable() diff --git a/frontend/app/src/app/translation/thing-translate.module.ts b/frontend/app/src/app/translation/thing-translate.module.ts index e81b8391..707c75e1 100644 --- a/frontend/app/src/app/translation/thing-translate.module.ts +++ b/frontend/app/src/app/translation/thing-translate.module.ts @@ -27,7 +27,7 @@ import { SentenceCasePipe, StringSplitPipe, ToUnixPipe, -} from './common-string-pipes.js'; +} from './common-string-pipes'; import {ThingTranslateDefaultParser, ThingTranslateParser} from './thing-translate.parser'; import {ThingTranslatePipe} from './thing-translate.pipe'; import {ThingTranslateService} from './thing-translate.service'; diff --git a/frontend/app/src/app/translation/translate-simple.pipe.ts b/frontend/app/src/app/translation/translate-simple.pipe.ts index c9a16b0a..0108a415 100644 --- a/frontend/app/src/app/translation/translate-simple.pipe.ts +++ b/frontend/app/src/app/translation/translate-simple.pipe.ts @@ -14,7 +14,7 @@ */ import {Injectable, OnDestroy, Pipe, PipeTransform} from '@angular/core'; import {TranslateService} from '@ngx-translate/core'; -import {get} from '../_helpers/collections/get.js'; +import {get} from '../_helpers/collections/get'; import {Subscription} from 'rxjs'; @Injectable() diff --git a/frontend/app/src/app/util/edit-modal.component.ts b/frontend/app/src/app/util/edit-modal.component.ts index 87f9c26b..4775dc96 100644 --- a/frontend/app/src/app/util/edit-modal.component.ts +++ b/frontend/app/src/app/util/edit-modal.component.ts @@ -22,7 +22,7 @@ import { IonRouterOutlet, ModalController, } from '@ionic/angular'; -import {pendingChangesActionSheet, PendingChangesRole} from './pending-changes-action-sheet.js'; +import {pendingChangesActionSheet, PendingChangesRole} from './pending-changes-action-sheet'; import {TranslatePipe} from '@ngx-translate/core'; @Component({ diff --git a/frontend/app/src/app/util/edit-modal.html b/frontend/app/src/app/util/edit-modal.html index 412b2972..83f711ee 100644 --- a/frontend/app/src/app/util/edit-modal.html +++ b/frontend/app/src/app/util/edit-modal.html @@ -19,9 +19,9 @@ {{ 'modal.TITLE_EDIT' | translate }} - {{ - 'modal.DISMISS_CONFIRM' | translate - }} + {{ 'modal.DISMISS_CONFIRM' | translate }} {{ 'modal.DISMISS_CANCEL' | translate }} diff --git a/frontend/app/src/app/util/ion-icon/icon-match.spec.ts b/frontend/app/src/app/util/ion-icon/icon-match.spec.ts index c19ea8ad..088d0676 100644 --- a/frontend/app/src/app/util/ion-icon/icon-match.spec.ts +++ b/frontend/app/src/app/util/ion-icon/icon-match.spec.ts @@ -14,7 +14,7 @@ */ /* eslint-disable unicorn/no-null */ -import {matchPropertyContent, matchTagProperties} from './icon-match.js'; +import {matchPropertyContent, matchTagProperties} from './icon-match'; describe('matchTagProperties', function () { const regex = matchTagProperties('test'); diff --git a/frontend/app/src/app/util/ion-icon/ion-back-button.directive.ts b/frontend/app/src/app/util/ion-icon/ion-back-button.directive.ts index f11eb44d..dd9df2bc 100644 --- a/frontend/app/src/app/util/ion-icon/ion-back-button.directive.ts +++ b/frontend/app/src/app/util/ion-icon/ion-back-button.directive.ts @@ -14,8 +14,8 @@ */ import {Directive, ElementRef, Host, Optional, Self, ViewContainerRef} from '@angular/core'; -import {SCIcon} from './icon.js'; -import {IconReplacer} from './replace-util.js'; +import {SCIcon} from './icon'; +import {IconReplacer} from './replace-util'; import {TranslateService} from '@ngx-translate/core'; import {Subscription} from 'rxjs'; import {IonBackButton} from '@ionic/angular'; diff --git a/frontend/app/src/app/util/ion-icon/ion-breadcrumb.directive.ts b/frontend/app/src/app/util/ion-icon/ion-breadcrumb.directive.ts index 2f38f991..e9139ae1 100644 --- a/frontend/app/src/app/util/ion-icon/ion-breadcrumb.directive.ts +++ b/frontend/app/src/app/util/ion-icon/ion-breadcrumb.directive.ts @@ -14,8 +14,8 @@ */ import {Directive, ElementRef, ViewContainerRef} from '@angular/core'; -import {SCIcon} from './icon.js'; -import {IconReplacer} from './replace-util.js'; +import {SCIcon} from './icon'; +import {IconReplacer} from './replace-util'; @Directive({ selector: 'ion-breadcrumb', diff --git a/frontend/app/src/app/util/ion-icon/ion-reorder.directive.ts b/frontend/app/src/app/util/ion-icon/ion-reorder.directive.ts index 5ea2b6bd..bbac84b9 100644 --- a/frontend/app/src/app/util/ion-icon/ion-reorder.directive.ts +++ b/frontend/app/src/app/util/ion-icon/ion-reorder.directive.ts @@ -14,8 +14,8 @@ */ import {Directive, ElementRef, ViewContainerRef} from '@angular/core'; -import {SCIcon} from './icon.js'; -import {IconReplacer} from './replace-util.js'; +import {SCIcon} from './icon'; +import {IconReplacer} from './replace-util'; @Directive({ selector: 'ion-reorder', diff --git a/frontend/app/src/app/util/ion-icon/ion-searchbar.directive.ts b/frontend/app/src/app/util/ion-icon/ion-searchbar.directive.ts index c0738d0f..d9f6d324 100644 --- a/frontend/app/src/app/util/ion-icon/ion-searchbar.directive.ts +++ b/frontend/app/src/app/util/ion-icon/ion-searchbar.directive.ts @@ -13,8 +13,8 @@ * this program. If not, see . */ import {Directive, ElementRef, ViewContainerRef} from '@angular/core'; -import {SCIcon} from './icon.js'; -import {IconReplacer} from './replace-util.js'; +import {SCIcon} from './icon'; +import {IconReplacer} from './replace-util'; @Directive({ selector: 'ion-searchbar', diff --git a/frontend/app/src/app/util/lazy.pipe.ts b/frontend/app/src/app/util/lazy.pipe.ts index e865a0f4..23079153 100644 --- a/frontend/app/src/app/util/lazy.pipe.ts +++ b/frontend/app/src/app/util/lazy.pipe.ts @@ -17,7 +17,7 @@ import {Observable} from 'rxjs'; import {Pipe, PipeTransform} from '@angular/core'; import {SCSaveableThing, SCThings, SCUuid} from '@openstapps/core'; import {DataProvider, DataScope} from '../modules/data/data.provider'; -import {get} from '../_helpers/collections/get.js'; +import {get} from '../_helpers/collections/get'; @Pipe({ name: 'lazyThing', diff --git a/frontend/app/src/app/util/opening-hours.html b/frontend/app/src/app/util/opening-hours.html index 46fc9117..bf548cf2 100644 --- a/frontend/app/src/app/util/opening-hours.html +++ b/frontend/app/src/app/util/opening-hours.html @@ -24,11 +24,7 @@ {{ openingHours | openingHours | slice : 1 : 2 }} - - {{ openingHours | openingHours | slice : 1 : 2 }} - - - {{ openingHours | openingHours | slice : 2 : 3 }} - + {{ openingHours | openingHours | slice : 1 : 2 }} + {{ openingHours | openingHours | slice : 2 : 3 }}
diff --git a/frontend/app/src/main.ts b/frontend/app/src/main.ts index fd824be1..bac43391 100644 --- a/frontend/app/src/main.ts +++ b/frontend/app/src/main.ts @@ -15,7 +15,7 @@ import {enableProdMode} from '@angular/core'; import {platformBrowserDynamic} from '@angular/platform-browser-dynamic'; import {AppModule} from './app/app.module'; -import {environment} from './environments/environment.js'; +import {environment} from './environments/environment'; if (environment.production) { enableProdMode(); diff --git a/frontend/app/tsconfig.json b/frontend/app/tsconfig.json index badbdee3..60d9af1c 100644 --- a/frontend/app/tsconfig.json +++ b/frontend/app/tsconfig.json @@ -1,5 +1,5 @@ { - "extends": "./node_modules/@openstapps/configuration/tsconfig.json", + "extends": "@openstapps/tsconfig", "compileOnSave": false, "compilerOptions": { "baseUrl": "./", @@ -10,9 +10,8 @@ "resolveJsonModule": true, "downlevelIteration": true, "importHelpers": true, - "module": "es2020", - "target": "es2017", - "lib": ["es2020", "dom"] + "module": "ES2020", + "moduleResolution": "Node" }, "exclude": ["**/*.spec.ts"] } diff --git a/package-template.json b/package-template.json new file mode 100644 index 00000000..a2f69120 --- /dev/null +++ b/package-template.json @@ -0,0 +1,28 @@ +{ + "scripts": { + "build": "tsup", + "format:": "prettier .", + "format:fix": "prettier . --write", + "lint": "eslint --ext .ts src/", + "lint:fix": "eslint --ext .ts src/", + "test": "nyc mocha 'test/**/*.spec.ts'" + }, + "nyc": { + "extends": "@openstapps/nyc-config" + }, + "tsup": { + "entry": [ + "src/index.ts" + ], + "sourcemap": true, + "clean": true, + "format": "esm", + "outDir": "lib" + }, + "prettier": "@openstapps/prettier-config", + "eslintConfig": { + "extends": [ + "@openstapps" + ] + } +} diff --git a/package.json b/package.json index c8a86255..6472e5e0 100644 --- a/package.json +++ b/package.json @@ -4,18 +4,23 @@ "scripts": { "build": "dotenv -c -- turbo run build", "dev": "dotenv -c -- turbo run dev", + "docs": "typedoc", "format": "dotenv -c -- turbo run format", "format:fix": "dotenv -c -- turbo run format:fix", "lint": "dotenv -c -- turbo run lint", "lint:fix": "dotenv -c -- turbo run lint:fix", + "publish-packages": "dotenv -c -- turbo run build format lint test && changeset version && changeset publish", "syncpack": "syncpack list-mismatches && syncpack lint-semver-ranges", - "syncpack:fix": "syncpack format && syncpack fix-mismatches", - "publish-packages": "dotenv -c -- turbo run build format lint test && changeset version && changeset publish" + "syncpack:fix": "node sync.mjs && syncpack format && syncpack fix-mismatches" }, "devDependencies": { + "@changesets/cli": "2.26.0", + "deepmerge": "4.3.1", "dotenv-cli": "7.1.0", + "glob": "10.2.1", + "package-sync-cli": "1.3.2", "syncpack": "9.8.4", "turbo": "1.8.3", - "@changesets/cli": "2.26.0" + "typedoc": "0.23.28" } } diff --git a/packages/api/.gitlab/issue_templates/bug.md b/packages/api/.gitlab/issue_templates/bug.md index f46f50ae..4ef365a8 100644 --- a/packages/api/.gitlab/issue_templates/bug.md +++ b/packages/api/.gitlab/issue_templates/bug.md @@ -2,35 +2,29 @@ (Summarize the bug encountered concisely) - ## Steps to reproduce (How one can reproduce the issue - this is very important) - ## Example Project (If possible, please create an example project here on GitLab.com that exhibits the problematic behaviour, and link to it here in the bug report) (If you are using an older version of GitLab, this will also determine whether the bug has been fixed in a more recent version) - ## What is the current bug behavior? (What actually happens) - ## What is the expected correct behavior? (What you should see instead) - ## Relevant logs and/or screenshots (Paste any relevant logs - please use code blocks (```) to format console output, logs, and code as it's very hard to read otherwise.) - ## Possible fixes (If you can, link to the line of code that might be responsible for the problem) diff --git a/packages/api/.gitlab/issue_templates/feature.md b/packages/api/.gitlab/issue_templates/feature.md index cb9b0517..e80ae1df 100644 --- a/packages/api/.gitlab/issue_templates/feature.md +++ b/packages/api/.gitlab/issue_templates/feature.md @@ -2,15 +2,12 @@ (Describe the feature that you're requesting concisely) - ## Explanation (Explain why the feature is necessary) - ## Dependencies, issues to be resolved beforehand (List issues or dependencies that need to be resolved before this feature can be implemented) - /label ~meeting diff --git a/packages/api/CHANGELOG.md b/packages/api/CHANGELOG.md index e08945f9..d9a076f9 100644 --- a/packages/api/CHANGELOG.md +++ b/packages/api/CHANGELOG.md @@ -22,287 +22,169 @@ # [0.45.0](https://gitlab.com/openstapps/api/compare/v0.44.0...v0.45.0) (2022-12-06) - - # [0.44.0](https://gitlab.com/openstapps/api/compare/v0.43.0...v0.44.0) (2022-10-18) - - # [0.43.0](https://gitlab.com/openstapps/api/compare/v0.42.0...v0.43.0) (2022-08-23) - - # [0.42.0](https://gitlab.com/openstapps/api/compare/v0.41.1...v0.42.0) (2022-07-04) - - ## [0.41.1](https://gitlab.com/openstapps/api/compare/v0.41.0...v0.41.1) (2022-05-27) - - # [0.41.0](https://gitlab.com/openstapps/api/compare/v0.40.0...v0.41.0) (2022-05-17) - - # [0.40.0](https://gitlab.com/openstapps/api/compare/v0.39.0...v0.40.0) (2022-04-04) - - # [0.39.0](https://gitlab.com/openstapps/api/compare/v0.38.0...v0.39.0) (2022-03-17) - - # [0.38.0](https://gitlab.com/openstapps/api/compare/v0.37.0...v0.38.0) (2022-01-25) - ### Features -* add client method for invoking plugin routes ([83120a6](https://gitlab.com/openstapps/api/commit/83120a67345d2fee672f6a44ab91708ecce65e58)) - - +- add client method for invoking plugin routes ([83120a6](https://gitlab.com/openstapps/api/commit/83120a67345d2fee672f6a44ab91708ecce65e58)) # [0.37.0](https://gitlab.com/openstapps/api/compare/v0.36.0...v0.37.0) (2021-12-17) - - # [0.36.0](https://gitlab.com/openstapps/api/compare/v0.35.0...v0.36.0) (2021-12-15) - - # [0.35.0](https://gitlab.com/openstapps/api/compare/v0.34.0...v0.35.0) (2021-10-20) - - # [0.34.0](https://gitlab.com/openstapps/api/compare/v0.33.0...v0.34.0) (2021-10-04) - - # [0.33.0](https://gitlab.com/openstapps/api/compare/v0.32.0...v0.33.0) (2021-09-16) - - # [0.32.0](https://gitlab.com/openstapps/api/compare/v0.31.1...v0.32.0) (2021-09-01) - - ## [0.31.1](https://gitlab.com/openstapps/api/compare/v0.31.0...v0.31.1) (2021-08-27) - ### Bug Fixes -* plugin related tests ([51c157d](https://gitlab.com/openstapps/api/commit/51c157d577b9ae70e8c4683e653cd65aacb4f248)) - - +- plugin related tests ([51c157d](https://gitlab.com/openstapps/api/commit/51c157d577b9ae70e8c4683e653cd65aacb4f248)) # [0.31.0](https://gitlab.com/openstapps/api/compare/v0.30.0...v0.31.0) (2021-08-17) - - # [0.30.0](https://gitlab.com/openstapps/api/compare/v0.29.0...v0.30.0) (2021-08-04) - - # [0.29.0](https://gitlab.com/openstapps/api/compare/v0.28.0...v0.29.0) (2021-06-08) - - # [0.28.0](https://gitlab.com/openstapps/api/compare/v0.27.0...v0.28.0) (2021-04-27) - - # [0.27.0](https://gitlab.com/openstapps/api/compare/v0.26.0...v0.27.0) (2021-03-08) - ### Bug Fixes -* send valid JSON on bulk/done ([29cd22f](https://gitlab.com/openstapps/api/commit/29cd22f2d11cebbe2de63cc2e614734e286821f2)), closes [#38](https://gitlab.com/openstapps/api/issues/38) - - +- send valid JSON on bulk/done ([29cd22f](https://gitlab.com/openstapps/api/commit/29cd22f2d11cebbe2de63cc2e614734e286821f2)), closes [#38](https://gitlab.com/openstapps/api/issues/38) # [0.26.0](https://gitlab.com/openstapps/api/compare/v0.25.0...v0.26.0) (2021-02-23) - - # [0.25.0](https://gitlab.com/openstapps/api/compare/v0.23.0...v0.25.0) (2020-11-09) - - # [0.23.0](https://gitlab.com/openstapps/api/compare/v0.22.0...v0.23.0) (2020-10-23) - ### Bug Fixes -* make express parse body ([b3e1075](https://gitlab.com/openstapps/api/commit/b3e107528b5d6ac5ec86786a9f9bf8fb1645e874)) - - +- make express parse body ([b3e1075](https://gitlab.com/openstapps/api/commit/b3e107528b5d6ac5ec86786a9f9bf8fb1645e874)) # [0.22.0](https://gitlab.com/openstapps/api/compare/v0.21.0...v0.22.0) (2020-05-15) - ### Features -* add content-type header ([d30de89](https://gitlab.com/openstapps/api/commit/d30de896f0d1a21c039e1905c0766cc37df06b23)) - - +- add content-type header ([d30de89](https://gitlab.com/openstapps/api/commit/d30de896f0d1a21c039e1905c0766cc37df06b23)) # [0.21.0](https://gitlab.com/openstapps/api/compare/v0.19.0...v0.21.0) (2020-05-06) - - # [0.19.0](https://gitlab.com/openstapps/api/compare/v0.18.0...v0.19.0) (2020-03-11) - ### Bug Fixes -* repair and unify subcommand help outputs ([4ae968f](https://gitlab.com/openstapps/api/commit/4ae968ff0f52c940cb11a97876f72d57feb61597)) - +- repair and unify subcommand help outputs ([4ae968f](https://gitlab.com/openstapps/api/commit/4ae968ff0f52c940cb11a97876f72d57feb61597)) ### Features -* add option to wait on resource to e2e script ([e18858f](https://gitlab.com/openstapps/api/commit/e18858fc58ccfb8b3bdec92260eba12cd1a25214)) - - +- add option to wait on resource to e2e script ([e18858f](https://gitlab.com/openstapps/api/commit/e18858fc58ccfb8b3bdec92260eba12cd1a25214)) # [0.18.0](https://gitlab.com/openstapps/api/compare/v0.17.0...v0.18.0) (2020-02-04) - ### Features -* extend e2e procedure ([dc79dc8](https://gitlab.com/openstapps/api/commit/dc79dc8feb10a29cff0f6d1c320658ad13cf7e4e)) - - +- extend e2e procedure ([dc79dc8](https://gitlab.com/openstapps/api/commit/dc79dc8feb10a29cff0f6d1c320658ad13cf7e4e)) # [0.17.0](https://gitlab.com/openstapps/api/compare/v0.16.0...v0.17.0) (2019-11-15) - - # [0.16.0](https://gitlab.com/openstapps/api/compare/v0.15.0...v0.16.0) (2019-09-03) - ### Features -* add plugin class ([c2848fc](https://gitlab.com/openstapps/api/commit/c2848fc7a528288ef4c3ab96728d4e16add6fe75)), closes [#12](https://gitlab.com/openstapps/api/issues/12) - - +- add plugin class ([c2848fc](https://gitlab.com/openstapps/api/commit/c2848fc7a528288ef4c3ab96728d4e16add6fe75)), closes [#12](https://gitlab.com/openstapps/api/issues/12) # [0.15.0](https://gitlab.com/openstapps/api/compare/v0.14.0...v0.15.0) (2019-08-19) - - # [0.14.0](https://gitlab.com/openstapps/api/compare/v0.13.0...v0.14.0) (2019-07-23) - - # [0.13.0](https://gitlab.com/openstapps/api/compare/v0.12.0...v0.13.0) (2019-07-16) - ### Bug Fixes -* change removeReferences() to also remove origin ([ded221c](https://gitlab.com/openstapps/api/commit/ded221c175368d315fdbb79d561c86c3ee8bf158)) - - +- change removeReferences() to also remove origin ([ded221c](https://gitlab.com/openstapps/api/commit/ded221c175368d315fdbb79d561c86c3ee8bf158)) # [0.12.0](https://gitlab.com/openstapps/api/compare/v0.11.0...v0.12.0) (2019-07-15) - ### Features -* add function to remove undefined properties ([f95fd09](https://gitlab.com/openstapps/api/commit/f95fd09112e81eab42591a5aaff3568ab06e9441)) - - +- add function to remove undefined properties ([f95fd09](https://gitlab.com/openstapps/api/commit/f95fd09112e81eab42591a5aaff3568ab06e9441)) # [0.11.0](https://gitlab.com/openstapps/api/compare/v0.10.0...v0.11.0) (2019-07-12) - - # [0.10.0](https://gitlab.com/openstapps/api/compare/v0.9.0...v0.10.0) (2019-07-03) - - # [0.9.0](https://gitlab.com/openstapps/api/compare/v0.8.0...v0.9.0) (2019-06-20) - - # [0.8.0](https://gitlab.com/openstapps/api/compare/v0.7.0...v0.8.0) (2019-05-14) - ### Features -* add e2e command. Indexes core test files. ([e1313b5](https://gitlab.com/openstapps/api/commit/e1313b55ff3bc17e96b09639f4949b2179991679)) - - +- add e2e command. Indexes core test files. ([e1313b5](https://gitlab.com/openstapps/api/commit/e1313b55ff3bc17e96b09639f4949b2179991679)) # [0.7.0](https://gitlab.com/openstapps/api/compare/v0.6.0...v0.7.0) (2019-04-16) - - # [0.6.0](https://gitlab.com/openstapps/api/compare/v0.5.0...v0.6.0) (2019-04-09) - - # [0.5.0](https://gitlab.com/openstapps/api/compare/v0.4.1...v0.5.0) (2019-04-04) - ### Features -* add method to remove references from a thing ([9cf6fde](https://gitlab.com/openstapps/api/commit/9cf6fde050c665b63026b8c08502c7836e23c2d5)), closes [#6](https://gitlab.com/openstapps/api/issues/6) - - +- add method to remove references from a thing ([9cf6fde](https://gitlab.com/openstapps/api/commit/9cf6fde050c665b63026b8c08502c7836e23c2d5)), closes [#6](https://gitlab.com/openstapps/api/issues/6) ## [0.4.1](https://gitlab.com/openstapps/api/compare/v0.4.0...v0.4.1) (2019-03-15) - ### Bug Fixes -* adjust compile npm script to exact configuration guideline ([7f8c9ed](https://gitlab.com/openstapps/api/commit/7f8c9eda2fdcef0831af23806b846baa0d236a1c)) - - +- adjust compile npm script to exact configuration guideline ([7f8c9ed](https://gitlab.com/openstapps/api/commit/7f8c9eda2fdcef0831af23806b846baa0d236a1c)) # [0.4.0](https://gitlab.com/openstapps/api/compare/v0.3.0...v0.4.0) (2019-03-15) - ### Bug Fixes -* apply changes suggested by @openstapps/configuration ([782fdbe](https://gitlab.com/openstapps/api/commit/782fdbebba3599323a98244fcc28e7605ed95cc2)) - - +- apply changes suggested by @openstapps/configuration ([782fdbe](https://gitlab.com/openstapps/api/commit/782fdbebba3599323a98244fcc28e7605ed95cc2)) # [0.3.0](https://gitlab.com/openstapps/api/compare/v0.2.0...v0.3.0) (2019-02-21) - - # [0.2.0](https://gitlab.com/openstapps/api/compare/v0.1.1...v0.2.0) (2019-02-18) - - ## [0.1.1](https://gitlab.com/openstapps/api/compare/v0.1.0...v0.1.1) (2019-02-07) - - # [0.1.0](https://gitlab.com/openstapps/api/compare/v0.0.3...v0.1.0) (2019-01-28) - - ## [0.0.3](https://gitlab.com/openstapps/api/compare/v0.0.2...v0.0.3) (2019-01-21) - - ## [0.0.2](https://gitlab.com/openstapps/api/compare/v0.0.1...v0.0.2) (2018-12-14) - ### Bug Fixes -* add type and batchSize to required parameters ([8541b00](https://gitlab.com/openstapps/api/commit/8541b00dbbf4c683fddaf3d003cf13fabfbc979b)), closes [#1](https://gitlab.com/openstapps/api/issues/1) -* remove trailing slash from url if needed ([eb7c334](https://gitlab.com/openstapps/api/commit/eb7c334bb8878cffd96cd9d52b5b99e2338e3a65)) - - +- add type and batchSize to required parameters ([8541b00](https://gitlab.com/openstapps/api/commit/8541b00dbbf4c683fddaf3d003cf13fabfbc979b)), closes [#1](https://gitlab.com/openstapps/api/issues/1) +- remove trailing slash from url if needed ([eb7c334](https://gitlab.com/openstapps/api/commit/eb7c334bb8878cffd96cd9d52b5b99e2338e3a65)) ## [0.0.1](https://gitlab.com/openstapps/api/compare/4839f941c617681c78ef9959f3df86013459c332...v0.0.1) (2018-11-29) - ### Features -* add api ([4839f94](https://gitlab.com/openstapps/api/commit/4839f941c617681c78ef9959f3df86013459c332)) - - - +- add api ([4839f94](https://gitlab.com/openstapps/api/commit/4839f941c617681c78ef9959f3df86013459c332)) diff --git a/packages/api/app.js b/packages/api/app.js index d233e644..5ca3fea3 100644 --- a/packages/api/app.js +++ b/packages/api/app.js @@ -1,2 +1,2 @@ #!/usr/bin/env node -import './lib/cli.js' +import './lib/app.js'; diff --git a/packages/api/package.json b/packages/api/package.json index 1b2398b3..c6809503 100644 --- a/packages/api/package.json +++ b/packages/api/package.json @@ -15,21 +15,18 @@ "Roman Klopsch", "Thea Schöbl " ], - "main": "lib/client.js", + "main": "lib/index.js", + "types": "lib/index.d.ts", "bin": { "openstapps-api": "app.js" }, "scripts": { - "build": "rimraf lib && tsc", - "changelog": "conventional-changelog -p angular -i CHANGELOG.md -s -r 0 && git add CHANGELOG.md && git commit -m 'docs: update changelog'", - "check-configuration": "openstapps-configuration", - "documentation": "typedoc --includeVersion --out docs --readme README.md --listInvalidSymbolLinks --entryPointStrategy expand src", + "build": "tsup --dts", + "format": "prettier .", + "format:fix": "prettier --write .", "lint": "eslint --ext .ts src/", - "postversion": "npm run changelog", - "prepublishOnly": "npm ci && npm run build", - "preversion": "npm run prepublishOnly", - "push": "git push && git push origin \"v$npm_package_version\"", - "test": "nyc mocha --recursive 'test/*.spec.ts'" + "lint:fix": "eslint --fix --ext .ts src/", + "test": "nyc mocha 'test/**/*.spec.ts'" }, "dependencies": { "@krlwlfrt/async-pool": "0.7.0", @@ -57,8 +54,10 @@ "wait-on": "6.0.1" }, "devDependencies": { - "@openstapps/configuration": "workspace:*", "@openstapps/eslint-config": "workspace:*", + "@openstapps/nyc-config": "workspace:*", + "@openstapps/prettier-config": "workspace:*", + "@openstapps/tsconfig": "workspace:*", "@testdeck/mocha": "0.3.3", "@types/body-parser": "1.19.2", "@types/chai": "4.3.5", @@ -69,55 +68,39 @@ "@types/fs-extra": "9.0.13", "@types/json-schema": "7.0.11", "@types/mocha": "10.0.1", - "@typescript-eslint/eslint-plugin": "5.40.1", - "@typescript-eslint/parser": "5.40.1", "chai": "4.3.7", "chai-as-promised": "7.1.1", "chai-spies": "1.0.0", "conventional-changelog-cli": "2.2.2", - "eslint": "8.33.0", - "eslint-config-prettier": "8.6.0", - "eslint-plugin-jsdoc": "39.7.4", - "eslint-plugin-prettier": "4.2.1", - "eslint-plugin-unicorn": "45.0.2", "fs-extra": "10.1.0", "mocha": "10.2.0", "nock": "13.3.1", "nyc": "15.1.0", - "prettier": "2.8.8", - "rimraf": "4.4.0", "ts-node": "10.9.1", - "typedoc": "0.23.26", + "tsup": "6.7.0", + "typedoc": "0.23.28", "typescript": "4.8.4" }, "peerDependencies": { - "@openstapps/core": "~2.1.0" + "@openstapps/core": "workspace:*" + }, + "tsup": { + "entry": [ + "src/app.ts", + "src/index.ts" + ], + "sourcemap": true, + "clean": true, + "format": "esm", + "outDir": "lib" + }, + "prettier": "@openstapps/prettier-config", + "eslintConfig": { + "extends": [ + "@openstapps" + ] }, "nyc": { - "all": true, - "branches": 95, - "check-coverage": true, - "exclude": [ - "src/cli.ts" - ], - "extension": [ - ".ts" - ], - "functions": 95, - "include": [ - "src" - ], - "lines": 95, - "per-file": true, - "reporter": [ - "cobertura", - "html", - "text-summary" - ], - "require": [ - "ts-node/register" - ], - "statements": 95 - }, - "typings": "lib/index.d.ts" + "extends": "@openstapps/nyc-config" + } } diff --git a/packages/api/src/cli.ts b/packages/api/src/app.ts similarity index 100% rename from packages/api/src/cli.ts rename to packages/api/src/app.ts diff --git a/packages/api/src/index.ts b/packages/api/src/index.ts new file mode 100644 index 00000000..dd53a743 --- /dev/null +++ b/packages/api/src/index.ts @@ -0,0 +1,10 @@ +export * from './bulk.js' +export * from './client.js' +export * from './connector-client.js' +export * from './copy.js' +export * from './e2e.js' +export * from './errors.js' +export * from './http-client.js' +export * from './http-client-interface.js' +export * from './plugin.js' +export * from './plugin-client.js' diff --git a/packages/api/src/plugin.ts b/packages/api/src/plugin.ts index 66cab943..306d8f19 100644 --- a/packages/api/src/plugin.ts +++ b/packages/api/src/plugin.ts @@ -12,7 +12,7 @@ * You should have received a copy of the GNU General Public License along with * this program. If not, see . */ -import {Converter} from '@openstapps/core-tools/lib/schema.js'; +import {Converter} from '@openstapps/core-tools'; import {Logger} from '@openstapps/logger'; import bodyParser from 'body-parser'; import express from 'express'; diff --git a/packages/api/test/bulk.spec.ts b/packages/api/test/bulk.spec.ts index 1d97604b..ee797928 100644 --- a/packages/api/test/bulk.spec.ts +++ b/packages/api/test/bulk.spec.ts @@ -12,7 +12,14 @@ * You should have received a copy of the GNU General Public License along with * this program. If not, see . */ -import {SCBulkAddRoute, SCBulkDoneRoute, SCDish, SCMessage, SCThingOriginType, SCThingType} from '@openstapps/core'; +import { + SCBulkAddRoute, + SCBulkDoneRoute, + SCDish, + SCMessage, + SCThingOriginType, + SCThingType, +} from '@openstapps/core'; import {expect} from 'chai'; import chai from 'chai'; import chaiAsPromised from 'chai-as-promised'; @@ -55,9 +62,7 @@ export class BulkSpec { }); const dish: SCDish = { - categories: [ - 'main dish', - ], + categories: ['main dish'], name: 'foobar', origin: { indexed: moment().format(), @@ -70,9 +75,13 @@ export class BulkSpec { await bulk.add(dish); - expect(client.invokeRoute).to.have.been.first.called.with(bulkAddRoute, { - UID: 'bar', - }, dish); + expect(client.invokeRoute).to.have.been.first.called.with( + bulkAddRoute, + { + UID: 'bar', + }, + dish, + ); } @test @@ -86,12 +95,8 @@ export class BulkSpec { }); const message: SCMessage = { - audiences: [ - 'students', - ], - categories: [ - 'news' - ], + audiences: ['students'], + categories: ['news'], messageBody: 'Lorem ipsum.', name: 'foobar', origin: { diff --git a/packages/api/test/client.spec.ts b/packages/api/test/client.spec.ts index eaec54d5..14f7c64b 100644 --- a/packages/api/test/client.spec.ts +++ b/packages/api/test/client.spec.ts @@ -52,10 +52,11 @@ const httpClient = new HttpClient(); * @see https://stackoverflow.com/a/51365037 */ export type RecursivePartial = { - [P in keyof T]?: - T[P] extends Array<(infer U)> ? Array> : - T[P] extends object ? RecursivePartial : - T[P]; + [P in keyof T]?: T[P] extends Array + ? Array> + : T[P] extends object + ? RecursivePartial + : T[P]; }; async function invokeIndexRoute(): Promise>> { @@ -119,12 +120,8 @@ export class ClientSpec { @test async getThing() { const message: SCMessage = { - audiences: [ - 'employees', - ], - categories: [ - 'news' - ], + audiences: ['employees'], + categories: ['news'], messageBody: 'Lorem ipsum.', name: 'foo', origin: { @@ -172,7 +169,7 @@ export class ClientSpec { size: 1, }, headers: { - "Content-Type": "application/json", + 'Content-Type': 'application/json', }, method: searchRoute.method, url: new URL('http://localhost' + searchRoute.getUrlPath()), @@ -210,12 +207,8 @@ export class ClientSpec { @test async getThingFailsByUid() { const message: SCMessage = { - audiences: [ - 'employees', - ], - categories: [ - 'news' - ], + audiences: ['employees'], + categories: ['news'], messageBody: 'Lorem ipsum.', name: 'foo', origin: { @@ -265,7 +258,7 @@ export class ClientSpec { expect(httpClient.request).to.have.been.first.called.with({ body: {}, headers: { - "Content-Type": "application/json", + 'Content-Type': 'application/json', }, method: indexRoute.method, url: new URL('http://localhost' + indexRoute.getUrlPath()), @@ -285,66 +278,78 @@ export class ClientSpec { @test async invokePlugin() { - sandbox.on(httpClient, 'request', async(): Promise>> => { - return { - body: { - app: { - features: { - plugins: { - "supportedPlugin": { urlPath: "/" } - }, - }, - }, - }, - statusCode: indexRoute.statusCodeSuccess, - }; - }); - - expect(httpClient.request).not.to.have.been.first.called(); - const client = new Client(httpClient, 'http://localhost'); - - await client.invokePlugin('unsupportedPlugin').should.be.rejectedWith(ApiError,/.*supportedPlugin.*/gmi); - - // again with cached feature definitions - return client.invokePlugin('supportedPlugin') - .should.not.be.rejectedWith(ApiError,/.*supportedPlugin.*/gmi); - } - - @test - async invokePluginUnavailable() { - sandbox.on(httpClient, 'request', async(): Promise>> => { - return { - body: {}, - statusCode: indexRoute.statusCodeSuccess, - }; - }); - - expect(httpClient.request).not.to.have.been.first.called(); - - const client = new Client(httpClient, 'http://localhost'); - - await client.invokePlugin('supportedPlugin').should.be.rejectedWith(ApiError,/.*supportedPlugin.*/gmi); - - sandbox.restore(); - sandbox.on(httpClient, 'request', async(): Promise>> => { - return { - body: { - app: { - features: { - plugins: { - 'unsupportedPlugin': { - urlPath: '/unsupported-plugin' + sandbox.on( + httpClient, + 'request', + async (): Promise>> => { + return { + body: { + app: { + features: { + plugins: { + supportedPlugin: {urlPath: '/'}, }, }, }, }, - }, - statusCode: indexRoute.statusCodeSuccess, - }; - }); + statusCode: indexRoute.statusCodeSuccess, + }; + }, + ); + + expect(httpClient.request).not.to.have.been.first.called(); + const client = new Client(httpClient, 'http://localhost'); + + await client.invokePlugin('unsupportedPlugin').should.be.rejectedWith(ApiError, /.*supportedPlugin.*/gim); + // again with cached feature definitions - return client.invokePlugin('supportedPlugin') - .should.be.rejectedWith(ApiError,/.*supportedPlugin.*/gmi); + return client + .invokePlugin('supportedPlugin') + .should.not.be.rejectedWith(ApiError, /.*supportedPlugin.*/gim); + } + + @test + async invokePluginUnavailable() { + sandbox.on( + httpClient, + 'request', + async (): Promise>> => { + return { + body: {}, + statusCode: indexRoute.statusCodeSuccess, + }; + }, + ); + + expect(httpClient.request).not.to.have.been.first.called(); + + const client = new Client(httpClient, 'http://localhost'); + + await client.invokePlugin('supportedPlugin').should.be.rejectedWith(ApiError, /.*supportedPlugin.*/gim); + + sandbox.restore(); + sandbox.on( + httpClient, + 'request', + async (): Promise>> => { + return { + body: { + app: { + features: { + plugins: { + unsupportedPlugin: { + urlPath: '/unsupported-plugin', + }, + }, + }, + }, + }, + statusCode: indexRoute.statusCodeSuccess, + }; + }, + ); + // again with cached feature definitions + return client.invokePlugin('supportedPlugin').should.be.rejectedWith(ApiError, /.*supportedPlugin.*/gim); } @test @@ -359,7 +364,7 @@ export class ClientSpec { expect(httpClient.request).to.have.been.first.called.with({ body: undefined, headers: { - "Content-Type": "application/json", + 'Content-Type': 'application/json', }, method: indexRoute.method, url: new URL('http://localhost' + indexRoute.getUrlPath()), @@ -420,7 +425,7 @@ export class ClientSpec { expect(httpClient.request).to.have.been.first.called.with({ body: {a: {size: 1}, b: {size: 1}}, headers: { - "Content-Type": "application/json", + 'Content-Type': 'application/json', }, method: multiSearchRoute.method, url: new URL('http://localhost' + multiSearchRoute.getUrlPath()), @@ -470,7 +475,7 @@ export class ClientSpec { expect(httpClient.request).to.have.been.first.called.with({ body: {foo: {size: 0}, bar: {size: 0}}, headers: { - "Content-Type": "application/json", + 'Content-Type': 'application/json', }, method: multiSearchRoute.method, url: new URL('http://localhost' + multiSearchRoute.getUrlPath()), @@ -478,7 +483,7 @@ export class ClientSpec { expect(httpClient.request).to.have.been.second.called.with({ body: {foo: {size: 1000}, bar: {size: 500}, foobar: {size: 30}}, headers: { - "Content-Type": "application/json", + 'Content-Type': 'application/json', }, method: multiSearchRoute.method, url: new URL('http://localhost' + multiSearchRoute.getUrlPath()), @@ -541,7 +546,7 @@ export class ClientSpec { expect(httpClient.request).to.have.been.first.called.with({ body: {size: 1}, headers: { - "Content-Type": "application/json", + 'Content-Type': 'application/json', }, method: searchRoute.method, url: new URL('http://localhost' + searchRoute.getUrlPath()), @@ -579,7 +584,7 @@ export class ClientSpec { expect(httpClient.request).to.have.been.first.called.with({ body: {from: 30, size: 30}, headers: { - "Content-Type": "application/json", + 'Content-Type': 'application/json', }, method: searchRoute.method, url: new URL('http://localhost' + searchRoute.getUrlPath()), @@ -615,7 +620,7 @@ export class ClientSpec { expect(httpClient.request).to.have.been.first.called.with({ body: {size: 0}, headers: { - "Content-Type": "application/json", + 'Content-Type': 'application/json', }, method: searchRoute.method, url: new URL('http://localhost' + searchRoute.getUrlPath()), @@ -623,7 +628,7 @@ export class ClientSpec { expect(httpClient.request).to.have.been.second.called.with({ body: {size: 1000}, headers: { - "Content-Type": "application/json", + 'Content-Type': 'application/json', }, method: searchRoute.method, url: new URL('http://localhost' + searchRoute.getUrlPath()), diff --git a/packages/api/test/connector-client.spec.ts b/packages/api/test/connector-client.spec.ts index 1597b3ac..253b01a1 100644 --- a/packages/api/test/connector-client.spec.ts +++ b/packages/api/test/connector-client.spec.ts @@ -72,7 +72,7 @@ function doesContainThings(thing: T): boolea return false; } - return sum || (item === null) ? false : isThing(item); + return sum || item === null ? false : isThing(item); }, false); } @@ -110,7 +110,7 @@ export class ConnectorClientSpec { type: SCThingType.Message, }, headers: { - "Content-Type": "application/json", + 'Content-Type': 'application/json', }, method: bulkRoute.method, url: new URL('http://localhost' + bulkRoute.getUrlPath()), @@ -145,7 +145,7 @@ export class ConnectorClientSpec { type: SCThingType.Message, }, headers: { - "Content-Type": "application/json", + 'Content-Type': 'application/json', }, method: bulkRoute.method, url: new URL('http://localhost' + bulkRoute.getUrlPath()), @@ -156,12 +156,8 @@ export class ConnectorClientSpec { async index() { const messages: SCMessage[] = [ { - audiences: [ - 'employees', - ], - categories: [ - 'news' - ], + audiences: ['employees'], + categories: ['news'], messageBody: 'Lorem ipsum.', name: 'foo', origin: { @@ -173,12 +169,8 @@ export class ConnectorClientSpec { uid: 'foo', }, { - audiences: [ - 'employees', - ], - categories: [ - 'news' - ], + audiences: ['employees'], + categories: ['news'], messageBody: 'Lorem ipsum.', name: 'foo', origin: { @@ -193,36 +185,45 @@ export class ConnectorClientSpec { type responses = SCBulkResponse | SCBulkAddResponse | SCBulkDoneResponse; - sandbox.on(httpClient, 'request', async (request: HttpClientRequest) - : Promise> => { - if (request.url.toString() === new URL('http://localhost' + bulkRoute.getUrlPath()).toString()) { - return { - body: { - expiration: moment().add(3600, 'seconds').format(), - source: 'copy', - state: 'in progress', - type: SCThingType.Message, - uid: 'foo', - }, - headers: {}, - statusCode: bulkRoute.statusCodeSuccess, - }; - } else if (request.url.toString() === new URL('http://localhost' + bulkAddRoute.getUrlPath({ - UID: 'foo', - })).toString()) { + sandbox.on( + httpClient, + 'request', + async (request: HttpClientRequest): Promise> => { + if (request.url.toString() === new URL('http://localhost' + bulkRoute.getUrlPath()).toString()) { + return { + body: { + expiration: moment().add(3600, 'seconds').format(), + source: 'copy', + state: 'in progress', + type: SCThingType.Message, + uid: 'foo', + }, + headers: {}, + statusCode: bulkRoute.statusCodeSuccess, + }; + } else if ( + request.url.toString() === + new URL( + 'http://localhost' + + bulkAddRoute.getUrlPath({ + UID: 'foo', + }), + ).toString() + ) { + return { + body: {}, + headers: {}, + statusCode: bulkAddRoute.statusCodeSuccess, + }; + } + return { body: {}, headers: {}, - statusCode: bulkAddRoute.statusCodeSuccess, + statusCode: bulkDoneRoute.statusCodeSuccess, }; - } - - return { - body: {}, - headers: {}, - statusCode: bulkDoneRoute.statusCodeSuccess, - }; - }); + }, + ); const connectorClient = new ConnectorClient(httpClient, 'http://localhost'); await connectorClient.index(messages, 'copy'); @@ -234,7 +235,7 @@ export class ConnectorClientSpec { type: SCThingType.Message, }, headers: { - "Content-Type": "application/json", + 'Content-Type': 'application/json', }, method: bulkRoute.method, url: new URL('http://localhost' + bulkRoute.getUrlPath()), @@ -251,12 +252,8 @@ export class ConnectorClientSpec { async indexWithoutSource() { const messages: SCMessage[] = [ { - audiences: [ - 'employees', - ], - categories: [ - 'news' - ], + audiences: ['employees'], + categories: ['news'], messageBody: 'Lorem ipsum.', name: 'foo', origin: { @@ -268,12 +265,8 @@ export class ConnectorClientSpec { uid: 'foo', }, { - audiences: [ - 'employees', - ], - categories: [ - 'news' - ], + audiences: ['employees'], + categories: ['news'], messageBody: 'Lorem ipsum.', name: 'foo', origin: { @@ -288,36 +281,45 @@ export class ConnectorClientSpec { type responses = SCBulkResponse | SCBulkAddResponse | SCBulkDoneResponse; - sandbox.on(httpClient, 'request', async (request: HttpClientRequest) - : Promise> => { - if (request.url.toString() === new URL('http://localhost' + bulkRoute.getUrlPath()).toString()) { - return { - body: { - expiration: moment().add(3600, 'seconds').format(), - source: 'stapps-api', - state: 'in progress', - type: SCThingType.Message, - uid: 'foo', - }, - headers: {}, - statusCode: bulkRoute.statusCodeSuccess, - }; - } else if (request.url.toString() === new URL('http://localhost' + bulkAddRoute.getUrlPath({ - UID: 'foo', - })).toString()) { + sandbox.on( + httpClient, + 'request', + async (request: HttpClientRequest): Promise> => { + if (request.url.toString() === new URL('http://localhost' + bulkRoute.getUrlPath()).toString()) { + return { + body: { + expiration: moment().add(3600, 'seconds').format(), + source: 'stapps-api', + state: 'in progress', + type: SCThingType.Message, + uid: 'foo', + }, + headers: {}, + statusCode: bulkRoute.statusCodeSuccess, + }; + } else if ( + request.url.toString() === + new URL( + 'http://localhost' + + bulkAddRoute.getUrlPath({ + UID: 'foo', + }), + ).toString() + ) { + return { + body: {}, + headers: {}, + statusCode: bulkAddRoute.statusCodeSuccess, + }; + } + return { body: {}, headers: {}, - statusCode: bulkAddRoute.statusCodeSuccess, + statusCode: bulkDoneRoute.statusCodeSuccess, }; - } - - return { - body: {}, - headers: {}, - statusCode: bulkDoneRoute.statusCodeSuccess, - }; - }); + }, + ); const connectorClient = new ConnectorClient(httpClient, 'http://localhost'); await connectorClient.index(messages); @@ -329,7 +331,7 @@ export class ConnectorClientSpec { type: SCThingType.Message, }, headers: { - "Content-Type": "application/json", + 'Content-Type': 'application/json', }, method: bulkRoute.method, url: new URL('http://localhost' + bulkRoute.getUrlPath()), @@ -362,12 +364,12 @@ export class ConnectorClientSpec { 'core', 'test', 'resources', - 'indexable' + 'indexable', ); const testFiles = await readdirPromisified(pathToTestFiles); - const testInstances = await asyncPool(5, testFiles, async (testFile) => { + const testInstances = await asyncPool(5, testFiles, async testFile => { const buffer = await readFilePromisified(join(pathToTestFiles, testFile)); const content = JSON.parse(buffer.toString()); @@ -375,58 +377,53 @@ export class ConnectorClientSpec { }); for (const testInstance of testInstances) { - const checkInstance = clone()(testInstance); const testInstanceWithoutReferences = ConnectorClient.removeReferences(testInstance); - expect(doesContainThings(testInstanceWithoutReferences)).to.be - .equal(false, JSON.stringify( - [testInstance, testInstanceWithoutReferences], - null, - 2, - )); - expect((testInstanceWithoutReferences as any).origin).to.be - .equal(undefined, JSON.stringify( - [testInstance, testInstanceWithoutReferences], - null, - 2, - )); - expect(testInstance).to.be.deep - .equal(checkInstance, - 'Removing the references of a thing could have side effects because no deep copy is used'); + expect(doesContainThings(testInstanceWithoutReferences)).to.be.equal( + false, + JSON.stringify([testInstance, testInstanceWithoutReferences], null, 2), + ); + expect((testInstanceWithoutReferences as any).origin).to.be.equal( + undefined, + JSON.stringify([testInstance, testInstanceWithoutReferences], null, 2), + ); + expect(testInstance).to.be.deep.equal( + checkInstance, + 'Removing the references of a thing could have side effects because no deep copy is used', + ); } } @test async removeUndefinedProperties() { - const objectWithUndefinedProperties = {value: 'foo', - novalue: undefined, - nested: { - value: 'foo', - novalue: undefined}, - }; - const objectWithoutUndefinedProperties = {value: 'foo', - nested: { - value: 'foo'}, - }; + const objectWithUndefinedProperties = { + value: 'foo', + novalue: undefined, + nested: { + value: 'foo', + novalue: undefined, + }, + }; + const objectWithoutUndefinedProperties = { + value: 'foo', + nested: { + value: 'foo', + }, + }; ConnectorClient.removeUndefinedProperties(objectWithUndefinedProperties); - expect(objectWithUndefinedProperties).to.deep.equal(objectWithoutUndefinedProperties, JSON.stringify( - [objectWithUndefinedProperties, objectWithoutUndefinedProperties], - null, - 2, - )); + expect(objectWithUndefinedProperties).to.deep.equal( + objectWithoutUndefinedProperties, + JSON.stringify([objectWithUndefinedProperties, objectWithoutUndefinedProperties], null, 2), + ); } @test async update() { const message: SCMessage = { - audiences: [ - 'employees', - ], - categories: [ - 'news' - ], + audiences: ['employees'], + categories: ['news'], messageBody: 'Lorem ipsum.', name: 'foo', origin: { @@ -454,13 +451,16 @@ export class ConnectorClientSpec { expect(httpClient.request).to.have.been.called.with({ body: message, headers: { - "Content-Type": "application/json", + 'Content-Type': 'application/json', }, method: thingUpdateRoute.method, - url: new URL('http://localhost' + thingUpdateRoute.getUrlPath({ - TYPE: SCThingType.Message, - UID: 'foo', - })), + url: new URL( + 'http://localhost' + + thingUpdateRoute.getUrlPath({ + TYPE: SCThingType.Message, + UID: 'foo', + }), + ), }); } } diff --git a/packages/api/test/copy.spec.ts b/packages/api/test/copy.spec.ts index feb6accd..862f6aab 100644 --- a/packages/api/test/copy.spec.ts +++ b/packages/api/test/copy.spec.ts @@ -57,63 +57,73 @@ export class CopySpec { async copy() { type responses = Response; - sandbox.on(httpClient, 'request', async (request: RequestOptions): Promise> => { - if (request.url.toString() === 'http://foo.bar' + searchRoute.getUrlPath().toString()) { - const body = request.body as SCSearchRequest; + sandbox.on( + httpClient, + 'request', + async (request: RequestOptions): Promise> => { + if (request.url.toString() === 'http://foo.bar' + searchRoute.getUrlPath().toString()) { + const body = request.body as SCSearchRequest; - let count = 0; - if (typeof body.size === 'number' && body.size > 0) { - count = 1; + let count = 0; + if (typeof body.size === 'number' && body.size > 0) { + count = 1; + } + + return { + body: { + data: [ + { + categories: ['main dish'], + name: 'foobar', + origin: { + indexed: moment().format(), + name: 'bar', + }, + type: SCThingType.Dish, + uid: 'foo', + }, + ], + facets: [], + pagination: { + count: count, + offset: 0, + total: 1, + }, + stats: { + time: 1, + }, + }, + statusCode: searchRoute.statusCodeSuccess, + }; + } else if (request.url.toString() === 'http://localhost' + bulkRoute.getUrlPath().toString()) { + return { + body: { + state: 'in progress', + uid: 'foo', + }, + statusCode: bulkRoute.statusCodeSuccess, + }; + } else if ( + request.url.toString() === + 'http://localhost' + + bulkAddRoute + .getUrlPath({ + UID: 'foo', + }) + .toString() + ) { + return { + body: {}, + statusCode: bulkAddRoute.statusCodeSuccess, + }; } - return { - body: { - data: [{ - categories: [ - 'main dish', - ], - name: 'foobar', - origin: { - indexed: moment().format(), - name: 'bar', - }, - type: SCThingType.Dish, - uid: 'foo', - }], - facets: [], - pagination: { - count: count, - offset: 0, - total: 1, - }, - stats: { - time: 1, - }, - }, - statusCode: searchRoute.statusCodeSuccess, - }; - } else if (request.url.toString() === 'http://localhost' + bulkRoute.getUrlPath().toString()) { - return { - body: { - state: 'in progress', - uid: 'foo', - }, - statusCode: bulkRoute.statusCodeSuccess, - }; - } else if (request.url.toString() === 'http://localhost' + bulkAddRoute.getUrlPath({ - UID: 'foo', - }).toString()) { return { body: {}, - statusCode: bulkAddRoute.statusCodeSuccess, + statusCode: bulkDoneRoute.statusCodeSuccess, }; - } - - return { - body: {}, - statusCode: bulkDoneRoute.statusCodeSuccess, - }; - }); + }, + ); await copy(httpClient, { batchSize: 5, @@ -129,62 +139,72 @@ export class CopySpec { async copyShouldFail() { type responses = Response; - sandbox.on(httpClient, 'request', async (request: RequestOptions): Promise> => { - if (request.url.toString() === 'http://foo.bar' + searchRoute.getUrlPath().toString()) { - const body = request.body as SCSearchRequest; + sandbox.on( + httpClient, + 'request', + async (request: RequestOptions): Promise> => { + if (request.url.toString() === 'http://foo.bar' + searchRoute.getUrlPath().toString()) { + const body = request.body as SCSearchRequest; - if (typeof body.size === 'number' && body.size > 0) { - throw new ApiError({}); + if (typeof body.size === 'number' && body.size > 0) { + throw new ApiError({}); + } + + return { + body: { + data: [ + { + categories: ['main dish'], + name: 'foobar', + origin: { + indexed: moment().format(), + name: 'bar', + }, + type: SCThingType.Dish, + uid: 'foo', + }, + ], + facets: [], + pagination: { + count: 0, + offset: 0, + total: 1, + }, + stats: { + time: 1, + }, + }, + statusCode: searchRoute.statusCodeSuccess, + }; + } else if (request.url.toString() === 'http://localhost' + bulkRoute.getUrlPath().toString()) { + return { + body: { + state: 'in progress', + uid: 'foo', + }, + statusCode: bulkRoute.statusCodeSuccess, + }; + } else if ( + request.url.toString() === + 'http://localhost' + + bulkAddRoute + .getUrlPath({ + UID: 'foo', + }) + .toString() + ) { + return { + body: {}, + statusCode: bulkAddRoute.statusCodeSuccess, + }; } - return { - body: { - data: [{ - categories: [ - 'main dish', - ], - name: 'foobar', - origin: { - indexed: moment().format(), - name: 'bar', - }, - type: SCThingType.Dish, - uid: 'foo', - }], - facets: [], - pagination: { - count: 0, - offset: 0, - total: 1, - }, - stats: { - time: 1, - }, - }, - statusCode: searchRoute.statusCodeSuccess, - }; - } else if (request.url.toString() === 'http://localhost' + bulkRoute.getUrlPath().toString()) { - return { - body: { - state: 'in progress', - uid: 'foo', - }, - statusCode: bulkRoute.statusCodeSuccess, - }; - } else if (request.url.toString() === 'http://localhost' + bulkAddRoute.getUrlPath({ - UID: 'foo', - }).toString()) { return { body: {}, - statusCode: bulkAddRoute.statusCodeSuccess, + statusCode: bulkDoneRoute.statusCodeSuccess, }; - } - - return { - body: {}, - statusCode: bulkDoneRoute.statusCodeSuccess, - }; - }); + }, + ); return copy(httpClient, { batchSize: 5, diff --git a/packages/api/test/e2e.spec.ts b/packages/api/test/e2e.spec.ts index a66cc914..ff8dd09e 100644 --- a/packages/api/test/e2e.spec.ts +++ b/packages/api/test/e2e.spec.ts @@ -80,80 +80,93 @@ export class E2EConnectorSpec { let failOnCompare = false; let failOnLookup = false; - sandbox.on(httpClient, 'request', async (request: RequestOptions): Promise> => { - if (request.url.toString() === `http://localhost${bulkRoute.getUrlPath().toString()}`) { - - return { - body: { - state: 'in progress', - uid: 'foo', - }, - statusCode: bulkRoute.statusCodeSuccess, - }; - } - - if (request.url.toString() === `http://localhost${bulkAddRoute.getUrlPath({UID: 'foo'}).toString()}`) { - storedThings.set(request.body.uid, clone()(request.body)); - - return { - body: {}, - statusCode: bulkAddRoute.statusCodeSuccess, - }; - } - - if (request.url.toString() === `http://localhost${bulkDoneRoute.getUrlPath({UID: 'foo'}).toString()}`) { - return { - body: {}, - statusCode: bulkDoneRoute.statusCodeSuccess, - }; - } - - if (request.url.toString() === `http://localhost${searchRoute.getUrlPath().toString()}`) { - const thing = storedThings.get(request.body.filter.arguments.value); - if (failOnCompare) { - thing!.origin!.modified = 'altered'; + sandbox.on( + httpClient, + 'request', + async (request: RequestOptions): Promise> => { + if (request.url.toString() === `http://localhost${bulkRoute.getUrlPath().toString()}`) { + return { + body: { + state: 'in progress', + uid: 'foo', + }, + statusCode: bulkRoute.statusCodeSuccess, + }; + } + + if ( + request.url.toString() === `http://localhost${bulkAddRoute.getUrlPath({UID: 'foo'}).toString()}` + ) { + storedThings.set(request.body.uid, clone()(request.body)); + + return { + body: {}, + statusCode: bulkAddRoute.statusCodeSuccess, + }; + } + + if ( + request.url.toString() === `http://localhost${bulkDoneRoute.getUrlPath({UID: 'foo'}).toString()}` + ) { + return { + body: {}, + statusCode: bulkDoneRoute.statusCodeSuccess, + }; + } + + if (request.url.toString() === `http://localhost${searchRoute.getUrlPath().toString()}`) { + const thing = storedThings.get(request.body.filter.arguments.value); + if (failOnCompare) { + thing!.origin!.modified = 'altered'; + } + const returnThing = failOnLookup ? [] : [thing]; + const returnBody = { + data: returnThing, + facets: [], + pagination: { + count: returnThing.length, + offset: 0, + total: returnThing.length, + }, + stats: { + time: 42, + }, + }; + + return { + body: returnBody, + statusCode: searchRoute.statusCodeSuccess, + }; } - const returnThing = failOnLookup ? [] : [thing]; - const returnBody = { - data: returnThing, - facets: [], - pagination: { - count: returnThing.length, - offset: 0, - total: returnThing.length, - }, - stats: { - time: 42, - }, - }; return { - body: returnBody, + body: {}, statusCode: searchRoute.statusCodeSuccess, }; - } - - return { - body: {}, - statusCode: searchRoute.statusCodeSuccess, - }; - }); + }, + ); // tslint:disable-next-line: max-line-length - await e2eRun(httpClient, {to: 'http://localhost', samplesLocation: './node_modules/@openstapps/core/test/resources'}); + await e2eRun(httpClient, { + to: 'http://localhost', + samplesLocation: './node_modules/@openstapps/core/test/resources', + }); failOnLookup = true; failOnCompare = false; // tslint:disable-next-line: max-line-length - await e2eRun(httpClient, {to: 'http://localhost', samplesLocation: './node_modules/@openstapps/core/test/resources'}) - .should.be.rejectedWith('Search for single SCThing with uid'); + await e2eRun(httpClient, { + to: 'http://localhost', + samplesLocation: './node_modules/@openstapps/core/test/resources', + }).should.be.rejectedWith('Search for single SCThing with uid'); failOnLookup = false; failOnCompare = true; // tslint:disable-next-line: max-line-length - await e2eRun(httpClient, {to: 'http://localhost', samplesLocation: './node_modules/@openstapps/core/test/resources'}) - .should.be.rejectedWith('Unexpected difference'); - + await e2eRun(httpClient, { + to: 'http://localhost', + samplesLocation: './node_modules/@openstapps/core/test/resources', + }).should.be.rejectedWith('Unexpected difference'); } @test @@ -161,7 +174,6 @@ export class E2EConnectorSpec { type responses = Response; sandbox.on(httpClient, 'request', async (): Promise> => { - return { body: {}, statusCode: Number.MAX_SAFE_INTEGER, @@ -169,8 +181,10 @@ export class E2EConnectorSpec { }); // tslint:disable-next-line: max-line-length - return e2eRun(httpClient, {to: 'http://localhost', samplesLocation: './node_modules/@openstapps/core/test/resources'}) - .should.be.rejectedWith(ApiError); + return e2eRun(httpClient, { + to: 'http://localhost', + samplesLocation: './node_modules/@openstapps/core/test/resources', + }).should.be.rejectedWith(ApiError); } @test @@ -179,8 +193,9 @@ export class E2EConnectorSpec { if (!existsSync(emptyDirPath)) { mkdirSync(emptyDirPath); } - await e2eRun(httpClient, {to: 'http://localhost', samplesLocation: emptyDirPath}) - .should.be.rejectedWith('Could not index samples. None were retrieved from the file system.'); + await e2eRun(httpClient, {to: 'http://localhost', samplesLocation: emptyDirPath}).should.be.rejectedWith( + 'Could not index samples. None were retrieved from the file system.', + ); rmdirSync(emptyDirPath); } @@ -190,10 +205,12 @@ export class E2EConnectorSpec { if (!existsSync(somewhatFilledDirPath)) { mkdirSync(somewhatFilledDirPath); } - const nonJsonFile = join (somewhatFilledDirPath, 'nonjson.txt'); + const nonJsonFile = join(somewhatFilledDirPath, 'nonjson.txt'); createFileSync(nonJsonFile); - await e2eRun(httpClient, {to: 'http://localhost', samplesLocation: somewhatFilledDirPath}) - .should.be.rejectedWith('Could not index samples. None were retrieved from the file system.'); + await e2eRun(httpClient, { + to: 'http://localhost', + samplesLocation: somewhatFilledDirPath, + }).should.be.rejectedWith('Could not index samples. None were retrieved from the file system.'); unlinkSync(nonJsonFile); rmdirSync(somewhatFilledDirPath); } diff --git a/packages/api/test/http-client.spec.ts b/packages/api/test/http-client.spec.ts index 5700ebfb..f991935a 100644 --- a/packages/api/test/http-client.spec.ts +++ b/packages/api/test/http-client.spec.ts @@ -21,7 +21,6 @@ import {HttpClient} from '../src/http-client.js'; @suite() export class HttpClientSpec { - @test async construct() { expect(() => { @@ -37,9 +36,7 @@ export class HttpClientSpec { async request() { const client = new HttpClient(); - nock('http://www.example.com') - .get('/resource') - .reply(200, 'foo'); + nock('http://www.example.com').get('/resource').reply(200, 'foo'); const response = await client.request({ url: new URL('http://www.example.com/resource'), @@ -52,12 +49,10 @@ export class HttpClientSpec { async requestWithBody() { const client = new HttpClient(); - nock('http://www.example.com') - .get('/resource') - .reply(200, 'foo'); + nock('http://www.example.com').get('/resource').reply(200, 'foo'); const response = await client.request({ - url: new URL('http://www.example.com/resource') + url: new URL('http://www.example.com/resource'), }); expect(response.body).to.be.equal('foo'); @@ -68,9 +63,7 @@ export class HttpClientSpec { const client = new HttpClient(); let caughtErr; - nock('http://www.example.com') - .get('/resource') - .replyWithError('foo'); + nock('http://www.example.com').get('/resource').replyWithError('foo'); try { await client.request({ @@ -90,9 +83,7 @@ export class HttpClientSpec { async requestWithHeaders() { const client = new HttpClient(); - nock('http://www.example.com') - .get('/resource') - .reply(200, 'foo'); + nock('http://www.example.com').get('/resource').reply(200, 'foo'); const response = await client.request({ headers: { @@ -108,9 +99,7 @@ export class HttpClientSpec { async requestWithMethodGet() { const client = new HttpClient(); - nock('http://www.example.com') - .get('/resource') - .reply(200, 'foo'); + nock('http://www.example.com').get('/resource').reply(200, 'foo'); const response = await client.request({ method: 'GET', @@ -124,9 +113,7 @@ export class HttpClientSpec { async requestWithMethodPost() { const client = new HttpClient(); - nock('http://www.example.com') - .post('/resource') - .reply(200, 'foo'); + nock('http://www.example.com').post('/resource').reply(200, 'foo'); const response = await client.request({ method: 'POST', diff --git a/packages/api/test/plugin-client.spec.ts b/packages/api/test/plugin-client.spec.ts index f6505d25..1599b503 100644 --- a/packages/api/test/plugin-client.spec.ts +++ b/packages/api/test/plugin-client.spec.ts @@ -41,7 +41,21 @@ export class PluginClientSpec { } static async before() { - this.plugin = new TestPlugin(4000, '', '', '', '', {getSchema: () => {/***/}} as any, '', '', ''); + this.plugin = new TestPlugin( + 4000, + '', + '', + '', + '', + { + getSchema: () => { + /***/ + }, + } as any, + '', + '', + '', + ); } async after() { @@ -78,7 +92,7 @@ export class PluginClientSpec { expect(httpClient.request).to.have.been.first.called.with({ body: request, headers: { - "Content-Type": "application/json", + 'Content-Type': 'application/json', }, method: pluginRegisterRoute.method, url: new URL(`http://localhost${pluginRegisterRoute.getUrlPath()}`), @@ -102,14 +116,14 @@ export class PluginClientSpec { await pluginClient.unregisterPlugin(PluginClientSpec.plugin); const request: SCPluginRegisterRequest = { - action: 'remove', - route: PluginClientSpec.plugin.route, + action: 'remove', + route: PluginClientSpec.plugin.route, }; expect(httpClient.request).to.have.been.first.called.with({ body: request, headers: { - "Content-Type": "application/json", + 'Content-Type': 'application/json', }, method: pluginRegisterRoute.method, url: new URL(`http://localhost${pluginRegisterRoute.getUrlPath()}`), diff --git a/packages/api/test/plugin-resources/test-plugin-response.ts b/packages/api/test/plugin-resources/test-plugin-response.ts index eac63bf7..38d92d76 100644 --- a/packages/api/test/plugin-resources/test-plugin-response.ts +++ b/packages/api/test/plugin-resources/test-plugin-response.ts @@ -17,9 +17,9 @@ * * @validatable */ - export interface TestPluginResponse { +export interface TestPluginResponse { /** * Query dummy */ - query: string; + query: string; } diff --git a/packages/api/test/plugin.spec.ts b/packages/api/test/plugin.spec.ts index 68f8191f..83ac9f1e 100644 --- a/packages/api/test/plugin.spec.ts +++ b/packages/api/test/plugin.spec.ts @@ -25,7 +25,7 @@ import {TestPlugin} from './plugin-resources/test-plugin.js'; chai.use(chaiSpies); -process.on('unhandledRejection', (err) => { +process.on('unhandledRejection', err => { throw err; }); @@ -42,10 +42,21 @@ export class PluginSpec { } static async before() { - PluginSpec.testPlugin = new TestPlugin(4000, '', '', '', '', { - getSchema: () => {/***/ - }, - } as any, '', '', ''); + PluginSpec.testPlugin = new TestPlugin( + 4000, + '', + '', + '', + '', + { + getSchema: () => { + /***/ + }, + } as any, + '', + '', + '', + ); } async after() { @@ -54,9 +65,12 @@ export class PluginSpec { @test async construct() { - const converter = new Converter(__dirname, resolve(__dirname,'plugin-resources','test-plugin-response.ts')); + const converter = new Converter( + __dirname, + resolve(__dirname, 'plugin-resources', 'test-plugin-response.ts'), + ); - sandbox.on(converter, 'getSchema', (schemaName) => { + sandbox.on(converter, 'getSchema', schemaName => { return {$id: schemaName}; }); @@ -98,10 +112,21 @@ export class PluginSpec { @test async fullUrl() { - const constructTestPlugin = new TestPlugin(4001, '', 'http://B', '', '', { - getSchema: () => {/***/ - }, - } as any, '', '', ''); + const constructTestPlugin = new TestPlugin( + 4001, + '', + 'http://B', + '', + '', + { + getSchema: () => { + /***/ + }, + } as any, + '', + '', + '', + ); expect(constructTestPlugin.fullUrl).to.be.equal('http://B:4001'); await constructTestPlugin.close(); } diff --git a/packages/api/tsconfig.json b/packages/api/tsconfig.json index 066a5f38..579a39ff 100644 --- a/packages/api/tsconfig.json +++ b/packages/api/tsconfig.json @@ -1,3 +1,3 @@ { - "extends": "./node_modules/@openstapps/configuration/tsconfig.json" + "extends": "@openstapps/tsconfig" } diff --git a/packages/collection-utils/.editorconfig b/packages/collection-utils/.editorconfig deleted file mode 100644 index 9a4062a7..00000000 --- a/packages/collection-utils/.editorconfig +++ /dev/null @@ -1,15 +0,0 @@ -# editorconfig.org - -root = true - -[*] -indent_style = space -indent_size = 2 - -end_of_line = lf -charset = utf-8 -trim_trailing_whitespace = true -insert_final_newline = true - -[*.md] -trim_trailing_whitespace = false diff --git a/packages/collection-utils/.eslintignore b/packages/collection-utils/.eslintignore deleted file mode 100644 index 3d0a9346..00000000 --- a/packages/collection-utils/.eslintignore +++ /dev/null @@ -1,2 +0,0 @@ -resources -openapi diff --git a/packages/collection-utils/.eslintrc.json b/packages/collection-utils/.eslintrc.json deleted file mode 100644 index 31d47702..00000000 --- a/packages/collection-utils/.eslintrc.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "extends": "@openstapps" -} diff --git a/packages/collection-utils/.gitignore b/packages/collection-utils/.gitignore deleted file mode 100644 index 6866dfa2..00000000 --- a/packages/collection-utils/.gitignore +++ /dev/null @@ -1,95 +0,0 @@ -# Logs -logs -*.log -npm-debug.log* -yarn-debug.log* -yarn-error.log* - -# Runtime data -pids -*.pid -*.seed -*.pid.lock -.DS_Store - -# Directory for instrumented libs generated by jscoverage/JSCover -lib-cov - -# Coverage directory used by tools like istanbul -coverage - -# nyc test coverage -.nyc_output - -# Grunt intermediate storage (https://gruntjs.com/creating-plugins#storing-task-files) -.grunt - -# Bower dependency directory (https://bower.io/) -bower_components - -# node-waf configuration -.lock-wscript - -# Compiled binary addons (https://nodejs.org/api/addons.html) -build/Release - -# Dependency directories -node_modules/ -jspm_packages/ - -# TypeScript v1 declaration files -typings/ - -# Optional npm cache directory -.npm - -# Optional eslint cache -.eslintcache - -# Optional REPL history -.node_repl_history - -# Output of 'npm pack' -*.tgz - -# Yarn Integrity file -.yarn-integrity - -# dotenv environment variables file -.env - -# parcel-bundler cache (https://parceljs.org/) -.cache - -# next.js build output -.next - -# nuxt.js build output -.nuxt - -# vuepress build output -.vuepress/dist - -# Serverless directories -.serverless/ - -# FuseBox cache -.fusebox/ - -#DynamoDB Local files -.dynamodb/ - -########## end of https://github.com/github/gitignore/blob/master/Node.gitignore - -# ignore ide files -.idea -.vscode - -# ignore lib -lib - -# ignore docs -docs - -# report directory -report diff --git a/packages/collection-utils/LICENSE b/packages/collection-utils/LICENSE deleted file mode 100644 index 9df63ccc..00000000 --- a/packages/collection-utils/LICENSE +++ /dev/null @@ -1,200 +0,0 @@ -GNU GENERAL PUBLIC LICENSE -Version 3, 29 June 2007 - -Copyright © 2007 Free Software Foundation, Inc. - -Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. - -Preamble - -The GNU General Public License is a free, copyleft license for software and other kinds of works. - -The licenses for most software and other practical works are designed to take away your freedom to share and change the works. By contrast, the GNU General Public License is intended to guarantee your freedom to share and change all versions of a program--to make sure it remains free software for all its users. We, the Free Software Foundation, use the GNU General Public License for most of our software; it applies also to any other work released this way by its authors. You can apply it to your programs, too. - -When we speak of free software, we are referring to freedom, not price. Our General Public Licenses are designed to make sure that you have the freedom to distribute copies of free software (and charge for them if you wish), that you receive source code or can get it if you want it, that you can change the software or use pieces of it in new free programs, and that you know you can do these things. - -To protect your rights, we need to prevent others from denying you these rights or asking you to surrender the rights. Therefore, you have certain responsibilities if you distribute copies of the software, or if you modify it: responsibilities to respect the freedom of others. - -For example, if you distribute copies of such a program, whether gratis or for a fee, you must pass on to the recipients the same freedoms that you received. You must make sure that they, too, receive or can get the source code. And you must show them these terms so they know their rights. - -Developers that use the GNU GPL protect your rights with two steps: (1) assert copyright on the software, and (2) offer you this License giving you legal permission to copy, distribute and/or modify it. - -For the developers' and authors' protection, the GPL clearly explains that there is no warranty for this free software. For both users' and authors' sake, the GPL requires that modified versions be marked as changed, so that their problems will not be attributed erroneously to authors of previous versions. - -Some devices are designed to deny users access to install or run modified versions of the software inside them, although the manufacturer can do so. This is fundamentally incompatible with the aim of protecting users' freedom to change the software. The systematic pattern of such abuse occurs in the area of products for individuals to use, which is precisely where it is most unacceptable. Therefore, we have designed this version of the GPL to prohibit the practice for those products. If such problems arise substantially in other domains, we stand ready to extend this provision to those domains in future versions of the GPL, as needed to protect the freedom of users. - -Finally, every program is threatened constantly by software patents. States should not allow patents to restrict development and use of software on general-purpose computers, but in those that do, we wish to avoid the special danger that patents applied to a free program could make it effectively proprietary. To prevent this, the GPL assures that patents cannot be used to render the program non-free. - -The precise terms and conditions for copying, distribution and modification follow. - -TERMS AND CONDITIONS - -0. Definitions. -"This License" refers to version 3 of the GNU General Public License. - -"Copyright" also means copyright-like laws that apply to other kinds of works, such as semiconductor masks. - -"The Program" refers to any copyrightable work licensed under this License. Each licensee is addressed as "you". "Licensees" and "recipients" may be individuals or organizations. - -To "modify" a work means to copy from or adapt all or part of the work in a fashion requiring copyright permission, other than the making of an exact copy. The resulting work is called a "modified version" of the earlier work or a work "based on" the earlier work. - -A "covered work" means either the unmodified Program or a work based on the Program. - -To "propagate" a work means to do anything with it that, without permission, would make you directly or secondarily liable for infringement under applicable copyright law, except executing it on a computer or modifying a private copy. Propagation includes copying, distribution (with or without modification), making available to the public, and in some countries other activities as well. - -To "convey" a work means any kind of propagation that enables other parties to make or receive copies. Mere interaction with a user through a computer network, with no transfer of a copy, is not conveying. - -An interactive user interface displays "Appropriate Legal Notices" to the extent that it includes a convenient and prominently visible feature that (1) displays an appropriate copyright notice, and (2) tells the user that there is no warranty for the work (except to the extent that warranties are provided), that licensees may convey the work under this License, and how to view a copy of this License. If the interface presents a list of user commands or options, such as a menu, a prominent item in the list meets this criterion. - -1. Source Code. -The "source code" for a work means the preferred form of the work for making modifications to it. "Object code" means any non-source form of a work. -A "Standard Interface" means an interface that either is an official standard defined by a recognized standards body, or, in the case of interfaces specified for a particular programming language, one that is widely used among developers working in that language. - -The "System Libraries" of an executable work include anything, other than the work as a whole, that (a) is included in the normal form of packaging a Major Component, but which is not part of that Major Component, and (b) serves only to enable use of the work with that Major Component, or to implement a Standard Interface for which an implementation is available to the public in source code form. A "Major Component", in this context, means a major essential component (kernel, window system, and so on) of the specific operating system (if any) on which the executable work runs, or a compiler used to produce the work, or an object code interpreter used to run it. - -The "Corresponding Source" for a work in object code form means all the source code needed to generate, install, and (for an executable work) run the object code and to modify the work, including scripts to control those activities. However, it does not include the work's System Libraries, or general-purpose tools or generally available free programs which are used unmodified in performing those activities but which are not part of the work. For example, Corresponding Source includes interface definition files associated with source files for the work, and the source code for shared libraries and dynamically linked subprograms that the work is specifically designed to require, such as by intimate data communication or control flow between those subprograms and other parts of the work. - -The Corresponding Source need not include anything that users can regenerate automatically from other parts of the Corresponding Source. - -The Corresponding Source for a work in source code form is that same work. - -2. Basic Permissions. -All rights granted under this License are granted for the term of copyright on the Program, and are irrevocable provided the stated conditions are met. This License explicitly affirms your unlimited permission to run the unmodified Program. The output from running a covered work is covered by this License only if the output, given its content, constitutes a covered work. This License acknowledges your rights of fair use or other equivalent, as provided by copyright law. -You may make, run and propagate covered works that you do not convey, without conditions so long as your license otherwise remains in force. You may convey covered works to others for the sole purpose of having them make modifications exclusively for you, or provide you with facilities for running those works, provided that you comply with the terms of this License in conveying all material for which you do not control copyright. Those thus making or running the covered works for you must do so exclusively on your behalf, under your direction and control, on terms that prohibit them from making any copies of your copyrighted material outside their relationship with you. - -Conveying under any other circumstances is permitted solely under the conditions stated below. Sublicensing is not allowed; section 10 makes it unnecessary. - -3. Protecting Users' Legal Rights From Anti-Circumvention Law. -No covered work shall be deemed part of an effective technological measure under any applicable law fulfilling obligations under article 11 of the WIPO copyright treaty adopted on 20 December 1996, or similar laws prohibiting or restricting circumvention of such measures. -When you convey a covered work, you waive any legal power to forbid circumvention of technological measures to the extent such circumvention is effected by exercising rights under this License with respect to the covered work, and you disclaim any intention to limit operation or modification of the work as a means of enforcing, against the work's users, your or third parties' legal rights to forbid circumvention of technological measures. - -4. Conveying Verbatim Copies. -You may convey verbatim copies of the Program's source code as you receive it, in any medium, provided that you conspicuously and appropriately publish on each copy an appropriate copyright notice; keep intact all notices stating that this License and any non-permissive terms added in accord with section 7 apply to the code; keep intact all notices of the absence of any warranty; and give all recipients a copy of this License along with the Program. -You may charge any price or no price for each copy that you convey, and you may offer support or warranty protection for a fee. - -5. Conveying Modified Source Versions. -You may convey a work based on the Program, or the modifications to produce it from the Program, in the form of source code under the terms of section 4, provided that you also meet all of these conditions: -a) The work must carry prominent notices stating that you modified it, and giving a relevant date. -b) The work must carry prominent notices stating that it is released under this License and any conditions added under section 7. This requirement modifies the requirement in section 4 to "keep intact all notices". -c) You must license the entire work, as a whole, under this License to anyone who comes into possession of a copy. This License will therefore apply, along with any applicable section 7 additional terms, to the whole of the work, and all its parts, regardless of how they are packaged. This License gives no permission to license the work in any other way, but it does not invalidate such permission if you have separately received it. -d) If the work has interactive user interfaces, each must display Appropriate Legal Notices; however, if the Program has interactive interfaces that do not display Appropriate Legal Notices, your work need not make them do so. -A compilation of a covered work with other separate and independent works, which are not by their nature extensions of the covered work, and which are not combined with it such as to form a larger program, in or on a volume of a storage or distribution medium, is called an "aggregate" if the compilation and its resulting copyright are not used to limit the access or legal rights of the compilation's users beyond what the individual works permit. Inclusion of a covered work in an aggregate does not cause this License to apply to the other parts of the aggregate. - -6. Conveying Non-Source Forms. -You may convey a covered work in object code form under the terms of sections 4 and 5, provided that you also convey the machine-readable Corresponding Source under the terms of this License, in one of these ways: -a) Convey the object code in, or embodied in, a physical product (including a physical distribution medium), accompanied by the Corresponding Source fixed on a durable physical medium customarily used for software interchange. -b) Convey the object code in, or embodied in, a physical product (including a physical distribution medium), accompanied by a written offer, valid for at least three years and valid for as long as you offer spare parts or customer support for that product model, to give anyone who possesses the object code either (1) a copy of the Corresponding Source for all the software in the product that is covered by this License, on a durable physical medium customarily used for software interchange, for a price no more than your reasonable cost of physically performing this conveying of source, or (2) access to copy the Corresponding Source from a network server at no charge. -c) Convey individual copies of the object code with a copy of the written offer to provide the Corresponding Source. This alternative is allowed only occasionally and noncommercially, and only if you received the object code with such an offer, in accord with subsection 6b. -d) Convey the object code by offering access from a designated place (gratis or for a charge), and offer equivalent access to the Corresponding Source in the same way through the same place at no further charge. You need not require recipients to copy the Corresponding Source along with the object code. If the place to copy the object code is a network server, the Corresponding Source may be on a different server (operated by you or a third party) that supports equivalent copying facilities, provided you maintain clear directions next to the object code saying where to find the Corresponding Source. Regardless of what server hosts the Corresponding Source, you remain obligated to ensure that it is available for as long as needed to satisfy these requirements. -e) Convey the object code using peer-to-peer transmission, provided you inform other peers where the object code and Corresponding Source of the work are being offered to the general public at no charge under subsection 6d. -A separable portion of the object code, whose source code is excluded from the Corresponding Source as a System Library, need not be included in conveying the object code work. - -A "User Product" is either (1) a "consumer product", which means any tangible personal property which is normally used for personal, family, or household purposes, or (2) anything designed or sold for incorporation into a dwelling. In determining whether a product is a consumer product, doubtful cases shall be resolved in favor of coverage. For a particular product received by a particular user, "normally used" refers to a typical or common use of that class of product, regardless of the status of the particular user or of the way in which the particular user actually uses, or expects or is expected to use, the product. A product is a consumer product regardless of whether the product has substantial commercial, industrial or non-consumer uses, unless such uses represent the only significant mode of use of the product. - -"Installation Information" for a User Product means any methods, procedures, authorization keys, or other information required to install and execute modified versions of a covered work in that User Product from a modified version of its Corresponding Source. The information must suffice to ensure that the continued functioning of the modified object code is in no case prevented or interfered with solely because modification has been made. - -If you convey an object code work under this section in, or with, or specifically for use in, a User Product, and the conveying occurs as part of a transaction in which the right of possession and use of the User Product is transferred to the recipient in perpetuity or for a fixed term (regardless of how the transaction is characterized), the Corresponding Source conveyed under this section must be accompanied by the Installation Information. But this requirement does not apply if neither you nor any third party retains the ability to install modified object code on the User Product (for example, the work has been installed in ROM). - -The requirement to provide Installation Information does not include a requirement to continue to provide support service, warranty, or updates for a work that has been modified or installed by the recipient, or for the User Product in which it has been modified or installed. Access to a network may be denied when the modification itself materially and adversely affects the operation of the network or violates the rules and protocols for communication across the network. - -Corresponding Source conveyed, and Installation Information provided, in accord with this section must be in a format that is publicly documented (and with an implementation available to the public in source code form), and must require no special password or key for unpacking, reading or copying. - -7. Additional Terms. -"Additional permissions" are terms that supplement the terms of this License by making exceptions from one or more of its conditions. Additional permissions that are applicable to the entire Program shall be treated as though they were included in this License, to the extent that they are valid under applicable law. If additional permissions apply only to part of the Program, that part may be used separately under those permissions, but the entire Program remains governed by this License without regard to the additional permissions. -When you convey a copy of a covered work, you may at your option remove any additional permissions from that copy, or from any part of it. (Additional permissions may be written to require their own removal in certain cases when you modify the work.) You may place additional permissions on material, added by you to a covered work, for which you have or can give appropriate copyright permission. - -Notwithstanding any other provision of this License, for material you add to a covered work, you may (if authorized by the copyright holders of that material) supplement the terms of this License with terms: - -a) Disclaiming warranty or limiting liability differently from the terms of sections 15 and 16 of this License; or -b) Requiring preservation of specified reasonable legal notices or author attributions in that material or in the Appropriate Legal Notices displayed by works containing it; or -c) Prohibiting misrepresentation of the origin of that material, or requiring that modified versions of such material be marked in reasonable ways as different from the original version; or -d) Limiting the use for publicity purposes of names of licensors or authors of the material; or -e) Declining to grant rights under trademark law for use of some trade names, trademarks, or service marks; or -f) Requiring indemnification of licensors and authors of that material by anyone who conveys the material (or modified versions of it) with contractual assumptions of liability to the recipient, for any liability that these contractual assumptions directly impose on those licensors and authors. -All other non-permissive additional terms are considered "further restrictions" within the meaning of section 10. If the Program as you received it, or any part of it, contains a notice stating that it is governed by this License along with a term that is a further restriction, you may remove that term. If a license document contains a further restriction but permits relicensing or conveying under this License, you may add to a covered work material governed by the terms of that license document, provided that the further restriction does not survive such relicensing or conveying. - -If you add terms to a covered work in accord with this section, you must place, in the relevant source files, a statement of the additional terms that apply to those files, or a notice indicating where to find the applicable terms. - -Additional terms, permissive or non-permissive, may be stated in the form of a separately written license, or stated as exceptions; the above requirements apply either way. - -8. Termination. -You may not propagate or modify a covered work except as expressly provided under this License. Any attempt otherwise to propagate or modify it is void, and will automatically terminate your rights under this License (including any patent licenses granted under the third paragraph of section 11). -However, if you cease all violation of this License, then your license from a particular copyright holder is reinstated (a) provisionally, unless and until the copyright holder explicitly and finally terminates your license, and (b) permanently, if the copyright holder fails to notify you of the violation by some reasonable means prior to 60 days after the cessation. - -Moreover, your license from a particular copyright holder is reinstated permanently if the copyright holder notifies you of the violation by some reasonable means, this is the first time you have received notice of violation of this License (for any work) from that copyright holder, and you cure the violation prior to 30 days after your receipt of the notice. - -Termination of your rights under this section does not terminate the licenses of parties who have received copies or rights from you under this License. If your rights have been terminated and not permanently reinstated, you do not qualify to receive new licenses for the same material under section 10. - -9. Acceptance Not Required for Having Copies. -You are not required to accept this License in order to receive or run a copy of the Program. Ancillary propagation of a covered work occurring solely as a consequence of using peer-to-peer transmission to receive a copy likewise does not require acceptance. However, nothing other than this License grants you permission to propagate or modify any covered work. These actions infringe copyright if you do not accept this License. Therefore, by modifying or propagating a covered work, you indicate your acceptance of this License to do so. -10. Automatic Licensing of Downstream Recipients. -Each time you convey a covered work, the recipient automatically receives a license from the original licensors, to run, modify and propagate that work, subject to this License. You are not responsible for enforcing compliance by third parties with this License. -An "entity transaction" is a transaction transferring control of an organization, or substantially all assets of one, or subdividing an organization, or merging organizations. If propagation of a covered work results from an entity transaction, each party to that transaction who receives a copy of the work also receives whatever licenses to the work the party's predecessor in interest had or could give under the previous paragraph, plus a right to possession of the Corresponding Source of the work from the predecessor in interest, if the predecessor has it or can get it with reasonable efforts. - -You may not impose any further restrictions on the exercise of the rights granted or affirmed under this License. For example, you may not impose a license fee, royalty, or other charge for exercise of rights granted under this License, and you may not initiate litigation (including a cross-claim or counterclaim in a lawsuit) alleging that any patent claim is infringed by making, using, selling, offering for sale, or importing the Program or any portion of it. - -11. Patents. -A "contributor" is a copyright holder who authorizes use under this License of the Program or a work on which the Program is based. The work thus licensed is called the contributor's "contributor version". -A contributor's "essential patent claims" are all patent claims owned or controlled by the contributor, whether already acquired or hereafter acquired, that would be infringed by some manner, permitted by this License, of making, using, or selling its contributor version, but do not include claims that would be infringed only as a consequence of further modification of the contributor version. For purposes of this definition, "control" includes the right to grant patent sublicenses in a manner consistent with the requirements of this License. - -Each contributor grants you a non-exclusive, worldwide, royalty-free patent license under the contributor's essential patent claims, to make, use, sell, offer for sale, import and otherwise run, modify and propagate the contents of its contributor version. - -In the following three paragraphs, a "patent license" is any express agreement or commitment, however denominated, not to enforce a patent (such as an express permission to practice a patent or covenant not to sue for patent infringement). To "grant" such a patent license to a party means to make such an agreement or commitment not to enforce a patent against the party. - -If you convey a covered work, knowingly relying on a patent license, and the Corresponding Source of the work is not available for anyone to copy, free of charge and under the terms of this License, through a publicly available network server or other readily accessible means, then you must either (1) cause the Corresponding Source to be so available, or (2) arrange to deprive yourself of the benefit of the patent license for this particular work, or (3) arrange, in a manner consistent with the requirements of this License, to extend the patent license to downstream recipients. "Knowingly relying" means you have actual knowledge that, but for the patent license, your conveying the covered work in a country, or your recipient's use of the covered work in a country, would infringe one or more identifiable patents in that country that you have reason to believe are valid. - -If, pursuant to or in connection with a single transaction or arrangement, you convey, or propagate by procuring conveyance of, a covered work, and grant a patent license to some of the parties receiving the covered work authorizing them to use, propagate, modify or convey a specific copy of the covered work, then the patent license you grant is automatically extended to all recipients of the covered work and works based on it. - -A patent license is "discriminatory" if it does not include within the scope of its coverage, prohibits the exercise of, or is conditioned on the non-exercise of one or more of the rights that are specifically granted under this License. You may not convey a covered work if you are a party to an arrangement with a third party that is in the business of distributing software, under which you make payment to the third party based on the extent of your activity of conveying the work, and under which the third party grants, to any of the parties who would receive the covered work from you, a discriminatory patent license (a) in connection with copies of the covered work conveyed by you (or copies made from those copies), or (b) primarily for and in connection with specific products or compilations that contain the covered work, unless you entered into that arrangement, or that patent license was granted, prior to 28 March 2007. - -Nothing in this License shall be construed as excluding or limiting any implied license or other defenses to infringement that may otherwise be available to you under applicable patent law. - -12. No Surrender of Others' Freedom. -If conditions are imposed on you (whether by court order, agreement or otherwise) that contradict the conditions of this License, they do not excuse you from the conditions of this License. If you cannot convey a covered work so as to satisfy simultaneously your obligations under this License and any other pertinent obligations, then as a consequence you may not convey it at all. For example, if you agree to terms that obligate you to collect a royalty for further conveying from those to whom you convey the Program, the only way you could satisfy both those terms and this License would be to refrain entirely from conveying the Program. -13. Use with the GNU Affero General Public License. -Notwithstanding any other provision of this License, you have permission to link or combine any covered work with a work licensed under version 3 of the GNU Affero General Public License into a single combined work, and to convey the resulting work. The terms of this License will continue to apply to the part which is the covered work, but the special requirements of the GNU Affero General Public License, section 13, concerning interaction through a network will apply to the combination as such. -14. Revised Versions of this License. -The Free Software Foundation may publish revised and/or new versions of the GNU General Public License from time to time. Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns. -Each version is given a distinguishing version number. If the Program specifies that a certain numbered version of the GNU General Public License "or any later version" applies to it, you have the option of following the terms and conditions either of that numbered version or of any later version published by the Free Software Foundation. If the Program does not specify a version number of the GNU General Public License, you may choose any version ever published by the Free Software Foundation. - -If the Program specifies that a proxy can decide which future versions of the GNU General Public License can be used, that proxy's public statement of acceptance of a version permanently authorizes you to choose that version for the Program. - -Later license versions may give you additional or different permissions. However, no additional obligations are imposed on any author or copyright holder as a result of your choosing to follow a later version. - -15. Disclaimer of Warranty. -THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. -16. Limitation of Liability. -IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. -17. Interpretation of Sections 15 and 16. -If the disclaimer of warranty and limitation of liability provided above cannot be given local legal effect according to their terms, reviewing courts shall apply local law that most closely approximates an absolute waiver of all civil liability in connection with the Program, unless a warranty or assumption of liability accompanies a copy of the Program in return for a fee. - -END OF TERMS AND CONDITIONS - -How to Apply These Terms to Your New Programs - -If you develop a new program, and you want it to be of the greatest possible use to the public, the best way to achieve this is to make it free software which everyone can redistribute and change under these terms. - -To do so, attach the following notices to the program. It is safest to attach them to the start of each source file to most effectively state the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found. - - -Copyright (C) - -This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. - -This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - -You should have received a copy of the GNU General Public License along with this program. If not, see . - -Also add information on how to contact you by electronic and paper mail. - -If the program does terminal interaction, make it output a short notice like this when it starts in an interactive mode: - - Copyright (C) -This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. -This is free software, and you are welcome to redistribute it under certain conditions; type `show c' for details. - -The hypothetical commands `show w' and `show c' should show the appropriate parts of the General Public License. Of course, your program's commands might be different; for a GUI interface, you would use an "about box". - -You should also get your employer (if you work as a programmer) or school, if any, to sign a "copyright disclaimer" for the program, if necessary. For more information on this, and how to apply and follow the GNU GPL, see . - -The GNU General Public License does not permit incorporating your program into proprietary programs. If your program is a subroutine library, you may consider it more useful to permit linking proprietary applications with the library. If this is what you want to do, use the GNU Lesser General Public License instead of this License. But first, please read . diff --git a/packages/collection-utils/package.json b/packages/collection-utils/package.json index 5196f868..74ed2fbf 100644 --- a/packages/collection-utils/package.json +++ b/packages/collection-utils/package.json @@ -2,25 +2,47 @@ "name": "@openstapps/collection-utils", "version": "2.1.0", "type": "module", + "license": "GPL-3.0-only", + "main": "lib/index.js", "scripts": { - "build": "rimraf lib && tsc", + "build": "tsup --dts", "format": "prettier .", "format:fix": "prettier --write .", - "test": "mocha --require ts-node/register test/*.spec.ts" + "lint": "eslint --ext .ts src/", + "lint:fix": "eslint --fix --ext .ts src/", + "test": "nyc mocha 'test/**/*.spec.ts'" }, "devDependencies": { - "@openstapps/configuration": "workspace:*", "@openstapps/eslint-config": "workspace:*", + "@openstapps/nyc-config": "workspace:*", "@openstapps/prettier-config": "workspace:*", + "@openstapps/tsconfig": "workspace:*", "@types/chai": "4.3.4", "@types/mocha": "10.0.1", "@types/node": "18.15.3", "chai": "4.3.7", - "eslint": "8.33.0", "mocha": "10.2.0", - "prettier": "2.8.3", - "rimraf": "4.4.0", "ts-node": "10.9.1", + "tsup": "6.7.0", "typescript": "4.8.4" - } + }, + "tsup": { + "entry": [ + "src/index.ts" + ], + "sourcemap": true, + "clean": true, + "format": "esm", + "outDir": "lib" + }, + "prettier": "@openstapps/prettier-config", + "eslintConfig": { + "extends": [ + "@openstapps" + ] + }, + "nyc": { + "extends": "@openstapps/nyc-config" + }, + "exports": "./lib/index.js" } diff --git a/packages/collection-utils/src/difference.ts b/packages/collection-utils/src/difference.ts index fac965a6..62839057 100644 --- a/packages/collection-utils/src/difference.ts +++ b/packages/collection-utils/src/difference.ts @@ -16,12 +16,8 @@ /** * Returns the difference between two arrays. */ -export function differenceBy( - a: T[], - b: T[], - transform: (item: T) => unknown -) { +export function differenceBy(a: T[], b: T[], transform: (item: T) => unknown) { const disallowed = new Set(b.map(transform)); - return a.filter((item) => !disallowed.has(transform(item))); + return a.filter(item => !disallowed.has(transform(item))); } diff --git a/packages/collection-utils/src/get.ts b/packages/collection-utils/src/get.ts index 633d03d5..78f20749 100644 --- a/packages/collection-utils/src/get.ts +++ b/packages/collection-utils/src/get.ts @@ -19,12 +19,12 @@ * If the path doesn't exist, undefined is returned. */ export function get(object: object, path: string): U { - return path.split(".").reduce( + return path.split('.').reduce( (accumulator, current) => accumulator?.hasOwnProperty(current) ? // eslint-disable-next-line @typescript-eslint/no-explicit-any (accumulator as any)[current] : undefined, - object + object, ) as unknown as U; } diff --git a/packages/collection-utils/src/group-by.ts b/packages/collection-utils/src/group-by.ts index 0015e7d8..6723f7db 100644 --- a/packages/collection-utils/src/group-by.ts +++ b/packages/collection-utils/src/group-by.ts @@ -16,12 +16,9 @@ /** * Group an array by a function */ -export function groupBy( - collection: T[], - group: (item: T) => string | undefined -): Record { +export function groupBy(collection: T[], group: (item: T) => string | undefined): Record { return collection.reduce((accumulator: Record, item) => { - const key = group(item) ?? ""; + const key = group(item) ?? ''; accumulator[key] = accumulator[key] ?? []; accumulator[key].push(item); return accumulator; @@ -31,12 +28,9 @@ export function groupBy( /** * Group an array by a function (returns a Map, whose keys keep order info of items entry) */ -export function groupByStable( - collection: T[], - group: (item: T) => string | undefined -): Map { +export function groupByStable(collection: T[], group: (item: T) => string | undefined): Map { return collection.reduce((accumulator: Map, item) => { - const key = group(item) ?? ""; + const key = group(item) ?? ''; accumulator.set(key, accumulator.get(key) ?? []); accumulator.get(key)?.push(item); return accumulator; @@ -46,9 +40,6 @@ export function groupByStable( /** * */ -export function groupByProperty( - collection: T[], - property: keyof T -): Record { - return groupBy(collection, (item) => item[property] as unknown as string); +export function groupByProperty(collection: T[], property: keyof T): Record { + return groupBy(collection, item => item[property] as unknown as string); } diff --git a/packages/collection-utils/src/index.ts b/packages/collection-utils/src/index.ts new file mode 100644 index 00000000..d953a74a --- /dev/null +++ b/packages/collection-utils/src/index.ts @@ -0,0 +1,16 @@ +export * from './chunk.js'; +export * from './difference.js'; +export * from './get.js'; +export * from './group-by.js'; +export * from './key-by.js'; +export * from './map-values.js'; +export * from './min.js'; +export * from './omit.js'; +export * from './partition.js'; +export * from './pick.js'; +export * from './shuffle.js'; +export * from './string-sort.js'; +export * from './sum.js'; +export * from './tree-group.js'; +export * from './uniq.js'; +export * from './zip.js'; diff --git a/packages/collection-utils/src/key-by.ts b/packages/collection-utils/src/key-by.ts index da50c471..e7f3a544 100644 --- a/packages/collection-utils/src/key-by.ts +++ b/packages/collection-utils/src/key-by.ts @@ -19,10 +19,7 @@ * each key is the last element responsible for generating the key. The * iteratee is invoked with one argument: (value). */ -export function keyBy( - collection: T[], - key: (item: T) => string | number -): Record { +export function keyBy(collection: T[], key: (item: T) => string | number): Record { return collection.reduce((accumulator, item) => { accumulator[key(item)] = item; return accumulator; diff --git a/packages/collection-utils/src/map-values.ts b/packages/collection-utils/src/map-values.ts index 6d8f93f4..3b36d107 100644 --- a/packages/collection-utils/src/map-values.ts +++ b/packages/collection-utils/src/map-values.ts @@ -18,9 +18,9 @@ */ export function mapValues( object: T, - transform: (value: T[keyof T], key: keyof T) => U -): { [key in keyof T]: U } { - const result = {} as { [key in keyof T]: U }; + transform: (value: T[keyof T], key: keyof T) => U, +): {[key in keyof T]: U} { + const result = {} as {[key in keyof T]: U}; for (const key in object) { if (object.hasOwnProperty(key)) { diff --git a/packages/collection-utils/src/min.ts b/packages/collection-utils/src/min.ts index f3e70beb..2a99e971 100644 --- a/packages/collection-utils/src/min.ts +++ b/packages/collection-utils/src/min.ts @@ -16,11 +16,8 @@ /** * Returns the minimum value of a collection. */ -export function minBy( - array: T[], - transform: (item: T) => number | undefined -): T { +export function minBy(array: T[], transform: (item: T) => number | undefined): T { const transforms = array.map(transform); - const min = Math.min(...(transforms.filter((it) => !!it) as number[])); + const min = Math.min(...(transforms.filter(it => !!it) as number[])); return array.find((_, i) => transforms[i] === min) as T; } diff --git a/packages/collection-utils/src/omit.ts b/packages/collection-utils/src/omit.ts index 7364a4dd..dd15b66f 100644 --- a/packages/collection-utils/src/omit.ts +++ b/packages/collection-utils/src/omit.ts @@ -16,11 +16,8 @@ /** * Returns a new object without the specified keys. */ -export function omit( - object: T, - ...keys: U[] -): Omit { - const out = { ...object }; +export function omit(object: T, ...keys: U[]): Omit { + const out = {...object}; for (const key of keys) delete out[key]; return out as Exclude; } diff --git a/packages/collection-utils/src/partition.ts b/packages/collection-utils/src/partition.ts index e845fec4..27ccfb62 100644 --- a/packages/collection-utils/src/partition.ts +++ b/packages/collection-utils/src/partition.ts @@ -17,15 +17,12 @@ * Partitions a list into two lists. One with the elements that satisfy a predicate, * and one with the elements that don't satisfy the predicate. */ -export function partition( - array: T[], - transform: (item: T) => boolean -): [T[], T[]] { +export function partition(array: T[], transform: (item: T) => boolean): [T[], T[]] { return array.reduce<[T[], T[]]>( (accumulator, item) => { accumulator[transform(item) ? 0 : 1].push(item); return accumulator; }, - [[], []] + [[], []], ); } diff --git a/packages/collection-utils/src/pick.ts b/packages/collection-utils/src/pick.ts index 171d7f70..9405a37b 100644 --- a/packages/collection-utils/src/pick.ts +++ b/packages/collection-utils/src/pick.ts @@ -16,10 +16,7 @@ /** * Pick a set of properties from an object */ -export function pick( - object: T, - keys: U[] -): Pick { +export function pick(object: T, keys: U[]): Pick { return keys.reduce((accumulator, key) => { if (object.hasOwnProperty(key)) { accumulator[key] = object[key]; @@ -33,7 +30,7 @@ export function pick( */ export function pickBy( object: T, - predicate: (value: T[U], key: U) => boolean + predicate: (value: T[U], key: U) => boolean, ): Pick { return (Object.keys(object) as U[]).reduce((accumulator, key) => { if (predicate(object[key], key)) { diff --git a/packages/collection-utils/src/string-sort.ts b/packages/collection-utils/src/string-sort.ts index 061d877a..b7a2b24d 100644 --- a/packages/collection-utils/src/string-sort.ts +++ b/packages/collection-utils/src/string-sort.ts @@ -16,7 +16,7 @@ /** * sort function for two strings */ -export function stringSort(a = "", b = ""): number { +export function stringSort(a = '', b = ''): number { if (a < b) return -1; if (a > b) return 1; return 0; @@ -25,12 +25,10 @@ export function stringSort(a = "", b = ""): number { /** * sort function for two strings that allows for a custom transform */ -export function stringSortBy( - map: (item: T) => string | undefined -): (a: T, b: T) => number { +export function stringSortBy(map: (item: T) => string | undefined): (a: T, b: T) => number { return (a: T, b: T): number => { - const aValue = map(a) || ""; - const bValue = map(b) || ""; + const aValue = map(a) || ''; + const bValue = map(b) || ''; if (aValue < bValue) return -1; if (aValue > bValue) return 1; return 0; diff --git a/packages/collection-utils/src/sum.ts b/packages/collection-utils/src/sum.ts index 006589b3..a92a796c 100644 --- a/packages/collection-utils/src/sum.ts +++ b/packages/collection-utils/src/sum.ts @@ -18,20 +18,14 @@ */ export function sumBy( collection: T[], - transform: (value: T) => number | undefined + transform: (value: T) => number | undefined, ): number { - return collection.reduce( - (accumulator, item) => accumulator + (transform(item) || 0), - 0 - ); + return collection.reduce((accumulator, item) => accumulator + (transform(item) || 0), 0); } /** * Sum an array of numbers */ export function sum(collection: Array): number { - return collection.reduce( - (accumulator, item) => accumulator + (item || 0), - 0 - ); + return collection.reduce((accumulator, item) => accumulator + (item || 0), 0); } diff --git a/packages/collection-utils/src/tree-group.ts b/packages/collection-utils/src/tree-group.ts index df8a10cc..171644b9 100644 --- a/packages/collection-utils/src/tree-group.ts +++ b/packages/collection-utils/src/tree-group.ts @@ -22,10 +22,7 @@ export type Tree = { /** * */ -export function treeGroupBy( - items: T[], - transform: (item: T) => string[] -): Tree { +export function treeGroupBy(items: T[], transform: (item: T) => string[]): Tree { const tree: Tree = {}; for (const item of items) { diff --git a/packages/collection-utils/src/uniq.ts b/packages/collection-utils/src/uniq.ts index 16ff8fe2..933c07e7 100644 --- a/packages/collection-utils/src/uniq.ts +++ b/packages/collection-utils/src/uniq.ts @@ -16,14 +16,11 @@ /** * Filter out duplicates from an array. */ -export function uniqBy( - array: T[], - transform: (item: T) => string | number -): T[] { +export function uniqBy(array: T[], transform: (item: T) => string | number): T[] { return Object.values( array.reduce((accumulator, current) => { accumulator[transform(current)] = current; return accumulator; - }, {} as Record) + }, {} as Record), ); } diff --git a/packages/collection-utils/test/chunk.spec.ts b/packages/collection-utils/test/chunk.spec.ts index 90d6cedc..f1cf480a 100644 --- a/packages/collection-utils/test/chunk.spec.ts +++ b/packages/collection-utils/test/chunk.spec.ts @@ -13,16 +13,11 @@ * this program. If not, see . */ -import { chunk } from "../src/chunk.js"; -import { expect } from "chai"; +import {chunk} from '../src/chunk.js'; +import {expect} from 'chai'; -describe("chunk", function () { - it("should chunk items in the correct sizes", function () { - expect(chunk([1, 2, 3, 4, 5, 6, 7, 8, 9, 10], 3)).to.deep.equal([ - [1, 2, 3], - [4, 5, 6], - [7, 8, 9], - [10], - ]); +describe('chunk', function () { + it('should chunk items in the correct sizes', function () { + expect(chunk([1, 2, 3, 4, 5, 6, 7, 8, 9, 10], 3)).to.deep.equal([[1, 2, 3], [4, 5, 6], [7, 8, 9], [10]]); }); }); diff --git a/packages/collection-utils/test/difference.spec.ts b/packages/collection-utils/test/difference.spec.ts index 01eba8b8..4295cff2 100644 --- a/packages/collection-utils/test/difference.spec.ts +++ b/packages/collection-utils/test/difference.spec.ts @@ -12,14 +12,14 @@ * You should have received a copy of the GNU General Public License along with * this program. If not, see . */ -import { differenceBy } from "../src/difference.js"; -import { expect } from "chai"; +import {differenceBy} from '../src/difference.js'; +import {expect} from 'chai'; -describe("differenceBy", function () { - it("should return the difference of two arrays", function () { +describe('differenceBy', function () { + it('should return the difference of two arrays', function () { const a = [1, 2, 3, 4, 5]; const b = [1, 2, 3]; - expect(differenceBy(a, b, (it) => it)).to.deep.equal([4, 5]); + expect(differenceBy(a, b, it => it)).to.deep.equal([4, 5]); }); }); diff --git a/packages/collection-utils/test/get.spec.ts b/packages/collection-utils/test/get.spec.ts index 4a0bfe98..59a372e8 100644 --- a/packages/collection-utils/test/get.spec.ts +++ b/packages/collection-utils/test/get.spec.ts @@ -12,29 +12,29 @@ * You should have received a copy of the GNU General Public License along with * this program. If not, see . */ -import { get } from "../src/get.js"; -import { expect } from "chai"; +import {get} from '../src/get.js'; +import {expect} from 'chai'; -describe("get", function () { - it("should get a simple path", function () { +describe('get', function () { + it('should get a simple path', function () { const object = { a: { b: { - c: "d", + c: 'd', }, }, }; - expect(get(object, "a.b.c")).to.equal("d"); + expect(get(object, 'a.b.c')).to.equal('d'); }); - it("should return undefined for a non-existent path", function () { + it('should return undefined for a non-existent path', function () { const object = { a: { b: { - c: "d", + c: 'd', }, }, }; - expect(get(object, "a.b.c.d")).to.be.undefined; + expect(get(object, 'a.b.c.d')).to.be.undefined; }); }); diff --git a/packages/collection-utils/test/group-by.spec.ts b/packages/collection-utils/test/group-by.spec.ts index 1b31d559..aff27d8b 100644 --- a/packages/collection-utils/test/group-by.spec.ts +++ b/packages/collection-utils/test/group-by.spec.ts @@ -12,113 +12,113 @@ * You should have received a copy of the GNU General Public License along with * this program. If not, see . */ -import { groupBy, groupByStable, groupByProperty } from "../src/group-by.js"; -import { expect } from "chai"; +import {groupBy, groupByStable, groupByProperty} from '../src/group-by.js'; +import {expect} from 'chai'; -describe("groupBy", () => { - it("should group an array by a key", () => { +describe('groupBy', () => { + it('should group an array by a key', () => { const array = [ - { id: 1, name: "one" }, - { id: 2, name: "two" }, - { id: 3, name: "three" }, - { id: 4, name: "four" }, - { id: 5, name: "five" }, + {id: 1, name: 'one'}, + {id: 2, name: 'two'}, + {id: 3, name: 'three'}, + {id: 4, name: 'four'}, + {id: 5, name: 'five'}, ]; - const result = groupBy(array, (it) => it.name); + const result = groupBy(array, it => it.name); expect(result).to.deep.equal({ - one: [{ id: 1, name: "one" }], - two: [{ id: 2, name: "two" }], - three: [{ id: 3, name: "three" }], - four: [{ id: 4, name: "four" }], - five: [{ id: 5, name: "five" }], + one: [{id: 1, name: 'one'}], + two: [{id: 2, name: 'two'}], + three: [{id: 3, name: 'three'}], + four: [{id: 4, name: 'four'}], + five: [{id: 5, name: 'five'}], }); }); - it("should handle multiple elements per group", () => { + it('should handle multiple elements per group', () => { const array = [ - { id: 1, name: "one" }, - { id: 2, name: "two" }, - { id: 3, name: "three" }, - { id: 4, name: "four" }, - { id: 5, name: "five" }, - { id: 6, name: "one" }, - { id: 7, name: "two" }, - { id: 8, name: "three" }, - { id: 9, name: "four" }, - { id: 10, name: "five" }, + {id: 1, name: 'one'}, + {id: 2, name: 'two'}, + {id: 3, name: 'three'}, + {id: 4, name: 'four'}, + {id: 5, name: 'five'}, + {id: 6, name: 'one'}, + {id: 7, name: 'two'}, + {id: 8, name: 'three'}, + {id: 9, name: 'four'}, + {id: 10, name: 'five'}, ]; - const result = groupBy(array, (it) => it.name); + const result = groupBy(array, it => it.name); expect(result).to.deep.equal({ one: [ - { id: 1, name: "one" }, - { id: 6, name: "one" }, + {id: 1, name: 'one'}, + {id: 6, name: 'one'}, ], two: [ - { id: 2, name: "two" }, - { id: 7, name: "two" }, + {id: 2, name: 'two'}, + {id: 7, name: 'two'}, ], three: [ - { id: 3, name: "three" }, - { id: 8, name: "three" }, + {id: 3, name: 'three'}, + {id: 8, name: 'three'}, ], four: [ - { id: 4, name: "four" }, - { id: 9, name: "four" }, + {id: 4, name: 'four'}, + {id: 9, name: 'four'}, ], five: [ - { id: 5, name: "five" }, - { id: 10, name: "five" }, + {id: 5, name: 'five'}, + {id: 10, name: 'five'}, ], }); }); }); -describe("groupByStable", () => { +describe('groupByStable', () => { const array = [ - { id: 2, name: "two" }, - { id: 4, name: "three" }, - { id: 3, name: "three" }, - { id: 1, name: "one" }, + {id: 2, name: 'two'}, + {id: 4, name: 'three'}, + {id: 3, name: 'three'}, + {id: 1, name: 'one'}, ]; - const result = groupByStable(array, (it) => it.name); + const result = groupByStable(array, it => it.name); - it("should group an array by keys", () => { - expect(result.get("one")).to.deep.equal([{ id: 1, name: "one" }]); - expect(result.get("two")).to.deep.equal([{ id: 2, name: "two" }]); - expect(result.get("three")).to.deep.equal([ - { id: 4, name: "three" }, - { id: 3, name: "three" }, + it('should group an array by keys', () => { + expect(result.get('one')).to.deep.equal([{id: 1, name: 'one'}]); + expect(result.get('two')).to.deep.equal([{id: 2, name: 'two'}]); + expect(result.get('three')).to.deep.equal([ + {id: 4, name: 'three'}, + {id: 3, name: 'three'}, ]); }); - it("should provide ordered keys", () => { + it('should provide ordered keys', () => { // eslint-disable-next-line unicorn/prefer-spread - expect(Array.from(result.keys())).to.deep.equal(["two", "three", "one"]); + expect(Array.from(result.keys())).to.deep.equal(['two', 'three', 'one']); }); }); -describe("groupByProperty", function () { - it("should group by property", () => { +describe('groupByProperty', function () { + it('should group by property', () => { const array = [ - { id: 1, name: "one" }, - { id: 2, name: "two" }, - { id: 3, name: "three" }, - { id: 4, name: "four" }, - { id: 5, name: "five" }, + {id: 1, name: 'one'}, + {id: 2, name: 'two'}, + {id: 3, name: 'three'}, + {id: 4, name: 'four'}, + {id: 5, name: 'five'}, ]; - const result = groupByProperty(array, "name"); + const result = groupByProperty(array, 'name'); expect(result).to.deep.equal({ - one: [{ id: 1, name: "one" }], - two: [{ id: 2, name: "two" }], - three: [{ id: 3, name: "three" }], - four: [{ id: 4, name: "four" }], - five: [{ id: 5, name: "five" }], + one: [{id: 1, name: 'one'}], + two: [{id: 2, name: 'two'}], + three: [{id: 3, name: 'three'}], + four: [{id: 4, name: 'four'}], + five: [{id: 5, name: 'five'}], }); }); }); diff --git a/packages/collection-utils/test/key-by.spec.ts b/packages/collection-utils/test/key-by.spec.ts index 09688b34..77ea068e 100644 --- a/packages/collection-utils/test/key-by.spec.ts +++ b/packages/collection-utils/test/key-by.spec.ts @@ -12,30 +12,30 @@ * You should have received a copy of the GNU General Public License along with * this program. If not, see . */ -import { keyBy } from "../src/key-by.js"; -import { expect } from "chai"; +import {keyBy} from '../src/key-by.js'; +import {expect} from 'chai'; -describe("keyBy", function () { - it("should key objects", function () { +describe('keyBy', function () { + it('should key objects', function () { const objects = [ { id: 1, - name: "foo", + name: 'foo', }, { id: 2, - name: "bar", + name: 'bar', }, ]; - const result = keyBy(objects, (it) => it.id); + const result = keyBy(objects, it => it.id); expect(result).to.deep.equal({ 1: { id: 1, - name: "foo", + name: 'foo', }, 2: { id: 2, - name: "bar", + name: 'bar', }, }); }); diff --git a/packages/collection-utils/test/map-values.spec.ts b/packages/collection-utils/test/map-values.spec.ts index 866ff445..4e968f2d 100644 --- a/packages/collection-utils/test/map-values.spec.ts +++ b/packages/collection-utils/test/map-values.spec.ts @@ -12,18 +12,18 @@ * You should have received a copy of the GNU General Public License along with * this program. If not, see . */ -import { mapValues } from "../src/map-values.js"; -import { expect } from "chai"; +import {mapValues} from '../src/map-values.js'; +import {expect} from 'chai'; -describe("map-values", () => { - it("should map values", () => { +describe('map-values', () => { + it('should map values', () => { const object = { a: 1, b: 2, c: 3, }; - const result = mapValues(object, (value) => value * 2); + const result = mapValues(object, value => value * 2); expect(result).to.deep.equal({ a: 2, @@ -32,14 +32,14 @@ describe("map-values", () => { }); }); - it("should not modify the original object", () => { + it('should not modify the original object', () => { const object = { a: 1, b: 2, c: 3, }; - mapValues(object, (value) => value * 2); + mapValues(object, value => value * 2); expect(object).to.deep.equal({ a: 1, diff --git a/packages/collection-utils/test/min.spec.ts b/packages/collection-utils/test/min.spec.ts index 1b808d57..2d9e4c62 100644 --- a/packages/collection-utils/test/min.spec.ts +++ b/packages/collection-utils/test/min.spec.ts @@ -12,33 +12,33 @@ * You should have received a copy of the GNU General Public License along with * this program. If not, see . */ -import { minBy } from "../src/min.js"; -import { expect } from "chai"; +import {minBy} from '../src/min.js'; +import {expect} from 'chai'; -describe("minBy", function () { - it("should pick the minimum value based on transform", function () { +describe('minBy', function () { + it('should pick the minimum value based on transform', function () { expect( minBy( [ - { id: 1, name: "A" }, - { id: 2, name: "B" }, - { id: 3, name: "C" }, + {id: 1, name: 'A'}, + {id: 2, name: 'B'}, + {id: 3, name: 'C'}, ], - (it) => it.id - ) - ).to.deep.equal({ id: 1, name: "A" }); + it => it.id, + ), + ).to.deep.equal({id: 1, name: 'A'}); }); - it("should not return undefined if there are other choices", function () { + it('should not return undefined if there are other choices', function () { expect( minBy( [ - { id: undefined, name: "B" }, - { id: 1, name: "A" }, - { id: undefined, name: "C" }, + {id: undefined, name: 'B'}, + {id: 1, name: 'A'}, + {id: undefined, name: 'C'}, ], - (it) => it.id - ) - ).to.deep.equal({ id: 1, name: "A" }); + it => it.id, + ), + ).to.deep.equal({id: 1, name: 'A'}); }); }); diff --git a/packages/collection-utils/test/omit.spec.ts b/packages/collection-utils/test/omit.spec.ts index 83124d12..0055edc6 100644 --- a/packages/collection-utils/test/omit.spec.ts +++ b/packages/collection-utils/test/omit.spec.ts @@ -12,13 +12,13 @@ * You should have received a copy of the GNU General Public License along with * this program. If not, see . */ -import { omit } from "../src/omit.js"; -import { expect } from "chai"; +import {omit} from '../src/omit.js'; +import {expect} from 'chai'; -describe("omit", function () { - it("should omit keys", function () { - const object = { a: 1, b: 2, c: 3 }; - const result = omit(object, "a", "c"); - expect(result).to.deep.equal({ b: 2 }); +describe('omit', function () { + it('should omit keys', function () { + const object = {a: 1, b: 2, c: 3}; + const result = omit(object, 'a', 'c'); + expect(result).to.deep.equal({b: 2}); }); }); diff --git a/packages/collection-utils/test/partition.spec.ts b/packages/collection-utils/test/partition.spec.ts index 5182b3e5..c379dd72 100644 --- a/packages/collection-utils/test/partition.spec.ts +++ b/packages/collection-utils/test/partition.spec.ts @@ -12,12 +12,12 @@ * You should have received a copy of the GNU General Public License along with * this program. If not, see . */ -import { partition } from "../src/partition.js"; -import { expect } from "chai"; +import {partition} from '../src/partition.js'; +import {expect} from 'chai'; -describe("partition", function () { - it("should partition an array", function () { - expect(partition([1, 2, 3, 4], (it) => it % 2 === 0)).to.deep.equal([ +describe('partition', function () { + it('should partition an array', function () { + expect(partition([1, 2, 3, 4], it => it % 2 === 0)).to.deep.equal([ [2, 4], [1, 3], ]); diff --git a/packages/collection-utils/test/pick.spec.ts b/packages/collection-utils/test/pick.spec.ts index 9b40ece7..85fd3e9d 100644 --- a/packages/collection-utils/test/pick.spec.ts +++ b/packages/collection-utils/test/pick.spec.ts @@ -12,13 +12,13 @@ * You should have received a copy of the GNU General Public License along with * this program. If not, see . */ -import { pick } from "../src/pick.js"; -import { expect } from "chai"; +import {pick} from '../src/pick.js'; +import {expect} from 'chai'; -describe("pick", function () { - it("should pick properties", function () { - const object = { a: 1, b: 2, c: 3 }; - const result = pick(object, ["a", "c"]); - expect(result).to.deep.equal({ a: 1, c: 3 }); +describe('pick', function () { + it('should pick properties', function () { + const object = {a: 1, b: 2, c: 3}; + const result = pick(object, ['a', 'c']); + expect(result).to.deep.equal({a: 1, c: 3}); }); }); diff --git a/packages/collection-utils/test/shuffle.spec.ts b/packages/collection-utils/test/shuffle.spec.ts index 22682d2e..0dbf9465 100644 --- a/packages/collection-utils/test/shuffle.spec.ts +++ b/packages/collection-utils/test/shuffle.spec.ts @@ -12,18 +12,18 @@ * You should have received a copy of the GNU General Public License along with * this program. If not, see . */ -import { shuffle } from "../src/shuffle.js"; -import { expect } from "chai"; +import {shuffle} from '../src/shuffle.js'; +import {expect} from 'chai'; -describe("shuffle", function () { - it("should shuffle an array", function () { +describe('shuffle', function () { + it('should shuffle an array', function () { const array = [1, 2, 3, 4, 5, 6, 7, 8, 9, 10]; const shuffled = shuffle(array); expect(shuffled).not.to.deep.equal(array); expect(shuffled).to.contain.members(array); }); - it("should not modify the original array", function () { + it('should not modify the original array', function () { const array = [1, 2, 3, 4, 5, 6, 7, 8, 9, 10]; shuffle(array); expect(array).to.deep.equal([1, 2, 3, 4, 5, 6, 7, 8, 9, 10]); diff --git a/packages/collection-utils/test/string-sort.spec.ts b/packages/collection-utils/test/string-sort.spec.ts index 817bb8af..053b8167 100644 --- a/packages/collection-utils/test/string-sort.spec.ts +++ b/packages/collection-utils/test/string-sort.spec.ts @@ -12,31 +12,19 @@ * You should have received a copy of the GNU General Public License along with * this program. If not, see . */ -import { stringSort, stringSortBy } from "../src/string-sort.js"; -import { expect } from "chai"; +import {stringSort, stringSortBy} from '../src/string-sort.js'; +import {expect} from 'chai'; -describe("stringSort", () => { - it("should sort an array of strings", () => { - expect(["a", "c", "b", "d"].sort(stringSort)).to.deep.equal([ - "a", - "b", - "c", - "d", - ]); +describe('stringSort', () => { + it('should sort an array of strings', () => { + expect(['a', 'c', 'b', 'd'].sort(stringSort)).to.deep.equal(['a', 'b', 'c', 'd']); }); }); -describe("stringSortBy", () => { - it("should sort an array of strings", () => { +describe('stringSortBy', () => { + it('should sort an array of strings', () => { expect( - [{ item: "a" }, { item: "c" }, { item: "b" }, { item: "d" }].sort( - stringSortBy((it) => it.item) - ) - ).to.deep.equal([ - { item: "a" }, - { item: "b" }, - { item: "c" }, - { item: "d" }, - ]); + [{item: 'a'}, {item: 'c'}, {item: 'b'}, {item: 'd'}].sort(stringSortBy(it => it.item)), + ).to.deep.equal([{item: 'a'}, {item: 'b'}, {item: 'c'}, {item: 'd'}]); }); }); diff --git a/packages/collection-utils/test/sum.spec.ts b/packages/collection-utils/test/sum.spec.ts index 952f26b4..19fdea97 100644 --- a/packages/collection-utils/test/sum.spec.ts +++ b/packages/collection-utils/test/sum.spec.ts @@ -12,21 +12,21 @@ * You should have received a copy of the GNU General Public License along with * this program. If not, see . */ -import { expect } from "chai"; -import { sum, sumBy } from "../src/sum.js"; +import {expect} from 'chai'; +import {sum, sumBy} from '../src/sum.js'; -describe("sum", () => { - it("should return the sum of all elements in the collection", () => { +describe('sum', () => { + it('should return the sum of all elements in the collection', () => { const collection = [1, 2, 3, 4, 5]; const result = sum(collection); expect(result).to.equal(15); }); }); -describe("sumBy", function () { - it("should return the sum of all elements in the collection", () => { - const collection = [{ a: 1 }, { a: 2 }, { a: 3 }, { a: 4 }, { a: 5 }]; - const result = sumBy(collection, (it) => it.a); +describe('sumBy', function () { + it('should return the sum of all elements in the collection', () => { + const collection = [{a: 1}, {a: 2}, {a: 3}, {a: 4}, {a: 5}]; + const result = sumBy(collection, it => it.a); expect(result).to.equal(15); }); }); diff --git a/packages/collection-utils/test/tree-group.spec.ts b/packages/collection-utils/test/tree-group.spec.ts index 3232b24b..de759a30 100644 --- a/packages/collection-utils/test/tree-group.spec.ts +++ b/packages/collection-utils/test/tree-group.spec.ts @@ -12,34 +12,34 @@ * You should have received a copy of the GNU General Public License along with * this program. If not, see . */ -import { expect } from "chai"; -import { Tree, treeGroupBy } from "../src/tree-group.js"; +import {expect} from 'chai'; +import {Tree, treeGroupBy} from '../src/tree-group.js'; interface TestItem { id: number; path?: string[]; } -describe("tree-group", function () { - it("should create a tree", function () { +describe('tree-group', function () { + it('should create a tree', function () { const items: Array = [ { id: 1, - path: ["a", "b", "c"], + path: ['a', 'b', 'c'], }, { id: 2, - path: ["a", "b", "d"], + path: ['a', 'b', 'd'], }, ]; - const tree = treeGroupBy(items, (item) => item.path ?? []); + const tree = treeGroupBy(items, item => item.path ?? []); const expectedTree: Tree = { a: { b: { - c: { _: [items[0]] }, - d: { _: [items[1]] }, + c: {_: [items[0]]}, + d: {_: [items[1]]}, } as Tree, } as Tree, } as Tree; @@ -47,23 +47,23 @@ describe("tree-group", function () { expect(tree).to.deep.equal(expectedTree); }); - it("should also sort empty paths", () => { + it('should also sort empty paths', () => { const items: Array = [ { id: 1, - path: ["a", "b", "c"], + path: ['a', 'b', 'c'], }, { id: 2, }, ]; - const tree = treeGroupBy(items, (item) => item.path ?? []); + const tree = treeGroupBy(items, item => item.path ?? []); const expectedTree: Tree = { a: { b: { - c: { _: [items[0]] }, + c: {_: [items[0]]}, } as Tree, } as Tree, _: [items[1]], diff --git a/packages/collection-utils/test/uniq.spec.ts b/packages/collection-utils/test/uniq.spec.ts index 32197e5c..a6cce2f8 100644 --- a/packages/collection-utils/test/uniq.spec.ts +++ b/packages/collection-utils/test/uniq.spec.ts @@ -12,15 +12,13 @@ * You should have received a copy of the GNU General Public License along with * this program. If not, see . */ -import { expect } from "chai"; -import { uniqBy } from "../src/uniq.js"; +import {expect} from 'chai'; +import {uniqBy} from '../src/uniq.js'; -describe("uniq", function () { - it("should return an array with unique values", function () { - const array = [ - 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, - ]; - const result = uniqBy(array, (it) => it); +describe('uniq', function () { + it('should return an array with unique values', function () { + const array = [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10]; + const result = uniqBy(array, it => it); expect(result).to.deep.equal([1, 2, 3, 4, 5, 6, 7, 8, 9, 10]); }); }); diff --git a/packages/collection-utils/test/zip.spec.ts b/packages/collection-utils/test/zip.spec.ts index 51f5396b..246c83f7 100644 --- a/packages/collection-utils/test/zip.spec.ts +++ b/packages/collection-utils/test/zip.spec.ts @@ -12,11 +12,11 @@ * You should have received a copy of the GNU General Public License along with * this program. If not, see . */ -import { expect } from "chai"; -import { zip } from "../src/zip.js"; +import {expect} from 'chai'; +import {zip} from '../src/zip.js'; -describe("zip", function () { - it("should zip arrays together", function () { +describe('zip', function () { + it('should zip arrays together', function () { expect(zip([1, 2, 3], [4, 5, 6])).to.deep.equal([ [1, 4], [2, 5], diff --git a/packages/collection-utils/tsconfig.json b/packages/collection-utils/tsconfig.json index 066a5f38..579a39ff 100644 --- a/packages/collection-utils/tsconfig.json +++ b/packages/collection-utils/tsconfig.json @@ -1,3 +1,3 @@ { - "extends": "./node_modules/@openstapps/configuration/tsconfig.json" + "extends": "@openstapps/tsconfig" } diff --git a/packages/core-tools/.editorconfig b/packages/core-tools/.editorconfig deleted file mode 100644 index 9a4062a7..00000000 --- a/packages/core-tools/.editorconfig +++ /dev/null @@ -1,15 +0,0 @@ -# editorconfig.org - -root = true - -[*] -indent_style = space -indent_size = 2 - -end_of_line = lf -charset = utf-8 -trim_trailing_whitespace = true -insert_final_newline = true - -[*.md] -trim_trailing_whitespace = false diff --git a/packages/core-tools/.eslintignore b/packages/core-tools/.eslintignore deleted file mode 100644 index 3d0a9346..00000000 --- a/packages/core-tools/.eslintignore +++ /dev/null @@ -1,2 +0,0 @@ -resources -openapi diff --git a/packages/core-tools/.eslintrc.json b/packages/core-tools/.eslintrc.json deleted file mode 100644 index 31d47702..00000000 --- a/packages/core-tools/.eslintrc.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "extends": "@openstapps" -} diff --git a/packages/core-tools/.gitlab-ci.yml b/packages/core-tools/.gitlab-ci.yml index 75298265..003f34b0 100644 --- a/packages/core-tools/.gitlab-ci.yml +++ b/packages/core-tools/.gitlab-ci.yml @@ -1,6 +1,5 @@ image: registry.gitlab.com/openstapps/projectmanagement/node - before_script: - npm ci diff --git a/packages/core-tools/.gitlab/issue_templates/bug.md b/packages/core-tools/.gitlab/issue_templates/bug.md index f46f50ae..4ef365a8 100644 --- a/packages/core-tools/.gitlab/issue_templates/bug.md +++ b/packages/core-tools/.gitlab/issue_templates/bug.md @@ -2,35 +2,29 @@ (Summarize the bug encountered concisely) - ## Steps to reproduce (How one can reproduce the issue - this is very important) - ## Example Project (If possible, please create an example project here on GitLab.com that exhibits the problematic behaviour, and link to it here in the bug report) (If you are using an older version of GitLab, this will also determine whether the bug has been fixed in a more recent version) - ## What is the current bug behavior? (What actually happens) - ## What is the expected correct behavior? (What you should see instead) - ## Relevant logs and/or screenshots (Paste any relevant logs - please use code blocks (```) to format console output, logs, and code as it's very hard to read otherwise.) - ## Possible fixes (If you can, link to the line of code that might be responsible for the problem) diff --git a/packages/core-tools/.gitlab/issue_templates/feature.md b/packages/core-tools/.gitlab/issue_templates/feature.md index cb9b0517..e80ae1df 100644 --- a/packages/core-tools/.gitlab/issue_templates/feature.md +++ b/packages/core-tools/.gitlab/issue_templates/feature.md @@ -2,15 +2,12 @@ (Describe the feature that you're requesting concisely) - ## Explanation (Explain why the feature is necessary) - ## Dependencies, issues to be resolved beforehand (List issues or dependencies that need to be resolved before this feature can be implemented) - /label ~meeting diff --git a/packages/core-tools/CHANGELOG.md b/packages/core-tools/CHANGELOG.md index fac74996..7bd98405 100644 --- a/packages/core-tools/CHANGELOG.md +++ b/packages/core-tools/CHANGELOG.md @@ -1,353 +1,228 @@ # [0.34.0](https://gitlab.com/openstapps/core-tools/compare/v0.33.0...v0.34.0) (2023-01-30) - - # [0.33.0](https://gitlab.com/openstapps/core-tools/compare/v0.32.0...v0.33.0) (2023-01-12) - ### Bug Fixes -* convert schema glob path to posix path ([c3d66b3](https://gitlab.com/openstapps/core-tools/commit/c3d66b36c8b4bdf84b3e23cd0ab8318d3fd068f9)) - - +- convert schema glob path to posix path ([c3d66b3](https://gitlab.com/openstapps/core-tools/commit/c3d66b36c8b4bdf84b3e23cd0ab8318d3fd068f9)) # [0.32.0](https://gitlab.com/openstapps/core-tools/compare/v0.31.0...v0.32.0) (2022-08-17) - ### Bug Fixes -* documentation not beeing generated ([51ae246](https://gitlab.com/openstapps/core-tools/commit/51ae246a0fd10144cf6af348bc7ded88e6dab27a)) - - +- documentation not beeing generated ([51ae246](https://gitlab.com/openstapps/core-tools/commit/51ae246a0fd10144cf6af348bc7ded88e6dab27a)) # [0.31.0](https://gitlab.com/openstapps/core-tools/compare/v0.30.1...v0.31.0) (2022-06-27) - - ## [0.30.1](https://gitlab.com/openstapps/core-tools/compare/v0.30.0...v0.30.1) (2022-05-27) - - # [0.30.0](https://gitlab.com/openstapps/core-tools/compare/v0.29.1...v0.30.0) (2022-04-04) - - ## [0.29.1](https://gitlab.com/openstapps/core-tools/compare/v0.29.0...v0.29.1) (2022-03-21) - - # [0.29.0](https://gitlab.com/openstapps/core-tools/compare/v0.28.0...v0.29.0) (2022-01-25) - - # [0.28.0](https://gitlab.com/openstapps/core-tools/compare/v0.27.0...v0.28.0) (2021-12-17) - ### Bug Fixes -* ajv related tranistive build errors ([e82f4e9](https://gitlab.com/openstapps/core-tools/commit/e82f4e92099359baed5ea89f64bd7204700c2785)) - - +- ajv related tranistive build errors ([e82f4e9](https://gitlab.com/openstapps/core-tools/commit/e82f4e92099359baed5ea89f64bd7204700c2785)) # [0.27.0](https://gitlab.com/openstapps/core-tools/compare/v0.26.0...v0.27.0) (2021-12-15) - - # [0.26.0](https://gitlab.com/openstapps/core-tools/compare/v0.25.0...v0.26.0) (2021-12-15) - - # [0.25.0](https://gitlab.com/openstapps/core-tools/compare/v0.24.3...v0.25.0) (2021-08-31) - ### Bug Fixes -* generate schemas for type aliases ([96e3acf](https://gitlab.com/openstapps/core-tools/commit/96e3acf9ba330c3414eb1e38b347ca9e597fee88)) - - +- generate schemas for type aliases ([96e3acf](https://gitlab.com/openstapps/core-tools/commit/96e3acf9ba330c3414eb1e38b347ca9e597fee88)) ## [0.24.3](https://gitlab.com/openstapps/core-tools/compare/v0.24.2...v0.24.3) (2021-08-27) - ### Bug Fixes -* add cruical Converter ceation option ([f82b465](https://gitlab.com/openstapps/core-tools/commit/f82b4652637808abf68f1e72b1de0c76b228457a)) - - +- add cruical Converter ceation option ([f82b465](https://gitlab.com/openstapps/core-tools/commit/f82b4652637808abf68f1e72b1de0c76b228457a)) ## [0.24.2](https://gitlab.com/openstapps/core-tools/compare/v0.24.1...v0.24.2) (2021-08-25) - - ## [0.24.1](https://gitlab.com/openstapps/core-tools/compare/v0.24.0...v0.24.1) (2021-08-25) - - # [0.24.0](https://gitlab.com/openstapps/core-tools/compare/v0.23.2...v0.24.0) (2021-08-25) - ### Features -* modernize core-tools ([fe59204](https://gitlab.com/openstapps/core-tools/commit/fe59204b4210831b15445fa9aa7dbc20de75e96d)) - - +- modernize core-tools ([fe59204](https://gitlab.com/openstapps/core-tools/commit/fe59204b4210831b15445fa9aa7dbc20de75e96d)) ## [0.23.2](https://gitlab.com/openstapps/core-tools/compare/v0.23.0...v0.23.2) (2021-08-02) - ### Bug Fixes -* rollback ajv version to 6.12.6 ([7a5d2bb](https://gitlab.com/openstapps/core-tools/commit/7a5d2bb1e98b41d1143fbfe21b29e3aef2133c8f)) - - +- rollback ajv version to 6.12.6 ([7a5d2bb](https://gitlab.com/openstapps/core-tools/commit/7a5d2bb1e98b41d1143fbfe21b29e3aef2133c8f)) # [0.23.0](https://gitlab.com/openstapps/core-tools/compare/v0.22.0...v0.23.0) (2021-07-21) - ### Features -* replace route markdown with openapi ([f4bf7ab](https://gitlab.com/openstapps/core-tools/commit/f4bf7abc895f87a57fa34b2269311809f2a9413d)) - - +- replace route markdown with openapi ([f4bf7ab](https://gitlab.com/openstapps/core-tools/commit/f4bf7abc895f87a57fa34b2269311809f2a9413d)) # [0.22.0](https://gitlab.com/openstapps/core-tools/compare/v0.21.0...v0.22.0) (2021-07-07) - ### Bug Fixes -* fix inherited properties not working correctly ([f20038c](https://gitlab.com/openstapps/core-tools/commit/f20038c8f9a37424fd7a95484e744e0c672f5cfb)) - - +- fix inherited properties not working correctly ([f20038c](https://gitlab.com/openstapps/core-tools/commit/f20038c8f9a37424fd7a95484e744e0c672f5cfb)) # [0.21.0](https://gitlab.com/openstapps/core-tools/compare/v0.20.0...v0.21.0) (2021-05-12) - ### Features -* add support for non-external premaps ([7429806](https://gitlab.com/openstapps/core-tools/commit/74298065e0386c8e4646e565e5e383b5ae08dfaa)) - - +- add support for non-external premaps ([7429806](https://gitlab.com/openstapps/core-tools/commit/74298065e0386c8e4646e565e5e383b5ae08dfaa)) # [0.20.0](https://gitlab.com/openstapps/core-tools/compare/v0.19.0...v0.20.0) (2021-04-26) - ### Features -* add filterable annotation option for integer ([7ba8233](https://gitlab.com/openstapps/core-tools/commit/7ba8233f5b81f4ab3c3aeec2c8a47a7bad3ae502)) - - +- add filterable annotation option for integer ([7ba8233](https://gitlab.com/openstapps/core-tools/commit/7ba8233f5b81f4ab3c3aeec2c8a47a7bad3ae502)) # [0.19.0](https://gitlab.com/openstapps/core-tools/compare/v0.18.0...v0.19.0) (2021-04-06) - - # [0.18.0](https://gitlab.com/openstapps/core-tools/compare/v0.17.0...v0.18.0) (2021-03-24) - ### Features -* make Point type sortable in Elasticsearch ([724a686](https://gitlab.com/openstapps/core-tools/commit/724a6866c80a544dec4ce11d70d648bd724f9aba)) - - +- make Point type sortable in Elasticsearch ([724a686](https://gitlab.com/openstapps/core-tools/commit/724a6866c80a544dec4ce11d70d648bd724f9aba)) # [0.17.0](https://gitlab.com/openstapps/core-tools/compare/v0.16.0...v0.17.0) (2020-12-02) - ### Features -* add support for [@inherit](https://gitlab.com/inherit)Tags ([485430b](https://gitlab.com/openstapps/core-tools/commit/485430b7f27fb9c751a6f5697e74eb5531ac7889)) -* add support for date mapping ([a09be1d](https://gitlab.com/openstapps/core-tools/commit/a09be1d941df88826ccaa8aa468680ece29d35a5)) - - +- add support for [@inherit](https://gitlab.com/inherit)Tags ([485430b](https://gitlab.com/openstapps/core-tools/commit/485430b7f27fb9c751a6f5697e74eb5531ac7889)) +- add support for date mapping ([a09be1d](https://gitlab.com/openstapps/core-tools/commit/a09be1d941df88826ccaa8aa468680ece29d35a5)) # [0.16.0](https://gitlab.com/openstapps/core-tools/compare/v0.15.0...v0.16.0) (2020-10-28) - ### Bug Fixes -* use value type in IndexSignature type instead of key type ([b7cdb6a](https://gitlab.com/openstapps/core-tools/commit/b7cdb6a9ad2bdb1fc09d0f535daf4ec778501fec)) - - +- use value type in IndexSignature type instead of key type ([b7cdb6a](https://gitlab.com/openstapps/core-tools/commit/b7cdb6a9ad2bdb1fc09d0f535daf4ec778501fec)) # [0.15.0](https://gitlab.com/openstapps/core-tools/compare/v0.14.0...v0.15.0) (2020-10-05) - ### Bug Fixes -* array tags did not propagate ([e5511d0](https://gitlab.com/openstapps/core-tools/commit/e5511d07386e93b032b5dbefa3e6cc46c07219ed)) - - +- array tags did not propagate ([e5511d0](https://gitlab.com/openstapps/core-tools/commit/e5511d07386e93b032b5dbefa3e6cc46c07219ed)) # [0.14.0](https://gitlab.com/openstapps/core-tools/compare/v0.13.0...v0.14.0) (2020-02-11) - - # [0.13.0](https://gitlab.com/openstapps/core-tools/compare/v0.12.0...v0.13.0) (2020-01-28) - - # [0.12.0](https://gitlab.com/openstapps/core-tools/compare/v0.11.0...v0.12.0) (2019-12-03) - ### Bug Fixes -* make fields with index signatures a dynamic mapping ([8f5570e](https://gitlab.com/openstapps/core-tools/commit/8f5570e2e2d350d6153b34f940f4cd5c407b5bc9)) - - +- make fields with index signatures a dynamic mapping ([8f5570e](https://gitlab.com/openstapps/core-tools/commit/8f5570e2e2d350d6153b34f940f4cd5c407b5bc9)) # [0.11.0](https://gitlab.com/openstapps/core-tools/compare/v0.10.0...v0.11.0) (2019-11-12) - ### Bug Fixes -* use .raw field for aggregations ([4c1a374](https://gitlab.com/openstapps/core-tools/commit/4c1a374a9ee266884bd33e8a3b3f52fcef8f4019)) - - +- use .raw field for aggregations ([4c1a374](https://gitlab.com/openstapps/core-tools/commit/4c1a374a9ee266884bd33e8a3b3f52fcef8f4019)) # [0.10.0](https://gitlab.com/openstapps/core-tools/compare/v0.9.0...v0.10.0) (2019-11-08) - ### Bug Fixes -* make mapping of generics work correctly ([8f7201e](https://gitlab.com/openstapps/core-tools/commit/8f7201e2cf010ed9ef457d9cf938167a4e970963)), closes [#27](https://gitlab.com/openstapps/core-tools/issues/27) -* make mapping tags work for overwritten values ([47361d4](https://gitlab.com/openstapps/core-tools/commit/47361d412a92ae34dc1b81298402d6b441b4f4ba)) - +- make mapping of generics work correctly ([8f7201e](https://gitlab.com/openstapps/core-tools/commit/8f7201e2cf010ed9ef457d9cf938167a4e970963)), closes [#27](https://gitlab.com/openstapps/core-tools/issues/27) +- make mapping tags work for overwritten values ([47361d4](https://gitlab.com/openstapps/core-tools/commit/47361d412a92ae34dc1b81298402d6b441b4f4ba)) ### Features -* generate aggreations from annotations in the core ([18ad651](https://gitlab.com/openstapps/core-tools/commit/18ad651286bafcbc929e14ee9429c7b852d86f3b)) - - +- generate aggreations from annotations in the core ([18ad651](https://gitlab.com/openstapps/core-tools/commit/18ad651286bafcbc929e14ee9429c7b852d86f3b)) # [0.9.0](https://gitlab.com/openstapps/core-tools/compare/v0.8.0...v0.9.0) (2019-09-10) - ### Bug Fixes -* read type tags correctly after the first time ([77e4914](https://gitlab.com/openstapps/core-tools/commit/77e49146c0619566919815bd5d63ddf34dc19387)) - +- read type tags correctly after the first time ([77e4914](https://gitlab.com/openstapps/core-tools/commit/77e49146c0619566919815bd5d63ddf34dc19387)) ### Features -* add support for [@filterable](https://gitlab.com/filterable) tag ([36bf17e](https://gitlab.com/openstapps/core-tools/commit/36bf17e3236a555e6d1193466141be880b280db9)) - - +- add support for [@filterable](https://gitlab.com/filterable) tag ([36bf17e](https://gitlab.com/openstapps/core-tools/commit/36bf17e3236a555e6d1193466141be880b280db9)) # [0.8.0](https://gitlab.com/openstapps/core-tools/compare/v0.7.0...v0.8.0) (2019-07-25) - ### Bug Fixes -* apply stricter tslint rules ([967f946](https://gitlab.com/openstapps/core-tools/commit/967f94652723d8589b7f272454185449233ac838)) -* emend the imports in the test files ([53e8047](https://gitlab.com/openstapps/core-tools/commit/53e80476c85027194cf406ad87fe8950d6c2f3a8)) -* remove duplicate job ([af904a7](https://gitlab.com/openstapps/core-tools/commit/af904a7a05de56cdef6aea136a7e3bb237c4beb2)) -* update the uml job to use our node image ([a478715](https://gitlab.com/openstapps/core-tools/commit/a478715d8045dd26cd345ba3cbb469fda651b84f)) - +- apply stricter tslint rules ([967f946](https://gitlab.com/openstapps/core-tools/commit/967f94652723d8589b7f272454185449233ac838)) +- emend the imports in the test files ([53e8047](https://gitlab.com/openstapps/core-tools/commit/53e80476c85027194cf406ad87fe8950d6c2f3a8)) +- remove duplicate job ([af904a7](https://gitlab.com/openstapps/core-tools/commit/af904a7a05de56cdef6aea136a7e3bb237c4beb2)) +- update the uml job to use our node image ([a478715](https://gitlab.com/openstapps/core-tools/commit/a478715d8045dd26cd345ba3cbb469fda651b84f)) ### Features -* add automatic mapping generation ([7b198f9](https://gitlab.com/openstapps/core-tools/commit/7b198f95ce7bbd75454247e70757d34af462cefc)), closes [#6](https://gitlab.com/openstapps/core-tools/issues/6) -* add the uml generator ([0f21da4](https://gitlab.com/openstapps/core-tools/commit/0f21da4a92b4e0ef11a5f274468d3679fc9784ee)) -* added output file name for uml generation ([843e598](https://gitlab.com/openstapps/core-tools/commit/843e59811a5a104df1c746627aa668d26fdc9f60)) - - +- add automatic mapping generation ([7b198f9](https://gitlab.com/openstapps/core-tools/commit/7b198f95ce7bbd75454247e70757d34af462cefc)), closes [#6](https://gitlab.com/openstapps/core-tools/issues/6) +- add the uml generator ([0f21da4](https://gitlab.com/openstapps/core-tools/commit/0f21da4a92b4e0ef11a5f274468d3679fc9784ee)) +- added output file name for uml generation ([843e598](https://gitlab.com/openstapps/core-tools/commit/843e59811a5a104df1c746627aa668d26fdc9f60)) # [0.7.0](https://gitlab.com/openstapps/core-tools/compare/v0.6.0...v0.7.0) (2019-06-24) - - # [0.6.0](https://gitlab.com/openstapps/core-tools/compare/v0.5.1...v0.6.0) (2019-04-16) - - ## [0.5.1](https://gitlab.com/openstapps/core-tools/compare/v0.5.0...v0.5.1) (2019-04-09) - - # [0.5.0](https://gitlab.com/openstapps/core-tools/compare/v0.4.0...v0.5.0) (2019-04-09) - - # [0.4.0](https://gitlab.com/openstapps/core-tools/compare/v0.3.0...v0.4.0) (2019-04-03) - ### Features -* add feature to validate schemas directly ([1022150](https://gitlab.com/openstapps/core-tools/commit/1022150ca3d2af846b819e0e0e46ead71134d5f8)) -* adjust generation of route documentation ([d3ce936](https://gitlab.com/openstapps/core-tools/commit/d3ce936626751f24f20081403271d77e2c346e03)), closes [#12](https://gitlab.com/openstapps/core-tools/issues/12) - - +- add feature to validate schemas directly ([1022150](https://gitlab.com/openstapps/core-tools/commit/1022150ca3d2af846b819e0e0e46ead71134d5f8)) +- adjust generation of route documentation ([d3ce936](https://gitlab.com/openstapps/core-tools/commit/d3ce936626751f24f20081403271d77e2c346e03)), closes [#12](https://gitlab.com/openstapps/core-tools/issues/12) # [0.3.0](https://gitlab.com/openstapps/core-tools/compare/v0.2.1...v0.3.0) (2019-02-06) - ### Features -* ensure correct path for input files ([1c74432](https://gitlab.com/openstapps/core-tools/commit/1c744328eb03dc8019fe6dc3a309f68260210146)) - - +- ensure correct path for input files ([1c74432](https://gitlab.com/openstapps/core-tools/commit/1c744328eb03dc8019fe6dc3a309f68260210146)) ## [0.2.1](https://gitlab.com/openstapps/core-tools/compare/v0.2.0...v0.2.1) (2019-01-30) - ### Bug Fixes -* add SC prefix to the camel cased type of the instance ([e559234](https://gitlab.com/openstapps/core-tools/commit/e559234cea9ef245733f8117ab4a27e83db54e14)) -* use tsconfig.json of project for schema generation ([6b1a420](https://gitlab.com/openstapps/core-tools/commit/6b1a4202f92759c9ef36d32d0960faf4f56cc8db)), closes [#10](https://gitlab.com/openstapps/core-tools/issues/10) - +- add SC prefix to the camel cased type of the instance ([e559234](https://gitlab.com/openstapps/core-tools/commit/e559234cea9ef245733f8117ab4a27e83db54e14)) +- use tsconfig.json of project for schema generation ([6b1a420](https://gitlab.com/openstapps/core-tools/commit/6b1a4202f92759c9ef36d32d0960faf4f56cc8db)), closes [#10](https://gitlab.com/openstapps/core-tools/issues/10) ### Features -* add function to find tsconfig.json ([aa645a2](https://gitlab.com/openstapps/core-tools/commit/aa645a2cc4661c58c6050196ee1944dfd9e5eea8)) - - +- add function to find tsconfig.json ([aa645a2](https://gitlab.com/openstapps/core-tools/commit/aa645a2cc4661c58c6050196ee1944dfd9e5eea8)) # [0.2.0](https://gitlab.com/openstapps/core-tools/compare/v0.1.1...v0.2.0) (2019-01-21) - ### Features -* add pack script ([7438465](https://gitlab.com/openstapps/core-tools/commit/7438465149b591ebf1583a8bd6b9da56aa9c9f57)), closes [#4](https://gitlab.com/openstapps/core-tools/issues/4) - - +- add pack script ([7438465](https://gitlab.com/openstapps/core-tools/commit/7438465149b591ebf1583a8bd6b9da56aa9c9f57)), closes [#4](https://gitlab.com/openstapps/core-tools/issues/4) ## [0.1.1](https://gitlab.com/openstapps/core-tools/compare/v0.1.0...v0.1.1) (2019-01-14) - ### Bug Fixes -* add missing dependency typedoc ([b248d1b](https://gitlab.com/openstapps/core-tools/commit/b248d1b5e0306247ce35e5c9d45637b0f3f83cac)), closes [#5](https://gitlab.com/openstapps/core-tools/issues/5) - - +- add missing dependency typedoc ([b248d1b](https://gitlab.com/openstapps/core-tools/commit/b248d1b5e0306247ce35e5c9d45637b0f3f83cac)), closes [#5](https://gitlab.com/openstapps/core-tools/issues/5) # [0.1.0](https://gitlab.com/openstapps/core-tools/compare/v0.0.3...v0.1.0) (2019-01-08) - ### Features -* validate generated schemas ([7b7299d](https://gitlab.com/openstapps/core-tools/commit/7b7299d9c475105f9d2387c9dc31974139997483)), closes [#1](https://gitlab.com/openstapps/core-tools/issues/1) - - +- validate generated schemas ([7b7299d](https://gitlab.com/openstapps/core-tools/commit/7b7299d9c475105f9d2387c9dc31974139997483)), closes [#1](https://gitlab.com/openstapps/core-tools/issues/1) ## [0.0.3](https://gitlab.com/openstapps/core-tools/compare/v0.0.2...v0.0.3) (2018-12-18) - ### Bug Fixes -* do not ignore resources ([6502bcf](https://gitlab.com/openstapps/core-tools/commit/6502bcf2b517ab98909626a7b8baa08e7cdcdc3e)) - - +- do not ignore resources ([6502bcf](https://gitlab.com/openstapps/core-tools/commit/6502bcf2b517ab98909626a7b8baa08e7cdcdc3e)) ## [0.0.2](https://gitlab.com/openstapps/core-tools/compare/v0.0.1...v0.0.2) (2018-12-18) - - ## [0.0.1](https://gitlab.com/openstapps/core-tools/compare/1ac90ef6330bcfd0ea362505a11db66453f3386f...v0.0.1) (2018-12-18) - ### Features -* add core tools ([1ac90ef](https://gitlab.com/openstapps/core-tools/commit/1ac90ef6330bcfd0ea362505a11db66453f3386f)) - - - +- add core tools ([1ac90ef](https://gitlab.com/openstapps/core-tools/commit/1ac90ef6330bcfd0ea362505a11db66453f3386f)) diff --git a/packages/core-tools/README.md b/packages/core-tools/README.md index a99b3e33..bac5c9bd 100644 --- a/packages/core-tools/README.md +++ b/packages/core-tools/README.md @@ -30,6 +30,7 @@ openstapps-core-tools schema ``` where: + - `` is path to the project (where used `*.ts` files are, e.g. `src/core`, - `` is directory to save output files to, e.g. `lib/schema`. @@ -45,14 +46,6 @@ Inside of a script in `package.json` or if the npm package is installed globally openstapps-core-tools schema src/core lib/schema ``` -## What is Easy AST? - -Easy [AST](https://en.wikipedia.org/wiki/Abstract_syntax_tree) is a "wrapper" around the TypeScript Compiler API. The TS Compiler API is built for many -much more complex things than just accessing type declarations, and thus comes with a ton of -bloat that makes it really difficult to work with. - -This is why we built the Easy AST, which converts the TS representation to a really easy and -lightweight structure, that removes a lot of the stuff you wouldn't really need. ## How to use the validator? @@ -65,7 +58,7 @@ import {ValidatorResult} from 'jsonschema'; import {join} from 'path'; const objectToValidate: SCDish = { -type: SCThingType.Dish, + type: SCThingType.Dish, // more properties }; @@ -95,6 +88,7 @@ Your basic JSON object: ``` JSON for validateFiles: + ```json { "errorNames": [], @@ -120,6 +114,7 @@ openstapps-core-tools validate [reportPath] ``` where: + - `` is a directory where JSON schema files are, e.g. `lib/schema`, - `` is a directory where test files are, e.g. `src/test/resources`, - `[reportPath]` is a file where the HTML report of the validation will be saved to, e.g. `report.html` (optional argument - if it's not provided no report will be written). @@ -144,14 +139,6 @@ To generate a openapi JSON file that represents the routes according to openapi openstapps-core-tools openapi PATH/TO/CORE/lib PATH/TO/PUT/FILES/TO ``` -## Pack definitions and implementations - -To pack all the different files into two distribution files - one for definitions/one for implementations - use the following command: - -```shell -openstapps-core-tools pack -``` - ## How to use the UML generator The UML Generator generates PlantUML from the project reflection of the source files. By default it will include externals, which will take considerably longer to execute, you can disable this behaviour via an option. It can help you to visually explore the data model or document a specific part. @@ -202,7 +189,8 @@ The plantuml code is persisted inside the generated file at the very bottom. You openstapps-core-tools plantuml-file /PATH/TO/Project.plantuml http://PLANTUMLSERVER OptionalCustomFileName ``` -Example-File-Content of Project.plantuml +Example-File-Content of Project.plantuml + ``` @startuml interface MyClass{ diff --git a/packages/core-tools/app.js b/packages/core-tools/app.js index d233e644..5ca3fea3 100644 --- a/packages/core-tools/app.js +++ b/packages/core-tools/app.js @@ -1,2 +1,2 @@ #!/usr/bin/env node -import './lib/cli.js' +import './lib/app.js'; diff --git a/packages/core-tools/package.json b/packages/core-tools/package.json index 9e481c98..a478e6a7 100644 --- a/packages/core-tools/package.json +++ b/packages/core-tools/package.json @@ -13,41 +13,43 @@ "Rainer Killinger ", "Thea Schöbl " ], - "prettier": "@openstapps", + "keywords": [ + "StApps", + "StAppsCore", + "converter", + "core", + "validator" + ], "main": "./lib/index.js", "types": "./lib/index.d.ts", "bin": { "openstapps-core-tools": "app.js" }, "scripts": { - "build": "rimraf lib && tsc", - "changelog": "conventional-changelog -p angular -i CHANGELOG.md -s -r 0 && git add CHANGELOG.md", - "check-configuration": "openstapps-configuration", - "documentation": "typedoc --out docs --readme README.md --includeVersion --validation.invalidLink true --entryPointStrategy expand src", - "lint": "eslint -c .eslintrc.json --ignore-path .eslintignore --ext .ts src/", - "lint:fix": "eslint --fix -c .eslintrc.json --ignore-path .eslintignore --ext .ts src/", + "build": "tsup --dts", + "format": "prettier .", + "format:fix": "prettier --write .", + "lint": "eslint --ext .ts src/", + "lint:fix": "eslint --fix --ext .ts src/", "plantuml-restart": "docker restart plantuml-server", "plantuml-start": "docker run --name plantuml-server -d -p 8080:8080 registry.gitlab.com/openstapps/core-tools:latest", "plantuml-stop": "docker stop plantuml-server", - "prepublishOnly": "npm ci && npm run build", - "preversion": "npm run prepublishOnly", - "push": "git push && git push origin \"v$npm_package_version\"", - "test": "mocha --require ts-node/register test/*.spec.ts", - "version": "npm run changelog" + "test": "nyc mocha 'test/**/*.spec.ts'" }, "dependencies": { "@openstapps/collection-utils": "workspace:*", "@openstapps/logger": "workspace:*", + "@openstapps/easy-ast": "workspace:*", "ajv": "8.12.0", "better-ajv-errors": "1.2.0", "chai": "4.3.7", "commander": "10.0.0", - "deepmerge": "4.3.0", + "deepmerge": "4.3.1", "del": "6.1.1", "eslint": "8.33.0", "flatted": "3.2.7", "fs-extra": "10.1.0", - "glob": "8.1.0", + "glob": "10.2.1", "got": "12.6.0", "humanize-string": "3.0.0", "json-schema": "0.4.0", @@ -61,9 +63,10 @@ "typescript": "4.8.4" }, "devDependencies": { - "@openstapps/configuration": "workspace:*", "@openstapps/eslint-config": "workspace:*", + "@openstapps/nyc-config": "workspace:*", "@openstapps/prettier-config": "workspace:*", + "@openstapps/tsconfig": "workspace:*", "@testdeck/mocha": "0.3.3", "@types/chai": "4.3.4", "@types/fs-extra": "9.0.13", @@ -72,25 +75,32 @@ "@types/mocha": "10.0.1", "@types/mustache": "4.2.2", "@types/node": "18.15.3", - "@types/rimraf": "3.0.2", - "@typescript-eslint/eslint-plugin": "5.49.0", - "@typescript-eslint/parser": "5.49.0", - "conventional-changelog-cli": "2.2.2", - "eslint-config-prettier": "8.6.0", - "eslint-plugin-jsdoc": "39.7.4", - "eslint-plugin-prettier": "4.2.1", - "eslint-plugin-unicorn": "45.0.2", "mocha": "10.2.0", "nock": "13.3.0", - "prettier": "2.8.3", - "rimraf": "4.4.0", - "typedoc": "0.23.26" + "tsup": "6.7.0", + "typedoc": "0.23.28" }, - "keywords": [ - "StApps", - "StAppsCore", - "converter", - "core", - "validator" - ] + "tsup": { + "entry": [ + "src/app.ts", + "src/index.ts" + ], + "sourcemap": true, + "clean": true, + "format": "esm", + "outDir": "lib" + }, + "prettier": "@openstapps/prettier-config", + "eslintConfig": { + "extends": [ + "@openstapps" + ] + }, + "eslintIgnore": [ + "resources", + "openapi" + ], + "nyc": { + "extends": "@openstapps/nyc-config" + } } diff --git a/packages/core-tools/src/cli.ts b/packages/core-tools/src/app.ts similarity index 96% rename from packages/core-tools/src/cli.ts rename to packages/core-tools/src/app.ts index 7386ee04..df8ff3cf 100644 --- a/packages/core-tools/src/cli.ts +++ b/packages/core-tools/src/app.ts @@ -18,8 +18,7 @@ import {existsSync, readFileSync, writeFileSync} from 'fs'; import {copy} from 'fs-extra'; import path from 'path'; import {mkdirPromisified, readFilePromisified} from './common.js'; -import {lightweightDefinitionsFromPath, lightweightProjectFromPath} from './easy-ast/easy-ast.js'; -import {pack} from './pack.js'; +import {lightweightDefinitionsFromPath, lightweightProjectFromPath} from '@openstapps/easy-ast'; import {openapi3Template} from './resources/openapi-303-template.js'; import {gatherRouteInformation, generateOpenAPIForRoute} from './routes.js'; import {Converter, getValidatableTypesInPath} from './schema.js'; @@ -27,7 +26,7 @@ import {createDiagram, createDiagramFromString} from './uml/create-diagram.js'; import {UMLConfig} from './uml/uml-config.js'; import {capitalize} from './util/string.js'; import {validateFiles, writeReport} from './validate.js'; -import {fileURLToPath} from "url"; +import {fileURLToPath} from 'url'; // handle unhandled promise rejections process.on('unhandledRejection', async (reason: unknown) => { @@ -41,7 +40,11 @@ process.on('unhandledRejection', async (reason: unknown) => { const commander = new Command('openstapps-core-tools'); // eslint-disable-next-line unicorn/prefer-module -commander.version(JSON.parse(readFileSync(path.resolve(path.dirname(fileURLToPath(import.meta.url)), '..', 'package.json')).toString()).version); +commander.version( + JSON.parse( + readFileSync(path.resolve(path.dirname(fileURLToPath(import.meta.url)), '..', 'package.json')).toString(), + ).version, +); commander.command('prototype ').action(async (sourcePath, out) => { const files = lightweightProjectFromPath(sourcePath); @@ -201,10 +204,6 @@ commander } }); -commander.command('pack').action(async () => { - await pack(); -}); - commander .command('plantuml ') .option('--definitions ', 'Shows these specific definitions (class, interface or enum)', it => diff --git a/packages/core-tools/src/better-ajv-errors.d.ts b/packages/core-tools/src/better-ajv-errors.d.ts index 0a8a5a66..3d657a3e 100644 --- a/packages/core-tools/src/better-ajv-errors.d.ts +++ b/packages/core-tools/src/better-ajv-errors.d.ts @@ -1,10 +1,10 @@ declare module 'better-ajv-errors' { - import type { ErrorObject } from 'ajv'; + import type {ErrorObject} from 'ajv'; export interface IOutputError { - start: { line: number; column: number; offset: number }; + start: {line: number; column: number; offset: number}; // Optional for required - end?: { line: number; column: number; offset: number }; + end?: {line: number; column: number; offset: number}; error: string; suggestion?: string; } @@ -21,6 +21,6 @@ declare module 'better-ajv-errors' { schema: S, data: T, errors: Array, - options?: Options - ): Options extends { format: 'js' } ? Array : string; + options?: Options, + ): Options extends {format: 'js'} ? Array : string; } diff --git a/packages/core-tools/src/index.ts b/packages/core-tools/src/index.ts new file mode 100644 index 00000000..9695025f --- /dev/null +++ b/packages/core-tools/src/index.ts @@ -0,0 +1,11 @@ +export * from './validate.js' +export * from './types/validator.js' + +export * from './uml/uml-config.js' +export * from './uml/create-diagram.js' + +export * from './routes.js' +export * from './types/routes.js' + +export * from './schema.js' +export * from './types/schema.js' diff --git a/packages/core-tools/src/pack.ts b/packages/core-tools/src/pack.ts deleted file mode 100644 index a7991292..00000000 --- a/packages/core-tools/src/pack.ts +++ /dev/null @@ -1,465 +0,0 @@ -/* eslint-disable unicorn/error-message */ -/* - * Copyright (C) 2021 StApps - * This program is free software: you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the Free - * Software Foundation, version 3. - * - * This program is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for - * more details. - * - * You should have received a copy of the GNU General Public License along with - * this program. If not, see . - */ -import {Logger} from '@openstapps/logger'; -import del from 'del'; -import {existsSync} from 'fs'; -import {cwd} from 'process'; -import {globPromisified, readFilePromisified, unlinkPromisified, writeFilePromisified} from './common.js'; -import {JavaScriptModule} from './types/pack.js'; -import path from 'path'; - -const PACK_IDENTIFIER = '/* PACKED BY @openstapps/pack */'; -const posixCwd = cwd().replaceAll(path.win32.sep, path.posix.sep) - -/** - * Pack cli.js - * - * This finds all internal requires and replaces the paths with `./index` or internal requires if it has been - * required already. - * - * Furthermore it checks that no shebang line is present and that it does not export anything. - */ -async function packCliJs(): Promise { - const cliPath = path.join(cwd(), 'lib', 'cli.js'); - - if (!existsSync(cliPath)) { - return; - } - - Logger.info('Adjusting JavaScript CLI...'); - - const buffer = await readFilePromisified(cliPath); - const content = buffer.toString(); - - if (content.indexOf('#!/') === 0) { - throw new Error('`cli.js` must not contain a shebang line! It is added by this script.'); - } - - let internalRequire: string | undefined; - - const adjustedContent = content - .split('\n') - .map((line, lineNumber) => { - // check for exports (cli.js is not allowed to export anything) - if (Array.isArray(line.match(/^\s*((exports)|(module\.exports))/))) { - throw new TypeError( - `Line '${lineNumber}' in 'cli.js' exports something. cli.js is not for exporting. Line was:\n${line}`, - ); - } - - // replace lines with internal requires - // extract module name from line - const match = line.match(/^(\s*)(const|var) ([a-z0-9_]*) = require\(("[^"]+"|'[^']+')\);$/i); - - if (match !== null) { - const importedName = match[3]; - // eslint-disable-next-line unicorn/prefer-string-slice - const moduleName = match[4].substring(1, match[4].length - 1); - - // if it begins with '.' and not ends with json - if (/^[.]{1,2}\/(?!.*\.json$).*$/i.test(moduleName)) { - // is the first internal require - if (internalRequire) { - return `const ${importedName} = ${internalRequire};`; - } - - // only the first import needs a require - internalRequire = importedName; - - return `const ${importedName} = require("./index");`; - } - } - - return line; - }) - .join('\n'); - - return writeFilePromisified(cliPath, `#!/usr/bin/env node\n\n${adjustedContent}`); -} - -/** - * Get a list containing the contents of all type definition files - */ -async function getAllTypeDefinitions(): Promise { - const fileNames = await globPromisified(path.posix.join(posixCwd, '*(lib|src)', '**', '*.d.ts'), { - ignore: [ - path.posix.join(posixCwd, 'lib', 'doc', '**', '*.d.ts'), - path.posix.join(posixCwd, 'lib', 'test', '**', '*.d.ts'), - path.posix.join(posixCwd, 'lib', 'cli.d.ts'), - ], - }); - - const promises = fileNames.map(async (fileName: string) => { - return readFilePromisified(fileName, 'utf8'); - }); - - return Promise.all(promises); -} - -/** - * Pack a list of type definitions into one file - */ -async function packTypeDefinitions(): Promise { - Logger.info('Packing TypeScript definition files...'); - - const indexPath = path.join(cwd(), 'lib', 'index.d.ts'); - - await deleteFileIfExistingAndPacked(indexPath); - - const typeDefinitions = await getAllTypeDefinitions(); - - // pack TypeScript definition files - const imports: {[k: string]: string[]} = {}; - - const referenceLines: string[] = []; - - let allDefinitions = typeDefinitions - // concat them separated by new lines - .join('\n\n\n\n\n') - // split all lines - .split('\n') - .map(line => { - if (line.includes('export =')) { - throw new Error('`export =` is not allowed by pack. Use named imports instead.'); - } - - if (line.indexOf('/// { - return object.trim(); - }); - - // add list of already imported objects for module - if (imports[module] === undefined) { - imports[module] = []; - } - - // count already imported objects and objects to import now - const objectsToImport: string[] = []; - for (const object of importedObjects) { - if (!imports[module].includes(object)) { - imports[module].push(object); - objectsToImport.push(object); - } - } - - // replace import line - if (objectsToImport.length === 0) { - return '// extraneous removed import'; - } - - return `import {${objectsToImport.join(', ')}} from '${module}';`; - } - - return line; - }) - // filter lines which contain "local" imports - .filter(line => { - return line.match(/^import .* from '\./) === null; - }) - // concat all lines separated by new lines - .join('\n'); - - if (allDefinitions.length > 0) { - if (referenceLines.length > 0) { - allDefinitions = `${referenceLines.join('\n')} - -${allDefinitions}`; - } - - // write packed TypeScript definition files - return writeFilePromisified( - indexPath, - `${PACK_IDENTIFIER} - -${allDefinitions}`, - ); - } -} - -/** - * Get all JavaScript modules - */ -async function getAllJavaScriptModules(): Promise { - const fileNames = await globPromisified(path.posix.join(posixCwd, 'lib', '**', '*.js'), { - ignore: [ - path.posix.join(posixCwd, 'lib', 'doc', '**', '*.js'), - path.posix.join(posixCwd, 'lib', 'test', '*.js'), - path.posix.join(posixCwd, 'lib', 'cli.js'), - ], - }); - - const promises = fileNames.map(async (fileName: string) => { - const fileContent = await readFilePromisified(fileName, 'utf8'); - const directory = path.dirname(fileName).replace(new RegExp(`^${path.join(cwd(), 'lib')}`), ''); - - return { - content: `(function() { -${fileContent} -})(); -`, - dependencies: getAllInternalDependencies(fileContent), - directory: directory, - name: path.basename(fileName, '.js'), - }; - }); - - return Promise.all(promises); -} - -/** - * Pack all javascript files - */ -async function packJavaScriptFiles(): Promise { - const indexPath = path.join(cwd(), 'lib', 'index.js'); - - Logger.info('Packing JavaScript files...'); - - await deleteFileIfExistingAndPacked(indexPath); - - // topologically sort the modules (sort by dependencies) - const jsModules = topologicalSort(await getAllJavaScriptModules()); - - let wholeCode = jsModules - // convert modules to strings - .map(module => { - module.content = module.content - .split('\n') - .map(line => { - const match = line.match( - /^(\s*)(const|var) ([a-z0-9_]*) = ((require\("([^"]+)"\))|(require\('([^']+)'\)));$/i, - ); - - // replace lines with internal requires - if (match !== null) { - if (match[6] === undefined) { - match[6] = match[8]; - } - - const whiteSpace = typeof match[1] === 'string' && match[1].length > 0 ? match[1] : ''; - const importedName = match[3]; - const modulePath = match[6]; - - // leave line unchanged if it is a "global" import - if (modulePath.match(/^[.]{1,2}\//) === null) { - return line; - } - - // replace internal requires with `module.exports` - if (existsSync(path.join(cwd(), 'lib', module.directory, `${modulePath}.js`))) { - return `${whiteSpace}const ${importedName} = module.exports;`; - } - - if (existsSync(path.join(cwd(), 'src', module.directory, modulePath))) { - return `${whiteSpace} const ${importedName} = require(../src/${modulePath});`; - } - - Logger.warn(`Import ${importedName} could not be found in module.directory ${modulePath}.`); - } - - return line; - }) - .join('\n'); - - return `// Module: ${module.name} -${module.content}`; - }) - // concat them separated by new lines - .join('\n\n\n\n\n') - // split all lines - .split('\n') - // filter lines - .filter(line => { - // remove strict usage - if (line === '"use strict";') { - return false; - } - - // remove esModule property - if (line === 'Object.defineProperty(exports, "__esModule", { value: true });') { - return false; - } - - // remove source map references - if (line.indexOf('//# sourceMappingURL=') === 0) { - return false; - } - - // keep all other lines - return true; - }) - // concat all lines separated by new lines - .join('\n'); - - if (wholeCode.length > 0) { - // add meta lines to the file - wholeCode = `"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); - -${wholeCode}`; - - // write packed JavaScript files - return writeFilePromisified( - indexPath, - `${PACK_IDENTIFIER} - -${wholeCode}`, - ); - } -} - -/** - * Delete file if it exists and is packed by this script - * - * @param path Path to file to check/delete - */ -async function deleteFileIfExistingAndPacked(path: string): Promise { - try { - const buffer = await readFilePromisified(path); - const content = buffer.toString(); - - // check if packed by this script - if (content.indexOf(PACK_IDENTIFIER) === 0) { - Logger.log(`Found '${path}' which is packed by this script. Deleting it...`); - - return unlinkPromisified(path); - } - } catch (error) { - if ((error as NodeJS.ErrnoException).code === 'ENOENT') { - return; - } - } -} - -/** - * Get all internal dependencies from the content of a module - * - * @param moduleContent Module content to analyze - */ -function getAllInternalDependencies(moduleContent: string): string[] { - // match all const = require(); - const requireLines = moduleContent.match( - /^\s*(const|var) [a-z0-9_]* = require\("([^"]+)"\)|require\('([^']+)'\);$/gim, - ); - - if (Array.isArray(requireLines)) { - return requireLines - .map(requireLine => { - const matches = requireLine.match(/require\("([^"]+)"\)|require\('([^']+)'\);$/i); - - // previously matched require line does not contain a require?! - if (matches === null) { - throw new Error(); - } - - // return only the moduleName - return matches[1]; - }) - .filter(moduleName => { - // filter out internal modules beginning with './' and not ending with '.json' - return /^[.]{1,2}\/(?!.*\.json$).*$/i.test(moduleName); - }) - .map(internalModuleName => { - // cut './' from the name - return internalModuleName.slice('./'.length); - }); - } - - return []; -} - -/** - * Sort modules by their dependencies - * - * @param modules Modules to sort - */ -function topologicalSort(modules: JavaScriptModule[]): JavaScriptModule[] { - // eslint-disable-next-line unicorn/prefer-module,@typescript-eslint/no-var-requires - const topoSort = require('toposort'); - - // vertices are modules, an edge from a to b means that b depends on a - const edges: string[][] = []; - const nodes: string[] = []; - - // add all edges - for (const module of modules) { - for (const dependencyPath of module.dependencies) { - // add edge from dependency to our module - edges.push([path.basename(dependencyPath), module.name]); - } - - nodes.push(module.name); - } - - // sort graph and return as an array of sorted modules - return topoSort.array(nodes, edges).map((moduleName: string) => { - return modules.find(module => { - return module.name === moduleName; - }); - }); -} - -/** - * Pack - */ -export async function pack() { - Logger.log(`Packing project in ${process.cwd()}...`); - - // run all tasks in parallel - const promises: Array> = [packCliJs(), packTypeDefinitions(), packJavaScriptFiles()]; - - await Promise.all(promises); - - // clean up afterwards - Logger.info('Deleting extraneous files...'); - - await del([ - // delete all transpiled files - 'lib/*', - - // keep packed files - '!lib/index.d.ts', - '!lib/index.js', - - // keep converted schema files - '!lib/schema', - '!lib/schema/*.json', - - // keep documentation - '!lib/doc', - '!lib/doc/*', - '!lib/doc/**/*', - - // keep cli - '!lib/cli.js', - - // keep tests - '!lib/test', - '!lib/test/*', - '!lib/test/**/*', - ]); -} diff --git a/packages/core-tools/src/resources/openapi-303-template.ts b/packages/core-tools/src/resources/openapi-303-template.ts index b27f32d9..f8c81509 100644 --- a/packages/core-tools/src/resources/openapi-303-template.ts +++ b/packages/core-tools/src/resources/openapi-303-template.ts @@ -15,27 +15,27 @@ import {OpenAPIV3} from 'openapi-types'; export const openapi3Template: OpenAPIV3.Document = { - openapi: '3.0.3', - info: { - title: 'Openstapps Backend', - description: `# Introduction + openapi: '3.0.3', + info: { + title: 'Openstapps Backend', + description: `# Introduction This is a human readable documentation of the backend OpenAPI representation.`, - contact: { - name: 'Openstapps Team', - url: 'https://gitlab.com/openstapps/backend', - email: 'app@uni-frankfurt.de', - }, - license: { - name: 'AGPL 3.0', - url: 'https://www.gnu.org/licenses/agpl-3.0.en.html', - }, - version: '2.0.0', + contact: { + name: 'Openstapps Team', + url: 'https://gitlab.com/openstapps/backend', + email: 'app@uni-frankfurt.de', }, - servers: [ - { - url: 'https://mobile.server.uni-frankfurt.de:3000', - description: 'Production server', - }, - ], - paths: {}, - }; + license: { + name: 'AGPL 3.0', + url: 'https://www.gnu.org/licenses/agpl-3.0.en.html', + }, + version: '2.0.0', + }, + servers: [ + { + url: 'https://mobile.server.uni-frankfurt.de:3000', + description: 'Production server', + }, + ], + paths: {}, +}; diff --git a/packages/core-tools/src/routes.ts b/packages/core-tools/src/routes.ts index e1496af3..c8c31f4d 100644 --- a/packages/core-tools/src/routes.ts +++ b/packages/core-tools/src/routes.ts @@ -13,13 +13,11 @@ * this program. If not, see . */ import {OpenAPIV3} from 'openapi-types'; -import {isLightweightClass} from './easy-ast/ast-util.js'; -import {LightweightProjectWithIndex} from './easy-ast/types/lightweight-project.js'; +import {isLightweightClass, lightweightProjectFromPath, LightweightProjectWithIndex} from '@openstapps/easy-ast'; import {RouteInstanceWithMeta, RouteWithMetaInformation} from './types/routes.js'; import {rejectNil} from './util/collections.js'; import {capitalize} from './util/string.js'; import path from 'path'; -import {lightweightProjectFromPath} from './easy-ast/easy-ast.js'; /** * Gather relevant information of routes @@ -33,38 +31,42 @@ export async function gatherRouteInformation(path: string): Promise { - if (!node.extendedDefinitions?.some(it => it.referenceName === 'SCAbstractRoute')) { - return undefined; - } + Object.values(project.definitions) + .filter(isLightweightClass) + .map(async node => { + if (!node.extendedDefinitions?.some(it => it.referenceName === 'SCAbstractRoute')) { + return undefined; + } - const instantiatedRoute = (await project.instantiateDefinitionByName( - node.name, - )) as RouteInstanceWithMeta; - // instantiate all errors - instantiatedRoute.errors = await Promise.all( - // eslint-disable-next-line @typescript-eslint/no-explicit-any - instantiatedRoute.errorNames.map(async (error: any) => - // eslint-disable-next-line @typescript-eslint/ban-types - Object.assign((await project.instantiateDefinitionByName(error.name)) as object, {name: error.name}), - ), - ); - instantiatedRoute.responseBodyDescription = - // eslint-disable-next-line @typescript-eslint/no-non-null-asserted-optional-chain - project.definitions[instantiatedRoute.responseBodyName]?.comment?.shortSummary!; - instantiatedRoute.requestBodyDescription = - // eslint-disable-next-line @typescript-eslint/no-non-null-asserted-optional-chain - project.definitions[instantiatedRoute.requestBodyName]?.comment?.shortSummary!; + const instantiatedRoute = (await project.instantiateDefinitionByName( + node.name, + )) as RouteInstanceWithMeta; + // instantiate all errors + instantiatedRoute.errors = await Promise.all( + // eslint-disable-next-line @typescript-eslint/no-explicit-any + instantiatedRoute.errorNames.map(async (error: any) => + // eslint-disable-next-line @typescript-eslint/ban-types + Object.assign((await project.instantiateDefinitionByName(error.name)) as object, { + name: error.name, + }), + ), + ); + instantiatedRoute.responseBodyDescription = + // eslint-disable-next-line @typescript-eslint/no-non-null-asserted-optional-chain + project.definitions[instantiatedRoute.responseBodyName]?.comment?.shortSummary!; + instantiatedRoute.requestBodyDescription = + // eslint-disable-next-line @typescript-eslint/no-non-null-asserted-optional-chain + project.definitions[instantiatedRoute.requestBodyName]?.comment?.shortSummary!; - return { - description: { - shortText: node.comment?.shortSummary, - text: node.comment?.description, - }, - name: node.name!, - route: instantiatedRoute, - }; - }), + return { + description: { + shortText: node.comment?.shortSummary, + text: node.comment?.description, + }, + name: node.name!, + route: instantiatedRoute, + }; + }), ), ); } diff --git a/packages/core-tools/src/schema.ts b/packages/core-tools/src/schema.ts index 502e95b4..c526163b 100644 --- a/packages/core-tools/src/schema.ts +++ b/packages/core-tools/src/schema.ts @@ -19,8 +19,7 @@ import {createFormatter} from 'ts-json-schema-generator'; import {createParser} from 'ts-json-schema-generator'; import {createProgram} from 'ts-json-schema-generator'; import {getTsconfigPath} from './common.js'; -import {definitionsOf} from './easy-ast/ast-util.js'; -import {lightweightProjectFromPath} from './easy-ast/easy-ast.js'; +import {definitionsOf, lightweightProjectFromPath} from '@openstapps/easy-ast'; import {isSchemaWithDefinitions} from './util/guards.js'; import path from 'path'; import re2 from './types/re2.js'; @@ -111,5 +110,5 @@ export class Converter { export function getValidatableTypesInPath(path: string): string[] { return Object.values(definitionsOf(lightweightProjectFromPath(path))) .filter(type => !!type.comment?.tags?.find(it => it.name === 'validatable')) - .map(type => type.name) + .map(type => type.name); } diff --git a/packages/core-tools/src/uml/create-diagram.ts b/packages/core-tools/src/uml/create-diagram.ts index d88f4b2c..61cab545 100644 --- a/packages/core-tools/src/uml/create-diagram.ts +++ b/packages/core-tools/src/uml/create-diagram.ts @@ -15,12 +15,15 @@ import {Logger} from '@openstapps/logger'; import {createWriteStream} from 'fs'; import * as request from 'got'; -import {expandTypeValue, isLightweightClass} from '../easy-ast/ast-util.js'; -import {LightweightAliasDefinition} from '../easy-ast/types/lightweight-alias-definition.js'; -import {LightweightClassDefinition} from '../easy-ast/types/lightweight-class-definition.js'; -import {LightweightDefinition} from '../easy-ast/types/lightweight-definition.js'; -import {LightweightProperty} from '../easy-ast/types/lightweight-property.js'; -import {LightweightType} from '../easy-ast/types/lightweight-type.js'; +import { + expandTypeValue, + isLightweightClass, + LightweightAliasDefinition, + LightweightClassDefinition, + LightweightDefinition, + LightweightProperty, + LightweightType +} from '@openstapps/easy-ast'; import {UMLConfig} from './uml-config.js'; /** @@ -59,7 +62,8 @@ export async function createDiagram( isLightweightClass(definition) ? createPlantUMLCodeForClass(config, definition) : createPlantUMLCodeForEnum(config, definition), - ).join(''); + ) + .join(''); return createDiagramFromString(modelPlantUMLCode, plantUmlBaseURL, config.outputFileName); } diff --git a/packages/core-tools/src/util/collections.ts b/packages/core-tools/src/util/collections.ts index 4f26e9df..ee0fdf84 100644 --- a/packages/core-tools/src/util/collections.ts +++ b/packages/core-tools/src/util/collections.ts @@ -34,10 +34,10 @@ export function mapNotNil(array: readonly T[], transform: (element: T) => export function cleanupEmpty(object: T): T { const out = {} as T; for (const key in object) { - const value = object[key] + const value = object[key]; // eslint-disable-next-line unicorn/no-null if (value != null && (typeof value !== 'object' || Object.values(value).length > 0)) { - out[key] = value + out[key] = value; } } return out; diff --git a/packages/core-tools/src/util/io.ts b/packages/core-tools/src/util/io.ts index 6fba6877..bc559924 100644 --- a/packages/core-tools/src/util/io.ts +++ b/packages/core-tools/src/util/io.ts @@ -25,7 +25,7 @@ export function expandPathToFilesSync(sourcePath: string, accept: (fileName: str return directory.isDirectory() ? readdirSync(fullPath).flatMap(fragment => expandPathToFilesSync(path.resolve(sourcePath, fragment), accept), - ) + ) : [fullPath].filter(accept); } diff --git a/packages/core-tools/test/create-diagram.spec.ts b/packages/core-tools/test/create-diagram.spec.ts index e6dcdaa5..745322c4 100644 --- a/packages/core-tools/test/create-diagram.spec.ts +++ b/packages/core-tools/test/create-diagram.spec.ts @@ -18,9 +18,8 @@ import {existsSync, unlinkSync} from 'fs'; import {slow, suite, test, timeout} from '@testdeck/mocha'; import {createDiagram, createDiagramFromString} from '../src/uml/create-diagram.js'; import {UMLConfig} from '../src/uml/uml-config.js'; -import {LightweightDefinition} from '../src/easy-ast/types/lightweight-definition.js'; +import {LightweightDefinition, lightweightDefinitionsFromPath} from '@openstapps/easy-ast'; import nock = require('nock'); -import {lightweightDefinitionsFromPath} from '../src/easy-ast/easy-ast.js'; import path from 'path'; @suite(timeout(15_000), slow(5000)) diff --git a/packages/core-tools/tsconfig.json b/packages/core-tools/tsconfig.json index bf9b151f..aff26de6 100644 --- a/packages/core-tools/tsconfig.json +++ b/packages/core-tools/tsconfig.json @@ -1,5 +1,5 @@ { - "extends": "./node_modules/@openstapps/configuration/tsconfig.json", + "extends": "@openstapps/tsconfig", "compilerOptions": { "noUnusedLocals": false, "stripInternal": true diff --git a/packages/core/.editorconfig b/packages/core/.editorconfig deleted file mode 100644 index 9a4062a7..00000000 --- a/packages/core/.editorconfig +++ /dev/null @@ -1,15 +0,0 @@ -# editorconfig.org - -root = true - -[*] -indent_style = space -indent_size = 2 - -end_of_line = lf -charset = utf-8 -trim_trailing_whitespace = true -insert_final_newline = true - -[*.md] -trim_trailing_whitespace = false diff --git a/packages/core/.eslintignore b/packages/core/.eslintignore deleted file mode 100644 index 3d0a9346..00000000 --- a/packages/core/.eslintignore +++ /dev/null @@ -1,2 +0,0 @@ -resources -openapi diff --git a/packages/core/.eslintrc.json b/packages/core/.eslintrc.json deleted file mode 100644 index a8d40002..00000000 --- a/packages/core/.eslintrc.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "extends": "@openstapps", - "rules": { - "@typescript-eslint/no-empty-interface": "off", - "jsdoc/check-tag-names": [ - "error", - { - "definedTags": [ - "internal", - "aggregatable", - "float", - "indexable", - "integer", - "keyword", - "sortable", - "text", - "date", - "validatable", - "filterable", - "inheritTags", - "minLength", - "pattern", - "typeparam", - "TJS-format" - ] - } - ] - } -} diff --git a/packages/core/.gitlab/issue_templates/bug.md b/packages/core/.gitlab/issue_templates/bug.md deleted file mode 100644 index 72b38997..00000000 --- a/packages/core/.gitlab/issue_templates/bug.md +++ /dev/null @@ -1,13 +0,0 @@ -## What's wrong with the current model? - -??? - -## How should the model be instead? - -??? - -## Why should the model be that way? - -??? - Describe use case! - -/label ~bug ~meeting diff --git a/packages/core/.gitlab/issue_templates/change.md b/packages/core/.gitlab/issue_templates/change.md deleted file mode 100644 index 38e0476d..00000000 --- a/packages/core/.gitlab/issue_templates/change.md +++ /dev/null @@ -1,17 +0,0 @@ -## What needs to be remodeled? - -??? - Describe use case! - -## How is the current model not sufficient? - -??? - -## Which changes are necessary? - -??? - -## Do the proposed changes impact current use cases? - -??? - -/label ~feature ~meeting diff --git a/packages/core/.gitlab/issue_templates/feature.md b/packages/core/.gitlab/issue_templates/feature.md deleted file mode 100644 index 35edc7fd..00000000 --- a/packages/core/.gitlab/issue_templates/feature.md +++ /dev/null @@ -1,15 +0,0 @@ -## What needs to be modeled? - -??? - -## Why is a new model necessary? - -??? - Describe use case! - -## Dependencies, issues, features that need to be resolved beforehand - -1. ??? -2. ??? -3. ... - -/label ~feature ~meeting diff --git a/packages/core/CHANGELOG.md b/packages/core/CHANGELOG.md index bac381d3..23ccac38 100644 --- a/packages/core/CHANGELOG.md +++ b/packages/core/CHANGELOG.md @@ -22,662 +22,429 @@ # [0.75.0](https://gitlab.com/openstapps/core/compare/v0.74.0...v0.75.0) (2023-02-28) - ### Features -* add rating for things ([28eacf7](https://gitlab.com/openstapps/core/commit/28eacf7925f84caa129cad4b94fb449effd4d6ea)), closes [#152](https://gitlab.com/openstapps/core/issues/152) - - +- add rating for things ([28eacf7](https://gitlab.com/openstapps/core/commit/28eacf7925f84caa129cad4b94fb449effd4d6ea)), closes [#152](https://gitlab.com/openstapps/core/issues/152) # [0.74.0](https://gitlab.com/openstapps/core/compare/v0.73.0...v0.74.0) (2023-01-30) - - # [0.73.0](https://gitlab.com/openstapps/core/compare/v0.72.0...v0.73.0) (2023-01-12) - - # [0.72.0](https://gitlab.com/openstapps/core/compare/v0.71.1...v0.72.0) (2022-12-06) - ### Features -* add dish menu section and service times ([be98fd8](https://gitlab.com/openstapps/core/commit/be98fd8c4c2fbb01eb80808bf3aa609b08b90ec6)), closes [#150](https://gitlab.com/openstapps/core/issues/150) - - +- add dish menu section and service times ([be98fd8](https://gitlab.com/openstapps/core/commit/be98fd8c4c2fbb01eb80808bf3aa609b08b90ec6)), closes [#150](https://gitlab.com/openstapps/core/issues/150) ## [0.71.1](https://gitlab.com/openstapps/core/compare/v0.71.0...v0.71.1) (2022-11-22) - - # [0.71.0](https://gitlab.com/openstapps/core/compare/v0.70.0...v0.71.0) (2022-10-11) - ### Features -* add new book categories ([dd138fd](https://gitlab.com/openstapps/core/commit/dd138fd0be6d8100fc242816f5eb2549f2672ab3)), closes [#147](https://gitlab.com/openstapps/core/issues/147) - - +- add new book categories ([dd138fd](https://gitlab.com/openstapps/core/commit/dd138fd0be6d8100fc242816f5eb2549f2672ab3)), closes [#147](https://gitlab.com/openstapps/core/issues/147) # [0.70.0](https://gitlab.com/openstapps/core/compare/v0.69.0...v0.70.0) (2022-09-02) - ### Features -* add auth provider to config menu items ([b183198](https://gitlab.com/openstapps/core/commit/b18319802969d711373e70cca5921730345aa3e8)) - - +- add auth provider to config menu items ([b183198](https://gitlab.com/openstapps/core/commit/b18319802969d711373e70cca5921730345aa3e8)) # [0.69.0](https://gitlab.com/openstapps/core/compare/v0.68.0...v0.69.0) (2022-08-17) - - # [0.68.0](https://gitlab.com/openstapps/core/compare/v0.67.0...v0.68.0) (2022-06-27) - - # [0.67.0](https://gitlab.com/openstapps/core/compare/v0.66.1...v0.67.0) (2022-05-31) - - ## [0.66.1](https://gitlab.com/openstapps/core/compare/v0.66.0...v0.66.1) (2022-05-27) - - # [0.66.0](https://gitlab.com/openstapps/core/compare/v0.65.1...v0.66.0) (2022-05-11) - ### Features -* add geo filter envelope support ([484be6a](https://gitlab.com/openstapps/core/commit/484be6a890d743601efa5d40d33ea2c619f3126d)) - - +- add geo filter envelope support ([484be6a](https://gitlab.com/openstapps/core/commit/484be6a890d743601efa5d40d33ea2c619f3126d)) ## [0.65.1](https://gitlab.com/openstapps/core/compare/v0.65.0...v0.65.1) (2022-04-04) - - # [0.65.0](https://gitlab.com/openstapps/core/compare/v0.64.0...v0.65.0) (2022-04-04) - - # [0.64.0](https://gitlab.com/openstapps/core/compare/v0.63.0...v0.64.0) (2022-03-21) - - # [0.63.0](https://gitlab.com/openstapps/core/compare/v0.62.0...v0.63.0) (2022-01-24) - ### Bug Fixes -* add auth object to index route ([e149931](https://gitlab.com/openstapps/core/commit/e14993114f0ec370775010eee4ad0d302a0beebb)) - - +- add auth object to index route ([e149931](https://gitlab.com/openstapps/core/commit/e14993114f0ec370775010eee4ad0d302a0beebb)) # [0.62.0](https://gitlab.com/openstapps/core/compare/v0.61.0...v0.62.0) (2022-01-21) - ### Bug Fixes -* add missing lastPublished to SCCreativeWork ([e0adb23](https://gitlab.com/openstapps/core/commit/e0adb2332ec24ce388c4c008b51b7aa941948532)) - - +- add missing lastPublished to SCCreativeWork ([e0adb23](https://gitlab.com/openstapps/core/commit/e0adb2332ec24ce388c4c008b51b7aa941948532)) # [0.61.0](https://gitlab.com/openstapps/core/compare/v0.60.0...v0.61.0) (2022-01-21) - - # [0.60.0](https://gitlab.com/openstapps/core/compare/v0.59.0...v0.60.0) (2022-01-21) - - # [0.59.0](https://gitlab.com/openstapps/core/compare/v0.58.0...v0.59.0) (2022-01-20) - - # [0.58.0](https://gitlab.com/openstapps/core/compare/v0.57.0...v0.58.0) (2022-01-18) - - # [0.57.0](https://gitlab.com/openstapps/core/compare/v0.56.0...v0.57.0) (2022-01-18) - ### Features -* extend config to describe auth providers ([7553620](https://gitlab.com/openstapps/core/commit/7553620a5d330ebfb66461afeab700e36bd37165)) - - +- extend config to describe auth providers ([7553620](https://gitlab.com/openstapps/core/commit/7553620a5d330ebfb66461afeab700e36bd37165)) # [0.56.0](https://gitlab.com/openstapps/core/compare/v0.55.0...v0.56.0) (2021-12-17) - - # [0.55.0](https://gitlab.com/openstapps/core/compare/v0.54.0...v0.55.0) (2021-12-15) - - # [0.54.0](https://gitlab.com/openstapps/core/compare/v0.53.0...v0.54.0) (2021-11-17) - ### Features -* add SCAssessment ([7a2e0f2](https://gitlab.com/openstapps/core/commit/7a2e0f20d1c64ab1deb7ab30bfb4bab4daaabd6d)) - - +- add SCAssessment ([7a2e0f2](https://gitlab.com/openstapps/core/commit/7a2e0f20d1c64ab1deb7ab30bfb4bab4daaabd6d)) # [0.53.0](https://gitlab.com/openstapps/core/compare/v0.52.0...v0.53.0) (2021-10-19) - - # [0.52.0](https://gitlab.com/openstapps/core/compare/v0.51.0...v0.52.0) (2021-09-28) - ### Features -* add about config ([aa294c4](https://gitlab.com/openstapps/core/commit/aa294c4e29e9191bef6d79487b0b321fbc34f6fb)) - - +- add about config ([aa294c4](https://gitlab.com/openstapps/core/commit/aa294c4e29e9191bef6d79487b0b321fbc34f6fb)) # [0.51.0](https://gitlab.com/openstapps/core/compare/v0.50.0...v0.51.0) (2021-09-10) - ### Bug Fixes -* add physicalobject to book categories ([ded8e7d](https://gitlab.com/openstapps/core/commit/ded8e7dfd51094c02a86e1383a4e94c069c10e64)) - - +- add physicalobject to book categories ([ded8e7d](https://gitlab.com/openstapps/core/commit/ded8e7dfd51094c02a86e1383a4e94c069c10e64)) # [0.50.0](https://gitlab.com/openstapps/core/compare/v0.49.5...v0.50.0) (2021-09-01) - - ## [0.49.5](https://gitlab.com/openstapps/core/compare/v0.49.3...v0.49.5) (2021-08-27) - ### Bug Fixes -* test resources from hds2 ([dfe35d7](https://gitlab.com/openstapps/core/commit/dfe35d71a38c35064726365f99714abff3b30ba6)) - - +- test resources from hds2 ([dfe35d7](https://gitlab.com/openstapps/core/commit/dfe35d71a38c35064726365f99714abff3b30ba6)) ## [0.49.3](https://gitlab.com/openstapps/core/compare/v0.49.2...v0.49.3) (2021-08-18) - - ## [0.49.2](https://gitlab.com/openstapps/core/compare/v0.49.1...v0.49.2) (2021-08-17) - - ## [0.49.1](https://gitlab.com/openstapps/core/compare/v0.49.0...v0.49.1) (2021-08-13) - ### Bug Fixes -* documentation generation ([8a28d6f](https://gitlab.com/openstapps/core/commit/8a28d6fa8657d778d6ae0d38cda7da3531d6478c)) - - +- documentation generation ([8a28d6f](https://gitlab.com/openstapps/core/commit/8a28d6fa8657d778d6ae0d38cda7da3531d6478c)) # [0.49.0](https://gitlab.com/openstapps/core/compare/v0.48.0...v0.49.0) (2021-08-12) - ### Features -* add elasticsearch mappings to build ([21eeecd](https://gitlab.com/openstapps/core/commit/21eeecd5ee0d68a4faa93bb70d2187ce35807b01)) - - +- add elasticsearch mappings to build ([21eeecd](https://gitlab.com/openstapps/core/commit/21eeecd5ee0d68a4faa93bb70d2187ce35807b01)) # [0.48.0](https://gitlab.com/openstapps/core/compare/v0.47.0...v0.48.0) (2021-07-14) - ### Bug Fixes -* correct parameter name of thing update route ([872c1f5](https://gitlab.com/openstapps/core/commit/872c1f5fc3884b6df6f5025287873d98b27dd6b1)) - +- correct parameter name of thing update route ([872c1f5](https://gitlab.com/openstapps/core/commit/872c1f5fc3884b6df6f5025287873d98b27dd6b1)) ### Features -* support geo shape queries ([882483e](https://gitlab.com/openstapps/core/commit/882483ee2490938014904bc26687bd1648992ae6)) - - +- support geo shape queries ([882483e](https://gitlab.com/openstapps/core/commit/882483ee2490938014904bc26687bd1648992ae6)) # [0.47.0](https://gitlab.com/openstapps/core/compare/v0.46.0...v0.47.0) (2021-06-15) - ### Bug Fixes -* set date-series frequency non translatable ([4a4cd4e](https://gitlab.com/openstapps/core/commit/4a4cd4e6d4b01ac34b5338dfcf4aeb959f54461d)) - +- set date-series frequency non translatable ([4a4cd4e](https://gitlab.com/openstapps/core/commit/4a4cd4e6d4b01ac34b5338dfcf4aeb959f54461d)) ### Features -* make SCDateSeries.frequency compliant with schema.org ([942cd11](https://gitlab.com/openstapps/core/commit/942cd1146966aa9e60321160489a6605877925e9)) - - +- make SCDateSeries.frequency compliant with schema.org ([942cd11](https://gitlab.com/openstapps/core/commit/942cd1146966aa9e60321160489a6605877925e9)) # [0.46.0](https://gitlab.com/openstapps/core/compare/v0.45.0...v0.46.0) (2021-05-04) - ### Features -* change range offer to use date range ([9c6972a](https://gitlab.com/openstapps/core/commit/9c6972af787678567409877b6bc9f9417e1374e2)) - - +- change range offer to use date range ([9c6972a](https://gitlab.com/openstapps/core/commit/9c6972af787678567409877b6bc9f9417e1374e2)) # [0.45.0](https://gitlab.com/openstapps/core/compare/v0.44.0...v0.45.0) (2021-04-26) - - # [0.44.0](https://gitlab.com/openstapps/core/compare/v0.43.0...v0.44.0) (2021-04-12) - ### Features -* add support for multiple values in the value filter ([913c569](https://gitlab.com/openstapps/core/commit/913c5691da46ad2591fe14bcf7286f12b29ab5ee)) - - +- add support for multiple values in the value filter ([913c569](https://gitlab.com/openstapps/core/commit/913c5691da46ad2591fe14bcf7286f12b29ab5ee)) # [0.43.0](https://gitlab.com/openstapps/core/compare/v0.42.0...v0.43.0) (2021-04-07) - - # [0.42.0](https://gitlab.com/openstapps/core/compare/v0.41.0...v0.42.0) (2021-02-16) - - # [0.41.0](https://gitlab.com/openstapps/core/compare/v0.40.0...v0.41.0) (2021-02-08) - ### Bug Fixes -* add date, numeric range filter to SCSearchFilter ([8510f11](https://gitlab.com/openstapps/core/commit/8510f11d7b4c62a6b239a70f47fe07e8cc86ab63)) - - +- add date, numeric range filter to SCSearchFilter ([8510f11](https://gitlab.com/openstapps/core/commit/8510f11d7b4c62a6b239a70f47fe07e8cc86ab63)) # [0.40.0](https://gitlab.com/openstapps/core/compare/v0.39.0...v0.40.0) (2021-02-05) - ### Features -* add range filter, date sorting support ([29bc006](https://gitlab.com/openstapps/core/commit/29bc00616e87a8d346d8c304fab2e3818921c75e)) - - +- add range filter, date sorting support ([29bc006](https://gitlab.com/openstapps/core/commit/29bc00616e87a8d346d8c304fab2e3818921c75e)) # [0.39.0](https://gitlab.com/openstapps/core/compare/v0.38.1...v0.39.0) (2020-12-01) - ### Features -* extend property value translation retrival ([a246bde](https://gitlab.com/openstapps/core/commit/a246bdea84e0ca390be6ab38723d637626db87d2)) - - +- extend property value translation retrival ([a246bde](https://gitlab.com/openstapps/core/commit/a246bdea84e0ca390be6ab38723d637626db87d2)) ## [0.38.1](https://gitlab.com/openstapps/core/compare/v0.38.0...v0.38.1) (2020-11-02) - - # [0.38.0](https://gitlab.com/openstapps/core/compare/v0.37.0...v0.38.0) (2020-10-30) - - # [0.37.0](https://gitlab.com/openstapps/core/compare/v0.36.0...v0.37.0) (2020-09-23) - ### Bug Fixes -* remove keyword tag from steps ([c369c85](https://gitlab.com/openstapps/core/commit/c369c8520a2eed169555a35a50ce745c08e1f9da)) -* remove redundant property declaration ([66075ef](https://gitlab.com/openstapps/core/commit/66075ef99b95198a9cd5c0a396603e089221bcd9)) - - +- remove keyword tag from steps ([c369c85](https://gitlab.com/openstapps/core/commit/c369c8520a2eed169555a35a50ce745c08e1f9da)) +- remove redundant property declaration ([66075ef](https://gitlab.com/openstapps/core/commit/66075ef99b95198a9cd5c0a396603e089221bcd9)) # [0.36.0](https://gitlab.com/openstapps/core/compare/v0.35.0...v0.36.0) (2020-07-16) - ### Features -* add function to get translated SCThingType ([fe7f1a5](https://gitlab.com/openstapps/core/commit/fe7f1a53ae46e052e23f1b39851f1547b5a8dded)) - - +- add function to get translated SCThingType ([fe7f1a5](https://gitlab.com/openstapps/core/commit/fe7f1a53ae46e052e23f1b39851f1547b5a8dded)) # [0.35.0](https://gitlab.com/openstapps/core/compare/v0.34.0...v0.35.0) (2020-05-13) - - # [0.34.0](https://gitlab.com/openstapps/core/compare/v0.33.0...v0.34.0) (2020-04-21) - ### Features -* add [@sortable](https://gitlab.com/sortable) tags to certain translatable properties ([f5e8856](https://gitlab.com/openstapps/core/commit/f5e88569eb75578febbcde67259c0c14563e53fe)) -* annotate SCThing uid and url as filterable ([70c1a3e](https://gitlab.com/openstapps/core/commit/70c1a3eaa3d1c88f4b86f0df86d0d362ad1f930c)) -* Update src/things/book.ts - made ISBN optional ([6060113](https://gitlab.com/openstapps/core/commit/6060113df56b871bb5014a8a961974895e52158f)) - - +- add [@sortable](https://gitlab.com/sortable) tags to certain translatable properties ([f5e8856](https://gitlab.com/openstapps/core/commit/f5e88569eb75578febbcde67259c0c14563e53fe)) +- annotate SCThing uid and url as filterable ([70c1a3e](https://gitlab.com/openstapps/core/commit/70c1a3eaa3d1c88f4b86f0df86d0d362ad1f930c)) +- Update src/things/book.ts - made ISBN optional ([6060113](https://gitlab.com/openstapps/core/commit/6060113df56b871bb5014a8a961974895e52158f)) # [0.33.0](https://gitlab.com/openstapps/core/compare/v0.32.0...v0.33.0) (2020-02-11) - - # [0.32.0](https://gitlab.com/openstapps/core/compare/v0.31.0...v0.32.0) (2020-02-04) - ### Features -* make SCContactPoint extend SCThing ([0d89b14](https://gitlab.com/openstapps/core/commit/0d89b1493293f83e9096615f653a6094519d59f2)) - - +- make SCContactPoint extend SCThing ([0d89b14](https://gitlab.com/openstapps/core/commit/0d89b1493293f83e9096615f653a6094519d59f2)) # [0.31.0](https://gitlab.com/openstapps/core/compare/v0.30.0...v0.31.0) (2019-11-14) - ### Bug Fixes -* remove categories from custom translations ([9658f05](https://gitlab.com/openstapps/core/commit/9658f05d31366b3735da3aa548ef5ed0255d8054)) -* translator can now handle enum translations ([abda5cf](https://gitlab.com/openstapps/core/commit/abda5cf0caead37f085431e1e5a9771b79272ec6)) - - +- remove categories from custom translations ([9658f05](https://gitlab.com/openstapps/core/commit/9658f05d31366b3735da3aa548ef5ed0255d8054)) +- translator can now handle enum translations ([abda5cf](https://gitlab.com/openstapps/core/commit/abda5cf0caead37f085431e1e5a9771b79272ec6)) # [0.30.0](https://gitlab.com/openstapps/core/compare/v0.29.0...v0.30.0) (2019-11-08) - ### Features -* add aggregatable tag for type field ([443cb74](https://gitlab.com/openstapps/core/commit/443cb748fba1575f5f1e16c550fd33eb7fa7901c)) -* add new field sequenceIndex to message ([01f92ba](https://gitlab.com/openstapps/core/commit/01f92baa985013bfe1c79fad60351fdaf44bd676)) - - +- add aggregatable tag for type field ([443cb74](https://gitlab.com/openstapps/core/commit/443cb748fba1575f5f1e16c550fd33eb7fa7901c)) +- add new field sequenceIndex to message ([01f92ba](https://gitlab.com/openstapps/core/commit/01f92baa985013bfe1c79fad60351fdaf44bd676)) # [0.29.0](https://gitlab.com/openstapps/core/compare/v0.28.0...v0.29.0) (2019-09-17) - ### Features -* add mappingIgnoredTags property to SCBackend ([149f3ff](https://gitlab.com/openstapps/core/commit/149f3ffff15dce27337665abba520d11bc3014dd)) - - +- add mappingIgnoredTags property to SCBackend ([149f3ff](https://gitlab.com/openstapps/core/commit/149f3ffff15dce27337665abba520d11bc3014dd)) # [0.28.0](https://gitlab.com/openstapps/core/compare/v0.27.0...v0.28.0) (2019-09-10) - ### Features -* add onlyOnType field for SCFacet ([fba63db](https://gitlab.com/openstapps/core/commit/fba63db137c52212113545be1062d760f0c4213f)) - - +- add onlyOnType field for SCFacet ([fba63db](https://gitlab.com/openstapps/core/commit/fba63db137c52212113545be1062d760f0c4213f)) # [0.27.0](https://gitlab.com/openstapps/core/compare/v0.26.0...v0.27.0) (2019-09-03) - ### Features -* add [@filterable](https://gitlab.com/filterable) tags ([fec3371](https://gitlab.com/openstapps/core/commit/fec33715add996ae0a7125ad00ee043d288c6671)) - - +- add [@filterable](https://gitlab.com/filterable) tags ([fec3371](https://gitlab.com/openstapps/core/commit/fec33715add996ae0a7125ad00ee043d288c6671)) # [0.26.0](https://gitlab.com/openstapps/core/compare/v0.25.0...v0.26.0) (2019-08-19) - ### Bug Fixes -* complete german translations ([bad15dc](https://gitlab.com/openstapps/core/commit/bad15dc8728954ee6ee23fa68c471647328830b9)) - +- complete german translations ([bad15dc](https://gitlab.com/openstapps/core/commit/bad15dc8728954ee6ee23fa68c471647328830b9)) ### Features -* add pluginRequestTimeout field to backend config ([88f579e](https://gitlab.com/openstapps/core/commit/88f579e09bc5e7726dbc4fc788737ba49a0801cd)) - - +- add pluginRequestTimeout field to backend config ([88f579e](https://gitlab.com/openstapps/core/commit/88f579e09bc5e7726dbc4fc788737ba49a0801cd)) # [0.25.0](https://gitlab.com/openstapps/core/compare/v0.24.0...v0.25.0) (2019-07-25) - ### Bug Fixes -* correct package job ([d4a8ef6](https://gitlab.com/openstapps/core/commit/d4a8ef6a9ca69849f8b981804da45e4ba907f37b)) - - +- correct package job ([d4a8ef6](https://gitlab.com/openstapps/core/commit/d4a8ef6a9ca69849f8b981804da45e4ba907f37b)) # [0.24.0](https://gitlab.com/openstapps/core/compare/v0.23.1...v0.24.0) (2019-07-23) - ### Features -* add new field receivingOrganisations to message ([d781dd6](https://gitlab.com/openstapps/core/commit/d781dd6de5cc7572b9218df959247b93cb2db305)) - - +- add new field receivingOrganisations to message ([d781dd6](https://gitlab.com/openstapps/core/commit/d781dd6de5cc7572b9218df959247b93cb2db305)) ## [0.23.1](https://gitlab.com/openstapps/core/compare/v0.23.0...v0.23.1) (2019-07-15) - ### Bug Fixes -* use correct generic for the distance filter ([f262a6b](https://gitlab.com/openstapps/core/commit/f262a6b8fa7a9d40234569ec490d5ef8e9437a75)) - +- use correct generic for the distance filter ([f262a6b](https://gitlab.com/openstapps/core/commit/f262a6b8fa7a9d40234569ec490d5ef8e9437a75)) ### Features -* add type maps from routes to requests and responses ([e1d4b2b](https://gitlab.com/openstapps/core/commit/e1d4b2bc9de60a2332788c9a2264760d151c8813)), closes [#80](https://gitlab.com/openstapps/core/issues/80) - - +- add type maps from routes to requests and responses ([e1d4b2b](https://gitlab.com/openstapps/core/commit/e1d4b2bc9de60a2332788c9a2264760d151c8813)), closes [#80](https://gitlab.com/openstapps/core/issues/80) # [0.23.0](https://gitlab.com/openstapps/core/compare/v0.22.0...v0.23.0) (2019-07-03) - ### Features -* add mapping type from response to request and vice versa ([c18e3c1](https://gitlab.com/openstapps/core/commit/c18e3c15f1940338b6872343f6b20dba6346f84b)), closes [#80](https://gitlab.com/openstapps/core/issues/80) -* support 404 (resource not found) error on plugin register route ([43851d2](https://gitlab.com/openstapps/core/commit/43851d2d358c4c342a80a863b059a6447c819c04)) - - +- add mapping type from response to request and vice versa ([c18e3c1](https://gitlab.com/openstapps/core/commit/c18e3c15f1940338b6872343f6b20dba6346f84b)), closes [#80](https://gitlab.com/openstapps/core/issues/80) +- support 404 (resource not found) error on plugin register route ([43851d2](https://gitlab.com/openstapps/core/commit/43851d2d358c4c342a80a863b059a6447c819c04)) # [0.22.0](https://gitlab.com/openstapps/core/compare/v0.21.0...v0.22.0) (2019-06-28) - - # [0.21.0](https://gitlab.com/openstapps/core/compare/v0.20.0...v0.21.0) (2019-06-19) - ### Features -* add ES annotations ([9c424b0](https://gitlab.com/openstapps/core/commit/9c424b0f96da26d3aae9ffaadb2c640e7369ca7e)) -* add static typed test for consistency ([ff1f554](https://gitlab.com/openstapps/core/commit/ff1f554e0beacb5ce2f3308c8212e2b8e4d8cbb0)), closes [#71](https://gitlab.com/openstapps/core/issues/71) - - +- add ES annotations ([9c424b0](https://gitlab.com/openstapps/core/commit/9c424b0f96da26d3aae9ffaadb2c640e7369ca7e)) +- add static typed test for consistency ([ff1f554](https://gitlab.com/openstapps/core/commit/ff1f554e0beacb5ce2f3308c8212e2b8e4d8cbb0)), closes [#71](https://gitlab.com/openstapps/core/issues/71) # [0.20.0](https://gitlab.com/openstapps/core/compare/v0.19.0...v0.20.0) (2019-06-11) - ### Bug Fixes -* add translations for every SCThing ([f847a2a](https://gitlab.com/openstapps/core/commit/f847a2aa0cf576e2fd79197cdc7795638d929136)) -* rename properties floor and message so that they are not identical to SCThingTypes ([78b64ba](https://gitlab.com/openstapps/core/commit/78b64bae08d9ca12badaedf921a24fa5ffe90552)) - - +- add translations for every SCThing ([f847a2a](https://gitlab.com/openstapps/core/commit/f847a2aa0cf576e2fd79197cdc7795638d929136)) +- rename properties floor and message so that they are not identical to SCThingTypes ([78b64ba](https://gitlab.com/openstapps/core/commit/78b64bae08d9ca12badaedf921a24fa5ffe90552)) # [0.19.0](https://gitlab.com/openstapps/core/compare/v0.18.0...v0.19.0) (2019-05-17) - ### Bug Fixes -* add thing without references, split thing ([da0507e](https://gitlab.com/openstapps/core/commit/da0507ee341af75cd15dddeeb3f4cbe08899434c)), closes [#69](https://gitlab.com/openstapps/core/issues/69) -* adjust model to remove references from things without references ([ca72c20](https://gitlab.com/openstapps/core/commit/ca72c20bd098032745ed0eb6978902b6ff6feac5)), closes [#69](https://gitlab.com/openstapps/core/issues/69) -* remove references from origins ([1d6a2b7](https://gitlab.com/openstapps/core/commit/1d6a2b7841e9c38e68c9e5c718377a9c04fe50d6)), closes [#69](https://gitlab.com/openstapps/core/issues/69) - - +- add thing without references, split thing ([da0507e](https://gitlab.com/openstapps/core/commit/da0507ee341af75cd15dddeeb3f4cbe08899434c)), closes [#69](https://gitlab.com/openstapps/core/issues/69) +- adjust model to remove references from things without references ([ca72c20](https://gitlab.com/openstapps/core/commit/ca72c20bd098032745ed0eb6978902b6ff6feac5)), closes [#69](https://gitlab.com/openstapps/core/issues/69) +- remove references from origins ([1d6a2b7](https://gitlab.com/openstapps/core/commit/1d6a2b7841e9c38e68c9e5c718377a9c04fe50d6)), closes [#69](https://gitlab.com/openstapps/core/issues/69) # [0.18.0](https://gitlab.com/openstapps/core/compare/v0.17.0...v0.18.0) (2019-05-14) - ### Features -* add study module interface ([d3790ad](https://gitlab.com/openstapps/core/commit/d3790adbd82417923d79b4a5a35c74fcaab3e050)) - - +- add study module interface ([d3790ad](https://gitlab.com/openstapps/core/commit/d3790adbd82417923d79b4a5a35c74fcaab3e050)) # [0.17.0](https://gitlab.com/openstapps/core/compare/v0.16.0...v0.17.0) (2019-04-16) - - # [0.16.0](https://gitlab.com/openstapps/core/compare/v0.15.0...v0.16.0) (2019-04-15) - - # [0.15.0](https://gitlab.com/openstapps/core/compare/v0.14.0...v0.15.0) (2019-04-09) - ### Bug Fixes -* change SCThingMeta getInstance() return value ([4986042](https://gitlab.com/openstapps/core/commit/4986042428e24a04b73fb03d71c01353588419a7)) -* resolve issues with things that can be offered ([623ed61](https://gitlab.com/openstapps/core/commit/623ed613a9405b53a86a33c13d48bc49d48de1ce)), closes [#41](https://gitlab.com/openstapps/core/issues/41) - +- change SCThingMeta getInstance() return value ([4986042](https://gitlab.com/openstapps/core/commit/4986042428e24a04b73fb03d71c01353588419a7)) +- resolve issues with things that can be offered ([623ed61](https://gitlab.com/openstapps/core/commit/623ed613a9405b53a86a33c13d48bc49d48de1ce)), closes [#41](https://gitlab.com/openstapps/core/issues/41) ### Features -* provide context based search ([3242411](https://gitlab.com/openstapps/core/commit/324241176849b338bee9f5d1dcaf1109f47a8bb9)) - - +- provide context based search ([3242411](https://gitlab.com/openstapps/core/commit/324241176849b338bee9f5d1dcaf1109f47a8bb9)) # [0.14.0](https://gitlab.com/openstapps/core/compare/v0.13.0...v0.14.0) (2019-04-03) - ### Features -* add model for plugin register route ([8188731](https://gitlab.com/openstapps/core/commit/81887315f8c3038ec37c2197db8e193da835f6fc)) - - +- add model for plugin register route ([8188731](https://gitlab.com/openstapps/core/commit/81887315f8c3038ec37c2197db8e193da835f6fc)) # [0.13.0](https://gitlab.com/openstapps/core/compare/v0.12.0...v0.13.0) (2019-04-02) - ### Bug Fixes -* correct isThing guard ([67868e9](https://gitlab.com/openstapps/core/commit/67868e9eb810de94ca0bb6e1298799ee3f550145)) -* update tslint dependencies ([bbe4fca](https://gitlab.com/openstapps/core/commit/bbe4fcac42c21c68b5c6aa6bcf9bbdecfdf84de7)) - +- correct isThing guard ([67868e9](https://gitlab.com/openstapps/core/commit/67868e9eb810de94ca0bb6e1298799ee3f550145)) +- update tslint dependencies ([bbe4fca](https://gitlab.com/openstapps/core/commit/bbe4fcac42c21c68b5c6aa6bcf9bbdecfdf84de7)) ### Features -* add conditional "maps" for associated types ([c8bda2e](https://gitlab.com/openstapps/core/commit/c8bda2eae7f44ec4a284cc26fc85051a9a45e192)), closes [#50](https://gitlab.com/openstapps/core/issues/50) -* provide sample JSON files with the package ([5d1e79d](https://gitlab.com/openstapps/core/commit/5d1e79d4879e6ce8f43d4cebb9d8c8500d5d16b7)), closes [#46](https://gitlab.com/openstapps/core/issues/46) - - +- add conditional "maps" for associated types ([c8bda2e](https://gitlab.com/openstapps/core/commit/c8bda2eae7f44ec4a284cc26fc85051a9a45e192)), closes [#50](https://gitlab.com/openstapps/core/issues/50) +- provide sample JSON files with the package ([5d1e79d](https://gitlab.com/openstapps/core/commit/5d1e79d4879e6ce8f43d4cebb9d8c8500d5d16b7)), closes [#46](https://gitlab.com/openstapps/core/issues/46) # [0.12.0](https://gitlab.com/openstapps/core/compare/v0.11.0...v0.12.0) (2019-03-14) - ### Bug Fixes -* add todo to SCThingsWithoutDiff and SCClasses ([9a49442](https://gitlab.com/openstapps/core/commit/9a49442902a9f49439083a9197bd9f0a231d007d)), closes [#39](https://gitlab.com/openstapps/core/issues/39) - +- add todo to SCThingsWithoutDiff and SCClasses ([9a49442](https://gitlab.com/openstapps/core/commit/9a49442902a9f49439083a9197bd9f0a231d007d)), closes [#39](https://gitlab.com/openstapps/core/issues/39) ### Features -* add SCThingTranslator class. move functionality accordingly ([90e3d22](https://gitlab.com/openstapps/core/commit/90e3d2239921bbfcea27b64aef9344ffee270b6d)) - - +- add SCThingTranslator class. move functionality accordingly ([90e3d22](https://gitlab.com/openstapps/core/commit/90e3d2239921bbfcea27b64aef9344ffee270b6d)) # [0.11.0](https://gitlab.com/openstapps/core/compare/v0.10.0...v0.11.0) (2019-02-21) - ### Features -* add laboratory and computer as room categories ([a0ab72e](https://gitlab.com/openstapps/core/commit/a0ab72e597f6a14cfc0bd8935e1ef765b86b90f7)), closes [#33](https://gitlab.com/openstapps/core/issues/33) -* add maxRequestBodySize in backend configuration ([b5bd09e](https://gitlab.com/openstapps/core/commit/b5bd09e40bfb49463815538ebaa44ff53b5d7b92)) - - +- add laboratory and computer as room categories ([a0ab72e](https://gitlab.com/openstapps/core/commit/a0ab72e597f6a14cfc0bd8935e1ef765b86b90f7)), closes [#33](https://gitlab.com/openstapps/core/issues/33) +- add maxRequestBodySize in backend configuration ([b5bd09e](https://gitlab.com/openstapps/core/commit/b5bd09e40bfb49463815538ebaa44ff53b5d7b92)) # [0.10.0](https://gitlab.com/openstapps/core/compare/v0.9.0...v0.10.0) (2019-02-18) - ### Features -* add model for requestBodyTooLargeError ([bc3a0f6](https://gitlab.com/openstapps/core/commit/bc3a0f6d11cba836a55cbd5787d68cfe655b68a6)) - - +- add model for requestBodyTooLargeError ([bc3a0f6](https://gitlab.com/openstapps/core/commit/bc3a0f6d11cba836a55cbd5787d68cfe655b68a6)) # [0.9.0](https://gitlab.com/openstapps/core/compare/v0.8.0...v0.9.0) (2019-02-14) - - # [0.8.0](https://gitlab.com/openstapps/core/compare/v0.7.0...v0.8.0) (2019-02-13) - ### Features -* add config for maximum queries ([c7ab473](https://gitlab.com/openstapps/core/commit/c7ab47397e2a33b1c460b9038cbf53fec148316d)) - - +- add config for maximum queries ([c7ab473](https://gitlab.com/openstapps/core/commit/c7ab47397e2a33b1c460b9038cbf53fec148316d)) # [0.7.0](https://gitlab.com/openstapps/core/compare/v0.6.0...v0.7.0) (2019-02-13) - - # [0.6.0](https://gitlab.com/openstapps/core/compare/v0.5.0...v0.6.0) (2019-02-07) - - # [0.5.0](https://gitlab.com/openstapps/core/compare/v0.4.0...v0.5.0) (2019-02-06) - ### Features -* add model for syntax error ([a3f9fcb](https://gitlab.com/openstapps/core/commit/a3f9fcbfb0c35206adabc95792de076518f604f7)) - - +- add model for syntax error ([a3f9fcb](https://gitlab.com/openstapps/core/commit/a3f9fcbfb0c35206adabc95792de076518f604f7)) # [0.4.0](https://gitlab.com/openstapps/core/compare/v0.3.0...v0.4.0) (2019-01-31) - ### Features -* add draft of todo ([2860a11](https://gitlab.com/openstapps/core/commit/2860a11b618081ab88ecb1780a280cab37217a0e)) - - +- add draft of todo ([2860a11](https://gitlab.com/openstapps/core/commit/2860a11b618081ab88ecb1780a280cab37217a0e)) # [0.3.0](https://gitlab.com/openstapps/core/compare/v0.2.0...v0.3.0) (2019-01-25) - ### Bug Fixes -* set larger v8 stack size ([d3d08e7](https://gitlab.com/openstapps/core/commit/d3d08e7735808d4eae5aab4b263e36047c608679)) - +- set larger v8 stack size ([d3d08e7](https://gitlab.com/openstapps/core/commit/d3d08e7735808d4eae5aab4b263e36047c608679)) ### Features -* add different origin types: remote and user ([13a4965](https://gitlab.com/openstapps/core/commit/13a49650c4498f6edbe17c9de3598e0180b866da)), closes [#12](https://gitlab.com/openstapps/core/issues/12) -* add saveable thing for saving user/client data ([a4f3fab](https://gitlab.com/openstapps/core/commit/a4f3fab033ca18352c0119061f2d0e64252d4bbb)), closes [#12](https://gitlab.com/openstapps/core/issues/12) - - +- add different origin types: remote and user ([13a4965](https://gitlab.com/openstapps/core/commit/13a49650c4498f6edbe17c9de3598e0180b866da)), closes [#12](https://gitlab.com/openstapps/core/issues/12) +- add saveable thing for saving user/client data ([a4f3fab](https://gitlab.com/openstapps/core/commit/a4f3fab033ca18352c0119061f2d0e64252d4bbb)), closes [#12](https://gitlab.com/openstapps/core/issues/12) # [0.2.0](https://gitlab.com/openstapps/core/compare/v0.1.0...v0.2.0) (2019-01-09) - ### Features -* use tag [@validatable](https://gitlab.com/validatable) to mark schema types ([7f248ee](https://gitlab.com/openstapps/core/commit/7f248eea13c732a95c4ee8e1bc91afeee52e8c2d)) - - +- use tag [@validatable](https://gitlab.com/validatable) to mark schema types ([7f248ee](https://gitlab.com/openstapps/core/commit/7f248eea13c732a95c4ee8e1bc91afeee52e8c2d)) # [0.1.0](https://gitlab.com/openstapps/core/compare/v0.0.2...v0.1.0) (2018-12-17) - ### Features -* add base scheme for academic degrees ([85c8fc4](https://gitlab.com/openstapps/core/commit/85c8fc49c14b0ce45cf0cfdaf46c1ebe43b23ec7)) -* add schema for course of studies ([2d4a76a](https://gitlab.com/openstapps/core/commit/2d4a76a555603a395c81a7a92ce5d95ed04de9de)) -* add tool to generate documentation for routes ([1a07df2](https://gitlab.com/openstapps/core/commit/1a07df2d676895264f43b0138645d7c13f60c9db)) - - +- add base scheme for academic degrees ([85c8fc4](https://gitlab.com/openstapps/core/commit/85c8fc49c14b0ce45cf0cfdaf46c1ebe43b23ec7)) +- add schema for course of studies ([2d4a76a](https://gitlab.com/openstapps/core/commit/2d4a76a555603a395c81a7a92ce5d95ed04de9de)) +- add tool to generate documentation for routes ([1a07df2](https://gitlab.com/openstapps/core/commit/1a07df2d676895264f43b0138645d7c13f60c9db)) ## [0.0.2](https://gitlab.com/openstapps/core/compare/v0.0.1...v0.0.2) (2018-11-29) - - ## [0.0.1](https://gitlab.com/openstapps/core/compare/2d770dde4464dc4cf4cdc29927aa4e4382914148...v0.0.1) (2018-11-29) - ### Features -* add core ([2d770dd](https://gitlab.com/openstapps/core/commit/2d770dde4464dc4cf4cdc29927aa4e4382914148)) - - - +- add core ([2d770dd](https://gitlab.com/openstapps/core/commit/2d770dde4464dc4cf4cdc29927aa4e4382914148)) diff --git a/packages/core/LICENSE b/packages/core/LICENSE deleted file mode 100644 index 9df63ccc..00000000 --- a/packages/core/LICENSE +++ /dev/null @@ -1,200 +0,0 @@ -GNU GENERAL PUBLIC LICENSE -Version 3, 29 June 2007 - -Copyright © 2007 Free Software Foundation, Inc. - -Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. - -Preamble - -The GNU General Public License is a free, copyleft license for software and other kinds of works. - -The licenses for most software and other practical works are designed to take away your freedom to share and change the works. By contrast, the GNU General Public License is intended to guarantee your freedom to share and change all versions of a program--to make sure it remains free software for all its users. We, the Free Software Foundation, use the GNU General Public License for most of our software; it applies also to any other work released this way by its authors. You can apply it to your programs, too. - -When we speak of free software, we are referring to freedom, not price. Our General Public Licenses are designed to make sure that you have the freedom to distribute copies of free software (and charge for them if you wish), that you receive source code or can get it if you want it, that you can change the software or use pieces of it in new free programs, and that you know you can do these things. - -To protect your rights, we need to prevent others from denying you these rights or asking you to surrender the rights. Therefore, you have certain responsibilities if you distribute copies of the software, or if you modify it: responsibilities to respect the freedom of others. - -For example, if you distribute copies of such a program, whether gratis or for a fee, you must pass on to the recipients the same freedoms that you received. You must make sure that they, too, receive or can get the source code. And you must show them these terms so they know their rights. - -Developers that use the GNU GPL protect your rights with two steps: (1) assert copyright on the software, and (2) offer you this License giving you legal permission to copy, distribute and/or modify it. - -For the developers' and authors' protection, the GPL clearly explains that there is no warranty for this free software. For both users' and authors' sake, the GPL requires that modified versions be marked as changed, so that their problems will not be attributed erroneously to authors of previous versions. - -Some devices are designed to deny users access to install or run modified versions of the software inside them, although the manufacturer can do so. This is fundamentally incompatible with the aim of protecting users' freedom to change the software. The systematic pattern of such abuse occurs in the area of products for individuals to use, which is precisely where it is most unacceptable. Therefore, we have designed this version of the GPL to prohibit the practice for those products. If such problems arise substantially in other domains, we stand ready to extend this provision to those domains in future versions of the GPL, as needed to protect the freedom of users. - -Finally, every program is threatened constantly by software patents. States should not allow patents to restrict development and use of software on general-purpose computers, but in those that do, we wish to avoid the special danger that patents applied to a free program could make it effectively proprietary. To prevent this, the GPL assures that patents cannot be used to render the program non-free. - -The precise terms and conditions for copying, distribution and modification follow. - -TERMS AND CONDITIONS - -0. Definitions. -"This License" refers to version 3 of the GNU General Public License. - -"Copyright" also means copyright-like laws that apply to other kinds of works, such as semiconductor masks. - -"The Program" refers to any copyrightable work licensed under this License. Each licensee is addressed as "you". "Licensees" and "recipients" may be individuals or organizations. - -To "modify" a work means to copy from or adapt all or part of the work in a fashion requiring copyright permission, other than the making of an exact copy. The resulting work is called a "modified version" of the earlier work or a work "based on" the earlier work. - -A "covered work" means either the unmodified Program or a work based on the Program. - -To "propagate" a work means to do anything with it that, without permission, would make you directly or secondarily liable for infringement under applicable copyright law, except executing it on a computer or modifying a private copy. Propagation includes copying, distribution (with or without modification), making available to the public, and in some countries other activities as well. - -To "convey" a work means any kind of propagation that enables other parties to make or receive copies. Mere interaction with a user through a computer network, with no transfer of a copy, is not conveying. - -An interactive user interface displays "Appropriate Legal Notices" to the extent that it includes a convenient and prominently visible feature that (1) displays an appropriate copyright notice, and (2) tells the user that there is no warranty for the work (except to the extent that warranties are provided), that licensees may convey the work under this License, and how to view a copy of this License. If the interface presents a list of user commands or options, such as a menu, a prominent item in the list meets this criterion. - -1. Source Code. -The "source code" for a work means the preferred form of the work for making modifications to it. "Object code" means any non-source form of a work. -A "Standard Interface" means an interface that either is an official standard defined by a recognized standards body, or, in the case of interfaces specified for a particular programming language, one that is widely used among developers working in that language. - -The "System Libraries" of an executable work include anything, other than the work as a whole, that (a) is included in the normal form of packaging a Major Component, but which is not part of that Major Component, and (b) serves only to enable use of the work with that Major Component, or to implement a Standard Interface for which an implementation is available to the public in source code form. A "Major Component", in this context, means a major essential component (kernel, window system, and so on) of the specific operating system (if any) on which the executable work runs, or a compiler used to produce the work, or an object code interpreter used to run it. - -The "Corresponding Source" for a work in object code form means all the source code needed to generate, install, and (for an executable work) run the object code and to modify the work, including scripts to control those activities. However, it does not include the work's System Libraries, or general-purpose tools or generally available free programs which are used unmodified in performing those activities but which are not part of the work. For example, Corresponding Source includes interface definition files associated with source files for the work, and the source code for shared libraries and dynamically linked subprograms that the work is specifically designed to require, such as by intimate data communication or control flow between those subprograms and other parts of the work. - -The Corresponding Source need not include anything that users can regenerate automatically from other parts of the Corresponding Source. - -The Corresponding Source for a work in source code form is that same work. - -2. Basic Permissions. -All rights granted under this License are granted for the term of copyright on the Program, and are irrevocable provided the stated conditions are met. This License explicitly affirms your unlimited permission to run the unmodified Program. The output from running a covered work is covered by this License only if the output, given its content, constitutes a covered work. This License acknowledges your rights of fair use or other equivalent, as provided by copyright law. -You may make, run and propagate covered works that you do not convey, without conditions so long as your license otherwise remains in force. You may convey covered works to others for the sole purpose of having them make modifications exclusively for you, or provide you with facilities for running those works, provided that you comply with the terms of this License in conveying all material for which you do not control copyright. Those thus making or running the covered works for you must do so exclusively on your behalf, under your direction and control, on terms that prohibit them from making any copies of your copyrighted material outside their relationship with you. - -Conveying under any other circumstances is permitted solely under the conditions stated below. Sublicensing is not allowed; section 10 makes it unnecessary. - -3. Protecting Users' Legal Rights From Anti-Circumvention Law. -No covered work shall be deemed part of an effective technological measure under any applicable law fulfilling obligations under article 11 of the WIPO copyright treaty adopted on 20 December 1996, or similar laws prohibiting or restricting circumvention of such measures. -When you convey a covered work, you waive any legal power to forbid circumvention of technological measures to the extent such circumvention is effected by exercising rights under this License with respect to the covered work, and you disclaim any intention to limit operation or modification of the work as a means of enforcing, against the work's users, your or third parties' legal rights to forbid circumvention of technological measures. - -4. Conveying Verbatim Copies. -You may convey verbatim copies of the Program's source code as you receive it, in any medium, provided that you conspicuously and appropriately publish on each copy an appropriate copyright notice; keep intact all notices stating that this License and any non-permissive terms added in accord with section 7 apply to the code; keep intact all notices of the absence of any warranty; and give all recipients a copy of this License along with the Program. -You may charge any price or no price for each copy that you convey, and you may offer support or warranty protection for a fee. - -5. Conveying Modified Source Versions. -You may convey a work based on the Program, or the modifications to produce it from the Program, in the form of source code under the terms of section 4, provided that you also meet all of these conditions: -a) The work must carry prominent notices stating that you modified it, and giving a relevant date. -b) The work must carry prominent notices stating that it is released under this License and any conditions added under section 7. This requirement modifies the requirement in section 4 to "keep intact all notices". -c) You must license the entire work, as a whole, under this License to anyone who comes into possession of a copy. This License will therefore apply, along with any applicable section 7 additional terms, to the whole of the work, and all its parts, regardless of how they are packaged. This License gives no permission to license the work in any other way, but it does not invalidate such permission if you have separately received it. -d) If the work has interactive user interfaces, each must display Appropriate Legal Notices; however, if the Program has interactive interfaces that do not display Appropriate Legal Notices, your work need not make them do so. -A compilation of a covered work with other separate and independent works, which are not by their nature extensions of the covered work, and which are not combined with it such as to form a larger program, in or on a volume of a storage or distribution medium, is called an "aggregate" if the compilation and its resulting copyright are not used to limit the access or legal rights of the compilation's users beyond what the individual works permit. Inclusion of a covered work in an aggregate does not cause this License to apply to the other parts of the aggregate. - -6. Conveying Non-Source Forms. -You may convey a covered work in object code form under the terms of sections 4 and 5, provided that you also convey the machine-readable Corresponding Source under the terms of this License, in one of these ways: -a) Convey the object code in, or embodied in, a physical product (including a physical distribution medium), accompanied by the Corresponding Source fixed on a durable physical medium customarily used for software interchange. -b) Convey the object code in, or embodied in, a physical product (including a physical distribution medium), accompanied by a written offer, valid for at least three years and valid for as long as you offer spare parts or customer support for that product model, to give anyone who possesses the object code either (1) a copy of the Corresponding Source for all the software in the product that is covered by this License, on a durable physical medium customarily used for software interchange, for a price no more than your reasonable cost of physically performing this conveying of source, or (2) access to copy the Corresponding Source from a network server at no charge. -c) Convey individual copies of the object code with a copy of the written offer to provide the Corresponding Source. This alternative is allowed only occasionally and noncommercially, and only if you received the object code with such an offer, in accord with subsection 6b. -d) Convey the object code by offering access from a designated place (gratis or for a charge), and offer equivalent access to the Corresponding Source in the same way through the same place at no further charge. You need not require recipients to copy the Corresponding Source along with the object code. If the place to copy the object code is a network server, the Corresponding Source may be on a different server (operated by you or a third party) that supports equivalent copying facilities, provided you maintain clear directions next to the object code saying where to find the Corresponding Source. Regardless of what server hosts the Corresponding Source, you remain obligated to ensure that it is available for as long as needed to satisfy these requirements. -e) Convey the object code using peer-to-peer transmission, provided you inform other peers where the object code and Corresponding Source of the work are being offered to the general public at no charge under subsection 6d. -A separable portion of the object code, whose source code is excluded from the Corresponding Source as a System Library, need not be included in conveying the object code work. - -A "User Product" is either (1) a "consumer product", which means any tangible personal property which is normally used for personal, family, or household purposes, or (2) anything designed or sold for incorporation into a dwelling. In determining whether a product is a consumer product, doubtful cases shall be resolved in favor of coverage. For a particular product received by a particular user, "normally used" refers to a typical or common use of that class of product, regardless of the status of the particular user or of the way in which the particular user actually uses, or expects or is expected to use, the product. A product is a consumer product regardless of whether the product has substantial commercial, industrial or non-consumer uses, unless such uses represent the only significant mode of use of the product. - -"Installation Information" for a User Product means any methods, procedures, authorization keys, or other information required to install and execute modified versions of a covered work in that User Product from a modified version of its Corresponding Source. The information must suffice to ensure that the continued functioning of the modified object code is in no case prevented or interfered with solely because modification has been made. - -If you convey an object code work under this section in, or with, or specifically for use in, a User Product, and the conveying occurs as part of a transaction in which the right of possession and use of the User Product is transferred to the recipient in perpetuity or for a fixed term (regardless of how the transaction is characterized), the Corresponding Source conveyed under this section must be accompanied by the Installation Information. But this requirement does not apply if neither you nor any third party retains the ability to install modified object code on the User Product (for example, the work has been installed in ROM). - -The requirement to provide Installation Information does not include a requirement to continue to provide support service, warranty, or updates for a work that has been modified or installed by the recipient, or for the User Product in which it has been modified or installed. Access to a network may be denied when the modification itself materially and adversely affects the operation of the network or violates the rules and protocols for communication across the network. - -Corresponding Source conveyed, and Installation Information provided, in accord with this section must be in a format that is publicly documented (and with an implementation available to the public in source code form), and must require no special password or key for unpacking, reading or copying. - -7. Additional Terms. -"Additional permissions" are terms that supplement the terms of this License by making exceptions from one or more of its conditions. Additional permissions that are applicable to the entire Program shall be treated as though they were included in this License, to the extent that they are valid under applicable law. If additional permissions apply only to part of the Program, that part may be used separately under those permissions, but the entire Program remains governed by this License without regard to the additional permissions. -When you convey a copy of a covered work, you may at your option remove any additional permissions from that copy, or from any part of it. (Additional permissions may be written to require their own removal in certain cases when you modify the work.) You may place additional permissions on material, added by you to a covered work, for which you have or can give appropriate copyright permission. - -Notwithstanding any other provision of this License, for material you add to a covered work, you may (if authorized by the copyright holders of that material) supplement the terms of this License with terms: - -a) Disclaiming warranty or limiting liability differently from the terms of sections 15 and 16 of this License; or -b) Requiring preservation of specified reasonable legal notices or author attributions in that material or in the Appropriate Legal Notices displayed by works containing it; or -c) Prohibiting misrepresentation of the origin of that material, or requiring that modified versions of such material be marked in reasonable ways as different from the original version; or -d) Limiting the use for publicity purposes of names of licensors or authors of the material; or -e) Declining to grant rights under trademark law for use of some trade names, trademarks, or service marks; or -f) Requiring indemnification of licensors and authors of that material by anyone who conveys the material (or modified versions of it) with contractual assumptions of liability to the recipient, for any liability that these contractual assumptions directly impose on those licensors and authors. -All other non-permissive additional terms are considered "further restrictions" within the meaning of section 10. If the Program as you received it, or any part of it, contains a notice stating that it is governed by this License along with a term that is a further restriction, you may remove that term. If a license document contains a further restriction but permits relicensing or conveying under this License, you may add to a covered work material governed by the terms of that license document, provided that the further restriction does not survive such relicensing or conveying. - -If you add terms to a covered work in accord with this section, you must place, in the relevant source files, a statement of the additional terms that apply to those files, or a notice indicating where to find the applicable terms. - -Additional terms, permissive or non-permissive, may be stated in the form of a separately written license, or stated as exceptions; the above requirements apply either way. - -8. Termination. -You may not propagate or modify a covered work except as expressly provided under this License. Any attempt otherwise to propagate or modify it is void, and will automatically terminate your rights under this License (including any patent licenses granted under the third paragraph of section 11). -However, if you cease all violation of this License, then your license from a particular copyright holder is reinstated (a) provisionally, unless and until the copyright holder explicitly and finally terminates your license, and (b) permanently, if the copyright holder fails to notify you of the violation by some reasonable means prior to 60 days after the cessation. - -Moreover, your license from a particular copyright holder is reinstated permanently if the copyright holder notifies you of the violation by some reasonable means, this is the first time you have received notice of violation of this License (for any work) from that copyright holder, and you cure the violation prior to 30 days after your receipt of the notice. - -Termination of your rights under this section does not terminate the licenses of parties who have received copies or rights from you under this License. If your rights have been terminated and not permanently reinstated, you do not qualify to receive new licenses for the same material under section 10. - -9. Acceptance Not Required for Having Copies. -You are not required to accept this License in order to receive or run a copy of the Program. Ancillary propagation of a covered work occurring solely as a consequence of using peer-to-peer transmission to receive a copy likewise does not require acceptance. However, nothing other than this License grants you permission to propagate or modify any covered work. These actions infringe copyright if you do not accept this License. Therefore, by modifying or propagating a covered work, you indicate your acceptance of this License to do so. -10. Automatic Licensing of Downstream Recipients. -Each time you convey a covered work, the recipient automatically receives a license from the original licensors, to run, modify and propagate that work, subject to this License. You are not responsible for enforcing compliance by third parties with this License. -An "entity transaction" is a transaction transferring control of an organization, or substantially all assets of one, or subdividing an organization, or merging organizations. If propagation of a covered work results from an entity transaction, each party to that transaction who receives a copy of the work also receives whatever licenses to the work the party's predecessor in interest had or could give under the previous paragraph, plus a right to possession of the Corresponding Source of the work from the predecessor in interest, if the predecessor has it or can get it with reasonable efforts. - -You may not impose any further restrictions on the exercise of the rights granted or affirmed under this License. For example, you may not impose a license fee, royalty, or other charge for exercise of rights granted under this License, and you may not initiate litigation (including a cross-claim or counterclaim in a lawsuit) alleging that any patent claim is infringed by making, using, selling, offering for sale, or importing the Program or any portion of it. - -11. Patents. -A "contributor" is a copyright holder who authorizes use under this License of the Program or a work on which the Program is based. The work thus licensed is called the contributor's "contributor version". -A contributor's "essential patent claims" are all patent claims owned or controlled by the contributor, whether already acquired or hereafter acquired, that would be infringed by some manner, permitted by this License, of making, using, or selling its contributor version, but do not include claims that would be infringed only as a consequence of further modification of the contributor version. For purposes of this definition, "control" includes the right to grant patent sublicenses in a manner consistent with the requirements of this License. - -Each contributor grants you a non-exclusive, worldwide, royalty-free patent license under the contributor's essential patent claims, to make, use, sell, offer for sale, import and otherwise run, modify and propagate the contents of its contributor version. - -In the following three paragraphs, a "patent license" is any express agreement or commitment, however denominated, not to enforce a patent (such as an express permission to practice a patent or covenant not to sue for patent infringement). To "grant" such a patent license to a party means to make such an agreement or commitment not to enforce a patent against the party. - -If you convey a covered work, knowingly relying on a patent license, and the Corresponding Source of the work is not available for anyone to copy, free of charge and under the terms of this License, through a publicly available network server or other readily accessible means, then you must either (1) cause the Corresponding Source to be so available, or (2) arrange to deprive yourself of the benefit of the patent license for this particular work, or (3) arrange, in a manner consistent with the requirements of this License, to extend the patent license to downstream recipients. "Knowingly relying" means you have actual knowledge that, but for the patent license, your conveying the covered work in a country, or your recipient's use of the covered work in a country, would infringe one or more identifiable patents in that country that you have reason to believe are valid. - -If, pursuant to or in connection with a single transaction or arrangement, you convey, or propagate by procuring conveyance of, a covered work, and grant a patent license to some of the parties receiving the covered work authorizing them to use, propagate, modify or convey a specific copy of the covered work, then the patent license you grant is automatically extended to all recipients of the covered work and works based on it. - -A patent license is "discriminatory" if it does not include within the scope of its coverage, prohibits the exercise of, or is conditioned on the non-exercise of one or more of the rights that are specifically granted under this License. You may not convey a covered work if you are a party to an arrangement with a third party that is in the business of distributing software, under which you make payment to the third party based on the extent of your activity of conveying the work, and under which the third party grants, to any of the parties who would receive the covered work from you, a discriminatory patent license (a) in connection with copies of the covered work conveyed by you (or copies made from those copies), or (b) primarily for and in connection with specific products or compilations that contain the covered work, unless you entered into that arrangement, or that patent license was granted, prior to 28 March 2007. - -Nothing in this License shall be construed as excluding or limiting any implied license or other defenses to infringement that may otherwise be available to you under applicable patent law. - -12. No Surrender of Others' Freedom. -If conditions are imposed on you (whether by court order, agreement or otherwise) that contradict the conditions of this License, they do not excuse you from the conditions of this License. If you cannot convey a covered work so as to satisfy simultaneously your obligations under this License and any other pertinent obligations, then as a consequence you may not convey it at all. For example, if you agree to terms that obligate you to collect a royalty for further conveying from those to whom you convey the Program, the only way you could satisfy both those terms and this License would be to refrain entirely from conveying the Program. -13. Use with the GNU Affero General Public License. -Notwithstanding any other provision of this License, you have permission to link or combine any covered work with a work licensed under version 3 of the GNU Affero General Public License into a single combined work, and to convey the resulting work. The terms of this License will continue to apply to the part which is the covered work, but the special requirements of the GNU Affero General Public License, section 13, concerning interaction through a network will apply to the combination as such. -14. Revised Versions of this License. -The Free Software Foundation may publish revised and/or new versions of the GNU General Public License from time to time. Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns. -Each version is given a distinguishing version number. If the Program specifies that a certain numbered version of the GNU General Public License "or any later version" applies to it, you have the option of following the terms and conditions either of that numbered version or of any later version published by the Free Software Foundation. If the Program does not specify a version number of the GNU General Public License, you may choose any version ever published by the Free Software Foundation. - -If the Program specifies that a proxy can decide which future versions of the GNU General Public License can be used, that proxy's public statement of acceptance of a version permanently authorizes you to choose that version for the Program. - -Later license versions may give you additional or different permissions. However, no additional obligations are imposed on any author or copyright holder as a result of your choosing to follow a later version. - -15. Disclaimer of Warranty. -THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. -16. Limitation of Liability. -IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. -17. Interpretation of Sections 15 and 16. -If the disclaimer of warranty and limitation of liability provided above cannot be given local legal effect according to their terms, reviewing courts shall apply local law that most closely approximates an absolute waiver of all civil liability in connection with the Program, unless a warranty or assumption of liability accompanies a copy of the Program in return for a fee. - -END OF TERMS AND CONDITIONS - -How to Apply These Terms to Your New Programs - -If you develop a new program, and you want it to be of the greatest possible use to the public, the best way to achieve this is to make it free software which everyone can redistribute and change under these terms. - -To do so, attach the following notices to the program. It is safest to attach them to the start of each source file to most effectively state the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found. - - -Copyright (C) - -This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. - -This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - -You should have received a copy of the GNU General Public License along with this program. If not, see . - -Also add information on how to contact you by electronic and paper mail. - -If the program does terminal interaction, make it output a short notice like this when it starts in an interactive mode: - - Copyright (C) -This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. -This is free software, and you are welcome to redistribute it under certain conditions; type `show c' for details. - -The hypothetical commands `show w' and `show c' should show the appropriate parts of the General Public License. Of course, your program's commands might be different; for a GUI interface, you would use an "about box". - -You should also get your employer (if you work as a programmer) or school, if any, to sign a "copyright disclaimer" for the program, if necessary. For more information on this, and how to apply and follow the GNU GPL, see . - -The GNU General Public License does not permit incorporating your program into proprietary programs. If your program is a subroutine library, you may consider it more useful to permit linking proprietary applications with the library. If this is what you want to do, use the GNU Lesser General Public License instead of this License. But first, please read . diff --git a/packages/core/README.md b/packages/core/README.md index 4a497585..4aeeae08 100644 --- a/packages/core/README.md +++ b/packages/core/README.md @@ -1,6 +1,6 @@ # @openstapps/core -[![pipeline status](https://img.shields.io/gitlab/pipeline/openstapps/core.svg?style=flat-square)](https://gitlab.com/openstapps/core/commits/master) +[![pipeline status](https://img.shields.io/gitlab/pipeline/openstapps/core.svg?style=flat-square)](https://gitlab.com/openstapps/core/commits/master) [![npm](https://img.shields.io/npm/v/@openstapps/core.svg?style=flat-square)](https://npmjs.com/package/@openstapps/core) [![license)](https://img.shields.io/npm/l/@openstapps/core.svg?style=flat-square)](https://www.gnu.org/licenses/gpl-3.0.en.html) [![documentation](https://img.shields.io/badge/documentation-online-blue.svg?style=flat-square)](https://openstapps.gitlab.io/core) diff --git a/packages/core/package.json b/packages/core/package.json index fbe03868..ac53f046 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -17,28 +17,28 @@ "Rainer Killinger ", "Roman Klopsch", "Sebastian Lange", - "Thea Schöbl" + "Thea Schöbl " + ], + "keywords": [ + "Model", + "StApps" ], "main": "./lib/index.js", "types": "./lib/index.d.ts", "scripts": { - "build": "pnpm run compile && pnpm run schema && pnpm run mappings", - "changelog": "conventional-changelog -p angular -i CHANGELOG.md -s -r 0 && git add CHANGELOG.md", - "check-configuration": "openstapps-configuration", - "compile": "rimraf lib && tsc", - "documentation": "typedoc --name \"@openstapps/core\" --includeVersion --out docs --readme README.md --listInvalidSymbolLinks --entryPointStrategy expand src", + "build": "tsup --dts", + "format": "prettier .", + "format:fix": "prettier --write .", "lint": "eslint --ext .ts src/", + "lint:fix": "eslint --fix --ext .ts src/", "mappings": "openstapps-es-mapping-generator mapping ../core/src -i minlength,pattern,see,tjs-format -m lib/mappings/mappings.json -a lib/mappings/aggregations.json", "mappings-integration": "openstapps-es-mapping-generator put-es-templates lib/mappings/mappings.json http://elasticsearch:9200/", - "prepublishOnly": "npm ci && npm run build", - "preversion": "npm run prepublishOnly", - "push": "git push && git push origin \"v$npm_package_version\"", "schema": "node --max-old-space-size=8192 --stack-size=10240 ./node_modules/@openstapps/core-tools/lib/cli.js schema src lib/schema", - "test": "nyc mocha --recursive 'test/*.spec.ts'", - "version": "npm run changelog" + "test": "nyc mocha --recursive 'test/*.spec.ts'" }, "dependencies": { "@openstapps/core-tools": "workspace:*", + "@types/geojson": "1.0.6", "fast-deep-equal": "3.1.3", "http-status-codes": "2.2.0", "json-patch": "0.7.0", @@ -46,78 +46,81 @@ "rfdc": "1.3.0" }, "devDependencies": { - "@openstapps/configuration": "workspace:*", "@openstapps/es-mapping-generator": "workspace:*", "@openstapps/eslint-config": "workspace:*", "@openstapps/logger": "workspace:*", + "@openstapps/prettier-config": "workspace:*", + "@openstapps/tsconfig": "workspace:*", "@testdeck/mocha": "0.3.3", "@types/chai": "4.3.4", - "@types/geojson": "1.0.6", "@types/json-patch": "0.0.30", "@types/json-schema": "7.0.11", "@types/mocha": "10.0.1", "@types/node": "18.15.3", - "@types/rimraf": "3.0.2", "@typescript-eslint/eslint-plugin": "5.49.0", "@typescript-eslint/parser": "5.49.0", "chai": "4.3.7", "conditional-type-checks": "1.0.6", - "conventional-changelog-cli": "2.2.2", - "eslint": "8.33.0", - "eslint-config-prettier": "8.6.0", - "eslint-plugin-jsdoc": "39.7.4", - "eslint-plugin-prettier": "4.2.1", - "eslint-plugin-unicorn": "45.0.2", "mocha": "10.2.0", "nyc": "15.1.0", - "prettier": "2.8.3", "rimraf": "4.4.0", "source-map-support": "0.5.21", "surge": "0.23.1", "ts-node": "10.9.1", - "typedoc": "0.23.26", + "tsup": "6.7.0", "typescript": "4.8.4" }, + "tsup": { + "entry": [ + "src/index.ts" + ], + "sourcemap": true, + "clean": true, + "format": "esm", + "outDir": "lib" + }, "prettier": "@openstapps/prettier-config", - "keywords": [ - "Model", - "StApps" + "eslintConfig": { + "extends": [ + "@openstapps" + ], + "rules": { + "@typescript-eslint/no-empty-interface": "off", + "jsdoc/check-tag-names": [ + "error", + { + "definedTags": [ + "internal", + "aggregatable", + "float", + "indexable", + "integer", + "keyword", + "sortable", + "text", + "date", + "validatable", + "filterable", + "inheritTags", + "minLength", + "pattern", + "typeparam", + "TJS-format" + ] + } + ] + } + }, + "eslintIgnore": [ + "resources", + "openapi" ], "nyc": { - "all": true, - "branches": 90, - "check-coverage": true, - "exclude": [], - "extension": [ - ".ts" - ], - "functions": 95, - "include": [ - "src/protocol/route.ts", - "src/things/abstract/thing.ts", - "src/things/abstract/thing-that-can-be-offered.ts", - "src/things/abstract/thing-with-categories.ts", - "src/translator.ts", - "src/guards.ts" - ], - "lines": 95, - "per-file": true, - "reporter": [ - "cobertura", - "html", - "text-summary" - ], - "require": [ - "ts-node/register" - ], - "statements": 95 + "extends": "@openstapps/nyc-config" }, - "openstappsConfiguration": { - "hasCli": false, - "ignoreCiEntries": [ - "build" - ], - "standardBuild": false, - "standardDocumentation": false + "openstapps-configuration": { + "overrides": [ + "lint" + ] } } diff --git a/packages/core/src/protocol/errors/validation.ts b/packages/core/src/protocol/errors/validation.ts index 421fd1fe..7afbc24a 100644 --- a/packages/core/src/protocol/errors/validation.ts +++ b/packages/core/src/protocol/errors/validation.ts @@ -12,7 +12,7 @@ * You should have received a copy of the GNU General Public License along with * this program. If not, see . */ -import {ValidationError} from '@openstapps/core-tools/lib/types/validator.js'; +import {ValidationError} from '@openstapps/core-tools'; import {StatusCodes} from 'http-status-codes'; import {SCError} from '../error.js'; diff --git a/packages/core/src/translator.ts b/packages/core/src/translator.ts index a241ffc2..29e043e5 100644 --- a/packages/core/src/translator.ts +++ b/packages/core/src/translator.ts @@ -13,8 +13,8 @@ * You should have received a copy of the GNU General Public License along with * this program. If not, see . */ -import equal = require('fast-deep-equal/es6'); -import clone = require('rfdc'); +import equal from 'fast-deep-equal/es6'; +import clone from 'rfdc'; import {SCLanguageCode} from './general/i18n.js'; import {isThing} from './guards.js'; import {SCClasses} from './meta.js'; @@ -92,12 +92,11 @@ export class SCThingTranslator { * @returns a T object allowing for access to translations or a translated value(s) */ private deeptranslate(data: T): T { - return typeof data === 'object' ? new Proxy( - data as never, - { - get: (target, key) => this.deeptranslate(target[key as never]), - }, - ) as unknown as T : data; + return typeof data === 'object' + ? (new Proxy(data as never, { + get: (target, key) => this.deeptranslate(target[key as never]), + }) as unknown as T) + : data; } /** @@ -254,25 +253,22 @@ export class SCThingTranslator { * @returns an TSOCType object allowing for access to translations or a translated value(s) */ public translatedAccess(thing: T): T { - return new Proxy( - thing, - { - get: (target, key) => { - const object: any = target; - if (equal(this.sourceCache.get(thing), thing)) { - const objectTranslatedFromCache = this.cache.get(thing); - if (objectTranslatedFromCache !== undefined) { - return this.deeptranslate((objectTranslatedFromCache as any)[key]); - } + return new Proxy(thing, { + get: (target, key) => { + const object: any = target; + if (equal(this.sourceCache.get(thing), thing)) { + const objectTranslatedFromCache = this.cache.get(thing); + if (objectTranslatedFromCache !== undefined) { + return this.deeptranslate((objectTranslatedFromCache as any)[key]); } - const objectTranslated = this.translateThingInPlaceDestructively(clone()(object)); - this.cache.putObject(objectTranslated); - this.sourceCache.putObject(thing); + } + const objectTranslated = this.translateThingInPlaceDestructively(clone()(object)); + this.cache.putObject(objectTranslated); + this.sourceCache.putObject(thing); - return this.deeptranslate(objectTranslated[key]); - }, + return this.deeptranslate(objectTranslated[key]); }, - ); + }); } /** diff --git a/packages/core/tsconfig.json b/packages/core/tsconfig.json index 066a5f38..579a39ff 100644 --- a/packages/core/tsconfig.json +++ b/packages/core/tsconfig.json @@ -1,3 +1,3 @@ { - "extends": "./node_modules/@openstapps/configuration/tsconfig.json" + "extends": "@openstapps/tsconfig" } diff --git a/packages/easy-ast/README.md b/packages/easy-ast/README.md new file mode 100644 index 00000000..7ed1d158 --- /dev/null +++ b/packages/easy-ast/README.md @@ -0,0 +1,8 @@ +# What is Easy AST? + +Easy [AST](https://en.wikipedia.org/wiki/Abstract_syntax_tree) is a "wrapper" around the TypeScript Compiler API. The TS Compiler API is built for many +much more complex things than just accessing type declarations, and thus comes with a ton of +bloat that makes it really difficult to work with. + +This is why we built the Easy AST, which converts the TS representation to a really easy and +lightweight structure, that removes a lot of the stuff you wouldn't really need. diff --git a/packages/easy-ast/package.json b/packages/easy-ast/package.json new file mode 100644 index 00000000..051e6169 --- /dev/null +++ b/packages/easy-ast/package.json @@ -0,0 +1,61 @@ +{ + "name": "@openstapps/easy-ast", + "description": "Tool to easily handle TypeScript AST", + "version": "2.1.0", + "type": "module", + "license": "GPL-3.0-only", + "repository": "git@gitlab.com:openstapps/core-tools.git", + "author": "Thea Schöbl ", + "main": "./lib/index.js", + "types": "./lib/index.d.ts", + "scripts": { + "build": "tsup --dts", + "format": "prettier .", + "format:fix": "prettier --write .", + "lint": "eslint --ext .ts src/", + "lint:fix": "eslint --fix --ext .ts src/", + "test": "nyc mocha 'test/**/*.spec.ts'" + }, + "dependencies": { + "@openstapps/collection-utils": "workspace:*", + "@openstapps/logger": "workspace:*", + "typescript": "4.8.4" + }, + "devDependencies": { + "@openstapps/eslint-config": "workspace:*", + "@openstapps/nyc-config": "workspace:*", + "@openstapps/prettier-config": "workspace:*", + "@openstapps/tsconfig": "workspace:*", + "@testdeck/mocha": "0.3.3", + "@types/chai": "4.3.4", + "@types/fs-extra": "9.0.13", + "@types/mocha": "10.0.1", + "@types/node": "18.15.3", + "mocha": "10.2.0", + "nock": "13.3.0", + "tsup": "6.7.0" + }, + "tsup": { + "entry": [ + "src/app.ts", + "src/index.ts" + ], + "sourcemap": true, + "clean": true, + "format": "esm", + "outDir": "lib" + }, + "prettier": "@openstapps/prettier-config", + "eslintConfig": { + "extends": [ + "@openstapps" + ] + }, + "eslintIgnore": [ + "resources", + "openapi" + ], + "nyc": { + "extends": "@openstapps/nyc-config" + } +} diff --git a/packages/core-tools/src/easy-ast/ast-internal-util.ts b/packages/easy-ast/src/ast-internal-util.ts similarity index 97% rename from packages/core-tools/src/easy-ast/ast-internal-util.ts rename to packages/easy-ast/src/ast-internal-util.ts index 1e531747..bccbbc3c 100644 --- a/packages/core-tools/src/easy-ast/ast-internal-util.ts +++ b/packages/easy-ast/src/ast-internal-util.ts @@ -13,7 +13,7 @@ * this program. If not, see . */ import * as ts from 'typescript'; -import {cleanupEmpty} from '../util/collections.js'; +import {cleanupEmpty} from './util.js'; import {LightweightComment} from './types/lightweight-comment.js'; /** @internal */ @@ -26,7 +26,7 @@ export function extractComment(node: ts.Node): LightweightComment | undefined { tags?: Array<{comment?: string; tagName?: {escapedText?: string}}>; }> | undefined; - const jsDocument = jsDocuments?.[jsDocuments.length - 1] + const jsDocument = jsDocuments?.[jsDocuments.length - 1]; const comment = jsDocument?.comment?.split('\n\n'); return jsDocument === undefined diff --git a/packages/core-tools/src/easy-ast/ast-util.ts b/packages/easy-ast/src/ast-util.ts similarity index 82% rename from packages/core-tools/src/easy-ast/ast-util.ts rename to packages/easy-ast/src/ast-util.ts index a9fba673..6ad50345 100644 --- a/packages/core-tools/src/easy-ast/ast-util.ts +++ b/packages/easy-ast/src/ast-util.ts @@ -20,7 +20,7 @@ import {LightweightDefinition} from './types/lightweight-definition.js'; import {LightweightDefinitionKind} from './types/lightweight-definition-kind.js'; import {LightweightProject} from './types/lightweight-project.js'; import {LightweightType} from './types/lightweight-type.js'; -import {keyBy} from "@openstapps/collection-utils/lib/key-by.js"; +import {keyBy} from '@openstapps/collection-utils'; /** * Creates a printable name of a type @@ -46,27 +46,27 @@ export function definitionsOf(project: LightweightProject): Record it.name); } -export function isPrimitiveType(type: { flags: ts.TypeFlags }): boolean { +export function isPrimitiveType(type: {flags: ts.TypeFlags}): boolean { return (type.flags & ts.TypeFlags.NonPrimitive) === 0; } -export function isLiteralType(type: { flags: ts.TypeFlags }): boolean { +export function isLiteralType(type: {flags: ts.TypeFlags}): boolean { return (type.flags & ts.TypeFlags.Literal) !== 0; } -export function isEnumLiteralType(type: { flags: ts.TypeFlags }): boolean { +export function isEnumLiteralType(type: {flags: ts.TypeFlags}): boolean { return (type.flags & ts.TypeFlags.EnumLiteral) !== 0; } -export function isStringLiteralType(type: { flags: ts.TypeFlags }): boolean { +export function isStringLiteralType(type: {flags: ts.TypeFlags}): boolean { return (type.flags & ts.TypeFlags.StringLiteral) !== 0; } -export function isUnionOrIntersectionType(type: { flags: ts.TypeFlags }): boolean { +export function isUnionOrIntersectionType(type: {flags: ts.TypeFlags}): boolean { return (type.flags & ts.TypeFlags.UnionOrIntersection) !== 0; } -export function isUnionType(type: { flags: ts.TypeFlags }): boolean { +export function isUnionType(type: {flags: ts.TypeFlags}): boolean { return (type.flags & ts.TypeFlags.Union) !== 0; } @@ -78,6 +78,6 @@ export function isLightweightEnum(node?: LightweightDefinition): node is Lightwe return node?.kind === LightweightDefinitionKind.ALIAS_LIKE; } -export function isTypeVariable(type: { flags: ts.TypeFlags }): boolean { +export function isTypeVariable(type: {flags: ts.TypeFlags}): boolean { return (type.flags & ts.TypeFlags.TypeVariable) !== 0; } diff --git a/packages/core-tools/src/easy-ast/easy-ast.ts b/packages/easy-ast/src/easy-ast.ts similarity index 91% rename from packages/core-tools/src/easy-ast/easy-ast.ts rename to packages/easy-ast/src/easy-ast.ts index 33704703..bb72b1f1 100644 --- a/packages/core-tools/src/easy-ast/easy-ast.ts +++ b/packages/easy-ast/src/easy-ast.ts @@ -14,8 +14,7 @@ * this program. If not, see . */ import ts from 'typescript'; -import {cleanupEmpty, mapNotNil, rejectNil} from '../util/collections.js'; -import {expandPathToFilesSync} from '../util/io.js'; +import {cleanupEmpty, mapNotNil, rejectNil, expandPathToFilesSync} from './util.js'; import { extractComment, filterChildrenTo, @@ -37,9 +36,7 @@ import {LightweightProject} from './types/lightweight-project.js'; import {LightweightType} from './types/lightweight-type.js'; import path from 'path'; import {LightweightProperty} from './types/lightweight-property.js'; -import {mapValues} from "@openstapps/collection-utils/lib/map-values.js"; -import {groupBy} from "@openstapps/collection-utils/lib/group-by.js"; -import {keyBy} from "@openstapps/collection-utils/lib/key-by.js"; +import {mapValues, groupBy, keyBy} from '@openstapps/collection-utils'; /** * Convert a TypeScript project to a lightweight Type-AST representation of the project @@ -101,7 +98,9 @@ class LightweightDefinitionBuilder { this.sourceFiles = mapNotNil(this.program.getRootFileNames(), it => this.program.getSourceFile(it)); } - private convertAliasLike(enumLike: ts.EnumDeclaration | ts.TypeAliasDeclaration): LightweightAliasDefinition { + private convertAliasLike( + enumLike: ts.EnumDeclaration | ts.TypeAliasDeclaration, + ): LightweightAliasDefinition { return cleanupEmpty({ comment: this.includeComments ? extractComment(enumLike) : undefined, name: enumLike.name.getText() ?? 'ERROR', @@ -118,9 +117,11 @@ class LightweightDefinitionBuilder { }); } - private convertClassLike(classLike: ts.ClassDeclaration | ts.InterfaceDeclaration): LightweightClassDefinition { + private convertClassLike( + classLike: ts.ClassDeclaration | ts.InterfaceDeclaration, + ): LightweightClassDefinition { const heritages = mapValues( - groupBy([...(classLike.heritageClauses!)], it => it.token.toString()), + groupBy([...classLike.heritageClauses!], it => it.token.toString()), heritages => heritages.flatMap(it => it.types), ); @@ -159,7 +160,9 @@ class LightweightDefinitionBuilder { }); } - collectProperties(members: ts.NodeArray): Record { + collectProperties( + members: ts.NodeArray, + ): Record { return keyBy( filterNodeTo(members as ts.NodeArray, isProperty).map(property => cleanupEmpty({ @@ -198,7 +201,8 @@ class LightweightDefinitionBuilder { return out; } - const isReference = typeNode !== undefined && ts.isTypeReferenceNode(typeNode) && !isEnumLiteralType(type); + const isReference = + typeNode !== undefined && ts.isTypeReferenceNode(typeNode) && !isEnumLiteralType(type); const isTypeLiteral = typeNode !== undefined && ts.isTypeLiteralNode(typeNode); // @ts-expect-error intrinsic name & value exist const intrinsicName = (type.intrinsicName ?? type.value) as string | undefined; diff --git a/packages/core-tools/src/types/pack.ts b/packages/easy-ast/src/index.ts similarity index 54% rename from packages/core-tools/src/types/pack.ts rename to packages/easy-ast/src/index.ts index 06c5d834..e09a4865 100644 --- a/packages/core-tools/src/types/pack.ts +++ b/packages/easy-ast/src/index.ts @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2021 StApps + * Copyright (C) 2021 StApps * This program is free software: you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the Free * Software Foundation, version 3. @@ -12,28 +12,14 @@ * You should have received a copy of the GNU General Public License along with * this program. If not, see . */ +export * from './easy-ast.js' +export * from './ast-util.js' -/** - * A JavaScript module representation to sort a list of them by dependencies - */ -export interface JavaScriptModule { - /** - * Content of the module - */ - content: string; - - /** - * List of names of dependencies - */ - dependencies: string[]; - - /** - * Directory the module is in - */ - directory: string; - - /** - * The name of the module - */ - name: string; -} +export * from './types/lightweight-alias-definition.js' +export * from './types/lightweight-class-definition.js' +export * from './types/lightweight-comment.js' +export * from './types/lightweight-definition.js' +export * from './types/lightweight-definition-kind.js' +export * from './types/lightweight-project.js' +export * from './types/lightweight-property.js' +export * from './types/lightweight-type.js' diff --git a/packages/core-tools/src/easy-ast/types/lightweight-alias-definition.ts b/packages/easy-ast/src/types/lightweight-alias-definition.ts similarity index 100% rename from packages/core-tools/src/easy-ast/types/lightweight-alias-definition.ts rename to packages/easy-ast/src/types/lightweight-alias-definition.ts diff --git a/packages/core-tools/src/easy-ast/types/lightweight-class-definition.ts b/packages/easy-ast/src/types/lightweight-class-definition.ts similarity index 100% rename from packages/core-tools/src/easy-ast/types/lightweight-class-definition.ts rename to packages/easy-ast/src/types/lightweight-class-definition.ts diff --git a/packages/core-tools/src/easy-ast/types/lightweight-comment.ts b/packages/easy-ast/src/types/lightweight-comment.ts similarity index 100% rename from packages/core-tools/src/easy-ast/types/lightweight-comment.ts rename to packages/easy-ast/src/types/lightweight-comment.ts diff --git a/packages/core-tools/src/easy-ast/types/lightweight-definition-kind.ts b/packages/easy-ast/src/types/lightweight-definition-kind.ts similarity index 100% rename from packages/core-tools/src/easy-ast/types/lightweight-definition-kind.ts rename to packages/easy-ast/src/types/lightweight-definition-kind.ts diff --git a/packages/core-tools/src/easy-ast/types/lightweight-definition.ts b/packages/easy-ast/src/types/lightweight-definition.ts similarity index 100% rename from packages/core-tools/src/easy-ast/types/lightweight-definition.ts rename to packages/easy-ast/src/types/lightweight-definition.ts diff --git a/packages/core-tools/src/easy-ast/types/lightweight-project.ts b/packages/easy-ast/src/types/lightweight-project.ts similarity index 94% rename from packages/core-tools/src/easy-ast/types/lightweight-project.ts rename to packages/easy-ast/src/types/lightweight-project.ts index ad8abec9..82d744ae 100644 --- a/packages/core-tools/src/easy-ast/types/lightweight-project.ts +++ b/packages/easy-ast/src/types/lightweight-project.ts @@ -12,7 +12,7 @@ * You should have received a copy of the GNU General Public License along with * this program. If not, see . */ -import {mapNotNil} from '../../util/collections.js'; +import {mapNotNil} from '../util.js'; import {definitionsOf, isLightweightClass} from '../ast-util.js'; import {lightweightProjectFromPath} from '../easy-ast.js'; import {LightweightClassDefinition} from './lightweight-class-definition.js'; @@ -23,7 +23,9 @@ import {LightweightDefinition} from './lightweight-definition.js'; */ function buildIndex(project: LightweightProject): Record { return Object.fromEntries( - Object.values(project).flatMap((definitions, file) => Object.keys(definitions).map(definition => [definition, file.toString()])) + Object.values(project).flatMap((definitions, file) => + Object.keys(definitions).map(definition => [definition, file.toString()]), + ), ); } diff --git a/packages/core-tools/src/easy-ast/types/lightweight-property.ts b/packages/easy-ast/src/types/lightweight-property.ts similarity index 100% rename from packages/core-tools/src/easy-ast/types/lightweight-property.ts rename to packages/easy-ast/src/types/lightweight-property.ts diff --git a/packages/core-tools/src/easy-ast/types/lightweight-type.ts b/packages/easy-ast/src/types/lightweight-type.ts similarity index 100% rename from packages/core-tools/src/easy-ast/types/lightweight-type.ts rename to packages/easy-ast/src/types/lightweight-type.ts diff --git a/packages/easy-ast/src/util.ts b/packages/easy-ast/src/util.ts new file mode 100644 index 00000000..ed51bcbf --- /dev/null +++ b/packages/easy-ast/src/util.ts @@ -0,0 +1,61 @@ +/* + * Copyright (C) 2021 StApps + * This program is free software: you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the Free + * Software Foundation, version 3. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for + * more details. + * + * You should have received a copy of the GNU General Public License along with + * this program. If not, see . + */ +import path from "path"; +import {readdirSync, statSync} from "fs"; + +/** + * Filters only defined elements + */ +export function rejectNil(array: Array): T[] { + // eslint-disable-next-line unicorn/no-null + return array.filter(it => it == null) as T[]; +} + +/** + * Map elements that are not null + */ +export function mapNotNil(array: readonly T[], transform: (element: T) => S | undefined | null): S[] { + return rejectNil(array.map(transform)); +} + +/** + * Deletes all properties with the value 'undefined', [] or {} + */ +// eslint-disable-next-line @typescript-eslint/ban-types +export function cleanupEmpty(object: T): T { + const out = {} as T; + for (const key in object) { + const value = object[key]; + // eslint-disable-next-line unicorn/no-null + if (value != null && (typeof value !== 'object' || Object.values(value).length > 0)) { + out[key] = value; + } + } + return out; +} + +/** + * Expand a path to a list of all files deeply contained in it + */ +export function expandPathToFilesSync(sourcePath: string, accept: (fileName: string) => boolean): string[] { + const fullPath = path.resolve(sourcePath); + const directory = statSync(fullPath); + + return directory.isDirectory() + ? readdirSync(fullPath).flatMap(fragment => + expandPathToFilesSync(path.resolve(sourcePath, fragment), accept), + ) + : [fullPath].filter(accept); +} diff --git a/packages/core-tools/test/easy-ast/alias-like.ast-test.ts b/packages/easy-ast/test/alias-like.ast-test.ts similarity index 100% rename from packages/core-tools/test/easy-ast/alias-like.ast-test.ts rename to packages/easy-ast/test/alias-like.ast-test.ts diff --git a/packages/core-tools/test/easy-ast/array-like.ast-test.ts b/packages/easy-ast/test/array-like.ast-test.ts similarity index 100% rename from packages/core-tools/test/easy-ast/array-like.ast-test.ts rename to packages/easy-ast/test/array-like.ast-test.ts diff --git a/packages/core-tools/test/easy-ast/class-like.ast-test.ts b/packages/easy-ast/test/class-like.ast-test.ts similarity index 100% rename from packages/core-tools/test/easy-ast/class-like.ast-test.ts rename to packages/easy-ast/test/class-like.ast-test.ts diff --git a/packages/core-tools/test/easy-ast/comment.ast-test.ts b/packages/easy-ast/test/comment.ast-test.ts similarity index 100% rename from packages/core-tools/test/easy-ast/comment.ast-test.ts rename to packages/easy-ast/test/comment.ast-test.ts diff --git a/packages/core-tools/test/easy-ast/default-generics.ast-test.ts b/packages/easy-ast/test/default-generics.ast-test.ts similarity index 100% rename from packages/core-tools/test/easy-ast/default-generics.ast-test.ts rename to packages/easy-ast/test/default-generics.ast-test.ts diff --git a/packages/core-tools/test/easy-ast/easy-ast-spec-type.ts b/packages/easy-ast/test/easy-ast-spec-type.ts similarity index 100% rename from packages/core-tools/test/easy-ast/easy-ast-spec-type.ts rename to packages/easy-ast/test/easy-ast-spec-type.ts diff --git a/packages/core-tools/test/easy-ast/enum-specified-value.ast-test.ts b/packages/easy-ast/test/enum-specified-value.ast-test.ts similarity index 100% rename from packages/core-tools/test/easy-ast/enum-specified-value.ast-test.ts rename to packages/easy-ast/test/enum-specified-value.ast-test.ts diff --git a/packages/core-tools/test/easy-ast/generics.ast-test.ts b/packages/easy-ast/test/generics.ast-test.ts similarity index 100% rename from packages/core-tools/test/easy-ast/generics.ast-test.ts rename to packages/easy-ast/test/generics.ast-test.ts diff --git a/packages/core-tools/test/easy-ast/index-signature.ast-test.ts b/packages/easy-ast/test/index-signature.ast-test.ts similarity index 100% rename from packages/core-tools/test/easy-ast/index-signature.ast-test.ts rename to packages/easy-ast/test/index-signature.ast-test.ts diff --git a/packages/core-tools/test/easy-ast.spec.ts b/packages/easy-ast/test/index.ts similarity index 83% rename from packages/core-tools/test/easy-ast.spec.ts rename to packages/easy-ast/test/index.ts index 8938dddf..85ffebe3 100644 --- a/packages/core-tools/test/easy-ast.spec.ts +++ b/packages/easy-ast/test/index.ts @@ -12,11 +12,10 @@ * You should have received a copy of the GNU General Public License along with * this program. If not, see . */ -import {expandPathToFilesSync, toUnixPath} from '../src/util/io.js'; -import {EasyAstSpecType} from './easy-ast/easy-ast-spec-type.js'; -import {lightweightProjectFromPath} from '../src/easy-ast/easy-ast.js'; +import {expandPathToFilesSync, toUnixPath} from '../src/util.js'; +import {EasyAstSpecType} from './easy-ast-spec-type.js'; +import {lightweightProjectFromPath} from '../src/easy-ast.js'; import {expect} from 'chai'; -import {omitBy} from 'lodash'; describe('Easy AST', async () => { const project = lightweightProjectFromPath('./test/easy-ast', true); diff --git a/packages/core-tools/test/easy-ast/ineritance.ast-test.ts b/packages/easy-ast/test/ineritance.ast-test.ts similarity index 100% rename from packages/core-tools/test/easy-ast/ineritance.ast-test.ts rename to packages/easy-ast/test/ineritance.ast-test.ts diff --git a/packages/core-tools/test/easy-ast/nested.ast-test.ts b/packages/easy-ast/test/nested.ast-test.ts similarity index 100% rename from packages/core-tools/test/easy-ast/nested.ast-test.ts rename to packages/easy-ast/test/nested.ast-test.ts diff --git a/packages/core-tools/test/easy-ast/primitive-types.ast-test.ts b/packages/easy-ast/test/primitive-types.ast-test.ts similarity index 100% rename from packages/core-tools/test/easy-ast/primitive-types.ast-test.ts rename to packages/easy-ast/test/primitive-types.ast-test.ts diff --git a/packages/core-tools/test/easy-ast/stack-overflow.ast-test.ts b/packages/easy-ast/test/stack-overflow.ast-test.ts similarity index 100% rename from packages/core-tools/test/easy-ast/stack-overflow.ast-test.ts rename to packages/easy-ast/test/stack-overflow.ast-test.ts diff --git a/packages/easy-ast/tsconfig.json b/packages/easy-ast/tsconfig.json new file mode 100644 index 00000000..579a39ff --- /dev/null +++ b/packages/easy-ast/tsconfig.json @@ -0,0 +1,3 @@ +{ + "extends": "@openstapps/tsconfig" +} diff --git a/packages/es-mapping-generator/.editorconfig b/packages/es-mapping-generator/.editorconfig deleted file mode 100644 index 9a4062a7..00000000 --- a/packages/es-mapping-generator/.editorconfig +++ /dev/null @@ -1,15 +0,0 @@ -# editorconfig.org - -root = true - -[*] -indent_style = space -indent_size = 2 - -end_of_line = lf -charset = utf-8 -trim_trailing_whitespace = true -insert_final_newline = true - -[*.md] -trim_trailing_whitespace = false diff --git a/packages/es-mapping-generator/CHANGELOG.md b/packages/es-mapping-generator/CHANGELOG.md index 7567cf93..45955f3c 100644 --- a/packages/es-mapping-generator/CHANGELOG.md +++ b/packages/es-mapping-generator/CHANGELOG.md @@ -8,49 +8,30 @@ # [0.4.0](https://gitlab.com/openstapps/es-mapping-generator/compare/v0.3.0...v0.4.0) (2023-01-12) - - # [0.3.0](https://gitlab.com/openstapps/es-mapping-generator/compare/v0.2.0...v0.3.0) (2022-08-17) - - # [0.2.0](https://gitlab.com/openstapps/es-mapping-generator/compare/v0.1.0...v0.2.0) (2022-06-27) - ### Bug Fixes -* marked version with audit issue ([7534744](https://gitlab.com/openstapps/es-mapping-generator/commit/7534744294ec27f1ce3f4bf65424d717b33dd889)) - - +- marked version with audit issue ([7534744](https://gitlab.com/openstapps/es-mapping-generator/commit/7534744294ec27f1ce3f4bf65424d717b33dd889)) # [0.1.0](https://gitlab.com/openstapps/es-mapping-generator/compare/v0.0.4...v0.1.0) (2022-05-27) - - ## [0.0.4](https://gitlab.com/openstapps/es-mapping-generator/compare/v0.0.3...v0.0.4) (2021-12-16) - ### Bug Fixes -* filter tags override inherited type tags ([f0401e1](https://gitlab.com/openstapps/es-mapping-generator/commit/f0401e1889f12860d4eaa2dc5a1ee1b08f20ba31)) - - +- filter tags override inherited type tags ([f0401e1](https://gitlab.com/openstapps/es-mapping-generator/commit/f0401e1889f12860d4eaa2dc5a1ee1b08f20ba31)) ## [0.0.3](https://gitlab.com/openstapps/es-mapping-generator/compare/v0.0.2...v0.0.3) (2021-08-05) - ### Bug Fixes -* put es template parsing ([9a88129](https://gitlab.com/openstapps/es-mapping-generator/commit/9a881299dc9d0a6d59b370340880a10bd8b1e2c5)) - - +- put es template parsing ([9a88129](https://gitlab.com/openstapps/es-mapping-generator/commit/9a881299dc9d0a6d59b370340880a10bd8b1e2c5)) ## [0.0.2](https://gitlab.com/openstapps/es-mapping-generator/compare/28334b800c014a9e0b6e980b5365af6fdc1d8950...v0.0.2) (2021-08-05) - ### Bug Fixes -* fix unwanted crash when not supplying an error path ([28334b8](https://gitlab.com/openstapps/es-mapping-generator/commit/28334b800c014a9e0b6e980b5365af6fdc1d8950)) - - - +- fix unwanted crash when not supplying an error path ([28334b8](https://gitlab.com/openstapps/es-mapping-generator/commit/28334b800c014a9e0b6e980b5365af6fdc1d8950)) diff --git a/packages/es-mapping-generator/LICENSE b/packages/es-mapping-generator/LICENSE deleted file mode 100644 index 9df63ccc..00000000 --- a/packages/es-mapping-generator/LICENSE +++ /dev/null @@ -1,200 +0,0 @@ -GNU GENERAL PUBLIC LICENSE -Version 3, 29 June 2007 - -Copyright © 2007 Free Software Foundation, Inc. - -Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. - -Preamble - -The GNU General Public License is a free, copyleft license for software and other kinds of works. - -The licenses for most software and other practical works are designed to take away your freedom to share and change the works. By contrast, the GNU General Public License is intended to guarantee your freedom to share and change all versions of a program--to make sure it remains free software for all its users. We, the Free Software Foundation, use the GNU General Public License for most of our software; it applies also to any other work released this way by its authors. You can apply it to your programs, too. - -When we speak of free software, we are referring to freedom, not price. Our General Public Licenses are designed to make sure that you have the freedom to distribute copies of free software (and charge for them if you wish), that you receive source code or can get it if you want it, that you can change the software or use pieces of it in new free programs, and that you know you can do these things. - -To protect your rights, we need to prevent others from denying you these rights or asking you to surrender the rights. Therefore, you have certain responsibilities if you distribute copies of the software, or if you modify it: responsibilities to respect the freedom of others. - -For example, if you distribute copies of such a program, whether gratis or for a fee, you must pass on to the recipients the same freedoms that you received. You must make sure that they, too, receive or can get the source code. And you must show them these terms so they know their rights. - -Developers that use the GNU GPL protect your rights with two steps: (1) assert copyright on the software, and (2) offer you this License giving you legal permission to copy, distribute and/or modify it. - -For the developers' and authors' protection, the GPL clearly explains that there is no warranty for this free software. For both users' and authors' sake, the GPL requires that modified versions be marked as changed, so that their problems will not be attributed erroneously to authors of previous versions. - -Some devices are designed to deny users access to install or run modified versions of the software inside them, although the manufacturer can do so. This is fundamentally incompatible with the aim of protecting users' freedom to change the software. The systematic pattern of such abuse occurs in the area of products for individuals to use, which is precisely where it is most unacceptable. Therefore, we have designed this version of the GPL to prohibit the practice for those products. If such problems arise substantially in other domains, we stand ready to extend this provision to those domains in future versions of the GPL, as needed to protect the freedom of users. - -Finally, every program is threatened constantly by software patents. States should not allow patents to restrict development and use of software on general-purpose computers, but in those that do, we wish to avoid the special danger that patents applied to a free program could make it effectively proprietary. To prevent this, the GPL assures that patents cannot be used to render the program non-free. - -The precise terms and conditions for copying, distribution and modification follow. - -TERMS AND CONDITIONS - -0. Definitions. -"This License" refers to version 3 of the GNU General Public License. - -"Copyright" also means copyright-like laws that apply to other kinds of works, such as semiconductor masks. - -"The Program" refers to any copyrightable work licensed under this License. Each licensee is addressed as "you". "Licensees" and "recipients" may be individuals or organizations. - -To "modify" a work means to copy from or adapt all or part of the work in a fashion requiring copyright permission, other than the making of an exact copy. The resulting work is called a "modified version" of the earlier work or a work "based on" the earlier work. - -A "covered work" means either the unmodified Program or a work based on the Program. - -To "propagate" a work means to do anything with it that, without permission, would make you directly or secondarily liable for infringement under applicable copyright law, except executing it on a computer or modifying a private copy. Propagation includes copying, distribution (with or without modification), making available to the public, and in some countries other activities as well. - -To "convey" a work means any kind of propagation that enables other parties to make or receive copies. Mere interaction with a user through a computer network, with no transfer of a copy, is not conveying. - -An interactive user interface displays "Appropriate Legal Notices" to the extent that it includes a convenient and prominently visible feature that (1) displays an appropriate copyright notice, and (2) tells the user that there is no warranty for the work (except to the extent that warranties are provided), that licensees may convey the work under this License, and how to view a copy of this License. If the interface presents a list of user commands or options, such as a menu, a prominent item in the list meets this criterion. - -1. Source Code. -The "source code" for a work means the preferred form of the work for making modifications to it. "Object code" means any non-source form of a work. -A "Standard Interface" means an interface that either is an official standard defined by a recognized standards body, or, in the case of interfaces specified for a particular programming language, one that is widely used among developers working in that language. - -The "System Libraries" of an executable work include anything, other than the work as a whole, that (a) is included in the normal form of packaging a Major Component, but which is not part of that Major Component, and (b) serves only to enable use of the work with that Major Component, or to implement a Standard Interface for which an implementation is available to the public in source code form. A "Major Component", in this context, means a major essential component (kernel, window system, and so on) of the specific operating system (if any) on which the executable work runs, or a compiler used to produce the work, or an object code interpreter used to run it. - -The "Corresponding Source" for a work in object code form means all the source code needed to generate, install, and (for an executable work) run the object code and to modify the work, including scripts to control those activities. However, it does not include the work's System Libraries, or general-purpose tools or generally available free programs which are used unmodified in performing those activities but which are not part of the work. For example, Corresponding Source includes interface definition files associated with source files for the work, and the source code for shared libraries and dynamically linked subprograms that the work is specifically designed to require, such as by intimate data communication or control flow between those subprograms and other parts of the work. - -The Corresponding Source need not include anything that users can regenerate automatically from other parts of the Corresponding Source. - -The Corresponding Source for a work in source code form is that same work. - -2. Basic Permissions. -All rights granted under this License are granted for the term of copyright on the Program, and are irrevocable provided the stated conditions are met. This License explicitly affirms your unlimited permission to run the unmodified Program. The output from running a covered work is covered by this License only if the output, given its content, constitutes a covered work. This License acknowledges your rights of fair use or other equivalent, as provided by copyright law. -You may make, run and propagate covered works that you do not convey, without conditions so long as your license otherwise remains in force. You may convey covered works to others for the sole purpose of having them make modifications exclusively for you, or provide you with facilities for running those works, provided that you comply with the terms of this License in conveying all material for which you do not control copyright. Those thus making or running the covered works for you must do so exclusively on your behalf, under your direction and control, on terms that prohibit them from making any copies of your copyrighted material outside their relationship with you. - -Conveying under any other circumstances is permitted solely under the conditions stated below. Sublicensing is not allowed; section 10 makes it unnecessary. - -3. Protecting Users' Legal Rights From Anti-Circumvention Law. -No covered work shall be deemed part of an effective technological measure under any applicable law fulfilling obligations under article 11 of the WIPO copyright treaty adopted on 20 December 1996, or similar laws prohibiting or restricting circumvention of such measures. -When you convey a covered work, you waive any legal power to forbid circumvention of technological measures to the extent such circumvention is effected by exercising rights under this License with respect to the covered work, and you disclaim any intention to limit operation or modification of the work as a means of enforcing, against the work's users, your or third parties' legal rights to forbid circumvention of technological measures. - -4. Conveying Verbatim Copies. -You may convey verbatim copies of the Program's source code as you receive it, in any medium, provided that you conspicuously and appropriately publish on each copy an appropriate copyright notice; keep intact all notices stating that this License and any non-permissive terms added in accord with section 7 apply to the code; keep intact all notices of the absence of any warranty; and give all recipients a copy of this License along with the Program. -You may charge any price or no price for each copy that you convey, and you may offer support or warranty protection for a fee. - -5. Conveying Modified Source Versions. -You may convey a work based on the Program, or the modifications to produce it from the Program, in the form of source code under the terms of section 4, provided that you also meet all of these conditions: -a) The work must carry prominent notices stating that you modified it, and giving a relevant date. -b) The work must carry prominent notices stating that it is released under this License and any conditions added under section 7. This requirement modifies the requirement in section 4 to "keep intact all notices". -c) You must license the entire work, as a whole, under this License to anyone who comes into possession of a copy. This License will therefore apply, along with any applicable section 7 additional terms, to the whole of the work, and all its parts, regardless of how they are packaged. This License gives no permission to license the work in any other way, but it does not invalidate such permission if you have separately received it. -d) If the work has interactive user interfaces, each must display Appropriate Legal Notices; however, if the Program has interactive interfaces that do not display Appropriate Legal Notices, your work need not make them do so. -A compilation of a covered work with other separate and independent works, which are not by their nature extensions of the covered work, and which are not combined with it such as to form a larger program, in or on a volume of a storage or distribution medium, is called an "aggregate" if the compilation and its resulting copyright are not used to limit the access or legal rights of the compilation's users beyond what the individual works permit. Inclusion of a covered work in an aggregate does not cause this License to apply to the other parts of the aggregate. - -6. Conveying Non-Source Forms. -You may convey a covered work in object code form under the terms of sections 4 and 5, provided that you also convey the machine-readable Corresponding Source under the terms of this License, in one of these ways: -a) Convey the object code in, or embodied in, a physical product (including a physical distribution medium), accompanied by the Corresponding Source fixed on a durable physical medium customarily used for software interchange. -b) Convey the object code in, or embodied in, a physical product (including a physical distribution medium), accompanied by a written offer, valid for at least three years and valid for as long as you offer spare parts or customer support for that product model, to give anyone who possesses the object code either (1) a copy of the Corresponding Source for all the software in the product that is covered by this License, on a durable physical medium customarily used for software interchange, for a price no more than your reasonable cost of physically performing this conveying of source, or (2) access to copy the Corresponding Source from a network server at no charge. -c) Convey individual copies of the object code with a copy of the written offer to provide the Corresponding Source. This alternative is allowed only occasionally and noncommercially, and only if you received the object code with such an offer, in accord with subsection 6b. -d) Convey the object code by offering access from a designated place (gratis or for a charge), and offer equivalent access to the Corresponding Source in the same way through the same place at no further charge. You need not require recipients to copy the Corresponding Source along with the object code. If the place to copy the object code is a network server, the Corresponding Source may be on a different server (operated by you or a third party) that supports equivalent copying facilities, provided you maintain clear directions next to the object code saying where to find the Corresponding Source. Regardless of what server hosts the Corresponding Source, you remain obligated to ensure that it is available for as long as needed to satisfy these requirements. -e) Convey the object code using peer-to-peer transmission, provided you inform other peers where the object code and Corresponding Source of the work are being offered to the general public at no charge under subsection 6d. -A separable portion of the object code, whose source code is excluded from the Corresponding Source as a System Library, need not be included in conveying the object code work. - -A "User Product" is either (1) a "consumer product", which means any tangible personal property which is normally used for personal, family, or household purposes, or (2) anything designed or sold for incorporation into a dwelling. In determining whether a product is a consumer product, doubtful cases shall be resolved in favor of coverage. For a particular product received by a particular user, "normally used" refers to a typical or common use of that class of product, regardless of the status of the particular user or of the way in which the particular user actually uses, or expects or is expected to use, the product. A product is a consumer product regardless of whether the product has substantial commercial, industrial or non-consumer uses, unless such uses represent the only significant mode of use of the product. - -"Installation Information" for a User Product means any methods, procedures, authorization keys, or other information required to install and execute modified versions of a covered work in that User Product from a modified version of its Corresponding Source. The information must suffice to ensure that the continued functioning of the modified object code is in no case prevented or interfered with solely because modification has been made. - -If you convey an object code work under this section in, or with, or specifically for use in, a User Product, and the conveying occurs as part of a transaction in which the right of possession and use of the User Product is transferred to the recipient in perpetuity or for a fixed term (regardless of how the transaction is characterized), the Corresponding Source conveyed under this section must be accompanied by the Installation Information. But this requirement does not apply if neither you nor any third party retains the ability to install modified object code on the User Product (for example, the work has been installed in ROM). - -The requirement to provide Installation Information does not include a requirement to continue to provide support service, warranty, or updates for a work that has been modified or installed by the recipient, or for the User Product in which it has been modified or installed. Access to a network may be denied when the modification itself materially and adversely affects the operation of the network or violates the rules and protocols for communication across the network. - -Corresponding Source conveyed, and Installation Information provided, in accord with this section must be in a format that is publicly documented (and with an implementation available to the public in source code form), and must require no special password or key for unpacking, reading or copying. - -7. Additional Terms. -"Additional permissions" are terms that supplement the terms of this License by making exceptions from one or more of its conditions. Additional permissions that are applicable to the entire Program shall be treated as though they were included in this License, to the extent that they are valid under applicable law. If additional permissions apply only to part of the Program, that part may be used separately under those permissions, but the entire Program remains governed by this License without regard to the additional permissions. -When you convey a copy of a covered work, you may at your option remove any additional permissions from that copy, or from any part of it. (Additional permissions may be written to require their own removal in certain cases when you modify the work.) You may place additional permissions on material, added by you to a covered work, for which you have or can give appropriate copyright permission. - -Notwithstanding any other provision of this License, for material you add to a covered work, you may (if authorized by the copyright holders of that material) supplement the terms of this License with terms: - -a) Disclaiming warranty or limiting liability differently from the terms of sections 15 and 16 of this License; or -b) Requiring preservation of specified reasonable legal notices or author attributions in that material or in the Appropriate Legal Notices displayed by works containing it; or -c) Prohibiting misrepresentation of the origin of that material, or requiring that modified versions of such material be marked in reasonable ways as different from the original version; or -d) Limiting the use for publicity purposes of names of licensors or authors of the material; or -e) Declining to grant rights under trademark law for use of some trade names, trademarks, or service marks; or -f) Requiring indemnification of licensors and authors of that material by anyone who conveys the material (or modified versions of it) with contractual assumptions of liability to the recipient, for any liability that these contractual assumptions directly impose on those licensors and authors. -All other non-permissive additional terms are considered "further restrictions" within the meaning of section 10. If the Program as you received it, or any part of it, contains a notice stating that it is governed by this License along with a term that is a further restriction, you may remove that term. If a license document contains a further restriction but permits relicensing or conveying under this License, you may add to a covered work material governed by the terms of that license document, provided that the further restriction does not survive such relicensing or conveying. - -If you add terms to a covered work in accord with this section, you must place, in the relevant source files, a statement of the additional terms that apply to those files, or a notice indicating where to find the applicable terms. - -Additional terms, permissive or non-permissive, may be stated in the form of a separately written license, or stated as exceptions; the above requirements apply either way. - -8. Termination. -You may not propagate or modify a covered work except as expressly provided under this License. Any attempt otherwise to propagate or modify it is void, and will automatically terminate your rights under this License (including any patent licenses granted under the third paragraph of section 11). -However, if you cease all violation of this License, then your license from a particular copyright holder is reinstated (a) provisionally, unless and until the copyright holder explicitly and finally terminates your license, and (b) permanently, if the copyright holder fails to notify you of the violation by some reasonable means prior to 60 days after the cessation. - -Moreover, your license from a particular copyright holder is reinstated permanently if the copyright holder notifies you of the violation by some reasonable means, this is the first time you have received notice of violation of this License (for any work) from that copyright holder, and you cure the violation prior to 30 days after your receipt of the notice. - -Termination of your rights under this section does not terminate the licenses of parties who have received copies or rights from you under this License. If your rights have been terminated and not permanently reinstated, you do not qualify to receive new licenses for the same material under section 10. - -9. Acceptance Not Required for Having Copies. -You are not required to accept this License in order to receive or run a copy of the Program. Ancillary propagation of a covered work occurring solely as a consequence of using peer-to-peer transmission to receive a copy likewise does not require acceptance. However, nothing other than this License grants you permission to propagate or modify any covered work. These actions infringe copyright if you do not accept this License. Therefore, by modifying or propagating a covered work, you indicate your acceptance of this License to do so. -10. Automatic Licensing of Downstream Recipients. -Each time you convey a covered work, the recipient automatically receives a license from the original licensors, to run, modify and propagate that work, subject to this License. You are not responsible for enforcing compliance by third parties with this License. -An "entity transaction" is a transaction transferring control of an organization, or substantially all assets of one, or subdividing an organization, or merging organizations. If propagation of a covered work results from an entity transaction, each party to that transaction who receives a copy of the work also receives whatever licenses to the work the party's predecessor in interest had or could give under the previous paragraph, plus a right to possession of the Corresponding Source of the work from the predecessor in interest, if the predecessor has it or can get it with reasonable efforts. - -You may not impose any further restrictions on the exercise of the rights granted or affirmed under this License. For example, you may not impose a license fee, royalty, or other charge for exercise of rights granted under this License, and you may not initiate litigation (including a cross-claim or counterclaim in a lawsuit) alleging that any patent claim is infringed by making, using, selling, offering for sale, or importing the Program or any portion of it. - -11. Patents. -A "contributor" is a copyright holder who authorizes use under this License of the Program or a work on which the Program is based. The work thus licensed is called the contributor's "contributor version". -A contributor's "essential patent claims" are all patent claims owned or controlled by the contributor, whether already acquired or hereafter acquired, that would be infringed by some manner, permitted by this License, of making, using, or selling its contributor version, but do not include claims that would be infringed only as a consequence of further modification of the contributor version. For purposes of this definition, "control" includes the right to grant patent sublicenses in a manner consistent with the requirements of this License. - -Each contributor grants you a non-exclusive, worldwide, royalty-free patent license under the contributor's essential patent claims, to make, use, sell, offer for sale, import and otherwise run, modify and propagate the contents of its contributor version. - -In the following three paragraphs, a "patent license" is any express agreement or commitment, however denominated, not to enforce a patent (such as an express permission to practice a patent or covenant not to sue for patent infringement). To "grant" such a patent license to a party means to make such an agreement or commitment not to enforce a patent against the party. - -If you convey a covered work, knowingly relying on a patent license, and the Corresponding Source of the work is not available for anyone to copy, free of charge and under the terms of this License, through a publicly available network server or other readily accessible means, then you must either (1) cause the Corresponding Source to be so available, or (2) arrange to deprive yourself of the benefit of the patent license for this particular work, or (3) arrange, in a manner consistent with the requirements of this License, to extend the patent license to downstream recipients. "Knowingly relying" means you have actual knowledge that, but for the patent license, your conveying the covered work in a country, or your recipient's use of the covered work in a country, would infringe one or more identifiable patents in that country that you have reason to believe are valid. - -If, pursuant to or in connection with a single transaction or arrangement, you convey, or propagate by procuring conveyance of, a covered work, and grant a patent license to some of the parties receiving the covered work authorizing them to use, propagate, modify or convey a specific copy of the covered work, then the patent license you grant is automatically extended to all recipients of the covered work and works based on it. - -A patent license is "discriminatory" if it does not include within the scope of its coverage, prohibits the exercise of, or is conditioned on the non-exercise of one or more of the rights that are specifically granted under this License. You may not convey a covered work if you are a party to an arrangement with a third party that is in the business of distributing software, under which you make payment to the third party based on the extent of your activity of conveying the work, and under which the third party grants, to any of the parties who would receive the covered work from you, a discriminatory patent license (a) in connection with copies of the covered work conveyed by you (or copies made from those copies), or (b) primarily for and in connection with specific products or compilations that contain the covered work, unless you entered into that arrangement, or that patent license was granted, prior to 28 March 2007. - -Nothing in this License shall be construed as excluding or limiting any implied license or other defenses to infringement that may otherwise be available to you under applicable patent law. - -12. No Surrender of Others' Freedom. -If conditions are imposed on you (whether by court order, agreement or otherwise) that contradict the conditions of this License, they do not excuse you from the conditions of this License. If you cannot convey a covered work so as to satisfy simultaneously your obligations under this License and any other pertinent obligations, then as a consequence you may not convey it at all. For example, if you agree to terms that obligate you to collect a royalty for further conveying from those to whom you convey the Program, the only way you could satisfy both those terms and this License would be to refrain entirely from conveying the Program. -13. Use with the GNU Affero General Public License. -Notwithstanding any other provision of this License, you have permission to link or combine any covered work with a work licensed under version 3 of the GNU Affero General Public License into a single combined work, and to convey the resulting work. The terms of this License will continue to apply to the part which is the covered work, but the special requirements of the GNU Affero General Public License, section 13, concerning interaction through a network will apply to the combination as such. -14. Revised Versions of this License. -The Free Software Foundation may publish revised and/or new versions of the GNU General Public License from time to time. Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns. -Each version is given a distinguishing version number. If the Program specifies that a certain numbered version of the GNU General Public License "or any later version" applies to it, you have the option of following the terms and conditions either of that numbered version or of any later version published by the Free Software Foundation. If the Program does not specify a version number of the GNU General Public License, you may choose any version ever published by the Free Software Foundation. - -If the Program specifies that a proxy can decide which future versions of the GNU General Public License can be used, that proxy's public statement of acceptance of a version permanently authorizes you to choose that version for the Program. - -Later license versions may give you additional or different permissions. However, no additional obligations are imposed on any author or copyright holder as a result of your choosing to follow a later version. - -15. Disclaimer of Warranty. -THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. -16. Limitation of Liability. -IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. -17. Interpretation of Sections 15 and 16. -If the disclaimer of warranty and limitation of liability provided above cannot be given local legal effect according to their terms, reviewing courts shall apply local law that most closely approximates an absolute waiver of all civil liability in connection with the Program, unless a warranty or assumption of liability accompanies a copy of the Program in return for a fee. - -END OF TERMS AND CONDITIONS - -How to Apply These Terms to Your New Programs - -If you develop a new program, and you want it to be of the greatest possible use to the public, the best way to achieve this is to make it free software which everyone can redistribute and change under these terms. - -To do so, attach the following notices to the program. It is safest to attach them to the start of each source file to most effectively state the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found. - - -Copyright (C) - -This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. - -This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - -You should have received a copy of the GNU General Public License along with this program. If not, see . - -Also add information on how to contact you by electronic and paper mail. - -If the program does terminal interaction, make it output a short notice like this when it starts in an interactive mode: - - Copyright (C) -This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. -This is free software, and you are welcome to redistribute it under certain conditions; type `show c' for details. - -The hypothetical commands `show w' and `show c' should show the appropriate parts of the General Public License. Of course, your program's commands might be different; for a GUI interface, you would use an "about box". - -You should also get your employer (if you work as a programmer) or school, if any, to sign a "copyright disclaimer" for the program, if necessary. For more information on this, and how to apply and follow the GNU GPL, see . - -The GNU General Public License does not permit incorporating your program into proprietary programs. If your program is a subroutine library, you may consider it more useful to permit linking proprietary applications with the library. If this is what you want to do, use the GNU Lesser General Public License instead of this License. But first, please read . diff --git a/packages/es-mapping-generator/README.md b/packages/es-mapping-generator/README.md index 499e5343..cd7fc764 100644 --- a/packages/es-mapping-generator/README.md +++ b/packages/es-mapping-generator/README.md @@ -28,9 +28,11 @@ manually. To generate the mapping files by hand, you need a local copy of the core-tools and the core, both need to be built first. After that you can run + ``` node lib/cli.js mapping path/to/core path/to/destination ignoredTag1,ignoredTag2,ignoredTag3 ``` + If you don't pass in any ignored tags, you will likely be prompted with errors, despite the core being absolutely correct. This is because there are some tags that are not relevant to Elasticsearch, but the program has no direct way to tell which ones simply lack an implementation and which ones can be ignored. Currently the ignored tags include @@ -41,10 +43,15 @@ which ones simply lack an implementation and which ones can be ignored. Currentl This is the more easy way, and it gives you direct access to the generated mapping as a (mostly typesafe) object. To use it, call `generateTemplate`, However you will first need to generate a ProjectReflection of the core you are working with. If you use the core as a dependency, you can for example use + ```typescript -const map = generateTemplate(getProjectReflection(resolve('node_modules', '@openstapps', 'core', 'src')), - ignoredTags, false); +const map = generateTemplate( + getProjectReflection(resolve('node_modules', '@openstapps', 'core', 'src')), + ignoredTags, + false, +); ``` + to generate the mappings. Note that the result object contains both a list of errors in `map.errors` and the actual mapping in `map.template`. You can also specify whether you want the generator to show any errors while generating the mappings in the console in the last parameter, `true` (default) being show errors and `false` to suppress them. That said it is very diff --git a/packages/es-mapping-generator/app.js b/packages/es-mapping-generator/app.js index 19bbfa61..832461c8 100644 --- a/packages/es-mapping-generator/app.js +++ b/packages/es-mapping-generator/app.js @@ -1,2 +1,2 @@ #!/usr/bin/env node -require('./lib/cli.js') +require('./lib/app.js'); diff --git a/packages/es-mapping-generator/package.json b/packages/es-mapping-generator/package.json index 183c8770..aa579d60 100644 --- a/packages/es-mapping-generator/package.json +++ b/packages/es-mapping-generator/package.json @@ -1,6 +1,5 @@ { "name": "@openstapps/es-mapping-generator", - "version": "0.4.0", "description": "Tool to convert TypeScript Interfaces to Elasticsearch Mappings", "version": "2.1.0", "type": "commonjs", @@ -14,29 +13,23 @@ "author": "Thea Schöbl ", "scripts": { "build": "rimraf lib && tsc", - "changelog": "conventional-changelog -p angular -i CHANGELOG.md -s -r 0 && git add CHANGELOG.md && git commit -m 'docs: update changelog'", - "check-configuration": "openstapps-configuration", - "documentation": "typedoc --includeDeclarations --mode modules --out docs --readme README.md --listInvalidSymbolLinks src", - "version": "npm run changelog", - "prepublishOnly": "npm ci && npm run build", - "preversion": "npm run prepublishOnly", - "push": "git push && git push origin \"v$npm_package_version\"", - "test": "mocha --require ts-node/register test/*.spec.ts", + "format": "prettier .", + "format:fix": "prettier --write .", "lint": "eslint -c .eslintrc --ignore-path .eslintignore --ext .ts src/ test/", - "lint:fix": "eslint --fix -c .eslintrc --ignore-path .eslintignore --ext .ts src/ test/" + "lint:fix": "eslint --fix -c .eslintrc --ignore-path .eslintignore --ext .ts src/ test/", + "test": "mocha --require ts-node/register test/*.spec.ts" }, "dependencies": { "@elastic/elasticsearch": "8.4.0", - "@openstapps/logger": "workspace:*", "commander": "10.0.0", - "deepmerge": "4.3.0", + "deepmerge": "4.3.1", "flatted": "3.2.7", "got": "11.8.6", "typedoc": "0.18.0", "typescript": "3.8.3" }, "devDependencies": { - "@openstapps/configuration": "workspace:*", + "@openstapps/prettier-config": "workspace:*", "@testdeck/mocha": "0.3.3", "@openstapps/eslint-config": "workspace:*", "@types/chai": "4.3.4", @@ -44,10 +37,10 @@ "@types/node": "14.18.38", "@types/rimraf": "3.0.2", "chai": "4.3.7", - "conventional-changelog-cli": "2.2.2", "mocha": "10.2.0", "nock": "13.3.0", - "rimraf": "4.4.0", "ts-node": "10.9.1", - } + "rimraf": "5.0.0" + }, + "prettier": "@openstapps/prettier-config" } diff --git a/packages/es-mapping-generator/src/cli.ts b/packages/es-mapping-generator/src/app.ts similarity index 99% rename from packages/es-mapping-generator/src/cli.ts rename to packages/es-mapping-generator/src/app.ts index 5118a413..2b703d73 100644 --- a/packages/es-mapping-generator/src/cli.ts +++ b/packages/es-mapping-generator/src/app.ts @@ -1,4 +1,3 @@ -/* eslint-disable unicorn/no-null */ /* * Copyright (C) 2018-2021 StApps * This program is free software: you can redistribute it and/or modify it diff --git a/packages/es-mapping-generator/src/index.ts b/packages/es-mapping-generator/src/index.ts new file mode 100644 index 00000000..bfa6b52b --- /dev/null +++ b/packages/es-mapping-generator/src/index.ts @@ -0,0 +1,6 @@ +export * from './mapping' +export * from './project-reflection' +export * from './config/premap' +export * from './config/fieldmap' +export * from './config/settings' +export * from './config/typemap' diff --git a/packages/es-mapping-generator/src/mapping.ts b/packages/es-mapping-generator/src/mapping.ts index 44dc1d3f..8af2bbbb 100644 --- a/packages/es-mapping-generator/src/mapping.ts +++ b/packages/es-mapping-generator/src/mapping.ts @@ -38,8 +38,9 @@ import {premaps} from './config/premap.js'; import {settings} from './config/settings.js'; import {dynamicTypes, isTagType, MISSING_PREMAP, PARSE_ERROR, TYPE_CONFLICT, typemap} from './config/typemap.js'; import {AggregationSchema, ESNestedAggregation} from './types/aggregation.js'; -import {ElasticsearchTemplateCollection, MappingGenTemplate} from './types/mapping.js'; -import * as console from "console"; +import {ElasticsearchTemplateCollection, + MappingGenTemplate} from './types/mapping.js'; +import * as console from 'console'; let dynamicTemplates: Record[] = []; let errors: string[] = []; @@ -259,7 +260,11 @@ function handleDeclarationReflection( // check if we have an object referencing a generic if (generics.has(decl.name)) { // if the object name is the same as the generic name - return readFieldTags(generics.get(decl.name)!, path, topTypeName, decl.comment?.tags ?? []); + return readFieldTags( + generics.get(decl.name)!, + path, + topTypeName, decl.comment?.tags ?? [], + ); // use the value defined by the generic } @@ -682,7 +687,12 @@ function readFieldTags( * @param topTypeName the name of the SCThingType * @param tags tags attached to the value */ -function readTypeTags(type: string, path: string, topTypeName: string, tags: CommentTag[]): MappingProperty { +function readTypeTags( + type: string, + path: string, + topTypeName: string, + tags: CommentTag[], +): MappingProperty { let out: MappingProperty = {type: PARSE_ERROR}; if (typeof typemap[type] !== 'undefined') { diff --git a/packages/es-mapping-generator/tsconfig.json b/packages/es-mapping-generator/tsconfig.json index 27d3a5bf..03808a28 100644 --- a/packages/es-mapping-generator/tsconfig.json +++ b/packages/es-mapping-generator/tsconfig.json @@ -21,8 +21,5 @@ "skipLibCheck": true, "target": "ES2020" }, - "exclude": [ - "./lib/", - "./test/" - ] + "exclude": ["./lib/", "./test/"] } diff --git a/packages/gitlab-api/.editorconfig b/packages/gitlab-api/.editorconfig deleted file mode 100644 index 9a4062a7..00000000 --- a/packages/gitlab-api/.editorconfig +++ /dev/null @@ -1,15 +0,0 @@ -# editorconfig.org - -root = true - -[*] -indent_style = space -indent_size = 2 - -end_of_line = lf -charset = utf-8 -trim_trailing_whitespace = true -insert_final_newline = true - -[*.md] -trim_trailing_whitespace = false diff --git a/packages/gitlab-api/.eslintignore b/packages/gitlab-api/.eslintignore deleted file mode 100644 index 3d0a9346..00000000 --- a/packages/gitlab-api/.eslintignore +++ /dev/null @@ -1,2 +0,0 @@ -resources -openapi diff --git a/packages/gitlab-api/.eslintrc.json b/packages/gitlab-api/.eslintrc.json deleted file mode 100644 index 31d47702..00000000 --- a/packages/gitlab-api/.eslintrc.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "extends": "@openstapps" -} diff --git a/packages/gitlab-api/.gitlab/issue_templates/bug.md b/packages/gitlab-api/.gitlab/issue_templates/bug.md index f46f50ae..4ef365a8 100644 --- a/packages/gitlab-api/.gitlab/issue_templates/bug.md +++ b/packages/gitlab-api/.gitlab/issue_templates/bug.md @@ -2,35 +2,29 @@ (Summarize the bug encountered concisely) - ## Steps to reproduce (How one can reproduce the issue - this is very important) - ## Example Project (If possible, please create an example project here on GitLab.com that exhibits the problematic behaviour, and link to it here in the bug report) (If you are using an older version of GitLab, this will also determine whether the bug has been fixed in a more recent version) - ## What is the current bug behavior? (What actually happens) - ## What is the expected correct behavior? (What you should see instead) - ## Relevant logs and/or screenshots (Paste any relevant logs - please use code blocks (```) to format console output, logs, and code as it's very hard to read otherwise.) - ## Possible fixes (If you can, link to the line of code that might be responsible for the problem) diff --git a/packages/gitlab-api/CHANGELOG.md b/packages/gitlab-api/CHANGELOG.md index 52fa6306..305aa08a 100644 --- a/packages/gitlab-api/CHANGELOG.md +++ b/packages/gitlab-api/CHANGELOG.md @@ -1,153 +1,98 @@ # [0.10.0](https://gitlab.com/openstapps/gitlab-api/compare/v0.9.0...v0.10.0) (2022-11-21) - - # [0.9.0](https://gitlab.com/openstapps/gitlab-api/compare/v0.8.0...v0.9.0) (2021-05-19) - - # [0.8.0](https://gitlab.com/openstapps/gitlab-api/compare/v0.7.0...v0.8.0) (2020-10-20) - ### Features -* add command to copy issues ([755a301](https://gitlab.com/openstapps/gitlab-api/commit/755a3013a6edb43f727baf21f081bc2251cbe3cd)) - - +- add command to copy issues ([755a301](https://gitlab.com/openstapps/gitlab-api/commit/755a3013a6edb43f727baf21f081bc2251cbe3cd)) # [0.7.0](https://gitlab.com/openstapps/gitlab-api/compare/v0.6.1...v0.7.0) (2020-05-06) - ### Features -* add merge request assignment ([927dcb1](https://gitlab.com/openstapps/gitlab-api/commit/927dcb159b5a89be959443d642af85ef1cfc0020)) - - +- add merge request assignment ([927dcb1](https://gitlab.com/openstapps/gitlab-api/commit/927dcb159b5a89be959443d642af85ef1cfc0020)) ## [0.6.1](https://gitlab.com/openstapps/gitlab-api/compare/v0.6.0...v0.6.1) (2020-01-08) - ### Bug Fixes -* use passed method instead of resetting it ([db56457](https://gitlab.com/openstapps/gitlab-api/commit/db5645732cca9bdf7f36b250d49273753aaa0126)) - - +- use passed method instead of resetting it ([db56457](https://gitlab.com/openstapps/gitlab-api/commit/db5645732cca9bdf7f36b250d49273753aaa0126)) # [0.6.0](https://gitlab.com/openstapps/gitlab-api/compare/v0.5.1...v0.6.0) (2019-11-19) - ### Features -* add batch processing of issues ([fcf7cac](https://gitlab.com/openstapps/gitlab-api/commit/fcf7caca502e9c57c595998be001d57d79f8f207)) -* add possibility to configure retrying of requests ([1796e88](https://gitlab.com/openstapps/gitlab-api/commit/1796e882271bceda9c2c9bebccb6847491ecd338)) - - +- add batch processing of issues ([fcf7cac](https://gitlab.com/openstapps/gitlab-api/commit/fcf7caca502e9c57c595998be001d57d79f8f207)) +- add possibility to configure retrying of requests ([1796e88](https://gitlab.com/openstapps/gitlab-api/commit/1796e882271bceda9c2c9bebccb6847491ecd338)) ## [0.5.1](https://gitlab.com/openstapps/gitlab-api/compare/v0.5.0...v0.5.1) (2019-02-25) - ### Bug Fixes -* correct return type for method ([a74ad2f](https://gitlab.com/openstapps/gitlab-api/commit/a74ad2f6d3eae693e56385bc2d6e85d356f3ba95)) - - +- correct return type for method ([a74ad2f](https://gitlab.com/openstapps/gitlab-api/commit/a74ad2f6d3eae693e56385bc2d6e85d356f3ba95)) # [0.5.0](https://gitlab.com/openstapps/gitlab-api/compare/v0.4.0...v0.5.0) (2019-02-25) - ### Features -* add method to fetch merge request discussions ([4ef2cfb](https://gitlab.com/openstapps/gitlab-api/commit/4ef2cfb7382973487b7be03b714270ed40d0c7ae)) -* add types for discussions ([7c9b56f](https://gitlab.com/openstapps/gitlab-api/commit/7c9b56f6784397bc142330f16c175acd8b941c91)) - - +- add method to fetch merge request discussions ([4ef2cfb](https://gitlab.com/openstapps/gitlab-api/commit/4ef2cfb7382973487b7be03b714270ed40d0c7ae)) +- add types for discussions ([7c9b56f](https://gitlab.com/openstapps/gitlab-api/commit/7c9b56f6784397bc142330f16c175acd8b941c91)) # [0.4.0](https://gitlab.com/openstapps/gitlab-api/compare/v0.3.1...v0.4.0) (2019-02-05) - ### Features -* add enums for stricter types ([2dc6e80](https://gitlab.com/openstapps/gitlab-api/commit/2dc6e808a944b66e66de3719477c4e1ed2995d7e)) -* add type for merge request approval ([9d5e272](https://gitlab.com/openstapps/gitlab-api/commit/9d5e2727f82e3abb6680cdde6d1b8a8c1159e9c0)) - - +- add enums for stricter types ([2dc6e80](https://gitlab.com/openstapps/gitlab-api/commit/2dc6e808a944b66e66de3719477c4e1ed2995d7e)) +- add type for merge request approval ([9d5e272](https://gitlab.com/openstapps/gitlab-api/commit/9d5e2727f82e3abb6680cdde6d1b8a8c1159e9c0)) ## [0.3.1](https://gitlab.com/openstapps/gitlab-api/compare/v0.3.0...v0.3.1) (2019-01-28) - ### Bug Fixes -* correct property order ([3e494ce](https://gitlab.com/openstapps/gitlab-api/commit/3e494ce0dcf1e45711b3b0891962acfd9954a61f)) - - +- correct property order ([3e494ce](https://gitlab.com/openstapps/gitlab-api/commit/3e494ce0dcf1e45711b3b0891962acfd9954a61f)) # [0.3.0](https://gitlab.com/openstapps/gitlab-api/compare/v0.2.3...v0.3.0) (2019-01-28) - ### Features -* add method to get subgroups ([1854f38](https://gitlab.com/openstapps/gitlab-api/commit/1854f38190bd6d146b55c127a2294187653beb02)) - - +- add method to get subgroups ([1854f38](https://gitlab.com/openstapps/gitlab-api/commit/1854f38190bd6d146b55c127a2294187653beb02)) ## [0.2.3](https://gitlab.com/openstapps/gitlab-api/compare/v0.2.2...v0.2.3) (2019-01-07) - - ## [0.2.2](https://gitlab.com/openstapps/gitlab-api/compare/v0.2.1...v0.2.2) (2019-01-07) - - ## [0.2.1](https://gitlab.com/openstapps/gitlab-api/compare/v0.2.0...v0.2.1) (2019-01-07) - ### Bug Fixes -* correctly delete labels ([5f36b53](https://gitlab.com/openstapps/gitlab-api/commit/5f36b5372f87d912c2b733971dca659203021d67)) - - +- correctly delete labels ([5f36b53](https://gitlab.com/openstapps/gitlab-api/commit/5f36b5372f87d912c2b733971dca659203021d67)) # [0.2.0](https://gitlab.com/openstapps/gitlab-api/compare/v0.1.3...v0.2.0) (2018-11-30) - ### Bug Fixes -* correctly build request url ([ad5b0b9](https://gitlab.com/openstapps/gitlab-api/commit/ad5b0b9fe5487d1a217fda93295d7097394f1be8)) - - +- correctly build request url ([ad5b0b9](https://gitlab.com/openstapps/gitlab-api/commit/ad5b0b9fe5487d1a217fda93295d7097394f1be8)) ## [0.1.3](https://gitlab.com/openstapps/gitlab-api/compare/v0.1.2...v0.1.3) (2018-11-30) - ### Bug Fixes -* remove undocumented default params ([5e358bc](https://gitlab.com/openstapps/gitlab-api/commit/5e358bcacdb182d8695da73d373dd9a1b7e34b15)) - - +- remove undocumented default params ([5e358bc](https://gitlab.com/openstapps/gitlab-api/commit/5e358bcacdb182d8695da73d373dd9a1b7e34b15)) ## [0.1.2](https://gitlab.com/openstapps/gitlab-api/compare/v0.1.1...v0.1.2) (2018-11-29) - ### Bug Fixes -* use correct prefix for binary ([547e28f](https://gitlab.com/openstapps/gitlab-api/commit/547e28fc5742c90d5362f3a534cdd2e756ae8791)) - - +- use correct prefix for binary ([547e28f](https://gitlab.com/openstapps/gitlab-api/commit/547e28fc5742c90d5362f3a534cdd2e756ae8791)) ## [0.1.1](https://gitlab.com/openstapps/gitlab-api/compare/v0.1.0...v0.1.1) (2018-11-29) - - # [0.1.0](https://gitlab.com/openstapps/gitlab-api/compare/v0.0.1...v0.1.0) (2018-11-29) - - ## [0.0.1](https://gitlab.com/openstapps/gitlab-api/compare/54d212963cb6fb507f5275f18bbccb4e10496b1c...v0.0.1) (2018-11-29) - ### Features -* add GitLab API ([54d2129](https://gitlab.com/openstapps/gitlab-api/commit/54d212963cb6fb507f5275f18bbccb4e10496b1c)) - - - +- add GitLab API ([54d2129](https://gitlab.com/openstapps/gitlab-api/commit/54d212963cb6fb507f5275f18bbccb4e10496b1c)) diff --git a/packages/gitlab-api/LICENSE b/packages/gitlab-api/LICENSE deleted file mode 100644 index 9df63ccc..00000000 --- a/packages/gitlab-api/LICENSE +++ /dev/null @@ -1,200 +0,0 @@ -GNU GENERAL PUBLIC LICENSE -Version 3, 29 June 2007 - -Copyright © 2007 Free Software Foundation, Inc. - -Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. - -Preamble - -The GNU General Public License is a free, copyleft license for software and other kinds of works. - -The licenses for most software and other practical works are designed to take away your freedom to share and change the works. By contrast, the GNU General Public License is intended to guarantee your freedom to share and change all versions of a program--to make sure it remains free software for all its users. We, the Free Software Foundation, use the GNU General Public License for most of our software; it applies also to any other work released this way by its authors. You can apply it to your programs, too. - -When we speak of free software, we are referring to freedom, not price. Our General Public Licenses are designed to make sure that you have the freedom to distribute copies of free software (and charge for them if you wish), that you receive source code or can get it if you want it, that you can change the software or use pieces of it in new free programs, and that you know you can do these things. - -To protect your rights, we need to prevent others from denying you these rights or asking you to surrender the rights. Therefore, you have certain responsibilities if you distribute copies of the software, or if you modify it: responsibilities to respect the freedom of others. - -For example, if you distribute copies of such a program, whether gratis or for a fee, you must pass on to the recipients the same freedoms that you received. You must make sure that they, too, receive or can get the source code. And you must show them these terms so they know their rights. - -Developers that use the GNU GPL protect your rights with two steps: (1) assert copyright on the software, and (2) offer you this License giving you legal permission to copy, distribute and/or modify it. - -For the developers' and authors' protection, the GPL clearly explains that there is no warranty for this free software. For both users' and authors' sake, the GPL requires that modified versions be marked as changed, so that their problems will not be attributed erroneously to authors of previous versions. - -Some devices are designed to deny users access to install or run modified versions of the software inside them, although the manufacturer can do so. This is fundamentally incompatible with the aim of protecting users' freedom to change the software. The systematic pattern of such abuse occurs in the area of products for individuals to use, which is precisely where it is most unacceptable. Therefore, we have designed this version of the GPL to prohibit the practice for those products. If such problems arise substantially in other domains, we stand ready to extend this provision to those domains in future versions of the GPL, as needed to protect the freedom of users. - -Finally, every program is threatened constantly by software patents. States should not allow patents to restrict development and use of software on general-purpose computers, but in those that do, we wish to avoid the special danger that patents applied to a free program could make it effectively proprietary. To prevent this, the GPL assures that patents cannot be used to render the program non-free. - -The precise terms and conditions for copying, distribution and modification follow. - -TERMS AND CONDITIONS - -0. Definitions. -"This License" refers to version 3 of the GNU General Public License. - -"Copyright" also means copyright-like laws that apply to other kinds of works, such as semiconductor masks. - -"The Program" refers to any copyrightable work licensed under this License. Each licensee is addressed as "you". "Licensees" and "recipients" may be individuals or organizations. - -To "modify" a work means to copy from or adapt all or part of the work in a fashion requiring copyright permission, other than the making of an exact copy. The resulting work is called a "modified version" of the earlier work or a work "based on" the earlier work. - -A "covered work" means either the unmodified Program or a work based on the Program. - -To "propagate" a work means to do anything with it that, without permission, would make you directly or secondarily liable for infringement under applicable copyright law, except executing it on a computer or modifying a private copy. Propagation includes copying, distribution (with or without modification), making available to the public, and in some countries other activities as well. - -To "convey" a work means any kind of propagation that enables other parties to make or receive copies. Mere interaction with a user through a computer network, with no transfer of a copy, is not conveying. - -An interactive user interface displays "Appropriate Legal Notices" to the extent that it includes a convenient and prominently visible feature that (1) displays an appropriate copyright notice, and (2) tells the user that there is no warranty for the work (except to the extent that warranties are provided), that licensees may convey the work under this License, and how to view a copy of this License. If the interface presents a list of user commands or options, such as a menu, a prominent item in the list meets this criterion. - -1. Source Code. -The "source code" for a work means the preferred form of the work for making modifications to it. "Object code" means any non-source form of a work. -A "Standard Interface" means an interface that either is an official standard defined by a recognized standards body, or, in the case of interfaces specified for a particular programming language, one that is widely used among developers working in that language. - -The "System Libraries" of an executable work include anything, other than the work as a whole, that (a) is included in the normal form of packaging a Major Component, but which is not part of that Major Component, and (b) serves only to enable use of the work with that Major Component, or to implement a Standard Interface for which an implementation is available to the public in source code form. A "Major Component", in this context, means a major essential component (kernel, window system, and so on) of the specific operating system (if any) on which the executable work runs, or a compiler used to produce the work, or an object code interpreter used to run it. - -The "Corresponding Source" for a work in object code form means all the source code needed to generate, install, and (for an executable work) run the object code and to modify the work, including scripts to control those activities. However, it does not include the work's System Libraries, or general-purpose tools or generally available free programs which are used unmodified in performing those activities but which are not part of the work. For example, Corresponding Source includes interface definition files associated with source files for the work, and the source code for shared libraries and dynamically linked subprograms that the work is specifically designed to require, such as by intimate data communication or control flow between those subprograms and other parts of the work. - -The Corresponding Source need not include anything that users can regenerate automatically from other parts of the Corresponding Source. - -The Corresponding Source for a work in source code form is that same work. - -2. Basic Permissions. -All rights granted under this License are granted for the term of copyright on the Program, and are irrevocable provided the stated conditions are met. This License explicitly affirms your unlimited permission to run the unmodified Program. The output from running a covered work is covered by this License only if the output, given its content, constitutes a covered work. This License acknowledges your rights of fair use or other equivalent, as provided by copyright law. -You may make, run and propagate covered works that you do not convey, without conditions so long as your license otherwise remains in force. You may convey covered works to others for the sole purpose of having them make modifications exclusively for you, or provide you with facilities for running those works, provided that you comply with the terms of this License in conveying all material for which you do not control copyright. Those thus making or running the covered works for you must do so exclusively on your behalf, under your direction and control, on terms that prohibit them from making any copies of your copyrighted material outside their relationship with you. - -Conveying under any other circumstances is permitted solely under the conditions stated below. Sublicensing is not allowed; section 10 makes it unnecessary. - -3. Protecting Users' Legal Rights From Anti-Circumvention Law. -No covered work shall be deemed part of an effective technological measure under any applicable law fulfilling obligations under article 11 of the WIPO copyright treaty adopted on 20 December 1996, or similar laws prohibiting or restricting circumvention of such measures. -When you convey a covered work, you waive any legal power to forbid circumvention of technological measures to the extent such circumvention is effected by exercising rights under this License with respect to the covered work, and you disclaim any intention to limit operation or modification of the work as a means of enforcing, against the work's users, your or third parties' legal rights to forbid circumvention of technological measures. - -4. Conveying Verbatim Copies. -You may convey verbatim copies of the Program's source code as you receive it, in any medium, provided that you conspicuously and appropriately publish on each copy an appropriate copyright notice; keep intact all notices stating that this License and any non-permissive terms added in accord with section 7 apply to the code; keep intact all notices of the absence of any warranty; and give all recipients a copy of this License along with the Program. -You may charge any price or no price for each copy that you convey, and you may offer support or warranty protection for a fee. - -5. Conveying Modified Source Versions. -You may convey a work based on the Program, or the modifications to produce it from the Program, in the form of source code under the terms of section 4, provided that you also meet all of these conditions: -a) The work must carry prominent notices stating that you modified it, and giving a relevant date. -b) The work must carry prominent notices stating that it is released under this License and any conditions added under section 7. This requirement modifies the requirement in section 4 to "keep intact all notices". -c) You must license the entire work, as a whole, under this License to anyone who comes into possession of a copy. This License will therefore apply, along with any applicable section 7 additional terms, to the whole of the work, and all its parts, regardless of how they are packaged. This License gives no permission to license the work in any other way, but it does not invalidate such permission if you have separately received it. -d) If the work has interactive user interfaces, each must display Appropriate Legal Notices; however, if the Program has interactive interfaces that do not display Appropriate Legal Notices, your work need not make them do so. -A compilation of a covered work with other separate and independent works, which are not by their nature extensions of the covered work, and which are not combined with it such as to form a larger program, in or on a volume of a storage or distribution medium, is called an "aggregate" if the compilation and its resulting copyright are not used to limit the access or legal rights of the compilation's users beyond what the individual works permit. Inclusion of a covered work in an aggregate does not cause this License to apply to the other parts of the aggregate. - -6. Conveying Non-Source Forms. -You may convey a covered work in object code form under the terms of sections 4 and 5, provided that you also convey the machine-readable Corresponding Source under the terms of this License, in one of these ways: -a) Convey the object code in, or embodied in, a physical product (including a physical distribution medium), accompanied by the Corresponding Source fixed on a durable physical medium customarily used for software interchange. -b) Convey the object code in, or embodied in, a physical product (including a physical distribution medium), accompanied by a written offer, valid for at least three years and valid for as long as you offer spare parts or customer support for that product model, to give anyone who possesses the object code either (1) a copy of the Corresponding Source for all the software in the product that is covered by this License, on a durable physical medium customarily used for software interchange, for a price no more than your reasonable cost of physically performing this conveying of source, or (2) access to copy the Corresponding Source from a network server at no charge. -c) Convey individual copies of the object code with a copy of the written offer to provide the Corresponding Source. This alternative is allowed only occasionally and noncommercially, and only if you received the object code with such an offer, in accord with subsection 6b. -d) Convey the object code by offering access from a designated place (gratis or for a charge), and offer equivalent access to the Corresponding Source in the same way through the same place at no further charge. You need not require recipients to copy the Corresponding Source along with the object code. If the place to copy the object code is a network server, the Corresponding Source may be on a different server (operated by you or a third party) that supports equivalent copying facilities, provided you maintain clear directions next to the object code saying where to find the Corresponding Source. Regardless of what server hosts the Corresponding Source, you remain obligated to ensure that it is available for as long as needed to satisfy these requirements. -e) Convey the object code using peer-to-peer transmission, provided you inform other peers where the object code and Corresponding Source of the work are being offered to the general public at no charge under subsection 6d. -A separable portion of the object code, whose source code is excluded from the Corresponding Source as a System Library, need not be included in conveying the object code work. - -A "User Product" is either (1) a "consumer product", which means any tangible personal property which is normally used for personal, family, or household purposes, or (2) anything designed or sold for incorporation into a dwelling. In determining whether a product is a consumer product, doubtful cases shall be resolved in favor of coverage. For a particular product received by a particular user, "normally used" refers to a typical or common use of that class of product, regardless of the status of the particular user or of the way in which the particular user actually uses, or expects or is expected to use, the product. A product is a consumer product regardless of whether the product has substantial commercial, industrial or non-consumer uses, unless such uses represent the only significant mode of use of the product. - -"Installation Information" for a User Product means any methods, procedures, authorization keys, or other information required to install and execute modified versions of a covered work in that User Product from a modified version of its Corresponding Source. The information must suffice to ensure that the continued functioning of the modified object code is in no case prevented or interfered with solely because modification has been made. - -If you convey an object code work under this section in, or with, or specifically for use in, a User Product, and the conveying occurs as part of a transaction in which the right of possession and use of the User Product is transferred to the recipient in perpetuity or for a fixed term (regardless of how the transaction is characterized), the Corresponding Source conveyed under this section must be accompanied by the Installation Information. But this requirement does not apply if neither you nor any third party retains the ability to install modified object code on the User Product (for example, the work has been installed in ROM). - -The requirement to provide Installation Information does not include a requirement to continue to provide support service, warranty, or updates for a work that has been modified or installed by the recipient, or for the User Product in which it has been modified or installed. Access to a network may be denied when the modification itself materially and adversely affects the operation of the network or violates the rules and protocols for communication across the network. - -Corresponding Source conveyed, and Installation Information provided, in accord with this section must be in a format that is publicly documented (and with an implementation available to the public in source code form), and must require no special password or key for unpacking, reading or copying. - -7. Additional Terms. -"Additional permissions" are terms that supplement the terms of this License by making exceptions from one or more of its conditions. Additional permissions that are applicable to the entire Program shall be treated as though they were included in this License, to the extent that they are valid under applicable law. If additional permissions apply only to part of the Program, that part may be used separately under those permissions, but the entire Program remains governed by this License without regard to the additional permissions. -When you convey a copy of a covered work, you may at your option remove any additional permissions from that copy, or from any part of it. (Additional permissions may be written to require their own removal in certain cases when you modify the work.) You may place additional permissions on material, added by you to a covered work, for which you have or can give appropriate copyright permission. - -Notwithstanding any other provision of this License, for material you add to a covered work, you may (if authorized by the copyright holders of that material) supplement the terms of this License with terms: - -a) Disclaiming warranty or limiting liability differently from the terms of sections 15 and 16 of this License; or -b) Requiring preservation of specified reasonable legal notices or author attributions in that material or in the Appropriate Legal Notices displayed by works containing it; or -c) Prohibiting misrepresentation of the origin of that material, or requiring that modified versions of such material be marked in reasonable ways as different from the original version; or -d) Limiting the use for publicity purposes of names of licensors or authors of the material; or -e) Declining to grant rights under trademark law for use of some trade names, trademarks, or service marks; or -f) Requiring indemnification of licensors and authors of that material by anyone who conveys the material (or modified versions of it) with contractual assumptions of liability to the recipient, for any liability that these contractual assumptions directly impose on those licensors and authors. -All other non-permissive additional terms are considered "further restrictions" within the meaning of section 10. If the Program as you received it, or any part of it, contains a notice stating that it is governed by this License along with a term that is a further restriction, you may remove that term. If a license document contains a further restriction but permits relicensing or conveying under this License, you may add to a covered work material governed by the terms of that license document, provided that the further restriction does not survive such relicensing or conveying. - -If you add terms to a covered work in accord with this section, you must place, in the relevant source files, a statement of the additional terms that apply to those files, or a notice indicating where to find the applicable terms. - -Additional terms, permissive or non-permissive, may be stated in the form of a separately written license, or stated as exceptions; the above requirements apply either way. - -8. Termination. -You may not propagate or modify a covered work except as expressly provided under this License. Any attempt otherwise to propagate or modify it is void, and will automatically terminate your rights under this License (including any patent licenses granted under the third paragraph of section 11). -However, if you cease all violation of this License, then your license from a particular copyright holder is reinstated (a) provisionally, unless and until the copyright holder explicitly and finally terminates your license, and (b) permanently, if the copyright holder fails to notify you of the violation by some reasonable means prior to 60 days after the cessation. - -Moreover, your license from a particular copyright holder is reinstated permanently if the copyright holder notifies you of the violation by some reasonable means, this is the first time you have received notice of violation of this License (for any work) from that copyright holder, and you cure the violation prior to 30 days after your receipt of the notice. - -Termination of your rights under this section does not terminate the licenses of parties who have received copies or rights from you under this License. If your rights have been terminated and not permanently reinstated, you do not qualify to receive new licenses for the same material under section 10. - -9. Acceptance Not Required for Having Copies. -You are not required to accept this License in order to receive or run a copy of the Program. Ancillary propagation of a covered work occurring solely as a consequence of using peer-to-peer transmission to receive a copy likewise does not require acceptance. However, nothing other than this License grants you permission to propagate or modify any covered work. These actions infringe copyright if you do not accept this License. Therefore, by modifying or propagating a covered work, you indicate your acceptance of this License to do so. -10. Automatic Licensing of Downstream Recipients. -Each time you convey a covered work, the recipient automatically receives a license from the original licensors, to run, modify and propagate that work, subject to this License. You are not responsible for enforcing compliance by third parties with this License. -An "entity transaction" is a transaction transferring control of an organization, or substantially all assets of one, or subdividing an organization, or merging organizations. If propagation of a covered work results from an entity transaction, each party to that transaction who receives a copy of the work also receives whatever licenses to the work the party's predecessor in interest had or could give under the previous paragraph, plus a right to possession of the Corresponding Source of the work from the predecessor in interest, if the predecessor has it or can get it with reasonable efforts. - -You may not impose any further restrictions on the exercise of the rights granted or affirmed under this License. For example, you may not impose a license fee, royalty, or other charge for exercise of rights granted under this License, and you may not initiate litigation (including a cross-claim or counterclaim in a lawsuit) alleging that any patent claim is infringed by making, using, selling, offering for sale, or importing the Program or any portion of it. - -11. Patents. -A "contributor" is a copyright holder who authorizes use under this License of the Program or a work on which the Program is based. The work thus licensed is called the contributor's "contributor version". -A contributor's "essential patent claims" are all patent claims owned or controlled by the contributor, whether already acquired or hereafter acquired, that would be infringed by some manner, permitted by this License, of making, using, or selling its contributor version, but do not include claims that would be infringed only as a consequence of further modification of the contributor version. For purposes of this definition, "control" includes the right to grant patent sublicenses in a manner consistent with the requirements of this License. - -Each contributor grants you a non-exclusive, worldwide, royalty-free patent license under the contributor's essential patent claims, to make, use, sell, offer for sale, import and otherwise run, modify and propagate the contents of its contributor version. - -In the following three paragraphs, a "patent license" is any express agreement or commitment, however denominated, not to enforce a patent (such as an express permission to practice a patent or covenant not to sue for patent infringement). To "grant" such a patent license to a party means to make such an agreement or commitment not to enforce a patent against the party. - -If you convey a covered work, knowingly relying on a patent license, and the Corresponding Source of the work is not available for anyone to copy, free of charge and under the terms of this License, through a publicly available network server or other readily accessible means, then you must either (1) cause the Corresponding Source to be so available, or (2) arrange to deprive yourself of the benefit of the patent license for this particular work, or (3) arrange, in a manner consistent with the requirements of this License, to extend the patent license to downstream recipients. "Knowingly relying" means you have actual knowledge that, but for the patent license, your conveying the covered work in a country, or your recipient's use of the covered work in a country, would infringe one or more identifiable patents in that country that you have reason to believe are valid. - -If, pursuant to or in connection with a single transaction or arrangement, you convey, or propagate by procuring conveyance of, a covered work, and grant a patent license to some of the parties receiving the covered work authorizing them to use, propagate, modify or convey a specific copy of the covered work, then the patent license you grant is automatically extended to all recipients of the covered work and works based on it. - -A patent license is "discriminatory" if it does not include within the scope of its coverage, prohibits the exercise of, or is conditioned on the non-exercise of one or more of the rights that are specifically granted under this License. You may not convey a covered work if you are a party to an arrangement with a third party that is in the business of distributing software, under which you make payment to the third party based on the extent of your activity of conveying the work, and under which the third party grants, to any of the parties who would receive the covered work from you, a discriminatory patent license (a) in connection with copies of the covered work conveyed by you (or copies made from those copies), or (b) primarily for and in connection with specific products or compilations that contain the covered work, unless you entered into that arrangement, or that patent license was granted, prior to 28 March 2007. - -Nothing in this License shall be construed as excluding or limiting any implied license or other defenses to infringement that may otherwise be available to you under applicable patent law. - -12. No Surrender of Others' Freedom. -If conditions are imposed on you (whether by court order, agreement or otherwise) that contradict the conditions of this License, they do not excuse you from the conditions of this License. If you cannot convey a covered work so as to satisfy simultaneously your obligations under this License and any other pertinent obligations, then as a consequence you may not convey it at all. For example, if you agree to terms that obligate you to collect a royalty for further conveying from those to whom you convey the Program, the only way you could satisfy both those terms and this License would be to refrain entirely from conveying the Program. -13. Use with the GNU Affero General Public License. -Notwithstanding any other provision of this License, you have permission to link or combine any covered work with a work licensed under version 3 of the GNU Affero General Public License into a single combined work, and to convey the resulting work. The terms of this License will continue to apply to the part which is the covered work, but the special requirements of the GNU Affero General Public License, section 13, concerning interaction through a network will apply to the combination as such. -14. Revised Versions of this License. -The Free Software Foundation may publish revised and/or new versions of the GNU General Public License from time to time. Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns. -Each version is given a distinguishing version number. If the Program specifies that a certain numbered version of the GNU General Public License "or any later version" applies to it, you have the option of following the terms and conditions either of that numbered version or of any later version published by the Free Software Foundation. If the Program does not specify a version number of the GNU General Public License, you may choose any version ever published by the Free Software Foundation. - -If the Program specifies that a proxy can decide which future versions of the GNU General Public License can be used, that proxy's public statement of acceptance of a version permanently authorizes you to choose that version for the Program. - -Later license versions may give you additional or different permissions. However, no additional obligations are imposed on any author or copyright holder as a result of your choosing to follow a later version. - -15. Disclaimer of Warranty. -THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. -16. Limitation of Liability. -IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. -17. Interpretation of Sections 15 and 16. -If the disclaimer of warranty and limitation of liability provided above cannot be given local legal effect according to their terms, reviewing courts shall apply local law that most closely approximates an absolute waiver of all civil liability in connection with the Program, unless a warranty or assumption of liability accompanies a copy of the Program in return for a fee. - -END OF TERMS AND CONDITIONS - -How to Apply These Terms to Your New Programs - -If you develop a new program, and you want it to be of the greatest possible use to the public, the best way to achieve this is to make it free software which everyone can redistribute and change under these terms. - -To do so, attach the following notices to the program. It is safest to attach them to the start of each source file to most effectively state the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found. - - -Copyright (C) - -This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. - -This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - -You should have received a copy of the GNU General Public License along with this program. If not, see . - -Also add information on how to contact you by electronic and paper mail. - -If the program does terminal interaction, make it output a short notice like this when it starts in an interactive mode: - - Copyright (C) -This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. -This is free software, and you are welcome to redistribute it under certain conditions; type `show c' for details. - -The hypothetical commands `show w' and `show c' should show the appropriate parts of the General Public License. Of course, your program's commands might be different; for a GUI interface, you would use an "about box". - -You should also get your employer (if you work as a programmer) or school, if any, to sign a "copyright disclaimer" for the program, if necessary. For more information on this, and how to apply and follow the GNU GPL, see . - -The GNU General Public License does not permit incorporating your program into proprietary programs. If your program is a subroutine library, you may consider it more useful to permit linking proprietary applications with the library. If this is what you want to do, use the GNU Lesser General Public License instead of this License. But first, please read . diff --git a/packages/gitlab-api/app.js b/packages/gitlab-api/app.js index d233e644..5ca3fea3 100644 --- a/packages/gitlab-api/app.js +++ b/packages/gitlab-api/app.js @@ -1,2 +1,2 @@ #!/usr/bin/env node -import './lib/cli.js' +import './lib/app.js'; diff --git a/packages/gitlab-api/package.json b/packages/gitlab-api/package.json index 75ed9707..186a38b6 100644 --- a/packages/gitlab-api/package.json +++ b/packages/gitlab-api/package.json @@ -15,15 +15,11 @@ "openstapps-gitlab-api": "app.js" }, "scripts": { - "build": "rimraf lib && tsc", - "changelog": "conventional-changelog -p angular -i CHANGELOG.md -s -r 0 && git add CHANGELOG.md && git commit -m 'docs: update changelog'", - "check-configuration": "openstapps-configuration", - "documentation": "typedoc --out docs --readme README.md --listInvalidSymbolLinks --entryPointStrategy expand src", + "build": "tsup --dts", + "format": "prettier .", + "format:fix": "prettier --write .", "lint": "eslint --ext .ts src/", - "postversion": "npm run changelog", - "prepublishOnly": "npm ci && npm run build && npm run test", - "preversion": "npm run prepublishOnly", - "push": "git push && git push origin \"v$npm_package_version\"" + "lint:fix": "eslint --fix --ext .ts src/" }, "dependencies": { "@openstapps/logger": "workspace:*", @@ -31,20 +27,31 @@ "got": "12.6.0" }, "devDependencies": { - "@openstapps/configuration": "workspace:*", "@openstapps/eslint-config": "workspace:*", + "@openstapps/prettier-config": "workspace:*", + "@openstapps/tsconfig": "workspace:*", "@types/node": "18.15.3", "@typescript-eslint/eslint-plugin": "5.49.0", "@typescript-eslint/parser": "5.49.0", - "conventional-changelog-cli": "2.2.2", - "eslint": "8.33.0", - "eslint-config-prettier": "8.6.0", - "eslint-plugin-jsdoc": "39.7.4", - "eslint-plugin-unicorn": "45.0.2", - "prettier": "2.8.3", - "rimraf": "4.4.0", "ts-node": "10.9.1", - "typedoc": "0.23.26", + "tsup": "6.7.0", + "typedoc": "0.23.28", "typescript": "4.8.4" + }, + "tsup": { + "entry": [ + "src/app.ts", + "src/api.ts" + ], + "sourcemap": true, + "clean": true, + "format": "esm", + "outDir": "lib" + }, + "prettier": "@openstapps/prettier-config", + "eslintConfig": { + "extends": [ + "@openstapps" + ] } } diff --git a/packages/gitlab-api/src/api.ts b/packages/gitlab-api/src/api.ts index 13307798..6dcf06dd 100644 --- a/packages/gitlab-api/src/api.ts +++ b/packages/gitlab-api/src/api.ts @@ -33,7 +33,9 @@ import { Tag, TreeFile, } from './types.js'; -import got from "got"; +import got from 'got'; + +export * from './types.js' /** * Sleep for a number of milliseconds @@ -300,9 +302,7 @@ export class Api { commitish, )}`; - return this.makeGitLabAPIRequest( - `projects/${projectId}/repository/files/${fileIdentifier}`, - ); + return this.makeGitLabAPIRequest(`projects/${projectId}/repository/files/${fileIdentifier}`); } /** @@ -508,17 +508,18 @@ export class Api { retry: { limit: _options.tries, }, - }).on('response', response => { - const xTotalPages = response.headers['x-total-pages']; - - if (typeof xTotalPages === 'string') { - totalPages = Number.parseInt(xTotalPages, 10); - } - }).json(); + }) + .on('response', response => { + const xTotalPages = response.headers['x-total-pages']; + if (typeof xTotalPages === 'string') { + totalPages = Number.parseInt(xTotalPages, 10); + } + }) + .json(); if (_options.method === 'DELETE') { - return (void 0) as unknown as T; + return void 0 as unknown as T; } apiResult = @@ -583,9 +584,12 @@ export class Api { */ public async setMilestoneForIssue(issue: Issue, milestoneId: number): Promise { if (milestoneId === null) { - return this.makeGitLabAPIRequest(`projects/${issue.project_id}/issues/${issue.iid}?milestone_id=`, { - method: 'PUT', - }); + return this.makeGitLabAPIRequest( + `projects/${issue.project_id}/issues/${issue.iid}?milestone_id=`, + { + method: 'PUT', + }, + ); } return this.makeGitLabAPIRequest( diff --git a/packages/gitlab-api/src/cli.ts b/packages/gitlab-api/src/app.ts similarity index 95% rename from packages/gitlab-api/src/cli.ts rename to packages/gitlab-api/src/app.ts index 28e0dcd9..9af33989 100644 --- a/packages/gitlab-api/src/cli.ts +++ b/packages/gitlab-api/src/app.ts @@ -12,9 +12,7 @@ * You should have received a copy of the GNU General Public License along with * this program. If not, see . */ -import {Logger} from '@openstapps/logger'; -import {AddLogLevel} from '@openstapps/logger/lib/transformations/add-log-level.js'; -import {Colorize} from '@openstapps/logger/lib/transformations/colorize.js'; +import {Logger, AddLogLevel, Colorize} from '@openstapps/logger'; import {Command} from 'commander'; import {readFileSync} from 'fs'; import path from 'path'; @@ -172,7 +170,7 @@ ${note.body}`, commander.parse(process.argv); -const token = commander.getOptionValue('token') +const token = commander.getOptionValue('token'); if (typeof token !== 'string' || token.length === 0) { Logger.warn( 'You probably want to supply a GitLab token either via option or environment variable (GITLAB_PRIVATE_TOKEN).', diff --git a/packages/gitlab-api/tsconfig.json b/packages/gitlab-api/tsconfig.json index 066a5f38..579a39ff 100644 --- a/packages/gitlab-api/tsconfig.json +++ b/packages/gitlab-api/tsconfig.json @@ -1,3 +1,3 @@ { - "extends": "./node_modules/@openstapps/configuration/tsconfig.json" + "extends": "@openstapps/tsconfig" } diff --git a/packages/logger/.editorconfig b/packages/logger/.editorconfig deleted file mode 100644 index 9a4062a7..00000000 --- a/packages/logger/.editorconfig +++ /dev/null @@ -1,15 +0,0 @@ -# editorconfig.org - -root = true - -[*] -indent_style = space -indent_size = 2 - -end_of_line = lf -charset = utf-8 -trim_trailing_whitespace = true -insert_final_newline = true - -[*.md] -trim_trailing_whitespace = false diff --git a/packages/logger/.eslintignore b/packages/logger/.eslintignore deleted file mode 100644 index 3d0a9346..00000000 --- a/packages/logger/.eslintignore +++ /dev/null @@ -1,2 +0,0 @@ -resources -openapi diff --git a/packages/logger/.eslintrc.json b/packages/logger/.eslintrc.json deleted file mode 100644 index 31d47702..00000000 --- a/packages/logger/.eslintrc.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "extends": "@openstapps" -} diff --git a/packages/logger/.gitlab/issue_templates/bug.md b/packages/logger/.gitlab/issue_templates/bug.md index f46f50ae..4ef365a8 100644 --- a/packages/logger/.gitlab/issue_templates/bug.md +++ b/packages/logger/.gitlab/issue_templates/bug.md @@ -2,35 +2,29 @@ (Summarize the bug encountered concisely) - ## Steps to reproduce (How one can reproduce the issue - this is very important) - ## Example Project (If possible, please create an example project here on GitLab.com that exhibits the problematic behaviour, and link to it here in the bug report) (If you are using an older version of GitLab, this will also determine whether the bug has been fixed in a more recent version) - ## What is the current bug behavior? (What actually happens) - ## What is the expected correct behavior? (What you should see instead) - ## Relevant logs and/or screenshots (Paste any relevant logs - please use code blocks (```) to format console output, logs, and code as it's very hard to read otherwise.) - ## Possible fixes (If you can, link to the line of code that might be responsible for the problem) diff --git a/packages/logger/CHANGELOG.md b/packages/logger/CHANGELOG.md index 0fd0cee8..c8dfc357 100644 --- a/packages/logger/CHANGELOG.md +++ b/packages/logger/CHANGELOG.md @@ -1,121 +1,73 @@ ## [1.1.1](https://gitlab.com/openstapps/logger/compare/v1.1.0...v1.1.1) (2022-11-08) - ### Bug Fixes -* removing transformations in production ([8d6ea04](https://gitlab.com/openstapps/logger/commit/8d6ea040c1e4ce177068e1a9fea5085e748f1110)) - - +- removing transformations in production ([8d6ea04](https://gitlab.com/openstapps/logger/commit/8d6ea040c1e4ce177068e1a9fea5085e748f1110)) # [1.1.0](https://gitlab.com/openstapps/logger/compare/v1.0.1...v1.1.0) (2022-11-01) - ### Bug Fixes -* compatibility with log aggregators ([8aef5b8](https://gitlab.com/openstapps/logger/commit/8aef5b8d5b5fe4ed4ff7f17fd679ebdf83381001)) - - +- compatibility with log aggregators ([8aef5b8](https://gitlab.com/openstapps/logger/commit/8aef5b8d5b5fe4ed4ff7f17fd679ebdf83381001)) ## [1.0.1](https://gitlab.com/openstapps/logger/compare/v1.0.0...v1.0.1) (2022-10-12) - - # [1.0.0](https://gitlab.com/openstapps/logger/compare/v0.8.1...v1.0.0) (2022-08-17) - - ## [0.8.1](https://gitlab.com/openstapps/logger/compare/v0.8.0...v0.8.1) (2022-05-27) - - # [0.8.0](https://gitlab.com/openstapps/logger/compare/v0.7.0...v0.8.0) (2021-12-14) - - # [0.7.0](https://gitlab.com/openstapps/logger/compare/v0.6.0...v0.7.0) (2021-05-18) - - # [0.6.0](https://gitlab.com/openstapps/logger/compare/v0.4.0...v0.6.0) (2021-04-06) - ### Bug Fixes -* log level exclusiveness calculation ([100b921](https://gitlab.com/openstapps/logger/commit/100b921488c3b8846678bf72befb787ca51bd1c7)) - +- log level exclusiveness calculation ([100b921](https://gitlab.com/openstapps/logger/commit/100b921488c3b8846678bf72befb787ca51bd1c7)) ### Features -* add EXIT log level ([edc6e6f](https://gitlab.com/openstapps/logger/commit/edc6e6fad5ece784059e406dcedd6d76fe07f74b)) - - +- add EXIT log level ([edc6e6f](https://gitlab.com/openstapps/logger/commit/edc6e6fad5ece784059e406dcedd6d76fe07f74b)) # [0.4.0](https://gitlab.com/openstapps/logger/compare/v0.3.1...v0.4.0) (2019-07-12) - ### Features -* add transformations ([ddbe00d](https://gitlab.com/openstapps/logger/commit/ddbe00d2a51430348fcf4e4e29807cc43a37cf49)), closes [#9](https://gitlab.com/openstapps/logger/issues/9) - - +- add transformations ([ddbe00d](https://gitlab.com/openstapps/logger/commit/ddbe00d2a51430348fcf4e4e29807cc43a37cf49)), closes [#9](https://gitlab.com/openstapps/logger/issues/9) ## [0.3.1](https://gitlab.com/openstapps/logger/compare/v0.3.0...v0.3.1) (2019-06-05) - ### Bug Fixes -* correct meta information for imports ([d2cb99f](https://gitlab.com/openstapps/logger/commit/d2cb99f70f713029550d8e535abfa65961486006)) - - +- correct meta information for imports ([d2cb99f](https://gitlab.com/openstapps/logger/commit/d2cb99f70f713029550d8e535abfa65961486006)) # [0.3.0](https://gitlab.com/openstapps/logger/compare/v0.2.1...v0.3.0) (2019-06-04) - - ## [0.2.1](https://gitlab.com/openstapps/logger/compare/v0.2.0...v0.2.1) (2019-05-27) - - # [0.2.0](https://gitlab.com/openstapps/logger/compare/v0.1.0...v0.2.0) (2019-05-27) - ### Features -* add automatic publishing ([d9c4ce4](https://gitlab.com/openstapps/logger/commit/d9c4ce48dc980f85d43be47a23b5eda73f9f21b1)), closes [#6](https://gitlab.com/openstapps/logger/issues/6) - - +- add automatic publishing ([d9c4ce4](https://gitlab.com/openstapps/logger/commit/d9c4ce48dc980f85d43be47a23b5eda73f9f21b1)), closes [#6](https://gitlab.com/openstapps/logger/issues/6) # [0.1.0](https://gitlab.com/openstapps/logger/compare/v0.0.5...v0.1.0) (2019-05-07) - - ## [0.0.5](https://gitlab.com/openstapps/logger/compare/v0.0.4...v0.0.5) (2019-01-16) - ### Features -* allow env variables to overwrite smtp config ([3d82c94](https://gitlab.com/openstapps/logger/commit/3d82c94577ad2013124fab64fc13ce24df579d21)), closes [#3](https://gitlab.com/openstapps/logger/issues/3) - - +- allow env variables to overwrite smtp config ([3d82c94](https://gitlab.com/openstapps/logger/commit/3d82c94577ad2013124fab64fc13ce24df579d21)), closes [#3](https://gitlab.com/openstapps/logger/issues/3) ## [0.0.4](https://gitlab.com/openstapps/logger/compare/v0.0.3...v0.0.4) (2018-11-28) - - ## [0.0.3](https://gitlab.com/openstapps/logger/compare/v0.0.2...v0.0.3) (2018-11-28) - - ## [0.0.2](https://gitlab.com/openstapps/logger/compare/v0.0.1...v0.0.2) (2018-11-28) - - ## [0.0.1](https://gitlab.com/openstapps/logger/compare/911d71cf3b453dfe302c33d275cb840086288e8e...v0.0.1) (2018-11-28) - ### Features -* add logger ([911d71c](https://gitlab.com/openstapps/logger/commit/911d71cf3b453dfe302c33d275cb840086288e8e)) - - - +- add logger ([911d71c](https://gitlab.com/openstapps/logger/commit/911d71cf3b453dfe302c33d275cb840086288e8e)) diff --git a/packages/logger/LICENSE b/packages/logger/LICENSE deleted file mode 100644 index 6f248655..00000000 --- a/packages/logger/LICENSE +++ /dev/null @@ -1,200 +0,0 @@ -GNU GENERAL PUBLIC LICENSE -Version 3, 29 June 2007 - -Copyright © 2007 Free Software Foundation, Inc. - -Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. - -Preamble - -The GNU General Public License is a free, copyleft license for software and other kinds of works. - -The licenses for most software and other practical works are designed to take away your freedom to share and change the works. By contrast, the GNU General Public License is intended to guarantee your freedom to share and change all versions of a program--to make sure it remains free software for all its users. We, the Free Software Foundation, use the GNU General Public License for most of our software; it applies also to any other work released this way by its authors. You can apply it to your programs, too. - -When we speak of free software, we are referring to freedom, not price. Our General Public Licenses are designed to make sure that you have the freedom to distribute copies of free software (and charge for them if you wish), that you receive source code or can get it if you want it, that you can change the software or use pieces of it in new free programs, and that you know you can do these things. - -To protect your rights, we need to prevent others from denying you these rights or asking you to surrender the rights. Therefore, you have certain responsibilities if you distribute copies of the software, or if you modify it: responsibilities to respect the freedom of others. - -For example, if you distribute copies of such a program, whether gratis or for a fee, you must pass on to the recipients the same freedoms that you received. You must make sure that they, too, receive or can get the source code. And you must show them these terms so they know their rights. - -Developers that use the GNU GPL protect your rights with two steps: (1) assert copyright on the software, and (2) offer you this License giving you legal permission to copy, distribute and/or modify it. - -For the developers' and authors' protection, the GPL clearly explains that there is no warranty for this free software. For both users' and authors' sake, the GPL requires that modified versions be marked as changed, so that their problems will not be attributed erroneously to authors of previous versions. - -Some devices are designed to deny users access to install or run modified versions of the software inside them, although the manufacturer can do so. This is fundamentally incompatible with the aim of protecting users' freedom to change the software. The systematic pattern of such abuse occurs in the area of products for individuals to use, which is precisely where it is most unacceptable. Therefore, we have designed this version of the GPL to prohibit the practice for those products. If such problems arise substantially in other domains, we stand ready to extend this provision to those domains in future versions of the GPL, as needed to protect the freedom of users. - -Finally, every program is threatened constantly by software patents. States should not allow patents to restrict development and use of software on general-purpose computers, but in those that do, we wish to avoid the special danger that patents applied to a free program could make it effectively proprietary. To prevent this, the GPL assures that patents cannot be used to render the program non-free. - -The precise terms and conditions for copying, distribution and modification follow. - -TERMS AND CONDITIONS - -0. Definitions. -"This License" refers to version 3 of the GNU General Public License. - -"Copyright" also means copyright-like laws that apply to other kinds of works, such as semiconductor masks. - -"The Program" refers to any copyrightable work licensed under this License. Each licensee is addressed as "you". "Licensees" and "recipients" may be individuals or organizations. - -To "modify" a work means to copy from or adapt all or part of the work in a fashion requiring copyright permission, other than the making of an exact copy. The resulting work is called a "modified version" of the earlier work or a work "based on" the earlier work. - -A "covered work" means either the unmodified Program or a work based on the Program. - -To "propagate" a work means to do anything with it that, without permission, would make you directly or secondarily liable for infringement under applicable copyright law, except executing it on a computer or modifying a private copy. Propagation includes copying, distribution (with or without modification), making available to the public, and in some countries other activities as well. - -To "convey" a work means any kind of propagation that enables other parties to make or receive copies. Mere interaction with a user through a computer network, with no transfer of a copy, is not conveying. - -An interactive user interface displays "Appropriate Legal Notices" to the extent that it includes a convenient and prominently visible feature that (1) displays an appropriate copyright notice, and (2) tells the user that there is no warranty for the work (except to the extent that warranties are provided), that licensees may convey the work under this License, and how to view a copy of this License. If the interface presents a list of user commands or options, such as a menu, a prominent item in the list meets this criterion. - -1. Source Code. -The "source code" for a work means the preferred form of the work for making modifications to it. "Object code" means any non-source form of a work. -A "Standard Interface" means an interface that either is an official standard defined by a recognized standards body, or, in the case of interfaces specified for a particular programming language, one that is widely used among developers working in that language. - -The "System Libraries" of an executable work include anything, other than the work as a whole, that (a) is included in the normal form of packaging a Major Component, but which is not part of that Major Component, and (b) serves only to enable use of the work with that Major Component, or to implement a Standard Interface for which an implementation is available to the public in source code form. A "Major Component", in this context, means a major essential component (kernel, window system, and so on) of the specific operating system (if any) on which the executable work runs, or a compiler used to produce the work, or an object code interpreter used to run it. - -The "Corresponding Source" for a work in object code form means all the source code needed to generate, install, and (for an executable work) run the object code and to modify the work, including scripts to control those activities. However, it does not include the work's System Libraries, or general-purpose tools or generally available free programs which are used unmodified in performing those activities but which are not part of the work. For example, Corresponding Source includes interface definition files associated with source files for the work, and the source code for shared libraries and dynamically linked subprograms that the work is specifically designed to require, such as by intimate data communication or control flow between those subprograms and other parts of the work. - -The Corresponding Source need not include anything that users can regenerate automatically from other parts of the Corresponding Source. - -The Corresponding Source for a work in source code form is that same work. - -2. Basic Permissions. -All rights granted under this License are granted for the term of copyright on the Program, and are irrevocable provided the stated conditions are met. This License explicitly affirms your unlimited permission to run the unmodified Program. The output from running a covered work is covered by this License only if the output, given its content, constitutes a covered work. This License acknowledges your rights of fair use or other equivalent, as provided by copyright law. -You may make, run and propagate covered works that you do not convey, without conditions so long as your license otherwise remains in force. You may convey covered works to others for the sole purpose of having them make modifications exclusively for you, or provide you with facilities for running those works, provided that you comply with the terms of this License in conveying all material for which you do not control copyright. Those thus making or running the covered works for you must do so exclusively on your behalf, under your direction and control, on terms that prohibit them from making any copies of your copyrighted material outside their relationship with you. - -Conveying under any other circumstances is permitted solely under the conditions stated below. Sublicensing is not allowed; section 10 makes it unnecessary. - -3. Protecting Users' Legal Rights From Anti-Circumvention Law. -No covered work shall be deemed part of an effective technological measure under any applicable law fulfilling obligations under article 11 of the WIPO copyright treaty adopted on 20 December 1996, or similar laws prohibiting or restricting circumvention of such measures. -When you convey a covered work, you waive any legal power to forbid circumvention of technological measures to the extent such circumvention is effected by exercising rights under this License with respect to the covered work, and you disclaim any intention to limit operation or modification of the work as a means of enforcing, against the work's users, your or third parties' legal rights to forbid circumvention of technological measures. - -4. Conveying Verbatim Copies. -You may convey verbatim copies of the Program's source code as you receive it, in any medium, provided that you conspicuously and appropriately publish on each copy an appropriate copyright notice; keep intact all notices stating that this License and any non-permissive terms added in accord with section 7 apply to the code; keep intact all notices of the absence of any warranty; and give all recipients a copy of this License along with the Program. -You may charge any price or no price for each copy that you convey, and you may offer support or warranty protection for a fee. - -5. Conveying Modified Source Versions. -You may convey a work based on the Program, or the modifications to produce it from the Program, in the form of source code under the terms of section 4, provided that you also meet all of these conditions: -a) The work must carry prominent notices stating that you modified it, and giving a relevant date. -b) The work must carry prominent notices stating that it is released under this License and any conditions added under section 7. This requirement modifies the requirement in section 4 to "keep intact all notices". -c) You must license the entire work, as a whole, under this License to anyone who comes into possession of a copy. This License will therefore apply, along with any applicable section 7 additional terms, to the whole of the work, and all its parts, regardless of how they are packaged. This License gives no permission to license the work in any other way, but it does not invalidate such permission if you have separately received it. -d) If the work has interactive user interfaces, each must display Appropriate Legal Notices; however, if the Program has interactive interfaces that do not display Appropriate Legal Notices, your work need not make them do so. -A compilation of a covered work with other separate and independent works, which are not by their nature extensions of the covered work, and which are not combined with it such as to form a larger program, in or on a volume of a storage or distribution medium, is called an "aggregate" if the compilation and its resulting copyright are not used to limit the access or legal rights of the compilation's users beyond what the individual works permit. Inclusion of a covered work in an aggregate does not cause this License to apply to the other parts of the aggregate. - -6. Conveying Non-Source Forms. -You may convey a covered work in object code form under the terms of sections 4 and 5, provided that you also convey the machine-readable Corresponding Source under the terms of this License, in one of these ways: -a) Convey the object code in, or embodied in, a physical product (including a physical distribution medium), accompanied by the Corresponding Source fixed on a durable physical medium customarily used for software interchange. -b) Convey the object code in, or embodied in, a physical product (including a physical distribution medium), accompanied by a written offer, valid for at least three years and valid for as long as you offer spare parts or customer support for that product model, to give anyone who possesses the object code either (1) a copy of the Corresponding Source for all the software in the product that is covered by this License, on a durable physical medium customarily used for software interchange, for a price no more than your reasonable cost of physically performing this conveying of source, or (2) access to copy the Corresponding Source from a network server at no charge. -c) Convey individual copies of the object code with a copy of the written offer to provide the Corresponding Source. This alternative is allowed only occasionally and noncommercially, and only if you received the object code with such an offer, in accord with subsection 6b. -d) Convey the object code by offering access from a designated place (gratis or for a charge), and offer equivalent access to the Corresponding Source in the same way through the same place at no further charge. You need not require recipients to copy the Corresponding Source along with the object code. If the place to copy the object code is a network server, the Corresponding Source may be on a different server (operated by you or a third party) that supports equivalent copying facilities, provided you maintain clear directions next to the object code saying where to find the Corresponding Source. Regardless of what server hosts the Corresponding Source, you remain obligated to ensure that it is available for as long as needed to satisfy these requirements. -e) Convey the object code using peer-to-peer transmission, provided you inform other peers where the object code and Corresponding Source of the work are being offered to the general public at no charge under subsection 6d. -A separable portion of the object code, whose source code is excluded from the Corresponding Source as a System Library, need not be included in conveying the object code work. - -A "User Product" is either (1) a "consumer product", which means any tangible personal property which is normally used for personal, family, or household purposes, or (2) anything designed or sold for incorporation into a dwelling. In determining whether a product is a consumer product, doubtful cases shall be resolved in favor of coverage. For a particular product received by a particular user, "normally used" refers to a typical or common use of that class of product, regardless of the status of the particular user or of the way in which the particular user actually uses, or expects or is expected to use, the product. A product is a consumer product regardless of whether the product has substantial commercial, industrial or non-consumer uses, unless such uses represent the only significant mode of use of the product. - -"Installation Information" for a User Product means any methods, procedures, authorization keys, or other information required to install and execute modified versions of a covered work in that User Product from a modified version of its Corresponding Source. The information must suffice to ensure that the continued functioning of the modified object code is in no case prevented or interfered with solely because modification has been made. - -If you convey an object code work under this section in, or with, or specifically for use in, a User Product, and the conveying occurs as part of a transaction in which the right of possession and use of the User Product is transferred to the recipient in perpetuity or for a fixed term (regardless of how the transaction is characterized), the Corresponding Source conveyed under this section must be accompanied by the Installation Information. But this requirement does not apply if neither you nor any third party retains the ability to install modified object code on the User Product (for example, the work has been installed in ROM). - -The requirement to provide Installation Information does not include a requirement to continue to provide support service, warranty, or updates for a work that has been modified or installed by the recipient, or for the User Product in which it has been modified or installed. Access to a network may be denied when the modification itself materially and adversely affects the operation of the network or violates the rules and protocols for communication across the network. - -Corresponding Source conveyed, and Installation Information provided, in accord with this section must be in a format that is publicly documented (and with an implementation available to the public in source code form), and must require no special password or key for unpacking, reading or copying. - -7. Additional Terms. -"Additional permissions" are terms that supplement the terms of this License by making exceptions from one or more of its conditions. Additional permissions that are applicable to the entire Program shall be treated as though they were included in this License, to the extent that they are valid under applicable law. If additional permissions apply only to part of the Program, that part may be used separately under those permissions, but the entire Program remains governed by this License without regard to the additional permissions. -When you convey a copy of a covered work, you may at your option remove any additional permissions from that copy, or from any part of it. (Additional permissions may be written to require their own removal in certain cases when you modify the work.) You may place additional permissions on material, added by you to a covered work, for which you have or can give appropriate copyright permission. - -Notwithstanding any other provision of this License, for material you add to a covered work, you may (if authorized by the copyright holders of that material) supplement the terms of this License with terms: - -a) Disclaiming warranty or limiting liability differently from the terms of sections 15 and 16 of this License; or -b) Requiring preservation of specified reasonable legal notices or author attributions in that material or in the Appropriate Legal Notices displayed by works containing it; or -c) Prohibiting misrepresentation of the origin of that material, or requiring that modified versions of such material be marked in reasonable ways as different from the original version; or -d) Limiting the use for publicity purposes of names of licensors or authors of the material; or -e) Declining to grant rights under trademark law for use of some trade names, trademarks, or service marks; or -f) Requiring indemnification of licensors and authors of that material by anyone who conveys the material (or modified versions of it) with contractual assumptions of liability to the recipient, for any liability that these contractual assumptions directly impose on those licensors and authors. -All other non-permissive additional terms are considered "further restrictions" within the meaning of section 10. If the Program as you received it, or any part of it, contains a notice stating that it is governed by this License along with a term that is a further restriction, you may remove that term. If a license document contains a further restriction but permits relicensing or conveying under this License, you may add to a covered work material governed by the terms of that license document, provided that the further restriction does not survive such relicensing or conveying. - -If you add terms to a covered work in accord with this section, you must place, in the relevant source files, a statement of the additional terms that apply to those files, or a notice indicating where to find the applicable terms. - -Additional terms, permissive or non-permissive, may be stated in the form of a separately written license, or stated as exceptions; the above requirements apply either way. - -8. Termination. -You may not propagate or modify a covered work except as expressly provided under this License. Any attempt otherwise to propagate or modify it is void, and will automatically terminate your rights under this License (including any patent licenses granted under the third paragraph of section 11). -However, if you cease all violation of this License, then your license from a particular copyright holder is reinstated (a) provisionally, unless and until the copyright holder explicitly and finally terminates your license, and (b) permanently, if the copyright holder fails to notify you of the violation by some reasonable means prior to 60 days after the cessation. - -Moreover, your license from a particular copyright holder is reinstated permanently if the copyright holder notifies you of the violation by some reasonable means, this is the first time you have received notice of violation of this License (for any work) from that copyright holder, and you cure the violation prior to 30 days after your receipt of the notice. - -Termination of your rights under this section does not terminate the licenses of parties who have received copies or rights from you under this License. If your rights have been terminated and not permanently reinstated, you do not qualify to receive new licenses for the same material under section 10. - -9. Acceptance Not Required for Having Copies. -You are not required to accept this License in order to receive or run a copy of the Program. Ancillary propagation of a covered work occurring solely as a consequence of using peer-to-peer transmission to receive a copy likewise does not require acceptance. However, nothing other than this License grants you permission to propagate or modify any covered work. These actions infringe copyright if you do not accept this License. Therefore, by modifying or propagating a covered work, you indicate your acceptance of this License to do so. -10. Automatic Licensing of Downstream Recipients. -Each time you convey a covered work, the recipient automatically receives a license from the original licensors, to run, modify and propagate that work, subject to this License. You are not responsible for enforcing compliance by third parties with this License. -An "entity transaction" is a transaction transferring control of an organization, or substantially all assets of one, or subdividing an organization, or merging organizations. If propagation of a covered work results from an entity transaction, each party to that transaction who receives a copy of the work also receives whatever licenses to the work the party's predecessor in interest had or could give under the previous paragraph, plus a right to possession of the Corresponding Source of the work from the predecessor in interest, if the predecessor has it or can get it with reasonable efforts. - -You may not impose any further restrictions on the exercise of the rights granted or affirmed under this License. For example, you may not impose a license fee, royalty, or other charge for exercise of rights granted under this License, and you may not initiate litigation (including a cross-claim or counterclaim in a lawsuit) alleging that any patent claim is infringed by making, using, selling, offering for sale, or importing the Program or any portion of it. - -11. Patents. -A "contributor" is a copyright holder who authorizes use under this License of the Program or a work on which the Program is based. The work thus licensed is called the contributor's "contributor version". -A contributor's "essential patent claims" are all patent claims owned or controlled by the contributor, whether already acquired or hereafter acquired, that would be infringed by some manner, permitted by this License, of making, using, or selling its contributor version, but do not include claims that would be infringed only as a consequence of further modification of the contributor version. For purposes of this definition, "control" includes the right to grant patent sublicenses in a manner consistent with the requirements of this License. - -Each contributor grants you a non-exclusive, worldwide, royalty-free patent license under the contributor's essential patent claims, to make, use, sell, offer for sale, import and otherwise run, modify and propagate the contents of its contributor version. - -In the following three paragraphs, a "patent license" is any express agreement or commitment, however denominated, not to enforce a patent (such as an express permission to practice a patent or covenant not to sue for patent infringement). To "grant" such a patent license to a party means to make such an agreement or commitment not to enforce a patent against the party. - -If you convey a covered work, knowingly relying on a patent license, and the Corresponding Source of the work is not available for anyone to copy, free of charge and under the terms of this License, through a publicly available network server or other readily accessible means, then you must either (1) cause the Corresponding Source to be so available, or (2) arrange to deprive yourself of the benefit of the patent license for this particular work, or (3) arrange, in a manner consistent with the requirements of this License, to extend the patent license to downstream recipients. "Knowingly relying" means you have actual knowledge that, but for the patent license, your conveying the covered work in a country, or your recipient's use of the covered work in a country, would infringe one or more identifiable patents in that country that you have reason to believe are valid. - -If, pursuant to or in connection with a single transaction or arrangement, you convey, or propagate by procuring conveyance of, a covered work, and grant a patent license to some of the parties receiving the covered work authorizing them to use, propagate, modify or convey a specific copy of the covered work, then the patent license you grant is automatically extended to all recipients of the covered work and works based on it. - -A patent license is "discriminatory" if it does not include within the scope of its coverage, prohibits the exercise of, or is conditioned on the non-exercise of one or more of the rights that are specifically granted under this License. You may not convey a covered work if you are a party to an arrangement with a third party that is in the business of distributing software, under which you make payment to the third party based on the extent of your activity of conveying the work, and under which the third party grants, to any of the parties who would receive the covered work from you, a discriminatory patent license (a) in connection with copies of the covered work conveyed by you (or copies made from those copies), or (b) primarily for and in connection with specific products or compilations that contain the covered work, unless you entered into that arrangement, or that patent license was granted, prior to 28 March 2007. - -Nothing in this License shall be construed as excluding or limiting any implied license or other defenses to infringement that may otherwise be available to you under applicable patent law. - -12. No Surrender of Others' Freedom. -If conditions are imposed on you (whether by court order, agreement or otherwise) that contradict the conditions of this License, they do not excuse you from the conditions of this License. If you cannot convey a covered work so as to satisfy simultaneously your obligations under this License and any other pertinent obligations, then as a consequence you may not convey it at all. For example, if you agree to terms that obligate you to collect a royalty for further conveying from those to whom you convey the Program, the only way you could satisfy both those terms and this License would be to refrain entirely from conveying the Program. -13. Use with the GNU Affero General Public License. -Notwithstanding any other provision of this License, you have permission to link or combine any covered work with a work licensed under version 3 of the GNU Affero General Public License into a single combined work, and to convey the resulting work. The terms of this License will continue to apply to the part which is the covered work, but the special requirements of the GNU Affero General Public License, section 13, concerning interaction through a network will apply to the combination as such. -14. Revised Versions of this License. -The Free Software Foundation may publish revised and/or new versions of the GNU General Public License from time to time. Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns. -Each version is given a distinguishing version number. If the Program specifies that a certain numbered version of the GNU General Public License "or any later version" applies to it, you have the option of following the terms and conditions either of that numbered version or of any later version published by the Free Software Foundation. If the Program does not specify a version number of the GNU General Public License, you may choose any version ever published by the Free Software Foundation. - -If the Program specifies that a proxy can decide which future versions of the GNU General Public License can be used, that proxy's public statement of acceptance of a version permanently authorizes you to choose that version for the Program. - -Later license versions may give you additional or different permissions. However, no additional obligations are imposed on any author or copyright holder as a result of your choosing to follow a later version. - -15. Disclaimer of Warranty. -THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. -16. Limitation of Liability. -IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. -17. Interpretation of Sections 15 and 16. -If the disclaimer of warranty and limitation of liability provided above cannot be given local legal effect according to their terms, reviewing courts shall apply local law that most closely approximates an absolute waiver of all civil liability in connection with the Program, unless a warranty or assumption of liability accompanies a copy of the Program in return for a fee. - -END OF TERMS AND CONDITIONS - -How to Apply These Terms to Your New Programs - -If you develop a new program, and you want it to be of the greatest possible use to the public, the best way to achieve this is to make it free software which everyone can redistribute and change under these terms. - -To do so, attach the following notices to the program. It is safest to attach them to the start of each source file to most effectively state the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found. - - -Copyright (C) - -This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. - -This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - -You should have received a copy of the GNU General Public License along with this program. If not, see . - -Also add information on how to contact you by electronic and paper mail. - -If the program does terminal interaction, make it output a short notice like this when it starts in an interactive mode: - - Copyright (C) -This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. -This is free software, and you are welcome to redistribute it under certain conditions; type `show c' for details. - -The hypothetical commands `show w' and `show c' should show the appropriate parts of the General Public License. Of course, your program's commands might be different; for a GUI interface, you would use an "about box". - -You should also get your employer (if you work as a programmer) or school, if any, to sign a "copyright disclaimer" for the program, if necessary. For more information on this, and how to apply and follow the GNU GPL, see . - -The GNU General Public License does not permit incorporating your program into proprietary programs. If your program is a subroutine library, you may consider it more useful to permit linking proprietary applications with the library. If this is what you want to do, use the GNU Lesser General Public License instead of this License. But first, please read . \ No newline at end of file diff --git a/packages/logger/README.md b/packages/logger/README.md index c34d6455..f2fc7380 100644 --- a/packages/logger/README.md +++ b/packages/logger/README.md @@ -10,6 +10,7 @@ Logs are only printed if their log level is equal or higher than the defined log ## Log Levels Available log levels are: + - 1 - INFO - 2 - LOG - 4 - WARN @@ -39,15 +40,15 @@ can overwrite the actual config values. Environment variables are: -* SMTP_AUTH_USER: SMTP username -* SMTP_AUTH_PASSWORD: SMTP password -* SMTP_HOST: SMTP host -* SMTP_PORT: SMTP port -* SMTP_RECIPIENTS: comma seperated list of recipients -* SMTP_CC: comma seperated list of recipients for the carbon copy (CC) -* SMTP_SENDER_MAIL: sender of the mail -* SMTP_SENDER_NAME: name of the sender -* SMTP_SECURE: `true` to enable tls +- SMTP_AUTH_USER: SMTP username +- SMTP_AUTH_PASSWORD: SMTP password +- SMTP_HOST: SMTP host +- SMTP_PORT: SMTP port +- SMTP_RECIPIENTS: comma seperated list of recipients +- SMTP_CC: comma seperated list of recipients for the carbon copy (CC) +- SMTP_SENDER_MAIL: sender of the mail +- SMTP_SENDER_NAME: name of the sender +- SMTP_SECURE: `true` to enable tls ## Transformations @@ -57,6 +58,6 @@ You can change this behavior by setting other Transformers via `Logger.setTransf You may choose from the following: -* `AddLogLevel`, which prepends the output with the log level -* `Colorize`, which colorizes the output according to the log level -* `Timestamp`, which prepends a timestamp to the output +- `AddLogLevel`, which prepends the output with the log level +- `Colorize`, which colorizes the output according to the log level +- `Timestamp`, which prepends a timestamp to the output diff --git a/packages/logger/package.json b/packages/logger/package.json index d957c229..a1c07fb4 100644 --- a/packages/logger/package.json +++ b/packages/logger/package.json @@ -1,6 +1,6 @@ { "name": "@openstapps/logger", - "description": "A cli logger with colors, loglevels and the possibility to use a transport system for errors", + "description": "A cli logger with colors, log-levels and the possibility to use a transport system for errors", "version": "2.1.0", "type": "module", "license": "GPL-3.0-only", @@ -11,17 +11,14 @@ "Jovan Krunic ", "Rainer Killinger " ], - "main": "./lib/logger.js", + "main": "./lib/index.js", + "types": "./lib/index.d.ts", "scripts": { - "build": "rimraf lib && tsc", - "changelog": "conventional-changelog -p angular -i CHANGELOG.md -s -r 0 && git add CHANGELOG.md && git commit -m 'docs: update changelog'", - "check-configuration": "openstapps-configuration", - "documentation": "typedoc --name \"@openstapps/logger\" --includeVersion --out docs --readme README.md --listInvalidSymbolLinks --entryPointStrategy expand src", + "build": "tsup --dts", + "format": "prettier .", + "format:fix": "prettier --write .", "lint": "eslint --ext .ts src/", - "postversion": "npm run changelog", - "prepublishOnly": "npm ci && npm run build", - "preversion": "npm run prepublishOnly", - "push": "git push && git push origin \"v$npm_package_version\"", + "lint:fix": "eslint --fix --ext .ts src/", "test": "nyc mocha 'test/**/*.spec.ts'" }, "dependencies": { @@ -32,59 +29,42 @@ "nodemailer": "6.9.1" }, "devDependencies": { - "@openstapps/configuration": "workspace:*", "@openstapps/eslint-config": "workspace:*", + "@openstapps/nyc-config": "workspace:*", + "@openstapps/prettier-config": "workspace:*", + "@openstapps/tsconfig": "workspace:*", "@testdeck/mocha": "0.3.3", "@types/chai": "4.3.4", "@types/chai-as-promised": "7.1.5", "@types/chai-spies": "1.0.3", "@types/mocha": "10.0.1", "@types/node": "18.15.3", - "@typescript-eslint/eslint-plugin": "5.49.0", - "@typescript-eslint/parser": "5.49.0", "chai": "4.3.7", "chai-as-promised": "7.1.1", "chai-spies": "1.0.0", - "conventional-changelog-cli": "2.2.2", - "eslint": "8.33.0", - "eslint-config-prettier": "8.6.0", - "eslint-plugin-jsdoc": "39.7.4", - "eslint-plugin-prettier": "4.2.1", - "eslint-plugin-unicorn": "45.0.2", "mocha": "10.2.0", "nyc": "15.1.0", - "prettier": "2.8.3", - "rimraf": "4.4.0", "ts-node": "10.9.1", - "typedoc": "0.23.26", + "tsup": "6.7.0", + "typedoc": "0.23.28", "typescript": "4.8.4" }, - "nyc": { - "all": true, - "branches": 95, - "check-coverage": true, - "exclude": [ - "src/smtp.ts", - "src/cli.ts" + "tsup": { + "entry": [ + "src/index.ts" ], - "extension": [ - ".ts" - ], - "functions": 95, - "include": [ - "src" - ], - "lines": 95, - "per-file": true, - "reporter": [ - "cobertura", - "html", - "text-summary" - ], - "require": [ - "ts-node/register" - ], - "statements": 95 + "sourcemap": true, + "clean": true, + "format": "esm", + "outDir": "lib" }, - "typings": "./lib/logger.d.ts" + "prettier": "@openstapps/prettier-config", + "eslintConfig": { + "extends": [ + "@openstapps" + ] + }, + "nyc": { + "extends": "@openstapps/nyc-config" + } } diff --git a/packages/logger/src/index.ts b/packages/logger/src/index.ts new file mode 100644 index 00000000..c4b3922e --- /dev/null +++ b/packages/logger/src/index.ts @@ -0,0 +1,9 @@ +export * from './logger.js' +export * from './common.js' +export * from './smtp.js' +export * from './transformation.js' +export * from './transport.js' + +export * from './transformations/add-log-level.js' +export * from './transformations/colorize.js' +export * from './transformations/timestamp.js' diff --git a/packages/logger/src/transformation.ts b/packages/logger/src/transformation.ts index f5201899..55a363c1 100644 --- a/packages/logger/src/transformation.ts +++ b/packages/logger/src/transformation.ts @@ -12,7 +12,7 @@ * You should have received a copy of the GNU General Public License along with * this program. If not, see . */ -import {LogLevel} from './logger.js'; +import {LogLevel} from './index.js'; /** * A transformer for log output diff --git a/packages/logger/test/common.spec.ts b/packages/logger/test/common.spec.ts index 26d13ecb..14e2dc8c 100644 --- a/packages/logger/test/common.spec.ts +++ b/packages/logger/test/common.spec.ts @@ -25,51 +25,45 @@ import { export class CommonSpec { @test deleteUndefinedProperties1() { - expect(deleteUndefinedProperties( - { + expect( + deleteUndefinedProperties({ a: 2, b: { c: 3, d: undefined, }, + }), + ).to.deep.equal({ + a: 2, + b: { + c: 3, }, - )).to.deep.equal( - { - a: 2, - b: { - c: 3, - }, - }, - ); + }); } @test deleteUndefinedProperties2() { - expect(deleteUndefinedProperties( - { + expect( + deleteUndefinedProperties({ a: undefined, b: undefined, - }, - )).to.deep.equal( - {}, - ); + }), + ).to.deep.equal({}); } @test deleteUndefinedProperties3() { - expect(deleteUndefinedProperties( - { + expect( + deleteUndefinedProperties({ a: 2, b: 'foo', c: 'bar', - }, - )).to.deep.equal( - { - a: 2, - b: 'foo', - c: 'bar', - }, - ); + }), + ).to.deep.equal({ + a: 2, + b: 'foo', + c: 'bar', + }); } @test diff --git a/packages/logger/test/dummyTransport.ts b/packages/logger/test/dummyTransport.ts index cbbb70f9..41a9b1f0 100644 --- a/packages/logger/test/dummyTransport.ts +++ b/packages/logger/test/dummyTransport.ts @@ -28,7 +28,7 @@ export class VerifiableDummyTransport extends VerifiableTransport { } verify(): Promise { - return new Promise((resolve) => { + return new Promise(resolve => { resolve(true); }); } diff --git a/packages/logger/test/logger.spec.ts b/packages/logger/test/logger.spec.ts index a3070038..b33e5b2f 100644 --- a/packages/logger/test/logger.spec.ts +++ b/packages/logger/test/logger.spec.ts @@ -28,19 +28,17 @@ chai.use(chaiAsPromised); @suite() export class LoggerSpec { - static sandbox: ChaiSpies.Sandbox; + static 'sandbox': ChaiSpies.Sandbox; - static before() { + static 'before'() { LoggerSpec.sandbox = chai.spy.sandbox(); } - before() { - Logger.setTransformations([ - new AddLogLevel(), - ]); + 'before'() { + Logger.setTransformations([new AddLogLevel()]); } - after() { + 'after'() { LoggerSpec.sandbox.restore(); } @@ -51,7 +49,7 @@ export class LoggerSpec { } @test - async error() { + async 'error'() { const spy = LoggerSpec.sandbox.on(console, 'error', () => { // noop }); @@ -121,7 +119,7 @@ export class LoggerSpec { } @test - info() { + 'info'() { const spy = LoggerSpec.sandbox.on(console, 'info', () => { // noop }); @@ -134,7 +132,7 @@ export class LoggerSpec { } @test - async exits() { + async 'exits'() { const infoSpy = LoggerSpec.sandbox.on(console, 'info', () => { // noop }); @@ -193,7 +191,7 @@ export class LoggerSpec { } @test - initialized() { + 'initialized'() { Logger.setTransport(new DummyTransport()); expect(() => { @@ -266,7 +264,7 @@ export class LoggerSpec { } @test - log() { + 'log'() { const spy = LoggerSpec.sandbox.on(console, 'log', () => { // noop }); @@ -294,7 +292,7 @@ export class LoggerSpec { } @test - ok() { + 'ok'() { const spy = LoggerSpec.sandbox.on(console, 'log', () => { // noop }); @@ -322,7 +320,7 @@ export class LoggerSpec { } @test - setTransport() { + 'setTransport'() { expect(() => { Logger.setTransport(new DummyTransport()); Logger.setTransport(); @@ -358,7 +356,7 @@ export class LoggerSpec { } @test - warn() { + 'warn'() { const spy = LoggerSpec.sandbox.on(console, 'warn', () => { // noop }); @@ -418,7 +416,7 @@ export class LoggerSpec { } @test - getExitLevel() { + 'getExitLevel'() { const savedProcess = process; // @ts-ignore @@ -442,7 +440,7 @@ export class LoggerSpec { } @test - getLogLevel() { + 'getLogLevel'() { const savedProcess = process; // @ts-ignore diff --git a/packages/logger/test/transformations/add-log-level.spec.ts b/packages/logger/test/transformations/add-log-level.spec.ts index 231b00c1..18c900a2 100644 --- a/packages/logger/test/transformations/add-log-level.spec.ts +++ b/packages/logger/test/transformations/add-log-level.spec.ts @@ -19,7 +19,7 @@ import {AddLogLevel} from '../../src/transformations/add-log-level.js'; @suite() export class AddLogLevelSpec { @test - 'transform'() { + transform() { const transformation = new AddLogLevel(); expect(transformation.transform('ERROR', 'Foobar')).to.be.equal('[ERROR] Foobar'); diff --git a/packages/logger/test/transformations/colorize.spec.ts b/packages/logger/test/transformations/colorize.spec.ts index d801241d..88e67a4f 100644 --- a/packages/logger/test/transformations/colorize.spec.ts +++ b/packages/logger/test/transformations/colorize.spec.ts @@ -19,10 +19,12 @@ import {Colorize} from '../../src/transformations/colorize.js'; @suite() export class ColorizeSpec { @test - 'transform'() { + transform() { const transformation = new Colorize(); - expect(transformation.transform('ERROR', 'Foobar')).to.be.equal('\u001b[1m\u001b[31mFoobar\u001b[39m\u001b[22m'); + expect(transformation.transform('ERROR', 'Foobar')).to.be.equal( + '\u001b[1m\u001b[31mFoobar\u001b[39m\u001b[22m', + ); expect(transformation.transform('LOG', 'Foobar')).to.be.equal('\u001b[37mFoobar\u001b[39m'); } } diff --git a/packages/logger/test/transformations/timestamp.spec.ts b/packages/logger/test/transformations/timestamp.spec.ts index 69301b7c..c48b6de7 100644 --- a/packages/logger/test/transformations/timestamp.spec.ts +++ b/packages/logger/test/transformations/timestamp.spec.ts @@ -19,8 +19,7 @@ import {Timestamp} from '../../src/transformations/timestamp.js'; @suite() export class TimeStampSpec { @test - 'default'() { - + default() { const transformation = new Timestamp(); expect(transformation.transform('ERROR', 'Foobar')).to.be.contain(`Z`); diff --git a/packages/logger/tsconfig.json b/packages/logger/tsconfig.json index 066a5f38..579a39ff 100644 --- a/packages/logger/tsconfig.json +++ b/packages/logger/tsconfig.json @@ -1,3 +1,3 @@ { - "extends": "./node_modules/@openstapps/configuration/tsconfig.json" + "extends": "@openstapps/tsconfig" } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 3e35d850..68fb32b7 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -5,24 +5,50 @@ importers: .: specifiers: '@changesets/cli': 2.26.0 + '@typescript-eslint/eslint-plugin': 5.49.0 + '@typescript-eslint/parser': 5.49.0 + deepmerge: 4.3.1 dotenv-cli: 7.1.0 + eslint: 8.33.0 + eslint-config-prettier: 8.6.0 + eslint-plugin-jsdoc: 39.7.4 + eslint-plugin-prettier: 4.2.1 + eslint-plugin-unicorn: 45.0.2 + glob: 10.2.1 + package-sync-cli: 1.3.2 + prettier: 2.8.6 syncpack: 9.8.4 turbo: 1.8.3 + typedoc: 0.23.28 devDependencies: '@changesets/cli': 2.26.0 + '@typescript-eslint/eslint-plugin': 5.49.0_bhfhikta3fu7tua7ac2hrytgwe + '@typescript-eslint/parser': 5.49.0_o2s6jvgtr2hafiobaqfgu6k2l4 + deepmerge: 4.3.1 dotenv-cli: 7.1.0 + eslint: 8.33.0 + eslint-config-prettier: 8.6.0_eslint@8.33.0 + eslint-plugin-jsdoc: 39.7.4_eslint@8.33.0 + eslint-plugin-prettier: 4.2.1_2blprs6rvzrjlgi3xqpegp3hoe + eslint-plugin-unicorn: 45.0.2_eslint@8.33.0 + glob: 10.2.1 + package-sync-cli: 1.3.2 + prettier: 2.8.6 syncpack: 9.8.4 turbo: 1.8.3 + typedoc: 0.23.28_typescript@4.8.4 backend/backend: specifiers: '@elastic/elasticsearch': 5.6.22 - '@openstapps/configuration': workspace:* '@openstapps/core': workspace:* '@openstapps/core-tools': workspace:* '@openstapps/es-mapping-generator': workspace:* '@openstapps/eslint-config': workspace:* '@openstapps/logger': workspace:* + '@openstapps/nyc-config': workspace:* + '@openstapps/prettier-config': workspace:* + '@openstapps/tsconfig': workspace:* '@testdeck/mocha': 0.3.3 '@types/chai': 4.3.4 '@types/chai-as-promised': 7.1.5 @@ -66,16 +92,16 @@ importers: node-cron: 3.0.2 nodemailer: 6.9.1 nyc: 15.1.0 - prettier: 2.8.3 + prettier: 2.8.6 prom-client: 14.1.1 promise-queue: 2.2.5 redoc-cli: 0.13.20 - rimraf: 4.4.0 sinon: 14.0.2 sinon-express-mock: 2.2.1 supertest: 6.3.3 ts-node: 10.9.1 - typedoc: 0.23.26 + tsup: 6.7.0 + typedoc: 0.23.28 typescript: 4.8.4 uuid: 8.3.2 dependencies: @@ -100,9 +126,11 @@ importers: ts-node: 10.9.1_x7wmykdye3n75c4332b67wrzwm uuid: 8.3.2 devDependencies: - '@openstapps/configuration': link:../../configuration/configuration '@openstapps/es-mapping-generator': link:../../packages/es-mapping-generator '@openstapps/eslint-config': link:../../configuration/eslint-config + '@openstapps/nyc-config': link:../../configuration/nyc-config + '@openstapps/prettier-config': link:../../configuration/prettier-config + '@openstapps/tsconfig': link:../../configuration/tsconfig '@testdeck/mocha': 0.3.3 '@types/chai': 4.3.4 '@types/chai-as-promised': 7.1.5 @@ -128,26 +156,28 @@ importers: eslint: 8.33.0 eslint-config-prettier: 8.6.0_eslint@8.33.0 eslint-plugin-jsdoc: 39.7.4_eslint@8.33.0 - eslint-plugin-prettier: 4.2.1_jqplj6qf3uqpxpu4gdyhwwasnq + eslint-plugin-prettier: 4.2.1_2blprs6rvzrjlgi3xqpegp3hoe eslint-plugin-unicorn: 45.0.2_eslint@8.33.0 get-port: 5.1.1 mocha: 10.2.0 mocked-env: 1.3.5 nyc: 15.1.0 - prettier: 2.8.3 + prettier: 2.8.6 redoc-cli: 0.13.20_ouq63s25oqg3e72zt7ebre7ohe - rimraf: 4.4.0 sinon: 14.0.2 sinon-express-mock: 2.2.1_sinon@14.0.2 supertest: 6.3.3 - typedoc: 0.23.26_typescript@4.8.4 + tsup: 6.7.0_mwhvu7sfp6vq5ryuwb6hlbjfka + typedoc: 0.23.28_typescript@4.8.4 typescript: 4.8.4 backend/proxy: specifiers: - '@openstapps/configuration': workspace:* '@openstapps/eslint-config': workspace:* '@openstapps/logger': workspace:* + '@openstapps/nyc-config': workspace:* + '@openstapps/prettier-config': workspace:* + '@openstapps/tsconfig': workspace:* '@testdeck/mocha': 0.3.3 '@types/chai': 4.3.4 '@types/chai-spies': 1.0.3 @@ -163,7 +193,6 @@ importers: chai: 4.3.7 chai-spies: 1.0.0 config: 3.3.9 - conventional-changelog-cli: 2.2.2 dockerode: 3.3.4 eslint: 8.33.0 eslint-config-prettier: 8.6.0 @@ -175,12 +204,12 @@ importers: mustache: 4.2.0 node-port-scanner: 3.0.1 nyc: 15.1.0 - prettier: 2.8.3 + prettier: 2.8.6 proxyquire: 2.1.3 - rimraf: 4.4.0 semver: 7.3.8 ts-node: 10.9.1 - typedoc: 0.23.26 + tsup: 6.7.0 + typedoc: 0.23.28 typescript: 4.8.4 dependencies: '@openstapps/logger': link:../../packages/logger @@ -191,8 +220,10 @@ importers: node-port-scanner: 3.0.1 semver: 7.3.8 devDependencies: - '@openstapps/configuration': link:../../configuration/configuration '@openstapps/eslint-config': link:../../configuration/eslint-config + '@openstapps/nyc-config': link:../../configuration/nyc-config + '@openstapps/prettier-config': link:../../configuration/prettier-config + '@openstapps/tsconfig': link:../../configuration/tsconfig '@testdeck/mocha': 0.3.3 '@types/chai': 4.3.4 '@types/chai-spies': 1.0.3 @@ -207,100 +238,88 @@ importers: '@typescript-eslint/parser': 5.49.0_o2s6jvgtr2hafiobaqfgu6k2l4 chai: 4.3.7 chai-spies: 1.0.0_chai@4.3.7 - conventional-changelog-cli: 2.2.2 eslint: 8.33.0 eslint-config-prettier: 8.6.0_eslint@8.33.0 eslint-plugin-jsdoc: 39.7.4_eslint@8.33.0 - eslint-plugin-prettier: 4.2.1_jqplj6qf3uqpxpu4gdyhwwasnq + eslint-plugin-prettier: 4.2.1_2blprs6rvzrjlgi3xqpegp3hoe eslint-plugin-unicorn: 45.0.2_eslint@8.33.0 mocha: 10.2.0 nyc: 15.1.0 - prettier: 2.8.3 + prettier: 2.8.6 proxyquire: 2.1.3 - rimraf: 4.4.0 ts-node: 10.9.1_x7wmykdye3n75c4332b67wrzwm - typedoc: 0.23.26_typescript@4.8.4 - typescript: 4.8.4 - - configuration/configuration: - specifiers: - '@openstapps/eslint-config': workspace:* - '@openstapps/prettier-config': workspace:* - '@types/node': 18.15.3 - '@types/semver': 7.3.13 - '@typescript-eslint/eslint-plugin': 5.49.0 - '@typescript-eslint/parser': 5.49.0 - chalk: 4.1.2 - commander: 10.0.0 - conventional-changelog-cli: 2.2.2 - eslint: 8.33.0 - eslint-config-prettier: 8.6.0 - eslint-plugin-jsdoc: 39.7.4 - eslint-plugin-prettier: 4.2.1 - eslint-plugin-unicorn: 45.0.2 - prettier: 2.8.3 - rimraf: 4.4.0 - semver: 7.3.8 - typedoc: 0.23.26 - typescript: 4.8.4 - yaml: 1.10.2 - dependencies: - chalk: 4.1.2 - commander: 10.0.0 - semver: 7.3.8 - yaml: 1.10.2 - devDependencies: - '@openstapps/eslint-config': link:../eslint-config - '@openstapps/prettier-config': link:../prettier-config - '@types/node': 18.15.3 - '@types/semver': 7.3.13 - '@typescript-eslint/eslint-plugin': 5.49.0_bhfhikta3fu7tua7ac2hrytgwe - '@typescript-eslint/parser': 5.49.0_o2s6jvgtr2hafiobaqfgu6k2l4 - conventional-changelog-cli: 2.2.2 - eslint: 8.33.0 - eslint-config-prettier: 8.6.0_eslint@8.33.0 - eslint-plugin-jsdoc: 39.7.4_eslint@8.33.0 - eslint-plugin-prettier: 4.2.1_jqplj6qf3uqpxpu4gdyhwwasnq - eslint-plugin-unicorn: 45.0.2_eslint@8.33.0 - prettier: 2.8.3 - rimraf: 4.4.0 - typedoc: 0.23.26_typescript@4.8.4 + tsup: 6.7.0_mwhvu7sfp6vq5ryuwb6hlbjfka + typedoc: 0.23.28_typescript@4.8.4 typescript: 4.8.4 configuration/eslint-config: specifiers: '@typescript-eslint/eslint-plugin': 5.49.0 '@typescript-eslint/parser': 5.49.0 - conventional-changelog-cli: 2.2.2 eslint: 8.33.0 eslint-config-prettier: 8.6.0 eslint-plugin-jsdoc: 39.7.4 eslint-plugin-prettier: 4.2.1 eslint-plugin-unicorn: 45.0.2 - prettier: 2.8.3 - typescript: 4.8.4 + prettier: 2.8.6 devDependencies: '@typescript-eslint/eslint-plugin': 5.49.0_bhfhikta3fu7tua7ac2hrytgwe '@typescript-eslint/parser': 5.49.0_o2s6jvgtr2hafiobaqfgu6k2l4 - conventional-changelog-cli: 2.2.2 eslint: 8.33.0 eslint-config-prettier: 8.6.0_eslint@8.33.0 eslint-plugin-jsdoc: 39.7.4_eslint@8.33.0 - eslint-plugin-prettier: 4.2.1_jqplj6qf3uqpxpu4gdyhwwasnq + eslint-plugin-prettier: 4.2.1_2blprs6rvzrjlgi3xqpegp3hoe eslint-plugin-unicorn: 45.0.2_eslint@8.33.0 - prettier: 2.8.3 - typescript: 4.8.4 + prettier: 2.8.6 + + configuration/nyc-config: + specifiers: + '@typescript-eslint/eslint-plugin': 5.49.0 + '@typescript-eslint/parser': 5.49.0 + eslint: 8.33.0 + eslint-config-prettier: 8.6.0 + eslint-plugin-jsdoc: 39.7.4 + eslint-plugin-prettier: 4.2.1 + eslint-plugin-unicorn: 45.0.2 + prettier: 2.8.6 + devDependencies: + '@typescript-eslint/eslint-plugin': 5.49.0_bhfhikta3fu7tua7ac2hrytgwe + '@typescript-eslint/parser': 5.49.0_o2s6jvgtr2hafiobaqfgu6k2l4 + eslint: 8.33.0 + eslint-config-prettier: 8.6.0_eslint@8.33.0 + eslint-plugin-jsdoc: 39.7.4_eslint@8.33.0 + eslint-plugin-prettier: 4.2.1_2blprs6rvzrjlgi3xqpegp3hoe + eslint-plugin-unicorn: 45.0.2_eslint@8.33.0 + prettier: 2.8.6 configuration/prettier-config: - specifiers: {} + specifiers: + '@typescript-eslint/eslint-plugin': 5.49.0 + '@typescript-eslint/parser': 5.49.0 + eslint: 8.33.0 + eslint-config-prettier: 8.6.0 + eslint-plugin-jsdoc: 39.7.4 + eslint-plugin-prettier: 4.2.1 + eslint-plugin-unicorn: 45.0.2 + prettier: 2.8.6 + devDependencies: + '@typescript-eslint/eslint-plugin': 5.49.0_bhfhikta3fu7tua7ac2hrytgwe + '@typescript-eslint/parser': 5.49.0_o2s6jvgtr2hafiobaqfgu6k2l4 + eslint: 8.33.0 + eslint-config-prettier: 8.6.0_eslint@8.33.0 + eslint-plugin-jsdoc: 39.7.4_eslint@8.33.0 + eslint-plugin-prettier: 4.2.1_2blprs6rvzrjlgi3xqpegp3hoe + eslint-plugin-unicorn: 45.0.2_eslint@8.33.0 + prettier: 2.8.6 configuration/projectmanagement: specifiers: - '@openstapps/configuration': workspace:* '@openstapps/eslint-config': workspace:* '@openstapps/gitlab-api': workspace:* '@openstapps/logger': workspace:* + '@openstapps/nyc-config': workspace:* '@openstapps/prettier-config': workspace:* + '@openstapps/tsconfig': workspace:* '@slack/web-api': 6.8.1 '@testdeck/mocha': 0.3.3 '@types/chai': 4.3.4 @@ -315,22 +334,20 @@ importers: chai: 4.3.7 chai-as-promised: 7.1.1 commander: 10.0.0 - conventional-changelog-cli: 2.2.2 date-fns: 2.29.3 eslint: 8.33.0 eslint-config-prettier: 8.6.0 eslint-plugin-jsdoc: 39.7.4 eslint-plugin-prettier: 4.2.1 eslint-plugin-unicorn: 45.0.2 - glob: 8.1.0 + glob: 10.2.1 mocha: 10.2.0 mustache: 4.2.0 nyc: 15.1.0 - prettier: 2.8.3 - rimraf: 4.4.0 + prettier: 2.8.6 tmp: 0.2.1 ts-node: 10.9.1 - typedoc: 0.23.26 + tsup: 6.7.0 typescript: 4.8.4 dependencies: '@openstapps/gitlab-api': link:../../packages/gitlab-api @@ -338,13 +355,14 @@ importers: '@slack/web-api': 6.8.1 commander: 10.0.0 date-fns: 2.29.3 - glob: 8.1.0 + glob: 10.2.1 mustache: 4.2.0 tmp: 0.2.1 devDependencies: - '@openstapps/configuration': link:../configuration '@openstapps/eslint-config': link:../eslint-config + '@openstapps/nyc-config': link:../nyc-config '@openstapps/prettier-config': link:../prettier-config + '@openstapps/tsconfig': link:../tsconfig '@testdeck/mocha': 0.3.3 '@types/chai': 4.3.4 '@types/chai-as-promised': 7.1.5 @@ -357,42 +375,70 @@ importers: '@typescript-eslint/parser': 5.49.0_o2s6jvgtr2hafiobaqfgu6k2l4 chai: 4.3.7 chai-as-promised: 7.1.1_chai@4.3.7 - conventional-changelog-cli: 2.2.2 eslint: 8.33.0 eslint-config-prettier: 8.6.0_eslint@8.33.0 eslint-plugin-jsdoc: 39.7.4_eslint@8.33.0 - eslint-plugin-prettier: 4.2.1_jqplj6qf3uqpxpu4gdyhwwasnq + eslint-plugin-prettier: 4.2.1_2blprs6rvzrjlgi3xqpegp3hoe eslint-plugin-unicorn: 45.0.2_eslint@8.33.0 mocha: 10.2.0 nyc: 15.1.0 - prettier: 2.8.3 - rimraf: 4.4.0 + prettier: 2.8.6 ts-node: 10.9.1_x7wmykdye3n75c4332b67wrzwm - typedoc: 0.23.26_typescript@4.8.4 + tsup: 6.7.0_mwhvu7sfp6vq5ryuwb6hlbjfka typescript: 4.8.4 + configuration/tsconfig: + specifiers: + '@typescript-eslint/eslint-plugin': 5.49.0 + '@typescript-eslint/parser': 5.49.0 + eslint: 8.33.0 + eslint-config-prettier: 8.6.0 + eslint-plugin-jsdoc: 39.7.4 + eslint-plugin-prettier: 4.2.1 + eslint-plugin-unicorn: 45.0.2 + prettier: 2.8.6 + devDependencies: + '@typescript-eslint/eslint-plugin': 5.49.0_bhfhikta3fu7tua7ac2hrytgwe + '@typescript-eslint/parser': 5.49.0_o2s6jvgtr2hafiobaqfgu6k2l4 + eslint: 8.33.0 + eslint-config-prettier: 8.6.0_eslint@8.33.0 + eslint-plugin-jsdoc: 39.7.4_eslint@8.33.0 + eslint-plugin-prettier: 4.2.1_2blprs6rvzrjlgi3xqpegp3hoe + eslint-plugin-unicorn: 45.0.2_eslint@8.33.0 + prettier: 2.8.6 + examples/minimal-connector: specifiers: '@openstapps/api': workspace:* - '@openstapps/configuration': workspace:* '@openstapps/core': workspace:* '@openstapps/core-tools': workspace:* + '@openstapps/eslint-config': workspace:* '@openstapps/logger': workspace:* + '@openstapps/nyc-config': workspace:* + '@openstapps/prettier-config': workspace:* + '@openstapps/tsconfig': workspace:* '@testdeck/mocha': 0.3.3 '@types/chai': 4.3.4 '@types/chai-as-promised': 7.1.5 '@types/mocha': 10.0.1 '@types/node': 18.15.3 + '@typescript-eslint/eslint-plugin': 5.49.0 + '@typescript-eslint/parser': 5.49.0 chai: 4.3.7 chai-as-promised: 7.1.1 commander: 10.0.0 conventional-changelog-cli: 2.2.2 + eslint: 8.33.0 + eslint-config-prettier: 8.6.0 + eslint-plugin-jsdoc: 39.7.4 + eslint-plugin-prettier: 4.2.1 + eslint-plugin-unicorn: 45.0.2 mocha: 10.2.0 nock: 13.3.0 nyc: 15.1.0 - rimraf: 4.4.0 + prettier: 2.8.6 ts-node: 10.9.1 - typedoc: 0.23.26 + tsup: 6.7.0 typescript: 4.8.4 dependencies: '@openstapps/api': link:../../packages/api @@ -400,39 +446,58 @@ importers: '@openstapps/logger': link:../../packages/logger commander: 10.0.0 devDependencies: - '@openstapps/configuration': link:../../configuration/configuration '@openstapps/core-tools': link:../../packages/core-tools + '@openstapps/eslint-config': link:../../configuration/eslint-config + '@openstapps/nyc-config': link:../../configuration/nyc-config + '@openstapps/prettier-config': link:../../configuration/prettier-config + '@openstapps/tsconfig': link:../../configuration/tsconfig '@testdeck/mocha': 0.3.3 '@types/chai': 4.3.4 '@types/chai-as-promised': 7.1.5 '@types/mocha': 10.0.1 '@types/node': 18.15.3 + '@typescript-eslint/eslint-plugin': 5.49.0_bhfhikta3fu7tua7ac2hrytgwe + '@typescript-eslint/parser': 5.49.0_o2s6jvgtr2hafiobaqfgu6k2l4 chai: 4.3.7 chai-as-promised: 7.1.1_chai@4.3.7 conventional-changelog-cli: 2.2.2 + eslint: 8.33.0 + eslint-config-prettier: 8.6.0_eslint@8.33.0 + eslint-plugin-jsdoc: 39.7.4_eslint@8.33.0 + eslint-plugin-prettier: 4.2.1_2blprs6rvzrjlgi3xqpegp3hoe + eslint-plugin-unicorn: 45.0.2_eslint@8.33.0 mocha: 10.2.0 nock: 13.3.0 nyc: 15.1.0 - rimraf: 4.4.0 + prettier: 2.8.6 ts-node: 10.9.1_x7wmykdye3n75c4332b67wrzwm - typedoc: 0.23.26_typescript@4.8.4 + tsup: 6.7.0_mwhvu7sfp6vq5ryuwb6hlbjfka typescript: 4.8.4 examples/minimal-plugin: specifiers: '@openstapps/api': workspace:* - '@openstapps/configuration': workspace:* '@openstapps/core': workspace:* '@openstapps/core-tools': workspace:* + '@openstapps/eslint-config': workspace:* '@openstapps/logger': workspace:* + '@openstapps/prettier-config': workspace:* + '@openstapps/tsconfig': workspace:* '@types/express': 4.17.16 '@types/node': 18.15.3 + '@typescript-eslint/eslint-plugin': 5.49.0 + '@typescript-eslint/parser': 5.49.0 commander: 10.0.0 - conventional-changelog-cli: 2.2.2 + eslint: 8.33.0 + eslint-config-prettier: 8.6.0 + eslint-plugin-jsdoc: 39.7.4 + eslint-plugin-prettier: 4.2.1 + eslint-plugin-unicorn: 45.0.2 express: 4.18.2 - rimraf: 4.4.0 + prettier: 2.8.6 ts-node: 10.9.1 - typedoc: 0.23.26 + tsup: 6.7.0 + typedoc: 0.23.28 typescript: 4.8.4 dependencies: '@openstapps/api': link:../../packages/api @@ -443,12 +508,21 @@ importers: express: 4.18.2 ts-node: 10.9.1_x7wmykdye3n75c4332b67wrzwm devDependencies: - '@openstapps/configuration': link:../../configuration/configuration + '@openstapps/eslint-config': link:../../configuration/eslint-config + '@openstapps/prettier-config': link:../../configuration/prettier-config + '@openstapps/tsconfig': link:../../configuration/tsconfig '@types/express': 4.17.16 '@types/node': 18.15.3 - conventional-changelog-cli: 2.2.2 - rimraf: 4.4.0 - typedoc: 0.23.26_typescript@4.8.4 + '@typescript-eslint/eslint-plugin': 5.49.0_bhfhikta3fu7tua7ac2hrytgwe + '@typescript-eslint/parser': 5.49.0_o2s6jvgtr2hafiobaqfgu6k2l4 + eslint: 8.33.0 + eslint-config-prettier: 8.6.0_eslint@8.33.0 + eslint-plugin-jsdoc: 39.7.4_eslint@8.33.0 + eslint-plugin-prettier: 4.2.1_2blprs6rvzrjlgi3xqpegp3hoe + eslint-plugin-unicorn: 45.0.2_eslint@8.33.0 + prettier: 2.8.6 + tsup: 6.7.0_mwhvu7sfp6vq5ryuwb6hlbjfka + typedoc: 0.23.28_typescript@4.8.4 typescript: 4.8.4 frontend/app: @@ -509,9 +583,9 @@ importers: '@ngx-translate/http-loader': 7.0.0 '@openid/appauth': 1.3.1 '@openstapps/api': workspace:* - '@openstapps/configuration': workspace:* '@openstapps/core': workspace:* '@openstapps/prettier-config': workspace:* + '@openstapps/tsconfig': workspace:* '@transistorsoft/capacitor-background-fetch': 1.0.2 '@types/fontkit': 1.8.0 '@types/geojson': 1.0.6 @@ -525,11 +599,10 @@ importers: '@typescript-eslint/eslint-plugin': 5.49.0 '@typescript-eslint/parser': 5.49.0 capacitor-secure-storage-plugin: 0.8.1 - conventional-changelog-cli: 2.2.2 cordova-plugin-calendar: 5.1.6 cordova-res: 0.15.4 cypress: 12.0.1 - deepmerge: 4.3.0 + deepmerge: 4.3.1 eslint: 8.33.0 eslint-config-prettier: 8.6.0 eslint-plugin-jsdoc: 39.7.4 @@ -538,7 +611,7 @@ importers: fontkit: 2.0.2 form-data: 4.0.0 geojson: 0.5.0 - glob: 8.1.0 + glob: 10.2.1 ionic-appauth: 0.9.0 is-docker: 2.2.1 jasmine-core: 4.5.0 @@ -560,14 +633,14 @@ importers: ngx-markdown: 13.1.0 ngx-moment: 6.0.2 opening_hours: 3.8.0 - prettier: 2.8.3 + prettier: 2.8.6 protractor: 7.0.0 rxjs: 7.8.0 surge: 0.23.1 swiper: 8.4.5 ts-node: 10.9.1 tslib: 2.4.1 - typescript: 4.8.4 + typescript: 4.6.4 webpack-bundle-analyzer: 4.7.0 zone.js: 0.12.0 dependencies: @@ -607,12 +680,11 @@ importers: '@ngx-translate/http-loader': 7.0.0_vl64tbma2gywhh7yhb52p553zu '@openid/appauth': 1.3.1 '@openstapps/api': link:../../packages/api - '@openstapps/configuration': link:../../configuration/configuration '@openstapps/core': link:../../packages/core '@transistorsoft/capacitor-background-fetch': 1.0.2_@capacitor+core@4.6.1 capacitor-secure-storage-plugin: 0.8.1_@capacitor+core@4.6.1 cordova-plugin-calendar: 5.1.6 - deepmerge: 4.3.0 + deepmerge: 4.3.1 form-data: 4.0.0 geojson: 0.5.0 ionic-appauth: 0.9.0_rxjs@7.8.0 @@ -631,17 +703,17 @@ importers: zone.js: 0.12.0 devDependencies: '@angular-devkit/architect': 0.1303.9 - '@angular-devkit/build-angular': 13.3.9_ea6cmfhwn32btxcasikv3bnvy4 + '@angular-devkit/build-angular': 13.3.9_3q3seh73q5u35r3zzwx6t7zisi '@angular-devkit/core': 13.3.9 '@angular-devkit/schematics': 13.3.9 - '@angular-eslint/builder': 13.5.0_o2s6jvgtr2hafiobaqfgu6k2l4 - '@angular-eslint/eslint-plugin': 13.5.0_o2s6jvgtr2hafiobaqfgu6k2l4 - '@angular-eslint/eslint-plugin-template': 13.5.0_o2s6jvgtr2hafiobaqfgu6k2l4 - '@angular-eslint/schematics': 13.5.0_536xy2vqb64yxidue4hjv6dyry - '@angular-eslint/template-parser': 13.5.0_o2s6jvgtr2hafiobaqfgu6k2l4 + '@angular-eslint/builder': 13.5.0_glr7kvvu63i7xo5xtsf5x2uhzq + '@angular-eslint/eslint-plugin': 13.5.0_glr7kvvu63i7xo5xtsf5x2uhzq + '@angular-eslint/eslint-plugin-template': 13.5.0_glr7kvvu63i7xo5xtsf5x2uhzq + '@angular-eslint/schematics': 13.5.0_t33cwzhstyizxm44gtu7b7yycy + '@angular-eslint/template-parser': 13.5.0_glr7kvvu63i7xo5xtsf5x2uhzq '@angular/cli': 13.3.9 '@angular/compiler': 13.3.11 - '@angular/compiler-cli': 13.3.11_xeflokkgu73wtkc6at5gry2yxu + '@angular/compiler-cli': 13.3.11_wvdsvu4ndjsgtqfw53dq3n3vza '@angular/language-service': 13.3.11 '@capacitor/android': 4.6.1_@capacitor+core@4.6.1 '@capacitor/cli': 4.6.1 @@ -651,6 +723,7 @@ importers: '@ionic/angular-toolkit': 6.1.0 '@ionic/cli': 6.20.4 '@openstapps/prettier-config': link:../../configuration/prettier-config + '@openstapps/tsconfig': link:../../configuration/tsconfig '@types/fontkit': 1.8.0 '@types/geojson': 1.0.6 '@types/glob': 8.0.1 @@ -660,18 +733,17 @@ importers: '@types/leaflet': 1.9.0 '@types/leaflet.markercluster': 1.5.1 '@types/node': 18.15.3 - '@typescript-eslint/eslint-plugin': 5.49.0_bhfhikta3fu7tua7ac2hrytgwe - '@typescript-eslint/parser': 5.49.0_o2s6jvgtr2hafiobaqfgu6k2l4 - conventional-changelog-cli: 2.2.2 + '@typescript-eslint/eslint-plugin': 5.49.0_2y3xuzvdczrvcatx5demchs3n4 + '@typescript-eslint/parser': 5.49.0_glr7kvvu63i7xo5xtsf5x2uhzq cordova-res: 0.15.4 cypress: 12.0.1 eslint: 8.33.0 eslint-config-prettier: 8.6.0_eslint@8.33.0 eslint-plugin-jsdoc: 39.7.4_eslint@8.33.0 - eslint-plugin-prettier: 4.2.1_jqplj6qf3uqpxpu4gdyhwwasnq + eslint-plugin-prettier: 4.2.1_2blprs6rvzrjlgi3xqpegp3hoe eslint-plugin-unicorn: 45.0.2_eslint@8.33.0 fontkit: 2.0.2 - glob: 8.1.0 + glob: 10.2.1 is-docker: 2.2.1 jasmine-core: 4.5.0 jasmine-spec-reporter: 7.0.0 @@ -683,21 +755,23 @@ importers: karma-jasmine-html-reporter: 2.0.0_uk6l45dlsjldsnfgnal4othgyq karma-mocha-reporter: 2.2.5_karma@6.4.1 license-checker: 25.0.1 - prettier: 2.8.3 + prettier: 2.8.6 protractor: 7.0.0 surge: 0.23.1 - ts-node: 10.9.1_x7wmykdye3n75c4332b67wrzwm - typescript: 4.8.4 + ts-node: 10.9.1_ev3x2t2gv55at43ghevgmyytwy + typescript: 4.6.4 webpack-bundle-analyzer: 4.7.0 packages/api: specifiers: '@krlwlfrt/async-pool': 0.7.0 - '@openstapps/configuration': workspace:* '@openstapps/core': workspace:* '@openstapps/core-tools': workspace:* '@openstapps/eslint-config': workspace:* '@openstapps/logger': workspace:* + '@openstapps/nyc-config': workspace:* + '@openstapps/prettier-config': workspace:* + '@openstapps/tsconfig': workspace:* '@testdeck/mocha': 0.3.3 '@types/body-parser': 1.19.2 '@types/chai': 4.3.4 @@ -736,12 +810,12 @@ importers: morgan: 1.10.0 nock: 13.3.0 nyc: 15.1.0 - prettier: 2.8.3 + prettier: 2.8.6 rfdc: 1.3.0 - rimraf: 4.4.0 traverse: 0.6.7 ts-node: 10.9.1 - typedoc: 0.23.26 + tsup: 6.7.0 + typedoc: 0.23.28 typescript: 4.8.4 uuid: 8.3.2 wait-on: 6.0.1 @@ -763,8 +837,10 @@ importers: uuid: 8.3.2 wait-on: 6.0.1 devDependencies: - '@openstapps/configuration': link:../../configuration/configuration '@openstapps/eslint-config': link:../../configuration/eslint-config + '@openstapps/nyc-config': link:../../configuration/nyc-config + '@openstapps/prettier-config': link:../../configuration/prettier-config + '@openstapps/tsconfig': link:../../configuration/tsconfig '@testdeck/mocha': 0.3.3 '@types/body-parser': 1.19.2 '@types/chai': 4.3.4 @@ -789,55 +865,70 @@ importers: eslint: 8.33.0 eslint-config-prettier: 8.6.0_eslint@8.33.0 eslint-plugin-jsdoc: 39.7.4_eslint@8.33.0 - eslint-plugin-prettier: 4.2.1_jqplj6qf3uqpxpu4gdyhwwasnq + eslint-plugin-prettier: 4.2.1_2blprs6rvzrjlgi3xqpegp3hoe eslint-plugin-unicorn: 45.0.2_eslint@8.33.0 fs-extra: 10.1.0 mocha: 10.2.0 nock: 13.3.0 nyc: 15.1.0 - prettier: 2.8.3 - rimraf: 4.4.0 + prettier: 2.8.6 ts-node: 10.9.1_x7wmykdye3n75c4332b67wrzwm - typedoc: 0.23.26_typescript@4.8.4 + tsup: 6.7.0_mwhvu7sfp6vq5ryuwb6hlbjfka + typedoc: 0.23.28_typescript@4.8.4 typescript: 4.8.4 packages/collection-utils: specifiers: - '@openstapps/configuration': workspace:* '@openstapps/eslint-config': workspace:* + '@openstapps/nyc-config': workspace:* '@openstapps/prettier-config': workspace:* + '@openstapps/tsconfig': workspace:* '@types/chai': 4.3.4 '@types/mocha': 10.0.1 '@types/node': 18.15.3 + '@typescript-eslint/eslint-plugin': 5.49.0 + '@typescript-eslint/parser': 5.49.0 chai: 4.3.7 eslint: 8.33.0 + eslint-config-prettier: 8.6.0 + eslint-plugin-jsdoc: 39.7.4 + eslint-plugin-prettier: 4.2.1 + eslint-plugin-unicorn: 45.0.2 mocha: 10.2.0 - prettier: 2.8.3 - rimraf: 4.4.0 + prettier: 2.8.6 ts-node: 10.9.1 + tsup: 6.7.0 typescript: 4.8.4 devDependencies: - '@openstapps/configuration': link:../../configuration/configuration '@openstapps/eslint-config': link:../../configuration/eslint-config + '@openstapps/nyc-config': link:../../configuration/nyc-config '@openstapps/prettier-config': link:../../configuration/prettier-config + '@openstapps/tsconfig': link:../../configuration/tsconfig '@types/chai': 4.3.4 '@types/mocha': 10.0.1 '@types/node': 18.15.3 + '@typescript-eslint/eslint-plugin': 5.49.0_bhfhikta3fu7tua7ac2hrytgwe + '@typescript-eslint/parser': 5.49.0_o2s6jvgtr2hafiobaqfgu6k2l4 chai: 4.3.7 eslint: 8.33.0 + eslint-config-prettier: 8.6.0_eslint@8.33.0 + eslint-plugin-jsdoc: 39.7.4_eslint@8.33.0 + eslint-plugin-prettier: 4.2.1_2blprs6rvzrjlgi3xqpegp3hoe + eslint-plugin-unicorn: 45.0.2_eslint@8.33.0 mocha: 10.2.0 - prettier: 2.8.3 - rimraf: 4.4.0 + prettier: 2.8.6 ts-node: 10.9.1_x7wmykdye3n75c4332b67wrzwm + tsup: 6.7.0_mwhvu7sfp6vq5ryuwb6hlbjfka typescript: 4.8.4 packages/core: specifiers: - '@openstapps/configuration': workspace:* '@openstapps/core-tools': workspace:* '@openstapps/es-mapping-generator': workspace:* '@openstapps/eslint-config': workspace:* '@openstapps/logger': workspace:* + '@openstapps/prettier-config': workspace:* + '@openstapps/tsconfig': workspace:* '@testdeck/mocha': 0.3.3 '@types/chai': 4.3.4 '@types/geojson': 1.0.6 @@ -845,12 +936,10 @@ importers: '@types/json-schema': 7.0.11 '@types/mocha': 10.0.1 '@types/node': 18.15.3 - '@types/rimraf': 3.0.2 '@typescript-eslint/eslint-plugin': 5.49.0 '@typescript-eslint/parser': 5.49.0 chai: 4.3.7 conditional-type-checks: 1.0.6 - conventional-changelog-cli: 2.2.2 eslint: 8.33.0 eslint-config-prettier: 8.6.0 eslint-plugin-jsdoc: 39.7.4 @@ -862,61 +951,62 @@ importers: json-schema: 0.4.0 mocha: 10.2.0 nyc: 15.1.0 - prettier: 2.8.3 + prettier: 2.8.6 rfdc: 1.3.0 rimraf: 4.4.0 source-map-support: 0.5.21 surge: 0.23.1 ts-node: 10.9.1 - typedoc: 0.23.26 + tsup: 6.7.0 typescript: 4.8.4 dependencies: '@openstapps/core-tools': link:../core-tools + '@types/geojson': 1.0.6 fast-deep-equal: 3.1.3 http-status-codes: 2.2.0 json-patch: 0.7.0 json-schema: 0.4.0 rfdc: 1.3.0 devDependencies: - '@openstapps/configuration': link:../../configuration/configuration '@openstapps/es-mapping-generator': link:../es-mapping-generator '@openstapps/eslint-config': link:../../configuration/eslint-config '@openstapps/logger': link:../logger + '@openstapps/prettier-config': link:../../configuration/prettier-config + '@openstapps/tsconfig': link:../../configuration/tsconfig '@testdeck/mocha': 0.3.3 '@types/chai': 4.3.4 - '@types/geojson': 1.0.6 '@types/json-patch': 0.0.30 '@types/json-schema': 7.0.11 '@types/mocha': 10.0.1 '@types/node': 18.15.3 - '@types/rimraf': 3.0.2 '@typescript-eslint/eslint-plugin': 5.49.0_bhfhikta3fu7tua7ac2hrytgwe '@typescript-eslint/parser': 5.49.0_o2s6jvgtr2hafiobaqfgu6k2l4 chai: 4.3.7 conditional-type-checks: 1.0.6 - conventional-changelog-cli: 2.2.2 eslint: 8.33.0 eslint-config-prettier: 8.6.0_eslint@8.33.0 eslint-plugin-jsdoc: 39.7.4_eslint@8.33.0 - eslint-plugin-prettier: 4.2.1_jqplj6qf3uqpxpu4gdyhwwasnq + eslint-plugin-prettier: 4.2.1_2blprs6rvzrjlgi3xqpegp3hoe eslint-plugin-unicorn: 45.0.2_eslint@8.33.0 mocha: 10.2.0 nyc: 15.1.0 - prettier: 2.8.3 + prettier: 2.8.6 rimraf: 4.4.0 source-map-support: 0.5.21 surge: 0.23.1 ts-node: 10.9.1_x7wmykdye3n75c4332b67wrzwm - typedoc: 0.23.26_typescript@4.8.4 + tsup: 6.7.0_mwhvu7sfp6vq5ryuwb6hlbjfka typescript: 4.8.4 packages/core-tools: specifiers: '@openstapps/collection-utils': workspace:* - '@openstapps/configuration': workspace:* + '@openstapps/easy-ast': workspace:* '@openstapps/eslint-config': workspace:* '@openstapps/logger': workspace:* + '@openstapps/nyc-config': workspace:* '@openstapps/prettier-config': workspace:* + '@openstapps/tsconfig': workspace:* '@testdeck/mocha': 0.3.3 '@types/chai': 4.3.4 '@types/fs-extra': 9.0.13 @@ -925,15 +1015,13 @@ importers: '@types/mocha': 10.0.1 '@types/mustache': 4.2.2 '@types/node': 18.15.3 - '@types/rimraf': 3.0.2 '@typescript-eslint/eslint-plugin': 5.49.0 '@typescript-eslint/parser': 5.49.0 ajv: 8.12.0 better-ajv-errors: 1.2.0 chai: 4.3.7 commander: 10.0.0 - conventional-changelog-cli: 2.2.2 - deepmerge: 4.3.0 + deepmerge: 4.3.1 del: 6.1.1 eslint: 8.33.0 eslint-config-prettier: 8.6.0 @@ -942,7 +1030,7 @@ importers: eslint-plugin-unicorn: 45.0.2 flatted: 3.2.7 fs-extra: 10.1.0 - glob: 8.1.0 + glob: 10.2.1 got: 12.6.0 humanize-string: 3.0.0 json-schema: 0.4.0 @@ -951,27 +1039,28 @@ importers: nock: 13.3.0 openapi-types: 12.1.0 plantuml-encoder: 1.4.0 - prettier: 2.8.3 + prettier: 2.8.6 re2: 1.18.0 - rimraf: 4.4.0 toposort: 2.0.2 ts-json-schema-generator: 1.2.0 ts-node: 10.9.1 - typedoc: 0.23.26 + tsup: 6.7.0 + typedoc: 0.23.28 typescript: 4.8.4 dependencies: '@openstapps/collection-utils': link:../collection-utils + '@openstapps/easy-ast': link:../easy-ast '@openstapps/logger': link:../logger ajv: 8.12.0 better-ajv-errors: 1.2.0_ajv@8.12.0 chai: 4.3.7 commander: 10.0.0 - deepmerge: 4.3.0 + deepmerge: 4.3.1 del: 6.1.1 eslint: 8.33.0 flatted: 3.2.7 fs-extra: 10.1.0 - glob: 8.1.0 + glob: 10.2.1 got: 12.6.0 humanize-string: 3.0.0 json-schema: 0.4.0 @@ -984,9 +1073,10 @@ importers: ts-node: 10.9.1_x7wmykdye3n75c4332b67wrzwm typescript: 4.8.4 devDependencies: - '@openstapps/configuration': link:../../configuration/configuration '@openstapps/eslint-config': link:../../configuration/eslint-config + '@openstapps/nyc-config': link:../../configuration/nyc-config '@openstapps/prettier-config': link:../../configuration/prettier-config + '@openstapps/tsconfig': link:../../configuration/tsconfig '@testdeck/mocha': 0.3.3 '@types/chai': 4.3.4 '@types/fs-extra': 9.0.13 @@ -995,108 +1085,175 @@ importers: '@types/mocha': 10.0.1 '@types/mustache': 4.2.2 '@types/node': 18.15.3 - '@types/rimraf': 3.0.2 '@typescript-eslint/eslint-plugin': 5.49.0_bhfhikta3fu7tua7ac2hrytgwe '@typescript-eslint/parser': 5.49.0_o2s6jvgtr2hafiobaqfgu6k2l4 - conventional-changelog-cli: 2.2.2 eslint-config-prettier: 8.6.0_eslint@8.33.0 eslint-plugin-jsdoc: 39.7.4_eslint@8.33.0 - eslint-plugin-prettier: 4.2.1_jqplj6qf3uqpxpu4gdyhwwasnq + eslint-plugin-prettier: 4.2.1_2blprs6rvzrjlgi3xqpegp3hoe eslint-plugin-unicorn: 45.0.2_eslint@8.33.0 mocha: 10.2.0 nock: 13.3.0 - prettier: 2.8.3 - rimraf: 4.4.0 - typedoc: 0.23.26_typescript@4.8.4 + prettier: 2.8.6 + tsup: 6.7.0_mwhvu7sfp6vq5ryuwb6hlbjfka + typedoc: 0.23.28_typescript@4.8.4 + + packages/easy-ast: + specifiers: + '@openstapps/collection-utils': workspace:* + '@openstapps/eslint-config': workspace:* + '@openstapps/logger': workspace:* + '@openstapps/nyc-config': workspace:* + '@openstapps/prettier-config': workspace:* + '@openstapps/tsconfig': workspace:* + '@testdeck/mocha': 0.3.3 + '@types/chai': 4.3.4 + '@types/fs-extra': 9.0.13 + '@types/mocha': 10.0.1 + '@types/node': 18.15.3 + '@typescript-eslint/eslint-plugin': 5.49.0 + '@typescript-eslint/parser': 5.49.0 + eslint: 8.33.0 + eslint-config-prettier: 8.6.0 + eslint-plugin-jsdoc: 39.7.4 + eslint-plugin-prettier: 4.2.1 + eslint-plugin-unicorn: 45.0.2 + mocha: 10.2.0 + nock: 13.3.0 + prettier: 2.8.6 + tsup: 6.7.0 + typescript: 4.8.4 + dependencies: + '@openstapps/collection-utils': link:../collection-utils + '@openstapps/logger': link:../logger + typescript: 4.8.4 + devDependencies: + '@openstapps/eslint-config': link:../../configuration/eslint-config + '@openstapps/nyc-config': link:../../configuration/nyc-config + '@openstapps/prettier-config': link:../../configuration/prettier-config + '@openstapps/tsconfig': link:../../configuration/tsconfig + '@testdeck/mocha': 0.3.3 + '@types/chai': 4.3.4 + '@types/fs-extra': 9.0.13 + '@types/mocha': 10.0.1 + '@types/node': 18.15.3 + '@typescript-eslint/eslint-plugin': 5.49.0_bhfhikta3fu7tua7ac2hrytgwe + '@typescript-eslint/parser': 5.49.0_o2s6jvgtr2hafiobaqfgu6k2l4 + eslint: 8.33.0 + eslint-config-prettier: 8.6.0_eslint@8.33.0 + eslint-plugin-jsdoc: 39.7.4_eslint@8.33.0 + eslint-plugin-prettier: 4.2.1_2blprs6rvzrjlgi3xqpegp3hoe + eslint-plugin-unicorn: 45.0.2_eslint@8.33.0 + mocha: 10.2.0 + nock: 13.3.0 + prettier: 2.8.6 + tsup: 6.7.0_typescript@4.8.4 packages/es-mapping-generator: specifiers: - '@openstapps/configuration': workspace:* + '@openstapps/prettier-config': workspace:* '@testdeck/mocha': 0.3.3 '@types/chai': 4.3.4 '@types/mocha': 10.0.1 '@types/node': 14.18.38 '@types/rimraf': 3.0.2 + '@typescript-eslint/eslint-plugin': 5.49.0 + '@typescript-eslint/parser': 5.49.0 chai: 4.3.7 commander: 10.0.0 - conventional-changelog-cli: 2.2.2 - deepmerge: 4.3.0 + deepmerge: 4.3.1 + eslint: 8.33.0 + eslint-config-prettier: 8.6.0 + eslint-plugin-jsdoc: 39.7.4 + eslint-plugin-prettier: 4.2.1 + eslint-plugin-unicorn: 45.0.2 flatted: 3.2.7 got: 11.8.6 mocha: 10.2.0 nock: 13.3.0 - rimraf: 4.4.0 + prettier: 2.8.6 + rimraf: 5.0.0 ts-node: 10.9.1 tslint-eslint-rules: 5.4.0 typedoc: 0.18.0 typescript: 3.8.3 dependencies: commander: 10.0.0 - deepmerge: 4.3.0 + deepmerge: 4.3.1 flatted: 3.2.7 got: 11.8.6 typedoc: 0.18.0_typescript@3.8.3 typescript: 3.8.3 devDependencies: - '@openstapps/configuration': link:../../configuration/configuration + '@openstapps/prettier-config': link:../../configuration/prettier-config '@testdeck/mocha': 0.3.3 '@types/chai': 4.3.4 '@types/mocha': 10.0.1 '@types/node': 14.18.38 '@types/rimraf': 3.0.2 + '@typescript-eslint/eslint-plugin': 5.49.0_kfd4zpckoia5uuabb7zlmzbqou + '@typescript-eslint/parser': 5.49.0_ymn73yqtyin7iqj6whnaesgwei chai: 4.3.7 - conventional-changelog-cli: 2.2.2 + eslint: 8.33.0 + eslint-config-prettier: 8.6.0_eslint@8.33.0 + eslint-plugin-jsdoc: 39.7.4_eslint@8.33.0 + eslint-plugin-prettier: 4.2.1_2blprs6rvzrjlgi3xqpegp3hoe + eslint-plugin-unicorn: 45.0.2_eslint@8.33.0 mocha: 10.2.0 nock: 13.3.0 - rimraf: 4.4.0 + prettier: 2.8.6 + rimraf: 5.0.0 ts-node: 10.9.1_v4vfm2zcz4t2yckcvpdr2ktuie tslint-eslint-rules: 5.4.0_zod7fnacdegw6szwqawh2ymqz4 packages/gitlab-api: specifiers: - '@openstapps/configuration': workspace:* '@openstapps/eslint-config': workspace:* '@openstapps/logger': workspace:* + '@openstapps/prettier-config': workspace:* + '@openstapps/tsconfig': workspace:* '@types/node': 18.15.3 '@typescript-eslint/eslint-plugin': 5.49.0 '@typescript-eslint/parser': 5.49.0 commander: 10.0.0 - conventional-changelog-cli: 2.2.2 eslint: 8.33.0 eslint-config-prettier: 8.6.0 eslint-plugin-jsdoc: 39.7.4 + eslint-plugin-prettier: 4.2.1 eslint-plugin-unicorn: 45.0.2 got: 12.6.0 - prettier: 2.8.3 - rimraf: 4.4.0 + prettier: 2.8.6 ts-node: 10.9.1 - typedoc: 0.23.26 + tsup: 6.7.0 + typedoc: 0.23.28 typescript: 4.8.4 dependencies: '@openstapps/logger': link:../logger commander: 10.0.0 got: 12.6.0 devDependencies: - '@openstapps/configuration': link:../../configuration/configuration '@openstapps/eslint-config': link:../../configuration/eslint-config + '@openstapps/prettier-config': link:../../configuration/prettier-config + '@openstapps/tsconfig': link:../../configuration/tsconfig '@types/node': 18.15.3 '@typescript-eslint/eslint-plugin': 5.49.0_bhfhikta3fu7tua7ac2hrytgwe '@typescript-eslint/parser': 5.49.0_o2s6jvgtr2hafiobaqfgu6k2l4 - conventional-changelog-cli: 2.2.2 eslint: 8.33.0 eslint-config-prettier: 8.6.0_eslint@8.33.0 eslint-plugin-jsdoc: 39.7.4_eslint@8.33.0 + eslint-plugin-prettier: 4.2.1_2blprs6rvzrjlgi3xqpegp3hoe eslint-plugin-unicorn: 45.0.2_eslint@8.33.0 - prettier: 2.8.3 - rimraf: 4.4.0 + prettier: 2.8.6 ts-node: 10.9.1_x7wmykdye3n75c4332b67wrzwm - typedoc: 0.23.26_typescript@4.8.4 + tsup: 6.7.0_mwhvu7sfp6vq5ryuwb6hlbjfka + typedoc: 0.23.28_typescript@4.8.4 typescript: 4.8.4 packages/logger: specifiers: - '@openstapps/configuration': workspace:* '@openstapps/eslint-config': workspace:* + '@openstapps/nyc-config': workspace:* + '@openstapps/prettier-config': workspace:* + '@openstapps/tsconfig': workspace:* '@testdeck/mocha': 0.3.3 '@types/chai': 4.3.4 '@types/chai-as-promised': 7.1.5 @@ -1110,7 +1267,6 @@ importers: chai-as-promised: 7.1.1 chai-spies: 1.0.0 chalk: 4.1.2 - conventional-changelog-cli: 2.2.2 eslint: 8.33.0 eslint-config-prettier: 8.6.0 eslint-plugin-jsdoc: 39.7.4 @@ -1121,10 +1277,10 @@ importers: moment: 2.29.4 nodemailer: 6.9.1 nyc: 15.1.0 - prettier: 2.8.3 - rimraf: 4.4.0 + prettier: 2.8.6 ts-node: 10.9.1 - typedoc: 0.23.26 + tsup: 6.7.0 + typedoc: 0.23.28 typescript: 4.8.4 dependencies: '@types/nodemailer': 6.4.7 @@ -1133,8 +1289,10 @@ importers: moment: 2.29.4 nodemailer: 6.9.1 devDependencies: - '@openstapps/configuration': link:../../configuration/configuration '@openstapps/eslint-config': link:../../configuration/eslint-config + '@openstapps/nyc-config': link:../../configuration/nyc-config + '@openstapps/prettier-config': link:../../configuration/prettier-config + '@openstapps/tsconfig': link:../../configuration/tsconfig '@testdeck/mocha': 0.3.3 '@types/chai': 4.3.4 '@types/chai-as-promised': 7.1.5 @@ -1146,18 +1304,17 @@ importers: chai: 4.3.7 chai-as-promised: 7.1.1_chai@4.3.7 chai-spies: 1.0.0_chai@4.3.7 - conventional-changelog-cli: 2.2.2 eslint: 8.33.0 eslint-config-prettier: 8.6.0_eslint@8.33.0 eslint-plugin-jsdoc: 39.7.4_eslint@8.33.0 - eslint-plugin-prettier: 4.2.1_jqplj6qf3uqpxpu4gdyhwwasnq + eslint-plugin-prettier: 4.2.1_2blprs6rvzrjlgi3xqpegp3hoe eslint-plugin-unicorn: 45.0.2_eslint@8.33.0 mocha: 10.2.0 nyc: 15.1.0 - prettier: 2.8.3 - rimraf: 4.4.0 + prettier: 2.8.6 ts-node: 10.9.1_x7wmykdye3n75c4332b67wrzwm - typedoc: 0.23.26_typescript@4.8.4 + tsup: 6.7.0_mwhvu7sfp6vq5ryuwb6hlbjfka + typedoc: 0.23.28_typescript@4.8.4 typescript: 4.8.4 packages: @@ -1192,7 +1349,7 @@ packages: - chokidar dev: true - /@angular-devkit/build-angular/13.3.9_ea6cmfhwn32btxcasikv3bnvy4: + /@angular-devkit/build-angular/13.3.9_3q3seh73q5u35r3zzwx6t7zisi: resolution: {integrity: sha512-1LqcMizeabx3yOkx3tptCSAoEhG6nO6hPgI/B3EJ07G/ZcoxunMWSeN3P3zT10dZMEHhcxl+8cSStSXaXj9hfA==} engines: {node: ^12.20.0 || ^14.15.0 || >=16.10.0, npm: ^6.11.0 || ^7.5.6 || >=8.0.0, yarn: '>= 1.13.0'} peerDependencies: @@ -1222,7 +1379,7 @@ packages: '@angular-devkit/architect': 0.1303.9 '@angular-devkit/build-webpack': 0.1303.9_yqwwn4zy7x4owjsib6p4jmcbki '@angular-devkit/core': 13.3.9 - '@angular/compiler-cli': 13.3.11_xeflokkgu73wtkc6at5gry2yxu + '@angular/compiler-cli': 13.3.11_wvdsvu4ndjsgtqfw53dq3n3vza '@babel/core': 7.16.12 '@babel/generator': 7.16.8 '@babel/helper-annotate-as-pure': 7.16.7 @@ -1233,7 +1390,7 @@ packages: '@babel/runtime': 7.16.7 '@babel/template': 7.16.7 '@discoveryjs/json-ext': 0.5.6 - '@ngtools/webpack': 13.3.9_v5dkofrxtqypqogvhwnjsgcexa + '@ngtools/webpack': 13.3.9_jxazvrfsrkkdusvwu3zpsnzlr4 ansi-colors: 4.1.1 babel-loader: 8.2.5_xcm7bbhl2zdsgckfarl5d37zpy babel-plugin-istanbul: 6.1.1 @@ -1280,7 +1437,7 @@ packages: text-table: 0.2.0 tree-kill: 1.2.2 tslib: 2.3.1 - typescript: 4.8.4 + typescript: 4.6.4 webpack: 5.70.0 webpack-dev-middleware: 5.3.0_webpack@5.70.0 webpack-dev-server: 4.7.3_webpack@5.70.0 @@ -1431,7 +1588,7 @@ packages: - chokidar dev: true - /@angular-eslint/builder/13.5.0_o2s6jvgtr2hafiobaqfgu6k2l4: + /@angular-eslint/builder/13.5.0_glr7kvvu63i7xo5xtsf5x2uhzq: resolution: {integrity: sha512-IYY/HYS4fSddJLs2pAkMkKhHL07driUILPxGnGLblfWuoJBhRspyrVL3uZc3Q4iJXc1RJfaOno9oRw11FGyL6Q==} peerDependencies: eslint: ^7.0.0 || ^8.0.0 @@ -1439,7 +1596,7 @@ packages: dependencies: '@nrwl/devkit': 13.1.3 eslint: 8.33.0 - typescript: 4.8.4 + typescript: 4.6.4 transitivePeerDependencies: - '@swc-node/register' - '@swc/core' @@ -1450,43 +1607,43 @@ packages: resolution: {integrity: sha512-7M/5ilxqPD3ydgqqdLsYs3kBwZgNg2Y6C01B5SEHZNLqLT9kAJa7I4y6GlxCZqejCIh554kdXGeV3abIxFccSg==} dev: true - /@angular-eslint/eslint-plugin-template/13.5.0_o2s6jvgtr2hafiobaqfgu6k2l4: + /@angular-eslint/eslint-plugin-template/13.5.0_glr7kvvu63i7xo5xtsf5x2uhzq: resolution: {integrity: sha512-ZVSXayn8MqYOhYomH2Cjc0azhuUQbY9fp9dKjJZOD64KhP8BYHw8+Ogc9E/FU5oZQ9fKw6A+23NAYKmLNqSAgA==} peerDependencies: eslint: ^7.0.0 || ^8.0.0 typescript: '*' dependencies: '@angular-eslint/bundled-angular-compiler': 13.5.0 - '@typescript-eslint/experimental-utils': 5.27.1_o2s6jvgtr2hafiobaqfgu6k2l4 + '@typescript-eslint/experimental-utils': 5.27.1_glr7kvvu63i7xo5xtsf5x2uhzq aria-query: 4.2.2 axobject-query: 2.2.0 eslint: 8.33.0 - typescript: 4.8.4 + typescript: 4.6.4 transitivePeerDependencies: - supports-color dev: true - /@angular-eslint/eslint-plugin/13.5.0_o2s6jvgtr2hafiobaqfgu6k2l4: + /@angular-eslint/eslint-plugin/13.5.0_glr7kvvu63i7xo5xtsf5x2uhzq: resolution: {integrity: sha512-k9o9WIqUkdO8tdYFCJ54PUWsNd9HHflih/GmA13EWciBYx8QxciwBh0u4NSAnbtOwp4Y7juGZ/Dta5ZrT/2VBA==} peerDependencies: eslint: ^7.0.0 || ^8.0.0 typescript: '*' dependencies: - '@angular-eslint/utils': 13.5.0_o2s6jvgtr2hafiobaqfgu6k2l4 - '@typescript-eslint/experimental-utils': 5.27.1_o2s6jvgtr2hafiobaqfgu6k2l4 + '@angular-eslint/utils': 13.5.0_glr7kvvu63i7xo5xtsf5x2uhzq + '@typescript-eslint/experimental-utils': 5.27.1_glr7kvvu63i7xo5xtsf5x2uhzq eslint: 8.33.0 - typescript: 4.8.4 + typescript: 4.6.4 transitivePeerDependencies: - supports-color dev: true - /@angular-eslint/schematics/13.5.0_536xy2vqb64yxidue4hjv6dyry: + /@angular-eslint/schematics/13.5.0_t33cwzhstyizxm44gtu7b7yycy: resolution: {integrity: sha512-0LvdalNpYb0oWwptwkeK2PVokfQ9itMIp8/aMjbOLH1RQ3eHFZgBtVvVm3G5EpPKzbL0llaeTifZvH2z70qVYQ==} peerDependencies: '@angular/cli': '>= 13.0.0 < 14.0.0' dependencies: - '@angular-eslint/eslint-plugin': 13.5.0_o2s6jvgtr2hafiobaqfgu6k2l4 - '@angular-eslint/eslint-plugin-template': 13.5.0_o2s6jvgtr2hafiobaqfgu6k2l4 + '@angular-eslint/eslint-plugin': 13.5.0_glr7kvvu63i7xo5xtsf5x2uhzq + '@angular-eslint/eslint-plugin-template': 13.5.0_glr7kvvu63i7xo5xtsf5x2uhzq '@angular/cli': 13.3.9 ignore: 5.2.0 strip-json-comments: 3.1.1 @@ -1497,7 +1654,7 @@ packages: - typescript dev: true - /@angular-eslint/template-parser/13.5.0_o2s6jvgtr2hafiobaqfgu6k2l4: + /@angular-eslint/template-parser/13.5.0_glr7kvvu63i7xo5xtsf5x2uhzq: resolution: {integrity: sha512-k+24+kBjaOuthfp9RBQB0zH6UqeizZuFQFEuZEQbvirPbdQ2SqNBw7IcmW2Qw1v7fjFe6/6gqK7wm2g7o9ZZvA==} peerDependencies: eslint: ^7.0.0 || ^8.0.0 @@ -1506,19 +1663,19 @@ packages: '@angular-eslint/bundled-angular-compiler': 13.5.0 eslint: 8.33.0 eslint-scope: 5.1.1 - typescript: 4.8.4 + typescript: 4.6.4 dev: true - /@angular-eslint/utils/13.5.0_o2s6jvgtr2hafiobaqfgu6k2l4: + /@angular-eslint/utils/13.5.0_glr7kvvu63i7xo5xtsf5x2uhzq: resolution: {integrity: sha512-wX3W6STSDJDJ7ZyEsUdBp4HUPwmillMmKcdnFsy+qxbpJFzFOxOFpK1zet4ELsq1XpB89i9vRvC3vYbpHn3CSw==} peerDependencies: eslint: ^7.0.0 || ^8.0.0 typescript: '*' dependencies: '@angular-eslint/bundled-angular-compiler': 13.5.0 - '@typescript-eslint/experimental-utils': 5.27.1_o2s6jvgtr2hafiobaqfgu6k2l4 + '@typescript-eslint/experimental-utils': 5.27.1_glr7kvvu63i7xo5xtsf5x2uhzq eslint: 8.33.0 - typescript: 4.8.4 + typescript: 4.6.4 transitivePeerDependencies: - supports-color dev: true @@ -1591,7 +1748,7 @@ packages: tslib: 2.4.1 dev: false - /@angular/compiler-cli/13.3.11_xeflokkgu73wtkc6at5gry2yxu: + /@angular/compiler-cli/13.3.11_wvdsvu4ndjsgtqfw53dq3n3vza: resolution: {integrity: sha512-cl+3Wzxt8NRi2WY+RdsxuQ3yQRUp8pSlfSlJJnfaKE1BEqap6uem2DovuhnIbmrLhxZ5xt7o+I1szyO6sn6+ag==} engines: {node: ^12.20.0 || ^14.15.0 || >=16.10.0} hasBin: true @@ -1609,7 +1766,7 @@ packages: semver: 7.3.8 sourcemap-codec: 1.4.8 tslib: 2.4.1 - typescript: 4.8.4 + typescript: 4.6.4 yargs: 17.7.1 transitivePeerDependencies: - supports-color @@ -4040,7 +4197,7 @@ packages: fs-extra: 7.0.1 lodash.startcase: 4.4.0 outdent: 0.5.0 - prettier: 2.8.3 + prettier: 2.8.6 resolve-from: 5.0.0 semver: 5.7.1 dev: true @@ -4208,7 +4365,7 @@ packages: '@changesets/types': 5.2.1 fs-extra: 7.0.1 human-id: 1.0.2 - prettier: 2.8.3 + prettier: 2.8.6 dev: true /@colors/colors/1.5.0: @@ -4427,6 +4584,204 @@ packages: jsdoc-type-pratt-parser: 3.1.0 dev: true + /@esbuild/android-arm/0.17.12: + resolution: {integrity: sha512-E/sgkvwoIfj4aMAPL2e35VnUJspzVYl7+M1B2cqeubdBhADV4uPon0KCc8p2G+LqSJ6i8ocYPCqY3A4GGq0zkQ==} + engines: {node: '>=12'} + cpu: [arm] + os: [android] + requiresBuild: true + dev: true + optional: true + + /@esbuild/android-arm64/0.17.12: + resolution: {integrity: sha512-WQ9p5oiXXYJ33F2EkE3r0FRDFVpEdcDiwNX3u7Xaibxfx6vQE0Sb8ytrfQsA5WO6kDn6mDfKLh6KrPBjvkk7xA==} + engines: {node: '>=12'} + cpu: [arm64] + os: [android] + requiresBuild: true + dev: true + optional: true + + /@esbuild/android-x64/0.17.12: + resolution: {integrity: sha512-m4OsaCr5gT+se25rFPHKQXARMyAehHTQAz4XX1Vk3d27VtqiX0ALMBPoXZsGaB6JYryCLfgGwUslMqTfqeLU0w==} + engines: {node: '>=12'} + cpu: [x64] + os: [android] + requiresBuild: true + dev: true + optional: true + + /@esbuild/darwin-arm64/0.17.12: + resolution: {integrity: sha512-O3GCZghRIx+RAN0NDPhyyhRgwa19MoKlzGonIb5hgTj78krqp9XZbYCvFr9N1eUxg0ZQEpiiZ4QvsOQwBpP+lg==} + engines: {node: '>=12'} + cpu: [arm64] + os: [darwin] + requiresBuild: true + dev: true + optional: true + + /@esbuild/darwin-x64/0.17.12: + resolution: {integrity: sha512-5D48jM3tW27h1qjaD9UNRuN+4v0zvksqZSPZqeSWggfMlsVdAhH3pwSfQIFJwcs9QJ9BRibPS4ViZgs3d2wsCA==} + engines: {node: '>=12'} + cpu: [x64] + os: [darwin] + requiresBuild: true + dev: true + optional: true + + /@esbuild/freebsd-arm64/0.17.12: + resolution: {integrity: sha512-OWvHzmLNTdF1erSvrfoEBGlN94IE6vCEaGEkEH29uo/VoONqPnoDFfShi41Ew+yKimx4vrmmAJEGNoyyP+OgOQ==} + engines: {node: '>=12'} + cpu: [arm64] + os: [freebsd] + requiresBuild: true + dev: true + optional: true + + /@esbuild/freebsd-x64/0.17.12: + resolution: {integrity: sha512-A0Xg5CZv8MU9xh4a+7NUpi5VHBKh1RaGJKqjxe4KG87X+mTjDE6ZvlJqpWoeJxgfXHT7IMP9tDFu7IZ03OtJAw==} + engines: {node: '>=12'} + cpu: [x64] + os: [freebsd] + requiresBuild: true + dev: true + optional: true + + /@esbuild/linux-arm/0.17.12: + resolution: {integrity: sha512-WsHyJ7b7vzHdJ1fv67Yf++2dz3D726oO3QCu8iNYik4fb5YuuReOI9OtA+n7Mk0xyQivNTPbl181s+5oZ38gyA==} + engines: {node: '>=12'} + cpu: [arm] + os: [linux] + requiresBuild: true + dev: true + optional: true + + /@esbuild/linux-arm64/0.17.12: + resolution: {integrity: sha512-cK3AjkEc+8v8YG02hYLQIQlOznW+v9N+OI9BAFuyqkfQFR+DnDLhEM5N8QRxAUz99cJTo1rLNXqRrvY15gbQUg==} + engines: {node: '>=12'} + cpu: [arm64] + os: [linux] + requiresBuild: true + dev: true + optional: true + + /@esbuild/linux-ia32/0.17.12: + resolution: {integrity: sha512-jdOBXJqcgHlah/nYHnj3Hrnl9l63RjtQ4vn9+bohjQPI2QafASB5MtHAoEv0JQHVb/xYQTFOeuHnNYE1zF7tYw==} + engines: {node: '>=12'} + cpu: [ia32] + os: [linux] + requiresBuild: true + dev: true + optional: true + + /@esbuild/linux-loong64/0.17.12: + resolution: {integrity: sha512-GTOEtj8h9qPKXCyiBBnHconSCV9LwFyx/gv3Phw0pa25qPYjVuuGZ4Dk14bGCfGX3qKF0+ceeQvwmtI+aYBbVA==} + engines: {node: '>=12'} + cpu: [loong64] + os: [linux] + requiresBuild: true + dev: true + optional: true + + /@esbuild/linux-mips64el/0.17.12: + resolution: {integrity: sha512-o8CIhfBwKcxmEENOH9RwmUejs5jFiNoDw7YgS0EJTF6kgPgcqLFjgoc5kDey5cMHRVCIWc6kK2ShUePOcc7RbA==} + engines: {node: '>=12'} + cpu: [mips64el] + os: [linux] + requiresBuild: true + dev: true + optional: true + + /@esbuild/linux-ppc64/0.17.12: + resolution: {integrity: sha512-biMLH6NR/GR4z+ap0oJYb877LdBpGac8KfZoEnDiBKd7MD/xt8eaw1SFfYRUeMVx519kVkAOL2GExdFmYnZx3A==} + engines: {node: '>=12'} + cpu: [ppc64] + os: [linux] + requiresBuild: true + dev: true + optional: true + + /@esbuild/linux-riscv64/0.17.12: + resolution: {integrity: sha512-jkphYUiO38wZGeWlfIBMB72auOllNA2sLfiZPGDtOBb1ELN8lmqBrlMiucgL8awBw1zBXN69PmZM6g4yTX84TA==} + engines: {node: '>=12'} + cpu: [riscv64] + os: [linux] + requiresBuild: true + dev: true + optional: true + + /@esbuild/linux-s390x/0.17.12: + resolution: {integrity: sha512-j3ucLdeY9HBcvODhCY4b+Ds3hWGO8t+SAidtmWu/ukfLLG/oYDMaA+dnugTVAg5fnUOGNbIYL9TOjhWgQB8W5g==} + engines: {node: '>=12'} + cpu: [s390x] + os: [linux] + requiresBuild: true + dev: true + optional: true + + /@esbuild/linux-x64/0.17.12: + resolution: {integrity: sha512-uo5JL3cgaEGotaqSaJdRfFNSCUJOIliKLnDGWaVCgIKkHxwhYMm95pfMbWZ9l7GeW9kDg0tSxcy9NYdEtjwwmA==} + engines: {node: '>=12'} + cpu: [x64] + os: [linux] + requiresBuild: true + dev: true + optional: true + + /@esbuild/netbsd-x64/0.17.12: + resolution: {integrity: sha512-DNdoRg8JX+gGsbqt2gPgkgb00mqOgOO27KnrWZtdABl6yWTST30aibGJ6geBq3WM2TIeW6COs5AScnC7GwtGPg==} + engines: {node: '>=12'} + cpu: [x64] + os: [netbsd] + requiresBuild: true + dev: true + optional: true + + /@esbuild/openbsd-x64/0.17.12: + resolution: {integrity: sha512-aVsENlr7B64w8I1lhHShND5o8cW6sB9n9MUtLumFlPhG3elhNWtE7M1TFpj3m7lT3sKQUMkGFjTQBrvDDO1YWA==} + engines: {node: '>=12'} + cpu: [x64] + os: [openbsd] + requiresBuild: true + dev: true + optional: true + + /@esbuild/sunos-x64/0.17.12: + resolution: {integrity: sha512-qbHGVQdKSwi0JQJuZznS4SyY27tYXYF0mrgthbxXrZI3AHKuRvU+Eqbg/F0rmLDpW/jkIZBlCO1XfHUBMNJ1pg==} + engines: {node: '>=12'} + cpu: [x64] + os: [sunos] + requiresBuild: true + dev: true + optional: true + + /@esbuild/win32-arm64/0.17.12: + resolution: {integrity: sha512-zsCp8Ql+96xXTVTmm6ffvoTSZSV2B/LzzkUXAY33F/76EajNw1m+jZ9zPfNJlJ3Rh4EzOszNDHsmG/fZOhtqDg==} + engines: {node: '>=12'} + cpu: [arm64] + os: [win32] + requiresBuild: true + dev: true + optional: true + + /@esbuild/win32-ia32/0.17.12: + resolution: {integrity: sha512-FfrFjR4id7wcFYOdqbDfDET3tjxCozUgbqdkOABsSFzoZGFC92UK7mg4JKRc/B3NNEf1s2WHxJ7VfTdVDPN3ng==} + engines: {node: '>=12'} + cpu: [ia32] + os: [win32] + requiresBuild: true + dev: true + optional: true + + /@esbuild/win32-x64/0.17.12: + resolution: {integrity: sha512-JOOxw49BVZx2/5tW3FqkdjSD/5gXYeVGPDcB0lvap0gLQshkh1Nyel1QazC+wNxus3xPlsYAgqU1BUmrmCvWtw==} + engines: {node: '>=12'} + cpu: [x64] + os: [win32] + requiresBuild: true + dev: true + optional: true + /@eslint-community/eslint-utils/4.2.0_eslint@8.33.0: resolution: {integrity: sha512-gB8T4H4DEfX2IV9zGDJPOBgP1e/DbfCPDTtEqUMckpvzS1OYtva8JdFYBqMwYk7xAQ429WGF/UPqn8uQ//h2vQ==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} @@ -4940,7 +5295,7 @@ packages: engines: {node: '>= 10.*'} dev: true - /@ngtools/webpack/13.3.9_v5dkofrxtqypqogvhwnjsgcexa: + /@ngtools/webpack/13.3.9_jxazvrfsrkkdusvwu3zpsnzlr4: resolution: {integrity: sha512-wmgOI5sogAuilwBZJqCHVMjm2uhDxjdSmNLFx7eznwGDa6LjvjuATqCv2dVlftq0Y/5oZFVrg5NpyHt5kfZ8Cg==} engines: {node: ^12.20.0 || ^14.15.0 || >=16.10.0, npm: ^6.11.0 || ^7.5.6 || >=8.0.0, yarn: '>= 1.13.0'} peerDependencies: @@ -4948,8 +5303,8 @@ packages: typescript: '>=4.4.3 <4.7' webpack: ^5.30.0 dependencies: - '@angular/compiler-cli': 13.3.11_xeflokkgu73wtkc6at5gry2yxu - typescript: 4.8.4 + '@angular/compiler-cli': 13.3.11_wvdsvu4ndjsgtqfw53dq3n3vza + typescript: 4.6.4 webpack: 5.70.0 dev: true @@ -5232,6 +5587,12 @@ packages: node-gyp-build: 4.6.0 dev: true + /@pkgjs/parseargs/0.11.0: + resolution: {integrity: sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==} + engines: {node: '>=14'} + requiresBuild: true + optional: true + /@polka/url/1.0.0-next.21: resolution: {integrity: sha512-a5Sab1C4/icpTZVzZc5Ghpz88yQtGOyNqYXcZgOssB2uuAr+wF/MvN6bgtW32q7HHrvBki+BsZ0OuNv6EV3K9g==} dev: true @@ -5484,7 +5845,7 @@ packages: resolution: {integrity: sha512-ALYone6pm6QmwZoAgeyNksccT9Q4AWZQ6PvfwR37GT6r6FWUPguq6sUmNGSMV2Wr761oQoBxwGGa6DR5o1DC9g==} dependencies: '@types/connect': 3.4.35 - '@types/node': 18.15.3 + '@types/node': 18.15.5 /@types/bonjour/3.5.10: resolution: {integrity: sha512-p7ienRMiS41Nu2/igbJxxLDWrSZ0WxM8UQgCeO9KhoVF7cOVFkrKsiDr1EsJIla8vV3oEEjGcz11jc5yimhzZw==} @@ -5520,7 +5881,7 @@ packages: /@types/cli-progress/3.11.0: resolution: {integrity: sha512-XhXhBv1R/q2ahF3BM7qT5HLzJNlIL0wbcGyZVjqOTqAybAnsLisd7gy1UCyIqpL+5Iv6XhlSyzjLCnI2sIdbCg==} dependencies: - '@types/node': 18.15.3 + '@types/node': 18.15.5 dev: true /@types/config/3.3.0: @@ -5537,7 +5898,7 @@ packages: /@types/connect/3.4.35: resolution: {integrity: sha512-cdeYyv4KWoEgpBISTxWvqYsVy444DOqehiF3fM3ne10AmJ62RSyNkUnxMJXHQWRQQX2eR94m5y1IZyDwBjV9FQ==} dependencies: - '@types/node': 18.15.3 + '@types/node': 18.15.5 /@types/cookie/0.4.1: resolution: {integrity: sha512-XW/Aa8APYr6jSVVA1y/DEIZX0/GMKLEVekNG727R8cs56ahETkRAy/3DR7+fJyh7oUgGwNQaRfXCun0+KbWY7Q==} @@ -5628,7 +5989,6 @@ packages: /@types/geojson/1.0.6: resolution: {integrity: sha512-Xqg/lIZMrUd0VRmSRbCAewtwGZiAk3mEUDvV4op1tGl+LvyPcb/MIOSxTl9z+9+J+R4/vpjiCAT4xeKzH9ji1w==} - dev: true /@types/glob/8.0.1: resolution: {integrity: sha512-8bVUjXZvJacUFkJXHdyZ9iH1Eaj5V7I8c4NdH5sQJsdXkqT4CA5Dhb4yb4VE/3asyx4L9ayZr1NIhTsWHczmMw==} @@ -5747,6 +6107,9 @@ packages: /@types/node/18.15.3: resolution: {integrity: sha512-p6ua9zBxz5otCmbpb5D3U4B5Nanw6Pk3PPyX05xnxbB/fRv71N7CPmORg7uAD5P70T0xmx1pzAx/FUfa5X+3cw==} + /@types/node/18.15.5: + resolution: {integrity: sha512-Ark2WDjjZO7GmvsyFFf81MXuGTA/d6oP38anyxWOL6EREyBKAxKoFHwBhaZxCfLRLpO8JgVXwqOwSwa7jRcjew==} + /@types/nodemailer/6.4.7: resolution: {integrity: sha512-f5qCBGAn/f0qtRcd4SEn88c8Fp3Swct1731X4ryPKqS61/A3LmmzN8zaEz7hneJvpjFbUUgY7lru/B/7ODTazg==} dependencies: @@ -5815,7 +6178,7 @@ packages: resolution: {integrity: sha512-NUo5XNiAdULrJENtJXZZ3fHtfMolzZwczzBbnAeBbqBwG+LaG6YaJtuwzwGSQZ2wsCrxjEhNNjAkKigy3n8teQ==} dependencies: '@types/mime': 3.0.1 - '@types/node': 18.15.3 + '@types/node': 18.15.5 /@types/sha1/1.1.3: resolution: {integrity: sha512-bXfx/6xrPu1l6pLItGRMPX00lhnJavpj2qiQeLHflXvL2Ix97aC8FTF2/pQoqukRzcCwKyN3csZvOLzamIoaSA==} @@ -5891,7 +6254,7 @@ packages: /@types/wait-on/5.3.1: resolution: {integrity: sha512-2FFOKCF/YydrMUaqg+fkk49qf0e5rDgwt6aQsMzFQzbS419h2gNOXyiwp/o2yYy27bi/C1z+HgfncryjGzlvgQ==} dependencies: - '@types/node': 18.15.3 + '@types/node': 18.15.5 dev: true /@types/ws/8.5.4: @@ -5908,6 +6271,33 @@ packages: dev: true optional: true + /@typescript-eslint/eslint-plugin/5.49.0_2y3xuzvdczrvcatx5demchs3n4: + resolution: {integrity: sha512-IhxabIpcf++TBaBa1h7jtOWyon80SXPRLDq0dVz5SLFC/eW6tofkw/O7Ar3lkx5z5U6wzbKDrl2larprp5kk5Q==} + engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} + peerDependencies: + '@typescript-eslint/parser': ^5.0.0 + eslint: ^6.0.0 || ^7.0.0 || ^8.0.0 + typescript: '*' + peerDependenciesMeta: + typescript: + optional: true + dependencies: + '@typescript-eslint/parser': 5.49.0_glr7kvvu63i7xo5xtsf5x2uhzq + '@typescript-eslint/scope-manager': 5.49.0 + '@typescript-eslint/type-utils': 5.49.0_glr7kvvu63i7xo5xtsf5x2uhzq + '@typescript-eslint/utils': 5.49.0_glr7kvvu63i7xo5xtsf5x2uhzq + debug: 4.3.4 + eslint: 8.33.0 + ignore: 5.2.4 + natural-compare-lite: 1.4.0 + regexpp: 3.2.0 + semver: 7.3.8 + tsutils: 3.21.0_typescript@4.6.4 + typescript: 4.6.4 + transitivePeerDependencies: + - supports-color + dev: true + /@typescript-eslint/eslint-plugin/5.49.0_bhfhikta3fu7tua7ac2hrytgwe: resolution: {integrity: sha512-IhxabIpcf++TBaBa1h7jtOWyon80SXPRLDq0dVz5SLFC/eW6tofkw/O7Ar3lkx5z5U6wzbKDrl2larprp5kk5Q==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} @@ -5935,19 +6325,66 @@ packages: - supports-color dev: true - /@typescript-eslint/experimental-utils/5.27.1_o2s6jvgtr2hafiobaqfgu6k2l4: + /@typescript-eslint/eslint-plugin/5.49.0_kfd4zpckoia5uuabb7zlmzbqou: + resolution: {integrity: sha512-IhxabIpcf++TBaBa1h7jtOWyon80SXPRLDq0dVz5SLFC/eW6tofkw/O7Ar3lkx5z5U6wzbKDrl2larprp5kk5Q==} + engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} + peerDependencies: + '@typescript-eslint/parser': ^5.0.0 + eslint: ^6.0.0 || ^7.0.0 || ^8.0.0 + typescript: '*' + peerDependenciesMeta: + typescript: + optional: true + dependencies: + '@typescript-eslint/parser': 5.49.0_ymn73yqtyin7iqj6whnaesgwei + '@typescript-eslint/scope-manager': 5.49.0 + '@typescript-eslint/type-utils': 5.49.0_ymn73yqtyin7iqj6whnaesgwei + '@typescript-eslint/utils': 5.49.0_ymn73yqtyin7iqj6whnaesgwei + debug: 4.3.4 + eslint: 8.33.0 + ignore: 5.2.4 + natural-compare-lite: 1.4.0 + regexpp: 3.2.0 + semver: 7.3.8 + tsutils: 3.21.0_typescript@3.8.3 + typescript: 3.8.3 + transitivePeerDependencies: + - supports-color + dev: true + + /@typescript-eslint/experimental-utils/5.27.1_glr7kvvu63i7xo5xtsf5x2uhzq: resolution: {integrity: sha512-Vd8uewIixGP93sEnmTRIH6jHZYRQRkGPDPpapACMvitJKX8335VHNyqKTE+mZ+m3E2c5VznTZfSsSsS5IF7vUA==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} peerDependencies: eslint: ^6.0.0 || ^7.0.0 || ^8.0.0 dependencies: - '@typescript-eslint/utils': 5.27.1_o2s6jvgtr2hafiobaqfgu6k2l4 + '@typescript-eslint/utils': 5.27.1_glr7kvvu63i7xo5xtsf5x2uhzq eslint: 8.33.0 transitivePeerDependencies: - supports-color - typescript dev: true + /@typescript-eslint/parser/5.49.0_glr7kvvu63i7xo5xtsf5x2uhzq: + resolution: {integrity: sha512-veDlZN9mUhGqU31Qiv2qEp+XrJj5fgZpJ8PW30sHU+j/8/e5ruAhLaVDAeznS7A7i4ucb/s8IozpDtt9NqCkZg==} + engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} + peerDependencies: + eslint: ^6.0.0 || ^7.0.0 || ^8.0.0 + typescript: '*' + peerDependenciesMeta: + typescript: + optional: true + dependencies: + '@typescript-eslint/scope-manager': 5.49.0 + '@typescript-eslint/types': 5.49.0 + '@typescript-eslint/typescript-estree': 5.49.0_typescript@4.6.4 + debug: 4.3.4 + eslint: 8.33.0 + typescript: 4.6.4 + transitivePeerDependencies: + - supports-color + dev: true + /@typescript-eslint/parser/5.49.0_o2s6jvgtr2hafiobaqfgu6k2l4: resolution: {integrity: sha512-veDlZN9mUhGqU31Qiv2qEp+XrJj5fgZpJ8PW30sHU+j/8/e5ruAhLaVDAeznS7A7i4ucb/s8IozpDtt9NqCkZg==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} @@ -5968,6 +6405,26 @@ packages: - supports-color dev: true + /@typescript-eslint/parser/5.49.0_ymn73yqtyin7iqj6whnaesgwei: + resolution: {integrity: sha512-veDlZN9mUhGqU31Qiv2qEp+XrJj5fgZpJ8PW30sHU+j/8/e5ruAhLaVDAeznS7A7i4ucb/s8IozpDtt9NqCkZg==} + engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} + peerDependencies: + eslint: ^6.0.0 || ^7.0.0 || ^8.0.0 + typescript: '*' + peerDependenciesMeta: + typescript: + optional: true + dependencies: + '@typescript-eslint/scope-manager': 5.49.0 + '@typescript-eslint/types': 5.49.0 + '@typescript-eslint/typescript-estree': 5.49.0_typescript@3.8.3 + debug: 4.3.4 + eslint: 8.33.0 + typescript: 3.8.3 + transitivePeerDependencies: + - supports-color + dev: true + /@typescript-eslint/scope-manager/5.27.1: resolution: {integrity: sha512-fQEOSa/QroWE6fAEg+bJxtRZJTH8NTskggybogHt4H9Da8zd4cJji76gA5SBlR0MgtwF7rebxTbDKB49YUCpAg==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} @@ -5984,6 +6441,26 @@ packages: '@typescript-eslint/visitor-keys': 5.49.0 dev: true + /@typescript-eslint/type-utils/5.49.0_glr7kvvu63i7xo5xtsf5x2uhzq: + resolution: {integrity: sha512-eUgLTYq0tR0FGU5g1YHm4rt5H/+V2IPVkP0cBmbhRyEmyGe4XvJ2YJ6sYTmONfjmdMqyMLad7SB8GvblbeESZA==} + engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} + peerDependencies: + eslint: '*' + typescript: '*' + peerDependenciesMeta: + typescript: + optional: true + dependencies: + '@typescript-eslint/typescript-estree': 5.49.0_typescript@4.6.4 + '@typescript-eslint/utils': 5.49.0_glr7kvvu63i7xo5xtsf5x2uhzq + debug: 4.3.4 + eslint: 8.33.0 + tsutils: 3.21.0_typescript@4.6.4 + typescript: 4.6.4 + transitivePeerDependencies: + - supports-color + dev: true + /@typescript-eslint/type-utils/5.49.0_o2s6jvgtr2hafiobaqfgu6k2l4: resolution: {integrity: sha512-eUgLTYq0tR0FGU5g1YHm4rt5H/+V2IPVkP0cBmbhRyEmyGe4XvJ2YJ6sYTmONfjmdMqyMLad7SB8GvblbeESZA==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} @@ -6004,6 +6481,26 @@ packages: - supports-color dev: true + /@typescript-eslint/type-utils/5.49.0_ymn73yqtyin7iqj6whnaesgwei: + resolution: {integrity: sha512-eUgLTYq0tR0FGU5g1YHm4rt5H/+V2IPVkP0cBmbhRyEmyGe4XvJ2YJ6sYTmONfjmdMqyMLad7SB8GvblbeESZA==} + engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} + peerDependencies: + eslint: '*' + typescript: '*' + peerDependenciesMeta: + typescript: + optional: true + dependencies: + '@typescript-eslint/typescript-estree': 5.49.0_typescript@3.8.3 + '@typescript-eslint/utils': 5.49.0_ymn73yqtyin7iqj6whnaesgwei + debug: 4.3.4 + eslint: 8.33.0 + tsutils: 3.21.0_typescript@3.8.3 + typescript: 3.8.3 + transitivePeerDependencies: + - supports-color + dev: true + /@typescript-eslint/types/5.27.1: resolution: {integrity: sha512-LgogNVkBhCTZU/m8XgEYIWICD6m4dmEDbKXESCbqOXfKZxRKeqpiJXQIErv66sdopRKZPo5l32ymNqibYEH/xg==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} @@ -6014,7 +6511,7 @@ packages: engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} dev: true - /@typescript-eslint/typescript-estree/5.27.1_typescript@4.8.4: + /@typescript-eslint/typescript-estree/5.27.1_typescript@4.6.4: resolution: {integrity: sha512-DnZvvq3TAJ5ke+hk0LklvxwYsnXpRdqUY5gaVS0D4raKtbznPz71UJGnPTHEFo0GDxqLOLdMkkmVZjSpET1hFw==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} peerDependencies: @@ -6029,8 +6526,50 @@ packages: globby: 11.1.0 is-glob: 4.0.3 semver: 7.3.8 - tsutils: 3.21.0_typescript@4.8.4 - typescript: 4.8.4 + tsutils: 3.21.0_typescript@4.6.4 + typescript: 4.6.4 + transitivePeerDependencies: + - supports-color + dev: true + + /@typescript-eslint/typescript-estree/5.49.0_typescript@3.8.3: + resolution: {integrity: sha512-PBdx+V7deZT/3GjNYPVQv1Nc0U46dAHbIuOG8AZ3on3vuEKiPDwFE/lG1snN2eUB9IhF7EyF7K1hmTcLztNIsA==} + engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} + peerDependencies: + typescript: '*' + peerDependenciesMeta: + typescript: + optional: true + dependencies: + '@typescript-eslint/types': 5.49.0 + '@typescript-eslint/visitor-keys': 5.49.0 + debug: 4.3.4 + globby: 11.1.0 + is-glob: 4.0.3 + semver: 7.3.8 + tsutils: 3.21.0_typescript@3.8.3 + typescript: 3.8.3 + transitivePeerDependencies: + - supports-color + dev: true + + /@typescript-eslint/typescript-estree/5.49.0_typescript@4.6.4: + resolution: {integrity: sha512-PBdx+V7deZT/3GjNYPVQv1Nc0U46dAHbIuOG8AZ3on3vuEKiPDwFE/lG1snN2eUB9IhF7EyF7K1hmTcLztNIsA==} + engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} + peerDependencies: + typescript: '*' + peerDependenciesMeta: + typescript: + optional: true + dependencies: + '@typescript-eslint/types': 5.49.0 + '@typescript-eslint/visitor-keys': 5.49.0 + debug: 4.3.4 + globby: 11.1.0 + is-glob: 4.0.3 + semver: 7.3.8 + tsutils: 3.21.0_typescript@4.6.4 + typescript: 4.6.4 transitivePeerDependencies: - supports-color dev: true @@ -6056,7 +6595,7 @@ packages: - supports-color dev: true - /@typescript-eslint/utils/5.27.1_o2s6jvgtr2hafiobaqfgu6k2l4: + /@typescript-eslint/utils/5.27.1_glr7kvvu63i7xo5xtsf5x2uhzq: resolution: {integrity: sha512-mZ9WEn1ZLDaVrhRaYgzbkXBkTPghPFsup8zDbbsYTxC5OmqrFE7skkKS/sraVsLP3TcT3Ki5CSyEFBRkLH/H/w==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} peerDependencies: @@ -6065,7 +6604,7 @@ packages: '@types/json-schema': 7.0.11 '@typescript-eslint/scope-manager': 5.27.1 '@typescript-eslint/types': 5.27.1 - '@typescript-eslint/typescript-estree': 5.27.1_typescript@4.8.4 + '@typescript-eslint/typescript-estree': 5.27.1_typescript@4.6.4 eslint: 8.33.0 eslint-scope: 5.1.1 eslint-utils: 3.0.0_eslint@8.33.0 @@ -6074,6 +6613,26 @@ packages: - typescript dev: true + /@typescript-eslint/utils/5.49.0_glr7kvvu63i7xo5xtsf5x2uhzq: + resolution: {integrity: sha512-cPJue/4Si25FViIb74sHCLtM4nTSBXtLx1d3/QT6mirQ/c65bV8arBEebBJJizfq8W2YyMoPI/WWPFWitmNqnQ==} + engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} + peerDependencies: + eslint: ^6.0.0 || ^7.0.0 || ^8.0.0 + dependencies: + '@types/json-schema': 7.0.11 + '@types/semver': 7.3.13 + '@typescript-eslint/scope-manager': 5.49.0 + '@typescript-eslint/types': 5.49.0 + '@typescript-eslint/typescript-estree': 5.49.0_typescript@4.6.4 + eslint: 8.33.0 + eslint-scope: 5.1.1 + eslint-utils: 3.0.0_eslint@8.33.0 + semver: 7.3.8 + transitivePeerDependencies: + - supports-color + - typescript + dev: true + /@typescript-eslint/utils/5.49.0_o2s6jvgtr2hafiobaqfgu6k2l4: resolution: {integrity: sha512-cPJue/4Si25FViIb74sHCLtM4nTSBXtLx1d3/QT6mirQ/c65bV8arBEebBJJizfq8W2YyMoPI/WWPFWitmNqnQ==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} @@ -6094,6 +6653,26 @@ packages: - typescript dev: true + /@typescript-eslint/utils/5.49.0_ymn73yqtyin7iqj6whnaesgwei: + resolution: {integrity: sha512-cPJue/4Si25FViIb74sHCLtM4nTSBXtLx1d3/QT6mirQ/c65bV8arBEebBJJizfq8W2YyMoPI/WWPFWitmNqnQ==} + engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} + peerDependencies: + eslint: ^6.0.0 || ^7.0.0 || ^8.0.0 + dependencies: + '@types/json-schema': 7.0.11 + '@types/semver': 7.3.13 + '@typescript-eslint/scope-manager': 5.49.0 + '@typescript-eslint/types': 5.49.0 + '@typescript-eslint/typescript-estree': 5.49.0_typescript@3.8.3 + eslint: 8.33.0 + eslint-scope: 5.1.1 + eslint-utils: 3.0.0_eslint@8.33.0 + semver: 7.3.8 + transitivePeerDependencies: + - supports-color + - typescript + dev: true + /@typescript-eslint/visitor-keys/5.27.1: resolution: {integrity: sha512-xYs6ffo01nhdJgPieyk7HAOpjhTsx7r/oB9LWEhwAXgwn33tkr+W8DI2ChboqhZlC4q3TC6geDYPoiX8ROqyOQ==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} @@ -6538,6 +7117,10 @@ packages: engines: {node: '>=0.10.0'} dev: true + /any-promise/1.3.0: + resolution: {integrity: sha512-7UvmKalWRt1wgjL1RrGxoSJW/0QZFIegpeGvZG9kjp8vrRu55XTHbwnqq2GpXm9uLbcuhxm3IqX9OB4MZR1b2A==} + dev: true + /anymatch/3.1.3: resolution: {integrity: sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==} engines: {node: '>= 8'} @@ -7284,6 +7867,16 @@ packages: resolution: {integrity: sha512-uYBjakWipfaO/bXI7E8rq6kpwHRZK5cNYrUv2OzZSI/FvmdMyXJ2tG9dKcjEC5YHmHpUAwsargWIZNWdxb/bnQ==} dev: true + /bundle-require/4.0.1_esbuild@0.17.12: + resolution: {integrity: sha512-9NQkRHlNdNpDBGmLpngF3EFDcwodhMUuLz9PaWYciVcQF9SE4LFjM2DB/xV1Li5JiuDMv7ZUWuC3rGbqR0MAXQ==} + engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0} + peerDependencies: + esbuild: '>=0.17' + dependencies: + esbuild: 0.17.12 + load-tsconfig: 0.2.5 + dev: true + /bytes/3.0.0: resolution: {integrity: sha512-pMhOfFDPiv9t5jjIXkHosWmkSyQbvsgEVNkz0ERHbuLh2T/7j4Mqqpz523Fe8MVY89KC6Sh/QfS2sM+SjgFDcw==} engines: {node: '>= 0.8'} @@ -7293,6 +7886,11 @@ packages: resolution: {integrity: sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==} engines: {node: '>= 0.8'} + /cac/6.7.14: + resolution: {integrity: sha512-b6Ilus+c3RrdDk+JhLKUAQfzzgLEPy6wcXqS7f/xe1EETvsDP6GORG7SFuOs6cID5YkqchW/LXZbX5bc8j7ZcQ==} + engines: {node: '>=8'} + dev: true + /cacache/15.3.0: resolution: {integrity: sha512-VVdYzXEn+cnbXpFgWs5hTT7OScegHVmLhJIR8Ufqk3iFD6A6j5iSX1KuBTfNEv4tdJWE2PzA6IVFtcLC7fN9wQ==} engines: {node: '>= 10'} @@ -7725,7 +8323,6 @@ packages: string-width: 4.2.3 strip-ansi: 6.0.1 wrap-ansi: 7.0.0 - dev: true /cliui/8.0.1: resolution: {integrity: sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==} @@ -7831,6 +8428,11 @@ packages: resolution: {integrity: sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==} dev: true + /commander/4.1.1: + resolution: {integrity: sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA==} + engines: {node: '>= 6'} + dev: true + /commander/5.1.0: resolution: {integrity: sha512-P0CysNDQ7rtVw4QIQtm+MRxV66vKFSvlsQvGYXZWR3qFU0jlMKHZZZgw8e+8DSah4UDKMqnknRDQz+xuQXQ/Zg==} engines: {node: '>= 6'} @@ -8743,10 +9345,9 @@ packages: /deep-is/0.1.4: resolution: {integrity: sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==} - /deepmerge/4.3.0: - resolution: {integrity: sha512-z2wJZXrmeHdvYJp/Ux55wIjqo81G5Bp4c+oELTW+7ar6SogWHajt5a9gO3s3IDaGSAXjDk0vlQKN3rms8ab3og==} + /deepmerge/4.3.1: + resolution: {integrity: sha512-3sUqbMEc77XqpdNO7FRyRog+eW3ph+GYCbj+rK+uYyRMuwsVy0rMiVtPn+QJlKFvWP/1PYpapqYn0Me2knFn+A==} engines: {node: '>=0.10.0'} - dev: false /default-gateway/6.0.3: resolution: {integrity: sha512-fwSOJsbbNzZ/CUFpqFBqYfYNLj1NbMPm8MMCIzHjC83iSJRBEGmDUxU+WP661BaBQImeC2yHwXtz+P/O9o+XEg==} @@ -9589,6 +10190,36 @@ packages: dev: true optional: true + /esbuild/0.17.12: + resolution: {integrity: sha512-bX/zHl7Gn2CpQwcMtRogTTBf9l1nl+H6R8nUbjk+RuKqAE3+8FDulLA+pHvX7aA7Xe07Iwa+CWvy9I8Y2qqPKQ==} + engines: {node: '>=12'} + hasBin: true + requiresBuild: true + optionalDependencies: + '@esbuild/android-arm': 0.17.12 + '@esbuild/android-arm64': 0.17.12 + '@esbuild/android-x64': 0.17.12 + '@esbuild/darwin-arm64': 0.17.12 + '@esbuild/darwin-x64': 0.17.12 + '@esbuild/freebsd-arm64': 0.17.12 + '@esbuild/freebsd-x64': 0.17.12 + '@esbuild/linux-arm': 0.17.12 + '@esbuild/linux-arm64': 0.17.12 + '@esbuild/linux-ia32': 0.17.12 + '@esbuild/linux-loong64': 0.17.12 + '@esbuild/linux-mips64el': 0.17.12 + '@esbuild/linux-ppc64': 0.17.12 + '@esbuild/linux-riscv64': 0.17.12 + '@esbuild/linux-s390x': 0.17.12 + '@esbuild/linux-x64': 0.17.12 + '@esbuild/netbsd-x64': 0.17.12 + '@esbuild/openbsd-x64': 0.17.12 + '@esbuild/sunos-x64': 0.17.12 + '@esbuild/win32-arm64': 0.17.12 + '@esbuild/win32-ia32': 0.17.12 + '@esbuild/win32-x64': 0.17.12 + dev: true + /escalade/3.1.1: resolution: {integrity: sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==} engines: {node: '>=6'} @@ -9662,7 +10293,7 @@ packages: - supports-color dev: true - /eslint-plugin-prettier/4.2.1_jqplj6qf3uqpxpu4gdyhwwasnq: + /eslint-plugin-prettier/4.2.1_2blprs6rvzrjlgi3xqpegp3hoe: resolution: {integrity: sha512-f/0rXLXUt0oFYs8ra4w49wYZBG5GKZpAYsJSm6rnYL5uVDjd+zowwMwVZHnAjf4edNrKpCDYfXDgmRE/Ak7QyQ==} engines: {node: '>=12.0.0'} peerDependencies: @@ -9675,7 +10306,7 @@ packages: dependencies: eslint: 8.33.0 eslint-config-prettier: 8.6.0_eslint@8.33.0 - prettier: 2.8.3 + prettier: 2.8.6 prettier-linter-helpers: 1.0.0 dev: true @@ -10302,6 +10933,13 @@ packages: signal-exit: 3.0.7 dev: true + /foreground-child/3.1.1: + resolution: {integrity: sha512-TMKDUnIte6bfb5nWv7V/caI169OHgvwjb7V4WkeUvbQQdjr5rWKqHFiKWb/fcOwB+CzBT+qbWjvj+DVwRskpIg==} + engines: {node: '>=14'} + dependencies: + cross-spawn: 7.0.3 + signal-exit: 4.0.1 + /forever-agent/0.6.1: resolution: {integrity: sha512-j0KLYPhm6zeac4lz3oJ3o65qvgQCcPubiyotZrXqEaG4hNagNYO8qdlUrX5vwqv9ohqeT/Z3j6+yW067yWWdUw==} dev: true @@ -10659,6 +11297,18 @@ packages: resolution: {integrity: sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==} dev: true + /glob/10.2.1: + resolution: {integrity: sha512-ngom3wq2UhjdbmRE/krgkD8BQyi1KZ5l+D2dVm4+Yj+jJIBp74/ZGunL6gNGc/CYuQmvUBiavWEXIotRiv5R6A==} + engines: {node: '>=16 || 14 >=14.17'} + hasBin: true + dependencies: + foreground-child: 3.1.1 + fs.realpath: 1.0.0 + jackspeak: 2.0.3 + minimatch: 9.0.0 + minipass: 5.0.0 + path-scurry: 1.7.0 + /glob/7.1.4: resolution: {integrity: sha512-hkLPepehmnKk41pUGm3sYxoFs/umurYfYJCerbXEyFIWcAzvpipAgVkBqqT9RBKMGjnq6kMuyYwha6csxbiM1A==} dependencies: @@ -10670,6 +11320,17 @@ packages: path-is-absolute: 1.0.1 dev: true + /glob/7.1.6: + resolution: {integrity: sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==} + dependencies: + fs.realpath: 1.0.0 + inflight: 1.0.6 + inherits: 2.0.4 + minimatch: 3.1.2 + once: 1.4.0 + path-is-absolute: 1.0.1 + dev: true + /glob/7.2.0: resolution: {integrity: sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q==} dependencies: @@ -11927,6 +12588,14 @@ packages: istanbul-lib-report: 3.0.0 dev: true + /jackspeak/2.0.3: + resolution: {integrity: sha512-0Jud3OMUdMbrlr3PyUMKESq51LXVAB+a239Ywdvd+Kgxj3MaBRml/nVRxf8tQFyfthMjuRkxkv7Vg58pmIMfuQ==} + engines: {node: '>=14'} + dependencies: + cliui: 7.0.4 + optionalDependencies: + '@pkgjs/parseargs': 0.11.0 + /jake/10.8.5: resolution: {integrity: sha512-sVpxYeuAhWt0OTWITwT98oyV0GsXyMlXCF+3L1SuafBVUIr/uILGRB+NqwkzhgXKvoJpDIpQvqkUALgdmQsQxw==} engines: {node: '>=10'} @@ -11990,6 +12659,11 @@ packages: '@sideway/pinpoint': 2.0.0 dev: false + /joycon/3.1.1: + resolution: {integrity: sha512-34wB/Y7MW7bzjKRjUKTa46I2Z7eV62Rkhva+KkopW7Qvv/OSWBqvkSY7vusOPrNuZcUG3tApvdVgNB8POj3SPw==} + engines: {node: '>=10'} + dev: true + /js-levenshtein/1.1.6: resolution: {integrity: sha512-X2BB11YZtrRqY4EnQcLX5Rh373zbK4alC1FW7D7MBhL2gtcC17cTnr6DmfHZeS0s2rTHjUTMMHfG7gO8SSdw+g==} engines: {node: '>=0.10.0'} @@ -12417,6 +13091,11 @@ packages: immediate: 3.0.6 dev: true + /lilconfig/2.1.0: + resolution: {integrity: sha512-utWOt/GHzuUxnLKxB6dk81RoOeoNeHgbrXiuGk4yyF5qlRz+iIVWu56E2fqGHFrXz0QNUhLB/8nKqvRH66JKGQ==} + engines: {node: '>=10'} + dev: true + /lines-and-columns/1.2.4: resolution: {integrity: sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==} dev: true @@ -12456,6 +13135,11 @@ packages: strip-bom: 3.0.0 dev: true + /load-tsconfig/0.2.5: + resolution: {integrity: sha512-IXO6OCs9yg8tMKzfPZ1YmheJbZCiEsnBdcB03l0OcfK9prKnJb96siuHCr5Fl37/yo9DnKU+TLpxzTUspw9shg==} + engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0} + dev: true + /load-yaml-file/0.2.0: resolution: {integrity: sha512-OfCBkGEw4nN6JLtgRidPX6QxjBQGQf72q3si2uvqyFEMbycSFFHwAZeXx6cJgFM9wmLrf9zBwCP3Ivqa+LLZPw==} engines: {node: '>=6'} @@ -12597,6 +13281,10 @@ packages: resolution: {integrity: sha512-L4/arjjuq4noiUJpt3yS6KIKDtJwNe2fIYgMqyYYKoeIfV1iEqvPwhCx23o+R9dzouGihDAPN1dTIRWa7zk8tw==} dev: true + /lodash.sortby/4.7.0: + resolution: {integrity: sha512-HDWXG8isMntAyRF5vZ7xKuEvOhT4AhlRt/3czTSjvGUxjYCBVRQY48ViDHyfYz9VIoBkW4TMGQNapx+l3RUwdA==} + dev: true + /lodash.startcase/4.4.0: resolution: {integrity: sha512-+WKqsK294HMSc2jEbNgpHpd0JfIBhp7rEV4aqXWqFr6AlXov+SlcgB1Fv01y2kGe3Gc8nMW7VA0SrGuSkRfIEg==} dev: true @@ -12700,6 +13388,10 @@ packages: resolution: {integrity: sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA==} engines: {node: '>=12'} + /lru-cache/9.1.0: + resolution: {integrity: sha512-qFXQEwchrZcMVen2uIDceR8Tii6kCJak5rzDStfEM0qA3YLMswaxIEZO0DhIbJ3aqaJiDjt+3crlplOb0tDtKQ==} + engines: {node: 14 || >=16.14} + /lunr/2.3.9: resolution: {integrity: sha512-zTU3DaZaF3Rt9rhN3uBMGQD3dD2/vFQqnvZCDv4dl5iOzq2IZQqTxu90r4E5J+nP70J3ilqVCrbho2eWaeW8Ow==} @@ -13026,6 +13718,12 @@ packages: brace-expansion: 2.0.1 dev: true + /minimatch/9.0.0: + resolution: {integrity: sha512-0jJj8AvgKqWN05mrwuqi8QYKx1WmYSUoKSxu5Qhs9prezTz10sxAHGNZe9J9cqIJzta8DWsleh2KaVaLl6Ru2w==} + engines: {node: '>=16 || 14 >=14.17'} + dependencies: + brace-expansion: 2.0.1 + /minimist-options/4.1.0: resolution: {integrity: sha512-Q4r8ghd80yhO/0j1O3B2BjweX3fiHg9cdOwjJd2J76Q135c+NDxGCqdYKQ1SKBuFfgWbAUzBfvYjPUEeNgqN1A==} engines: {node: '>= 6'} @@ -13104,6 +13802,10 @@ packages: resolution: {integrity: sha512-+yQl7SX3bIT83Lhb4BVorMAHVuqsskxRdlmO9kTpyukp8vsm2Sn/fUOV9xlnG8/a5JsypJzap21lz/y3FBMJ8Q==} engines: {node: '>=8'} + /minipass/5.0.0: + resolution: {integrity: sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ==} + engines: {node: '>=8'} + /minizlib/2.1.2: resolution: {integrity: sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==} engines: {node: '>= 8'} @@ -13280,6 +13982,14 @@ packages: resolution: {integrity: sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==} dev: true + /mz/2.7.0: + resolution: {integrity: sha512-z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q==} + dependencies: + any-promise: 1.3.0 + object-assign: 4.1.1 + thenify-all: 1.6.0 + dev: true + /nan/2.17.0: resolution: {integrity: sha512-2ZTgtl0nJsO0KQCjEpxcIr5D+Yv90plTitZt9JBfQvVJDS5seMl3FOvsh3+9CoYWXf/1l5OaZzzF6nDm4cagaQ==} dev: false @@ -14261,6 +14971,20 @@ packages: semver: 6.3.0 dev: true + /package-sync-cli/1.3.2: + resolution: {integrity: sha512-z5bi8UaCk7xIEQGovxkZrNHAiPVOzi4B7+uLRudAHp64zGjhG1WR+6l8vPIdSvngled6dWVhjA+GQdSW1kaeXw==} + engines: {node: '>=14.0.0'} + hasBin: true + dependencies: + chalk: 4.1.2 + cli-table3: 0.6.3 + js-yaml: 4.1.0 + micromatch: 4.0.5 + semver: 7.3.8 + string-similarity: 4.0.4 + yargs: 17.7.1 + dev: true + /pacote/12.0.3: resolution: {integrity: sha512-CdYEl03JDrRO3x18uHjBYA9TyoW8gy+ThVcypcDkxPtKlw76e4ejhYB6i9lJ+/cebbjpqPW/CijjqxwDTts8Ow==} engines: {node: ^12.13.0 || ^14.15.0 || >=16} @@ -14423,6 +15147,13 @@ packages: minipass: 4.2.5 dev: true + /path-scurry/1.7.0: + resolution: {integrity: sha512-UkZUeDjczjYRE495+9thsgcVgsaCPkaw80slmfVFgllxY+IO8ubTsOpFVjDPROBqJdHfVPUFRHPBV/WciOVfWg==} + engines: {node: '>=16 || 14 >=14.17'} + dependencies: + lru-cache: 9.1.0 + minipass: 5.0.0 + /path-to-regexp/0.1.7: resolution: {integrity: sha512-5DFkuoqlv1uYQKxy8omFBeJPQcdoE07Kv2sferDCrAq1ohOU+MSDswDIbnx3YAM60qIOnYa53wBhXW0EbMonrQ==} @@ -14532,6 +15263,11 @@ packages: engines: {node: '>=0.10.0'} dev: true + /pirates/4.0.5: + resolution: {integrity: sha512-8V9+HQPupnaXMA23c5hvl69zXvTwTzyAYasnkb0Tts4XvO4CliqONMOnvlq26rkhLC3nWDFBJf73LU1e1VZLaQ==} + engines: {node: '>= 6'} + dev: true + /piscina/3.2.0: resolution: {integrity: sha512-yn/jMdHRw+q2ZJhFhyqsmANcbF6V2QwmD84c6xRau+QpQOmtrBCoRGdvTfeuFDYXB5W2m6MfLkjkvQa9lUSmIA==} dependencies: @@ -14767,6 +15503,39 @@ packages: postcss-value-parser: 4.2.0 dev: true + /postcss-load-config/3.1.4: + resolution: {integrity: sha512-6DiM4E7v4coTE4uzA8U//WhtPwyhiim3eyjEMFCnUpzbrkK9wJHgKDT2mR+HbtSrd/NubVaYTOpSpjUl8NQeRg==} + engines: {node: '>= 10'} + peerDependencies: + postcss: '>=8.0.9' + ts-node: '>=9.0.0' + peerDependenciesMeta: + postcss: + optional: true + ts-node: + optional: true + dependencies: + lilconfig: 2.1.0 + yaml: 1.10.2 + dev: true + + /postcss-load-config/3.1.4_ts-node@10.9.1: + resolution: {integrity: sha512-6DiM4E7v4coTE4uzA8U//WhtPwyhiim3eyjEMFCnUpzbrkK9wJHgKDT2mR+HbtSrd/NubVaYTOpSpjUl8NQeRg==} + engines: {node: '>= 10'} + peerDependencies: + postcss: '>=8.0.9' + ts-node: '>=9.0.0' + peerDependenciesMeta: + postcss: + optional: true + ts-node: + optional: true + dependencies: + lilconfig: 2.1.0 + ts-node: 10.9.1_x7wmykdye3n75c4332b67wrzwm + yaml: 1.10.2 + dev: true + /postcss-loader/6.2.1_2dg6tyfnzs734jht5i7ukf2nxy: resolution: {integrity: sha512-WbbYpmAaKcux/P66bZ40bpWsBucjx/TTgVVzRZ9yUO8yQfVBlameJ0ZGVaPfH64hNSBh63a+ICP5nqOpBA0w+Q==} engines: {node: '>= 12.13.0'} @@ -15019,8 +15788,8 @@ packages: fast-diff: 1.2.0 dev: true - /prettier/2.8.3: - resolution: {integrity: sha512-tJ/oJ4amDihPoufT5sM0Z1SKEuKay8LfVAMlbbhnnkvt6BUserZylqo2PN+p9KeljLr0OHa2rXHU1T8reeoTrw==} + /prettier/2.8.6: + resolution: {integrity: sha512-mtuzdiBbHwPEgl7NxWlqOkithPyp4VN93V7VeHVWBF+ad3I5avc0RVDT4oImXQy9H/AqxA2NSQH8pSxHW6FYbQ==} engines: {node: '>=10.13.0'} hasBin: true dev: true @@ -15881,6 +16650,14 @@ packages: glob: 9.3.0 dev: true + /rimraf/5.0.0: + resolution: {integrity: sha512-Jf9llaP+RvaEVS5nPShYFhtXIrb3LRKP281ib3So0KkeZKo2wIKyq0Re7TOSwanasA423PSr6CCIL4bP6T040g==} + engines: {node: '>=14'} + hasBin: true + dependencies: + glob: 10.2.1 + dev: true + /ripemd160/2.0.2: resolution: {integrity: sha512-ii4iagi25WusVoiC4B4lq7pbXfAp3D9v5CwfkY33vffw2+pkDjY1D8GaN7spsxvCSx8dkPqOZCEZyfxcmJG2IA==} dependencies: @@ -15888,6 +16665,14 @@ packages: inherits: 2.0.4 dev: true + /rollup/3.20.0: + resolution: {integrity: sha512-YsIfrk80NqUDrxrjWPXUa7PWvAfegZEXHuPsEZg58fGCdjL1I9C1i/NaG+L+27kxxwkrG/QEDEQc8s/ynXWWGQ==} + engines: {node: '>=14.18.0', npm: '>=8.0.0'} + hasBin: true + optionalDependencies: + fsevents: 2.3.2 + dev: true + /rsvp/3.6.2: resolution: {integrity: sha512-OfWGQTb9vnwRjwtA2QwpG2ICclHC3pgXZO5xt8H2EfgDquO0qVdSb5T88L4qJVAEugbS56pAuV4XZM58UX8ulw==} engines: {node: 0.12.* || 4.* || 6.* || >= 7.*} @@ -16310,6 +17095,10 @@ packages: /signal-exit/3.0.7: resolution: {integrity: sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==} + /signal-exit/4.0.1: + resolution: {integrity: sha512-uUWsN4aOxJAS8KOuf3QMyFtgm1pkb6I+KRZbRF/ghdf5T7sM+B1lLLzPDxswUjkmHyxQAVzEgG35E3NzDM9GVw==} + engines: {node: '>=14'} + /simple-concat/1.0.1: resolution: {integrity: sha512-cSFtAPtRhljv69IK0hTVZQ+OfE9nePi/rtJmw5UjHeVyVroEqJXP1sFztKUy1qU+xvz3u/sfYJLa947b7nAN2Q==} dev: true @@ -16561,6 +17350,13 @@ packages: engines: {node: '>= 8'} dev: true + /source-map/0.8.0-beta.0: + resolution: {integrity: sha512-2ymg6oRBpebeZi9UUNsgQ89bhx01TcTkmNTGnNO88imTmbSgy4nfujrgVEFKWpMTEGA11EDkTt7mqObTPdigIA==} + engines: {node: '>= 8'} + dependencies: + whatwg-url: 7.1.0 + dev: true + /sourcemap-codec/1.4.8: resolution: {integrity: sha512-9NykojV5Uih4lgo5So5dtw+f0JgJX30KCNI8gwhz2J9A15wD0Ml6tjHKwf6fTSa6fAdVBdZeNOs9eJ71qCk8vA==} deprecated: Please use @jridgewell/sourcemap-codec instead @@ -16819,6 +17615,10 @@ packages: - supports-color dev: true + /string-similarity/4.0.4: + resolution: {integrity: sha512-/q/8Q4Bl4ZKAPjj8WerIBJWALKkaPRfrvhfF8k/B23i4nzrlRj2/go1m90In7nG/3XDSbOo0+pu6RvCTM9RGMQ==} + dev: true + /string-width/2.1.1: resolution: {integrity: sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==} engines: {node: '>=4'} @@ -16955,7 +17755,7 @@ packages: peerDependencies: webpack: ^5.0.0 dependencies: - webpack: 5.76.1 + webpack: 5.76.1_esbuild@0.17.12 dev: true /styled-components/5.3.9_d5kzqcx725xkmyluugjzy5jwom: @@ -17009,6 +17809,19 @@ packages: - supports-color dev: true + /sucrase/3.30.0: + resolution: {integrity: sha512-7d37d3vLF0IeH2dzvHpzDNDxUqpbDHJXTJOAnQ8jvMW04o2Czps6mxtaSnKWpE+hUS/eczqfWPUgQTrazKZPnQ==} + engines: {node: '>=8'} + hasBin: true + dependencies: + commander: 4.1.1 + glob: 7.1.6 + lines-and-columns: 1.2.4 + mz: 2.7.0 + pirates: 4.0.5 + ts-interface-checker: 0.1.13 + dev: true + /suncalc/1.9.0: resolution: {integrity: sha512-vMJ8Byp1uIPoj+wb9c1AdK4jpkSKVAywgHX0lqY7zt6+EWRRC3Z+0Ucfjy/0yxTVO1hwwchZe4uoFNqrIC24+A==} dev: false @@ -17262,6 +18075,31 @@ packages: engines: {node: '>=8'} dev: true + /terser-webpack-plugin/5.3.7_i3h5l3fvm2ovo2ze4lk4svvvka: + resolution: {integrity: sha512-AfKwIktyP7Cu50xNjXF/6Qb5lBNzYaWpU6YfoX3uZicTx0zTy0stDDCsvjDapKsSDvOeWo5MEq4TmdBy2cNoHw==} + engines: {node: '>= 10.13.0'} + peerDependencies: + '@swc/core': '*' + esbuild: '*' + uglify-js: '*' + webpack: ^5.1.0 + peerDependenciesMeta: + '@swc/core': + optional: true + esbuild: + optional: true + uglify-js: + optional: true + dependencies: + '@jridgewell/trace-mapping': 0.3.17 + esbuild: 0.17.12 + jest-worker: 27.5.1 + schema-utils: 3.1.1 + serialize-javascript: 6.0.1 + terser: 5.16.6 + webpack: 5.76.1_esbuild@0.17.12 + dev: true + /terser-webpack-plugin/5.3.7_webpack@5.70.0: resolution: {integrity: sha512-AfKwIktyP7Cu50xNjXF/6Qb5lBNzYaWpU6YfoX3uZicTx0zTy0stDDCsvjDapKsSDvOeWo5MEq4TmdBy2cNoHw==} engines: {node: '>= 10.13.0'} @@ -17286,30 +18124,6 @@ packages: webpack: 5.70.0 dev: true - /terser-webpack-plugin/5.3.7_webpack@5.76.1: - resolution: {integrity: sha512-AfKwIktyP7Cu50xNjXF/6Qb5lBNzYaWpU6YfoX3uZicTx0zTy0stDDCsvjDapKsSDvOeWo5MEq4TmdBy2cNoHw==} - engines: {node: '>= 10.13.0'} - peerDependencies: - '@swc/core': '*' - esbuild: '*' - uglify-js: '*' - webpack: ^5.1.0 - peerDependenciesMeta: - '@swc/core': - optional: true - esbuild: - optional: true - uglify-js: - optional: true - dependencies: - '@jridgewell/trace-mapping': 0.3.17 - jest-worker: 27.5.1 - schema-utils: 3.1.1 - serialize-javascript: 6.0.1 - terser: 5.16.6 - webpack: 5.76.1 - dev: true - /terser/5.14.2: resolution: {integrity: sha512-oL0rGeM/WFQCUd0y2QrWxYnq7tfSuKBiqTjRPWrRgB46WD/kiwHwF8T23z78H6Q6kGCuuHcPB+KULHRdxvVGQA==} engines: {node: '>=10'} @@ -17349,6 +18163,19 @@ packages: /text-table/0.2.0: resolution: {integrity: sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==} + /thenify-all/1.6.0: + resolution: {integrity: sha512-RNxQH/qI8/t3thXJDwcstUO4zeqo64+Uy/+sNVRBx4Xn2OX+OZ9oP+iJnNFqplFra2ZUVeKCSa2oVWi3T4uVmA==} + engines: {node: '>=0.8'} + dependencies: + thenify: 3.3.1 + dev: true + + /thenify/3.3.1: + resolution: {integrity: sha512-RVZSIV5IG10Hk3enotrhvz0T9em6cyHBLkH/YAZuKqd8hRkKhSfCGIcP2KUY0EPxndzANBmNllzWPwak+bheSw==} + dependencies: + any-promise: 1.3.0 + dev: true + /throttleit/1.0.0: resolution: {integrity: sha512-rkTVqu6IjfQ/6+uNuuc3sZek4CEYxTJom3IktzgdSxcZqdARuebbA/f4QmAxMQIxqq9ZLEUkSYqvuk1I6VKq4g==} dev: true @@ -17455,6 +18282,12 @@ packages: resolution: {integrity: sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==} dev: true + /tr46/1.0.1: + resolution: {integrity: sha512-dTpowEjclQ7Kgx5SdBkqRzVhERQXov8/l9Ft9dVM9fmg0W0KQSVaXX9T4i6twCPNtYiZM53lpSSUAwJbFPOHxA==} + dependencies: + punycode: 2.3.0 + dev: true + /traverse/0.6.7: resolution: {integrity: sha512-/y956gpUo9ZNCb99YjxG7OaslxZWHfCHAUUfshwqOXmxUIvqLjVO581BT+gM59+QV9tFe6/CGG53tsA1Y7RSdg==} @@ -17473,6 +18306,10 @@ packages: engines: {node: '>=8'} dev: true + /ts-interface-checker/0.1.13: + resolution: {integrity: sha512-Y/arvbn+rrz3JCKl9C4kVNfTfSm2/mEp5FSz5EsZSANGPSlQrpRI5M4PKF+mJnE52jOO90PnPSc3Ur3bTQw0gA==} + dev: true + /ts-json-schema-generator/1.2.0: resolution: {integrity: sha512-tUMeO3ZvA12d3HHh7T/AK8W5hmUhDRNtqWRHSMN3ZRbUFt+UmV0oX8k1RK4SA+a+BKNHpmW2v06MS49e8Fi3Yg==} engines: {node: '>=10.0.0'} @@ -17494,6 +18331,37 @@ packages: code-block-writer: 11.0.3 dev: true + /ts-node/10.9.1_ev3x2t2gv55at43ghevgmyytwy: + resolution: {integrity: sha512-NtVysVPkxxrwFGUUxGYhfux8k78pQB3JqYBXlLRZgdGUqTO5wU/UyHop5p70iEbGhB7q5KmiZiU0Y3KlJrScEw==} + hasBin: true + peerDependencies: + '@swc/core': '>=1.2.50' + '@swc/wasm': '>=1.2.50' + '@types/node': '*' + typescript: '>=2.7' + peerDependenciesMeta: + '@swc/core': + optional: true + '@swc/wasm': + optional: true + dependencies: + '@cspotcode/source-map-support': 0.8.1 + '@tsconfig/node10': 1.0.9 + '@tsconfig/node12': 1.0.11 + '@tsconfig/node14': 1.0.3 + '@tsconfig/node16': 1.0.3 + '@types/node': 18.15.3 + acorn: 8.8.2 + acorn-walk: 8.2.0 + arg: 4.1.3 + create-require: 1.1.1 + diff: 4.0.2 + make-error: 1.3.6 + typescript: 4.6.4 + v8-compile-cache-lib: 3.0.1 + yn: 3.1.1 + dev: true + /ts-node/10.9.1_v4vfm2zcz4t2yckcvpdr2ktuie: resolution: {integrity: sha512-NtVysVPkxxrwFGUUxGYhfux8k78pQB3JqYBXlLRZgdGUqTO5wU/UyHop5p70iEbGhB7q5KmiZiU0Y3KlJrScEw==} hasBin: true @@ -17614,6 +18482,78 @@ packages: typescript: 3.8.3 dev: true + /tsup/6.7.0_mwhvu7sfp6vq5ryuwb6hlbjfka: + resolution: {integrity: sha512-L3o8hGkaHnu5TdJns+mCqFsDBo83bJ44rlK7e6VdanIvpea4ArPcU3swWGsLVbXak1PqQx/V+SSmFPujBK+zEQ==} + engines: {node: '>=14.18'} + hasBin: true + peerDependencies: + '@swc/core': ^1 + postcss: ^8.4.12 + typescript: '>=4.1.0' + peerDependenciesMeta: + '@swc/core': + optional: true + postcss: + optional: true + typescript: + optional: true + dependencies: + bundle-require: 4.0.1_esbuild@0.17.12 + cac: 6.7.14 + chokidar: 3.5.3 + debug: 4.3.4 + esbuild: 0.17.12 + execa: 5.1.1 + globby: 11.1.0 + joycon: 3.1.1 + postcss-load-config: 3.1.4_ts-node@10.9.1 + resolve-from: 5.0.0 + rollup: 3.20.0 + source-map: 0.8.0-beta.0 + sucrase: 3.30.0 + tree-kill: 1.2.2 + typescript: 4.8.4 + transitivePeerDependencies: + - supports-color + - ts-node + dev: true + + /tsup/6.7.0_typescript@4.8.4: + resolution: {integrity: sha512-L3o8hGkaHnu5TdJns+mCqFsDBo83bJ44rlK7e6VdanIvpea4ArPcU3swWGsLVbXak1PqQx/V+SSmFPujBK+zEQ==} + engines: {node: '>=14.18'} + hasBin: true + peerDependencies: + '@swc/core': ^1 + postcss: ^8.4.12 + typescript: '>=4.1.0' + peerDependenciesMeta: + '@swc/core': + optional: true + postcss: + optional: true + typescript: + optional: true + dependencies: + bundle-require: 4.0.1_esbuild@0.17.12 + cac: 6.7.14 + chokidar: 3.5.3 + debug: 4.3.4 + esbuild: 0.17.12 + execa: 5.1.1 + globby: 11.1.0 + joycon: 3.1.1 + postcss-load-config: 3.1.4 + resolve-from: 5.0.0 + rollup: 3.20.0 + source-map: 0.8.0-beta.0 + sucrase: 3.30.0 + tree-kill: 1.2.2 + typescript: 4.8.4 + transitivePeerDependencies: + - supports-color + - ts-node + dev: true + /tsutils/2.29.0_typescript@3.8.3: resolution: {integrity: sha512-g5JVHCIJwzfISaXpXE1qvNalca5Jwob6FjI4AoPlqMusJ6ftFE7IkkFoMhVLRgK+4Kx3gkzb8UZK5t5yTTvEmA==} peerDependencies: @@ -17633,6 +18573,16 @@ packages: typescript: 3.8.3 dev: true + /tsutils/3.21.0_typescript@4.6.4: + resolution: {integrity: sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==} + engines: {node: '>= 6'} + peerDependencies: + typescript: '>=2.8.0 || >= 3.2.0-dev || >= 3.3.0-dev || >= 3.4.0-dev || >= 3.5.0-dev || >= 3.6.0-dev || >= 3.6.0-beta || >= 3.7.0-dev || >= 3.7.0-beta' + dependencies: + tslib: 1.14.1 + typescript: 4.6.4 + dev: true + /tsutils/3.21.0_typescript@4.8.4: resolution: {integrity: sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==} engines: {node: '>= 6'} @@ -17841,12 +18791,12 @@ packages: typescript: 3.8.3 dev: false - /typedoc/0.23.26_typescript@4.8.4: - resolution: {integrity: sha512-5m4KwR5tOLnk0OtMaRn9IdbeRM32uPemN9kur7YK9wFqx8U0CYrvO9aVq6ysdZSV1c824BTm+BuQl2Ze/k1HtA==} + /typedoc/0.23.28_typescript@4.8.4: + resolution: {integrity: sha512-9x1+hZWTHEQcGoP7qFmlo4unUoVJLB0H/8vfO/7wqTnZxg4kPuji9y3uRzEu0ZKez63OJAUmiGhUrtukC6Uj3w==} engines: {node: '>= 14.14'} hasBin: true peerDependencies: - typescript: 4.6.x || 4.7.x || 4.8.x || 4.9.x + typescript: 4.6.x || 4.7.x || 4.8.x || 4.9.x || 5.0.x dependencies: lunr: 2.3.9 marked: 4.2.12 @@ -17860,6 +18810,12 @@ packages: engines: {node: '>=4.2.0'} hasBin: true + /typescript/4.6.4: + resolution: {integrity: sha512-9ia/jWHIEbo49HfjrLGfKbZSuWo9iTMwXO+Ca3pRsSpbsMbc7/IU8NKdCZVRRBafVPGnoJeFL76ZOAA84I9fEg==} + engines: {node: '>=4.2.0'} + hasBin: true + dev: true + /typescript/4.8.4: resolution: {integrity: sha512-QCh+85mCy+h0IGff8r5XWzOVSbBO+KfeYrMQh7NJ58QujwcE22u+NUSmUxqF+un70P9GXKxa2HCNiTTMJknyjQ==} engines: {node: '>=4.2.0'} @@ -18209,6 +19165,10 @@ packages: resolution: {integrity: sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==} dev: true + /webidl-conversions/4.0.2: + resolution: {integrity: sha512-YQ+BmxuTgd6UXZW3+ICGfyqRyHXVlD5GtQr5+qjiNW7bF0cqrzX500HVXPBOvgXb5YnzDd+h0zqyv61KUD7+Sg==} + dev: true + /webpack-bundle-analyzer/4.7.0: resolution: {integrity: sha512-j9b8ynpJS4K+zfO5GGwsAcQX4ZHpWV+yRiHDiL+bE0XHJ8NiPYLTNVQdlFYWxtpg9lfAQNlwJg16J9AJtFSXRg==} engines: {node: '>= 10.13.0'} @@ -18358,7 +19318,7 @@ packages: - uglify-js dev: true - /webpack/5.76.1: + /webpack/5.76.1_esbuild@0.17.12: resolution: {integrity: sha512-4+YIK4Abzv8172/SGqObnUjaIHjLEuUasz9EwQj/9xmPPkYJy2Mh03Q/lJfSD3YLzbxy5FeTq5Uw0323Oh6SJQ==} engines: {node: '>=10.13.0'} hasBin: true @@ -18389,7 +19349,7 @@ packages: neo-async: 2.6.2 schema-utils: 3.1.1 tapable: 2.2.1 - terser-webpack-plugin: 5.3.7_webpack@5.76.1 + terser-webpack-plugin: 5.3.7_i3h5l3fvm2ovo2ze4lk4svvvka watchpack: 2.4.0 webpack-sources: 3.2.3 transitivePeerDependencies: @@ -18419,6 +19379,14 @@ packages: webidl-conversions: 3.0.1 dev: true + /whatwg-url/7.1.0: + resolution: {integrity: sha512-WUu7Rg1DroM7oQvGWfOiAK21n74Gg+T4elXEQYkOhtyLeWiJFoOGLXPKI/9gzIie9CtwVLm8wtw6YJdKyxSjeg==} + dependencies: + lodash.sortby: 4.7.0 + tr46: 1.0.1 + webidl-conversions: 4.0.2 + dev: true + /which-boxed-primitive/1.0.2: resolution: {integrity: sha512-bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg==} dependencies: @@ -18517,7 +19485,6 @@ packages: ansi-styles: 4.3.0 string-width: 4.2.3 strip-ansi: 6.0.1 - dev: true /wrappy/1.0.2: resolution: {integrity: sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==} @@ -18635,6 +19602,7 @@ packages: /yaml/1.10.2: resolution: {integrity: sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==} engines: {node: '>= 6'} + dev: true /yargs-parser/18.1.3: resolution: {integrity: sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==} diff --git a/sync.mjs b/sync.mjs new file mode 100644 index 00000000..fb46e104 --- /dev/null +++ b/sync.mjs @@ -0,0 +1,113 @@ +#!/usr/bin/env node + +import {glob} from "glob"; +import {readFile, writeFile} from "fs/promises" + +const options = { + format: { + override: { + scripts: { + "format": "prettier .", + "format:fix": "prettier --write ." + }, + prettier: "@openstapps/prettier-config" + }, + if: "@openstapps/prettier-config" + }, + lint: { + override: { + scripts: { + "lint": "eslint --ext .ts src/", + "lint:fix": "eslint --fix --ext .ts src/" + }, + eslintConfig: { + extends: ["@openstapps"] + } + }, + if: "@openstapps/eslint-config" + }, + build: { + override: { + scripts: { + build: "tsup --dts", + }, + tsup: { + entry: ["src/index.ts"], + sourcemap: true, + clean: true, + format: "esm", + outDir: "lib" + }, + }, + if: "tsup" + }, + test: { + override: { + scripts: { + "test": "nyc mocha 'test/**/*.spec.ts'" + }, + nyc: { + extends: "@openstapps/nyc-config" + } + }, + if: "@openstapps/nyc-config" + } +} + +/** + * @param path {string} + * @returns {Promise} + */ +async function fixPackage(path) { + const file = JSON.parse(await readFile(path, 'utf-8')) + console.log(path) + /** @type {string[]} */ + const overrides = file['openstapps-configuration']?.['overrides'] || [] + /** @type {string[]} */ + const dependencies = Object.keys(file['devDependencies'] || {}) + + for (const option in options) { + if (overrides.includes(option)) continue + + const condition = options[option].if + const override = options[option].override + + if (!dependencies.includes(condition)) continue + if (option === 'build') { + const bin = file['bin'] + const entries = [] + if (typeof bin === 'string') { + entries.push(bin) + } else if (typeof bin === 'object') { + for (const key in bin) { + entries.push(bin[key]) + } + } + const main = file['main'] + if (main) { + entries.push(main) + } + + override['tsup']['entry'] = entries.map(it => it.replace(/^((\.\/)?lib\/)?/, 'src/').replace(/\.js$/, '.ts')) + } + + for (const key in override) { + if (key === 'scripts') { + for (const script in override[key]) { + file[key][script] = override[key][script] + } + } else { + file[key] = override[key] + } + } + } + + await writeFile(path, JSON.stringify(file, null, 2)) +} + +async function run() { + const packages = await glob('*/**/package.json') + await Promise.all(packages.map(fixPackage)) +} + +await run() diff --git a/turbo.json b/turbo.json index 23df1706..6962ae07 100644 --- a/turbo.json +++ b/turbo.json @@ -18,6 +18,9 @@ }, "check-configuration": { "dependsOn": ["^check-configuration"] + }, + "docs": { + } } } \ No newline at end of file diff --git a/typedoc.json b/typedoc.json new file mode 100644 index 00000000..d4cc3a19 --- /dev/null +++ b/typedoc.json @@ -0,0 +1,15 @@ +{ + "entryPointStrategy": "packages", + "entryPoints": [ + "packages/core", + "packages/api", + "packages/core-tools", + "packages/collection-utils", + "packages/gitlab-api", + "packages/logger", + "backend/backend", + "backend/proxy", + "configuration/projectmanagement" + ], + "excludeExternals": true +}