From 252c33837deff007b973bbd2615a0e85915af7ca Mon Sep 17 00:00:00 2001 From: Marika Marszalkowski <868536+marikaner@users.noreply.github.com> Date: Tue, 24 Sep 2024 14:47:32 +0200 Subject: [PATCH] feat: add types to type imports (#5021) * feat: add types to type imports * changeset --- .changeset/healthy-islands-breathe.md | 5 ++++ .../src/http-agent/agent-config.ts | 2 +- .../src/http-agent/http-agent.spec.ts | 4 +-- .../connectivity/src/http-agent/http-agent.ts | 10 ++++---- .../connectivity/src/scp-cf/async-cache.ts | 3 ++- .../src/scp-cf/authorization-header.spec.ts | 2 +- .../src/scp-cf/authorization-header.ts | 2 +- .../connectivity/src/scp-cf/cache.spec.ts | 9 +++---- .../scp-cf/client-credentials-token-cache.ts | 2 +- .../src/scp-cf/connectivity-service-types.ts | 2 +- .../src/scp-cf/connectivity-service.spec.ts | 3 ++- .../src/scp-cf/connectivity-service.ts | 12 ++++----- .../destination-accessor-jwks.spec.ts | 4 +-- ...ation-accessor-loading-precendence.spec.ts | 12 +++------ ...ccessor-provider-subscriber-lookup.spec.ts | 14 ++++++----- ...ation-accessor-proxy-configuration.spec.ts | 2 +- .../destination/destination-accessor-types.ts | 2 +- .../destination/destination-accessor.ts | 19 ++++++-------- .../destination/destination-cache.spec.ts | 4 +-- .../scp-cf/destination/destination-cache.ts | 11 ++++---- .../destination/destination-from-env.spec.ts | 2 +- .../destination/destination-from-env.ts | 2 +- .../destination-from-registration.spec.ts | 2 +- .../destination-from-registration.ts | 11 ++++---- .../destination/destination-from-service.ts | 19 +++++++------- .../destination/destination-from-vcap.spec.ts | 2 +- .../destination/destination-from-vcap.ts | 9 ++++--- .../destination-selection-strategies.spec.ts | 2 +- .../destination-service-cache.spec.ts | 2 +- .../destination/destination-service-cache.ts | 4 +-- .../destination/destination-service.spec.ts | 8 +++--- .../scp-cf/destination/destination-service.ts | 22 ++++++---------- .../scp-cf/destination/destination.spec.ts | 9 +++---- .../src/scp-cf/destination/destination.ts | 10 +++----- .../scp-cf/destination/forward-auth-token.ts | 5 +++- .../scp-cf/destination/get-provider-token.ts | 5 ++-- .../destination/get-subscriber-token.ts | 13 +++------- .../destination/http-proxy-util.spec.ts | 4 +-- .../src/scp-cf/destination/http-proxy-util.ts | 12 ++++----- .../destination/register-destination-cache.ts | 12 ++++----- .../service-binding-to-destination.ts | 4 +-- .../environment-accessor/destination.ts | 2 +- .../environment-accessor/service-bindings.ts | 2 +- .../service-credentials.ts | 4 +-- .../scp-cf/environment-accessor/xsuaa.spec.ts | 2 +- .../src/scp-cf/environment-accessor/xsuaa.ts | 4 +-- .../connectivity/src/scp-cf/get-protocol.ts | 5 ++-- .../header-builder-for-destination.spec.ts | 2 +- .../scp-cf/header-builder-for-destination.ts | 2 +- .../src/scp-cf/identity-service.ts | 2 +- packages/connectivity/src/scp-cf/jwt.ts | 10 +++++--- .../src/scp-cf/subdomain-replacer.ts | 2 +- packages/connectivity/src/scp-cf/tenant.ts | 2 +- .../src/scp-cf/token-accessor.spec.ts | 2 +- .../connectivity/src/scp-cf/token-accessor.ts | 6 ++--- .../connectivity/src/scp-cf/xsuaa-service.ts | 9 ++++--- packages/eslint-config/flat-config.js | 1 + packages/eslint-config/index.js | 1 + packages/generator-common/src/cli-parser.ts | 3 ++- .../generator-common/src/compiler.spec.ts | 11 +++----- packages/generator-common/src/compiler.ts | 17 +++++++------ .../src/file-writer/create-file.spec.ts | 2 +- .../src/file-writer/create-file.ts | 6 ++--- .../generator-common/src/options-parser.ts | 2 +- .../src/options-per-service.spec.ts | 4 +-- packages/generator-common/src/options.ts | 4 +-- .../src/sdk-metadata/sdk-metadata.ts | 6 ++++- packages/generator/src/batch/file.ts | 5 ++-- packages/generator/src/batch/function.ts | 8 +++--- packages/generator/src/batch/imports.ts | 5 ++-- packages/generator/src/batch/type.ts | 5 ++-- packages/generator/src/cli-parser.ts | 3 ++- .../src/complex-type/field-type-class.ts | 9 +++---- packages/generator/src/complex-type/file.ts | 7 +++--- .../src/complex-type/imports.spec.ts | 2 +- .../generator/src/complex-type/imports.ts | 6 ++--- .../generator/src/complex-type/interface.ts | 8 +++--- .../generator/src/complex-type/namespace.ts | 7 +++--- packages/generator/src/complex-type/util.ts | 2 +- .../src/edmx-parser/common/edmx-parser.ts | 2 +- .../src/edmx-parser/common/edmx-types.ts | 2 +- .../src/edmx-parser/edmx-file-reader.ts | 9 ++++--- .../generator/src/edmx-parser/v2/edm-types.ts | 2 +- .../src/edmx-parser/v2/edmx-parser.ts | 4 +-- .../generator/src/edmx-parser/v4/edm-types.ts | 2 +- .../src/edmx-parser/v4/edmx-parser.ts | 2 +- .../src/edmx-to-vdm/common/complex-type.ts | 10 +++++--- .../src/edmx-to-vdm/common/entity.ts | 8 +++--- .../src/edmx-to-vdm/common/enum-type.ts | 6 ++--- .../edmx-to-vdm/common/operation-parameter.ts | 4 +-- .../common/operation-return-type.ts | 4 +-- .../src/edmx-to-vdm/common/operation.ts | 4 +-- .../src/edmx-to-vdm/description-util.ts | 4 +-- .../src/edmx-to-vdm/v2/complex-type.ts | 6 ++--- .../generator/src/edmx-to-vdm/v2/entity.ts | 10 ++++---- .../src/edmx-to-vdm/v2/function-import.ts | 6 ++--- .../src/edmx-to-vdm/v2/service-entities.ts | 4 +-- .../src/edmx-to-vdm/v4/complex-type.ts | 6 ++--- .../src/edmx-to-vdm/v4/entity.spec.ts | 6 ++--- .../generator/src/edmx-to-vdm/v4/entity.ts | 8 +++--- .../generator/src/edmx-to-vdm/v4/enum-type.ts | 6 ++--- .../src/edmx-to-vdm/v4/operation-util.ts | 2 +- .../src/edmx-to-vdm/v4/operation.spec.ts | 6 ++--- .../generator/src/edmx-to-vdm/v4/operation.ts | 11 +++----- .../src/edmx-to-vdm/v4/service-entities.ts | 4 +-- packages/generator/src/entity/class.ts | 8 +++--- packages/generator/src/entity/file.ts | 5 ++-- packages/generator/src/entity/imports.ts | 7 +++--- packages/generator/src/entity/interface.ts | 8 +++--- .../generator/src/entity/namespace.spec.ts | 2 +- packages/generator/src/entity/namespace.ts | 7 +++--- packages/generator/src/enum-type/enum.ts | 5 ++-- packages/generator/src/enum-type/file.ts | 5 ++-- packages/generator/src/file-generator.ts | 8 +++--- packages/generator/src/generator-utils.ts | 5 ++-- .../de-serializers-generic-types.ts | 2 +- .../entity-api/class.ts | 2 +- .../entity-api/file.ts | 8 +++--- .../entity-api/import.spec.ts | 2 +- .../entity-api/imports.ts | 7 +++--- .../entity-api/match-entity.ts | 2 +- .../entity-api/navigation-properties.ts | 2 +- .../entity-api/schema-type.ts | 6 ++++- .../entity-api/schema.ts | 2 +- .../src/generator-without-ts-morph/imports.ts | 7 +++--- .../request-builder/class.spec.ts | 2 +- .../request-builder/class.ts | 2 +- .../request-builder/file.ts | 5 ++-- .../request-builder/imports.ts | 7 +++--- .../service/class.spec.ts | 2 +- .../service/class.ts | 5 ++-- .../service/file.ts | 8 +++--- packages/generator/src/generator.spec.ts | 2 +- packages/generator/src/generator.ts | 19 +++++++------- packages/generator/src/imports.spec.ts | 5 ++-- packages/generator/src/imports.ts | 8 +++--- packages/generator/src/input-path-provider.ts | 3 ++- .../src/operations/export-statement.ts | 9 +++---- packages/generator/src/operations/file.ts | 8 +++--- .../generator/src/operations/import.spec.ts | 2 +- packages/generator/src/operations/import.ts | 5 ++-- .../generator/src/operations/operation.ts | 8 +++--- .../src/operations/parameters-interface.ts | 5 ++-- .../operations/request-builder-arguments.ts | 2 +- .../response-transformer-function.spec.ts | 2 +- .../response-transformer-function.ts | 2 +- .../generator/src/operations/return-type.ts | 2 +- packages/generator/src/options/options.ts | 6 ++--- .../src/sdk-metadata/code-sample-util.spec.ts | 2 +- .../src/sdk-metadata/code-sample-util.ts | 2 +- .../src/sdk-metadata/code-samples.ts | 4 +-- .../sdk-metadata/generation-and-usage.spec.ts | 2 +- .../src/sdk-metadata/generation-and-usage.ts | 4 +-- .../src/sdk-metadata/pregenerated-lib.spec.ts | 2 +- .../src/sdk-metadata/sdk-metadata.ts | 4 +-- .../generator/src/service-base-path.spec.ts | 2 +- packages/generator/src/service-base-path.ts | 4 +-- .../generator/src/service-generator.spec.ts | 10 +++----- packages/generator/src/service-generator.ts | 13 +++++----- packages/generator/src/service/index-file.ts | 9 +++---- .../src/service/package-json.spec.ts | 5 ++-- .../generator/src/service/package-json.ts | 9 +++---- packages/generator/src/service/readme.spec.ts | 2 +- packages/generator/src/service/readme.ts | 2 +- .../src/swagger-parser/swagger-parser.ts | 5 ++-- .../src/swagger-parser/swagger-util.ts | 4 +-- packages/generator/src/typedoc.spec.ts | 2 +- packages/generator/src/typedoc.ts | 2 +- packages/generator/src/vdm-types.ts | 6 ++--- .../test-util/create-generator-options.ts | 6 ++--- .../generator/test/test-util/data-model.ts | 2 +- .../generator/test/test-util/generator.ts | 8 ++++-- .../import-declaration-structures.ts | 3 ++- .../http-client/src/csrf-token-middleware.ts | 2 +- packages/http-client/src/http-client-types.ts | 4 +-- packages/http-client/src/http-client.spec.ts | 8 +++--- packages/http-client/src/http-client.ts | 16 +++++++----- .../src/http-request-config.spec.ts | 2 +- .../http-client/src/http-request-config.ts | 2 +- packages/mail-client/src/mail-client-types.ts | 10 ++++---- packages/mail-client/src/mail-client.spec.ts | 10 +++----- packages/mail-client/src/mail-client.ts | 14 ++++++----- packages/odata-common/src/batch-response.ts | 6 ++--- .../de-serializers/custom-de-serializers.ts | 10 +++----- .../default-de-serializers.spec.ts | 2 +- .../de-serializers/default-de-serializers.ts | 4 +-- .../src/de-serializers/uri-value-converter.ts | 4 +-- packages/odata-common/src/edm-types.ts | 2 +- packages/odata-common/src/entity-base.ts | 4 +-- packages/odata-common/src/entity-builder.ts | 4 +-- .../odata-common/src/entity-deserializer.ts | 23 +++++++++-------- .../odata-common/src/entity-serializer.ts | 17 ++++++------- packages/odata-common/src/expandable.ts | 12 ++++----- .../src/filter/boolean-filter-function.ts | 10 +++----- .../src/filter/collection-filter-function.ts | 10 +++----- .../src/filter/filter-function-base.ts | 8 +++--- .../src/filter/filter-function.ts | 4 +-- .../src/filter/filter-functions.ts | 16 ++++++------ .../src/filter/filter-lambda-expression.ts | 6 ++--- .../odata-common/src/filter/filter-link.ts | 8 +++--- .../odata-common/src/filter/filter-list.ts | 4 +-- packages/odata-common/src/filter/filter.ts | 10 +++++--- .../odata-common/src/filter/filterable.ts | 8 +++--- .../src/filter/number-filter-function.ts | 4 +-- .../src/filter/orderable-filter-function.ts | 10 +++----- .../src/filter/string-filter-function.ts | 4 +-- .../odata-common/src/filter/unary-filter.ts | 2 +- packages/odata-common/src/header-builder.ts | 6 ++--- packages/odata-common/src/order/order-link.ts | 6 ++--- packages/odata-common/src/order/order.ts | 6 ++++- packages/odata-common/src/order/orderable.ts | 12 ++++----- .../request-builder/batch/batch-change-set.ts | 12 ++++----- .../batch/batch-request-builder.ts | 25 ++++++++++--------- .../batch/batch-request-options.ts | 2 +- .../batch/batch-request-serializer.spec.ts | 8 +++--- .../batch/batch-request-serializer.ts | 10 ++++---- .../batch/batch-response-deserializer.spec.ts | 4 +-- .../batch/batch-response-deserializer.ts | 15 +++++------ .../batch/batch-response-parser.spec.ts | 2 +- .../batch/batch-response-parser.ts | 2 +- .../request-builder/count-request-builder.ts | 8 +++--- .../create-request-builder-base.spec.ts | 6 ++--- .../create-request-builder-base.ts | 12 ++++----- .../delete-request-builder-base.ts | 15 +++++------ .../get-all-request-builder-base.ts | 19 +++++++------- .../get-by-key-request-builder-base.ts | 18 ++++++------- .../get-request-builder-base.ts | 20 +++++++++------ .../operation-request-builder-base.ts | 10 ++++---- .../request-builder/request-builder-base.ts | 12 ++++----- .../src/request-builder/request-builder.ts | 6 ++--- .../update-request-builder-base.ts | 18 ++++++------- .../src/request/odata-batch-request-config.ts | 2 +- .../src/request/odata-count-request-config.ts | 4 +-- .../request/odata-create-request-config.ts | 10 ++++---- .../odata-delete-request-config.spec.ts | 8 +++--- .../request/odata-delete-request-config.ts | 10 ++++---- .../request/odata-function-request-config.ts | 9 ++++--- .../odata-get-all-request-config.spec.ts | 2 +- .../request/odata-get-all-request-config.ts | 18 ++++++------- .../odata-get-by-key-request-config.spec.ts | 8 +++--- .../odata-get-by-key-request-config.ts | 14 +++++------ .../src/request/odata-request-config.ts | 8 +++--- .../src/request/odata-request-traits.ts | 12 ++++----- .../src/request/odata-request.spec.ts | 10 +++----- .../odata-common/src/request/odata-request.ts | 19 +++++++------- .../odata-update-request-config.spec.ts | 10 +++----- .../request/odata-update-request-config.ts | 10 ++++---- .../src/request/operation-parameter.ts | 2 +- .../odata-common/src/selectable/all-fields.ts | 2 +- .../src/selectable/collection-field.ts | 13 +++++----- .../src/selectable/complex-type-field.ts | 14 ++++++----- .../src/selectable/complex-type-namespace.ts | 2 +- .../complex-type-property-fields.ts | 6 ++--- .../src/selectable/constructor-or-field.ts | 4 +-- .../src/selectable/custom-field.ts | 8 +++--- .../src/selectable/edm-type-field.ts | 11 ++++---- .../odata-common/src/selectable/enum-field.ts | 11 ++++---- .../src/selectable/field-builder.ts | 18 ++++++------- packages/odata-common/src/selectable/field.ts | 2 +- packages/odata-common/src/selectable/link.ts | 6 ++--- .../src/selectable/one-to-many-link.ts | 6 ++--- .../src/selectable/one-to-one-link.ts | 12 +++++---- .../orderable-edm-type-field.spec.ts | 7 +++--- .../selectable/orderable-edm-type-field.ts | 9 ++++--- .../odata-common/src/selectable/selectable.ts | 6 ++--- .../src/selectable/simple-type-fields.ts | 6 ++--- .../src/uri-conversion/get-filter.ts | 22 ++++++++-------- .../src/uri-conversion/get-keys.ts | 4 +-- .../src/uri-conversion/get-orderby.ts | 9 ++++--- .../src/uri-conversion/get-resource-path.ts | 6 ++--- .../src/uri-conversion/odata-uri.ts | 17 +++++++------ packages/odata-v2/src/batch-response.ts | 4 +-- .../odata-v2/src/de-serializers/converters.ts | 2 +- .../de-serializers/custom-de-serializers.ts | 12 ++++----- .../src/de-serializers/de-serializers.ts | 2 +- .../de-serializers/default-de-serializers.ts | 6 ++--- .../src/de-serializers/entity-deserializer.ts | 8 +++--- .../payload-value-converter.spec.ts | 2 +- .../de-serializers/payload-value-converter.ts | 4 +-- packages/odata-v2/src/edm-types.ts | 2 +- packages/odata-v2/src/entity.spec.ts | 4 +-- packages/odata-v2/src/filter-functions.ts | 14 ++++++----- .../batch-request-builder.spec.ts | 2 +- .../request-builder/batch-request-builder.ts | 11 +++----- .../request-builder/count-request-builder.ts | 4 +-- .../request-builder/create-request-builder.ts | 15 ++++++----- .../request-builder/delete-request-builder.ts | 10 +++----- .../get-all-request-builder.spec.ts | 4 +-- .../get-all-request-builder.ts | 17 ++++++------- .../get-by-key-request-builder.ts | 15 +++++------ .../operation-request-builder.ts | 8 +++--- .../request-builder/response-data-accessor.ts | 2 +- .../request-builder/response-transformers.ts | 6 ++--- .../request-builder/update-request-builder.ts | 14 ++++++----- .../odata-function-request-config.spec.ts | 3 ++- .../request/odata-function-request-config.ts | 8 +++--- .../odata-v2/src/selectable/custom-field.ts | 8 +++--- .../odata-v2/src/uri-conversion/get-expand.ts | 7 +++--- .../odata-v2/src/uri-conversion/get-select.ts | 7 +++--- .../odata-v2/src/uri-conversion/odata-uri.ts | 4 +-- packages/odata-v2/test/test-util/test-data.ts | 9 +++---- packages/odata-v4/src/batch-response.ts | 4 +-- .../odata-v4/src/de-serializers/converters.ts | 2 +- .../de-serializers/custom-de-serializers.ts | 14 +++++------ .../src/de-serializers/de-serializers.ts | 2 +- .../de-serializers/default-de-serializers.ts | 6 ++--- .../src/de-serializers/entity-deserializer.ts | 8 +++--- .../de-serializers/payload-value-converter.ts | 4 +-- packages/odata-v4/src/edm-types.ts | 2 +- packages/odata-v4/src/entity-builder.spec.ts | 2 +- packages/odata-v4/src/filter-function.ts | 10 +++++--- packages/odata-v4/src/filter-functions.ts | 12 ++++----- .../src/filter/date-filter-function.ts | 8 +++--- .../src/filter/filter-lambda-expression.ts | 14 ++++++----- .../request-builder/batch-request-builder.ts | 11 +++----- .../bound-operation-request-builder.spec.ts | 2 +- .../bound-operation-request-builder.ts | 6 ++--- .../request-builder/count-request-builder.ts | 4 +-- .../request-builder/create-request-builder.ts | 15 ++++++----- .../request-builder/delete-request-builder.ts | 10 +++----- .../get-all-request-builder.spec.ts | 4 +-- .../get-all-request-builder.ts | 21 ++++++++-------- .../get-by-key-request-builder.ts | 13 ++++------ .../operation-request-builder.spec.ts | 2 +- .../operation-request-builder.ts | 6 ++--- .../request-builder/response-data-accessor.ts | 2 +- .../request-builder/response-transformers.ts | 7 +++--- .../request-builder/update-request-builder.ts | 14 ++++++----- .../src/request/action-import-parameter.ts | 2 +- .../request/odata-action-request-config.ts | 6 ++--- .../odata-bound-action-request-config.ts | 4 +-- .../odata-bound-function-request-config.ts | 4 +-- .../request/odata-function-request-config.ts | 6 ++--- .../odata-v4/src/selectable/custom-field.ts | 8 +++--- .../odata-v4/src/uri-conversion/get-expand.ts | 12 +++++---- .../odata-v4/src/uri-conversion/get-select.ts | 6 ++--- .../odata-v4/src/uri-conversion/odata-uri.ts | 8 +++--- packages/odata-v4/test/test-util/test-data.ts | 6 ++--- packages/openapi-generator/src/cli-parser.ts | 3 ++- .../src/document-converter.spec.ts | 2 +- .../src/document-converter.ts | 2 +- .../src/file-serializer/api-file.spec.ts | 2 +- .../src/file-serializer/api-file.ts | 6 ++--- .../src/file-serializer/index-file.spec.ts | 8 +++--- .../src/file-serializer/index-file.ts | 4 +-- .../src/file-serializer/operation.spec.ts | 2 +- .../src/file-serializer/operation.ts | 2 +- .../src/file-serializer/package-json.ts | 6 ++--- .../src/file-serializer/readme.spec.ts | 2 +- .../src/file-serializer/readme.ts | 2 +- .../src/file-serializer/schema-file.spec.ts | 8 +++--- .../src/file-serializer/schema-file.ts | 6 ++--- .../src/file-serializer/schema.ts | 2 +- packages/openapi-generator/src/generator.ts | 18 ++++++------- .../openapi-generator/src/openapi-types.ts | 2 +- .../openapi-generator/src/options/options.ts | 4 +-- .../src/options/tsconfig-json.spec.ts | 2 +- .../src/options/tsconfig-json.ts | 2 +- .../openapi-generator/src/parser/api.spec.ts | 2 +- packages/openapi-generator/src/parser/api.ts | 11 ++++---- .../src/parser/document.spec.ts | 4 +-- .../openapi-generator/src/parser/document.ts | 11 ++++---- .../src/parser/media-type.ts | 8 +++--- .../src/parser/operation-naming.spec.ts | 2 +- .../src/parser/operation-naming.ts | 4 +-- .../src/parser/operation.spec.ts | 4 +-- .../openapi-generator/src/parser/operation.ts | 10 ++++---- .../src/parser/parsing-info.ts | 6 ++--- .../openapi-generator/src/parser/refs.spec.ts | 5 ++-- packages/openapi-generator/src/parser/refs.ts | 10 ++++---- .../src/parser/request-body.ts | 8 +++--- .../openapi-generator/src/parser/responses.ts | 8 +++--- .../src/parser/schema-naming.ts | 2 +- .../src/parser/schema.spec.ts | 4 +-- .../openapi-generator/src/parser/schema.ts | 8 +++--- .../src/parser/swagger-parser-workaround.ts | 9 +++---- .../src/parser/unique-naming.ts | 2 +- .../openapi-generator/src/schema-util.spec.ts | 2 +- packages/openapi-generator/src/schema-util.ts | 6 ++--- .../src/sdk-metadata/code-sample-util.spec.ts | 2 +- .../src/sdk-metadata/code-sample-util.ts | 2 +- .../src/sdk-metadata/code-sample.ts | 4 +-- .../src/sdk-metadata/generation-and-usage.ts | 4 +-- .../src/sdk-metadata/sdk-metadata.ts | 4 +-- packages/openapi-generator/test/test-util.ts | 7 +++--- .../src/openapi-request-builder.spec.ts | 2 +- .../openapi/src/openapi-request-builder.ts | 16 ++++++------ packages/openapi/src/types.ts | 2 +- .../resilience/src/circuit-breaker.spec.ts | 6 +++-- packages/resilience/src/circuit-breaker.ts | 8 ++++-- packages/resilience/src/middleware.spec.ts | 7 ++---- packages/resilience/src/resilience.spec.ts | 6 +++-- packages/resilience/src/resilience.ts | 3 +-- packages/resilience/src/retry.ts | 2 +- packages/resilience/src/timeout.ts | 2 +- .../src/temporal-de-serializers-v2.ts | 6 ++--- .../src/temporal-de-serializers-v4.ts | 6 ++--- .../src/test-destination-mocker.spec.ts | 2 +- .../test-util/src/test-destination-mocker.ts | 4 +-- .../src/test-destination-provider.ts | 2 +- packages/util/src/error-with-cause.ts | 2 +- packages/util/src/fs.ts | 3 ++- packages/util/src/logger/cloud-sdk-logger.ts | 12 +++------ packages/util/src/logger/format/kibana.ts | 2 +- packages/util/src/logger/format/local.ts | 2 +- .../test/TripPin/request-builder.spec.ts | 2 +- test-packages/e2e-tests/test/batch.spec.ts | 2 +- .../e2e-tests/test/bound-action.spec.ts | 6 ++--- .../e2e-tests/test/bound-function.spec.ts | 6 ++--- .../e2e-tests/test/http-agent.spec.ts | 5 ++-- .../e2e-tests/test/mail/mail.spec.ts | 3 ++- test-packages/e2e-tests/test/openapi.spec.ts | 6 ++--- .../e2e-tests/test/proxy/odata.spec.ts | 6 ++--- .../test/exception-logger.spec.ts | 2 +- .../integration-tests/test/mtls.spec.ts | 8 +++--- .../integration-tests/test/v2/batch.spec.ts | 4 +-- .../test/v2/complex-types.spec.ts | 2 +- .../test/v2/custom-fields.spec.ts | 2 +- .../test/v2/function-imports.spec.ts | 2 +- .../type-tests/test/duplicated-types.ts | 8 +++--- .../test/generator/generator-utils.test-d.ts | 6 ++--- .../type-tests/test/http-agent.test-d.ts | 4 +-- .../type-tests/test/http-client.test-d.ts | 4 +-- test-packages/type-tests/test/jwt.test-d.ts | 3 ++- .../test/mail-client/mail-client.test-d.ts | 3 ++- .../type-tests/test/openapi/schema.test-d.ts | 2 +- .../type-tests/test/v2/batch.test-d.ts | 12 ++++----- .../test/v2/complex-types.test-d.ts | 22 ++++++++-------- .../test/v2/de-serializers.test-d.ts | 4 +-- .../test/v2/entity-builder.test-d.ts | 10 +++----- .../test/v2/filter-functions.test-d.ts | 15 +++++------ .../type-tests/test/v2/filter.test-d.ts | 19 +++++++++----- .../test/v2/function-imports.test-d.ts | 22 ++++++++-------- .../type-tests/test/v2/link.test-d.ts | 4 +-- .../test/v2/request-builder.test-d.ts | 10 ++++---- .../test/v2/schema-properties.test-d.ts | 19 +++++++------- .../type-tests/test/v2/selectable.test-d.ts | 10 +++----- .../test/v4/action-imports.test-d.ts | 20 +++++++-------- .../type-tests/test/v4/batch.test-d.ts | 13 ++++++---- .../test/v4/de-serializers.test-d.ts | 8 +++--- .../test/v4/entity-builder.test-d.ts | 8 +++--- .../test/v4/field-builder.test-d.ts | 9 ++++--- .../test/v4/filter-functions.test-d.ts | 14 ++++------- .../type-tests/test/v4/filters.test-d.ts | 14 +++++++---- .../test/v4/function-import.test-d.ts | 10 +++----- .../test/v4/schema-properties.test-d.ts | 17 +++++++------ 446 files changed, 1481 insertions(+), 1480 deletions(-) create mode 100644 .changeset/healthy-islands-breathe.md diff --git a/.changeset/healthy-islands-breathe.md b/.changeset/healthy-islands-breathe.md new file mode 100644 index 0000000000..41f8d090dd --- /dev/null +++ b/.changeset/healthy-islands-breathe.md @@ -0,0 +1,5 @@ +--- +'@sap-cloud-sdk/eslint-config': minor +--- + +[New Functionality] Add `@typescript-eslint/consistent-type-imports` to the ruleset. diff --git a/packages/connectivity/src/http-agent/agent-config.ts b/packages/connectivity/src/http-agent/agent-config.ts index f64c24e3bb..a12b75128a 100644 --- a/packages/connectivity/src/http-agent/agent-config.ts +++ b/packages/connectivity/src/http-agent/agent-config.ts @@ -1,4 +1,4 @@ -import * as http from 'http'; +import type * as http from 'http'; /** * Interface for the `http-agent` within the Axios request config. diff --git a/packages/connectivity/src/http-agent/http-agent.spec.ts b/packages/connectivity/src/http-agent/http-agent.spec.ts index ed61a5774b..54d34b5432 100644 --- a/packages/connectivity/src/http-agent/http-agent.spec.ts +++ b/packages/connectivity/src/http-agent/http-agent.spec.ts @@ -1,8 +1,8 @@ import { X509Certificate } from 'node:crypto'; import mock from 'mock-fs'; import { createLogger } from '@sap-cloud-sdk/util'; -import { DestinationCertificate } from '../scp-cf'; -import { HttpDestination } from '../scp-cf/destination'; +import type { DestinationCertificate } from '../scp-cf'; +import type { HttpDestination } from '../scp-cf/destination'; import { registerDestinationCache } from '../scp-cf/destination/register-destination-cache'; import { certAsString } from '../../../../test-resources/test/test-util/test-certificate'; import { getAgentConfigAsync } from './http-agent'; diff --git a/packages/connectivity/src/http-agent/http-agent.ts b/packages/connectivity/src/http-agent/http-agent.ts index 41a05ec0e6..e154cacdc3 100644 --- a/packages/connectivity/src/http-agent/http-agent.ts +++ b/packages/connectivity/src/http-agent/http-agent.ts @@ -2,21 +2,21 @@ import { readFile } from 'fs/promises'; import http from 'http'; import https from 'https'; import { createLogger, last } from '@sap-cloud-sdk/util'; -import { +import type { BasicProxyConfiguration, Destination, - DestinationCertificate, - getProtocolOrDefault + DestinationCertificate } from '../scp-cf'; +import { getProtocolOrDefault } from '../scp-cf'; /* Careful the proxy imports cause circular dependencies if imported from scp directly */ +import type { HttpDestination } from '../scp-cf/destination'; import { addProxyConfigurationInternet, getProxyConfig, - HttpDestination, proxyStrategy } from '../scp-cf/destination'; import { registerDestinationCache } from '../scp-cf/destination/register-destination-cache'; -import { HttpAgentConfig, HttpsAgentConfig } from './agent-config'; +import type { HttpAgentConfig, HttpsAgentConfig } from './agent-config'; const logger = createLogger({ package: 'connectivity', diff --git a/packages/connectivity/src/scp-cf/async-cache.ts b/packages/connectivity/src/scp-cf/async-cache.ts index d99b9685f5..9943ad0a82 100644 --- a/packages/connectivity/src/scp-cf/async-cache.ts +++ b/packages/connectivity/src/scp-cf/async-cache.ts @@ -1,4 +1,5 @@ -import { Cache, CacheEntry } from './cache'; +import type { CacheEntry } from './cache'; +import { Cache } from './cache'; /** * Generic async cache interface. diff --git a/packages/connectivity/src/scp-cf/authorization-header.spec.ts b/packages/connectivity/src/scp-cf/authorization-header.spec.ts index a10c5f970b..3655ac438b 100644 --- a/packages/connectivity/src/scp-cf/authorization-header.spec.ts +++ b/packages/connectivity/src/scp-cf/authorization-header.spec.ts @@ -5,7 +5,7 @@ import { } from '../../../../test-resources/test/test-util/request-mocker'; import { buildAuthorizationHeaders } from './authorization-header'; import * as destinationImport from './destination/destination'; -import { Destination } from './destination'; +import type { Destination } from './destination'; const principalPropagationDestination = { url: '', diff --git a/packages/connectivity/src/scp-cf/authorization-header.ts b/packages/connectivity/src/scp-cf/authorization-header.ts index 282cbf83e7..95a9b46b26 100644 --- a/packages/connectivity/src/scp-cf/authorization-header.ts +++ b/packages/connectivity/src/scp-cf/authorization-header.ts @@ -5,7 +5,7 @@ import { encodeBase64, pickValueIgnoreCase } from '@sap-cloud-sdk/util'; -import { +import type { AuthenticationType, Destination, DestinationAuthToken diff --git a/packages/connectivity/src/scp-cf/cache.spec.ts b/packages/connectivity/src/scp-cf/cache.spec.ts index fb1fff9206..b7363bd278 100644 --- a/packages/connectivity/src/scp-cf/cache.spec.ts +++ b/packages/connectivity/src/scp-cf/cache.spec.ts @@ -1,11 +1,8 @@ import { Cache } from './cache'; import { clientCredentialsTokenCache } from './client-credentials-token-cache'; -import { - AuthenticationType, - Destination, - destinationCache -} from './destination'; -import { ClientCredentialsResponse } from './xsuaa-service-types'; +import type { AuthenticationType, Destination } from './destination'; +import { destinationCache } from './destination'; +import type { ClientCredentialsResponse } from './xsuaa-service-types'; const destinationOne: Destination = { url: 'https://destination1.example', diff --git a/packages/connectivity/src/scp-cf/client-credentials-token-cache.ts b/packages/connectivity/src/scp-cf/client-credentials-token-cache.ts index ad0074af69..cd146bf4c2 100644 --- a/packages/connectivity/src/scp-cf/client-credentials-token-cache.ts +++ b/packages/connectivity/src/scp-cf/client-credentials-token-cache.ts @@ -1,6 +1,6 @@ import { createLogger } from '@sap-cloud-sdk/util'; import { Cache } from './cache'; -import { ClientCredentialsResponse } from './xsuaa-service-types'; +import type { ClientCredentialsResponse } from './xsuaa-service-types'; const logger = createLogger({ package: 'connectivity', diff --git a/packages/connectivity/src/scp-cf/connectivity-service-types.ts b/packages/connectivity/src/scp-cf/connectivity-service-types.ts index 22959367de..200f1a89ec 100644 --- a/packages/connectivity/src/scp-cf/connectivity-service-types.ts +++ b/packages/connectivity/src/scp-cf/connectivity-service-types.ts @@ -1,4 +1,4 @@ -import { Protocol } from './protocol'; +import type { Protocol } from './protocol'; /** * Proxy settings for connecting to an on-premise destination via connectivity proxy or web proxies. diff --git a/packages/connectivity/src/scp-cf/connectivity-service.spec.ts b/packages/connectivity/src/scp-cf/connectivity-service.spec.ts index 8327db4b3b..4ba7e0a930 100644 --- a/packages/connectivity/src/scp-cf/connectivity-service.spec.ts +++ b/packages/connectivity/src/scp-cf/connectivity-service.spec.ts @@ -16,7 +16,8 @@ import { addProxyConfigurationOnPrem, httpProxyHostAndPort } from './connectivity-service'; -import { Destination, getRequiredSubscriberToken } from './destination'; +import type { Destination } from './destination'; +import { getRequiredSubscriberToken } from './destination'; import { getJwtPair } from './jwt'; describe('connectivity-service', () => { diff --git a/packages/connectivity/src/scp-cf/connectivity-service.ts b/packages/connectivity/src/scp-cf/connectivity-service.ts index 5a475a073b..4b93eb11da 100644 --- a/packages/connectivity/src/scp-cf/connectivity-service.ts +++ b/packages/connectivity/src/scp-cf/connectivity-service.ts @@ -1,18 +1,18 @@ import { createLogger, ErrorWithCause } from '@sap-cloud-sdk/util'; -import { JwtPayload } from './jsonwebtoken-type'; -import { Protocol } from './protocol'; -import { +import type { JwtPayload } from './jsonwebtoken-type'; +import type { Protocol } from './protocol'; +import type { ProxyConfiguration, ProxyConfigurationHeaders } from './connectivity-service-types'; -import { +import type { AuthenticationType, Destination } from './destination/destination-service-types'; import { getServiceBindings } from './environment-accessor'; -import { Service } from './environment-accessor/environment-accessor-types'; +import type { Service } from './environment-accessor/environment-accessor-types'; import { serviceToken } from './token-accessor'; -import { SubscriberToken } from './destination'; +import type { SubscriberToken } from './destination'; const logger = createLogger({ package: 'connectivity', diff --git a/packages/connectivity/src/scp-cf/destination/destination-accessor-jwks.spec.ts b/packages/connectivity/src/scp-cf/destination/destination-accessor-jwks.spec.ts index 0722be4969..6d3b62c504 100644 --- a/packages/connectivity/src/scp-cf/destination/destination-accessor-jwks.spec.ts +++ b/packages/connectivity/src/scp-cf/destination/destination-accessor-jwks.spec.ts @@ -7,10 +7,10 @@ import { oauthMultipleResponse, providerServiceToken } from '../../../../../test-resources/test/test-util'; -import { DestinationFetchOptions } from './destination-accessor-types'; +import type { DestinationFetchOptions } from './destination-accessor-types'; import { alwaysProvider } from './destination-selection-strategies'; import { getDestination } from './destination-accessor'; -import { DestinationConfiguration } from './destination'; +import type { DestinationConfiguration } from './destination'; describe('custom JWTs', () => { beforeEach(() => { diff --git a/packages/connectivity/src/scp-cf/destination/destination-accessor-loading-precendence.spec.ts b/packages/connectivity/src/scp-cf/destination/destination-accessor-loading-precendence.spec.ts index 11286fe952..9b81bed3c0 100644 --- a/packages/connectivity/src/scp-cf/destination/destination-accessor-loading-precendence.spec.ts +++ b/packages/connectivity/src/scp-cf/destination/destination-accessor-loading-precendence.spec.ts @@ -1,12 +1,8 @@ -import { - MockServiceBindings, - mockServiceBindings -} from '../../../../../test-resources/test/test-util'; +import type { MockServiceBindings } from '../../../../../test-resources/test/test-util'; +import { mockServiceBindings } from '../../../../../test-resources/test/test-util'; import { getDestination, useOrFetchDestination } from './destination-accessor'; -import { - DestinationWithName, - registerDestination -} from './destination-from-registration'; +import type { DestinationWithName } from './destination-from-registration'; +import { registerDestination } from './destination-from-registration'; import { registerDestinationCache } from './register-destination-cache'; function mockEnvDestinations() { diff --git a/packages/connectivity/src/scp-cf/destination/destination-accessor-provider-subscriber-lookup.spec.ts b/packages/connectivity/src/scp-cf/destination/destination-accessor-provider-subscriber-lookup.spec.ts index 416152f73a..85b73dee2b 100644 --- a/packages/connectivity/src/scp-cf/destination/destination-accessor-provider-subscriber-lookup.spec.ts +++ b/packages/connectivity/src/scp-cf/destination/destination-accessor-provider-subscriber-lookup.spec.ts @@ -1,5 +1,6 @@ -import { createLogger, ErrorWithCause } from '@sap-cloud-sdk/util'; -import { AxiosError } from 'axios'; +import type { ErrorWithCause } from '@sap-cloud-sdk/util'; +import { createLogger } from '@sap-cloud-sdk/util'; +import type { AxiosError } from 'axios'; import nock from 'nock'; import { mockFetchDestinationCalls, @@ -27,23 +28,24 @@ import { } from '../../../../../test-resources/test/test-util/mocked-access-tokens'; import { mockServiceToken } from '../../../../../test-resources/test/test-util/token-accessor-mocks'; import * as identityService from '../identity-service'; -import { DestinationConfiguration, parseDestination } from './destination'; +import type { DestinationConfiguration } from './destination'; +import { parseDestination } from './destination'; import { getAllDestinationsFromDestinationService, getDestination } from './destination-accessor'; -import { +import type { DestinationFetchOptions, DestinationWithoutToken } from './destination-accessor-types'; import { getDestinationFromDestinationService } from './destination-from-service'; +import type { DestinationSelectionStrategy } from './destination-selection-strategies'; import { alwaysProvider, alwaysSubscriber, - DestinationSelectionStrategy, subscriberFirst } from './destination-selection-strategies'; -import { Destination } from './destination-service-types'; +import type { Destination } from './destination-service-types'; const destName = 'DESTINATION'; diff --git a/packages/connectivity/src/scp-cf/destination/destination-accessor-proxy-configuration.spec.ts b/packages/connectivity/src/scp-cf/destination/destination-accessor-proxy-configuration.spec.ts index 60fec58360..1c483d5fb8 100644 --- a/packages/connectivity/src/scp-cf/destination/destination-accessor-proxy-configuration.spec.ts +++ b/packages/connectivity/src/scp-cf/destination/destination-accessor-proxy-configuration.spec.ts @@ -27,7 +27,7 @@ import { import { getDestination } from './destination-accessor'; import * as ProxyUtil from './http-proxy-util'; import { alwaysProvider } from './destination-selection-strategies'; -import { Destination } from './destination-service-types'; +import type { Destination } from './destination-service-types'; import { destinationCache } from './destination-cache'; import { destinationServiceCache } from './destination-service-cache'; diff --git a/packages/connectivity/src/scp-cf/destination/destination-accessor-types.ts b/packages/connectivity/src/scp-cf/destination/destination-accessor-types.ts index 6c3bf4a989..a24b8df8c5 100644 --- a/packages/connectivity/src/scp-cf/destination/destination-accessor-types.ts +++ b/packages/connectivity/src/scp-cf/destination/destination-accessor-types.ts @@ -1,4 +1,4 @@ -import { VerifyJwtOptions } from '../jwt'; +import type { VerifyJwtOptions } from '../jwt'; import type { Destination, DestinationRetrievalOptions diff --git a/packages/connectivity/src/scp-cf/destination/destination-accessor.ts b/packages/connectivity/src/scp-cf/destination/destination-accessor.ts index c724c56ba8..901a8b18f9 100644 --- a/packages/connectivity/src/scp-cf/destination/destination-accessor.ts +++ b/packages/connectivity/src/scp-cf/destination/destination-accessor.ts @@ -2,24 +2,19 @@ import { createLogger, ErrorWithCause } from '@sap-cloud-sdk/util'; import { exchangeToken, shouldExchangeToken } from '../identity-service'; import { getDestinationServiceCredentials } from '../environment-accessor'; import { getSubdomain } from '../jwt'; -import { - DestinationOrFetchOptions, - sanitizeDestination, - toDestinationNameUrl -} from './destination'; -import { Destination } from './destination-service-types'; +import type { DestinationOrFetchOptions } from './destination'; +import { sanitizeDestination, toDestinationNameUrl } from './destination'; +import type { Destination } from './destination-service-types'; import { searchEnvVariablesForDestination } from './destination-from-env'; -import { - DestinationForServiceBindingOptions, - searchServiceBindingForDestination -} from './destination-from-vcap'; +import type { DestinationForServiceBindingOptions } from './destination-from-vcap'; +import { searchServiceBindingForDestination } from './destination-from-vcap'; import { getDestinationFromDestinationService } from './destination-from-service'; -import { +import type { DestinationFetchOptions, - isDestinationFetchOptions, AllDestinationOptions, DestinationWithoutToken } from './destination-accessor-types'; +import { isDestinationFetchOptions } from './destination-accessor-types'; import { searchRegisteredDestination } from './destination-from-registration'; import { getSubscriberToken } from './get-subscriber-token'; import { getProviderServiceToken } from './get-provider-token'; diff --git a/packages/connectivity/src/scp-cf/destination/destination-cache.spec.ts b/packages/connectivity/src/scp-cf/destination/destination-cache.spec.ts index 90f38b2844..784210cb75 100644 --- a/packages/connectivity/src/scp-cf/destination/destination-cache.spec.ts +++ b/packages/connectivity/src/scp-cf/destination/destination-cache.spec.ts @@ -31,7 +31,7 @@ import { mockJwtBearerToken, mockServiceToken } from '../../../../../test-resources/test/test-util/token-accessor-mocks'; -import { +import type { AuthenticationType, Destination, DestinationAuthToken @@ -43,10 +43,10 @@ import { subscriberFirst } from './destination-selection-strategies'; import { getDestinationFromDestinationService } from './destination-from-service'; +import type { IsolationStrategy } from './destination-cache'; import { destinationCache, getDestinationCacheKey, - IsolationStrategy, setDestinationCache } from './destination-cache'; import { getDestination } from './destination-accessor'; diff --git a/packages/connectivity/src/scp-cf/destination/destination-cache.ts b/packages/connectivity/src/scp-cf/destination/destination-cache.ts index f97a6b9f3e..2dfec69be2 100644 --- a/packages/connectivity/src/scp-cf/destination/destination-cache.ts +++ b/packages/connectivity/src/scp-cf/destination/destination-cache.ts @@ -1,10 +1,11 @@ import { createLogger, first } from '@sap-cloud-sdk/util'; import { getTenantId, userId } from '../jwt'; -import { JwtPayload } from '../jsonwebtoken-type'; -import { AsyncCache, AsyncCacheInterface } from '../async-cache'; -import { Destination } from './destination-service-types'; -import { DestinationsByType } from './destination-accessor-types'; -import { SubscriberToken } from './get-subscriber-token'; +import type { JwtPayload } from '../jsonwebtoken-type'; +import type { AsyncCacheInterface } from '../async-cache'; +import { AsyncCache } from '../async-cache'; +import type { Destination } from './destination-service-types'; +import type { DestinationsByType } from './destination-accessor-types'; +import type { SubscriberToken } from './get-subscriber-token'; const logger = createLogger({ package: 'connectivity', diff --git a/packages/connectivity/src/scp-cf/destination/destination-from-env.spec.ts b/packages/connectivity/src/scp-cf/destination/destination-from-env.spec.ts index 4455843bc3..08c2e0d193 100644 --- a/packages/connectivity/src/scp-cf/destination/destination-from-env.spec.ts +++ b/packages/connectivity/src/scp-cf/destination/destination-from-env.spec.ts @@ -5,7 +5,7 @@ import { unmockDestinationsEnv } from '../../../../../test-resources/test/test-util/request-mocker'; import { signedJwt } from '../../../../../test-resources/test/test-util'; -import { Destination } from './destination-service-types'; +import type { Destination } from './destination-service-types'; import { getDestinationFromEnvByName, getDestinationsFromEnv, diff --git a/packages/connectivity/src/scp-cf/destination/destination-from-env.ts b/packages/connectivity/src/scp-cf/destination/destination-from-env.ts index a2553b165c..6a035bb6a6 100644 --- a/packages/connectivity/src/scp-cf/destination/destination-from-env.ts +++ b/packages/connectivity/src/scp-cf/destination/destination-from-env.ts @@ -4,7 +4,7 @@ import { isDestinationConfiguration, parseDestination } from './destination'; -import { DestinationFetchOptions } from './destination-accessor-types'; +import type { DestinationFetchOptions } from './destination-accessor-types'; import type { Destination } from './destination-service-types'; import { addProxyConfigurationInternet, diff --git a/packages/connectivity/src/scp-cf/destination/destination-from-registration.spec.ts b/packages/connectivity/src/scp-cf/destination/destination-from-registration.spec.ts index b7e9b6d713..2e718a3d62 100644 --- a/packages/connectivity/src/scp-cf/destination/destination-from-registration.spec.ts +++ b/packages/connectivity/src/scp-cf/destination/destination-from-registration.spec.ts @@ -11,8 +11,8 @@ import { xsuaaBindingMock } from '../../../../../test-resources/test/test-util'; import { certAsString } from '../../../../../test-resources/test/test-util/test-certificate'; +import type { DestinationWithName } from './destination-from-registration'; import { - DestinationWithName, registerDestination, searchRegisteredDestination } from './destination-from-registration'; diff --git a/packages/connectivity/src/scp-cf/destination/destination-from-registration.ts b/packages/connectivity/src/scp-cf/destination/destination-from-registration.ts index ecc9289844..8e7f9da0d8 100644 --- a/packages/connectivity/src/scp-cf/destination/destination-from-registration.ts +++ b/packages/connectivity/src/scp-cf/destination/destination-from-registration.ts @@ -5,12 +5,11 @@ import { defaultTenantId, getTenantId } from '../jwt'; -import { DestinationFetchOptions } from './destination-accessor-types'; -import { - IsolationStrategy, - getDefaultIsolationStrategy -} from './destination-cache'; -import { Destination, isHttpDestination } from './destination-service-types'; +import type { DestinationFetchOptions } from './destination-accessor-types'; +import type { IsolationStrategy } from './destination-cache'; +import { getDefaultIsolationStrategy } from './destination-cache'; +import type { Destination } from './destination-service-types'; +import { isHttpDestination } from './destination-service-types'; import { addProxyConfigurationInternet, proxyStrategy diff --git a/packages/connectivity/src/scp-cf/destination/destination-from-service.ts b/packages/connectivity/src/scp-cf/destination/destination-from-service.ts index 1fbd9f1d23..4a19d4e90b 100644 --- a/packages/connectivity/src/scp-cf/destination/destination-from-service.ts +++ b/packages/connectivity/src/scp-cf/destination/destination-from-service.ts @@ -1,15 +1,16 @@ import { createLogger } from '@sap-cloud-sdk/util'; import { addProxyConfigurationOnPrem } from '../connectivity-service'; +import type { Service } from '../environment-accessor'; import { - Service, getDestinationServiceCredentials, getServiceBinding } from '../environment-accessor'; import { exchangeToken, shouldExchangeToken } from '../identity-service'; -import { JwtPair, getSubdomain, isXsuaaToken } from '../jwt'; +import type { JwtPair } from '../jwt'; +import { getSubdomain, isXsuaaToken } from '../jwt'; import { isIdenticalTenant } from '../tenant'; import { jwtBearerToken } from '../token-accessor'; -import { +import type { DestinationFetchOptions, DestinationsByType } from './destination-accessor-types'; @@ -22,22 +23,20 @@ import { alwaysSubscriber, subscriberFirst } from './destination-selection-strategies'; +import type { AuthAndExchangeTokens } from './destination-service'; import { - AuthAndExchangeTokens, fetchCertificate, fetchDestinationWithTokenRetrieval, fetchDestinationWithoutTokenRetrieval } from './destination-service'; -import { - assertHttpDestination, - Destination -} from './destination-service-types'; +import type { Destination } from './destination-service-types'; +import { assertHttpDestination } from './destination-service-types'; import { getProviderServiceToken } from './get-provider-token'; +import type { SubscriberToken } from './get-subscriber-token'; import { getRequiredSubscriberToken, getSubscriberToken, - hasTokens, - SubscriberToken + hasTokens } from './get-subscriber-token'; import { addProxyConfigurationInternet, diff --git a/packages/connectivity/src/scp-cf/destination/destination-from-vcap.spec.ts b/packages/connectivity/src/scp-cf/destination/destination-from-vcap.spec.ts index ad724adbfe..001e460846 100644 --- a/packages/connectivity/src/scp-cf/destination/destination-from-vcap.spec.ts +++ b/packages/connectivity/src/scp-cf/destination/destination-from-vcap.spec.ts @@ -7,7 +7,7 @@ import { testTenants } from '../../../../../test-resources/test/test-util'; import * as tokenAccessor from '../token-accessor'; -import { Service } from '../environment-accessor/environment-accessor-types'; +import type { Service } from '../environment-accessor/environment-accessor-types'; import { decodeJwt } from '../jwt'; import { getDestination } from './destination-accessor'; import { getDestinationFromServiceBinding } from './destination-from-vcap'; diff --git a/packages/connectivity/src/scp-cf/destination/destination-from-vcap.ts b/packages/connectivity/src/scp-cf/destination/destination-from-vcap.ts index 625db6acd4..70175421fc 100644 --- a/packages/connectivity/src/scp-cf/destination/destination-from-vcap.ts +++ b/packages/connectivity/src/scp-cf/destination/destination-from-vcap.ts @@ -1,14 +1,15 @@ import { createLogger } from '@sap-cloud-sdk/util'; -import { JwtPayload } from '../jsonwebtoken-type'; +import type { JwtPayload } from '../jsonwebtoken-type'; import { decodeJwt, decodeOrMakeJwt } from '../jwt'; -import { Service } from '../environment-accessor/environment-accessor-types'; +import type { Service } from '../environment-accessor/environment-accessor-types'; import { getServiceBindingByInstanceName } from '../environment-accessor'; -import { CachingOptions } from '../cache'; +import type { CachingOptions } from '../cache'; import { addProxyConfigurationInternet, proxyStrategy } from './http-proxy-util'; -import { Destination, isHttpDestination } from './destination-service-types'; +import type { Destination } from './destination-service-types'; +import { isHttpDestination } from './destination-service-types'; import type { DestinationFetchOptions } from './destination-accessor-types'; import { destinationCache } from './destination-cache'; import { serviceToDestinationTransformers } from './service-binding-to-destination'; diff --git a/packages/connectivity/src/scp-cf/destination/destination-selection-strategies.spec.ts b/packages/connectivity/src/scp-cf/destination/destination-selection-strategies.spec.ts index a608ad8f3d..8522426212 100644 --- a/packages/connectivity/src/scp-cf/destination/destination-selection-strategies.spec.ts +++ b/packages/connectivity/src/scp-cf/destination/destination-selection-strategies.spec.ts @@ -1,5 +1,5 @@ import { createLogger } from '@sap-cloud-sdk/util'; -import { AllDestinations } from './destination-accessor-types'; +import type { AllDestinations } from './destination-accessor-types'; import { alwaysProvider, alwaysSubscriber, diff --git a/packages/connectivity/src/scp-cf/destination/destination-service-cache.spec.ts b/packages/connectivity/src/scp-cf/destination/destination-service-cache.spec.ts index 510df578ef..a52258f318 100644 --- a/packages/connectivity/src/scp-cf/destination/destination-service-cache.spec.ts +++ b/packages/connectivity/src/scp-cf/destination/destination-service-cache.spec.ts @@ -11,7 +11,7 @@ import { mockVerifyJwt } from '../../../../../test-resources/test/test-util/destination-service-mocks'; import { decodeJwt } from '../jwt'; -import { Destination } from './destination-service-types'; +import type { Destination } from './destination-service-types'; import { destinationServiceCache } from './destination-service-cache'; import { fetchDestinations } from './destination-service'; diff --git a/packages/connectivity/src/scp-cf/destination/destination-service-cache.ts b/packages/connectivity/src/scp-cf/destination/destination-service-cache.ts index 80caf54c34..4c06c9cd5e 100644 --- a/packages/connectivity/src/scp-cf/destination/destination-service-cache.ts +++ b/packages/connectivity/src/scp-cf/destination/destination-service-cache.ts @@ -1,6 +1,6 @@ -import { JwtPayload } from '../jsonwebtoken-type'; +import type { JwtPayload } from '../jsonwebtoken-type'; import { Cache } from '../cache'; -import { Destination } from './destination-service-types'; +import type { Destination } from './destination-service-types'; import { getDestinationCacheKey } from './destination-cache'; const DestinationServiceCache = (cache: Cache) => ({ diff --git a/packages/connectivity/src/scp-cf/destination/destination-service.spec.ts b/packages/connectivity/src/scp-cf/destination/destination-service.spec.ts index 29d1adcc91..fc3b22d739 100644 --- a/packages/connectivity/src/scp-cf/destination/destination-service.spec.ts +++ b/packages/connectivity/src/scp-cf/destination/destination-service.spec.ts @@ -4,18 +4,20 @@ import nock from 'nock'; import * as resilienceMethods from '@sap-cloud-sdk/resilience/internal'; import { circuitBreakers } from '@sap-cloud-sdk/resilience/internal'; // eslint-disable-next-line import/named -import axios, { RawAxiosRequestConfig } from 'axios'; +import type { RawAxiosRequestConfig } from 'axios'; +import axios from 'axios'; import { mockCertificateCall } from '../../../../../test-resources/test/test-util'; import { destinationServiceUri } from '../../../../../test-resources/test/test-util/environment-mocks'; import { privateKey } from '../../../../../test-resources/test/test-util/keys'; -import { DestinationConfiguration, parseDestination } from './destination'; +import type { DestinationConfiguration } from './destination'; +import { parseDestination } from './destination'; import { fetchCertificate, fetchDestinationWithTokenRetrieval, fetchDestinationWithoutTokenRetrieval, fetchDestinations } from './destination-service'; -import { Destination } from './destination-service-types'; +import type { Destination } from './destination-service-types'; const jwt = jwt123.sign( JSON.stringify({ user_id: 'user', zid: 'tenant' }), diff --git a/packages/connectivity/src/scp-cf/destination/destination-service.ts b/packages/connectivity/src/scp-cf/destination/destination-service.ts index f1a196daac..77acf3d021 100644 --- a/packages/connectivity/src/scp-cf/destination/destination-service.ts +++ b/packages/connectivity/src/scp-cf/destination/destination-service.ts @@ -5,29 +5,23 @@ import { removeTrailingSlashes } from '@sap-cloud-sdk/util'; // eslint-disable-next-line import/named -import axios, { RawAxiosRequestConfig, AxiosResponse, AxiosError } from 'axios'; +import type { RawAxiosRequestConfig, AxiosResponse, AxiosError } from 'axios'; +import axios from 'axios'; import { executeWithMiddleware } from '@sap-cloud-sdk/resilience/internal'; -import { - resilience, - Middleware, - MiddlewareContext -} from '@sap-cloud-sdk/resilience'; +import type { Middleware, MiddlewareContext } from '@sap-cloud-sdk/resilience'; +import { resilience } from '@sap-cloud-sdk/resilience'; import * as asyncRetry from 'async-retry'; import { decodeJwt, getTenantId, wrapJwtInHeader } from '../jwt'; import { urlAndAgent } from '../../http-agent'; import { buildAuthorizationHeaders } from '../authorization-header'; -import { - DestinationConfiguration, - DestinationJson, - parseCertificate, - parseDestination -} from './destination'; -import { +import type { DestinationConfiguration, DestinationJson } from './destination'; +import { parseCertificate, parseDestination } from './destination'; +import type { DestinationFetchOptions, DestinationsByType } from './destination-accessor-types'; import { destinationServiceCache } from './destination-service-cache'; -import { +import type { Destination, DestinationCertificate } from './destination-service-types'; diff --git a/packages/connectivity/src/scp-cf/destination/destination.spec.ts b/packages/connectivity/src/scp-cf/destination/destination.spec.ts index 762d1f735a..94bfe07692 100644 --- a/packages/connectivity/src/scp-cf/destination/destination.spec.ts +++ b/packages/connectivity/src/scp-cf/destination/destination.spec.ts @@ -3,12 +3,9 @@ import { certificateMultipleResponse, certificateSingleResponse } from '../../../../../test-resources/test/test-util/example-destination-service-responses'; -import { - DestinationConfiguration, - parseDestination, - sanitizeDestination -} from './destination'; -import { Destination } from './destination-service-types'; +import type { DestinationConfiguration } from './destination'; +import { parseDestination, sanitizeDestination } from './destination'; +import type { Destination } from './destination-service-types'; describe('parseDestination', () => { it('destination is parsed correctly ', () => { diff --git a/packages/connectivity/src/scp-cf/destination/destination.ts b/packages/connectivity/src/scp-cf/destination/destination.ts index 636241db6c..3a310f858c 100644 --- a/packages/connectivity/src/scp-cf/destination/destination.ts +++ b/packages/connectivity/src/scp-cf/destination/destination.ts @@ -1,10 +1,8 @@ -import { Xor } from '@sap-cloud-sdk/util'; -import { - DestinationFetchOptions, - isDestinationFetchOptions -} from './destination-accessor-types'; +import type { Xor } from '@sap-cloud-sdk/util'; +import type { DestinationFetchOptions } from './destination-accessor-types'; +import { isDestinationFetchOptions } from './destination-accessor-types'; import type { DestinationForServiceBindingOptions } from './destination-from-vcap'; -import { +import type { AuthenticationType, Destination, DestinationAuthToken, diff --git a/packages/connectivity/src/scp-cf/destination/forward-auth-token.ts b/packages/connectivity/src/scp-cf/destination/forward-auth-token.ts index 948fa5671b..c6e1920772 100644 --- a/packages/connectivity/src/scp-cf/destination/forward-auth-token.ts +++ b/packages/connectivity/src/scp-cf/destination/forward-auth-token.ts @@ -1,6 +1,9 @@ import { createLogger } from '@sap-cloud-sdk/util'; import { decodeJwt } from '../jwt'; -import { Destination, DestinationAuthToken } from './destination-service-types'; +import type { + Destination, + DestinationAuthToken +} from './destination-service-types'; const logger = createLogger({ package: 'connectivity', diff --git a/packages/connectivity/src/scp-cf/destination/get-provider-token.ts b/packages/connectivity/src/scp-cf/destination/get-provider-token.ts index 29fb3d62c8..13f0d0dbc2 100644 --- a/packages/connectivity/src/scp-cf/destination/get-provider-token.ts +++ b/packages/connectivity/src/scp-cf/destination/get-provider-token.ts @@ -1,6 +1,7 @@ -import { decodeJwt, JwtPair } from '../jwt'; +import type { JwtPair } from '../jwt'; +import { decodeJwt } from '../jwt'; import { serviceToken } from '../token-accessor'; -import { DestinationOptions } from './destination-accessor-types'; +import type { DestinationOptions } from './destination-accessor-types'; /** * @internal diff --git a/packages/connectivity/src/scp-cf/destination/get-subscriber-token.ts b/packages/connectivity/src/scp-cf/destination/get-subscriber-token.ts index ccf456786d..875cd9fa25 100644 --- a/packages/connectivity/src/scp-cf/destination/get-subscriber-token.ts +++ b/packages/connectivity/src/scp-cf/destination/get-subscriber-token.ts @@ -1,15 +1,10 @@ import { createLogger } from '@sap-cloud-sdk/util'; -import { JwtPayload } from '../jsonwebtoken-type'; -import { - decodeJwt, - getJwtPair, - isXsuaaToken, - JwtPair, - verifyJwt -} from '../jwt'; +import type { JwtPayload } from '../jsonwebtoken-type'; +import type { JwtPair } from '../jwt'; +import { decodeJwt, getJwtPair, isXsuaaToken, verifyJwt } from '../jwt'; import { serviceToken } from '../token-accessor'; import { getIssuerSubdomain } from '../subdomain-replacer'; -import { DestinationOptions } from './destination-accessor-types'; +import type { DestinationOptions } from './destination-accessor-types'; const logger = createLogger({ package: 'connectivity', diff --git a/packages/connectivity/src/scp-cf/destination/http-proxy-util.spec.ts b/packages/connectivity/src/scp-cf/destination/http-proxy-util.spec.ts index 48c2926c31..0b00e2c0a2 100644 --- a/packages/connectivity/src/scp-cf/destination/http-proxy-util.spec.ts +++ b/packages/connectivity/src/scp-cf/destination/http-proxy-util.spec.ts @@ -1,13 +1,13 @@ import { createLogger } from '@sap-cloud-sdk/util'; import { basicHeader } from '../authorization-header'; -import { BasicProxyConfiguration } from '../connectivity-service-types'; +import type { BasicProxyConfiguration } from '../connectivity-service-types'; import { addProxyConfigurationInternet, getProxyConfig, parseProxyEnv, proxyStrategy } from './http-proxy-util'; -import { HttpDestination } from './destination-service-types'; +import type { HttpDestination } from './destination-service-types'; describe('proxy-util', () => { afterEach(() => { diff --git a/packages/connectivity/src/scp-cf/destination/http-proxy-util.ts b/packages/connectivity/src/scp-cf/destination/http-proxy-util.ts index 121efd804b..adfbddcf90 100644 --- a/packages/connectivity/src/scp-cf/destination/http-proxy-util.ts +++ b/packages/connectivity/src/scp-cf/destination/http-proxy-util.ts @@ -1,17 +1,15 @@ import { URL } from 'node:url'; import { createLogger, sanitizeRecord } from '@sap-cloud-sdk/util'; -import { Protocol, getProtocol } from '../protocol'; -import { +import type { Protocol } from '../protocol'; +import { getProtocol } from '../protocol'; +import type { BasicProxyConfiguration, ProxyConfiguration } from '../connectivity-service-types'; import { basicHeader } from '../authorization-header'; import { getProtocolOrDefault } from '../get-protocol'; -import { - Destination, - HttpDestination, - isHttpDestination -} from './destination-service-types'; +import type { Destination, HttpDestination } from './destination-service-types'; +import { isHttpDestination } from './destination-service-types'; const logger = createLogger({ package: 'connectivity', diff --git a/packages/connectivity/src/scp-cf/destination/register-destination-cache.ts b/packages/connectivity/src/scp-cf/destination/register-destination-cache.ts index b8022e1408..e36d64f2fa 100644 --- a/packages/connectivity/src/scp-cf/destination/register-destination-cache.ts +++ b/packages/connectivity/src/scp-cf/destination/register-destination-cache.ts @@ -1,13 +1,11 @@ import { readFile } from 'fs/promises'; import { X509Certificate } from 'crypto'; import { createLogger } from '@sap-cloud-sdk/util'; -import { MtlsOptions } from '../../http-agent'; -import { AsyncCache, AsyncCacheInterface } from '../async-cache'; -import { - DefaultDestinationCache, - DestinationCache, - DestinationCacheType -} from './destination-cache'; +import type { MtlsOptions } from '../../http-agent'; +import type { AsyncCacheInterface } from '../async-cache'; +import { AsyncCache } from '../async-cache'; +import type { DestinationCacheType } from './destination-cache'; +import { DefaultDestinationCache, DestinationCache } from './destination-cache'; const logger = createLogger('register-destination-cache'); diff --git a/packages/connectivity/src/scp-cf/destination/service-binding-to-destination.ts b/packages/connectivity/src/scp-cf/destination/service-binding-to-destination.ts index 2cd1ec934c..c1782d0d9b 100644 --- a/packages/connectivity/src/scp-cf/destination/service-binding-to-destination.ts +++ b/packages/connectivity/src/scp-cf/destination/service-binding-to-destination.ts @@ -1,11 +1,11 @@ -import { Service } from '../environment-accessor/environment-accessor-types'; +import type { Service } from '../environment-accessor/environment-accessor-types'; import { serviceToken } from '../token-accessor'; import { decodeJwt } from '../jwt'; import type { ServiceBindingTransformFunction, ServiceBindingTransformOptions } from './destination-from-vcap'; -import { Destination } from './destination-service-types'; +import type { Destination } from './destination-service-types'; /** * @internal diff --git a/packages/connectivity/src/scp-cf/environment-accessor/destination.ts b/packages/connectivity/src/scp-cf/environment-accessor/destination.ts index 28c67fe1cc..cd768cd9ae 100644 --- a/packages/connectivity/src/scp-cf/environment-accessor/destination.ts +++ b/packages/connectivity/src/scp-cf/environment-accessor/destination.ts @@ -1,4 +1,4 @@ -import { DestinationServiceCredentials } from './environment-accessor-types'; +import type { DestinationServiceCredentials } from './environment-accessor-types'; import { getServiceCredentials } from './service-credentials'; /** diff --git a/packages/connectivity/src/scp-cf/environment-accessor/service-bindings.ts b/packages/connectivity/src/scp-cf/environment-accessor/service-bindings.ts index a943879947..fc13708019 100644 --- a/packages/connectivity/src/scp-cf/environment-accessor/service-bindings.ts +++ b/packages/connectivity/src/scp-cf/environment-accessor/service-bindings.ts @@ -1,6 +1,6 @@ import { createLogger } from '@sap-cloud-sdk/util'; import * as xsenv from '@sap/xsenv'; -import { Service } from './environment-accessor-types'; +import type { Service } from './environment-accessor-types'; const logger = createLogger({ package: 'connectivity', diff --git a/packages/connectivity/src/scp-cf/environment-accessor/service-credentials.ts b/packages/connectivity/src/scp-cf/environment-accessor/service-credentials.ts index 46122d76ee..c45e110c5f 100644 --- a/packages/connectivity/src/scp-cf/environment-accessor/service-credentials.ts +++ b/packages/connectivity/src/scp-cf/environment-accessor/service-credentials.ts @@ -1,7 +1,7 @@ import { createLogger } from '@sap-cloud-sdk/util'; -import { JwtPayload } from '../jsonwebtoken-type'; +import type { JwtPayload } from '../jsonwebtoken-type'; import { audiences, decodeJwt } from '../jwt'; -import { ServiceCredentials } from './environment-accessor-types'; +import type { ServiceCredentials } from './environment-accessor-types'; import { getServiceBindings } from './service-bindings'; const logger = createLogger({ diff --git a/packages/connectivity/src/scp-cf/environment-accessor/xsuaa.spec.ts b/packages/connectivity/src/scp-cf/environment-accessor/xsuaa.spec.ts index 37552cfb14..25143eac2f 100644 --- a/packages/connectivity/src/scp-cf/environment-accessor/xsuaa.spec.ts +++ b/packages/connectivity/src/scp-cf/environment-accessor/xsuaa.spec.ts @@ -4,7 +4,7 @@ import { getXsuaaService, getXsuaaServiceCredentials } from './xsuaa'; -import { ServiceCredentials } from './environment-accessor-types'; +import type { ServiceCredentials } from './environment-accessor-types'; const clientId = 'sb-jwt-app'; diff --git a/packages/connectivity/src/scp-cf/environment-accessor/xsuaa.ts b/packages/connectivity/src/scp-cf/environment-accessor/xsuaa.ts index 1e7d57ce9f..064a3ece9e 100644 --- a/packages/connectivity/src/scp-cf/environment-accessor/xsuaa.ts +++ b/packages/connectivity/src/scp-cf/environment-accessor/xsuaa.ts @@ -1,6 +1,6 @@ import { XsuaaService } from '@sap/xssec'; -import { JwtPayload } from '../jsonwebtoken-type'; -import { +import type { JwtPayload } from '../jsonwebtoken-type'; +import type { ServiceCredentials, XsuaaServiceCredentials } from './environment-accessor-types'; diff --git a/packages/connectivity/src/scp-cf/get-protocol.ts b/packages/connectivity/src/scp-cf/get-protocol.ts index 9f4688f8bc..46d73b4d27 100644 --- a/packages/connectivity/src/scp-cf/get-protocol.ts +++ b/packages/connectivity/src/scp-cf/get-protocol.ts @@ -1,6 +1,7 @@ import { createLogger } from '@sap-cloud-sdk/util'; -import { HttpDestination } from './destination/destination-service-types'; -import { Protocol, getProtocol } from './protocol'; +import type { HttpDestination } from './destination/destination-service-types'; +import type { Protocol } from './protocol'; +import { getProtocol } from './protocol'; const logger = createLogger({ package: 'connectivity', diff --git a/packages/connectivity/src/scp-cf/header-builder-for-destination.spec.ts b/packages/connectivity/src/scp-cf/header-builder-for-destination.spec.ts index 75cf1b89ec..f2dfb594e0 100644 --- a/packages/connectivity/src/scp-cf/header-builder-for-destination.spec.ts +++ b/packages/connectivity/src/scp-cf/header-builder-for-destination.spec.ts @@ -1,5 +1,5 @@ import { buildHeadersForDestination } from './header-builder-for-destination'; -import { Destination } from './destination'; +import type { Destination } from './destination'; describe('header builder for destination', () => { it('adds location id headers if there is a cloudConnectorLocationId in the destination', async () => { diff --git a/packages/connectivity/src/scp-cf/header-builder-for-destination.ts b/packages/connectivity/src/scp-cf/header-builder-for-destination.ts index e746810ab4..54c3460aa4 100644 --- a/packages/connectivity/src/scp-cf/header-builder-for-destination.ts +++ b/packages/connectivity/src/scp-cf/header-builder-for-destination.ts @@ -4,7 +4,7 @@ import { pickNonNullish } from '@sap-cloud-sdk/util'; import { buildAuthorizationHeaders } from './authorization-header'; -import { Destination } from './destination/destination-service-types'; +import type { Destination } from './destination/destination-service-types'; /** * Build a request header object, that contains authentication headers and SAP specific headers like 'sap-client', from a given destination. diff --git a/packages/connectivity/src/scp-cf/identity-service.ts b/packages/connectivity/src/scp-cf/identity-service.ts index ec158de2d3..85ec5c912d 100644 --- a/packages/connectivity/src/scp-cf/identity-service.ts +++ b/packages/connectivity/src/scp-cf/identity-service.ts @@ -1,4 +1,4 @@ -import { DestinationOptions } from './destination'; +import type { DestinationOptions } from './destination'; import { decodeJwt, isXsuaaToken } from './jwt'; import { jwtBearerToken } from './token-accessor'; diff --git a/packages/connectivity/src/scp-cf/jwt.ts b/packages/connectivity/src/scp-cf/jwt.ts index e675a35873..996bc41a14 100644 --- a/packages/connectivity/src/scp-cf/jwt.ts +++ b/packages/connectivity/src/scp-cf/jwt.ts @@ -1,4 +1,4 @@ -import { IncomingMessage } from 'http'; +import type { IncomingMessage } from 'http'; import { createLogger, ErrorWithCause, @@ -8,8 +8,12 @@ import { createSecurityContext } from '@sap/xssec'; import { decode } from 'jsonwebtoken'; import { Cache } from './cache'; import { getServiceCredentials, getXsuaaService } from './environment-accessor'; -import { Jwt, JwtPayload, JwtWithPayloadObject } from './jsonwebtoken-type'; -import { TokenKey } from './xsuaa-service-types'; +import type { + Jwt, + JwtPayload, + JwtWithPayloadObject +} from './jsonwebtoken-type'; +import type { TokenKey } from './xsuaa-service-types'; import { getIssuerSubdomain } from './subdomain-replacer'; const logger = createLogger({ diff --git a/packages/connectivity/src/scp-cf/subdomain-replacer.ts b/packages/connectivity/src/scp-cf/subdomain-replacer.ts index db142d67d7..466d22b44a 100644 --- a/packages/connectivity/src/scp-cf/subdomain-replacer.ts +++ b/packages/connectivity/src/scp-cf/subdomain-replacer.ts @@ -1,5 +1,5 @@ import { URL } from 'url'; -import { JwtPayload } from './jsonwebtoken-type'; +import type { JwtPayload } from './jsonwebtoken-type'; /** * @internal diff --git a/packages/connectivity/src/scp-cf/tenant.ts b/packages/connectivity/src/scp-cf/tenant.ts index 3c8e27d227..78fd32f779 100644 --- a/packages/connectivity/src/scp-cf/tenant.ts +++ b/packages/connectivity/src/scp-cf/tenant.ts @@ -1,4 +1,4 @@ -import { JwtPayload } from './jsonwebtoken-type'; +import type { JwtPayload } from './jsonwebtoken-type'; import { getTenantId } from './jwt'; /** diff --git a/packages/connectivity/src/scp-cf/token-accessor.spec.ts b/packages/connectivity/src/scp-cf/token-accessor.spec.ts index d59fe972a0..54a3ecf8a0 100644 --- a/packages/connectivity/src/scp-cf/token-accessor.spec.ts +++ b/packages/connectivity/src/scp-cf/token-accessor.spec.ts @@ -29,7 +29,7 @@ import { } from '../../../../test-resources/test/test-util/xsuaa-service-mocks'; import { clientCredentialsTokenCache } from './client-credentials-token-cache'; import { jwtBearerToken, serviceToken } from './token-accessor'; -import { ClientCredentialsResponse } from './xsuaa-service-types'; +import type { ClientCredentialsResponse } from './xsuaa-service-types'; import { clearXsuaaServices } from './environment-accessor'; describe('token accessor', () => { diff --git a/packages/connectivity/src/scp-cf/token-accessor.ts b/packages/connectivity/src/scp-cf/token-accessor.ts index 851d219882..3ee63a2598 100644 --- a/packages/connectivity/src/scp-cf/token-accessor.ts +++ b/packages/connectivity/src/scp-cf/token-accessor.ts @@ -1,15 +1,15 @@ import { ErrorWithCause } from '@sap-cloud-sdk/util'; -import { JwtPayload } from './jsonwebtoken-type'; +import type { JwtPayload } from './jsonwebtoken-type'; import { getDefaultTenantId, getSubdomain, getTenantId, getTenantIdFromBinding } from './jwt'; -import { CachingOptions } from './cache'; +import type { CachingOptions } from './cache'; import { clientCredentialsTokenCache } from './client-credentials-token-cache'; import { resolveServiceBinding } from './environment-accessor'; -import { +import type { Service, XsuaaServiceCredentials } from './environment-accessor/environment-accessor-types'; diff --git a/packages/connectivity/src/scp-cf/xsuaa-service.ts b/packages/connectivity/src/scp-cf/xsuaa-service.ts index 2608d39fe6..77a8c254a7 100644 --- a/packages/connectivity/src/scp-cf/xsuaa-service.ts +++ b/packages/connectivity/src/scp-cf/xsuaa-service.ts @@ -1,11 +1,12 @@ import { executeWithMiddleware } from '@sap-cloud-sdk/resilience/internal'; -import { resilience, MiddlewareContext } from '@sap-cloud-sdk/resilience'; -import { JwtPayload } from './jsonwebtoken-type'; -import { +import type { MiddlewareContext } from '@sap-cloud-sdk/resilience'; +import { resilience } from '@sap-cloud-sdk/resilience'; +import type { JwtPayload } from './jsonwebtoken-type'; +import type { Service, ServiceCredentials } from './environment-accessor/environment-accessor-types'; -import { ClientCredentialsResponse } from './xsuaa-service-types'; +import type { ClientCredentialsResponse } from './xsuaa-service-types'; import { getXsuaaService, resolveServiceBinding } from './environment-accessor'; import { decodeJwt, getSubdomain, getTenantId } from './jwt'; diff --git a/packages/eslint-config/flat-config.js b/packages/eslint-config/flat-config.js index 077b9dbddd..6fc4bcfa54 100644 --- a/packages/eslint-config/flat-config.js +++ b/packages/eslint-config/flat-config.js @@ -43,6 +43,7 @@ const flatConfig = [ '@typescript-eslint/array-type': 'error', '@typescript-eslint/consistent-type-assertions': 'error', '@typescript-eslint/consistent-type-definitions': 'error', + '@typescript-eslint/consistent-type-imports': 'error', '@typescript-eslint/explicit-member-accessibility': [ 'off', { diff --git a/packages/eslint-config/index.js b/packages/eslint-config/index.js index 4eb9c2436d..06c4fc48df 100644 --- a/packages/eslint-config/index.js +++ b/packages/eslint-config/index.js @@ -42,6 +42,7 @@ module.exports = { '@typescript-eslint/array-type': 'error', '@typescript-eslint/consistent-type-assertions': 'error', '@typescript-eslint/consistent-type-definitions': 'error', + '@typescript-eslint/consistent-type-imports': 'error', '@typescript-eslint/explicit-member-accessibility': [ 'off', { diff --git a/packages/generator-common/src/cli-parser.ts b/packages/generator-common/src/cli-parser.ts index 12a4880274..062f63b141 100644 --- a/packages/generator-common/src/cli-parser.ts +++ b/packages/generator-common/src/cli-parser.ts @@ -1,5 +1,6 @@ import yargs from 'yargs'; -import { getOptionsWithoutDefaults, Option } from './options-parser'; +import type { Option } from './options-parser'; +import { getOptionsWithoutDefaults } from './options-parser'; /** * @internal diff --git a/packages/generator-common/src/compiler.spec.ts b/packages/generator-common/src/compiler.spec.ts index 298d6dc448..95b824c350 100644 --- a/packages/generator-common/src/compiler.spec.ts +++ b/packages/generator-common/src/compiler.spec.ts @@ -2,19 +2,16 @@ import { promises } from 'fs'; import { resolve, join } from 'path'; import { EOL } from 'os'; import mock from 'mock-fs'; -import { - CompilerOptions, - ModuleKind, - ModuleResolutionKind, - ScriptTarget -} from 'typescript'; +import type { CompilerOptions } from 'typescript'; +import { ModuleKind, ModuleResolutionKind, ScriptTarget } from 'typescript'; import { globSync } from 'glob'; import { readCompilerOptions, readIncludeExcludeWithDefaults, transpileDirectory } from './compiler'; -import { CreateFileOptions, defaultPrettierConfig } from './file-writer'; +import type { CreateFileOptions } from './file-writer'; +import { defaultPrettierConfig } from './file-writer'; const { readFile, readdir } = promises; diff --git a/packages/generator-common/src/compiler.ts b/packages/generator-common/src/compiler.ts index 064b59eb9a..45a2bf0901 100644 --- a/packages/generator-common/src/compiler.ts +++ b/packages/generator-common/src/compiler.ts @@ -2,20 +2,23 @@ import { parse, resolve } from 'path'; import { existsSync, promises } from 'fs'; import { EOL } from 'os'; import { createLogger } from '@sap-cloud-sdk/util'; -import { +import type { CompilerOptions, - createProgram, Diagnostic, - getPreEmitDiagnostics, - ModuleKind, - ModuleResolutionKind, NodeArray, - ScriptTarget, Statement, WriteFileCallback } from 'typescript'; +import { + createProgram, + getPreEmitDiagnostics, + ModuleKind, + ModuleResolutionKind, + ScriptTarget +} from 'typescript'; import { glob } from 'glob'; -import { createFile, CreateFileOptions, getFileExtension } from './file-writer'; +import type { CreateFileOptions } from './file-writer'; +import { createFile, getFileExtension } from './file-writer'; const logger = createLogger('compiler'); const { mkdir } = promises; diff --git a/packages/generator-common/src/file-writer/create-file.spec.ts b/packages/generator-common/src/file-writer/create-file.spec.ts index 11e9650547..ae3996c2c8 100644 --- a/packages/generator-common/src/file-writer/create-file.spec.ts +++ b/packages/generator-common/src/file-writer/create-file.spec.ts @@ -3,9 +3,9 @@ import { resolve } from 'path'; import mock from 'mock-fs'; import prettier from 'prettier'; import { createLogger, unixEOL } from '@sap-cloud-sdk/util'; +import type { CreateFileOptions } from './create-file'; import { createFile, - CreateFileOptions, defaultPrettierConfig, readPrettierConfig } from './create-file'; diff --git a/packages/generator-common/src/file-writer/create-file.ts b/packages/generator-common/src/file-writer/create-file.ts index 27b1998063..66fb2bd8fd 100644 --- a/packages/generator-common/src/file-writer/create-file.ts +++ b/packages/generator-common/src/file-writer/create-file.ts @@ -6,10 +6,8 @@ import { ErrorWithCause, unixEOL } from '@sap-cloud-sdk/util'; -import prettier, { - BuiltInParserName, - Options as PrettierOptions -} from 'prettier'; +import type { BuiltInParserName, Options as PrettierOptions } from 'prettier'; +import prettier from 'prettier'; import { getCopyrightHeader } from '../util'; const { writeFile, readFile } = promises; diff --git a/packages/generator-common/src/options-parser.ts b/packages/generator-common/src/options-parser.ts index a06780a4db..0f944e2eb3 100644 --- a/packages/generator-common/src/options-parser.ts +++ b/packages/generator-common/src/options-parser.ts @@ -1,7 +1,7 @@ import { dirname, extname, join, posix, resolve, sep } from 'path'; import { existsSync, lstatSync } from 'fs'; import { createLogger } from '@sap-cloud-sdk/util'; -import { InferredOptionType, Options as YargsOption } from 'yargs'; +import type { InferredOptionType, Options as YargsOption } from 'yargs'; const logger = createLogger('generator-options'); import { globSync, hasMagic } from 'glob'; diff --git a/packages/generator-common/src/options-per-service.spec.ts b/packages/generator-common/src/options-per-service.spec.ts index d110ace0f1..c8fe07bc61 100644 --- a/packages/generator-common/src/options-per-service.spec.ts +++ b/packages/generator-common/src/options-per-service.spec.ts @@ -10,11 +10,11 @@ jest.mock('path', () => { }); import mock from 'mock-fs'; +import type { OptionsPerService } from './options-per-service'; import { getOptionsPerService, getOriginalOptionsPerService, - getServiceOptions, - OptionsPerService + getServiceOptions } from './options-per-service'; describe('getOriginalOptionsPerService', () => { diff --git a/packages/generator-common/src/options.ts b/packages/generator-common/src/options.ts index 3cb6dbc790..522011b34b 100644 --- a/packages/generator-common/src/options.ts +++ b/packages/generator-common/src/options.ts @@ -1,10 +1,10 @@ +import type { ServiceType } from './options-parser'; import { buildResolveInputGlob, resolveGlob, resolveOptionsPerService, resolvePath, - resolveRequiredPath, - ServiceType + resolveRequiredPath } from './options-parser'; function getReadmeText(serviceType: ServiceType): string { diff --git a/packages/generator-common/src/sdk-metadata/sdk-metadata.ts b/packages/generator-common/src/sdk-metadata/sdk-metadata.ts index 5af5244d32..10ef5bff60 100644 --- a/packages/generator-common/src/sdk-metadata/sdk-metadata.ts +++ b/packages/generator-common/src/sdk-metadata/sdk-metadata.ts @@ -1,5 +1,9 @@ import levenshtein from 'fast-levenshtein'; -import { Client, MultiLineText, ServiceStatus } from './sdk-metadata-types'; +import type { + Client, + MultiLineText, + ServiceStatus +} from './sdk-metadata-types'; const distanceThreshold = 5; diff --git a/packages/generator/src/batch/file.ts b/packages/generator/src/batch/file.ts index 4f473f74d1..f1a393ec5b 100644 --- a/packages/generator/src/batch/file.ts +++ b/packages/generator/src/batch/file.ts @@ -1,5 +1,6 @@ -import { SourceFileStructure, StructureKind } from 'ts-morph'; -import { VdmServiceMetadata } from '../vdm-types'; +import type { SourceFileStructure } from 'ts-morph'; +import { StructureKind } from 'ts-morph'; +import type { VdmServiceMetadata } from '../vdm-types'; import { batchFunction, changesetFunction } from './function'; import { importBatchDeclarations } from './imports'; import { readRequestType, writeRequestType } from './type'; diff --git a/packages/generator/src/batch/function.ts b/packages/generator/src/batch/function.ts index d07a4c1b62..19c5408eab 100644 --- a/packages/generator/src/batch/function.ts +++ b/packages/generator/src/batch/function.ts @@ -1,10 +1,10 @@ -import { +import type { FunctionDeclarationOverloadStructure, - FunctionDeclarationStructure, - StructureKind + FunctionDeclarationStructure } from 'ts-morph'; +import { StructureKind } from 'ts-morph'; import { addLeadingNewline, getFunctionDoc } from '../typedoc'; -import { VdmServiceMetadata } from '../vdm-types'; +import type { VdmServiceMetadata } from '../vdm-types'; /** * @internal diff --git a/packages/generator/src/batch/imports.ts b/packages/generator/src/batch/imports.ts index 4b3462be78..1238b43a68 100644 --- a/packages/generator/src/batch/imports.ts +++ b/packages/generator/src/batch/imports.ts @@ -1,7 +1,8 @@ -import { ImportDeclarationStructure, StructureKind } from 'ts-morph'; +import type { ImportDeclarationStructure } from 'ts-morph'; +import { StructureKind } from 'ts-morph'; import { unique } from '@sap-cloud-sdk/util'; import { odataImportDeclarationTsMorph } from '../imports'; -import { VdmServiceMetadata } from '../vdm-types'; +import type { VdmServiceMetadata } from '../vdm-types'; /** * @internal diff --git a/packages/generator/src/batch/type.ts b/packages/generator/src/batch/type.ts index b8a4489abb..66e6c49b6b 100644 --- a/packages/generator/src/batch/type.ts +++ b/packages/generator/src/batch/type.ts @@ -1,5 +1,6 @@ -import { StructureKind, TypeAliasDeclarationStructure } from 'ts-morph'; -import { VdmServiceMetadata } from '../vdm-types'; +import type { TypeAliasDeclarationStructure } from 'ts-morph'; +import { StructureKind } from 'ts-morph'; +import type { VdmServiceMetadata } from '../vdm-types'; import { operationReturnType } from '../operations'; /** diff --git a/packages/generator/src/cli-parser.ts b/packages/generator/src/cli-parser.ts index 774071d37c..35172c837f 100644 --- a/packages/generator/src/cli-parser.ts +++ b/packages/generator/src/cli-parser.ts @@ -1,5 +1,6 @@ import { parseCmdArgsBuilder } from '@sap-cloud-sdk/generator-common/internal'; -import { cliOptions, GeneratorOptions } from './options'; +import type { GeneratorOptions } from './options'; +import { cliOptions } from './options'; const commandText = 'OData Client Code Generator for OData v2 and v4. Generates typed clients from EDMX and XML files for usage with the SAP Cloud SDK for JavaScript.'; diff --git a/packages/generator/src/complex-type/field-type-class.ts b/packages/generator/src/complex-type/field-type-class.ts index 0d5dfff844..40edd3158d 100644 --- a/packages/generator/src/complex-type/field-type-class.ts +++ b/packages/generator/src/complex-type/field-type-class.ts @@ -1,16 +1,15 @@ import { unixEOL } from '@sap-cloud-sdk/util'; -import { +import type { ClassDeclarationStructure, - PropertyDeclarationStructure, - Scope, - StructureKind + PropertyDeclarationStructure } from 'ts-morph'; +import { Scope, StructureKind } from 'ts-morph'; import { getGenericParameters } from '../generator-utils'; import { getComplexTypeFieldDescription, getComplexTypePropertyDescription } from '../typedoc'; -import { VdmComplexType, VdmProperty } from '../vdm-types'; +import type { VdmComplexType, VdmProperty } from '../vdm-types'; /** * @internal diff --git a/packages/generator/src/complex-type/file.ts b/packages/generator/src/complex-type/file.ts index 7071f17ba2..c12e6b89f2 100644 --- a/packages/generator/src/complex-type/file.ts +++ b/packages/generator/src/complex-type/file.ts @@ -1,6 +1,7 @@ -import { SourceFileStructure, StructureKind } from 'ts-morph'; -import { ODataVersion } from '@sap-cloud-sdk/util'; -import { VdmComplexType } from '../vdm-types'; +import type { SourceFileStructure } from 'ts-morph'; +import { StructureKind } from 'ts-morph'; +import type { ODataVersion } from '@sap-cloud-sdk/util'; +import type { VdmComplexType } from '../vdm-types'; import { fieldTypeClass } from './field-type-class'; import { importDeclarations } from './imports'; import { complexTypeInterface } from './interface'; diff --git a/packages/generator/src/complex-type/imports.spec.ts b/packages/generator/src/complex-type/imports.spec.ts index 99f0309074..507f5b5dc8 100644 --- a/packages/generator/src/complex-type/imports.spec.ts +++ b/packages/generator/src/complex-type/imports.spec.ts @@ -3,7 +3,7 @@ import { complexMeal, complexMealWithDesert } from '../../test/test-util/data-model'; -import { VdmComplexType } from '../vdm-types'; +import type { VdmComplexType } from '../vdm-types'; import { importDeclarations } from './imports'; describe('complex type imports', () => { diff --git a/packages/generator/src/complex-type/imports.ts b/packages/generator/src/complex-type/imports.ts index b55f932d9b..aafb1950c4 100644 --- a/packages/generator/src/complex-type/imports.ts +++ b/packages/generator/src/complex-type/imports.ts @@ -1,11 +1,11 @@ -import { ImportDeclarationStructure } from 'ts-morph'; -import { ODataVersion } from '@sap-cloud-sdk/util'; +import type { ImportDeclarationStructure } from 'ts-morph'; +import type { ODataVersion } from '@sap-cloud-sdk/util'; import { complexTypeImportDeclarations, odataImportDeclarationTsMorph, enumTypeImportDeclarations } from '../imports'; -import { VdmComplexType } from '../vdm-types'; +import type { VdmComplexType } from '../vdm-types'; /** * @internal diff --git a/packages/generator/src/complex-type/interface.ts b/packages/generator/src/complex-type/interface.ts index 9b6c1f7459..53c2faa3aa 100644 --- a/packages/generator/src/complex-type/interface.ts +++ b/packages/generator/src/complex-type/interface.ts @@ -1,10 +1,10 @@ -import { +import type { InterfaceDeclarationStructure, - PropertySignatureStructure, - StructureKind + PropertySignatureStructure } from 'ts-morph'; +import { StructureKind } from 'ts-morph'; import { getPropertyDescription, addLeadingNewline } from '../typedoc'; -import { VdmComplexType, VdmProperty } from '../vdm-types'; +import type { VdmComplexType, VdmProperty } from '../vdm-types'; /** * @internal diff --git a/packages/generator/src/complex-type/namespace.ts b/packages/generator/src/complex-type/namespace.ts index 466302e3a0..c55fe23f6d 100644 --- a/packages/generator/src/complex-type/namespace.ts +++ b/packages/generator/src/complex-type/namespace.ts @@ -1,11 +1,10 @@ import { unixEOL } from '@sap-cloud-sdk/util'; -import { +import type { ModuleDeclarationStructure, - StructureKind, - VariableDeclarationKind, VariableStatementStructure } from 'ts-morph'; -import { VdmComplexType } from '../vdm-types'; +import { StructureKind, VariableDeclarationKind } from 'ts-morph'; +import type { VdmComplexType } from '../vdm-types'; /** * @internal diff --git a/packages/generator/src/complex-type/util.ts b/packages/generator/src/complex-type/util.ts index 2000331483..4b90cf1c22 100644 --- a/packages/generator/src/complex-type/util.ts +++ b/packages/generator/src/complex-type/util.ts @@ -1,4 +1,4 @@ -import { VdmProperty } from '../vdm-types'; +import type { VdmProperty } from '../vdm-types'; /** * @internal diff --git a/packages/generator/src/edmx-parser/common/edmx-parser.ts b/packages/generator/src/edmx-parser/common/edmx-parser.ts index ecb879efec..1429db62f1 100644 --- a/packages/generator/src/edmx-parser/common/edmx-parser.ts +++ b/packages/generator/src/edmx-parser/common/edmx-parser.ts @@ -1,6 +1,6 @@ import { flat } from '@sap-cloud-sdk/util'; import { forceArray } from '../../generator-utils'; -import { +import type { EdmxComplexTypeBase, EdmxEntitySetBase, EdmxEntityTypeBase diff --git a/packages/generator/src/edmx-parser/common/edmx-types.ts b/packages/generator/src/edmx-parser/common/edmx-types.ts index 0f9f768788..0a19b30201 100644 --- a/packages/generator/src/edmx-parser/common/edmx-types.ts +++ b/packages/generator/src/edmx-parser/common/edmx-types.ts @@ -1,4 +1,4 @@ -import { SwaggerEntity } from '../../swagger-parser'; +import type { SwaggerEntity } from '../../swagger-parser'; /** * @internal */ diff --git a/packages/generator/src/edmx-parser/edmx-file-reader.ts b/packages/generator/src/edmx-parser/edmx-file-reader.ts index 7e5e1d34fd..91b7460c36 100644 --- a/packages/generator/src/edmx-parser/edmx-file-reader.ts +++ b/packages/generator/src/edmx-parser/edmx-file-reader.ts @@ -1,9 +1,12 @@ -import { PathLike, readdirSync, readFileSync } from 'fs'; +import type { PathLike } from 'fs'; +import { readdirSync, readFileSync } from 'fs'; import path, { basename, join, parse } from 'path'; import { XMLParser } from 'fast-xml-parser'; -import { ODataVersion, removeFileExtension } from '@sap-cloud-sdk/util'; +import type { ODataVersion } from '@sap-cloud-sdk/util'; +import { removeFileExtension } from '@sap-cloud-sdk/util'; import { forceArray } from '../generator-utils'; -import { readSwaggerFile, SwaggerMetadata } from '../swagger-parser'; +import type { SwaggerMetadata } from '../swagger-parser'; +import { readSwaggerFile } from '../swagger-parser'; import { getMergedPropertyWithNamespace } from './common'; /** * @internal diff --git a/packages/generator/src/edmx-parser/v2/edm-types.ts b/packages/generator/src/edmx-parser/v2/edm-types.ts index d61b1e9e5f..039356cedc 100644 --- a/packages/generator/src/edmx-parser/v2/edm-types.ts +++ b/packages/generator/src/edmx-parser/v2/edm-types.ts @@ -1,4 +1,4 @@ -import { +import type { EdmxEntityTypeBase, EdmxNamed, EdmxNamespaced, diff --git a/packages/generator/src/edmx-parser/v2/edmx-parser.ts b/packages/generator/src/edmx-parser/v2/edmx-parser.ts index 233f7de09f..b9149ad2d1 100644 --- a/packages/generator/src/edmx-parser/v2/edmx-parser.ts +++ b/packages/generator/src/edmx-parser/v2/edmx-parser.ts @@ -5,9 +5,9 @@ import { parseEntitySetsBase, parseEntityTypesBase } from '../common/edmx-parser'; -import { EdmxComplexTypeBase, EdmxEntitySetBase } from '../common'; +import type { EdmxComplexTypeBase, EdmxEntitySetBase } from '../common'; import { forceArray } from '../../generator-utils'; -import { +import type { EdmxAssociation, EdmxAssociationSet, EdmxEntityTypeV2, diff --git a/packages/generator/src/edmx-parser/v4/edm-types.ts b/packages/generator/src/edmx-parser/v4/edm-types.ts index e2d5173b8d..6be35407e4 100644 --- a/packages/generator/src/edmx-parser/v4/edm-types.ts +++ b/packages/generator/src/edmx-parser/v4/edm-types.ts @@ -1,4 +1,4 @@ -import { +import type { EdmxComplexTypeBase, EdmxEntitySetBase, EdmxEntityTypeBase, diff --git a/packages/generator/src/edmx-parser/v4/edmx-parser.ts b/packages/generator/src/edmx-parser/v4/edmx-parser.ts index fcd82d2102..960890fd35 100644 --- a/packages/generator/src/edmx-parser/v4/edmx-parser.ts +++ b/packages/generator/src/edmx-parser/v4/edmx-parser.ts @@ -8,7 +8,7 @@ import { } from '../common/edmx-parser'; import { forceArray } from '../../generator-utils'; import { stripNamespace } from '../../edmx-to-vdm/edmx-to-vdm-util'; -import { +import type { EdmxComplexType, EdmxDerivedType, EdmxEntitySet, diff --git a/packages/generator/src/edmx-to-vdm/common/complex-type.ts b/packages/generator/src/edmx-to-vdm/common/complex-type.ts index 3611acfa57..9e9ad18826 100644 --- a/packages/generator/src/edmx-to-vdm/common/complex-type.ts +++ b/packages/generator/src/edmx-to-vdm/common/complex-type.ts @@ -4,8 +4,12 @@ import { getFallbackEdmTypeIfNeeded, isNullableProperty } from '../../generator-utils'; -import { ServiceNameFormatter } from '../../service-name-formatter'; -import { VdmComplexType, VdmMappedEdmType, VdmEnumType } from '../../vdm-types'; +import type { ServiceNameFormatter } from '../../service-name-formatter'; +import type { + VdmComplexType, + VdmMappedEdmType, + VdmEnumType +} from '../../vdm-types'; import { propertyDescription } from '../description-util'; import { checkCollectionKind, @@ -19,7 +23,7 @@ import { typesForCollection, enumTypeForName } from '../edmx-to-vdm-util'; -import { EdmxComplexTypeBase } from '../../edmx-parser/common'; +import type { EdmxComplexTypeBase } from '../../edmx-parser/common'; import { applyPrefixOnJsConflictParam } from '../../name-formatting-strategies'; /** diff --git a/packages/generator/src/edmx-to-vdm/common/entity.ts b/packages/generator/src/edmx-to-vdm/common/entity.ts index 3181d789d0..7752af9f46 100644 --- a/packages/generator/src/edmx-to-vdm/common/entity.ts +++ b/packages/generator/src/edmx-to-vdm/common/entity.ts @@ -1,4 +1,4 @@ -import { +import type { EdmxEntitySetBase, EdmxEntityTypeBase, EdmxNamed, @@ -14,9 +14,9 @@ import { isUpdatable } from '../../generator-utils'; import { applyPrefixOnJsConflictParam } from '../../name-formatting-strategies'; -import { ServiceNameFormatter } from '../../service-name-formatter'; -import { SwaggerMetadata } from '../../swagger-parser/swagger-types'; -import { +import type { ServiceNameFormatter } from '../../service-name-formatter'; +import type { SwaggerMetadata } from '../../swagger-parser/swagger-types'; +import type { VdmComplexType, VdmEntity, VdmEnumType, diff --git a/packages/generator/src/edmx-to-vdm/common/enum-type.ts b/packages/generator/src/edmx-to-vdm/common/enum-type.ts index a36bdf06b7..67f2200053 100644 --- a/packages/generator/src/edmx-to-vdm/common/enum-type.ts +++ b/packages/generator/src/edmx-to-vdm/common/enum-type.ts @@ -1,7 +1,7 @@ import { createLogger, unique } from '@sap-cloud-sdk/util'; -import { ServiceNameFormatter } from '../../service-name-formatter'; -import { VdmEnumMemberType, VdmEnumType } from '../../vdm-types'; -import { EdmxEnumType } from '../../edmx-parser/v4'; +import type { ServiceNameFormatter } from '../../service-name-formatter'; +import type { VdmEnumMemberType, VdmEnumType } from '../../vdm-types'; +import type { EdmxEnumType } from '../../edmx-parser/v4'; const logger = createLogger({ package: 'generator', diff --git a/packages/generator/src/edmx-to-vdm/common/operation-parameter.ts b/packages/generator/src/edmx-to-vdm/common/operation-parameter.ts index 430eb6da5e..a555e946de 100644 --- a/packages/generator/src/edmx-to-vdm/common/operation-parameter.ts +++ b/packages/generator/src/edmx-to-vdm/common/operation-parameter.ts @@ -2,8 +2,8 @@ import type { VdmParameter } from '../../vdm-types'; import { isNullableProperty } from '../../generator-utils'; import { parameterDescription } from '../description-util'; import type { EdmxParameter } from '../../edmx-parser/common/edmx-types'; -import { SwaggerPath } from '../../swagger-parser'; -import { ServiceNameFormatter } from '../../service-name-formatter'; +import type { SwaggerPath } from '../../swagger-parser'; +import type { ServiceNameFormatter } from '../../service-name-formatter'; import type { EdmxFunctionImportV2 } from '../../edmx-parser/v2/edm-types'; import { getTypeMappingActionFunction } from '../edmx-to-vdm-util'; import type { EdmxJoinedOperation } from '../v4'; diff --git a/packages/generator/src/edmx-to-vdm/common/operation-return-type.ts b/packages/generator/src/edmx-to-vdm/common/operation-return-type.ts index d7fe1ecfb6..0c0caa5e95 100644 --- a/packages/generator/src/edmx-to-vdm/common/operation-return-type.ts +++ b/packages/generator/src/edmx-to-vdm/common/operation-return-type.ts @@ -1,9 +1,9 @@ import { first } from '@sap-cloud-sdk/util'; import voca from 'voca'; -import { EdmxReturnType } from '../../edmx-parser/v4'; +import type { EdmxReturnType } from '../../edmx-parser/v4'; import { isNullableProperty } from '../../generator-utils'; import { getApiName } from '../../generator-without-ts-morph/service'; -import { +import type { VdmComplexType, VdmPartialEntity, VdmOperationReturnType diff --git a/packages/generator/src/edmx-to-vdm/common/operation.ts b/packages/generator/src/edmx-to-vdm/common/operation.ts index ddfe2d2079..29c901cb7f 100644 --- a/packages/generator/src/edmx-to-vdm/common/operation.ts +++ b/packages/generator/src/edmx-to-vdm/common/operation.ts @@ -1,8 +1,8 @@ import { pascalCase } from '@sap-cloud-sdk/util'; import type { EdmxParameter } from '../../edmx-parser/common'; import type { EdmxFunctionImportV2 } from '../../edmx-parser/v2'; -import { ServiceNameFormatter } from '../../service-name-formatter'; -import { SwaggerPath } from '../../swagger-parser'; +import type { ServiceNameFormatter } from '../../service-name-formatter'; +import type { SwaggerPath } from '../../swagger-parser'; import type { VdmOperationBase } from '../../vdm-types'; import { functionImportDescription } from '../description-util'; import type { EdmxJoinedOperation } from '../v4'; diff --git a/packages/generator/src/edmx-to-vdm/description-util.ts b/packages/generator/src/edmx-to-vdm/description-util.ts index d759e86bb9..9f7c684ced 100644 --- a/packages/generator/src/edmx-to-vdm/description-util.ts +++ b/packages/generator/src/edmx-to-vdm/description-util.ts @@ -1,13 +1,13 @@ import { unixEOL, titleFormat } from '@sap-cloud-sdk/util'; import { endWithDot, ensureString } from '../generator-utils'; -import { +import type { EdmxDocumented, EdmxEntitySetBase, EdmxParameter, EdmxProperty, JoinedEntityMetadata } from '../edmx-parser/common'; -import { +import type { SwaggerDescribed, SwaggerPath, SwaggerPathParameter, diff --git a/packages/generator/src/edmx-to-vdm/v2/complex-type.ts b/packages/generator/src/edmx-to-vdm/v2/complex-type.ts index 60c5b8b5d5..f79f452219 100644 --- a/packages/generator/src/edmx-to-vdm/v2/complex-type.ts +++ b/packages/generator/src/edmx-to-vdm/v2/complex-type.ts @@ -1,8 +1,8 @@ import { transformComplexTypesBase } from '../common/complex-type'; -import { ServiceNameFormatter } from '../../service-name-formatter'; -import { VdmComplexType } from '../../vdm-types'; +import type { ServiceNameFormatter } from '../../service-name-formatter'; +import type { VdmComplexType } from '../../vdm-types'; import { parseComplexTypesV2 } from '../../edmx-parser/v2/edmx-parser'; -import { ServiceMetadata } from '../../edmx-parser/edmx-file-reader'; +import type { ServiceMetadata } from '../../edmx-parser/edmx-file-reader'; /** * @internal diff --git a/packages/generator/src/edmx-to-vdm/v2/entity.ts b/packages/generator/src/edmx-to-vdm/v2/entity.ts index d00f35ec73..988594fe98 100644 --- a/packages/generator/src/edmx-to-vdm/v2/entity.ts +++ b/packages/generator/src/edmx-to-vdm/v2/entity.ts @@ -4,17 +4,17 @@ import { navigationPropertyBase, transformEntityBase } from '../common/entity'; -import { +import type { VdmComplexType, VdmEntity, VdmNavigationProperty } from '../../vdm-types'; -import { ServiceNameFormatter } from '../../service-name-formatter'; -import { +import type { ServiceNameFormatter } from '../../service-name-formatter'; +import type { EdmxEntitySetBase, JoinedEntityMetadata } from '../../edmx-parser/common/edmx-types'; -import { +import type { EdmxAssociation, EdmxAssociationSet, EdmxEntityTypeV2, @@ -27,7 +27,7 @@ import { parseEntitySetsV2, parseEntityTypes } from '../../edmx-parser/v2/edmx-parser'; -import { ServiceMetadata } from '../../edmx-parser/edmx-file-reader'; +import type { ServiceMetadata } from '../../edmx-parser/edmx-file-reader'; import { stripNamespace } from '../edmx-to-vdm-util'; /** diff --git a/packages/generator/src/edmx-to-vdm/v2/function-import.ts b/packages/generator/src/edmx-to-vdm/v2/function-import.ts index e3993760e4..af7593ea5c 100644 --- a/packages/generator/src/edmx-to-vdm/v2/function-import.ts +++ b/packages/generator/src/edmx-to-vdm/v2/function-import.ts @@ -1,10 +1,10 @@ -import { ServiceNameFormatter } from '../../service-name-formatter'; +import type { ServiceNameFormatter } from '../../service-name-formatter'; import { transformOperationBase } from '../common/operation'; import { parseOperationReturnType } from '../common/operation-return-type'; -import { VdmComplexType, VdmEntity, VdmOperation } from '../../vdm-types'; +import type { VdmComplexType, VdmEntity, VdmOperation } from '../../vdm-types'; import { getSwaggerDefinitionForOperation } from '../../swagger-parser/swagger-parser'; import { parseFunctionImportsV2 } from '../../edmx-parser/v2/edmx-parser'; -import { ServiceMetadata } from '../../edmx-parser/edmx-file-reader'; +import type { ServiceMetadata } from '../../edmx-parser/edmx-file-reader'; import { hasUnsupportedParameterTypes } from '../edmx-to-vdm-util'; const extractResponse = (functionName: string) => (response: string) => diff --git a/packages/generator/src/edmx-to-vdm/v2/service-entities.ts b/packages/generator/src/edmx-to-vdm/v2/service-entities.ts index f5a21fdb4c..b1970df156 100644 --- a/packages/generator/src/edmx-to-vdm/v2/service-entities.ts +++ b/packages/generator/src/edmx-to-vdm/v2/service-entities.ts @@ -1,5 +1,5 @@ -import { ServiceMetadata } from '../../edmx-parser/edmx-file-reader'; -import { VdmServiceEntities } from '../../vdm-types'; +import type { ServiceMetadata } from '../../edmx-parser/edmx-file-reader'; +import type { VdmServiceEntities } from '../../vdm-types'; import { ServiceNameFormatter } from '../../service-name-formatter'; import { generateFunctionImportsV2 } from './function-import'; import { generateComplexTypesV2 } from './complex-type'; diff --git a/packages/generator/src/edmx-to-vdm/v4/complex-type.ts b/packages/generator/src/edmx-to-vdm/v4/complex-type.ts index 4386aa7593..b850d19784 100644 --- a/packages/generator/src/edmx-to-vdm/v4/complex-type.ts +++ b/packages/generator/src/edmx-to-vdm/v4/complex-type.ts @@ -1,8 +1,8 @@ import { transformComplexTypesBase } from '../common/complex-type'; -import { ServiceNameFormatter } from '../../service-name-formatter'; -import { VdmComplexType, VdmEnumType } from '../../vdm-types'; +import type { ServiceNameFormatter } from '../../service-name-formatter'; +import type { VdmComplexType, VdmEnumType } from '../../vdm-types'; import { parseComplexTypesV4 } from '../../edmx-parser/v4/edmx-parser'; -import { ServiceMetadata } from '../../edmx-parser/edmx-file-reader'; +import type { ServiceMetadata } from '../../edmx-parser/edmx-file-reader'; /** * @internal diff --git a/packages/generator/src/edmx-to-vdm/v4/entity.spec.ts b/packages/generator/src/edmx-to-vdm/v4/entity.spec.ts index 5837942e02..4932197ca3 100644 --- a/packages/generator/src/edmx-to-vdm/v4/entity.spec.ts +++ b/packages/generator/src/edmx-to-vdm/v4/entity.spec.ts @@ -1,6 +1,6 @@ -import { ServiceMetadata } from '../../edmx-parser'; -import { EdmxProperty } from '../../edmx-parser/common'; -import { +import type { ServiceMetadata } from '../../edmx-parser'; +import type { EdmxProperty } from '../../edmx-parser/common'; +import type { EdmxComplexType, EdmxEntitySet, EdmxEntityTypeV4, diff --git a/packages/generator/src/edmx-to-vdm/v4/entity.ts b/packages/generator/src/edmx-to-vdm/v4/entity.ts index 9fcb948e76..5296989e97 100644 --- a/packages/generator/src/edmx-to-vdm/v4/entity.ts +++ b/packages/generator/src/edmx-to-vdm/v4/entity.ts @@ -1,5 +1,5 @@ -import { ServiceMetadata } from '../../edmx-parser/edmx-file-reader'; -import { +import type { ServiceMetadata } from '../../edmx-parser/edmx-file-reader'; +import type { EdmxEntitySet, EdmxEntityTypeV4 } from '../../edmx-parser/v4/edm-types'; @@ -7,8 +7,8 @@ import { parseEntitySetsV4, parseEntityType } from '../../edmx-parser/v4/edmx-parser'; -import { ServiceNameFormatter } from '../../service-name-formatter'; -import { +import type { ServiceNameFormatter } from '../../service-name-formatter'; +import type { VdmComplexType, VdmEntity, VdmPartialEntity, diff --git a/packages/generator/src/edmx-to-vdm/v4/enum-type.ts b/packages/generator/src/edmx-to-vdm/v4/enum-type.ts index c628fc079b..b2ba3ba9c6 100644 --- a/packages/generator/src/edmx-to-vdm/v4/enum-type.ts +++ b/packages/generator/src/edmx-to-vdm/v4/enum-type.ts @@ -1,7 +1,7 @@ -import { ServiceNameFormatter } from '../../service-name-formatter'; +import type { ServiceNameFormatter } from '../../service-name-formatter'; import { parseEnumTypes } from '../../edmx-parser/v4/edmx-parser'; -import { ServiceMetadata } from '../../edmx-parser/edmx-file-reader'; -import { VdmEnumType } from '../../vdm-types'; +import type { ServiceMetadata } from '../../edmx-parser/edmx-file-reader'; +import type { VdmEnumType } from '../../vdm-types'; import { transformEnumTypesBase } from '../common/enum-type'; /** diff --git a/packages/generator/src/edmx-to-vdm/v4/operation-util.ts b/packages/generator/src/edmx-to-vdm/v4/operation-util.ts index 067215032a..4f7f66d0dc 100644 --- a/packages/generator/src/edmx-to-vdm/v4/operation-util.ts +++ b/packages/generator/src/edmx-to-vdm/v4/operation-util.ts @@ -1,4 +1,4 @@ -import { EdmxOperation } from '../../edmx-parser/v4/edm-types'; +import type { EdmxOperation } from '../../edmx-parser/v4/edm-types'; import { stripNamespace } from '../edmx-to-vdm-util'; /** diff --git a/packages/generator/src/edmx-to-vdm/v4/operation.spec.ts b/packages/generator/src/edmx-to-vdm/v4/operation.spec.ts index a9680ee959..15edc4263b 100644 --- a/packages/generator/src/edmx-to-vdm/v4/operation.spec.ts +++ b/packages/generator/src/edmx-to-vdm/v4/operation.spec.ts @@ -1,13 +1,13 @@ import { createLogger } from '@sap-cloud-sdk/util'; -import { EdmxParameter, EdmxProperty } from '../../edmx-parser/common'; -import { +import type { EdmxParameter, EdmxProperty } from '../../edmx-parser/common'; +import type { EdmxComplexType, EdmxEntitySet, EdmxEntityTypeV4, EdmxOperation, EdmxOperationImport } from '../../edmx-parser/v4'; -import { ServiceMetadata } from '../../edmx-parser'; +import type { ServiceMetadata } from '../../edmx-parser'; import { generateEntitiesV4 } from './entity'; import { filterAndTransformOperations, diff --git a/packages/generator/src/edmx-to-vdm/v4/operation.ts b/packages/generator/src/edmx-to-vdm/v4/operation.ts index c1ed9a2312..bc1b920f87 100644 --- a/packages/generator/src/edmx-to-vdm/v4/operation.ts +++ b/packages/generator/src/edmx-to-vdm/v4/operation.ts @@ -1,16 +1,13 @@ import { createLogger } from '@sap-cloud-sdk/util'; -import { - EdmxParameter, - parseOperationImports, - parseOperations -} from '../../edmx-parser'; -import { ServiceMetadata } from '../../edmx-parser/edmx-file-reader'; +import type { EdmxParameter } from '../../edmx-parser'; +import { parseOperationImports, parseOperations } from '../../edmx-parser'; +import type { ServiceMetadata } from '../../edmx-parser/edmx-file-reader'; import type { EdmxOperation, EdmxOperationImport, EdmxReturnType } from '../../edmx-parser/v4/edm-types'; -import { ServiceNameFormatter } from '../../service-name-formatter'; +import type { ServiceNameFormatter } from '../../service-name-formatter'; import { getSwaggerDefinitionForOperation } from '../../swagger-parser/swagger-parser'; import type { VdmComplexType, diff --git a/packages/generator/src/edmx-to-vdm/v4/service-entities.ts b/packages/generator/src/edmx-to-vdm/v4/service-entities.ts index 27a67eedb1..1455543ff6 100644 --- a/packages/generator/src/edmx-to-vdm/v4/service-entities.ts +++ b/packages/generator/src/edmx-to-vdm/v4/service-entities.ts @@ -1,6 +1,6 @@ -import { ServiceMetadata } from '../../edmx-parser/edmx-file-reader'; +import type { ServiceMetadata } from '../../edmx-parser/edmx-file-reader'; import { ServiceNameFormatter } from '../../service-name-formatter'; -import { VdmServiceEntities } from '../../vdm-types'; +import type { VdmServiceEntities } from '../../vdm-types'; import { generateUnboundOperations } from './operation'; import { generateComplexTypesV4 } from './complex-type'; import { generateEntitiesV4 } from './entity'; diff --git a/packages/generator/src/entity/class.ts b/packages/generator/src/entity/class.ts index f0309c2040..2827fb7326 100644 --- a/packages/generator/src/entity/class.ts +++ b/packages/generator/src/entity/class.ts @@ -1,9 +1,9 @@ -import { +import type { ClassDeclarationStructure, MethodDeclarationStructure, - PropertyDeclarationStructure, - StructureKind + PropertyDeclarationStructure } from 'ts-morph'; +import { StructureKind } from 'ts-morph'; import { prependPrefix } from '../internal-prefix'; import { operationFunctionBase } from '../operations'; import { @@ -12,7 +12,7 @@ import { getNavPropertyDescription, getPropertyDescription } from '../typedoc'; -import { +import type { VdmEntity, VdmNavigationProperty, VdmOperation, diff --git a/packages/generator/src/entity/file.ts b/packages/generator/src/entity/file.ts index b96ffb8d7c..b86a928735 100644 --- a/packages/generator/src/entity/file.ts +++ b/packages/generator/src/entity/file.ts @@ -1,6 +1,7 @@ -import { SourceFileStructure, StructureKind } from 'ts-morph'; +import type { SourceFileStructure } from 'ts-morph'; +import { StructureKind } from 'ts-morph'; import { parametersInterface } from '../operations'; -import { VdmEntity, VdmServiceMetadata } from '../vdm-types'; +import type { VdmEntity, VdmServiceMetadata } from '../vdm-types'; import { entityClass } from './class'; import { entityImportDeclarations, otherEntityImports } from './imports'; import { entityTypeInterface } from './interface'; diff --git a/packages/generator/src/entity/imports.ts b/packages/generator/src/entity/imports.ts index 3457c97256..df7d9de620 100644 --- a/packages/generator/src/entity/imports.ts +++ b/packages/generator/src/entity/imports.ts @@ -1,5 +1,6 @@ -import { ODataVersion } from '@sap-cloud-sdk/util'; -import { ImportDeclarationStructure, StructureKind } from 'ts-morph'; +import type { ODataVersion } from '@sap-cloud-sdk/util'; +import type { ImportDeclarationStructure } from 'ts-morph'; +import { StructureKind } from 'ts-morph'; import { complexTypeImportDeclarations, enumTypeImportDeclarations, @@ -7,7 +8,7 @@ import { odataImportDeclarationTsMorph } from '../imports'; import { operationDeclarations } from '../operations'; -import { VdmEntity, VdmServiceMetadata } from '../vdm-types'; +import type { VdmEntity, VdmServiceMetadata } from '../vdm-types'; /** * @internal diff --git a/packages/generator/src/entity/interface.ts b/packages/generator/src/entity/interface.ts index 212711644c..423dc44c69 100644 --- a/packages/generator/src/entity/interface.ts +++ b/packages/generator/src/entity/interface.ts @@ -1,9 +1,9 @@ -import { +import type { InterfaceDeclarationStructure, - PropertySignatureStructure, - StructureKind + PropertySignatureStructure } from 'ts-morph'; -import { +import { StructureKind } from 'ts-morph'; +import type { VdmEntity, VdmNavigationProperty, VdmProperty, diff --git a/packages/generator/src/entity/namespace.spec.ts b/packages/generator/src/entity/namespace.spec.ts index aee86e0c69..48173ac08b 100644 --- a/packages/generator/src/entity/namespace.spec.ts +++ b/packages/generator/src/entity/namespace.spec.ts @@ -1,4 +1,4 @@ -import { VariableStatementStructure } from 'ts-morph'; +import type { VariableStatementStructure } from 'ts-morph'; import { breakfastEntity, breakfastTime, diff --git a/packages/generator/src/entity/namespace.ts b/packages/generator/src/entity/namespace.ts index a2761af95c..4fc4a30cf7 100644 --- a/packages/generator/src/entity/namespace.ts +++ b/packages/generator/src/entity/namespace.ts @@ -1,12 +1,11 @@ import { unixEOL, unique } from '@sap-cloud-sdk/util'; -import { +import type { ModuleDeclarationStructure, - StructureKind, - VariableDeclarationKind, VariableStatementStructure, OptionalKind, VariableDeclarationStructure } from 'ts-morph'; +import { StructureKind, VariableDeclarationKind } from 'ts-morph'; import { isOrderableEdmType } from '@sap-cloud-sdk/odata-common'; import { getGenericParameters, linkClass } from '../generator-utils'; import { prependPrefix } from '../internal-prefix'; @@ -15,7 +14,7 @@ import { getStaticPropertyDescription, addLeadingNewline } from '../typedoc'; -import { +import type { VdmEntity, VdmNavigationProperty, VdmProperty, diff --git a/packages/generator/src/enum-type/enum.ts b/packages/generator/src/enum-type/enum.ts index 9d7ad4242e..93e84c25f5 100644 --- a/packages/generator/src/enum-type/enum.ts +++ b/packages/generator/src/enum-type/enum.ts @@ -1,5 +1,6 @@ -import { EnumDeclarationStructure, StructureKind } from 'ts-morph'; -import { VdmEnumType } from '../vdm-types'; +import type { EnumDeclarationStructure } from 'ts-morph'; +import { StructureKind } from 'ts-morph'; +import type { VdmEnumType } from '../vdm-types'; import { addLeadingNewline, enumDocs } from '../typedoc'; /** diff --git a/packages/generator/src/enum-type/file.ts b/packages/generator/src/enum-type/file.ts index 06e3fa0c50..7c32dfb361 100644 --- a/packages/generator/src/enum-type/file.ts +++ b/packages/generator/src/enum-type/file.ts @@ -1,5 +1,6 @@ -import { SourceFileStructure, StructureKind } from 'ts-morph'; -import { VdmEnumType } from '../vdm-types'; +import type { SourceFileStructure } from 'ts-morph'; +import { StructureKind } from 'ts-morph'; +import type { VdmEnumType } from '../vdm-types'; import { enumTypeClass } from './enum'; /** diff --git a/packages/generator/src/file-generator.ts b/packages/generator/src/file-generator.ts index 239be139eb..4f14c90cdf 100644 --- a/packages/generator/src/file-generator.ts +++ b/packages/generator/src/file-generator.ts @@ -1,9 +1,7 @@ import { parse } from 'path'; -import { Directory, SourceFile, SourceFileStructure } from 'ts-morph'; -import { - createFile, - CreateFileOptions -} from '@sap-cloud-sdk/generator-common/internal'; +import type { Directory, SourceFile, SourceFileStructure } from 'ts-morph'; +import type { CreateFileOptions } from '@sap-cloud-sdk/generator-common/internal'; +import { createFile } from '@sap-cloud-sdk/generator-common/internal'; /** * @internal diff --git a/packages/generator/src/generator-utils.ts b/packages/generator/src/generator-utils.ts index b9157bc1ac..40ffc32223 100644 --- a/packages/generator/src/generator-utils.ts +++ b/packages/generator/src/generator-utils.ts @@ -1,5 +1,6 @@ -import { createLogger, ODataVersion } from '@sap-cloud-sdk/util'; -import { +import type { ODataVersion } from '@sap-cloud-sdk/util'; +import { createLogger } from '@sap-cloud-sdk/util'; +import type { VdmNavigationProperty, VdmProperty, VdmServiceMetadata diff --git a/packages/generator/src/generator-without-ts-morph/de-serializers-generic-types.ts b/packages/generator/src/generator-without-ts-morph/de-serializers-generic-types.ts index 773a5263b6..d35cdfd984 100644 --- a/packages/generator/src/generator-without-ts-morph/de-serializers-generic-types.ts +++ b/packages/generator/src/generator-without-ts-morph/de-serializers-generic-types.ts @@ -1,4 +1,4 @@ -import { ODataVersion } from '@sap-cloud-sdk/util'; +import type { ODataVersion } from '@sap-cloud-sdk/util'; /** * @internal diff --git a/packages/generator/src/generator-without-ts-morph/entity-api/class.ts b/packages/generator/src/generator-without-ts-morph/entity-api/class.ts index 0f096824ec..9ad1d67dc3 100644 --- a/packages/generator/src/generator-without-ts-morph/entity-api/class.ts +++ b/packages/generator/src/generator-without-ts-morph/entity-api/class.ts @@ -1,5 +1,5 @@ import { codeBlock, documentationBlock } from '@sap-cloud-sdk/util'; -import { VdmEntity, VdmServiceMetadata } from '../../vdm-types'; +import type { VdmEntity, VdmServiceMetadata } from '../../vdm-types'; import { addNavigationPropertyFieldsFunction, navigationPropertyFieldsVariable diff --git a/packages/generator/src/generator-without-ts-morph/entity-api/file.ts b/packages/generator/src/generator-without-ts-morph/entity-api/file.ts index 64313846ea..1a98aae5d0 100644 --- a/packages/generator/src/generator-without-ts-morph/entity-api/file.ts +++ b/packages/generator/src/generator-without-ts-morph/entity-api/file.ts @@ -1,9 +1,7 @@ import { unixEOL } from '@sap-cloud-sdk/util'; -import { - serializeImports, - Import -} from '@sap-cloud-sdk/generator-common/internal'; -import { VdmEntity, VdmServiceMetadata } from '../../vdm-types'; +import type { Import } from '@sap-cloud-sdk/generator-common/internal'; +import { serializeImports } from '@sap-cloud-sdk/generator-common/internal'; +import type { VdmEntity, VdmServiceMetadata } from '../../vdm-types'; import { navPropertyFieldTypeImportNames, propertyFieldTypeImportNames, diff --git a/packages/generator/src/generator-without-ts-morph/entity-api/import.spec.ts b/packages/generator/src/generator-without-ts-morph/entity-api/import.spec.ts index 7833597998..aa583835f6 100644 --- a/packages/generator/src/generator-without-ts-morph/entity-api/import.spec.ts +++ b/packages/generator/src/generator-without-ts-morph/entity-api/import.spec.ts @@ -1,4 +1,4 @@ -import { Import } from '@sap-cloud-sdk/generator-common/internal'; +import type { Import } from '@sap-cloud-sdk/generator-common/internal'; import { mergeImports } from './imports'; describe('entity api import', () => { diff --git a/packages/generator/src/generator-without-ts-morph/entity-api/imports.ts b/packages/generator/src/generator-without-ts-morph/entity-api/imports.ts index c639070465..f673a18602 100644 --- a/packages/generator/src/generator-without-ts-morph/entity-api/imports.ts +++ b/packages/generator/src/generator-without-ts-morph/entity-api/imports.ts @@ -1,6 +1,7 @@ -import { ODataVersion, unique } from '@sap-cloud-sdk/util'; -import { Import } from '@sap-cloud-sdk/generator-common/internal'; -import { VdmMappedEdmType, VdmProperty } from '../../vdm-types'; +import type { ODataVersion } from '@sap-cloud-sdk/util'; +import { unique } from '@sap-cloud-sdk/util'; +import type { Import } from '@sap-cloud-sdk/generator-common/internal'; +import type { VdmMappedEdmType, VdmProperty } from '../../vdm-types'; import { potentialExternalImportDeclarations } from '../../imports'; /** diff --git a/packages/generator/src/generator-without-ts-morph/entity-api/match-entity.ts b/packages/generator/src/generator-without-ts-morph/entity-api/match-entity.ts index 27935af74b..0ee9ab1725 100644 --- a/packages/generator/src/generator-without-ts-morph/entity-api/match-entity.ts +++ b/packages/generator/src/generator-without-ts-morph/entity-api/match-entity.ts @@ -1,4 +1,4 @@ -import { +import type { VdmNavigationProperty, VdmServiceMetadata, VdmEntity diff --git a/packages/generator/src/generator-without-ts-morph/entity-api/navigation-properties.ts b/packages/generator/src/generator-without-ts-morph/entity-api/navigation-properties.ts index 2211fca499..21fcc5fe76 100644 --- a/packages/generator/src/generator-without-ts-morph/entity-api/navigation-properties.ts +++ b/packages/generator/src/generator-without-ts-morph/entity-api/navigation-properties.ts @@ -1,7 +1,7 @@ import { codeBlock, documentationBlock } from '@sap-cloud-sdk/util'; import { linkClass } from '../../generator-utils'; import { getStaticNavPropertyDescription } from '../../typedoc'; -import { +import type { VdmEntity, VdmServiceMetadata, VdmNavigationProperty diff --git a/packages/generator/src/generator-without-ts-morph/entity-api/schema-type.ts b/packages/generator/src/generator-without-ts-morph/entity-api/schema-type.ts index 6b692415c2..6580ca0f3c 100644 --- a/packages/generator/src/generator-without-ts-morph/entity-api/schema-type.ts +++ b/packages/generator/src/generator-without-ts-morph/entity-api/schema-type.ts @@ -1,4 +1,8 @@ -import { VdmEntity, VdmProperty, VdmServiceMetadata } from '../../vdm-types'; +import type { + VdmEntity, + VdmProperty, + VdmServiceMetadata +} from '../../vdm-types'; import { createPropertyFieldType } from '../../entity'; import { navigationPropertyTypes } from './navigation-properties'; diff --git a/packages/generator/src/generator-without-ts-morph/entity-api/schema.ts b/packages/generator/src/generator-without-ts-morph/entity-api/schema.ts index c40ce020ab..e5db5a7677 100644 --- a/packages/generator/src/generator-without-ts-morph/entity-api/schema.ts +++ b/packages/generator/src/generator-without-ts-morph/entity-api/schema.ts @@ -1,5 +1,5 @@ import { documentationBlock } from '@sap-cloud-sdk/util'; -import { VdmEntity, VdmProperty } from '../../vdm-types'; +import type { VdmEntity, VdmProperty } from '../../vdm-types'; import { addLeadingNewline, getStaticPropertyDescription } from '../../typedoc'; import { createPropertyFieldInitializerForEntity } from '../../entity'; diff --git a/packages/generator/src/generator-without-ts-morph/imports.ts b/packages/generator/src/generator-without-ts-morph/imports.ts index e2f42c1044..c00fc8e6f5 100644 --- a/packages/generator/src/generator-without-ts-morph/imports.ts +++ b/packages/generator/src/generator-without-ts-morph/imports.ts @@ -1,7 +1,8 @@ -import { Import } from '@sap-cloud-sdk/generator-common/internal'; -import { ODataVersion, unique } from '@sap-cloud-sdk/util'; +import type { Import } from '@sap-cloud-sdk/generator-common/internal'; +import type { ODataVersion } from '@sap-cloud-sdk/util'; +import { unique } from '@sap-cloud-sdk/util'; import { potentialExternalImportDeclarations } from '../imports'; -import { VdmMappedEdmType } from '../vdm-types'; +import type { VdmMappedEdmType } from '../vdm-types'; /** * @internal diff --git a/packages/generator/src/generator-without-ts-morph/request-builder/class.spec.ts b/packages/generator/src/generator-without-ts-morph/request-builder/class.spec.ts index e300253f53..3df31215e1 100644 --- a/packages/generator/src/generator-without-ts-morph/request-builder/class.spec.ts +++ b/packages/generator/src/generator-without-ts-morph/request-builder/class.spec.ts @@ -1,5 +1,5 @@ import { breakfastEntity } from '../../../test/test-util/data-model'; -import { VdmProperty } from '../../vdm-types'; +import type { VdmProperty } from '../../vdm-types'; import { requestBuilderClass } from './class'; describe('request builder class', () => { diff --git a/packages/generator/src/generator-without-ts-morph/request-builder/class.ts b/packages/generator/src/generator-without-ts-morph/request-builder/class.ts index d74a3e1677..390c229a96 100644 --- a/packages/generator/src/generator-without-ts-morph/request-builder/class.ts +++ b/packages/generator/src/generator-without-ts-morph/request-builder/class.ts @@ -1,6 +1,6 @@ import { codeBlock, documentationBlock, unixEOL } from '@sap-cloud-sdk/util'; import { getFunctionDoc, getRequestBuilderDescription } from '../../typedoc'; -import { VdmEntity } from '../../vdm-types'; +import type { VdmEntity } from '../../vdm-types'; /** * @internal diff --git a/packages/generator/src/generator-without-ts-morph/request-builder/file.ts b/packages/generator/src/generator-without-ts-morph/request-builder/file.ts index b8f650deeb..82759550eb 100644 --- a/packages/generator/src/generator-without-ts-morph/request-builder/file.ts +++ b/packages/generator/src/generator-without-ts-morph/request-builder/file.ts @@ -1,6 +1,7 @@ import { serializeImports } from '@sap-cloud-sdk/generator-common/internal'; -import { ODataVersion, unixEOL } from '@sap-cloud-sdk/util'; -import { VdmEntity } from '../../vdm-types'; +import type { ODataVersion } from '@sap-cloud-sdk/util'; +import { unixEOL } from '@sap-cloud-sdk/util'; +import type { VdmEntity } from '../../vdm-types'; import { requestBuilderClass } from './class'; import { requestBuilderImportDeclarations } from './imports'; diff --git a/packages/generator/src/generator-without-ts-morph/request-builder/imports.ts b/packages/generator/src/generator-without-ts-morph/request-builder/imports.ts index c2eb627fb8..4061d317e2 100644 --- a/packages/generator/src/generator-without-ts-morph/request-builder/imports.ts +++ b/packages/generator/src/generator-without-ts-morph/request-builder/imports.ts @@ -1,7 +1,8 @@ -import { Import } from '@sap-cloud-sdk/generator-common/internal'; -import { ODataVersion, unique } from '@sap-cloud-sdk/util'; +import type { Import } from '@sap-cloud-sdk/generator-common/internal'; +import type { ODataVersion } from '@sap-cloud-sdk/util'; +import { unique } from '@sap-cloud-sdk/util'; import { propertyTypeImportNames } from '../../imports'; -import { VdmEntity, VdmProperty } from '../../vdm-types'; +import type { VdmEntity, VdmProperty } from '../../vdm-types'; import { externalImportDeclarations, odataImportDeclaration } from '../imports'; /** diff --git a/packages/generator/src/generator-without-ts-morph/service/class.spec.ts b/packages/generator/src/generator-without-ts-morph/service/class.spec.ts index 87eafe7d1e..ee1ff86583 100644 --- a/packages/generator/src/generator-without-ts-morph/service/class.spec.ts +++ b/packages/generator/src/generator-without-ts-morph/service/class.spec.ts @@ -1,4 +1,4 @@ -import { VdmOperation, VdmServiceMetadata } from '../../vdm-types'; +import type { VdmOperation, VdmServiceMetadata } from '../../vdm-types'; import { serviceClass } from './class'; describe('class', () => { diff --git a/packages/generator/src/generator-without-ts-morph/service/class.ts b/packages/generator/src/generator-without-ts-morph/service/class.ts index 900a07c589..d2a8a5bbbf 100644 --- a/packages/generator/src/generator-without-ts-morph/service/class.ts +++ b/packages/generator/src/generator-without-ts-morph/service/class.ts @@ -1,6 +1,7 @@ -import { codeBlock, ODataVersion } from '@sap-cloud-sdk/util'; +import type { ODataVersion } from '@sap-cloud-sdk/util'; +import { codeBlock } from '@sap-cloud-sdk/util'; import voca from 'voca'; -import { VdmEntity, VdmServiceMetadata } from '../../vdm-types'; +import type { VdmEntity, VdmServiceMetadata } from '../../vdm-types'; import { matchEntity } from '../entity-api/match-entity'; import { getGenericTypes, diff --git a/packages/generator/src/generator-without-ts-morph/service/file.ts b/packages/generator/src/generator-without-ts-morph/service/file.ts index 2d676d8ba4..f1b89b812a 100644 --- a/packages/generator/src/generator-without-ts-morph/service/file.ts +++ b/packages/generator/src/generator-without-ts-morph/service/file.ts @@ -1,10 +1,8 @@ import { codeBlock } from '@sap-cloud-sdk/util'; -import { - serializeImports, - Import -} from '@sap-cloud-sdk/generator-common/internal'; +import type { Import } from '@sap-cloud-sdk/generator-common/internal'; +import { serializeImports } from '@sap-cloud-sdk/generator-common/internal'; import { hasEntities } from '../../generator-utils'; -import { VdmServiceMetadata } from '../../vdm-types'; +import type { VdmServiceMetadata } from '../../vdm-types'; import { serviceBuilder, serviceClass } from './class'; /** diff --git a/packages/generator/src/generator.spec.ts b/packages/generator/src/generator.spec.ts index c2d74f9e0f..1df3ea821d 100644 --- a/packages/generator/src/generator.spec.ts +++ b/packages/generator/src/generator.spec.ts @@ -1,7 +1,7 @@ import { join, resolve } from 'path'; import { promises } from 'fs'; import { transports } from 'winston'; -import { SourceFile } from 'ts-morph'; +import type { SourceFile } from 'ts-morph'; import mock from 'mock-fs'; import prettier from 'prettier'; import { createLogger } from '@sap-cloud-sdk/util'; diff --git a/packages/generator/src/generator.ts b/packages/generator/src/generator.ts index 3ef395268f..abad0d75aa 100644 --- a/packages/generator/src/generator.ts +++ b/packages/generator/src/generator.ts @@ -1,9 +1,12 @@ import { existsSync, promises as fsPromises } from 'fs'; import { dirname, join, resolve } from 'path'; +import type { + CreateFileOptions, + OptionsPerService +} from '@sap-cloud-sdk/generator-common/internal'; import { copyFiles, createFile, - CreateFileOptions, formatTsConfig, getSdkMetadataFileNames, getSdkVersion, @@ -14,8 +17,7 @@ import { transpileDirectory, parseOptions, getRelPathWithPosixSeparator, - writeOptionsPerService, - OptionsPerService + writeOptionsPerService } from '@sap-cloud-sdk/generator-common/internal'; import { createLogger, @@ -24,12 +26,12 @@ import { splitInChunks } from '@sap-cloud-sdk/util'; import { emptyDirSync } from 'fs-extra'; +import type { ProjectOptions } from 'ts-morph'; import { IndentationText, ModuleKind, ModuleResolutionKind, Project, - ProjectOptions, QuoteKind, ScriptTarget } from 'ts-morph'; @@ -38,11 +40,8 @@ import { complexTypeSourceFile } from './complex-type/file'; import { entitySourceFile } from './entity/file'; import { enumTypeSourceFile } from './enum-type/file'; import { sourceFile } from './file-generator'; -import { - GeneratorOptions, - cliOptions, - ParsedGeneratorOptions -} from './options'; +import type { GeneratorOptions, ParsedGeneratorOptions } from './options'; +import { cliOptions } from './options'; import { hasEntities } from './generator-utils'; import { entityApiFile } from './generator-without-ts-morph'; import { requestBuilderSourceFile } from './generator-without-ts-morph/request-builder/file'; @@ -53,7 +52,7 @@ import { parseAllServices } from './service-generator'; import { indexFile } from './service/index-file'; import { packageJson } from './service/package-json'; import { readme } from './service/readme'; -import { VdmServiceMetadata } from './vdm-types'; +import type { VdmServiceMetadata } from './vdm-types'; const { mkdir, readdir } = fsPromises; diff --git a/packages/generator/src/imports.spec.ts b/packages/generator/src/imports.spec.ts index 6d1641b4ff..e0de7de505 100644 --- a/packages/generator/src/imports.spec.ts +++ b/packages/generator/src/imports.spec.ts @@ -1,9 +1,10 @@ -import { ImportDeclarationStructure, StructureKind } from 'ts-morph'; +import type { ImportDeclarationStructure } from 'ts-morph'; +import { StructureKind } from 'ts-morph'; import { bigNumberImport, momentImport } from '../test/test-util/import-declaration-structures'; -import { VdmNavigationProperty, VdmProperty } from './vdm-types'; +import type { VdmNavigationProperty, VdmProperty } from './vdm-types'; import { complexTypeImportDeclarations, navPropertyFieldTypeImportNames, diff --git a/packages/generator/src/imports.ts b/packages/generator/src/imports.ts index 5356951b55..ac292fa88c 100644 --- a/packages/generator/src/imports.ts +++ b/packages/generator/src/imports.ts @@ -1,7 +1,9 @@ -import { unique, ODataVersion } from '@sap-cloud-sdk/util'; -import { ImportDeclarationStructure, StructureKind } from 'ts-morph'; +import type { ODataVersion } from '@sap-cloud-sdk/util'; +import { unique } from '@sap-cloud-sdk/util'; +import type { ImportDeclarationStructure } from 'ts-morph'; +import { StructureKind } from 'ts-morph'; import { linkClass } from './generator-utils'; -import { +import type { VdmMappedEdmType, VdmNavigationProperty, VdmProperty diff --git a/packages/generator/src/input-path-provider.ts b/packages/generator/src/input-path-provider.ts index 155ae315a8..d0980fb116 100644 --- a/packages/generator/src/input-path-provider.ts +++ b/packages/generator/src/input-path-provider.ts @@ -1,4 +1,5 @@ -import { lstatSync, PathLike, readdirSync, existsSync } from 'fs'; +import type { PathLike } from 'fs'; +import { lstatSync, readdirSync, existsSync } from 'fs'; import { join, extname, parse } from 'path'; const validFileExtensions = ['.edmx', '.xml']; diff --git a/packages/generator/src/operations/export-statement.ts b/packages/generator/src/operations/export-statement.ts index 02992ec155..0c497a9644 100644 --- a/packages/generator/src/operations/export-statement.ts +++ b/packages/generator/src/operations/export-statement.ts @@ -1,9 +1,6 @@ -import { - StructureKind, - VariableDeclarationKind, - VariableStatementStructure -} from 'ts-morph'; -import { VdmOperation } from '../vdm-types'; +import type { VariableStatementStructure } from 'ts-morph'; +import { StructureKind, VariableDeclarationKind } from 'ts-morph'; +import type { VdmOperation } from '../vdm-types'; /** * @internal diff --git a/packages/generator/src/operations/file.ts b/packages/generator/src/operations/file.ts index f1538d946c..e58e1ed31a 100644 --- a/packages/generator/src/operations/file.ts +++ b/packages/generator/src/operations/file.ts @@ -1,11 +1,11 @@ import { flat } from '@sap-cloud-sdk/util'; -import { +import type { FunctionDeclarationStructure, InterfaceDeclarationStructure, - SourceFileStructure, - StructureKind + SourceFileStructure } from 'ts-morph'; -import { VdmOperation, VdmServiceMetadata } from '../vdm-types'; +import { StructureKind } from 'ts-morph'; +import type { VdmOperation, VdmServiceMetadata } from '../vdm-types'; import { parametersInterface } from './parameters-interface'; import { exportStatement } from './export-statement'; import { operationDeclarations } from './import'; diff --git a/packages/generator/src/operations/import.spec.ts b/packages/generator/src/operations/import.spec.ts index 7dfa76e537..bcdefdd6ad 100644 --- a/packages/generator/src/operations/import.spec.ts +++ b/packages/generator/src/operations/import.spec.ts @@ -1,5 +1,5 @@ import { orderBreakfast } from '../../test/test-util/data-model'; -import { VdmServiceMetadata } from '../vdm-types'; +import type { VdmServiceMetadata } from '../vdm-types'; import { operationDeclarations } from './import'; describe('import declarations for operations', () => { diff --git a/packages/generator/src/operations/import.ts b/packages/generator/src/operations/import.ts index 7694adf8a4..aa09634429 100644 --- a/packages/generator/src/operations/import.ts +++ b/packages/generator/src/operations/import.ts @@ -1,6 +1,7 @@ -import { ImportDeclarationStructure, StructureKind } from 'ts-morph'; +import type { ImportDeclarationStructure } from 'ts-morph'; +import { StructureKind } from 'ts-morph'; import voca from 'voca'; -import { +import type { VdmOperationReturnType, VdmOperation, VdmServiceMetadata diff --git a/packages/generator/src/operations/operation.ts b/packages/generator/src/operations/operation.ts index 2ec497f677..d84619a2b0 100644 --- a/packages/generator/src/operations/operation.ts +++ b/packages/generator/src/operations/operation.ts @@ -1,10 +1,10 @@ -import { +import type { FunctionDeclarationStructure, - FunctionLikeDeclarationStructure, - StructureKind + FunctionLikeDeclarationStructure } from 'ts-morph'; +import { StructureKind } from 'ts-morph'; import { cannotDeserialize } from '../edmx-to-vdm/common'; -import { VdmOperation, VdmServiceMetadata } from '../vdm-types'; +import type { VdmOperation, VdmServiceMetadata } from '../vdm-types'; import { getRequestBuilderArguments } from './request-builder-arguments'; import { operationReturnType } from './return-type'; diff --git a/packages/generator/src/operations/parameters-interface.ts b/packages/generator/src/operations/parameters-interface.ts index 04abad2797..35f859a87e 100644 --- a/packages/generator/src/operations/parameters-interface.ts +++ b/packages/generator/src/operations/parameters-interface.ts @@ -1,5 +1,6 @@ -import { InterfaceDeclarationStructure, StructureKind } from 'ts-morph'; -import { VdmOperation } from '../vdm-types'; +import type { InterfaceDeclarationStructure } from 'ts-morph'; +import { StructureKind } from 'ts-morph'; +import type { VdmOperation } from '../vdm-types'; import { addLeadingNewline } from '../typedoc'; /** diff --git a/packages/generator/src/operations/request-builder-arguments.ts b/packages/generator/src/operations/request-builder-arguments.ts index 4abbc92c9a..3d3607bff3 100644 --- a/packages/generator/src/operations/request-builder-arguments.ts +++ b/packages/generator/src/operations/request-builder-arguments.ts @@ -1,4 +1,4 @@ -import { VdmOperation, VdmServiceMetadata } from '../vdm-types'; +import type { VdmOperation, VdmServiceMetadata } from '../vdm-types'; import { cannotDeserialize } from '../edmx-to-vdm/common'; import { responseTransformerFunctionName } from './response-transformer-function'; diff --git a/packages/generator/src/operations/response-transformer-function.spec.ts b/packages/generator/src/operations/response-transformer-function.spec.ts index 1d08276c5d..6ef9fc57fc 100644 --- a/packages/generator/src/operations/response-transformer-function.spec.ts +++ b/packages/generator/src/operations/response-transformer-function.spec.ts @@ -1,5 +1,5 @@ import { orderBreakfast } from '../../test/test-util/data-model'; -import { VdmOperationReturnType } from '../vdm-types'; +import type { VdmOperationReturnType } from '../vdm-types'; import { responseTransformerFunctionName } from './response-transformer-function'; const returnTypeEntity: VdmOperationReturnType = { diff --git a/packages/generator/src/operations/response-transformer-function.ts b/packages/generator/src/operations/response-transformer-function.ts index a7f0f92bd4..ca4b4f4254 100644 --- a/packages/generator/src/operations/response-transformer-function.ts +++ b/packages/generator/src/operations/response-transformer-function.ts @@ -1,4 +1,4 @@ -import { VdmOperationReturnType } from '../vdm-types'; +import type { VdmOperationReturnType } from '../vdm-types'; /** * @internal diff --git a/packages/generator/src/operations/return-type.ts b/packages/generator/src/operations/return-type.ts index e99c743ea9..aee7e1692d 100644 --- a/packages/generator/src/operations/return-type.ts +++ b/packages/generator/src/operations/return-type.ts @@ -1,4 +1,4 @@ -import { VdmOperation } from '../vdm-types'; +import type { VdmOperation } from '../vdm-types'; import { cannotDeserialize } from '../edmx-to-vdm/common'; /** * @internal diff --git a/packages/generator/src/options/options.ts b/packages/generator/src/options/options.ts index 6423d18d49..058abaeca9 100644 --- a/packages/generator/src/options/options.ts +++ b/packages/generator/src/options/options.ts @@ -1,9 +1,9 @@ -import { +import type { Options, ParsedOptions, - CommonGeneratorOptions, - getCommonCliOptions + CommonGeneratorOptions } from '@sap-cloud-sdk/generator-common/internal'; +import { getCommonCliOptions } from '@sap-cloud-sdk/generator-common/internal'; /** * Options to configure OData client generation when using the generator programmatically. diff --git a/packages/generator/src/sdk-metadata/code-sample-util.spec.ts b/packages/generator/src/sdk-metadata/code-sample-util.spec.ts index 555ee56a2e..cd7627787f 100644 --- a/packages/generator/src/sdk-metadata/code-sample-util.spec.ts +++ b/packages/generator/src/sdk-metadata/code-sample-util.spec.ts @@ -1,5 +1,5 @@ import { getLevenshteinClosest } from '@sap-cloud-sdk/generator-common/internal'; -import { VdmEntity, VdmOperation, VdmParameter } from '../vdm-types'; +import type { VdmEntity, VdmOperation, VdmParameter } from '../vdm-types'; import { sampleOperation, getOperationParams, diff --git a/packages/generator/src/sdk-metadata/code-sample-util.ts b/packages/generator/src/sdk-metadata/code-sample-util.ts index a070c3924f..ced1b706dc 100644 --- a/packages/generator/src/sdk-metadata/code-sample-util.ts +++ b/packages/generator/src/sdk-metadata/code-sample-util.ts @@ -1,5 +1,5 @@ import { getLevenshteinClosest } from '@sap-cloud-sdk/generator-common/internal'; -import { VdmEntity, VdmOperation, VdmParameter } from '../vdm-types'; +import type { VdmEntity, VdmOperation, VdmParameter } from '../vdm-types'; /** * @internal diff --git a/packages/generator/src/sdk-metadata/code-samples.ts b/packages/generator/src/sdk-metadata/code-samples.ts index 7312b14aaf..8ef3e1a1c6 100644 --- a/packages/generator/src/sdk-metadata/code-samples.ts +++ b/packages/generator/src/sdk-metadata/code-samples.ts @@ -1,7 +1,7 @@ import { codeBlock } from '@sap-cloud-sdk/util'; -import { MultiLineText } from '@sap-cloud-sdk/generator-common/internal'; +import type { MultiLineText } from '@sap-cloud-sdk/generator-common/internal'; import voca from 'voca'; -import { VdmOperation } from '../vdm-types'; +import type { VdmOperation } from '../vdm-types'; import { getApiName } from '../generator-without-ts-morph/service'; import { getOperationParams } from './code-sample-util'; diff --git a/packages/generator/src/sdk-metadata/generation-and-usage.spec.ts b/packages/generator/src/sdk-metadata/generation-and-usage.spec.ts index aa52b60b06..c43dfd80de 100644 --- a/packages/generator/src/sdk-metadata/generation-and-usage.spec.ts +++ b/packages/generator/src/sdk-metadata/generation-and-usage.spec.ts @@ -1,7 +1,7 @@ import { resolve } from 'path'; import { writeFile, readFile, removeSync } from 'fs-extra'; import execa from 'execa'; -import { VdmServiceMetadata } from '../vdm-types'; +import type { VdmServiceMetadata } from '../vdm-types'; import { getApiSpecificUsage } from './generation-and-usage'; import { entityCodeSample } from './code-samples'; diff --git a/packages/generator/src/sdk-metadata/generation-and-usage.ts b/packages/generator/src/sdk-metadata/generation-and-usage.ts index 855999c5cf..07013cfdaa 100644 --- a/packages/generator/src/sdk-metadata/generation-and-usage.ts +++ b/packages/generator/src/sdk-metadata/generation-and-usage.ts @@ -1,5 +1,5 @@ -import { MultiLineText } from '@sap-cloud-sdk/generator-common/internal'; -import { VdmServiceMetadata } from '../vdm-types'; +import type { MultiLineText } from '@sap-cloud-sdk/generator-common/internal'; +import type { VdmServiceMetadata } from '../vdm-types'; import { entityCodeSample, operationCodeSample } from './code-samples'; import { sampleOperation, getODataEntity } from './code-sample-util'; diff --git a/packages/generator/src/sdk-metadata/pregenerated-lib.spec.ts b/packages/generator/src/sdk-metadata/pregenerated-lib.spec.ts index da9338caa0..1c61074e3c 100644 --- a/packages/generator/src/sdk-metadata/pregenerated-lib.spec.ts +++ b/packages/generator/src/sdk-metadata/pregenerated-lib.spec.ts @@ -3,7 +3,7 @@ import { packageDescription, parseOptions } from '@sap-cloud-sdk/generator-common/internal'; -import { VdmServiceMetadata } from '../vdm-types'; +import type { VdmServiceMetadata } from '../vdm-types'; import { parseService } from '../service-generator'; import { createOptions } from '../../test/test-util/create-generator-options'; import { oDataServiceSpecs } from '../../../../test-resources/odata-service-specs'; diff --git a/packages/generator/src/sdk-metadata/sdk-metadata.ts b/packages/generator/src/sdk-metadata/sdk-metadata.ts index 46cd1abd34..0353a77e08 100644 --- a/packages/generator/src/sdk-metadata/sdk-metadata.ts +++ b/packages/generator/src/sdk-metadata/sdk-metadata.ts @@ -1,9 +1,9 @@ +import type { Client } from '@sap-cloud-sdk/generator-common/internal'; import { getSdkMetadataClient, - Client, getSdkVersion } from '@sap-cloud-sdk/generator-common/internal'; -import { VdmServiceMetadata } from '../vdm-types'; +import type { VdmServiceMetadata } from '../vdm-types'; import { getApiSpecificUsage } from './generation-and-usage'; /** diff --git a/packages/generator/src/service-base-path.spec.ts b/packages/generator/src/service-base-path.spec.ts index 90442b0194..9779474138 100644 --- a/packages/generator/src/service-base-path.spec.ts +++ b/packages/generator/src/service-base-path.spec.ts @@ -1,5 +1,5 @@ import { createLogger } from '@sap-cloud-sdk/util'; -import { ServiceOptions } from '@sap-cloud-sdk/generator-common/dist/options-per-service'; +import type { ServiceOptions } from '@sap-cloud-sdk/generator-common/dist/options-per-service'; import { getBasePath } from './service-base-path'; describe('options-per-service', () => { diff --git a/packages/generator/src/service-base-path.ts b/packages/generator/src/service-base-path.ts index 638b2d5089..e60662836a 100644 --- a/packages/generator/src/service-base-path.ts +++ b/packages/generator/src/service-base-path.ts @@ -1,8 +1,8 @@ import { parse } from 'path'; import { createLogger } from '@sap-cloud-sdk/util'; -import { ServiceOptions } from '@sap-cloud-sdk/generator-common/internal'; +import type { ServiceOptions } from '@sap-cloud-sdk/generator-common/internal'; import { basePathFromSwagger } from './swagger-parser/swagger-util'; -import { ServiceMetadata } from './edmx-parser/edmx-file-reader'; +import type { ServiceMetadata } from './edmx-parser/edmx-file-reader'; const logger = createLogger({ package: 'generator', diff --git a/packages/generator/src/service-generator.spec.ts b/packages/generator/src/service-generator.spec.ts index 4b717f4a21..bfd4189319 100644 --- a/packages/generator/src/service-generator.spec.ts +++ b/packages/generator/src/service-generator.spec.ts @@ -1,13 +1,11 @@ import { resolve } from 'path'; -import { ServiceOptions } from '@sap-cloud-sdk/generator-common/dist/options-per-service'; +import type { ServiceOptions } from '@sap-cloud-sdk/generator-common/dist/options-per-service'; import mock from 'mock-fs'; -import { - getRelPathWithPosixSeparator, - OptionsPerService -} from '@sap-cloud-sdk/generator-common/internal'; +import type { OptionsPerService } from '@sap-cloud-sdk/generator-common/internal'; +import { getRelPathWithPosixSeparator } from '@sap-cloud-sdk/generator-common/internal'; import { createParsedOptions } from '../test/test-util/create-generator-options'; import { oDataServiceSpecs } from '../../../test-resources/odata-service-specs'; -import { VdmProperty } from './vdm-types'; +import type { VdmProperty } from './vdm-types'; import { parseAllServices, parseService } from './service-generator'; describe('service-generator', () => { diff --git a/packages/generator/src/service-generator.ts b/packages/generator/src/service-generator.ts index cd500ed498..4230a7ed2b 100644 --- a/packages/generator/src/service-generator.ts +++ b/packages/generator/src/service-generator.ts @@ -4,13 +4,14 @@ import { getOptionsPerService, getRelPathWithPosixSeparator } from '@sap-cloud-sdk/generator-common/internal'; -import { ParsedGeneratorOptions } from './options'; -import { - readEdmxAndSwaggerFile, - ServiceMetadata -} from './edmx-parser/edmx-file-reader'; +import type { ParsedGeneratorOptions } from './options'; +import type { ServiceMetadata } from './edmx-parser/edmx-file-reader'; +import { readEdmxAndSwaggerFile } from './edmx-parser/edmx-file-reader'; import { apiBusinessHubMetadata } from './swagger-parser/swagger-util'; -import { VdmServiceMetadata, VdmServicePackageMetaData } from './vdm-types'; +import type { + VdmServiceMetadata, + VdmServicePackageMetaData +} from './vdm-types'; import { isV2Metadata } from './edmx-to-vdm/edmx-to-vdm-util'; import { getServiceEntitiesV2 } from './edmx-to-vdm/v2'; import { getServiceEntitiesV4 } from './edmx-to-vdm/v4'; diff --git a/packages/generator/src/service/index-file.ts b/packages/generator/src/service/index-file.ts index 1f58420746..78ddc47019 100644 --- a/packages/generator/src/service/index-file.ts +++ b/packages/generator/src/service/index-file.ts @@ -1,9 +1,6 @@ -import { - ExportDeclarationStructure, - SourceFileStructure, - StructureKind -} from 'ts-morph'; -import { VdmServiceMetadata } from '../vdm-types'; +import type { ExportDeclarationStructure, SourceFileStructure } from 'ts-morph'; +import { StructureKind } from 'ts-morph'; +import type { VdmServiceMetadata } from '../vdm-types'; import { hasEntities } from '../generator-utils'; /** diff --git a/packages/generator/src/service/package-json.spec.ts b/packages/generator/src/service/package-json.spec.ts index f3af31b55e..0cc44c1719 100644 --- a/packages/generator/src/service/package-json.spec.ts +++ b/packages/generator/src/service/package-json.spec.ts @@ -1,5 +1,6 @@ -import { ODataVersion } from '@sap-cloud-sdk/util'; -import { packageJson, PackageJsonOptions } from './package-json'; +import type { ODataVersion } from '@sap-cloud-sdk/util'; +import type { PackageJsonOptions } from './package-json'; +import { packageJson } from './package-json'; describe('package-json', () => { const packageJsonStatic = { homepage: 'https://sap.github.io/cloud-sdk/docs/js/getting-started', diff --git a/packages/generator/src/service/package-json.ts b/packages/generator/src/service/package-json.ts index db2768bd93..674b700d42 100644 --- a/packages/generator/src/service/package-json.ts +++ b/packages/generator/src/service/package-json.ts @@ -1,8 +1,7 @@ -import { ODataVersion, unixEOL } from '@sap-cloud-sdk/util'; -import { - packageJsonBase, - PackageJsonOptions as PackageJsonOptionsBase -} from '@sap-cloud-sdk/generator-common/internal'; +import type { ODataVersion } from '@sap-cloud-sdk/util'; +import { unixEOL } from '@sap-cloud-sdk/util'; +import type { PackageJsonOptions as PackageJsonOptionsBase } from '@sap-cloud-sdk/generator-common/internal'; +import { packageJsonBase } from '@sap-cloud-sdk/generator-common/internal'; /** * @internal diff --git a/packages/generator/src/service/readme.spec.ts b/packages/generator/src/service/readme.spec.ts index c6702e2bfb..643006dd71 100644 --- a/packages/generator/src/service/readme.spec.ts +++ b/packages/generator/src/service/readme.spec.ts @@ -1,5 +1,5 @@ import { getExpectedHelpfulLinks } from '../../test/test-util/readme-util'; -import { +import type { ApiBusinessHubMetadata, VdmOperation, VdmServiceMetadata diff --git a/packages/generator/src/service/readme.ts b/packages/generator/src/service/readme.ts index 924a184a17..b76ee16d80 100644 --- a/packages/generator/src/service/readme.ts +++ b/packages/generator/src/service/readme.ts @@ -4,7 +4,7 @@ import { usageHeaderText } from '@sap-cloud-sdk/generator-common/internal'; import { getApiSpecificUsage } from '../sdk-metadata'; -import { VdmServiceMetadata } from '../vdm-types'; +import type { VdmServiceMetadata } from '../vdm-types'; function title(service: VdmServiceMetadata): string { return service.serviceOptions.packageName || service.speakingModuleName; diff --git a/packages/generator/src/swagger-parser/swagger-parser.ts b/packages/generator/src/swagger-parser/swagger-parser.ts index c3d31938d4..0baa5c4dfe 100644 --- a/packages/generator/src/swagger-parser/swagger-parser.ts +++ b/packages/generator/src/swagger-parser/swagger-parser.ts @@ -1,6 +1,7 @@ -import { PathLike, readFileSync } from 'fs'; +import type { PathLike } from 'fs'; +import { readFileSync } from 'fs'; import path from 'path'; -import { SwaggerMetadata, SwaggerPath } from './swagger-types'; +import type { SwaggerMetadata, SwaggerPath } from './swagger-types'; /** * @internal diff --git a/packages/generator/src/swagger-parser/swagger-util.ts b/packages/generator/src/swagger-parser/swagger-util.ts index 957efd63a7..e18248b552 100644 --- a/packages/generator/src/swagger-parser/swagger-util.ts +++ b/packages/generator/src/swagger-parser/swagger-util.ts @@ -1,5 +1,5 @@ -import { ApiBusinessHubMetadata } from '../vdm-types'; -import { SwaggerMetadata } from './swagger-types'; +import type { ApiBusinessHubMetadata } from '../vdm-types'; +import type { SwaggerMetadata } from './swagger-types'; /** * @internal diff --git a/packages/generator/src/typedoc.spec.ts b/packages/generator/src/typedoc.spec.ts index d1463361cb..0e523f5ddc 100644 --- a/packages/generator/src/typedoc.spec.ts +++ b/packages/generator/src/typedoc.spec.ts @@ -4,7 +4,7 @@ import { getNavPropertyDescription, getPropertyDescription } from './typedoc'; -import { VdmNavigationProperty, VdmProperty } from './vdm-types'; +import type { VdmNavigationProperty, VdmProperty } from './vdm-types'; describe('typedoc', () => { it('get normal property description', () => { diff --git a/packages/generator/src/typedoc.ts b/packages/generator/src/typedoc.ts index d5a5cf4b07..80852300ab 100644 --- a/packages/generator/src/typedoc.ts +++ b/packages/generator/src/typedoc.ts @@ -1,6 +1,6 @@ import { unixEOL, titleFormat } from '@sap-cloud-sdk/util'; import { endWithDot } from './generator-utils'; -import { +import type { VdmComplexType, VdmEntity, VdmEnumType, diff --git a/packages/generator/src/vdm-types.ts b/packages/generator/src/vdm-types.ts index b3621260f1..2f6bd368b4 100644 --- a/packages/generator/src/vdm-types.ts +++ b/packages/generator/src/vdm-types.ts @@ -1,6 +1,6 @@ -import { PathLike } from 'fs'; -import { ODataVersion } from '@sap-cloud-sdk/util'; -import { ServiceOptions } from '@sap-cloud-sdk/generator-common/internal'; +import type { PathLike } from 'fs'; +import type { ODataVersion } from '@sap-cloud-sdk/util'; +import type { ServiceOptions } from '@sap-cloud-sdk/generator-common/internal'; /** * @internal */ diff --git a/packages/generator/test/test-util/create-generator-options.ts b/packages/generator/test/test-util/create-generator-options.ts index 85ec387fa2..b91b603fce 100644 --- a/packages/generator/test/test-util/create-generator-options.ts +++ b/packages/generator/test/test-util/create-generator-options.ts @@ -1,9 +1,9 @@ import { parseOptions } from '@sap-cloud-sdk/generator-common/internal'; -import { +import type { GeneratorOptions, - ParsedGeneratorOptions, - cliOptions + ParsedGeneratorOptions } from '../../src/options'; +import { cliOptions } from '../../src/options'; export function createOptions( options?: Partial diff --git a/packages/generator/test/test-util/data-model.ts b/packages/generator/test/test-util/data-model.ts index 7666598574..4738b23d63 100644 --- a/packages/generator/test/test-util/data-model.ts +++ b/packages/generator/test/test-util/data-model.ts @@ -1,4 +1,4 @@ -import { +import type { VdmComplexType, VdmEntity, VdmEnumType, diff --git a/packages/generator/test/test-util/generator.ts b/packages/generator/test/test-util/generator.ts index 04545c2377..d4ab1ecf18 100644 --- a/packages/generator/test/test-util/generator.ts +++ b/packages/generator/test/test-util/generator.ts @@ -1,6 +1,10 @@ import { resolve } from 'path'; -import { ClassDeclaration, FunctionDeclaration, SourceFile } from 'ts-morph'; -import { ODataVersion } from '@sap-cloud-sdk/util'; +import type { + ClassDeclaration, + FunctionDeclaration, + SourceFile +} from 'ts-morph'; +import type { ODataVersion } from '@sap-cloud-sdk/util'; import { parseOptions } from '@sap-cloud-sdk/generator-common/internal'; import { generateProject } from '../../src/generator'; import { oDataServiceSpecs } from '../../../../test-resources/odata-service-specs'; diff --git a/packages/generator/test/test-util/import-declaration-structures.ts b/packages/generator/test/test-util/import-declaration-structures.ts index 2e6834b0bf..740b49735a 100644 --- a/packages/generator/test/test-util/import-declaration-structures.ts +++ b/packages/generator/test/test-util/import-declaration-structures.ts @@ -1,4 +1,5 @@ -import { ImportDeclarationStructure, StructureKind } from 'ts-morph'; +import type { ImportDeclarationStructure } from 'ts-morph'; +import { StructureKind } from 'ts-morph'; export const momentImport = { kind: StructureKind.ImportDeclaration, diff --git a/packages/http-client/src/csrf-token-middleware.ts b/packages/http-client/src/csrf-token-middleware.ts index 51b8a15e9d..107a2d90b3 100644 --- a/packages/http-client/src/csrf-token-middleware.ts +++ b/packages/http-client/src/csrf-token-middleware.ts @@ -9,7 +9,7 @@ import { } from '@sap-cloud-sdk/util'; import axios from 'axios'; import { executeWithMiddleware } from '@sap-cloud-sdk/resilience/internal'; -import { +import type { HttpMiddleware, HttpMiddlewareContext, HttpMiddlewareOptions, diff --git a/packages/http-client/src/http-client-types.ts b/packages/http-client/src/http-client-types.ts index ddb37329c2..9ffd271ed0 100644 --- a/packages/http-client/src/http-client-types.ts +++ b/packages/http-client/src/http-client-types.ts @@ -1,10 +1,10 @@ -import * as http from 'http'; +import type * as http from 'http'; import type { MiddlewareContext, Middleware, MiddlewareOptions } from '@sap-cloud-sdk/resilience'; -import { BasicProxyConfiguration } from '@sap-cloud-sdk/connectivity'; +import type { BasicProxyConfiguration } from '@sap-cloud-sdk/connectivity'; /** * Context for HttpRequests of the middleware. diff --git a/packages/http-client/src/http-client.spec.ts b/packages/http-client/src/http-client.spec.ts index 3427103c5b..7f8850848d 100644 --- a/packages/http-client/src/http-client.spec.ts +++ b/packages/http-client/src/http-client.spec.ts @@ -11,14 +11,14 @@ import { circuitBreakers, circuitBreaker } from '@sap-cloud-sdk/resilience/internal'; -import { +import type { DestinationWithName, - registerDestination, Destination, HttpDestination } from '@sap-cloud-sdk/connectivity'; +import { registerDestination } from '@sap-cloud-sdk/connectivity'; import { registerDestinationCache } from '@sap-cloud-sdk/connectivity/internal'; -import { ProxyConfiguration } from '@sap-cloud-sdk/connectivity/src'; +import type { ProxyConfiguration } from '@sap-cloud-sdk/connectivity/src'; import { responseWithPublicKey } from '../../connectivity/src/scp-cf/jwt.spec'; import { basicMultipleResponse, @@ -39,7 +39,7 @@ import { xsuaaBindingMock } from '../../../test-resources/test/test-util'; import * as csrf from './csrf-token-middleware'; -import { +import type { DestinationHttpRequestConfig, HttpMiddleware, HttpMiddlewareOptions, diff --git a/packages/http-client/src/http-client.ts b/packages/http-client/src/http-client.ts index e2373e5f85..d5ef7ffc5b 100644 --- a/packages/http-client/src/http-client.ts +++ b/packages/http-client/src/http-client.ts @@ -1,19 +1,23 @@ import * as http from 'http'; import * as https from 'https'; +import type { + Destination, + HttpDestinationOrFetchOptions +} from '@sap-cloud-sdk/connectivity'; import { buildHeadersForDestination, - Destination, - HttpDestinationOrFetchOptions, getAgentConfigAsync, getTenantId } from '@sap-cloud-sdk/connectivity'; +import type { + DestinationConfiguration, + HttpDestination +} from '@sap-cloud-sdk/connectivity/internal'; import { assertHttpDestination, - DestinationConfiguration, getAdditionalHeaders, getAdditionalQueryParameters, getProxyConfig, - HttpDestination, resolveDestination } from '@sap-cloud-sdk/connectivity/internal'; import { executeWithMiddleware } from '@sap-cloud-sdk/resilience/internal'; @@ -25,7 +29,7 @@ import { unixEOL } from '@sap-cloud-sdk/util'; import axios from 'axios'; -import { +import type { DestinationHttpRequestConfig, ExecuteHttpRequestFn, HttpRequest, @@ -34,11 +38,11 @@ import { HttpRequestConfigWithOrigin, HttpRequestOptions, HttpResponse, - isHttpRequestConfigWithOrigin, OriginOptions, OriginOptionsInternal, ParameterEncoder } from './http-client-types'; +import { isHttpRequestConfigWithOrigin } from './http-client-types'; import { mergeOptionsWithPriority } from './http-request-config'; import { csrf } from './csrf-token-middleware'; diff --git a/packages/http-client/src/http-request-config.spec.ts b/packages/http-client/src/http-request-config.spec.ts index aa05a5ba94..1b5d38e08d 100644 --- a/packages/http-client/src/http-request-config.spec.ts +++ b/packages/http-client/src/http-request-config.spec.ts @@ -3,7 +3,7 @@ import { filterCustomRequestConfig, mergeOptionsWithPriority } from './http-request-config'; -import { OriginOptionsInternal } from './http-client-types'; +import type { OriginOptionsInternal } from './http-client-types'; const logger = createLogger('http-request-config'); diff --git a/packages/http-client/src/http-request-config.ts b/packages/http-client/src/http-request-config.ts index 9f54ed56da..3a551256e8 100644 --- a/packages/http-client/src/http-request-config.ts +++ b/packages/http-client/src/http-request-config.ts @@ -1,5 +1,5 @@ import { createLogger, exclude, mergeIgnoreCase } from '@sap-cloud-sdk/util'; -import { OriginOptionsInternal } from './http-client-types'; +import type { OriginOptionsInternal } from './http-client-types'; const logger = createLogger({ package: 'http-client', diff --git a/packages/mail-client/src/mail-client-types.ts b/packages/mail-client/src/mail-client-types.ts index d87c78f87d..e96b196075 100644 --- a/packages/mail-client/src/mail-client-types.ts +++ b/packages/mail-client/src/mail-client-types.ts @@ -1,8 +1,8 @@ -import { Readable } from 'stream'; -import { Url } from 'url'; -import { ConnectionOptions } from 'tls'; -import net from 'net'; -import { +import type { Readable } from 'stream'; +import type { Url } from 'url'; +import type { ConnectionOptions } from 'tls'; +import type net from 'net'; +import type { AuthenticationType, DestinationProxyType, ProxyConfiguration diff --git a/packages/mail-client/src/mail-client.spec.ts b/packages/mail-client/src/mail-client.spec.ts index a5128806cd..2555cdf023 100644 --- a/packages/mail-client/src/mail-client.spec.ts +++ b/packages/mail-client/src/mail-client.spec.ts @@ -1,10 +1,8 @@ import nodemailer from 'nodemailer'; import { SocksClient } from 'socks'; -import { - DestinationWithName, - registerDestination -} from '@sap-cloud-sdk/connectivity'; -import { DestinationConfiguration } from '@sap-cloud-sdk/connectivity/internal'; +import type { DestinationWithName } from '@sap-cloud-sdk/connectivity'; +import { registerDestination } from '@sap-cloud-sdk/connectivity'; +import type { DestinationConfiguration } from '@sap-cloud-sdk/connectivity/internal'; import * as tokenAccessor from '@sap-cloud-sdk/connectivity/dist/scp-cf/token-accessor'; import { mockFetchDestinationCalls, @@ -16,7 +14,7 @@ import { isMailSentInSequential, sendMail } from './mail-client'; -import { +import type { MailDestination, MailConfig, MailClientOptions diff --git a/packages/mail-client/src/mail-client.ts b/packages/mail-client/src/mail-client.ts index e5606e65e9..37ce171c4a 100644 --- a/packages/mail-client/src/mail-client.ts +++ b/packages/mail-client/src/mail-client.ts @@ -1,15 +1,17 @@ -import { +import type { Destination, - DestinationOrFetchOptions, - toDestinationNameUrl + DestinationOrFetchOptions } from '@sap-cloud-sdk/connectivity'; +import { toDestinationNameUrl } from '@sap-cloud-sdk/connectivity'; import { resolveDestination } from '@sap-cloud-sdk/connectivity/internal'; import { createLogger } from '@sap-cloud-sdk/util'; -import nodemailer, { SentMessageInfo, Transporter } from 'nodemailer'; -import { SocksClient, SocksClientOptions, SocksProxy } from 'socks'; +import type { SentMessageInfo, Transporter } from 'nodemailer'; +import nodemailer from 'nodemailer'; +import type { SocksClientOptions, SocksProxy } from 'socks'; +import { SocksClient } from 'socks'; // eslint-disable-next-line import/no-internal-modules import type { Options } from 'nodemailer/lib/smtp-pool'; -import { +import type { MailClientOptions, MailConfig, MailDestination, diff --git a/packages/odata-common/src/batch-response.ts b/packages/odata-common/src/batch-response.ts index 921e32cee5..10158c9685 100644 --- a/packages/odata-common/src/batch-response.ts +++ b/packages/odata-common/src/batch-response.ts @@ -1,6 +1,6 @@ -import { DeSerializers } from './de-serializers'; -import { EntityBase } from './entity-base'; -import { EntityApi } from './entity-api'; +import type { DeSerializers } from './de-serializers'; +import type { EntityBase } from './entity-base'; +import type { EntityApi } from './entity-api'; /** * @internal diff --git a/packages/odata-common/src/de-serializers/custom-de-serializers.ts b/packages/odata-common/src/de-serializers/custom-de-serializers.ts index b9a5020004..99127ea5bb 100644 --- a/packages/odata-common/src/de-serializers/custom-de-serializers.ts +++ b/packages/odata-common/src/de-serializers/custom-de-serializers.ts @@ -1,13 +1,11 @@ -import BigNumber from 'bignumber.js'; -import { +import type BigNumber from 'bignumber.js'; +import type { DeserializedType, DeSerializer, DeSerializers } from './de-serializers'; -import { - defaultDeSerializers, - DefaultDeSerializers -} from './default-de-serializers'; +import type { DefaultDeSerializers } from './default-de-serializers'; +import { defaultDeSerializers } from './default-de-serializers'; /** * Infers the deserialized type for an EDM type, based on custom (de-)serializers. diff --git a/packages/odata-common/src/de-serializers/default-de-serializers.spec.ts b/packages/odata-common/src/de-serializers/default-de-serializers.spec.ts index 2a4dc5d3ac..d98ac2053c 100644 --- a/packages/odata-common/src/de-serializers/default-de-serializers.spec.ts +++ b/packages/odata-common/src/de-serializers/default-de-serializers.spec.ts @@ -1,4 +1,4 @@ -import { DeSerializers } from './de-serializers'; +import type { DeSerializers } from './de-serializers'; import { wrapDefaultDeSerializers } from './default-de-serializers'; describe('wrapDefaultDeSerializers', () => { diff --git a/packages/odata-common/src/de-serializers/default-de-serializers.ts b/packages/odata-common/src/de-serializers/default-de-serializers.ts index 027472cddf..1114586ac3 100644 --- a/packages/odata-common/src/de-serializers/default-de-serializers.ts +++ b/packages/odata-common/src/de-serializers/default-de-serializers.ts @@ -1,6 +1,6 @@ import { identity, isNullish } from '@sap-cloud-sdk/util'; -import BigNumber from 'bignumber.js'; -import { DeSerializer, DeSerializers } from './de-serializers'; +import type BigNumber from 'bignumber.js'; +import type { DeSerializer, DeSerializers } from './de-serializers'; import { serializeFromBigNumber, deserializeToNumber, diff --git a/packages/odata-common/src/de-serializers/uri-value-converter.ts b/packages/odata-common/src/de-serializers/uri-value-converter.ts index 99a0b8eba7..33cf9d910c 100644 --- a/packages/odata-common/src/de-serializers/uri-value-converter.ts +++ b/packages/odata-common/src/de-serializers/uri-value-converter.ts @@ -1,5 +1,5 @@ -import { EdmTypeShared } from '../edm-types'; -import { DeSerializers } from './de-serializers'; +import type { EdmTypeShared } from '../edm-types'; +import type { DeSerializers } from './de-serializers'; /** * @internal diff --git a/packages/odata-common/src/edm-types.ts b/packages/odata-common/src/edm-types.ts index 5aa071254a..c528f266a7 100644 --- a/packages/odata-common/src/edm-types.ts +++ b/packages/odata-common/src/edm-types.ts @@ -1,4 +1,4 @@ -import { ODataVersion } from '@sap-cloud-sdk/util'; +import type { ODataVersion } from '@sap-cloud-sdk/util'; /** * Includes all EDM types which are shared between OData version 2 and 4. */ diff --git a/packages/odata-common/src/entity-base.ts b/packages/odata-common/src/entity-base.ts index 86659a9cb0..760356ed76 100644 --- a/packages/odata-common/src/entity-base.ts +++ b/packages/odata-common/src/entity-base.ts @@ -4,8 +4,8 @@ import { camelCase, equal, isNullish } from '@sap-cloud-sdk/util'; import { EntityBuilder } from './entity-builder'; import { isNavigationProperty, nonEnumerable } from './properties-util'; import type { Field, Link } from './selectable'; -import { DeSerializers } from './de-serializers'; -import { EntityApi } from './entity-api'; +import type { DeSerializers } from './de-serializers'; +import type { EntityApi } from './entity-api'; /** * Helper type to extract the {@link @sap-cloud-sdk/util!ODataVersion} from a given entity so ODataVersionOf is `v2`. diff --git a/packages/odata-common/src/entity-builder.ts b/packages/odata-common/src/entity-builder.ts index 5cee6ad259..766b7da839 100644 --- a/packages/odata-common/src/entity-builder.ts +++ b/packages/odata-common/src/entity-builder.ts @@ -5,8 +5,8 @@ import { } from '@sap-cloud-sdk/util'; import { isNavigationProperty } from './properties-util'; import type { EntityBase } from './entity-base'; -import { DeSerializers } from './de-serializers'; -import { EntityApi } from './entity-api'; +import type { DeSerializers } from './de-serializers'; +import type { EntityApi } from './entity-api'; const logger = createLogger({ package: 'odata-common', diff --git a/packages/odata-common/src/entity-deserializer.ts b/packages/odata-common/src/entity-deserializer.ts index 55737142ef..eede2c5db5 100644 --- a/packages/odata-common/src/entity-deserializer.ts +++ b/packages/odata-common/src/entity-deserializer.ts @@ -3,18 +3,19 @@ import { createLogger, pickValueIgnoreCase } from '@sap-cloud-sdk/util'; -import { createValueDeserializer, DeSerializers } from './de-serializers'; -import { - EntityBase, - isExpandedProperty, - isSelectedProperty -} from './entity-base'; -import { EdmTypeShared, isEdmType } from './edm-types'; -import { +import type { DeSerializers } from './de-serializers'; +import { createValueDeserializer } from './de-serializers'; +import type { EntityBase } from './entity-base'; +import { isExpandedProperty, isSelectedProperty } from './entity-base'; +import type { EdmTypeShared } from './edm-types'; +import { isEdmType } from './edm-types'; +import type { ComplexTypeNamespace, - isComplexTypeNameSpace, PropertyMetadata, - Field, + Field +} from './selectable'; +import { + isComplexTypeNameSpace, Link, EdmTypeField, EnumField, @@ -22,7 +23,7 @@ import { ComplexTypeField, OneToOneLink } from './selectable'; -import { EntityApi, EntityType } from './entity-api'; +import type { EntityApi, EntityType } from './entity-api'; const logger = createLogger({ package: 'odata-common', diff --git a/packages/odata-common/src/entity-serializer.ts b/packages/odata-common/src/entity-serializer.ts index 68a1ef3c5b..4811db6446 100644 --- a/packages/odata-common/src/entity-serializer.ts +++ b/packages/odata-common/src/entity-serializer.ts @@ -1,22 +1,21 @@ import { createLogger, upperCaseSnakeCase } from '@sap-cloud-sdk/util'; -import { EntityBase } from './entity-base'; -import { +import type { EntityBase } from './entity-base'; +import type { ComplexTypeNamespace, - isComplexTypeNameSpace, PropertyMetadata } from './selectable/complex-type-namespace'; +import { isComplexTypeNameSpace } from './selectable/complex-type-namespace'; import { EdmTypeField } from './selectable/edm-type-field'; import { OneToOneLink } from './selectable/one-to-one-link'; import { Link } from './selectable/link'; import { ComplexTypeField } from './selectable/complex-type-field'; import { CollectionField } from './selectable/collection-field'; import { EnumField } from './selectable/enum-field'; -import { EdmTypeShared, isEdmType } from './edm-types'; -import { - createValueSerializer, - DeSerializers -} from './de-serializers/de-serializers'; -import { EntityApi } from './entity-api'; +import type { EdmTypeShared } from './edm-types'; +import { isEdmType } from './edm-types'; +import type { DeSerializers } from './de-serializers/de-serializers'; +import { createValueSerializer } from './de-serializers/de-serializers'; +import type { EntityApi } from './entity-api'; const logger = createLogger({ package: 'odata-common', diff --git a/packages/odata-common/src/expandable.ts b/packages/odata-common/src/expandable.ts index db36cebe53..4a89e319ce 100644 --- a/packages/odata-common/src/expandable.ts +++ b/packages/odata-common/src/expandable.ts @@ -1,9 +1,9 @@ -import { DeSerializers } from './de-serializers'; -import { EntityBase, ODataVersionOf } from './entity-base'; -import { OneToManyLink } from './selectable/one-to-many-link'; -import { AllFields } from './selectable/all-fields'; -import { OneToOneLink } from './selectable/one-to-one-link'; -import { EntityApi } from './entity-api'; +import type { DeSerializers } from './de-serializers'; +import type { EntityBase, ODataVersionOf } from './entity-base'; +import type { OneToManyLink } from './selectable/one-to-many-link'; +import type { AllFields } from './selectable/all-fields'; +import type { OneToOneLink } from './selectable/one-to-one-link'; +import type { EntityApi } from './entity-api'; /** * Represents everything that can be used in an `.expand` statement. Only relevant for OData v4 requests. diff --git a/packages/odata-common/src/filter/boolean-filter-function.ts b/packages/odata-common/src/filter/boolean-filter-function.ts index 2e8e4b255c..7328822419 100644 --- a/packages/odata-common/src/filter/boolean-filter-function.ts +++ b/packages/odata-common/src/filter/boolean-filter-function.ts @@ -1,9 +1,7 @@ -import { EntityBase } from '../entity-base'; -import { - FilterFunction, - FilterFunctionParameterType -} from './filter-function-base'; -import { Filterable } from './filterable'; +import type { EntityBase } from '../entity-base'; +import type { FilterFunctionParameterType } from './filter-function-base'; +import { FilterFunction } from './filter-function-base'; +import type { Filterable } from './filterable'; /** * Representation of a filter function, that returns a value of type boolean. diff --git a/packages/odata-common/src/filter/collection-filter-function.ts b/packages/odata-common/src/filter/collection-filter-function.ts index 475791b1e7..43aced551e 100644 --- a/packages/odata-common/src/filter/collection-filter-function.ts +++ b/packages/odata-common/src/filter/collection-filter-function.ts @@ -1,9 +1,7 @@ -import { EntityBase } from '../entity-base'; -import { EdmTypeShared } from '../edm-types'; -import { - FilterFunction, - FilterFunctionParameterType -} from './filter-function-base'; +import type { EntityBase } from '../entity-base'; +import type { EdmTypeShared } from '../edm-types'; +import type { FilterFunctionParameterType } from './filter-function-base'; +import { FilterFunction } from './filter-function-base'; /** * Representation of a filter function, that returns a collection of values. diff --git a/packages/odata-common/src/filter/filter-function-base.ts b/packages/odata-common/src/filter/filter-function-base.ts index 3c9b9f650c..251deadf08 100644 --- a/packages/odata-common/src/filter/filter-function-base.ts +++ b/packages/odata-common/src/filter/filter-function-base.ts @@ -1,7 +1,7 @@ -import moment from 'moment'; -import { EdmTypeShared } from '../edm-types'; -import { EntityBase, ODataVersionOf } from '../entity-base'; -import { Field } from '../selectable/field'; +import type moment from 'moment'; +import type { EdmTypeShared } from '../edm-types'; +import type { EntityBase, ODataVersionOf } from '../entity-base'; +import type { Field } from '../selectable/field'; import { Filter } from './filter'; /** diff --git a/packages/odata-common/src/filter/filter-function.ts b/packages/odata-common/src/filter/filter-function.ts index 5d213d6f65..c3747b4886 100644 --- a/packages/odata-common/src/filter/filter-function.ts +++ b/packages/odata-common/src/filter/filter-function.ts @@ -1,8 +1,8 @@ -import { EntityBase } from '../entity-base'; +import type { EntityBase } from '../entity-base'; import { BooleanFilterFunction } from './boolean-filter-function'; import { NumberFilterFunction } from './number-filter-function'; import { StringFilterFunction } from './string-filter-function'; -import { FilterFunctionParameterType } from './filter-function-base'; +import type { FilterFunctionParameterType } from './filter-function-base'; export function filterFunction( functionName: string, diff --git a/packages/odata-common/src/filter/filter-functions.ts b/packages/odata-common/src/filter/filter-functions.ts index 19284be391..1391fda1ae 100644 --- a/packages/odata-common/src/filter/filter-functions.ts +++ b/packages/odata-common/src/filter/filter-functions.ts @@ -1,12 +1,12 @@ -import moment from 'moment'; -import BigNumber from 'bignumber.js'; -import { DeSerializers } from '../de-serializers'; -import { EntityBase } from '../entity-base'; -import { Field } from '../selectable/field'; -import { StringFilterFunction } from './string-filter-function'; -import { BooleanFilterFunction } from './boolean-filter-function'; +import type moment from 'moment'; +import type BigNumber from 'bignumber.js'; +import type { DeSerializers } from '../de-serializers'; +import type { EntityBase } from '../entity-base'; +import type { Field } from '../selectable/field'; +import type { StringFilterFunction } from './string-filter-function'; +import type { BooleanFilterFunction } from './boolean-filter-function'; import { filterFunction } from './filter-function'; -import { NumberFilterFunction } from './number-filter-function'; +import type { NumberFilterFunction } from './number-filter-function'; /* String Functions */ /** diff --git a/packages/odata-common/src/filter/filter-lambda-expression.ts b/packages/odata-common/src/filter/filter-lambda-expression.ts index aed96242b2..c0fefdb987 100644 --- a/packages/odata-common/src/filter/filter-lambda-expression.ts +++ b/packages/odata-common/src/filter/filter-lambda-expression.ts @@ -1,6 +1,6 @@ -import { DeSerializers } from '../de-serializers'; -import { EntityBase } from '../entity-base'; -import { FilterList } from './filter-list'; +import type { DeSerializers } from '../de-serializers'; +import type { EntityBase } from '../entity-base'; +import type { FilterList } from './filter-list'; import type { Filterable } from './filterable'; /** diff --git a/packages/odata-common/src/filter/filter-link.ts b/packages/odata-common/src/filter/filter-link.ts index 1308833e55..6161c3c78d 100644 --- a/packages/odata-common/src/filter/filter-link.ts +++ b/packages/odata-common/src/filter/filter-link.ts @@ -1,7 +1,7 @@ -import { DeSerializers } from '../de-serializers'; -import { EntityBase, EntityIdentifiable } from '../entity-base'; -import { Link } from '../selectable/link'; -import { EntityApi, EntityType } from '../entity-api'; +import type { DeSerializers } from '../de-serializers'; +import type { EntityBase, EntityIdentifiable } from '../entity-base'; +import type { Link } from '../selectable/link'; +import type { EntityApi, EntityType } from '../entity-api'; import type { Filterable } from './filterable'; /** diff --git a/packages/odata-common/src/filter/filter-list.ts b/packages/odata-common/src/filter/filter-list.ts index 855593b642..b4cf160269 100644 --- a/packages/odata-common/src/filter/filter-list.ts +++ b/packages/odata-common/src/filter/filter-list.ts @@ -1,5 +1,5 @@ -import { DeSerializers } from '../de-serializers'; -import { EntityBase, EntityIdentifiable } from '../entity-base'; +import type { DeSerializers } from '../de-serializers'; +import type { EntityBase, EntityIdentifiable } from '../entity-base'; import { OneToManyLink } from '../selectable/one-to-many-link'; import type { Filterable } from './filterable'; diff --git a/packages/odata-common/src/filter/filter.ts b/packages/odata-common/src/filter/filter.ts index 27c55a35d0..d90adcf6b0 100644 --- a/packages/odata-common/src/filter/filter.ts +++ b/packages/odata-common/src/filter/filter.ts @@ -1,6 +1,10 @@ -import { DeSerializers } from '../de-serializers/de-serializers'; -import { EdmTypeShared } from '../edm-types'; -import { EntityBase, EntityIdentifiable, ODataVersionOf } from '../entity-base'; +import type { DeSerializers } from '../de-serializers/de-serializers'; +import type { EdmTypeShared } from '../edm-types'; +import type { + EntityBase, + EntityIdentifiable, + ODataVersionOf +} from '../entity-base'; import type { FilterFunction } from './filter-function-base'; import type { Filterable } from './filterable'; diff --git a/packages/odata-common/src/filter/filterable.ts b/packages/odata-common/src/filter/filterable.ts index 0c2576d1c5..95473723c9 100644 --- a/packages/odata-common/src/filter/filterable.ts +++ b/packages/odata-common/src/filter/filterable.ts @@ -1,14 +1,14 @@ import { transformVariadicArgumentToArray } from '@sap-cloud-sdk/util'; import type { EntityBase } from '../entity-base'; import type { OneToManyLink } from '../selectable/one-to-many-link'; -import { DeSerializers } from '../de-serializers'; -import { EntityApi } from '../entity-api'; +import type { DeSerializers } from '../de-serializers'; +import type { EntityApi } from '../entity-api'; import type { BooleanFilterFunction } from './boolean-filter-function'; import type { Filter } from './filter'; import { UnaryFilter } from './unary-filter'; import { FilterList } from './filter-list'; -import { FilterLambdaExpression } from './filter-lambda-expression'; -import { FilterLink } from './filter-link'; +import type { FilterLambdaExpression } from './filter-lambda-expression'; +import type { FilterLink } from './filter-link'; /** * A union of all types that can be used for filtering. diff --git a/packages/odata-common/src/filter/number-filter-function.ts b/packages/odata-common/src/filter/number-filter-function.ts index 5f7d55fda0..b1c36bc708 100644 --- a/packages/odata-common/src/filter/number-filter-function.ts +++ b/packages/odata-common/src/filter/number-filter-function.ts @@ -1,5 +1,5 @@ -import { EntityBase } from '../entity-base'; -import { FilterFunctionParameterType } from './filter-function-base'; +import type { EntityBase } from '../entity-base'; +import type { FilterFunctionParameterType } from './filter-function-base'; import { OrderableFilterFunction } from './orderable-filter-function'; /** diff --git a/packages/odata-common/src/filter/orderable-filter-function.ts b/packages/odata-common/src/filter/orderable-filter-function.ts index c5d2407e40..30825d9c51 100644 --- a/packages/odata-common/src/filter/orderable-filter-function.ts +++ b/packages/odata-common/src/filter/orderable-filter-function.ts @@ -1,10 +1,8 @@ -import { EntityBase, ODataVersionOf } from '../entity-base'; -import { EdmTypeShared } from '../edm-types'; +import type { EntityBase, ODataVersionOf } from '../entity-base'; +import type { EdmTypeShared } from '../edm-types'; import { Filter } from './filter'; -import { - FilterFunction, - FilterFunctionParameterType -} from './filter-function-base'; +import type { FilterFunctionParameterType } from './filter-function-base'; +import { FilterFunction } from './filter-function-base'; /** * Representation of a filter function, that returns a value of an orderable type. This supports int, double and decimal values. diff --git a/packages/odata-common/src/filter/string-filter-function.ts b/packages/odata-common/src/filter/string-filter-function.ts index 41bd19bee2..7c5a832bf0 100644 --- a/packages/odata-common/src/filter/string-filter-function.ts +++ b/packages/odata-common/src/filter/string-filter-function.ts @@ -1,5 +1,5 @@ -import { EntityBase } from '../entity-base'; -import { FilterFunctionParameterType } from './filter-function-base'; +import type { EntityBase } from '../entity-base'; +import type { FilterFunctionParameterType } from './filter-function-base'; import { OrderableFilterFunction } from './orderable-filter-function'; /** diff --git a/packages/odata-common/src/filter/unary-filter.ts b/packages/odata-common/src/filter/unary-filter.ts index d699d86c87..d5d0ee0f0d 100644 --- a/packages/odata-common/src/filter/unary-filter.ts +++ b/packages/odata-common/src/filter/unary-filter.ts @@ -1,5 +1,5 @@ import type { EntityBase } from '../entity-base'; -import { DeSerializers } from '../de-serializers'; +import type { DeSerializers } from '../de-serializers'; import type { Filterable } from './filterable'; type UnaryFilterOperator = 'not'; diff --git a/packages/odata-common/src/header-builder.ts b/packages/odata-common/src/header-builder.ts index c6385e878c..5140359a13 100644 --- a/packages/odata-common/src/header-builder.ts +++ b/packages/odata-common/src/header-builder.ts @@ -5,9 +5,9 @@ * @param request - OData request configuration to create headers for. * @returns Key-value pairs where the key is the name of a header property and the value is the respective value. */ -import { OriginOptions } from '@sap-cloud-sdk/http-client'; -import { ODataRequest } from './request/odata-request'; -import { ODataRequestConfig } from './request/odata-request-config'; +import type { OriginOptions } from '@sap-cloud-sdk/http-client'; +import type { ODataRequest } from './request/odata-request'; +import type { ODataRequestConfig } from './request/odata-request-config'; /** * Create Headers from request object. diff --git a/packages/odata-common/src/order/order-link.ts b/packages/odata-common/src/order/order-link.ts index 1223b62145..dff85d7e5d 100644 --- a/packages/odata-common/src/order/order-link.ts +++ b/packages/odata-common/src/order/order-link.ts @@ -1,6 +1,6 @@ -import { EntityBase } from '../entity-base'; -import { Link } from '../selectable/link'; -import { EntityApi, EntityType } from '../entity-api'; +import type { EntityBase } from '../entity-base'; +import type { Link } from '../selectable/link'; +import type { EntityApi, EntityType } from '../entity-api'; import type { Orderable } from './orderable'; /** diff --git a/packages/odata-common/src/order/order.ts b/packages/odata-common/src/order/order.ts index 208a5ec783..8cdaab4903 100644 --- a/packages/odata-common/src/order/order.ts +++ b/packages/odata-common/src/order/order.ts @@ -1,4 +1,8 @@ -import { EntityBase, EntityIdentifiable, Constructable } from '../entity-base'; +import type { + EntityBase, + EntityIdentifiable, + Constructable +} from '../entity-base'; /** * Is either ascending or descending. diff --git a/packages/odata-common/src/order/orderable.ts b/packages/odata-common/src/order/orderable.ts index 0a8cea2e93..1ef8db0230 100644 --- a/packages/odata-common/src/order/orderable.ts +++ b/packages/odata-common/src/order/orderable.ts @@ -1,11 +1,11 @@ -import { DeSerializers } from '../de-serializers'; -import { EntityBase } from '../entity-base'; -import { ComplexTypePropertyFields } from '../selectable/complex-type-property-fields'; -import { SimpleTypeFields } from '../selectable/simple-type-fields'; +import type { DeSerializers } from '../de-serializers'; +import type { EntityBase } from '../entity-base'; +import type { ComplexTypePropertyFields } from '../selectable/complex-type-property-fields'; +import type { SimpleTypeFields } from '../selectable/simple-type-fields'; import { Link } from '../selectable/link'; -import { EntityApi } from '../entity-api'; +import type { EntityApi } from '../entity-api'; import { Order } from './order'; -import { OrderLink } from './order-link'; +import type { OrderLink } from './order-link'; /** * A union of all types that can be used for ordering. diff --git a/packages/odata-common/src/request-builder/batch/batch-change-set.ts b/packages/odata-common/src/request-builder/batch/batch-change-set.ts index 4b597e1aa9..4763fc77f1 100644 --- a/packages/odata-common/src/request-builder/batch/batch-change-set.ts +++ b/packages/odata-common/src/request-builder/batch/batch-change-set.ts @@ -1,10 +1,10 @@ import { v4 as uuid } from 'uuid'; -import { DefaultDeSerializers, DeSerializers } from '../../de-serializers'; -import { CreateRequestBuilderBase } from '../create-request-builder-base'; -import { EntityBase } from '../../entity-base'; -import { UpdateRequestBuilderBase } from '../update-request-builder-base'; -import { DeleteRequestBuilderBase } from '../delete-request-builder-base'; -import { OperationRequestBuilderBase } from '../operation-request-builder-base'; +import type { DefaultDeSerializers, DeSerializers } from '../../de-serializers'; +import type { CreateRequestBuilderBase } from '../create-request-builder-base'; +import type { EntityBase } from '../../entity-base'; +import type { UpdateRequestBuilderBase } from '../update-request-builder-base'; +import type { DeleteRequestBuilderBase } from '../delete-request-builder-base'; +import type { OperationRequestBuilderBase } from '../operation-request-builder-base'; /** * Representation of a batch change set, which holds a collection of write operations. diff --git a/packages/odata-common/src/request-builder/batch/batch-request-builder.ts b/packages/odata-common/src/request-builder/batch/batch-request-builder.ts index b4311f5afd..5234c67aa0 100644 --- a/packages/odata-common/src/request-builder/batch/batch-request-builder.ts +++ b/packages/odata-common/src/request-builder/batch/batch-request-builder.ts @@ -1,18 +1,19 @@ -import { HttpDestinationOrFetchOptions } from '@sap-cloud-sdk/connectivity'; -import { HttpResponse } from '@sap-cloud-sdk/http-client'; +import type { HttpDestinationOrFetchOptions } from '@sap-cloud-sdk/connectivity'; +import type { HttpResponse } from '@sap-cloud-sdk/http-client'; import { first } from '@sap-cloud-sdk/util'; -import { DefaultDeSerializers, DeSerializers } from '../../de-serializers'; -import { EntityApi } from '../../entity-api'; -import { EntityBase } from '../../entity-base'; -import { ODataRequestConfig } from '../../request'; +import type { DefaultDeSerializers, DeSerializers } from '../../de-serializers'; +import type { EntityApi } from '../../entity-api'; +import type { EntityBase } from '../../entity-base'; +import type { ODataRequestConfig } from '../../request'; import { ODataBatchRequestConfig } from '../../request/odata-batch-request-config'; -import { ODataRequest } from '../../request/odata-request'; -import { OperationRequestBuilderBase } from '../operation-request-builder-base'; -import { GetAllRequestBuilderBase } from '../get-all-request-builder-base'; -import { GetByKeyRequestBuilderBase } from '../get-by-key-request-builder-base'; +import type { ODataRequest } from '../../request/odata-request'; +import type { OperationRequestBuilderBase } from '../operation-request-builder-base'; +import type { GetAllRequestBuilderBase } from '../get-all-request-builder-base'; +import type { GetByKeyRequestBuilderBase } from '../get-by-key-request-builder-base'; import { MethodRequestBuilder } from '../request-builder-base'; -import { BatchChangeSet, ChangesetBuilderTypes } from './batch-change-set'; -import { BatchSubRequestPathType } from './batch-request-options'; +import type { ChangesetBuilderTypes } from './batch-change-set'; +import { BatchChangeSet } from './batch-change-set'; +import type { BatchSubRequestPathType } from './batch-request-options'; import { serializeBatchRequest } from './batch-request-serializer'; /** diff --git a/packages/odata-common/src/request-builder/batch/batch-request-options.ts b/packages/odata-common/src/request-builder/batch/batch-request-options.ts index d8d68f3b5f..a639ba97e1 100644 --- a/packages/odata-common/src/request-builder/batch/batch-request-options.ts +++ b/packages/odata-common/src/request-builder/batch/batch-request-options.ts @@ -1,4 +1,4 @@ -import { HttpDestination } from '@sap-cloud-sdk/connectivity/internal'; +import type { HttpDestination } from '@sap-cloud-sdk/connectivity/internal'; /** * The path in the sub request should be serialized as an absolute or relative URL. diff --git a/packages/odata-common/src/request-builder/batch/batch-request-serializer.spec.ts b/packages/odata-common/src/request-builder/batch/batch-request-serializer.spec.ts index 0adcbfab45..af715aa986 100644 --- a/packages/odata-common/src/request-builder/batch/batch-request-serializer.spec.ts +++ b/packages/odata-common/src/request-builder/batch/batch-request-serializer.spec.ts @@ -1,18 +1,18 @@ +import type { CommonEntity } from '@sap-cloud-sdk/test-services-odata-common/common-entity'; import { - CommonEntity, commonEntityApi, CommonEntityApi } from '@sap-cloud-sdk/test-services-odata-common/common-entity'; +import type { WriteBuilder } from '@sap-cloud-sdk/test-services-odata-common/common-request-config'; import { batchRequestBuilder, createRequestBuilder, deleteRequestBuilder, getAllRequestBuilder, getByKeyRequestBuilder, - updateRequestBuilder, - WriteBuilder + updateRequestBuilder } from '@sap-cloud-sdk/test-services-odata-common/common-request-config'; -import { HttpDestination } from '@sap-cloud-sdk/connectivity/internal'; +import type { HttpDestination } from '@sap-cloud-sdk/connectivity/internal'; import { serializeBatchRequest, serializeRequest, diff --git a/packages/odata-common/src/request-builder/batch/batch-request-serializer.ts b/packages/odata-common/src/request-builder/batch/batch-request-serializer.ts index 1058078973..4c7431c2e3 100644 --- a/packages/odata-common/src/request-builder/batch/batch-request-serializer.ts +++ b/packages/odata-common/src/request-builder/batch/batch-request-serializer.ts @@ -1,12 +1,12 @@ import { unixEOL } from '@sap-cloud-sdk/util'; import voca from 'voca'; import { ODataRequest } from '../../request/odata-request'; -import { ODataRequestConfig } from '../../request/odata-request-config'; -import { MethodRequestBuilder } from '../request-builder-base'; -import { DeSerializers } from '../../de-serializers'; -import { WithBatchReference } from '../../request'; +import type { ODataRequestConfig } from '../../request/odata-request-config'; +import type { MethodRequestBuilder } from '../request-builder-base'; +import type { DeSerializers } from '../../de-serializers'; +import type { WithBatchReference } from '../../request'; import type { BatchRequestBuilder } from './batch-request-builder'; -import { +import type { BatchRequestSerializationOptions, BatchSubRequestPathType } from './batch-request-options'; diff --git a/packages/odata-common/src/request-builder/batch/batch-response-deserializer.spec.ts b/packages/odata-common/src/request-builder/batch/batch-response-deserializer.spec.ts index 21ab68b029..818fd490d7 100644 --- a/packages/odata-common/src/request-builder/batch/batch-response-deserializer.spec.ts +++ b/packages/odata-common/src/request-builder/batch/batch-response-deserializer.spec.ts @@ -1,6 +1,6 @@ import { createLogger } from '@sap-cloud-sdk/util'; -import { EntityDeserializer } from '../../entity-deserializer'; -import { ResponseDataAccessor } from '../../response-data-accessor'; +import type { EntityDeserializer } from '../../entity-deserializer'; +import type { ResponseDataAccessor } from '../../response-data-accessor'; import { BatchResponseDeserializer, parseEntityNameFromMetadataUri diff --git a/packages/odata-common/src/request-builder/batch/batch-response-deserializer.ts b/packages/odata-common/src/request-builder/batch/batch-response-deserializer.ts index 1145a0e5fe..a6190a65d8 100644 --- a/packages/odata-common/src/request-builder/batch/batch-response-deserializer.ts +++ b/packages/odata-common/src/request-builder/batch/batch-response-deserializer.ts @@ -1,17 +1,18 @@ import { createLogger, ErrorWithCause } from '@sap-cloud-sdk/util'; -import { +import type { BatchResponse, ErrorResponse, ReadResponse, WriteResponse, WriteResponses } from '../../batch-response'; -import { DeSerializers } from '../../de-serializers'; -import { EntityBase } from '../../entity-base'; -import { EntityDeserializer } from '../../entity-deserializer'; -import { ResponseDataAccessor } from '../../response-data-accessor'; -import { EntityApi } from '../../entity-api'; -import { ResponseData, isHttpSuccessCode } from './batch-response-parser'; +import type { DeSerializers } from '../../de-serializers'; +import type { EntityBase } from '../../entity-base'; +import type { EntityDeserializer } from '../../entity-deserializer'; +import type { ResponseDataAccessor } from '../../response-data-accessor'; +import type { EntityApi } from '../../entity-api'; +import type { ResponseData } from './batch-response-parser'; +import { isHttpSuccessCode } from './batch-response-parser'; const logger = createLogger({ package: 'odata-common', diff --git a/packages/odata-common/src/request-builder/batch/batch-response-parser.spec.ts b/packages/odata-common/src/request-builder/batch/batch-response-parser.spec.ts index f8b8dbd7b7..b7a0e91a70 100644 --- a/packages/odata-common/src/request-builder/batch/batch-response-parser.spec.ts +++ b/packages/odata-common/src/request-builder/batch/batch-response-parser.spec.ts @@ -1,5 +1,5 @@ import { unixEOL, createLogger } from '@sap-cloud-sdk/util'; -import { HttpResponse } from '@sap-cloud-sdk/http-client'; +import type { HttpResponse } from '@sap-cloud-sdk/http-client'; import { detectNewLineSymbol, getResponseBody, diff --git a/packages/odata-common/src/request-builder/batch/batch-response-parser.ts b/packages/odata-common/src/request-builder/batch/batch-response-parser.ts index eafff021c2..5f25cc97a9 100644 --- a/packages/odata-common/src/request-builder/batch/batch-response-parser.ts +++ b/packages/odata-common/src/request-builder/batch/batch-response-parser.ts @@ -6,7 +6,7 @@ import { webEOL, unixEOL } from '@sap-cloud-sdk/util'; -import { HttpResponse } from '@sap-cloud-sdk/http-client'; +import type { HttpResponse } from '@sap-cloud-sdk/http-client'; const logger = createLogger({ package: 'odata-common', diff --git a/packages/odata-common/src/request-builder/count-request-builder.ts b/packages/odata-common/src/request-builder/count-request-builder.ts index 99e4a42ed1..7dba338354 100644 --- a/packages/odata-common/src/request-builder/count-request-builder.ts +++ b/packages/odata-common/src/request-builder/count-request-builder.ts @@ -1,8 +1,8 @@ -import { HttpDestinationOrFetchOptions } from '@sap-cloud-sdk/connectivity'; -import { HttpResponse } from '@sap-cloud-sdk/http-client'; -import { EntityBase } from '../entity-base'; +import type { HttpDestinationOrFetchOptions } from '@sap-cloud-sdk/connectivity'; +import type { HttpResponse } from '@sap-cloud-sdk/http-client'; +import type { EntityBase } from '../entity-base'; import { ODataCountRequestConfig } from '../request/odata-count-request-config'; -import { DeSerializers } from '../de-serializers/de-serializers'; +import type { DeSerializers } from '../de-serializers/de-serializers'; import { MethodRequestBuilder } from './request-builder-base'; import type { GetAllRequestBuilderBase } from './get-all-request-builder-base'; diff --git a/packages/odata-common/src/request-builder/create-request-builder-base.spec.ts b/packages/odata-common/src/request-builder/create-request-builder-base.spec.ts index f02255c46c..3226aa9bc3 100644 --- a/packages/odata-common/src/request-builder/create-request-builder-base.spec.ts +++ b/packages/odata-common/src/request-builder/create-request-builder-base.spec.ts @@ -1,7 +1,5 @@ -import { - CommonEntity, - CommonEntityApi -} from '@sap-cloud-sdk/test-services-odata-common/common-entity'; +import type { CommonEntity } from '@sap-cloud-sdk/test-services-odata-common/common-entity'; +import { CommonEntityApi } from '@sap-cloud-sdk/test-services-odata-common/common-entity'; import { createRequestBuilder } from '@sap-cloud-sdk/test-services-odata-common/common-request-config'; const mockBatchId = ''; jest.mock('uuid', () => ({ diff --git a/packages/odata-common/src/request-builder/create-request-builder-base.ts b/packages/odata-common/src/request-builder/create-request-builder-base.ts index c611d462f9..8e68de0a94 100644 --- a/packages/odata-common/src/request-builder/create-request-builder-base.ts +++ b/packages/odata-common/src/request-builder/create-request-builder-base.ts @@ -1,6 +1,6 @@ import { ErrorWithCause } from '@sap-cloud-sdk/util'; -import { HttpDestinationOrFetchOptions } from '@sap-cloud-sdk/connectivity'; -import { HttpResponse } from '@sap-cloud-sdk/http-client'; +import type { HttpDestinationOrFetchOptions } from '@sap-cloud-sdk/connectivity'; +import type { HttpResponse } from '@sap-cloud-sdk/http-client'; import { v4 as uuid } from 'uuid'; import type { EntitySerializer } from '../entity-serializer'; import type { ODataUri } from '../uri-conversion'; @@ -8,10 +8,10 @@ import type { EntityBase, EntityIdentifiable } from '../entity-base'; import type { EntityDeserializer } from '../entity-deserializer'; import type { ResponseDataAccessor } from '../response-data-accessor'; import { ODataCreateRequestConfig } from '../request/odata-create-request-config'; -import { Link } from '../selectable'; -import { DeSerializers } from '../de-serializers/de-serializers'; -import { EntityApi } from '../entity-api'; -import { +import type { Link } from '../selectable'; +import type { DeSerializers } from '../de-serializers/de-serializers'; +import type { EntityApi } from '../entity-api'; +import type { BatchReference, WithBatchReference } from '../request/odata-request-traits'; diff --git a/packages/odata-common/src/request-builder/delete-request-builder-base.ts b/packages/odata-common/src/request-builder/delete-request-builder-base.ts index 4592e52624..a8cfe9b43b 100644 --- a/packages/odata-common/src/request-builder/delete-request-builder-base.ts +++ b/packages/odata-common/src/request-builder/delete-request-builder-base.ts @@ -1,13 +1,14 @@ import { ErrorWithCause } from '@sap-cloud-sdk/util'; -import { HttpDestinationOrFetchOptions } from '@sap-cloud-sdk/connectivity'; -import { HttpResponse } from '@sap-cloud-sdk/http-client'; +import type { HttpDestinationOrFetchOptions } from '@sap-cloud-sdk/connectivity'; +import type { HttpResponse } from '@sap-cloud-sdk/http-client'; import { v4 as uuid } from 'uuid'; -import { EntityBase, EntityIdentifiable } from '../entity-base'; -import { ODataUri } from '../uri-conversion'; +import type { EntityIdentifiable } from '../entity-base'; +import { EntityBase } from '../entity-base'; +import type { ODataUri } from '../uri-conversion'; import { ODataDeleteRequestConfig } from '../request/odata-delete-request-config'; -import { DeSerializers } from '../de-serializers/de-serializers'; -import { EntityApi } from '../entity-api'; -import { +import type { DeSerializers } from '../de-serializers/de-serializers'; +import type { EntityApi } from '../entity-api'; +import type { BatchReference, WithBatchReference } from '../request/odata-request-traits'; diff --git a/packages/odata-common/src/request-builder/get-all-request-builder-base.ts b/packages/odata-common/src/request-builder/get-all-request-builder-base.ts index 98e641a23f..e85b55cab3 100644 --- a/packages/odata-common/src/request-builder/get-all-request-builder-base.ts +++ b/packages/odata-common/src/request-builder/get-all-request-builder-base.ts @@ -1,13 +1,14 @@ import { transformVariadicArgumentToArray } from '@sap-cloud-sdk/util'; -import { HttpDestinationOrFetchOptions } from '@sap-cloud-sdk/connectivity'; -import { EntityBase } from '../entity-base'; -import { Selectable } from '../selectable'; -import { OrderableAndOrderableInput, isOrderable, asc } from '../order'; -import { ODataGetAllRequestConfig } from '../request/odata-get-all-request-config'; -import { EntityDeserializer } from '../entity-deserializer'; -import { ResponseDataAccessor } from '../response-data-accessor'; -import { DeSerializers } from '../de-serializers/de-serializers'; -import { EntityApi } from '../entity-api'; +import type { HttpDestinationOrFetchOptions } from '@sap-cloud-sdk/connectivity'; +import type { EntityBase } from '../entity-base'; +import type { Selectable } from '../selectable'; +import type { OrderableAndOrderableInput } from '../order'; +import { isOrderable, asc } from '../order'; +import type { ODataGetAllRequestConfig } from '../request/odata-get-all-request-config'; +import type { EntityDeserializer } from '../entity-deserializer'; +import type { ResponseDataAccessor } from '../response-data-accessor'; +import type { DeSerializers } from '../de-serializers/de-serializers'; +import type { EntityApi } from '../entity-api'; import { CountRequestBuilder } from './count-request-builder'; import { GetRequestBuilderBase } from './get-request-builder-base'; diff --git a/packages/odata-common/src/request-builder/get-by-key-request-builder-base.ts b/packages/odata-common/src/request-builder/get-by-key-request-builder-base.ts index 643e0c796b..64363532de 100644 --- a/packages/odata-common/src/request-builder/get-by-key-request-builder-base.ts +++ b/packages/odata-common/src/request-builder/get-by-key-request-builder-base.ts @@ -2,17 +2,17 @@ import { ErrorWithCause, transformVariadicArgumentToArray } from '@sap-cloud-sdk/util'; -import { HttpDestinationOrFetchOptions } from '@sap-cloud-sdk/connectivity'; +import type { HttpDestinationOrFetchOptions } from '@sap-cloud-sdk/connectivity'; import { v4 as uuid } from 'uuid'; -import { EntityBase } from '../entity-base'; -import { EntityDeserializer } from '../entity-deserializer'; -import { ResponseDataAccessor } from '../response-data-accessor'; +import type { EntityBase } from '../entity-base'; +import type { EntityDeserializer } from '../entity-deserializer'; +import type { ResponseDataAccessor } from '../response-data-accessor'; import { ODataGetByKeyRequestConfig } from '../request/odata-get-by-key-request-config'; -import { Selectable } from '../selectable'; -import { ODataUri } from '../uri-conversion'; -import { DeSerializers } from '../de-serializers/de-serializers'; -import { EntityApi } from '../entity-api'; -import { +import type { Selectable } from '../selectable'; +import type { ODataUri } from '../uri-conversion'; +import type { DeSerializers } from '../de-serializers/de-serializers'; +import type { EntityApi } from '../entity-api'; +import type { BatchReference, WithBatchReference } from '../request/odata-request-traits'; diff --git a/packages/odata-common/src/request-builder/get-request-builder-base.ts b/packages/odata-common/src/request-builder/get-request-builder-base.ts index 8a9a7b886f..d39d0604fa 100644 --- a/packages/odata-common/src/request-builder/get-request-builder-base.ts +++ b/packages/odata-common/src/request-builder/get-request-builder-base.ts @@ -1,12 +1,16 @@ import { transformVariadicArgumentToArray } from '@sap-cloud-sdk/util'; -import { HttpDestinationOrFetchOptions } from '@sap-cloud-sdk/connectivity'; -import { HttpResponse } from '@sap-cloud-sdk/http-client'; -import { Constructable, EntityIdentifiable, EntityBase } from '../entity-base'; -import { Selectable } from '../selectable'; -import { ODataGetAllRequestConfig } from '../request/odata-get-all-request-config'; -import { ODataGetByKeyRequestConfig } from '../request/odata-get-by-key-request-config'; -import { DeSerializers } from '../de-serializers/de-serializers'; -import { EntityApi } from '../entity-api'; +import type { HttpDestinationOrFetchOptions } from '@sap-cloud-sdk/connectivity'; +import type { HttpResponse } from '@sap-cloud-sdk/http-client'; +import type { + Constructable, + EntityIdentifiable, + EntityBase +} from '../entity-base'; +import type { Selectable } from '../selectable'; +import type { ODataGetAllRequestConfig } from '../request/odata-get-all-request-config'; +import type { ODataGetByKeyRequestConfig } from '../request/odata-get-by-key-request-config'; +import type { DeSerializers } from '../de-serializers/de-serializers'; +import type { EntityApi } from '../entity-api'; import { MethodRequestBuilder } from './request-builder-base'; /** diff --git a/packages/odata-common/src/request-builder/operation-request-builder-base.ts b/packages/odata-common/src/request-builder/operation-request-builder-base.ts index 1f86302582..e5acc859bc 100644 --- a/packages/odata-common/src/request-builder/operation-request-builder-base.ts +++ b/packages/odata-common/src/request-builder/operation-request-builder-base.ts @@ -1,9 +1,9 @@ -import { HttpDestinationOrFetchOptions } from '@sap-cloud-sdk/connectivity'; -import { HttpResponse } from '@sap-cloud-sdk/http-client'; +import type { HttpDestinationOrFetchOptions } from '@sap-cloud-sdk/connectivity'; +import type { HttpResponse } from '@sap-cloud-sdk/http-client'; import { v4 as uuid } from 'uuid'; -import { ODataRequestConfig } from '../request/odata-request-config'; -import { BatchReference, WithBatchReference } from '../request'; -import { DeSerializers } from '../de-serializers/de-serializers'; +import type { ODataRequestConfig } from '../request/odata-request-config'; +import type { BatchReference, WithBatchReference } from '../request'; +import type { DeSerializers } from '../de-serializers/de-serializers'; import { MethodRequestBuilder } from './request-builder-base'; /** diff --git a/packages/odata-common/src/request-builder/request-builder-base.ts b/packages/odata-common/src/request-builder/request-builder-base.ts index 234763a5ca..d945f9d1b5 100644 --- a/packages/odata-common/src/request-builder/request-builder-base.ts +++ b/packages/odata-common/src/request-builder/request-builder-base.ts @@ -2,18 +2,16 @@ import { ErrorWithCause, transformVariadicArgumentToArray } from '@sap-cloud-sdk/util'; -import { - HttpDestinationOrFetchOptions, - useOrFetchDestination -} from '@sap-cloud-sdk/connectivity'; +import type { HttpDestinationOrFetchOptions } from '@sap-cloud-sdk/connectivity'; +import { useOrFetchDestination } from '@sap-cloud-sdk/connectivity'; import { assertHttpDestination, noDestinationErrorMessage } from '@sap-cloud-sdk/connectivity/internal'; -import { HttpMiddleware } from '@sap-cloud-sdk/http-client/internal'; -import { CustomRequestConfig } from '@sap-cloud-sdk/http-client'; +import type { HttpMiddleware } from '@sap-cloud-sdk/http-client/internal'; +import type { CustomRequestConfig } from '@sap-cloud-sdk/http-client'; import { ODataRequest } from '../request/odata-request'; -import { ODataRequestConfig } from '../request/odata-request-config'; +import type { ODataRequestConfig } from '../request/odata-request-config'; /** * Base class for all request builders. diff --git a/packages/odata-common/src/request-builder/request-builder.ts b/packages/odata-common/src/request-builder/request-builder.ts index 96c2a4f877..234ba9d5ea 100644 --- a/packages/odata-common/src/request-builder/request-builder.ts +++ b/packages/odata-common/src/request-builder/request-builder.ts @@ -1,6 +1,6 @@ -import { DeSerializers } from '../de-serializers/de-serializers'; -import { EntityBase, EntityIdentifiable } from '../entity-base'; -import { EntityApi } from '../entity-api'; +import type { DeSerializers } from '../de-serializers/de-serializers'; +import type { EntityBase, EntityIdentifiable } from '../entity-base'; +import type { EntityApi } from '../entity-api'; /** * Represents a request builder for a given entity API. diff --git a/packages/odata-common/src/request-builder/update-request-builder-base.ts b/packages/odata-common/src/request-builder/update-request-builder-base.ts index 017976a8bf..e6d95e041a 100644 --- a/packages/odata-common/src/request-builder/update-request-builder-base.ts +++ b/packages/odata-common/src/request-builder/update-request-builder-base.ts @@ -2,18 +2,18 @@ import { ErrorWithCause, transformVariadicArgumentToArray } from '@sap-cloud-sdk/util'; -import { HttpResponse } from '@sap-cloud-sdk/http-client'; +import type { HttpResponse } from '@sap-cloud-sdk/http-client'; import { v4 as uuid } from 'uuid'; -import { EntityBase, EntityIdentifiable } from '../entity-base'; +import type { EntityBase, EntityIdentifiable } from '../entity-base'; import { extractEtagFromHeader } from '../entity-deserializer'; -import { EntitySerializer } from '../entity-serializer'; -import { ODataRequest } from '../request/odata-request'; +import type { EntitySerializer } from '../entity-serializer'; +import type { ODataRequest } from '../request/odata-request'; import { ODataUpdateRequestConfig } from '../request/odata-update-request-config'; -import { ODataUri } from '../uri-conversion'; -import { Selectable } from '../selectable'; -import { DeSerializers } from '../de-serializers/de-serializers'; -import { EntityApi } from '../entity-api'; -import { +import type { ODataUri } from '../uri-conversion'; +import type { Selectable } from '../selectable'; +import type { DeSerializers } from '../de-serializers/de-serializers'; +import type { EntityApi } from '../entity-api'; +import type { BatchReference, WithBatchReference } from '../request/odata-request-traits'; diff --git a/packages/odata-common/src/request/odata-batch-request-config.ts b/packages/odata-common/src/request/odata-batch-request-config.ts index 5ae050e45c..c5ae6ae52b 100644 --- a/packages/odata-common/src/request/odata-batch-request-config.ts +++ b/packages/odata-common/src/request/odata-batch-request-config.ts @@ -1,5 +1,5 @@ import { v4 as uuid } from 'uuid'; -import { BatchSubRequestPathType } from '../request-builder/batch/batch-request-options'; +import type { BatchSubRequestPathType } from '../request-builder/batch/batch-request-options'; import { ODataRequestConfig } from './odata-request-config'; /** diff --git a/packages/odata-common/src/request/odata-count-request-config.ts b/packages/odata-common/src/request/odata-count-request-config.ts index 362493e9b3..8ec719fc2e 100644 --- a/packages/odata-common/src/request/odata-count-request-config.ts +++ b/packages/odata-common/src/request/odata-count-request-config.ts @@ -1,6 +1,6 @@ import { createLogger, pick, removeTrailingSlashes } from '@sap-cloud-sdk/util'; -import { DeSerializers } from '../de-serializers'; -import { EntityBase } from '../entity-base'; +import type { DeSerializers } from '../de-serializers'; +import type { EntityBase } from '../entity-base'; import type { GetAllRequestBuilderBase } from '../request-builder'; import { ODataRequestConfig } from './odata-request-config'; diff --git a/packages/odata-common/src/request/odata-create-request-config.ts b/packages/odata-common/src/request/odata-create-request-config.ts index cfbea51732..5f361d7258 100644 --- a/packages/odata-common/src/request/odata-create-request-config.ts +++ b/packages/odata-common/src/request/odata-create-request-config.ts @@ -1,8 +1,8 @@ -import { EntityBase } from '../entity-base'; -import { ODataUri } from '../uri-conversion'; -import { Link } from '../selectable'; -import { DeSerializers } from '../de-serializers'; -import { EntityApi } from '../entity-api'; +import type { EntityBase } from '../entity-base'; +import type { ODataUri } from '../uri-conversion'; +import type { Link } from '../selectable'; +import type { DeSerializers } from '../de-serializers'; +import type { EntityApi } from '../entity-api'; import { ODataRequestConfig } from './odata-request-config'; /** diff --git a/packages/odata-common/src/request/odata-delete-request-config.spec.ts b/packages/odata-common/src/request/odata-delete-request-config.spec.ts index 88cdae7136..eb1eafe19c 100644 --- a/packages/odata-common/src/request/odata-delete-request-config.spec.ts +++ b/packages/odata-common/src/request/odata-delete-request-config.spec.ts @@ -1,11 +1,9 @@ import { v4 as uuid } from 'uuid'; -import { - CommonEntity, - commonEntityApi -} from '@sap-cloud-sdk/test-services-odata-common/common-entity'; +import type { CommonEntity } from '@sap-cloud-sdk/test-services-odata-common/common-entity'; +import { commonEntityApi } from '@sap-cloud-sdk/test-services-odata-common/common-entity'; import { commonODataUri } from '@sap-cloud-sdk/test-services-odata-common/common-request-config'; import { testEntityResourcePath } from '../../test/test-util'; -import { DefaultDeSerializers } from '../de-serializers'; +import type { DefaultDeSerializers } from '../de-serializers'; import { ODataDeleteRequestConfig } from './odata-delete-request-config'; describe('ODataDeleteRequestConfig', () => { diff --git a/packages/odata-common/src/request/odata-delete-request-config.ts b/packages/odata-common/src/request/odata-delete-request-config.ts index ac7ece0d0a..257123779b 100644 --- a/packages/odata-common/src/request/odata-delete-request-config.ts +++ b/packages/odata-common/src/request/odata-delete-request-config.ts @@ -1,9 +1,9 @@ -import { DeSerializers } from '../de-serializers'; -import { EntityBase } from '../entity-base'; -import { ODataUri } from '../uri-conversion'; -import { EntityApi } from '../entity-api'; +import type { DeSerializers } from '../de-serializers'; +import type { EntityBase } from '../entity-base'; +import type { ODataUri } from '../uri-conversion'; +import type { EntityApi } from '../entity-api'; import { ODataRequestConfig } from './odata-request-config'; -import { WithKeys, WithETag } from './odata-request-traits'; +import type { WithKeys, WithETag } from './odata-request-traits'; /** * OData delete request configuration for an entity type. diff --git a/packages/odata-common/src/request/odata-function-request-config.ts b/packages/odata-common/src/request/odata-function-request-config.ts index 051a0a083d..a3b320084d 100644 --- a/packages/odata-common/src/request/odata-function-request-config.ts +++ b/packages/odata-common/src/request/odata-function-request-config.ts @@ -1,7 +1,8 @@ -import { DeSerializers } from '../de-serializers'; -import { ODataUri } from '../uri-conversion'; -import { OperationParameters } from './operation-parameter'; -import { ODataRequestConfig, RequestMethodType } from './odata-request-config'; +import type { DeSerializers } from '../de-serializers'; +import type { ODataUri } from '../uri-conversion'; +import type { OperationParameters } from './operation-parameter'; +import type { RequestMethodType } from './odata-request-config'; +import { ODataRequestConfig } from './odata-request-config'; /** * Function request configuration for an entity type. diff --git a/packages/odata-common/src/request/odata-get-all-request-config.spec.ts b/packages/odata-common/src/request/odata-get-all-request-config.spec.ts index 9a6a197d01..f0d3631616 100644 --- a/packages/odata-common/src/request/odata-get-all-request-config.spec.ts +++ b/packages/odata-common/src/request/odata-get-all-request-config.spec.ts @@ -3,7 +3,7 @@ import { commonEntityApi } from '@sap-cloud-sdk/test-services-odata-common/common-entity'; import { commonODataUri } from '@sap-cloud-sdk/test-services-odata-common/common-request-config'; -import { DefaultDeSerializers } from '../de-serializers'; +import type { DefaultDeSerializers } from '../de-serializers'; import { asc } from '../order'; import { ODataGetAllRequestConfig } from './odata-get-all-request-config'; diff --git a/packages/odata-common/src/request/odata-get-all-request-config.ts b/packages/odata-common/src/request/odata-get-all-request-config.ts index 1789317a50..354bd8dce1 100644 --- a/packages/odata-common/src/request/odata-get-all-request-config.ts +++ b/packages/odata-common/src/request/odata-get-all-request-config.ts @@ -1,13 +1,13 @@ -import { EntityBase } from '../entity-base'; -import { Selectable } from '../selectable'; -import { Filterable } from '../filter'; -import { Expandable } from '../expandable'; -import { Orderable } from '../order'; -import { ODataUri } from '../uri-conversion'; -import { DeSerializers } from '../de-serializers'; -import { EntityApi } from '../entity-api'; +import type { EntityBase } from '../entity-base'; +import type { Selectable } from '../selectable'; +import type { Filterable } from '../filter'; +import type { Expandable } from '../expandable'; +import type { Orderable } from '../order'; +import type { ODataUri } from '../uri-conversion'; +import type { DeSerializers } from '../de-serializers'; +import type { EntityApi } from '../entity-api'; import { ODataRequestConfig } from './odata-request-config'; -import { WithGetAllRestrictions } from './odata-request-traits'; +import type { WithGetAllRestrictions } from './odata-request-traits'; /** * OData getAll request configuration for an entity type. diff --git a/packages/odata-common/src/request/odata-get-by-key-request-config.spec.ts b/packages/odata-common/src/request/odata-get-by-key-request-config.spec.ts index 60f46d07b8..44bd0ed7b9 100644 --- a/packages/odata-common/src/request/odata-get-by-key-request-config.spec.ts +++ b/packages/odata-common/src/request/odata-get-by-key-request-config.spec.ts @@ -1,11 +1,9 @@ import { v4 as uuid } from 'uuid'; -import { - CommonEntity, - commonEntityApi -} from '@sap-cloud-sdk/test-services-odata-common/common-entity'; +import type { CommonEntity } from '@sap-cloud-sdk/test-services-odata-common/common-entity'; +import { commonEntityApi } from '@sap-cloud-sdk/test-services-odata-common/common-entity'; import { commonODataUri } from '@sap-cloud-sdk/test-services-odata-common/common-request-config'; import { testEntityResourcePath } from '../../test/test-util'; -import { DefaultDeSerializers } from '../de-serializers'; +import type { DefaultDeSerializers } from '../de-serializers'; import { ODataGetByKeyRequestConfig } from './odata-get-by-key-request-config'; describe('ODataGetByKeyRequestConfig', () => { diff --git a/packages/odata-common/src/request/odata-get-by-key-request-config.ts b/packages/odata-common/src/request/odata-get-by-key-request-config.ts index 3b51d08419..2938bb6d11 100644 --- a/packages/odata-common/src/request/odata-get-by-key-request-config.ts +++ b/packages/odata-common/src/request/odata-get-by-key-request-config.ts @@ -1,10 +1,10 @@ -import { EntityBase } from '../entity-base'; -import { Expandable } from '../expandable'; -import { Selectable } from '../selectable'; -import { ODataUri } from '../uri-conversion'; -import { DeSerializers } from '../de-serializers'; -import { EntityApi } from '../entity-api'; -import { WithKeys, WithSelection } from './odata-request-traits'; +import type { EntityBase } from '../entity-base'; +import type { Expandable } from '../expandable'; +import type { Selectable } from '../selectable'; +import type { ODataUri } from '../uri-conversion'; +import type { DeSerializers } from '../de-serializers'; +import type { EntityApi } from '../entity-api'; +import type { WithKeys, WithSelection } from './odata-request-traits'; import { ODataRequestConfig } from './odata-request-config'; /** diff --git a/packages/odata-common/src/request/odata-request-config.ts b/packages/odata-common/src/request/odata-request-config.ts index 21ccf7b224..e8c33dbbd8 100644 --- a/packages/odata-common/src/request/odata-request-config.ts +++ b/packages/odata-common/src/request/odata-request-config.ts @@ -1,10 +1,10 @@ import { mergeIgnoreCase } from '@sap-cloud-sdk/util'; -import { - oDataTypedClientParameterEncoder, +import { oDataTypedClientParameterEncoder } from '@sap-cloud-sdk/http-client/internal'; +import type { + ParameterEncoder, HttpMiddleware } from '@sap-cloud-sdk/http-client/internal'; -import type { ParameterEncoder } from '@sap-cloud-sdk/http-client/internal'; -import { CustomRequestConfig } from '@sap-cloud-sdk/http-client'; +import type { CustomRequestConfig } from '@sap-cloud-sdk/http-client'; /** * Set of possible request methods. diff --git a/packages/odata-common/src/request/odata-request-traits.ts b/packages/odata-common/src/request/odata-request-traits.ts index 4a89f5c83a..d311d18fa9 100644 --- a/packages/odata-common/src/request/odata-request-traits.ts +++ b/packages/odata-common/src/request/odata-request-traits.ts @@ -1,9 +1,9 @@ -import { EntityBase } from '../entity-base'; -import { Selectable } from '../selectable'; -import { Orderable } from '../order'; -import { Filterable } from '../filter'; -import { DeSerializers } from '../de-serializers'; -import { EntityApi } from '../entity-api'; +import type { EntityBase } from '../entity-base'; +import type { Selectable } from '../selectable'; +import type { Orderable } from '../order'; +import type { Filterable } from '../filter'; +import type { DeSerializers } from '../de-serializers'; +import type { EntityApi } from '../entity-api'; /** * Interface implemented by OData requests needing keys to identify an entity like `getByKey`, `delete` or `update`. diff --git a/packages/odata-common/src/request/odata-request.spec.ts b/packages/odata-common/src/request/odata-request.spec.ts index 12160d7843..270ed2f4a1 100644 --- a/packages/odata-common/src/request/odata-request.spec.ts +++ b/packages/odata-common/src/request/odata-request.spec.ts @@ -1,12 +1,10 @@ import { v4 as uuid } from 'uuid'; import { oDataTypedClientParameterEncoder } from '@sap-cloud-sdk/http-client/internal'; import { commonODataUri } from '@sap-cloud-sdk/test-services-odata-common/common-request-config'; -import { - CommonEntity, - commonEntityApi -} from '@sap-cloud-sdk/test-services-odata-common/common-entity'; -import { HttpDestination } from '@sap-cloud-sdk/connectivity/internal'; -import { DefaultDeSerializers } from '../de-serializers'; +import type { CommonEntity } from '@sap-cloud-sdk/test-services-odata-common/common-entity'; +import { commonEntityApi } from '@sap-cloud-sdk/test-services-odata-common/common-entity'; +import type { HttpDestination } from '@sap-cloud-sdk/connectivity/internal'; +import type { DefaultDeSerializers } from '../de-serializers'; import { ODataGetAllRequestConfig } from './odata-get-all-request-config'; import { ODataRequest } from './odata-request'; diff --git a/packages/odata-common/src/request/odata-request.ts b/packages/odata-common/src/request/odata-request.ts index fd888387a5..55291947c2 100644 --- a/packages/odata-common/src/request/odata-request.ts +++ b/packages/odata-common/src/request/odata-request.ts @@ -9,22 +9,21 @@ import { removeSlashes, removeTrailingSlashes } from '@sap-cloud-sdk/util'; -import { Destination, sanitizeDestination } from '@sap-cloud-sdk/connectivity'; -import { +import type { Destination } from '@sap-cloud-sdk/connectivity'; +import { sanitizeDestination } from '@sap-cloud-sdk/connectivity'; +import type { HttpResponse, - HttpRequestConfigWithOrigin, - executeHttpRequest + HttpRequestConfigWithOrigin } from '@sap-cloud-sdk/http-client'; +import { executeHttpRequest } from '@sap-cloud-sdk/http-client'; +import type { OriginOptions } from '@sap-cloud-sdk/http-client/internal'; import { filterCustomRequestConfig, - OriginOptions, mergeOptionsWithPriority } from '@sap-cloud-sdk/http-client/internal'; -import { - assertHttpDestination, - HttpDestination -} from '@sap-cloud-sdk/connectivity/internal'; -import { ODataRequestConfig } from './odata-request-config'; +import type { HttpDestination } from '@sap-cloud-sdk/connectivity/internal'; +import { assertHttpDestination } from '@sap-cloud-sdk/connectivity/internal'; +import type { ODataRequestConfig } from './odata-request-config'; import { isWithETag } from './odata-request-traits'; /** diff --git a/packages/odata-common/src/request/odata-update-request-config.spec.ts b/packages/odata-common/src/request/odata-update-request-config.spec.ts index 38ae1d6829..b014a69957 100644 --- a/packages/odata-common/src/request/odata-update-request-config.spec.ts +++ b/packages/odata-common/src/request/odata-update-request-config.spec.ts @@ -1,12 +1,10 @@ import { v4 as uuid } from 'uuid'; import { updateRequestConfig } from '@sap-cloud-sdk/test-services-odata-common/common-request-config'; -import { - CommonEntity, - commonEntityApi -} from '@sap-cloud-sdk/test-services-odata-common/common-entity'; -import { DefaultDeSerializers } from '../de-serializers'; +import type { CommonEntity } from '@sap-cloud-sdk/test-services-odata-common/common-entity'; +import { commonEntityApi } from '@sap-cloud-sdk/test-services-odata-common/common-entity'; +import type { DefaultDeSerializers } from '../de-serializers'; import { testEntityResourcePath } from '../../test/test-util'; -import { ODataUpdateRequestConfig } from './odata-update-request-config'; +import type { ODataUpdateRequestConfig } from './odata-update-request-config'; describe('ODataUpdateRequestConfig', () => { let config: ODataUpdateRequestConfig; diff --git a/packages/odata-common/src/request/odata-update-request-config.ts b/packages/odata-common/src/request/odata-update-request-config.ts index fa9a8b3eb6..35107a1334 100644 --- a/packages/odata-common/src/request/odata-update-request-config.ts +++ b/packages/odata-common/src/request/odata-update-request-config.ts @@ -1,9 +1,9 @@ -import { DeSerializers } from '../de-serializers'; -import { EntityBase } from '../entity-base'; -import { ODataUri } from '../uri-conversion'; -import { EntityApi } from '../entity-api'; +import type { DeSerializers } from '../de-serializers'; +import type { EntityBase } from '../entity-base'; +import type { ODataUri } from '../uri-conversion'; +import type { EntityApi } from '../entity-api'; import { ODataRequestConfig } from './odata-request-config'; -import { WithKeys, WithETag } from './odata-request-traits'; +import type { WithKeys, WithETag } from './odata-request-traits'; /** * OData update request configuration for an entity type. diff --git a/packages/odata-common/src/request/operation-parameter.ts b/packages/odata-common/src/request/operation-parameter.ts index c8f08bf905..ec4baa6d4d 100644 --- a/packages/odata-common/src/request/operation-parameter.ts +++ b/packages/odata-common/src/request/operation-parameter.ts @@ -1,4 +1,4 @@ -import { EdmTypeShared } from '../edm-types'; +import type { EdmTypeShared } from '../edm-types'; /** * Internal representation of operation parameters. It adds metadata to the value. diff --git a/packages/odata-common/src/selectable/all-fields.ts b/packages/odata-common/src/selectable/all-fields.ts index b554e967b8..d0f1159bac 100644 --- a/packages/odata-common/src/selectable/all-fields.ts +++ b/packages/odata-common/src/selectable/all-fields.ts @@ -1,4 +1,4 @@ -import { EntityBase, Constructable } from '../entity-base'; +import type { EntityBase, Constructable } from '../entity-base'; /** * Represents the selection of all fields. diff --git a/packages/odata-common/src/selectable/collection-field.ts b/packages/odata-common/src/selectable/collection-field.ts index c0d476e916..048bf315e1 100644 --- a/packages/odata-common/src/selectable/collection-field.ts +++ b/packages/odata-common/src/selectable/collection-field.ts @@ -1,10 +1,11 @@ -import { EntityBase } from '../entity-base'; -import { EdmTypeShared } from '../edm-types'; -import { DeSerializers } from '../de-serializers'; -import { Field, FieldOptions } from './field'; -import { ConstructorOrField } from './constructor-or-field'; +import type { EntityBase } from '../entity-base'; +import type { EdmTypeShared } from '../edm-types'; +import type { DeSerializers } from '../de-serializers'; +import type { FieldOptions } from './field'; +import { Field } from './field'; +import type { ConstructorOrField } from './constructor-or-field'; import { ComplexTypeField, getEntityConstructor } from './complex-type-field'; -import { ComplexTypeNamespace } from './complex-type-namespace'; +import type { ComplexTypeNamespace } from './complex-type-namespace'; /** * Represents a field of an entity or a complex type, that can have a collection as value. diff --git a/packages/odata-common/src/selectable/complex-type-field.ts b/packages/odata-common/src/selectable/complex-type-field.ts index 5be930f29c..48e9f2fa92 100644 --- a/packages/odata-common/src/selectable/complex-type-field.ts +++ b/packages/odata-common/src/selectable/complex-type-field.ts @@ -1,9 +1,11 @@ -import { ODataVersion } from '@sap-cloud-sdk/util'; -import { EdmTypeShared, isEdmType } from '../edm-types'; -import { Constructable, EntityBase } from '../entity-base'; -import { DeSerializers } from '../de-serializers'; -import { Field, FieldOptions } from './field'; -import { ComplexTypeNamespace } from './complex-type-namespace'; +import type { ODataVersion } from '@sap-cloud-sdk/util'; +import type { EdmTypeShared } from '../edm-types'; +import { isEdmType } from '../edm-types'; +import type { Constructable, EntityBase } from '../entity-base'; +import type { DeSerializers } from '../de-serializers'; +import type { FieldOptions } from './field'; +import { Field } from './field'; +import type { ComplexTypeNamespace } from './complex-type-namespace'; import type { ConstructorOrField } from './constructor-or-field'; /** diff --git a/packages/odata-common/src/selectable/complex-type-namespace.ts b/packages/odata-common/src/selectable/complex-type-namespace.ts index e5224451c4..37cb2dca35 100644 --- a/packages/odata-common/src/selectable/complex-type-namespace.ts +++ b/packages/odata-common/src/selectable/complex-type-namespace.ts @@ -1,4 +1,4 @@ -import { EdmTypeShared } from '../edm-types'; +import type { EdmTypeShared } from '../edm-types'; /** * Interface to represent meta information on the _propertyMetadata property of a complex type. diff --git a/packages/odata-common/src/selectable/complex-type-property-fields.ts b/packages/odata-common/src/selectable/complex-type-property-fields.ts index 8eb7115d65..94badc8450 100644 --- a/packages/odata-common/src/selectable/complex-type-property-fields.ts +++ b/packages/odata-common/src/selectable/complex-type-property-fields.ts @@ -1,6 +1,6 @@ -import { EntityBase } from '../entity-base'; -import { EdmTypeField } from './edm-type-field'; -import { OrderableEdmTypeField } from './orderable-edm-type-field'; +import type { EntityBase } from '../entity-base'; +import type { EdmTypeField } from './edm-type-field'; +import type { OrderableEdmTypeField } from './orderable-edm-type-field'; /** * A complex type contains multiple properties. diff --git a/packages/odata-common/src/selectable/constructor-or-field.ts b/packages/odata-common/src/selectable/constructor-or-field.ts index dd54917149..f0381778aa 100644 --- a/packages/odata-common/src/selectable/constructor-or-field.ts +++ b/packages/odata-common/src/selectable/constructor-or-field.ts @@ -1,5 +1,5 @@ -import { DeSerializers } from '../de-serializers'; -import { Constructable, EntityBase } from '../entity-base'; +import type { DeSerializers } from '../de-serializers'; +import type { Constructable, EntityBase } from '../entity-base'; import type { ComplexTypeField } from './complex-type-field'; /** diff --git a/packages/odata-common/src/selectable/custom-field.ts b/packages/odata-common/src/selectable/custom-field.ts index e0e75c50bc..b15b1c37ff 100644 --- a/packages/odata-common/src/selectable/custom-field.ts +++ b/packages/odata-common/src/selectable/custom-field.ts @@ -1,9 +1,9 @@ -import { DeSerializers } from '../de-serializers'; -import { EntityBase, Constructable } from '../entity-base'; -import { EdmTypeField } from './edm-type-field'; +import type { DeSerializers } from '../de-serializers'; +import type { EntityBase, Constructable } from '../entity-base'; +import type { EdmTypeField } from './edm-type-field'; import { Field } from './field'; import { FieldBuilder } from './field-builder'; -import { OrderableEdmTypeField } from './orderable-edm-type-field'; +import type { OrderableEdmTypeField } from './orderable-edm-type-field'; /** * If your entity contains fields not present in your service specification you can model them using custom fields. diff --git a/packages/odata-common/src/selectable/edm-type-field.ts b/packages/odata-common/src/selectable/edm-type-field.ts index d021eeee6f..12c4611827 100644 --- a/packages/odata-common/src/selectable/edm-type-field.ts +++ b/packages/odata-common/src/selectable/edm-type-field.ts @@ -1,10 +1,11 @@ -import { EntityBase, EntityIdentifiable } from '../entity-base'; +import type { EntityBase, EntityIdentifiable } from '../entity-base'; import { Filter } from '../filter/filter'; -import { EdmTypeShared } from '../edm-types'; -import { DeSerializers, DeserializedType } from '../de-serializers'; +import type { EdmTypeShared } from '../edm-types'; +import type { DeSerializers, DeserializedType } from '../de-serializers'; import { ComplexTypeField, getEntityConstructor } from './complex-type-field'; -import { ConstructorOrField } from './constructor-or-field'; -import { Field, FieldOptions } from './field'; +import type { ConstructorOrField } from './constructor-or-field'; +import type { FieldOptions } from './field'; +import { Field } from './field'; /** * Convenience type that maps the given field type to a new type that is either nullable or not, depending on the given `NullableT`. diff --git a/packages/odata-common/src/selectable/enum-field.ts b/packages/odata-common/src/selectable/enum-field.ts index 8c0750ba6e..cf1e2fb5f1 100644 --- a/packages/odata-common/src/selectable/enum-field.ts +++ b/packages/odata-common/src/selectable/enum-field.ts @@ -1,9 +1,10 @@ -import { EntityBase } from '../entity-base'; +import type { EntityBase } from '../entity-base'; import { Filter } from '../filter'; -import { EdmTypeShared } from '../edm-types'; -import { DeSerializers } from '../de-serializers'; -import { Field, FieldOptions } from './field'; -import { ConstructorOrField } from './constructor-or-field'; +import type { EdmTypeShared } from '../edm-types'; +import type { DeSerializers } from '../de-serializers'; +import type { FieldOptions } from './field'; +import { Field } from './field'; +import type { ConstructorOrField } from './constructor-or-field'; import { ComplexTypeField, getEntityConstructor } from './complex-type-field'; /** diff --git a/packages/odata-common/src/selectable/field-builder.ts b/packages/odata-common/src/selectable/field-builder.ts index 156ca65f6e..ce7eec5b4b 100644 --- a/packages/odata-common/src/selectable/field-builder.ts +++ b/packages/odata-common/src/selectable/field-builder.ts @@ -1,18 +1,16 @@ /* eslint-disable max-classes-per-file */ -import { - EdmTypeShared, - isOrderableEdmType, - OrderableEdmType -} from '../edm-types'; -import { Constructable, EntityBase } from '../entity-base'; -import { DeSerializers } from '../de-serializers'; +import type { EdmTypeShared, OrderableEdmType } from '../edm-types'; +import { isOrderableEdmType } from '../edm-types'; +import type { Constructable, EntityBase } from '../entity-base'; +import type { DeSerializers } from '../de-serializers'; import { ComplexTypeField } from './complex-type-field'; import { EdmTypeField } from './edm-type-field'; import { OrderableEdmTypeField } from './orderable-edm-type-field'; -import { CollectionField, CollectionFieldType } from './collection-field'; -import { ConstructorOrField } from './constructor-or-field'; -import { FieldOptions } from './field'; +import type { CollectionFieldType } from './collection-field'; +import { CollectionField } from './collection-field'; +import type { ConstructorOrField } from './constructor-or-field'; +import type { FieldOptions } from './field'; import { EnumField } from './enum-field'; /** diff --git a/packages/odata-common/src/selectable/field.ts b/packages/odata-common/src/selectable/field.ts index 9315df8ab8..4fe2884ad1 100644 --- a/packages/odata-common/src/selectable/field.ts +++ b/packages/odata-common/src/selectable/field.ts @@ -1,4 +1,4 @@ -import { EntityBase, Constructable } from '../entity-base'; +import type { EntityBase, Constructable } from '../entity-base'; /** * Optional settings for fields. diff --git a/packages/odata-common/src/selectable/link.ts b/packages/odata-common/src/selectable/link.ts index 15857f54d3..5cb481713f 100644 --- a/packages/odata-common/src/selectable/link.ts +++ b/packages/odata-common/src/selectable/link.ts @@ -1,7 +1,7 @@ -import { DeSerializers } from '../de-serializers'; -import { EntityBase, EntityIdentifiable } from '../entity-base'; +import type { DeSerializers } from '../de-serializers'; +import type { EntityBase, EntityIdentifiable } from '../entity-base'; import type { Expandable } from '../expandable'; -import { EntityApi, EntityType } from '../entity-api'; +import type { EntityApi, EntityType } from '../entity-api'; import type { Selectable } from './selectable'; /** diff --git a/packages/odata-common/src/selectable/one-to-many-link.ts b/packages/odata-common/src/selectable/one-to-many-link.ts index f1331d65e6..dc956c17c3 100644 --- a/packages/odata-common/src/selectable/one-to-many-link.ts +++ b/packages/odata-common/src/selectable/one-to-many-link.ts @@ -1,9 +1,9 @@ import type { EntityBase } from '../entity-base'; import { FilterLink } from '../filter/filter-link'; -import { Orderable } from '../order/orderable'; +import type { Orderable } from '../order/orderable'; import type { Filterable } from '../filter'; -import { DeSerializers } from '../de-serializers/de-serializers'; -import { EntityApi, EntityType } from '../entity-api'; +import type { DeSerializers } from '../de-serializers/de-serializers'; +import type { EntityApi, EntityType } from '../entity-api'; import { Link } from './link'; /** diff --git a/packages/odata-common/src/selectable/one-to-one-link.ts b/packages/odata-common/src/selectable/one-to-one-link.ts index 2ede2149d7..b43aafc336 100644 --- a/packages/odata-common/src/selectable/one-to-one-link.ts +++ b/packages/odata-common/src/selectable/one-to-one-link.ts @@ -1,8 +1,10 @@ -import { EntityBase } from '../entity-base'; -import { Order, Orderable, OrderLink } from '../order'; -import { Filterable, FilterLink } from '../filter'; -import { DeSerializers } from '../de-serializers'; -import { EntityApi, EntityType } from '../entity-api'; +import type { EntityBase } from '../entity-base'; +import type { Order, Orderable } from '../order'; +import { OrderLink } from '../order'; +import type { Filterable } from '../filter'; +import { FilterLink } from '../filter'; +import type { DeSerializers } from '../de-serializers'; +import type { EntityApi, EntityType } from '../entity-api'; import { Link } from './link'; /** diff --git a/packages/odata-common/src/selectable/orderable-edm-type-field.spec.ts b/packages/odata-common/src/selectable/orderable-edm-type-field.spec.ts index 74fd3284af..bf0398f5d0 100644 --- a/packages/odata-common/src/selectable/orderable-edm-type-field.spec.ts +++ b/packages/odata-common/src/selectable/orderable-edm-type-field.spec.ts @@ -2,9 +2,10 @@ import { CommonComplexTypeField, CommonEntity } from '@sap-cloud-sdk/test-services-odata-common/common-entity'; -import { defaultDeSerializers, DeSerializers } from '../de-serializers'; -import { EntityBase } from '../entity-base'; -import { Filter } from '../filter'; +import type { DeSerializers } from '../de-serializers'; +import { defaultDeSerializers } from '../de-serializers'; +import type { EntityBase } from '../entity-base'; +import type { Filter } from '../filter'; import { OrderableEdmTypeField } from './orderable-edm-type-field'; export function checkFilter< diff --git a/packages/odata-common/src/selectable/orderable-edm-type-field.ts b/packages/odata-common/src/selectable/orderable-edm-type-field.ts index 7b5a4d6e18..ce697444c7 100644 --- a/packages/odata-common/src/selectable/orderable-edm-type-field.ts +++ b/packages/odata-common/src/selectable/orderable-edm-type-field.ts @@ -1,8 +1,9 @@ -import { EntityBase } from '../entity-base'; -import { EdmTypeShared } from '../edm-types'; +import type { EntityBase } from '../entity-base'; +import type { EdmTypeShared } from '../edm-types'; import { Filter } from '../filter/filter'; -import { DeSerializers } from '../de-serializers/de-serializers'; -import { EdmTypeField, FieldTypeByEdmType } from './edm-type-field'; +import type { DeSerializers } from '../de-serializers/de-serializers'; +import type { FieldTypeByEdmType } from './edm-type-field'; +import { EdmTypeField } from './edm-type-field'; /** * {@link EdmTypeField}, that represents a property with an EDM type, that can be compared with `greaterThan`, `greaterOrEqual`, `lessThan` and `lessOrEqual`. diff --git a/packages/odata-common/src/selectable/selectable.ts b/packages/odata-common/src/selectable/selectable.ts index 31acb045f1..e0c244477c 100644 --- a/packages/odata-common/src/selectable/selectable.ts +++ b/packages/odata-common/src/selectable/selectable.ts @@ -1,6 +1,6 @@ -import { EntityBase, ODataVersionOf } from '../entity-base'; -import { DeSerializers } from '../de-serializers'; -import { EntityApi } from '../entity-api'; +import type { EntityBase, ODataVersionOf } from '../entity-base'; +import type { DeSerializers } from '../de-serializers'; +import type { EntityApi } from '../entity-api'; import type { CollectionField } from './collection-field'; import type { AllFields } from './all-fields'; import type { ComplexTypeField } from './complex-type-field'; diff --git a/packages/odata-common/src/selectable/simple-type-fields.ts b/packages/odata-common/src/selectable/simple-type-fields.ts index 7db44dafcd..9ff4d1dec3 100644 --- a/packages/odata-common/src/selectable/simple-type-fields.ts +++ b/packages/odata-common/src/selectable/simple-type-fields.ts @@ -1,6 +1,6 @@ -import { EntityBase } from '../entity-base'; -import { EdmTypeField } from './edm-type-field'; -import { OrderableEdmTypeField } from './orderable-edm-type-field'; +import type { EntityBase } from '../entity-base'; +import type { EdmTypeField } from './edm-type-field'; +import type { OrderableEdmTypeField } from './orderable-edm-type-field'; /** * Helper type to unite the {@link EdmTypeField} and {@link OrderableEdmTypeField} which are appearing often together. diff --git a/packages/odata-common/src/uri-conversion/get-filter.ts b/packages/odata-common/src/uri-conversion/get-filter.ts index 3257699e79..31be88b8db 100644 --- a/packages/odata-common/src/uri-conversion/get-filter.ts +++ b/packages/odata-common/src/uri-conversion/get-filter.ts @@ -1,30 +1,32 @@ import moment from 'moment'; import { upperCaseSnakeCase } from '@sap-cloud-sdk/util'; -import { EntityBase } from '../entity-base'; -import { EdmTypeShared } from '../edm-types'; -import { +import type { EntityBase } from '../entity-base'; +import type { EdmTypeShared } from '../edm-types'; +import type { FilterLambdaExpression, - isFilterLambdaExpression, Filterable, FilterList, + FilterLink, + UnaryFilter, + FilterFunctionParameterType, + Filter +} from '../filter'; +import { + isFilterLambdaExpression, isFilterList, isBooleanFilterFunction, - FilterLink, isFilterLink, isUnaryFilter, - UnaryFilter, FilterFunction, - FilterFunctionParameterType, - Filter, isFilter } from '../filter'; -import { +import type { DefaultDeSerializers, DeSerializers, UriConverter } from '../de-serializers'; import { ComplexTypeField, OneToManyLink } from '../selectable'; -import { EntityApi } from '../entity-api'; +import type { EntityApi } from '../entity-api'; type GetFilterType = < EntityT extends EntityBase, diff --git a/packages/odata-common/src/uri-conversion/get-keys.ts b/packages/odata-common/src/uri-conversion/get-keys.ts index 075b6dbf84..cfa8d1a2c6 100644 --- a/packages/odata-common/src/uri-conversion/get-keys.ts +++ b/packages/odata-common/src/uri-conversion/get-keys.ts @@ -1,6 +1,6 @@ import { camelCase } from '@sap-cloud-sdk/util'; -import { EntityBase } from '../entity-base'; -import { EntityApi } from '../entity-api'; +import type { EntityBase } from '../entity-base'; +import type { EntityApi } from '../entity-api'; /** * Helper function that maps an entity to its keys map with their original names. diff --git a/packages/odata-common/src/uri-conversion/get-orderby.ts b/packages/odata-common/src/uri-conversion/get-orderby.ts index 30d85b9389..73ee9de613 100644 --- a/packages/odata-common/src/uri-conversion/get-orderby.ts +++ b/packages/odata-common/src/uri-conversion/get-orderby.ts @@ -1,7 +1,8 @@ -import { EntityBase } from '../entity-base'; -import { Orderable, OrderLink, Order } from '../order'; -import { DeSerializers } from '../de-serializers'; -import { EntityApi } from '../entity-api'; +import type { EntityBase } from '../entity-base'; +import type { Orderable, Order } from '../order'; +import { OrderLink } from '../order'; +import type { DeSerializers } from '../de-serializers'; +import type { EntityApi } from '../entity-api'; /** * Get an object containing the given order bys as query parameter, or an empty object if none was given. diff --git a/packages/odata-common/src/uri-conversion/get-resource-path.ts b/packages/odata-common/src/uri-conversion/get-resource-path.ts index 735900a67f..3f36333562 100644 --- a/packages/odata-common/src/uri-conversion/get-resource-path.ts +++ b/packages/odata-common/src/uri-conversion/get-resource-path.ts @@ -3,9 +3,9 @@ import { isNullish, upperCaseSnakeCase } from '@sap-cloud-sdk/util'; -import { EntityBase, Constructable } from '../entity-base'; -import { UriConverter } from '../de-serializers'; -import { EntityApi } from '../entity-api'; +import type { EntityBase, Constructable } from '../entity-base'; +import type { UriConverter } from '../de-serializers'; +import type { EntityApi } from '../entity-api'; const logger = createLogger({ package: 'odata-common', diff --git a/packages/odata-common/src/uri-conversion/odata-uri.ts b/packages/odata-common/src/uri-conversion/odata-uri.ts index a153da9072..4be0d5aa89 100644 --- a/packages/odata-common/src/uri-conversion/odata-uri.ts +++ b/packages/odata-common/src/uri-conversion/odata-uri.ts @@ -1,11 +1,12 @@ -import { Expandable } from '../expandable'; -import { EntityBase } from '../entity-base'; -import { EdmTypeShared } from '../edm-types'; -import { Selectable } from '../selectable'; -import { Orderable } from '../order'; -import { Filterable } from '../filter'; -import { createUriConverter, DeSerializers } from '../de-serializers'; -import { EntityApi } from '../entity-api'; +import type { Expandable } from '../expandable'; +import type { EntityBase } from '../entity-base'; +import type { EdmTypeShared } from '../edm-types'; +import type { Selectable } from '../selectable'; +import type { Orderable } from '../order'; +import type { Filterable } from '../filter'; +import type { DeSerializers } from '../de-serializers'; +import { createUriConverter } from '../de-serializers'; +import type { EntityApi } from '../entity-api'; import { getEntityKeys } from './get-keys'; import { getOrderBy } from './get-orderby'; import { createGetFilter } from './get-filter'; diff --git a/packages/odata-v2/src/batch-response.ts b/packages/odata-v2/src/batch-response.ts index 133b7af73c..8261771b3d 100644 --- a/packages/odata-v2/src/batch-response.ts +++ b/packages/odata-v2/src/batch-response.ts @@ -1,10 +1,10 @@ -import { +import type { WriteResponses as WriteResponsesCommon, ReadResponse as ReadResponseCommon, WriteResponse as WriteResponseCommon, ErrorResponse } from '@sap-cloud-sdk/odata-common'; -import { DefaultDeSerializers, DeSerializers } from './de-serializers'; +import type { DefaultDeSerializers, DeSerializers } from './de-serializers'; /** * Union of the possible batch responses: {@link @sap-cloud-sdk/odata-common!ReadResponse | ReadResponseCommon}, {@link @sap-cloud-sdk/odata-common!WriteResponses | WriteResponsesCommon} and {@link @sap-cloud-sdk/odata-common!ErrorResponse}. diff --git a/packages/odata-v2/src/de-serializers/converters.ts b/packages/odata-v2/src/de-serializers/converters.ts index b4b36e32b0..63ca741003 100644 --- a/packages/odata-v2/src/de-serializers/converters.ts +++ b/packages/odata-v2/src/de-serializers/converters.ts @@ -1,6 +1,6 @@ import moment from 'moment'; import { durationRegexV2 } from '@sap-cloud-sdk/odata-common/internal'; -import { Time } from '@sap-cloud-sdk/odata-common'; +import type { Time } from '@sap-cloud-sdk/odata-common'; /** * @internal diff --git a/packages/odata-v2/src/de-serializers/custom-de-serializers.ts b/packages/odata-v2/src/de-serializers/custom-de-serializers.ts index fbe4dbef20..30f413a5a5 100644 --- a/packages/odata-v2/src/de-serializers/custom-de-serializers.ts +++ b/packages/odata-v2/src/de-serializers/custom-de-serializers.ts @@ -1,13 +1,11 @@ -import { +import type { Time, CustomOrDefaultType as CustomOrDefaultTypeCommon } from '@sap-cloud-sdk/odata-common'; -import BigNumber from 'bignumber.js'; -import { DeSerializers } from './de-serializers'; -import { - DefaultDeSerializers, - defaultDeSerializers -} from './default-de-serializers'; +import type BigNumber from 'bignumber.js'; +import type { DeSerializers } from './de-serializers'; +import type { DefaultDeSerializers } from './default-de-serializers'; +import { defaultDeSerializers } from './default-de-serializers'; /** * Get a complete set of (de-)serializers, that consists of the given partial custom (de-)serializers and default (de-)serializers (aka. default (de-)serializers merged with custom (de-)serializers). diff --git a/packages/odata-v2/src/de-serializers/de-serializers.ts b/packages/odata-v2/src/de-serializers/de-serializers.ts index 321ac26ea8..3ba2ab1ca0 100644 --- a/packages/odata-v2/src/de-serializers/de-serializers.ts +++ b/packages/odata-v2/src/de-serializers/de-serializers.ts @@ -1,4 +1,4 @@ -import { +import type { DeSerializer, DeSerializers as DeSerializersCommon } from '@sap-cloud-sdk/odata-common'; diff --git a/packages/odata-v2/src/de-serializers/default-de-serializers.ts b/packages/odata-v2/src/de-serializers/default-de-serializers.ts index 4a0d0d920d..2fa0f874d6 100644 --- a/packages/odata-v2/src/de-serializers/default-de-serializers.ts +++ b/packages/odata-v2/src/de-serializers/default-de-serializers.ts @@ -1,16 +1,16 @@ +import type { Time } from '@sap-cloud-sdk/odata-common/internal'; import { defaultDeSerializersRaw as defaultDeSerializersCommon, - Time, wrapDefaultDeSerializers } from '@sap-cloud-sdk/odata-common/internal'; -import BigNumber from 'bignumber.js'; +import type BigNumber from 'bignumber.js'; import { deserializeToMoment, deserializeToTime, serializeFromMoment, serializeFromTime } from './converters'; -import { DeSerializers } from './de-serializers'; +import type { DeSerializers } from './de-serializers'; /** * Type of the default (de-)serializers. diff --git a/packages/odata-v2/src/de-serializers/entity-deserializer.ts b/packages/odata-v2/src/de-serializers/entity-deserializer.ts index 8e7b1ea9b3..3ea94fa9b7 100644 --- a/packages/odata-v2/src/de-serializers/entity-deserializer.ts +++ b/packages/odata-v2/src/de-serializers/entity-deserializer.ts @@ -1,10 +1,8 @@ -import { - entityDeserializer as entityDeserializerBase, - EntityDeserializer -} from '@sap-cloud-sdk/odata-common'; +import type { EntityDeserializer } from '@sap-cloud-sdk/odata-common'; +import { entityDeserializer as entityDeserializerBase } from '@sap-cloud-sdk/odata-common'; import { getLinkedCollectionResult } from '../request-builder/response-data-accessor'; import { extractODataEtag } from '../extract-odata-etag'; -import { DeSerializers } from './de-serializers'; +import type { DeSerializers } from './de-serializers'; /** * Entity deserializer instance for v2 entities. diff --git a/packages/odata-v2/src/de-serializers/payload-value-converter.spec.ts b/packages/odata-v2/src/de-serializers/payload-value-converter.spec.ts index 3512b7ae62..de206cd721 100644 --- a/packages/odata-v2/src/de-serializers/payload-value-converter.spec.ts +++ b/packages/odata-v2/src/de-serializers/payload-value-converter.spec.ts @@ -4,7 +4,7 @@ import { deserializeToNumber, serializeFromNumber } from '@sap-cloud-sdk/odata-common/internal'; -import { EdmType } from '../edm-types'; +import type { EdmType } from '../edm-types'; import { defaultDeSerializers } from '../de-serializers'; import { edmToTs, tsToEdm } from './payload-value-converter'; diff --git a/packages/odata-v2/src/de-serializers/payload-value-converter.ts b/packages/odata-v2/src/de-serializers/payload-value-converter.ts index fd421153e1..22f2454d33 100644 --- a/packages/odata-v2/src/de-serializers/payload-value-converter.ts +++ b/packages/odata-v2/src/de-serializers/payload-value-converter.ts @@ -1,5 +1,5 @@ -import { EdmTypeShared } from '@sap-cloud-sdk/odata-common'; -import { DeSerializers } from './de-serializers'; +import type { EdmTypeShared } from '@sap-cloud-sdk/odata-common'; +import type { DeSerializers } from './de-serializers'; /** * Convert a value from EDM format to TypeScript. This function is typically used when deserializing an OData response. diff --git a/packages/odata-v2/src/edm-types.ts b/packages/odata-v2/src/edm-types.ts index 3097ab4d7e..ea2d6bf0fd 100644 --- a/packages/odata-v2/src/edm-types.ts +++ b/packages/odata-v2/src/edm-types.ts @@ -1,4 +1,4 @@ -import { +import type { EdmTypeCommon, ExclusiveEdmTypeV2 } from '@sap-cloud-sdk/odata-common/internal'; diff --git a/packages/odata-v2/src/entity.spec.ts b/packages/odata-v2/src/entity.spec.ts index 8ff0dac918..ae09ad6510 100644 --- a/packages/odata-v2/src/entity.spec.ts +++ b/packages/odata-v2/src/entity.spec.ts @@ -1,12 +1,12 @@ import { TestEntity } from '@sap-cloud-sdk/test-services-odata-v2/test-service'; -import { customTestDeSerializers } from '../../../test-resources/test/test-util'; +import type { customTestDeSerializers } from '../../../test-resources/test/test-util'; import { testEntityApi, testEntityApiCustom, testEntityMultiLinkApi, testEntitySingleLinkApi } from '../test/test-util'; -import { CustomDeSerializers } from './de-serializers'; +import type { CustomDeSerializers } from './de-serializers'; describe('entity', () => { it('returns enumerable false for _oDataVersion', () => { diff --git a/packages/odata-v2/src/filter-functions.ts b/packages/odata-v2/src/filter-functions.ts index 23e3c54e5a..ebe55167ce 100644 --- a/packages/odata-v2/src/filter-functions.ts +++ b/packages/odata-v2/src/filter-functions.ts @@ -1,20 +1,22 @@ -import { +import type { Field, StringFilterFunction, BooleanFilterFunction, - filterFunction, - filterFunctions as filterFunctionsCommon, FilterFunctionsType as FilterFunctionsCommonType, Time, FilterFunctionNames as FilterFunctionNamesCommon } from '@sap-cloud-sdk/odata-common/internal'; -import BigNumber from 'bignumber.js'; import { - DeSerializers, + filterFunction, + filterFunctions as filterFunctionsCommon +} from '@sap-cloud-sdk/odata-common/internal'; +import type BigNumber from 'bignumber.js'; +import type { DeSerializers } from './de-serializers'; +import { defaultDeSerializers, mergeDefaultDeSerializersWith } from './de-serializers'; -import { Entity } from './entity'; +import type { Entity } from './entity'; /* String Functions */ /** diff --git a/packages/odata-v2/src/request-builder/batch-request-builder.spec.ts b/packages/odata-v2/src/request-builder/batch-request-builder.spec.ts index 2084b8efe0..09f486fd9c 100644 --- a/packages/odata-v2/src/request-builder/batch-request-builder.spec.ts +++ b/packages/odata-v2/src/request-builder/batch-request-builder.spec.ts @@ -5,7 +5,7 @@ import { } from '@sap-cloud-sdk/test-services-odata-v2/test-service'; import nock from 'nock'; import { BatchChangeSet } from '@sap-cloud-sdk/odata-common'; -import { DefaultDeSerializers } from '../de-serializers'; +import type { DefaultDeSerializers } from '../de-serializers'; const regexUuid = '\\w{8}-\\w{4}-\\w{4}-\\w{4}-\\w{12}'; const responseBoundary = 'responseBoundary'; diff --git a/packages/odata-v2/src/request-builder/batch-request-builder.ts b/packages/odata-v2/src/request-builder/batch-request-builder.ts index 6a60f36e83..d03eef776e 100644 --- a/packages/odata-v2/src/request-builder/batch-request-builder.ts +++ b/packages/odata-v2/src/request-builder/batch-request-builder.ts @@ -1,16 +1,13 @@ import { ErrorWithCause } from '@sap-cloud-sdk/util'; -import { HttpDestinationOrFetchOptions } from '@sap-cloud-sdk/connectivity'; +import type { HttpDestinationOrFetchOptions } from '@sap-cloud-sdk/connectivity'; import { deserializeBatchResponse, parseBatchResponse, BatchRequestBuilder } from '@sap-cloud-sdk/odata-common/internal'; -import { - DeSerializers, - DefaultDeSerializers, - entityDeserializer -} from '../de-serializers'; -import { BatchResponse } from '../batch-response'; +import type { DeSerializers, DefaultDeSerializers } from '../de-serializers'; +import { entityDeserializer } from '../de-serializers'; +import type { BatchResponse } from '../batch-response'; import { responseDataAccessor } from './response-data-accessor'; /** diff --git a/packages/odata-v2/src/request-builder/count-request-builder.ts b/packages/odata-v2/src/request-builder/count-request-builder.ts index 7c79f3950d..69c60a4542 100644 --- a/packages/odata-v2/src/request-builder/count-request-builder.ts +++ b/packages/odata-v2/src/request-builder/count-request-builder.ts @@ -1,6 +1,6 @@ import { CountRequestBuilder as CountRequestBuilderCommon } from '@sap-cloud-sdk/odata-common'; -import { Entity } from '../entity'; -import { DeSerializers, DefaultDeSerializers } from '../de-serializers'; +import type { Entity } from '../entity'; +import type { DeSerializers, DefaultDeSerializers } from '../de-serializers'; /** * Create an OData request to count entities based on the configuration of the request. diff --git a/packages/odata-v2/src/request-builder/create-request-builder.ts b/packages/odata-v2/src/request-builder/create-request-builder.ts index 810058650a..f5370bf60c 100644 --- a/packages/odata-v2/src/request-builder/create-request-builder.ts +++ b/packages/odata-v2/src/request-builder/create-request-builder.ts @@ -1,15 +1,14 @@ -import { +import type { EntityIdentifiable, - CreateRequestBuilderBase, - entitySerializer, EntityApi } from '@sap-cloud-sdk/odata-common/internal'; import { - DefaultDeSerializers, - DeSerializers, - entityDeserializer -} from '../de-serializers'; -import { Entity } from '../entity'; + CreateRequestBuilderBase, + entitySerializer +} from '@sap-cloud-sdk/odata-common/internal'; +import type { DefaultDeSerializers, DeSerializers } from '../de-serializers'; +import { entityDeserializer } from '../de-serializers'; +import type { Entity } from '../entity'; import { createODataUri } from '../uri-conversion'; import { responseDataAccessor } from './response-data-accessor'; diff --git a/packages/odata-v2/src/request-builder/delete-request-builder.ts b/packages/odata-v2/src/request-builder/delete-request-builder.ts index c693badc3e..851dcd968d 100644 --- a/packages/odata-v2/src/request-builder/delete-request-builder.ts +++ b/packages/odata-v2/src/request-builder/delete-request-builder.ts @@ -1,9 +1,7 @@ -import { - DeleteRequestBuilderBase, - EntityApi -} from '@sap-cloud-sdk/odata-common/internal'; -import { DefaultDeSerializers, DeSerializers } from '../de-serializers'; -import { Entity } from '../entity'; +import type { EntityApi } from '@sap-cloud-sdk/odata-common/internal'; +import { DeleteRequestBuilderBase } from '@sap-cloud-sdk/odata-common/internal'; +import type { DefaultDeSerializers, DeSerializers } from '../de-serializers'; +import type { Entity } from '../entity'; import { createODataUri } from '../uri-conversion'; /** diff --git a/packages/odata-v2/src/request-builder/get-all-request-builder.spec.ts b/packages/odata-v2/src/request-builder/get-all-request-builder.spec.ts index 6a96967e74..f610b3101c 100644 --- a/packages/odata-v2/src/request-builder/get-all-request-builder.spec.ts +++ b/packages/odata-v2/src/request-builder/get-all-request-builder.spec.ts @@ -1,6 +1,6 @@ import nock from 'nock'; import * as httpClient from '@sap-cloud-sdk/http-client'; -import { TestEntity } from '@sap-cloud-sdk/test-services-odata-v2/test-service'; +import type { TestEntity } from '@sap-cloud-sdk/test-services-odata-v2/test-service'; import { oDataTypedClientParameterEncoder } from '@sap-cloud-sdk/http-client/dist/http-client'; import { asc, desc } from '@sap-cloud-sdk/odata-common'; import { timeout } from '@sap-cloud-sdk/resilience'; @@ -30,7 +30,7 @@ import { testEntityApiCustom, createTestEntityWithCustomDeSerializers } from '../../test/test-util'; -import { DefaultDeSerializers } from '../de-serializers'; +import type { DefaultDeSerializers } from '../de-serializers'; import { GetAllRequestBuilder } from './get-all-request-builder'; describe('GetAllRequestBuilder', () => { diff --git a/packages/odata-v2/src/request-builder/get-all-request-builder.ts b/packages/odata-v2/src/request-builder/get-all-request-builder.ts index 11a8d0f6d5..420d601f51 100644 --- a/packages/odata-v2/src/request-builder/get-all-request-builder.ts +++ b/packages/odata-v2/src/request-builder/get-all-request-builder.ts @@ -1,18 +1,17 @@ -import { +import type { EntityIdentifiable, + Filterable, + EntityApi +} from '@sap-cloud-sdk/odata-common/internal'; +import { GetAllRequestBuilderBase, ODataGetAllRequestConfig, - Filterable, - EntityApi, and } from '@sap-cloud-sdk/odata-common/internal'; import { transformVariadicArgumentToArray } from '@sap-cloud-sdk/util'; -import { Entity } from '../entity'; -import { - DefaultDeSerializers, - DeSerializers, - entityDeserializer -} from '../de-serializers'; +import type { Entity } from '../entity'; +import type { DefaultDeSerializers, DeSerializers } from '../de-serializers'; +import { entityDeserializer } from '../de-serializers'; import { createODataUri } from '../uri-conversion'; import { responseDataAccessor } from './response-data-accessor'; diff --git a/packages/odata-v2/src/request-builder/get-by-key-request-builder.ts b/packages/odata-v2/src/request-builder/get-by-key-request-builder.ts index 282eaf1168..dff2fc0166 100644 --- a/packages/odata-v2/src/request-builder/get-by-key-request-builder.ts +++ b/packages/odata-v2/src/request-builder/get-by-key-request-builder.ts @@ -1,14 +1,11 @@ -import { +import type { EntityApi, - EntityIdentifiable, - GetByKeyRequestBuilderBase + EntityIdentifiable } from '@sap-cloud-sdk/odata-common/internal'; -import { - DefaultDeSerializers, - DeSerializers, - entityDeserializer -} from '../de-serializers'; -import { Entity } from '../entity'; +import { GetByKeyRequestBuilderBase } from '@sap-cloud-sdk/odata-common/internal'; +import type { DefaultDeSerializers, DeSerializers } from '../de-serializers'; +import { entityDeserializer } from '../de-serializers'; +import type { Entity } from '../entity'; import { createODataUri } from '../uri-conversion'; import { responseDataAccessor } from './response-data-accessor'; diff --git a/packages/odata-v2/src/request-builder/operation-request-builder.ts b/packages/odata-v2/src/request-builder/operation-request-builder.ts index 874dac2ca6..92db5e881e 100644 --- a/packages/odata-v2/src/request-builder/operation-request-builder.ts +++ b/packages/odata-v2/src/request-builder/operation-request-builder.ts @@ -1,9 +1,9 @@ -import { +import type { OperationParameters, - RequestMethodType, - OperationRequestBuilderBase + RequestMethodType } from '@sap-cloud-sdk/odata-common/internal'; -import { DeSerializers } from '../de-serializers'; +import { OperationRequestBuilderBase } from '@sap-cloud-sdk/odata-common/internal'; +import type { DeSerializers } from '../de-serializers'; import { ODataFunctionRequestConfig } from '../request'; import { createODataUri } from '../uri-conversion'; diff --git a/packages/odata-v2/src/request-builder/response-data-accessor.ts b/packages/odata-v2/src/request-builder/response-data-accessor.ts index a19e7d29d5..12766231fd 100644 --- a/packages/odata-v2/src/request-builder/response-data-accessor.ts +++ b/packages/odata-v2/src/request-builder/response-data-accessor.ts @@ -1,5 +1,5 @@ import { createLogger } from '@sap-cloud-sdk/util'; -import { ResponseDataAccessor } from '@sap-cloud-sdk/odata-common'; +import type { ResponseDataAccessor } from '@sap-cloud-sdk/odata-common'; const logger = createLogger({ package: 'odata-v2', diff --git a/packages/odata-v2/src/request-builder/response-transformers.ts b/packages/odata-v2/src/request-builder/response-transformers.ts index d2fd5159de..b7afb33cad 100644 --- a/packages/odata-v2/src/request-builder/response-transformers.ts +++ b/packages/odata-v2/src/request-builder/response-transformers.ts @@ -1,7 +1,7 @@ -import { EntityApi } from '@sap-cloud-sdk/odata-common'; +import type { EntityApi } from '@sap-cloud-sdk/odata-common'; import { entityDeserializer } from '../de-serializers'; -import { DeSerializers } from '../de-serializers/de-serializers'; -import { Entity } from '../entity'; +import type { DeSerializers } from '../de-serializers/de-serializers'; +import type { Entity } from '../entity'; import { getSingleResult, getCollectionResult } from './response-data-accessor'; /** diff --git a/packages/odata-v2/src/request-builder/update-request-builder.ts b/packages/odata-v2/src/request-builder/update-request-builder.ts index e23b0422f7..44fd306221 100644 --- a/packages/odata-v2/src/request-builder/update-request-builder.ts +++ b/packages/odata-v2/src/request-builder/update-request-builder.ts @@ -1,19 +1,21 @@ import { createLogger, isNullish } from '@sap-cloud-sdk/util'; -import { HttpDestinationOrFetchOptions } from '@sap-cloud-sdk/connectivity'; -import { HttpResponse } from '@sap-cloud-sdk/http-client'; -import { +import type { HttpDestinationOrFetchOptions } from '@sap-cloud-sdk/connectivity'; +import type { HttpResponse } from '@sap-cloud-sdk/http-client'; +import type { EntityIdentifiable, ODataRequest, ODataUpdateRequestConfig, + EntityApi +} from '@sap-cloud-sdk/odata-common/internal'; +import { UpdateRequestBuilderBase, isNavigationProperty, removePropertyOnCondition, - EntityApi, entitySerializer } from '@sap-cloud-sdk/odata-common/internal'; -import { Entity } from '../entity'; +import type { Entity } from '../entity'; import { extractODataEtag } from '../extract-odata-etag'; -import { DefaultDeSerializers, DeSerializers } from '../de-serializers'; +import type { DefaultDeSerializers, DeSerializers } from '../de-serializers'; import { createODataUri } from '../uri-conversion'; const logger = createLogger({ diff --git a/packages/odata-v2/src/request/odata-function-request-config.spec.ts b/packages/odata-v2/src/request/odata-function-request-config.spec.ts index e9c842f905..2cda5b3a05 100644 --- a/packages/odata-v2/src/request/odata-function-request-config.spec.ts +++ b/packages/odata-v2/src/request/odata-function-request-config.spec.ts @@ -1,5 +1,6 @@ import { OperationParameter } from '@sap-cloud-sdk/odata-common'; -import { defaultDeSerializers, DefaultDeSerializers } from '../de-serializers'; +import type { DefaultDeSerializers } from '../de-serializers'; +import { defaultDeSerializers } from '../de-serializers'; import { createODataUri } from '../uri-conversion'; import { ODataFunctionRequestConfig } from './odata-function-request-config'; diff --git a/packages/odata-v2/src/request/odata-function-request-config.ts b/packages/odata-v2/src/request/odata-function-request-config.ts index 191d361f26..a4810cf4d9 100644 --- a/packages/odata-v2/src/request/odata-function-request-config.ts +++ b/packages/odata-v2/src/request/odata-function-request-config.ts @@ -1,11 +1,11 @@ -import { +import type { ODataUri, OperationParameter, OperationParameters, - RequestMethodType, - ODataFunctionRequestConfig as ODataFunctionRequestConfigBase + RequestMethodType } from '@sap-cloud-sdk/odata-common/internal'; -import { DeSerializers } from '../de-serializers'; +import { ODataFunctionRequestConfig as ODataFunctionRequestConfigBase } from '@sap-cloud-sdk/odata-common/internal'; +import type { DeSerializers } from '../de-serializers'; /** * Function request configuration for an entity type. diff --git a/packages/odata-v2/src/selectable/custom-field.ts b/packages/odata-v2/src/selectable/custom-field.ts index 1cb9ea4869..52f070f656 100644 --- a/packages/odata-v2/src/selectable/custom-field.ts +++ b/packages/odata-v2/src/selectable/custom-field.ts @@ -1,8 +1,6 @@ -import { - CustomField as CustomFieldBase, - OrderableEdmTypeField -} from '@sap-cloud-sdk/odata-common/internal'; -import { DeSerializers } from '../de-serializers/de-serializers'; +import type { OrderableEdmTypeField } from '@sap-cloud-sdk/odata-common/internal'; +import { CustomField as CustomFieldBase } from '@sap-cloud-sdk/odata-common/internal'; +import type { DeSerializers } from '../de-serializers/de-serializers'; import type { Entity } from '../entity'; export class CustomField< diff --git a/packages/odata-v2/src/uri-conversion/get-expand.ts b/packages/odata-v2/src/uri-conversion/get-expand.ts index 398f20bf36..baad439478 100644 --- a/packages/odata-v2/src/uri-conversion/get-expand.ts +++ b/packages/odata-v2/src/uri-conversion/get-expand.ts @@ -1,6 +1,7 @@ -import { Selectable, Link } from '@sap-cloud-sdk/odata-common'; -import { DeSerializers } from '../de-serializers'; -import { Entity } from '../entity'; +import type { Selectable } from '@sap-cloud-sdk/odata-common'; +import { Link } from '@sap-cloud-sdk/odata-common'; +import type { DeSerializers } from '../de-serializers'; +import type { Entity } from '../entity'; /** * @internal diff --git a/packages/odata-v2/src/uri-conversion/get-select.ts b/packages/odata-v2/src/uri-conversion/get-select.ts index a496a52e88..8a8baa8643 100644 --- a/packages/odata-v2/src/uri-conversion/get-select.ts +++ b/packages/odata-v2/src/uri-conversion/get-select.ts @@ -1,6 +1,7 @@ -import { Selectable, Link } from '@sap-cloud-sdk/odata-common'; -import { DeSerializers } from '../de-serializers'; -import { Entity } from '../entity'; +import type { Selectable } from '@sap-cloud-sdk/odata-common'; +import { Link } from '@sap-cloud-sdk/odata-common'; +import type { DeSerializers } from '../de-serializers'; +import type { Entity } from '../entity'; /** * Get an object containing the given Selectables as query parameter, or an empty object if none were given. diff --git a/packages/odata-v2/src/uri-conversion/odata-uri.ts b/packages/odata-v2/src/uri-conversion/odata-uri.ts index 6e82795ae0..adc10dac10 100644 --- a/packages/odata-v2/src/uri-conversion/odata-uri.ts +++ b/packages/odata-v2/src/uri-conversion/odata-uri.ts @@ -1,8 +1,8 @@ -import { +import type { ODataUri, - createODataUri as createODataUriBase, DeSerializers } from '@sap-cloud-sdk/odata-common/internal'; +import { createODataUri as createODataUriBase } from '@sap-cloud-sdk/odata-common/internal'; import { getExpand } from './get-expand'; import { getSelect } from './get-select'; diff --git a/packages/odata-v2/test/test-util/test-data.ts b/packages/odata-v2/test/test-util/test-data.ts index 9cfd601445..eec8345689 100644 --- a/packages/odata-v2/test/test-util/test-data.ts +++ b/packages/odata-v2/test/test-util/test-data.ts @@ -1,9 +1,8 @@ import { createUriConverter } from '@sap-cloud-sdk/odata-common/internal'; -import { - TestEntity, - testService -} from '@sap-cloud-sdk/test-services-odata-v2/test-service'; -import { defaultDeSerializers, CustomDeSerializers } from '../../src'; +import type { TestEntity } from '@sap-cloud-sdk/test-services-odata-v2/test-service'; +import { testService } from '@sap-cloud-sdk/test-services-odata-v2/test-service'; +import type { CustomDeSerializers } from '../../src'; +import { defaultDeSerializers } from '../../src'; import { customStringPropertyValue, customTestDeSerializers diff --git a/packages/odata-v4/src/batch-response.ts b/packages/odata-v4/src/batch-response.ts index dde995fc73..c064cbad30 100644 --- a/packages/odata-v4/src/batch-response.ts +++ b/packages/odata-v4/src/batch-response.ts @@ -1,10 +1,10 @@ -import { +import type { WriteResponses as WriteResponsesCommon, ReadResponse as ReadResponseCommon, WriteResponse as WriteResponseCommon, ErrorResponse } from '@sap-cloud-sdk/odata-common/internal'; -import { DefaultDeSerializers, DeSerializers } from './de-serializers'; +import type { DefaultDeSerializers, DeSerializers } from './de-serializers'; /** * Union of the possible batch responses: {@link @sap-cloud-sdk/odata-common!ReadResponse | ReadResponseCommon}, {@link @sap-cloud-sdk/odata-common!WriteResponses | WriteResponsesCommon} and {@link @sap-cloud-sdk/odata-common!ErrorResponse}. diff --git a/packages/odata-v4/src/de-serializers/converters.ts b/packages/odata-v4/src/de-serializers/converters.ts index aa2bff6f84..8d9c70223b 100644 --- a/packages/odata-v4/src/de-serializers/converters.ts +++ b/packages/odata-v4/src/de-serializers/converters.ts @@ -1,5 +1,5 @@ import { durationRegexV4 } from '@sap-cloud-sdk/odata-common/internal'; -import { Time } from '@sap-cloud-sdk/odata-common'; +import type { Time } from '@sap-cloud-sdk/odata-common'; import moment from 'moment'; /** * @internal diff --git a/packages/odata-v4/src/de-serializers/custom-de-serializers.ts b/packages/odata-v4/src/de-serializers/custom-de-serializers.ts index ee64e3b0e4..a8940b1ad3 100644 --- a/packages/odata-v4/src/de-serializers/custom-de-serializers.ts +++ b/packages/odata-v4/src/de-serializers/custom-de-serializers.ts @@ -1,14 +1,12 @@ -import { +import type { Time, CustomOrDefaultType as CustomOrDefaultTypeCommon } from '@sap-cloud-sdk/odata-common'; -import BigNumber from 'bignumber.js'; -import moment from 'moment'; -import { DeSerializers } from './de-serializers'; -import { - DefaultDeSerializers, - defaultDeSerializers -} from './default-de-serializers'; +import type BigNumber from 'bignumber.js'; +import type moment from 'moment'; +import type { DeSerializers } from './de-serializers'; +import type { DefaultDeSerializers } from './default-de-serializers'; +import { defaultDeSerializers } from './default-de-serializers'; /** * Get a complete set of (de-)serializers, that consists of the given partial custom (de-)serializers and default (de-)serializers (aka. default (de-)serializers merged with custom (de-)serializers). diff --git a/packages/odata-v4/src/de-serializers/de-serializers.ts b/packages/odata-v4/src/de-serializers/de-serializers.ts index ec4cb6c97d..d8df41fa9a 100644 --- a/packages/odata-v4/src/de-serializers/de-serializers.ts +++ b/packages/odata-v4/src/de-serializers/de-serializers.ts @@ -1,4 +1,4 @@ -import { +import type { DeSerializer, DeSerializers as DeSerializersCommon } from '@sap-cloud-sdk/odata-common'; diff --git a/packages/odata-v4/src/de-serializers/default-de-serializers.ts b/packages/odata-v4/src/de-serializers/default-de-serializers.ts index 8a2b8de4c3..f3ca8ff6a5 100644 --- a/packages/odata-v4/src/de-serializers/default-de-serializers.ts +++ b/packages/odata-v4/src/de-serializers/default-de-serializers.ts @@ -1,11 +1,11 @@ +import type { Time } from '@sap-cloud-sdk/odata-common/internal'; import { convertToUriForEdmString, defaultDeSerializersRaw as defaultDeSerializersCommon, - Time, wrapDefaultDeSerializers } from '@sap-cloud-sdk/odata-common/internal'; import { identity } from '@sap-cloud-sdk/util'; -import BigNumber from 'bignumber.js'; +import type BigNumber from 'bignumber.js'; import { serializeToDate, deserializeDateTimeOffsetToMoment, @@ -16,7 +16,7 @@ import { serializeToTime, deserializeDateToMoment } from './converters'; -import { DeSerializers } from './de-serializers'; +import type { DeSerializers } from './de-serializers'; /** * Type of the default (de-)serializers. diff --git a/packages/odata-v4/src/de-serializers/entity-deserializer.ts b/packages/odata-v4/src/de-serializers/entity-deserializer.ts index 5191030de6..62ac2c4f3a 100644 --- a/packages/odata-v4/src/de-serializers/entity-deserializer.ts +++ b/packages/odata-v4/src/de-serializers/entity-deserializer.ts @@ -1,10 +1,8 @@ -import { - entityDeserializer as entityDeserializerBase, - EntityDeserializer -} from '@sap-cloud-sdk/odata-common/internal'; +import type { EntityDeserializer } from '@sap-cloud-sdk/odata-common/internal'; +import { entityDeserializer as entityDeserializerBase } from '@sap-cloud-sdk/odata-common/internal'; import { extractODataEtag } from '../extract-odata-etag'; import { getLinkedCollectionResult } from '../request-builder/response-data-accessor'; -import { DeSerializers } from './de-serializers'; +import type { DeSerializers } from './de-serializers'; /** * Entity deserializer instance for v4 entities. diff --git a/packages/odata-v4/src/de-serializers/payload-value-converter.ts b/packages/odata-v4/src/de-serializers/payload-value-converter.ts index 4702816cfa..4f972d274c 100644 --- a/packages/odata-v4/src/de-serializers/payload-value-converter.ts +++ b/packages/odata-v4/src/de-serializers/payload-value-converter.ts @@ -1,5 +1,5 @@ -import { EdmTypeShared } from '@sap-cloud-sdk/odata-common'; -import { DeSerializers } from './de-serializers'; +import type { EdmTypeShared } from '@sap-cloud-sdk/odata-common'; +import type { DeSerializers } from './de-serializers'; /** * Convert a value with edm format to one with typescript format. This function is typically used when deserializing an OData response. diff --git a/packages/odata-v4/src/edm-types.ts b/packages/odata-v4/src/edm-types.ts index 1f0dab61ed..3fec9b98dc 100644 --- a/packages/odata-v4/src/edm-types.ts +++ b/packages/odata-v4/src/edm-types.ts @@ -1,4 +1,4 @@ -import { +import type { EdmTypeCommon, ExclusiveEdmTypeV4 } from '@sap-cloud-sdk/odata-common/internal'; diff --git a/packages/odata-v4/src/entity-builder.spec.ts b/packages/odata-v4/src/entity-builder.spec.ts index 9af3baa92e..06a56997e8 100644 --- a/packages/odata-v4/src/entity-builder.spec.ts +++ b/packages/odata-v4/src/entity-builder.spec.ts @@ -1,4 +1,4 @@ -import { TestEntity } from '@sap-cloud-sdk/test-services-odata-v4/test-service'; +import type { TestEntity } from '@sap-cloud-sdk/test-services-odata-v4/test-service'; import moment from 'moment'; import BigNumber from 'bignumber.js'; import { diff --git a/packages/odata-v4/src/filter-function.ts b/packages/odata-v4/src/filter-function.ts index c129c05c1e..7385859127 100644 --- a/packages/odata-v4/src/filter-function.ts +++ b/packages/odata-v4/src/filter-function.ts @@ -1,15 +1,17 @@ -import moment from 'moment'; -import { +import type moment from 'moment'; +import type { FilterFunctionParameterType, BooleanFilterFunction, NumberFilterFunction, StringFilterFunction, - FilterFunctionReturnType as FilterFunctionReturnTypeBase, + FilterFunctionReturnType as FilterFunctionReturnTypeBase +} from '@sap-cloud-sdk/odata-common/internal'; +import { createFilterFunction, numberReturnTypeMapping, CollectionFilterFunction } from '@sap-cloud-sdk/odata-common/internal'; -import { Entity } from './entity'; +import type { Entity } from './entity'; import { DateFilterFunction } from './filter'; // eslint-disable valid-jsdoc diff --git a/packages/odata-v4/src/filter-functions.ts b/packages/odata-v4/src/filter-functions.ts index 732172fa6c..b84027f686 100644 --- a/packages/odata-v4/src/filter-functions.ts +++ b/packages/odata-v4/src/filter-functions.ts @@ -1,5 +1,5 @@ -import moment from 'moment'; -import { +import type moment from 'moment'; +import type { Field, StringFilterFunction, BooleanFilterFunction, @@ -7,17 +7,17 @@ import { FilterFunctionPrimitiveParameterType, CollectionField, CollectionFilterFunction, - filterFunctions as filterFunctionsCommon, FilterFunctionNames as FilterFunctionNamesCommon, FilterFunctionsType as FilterFunctionsCommonType, Time } from '@sap-cloud-sdk/odata-common/internal'; -import BigNumber from 'bignumber.js'; -import { Entity } from './entity'; +import { filterFunctions as filterFunctionsCommon } from '@sap-cloud-sdk/odata-common/internal'; +import type BigNumber from 'bignumber.js'; +import type { Entity } from './entity'; import { filterFunction } from './filter-function'; +import type { DeSerializers } from './de-serializers'; import { defaultDeSerializers, - DeSerializers, mergeDefaultDeSerializersWith } from './de-serializers'; diff --git a/packages/odata-v4/src/filter/date-filter-function.ts b/packages/odata-v4/src/filter/date-filter-function.ts index 65be51cc07..b0041f24d1 100644 --- a/packages/odata-v4/src/filter/date-filter-function.ts +++ b/packages/odata-v4/src/filter/date-filter-function.ts @@ -1,9 +1,9 @@ -import moment from 'moment'; -import { +import type moment from 'moment'; +import type { EntityBase, - FilterFunctionParameterType, - OrderableFilterFunction + FilterFunctionParameterType } from '@sap-cloud-sdk/odata-common/internal'; +import { OrderableFilterFunction } from '@sap-cloud-sdk/odata-common/internal'; /** * Representation of a filter function, that returns a value of type date. This supports DateTimeOffset values. diff --git a/packages/odata-v4/src/filter/filter-lambda-expression.ts b/packages/odata-v4/src/filter/filter-lambda-expression.ts index 920eaf0ca0..139bc74c5f 100644 --- a/packages/odata-v4/src/filter/filter-lambda-expression.ts +++ b/packages/odata-v4/src/filter/filter-lambda-expression.ts @@ -1,13 +1,15 @@ -import { - FilterLambdaExpression, +import type { EntityBase, - and, Filterable, - toFilterableList, EntityApi } from '@sap-cloud-sdk/odata-common/internal'; -import { DeSerializers } from '../de-serializers'; -import { Entity } from '../entity'; +import { + FilterLambdaExpression, + and, + toFilterableList +} from '@sap-cloud-sdk/odata-common/internal'; +import type { DeSerializers } from '../de-serializers'; +import type { Entity } from '../entity'; /** * Will return the entity if at least one element of the one-to-many link relation fulfills the condition. diff --git a/packages/odata-v4/src/request-builder/batch-request-builder.ts b/packages/odata-v4/src/request-builder/batch-request-builder.ts index e74c046d6d..023dce84c5 100644 --- a/packages/odata-v4/src/request-builder/batch-request-builder.ts +++ b/packages/odata-v4/src/request-builder/batch-request-builder.ts @@ -1,16 +1,13 @@ import { ErrorWithCause } from '@sap-cloud-sdk/util'; -import { HttpDestinationOrFetchOptions } from '@sap-cloud-sdk/connectivity'; +import type { HttpDestinationOrFetchOptions } from '@sap-cloud-sdk/connectivity'; import { parseBatchResponse, BatchRequestBuilder, deserializeBatchResponse } from '@sap-cloud-sdk/odata-common/internal'; -import { - DefaultDeSerializers, - DeSerializers, - entityDeserializer -} from '../de-serializers'; -import { BatchResponse } from '../batch-response'; +import type { DefaultDeSerializers, DeSerializers } from '../de-serializers'; +import { entityDeserializer } from '../de-serializers'; +import type { BatchResponse } from '../batch-response'; import { responseDataAccessor } from './response-data-accessor'; /** diff --git a/packages/odata-v4/src/request-builder/bound-operation-request-builder.spec.ts b/packages/odata-v4/src/request-builder/bound-operation-request-builder.spec.ts index d5fd78e510..000277a314 100644 --- a/packages/odata-v4/src/request-builder/bound-operation-request-builder.spec.ts +++ b/packages/odata-v4/src/request-builder/bound-operation-request-builder.spec.ts @@ -1,4 +1,4 @@ -import { HttpDestination } from '@sap-cloud-sdk/connectivity'; +import type { HttpDestination } from '@sap-cloud-sdk/connectivity'; import { TestEntity, testService diff --git a/packages/odata-v4/src/request-builder/bound-operation-request-builder.ts b/packages/odata-v4/src/request-builder/bound-operation-request-builder.ts index 2bfceab216..0f117d7895 100644 --- a/packages/odata-v4/src/request-builder/bound-operation-request-builder.ts +++ b/packages/odata-v4/src/request-builder/bound-operation-request-builder.ts @@ -1,11 +1,11 @@ // eslint-disable-next-line max-classes-per-file -import { - OperationRequestBuilderBase, +import type { EntityApi, EntityBase, OperationParameters } from '@sap-cloud-sdk/odata-common/internal'; -import { DeSerializers } from '../de-serializers'; +import { OperationRequestBuilderBase } from '@sap-cloud-sdk/odata-common/internal'; +import type { DeSerializers } from '../de-serializers'; import { ODataBoundActionRequestConfig, ODataBoundFunctionRequestConfig diff --git a/packages/odata-v4/src/request-builder/count-request-builder.ts b/packages/odata-v4/src/request-builder/count-request-builder.ts index 7c79f3950d..69c60a4542 100644 --- a/packages/odata-v4/src/request-builder/count-request-builder.ts +++ b/packages/odata-v4/src/request-builder/count-request-builder.ts @@ -1,6 +1,6 @@ import { CountRequestBuilder as CountRequestBuilderCommon } from '@sap-cloud-sdk/odata-common'; -import { Entity } from '../entity'; -import { DeSerializers, DefaultDeSerializers } from '../de-serializers'; +import type { Entity } from '../entity'; +import type { DeSerializers, DefaultDeSerializers } from '../de-serializers'; /** * Create an OData request to count entities based on the configuration of the request. diff --git a/packages/odata-v4/src/request-builder/create-request-builder.ts b/packages/odata-v4/src/request-builder/create-request-builder.ts index 555873dcdd..35c587ac84 100644 --- a/packages/odata-v4/src/request-builder/create-request-builder.ts +++ b/packages/odata-v4/src/request-builder/create-request-builder.ts @@ -1,15 +1,14 @@ -import { +import type { EntityApi, - CreateRequestBuilderBase, - entitySerializer, EntityIdentifiable } from '@sap-cloud-sdk/odata-common/internal'; import { - DefaultDeSerializers, - DeSerializers, - entityDeserializer -} from '../de-serializers'; -import { Entity } from '../entity'; + CreateRequestBuilderBase, + entitySerializer +} from '@sap-cloud-sdk/odata-common/internal'; +import type { DefaultDeSerializers, DeSerializers } from '../de-serializers'; +import { entityDeserializer } from '../de-serializers'; +import type { Entity } from '../entity'; import { createODataUri } from '../uri-conversion'; import { responseDataAccessor } from './response-data-accessor'; /** diff --git a/packages/odata-v4/src/request-builder/delete-request-builder.ts b/packages/odata-v4/src/request-builder/delete-request-builder.ts index c86905a625..86738fe8ad 100644 --- a/packages/odata-v4/src/request-builder/delete-request-builder.ts +++ b/packages/odata-v4/src/request-builder/delete-request-builder.ts @@ -1,9 +1,7 @@ -import { - DeleteRequestBuilderBase, - EntityApi -} from '@sap-cloud-sdk/odata-common/internal'; -import { DefaultDeSerializers, DeSerializers } from '../de-serializers'; -import { Entity } from '../entity'; +import type { EntityApi } from '@sap-cloud-sdk/odata-common/internal'; +import { DeleteRequestBuilderBase } from '@sap-cloud-sdk/odata-common/internal'; +import type { DefaultDeSerializers, DeSerializers } from '../de-serializers'; +import type { Entity } from '../entity'; import { createODataUri } from '../uri-conversion'; /** diff --git a/packages/odata-v4/src/request-builder/get-all-request-builder.spec.ts b/packages/odata-v4/src/request-builder/get-all-request-builder.spec.ts index 07406743ef..c9007b5ab0 100644 --- a/packages/odata-v4/src/request-builder/get-all-request-builder.spec.ts +++ b/packages/odata-v4/src/request-builder/get-all-request-builder.spec.ts @@ -1,4 +1,4 @@ -import { TestEntity } from '@sap-cloud-sdk/test-services-odata-v4/test-service'; +import type { TestEntity } from '@sap-cloud-sdk/test-services-odata-v4/test-service'; import { createOriginalTestEntityDataV4_1, createOriginalTestEntityDataV4_2, @@ -15,7 +15,7 @@ import { testEntityMultiLinkApi, testEntitySingleLinkApi } from '../../test/test-util'; -import { DefaultDeSerializers } from '../de-serializers'; +import type { DefaultDeSerializers } from '../de-serializers'; import { any } from '../filter'; import { GetAllRequestBuilder } from './get-all-request-builder'; diff --git a/packages/odata-v4/src/request-builder/get-all-request-builder.ts b/packages/odata-v4/src/request-builder/get-all-request-builder.ts index 4d1d7dd5a3..6c6c02dab5 100644 --- a/packages/odata-v4/src/request-builder/get-all-request-builder.ts +++ b/packages/odata-v4/src/request-builder/get-all-request-builder.ts @@ -1,21 +1,20 @@ -import { +import type { EntityIdentifiable, - GetAllRequestBuilderBase, - ODataGetAllRequestConfig, Filterable, Expandable, EntityApi, - toFilterableList, - and, EntityBase } from '@sap-cloud-sdk/odata-common/internal'; -import { transformVariadicArgumentToArray } from '@sap-cloud-sdk/util'; -import { Entity } from '../entity'; import { - DefaultDeSerializers, - DeSerializers, - entityDeserializer -} from '../de-serializers'; + GetAllRequestBuilderBase, + ODataGetAllRequestConfig, + toFilterableList, + and +} from '@sap-cloud-sdk/odata-common/internal'; +import { transformVariadicArgumentToArray } from '@sap-cloud-sdk/util'; +import type { Entity } from '../entity'; +import type { DefaultDeSerializers, DeSerializers } from '../de-serializers'; +import { entityDeserializer } from '../de-serializers'; import { createODataUri } from '../uri-conversion'; import { responseDataAccessor } from './response-data-accessor'; diff --git a/packages/odata-v4/src/request-builder/get-by-key-request-builder.ts b/packages/odata-v4/src/request-builder/get-by-key-request-builder.ts index 76d2f76ce8..4d0b2f84d5 100644 --- a/packages/odata-v4/src/request-builder/get-by-key-request-builder.ts +++ b/packages/odata-v4/src/request-builder/get-by-key-request-builder.ts @@ -1,17 +1,14 @@ import { transformVariadicArgumentToArray } from '@sap-cloud-sdk/util'; -import { +import type { EntityIdentifiable, Expandable, - GetByKeyRequestBuilderBase, EntityApi, EntityBase } from '@sap-cloud-sdk/odata-common/internal'; -import { - DefaultDeSerializers, - DeSerializers, - entityDeserializer -} from '../de-serializers'; -import { Entity } from '../entity'; +import { GetByKeyRequestBuilderBase } from '@sap-cloud-sdk/odata-common/internal'; +import type { DefaultDeSerializers, DeSerializers } from '../de-serializers'; +import { entityDeserializer } from '../de-serializers'; +import type { Entity } from '../entity'; import { createODataUri } from '../uri-conversion'; import { responseDataAccessor } from './response-data-accessor'; diff --git a/packages/odata-v4/src/request-builder/operation-request-builder.spec.ts b/packages/odata-v4/src/request-builder/operation-request-builder.spec.ts index 6a2b43344c..9a6ed4604a 100644 --- a/packages/odata-v4/src/request-builder/operation-request-builder.spec.ts +++ b/packages/odata-v4/src/request-builder/operation-request-builder.spec.ts @@ -1,5 +1,5 @@ import nock from 'nock'; -import { HttpDestination } from '@sap-cloud-sdk/connectivity'; +import type { HttpDestination } from '@sap-cloud-sdk/connectivity'; import { testActionImportMultipleParameterComplexReturnType, testActionImportNoParameterNoReturnType, diff --git a/packages/odata-v4/src/request-builder/operation-request-builder.ts b/packages/odata-v4/src/request-builder/operation-request-builder.ts index 09c531f164..7cc141e002 100644 --- a/packages/odata-v4/src/request-builder/operation-request-builder.ts +++ b/packages/odata-v4/src/request-builder/operation-request-builder.ts @@ -1,10 +1,10 @@ // eslint-disable-next-line max-classes-per-file -import { - OperationRequestBuilderBase, +import type { ODataRequestConfig, OperationParameters } from '@sap-cloud-sdk/odata-common/internal'; -import { DeSerializers } from '../de-serializers'; +import { OperationRequestBuilderBase } from '@sap-cloud-sdk/odata-common/internal'; +import type { DeSerializers } from '../de-serializers'; import { ODataFunctionRequestConfig, ODataActionRequestConfig diff --git a/packages/odata-v4/src/request-builder/response-data-accessor.ts b/packages/odata-v4/src/request-builder/response-data-accessor.ts index 0acb009887..51779d64aa 100644 --- a/packages/odata-v4/src/request-builder/response-data-accessor.ts +++ b/packages/odata-v4/src/request-builder/response-data-accessor.ts @@ -1,5 +1,5 @@ import { createLogger } from '@sap-cloud-sdk/util'; -import { ResponseDataAccessor } from '@sap-cloud-sdk/odata-common'; +import type { ResponseDataAccessor } from '@sap-cloud-sdk/odata-common'; const logger = createLogger({ package: 'odata-v4', diff --git a/packages/odata-v4/src/request-builder/response-transformers.ts b/packages/odata-v4/src/request-builder/response-transformers.ts index 4d17f1e589..fc5331dc9e 100644 --- a/packages/odata-v4/src/request-builder/response-transformers.ts +++ b/packages/odata-v4/src/request-builder/response-transformers.ts @@ -1,6 +1,7 @@ -import { EntityApi } from '@sap-cloud-sdk/odata-common'; -import { Entity } from '../entity'; -import { DeSerializers, entityDeserializer } from '../de-serializers'; +import type { EntityApi } from '@sap-cloud-sdk/odata-common'; +import type { Entity } from '../entity'; +import type { DeSerializers } from '../de-serializers'; +import { entityDeserializer } from '../de-serializers'; import { getSingleResult, getCollectionResult } from './response-data-accessor'; /** diff --git a/packages/odata-v4/src/request-builder/update-request-builder.ts b/packages/odata-v4/src/request-builder/update-request-builder.ts index c9b5cc0a66..d2fed09ada 100644 --- a/packages/odata-v4/src/request-builder/update-request-builder.ts +++ b/packages/odata-v4/src/request-builder/update-request-builder.ts @@ -1,15 +1,17 @@ import { identity } from '@sap-cloud-sdk/util'; -import { HttpDestinationOrFetchOptions } from '@sap-cloud-sdk/connectivity'; -import { HttpResponse } from '@sap-cloud-sdk/http-client'; -import { +import type { HttpDestinationOrFetchOptions } from '@sap-cloud-sdk/connectivity'; +import type { HttpResponse } from '@sap-cloud-sdk/http-client'; +import type { EntityIdentifiable, - EntityApi, + EntityApi +} from '@sap-cloud-sdk/odata-common/internal'; +import { UpdateRequestBuilderBase, entitySerializer } from '@sap-cloud-sdk/odata-common/internal'; -import { Entity } from '../entity'; +import type { Entity } from '../entity'; import { extractODataEtag } from '../extract-odata-etag'; -import { DefaultDeSerializers, DeSerializers } from '../de-serializers'; +import type { DefaultDeSerializers, DeSerializers } from '../de-serializers'; import { createODataUri } from '../uri-conversion'; /** diff --git a/packages/odata-v4/src/request/action-import-parameter.ts b/packages/odata-v4/src/request/action-import-parameter.ts index 9905375411..3623ad0f93 100644 --- a/packages/odata-v4/src/request/action-import-parameter.ts +++ b/packages/odata-v4/src/request/action-import-parameter.ts @@ -2,7 +2,7 @@ * Internal representation of function import parameters. It adds metadata to the value. * @typeParam ValueT - Type of the value. */ -import { EdmTypeShared } from '@sap-cloud-sdk/odata-common'; +import type { EdmTypeShared } from '@sap-cloud-sdk/odata-common'; /** * @deprecated Since 3.3.0. Use {@link OperationParameter} instead. diff --git a/packages/odata-v4/src/request/odata-action-request-config.ts b/packages/odata-v4/src/request/odata-action-request-config.ts index eaf6f9eb5f..f27915fcb4 100644 --- a/packages/odata-v4/src/request/odata-action-request-config.ts +++ b/packages/odata-v4/src/request/odata-action-request-config.ts @@ -1,10 +1,10 @@ -import { - ODataRequestConfig, +import type { ODataUri, OperationParameter, OperationParameters } from '@sap-cloud-sdk/odata-common'; -import { DeSerializers } from '../de-serializers'; +import { ODataRequestConfig } from '@sap-cloud-sdk/odata-common'; +import type { DeSerializers } from '../de-serializers'; /** * Action request configuration for an entity type. diff --git a/packages/odata-v4/src/request/odata-bound-action-request-config.ts b/packages/odata-v4/src/request/odata-bound-action-request-config.ts index 30cd79768b..bec3d94489 100644 --- a/packages/odata-v4/src/request/odata-bound-action-request-config.ts +++ b/packages/odata-v4/src/request/odata-bound-action-request-config.ts @@ -1,5 +1,5 @@ // eslint-disable-next-line max-classes-per-file -import { +import type { ODataUri, EntityBase, RequestMethodType, @@ -7,7 +7,7 @@ import { OperationParameters, WithKeys } from '@sap-cloud-sdk/odata-common'; -import { DeSerializers } from '../de-serializers'; +import type { DeSerializers } from '../de-serializers'; import { ODataActionRequestConfig } from './odata-action-request-config'; /** diff --git a/packages/odata-v4/src/request/odata-bound-function-request-config.ts b/packages/odata-v4/src/request/odata-bound-function-request-config.ts index f85d409861..b01c958f46 100644 --- a/packages/odata-v4/src/request/odata-bound-function-request-config.ts +++ b/packages/odata-v4/src/request/odata-bound-function-request-config.ts @@ -1,4 +1,4 @@ -import { +import type { ODataUri, OperationParameters, RequestMethodType, @@ -6,7 +6,7 @@ import { EntityApi, EntityBase } from '@sap-cloud-sdk/odata-common'; -import { DeSerializers } from '../de-serializers'; +import type { DeSerializers } from '../de-serializers'; import { ODataFunctionRequestConfig } from './odata-function-request-config'; /** diff --git a/packages/odata-v4/src/request/odata-function-request-config.ts b/packages/odata-v4/src/request/odata-function-request-config.ts index b363a177fc..a9b4badb4a 100644 --- a/packages/odata-v4/src/request/odata-function-request-config.ts +++ b/packages/odata-v4/src/request/odata-function-request-config.ts @@ -1,11 +1,11 @@ -import { +import type { ODataUri, OperationParameter, OperationParameters, - ODataFunctionRequestConfig as ODataFunctionRequestConfigBase, RequestMethodType } from '@sap-cloud-sdk/odata-common'; -import { DeSerializers } from '../de-serializers'; +import { ODataFunctionRequestConfig as ODataFunctionRequestConfigBase } from '@sap-cloud-sdk/odata-common'; +import type { DeSerializers } from '../de-serializers'; /** * Function request configuration for an entity type. diff --git a/packages/odata-v4/src/selectable/custom-field.ts b/packages/odata-v4/src/selectable/custom-field.ts index 9b0ebb333d..ad55b1e7cc 100644 --- a/packages/odata-v4/src/selectable/custom-field.ts +++ b/packages/odata-v4/src/selectable/custom-field.ts @@ -1,8 +1,6 @@ -import { - CustomField as CustomFieldBase, - OrderableEdmTypeField -} from '@sap-cloud-sdk/odata-common/internal'; -import { DeSerializers } from '../de-serializers'; +import type { OrderableEdmTypeField } from '@sap-cloud-sdk/odata-common/internal'; +import { CustomField as CustomFieldBase } from '@sap-cloud-sdk/odata-common/internal'; +import type { DeSerializers } from '../de-serializers'; import type { Entity } from '../entity'; export class CustomField< diff --git a/packages/odata-v4/src/uri-conversion/get-expand.ts b/packages/odata-v4/src/uri-conversion/get-expand.ts index 0047c42daa..6c436d5fa8 100644 --- a/packages/odata-v4/src/uri-conversion/get-expand.ts +++ b/packages/odata-v4/src/uri-conversion/get-expand.ts @@ -1,15 +1,17 @@ -import { +import type { Expandable, + EntityApi +} from '@sap-cloud-sdk/odata-common/internal'; +import { OneToManyLink, AllFields, Link, and, createGetFilter, - getOrderBy, - EntityApi + getOrderBy } from '@sap-cloud-sdk/odata-common/internal'; -import { DeSerializers } from '../de-serializers'; -import { Entity } from '../entity'; +import type { DeSerializers } from '../de-serializers'; +import type { Entity } from '../entity'; import { getSelect } from './get-select'; import { uriConverter } from './uri-value-converter'; diff --git a/packages/odata-v4/src/uri-conversion/get-select.ts b/packages/odata-v4/src/uri-conversion/get-select.ts index ed7a5aa702..c0273a4147 100644 --- a/packages/odata-v4/src/uri-conversion/get-select.ts +++ b/packages/odata-v4/src/uri-conversion/get-select.ts @@ -1,6 +1,6 @@ -import { Selectable } from '@sap-cloud-sdk/odata-common'; -import { DeSerializers } from '../de-serializers'; -import { Entity } from '../entity'; +import type { Selectable } from '@sap-cloud-sdk/odata-common'; +import type { DeSerializers } from '../de-serializers'; +import type { Entity } from '../entity'; /** * Get an object containing the given Selectables as query parameter, or an empty object if none were given. diff --git a/packages/odata-v4/src/uri-conversion/odata-uri.ts b/packages/odata-v4/src/uri-conversion/odata-uri.ts index 3686ccf410..903fdd8102 100644 --- a/packages/odata-v4/src/uri-conversion/odata-uri.ts +++ b/packages/odata-v4/src/uri-conversion/odata-uri.ts @@ -1,13 +1,13 @@ -import { - createODataUri as createODataUriBase, +import type { EntityApi, EntityBase, Expandable, ODataUri, Selectable } from '@sap-cloud-sdk/odata-common/internal'; -import { DeSerializers } from '../de-serializers'; -import { Entity } from '../entity'; +import { createODataUri as createODataUriBase } from '@sap-cloud-sdk/odata-common/internal'; +import type { DeSerializers } from '../de-serializers'; +import type { Entity } from '../entity'; import { getExpand } from './get-expand'; import { getSelect } from './get-select'; diff --git a/packages/odata-v4/test/test-util/test-data.ts b/packages/odata-v4/test/test-util/test-data.ts index 83c6773730..d35dce6b14 100644 --- a/packages/odata-v4/test/test-util/test-data.ts +++ b/packages/odata-v4/test/test-util/test-data.ts @@ -1,9 +1,9 @@ import { createUriConverter } from '@sap-cloud-sdk/odata-common/internal'; -import { +import type { TestEntity, - TestEntityWithEnumKey, - testService + TestEntityWithEnumKey } from '@sap-cloud-sdk/test-services-odata-v4/test-service'; +import { testService } from '@sap-cloud-sdk/test-services-odata-v4/test-service'; import { customTestDeSerializers } from '../../../../test-resources/test/test-util'; import { defaultDeSerializers } from '../../src'; diff --git a/packages/openapi-generator/src/cli-parser.ts b/packages/openapi-generator/src/cli-parser.ts index 3933101611..b6a66592ac 100644 --- a/packages/openapi-generator/src/cli-parser.ts +++ b/packages/openapi-generator/src/cli-parser.ts @@ -1,5 +1,6 @@ import { parseCmdArgsBuilder } from '@sap-cloud-sdk/generator-common/internal'; -import { cliOptions, GeneratorOptions } from './options'; +import type { GeneratorOptions } from './options'; +import { cliOptions } from './options'; const commandText = 'OpenAPI Client Code Generator. Generates typed clients from OpenAPI files for usage with the SAP Cloud SDK for JavaScript.'; diff --git a/packages/openapi-generator/src/document-converter.spec.ts b/packages/openapi-generator/src/document-converter.spec.ts index 7acda3eca9..c181807a39 100644 --- a/packages/openapi-generator/src/document-converter.spec.ts +++ b/packages/openapi-generator/src/document-converter.spec.ts @@ -1,4 +1,4 @@ -import { OpenAPIV2, OpenAPIV3 } from 'openapi-types'; +import type { OpenAPIV2, OpenAPIV3 } from 'openapi-types'; import mock from 'mock-fs'; import { convertDocToOpenApiV3, parseFileAsJson } from './document-converter'; diff --git a/packages/openapi-generator/src/document-converter.ts b/packages/openapi-generator/src/document-converter.ts index 596b602ac7..64efeb0075 100644 --- a/packages/openapi-generator/src/document-converter.ts +++ b/packages/openapi-generator/src/document-converter.ts @@ -1,6 +1,6 @@ import { promises } from 'fs'; import { parse } from 'path'; -import { OpenAPIV3 } from 'openapi-types'; +import type { OpenAPIV3 } from 'openapi-types'; import { convert } from 'swagger2openapi'; import { load } from 'js-yaml'; import { ErrorWithCause } from '@sap-cloud-sdk/util'; diff --git a/packages/openapi-generator/src/file-serializer/api-file.spec.ts b/packages/openapi-generator/src/file-serializer/api-file.spec.ts index 059bb82c17..d1a91dfe1e 100644 --- a/packages/openapi-generator/src/file-serializer/api-file.spec.ts +++ b/packages/openapi-generator/src/file-serializer/api-file.spec.ts @@ -1,5 +1,5 @@ import { readPrettierConfig } from '@sap-cloud-sdk/generator-common/internal'; -import { OpenApiApi, OpenApiReferenceSchema } from '../openapi-types'; +import type { OpenApiApi, OpenApiReferenceSchema } from '../openapi-types'; import { apiDocumentation, apiFile } from './api-file'; const singleOperationApi: OpenApiApi = { diff --git a/packages/openapi-generator/src/file-serializer/api-file.ts b/packages/openapi-generator/src/file-serializer/api-file.ts index ad9d856a22..92a8a295f6 100644 --- a/packages/openapi-generator/src/file-serializer/api-file.ts +++ b/packages/openapi-generator/src/file-serializer/api-file.ts @@ -1,10 +1,10 @@ import { codeBlock, documentationBlock, unixEOL } from '@sap-cloud-sdk/util'; -import { - serializeImports, +import type { Import, CreateFileOptions } from '@sap-cloud-sdk/generator-common/internal'; -import { +import { serializeImports } from '@sap-cloud-sdk/generator-common/internal'; +import type { OpenApiApi, OpenApiOperation, OpenApiReferenceSchema diff --git a/packages/openapi-generator/src/file-serializer/index-file.spec.ts b/packages/openapi-generator/src/file-serializer/index-file.spec.ts index 5af362e7b8..262d9d1f40 100644 --- a/packages/openapi-generator/src/file-serializer/index-file.spec.ts +++ b/packages/openapi-generator/src/file-serializer/index-file.spec.ts @@ -1,8 +1,6 @@ -import { - CreateFileOptions, - readPrettierConfig -} from '@sap-cloud-sdk/generator-common/internal'; -import { OpenApiDocument } from '../openapi-types'; +import type { CreateFileOptions } from '@sap-cloud-sdk/generator-common/internal'; +import { readPrettierConfig } from '@sap-cloud-sdk/generator-common/internal'; +import type { OpenApiDocument } from '../openapi-types'; import { apiIndexFile, schemaIndexFile } from './index-file'; describe('index-file', () => { diff --git a/packages/openapi-generator/src/file-serializer/index-file.ts b/packages/openapi-generator/src/file-serializer/index-file.ts index 4014d36d29..e3fd88d74a 100644 --- a/packages/openapi-generator/src/file-serializer/index-file.ts +++ b/packages/openapi-generator/src/file-serializer/index-file.ts @@ -1,6 +1,6 @@ import { codeBlock, kebabCase } from '@sap-cloud-sdk/util'; -import { CreateFileOptions } from '@sap-cloud-sdk/generator-common/internal'; -import { OpenApiDocument } from '../openapi-types'; +import type { CreateFileOptions } from '@sap-cloud-sdk/generator-common/internal'; +import type { OpenApiDocument } from '../openapi-types'; /** * Serialize an index file for the root directory of the generated service. diff --git a/packages/openapi-generator/src/file-serializer/operation.spec.ts b/packages/openapi-generator/src/file-serializer/operation.spec.ts index 8b34637ceb..80cb3201d6 100644 --- a/packages/openapi-generator/src/file-serializer/operation.spec.ts +++ b/packages/openapi-generator/src/file-serializer/operation.spec.ts @@ -1,4 +1,4 @@ -import { +import type { OpenApiOperation, OpenApiParameter, OpenApiReferenceSchema diff --git a/packages/openapi-generator/src/file-serializer/operation.ts b/packages/openapi-generator/src/file-serializer/operation.ts index 51dad2cd3f..824f1e26b1 100644 --- a/packages/openapi-generator/src/file-serializer/operation.ts +++ b/packages/openapi-generator/src/file-serializer/operation.ts @@ -1,5 +1,5 @@ import { codeBlock, documentationBlock, unixEOL } from '@sap-cloud-sdk/util'; -import { +import type { OpenApiOperation, OpenApiParameter, OpenApiRequestBody diff --git a/packages/openapi-generator/src/file-serializer/package-json.ts b/packages/openapi-generator/src/file-serializer/package-json.ts index 945c6e1cb4..e4aa6d0638 100644 --- a/packages/openapi-generator/src/file-serializer/package-json.ts +++ b/packages/openapi-generator/src/file-serializer/package-json.ts @@ -1,8 +1,6 @@ import { unixEOL } from '@sap-cloud-sdk/util'; -import { - PackageJsonOptions, - packageJsonBase -} from '@sap-cloud-sdk/generator-common/internal'; +import type { PackageJsonOptions } from '@sap-cloud-sdk/generator-common/internal'; +import { packageJsonBase } from '@sap-cloud-sdk/generator-common/internal'; /** * Generate the package.json for an openapi client so it can be released as an npm module. diff --git a/packages/openapi-generator/src/file-serializer/readme.spec.ts b/packages/openapi-generator/src/file-serializer/readme.spec.ts index 4bf2d127e6..f95a07b152 100644 --- a/packages/openapi-generator/src/file-serializer/readme.spec.ts +++ b/packages/openapi-generator/src/file-serializer/readme.spec.ts @@ -1,4 +1,4 @@ -import { OpenApiDocument } from '../openapi-types'; +import type { OpenApiDocument } from '../openapi-types'; import { readme } from './readme'; describe('readme', () => { diff --git a/packages/openapi-generator/src/file-serializer/readme.ts b/packages/openapi-generator/src/file-serializer/readme.ts index 44310fe3ae..d67f9d857d 100644 --- a/packages/openapi-generator/src/file-serializer/readme.ts +++ b/packages/openapi-generator/src/file-serializer/readme.ts @@ -3,7 +3,7 @@ import { helpfulLinksSection, usageHeaderText } from '@sap-cloud-sdk/generator-common/internal'; -import { OpenApiDocument } from '../openapi-types'; +import type { OpenApiDocument } from '../openapi-types'; import { getApiSpecificUsage } from '../sdk-metadata'; /** * Generate the readme for an openapi client. diff --git a/packages/openapi-generator/src/file-serializer/schema-file.spec.ts b/packages/openapi-generator/src/file-serializer/schema-file.spec.ts index a5b579ad02..0341f2deb0 100644 --- a/packages/openapi-generator/src/file-serializer/schema-file.spec.ts +++ b/packages/openapi-generator/src/file-serializer/schema-file.spec.ts @@ -1,8 +1,6 @@ -import { - CreateFileOptions, - readPrettierConfig -} from '@sap-cloud-sdk/generator-common/internal'; -import { +import type { CreateFileOptions } from '@sap-cloud-sdk/generator-common/internal'; +import { readPrettierConfig } from '@sap-cloud-sdk/generator-common/internal'; +import type { OpenApiObjectSchemaProperty, OpenApiPersistedSchema } from '../openapi-types'; diff --git a/packages/openapi-generator/src/file-serializer/schema-file.ts b/packages/openapi-generator/src/file-serializer/schema-file.ts index 8aaa2441df..5ea3dd9caa 100644 --- a/packages/openapi-generator/src/file-serializer/schema-file.ts +++ b/packages/openapi-generator/src/file-serializer/schema-file.ts @@ -1,10 +1,10 @@ import { codeBlock, documentationBlock, unixEOL } from '@sap-cloud-sdk/util'; -import { - serializeImports, +import type { Import, CreateFileOptions } from '@sap-cloud-sdk/generator-common/internal'; -import { OpenApiPersistedSchema } from '../openapi-types'; +import { serializeImports } from '@sap-cloud-sdk/generator-common/internal'; +import type { OpenApiPersistedSchema } from '../openapi-types'; import { collectRefs, getSchemaPropertiesDocumentation } from '../schema-util'; import { serializeSchema } from './schema'; diff --git a/packages/openapi-generator/src/file-serializer/schema.ts b/packages/openapi-generator/src/file-serializer/schema.ts index de53d76295..33824180a6 100644 --- a/packages/openapi-generator/src/file-serializer/schema.ts +++ b/packages/openapi-generator/src/file-serializer/schema.ts @@ -1,5 +1,5 @@ import { codeBlock, documentationBlock, unixEOL } from '@sap-cloud-sdk/util'; -import { +import type { OpenApiSchema, OpenApiObjectSchema, OpenApiObjectSchemaProperty diff --git a/packages/openapi-generator/src/generator.ts b/packages/openapi-generator/src/generator.ts index f0c8c509c0..37a5ae7fec 100644 --- a/packages/openapi-generator/src/generator.ts +++ b/packages/openapi-generator/src/generator.ts @@ -7,6 +7,10 @@ import { setLogLevel, ErrorWithCause } from '@sap-cloud-sdk/util'; +import type { + CreateFileOptions, + ServiceOptions +} from '@sap-cloud-sdk/generator-common/internal'; import { getSdkMetadataFileNames, getSdkVersion, @@ -15,29 +19,23 @@ import { copyFiles, packageDescription, createFile, - CreateFileOptions, readPrettierConfig, parseOptions, writeOptionsPerService, getOptionsPerService, - getRelPathWithPosixSeparator, - ServiceOptions + getRelPathWithPosixSeparator } from '@sap-cloud-sdk/generator-common/internal'; import { apiFile } from './file-serializer/api-file'; import { packageJson } from './file-serializer/package-json'; import { readme } from './file-serializer/readme'; import { schemaFile } from './file-serializer/schema-file'; import { apiIndexFile, schemaIndexFile } from './file-serializer/index-file'; -import { OpenApiDocument } from './openapi-types'; +import type { OpenApiDocument } from './openapi-types'; import { parseOpenApiDocument } from './parser/document'; import { convertOpenApiSpec } from './document-converter'; import { sdkMetadata } from './sdk-metadata'; -import { - cliOptions, - GeneratorOptions, - ParsedGeneratorOptions, - tsconfigJson -} from './options'; +import type { GeneratorOptions, ParsedGeneratorOptions } from './options'; +import { cliOptions, tsconfigJson } from './options'; const { mkdir } = promisesFs; const logger = createLogger('openapi-generator'); diff --git a/packages/openapi-generator/src/openapi-types.ts b/packages/openapi-generator/src/openapi-types.ts index 53c3b00ed2..89708423e8 100644 --- a/packages/openapi-generator/src/openapi-types.ts +++ b/packages/openapi-generator/src/openapi-types.ts @@ -1,5 +1,5 @@ import type { OpenAPIV3 } from 'openapi-types'; -import { ServiceOptions } from '@sap-cloud-sdk/generator-common/internal'; +import type { ServiceOptions } from '@sap-cloud-sdk/generator-common/internal'; /** * Representation of an OpenAPI specification/document. diff --git a/packages/openapi-generator/src/options/options.ts b/packages/openapi-generator/src/options/options.ts index c17d9735a1..7003490380 100644 --- a/packages/openapi-generator/src/options/options.ts +++ b/packages/openapi-generator/src/options/options.ts @@ -1,10 +1,10 @@ // eslint-disable-next-line import/no-internal-modules -import { +import type { ParsedOptions, Options, - getCommonCliOptions, CommonGeneratorOptions } from '@sap-cloud-sdk/generator-common/internal'; +import { getCommonCliOptions } from '@sap-cloud-sdk/generator-common/internal'; /** * Options to configure OData client generation when using the generator programmatically. diff --git a/packages/openapi-generator/src/options/tsconfig-json.spec.ts b/packages/openapi-generator/src/options/tsconfig-json.spec.ts index 12b92ec07d..1a03d7eee4 100644 --- a/packages/openapi-generator/src/options/tsconfig-json.spec.ts +++ b/packages/openapi-generator/src/options/tsconfig-json.spec.ts @@ -1,7 +1,7 @@ import { defaultTsConfig } from '@sap-cloud-sdk/generator-common/internal'; import mock from 'mock-fs'; import { tsconfigJson } from './tsconfig-json'; -import { ParsedGeneratorOptions } from './options'; +import type { ParsedGeneratorOptions } from './options'; describe('tsconfigJson', () => { afterEach(() => { diff --git a/packages/openapi-generator/src/options/tsconfig-json.ts b/packages/openapi-generator/src/options/tsconfig-json.ts index f08146ebe2..358fdd90ef 100644 --- a/packages/openapi-generator/src/options/tsconfig-json.ts +++ b/packages/openapi-generator/src/options/tsconfig-json.ts @@ -2,7 +2,7 @@ import { formatTsConfig, readCustomTsConfig } from '@sap-cloud-sdk/generator-common/internal'; -import { ParsedGeneratorOptions } from './options'; +import type { ParsedGeneratorOptions } from './options'; /** * Build a tsconfig.json file as string. diff --git a/packages/openapi-generator/src/parser/api.spec.ts b/packages/openapi-generator/src/parser/api.spec.ts index e0eddf16fc..168c90e647 100644 --- a/packages/openapi-generator/src/parser/api.spec.ts +++ b/packages/openapi-generator/src/parser/api.spec.ts @@ -1,4 +1,4 @@ -import { OpenAPIV3 } from 'openapi-types'; +import type { OpenAPIV3 } from 'openapi-types'; import { createTestRefs, emptyDocument } from '../../test/test-util'; import { apiNameExtension } from '../extensions'; import { parseApis } from './api'; diff --git a/packages/openapi-generator/src/parser/api.ts b/packages/openapi-generator/src/parser/api.ts index 8e40bcef5a..6943ec2573 100644 --- a/packages/openapi-generator/src/parser/api.ts +++ b/packages/openapi-generator/src/parser/api.ts @@ -1,13 +1,14 @@ import { flat, pascalCase } from '@sap-cloud-sdk/util'; -import { OpenAPIV3 } from 'openapi-types'; -import { methods, OpenApiApi } from '../openapi-types'; +import type { OpenAPIV3 } from 'openapi-types'; +import type { OpenApiApi } from '../openapi-types'; +import { methods } from '../openapi-types'; import { apiNameExtension, defaultApiName } from '../extensions'; import { parseOperation } from './operation'; -import { OperationInfo } from './parsing-info'; +import type { OperationInfo } from './parsing-info'; import { nameOperations } from './operation-naming'; import { ensureUniqueNames } from './unique-naming'; -import { OpenApiDocumentRefs } from './refs'; -import { ParserOptions } from './options'; +import type { OpenApiDocumentRefs } from './refs'; +import type { ParserOptions } from './options'; /** * Collect and parse all APIs of an `OpenAPIV3.Document`. diff --git a/packages/openapi-generator/src/parser/document.spec.ts b/packages/openapi-generator/src/parser/document.spec.ts index 8faba957e2..6c58f71d55 100644 --- a/packages/openapi-generator/src/parser/document.spec.ts +++ b/packages/openapi-generator/src/parser/document.spec.ts @@ -1,5 +1,5 @@ -import { OpenAPIV3 } from 'openapi-types'; -import { ServiceOptions } from '@sap-cloud-sdk/generator-common/dist/options-per-service'; +import type { OpenAPIV3 } from 'openapi-types'; +import type { ServiceOptions } from '@sap-cloud-sdk/generator-common/dist/options-per-service'; import { emptyDocument } from '../../test/test-util'; import { parseOpenApiDocument } from './document'; import * as api from './api'; diff --git a/packages/openapi-generator/src/parser/document.ts b/packages/openapi-generator/src/parser/document.ts index 1b86d7e2c5..cd21aafa8a 100644 --- a/packages/openapi-generator/src/parser/document.ts +++ b/packages/openapi-generator/src/parser/document.ts @@ -1,10 +1,11 @@ -import { OpenAPIV3 } from 'openapi-types'; -import { ServiceOptions } from '@sap-cloud-sdk/generator-common/internal'; -import { OpenApiDocument, OpenApiPersistedSchema } from '../openapi-types'; +import type { OpenAPIV3 } from 'openapi-types'; +import type { ServiceOptions } from '@sap-cloud-sdk/generator-common/internal'; +import type { OpenApiDocument, OpenApiPersistedSchema } from '../openapi-types'; import { parseSchema, parseSchemaProperties } from './schema'; import { parseApis } from './api'; -import { createRefs, OpenApiDocumentRefs } from './refs'; -import { ParserOptions } from './options'; +import type { OpenApiDocumentRefs } from './refs'; +import { createRefs } from './refs'; +import type { ParserOptions } from './options'; import { parseBound } from './swagger-parser-workaround'; /** diff --git a/packages/openapi-generator/src/parser/media-type.ts b/packages/openapi-generator/src/parser/media-type.ts index 50ac5ae92b..164a3665d4 100644 --- a/packages/openapi-generator/src/parser/media-type.ts +++ b/packages/openapi-generator/src/parser/media-type.ts @@ -1,9 +1,9 @@ import { createLogger } from '@sap-cloud-sdk/util'; -import { OpenAPIV3 } from 'openapi-types'; -import { OpenApiSchema } from '../openapi-types'; -import { OpenApiDocumentRefs } from './refs'; +import type { OpenAPIV3 } from 'openapi-types'; +import type { OpenApiSchema } from '../openapi-types'; +import type { OpenApiDocumentRefs } from './refs'; import { parseSchema } from './schema'; -import { ParserOptions } from './options'; +import type { ParserOptions } from './options'; const logger = createLogger('openapi-generator'); const allowedMediaTypes = [ diff --git a/packages/openapi-generator/src/parser/operation-naming.spec.ts b/packages/openapi-generator/src/parser/operation-naming.spec.ts index fb35e8781e..901359427d 100644 --- a/packages/openapi-generator/src/parser/operation-naming.spec.ts +++ b/packages/openapi-generator/src/parser/operation-naming.spec.ts @@ -1,5 +1,5 @@ import { operationNameExtension } from '../extensions'; -import { OperationInfo } from './parsing-info'; +import type { OperationInfo } from './parsing-info'; import { getOperationNameFromPatternAndMethod, nameOperations diff --git a/packages/openapi-generator/src/parser/operation-naming.ts b/packages/openapi-generator/src/parser/operation-naming.ts index edf41955a4..f48ac29044 100644 --- a/packages/openapi-generator/src/parser/operation-naming.ts +++ b/packages/openapi-generator/src/parser/operation-naming.ts @@ -1,7 +1,7 @@ import { partition, pascalCase, camelCase } from '@sap-cloud-sdk/util'; -import { Method } from '../openapi-types'; +import type { Method } from '../openapi-types'; import { operationNameExtension } from '../extensions'; -import { OperationInfo } from './parsing-info'; +import type { OperationInfo } from './parsing-info'; /** * Give all given operations an initial name. diff --git a/packages/openapi-generator/src/parser/operation.spec.ts b/packages/openapi-generator/src/parser/operation.spec.ts index cbe1356f0f..987ab4b7ce 100644 --- a/packages/openapi-generator/src/parser/operation.spec.ts +++ b/packages/openapi-generator/src/parser/operation.spec.ts @@ -1,6 +1,6 @@ -import { OpenAPIV3 } from 'openapi-types'; +import type { OpenAPIV3 } from 'openapi-types'; import { createTestRefs, emptyObjectSchema } from '../../test/test-util'; -import { OpenApiParameter } from '../openapi-types'; +import type { OpenApiParameter } from '../openapi-types'; import { parseParameters, getRelevantParameters, diff --git a/packages/openapi-generator/src/parser/operation.ts b/packages/openapi-generator/src/parser/operation.ts index b86e66f28a..b537340535 100644 --- a/packages/openapi-generator/src/parser/operation.ts +++ b/packages/openapi-generator/src/parser/operation.ts @@ -1,14 +1,14 @@ -import { OpenAPIV3 } from 'openapi-types'; +import type { OpenAPIV3 } from 'openapi-types'; import { filterDuplicatesRight } from '@sap-cloud-sdk/util'; import { reservedJsKeywords } from '@sap-cloud-sdk/generator-common/internal'; -import { OpenApiOperation, OpenApiParameter } from '../openapi-types'; +import type { OpenApiOperation, OpenApiParameter } from '../openapi-types'; import { parseRequestBody } from './request-body'; -import { OpenApiDocumentRefs } from './refs'; +import type { OpenApiDocumentRefs } from './refs'; import { parseSchema } from './schema'; import { parseResponses } from './responses'; -import { OperationInfo } from './parsing-info'; +import type { OperationInfo } from './parsing-info'; import { ensureUniqueNames } from './unique-naming'; -import { ParserOptions } from './options'; +import type { ParserOptions } from './options'; /** * Parse an operation info into a serialization-ready object. diff --git a/packages/openapi-generator/src/parser/parsing-info.ts b/packages/openapi-generator/src/parser/parsing-info.ts index 86110d98d6..209ba8d472 100644 --- a/packages/openapi-generator/src/parser/parsing-info.ts +++ b/packages/openapi-generator/src/parser/parsing-info.ts @@ -1,6 +1,6 @@ -import { OpenAPIV3 } from 'openapi-types'; -import { OperationNameExtended } from '../extensions'; -import { Method, SchemaNaming } from '../openapi-types'; +import type { OpenAPIV3 } from 'openapi-types'; +import type { OperationNameExtended } from '../extensions'; +import type { Method, SchemaNaming } from '../openapi-types'; /** * Represents an object holding all relevant information for operation parsing. diff --git a/packages/openapi-generator/src/parser/refs.spec.ts b/packages/openapi-generator/src/parser/refs.spec.ts index d389ed8980..6362384938 100644 --- a/packages/openapi-generator/src/parser/refs.spec.ts +++ b/packages/openapi-generator/src/parser/refs.spec.ts @@ -1,6 +1,7 @@ -import { OpenAPIV3 } from 'openapi-types'; +import type { OpenAPIV3 } from 'openapi-types'; import { emptyDocument } from '../../test/test-util'; -import { createRefs, OpenApiDocumentRefs } from './refs'; +import type { OpenApiDocumentRefs } from './refs'; +import { createRefs } from './refs'; describe('OpenApiDocumentRefs', () => { let refs: OpenApiDocumentRefs; const typeName: OpenAPIV3.SchemaObject = { type: 'string' }; diff --git a/packages/openapi-generator/src/parser/refs.ts b/packages/openapi-generator/src/parser/refs.ts index 6b1be88721..b8b14b26ef 100644 --- a/packages/openapi-generator/src/parser/refs.ts +++ b/packages/openapi-generator/src/parser/refs.ts @@ -1,11 +1,11 @@ -import { OpenAPIV3 } from 'openapi-types'; -import { $Refs } from '@apidevtools/swagger-parser'; +import type { OpenAPIV3 } from 'openapi-types'; +import type { $Refs } from '@apidevtools/swagger-parser'; import { pascalCase, kebabCase } from '@sap-cloud-sdk/util'; import { isReferenceObject } from '../schema-util'; -import { SchemaNaming } from '../openapi-types'; -import { SchemaRefMapping } from './parsing-info'; +import type { SchemaNaming } from '../openapi-types'; +import type { SchemaRefMapping } from './parsing-info'; import { ensureUniqueNames } from './unique-naming'; -import { ParserOptions } from './options'; +import type { ParserOptions } from './options'; import { ensureValidSchemaNames } from './schema-naming'; import { resolveBound } from './swagger-parser-workaround'; diff --git a/packages/openapi-generator/src/parser/request-body.ts b/packages/openapi-generator/src/parser/request-body.ts index 04b1eb3cd4..83d2a962a9 100644 --- a/packages/openapi-generator/src/parser/request-body.ts +++ b/packages/openapi-generator/src/parser/request-body.ts @@ -1,8 +1,8 @@ -import { OpenAPIV3 } from 'openapi-types'; -import { OpenApiRequestBody } from '../openapi-types'; -import { OpenApiDocumentRefs } from './refs'; +import type { OpenAPIV3 } from 'openapi-types'; +import type { OpenApiRequestBody } from '../openapi-types'; +import type { OpenApiDocumentRefs } from './refs'; import { parseMediaType } from './media-type'; -import { ParserOptions } from './options'; +import type { ParserOptions } from './options'; /** * @internal diff --git a/packages/openapi-generator/src/parser/responses.ts b/packages/openapi-generator/src/parser/responses.ts index 41356f817f..ef0844a621 100644 --- a/packages/openapi-generator/src/parser/responses.ts +++ b/packages/openapi-generator/src/parser/responses.ts @@ -1,8 +1,8 @@ -import { OpenAPIV3 } from 'openapi-types'; -import { OpenApiSchema } from '../openapi-types'; -import { OpenApiDocumentRefs } from './refs'; +import type { OpenAPIV3 } from 'openapi-types'; +import type { OpenApiSchema } from '../openapi-types'; +import type { OpenApiDocumentRefs } from './refs'; import { parseMediaType } from './media-type'; -import { ParserOptions } from './options'; +import type { ParserOptions } from './options'; /** * @internal diff --git a/packages/openapi-generator/src/parser/schema-naming.ts b/packages/openapi-generator/src/parser/schema-naming.ts index a043680893..dfd8ebc03a 100644 --- a/packages/openapi-generator/src/parser/schema-naming.ts +++ b/packages/openapi-generator/src/parser/schema-naming.ts @@ -1,5 +1,5 @@ // Most likely this list is not complete -import { ParserOptions } from './options'; +import type { ParserOptions } from './options'; const illegalCharacterRegex = /[.#@/"'*%]+/g; const startsWithNumberRegex = /^\d+/g; diff --git a/packages/openapi-generator/src/parser/schema.spec.ts b/packages/openapi-generator/src/parser/schema.spec.ts index 5346b94006..197fa1d42a 100644 --- a/packages/openapi-generator/src/parser/schema.spec.ts +++ b/packages/openapi-generator/src/parser/schema.spec.ts @@ -1,7 +1,7 @@ -import { OpenAPIV3 } from 'openapi-types'; +import type { OpenAPIV3 } from 'openapi-types'; import { createLogger } from '@sap-cloud-sdk/util'; import { createTestRefs, emptyObjectSchema } from '../../test/test-util'; -import { OpenApiObjectSchema } from '../openapi-types'; +import type { OpenApiObjectSchema } from '../openapi-types'; import { parseSchema, parseSchemaProperties } from './schema'; describe('parseSchema', () => { diff --git a/packages/openapi-generator/src/parser/schema.ts b/packages/openapi-generator/src/parser/schema.ts index a3df641c71..a80587b8cf 100644 --- a/packages/openapi-generator/src/parser/schema.ts +++ b/packages/openapi-generator/src/parser/schema.ts @@ -1,7 +1,7 @@ import { createLogger } from '@sap-cloud-sdk/util'; -import { OpenAPIV3 } from 'openapi-types'; +import type { OpenAPIV3 } from 'openapi-types'; import { isReferenceObject } from '../schema-util'; -import { +import type { OpenApiArraySchema, OpenApiEnumSchema, OpenApiObjectSchema, @@ -11,8 +11,8 @@ import { OpenApiSchemaProperties } from '../openapi-types'; import { getType } from './type-mapping'; -import { OpenApiDocumentRefs } from './refs'; -import { ParserOptions } from './options'; +import type { OpenApiDocumentRefs } from './refs'; +import type { ParserOptions } from './options'; const logger = createLogger('openapi-generator'); diff --git a/packages/openapi-generator/src/parser/swagger-parser-workaround.ts b/packages/openapi-generator/src/parser/swagger-parser-workaround.ts index 6bade518f8..a3b4f9645b 100644 --- a/packages/openapi-generator/src/parser/swagger-parser-workaround.ts +++ b/packages/openapi-generator/src/parser/swagger-parser-workaround.ts @@ -1,9 +1,6 @@ -import { OpenAPIV3 } from 'openapi-types'; -import SwaggerParser, { - $Refs, - parse, - resolve -} from '@apidevtools/swagger-parser'; +import type { OpenAPIV3 } from 'openapi-types'; +import type { $Refs } from '@apidevtools/swagger-parser'; +import SwaggerParser, { parse, resolve } from '@apidevtools/swagger-parser'; /** * These to methods are a workaround until the swagger-parser is updated: https://github.com/APIDevTools/swagger-parser/issues/186 diff --git a/packages/openapi-generator/src/parser/unique-naming.ts b/packages/openapi-generator/src/parser/unique-naming.ts index 0c53ab33f9..c27bb92beb 100644 --- a/packages/openapi-generator/src/parser/unique-naming.ts +++ b/packages/openapi-generator/src/parser/unique-naming.ts @@ -1,5 +1,5 @@ import { UniqueNameGenerator, camelCase, unique } from '@sap-cloud-sdk/util'; -import { ParserOptions } from './options'; +import type { ParserOptions } from './options'; /** * Format names and ensure uniqueness of names. diff --git a/packages/openapi-generator/src/schema-util.spec.ts b/packages/openapi-generator/src/schema-util.spec.ts index 2544d00108..d58df616b2 100644 --- a/packages/openapi-generator/src/schema-util.spec.ts +++ b/packages/openapi-generator/src/schema-util.spec.ts @@ -1,4 +1,4 @@ -import { +import type { OpenApiReferenceSchema, OpenApiSchemaProperties } from './openapi-types'; diff --git a/packages/openapi-generator/src/schema-util.ts b/packages/openapi-generator/src/schema-util.ts index a04208eaf3..a917292725 100644 --- a/packages/openapi-generator/src/schema-util.ts +++ b/packages/openapi-generator/src/schema-util.ts @@ -1,6 +1,6 @@ import { flat, titleFormat } from '@sap-cloud-sdk/util'; -import { OpenAPIV3 } from 'openapi-types'; -import { +import type { OpenAPIV3 } from 'openapi-types'; +import type { OpenApiAllOfSchema, OpenApiAnyOfSchema, OpenApiArraySchema, @@ -13,7 +13,7 @@ import { OpenApiSchemaProperties, SchemaNaming } from './openapi-types'; -import { SchemaRefMapping } from './parser/parsing-info'; +import type { SchemaRefMapping } from './parser/parsing-info'; /** * Collect all unique reference schemas within the given schemas. diff --git a/packages/openapi-generator/src/sdk-metadata/code-sample-util.spec.ts b/packages/openapi-generator/src/sdk-metadata/code-sample-util.spec.ts index 47b3302792..257b8061bc 100644 --- a/packages/openapi-generator/src/sdk-metadata/code-sample-util.spec.ts +++ b/packages/openapi-generator/src/sdk-metadata/code-sample-util.spec.ts @@ -1,5 +1,5 @@ import { getLevenshteinClosest } from '@sap-cloud-sdk/generator-common/internal'; -import { +import type { OpenApiApi, OpenApiOperation, OpenApiParameter diff --git a/packages/openapi-generator/src/sdk-metadata/code-sample-util.ts b/packages/openapi-generator/src/sdk-metadata/code-sample-util.ts index d604051613..d11631d157 100644 --- a/packages/openapi-generator/src/sdk-metadata/code-sample-util.ts +++ b/packages/openapi-generator/src/sdk-metadata/code-sample-util.ts @@ -1,6 +1,6 @@ import { getLevenshteinClosest } from '@sap-cloud-sdk/generator-common/internal'; import { codeBlock, pascalCase } from '@sap-cloud-sdk/util'; -import { +import type { OpenApiApi, OpenApiOperation, OpenApiParameter diff --git a/packages/openapi-generator/src/sdk-metadata/code-sample.ts b/packages/openapi-generator/src/sdk-metadata/code-sample.ts index 3792961021..66c1b77693 100644 --- a/packages/openapi-generator/src/sdk-metadata/code-sample.ts +++ b/packages/openapi-generator/src/sdk-metadata/code-sample.ts @@ -1,6 +1,6 @@ import { codeBlock } from '@sap-cloud-sdk/util'; -import { MultiLineText } from '@sap-cloud-sdk/generator-common/internal'; -import { OpenApiOperation } from '../openapi-types'; +import type { MultiLineText } from '@sap-cloud-sdk/generator-common/internal'; +import type { OpenApiOperation } from '../openapi-types'; import { getOperationParamCode } from './code-sample-util'; /** diff --git a/packages/openapi-generator/src/sdk-metadata/generation-and-usage.ts b/packages/openapi-generator/src/sdk-metadata/generation-and-usage.ts index 0117e959fa..a654cbe226 100644 --- a/packages/openapi-generator/src/sdk-metadata/generation-and-usage.ts +++ b/packages/openapi-generator/src/sdk-metadata/generation-and-usage.ts @@ -1,5 +1,5 @@ -import { MultiLineText } from '@sap-cloud-sdk/generator-common/internal'; -import { OpenApiDocument } from '../openapi-types'; +import type { MultiLineText } from '@sap-cloud-sdk/generator-common/internal'; +import type { OpenApiDocument } from '../openapi-types'; import { apiSpecificCodeSample } from './code-sample'; import { getMainApi, getMainOperation } from './code-sample-util'; diff --git a/packages/openapi-generator/src/sdk-metadata/sdk-metadata.ts b/packages/openapi-generator/src/sdk-metadata/sdk-metadata.ts index 537019bd64..e1a7fea09e 100644 --- a/packages/openapi-generator/src/sdk-metadata/sdk-metadata.ts +++ b/packages/openapi-generator/src/sdk-metadata/sdk-metadata.ts @@ -1,9 +1,9 @@ +import type { Client } from '@sap-cloud-sdk/generator-common/internal'; import { getSdkMetadataClient, - Client, getSdkVersion } from '@sap-cloud-sdk/generator-common/internal'; -import { OpenApiDocument } from '../openapi-types'; +import type { OpenApiDocument } from '../openapi-types'; import { getApiSpecificUsage } from './generation-and-usage'; /** diff --git a/packages/openapi-generator/test/test-util.ts b/packages/openapi-generator/test/test-util.ts index 73b9476660..9a3cc3fc3a 100644 --- a/packages/openapi-generator/test/test-util.ts +++ b/packages/openapi-generator/test/test-util.ts @@ -1,6 +1,7 @@ -import { OpenAPIV3 } from 'openapi-types'; -import { createRefs, OpenApiDocumentRefs } from '../src/parser/refs'; -import { OpenApiDocument } from '../src/openapi-types'; +import type { OpenAPIV3 } from 'openapi-types'; +import type { OpenApiDocumentRefs } from '../src/parser/refs'; +import { createRefs } from '../src/parser/refs'; +import type { OpenApiDocument } from '../src/openapi-types'; export const emptyDocument = { openapi: '3.0.0', diff --git a/packages/openapi/src/openapi-request-builder.spec.ts b/packages/openapi/src/openapi-request-builder.spec.ts index 31bf94e2d1..3d98c51e79 100644 --- a/packages/openapi/src/openapi-request-builder.spec.ts +++ b/packages/openapi/src/openapi-request-builder.spec.ts @@ -1,7 +1,7 @@ import nock from 'nock'; import * as httpClient from '@sap-cloud-sdk/http-client'; +import type { HttpDestination } from '@sap-cloud-sdk/connectivity'; import { - HttpDestination, parseDestination, sanitizeDestination } from '@sap-cloud-sdk/connectivity'; diff --git a/packages/openapi/src/openapi-request-builder.ts b/packages/openapi/src/openapi-request-builder.ts index f76ad308bf..920d66a6bb 100644 --- a/packages/openapi/src/openapi-request-builder.ts +++ b/packages/openapi/src/openapi-request-builder.ts @@ -1,30 +1,28 @@ /* eslint-disable max-classes-per-file */ // eslint-disable-next-line import/named -import { AxiosResponse } from 'axios'; +import type { AxiosResponse } from 'axios'; import { isNullish, transformVariadicArgumentToArray } from '@sap-cloud-sdk/util'; -import { - useOrFetchDestination, - HttpDestinationOrFetchOptions -} from '@sap-cloud-sdk/connectivity'; +import type { HttpDestinationOrFetchOptions } from '@sap-cloud-sdk/connectivity'; +import { useOrFetchDestination } from '@sap-cloud-sdk/connectivity'; import { assertHttpDestination, noDestinationErrorMessage } from '@sap-cloud-sdk/connectivity/internal'; -import { +import type { Method, HttpResponse, HttpRequestConfigWithOrigin, - executeHttpRequest, CustomRequestConfig } from '@sap-cloud-sdk/http-client'; -import { - filterCustomRequestConfig, +import { executeHttpRequest } from '@sap-cloud-sdk/http-client'; +import type { OriginOptions, HttpMiddleware } from '@sap-cloud-sdk/http-client/internal'; +import { filterCustomRequestConfig } from '@sap-cloud-sdk/http-client/internal'; /** * Request builder for OpenAPI requests. diff --git a/packages/openapi/src/types.ts b/packages/openapi/src/types.ts index 2076ee4593..69680646d0 100644 --- a/packages/openapi/src/types.ts +++ b/packages/openapi/src/types.ts @@ -1,5 +1,5 @@ // eslint-disable-next-line import/named -import { AxiosResponse } from 'axios'; +import type { AxiosResponse } from 'axios'; /** * Type of the parameters of a given function diff --git a/packages/resilience/src/circuit-breaker.spec.ts b/packages/resilience/src/circuit-breaker.spec.ts index 4576d2ec15..55b724ae8f 100644 --- a/packages/resilience/src/circuit-breaker.spec.ts +++ b/packages/resilience/src/circuit-breaker.spec.ts @@ -1,8 +1,10 @@ // eslint-disable-next-line import/named -import axios, { AxiosResponse, RawAxiosRequestConfig } from 'axios'; +import type { AxiosResponse, RawAxiosRequestConfig } from 'axios'; +import axios from 'axios'; import nock from 'nock'; import { circuitBreakers, circuitBreaker } from './circuit-breaker'; -import { MiddlewareContext, executeWithMiddleware } from './middleware'; +import type { MiddlewareContext } from './middleware'; +import { executeWithMiddleware } from './middleware'; describe('circuit-breaker', () => { beforeEach(() => { diff --git a/packages/resilience/src/circuit-breaker.ts b/packages/resilience/src/circuit-breaker.ts index 80a3c5008c..6b639931b6 100644 --- a/packages/resilience/src/circuit-breaker.ts +++ b/packages/resilience/src/circuit-breaker.ts @@ -1,7 +1,11 @@ import CircuitBreaker from 'opossum'; // eslint-disable-next-line import/named -import { AxiosError } from 'axios'; -import { MiddlewareContext, Middleware, MiddlewareOptions } from './middleware'; +import type { AxiosError } from 'axios'; +import type { + MiddlewareContext, + Middleware, + MiddlewareOptions +} from './middleware'; /** * Map of all existing circuit breakers. diff --git a/packages/resilience/src/middleware.spec.ts b/packages/resilience/src/middleware.spec.ts index 362c17b327..785f07ec06 100644 --- a/packages/resilience/src/middleware.spec.ts +++ b/packages/resilience/src/middleware.spec.ts @@ -1,9 +1,6 @@ import { createLogger } from '@sap-cloud-sdk/util/dist/logger'; -import { - MiddlewareContext, - executeWithMiddleware, - MiddlewareOptions -} from './middleware'; +import type { MiddlewareContext, MiddlewareOptions } from './middleware'; +import { executeWithMiddleware } from './middleware'; describe('middleware', () => { const logger = createLogger('middleware'); diff --git a/packages/resilience/src/resilience.spec.ts b/packages/resilience/src/resilience.spec.ts index b4ae75e28e..91df6b4525 100644 --- a/packages/resilience/src/resilience.spec.ts +++ b/packages/resilience/src/resilience.spec.ts @@ -1,8 +1,10 @@ // eslint-disable-next-line import/named -import axios, { AxiosResponse, RawAxiosRequestConfig } from 'axios'; +import type { AxiosResponse, RawAxiosRequestConfig } from 'axios'; +import axios from 'axios'; import nock from 'nock'; import { circuitBreakers } from './circuit-breaker'; -import { MiddlewareContext, executeWithMiddleware } from './middleware'; +import type { MiddlewareContext } from './middleware'; +import { executeWithMiddleware } from './middleware'; import { resilience } from './resilience'; import { retry } from './retry'; import { timeout } from './timeout'; diff --git a/packages/resilience/src/resilience.ts b/packages/resilience/src/resilience.ts index 7d564efef8..04c14147cc 100644 --- a/packages/resilience/src/resilience.ts +++ b/packages/resilience/src/resilience.ts @@ -1,8 +1,7 @@ import { timeout } from './timeout'; import { retry } from './retry'; import { circuitBreaker } from './circuit-breaker'; -import { MiddlewareContext } from './middleware'; -import type { Middleware } from './middleware'; +import type { MiddlewareContext, Middleware } from './middleware'; /** * Interface for Resilience Options. */ diff --git a/packages/resilience/src/retry.ts b/packages/resilience/src/retry.ts index df50bbd530..b705d14b34 100644 --- a/packages/resilience/src/retry.ts +++ b/packages/resilience/src/retry.ts @@ -1,6 +1,6 @@ import { ErrorWithCause, createLogger } from '@sap-cloud-sdk/util'; import * as asyncRetry from 'async-retry'; -import { +import type { MiddlewareContext, Middleware, MiddlewareOptions, diff --git a/packages/resilience/src/timeout.ts b/packages/resilience/src/timeout.ts index 43e147390e..0b9d1b1589 100644 --- a/packages/resilience/src/timeout.ts +++ b/packages/resilience/src/timeout.ts @@ -1,5 +1,5 @@ import { createLogger } from '@sap-cloud-sdk/util'; -import { +import type { MiddlewareContext, Middleware, MiddlewareOptions, diff --git a/packages/temporal-de-serializers/src/temporal-de-serializers-v2.ts b/packages/temporal-de-serializers/src/temporal-de-serializers-v2.ts index 0837a39bcd..d43fd41739 100644 --- a/packages/temporal-de-serializers/src/temporal-de-serializers-v2.ts +++ b/packages/temporal-de-serializers/src/temporal-de-serializers-v2.ts @@ -1,8 +1,6 @@ import { Temporal } from '@js-temporal/polyfill'; -import { - DeSerializer, - durationRegexV2 -} from '@sap-cloud-sdk/odata-common/internal'; +import type { DeSerializer } from '@sap-cloud-sdk/odata-common/internal'; +import { durationRegexV2 } from '@sap-cloud-sdk/odata-common/internal'; /** * Temporal (de-)serializers for Odata-v2. diff --git a/packages/temporal-de-serializers/src/temporal-de-serializers-v4.ts b/packages/temporal-de-serializers/src/temporal-de-serializers-v4.ts index b1ba1ea3b4..996d787fb6 100644 --- a/packages/temporal-de-serializers/src/temporal-de-serializers-v4.ts +++ b/packages/temporal-de-serializers/src/temporal-de-serializers-v4.ts @@ -1,8 +1,6 @@ import { Temporal } from '@js-temporal/polyfill'; -import { - DeSerializer, - durationRegexV4 -} from '@sap-cloud-sdk/odata-common/internal'; +import type { DeSerializer } from '@sap-cloud-sdk/odata-common/internal'; +import { durationRegexV4 } from '@sap-cloud-sdk/odata-common/internal'; /** * Temporal (de-)serializers for Odata-v4. diff --git a/packages/test-util/src/test-destination-mocker.spec.ts b/packages/test-util/src/test-destination-mocker.spec.ts index 81ee9a19a8..d61ab394bd 100644 --- a/packages/test-util/src/test-destination-mocker.spec.ts +++ b/packages/test-util/src/test-destination-mocker.spec.ts @@ -1,6 +1,6 @@ import { resolve } from 'path'; import mock from 'mock-fs'; -import { Destination } from '@sap-cloud-sdk/connectivity'; +import type { Destination } from '@sap-cloud-sdk/connectivity'; import { credentials, systems } from '../test/test-util/test-destinations'; import { mockAllTestDestinations, diff --git a/packages/test-util/src/test-destination-mocker.ts b/packages/test-util/src/test-destination-mocker.ts index 1bea1ac5ba..650f6a0c58 100644 --- a/packages/test-util/src/test-destination-mocker.ts +++ b/packages/test-util/src/test-destination-mocker.ts @@ -1,11 +1,11 @@ +import type { Destination } from '@sap-cloud-sdk/connectivity/internal'; import { - Destination, validateNameAvailable, setDestinationsInEnv } from '@sap-cloud-sdk/connectivity/internal'; +import type { GetTestDestinationOptions } from './test-destination-provider'; import { getTestDestinationByAlias, - GetTestDestinationOptions, getTestDestinations } from './test-destination-provider'; diff --git a/packages/test-util/src/test-destination-provider.ts b/packages/test-util/src/test-destination-provider.ts index 011b90a79b..1df9cb2ce8 100644 --- a/packages/test-util/src/test-destination-provider.ts +++ b/packages/test-util/src/test-destination-provider.ts @@ -1,7 +1,7 @@ import { existsSync, readdirSync, readFileSync } from 'fs'; import { join, parse, resolve, sep } from 'path'; import { createLogger } from '@sap-cloud-sdk/util'; -import { Destination } from '@sap-cloud-sdk/connectivity'; +import type { Destination } from '@sap-cloud-sdk/connectivity'; const logger = createLogger({ package: 'test-util', diff --git a/packages/util/src/error-with-cause.ts b/packages/util/src/error-with-cause.ts index b34b2e80ef..6e6652d49c 100644 --- a/packages/util/src/error-with-cause.ts +++ b/packages/util/src/error-with-cause.ts @@ -1,4 +1,4 @@ -import { AxiosError } from 'axios'; +import type { AxiosError } from 'axios'; import { unixEOL } from './string-formatter'; /** diff --git a/packages/util/src/fs.ts b/packages/util/src/fs.ts index bf43648443..97b7769adc 100644 --- a/packages/util/src/fs.ts +++ b/packages/util/src/fs.ts @@ -1,4 +1,5 @@ -import { existsSync, PathLike, readdirSync, readFileSync } from 'fs'; +import type { PathLike } from 'fs'; +import { existsSync, readdirSync, readFileSync } from 'fs'; import { resolve } from 'path'; import { createLogger } from './logger'; diff --git a/packages/util/src/logger/cloud-sdk-logger.ts b/packages/util/src/logger/cloud-sdk-logger.ts index 0c8ceb45b3..2ed581f71f 100644 --- a/packages/util/src/logger/cloud-sdk-logger.ts +++ b/packages/util/src/logger/cloud-sdk-logger.ts @@ -1,11 +1,7 @@ -import { Format } from 'logform'; -import { - Container, - Logger, - LoggerOptions as WinstonLoggerOptions, - transports -} from 'winston'; -import TransportStream from 'winston-transport'; +import type { Format } from 'logform'; +import type { Logger, LoggerOptions as WinstonLoggerOptions } from 'winston'; +import { Container, transports } from 'winston'; +import type TransportStream from 'winston-transport'; import { kibana, local } from './format'; const loggerReference = 'sap-cloud-sdk-logger'; const exceptionLoggerId = 'sap-cloud-sdk-exception-logger'; diff --git a/packages/util/src/logger/format/kibana.ts b/packages/util/src/logger/format/kibana.ts index 63647162dc..a2659c9bca 100644 --- a/packages/util/src/logger/format/kibana.ts +++ b/packages/util/src/logger/format/kibana.ts @@ -1,5 +1,5 @@ import { format } from 'winston'; -import { TransformableInfo } from 'logform'; +import type { TransformableInfo } from 'logform'; import { getMessageOrStack } from './local'; const { combine, timestamp, json } = format; diff --git a/packages/util/src/logger/format/local.ts b/packages/util/src/logger/format/local.ts index 579c35cd9a..da18c4cea2 100644 --- a/packages/util/src/logger/format/local.ts +++ b/packages/util/src/logger/format/local.ts @@ -1,6 +1,6 @@ import chalk from 'chalk'; import { format } from 'winston'; -import { TransformableInfo } from 'logform'; +import type { TransformableInfo } from 'logform'; const { combine, timestamp, cli, printf } = format; diff --git a/test-packages/e2e-tests/test/TripPin/request-builder.spec.ts b/test-packages/e2e-tests/test/TripPin/request-builder.spec.ts index 1b21488abd..848360be44 100644 --- a/test-packages/e2e-tests/test/TripPin/request-builder.spec.ts +++ b/test-packages/e2e-tests/test/TripPin/request-builder.spec.ts @@ -1,7 +1,7 @@ import { resetDataSource } from '@sap-cloud-sdk/test-services-e2e/TripPin/microsoft-o-data-service-sample-trippin-in-memory-models-service/operations'; import { PersonGender } from '@sap-cloud-sdk/test-services-e2e/TripPin/microsoft-o-data-service-sample-trippin-in-memory-models-service/PersonGender'; +import type { People } from '@sap-cloud-sdk/test-services-e2e/TripPin/microsoft-o-data-service-sample-trippin-in-memory-models-service'; import { - People, microsoftODataServiceSampleTrippinInMemoryModelsService, batch, getNearestAirport diff --git a/test-packages/e2e-tests/test/batch.spec.ts b/test-packages/e2e-tests/test/batch.spec.ts index 017af697b1..27fac3e788 100644 --- a/test-packages/e2e-tests/test/batch.spec.ts +++ b/test-packages/e2e-tests/test/batch.spec.ts @@ -1,5 +1,5 @@ import { BatchChangeSet } from '@sap-cloud-sdk/odata-common'; -import { DefaultDeSerializers } from '@sap-cloud-sdk/odata-v4'; +import type { DefaultDeSerializers } from '@sap-cloud-sdk/odata-v4'; import { batch, changeset, diff --git a/test-packages/e2e-tests/test/bound-action.spec.ts b/test-packages/e2e-tests/test/bound-action.spec.ts index bc4d977870..869329b0bf 100644 --- a/test-packages/e2e-tests/test/bound-action.spec.ts +++ b/test-packages/e2e-tests/test/bound-action.spec.ts @@ -1,8 +1,8 @@ -import { +import type { TestEntity, - TestEntityWithMultipleKeys, - testService + TestEntityWithMultipleKeys } from '@sap-cloud-sdk/test-services-e2e/v4/test-service'; +import { testService } from '@sap-cloud-sdk/test-services-e2e/v4/test-service'; import { getByKey } from '@sap-cloud-sdk/test-services-e2e/v4/test-service/operations'; const url = 'http://localhost:4004/'; diff --git a/test-packages/e2e-tests/test/bound-function.spec.ts b/test-packages/e2e-tests/test/bound-function.spec.ts index 3e354c8afd..3d658f571a 100644 --- a/test-packages/e2e-tests/test/bound-function.spec.ts +++ b/test-packages/e2e-tests/test/bound-function.spec.ts @@ -1,8 +1,8 @@ -import { +import type { TestEntity, - TestEntityWithMultipleKeys, - testService + TestEntityWithMultipleKeys } from '@sap-cloud-sdk/test-services-e2e/v4/test-service'; +import { testService } from '@sap-cloud-sdk/test-services-e2e/v4/test-service'; import { getByKey } from '@sap-cloud-sdk/test-services-e2e/v4/test-service/operations'; const url = 'http://localhost:4004/'; diff --git a/test-packages/e2e-tests/test/http-agent.spec.ts b/test-packages/e2e-tests/test/http-agent.spec.ts index 7043092306..d2c991a5c3 100644 --- a/test-packages/e2e-tests/test/http-agent.spec.ts +++ b/test-packages/e2e-tests/test/http-agent.spec.ts @@ -1,6 +1,7 @@ -import { createServer, Server } from 'https'; +import type { Server } from 'https'; +import { createServer } from 'https'; import { promisify } from 'util'; -import { +import type { DestinationCertificate, HttpDestination } from '@sap-cloud-sdk/connectivity'; diff --git a/test-packages/e2e-tests/test/mail/mail.spec.ts b/test-packages/e2e-tests/test/mail/mail.spec.ts index 0b78751e9b..1538b101ba 100644 --- a/test-packages/e2e-tests/test/mail/mail.spec.ts +++ b/test-packages/e2e-tests/test/mail/mail.spec.ts @@ -1,7 +1,8 @@ import fs from 'fs'; import { join, resolve } from 'path'; import * as fsExtra from 'fs-extra'; -import { MailConfig, MailResponse, sendMail } from '@sap-cloud-sdk/mail-client'; +import type { MailConfig, MailResponse } from '@sap-cloud-sdk/mail-client'; +import { sendMail } from '@sap-cloud-sdk/mail-client'; describe('Mail', () => { beforeEach(async () => { diff --git a/test-packages/e2e-tests/test/openapi.spec.ts b/test-packages/e2e-tests/test/openapi.spec.ts index 35d625bb50..1d267b5174 100644 --- a/test-packages/e2e-tests/test/openapi.spec.ts +++ b/test-packages/e2e-tests/test/openapi.spec.ts @@ -1,7 +1,5 @@ -import { - TestEntity, - EntityApi -} from '@sap-cloud-sdk/test-services-openapi/test-service'; +import type { TestEntity } from '@sap-cloud-sdk/test-services-openapi/test-service'; +import { EntityApi } from '@sap-cloud-sdk/test-services-openapi/test-service'; import { destination } from './test-util'; // TODO: How do I handle paths in rest requests? diff --git a/test-packages/e2e-tests/test/proxy/odata.spec.ts b/test-packages/e2e-tests/test/proxy/odata.spec.ts index 8fee22df10..6559c1b27e 100644 --- a/test-packages/e2e-tests/test/proxy/odata.spec.ts +++ b/test-packages/e2e-tests/test/proxy/odata.spec.ts @@ -1,9 +1,9 @@ -import { +import type { ProxyConfiguration, HttpDestination } from '@sap-cloud-sdk/connectivity'; -import { ErrorWithCause } from '@sap-cloud-sdk/util'; -import { AxiosError } from 'axios'; +import type { ErrorWithCause } from '@sap-cloud-sdk/util'; +import type { AxiosError } from 'axios'; import { basicHeader } from '@sap-cloud-sdk/connectivity/internal'; import { destination as e2eDestination } from '../test-util'; import { testEntityApi } from '../test-utils/test-entity-operations'; diff --git a/test-packages/integration-tests/test/exception-logger.spec.ts b/test-packages/integration-tests/test/exception-logger.spec.ts index ccbae4363c..efe5ce439e 100644 --- a/test-packages/integration-tests/test/exception-logger.spec.ts +++ b/test-packages/integration-tests/test/exception-logger.spec.ts @@ -1,7 +1,7 @@ import { resolve } from 'path'; import execa from 'execa'; import { createLogger, kibana, local } from '@sap-cloud-sdk/util'; -import { Logger } from 'winston'; +import type { Logger } from 'winston'; describe('exception logger', () => { let logger: Logger; diff --git a/test-packages/integration-tests/test/mtls.spec.ts b/test-packages/integration-tests/test/mtls.spec.ts index 0ed76bd8cb..43e41b9c61 100644 --- a/test-packages/integration-tests/test/mtls.spec.ts +++ b/test-packages/integration-tests/test/mtls.spec.ts @@ -1,9 +1,9 @@ -import { HttpDestination } from '@sap-cloud-sdk/connectivity'; -import { +import type { HttpDestination } from '@sap-cloud-sdk/connectivity'; +import type { DestinationWithName, - RegisterDestinationOptions, - registerDestination + RegisterDestinationOptions } from '@sap-cloud-sdk/connectivity/src/scp-cf'; +import { registerDestination } from '@sap-cloud-sdk/connectivity/src/scp-cf'; import { executeHttpRequest } from '@sap-cloud-sdk/http-client'; import axios from 'axios'; import mock from 'mock-fs'; diff --git a/test-packages/integration-tests/test/v2/batch.spec.ts b/test-packages/integration-tests/test/v2/batch.spec.ts index 35b09116de..a932f1559b 100644 --- a/test-packages/integration-tests/test/v2/batch.spec.ts +++ b/test-packages/integration-tests/test/v2/batch.spec.ts @@ -3,9 +3,9 @@ import { changeset } from '@sap-cloud-sdk/test-services-odata-v2/test-service'; import nock from 'nock'; -import { HttpDestination } from '@sap-cloud-sdk/connectivity'; +import type { HttpDestination } from '@sap-cloud-sdk/connectivity'; import { basicHeader } from '@sap-cloud-sdk/connectivity/internal'; -import { ErrorResponse } from '@sap-cloud-sdk/odata-common'; +import type { ErrorResponse } from '@sap-cloud-sdk/odata-common'; import { createAsChildOfRequest, createRequest, diff --git a/test-packages/integration-tests/test/v2/complex-types.spec.ts b/test-packages/integration-tests/test/v2/complex-types.spec.ts index c7442fb928..f9733cbb86 100644 --- a/test-packages/integration-tests/test/v2/complex-types.spec.ts +++ b/test-packages/integration-tests/test/v2/complex-types.spec.ts @@ -4,7 +4,7 @@ import { } from '@sap-cloud-sdk/test-services-odata-v2/test-service'; import BigNumber from 'bignumber.js'; import nock from 'nock'; -import { HttpDestination } from '@sap-cloud-sdk/connectivity'; +import type { HttpDestination } from '@sap-cloud-sdk/connectivity'; import { basicHeader } from '@sap-cloud-sdk/connectivity/internal'; import { asc } from '@sap-cloud-sdk/odata-common'; import { diff --git a/test-packages/integration-tests/test/v2/custom-fields.spec.ts b/test-packages/integration-tests/test/v2/custom-fields.spec.ts index f4c589bfba..4d18087941 100644 --- a/test-packages/integration-tests/test/v2/custom-fields.spec.ts +++ b/test-packages/integration-tests/test/v2/custom-fields.spec.ts @@ -1,7 +1,7 @@ import { TestEntity } from '@sap-cloud-sdk/test-services-odata-v2/test-service'; import nock from 'nock'; import { basicHeader } from '@sap-cloud-sdk/connectivity/internal'; -import { HttpDestination } from '@sap-cloud-sdk/connectivity'; +import type { HttpDestination } from '@sap-cloud-sdk/connectivity'; import { singleTestEntityResponse } from '../test-data/single-test-entity-response'; import { testEntityCollectionResponse } from '../test-data/test-entity-collection-response'; import { testEntityApi } from './test-util'; diff --git a/test-packages/integration-tests/test/v2/function-imports.spec.ts b/test-packages/integration-tests/test/v2/function-imports.spec.ts index 87c9ea1192..2ea28bf18a 100644 --- a/test-packages/integration-tests/test/v2/function-imports.spec.ts +++ b/test-packages/integration-tests/test/v2/function-imports.spec.ts @@ -1,7 +1,7 @@ import { operations } from '@sap-cloud-sdk/test-services-odata-v2/test-service'; import nock from 'nock'; import { basicHeader } from '@sap-cloud-sdk/connectivity/internal'; -import { HttpDestination } from '@sap-cloud-sdk/connectivity'; +import type { HttpDestination } from '@sap-cloud-sdk/connectivity'; import { errorResponse } from '../test-data/error-response'; import { singleTestEntityResponse } from '../test-data/single-test-entity-response'; diff --git a/test-packages/type-tests/test/duplicated-types.ts b/test-packages/type-tests/test/duplicated-types.ts index 54f46e0430..4b6045977e 100644 --- a/test-packages/type-tests/test/duplicated-types.ts +++ b/test-packages/type-tests/test/duplicated-types.ts @@ -1,7 +1,7 @@ -import { DeSerializers as DeSerializersV2 } from '@sap-cloud-sdk/odata-v2'; -import BigNumber from 'bignumber.js'; -import { Time } from '@sap-cloud-sdk/odata-common/internal'; -import { DeSerializers as DeSerializersV4 } from '@sap-cloud-sdk/odata-v4'; +import type { DeSerializers as DeSerializersV2 } from '@sap-cloud-sdk/odata-v2'; +import type BigNumber from 'bignumber.js'; +import type { Time } from '@sap-cloud-sdk/odata-common/internal'; +import type { DeSerializers as DeSerializersV4 } from '@sap-cloud-sdk/odata-v4'; import { mergeDefaultDeSerializersWith } from '@sap-cloud-sdk/odata-v4/internal'; /* diff --git a/test-packages/type-tests/test/generator/generator-utils.test-d.ts b/test-packages/type-tests/test/generator/generator-utils.test-d.ts index e051235e99..c639955663 100644 --- a/test-packages/type-tests/test/generator/generator-utils.test-d.ts +++ b/test-packages/type-tests/test/generator/generator-utils.test-d.ts @@ -1,7 +1,5 @@ -import { - EdmTypeShared, - getFallbackEdmTypeIfNeeded -} from '@sap-cloud-sdk/generator/internal'; +import type { EdmTypeShared } from '@sap-cloud-sdk/generator/internal'; +import { getFallbackEdmTypeIfNeeded } from '@sap-cloud-sdk/generator/internal'; import { expectType } from 'tsd'; expectType(getFallbackEdmTypeIfNeeded('Edm.Any')); diff --git a/test-packages/type-tests/test/http-agent.test-d.ts b/test-packages/type-tests/test/http-agent.test-d.ts index 59fefb9810..617667e193 100644 --- a/test-packages/type-tests/test/http-agent.test-d.ts +++ b/test-packages/type-tests/test/http-agent.test-d.ts @@ -1,8 +1,8 @@ -import { - getAgentConfigAsync, +import type { HttpAgentConfig, HttpsAgentConfig } from '@sap-cloud-sdk/connectivity'; +import { getAgentConfigAsync } from '@sap-cloud-sdk/connectivity'; import { expectType } from 'tsd'; expectType>( diff --git a/test-packages/type-tests/test/http-client.test-d.ts b/test-packages/type-tests/test/http-client.test-d.ts index 07190824a2..81246b85a4 100644 --- a/test-packages/type-tests/test/http-client.test-d.ts +++ b/test-packages/type-tests/test/http-client.test-d.ts @@ -1,10 +1,10 @@ import { expectError, expectType } from 'tsd'; +import type { HttpResponse } from '@sap-cloud-sdk/http-client'; import { - HttpResponse, executeHttpRequest, executeHttpRequestWithOrigin } from '@sap-cloud-sdk/http-client'; -import { ServiceBindingTransformFunction } from '@sap-cloud-sdk/connectivity'; +import type { ServiceBindingTransformFunction } from '@sap-cloud-sdk/connectivity'; expectType>( executeHttpRequest( diff --git a/test-packages/type-tests/test/jwt.test-d.ts b/test-packages/type-tests/test/jwt.test-d.ts index fd528f7146..8cee5ea14a 100644 --- a/test-packages/type-tests/test/jwt.test-d.ts +++ b/test-packages/type-tests/test/jwt.test-d.ts @@ -1,4 +1,5 @@ -import { decodeJwt, JwtPayload } from '@sap-cloud-sdk/connectivity'; +import type { JwtPayload } from '@sap-cloud-sdk/connectivity'; +import { decodeJwt } from '@sap-cloud-sdk/connectivity'; import { expectType } from 'tsd'; expectType(decodeJwt('')); diff --git a/test-packages/type-tests/test/mail-client/mail-client.test-d.ts b/test-packages/type-tests/test/mail-client/mail-client.test-d.ts index d39fb8151f..34096b204e 100644 --- a/test-packages/type-tests/test/mail-client/mail-client.test-d.ts +++ b/test-packages/type-tests/test/mail-client/mail-client.test-d.ts @@ -1,4 +1,5 @@ -import { MailResponse, sendMail } from '@sap-cloud-sdk/mail-client'; +import type { MailResponse } from '@sap-cloud-sdk/mail-client'; +import { sendMail } from '@sap-cloud-sdk/mail-client'; import { expectType } from 'tsd'; const mailConfig = { from: 'from', to: 'to' }; diff --git a/test-packages/type-tests/test/openapi/schema.test-d.ts b/test-packages/type-tests/test/openapi/schema.test-d.ts index 193efbac0f..70e77ee7a9 100644 --- a/test-packages/type-tests/test/openapi/schema.test-d.ts +++ b/test-packages/type-tests/test/openapi/schema.test-d.ts @@ -1,4 +1,4 @@ -import { SimpleTestEntity } from '@sap-cloud-sdk/test-services-openapi/test-service'; +import type { SimpleTestEntity } from '@sap-cloud-sdk/test-services-openapi/test-service'; import { expectType } from 'tsd'; const simpleTestEntity: SimpleTestEntity = { stringProperty: 'prop' }; diff --git a/test-packages/type-tests/test/v2/batch.test-d.ts b/test-packages/type-tests/test/v2/batch.test-d.ts index 626faa80d1..f2f1de3cf5 100644 --- a/test-packages/type-tests/test/v2/batch.test-d.ts +++ b/test-packages/type-tests/test/v2/batch.test-d.ts @@ -2,25 +2,25 @@ import { changeset as otherServiceChangeset, multipleSchemasService } from '@sap-cloud-sdk/test-services-odata-v2/multiple-schemas-service'; +import type { TestEntity } from '@sap-cloud-sdk/test-services-odata-v2/test-service'; import { batch, changeset as testEntityChangeset, - TestEntity, testService } from '@sap-cloud-sdk/test-services-odata-v2/test-service'; -import { - mergeDefaultDeSerializersWith, +import type { ReadResponse, WriteResponses } from '@sap-cloud-sdk/odata-v2/internal'; +import { mergeDefaultDeSerializersWith } from '@sap-cloud-sdk/odata-v2/internal'; import { expectType } from 'tsd'; -import { BatchChangeSet } from '@sap-cloud-sdk/odata-common'; -import { +import type { BatchChangeSet } from '@sap-cloud-sdk/odata-common'; +import type { BatchResponse, DefaultDeSerializers, ODataBatchRequestBuilder } from '@sap-cloud-sdk/odata-v2'; -import { +import type { CustomDeSerializerV2, DefaultDeSerializerV2 } from '../duplicated-types'; diff --git a/test-packages/type-tests/test/v2/complex-types.test-d.ts b/test-packages/type-tests/test/v2/complex-types.test-d.ts index 96353ec214..b0c7e502df 100644 --- a/test-packages/type-tests/test/v2/complex-types.test-d.ts +++ b/test-packages/type-tests/test/v2/complex-types.test-d.ts @@ -1,18 +1,16 @@ -import { +import type { TestComplexTypeField, - TestEntity, - testService + TestEntity } from '@sap-cloud-sdk/test-services-odata-v2/test-service'; -import { - and, - asc, - desc, - or, - OrderableEdmTypeField -} from '@sap-cloud-sdk/odata-common'; +import { testService } from '@sap-cloud-sdk/test-services-odata-v2/test-service'; +import type { OrderableEdmTypeField } from '@sap-cloud-sdk/odata-common'; +import { and, asc, desc, or } from '@sap-cloud-sdk/odata-common'; import { expectError, expectType } from 'tsd'; -import { GetAllRequestBuilder } from '@sap-cloud-sdk/odata-v2'; -import { AnyDeserializerV2, DefaultDeSerializerV2 } from '../duplicated-types'; +import type { GetAllRequestBuilder } from '@sap-cloud-sdk/odata-v2'; +import type { + AnyDeserializerV2, + DefaultDeSerializerV2 +} from '../duplicated-types'; const { testEntityApi } = testService(); const testEntitySchema = testEntityApi.schema; diff --git a/test-packages/type-tests/test/v2/de-serializers.test-d.ts b/test-packages/type-tests/test/v2/de-serializers.test-d.ts index 26e2dbb6ae..09a910fc5d 100644 --- a/test-packages/type-tests/test/v2/de-serializers.test-d.ts +++ b/test-packages/type-tests/test/v2/de-serializers.test-d.ts @@ -1,8 +1,8 @@ import { mergeDefaultDeSerializersWith } from '@sap-cloud-sdk/odata-v2/internal'; import { temporalDeSerializersV2 } from '@sap-cloud-sdk/temporal-de-serializers'; import { expectType } from 'tsd'; -import { CustomDeSerializers } from '@sap-cloud-sdk/odata-v2'; -import { CustomDeSerializerV2 } from '../duplicated-types'; +import type { CustomDeSerializers } from '@sap-cloud-sdk/odata-v2'; +import type { CustomDeSerializerV2 } from '../duplicated-types'; import { customTestDeSerializers } from './batch.test-d'; expectType>>( diff --git a/test-packages/type-tests/test/v2/entity-builder.test-d.ts b/test-packages/type-tests/test/v2/entity-builder.test-d.ts index e07a30c570..dd09380c7e 100644 --- a/test-packages/type-tests/test/v2/entity-builder.test-d.ts +++ b/test-packages/type-tests/test/v2/entity-builder.test-d.ts @@ -1,10 +1,8 @@ -import { - TestEntity, - testService -} from '@sap-cloud-sdk/test-services-odata-v2/test-service'; +import type { TestEntity } from '@sap-cloud-sdk/test-services-odata-v2/test-service'; +import { testService } from '@sap-cloud-sdk/test-services-odata-v2/test-service'; import { expectError, expectType } from 'tsd'; -import { EntityBuilderType } from '@sap-cloud-sdk/odata-common'; -import { DefaultDeSerializerV2 } from '../duplicated-types'; +import type { EntityBuilderType } from '@sap-cloud-sdk/odata-common'; +import type { DefaultDeSerializerV2 } from '../duplicated-types'; const builder = testService().testEntityApi.entityBuilder(); diff --git a/test-packages/type-tests/test/v2/filter-functions.test-d.ts b/test-packages/type-tests/test/v2/filter-functions.test-d.ts index f7103054d9..85fb9d5bc1 100644 --- a/test-packages/type-tests/test/v2/filter-functions.test-d.ts +++ b/test-packages/type-tests/test/v2/filter-functions.test-d.ts @@ -1,23 +1,24 @@ -import { - TestEntity, - testService -} from '@sap-cloud-sdk/test-services-odata-v2/test-service'; +import type { TestEntity } from '@sap-cloud-sdk/test-services-odata-v2/test-service'; +import { testService } from '@sap-cloud-sdk/test-services-odata-v2/test-service'; +import type { GetAllRequestBuilder } from '@sap-cloud-sdk/odata-v2'; import { filterFunctions, - GetAllRequestBuilder, length, substring, substringOf } from '@sap-cloud-sdk/odata-v2'; import { expectError, expectType } from 'tsd'; -import { +import type { BooleanFilterFunction, EntityBase, Filter, NumberFilterFunction, StringFilterFunction } from '@sap-cloud-sdk/odata-common'; -import { AnyDeserializerV2, DefaultDeSerializerV2 } from '../duplicated-types'; +import type { + AnyDeserializerV2, + DefaultDeSerializerV2 +} from '../duplicated-types'; const { testEntityApi, testEntitySingleLinkApi } = testService(); const testEntitySchema = testEntityApi.schema; diff --git a/test-packages/type-tests/test/v2/filter.test-d.ts b/test-packages/type-tests/test/v2/filter.test-d.ts index 6a9c945bbf..5156e6ed58 100644 --- a/test-packages/type-tests/test/v2/filter.test-d.ts +++ b/test-packages/type-tests/test/v2/filter.test-d.ts @@ -1,13 +1,20 @@ -import { +import type { TestEntity, - TestEntityMultiLink, - testService + TestEntityMultiLink } from '@sap-cloud-sdk/test-services-odata-v2/test-service'; +import { testService } from '@sap-cloud-sdk/test-services-odata-v2/test-service'; import { and, or } from '@sap-cloud-sdk/odata-v2'; import { expectError, expectType } from 'tsd'; -import { Filter, FilterLink, FilterList } from '@sap-cloud-sdk/odata-common'; -import { TestEntitySingleLinkApi } from '@sap-cloud-sdk/test-services-odata-v2/test-service/TestEntitySingleLinkApi'; -import { AnyDeserializerV2, DefaultDeSerializerV2 } from '../duplicated-types'; +import type { + Filter, + FilterLink, + FilterList +} from '@sap-cloud-sdk/odata-common'; +import type { TestEntitySingleLinkApi } from '@sap-cloud-sdk/test-services-odata-v2/test-service/TestEntitySingleLinkApi'; +import type { + AnyDeserializerV2, + DefaultDeSerializerV2 +} from '../duplicated-types'; const { testEntityApi, testEntitySingleLinkApi, testEntityMultiLinkApi } = testService(); diff --git a/test-packages/type-tests/test/v2/function-imports.test-d.ts b/test-packages/type-tests/test/v2/function-imports.test-d.ts index 5e9ca82994..4549585ed5 100644 --- a/test-packages/type-tests/test/v2/function-imports.test-d.ts +++ b/test-packages/type-tests/test/v2/function-imports.test-d.ts @@ -1,25 +1,27 @@ -import { +import type { TestComplexType, TestEntity, - testFunctionImportComplexReturnType, - testFunctionImportComplexReturnTypeCollection, TestFunctionImportComplexReturnTypeCollectionParameters, TestFunctionImportComplexReturnTypeParameters, - testFunctionImportEdmReturnType, - testFunctionImportEdmReturnTypeCollection, TestFunctionImportEdmReturnTypeCollectionParameters, TestFunctionImportEdmReturnTypeParameters, + TestFunctionImportEntityReturnTypeParameters, + TestFunctionImportNoReturnTypeParameters +} from '@sap-cloud-sdk/test-services-odata-v2/test-service'; +import { + testFunctionImportComplexReturnType, + testFunctionImportComplexReturnTypeCollection, + testFunctionImportEdmReturnType, + testFunctionImportEdmReturnTypeCollection, testFunctionImportEntityReturnType, testFunctionImportEntityReturnTypeCollection, - TestFunctionImportEntityReturnTypeParameters, - TestFunctionImportNoReturnTypeParameters, testFunctionImportSharedEntityReturnType, testService } from '@sap-cloud-sdk/test-services-odata-v2/test-service'; import { expectError, expectType } from 'tsd'; -import { OperationRequestBuilder } from '@sap-cloud-sdk/odata-v2'; -import { HttpResponse } from '@sap-cloud-sdk/http-client'; -import { DefaultDeSerializerV2 } from '../duplicated-types'; +import type { OperationRequestBuilder } from '@sap-cloud-sdk/odata-v2'; +import type { HttpResponse } from '@sap-cloud-sdk/http-client'; +import type { DefaultDeSerializerV2 } from '../duplicated-types'; const edmReturnTypeRequestBuilder = testFunctionImportEdmReturnType({}); expectType< diff --git a/test-packages/type-tests/test/v2/link.test-d.ts b/test-packages/type-tests/test/v2/link.test-d.ts index d43f68275b..db81eed5e1 100644 --- a/test-packages/type-tests/test/v2/link.test-d.ts +++ b/test-packages/type-tests/test/v2/link.test-d.ts @@ -2,8 +2,8 @@ /* eslint-disable import/no-internal-modules */ import { testService } from '@sap-cloud-sdk/test-services-odata-v2/test-service'; import { expectType } from 'tsd'; -import { TestEntitySingleLinkApi } from '@sap-cloud-sdk/test-services-odata-v2/test-service/TestEntitySingleLinkApi'; -import { TestEntityLvl2MultiLinkApi } from '@sap-cloud-sdk/test-services-odata-v2/test-service/TestEntityLvl2MultiLinkApi'; +import type { TestEntitySingleLinkApi } from '@sap-cloud-sdk/test-services-odata-v2/test-service/TestEntitySingleLinkApi'; +import type { TestEntityLvl2MultiLinkApi } from '@sap-cloud-sdk/test-services-odata-v2/test-service/TestEntityLvl2MultiLinkApi'; import { mergeDefaultDeSerializersWith } from '@sap-cloud-sdk/odata-v2'; const custom = { diff --git a/test-packages/type-tests/test/v2/request-builder.test-d.ts b/test-packages/type-tests/test/v2/request-builder.test-d.ts index b363ec8a94..5f5dab19b5 100644 --- a/test-packages/type-tests/test/v2/request-builder.test-d.ts +++ b/test-packages/type-tests/test/v2/request-builder.test-d.ts @@ -1,18 +1,18 @@ -import { +import type { TestEntity, TestEntityMultiLink, - TestEntityRequestBuilder, - testService + TestEntityRequestBuilder } from '@sap-cloud-sdk/test-services-odata-v2/test-service'; +import { testService } from '@sap-cloud-sdk/test-services-odata-v2/test-service'; import { and, asc, desc, or } from '@sap-cloud-sdk/odata-common'; import { expectError, expectType } from 'tsd'; -import { +import type { CreateRequestBuilder, GetAllRequestBuilder, GetByKeyRequestBuilder, UpdateRequestBuilder } from '@sap-cloud-sdk/odata-v2'; -import { DefaultDeSerializerV2 } from '../duplicated-types'; +import type { DefaultDeSerializerV2 } from '../duplicated-types'; const { testEntityApi, testEntityMultiLinkApi, testEntitySingleLinkApi } = testService(); diff --git a/test-packages/type-tests/test/v2/schema-properties.test-d.ts b/test-packages/type-tests/test/v2/schema-properties.test-d.ts index 04ff7affbd..3bbf5a6e61 100644 --- a/test-packages/type-tests/test/v2/schema-properties.test-d.ts +++ b/test-packages/type-tests/test/v2/schema-properties.test-d.ts @@ -1,18 +1,19 @@ /* eslint-disable import/no-internal-modules */ -import { - TestEntity, - testService -} from '@sap-cloud-sdk/test-services-odata-v2/test-service'; +import type { TestEntity } from '@sap-cloud-sdk/test-services-odata-v2/test-service'; +import { testService } from '@sap-cloud-sdk/test-services-odata-v2/test-service'; import { expectType } from 'tsd'; -import { +import type { Link, OneToOneLink, OrderableEdmTypeField } from '@sap-cloud-sdk/odata-common'; -import { TestEntityMultiLinkApi } from '@sap-cloud-sdk/test-services-odata-v2/test-service/TestEntityMultiLinkApi'; -import { TestEntityOtherMultiLinkApi } from '@sap-cloud-sdk/test-services-odata-v2/test-service/TestEntityOtherMultiLinkApi'; -import { TestEntitySingleLinkApi } from '@sap-cloud-sdk/test-services-odata-v2/test-service/TestEntitySingleLinkApi'; -import { AnyDeserializerV2, DefaultDeSerializerV2 } from '../duplicated-types'; +import type { TestEntityMultiLinkApi } from '@sap-cloud-sdk/test-services-odata-v2/test-service/TestEntityMultiLinkApi'; +import type { TestEntityOtherMultiLinkApi } from '@sap-cloud-sdk/test-services-odata-v2/test-service/TestEntityOtherMultiLinkApi'; +import type { TestEntitySingleLinkApi } from '@sap-cloud-sdk/test-services-odata-v2/test-service/TestEntitySingleLinkApi'; +import type { + AnyDeserializerV2, + DefaultDeSerializerV2 +} from '../duplicated-types'; const { testEntityApi } = testService(); const testEntitySchema = testEntityApi.schema; diff --git a/test-packages/type-tests/test/v2/selectable.test-d.ts b/test-packages/type-tests/test/v2/selectable.test-d.ts index 5f8b4beafa..aa4b388f3d 100644 --- a/test-packages/type-tests/test/v2/selectable.test-d.ts +++ b/test-packages/type-tests/test/v2/selectable.test-d.ts @@ -1,11 +1,9 @@ -import { - TestEntity, - testService -} from '@sap-cloud-sdk/test-services-odata-v2/test-service'; +import type { TestEntity } from '@sap-cloud-sdk/test-services-odata-v2/test-service'; +import { testService } from '@sap-cloud-sdk/test-services-odata-v2/test-service'; import { OneToOneLink } from '@sap-cloud-sdk/odata-common'; import { expectError, expectType } from 'tsd'; -import { TestEntitySingleLinkApi } from '@sap-cloud-sdk/test-services-odata-v2/test-service/TestEntitySingleLinkApi'; -import { DefaultDeSerializerV2 } from '../duplicated-types'; +import type { TestEntitySingleLinkApi } from '@sap-cloud-sdk/test-services-odata-v2/test-service/TestEntitySingleLinkApi'; +import type { DefaultDeSerializerV2 } from '../duplicated-types'; const { testEntityApi, testEntitySingleLinkApi } = testService(); diff --git a/test-packages/type-tests/test/v4/action-imports.test-d.ts b/test-packages/type-tests/test/v4/action-imports.test-d.ts index 28676b9f24..4ba7a5acd2 100644 --- a/test-packages/type-tests/test/v4/action-imports.test-d.ts +++ b/test-packages/type-tests/test/v4/action-imports.test-d.ts @@ -1,20 +1,20 @@ -import { - testActionImportMultipleParameterComplexReturnType, +import type { TestActionImportMultipleParameterComplexReturnTypeParameters, - testActionImportNoParameterNoReturnType, TestActionImportNoParameterNoReturnTypeParameters, - testActionImportNullableTest, TestActionImportNullableTestParameters, - testActionImportUnsupportedEdmTypes, TestActionImportUnsupportedEdmTypesParameters } from '@sap-cloud-sdk/test-services-odata-v4/test-service/operations'; import { - TestComplexType, - testService -} from '@sap-cloud-sdk/test-services-odata-v4/test-service'; + testActionImportMultipleParameterComplexReturnType, + testActionImportNoParameterNoReturnType, + testActionImportNullableTest, + testActionImportUnsupportedEdmTypes +} from '@sap-cloud-sdk/test-services-odata-v4/test-service/operations'; +import type { TestComplexType } from '@sap-cloud-sdk/test-services-odata-v4/test-service'; +import { testService } from '@sap-cloud-sdk/test-services-odata-v4/test-service'; import { expectError, expectType } from 'tsd'; -import { OperationRequestBuilder } from '@sap-cloud-sdk/odata-v4'; -import { DefaultDeSerializersV4 } from '../duplicated-types'; +import type { OperationRequestBuilder } from '@sap-cloud-sdk/odata-v4'; +import type { DefaultDeSerializersV4 } from '../duplicated-types'; const noReturnTypeRequestBuilder = testActionImportNoParameterNoReturnType({}); expectType< diff --git a/test-packages/type-tests/test/v4/batch.test-d.ts b/test-packages/type-tests/test/v4/batch.test-d.ts index 5c2159f5cf..356418b903 100644 --- a/test-packages/type-tests/test/v4/batch.test-d.ts +++ b/test-packages/type-tests/test/v4/batch.test-d.ts @@ -2,15 +2,18 @@ import { batch, testService } from '@sap-cloud-sdk/test-services-odata-v4/test-service'; -import { ReadResponse, WriteResponses } from '@sap-cloud-sdk/odata-v4/internal'; +import type { + ReadResponse, + WriteResponses +} from '@sap-cloud-sdk/odata-v4/internal'; import { expectType } from 'tsd'; -import { BatchResponse } from '@sap-cloud-sdk/odata-v4'; -import { TestEntity } from '@sap-cloud-sdk/test-services-odata-v4/test-service/TestEntity'; -import { +import type { BatchResponse } from '@sap-cloud-sdk/odata-v4'; +import type { TestEntity } from '@sap-cloud-sdk/test-services-odata-v4/test-service/TestEntity'; +import type { CustomDeSerializerV4, - customTestDeSerializersV4, DefaultDeSerializersV4 } from '../duplicated-types'; +import { customTestDeSerializersV4 } from '../duplicated-types'; const { testEntityApi } = testService(); diff --git a/test-packages/type-tests/test/v4/de-serializers.test-d.ts b/test-packages/type-tests/test/v4/de-serializers.test-d.ts index 5d019b5f72..94a1834a32 100644 --- a/test-packages/type-tests/test/v4/de-serializers.test-d.ts +++ b/test-packages/type-tests/test/v4/de-serializers.test-d.ts @@ -1,11 +1,9 @@ import { mergeDefaultDeSerializersWith } from '@sap-cloud-sdk/odata-v4/internal'; import { temporalDeSerializersV4 } from '@sap-cloud-sdk/temporal-de-serializers'; import { expectType } from 'tsd'; -import { CustomDeSerializers } from '@sap-cloud-sdk/odata-v4'; -import { - CustomDeSerializerV4, - customTestDeSerializersV4 -} from '../duplicated-types'; +import type { CustomDeSerializers } from '@sap-cloud-sdk/odata-v4'; +import type { CustomDeSerializerV4 } from '../duplicated-types'; +import { customTestDeSerializersV4 } from '../duplicated-types'; expectType>>( mergeDefaultDeSerializersWith(customTestDeSerializersV4) diff --git a/test-packages/type-tests/test/v4/entity-builder.test-d.ts b/test-packages/type-tests/test/v4/entity-builder.test-d.ts index d6b04dde54..c37f7e7c73 100644 --- a/test-packages/type-tests/test/v4/entity-builder.test-d.ts +++ b/test-packages/type-tests/test/v4/entity-builder.test-d.ts @@ -1,9 +1,7 @@ -import { - testService, - TestEntity -} from '@sap-cloud-sdk/test-services-odata-v4/test-service'; +import type { TestEntity } from '@sap-cloud-sdk/test-services-odata-v4/test-service'; +import { testService } from '@sap-cloud-sdk/test-services-odata-v4/test-service'; import { expectError, expectType } from 'tsd'; -import { DefaultDeSerializersV4 } from '../duplicated-types'; +import type { DefaultDeSerializersV4 } from '../duplicated-types'; const builder = testService().testEntityApi.entityBuilder(); diff --git a/test-packages/type-tests/test/v4/field-builder.test-d.ts b/test-packages/type-tests/test/v4/field-builder.test-d.ts index f4b70164cf..448848c715 100644 --- a/test-packages/type-tests/test/v4/field-builder.test-d.ts +++ b/test-packages/type-tests/test/v4/field-builder.test-d.ts @@ -3,14 +3,17 @@ import { TestComplexTypeField, TestEntity } from '@sap-cloud-sdk/test-services-odata-v4/test-service'; -import { +import type { CollectionField, - defaultDeSerializers, OrderableEdmTypeField } from '@sap-cloud-sdk/odata-v4'; +import { defaultDeSerializers } from '@sap-cloud-sdk/odata-v4'; import { FieldBuilder } from '@sap-cloud-sdk/odata-common'; import { expectType } from 'tsd'; -import { AnyDeSerializerV4, DefaultDeSerializersV4 } from '../duplicated-types'; +import type { + AnyDeSerializerV4, + DefaultDeSerializersV4 +} from '../duplicated-types'; const entityFieldBuilder = new FieldBuilder(TestEntity, defaultDeSerializers); expectType>( diff --git a/test-packages/type-tests/test/v4/filter-functions.test-d.ts b/test-packages/type-tests/test/v4/filter-functions.test-d.ts index c73f0071cc..9998a086cd 100644 --- a/test-packages/type-tests/test/v4/filter-functions.test-d.ts +++ b/test-packages/type-tests/test/v4/filter-functions.test-d.ts @@ -1,18 +1,14 @@ import { testService } from '@sap-cloud-sdk/test-services-odata-v4/test-service'; -import { - DateFilterFunction, - Entity, - filterFunction, - filterFunctions -} from '@sap-cloud-sdk/odata-v4'; +import type { DateFilterFunction, Entity } from '@sap-cloud-sdk/odata-v4'; +import { filterFunction, filterFunctions } from '@sap-cloud-sdk/odata-v4'; import { expectError, expectType } from 'tsd'; -import { +import type { BooleanFilterFunction, CollectionFilterFunction, Filter } from '@sap-cloud-sdk/odata-common'; -import { TestEntity } from '@sap-cloud-sdk/test-services-odata-v4/test-service/TestEntity'; -import { AnyDeSerializerV4 } from '../duplicated-types'; +import type { TestEntity } from '@sap-cloud-sdk/test-services-odata-v4/test-service/TestEntity'; +import type { AnyDeSerializerV4 } from '../duplicated-types'; const testEntitySchema = testService().testEntityApi.schema; diff --git a/test-packages/type-tests/test/v4/filters.test-d.ts b/test-packages/type-tests/test/v4/filters.test-d.ts index 797e24b41c..3893bc81d2 100644 --- a/test-packages/type-tests/test/v4/filters.test-d.ts +++ b/test-packages/type-tests/test/v4/filters.test-d.ts @@ -1,13 +1,17 @@ -import { and, any, OneToManyLink } from '@sap-cloud-sdk/odata-v4'; +import type { OneToManyLink } from '@sap-cloud-sdk/odata-v4'; +import { and, any } from '@sap-cloud-sdk/odata-v4'; +import type { TestEntity } from '@sap-cloud-sdk/test-services-odata-v4/test-service'; import { - TestEntity, TestEnumType, testService } from '@sap-cloud-sdk/test-services-odata-v4/test-service'; import { expectError, expectType } from 'tsd'; -import { Filter, FilterList } from '@sap-cloud-sdk/odata-common'; -import { TestEntityMultiLinkApi } from '@sap-cloud-sdk/test-services-odata-v4/test-service/TestEntityMultiLinkApi'; -import { AnyDeSerializerV4, DefaultDeSerializersV4 } from '../duplicated-types'; +import type { Filter, FilterList } from '@sap-cloud-sdk/odata-common'; +import type { TestEntityMultiLinkApi } from '@sap-cloud-sdk/test-services-odata-v4/test-service/TestEntityMultiLinkApi'; +import type { + AnyDeSerializerV4, + DefaultDeSerializersV4 +} from '../duplicated-types'; const { testEntityApi, testEntitySingleLinkApi, testEntityMultiLinkApi } = testService(); diff --git a/test-packages/type-tests/test/v4/function-import.test-d.ts b/test-packages/type-tests/test/v4/function-import.test-d.ts index bdc2fb499f..5028bf5272 100644 --- a/test-packages/type-tests/test/v4/function-import.test-d.ts +++ b/test-packages/type-tests/test/v4/function-import.test-d.ts @@ -1,10 +1,8 @@ -import { - testFunctionImportNullableTest, - TestFunctionImportNullableTestParameters -} from '@sap-cloud-sdk/test-services-odata-v4/test-service'; +import type { TestFunctionImportNullableTestParameters } from '@sap-cloud-sdk/test-services-odata-v4/test-service'; +import { testFunctionImportNullableTest } from '@sap-cloud-sdk/test-services-odata-v4/test-service'; import { expectError, expectType } from 'tsd'; -import { OperationRequestBuilder } from '@sap-cloud-sdk/odata-v4'; -import { DefaultDeSerializersV4 } from '../duplicated-types'; +import type { OperationRequestBuilder } from '@sap-cloud-sdk/odata-v4'; +import type { DefaultDeSerializersV4 } from '../duplicated-types'; expectError(testFunctionImportNullableTest({})); diff --git a/test-packages/type-tests/test/v4/schema-properties.test-d.ts b/test-packages/type-tests/test/v4/schema-properties.test-d.ts index f88b2a339c..ddb4ffd3bb 100644 --- a/test-packages/type-tests/test/v4/schema-properties.test-d.ts +++ b/test-packages/type-tests/test/v4/schema-properties.test-d.ts @@ -1,16 +1,17 @@ -import { - TestEntity, - testService -} from '@sap-cloud-sdk/test-services-odata-v4/test-service'; +import type { TestEntity } from '@sap-cloud-sdk/test-services-odata-v4/test-service'; +import { testService } from '@sap-cloud-sdk/test-services-odata-v4/test-service'; import { expectType } from 'tsd'; -import { +import type { OneToManyLink, OneToOneLink, OrderableEdmTypeField } from '@sap-cloud-sdk/odata-v4'; -import { TestEntityMultiLinkApi } from '@sap-cloud-sdk/test-services-odata-v4/test-service/TestEntityMultiLinkApi'; -import { TestEntitySingleLinkApi } from '@sap-cloud-sdk/test-services-odata-v4/test-service/TestEntitySingleLinkApi'; -import { AnyDeSerializerV4, DefaultDeSerializersV4 } from '../duplicated-types'; +import type { TestEntityMultiLinkApi } from '@sap-cloud-sdk/test-services-odata-v4/test-service/TestEntityMultiLinkApi'; +import type { TestEntitySingleLinkApi } from '@sap-cloud-sdk/test-services-odata-v4/test-service/TestEntitySingleLinkApi'; +import type { + AnyDeSerializerV4, + DefaultDeSerializersV4 +} from '../duplicated-types'; const { testEntityApi } = testService(); const testEntitySchema = testEntityApi.schema;