From b9a22f12db3b13e2706d8d06be5ab53600a16093 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 24 Sep 2024 13:26:19 +0000 Subject: [PATCH 01/10] chore(deps): bump eslint-plugin-import from 2.29.1 to 2.30.0 Bumps [eslint-plugin-import](https://github.com/import-js/eslint-plugin-import) from 2.29.1 to 2.30.0. - [Release notes](https://github.com/import-js/eslint-plugin-import/releases) - [Changelog](https://github.com/import-js/eslint-plugin-import/blob/main/CHANGELOG.md) - [Commits](https://github.com/import-js/eslint-plugin-import/compare/v2.29.1...v2.30.0) --- updated-dependencies: - dependency-name: eslint-plugin-import dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] From dcb06d4a1e1f00c1c5720bfc7e79c23b73c180f4 Mon Sep 17 00:00:00 2001 From: Marika Marszalkowski Date: Thu, 26 Sep 2024 18:51:02 +0200 Subject: [PATCH 02/10] chore: add missing dependencies --- packages/eslint-config/flat-config.js | 12 +++- packages/eslint-config/index.js | 15 ++++- packages/generator/src/generator.spec.ts | 1 - .../openapi-generator/src/generator.spec.ts | 1 - yarn.lock | 55 ++++++++++++++++++- 5 files changed, 74 insertions(+), 10 deletions(-) diff --git a/packages/eslint-config/flat-config.js b/packages/eslint-config/flat-config.js index 3d26642185..bfd5af56a4 100644 --- a/packages/eslint-config/flat-config.js +++ b/packages/eslint-config/flat-config.js @@ -155,8 +155,12 @@ const flatConfig = [ ], 'import/no-self-import': 'error', 'import/no-cycle': 'error', - 'import/no-useless-path-segments': 'error', - 'import/no-relative-parent-imports': 'error', + 'import/no-useless-path-segments': [ + 'error', + { + noUselessIndex: true + } + ], 'import/export': 'error', 'import/order': 'error', 'import/no-duplicates': 'error', @@ -236,6 +240,10 @@ const flatConfig = [ settings: { jsdoc: { ignoreInternal: true + }, + 'import/resolver': { + typescript: true, + node: true } } }, diff --git a/packages/eslint-config/index.js b/packages/eslint-config/index.js index 16a022d674..98a086efbc 100644 --- a/packages/eslint-config/index.js +++ b/packages/eslint-config/index.js @@ -29,7 +29,8 @@ module.exports = { '@typescript-eslint/explicit-module-boundary-types': 'off', 'import/no-internal-modules': 'off', 'no-unused-expressions': 'off', - 'jsdoc/require-jsdoc': 'off' + 'jsdoc/require-jsdoc': 'off', + 'import/no-relative-parent-imports': 'off' } } ], @@ -159,8 +160,12 @@ module.exports = { ], 'import/no-self-import': 'error', 'import/no-cycle': 'error', - 'import/no-useless-path-segments': 'error', - 'import/no-relative-parent-imports': 'error', + 'import/no-useless-path-segments': [ + 'error', + { + noUselessIndex: true + } + ], 'import/export': 'error', 'import/order': 'error', 'import/no-duplicates': 'error', @@ -240,6 +245,10 @@ module.exports = { settings: { jsdoc: { ignoreInternal: true + }, + 'import/resolver': { + typescript: true, + node: true } } }; diff --git a/packages/generator/src/generator.spec.ts b/packages/generator/src/generator.spec.ts index 5a6a791267..5a91f1c3ac 100644 --- a/packages/generator/src/generator.spec.ts +++ b/packages/generator/src/generator.spec.ts @@ -3,7 +3,6 @@ import { promises } from 'fs'; import { transports } from 'winston'; import type { SourceFile } from 'ts-morph'; import mock from 'mock-fs'; -// eslint-disable-next-line import/default import prettier from 'prettier'; import { createLogger } from '@sap-cloud-sdk/util'; import { getInputFilePaths } from '@sap-cloud-sdk/generator-common/dist/options-parser'; diff --git a/packages/openapi-generator/src/generator.spec.ts b/packages/openapi-generator/src/generator.spec.ts index b12a49d9ba..3513e1cef3 100644 --- a/packages/openapi-generator/src/generator.spec.ts +++ b/packages/openapi-generator/src/generator.spec.ts @@ -2,7 +2,6 @@ import { resolve } from 'path'; import { existsSync, promises } from 'fs'; import mock from 'mock-fs'; import { readJSON } from '@sap-cloud-sdk/util'; -// eslint-disable-next-line import/default import prettier from 'prettier'; import { getInputFilePaths } from '@sap-cloud-sdk/generator-common/internal'; import { emptyDocument } from '../test/test-util'; diff --git a/yarn.lock b/yarn.lock index 79fbb3bdec..d2288320d8 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1163,6 +1163,11 @@ "@nodelib/fs.scandir" "2.1.5" fastq "^1.6.0" +"@nolyfill/is-core-module@1.0.39": + version "1.0.39" + resolved "https://registry.npmjs.org/@nolyfill/is-core-module/-/is-core-module-1.0.39.tgz#3dc35ba0f1e66b403c00b39344f870298ebb1c8e" + integrity sha512-nn5ozdjYQpUCZlWGuxcJY/KpxkWQs4DcbMCmKojjyrYDEAGy4Ce19NN4v5MduafTwJlbKc99UA8YhSVqq9yPZA== + "@npmcli/fs@^1.0.0": version "1.1.1" resolved "https://registry.npmjs.org/@npmcli/fs/-/fs-1.1.1.tgz#72f719fe935e687c56a4faecf3c03d06ba593257" @@ -1908,6 +1913,17 @@ "@typescript-eslint/visitor-keys" "7.18.0" debug "^4.3.4" +"@typescript-eslint/parser@^8.7.0": + version "8.7.0" + resolved "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.7.0.tgz#a567b0890d13db72c7348e1d88442ea8ab4e9173" + integrity sha512-lN0btVpj2unxHlNYLI//BQ7nzbMJYBVQX5+pbNXvGYazdlgYonMn4AhhHifQ+J4fGRYA/m1DjaQjx+fDetqBOQ== + dependencies: + "@typescript-eslint/scope-manager" "8.7.0" + "@typescript-eslint/types" "8.7.0" + "@typescript-eslint/typescript-estree" "8.7.0" + "@typescript-eslint/visitor-keys" "8.7.0" + debug "^4.3.4" + "@typescript-eslint/scope-manager@7.18.0": version "7.18.0" resolved "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-7.18.0.tgz#c928e7a9fc2c0b3ed92ab3112c614d6bd9951c83" @@ -3372,7 +3388,7 @@ debug@3.1.0: dependencies: ms "2.0.0" -debug@4, debug@4.3.7, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1, debug@^4.3.2, debug@^4.3.3, debug@^4.3.4, debug@^4.3.6, debug@^4.3.7, debug@~4.3.1: +debug@4, debug@4.3.7, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1, debug@^4.3.2, debug@^4.3.3, debug@^4.3.4, debug@^4.3.5, debug@^4.3.6, debug@^4.3.7, debug@~4.3.1: version "4.3.7" resolved "https://registry.npmjs.org/debug/-/debug-4.3.7.tgz#87945b4151a011d76d95a198d7111c865c360a52" integrity sha512-Er2nc/H7RrMXZBFCEim6TCmMk02Z8vLC2Rbi1KEBggpo0fS6l0S1nnapwmIi3yW/+GOJap1Krg4w0Hg80oCqgQ== @@ -3784,7 +3800,7 @@ end-of-stream@^1.1.0, end-of-stream@^1.4.1: dependencies: once "^1.4.0" -enhanced-resolve@^5.16.0: +enhanced-resolve@^5.15.0, enhanced-resolve@^5.16.0: version "5.17.1" resolved "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.17.1.tgz#67bfbbcc2f81d511be77d686a90267ef7f898a15" integrity sha512-LMHl3dXhTcfv8gM4kEzIUeTQ+7fpdA0l2tUf34BddXPkz2A5xJ5L/Pchd5BL6rdccM9QGvu0sWZzK1Z1t4wwyg== @@ -3999,7 +4015,21 @@ eslint-import-resolver-node@^0.3.9: is-core-module "^2.13.0" resolve "^1.22.4" -eslint-module-utils@^2.9.0: +eslint-import-resolver-typescript@^3.6.3: + version "3.6.3" + resolved "https://registry.npmjs.org/eslint-import-resolver-typescript/-/eslint-import-resolver-typescript-3.6.3.tgz#bb8e388f6afc0f940ce5d2c5fd4a3d147f038d9e" + integrity sha512-ud9aw4szY9cCT1EWWdGv1L1XR6hh2PaRWif0j2QjQ0pgTY/69iw+W0Z4qZv5wHahOl8isEr+k/JnyAqNQkLkIA== + dependencies: + "@nolyfill/is-core-module" "1.0.39" + debug "^4.3.5" + enhanced-resolve "^5.15.0" + eslint-module-utils "^2.8.1" + fast-glob "^3.3.2" + get-tsconfig "^4.7.5" + is-bun-module "^1.0.2" + is-glob "^4.0.3" + +eslint-module-utils@^2.8.1, eslint-module-utils@^2.9.0: version "2.11.1" resolved "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.11.1.tgz#6d5a05f09af98f4d238a819ae4c23626a75fa65b" integrity sha512-EwcbfLOhwVMAfatfqLecR2yv3dE5+kQ8kx+Rrt0DvDXEVwW86KQ/xbMDQhtp5l42VXukD5SOF8mQQHbaNtO0CQ== @@ -4758,6 +4788,13 @@ get-symbol-description@^1.0.2: es-errors "^1.3.0" get-intrinsic "^1.2.4" +get-tsconfig@^4.7.5: + version "4.8.1" + resolved "https://registry.npmjs.org/get-tsconfig/-/get-tsconfig-4.8.1.tgz#8995eb391ae6e1638d251118c7b56de7eb425471" + integrity sha512-k9PN+cFBmaLWtVz29SkUoqU5O0slLuHJXt/2P+tMVFT+phsSGXGkp9t3rQIqdz0e+06EHNGs3oM6ZX1s2zHxRg== + dependencies: + resolve-pkg-maps "^1.0.0" + get-uri@^6.0.1: version "6.0.3" resolved "https://registry.npmjs.org/get-uri/-/get-uri-6.0.3.tgz#0d26697bc13cf91092e519aa63aa60ee5b6f385a" @@ -5278,6 +5315,13 @@ is-boolean-object@^1.1.0: call-bind "^1.0.2" has-tostringtag "^1.0.0" +is-bun-module@^1.0.2: + version "1.2.1" + resolved "https://registry.npmjs.org/is-bun-module/-/is-bun-module-1.2.1.tgz#495e706f42e29f086fd5fe1ac3c51f106062b9fc" + integrity sha512-AmidtEM6D6NmUiLOvvU7+IePxjEjOzra2h0pSrsfSAcXwl/83zLLXDByafUJy9k/rKK0pvXMLdwKwGHlX2Ke6Q== + dependencies: + semver "^7.6.3" + is-callable@^1.1.3, is-callable@^1.1.4, is-callable@^1.2.7: version "1.2.7" resolved "https://registry.npmjs.org/is-callable/-/is-callable-1.2.7.tgz#3bc2a85ea742d9e36205dcacdd72ca1fdc51b055" @@ -8102,6 +8146,11 @@ resolve-from@^5.0.0: resolved "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz#c35225843df8f776df21c57557bc087e9dfdfc69" integrity sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw== +resolve-pkg-maps@^1.0.0: + version "1.0.0" + resolved "https://registry.npmjs.org/resolve-pkg-maps/-/resolve-pkg-maps-1.0.0.tgz#616b3dc2c57056b5588c31cdf4b3d64db133720f" + integrity sha512-seS2Tj26TBVOC2NIc2rOe2y2ZO7efxITtLZcGSOnHHNOQ7CkiUBfw0Iw2ck6xkIhPwLhKNLS8BO+hEpngQlqzw== + resolve.exports@^2.0.0: version "2.0.2" resolved "https://registry.npmjs.org/resolve.exports/-/resolve.exports-2.0.2.tgz#f8c934b8e6a13f539e38b7098e2e36134f01e800" From cb8088e7d01b4b472720109bbfde500b3011d339 Mon Sep 17 00:00:00 2001 From: Marika Marszalkowski Date: Thu, 26 Sep 2024 18:51:17 +0200 Subject: [PATCH 03/10] fix lint issues --- .../connectivity/src/http-agent/http-agent.ts | 3 +++ .../src/scp-cf/authorization-header.ts | 3 ++- .../src/scp-cf/connectivity-service.ts | 8 +++--- .../destination/destination-from-vcap.ts | 2 +- .../service-binding-to-destination.ts | 2 +- .../service-credentials.ts | 1 + .../connectivity/src/scp-cf/get-protocol.ts | 2 +- .../scp-cf/header-builder-for-destination.ts | 2 +- packages/connectivity/src/scp-cf/index.ts | 1 - .../connectivity/src/scp-cf/token-accessor.ts | 5 +--- .../connectivity/src/scp-cf/xsuaa-service.ts | 5 +--- .../generator/src/complex-type/file.spec.ts | 2 +- .../src/edmx-parser/v2/edmx-parser.spec.ts | 10 ++++---- .../src/edmx-parser/v2/edmx-parser.ts | 2 +- .../src/edmx-parser/v4/edmx-parser.spec.ts | 2 +- .../src/edmx-parser/v4/edmx-parser.ts | 3 ++- .../src/edmx-to-vdm/common/complex-type.ts | 2 +- .../src/edmx-to-vdm/common/entity.ts | 4 +-- .../src/edmx-to-vdm/common/enum-type.ts | 2 +- .../edmx-to-vdm/common/operation-parameter.ts | 3 +-- .../common/operation-return-type.ts | 3 ++- .../src/edmx-to-vdm/common/operation.ts | 3 +-- .../src/edmx-to-vdm/description-util.ts | 2 +- .../src/edmx-to-vdm/edmx-to-vdm-util.ts | 8 +++--- .../src/edmx-to-vdm/v2/complex-type.ts | 6 ++--- .../generator/src/edmx-to-vdm/v2/entity.ts | 14 +++++------ .../src/edmx-to-vdm/v2/function-import.ts | 9 +++---- .../src/edmx-to-vdm/v2/service-entities.ts | 2 +- .../src/edmx-to-vdm/v4/complex-type.ts | 6 ++--- .../generator/src/edmx-to-vdm/v4/entity.ts | 11 +++----- .../generator/src/edmx-to-vdm/v4/enum-type.ts | 6 ++--- .../src/edmx-to-vdm/v4/operation-util.ts | 2 +- .../generator/src/edmx-to-vdm/v4/operation.ts | 13 +++++----- .../src/edmx-to-vdm/v4/service-entities.ts | 2 +- .../generator/src/entity/interface.spec.ts | 2 +- .../service/class.ts | 1 + packages/generator/src/generator.ts | 22 ++++++++-------- packages/generator/src/internal.ts | 1 - packages/generator/src/operations/import.ts | 2 +- .../generator/src/operations/operation.ts | 2 +- .../operations/request-builder-arguments.ts | 2 +- .../generator/src/operations/return-type.ts | 2 +- .../src/sdk-metadata/code-samples.ts | 2 +- packages/generator/src/service-base-path.ts | 4 +-- packages/generator/src/service-generator.ts | 14 ++++++----- .../odata-common/src/entity-serializer.ts | 25 +++++++++---------- packages/odata-common/src/expandable.ts | 4 +-- .../src/filter/filter-function-base.ts | 2 +- .../src/filter/filter-functions.ts | 2 +- .../odata-common/src/filter/filter-link.ts | 2 +- .../odata-common/src/filter/filter-list.ts | 1 + packages/odata-common/src/filter/filter.ts | 2 +- .../odata-common/src/filter/filterable.ts | 2 +- packages/odata-common/src/header-builder.ts | 3 +-- packages/odata-common/src/index.ts | 2 +- packages/odata-common/src/order/order-link.ts | 2 +- packages/odata-common/src/order/orderable.ts | 7 ++++-- .../batch/batch-request-builder.ts | 5 ++-- .../batch/batch-request-serializer.ts | 5 ++-- .../request-builder/count-request-builder.ts | 4 +-- .../create-request-builder-base.ts | 9 +++---- .../delete-request-builder-base.ts | 9 +++---- .../get-all-request-builder-base.ts | 4 +-- .../get-by-key-request-builder-base.ts | 9 +++---- .../get-request-builder-base.ts | 8 +++--- .../operation-request-builder-base.ts | 9 ++++--- .../request-builder/request-builder-base.ts | 4 +-- .../src/request-builder/request-builder.ts | 2 +- .../update-request-builder-base.ts | 14 +++++------ .../src/request/odata-batch-request-config.ts | 2 +- .../src/selectable/edm-type-field.ts | 2 +- .../src/selectable/one-to-many-link.ts | 5 ++-- .../selectable/orderable-edm-type-field.ts | 4 +-- .../src/de-serializers/entity-deserializer.ts | 1 + .../payload-value-converter.spec.ts | 2 +- packages/odata-v2/src/index.ts | 2 +- .../request-builder/response-transformers.ts | 2 +- .../odata-v2/src/selectable/custom-field.ts | 2 +- .../entity-deserializer.spec.ts | 2 +- .../src/de-serializers/entity-deserializer.ts | 1 + .../de-serializers/entity-serializer.spec.ts | 2 +- .../payload-value-converter.spec.ts | 2 +- packages/odata-v4/src/index.ts | 6 ++--- .../src/file-serializer/schema.ts | 2 +- packages/openapi-generator/src/generator.ts | 15 ++++++----- packages/openapi-generator/src/schema-util.ts | 2 +- 86 files changed, 194 insertions(+), 201 deletions(-) diff --git a/packages/connectivity/src/http-agent/http-agent.ts b/packages/connectivity/src/http-agent/http-agent.ts index f347257570..ba864248c0 100644 --- a/packages/connectivity/src/http-agent/http-agent.ts +++ b/packages/connectivity/src/http-agent/http-agent.ts @@ -9,12 +9,15 @@ import type { HttpDestination } from '../scp-cf'; /* Careful the proxy imports cause circular dependencies if imported from scp directly */ +// eslint-disable-next-line import/no-internal-modules import { getProtocolOrDefault } from '../scp-cf/get-protocol'; import { addProxyConfigurationInternet, getProxyConfig, proxyStrategy + // eslint-disable-next-line import/no-internal-modules } from '../scp-cf/destination/http-proxy-util'; +// eslint-disable-next-line import/no-internal-modules import { registerDestinationCache } from '../scp-cf/destination/register-destination-cache'; import type { HttpAgentConfig, HttpsAgentConfig } from './agent-config'; diff --git a/packages/connectivity/src/scp-cf/authorization-header.ts b/packages/connectivity/src/scp-cf/authorization-header.ts index 95a9b46b26..231dbb6658 100644 --- a/packages/connectivity/src/scp-cf/authorization-header.ts +++ b/packages/connectivity/src/scp-cf/authorization-header.ts @@ -9,7 +9,8 @@ import type { AuthenticationType, Destination, DestinationAuthToken -} from './destination/destination-service-types'; +} from './destination'; +// eslint-disable-next-line import/no-internal-modules import { sanitizeDestination } from './destination/destination'; const logger = createLogger({ diff --git a/packages/connectivity/src/scp-cf/connectivity-service.ts b/packages/connectivity/src/scp-cf/connectivity-service.ts index 4b93eb11da..ae252d81f8 100644 --- a/packages/connectivity/src/scp-cf/connectivity-service.ts +++ b/packages/connectivity/src/scp-cf/connectivity-service.ts @@ -7,12 +7,12 @@ import type { } from './connectivity-service-types'; import type { AuthenticationType, - Destination -} from './destination/destination-service-types'; + Destination, + SubscriberToken +} from './destination'; import { getServiceBindings } from './environment-accessor'; -import type { Service } from './environment-accessor/environment-accessor-types'; +import type { Service } from './environment-accessor'; import { serviceToken } from './token-accessor'; -import type { SubscriberToken } from './destination'; const logger = createLogger({ package: 'connectivity', 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 70175421fc..42d508ba94 100644 --- a/packages/connectivity/src/scp-cf/destination/destination-from-vcap.ts +++ b/packages/connectivity/src/scp-cf/destination/destination-from-vcap.ts @@ -1,7 +1,7 @@ import { createLogger } from '@sap-cloud-sdk/util'; import type { JwtPayload } from '../jsonwebtoken-type'; import { decodeJwt, decodeOrMakeJwt } from '../jwt'; -import type { Service } from '../environment-accessor/environment-accessor-types'; +import type { Service } from '../environment-accessor'; import { getServiceBindingByInstanceName } from '../environment-accessor'; import type { CachingOptions } from '../cache'; import { 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 c1782d0d9b..c1994dd591 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,4 +1,4 @@ -import type { Service } from '../environment-accessor/environment-accessor-types'; +import type { Service } from '../environment-accessor'; import { serviceToken } from '../token-accessor'; import { decodeJwt } from '../jwt'; import type { 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 5611a75e84..39261dd63f 100644 --- a/packages/connectivity/src/scp-cf/environment-accessor/service-credentials.ts +++ b/packages/connectivity/src/scp-cf/environment-accessor/service-credentials.ts @@ -1,5 +1,6 @@ import { createLogger } from '@sap-cloud-sdk/util'; import type { JwtPayload } from '../jsonwebtoken-type'; +// eslint-disable-next-line import/no-internal-modules import { audiences, decodeJwt } from '../jwt/jwt'; import type { ServiceCredentials } from './environment-accessor-types'; import { getServiceBindings } from './service-bindings'; diff --git a/packages/connectivity/src/scp-cf/get-protocol.ts b/packages/connectivity/src/scp-cf/get-protocol.ts index 46d73b4d27..61baadc467 100644 --- a/packages/connectivity/src/scp-cf/get-protocol.ts +++ b/packages/connectivity/src/scp-cf/get-protocol.ts @@ -1,5 +1,5 @@ import { createLogger } from '@sap-cloud-sdk/util'; -import type { HttpDestination } from './destination/destination-service-types'; +import type { HttpDestination } from './destination'; import type { Protocol } from './protocol'; import { getProtocol } from './protocol'; 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 54c3460aa4..542b871407 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 type { Destination } from './destination/destination-service-types'; +import type { Destination } from './destination'; /** * 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/index.ts b/packages/connectivity/src/scp-cf/index.ts index 6bb0a92707..5f4ae64f74 100644 --- a/packages/connectivity/src/scp-cf/index.ts +++ b/packages/connectivity/src/scp-cf/index.ts @@ -5,7 +5,6 @@ export * from './client-credentials-token-cache'; export * from './connectivity-service'; export * from './connectivity-service-types'; export * from './environment-accessor'; -export * from './environment-accessor/environment-accessor-types'; export * from './get-protocol'; export * from './header-builder-for-destination'; export * from './identity-service'; diff --git a/packages/connectivity/src/scp-cf/token-accessor.ts b/packages/connectivity/src/scp-cf/token-accessor.ts index 3ee63a2598..cb8b7754df 100644 --- a/packages/connectivity/src/scp-cf/token-accessor.ts +++ b/packages/connectivity/src/scp-cf/token-accessor.ts @@ -9,10 +9,7 @@ import { import type { CachingOptions } from './cache'; import { clientCredentialsTokenCache } from './client-credentials-token-cache'; import { resolveServiceBinding } from './environment-accessor'; -import type { - Service, - XsuaaServiceCredentials -} from './environment-accessor/environment-accessor-types'; +import type { Service, XsuaaServiceCredentials } from './environment-accessor'; import { getClientCredentialsToken, getUserToken } from './xsuaa-service'; /** diff --git a/packages/connectivity/src/scp-cf/xsuaa-service.ts b/packages/connectivity/src/scp-cf/xsuaa-service.ts index 77a8c254a7..740a18832f 100644 --- a/packages/connectivity/src/scp-cf/xsuaa-service.ts +++ b/packages/connectivity/src/scp-cf/xsuaa-service.ts @@ -2,10 +2,7 @@ import { executeWithMiddleware } from '@sap-cloud-sdk/resilience/internal'; 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 type { Service, ServiceCredentials } from './environment-accessor'; import type { ClientCredentialsResponse } from './xsuaa-service-types'; import { getXsuaaService, resolveServiceBinding } from './environment-accessor'; import { decodeJwt, getSubdomain, getTenantId } from './jwt'; diff --git a/packages/generator/src/complex-type/file.spec.ts b/packages/generator/src/complex-type/file.spec.ts index 39fe0a573e..a142d25031 100644 --- a/packages/generator/src/complex-type/file.spec.ts +++ b/packages/generator/src/complex-type/file.spec.ts @@ -1,9 +1,9 @@ import { StructureKind } from 'ts-morph'; -import { complexTypeSourceFile } from '../complex-type'; import { complexMeal, complexMealWithDesert } from '../../test/test-util/data-model'; +import { complexTypeSourceFile } from './file'; describe('file', () => { it('complexTypeSourceFile', () => { diff --git a/packages/generator/src/edmx-parser/v2/edmx-parser.spec.ts b/packages/generator/src/edmx-parser/v2/edmx-parser.spec.ts index 37c40d5b79..19d0342706 100644 --- a/packages/generator/src/edmx-parser/v2/edmx-parser.spec.ts +++ b/packages/generator/src/edmx-parser/v2/edmx-parser.spec.ts @@ -1,14 +1,14 @@ import { resolve } from 'path'; import { readEdmxFile } from '../edmx-file-reader'; import { parseComplexTypesBase } from '../common'; +import { oDataServiceSpecs } from '../../../../../test-resources/odata-service-specs'; import { parseAssociation, parseAssociationSets, parseEntitySetsV2, - parseEntityTypes as parseEntityTypesV2, + parseEntityTypes, parseFunctionImportsV2 -} from '../v2'; -import { oDataServiceSpecs } from '../../../../../test-resources/odata-service-specs'; +} from './edmx-parser'; describe('edmx-edmx-parser', () => { it('v2: parses EDMX file to JSON and coerces properties to arrays', () => { @@ -17,13 +17,13 @@ describe('edmx-edmx-parser', () => { ); expect(parseEntitySetsV2(metadataEdmx.root).length).toBe(14); - expect(parseEntityTypesV2(metadataEdmx.root).length).toBe(12); + expect(parseEntityTypes(metadataEdmx.root).length).toBe(12); expect(parseFunctionImportsV2(metadataEdmx.root).length).toBe(15); expect(parseComplexTypesBase(metadataEdmx.root).length).toBe(3); expect(parseAssociationSets(metadataEdmx.root).length).toBe(8); expect(parseAssociation(metadataEdmx.root).length).toBe(8); - parseEntityTypesV2(metadataEdmx.root).forEach(e => { + parseEntityTypes(metadataEdmx.root).forEach(e => { expect(e.Key.PropertyRef).toBeInstanceOf(Array); expect(e.NavigationProperty).toBeInstanceOf(Array); expect(e.Property).toBeInstanceOf(Array); diff --git a/packages/generator/src/edmx-parser/v2/edmx-parser.ts b/packages/generator/src/edmx-parser/v2/edmx-parser.ts index b9149ad2d1..fcba257f40 100644 --- a/packages/generator/src/edmx-parser/v2/edmx-parser.ts +++ b/packages/generator/src/edmx-parser/v2/edmx-parser.ts @@ -4,7 +4,7 @@ import { parseComplexTypesBase, parseEntitySetsBase, parseEntityTypesBase -} from '../common/edmx-parser'; +} from '../common'; import type { EdmxComplexTypeBase, EdmxEntitySetBase } from '../common'; import { forceArray } from '../../generator-utils'; import type { diff --git a/packages/generator/src/edmx-parser/v4/edmx-parser.spec.ts b/packages/generator/src/edmx-parser/v4/edmx-parser.spec.ts index 8a50772836..40b803e267 100644 --- a/packages/generator/src/edmx-parser/v4/edmx-parser.spec.ts +++ b/packages/generator/src/edmx-parser/v4/edmx-parser.spec.ts @@ -9,7 +9,7 @@ import { parseEnumTypes, parseOperationImports, parseOperations -} from '../v4'; +} from './edmx-parser'; describe('edmx-edmx-parser', () => { it('parses IsBound with default false', () => { diff --git a/packages/generator/src/edmx-parser/v4/edmx-parser.ts b/packages/generator/src/edmx-parser/v4/edmx-parser.ts index 960890fd35..d0f063e5a4 100644 --- a/packages/generator/src/edmx-parser/v4/edmx-parser.ts +++ b/packages/generator/src/edmx-parser/v4/edmx-parser.ts @@ -5,8 +5,9 @@ import { parseComplexTypesBase, parseEntitySetsBase, parseEntityTypesBase -} from '../common/edmx-parser'; +} from '../common'; import { forceArray } from '../../generator-utils'; +// eslint-disable-next-line import/no-internal-modules import { stripNamespace } from '../../edmx-to-vdm/edmx-to-vdm-util'; import type { EdmxComplexType, 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 9e9ad18826..e0046a9dba 100644 --- a/packages/generator/src/edmx-to-vdm/common/complex-type.ts +++ b/packages/generator/src/edmx-to-vdm/common/complex-type.ts @@ -23,7 +23,7 @@ import { typesForCollection, enumTypeForName } from '../edmx-to-vdm-util'; -import type { EdmxComplexTypeBase } from '../../edmx-parser/common'; +import type { EdmxComplexTypeBase } from '../../edmx-parser'; 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 7752af9f46..ff96ef86de 100644 --- a/packages/generator/src/edmx-to-vdm/common/entity.ts +++ b/packages/generator/src/edmx-to-vdm/common/entity.ts @@ -3,7 +3,7 @@ import type { EdmxEntityTypeBase, EdmxNamed, JoinedEntityMetadata -} from '../../edmx-parser/common'; +} from '../../edmx-parser'; import { edmToFieldType, edmToTsType, @@ -15,7 +15,7 @@ import { } from '../../generator-utils'; import { applyPrefixOnJsConflictParam } from '../../name-formatting-strategies'; import type { ServiceNameFormatter } from '../../service-name-formatter'; -import type { SwaggerMetadata } from '../../swagger-parser/swagger-types'; +import type { SwaggerMetadata } from '../../swagger-parser'; import type { VdmComplexType, VdmEntity, 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 67f2200053..1f6417c501 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 type { ServiceNameFormatter } from '../../service-name-formatter'; import type { VdmEnumMemberType, VdmEnumType } from '../../vdm-types'; -import type { EdmxEnumType } from '../../edmx-parser/v4'; +import type { EdmxEnumType } from '../../edmx-parser'; 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 a555e946de..86fec77890 100644 --- a/packages/generator/src/edmx-to-vdm/common/operation-parameter.ts +++ b/packages/generator/src/edmx-to-vdm/common/operation-parameter.ts @@ -1,10 +1,9 @@ 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 type { EdmxParameter, EdmxFunctionImportV2 } from '../../edmx-parser'; 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 0c0caa5e95..e5a03559f0 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,7 +1,8 @@ import { first } from '@sap-cloud-sdk/util'; import voca from 'voca'; -import type { EdmxReturnType } from '../../edmx-parser/v4'; +import type { EdmxReturnType } from '../../edmx-parser'; import { isNullableProperty } from '../../generator-utils'; +// eslint-disable-next-line import/no-internal-modules import { getApiName } from '../../generator-without-ts-morph/service'; import type { VdmComplexType, diff --git a/packages/generator/src/edmx-to-vdm/common/operation.ts b/packages/generator/src/edmx-to-vdm/common/operation.ts index 29c901cb7f..094a3cfde1 100644 --- a/packages/generator/src/edmx-to-vdm/common/operation.ts +++ b/packages/generator/src/edmx-to-vdm/common/operation.ts @@ -1,6 +1,5 @@ import { pascalCase } from '@sap-cloud-sdk/util'; -import type { EdmxParameter } from '../../edmx-parser/common'; -import type { EdmxFunctionImportV2 } from '../../edmx-parser/v2'; +import type { EdmxParameter, EdmxFunctionImportV2 } from '../../edmx-parser'; import type { ServiceNameFormatter } from '../../service-name-formatter'; import type { SwaggerPath } from '../../swagger-parser'; import type { VdmOperationBase } from '../../vdm-types'; diff --git a/packages/generator/src/edmx-to-vdm/description-util.ts b/packages/generator/src/edmx-to-vdm/description-util.ts index 9f7c684ced..66d47ed090 100644 --- a/packages/generator/src/edmx-to-vdm/description-util.ts +++ b/packages/generator/src/edmx-to-vdm/description-util.ts @@ -6,7 +6,7 @@ import type { EdmxParameter, EdmxProperty, JoinedEntityMetadata -} from '../edmx-parser/common'; +} from '../edmx-parser'; import type { SwaggerDescribed, SwaggerPath, diff --git a/packages/generator/src/edmx-to-vdm/edmx-to-vdm-util.ts b/packages/generator/src/edmx-to-vdm/edmx-to-vdm-util.ts index dd4d2ae3ef..e2e6052663 100644 --- a/packages/generator/src/edmx-to-vdm/edmx-to-vdm-util.ts +++ b/packages/generator/src/edmx-to-vdm/edmx-to-vdm-util.ts @@ -1,7 +1,9 @@ import { createLogger, last } from '@sap-cloud-sdk/util'; -import type { EdmxProperty } from '../edmx-parser/common/edmx-types'; -import type { EdmxMetadata } from '../edmx-parser/edmx-file-reader'; -import type { EdmxFunctionImportV2 } from '../edmx-parser/v2/edm-types'; +import type { + EdmxProperty, + EdmxMetadata, + EdmxFunctionImportV2 +} from '../edmx-parser'; import { edmToFieldType, edmToTsType, 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 f79f452219..cf4d850333 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 { transformComplexTypesBase } from '../common'; import type { ServiceNameFormatter } from '../../service-name-formatter'; import type { VdmComplexType } from '../../vdm-types'; -import { parseComplexTypesV2 } from '../../edmx-parser/v2/edmx-parser'; -import type { ServiceMetadata } from '../../edmx-parser/edmx-file-reader'; +import { parseComplexTypesV2 } from '../../edmx-parser'; +import type { ServiceMetadata } from '../../edmx-parser'; /** * @internal diff --git a/packages/generator/src/edmx-to-vdm/v2/entity.ts b/packages/generator/src/edmx-to-vdm/v2/entity.ts index 988594fe98..9174a8ba53 100644 --- a/packages/generator/src/edmx-to-vdm/v2/entity.ts +++ b/packages/generator/src/edmx-to-vdm/v2/entity.ts @@ -3,7 +3,7 @@ import { joinEntityMetadata, navigationPropertyBase, transformEntityBase -} from '../common/entity'; +} from '../common'; import type { VdmComplexType, VdmEntity, @@ -12,22 +12,20 @@ import type { import type { ServiceNameFormatter } from '../../service-name-formatter'; import type { EdmxEntitySetBase, - JoinedEntityMetadata -} from '../../edmx-parser/common/edmx-types'; -import type { + JoinedEntityMetadata, EdmxAssociation, EdmxAssociationSet, EdmxEntityTypeV2, End, - JoinedAssociationMetadata -} from '../../edmx-parser/v2/edm-types'; + JoinedAssociationMetadata, + ServiceMetadata +} from '../../edmx-parser'; import { parseAssociation, parseAssociationSets, parseEntitySetsV2, parseEntityTypes -} from '../../edmx-parser/v2/edmx-parser'; -import type { ServiceMetadata } from '../../edmx-parser/edmx-file-reader'; +} from '../../edmx-parser'; 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 af7593ea5c..007df1d4fd 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,9 @@ import type { ServiceNameFormatter } from '../../service-name-formatter'; -import { transformOperationBase } from '../common/operation'; -import { parseOperationReturnType } from '../common/operation-return-type'; +import { transformOperationBase, parseOperationReturnType } from '../common'; import type { VdmComplexType, VdmEntity, VdmOperation } from '../../vdm-types'; -import { getSwaggerDefinitionForOperation } from '../../swagger-parser/swagger-parser'; -import { parseFunctionImportsV2 } from '../../edmx-parser/v2/edmx-parser'; -import type { ServiceMetadata } from '../../edmx-parser/edmx-file-reader'; +import { getSwaggerDefinitionForOperation } from '../../swagger-parser'; +import { parseFunctionImportsV2 } from '../../edmx-parser'; +import type { ServiceMetadata } from '../../edmx-parser'; 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 b1970df156..18c40c5c5a 100644 --- a/packages/generator/src/edmx-to-vdm/v2/service-entities.ts +++ b/packages/generator/src/edmx-to-vdm/v2/service-entities.ts @@ -1,4 +1,4 @@ -import type { ServiceMetadata } from '../../edmx-parser/edmx-file-reader'; +import type { ServiceMetadata } from '../../edmx-parser'; import type { VdmServiceEntities } from '../../vdm-types'; import { ServiceNameFormatter } from '../../service-name-formatter'; import { generateFunctionImportsV2 } from './function-import'; 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 b850d19784..39fb9a35f5 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 { transformComplexTypesBase } from '../common'; import type { ServiceNameFormatter } from '../../service-name-formatter'; import type { VdmComplexType, VdmEnumType } from '../../vdm-types'; -import { parseComplexTypesV4 } from '../../edmx-parser/v4/edmx-parser'; -import type { ServiceMetadata } from '../../edmx-parser/edmx-file-reader'; +import { parseComplexTypesV4 } from '../../edmx-parser'; +import type { ServiceMetadata } from '../../edmx-parser'; /** * @internal diff --git a/packages/generator/src/edmx-to-vdm/v4/entity.ts b/packages/generator/src/edmx-to-vdm/v4/entity.ts index 5296989e97..428d43c1e0 100644 --- a/packages/generator/src/edmx-to-vdm/v4/entity.ts +++ b/packages/generator/src/edmx-to-vdm/v4/entity.ts @@ -1,12 +1,9 @@ -import type { ServiceMetadata } from '../../edmx-parser/edmx-file-reader'; import type { + ServiceMetadata, EdmxEntitySet, EdmxEntityTypeV4 -} from '../../edmx-parser/v4/edm-types'; -import { - parseEntitySetsV4, - parseEntityType -} from '../../edmx-parser/v4/edmx-parser'; +} from '../../edmx-parser'; +import { parseEntitySetsV4, parseEntityType } from '../../edmx-parser'; import type { ServiceNameFormatter } from '../../service-name-formatter'; import type { VdmComplexType, @@ -20,7 +17,7 @@ import { joinEntityMetadata, navigationPropertyBase, transformEntityBase -} from '../common/entity'; +} from '../common'; import { isCollectionType } from '../edmx-to-vdm-util'; import { generateBoundOperations } from './operation'; 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 b2ba3ba9c6..9c74323761 100644 --- a/packages/generator/src/edmx-to-vdm/v4/enum-type.ts +++ b/packages/generator/src/edmx-to-vdm/v4/enum-type.ts @@ -1,8 +1,8 @@ import type { ServiceNameFormatter } from '../../service-name-formatter'; -import { parseEnumTypes } from '../../edmx-parser/v4/edmx-parser'; -import type { ServiceMetadata } from '../../edmx-parser/edmx-file-reader'; +import { parseEnumTypes } from '../../edmx-parser'; +import type { ServiceMetadata } from '../../edmx-parser'; import type { VdmEnumType } from '../../vdm-types'; -import { transformEnumTypesBase } from '../common/enum-type'; +import { transformEnumTypesBase } from '../common'; /** * @internal 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 4f7f66d0dc..26989f06a4 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 type { EdmxOperation } from '../../edmx-parser/v4/edm-types'; +import type { EdmxOperation } from '../../edmx-parser'; import { stripNamespace } from '../edmx-to-vdm-util'; /** diff --git a/packages/generator/src/edmx-to-vdm/v4/operation.ts b/packages/generator/src/edmx-to-vdm/v4/operation.ts index bc1b920f87..91d64a8d1c 100644 --- a/packages/generator/src/edmx-to-vdm/v4/operation.ts +++ b/packages/generator/src/edmx-to-vdm/v4/operation.ts @@ -1,21 +1,20 @@ import { createLogger } from '@sap-cloud-sdk/util'; -import type { EdmxParameter } from '../../edmx-parser'; -import { parseOperationImports, parseOperations } from '../../edmx-parser'; -import type { ServiceMetadata } from '../../edmx-parser/edmx-file-reader'; import type { + EdmxParameter, + ServiceMetadata, EdmxOperation, EdmxOperationImport, EdmxReturnType -} from '../../edmx-parser/v4/edm-types'; +} from '../../edmx-parser'; +import { parseOperationImports, parseOperations } from '../../edmx-parser'; import type { ServiceNameFormatter } from '../../service-name-formatter'; -import { getSwaggerDefinitionForOperation } from '../../swagger-parser/swagger-parser'; +import { getSwaggerDefinitionForOperation } from '../../swagger-parser'; import type { VdmComplexType, VdmOperation, VdmPartialEntity } from '../../vdm-types'; -import { transformOperationBase } from '../common/operation'; -import { parseOperationReturnType } from '../common/operation-return-type'; +import { transformOperationBase, parseOperationReturnType } from '../common'; import { hasUnsupportedParameterTypes } from '../edmx-to-vdm-util'; import { findOperationByImportName } from './operation-util'; 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 1455543ff6..c76b69ce29 100644 --- a/packages/generator/src/edmx-to-vdm/v4/service-entities.ts +++ b/packages/generator/src/edmx-to-vdm/v4/service-entities.ts @@ -1,4 +1,4 @@ -import type { ServiceMetadata } from '../../edmx-parser/edmx-file-reader'; +import type { ServiceMetadata } from '../../edmx-parser'; import { ServiceNameFormatter } from '../../service-name-formatter'; import type { VdmServiceEntities } from '../../vdm-types'; import { generateUnboundOperations } from './operation'; diff --git a/packages/generator/src/entity/interface.spec.ts b/packages/generator/src/entity/interface.spec.ts index e6a5efa040..a5dbb58b1a 100644 --- a/packages/generator/src/entity/interface.spec.ts +++ b/packages/generator/src/entity/interface.spec.ts @@ -1,4 +1,3 @@ -import { entityTypeInterface } from '../entity'; import { breakfastEntity, breakfastTime, @@ -7,6 +6,7 @@ import { numberOfEggs, toBrunch } from '../../test/test-util/data-model'; +import { entityTypeInterface } from './interface'; describe('entity interface generator', () => { it('creates an interface', () => { 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 d2a8a5bbbf..4ae43fca51 100644 --- a/packages/generator/src/generator-without-ts-morph/service/class.ts +++ b/packages/generator/src/generator-without-ts-morph/service/class.ts @@ -2,6 +2,7 @@ import type { ODataVersion } from '@sap-cloud-sdk/util'; import { codeBlock } from '@sap-cloud-sdk/util'; import voca from 'voca'; import type { VdmEntity, VdmServiceMetadata } from '../../vdm-types'; +// eslint-disable-next-line import/no-internal-modules import { matchEntity } from '../entity-api/match-entity'; import { getGenericTypes, diff --git a/packages/generator/src/generator.ts b/packages/generator/src/generator.ts index abad0d75aa..b746501139 100644 --- a/packages/generator/src/generator.ts +++ b/packages/generator/src/generator.ts @@ -35,23 +35,23 @@ import { QuoteKind, ScriptTarget } from 'ts-morph'; -import { batchSourceFile } from './batch/file'; -import { complexTypeSourceFile } from './complex-type/file'; -import { entitySourceFile } from './entity/file'; -import { enumTypeSourceFile } from './enum-type/file'; +import { batchSourceFile } from './batch'; +import { complexTypeSourceFile } from './complex-type'; +import { entitySourceFile } from './entity'; +import { enumTypeSourceFile } from './enum-type'; import { sourceFile } from './file-generator'; 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'; -import { serviceFile } from './generator-without-ts-morph/service/file'; -import { operationsSourceFile } from './operations/file'; +import { + entityApiFile, + requestBuilderSourceFile, + serviceFile +} from './generator-without-ts-morph'; +import { operationsSourceFile } from './operations'; import { sdkMetadata } from './sdk-metadata'; import { parseAllServices } from './service-generator'; -import { indexFile } from './service/index-file'; -import { packageJson } from './service/package-json'; -import { readme } from './service/readme'; +import { indexFile, packageJson, readme } from './service'; import type { VdmServiceMetadata } from './vdm-types'; const { mkdir, readdir } = fsPromises; diff --git a/packages/generator/src/internal.ts b/packages/generator/src/internal.ts index 4f72c2324b..67afb82f6e 100644 --- a/packages/generator/src/internal.ts +++ b/packages/generator/src/internal.ts @@ -12,7 +12,6 @@ export * from './generator-utils'; // Had to be added for public API check // generator-without-ts-morph will be removed once we finished the migration to template-based generation export * from './generator-without-ts-morph'; -export * from './generator-without-ts-morph/request-builder'; export * from './imports'; export * from './input-path-provider'; export * from './internal-prefix'; diff --git a/packages/generator/src/operations/import.ts b/packages/generator/src/operations/import.ts index aa09634429..1963144913 100644 --- a/packages/generator/src/operations/import.ts +++ b/packages/generator/src/operations/import.ts @@ -12,7 +12,7 @@ import { externalImportDeclarationsTsMorph, mergeImportDeclarations } from '../imports'; -import { cannotDeserialize } from '../edmx-to-vdm/common'; +import { cannotDeserialize } from '../edmx-to-vdm'; import { responseTransformerFunctionName } from './response-transformer-function'; function complexTypeRelatedImports(returnTypes: VdmOperationReturnType[]) { diff --git a/packages/generator/src/operations/operation.ts b/packages/generator/src/operations/operation.ts index d84619a2b0..e77a926e7d 100644 --- a/packages/generator/src/operations/operation.ts +++ b/packages/generator/src/operations/operation.ts @@ -3,7 +3,7 @@ import type { FunctionLikeDeclarationStructure } from 'ts-morph'; import { StructureKind } from 'ts-morph'; -import { cannotDeserialize } from '../edmx-to-vdm/common'; +import { cannotDeserialize } from '../edmx-to-vdm'; 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/request-builder-arguments.ts b/packages/generator/src/operations/request-builder-arguments.ts index 3d3607bff3..6f1ac27dc2 100644 --- a/packages/generator/src/operations/request-builder-arguments.ts +++ b/packages/generator/src/operations/request-builder-arguments.ts @@ -1,5 +1,5 @@ import type { VdmOperation, VdmServiceMetadata } from '../vdm-types'; -import { cannotDeserialize } from '../edmx-to-vdm/common'; +import { cannotDeserialize } from '../edmx-to-vdm'; import { responseTransformerFunctionName } from './response-transformer-function'; /** diff --git a/packages/generator/src/operations/return-type.ts b/packages/generator/src/operations/return-type.ts index aee7e1692d..d051f71ed3 100644 --- a/packages/generator/src/operations/return-type.ts +++ b/packages/generator/src/operations/return-type.ts @@ -1,5 +1,5 @@ import type { VdmOperation } from '../vdm-types'; -import { cannotDeserialize } from '../edmx-to-vdm/common'; +import { cannotDeserialize } from '../edmx-to-vdm'; /** * @internal */ diff --git a/packages/generator/src/sdk-metadata/code-samples.ts b/packages/generator/src/sdk-metadata/code-samples.ts index 8ef3e1a1c6..aa8288efd6 100644 --- a/packages/generator/src/sdk-metadata/code-samples.ts +++ b/packages/generator/src/sdk-metadata/code-samples.ts @@ -2,7 +2,7 @@ import { codeBlock } from '@sap-cloud-sdk/util'; import type { MultiLineText } from '@sap-cloud-sdk/generator-common/internal'; import voca from 'voca'; import type { VdmOperation } from '../vdm-types'; -import { getApiName } from '../generator-without-ts-morph/service'; +import { getApiName } from '../generator-without-ts-morph'; import { getOperationParams } from './code-sample-util'; /** diff --git a/packages/generator/src/service-base-path.ts b/packages/generator/src/service-base-path.ts index e60662836a..a9341812ec 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 type { ServiceOptions } from '@sap-cloud-sdk/generator-common/internal'; -import { basePathFromSwagger } from './swagger-parser/swagger-util'; -import type { ServiceMetadata } from './edmx-parser/edmx-file-reader'; +import { basePathFromSwagger } from './swagger-parser'; +import type { ServiceMetadata } from './edmx-parser'; const logger = createLogger({ package: 'generator', diff --git a/packages/generator/src/service-generator.ts b/packages/generator/src/service-generator.ts index 4230a7ed2b..390ecf92c6 100644 --- a/packages/generator/src/service-generator.ts +++ b/packages/generator/src/service-generator.ts @@ -5,16 +5,18 @@ import { getRelPathWithPosixSeparator } from '@sap-cloud-sdk/generator-common/internal'; 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 type { ServiceMetadata } from './edmx-parser'; +import { readEdmxAndSwaggerFile } from './edmx-parser'; +import { apiBusinessHubMetadata } from './swagger-parser'; 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'; +import { + isV2Metadata, + getServiceEntitiesV2, + getServiceEntitiesV4 +} from './edmx-to-vdm'; import { getBasePath } from './service-base-path'; class ServiceGenerator { diff --git a/packages/odata-common/src/entity-serializer.ts b/packages/odata-common/src/entity-serializer.ts index 4811db6446..960db02931 100644 --- a/packages/odata-common/src/entity-serializer.ts +++ b/packages/odata-common/src/entity-serializer.ts @@ -1,20 +1,19 @@ import { createLogger, upperCaseSnakeCase } from '@sap-cloud-sdk/util'; import type { EntityBase } from './entity-base'; -import type { - ComplexTypeNamespace, - 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 type { ComplexTypeNamespace, PropertyMetadata } from './selectable'; +import { + isComplexTypeNameSpace, + EdmTypeField, + OneToOneLink, + Link, + ComplexTypeField, + CollectionField, + EnumField +} from './selectable'; 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 { DeSerializers } from './de-serializers'; +import { createValueSerializer } from './de-serializers'; import type { EntityApi } from './entity-api'; const logger = createLogger({ diff --git a/packages/odata-common/src/expandable.ts b/packages/odata-common/src/expandable.ts index 4a89e319ce..847eb69fa5 100644 --- a/packages/odata-common/src/expandable.ts +++ b/packages/odata-common/src/expandable.ts @@ -1,8 +1,6 @@ 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 { OneToManyLink, OneToOneLink, AllFields } from './selectable'; import type { EntityApi } from './entity-api'; /** diff --git a/packages/odata-common/src/filter/filter-function-base.ts b/packages/odata-common/src/filter/filter-function-base.ts index 251deadf08..98c96bf41e 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 type moment from 'moment'; import type { EdmTypeShared } from '../edm-types'; import type { EntityBase, ODataVersionOf } from '../entity-base'; -import type { Field } from '../selectable/field'; +import type { Field } from '../selectable'; import { Filter } from './filter'; /** diff --git a/packages/odata-common/src/filter/filter-functions.ts b/packages/odata-common/src/filter/filter-functions.ts index 1391fda1ae..fd2e52980c 100644 --- a/packages/odata-common/src/filter/filter-functions.ts +++ b/packages/odata-common/src/filter/filter-functions.ts @@ -2,7 +2,7 @@ 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 { Field } from '../selectable'; import type { StringFilterFunction } from './string-filter-function'; import type { BooleanFilterFunction } from './boolean-filter-function'; import { filterFunction } from './filter-function'; diff --git a/packages/odata-common/src/filter/filter-link.ts b/packages/odata-common/src/filter/filter-link.ts index 6161c3c78d..8fd2fa9e04 100644 --- a/packages/odata-common/src/filter/filter-link.ts +++ b/packages/odata-common/src/filter/filter-link.ts @@ -1,6 +1,6 @@ import type { DeSerializers } from '../de-serializers'; import type { EntityBase, EntityIdentifiable } from '../entity-base'; -import type { Link } from '../selectable/link'; +import type { Link } from '../selectable'; 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 b4cf160269..2c0ae675dd 100644 --- a/packages/odata-common/src/filter/filter-list.ts +++ b/packages/odata-common/src/filter/filter-list.ts @@ -1,5 +1,6 @@ import type { DeSerializers } from '../de-serializers'; import type { EntityBase, EntityIdentifiable } from '../entity-base'; +// eslint-disable-next-line import/no-internal-modules 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 d90adcf6b0..17b99899f1 100644 --- a/packages/odata-common/src/filter/filter.ts +++ b/packages/odata-common/src/filter/filter.ts @@ -1,4 +1,4 @@ -import type { DeSerializers } from '../de-serializers/de-serializers'; +import type { DeSerializers } from '../de-serializers'; import type { EdmTypeShared } from '../edm-types'; import type { EntityBase, diff --git a/packages/odata-common/src/filter/filterable.ts b/packages/odata-common/src/filter/filterable.ts index 95473723c9..ddd5d73093 100644 --- a/packages/odata-common/src/filter/filterable.ts +++ b/packages/odata-common/src/filter/filterable.ts @@ -1,6 +1,6 @@ import { transformVariadicArgumentToArray } from '@sap-cloud-sdk/util'; import type { EntityBase } from '../entity-base'; -import type { OneToManyLink } from '../selectable/one-to-many-link'; +import type { OneToManyLink } from '../selectable'; import type { DeSerializers } from '../de-serializers'; import type { EntityApi } from '../entity-api'; import type { BooleanFilterFunction } from './boolean-filter-function'; diff --git a/packages/odata-common/src/header-builder.ts b/packages/odata-common/src/header-builder.ts index 5140359a13..5c83f2b0d4 100644 --- a/packages/odata-common/src/header-builder.ts +++ b/packages/odata-common/src/header-builder.ts @@ -6,8 +6,7 @@ * @returns Key-value pairs where the key is the name of a header property and the value is the respective value. */ import type { OriginOptions } from '@sap-cloud-sdk/http-client'; -import type { ODataRequest } from './request/odata-request'; -import type { ODataRequestConfig } from './request/odata-request-config'; +import type { ODataRequest, ODataRequestConfig } from './request'; /** * Create Headers from request object. diff --git a/packages/odata-common/src/index.ts b/packages/odata-common/src/index.ts index ac4bcc2783..60e20a0c38 100644 --- a/packages/odata-common/src/index.ts +++ b/packages/odata-common/src/index.ts @@ -4,7 +4,7 @@ * @module @sap-cloud-sdk/odata-common */ -export { WithBatchReference } from './request/odata-request-traits'; +export { WithBatchReference } from './request'; export { and, or, diff --git a/packages/odata-common/src/order/order-link.ts b/packages/odata-common/src/order/order-link.ts index dff85d7e5d..803bb83572 100644 --- a/packages/odata-common/src/order/order-link.ts +++ b/packages/odata-common/src/order/order-link.ts @@ -1,5 +1,5 @@ import type { EntityBase } from '../entity-base'; -import type { Link } from '../selectable/link'; +import type { Link } from '../selectable'; import type { EntityApi, EntityType } from '../entity-api'; import type { Orderable } from './orderable'; diff --git a/packages/odata-common/src/order/orderable.ts b/packages/odata-common/src/order/orderable.ts index 1ef8db0230..ac2b53b772 100644 --- a/packages/odata-common/src/order/orderable.ts +++ b/packages/odata-common/src/order/orderable.ts @@ -1,7 +1,10 @@ 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 type { + ComplexTypePropertyFields, + SimpleTypeFields +} from '../selectable'; +// eslint-disable-next-line import/no-internal-modules import { Link } from '../selectable/link'; import type { EntityApi } from '../entity-api'; import { Order } from './order'; 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 5234c67aa0..356b4360d6 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 @@ -4,9 +4,8 @@ import { first } from '@sap-cloud-sdk/util'; 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 type { ODataRequest } from '../../request/odata-request'; +import type { ODataRequestConfig, ODataRequest } from '../../request'; +import { ODataBatchRequestConfig } from '../../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'; 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 4c7431c2e3..38a0c7387e 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,10 +1,9 @@ import { unixEOL } from '@sap-cloud-sdk/util'; import voca from 'voca'; -import { ODataRequest } from '../../request/odata-request'; -import type { ODataRequestConfig } from '../../request/odata-request-config'; +import { ODataRequest } from '../../request'; +import type { ODataRequestConfig, WithBatchReference } from '../../request'; 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 type { BatchRequestSerializationOptions, 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 7dba338354..fe154ebb47 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 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 type { DeSerializers } from '../de-serializers/de-serializers'; +import { ODataCountRequestConfig } from '../request'; +import type { DeSerializers } from '../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.ts b/packages/odata-common/src/request-builder/create-request-builder-base.ts index 8e68de0a94..604a35205d 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 @@ -7,14 +7,11 @@ import type { ODataUri } from '../uri-conversion'; 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 { ODataCreateRequestConfig } from '../request'; import type { Link } from '../selectable'; -import type { DeSerializers } from '../de-serializers/de-serializers'; +import type { DeSerializers } from '../de-serializers'; import type { EntityApi } from '../entity-api'; -import type { - BatchReference, - WithBatchReference -} from '../request/odata-request-traits'; +import type { BatchReference, WithBatchReference } from '../request'; import { MethodRequestBuilder } from './request-builder-base'; /** 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 a8cfe9b43b..0ead04a022 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 @@ -5,13 +5,10 @@ import { v4 as uuid } from 'uuid'; 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 type { DeSerializers } from '../de-serializers/de-serializers'; +import { ODataDeleteRequestConfig } from '../request'; +import type { DeSerializers } from '../de-serializers'; import type { EntityApi } from '../entity-api'; -import type { - BatchReference, - WithBatchReference -} from '../request/odata-request-traits'; +import type { BatchReference, WithBatchReference } from '../request'; import { MethodRequestBuilder } from './request-builder-base'; /** * Abstract class to delete an entity holding the shared parts between OData v2 and v4. 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 e85b55cab3..58bc95f853 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 @@ -4,10 +4,10 @@ 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 { ODataGetAllRequestConfig } from '../request'; import type { EntityDeserializer } from '../entity-deserializer'; import type { ResponseDataAccessor } from '../response-data-accessor'; -import type { DeSerializers } from '../de-serializers/de-serializers'; +import type { DeSerializers } from '../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 64363532de..7c1783a580 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 @@ -7,15 +7,12 @@ import { v4 as uuid } from 'uuid'; 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 { ODataGetByKeyRequestConfig } from '../request'; import type { Selectable } from '../selectable'; import type { ODataUri } from '../uri-conversion'; -import type { DeSerializers } from '../de-serializers/de-serializers'; +import type { DeSerializers } from '../de-serializers'; import type { EntityApi } from '../entity-api'; -import type { - BatchReference, - WithBatchReference -} from '../request/odata-request-traits'; +import type { BatchReference, WithBatchReference } from '../request'; import { GetRequestBuilderBase } from './get-request-builder-base'; /** * Abstract class to create a get by key request containing the shared functionality for OData v2 and v4. 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 d39d0604fa..60cde55dea 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 @@ -7,9 +7,11 @@ import type { 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 { + ODataGetAllRequestConfig, + ODataGetByKeyRequestConfig +} from '../request'; +import type { DeSerializers } from '../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 e5acc859bc..a80bb6a159 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,12 @@ 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 { ODataRequestConfig } from '../request/odata-request-config'; -import type { BatchReference, WithBatchReference } from '../request'; -import type { DeSerializers } from '../de-serializers/de-serializers'; +import type { + ODataRequestConfig, + BatchReference, + WithBatchReference +} from '../request'; +import type { DeSerializers } from '../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 d945f9d1b5..92b96a9104 100644 --- a/packages/odata-common/src/request-builder/request-builder-base.ts +++ b/packages/odata-common/src/request-builder/request-builder-base.ts @@ -10,8 +10,8 @@ import { } from '@sap-cloud-sdk/connectivity/internal'; 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 type { ODataRequestConfig } from '../request/odata-request-config'; +import { ODataRequest } from '../request'; +import type { ODataRequestConfig } from '../request'; /** * 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 234ba9d5ea..de7ebb310c 100644 --- a/packages/odata-common/src/request-builder/request-builder.ts +++ b/packages/odata-common/src/request-builder/request-builder.ts @@ -1,4 +1,4 @@ -import type { DeSerializers } from '../de-serializers/de-serializers'; +import type { DeSerializers } from '../de-serializers'; import type { EntityBase, EntityIdentifiable } from '../entity-base'; import type { EntityApi } from '../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 e6d95e041a..390c6a680e 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 @@ -7,16 +7,16 @@ import { v4 as uuid } from 'uuid'; import type { EntityBase, EntityIdentifiable } from '../entity-base'; import { extractEtagFromHeader } from '../entity-deserializer'; import type { EntitySerializer } from '../entity-serializer'; -import type { ODataRequest } from '../request/odata-request'; -import { ODataUpdateRequestConfig } from '../request/odata-update-request-config'; -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 { + ODataRequest, BatchReference, WithBatchReference -} from '../request/odata-request-traits'; +} from '../request'; +import { ODataUpdateRequestConfig } from '../request'; +import type { ODataUri } from '../uri-conversion'; +import type { Selectable } from '../selectable'; +import type { DeSerializers } from '../de-serializers'; +import type { EntityApi } from '../entity-api'; import { MethodRequestBuilder } from './request-builder-base'; /** 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 c5ae6ae52b..27dd272217 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 type { BatchSubRequestPathType } from '../request-builder/batch/batch-request-options'; +import type { BatchSubRequestPathType } from '../request-builder'; import { ODataRequestConfig } from './odata-request-config'; /** diff --git a/packages/odata-common/src/selectable/edm-type-field.ts b/packages/odata-common/src/selectable/edm-type-field.ts index 12c4611827..08a7dd8c24 100644 --- a/packages/odata-common/src/selectable/edm-type-field.ts +++ b/packages/odata-common/src/selectable/edm-type-field.ts @@ -1,5 +1,5 @@ import type { EntityBase, EntityIdentifiable } from '../entity-base'; -import { Filter } from '../filter/filter'; +import { Filter } from '../filter'; import type { EdmTypeShared } from '../edm-types'; import type { DeSerializers, DeserializedType } from '../de-serializers'; import { ComplexTypeField, getEntityConstructor } from './complex-type-field'; 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 dc956c17c3..2821024b5c 100644 --- a/packages/odata-common/src/selectable/one-to-many-link.ts +++ b/packages/odata-common/src/selectable/one-to-many-link.ts @@ -1,8 +1,9 @@ import type { EntityBase } from '../entity-base'; +// eslint-disable-next-line import/no-internal-modules import { FilterLink } from '../filter/filter-link'; -import type { Orderable } from '../order/orderable'; +import type { Orderable } from '../order'; import type { Filterable } from '../filter'; -import type { DeSerializers } from '../de-serializers/de-serializers'; +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.ts b/packages/odata-common/src/selectable/orderable-edm-type-field.ts index ce697444c7..ea8abf6b60 100644 --- a/packages/odata-common/src/selectable/orderable-edm-type-field.ts +++ b/packages/odata-common/src/selectable/orderable-edm-type-field.ts @@ -1,7 +1,7 @@ import type { EntityBase } from '../entity-base'; import type { EdmTypeShared } from '../edm-types'; -import { Filter } from '../filter/filter'; -import type { DeSerializers } from '../de-serializers/de-serializers'; +import { Filter } from '../filter'; +import type { DeSerializers } from '../de-serializers'; import type { FieldTypeByEdmType } from './edm-type-field'; import { EdmTypeField } from './edm-type-field'; diff --git a/packages/odata-v2/src/de-serializers/entity-deserializer.ts b/packages/odata-v2/src/de-serializers/entity-deserializer.ts index 3ea94fa9b7..6626a6a0aa 100644 --- a/packages/odata-v2/src/de-serializers/entity-deserializer.ts +++ b/packages/odata-v2/src/de-serializers/entity-deserializer.ts @@ -1,5 +1,6 @@ import type { EntityDeserializer } from '@sap-cloud-sdk/odata-common'; import { entityDeserializer as entityDeserializerBase } from '@sap-cloud-sdk/odata-common'; +// eslint-disable-next-line import/no-internal-modules import { getLinkedCollectionResult } from '../request-builder/response-data-accessor'; import { extractODataEtag } from '../extract-odata-etag'; import type { DeSerializers } from './de-serializers'; 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 de206cd721..bb4d0cebd9 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 @@ -5,7 +5,7 @@ import { serializeFromNumber } from '@sap-cloud-sdk/odata-common/internal'; import type { EdmType } from '../edm-types'; -import { defaultDeSerializers } from '../de-serializers'; +import { defaultDeSerializers } from './default-de-serializers'; import { edmToTs, tsToEdm } from './payload-value-converter'; describe('edmToTs()', () => { diff --git a/packages/odata-v2/src/index.ts b/packages/odata-v2/src/index.ts index a3e895ef2a..8bb1452071 100644 --- a/packages/odata-v2/src/index.ts +++ b/packages/odata-v2/src/index.ts @@ -22,7 +22,7 @@ export { transformReturnValueForEntity, transformReturnValueForEntityList, transformReturnValueForUndefined -} from './request-builder/response-transformers'; +} from './request-builder'; export { CreateRequestBuilder, diff --git a/packages/odata-v2/src/request-builder/response-transformers.ts b/packages/odata-v2/src/request-builder/response-transformers.ts index b7afb33cad..7108b1772b 100644 --- a/packages/odata-v2/src/request-builder/response-transformers.ts +++ b/packages/odata-v2/src/request-builder/response-transformers.ts @@ -1,6 +1,6 @@ import type { EntityApi } from '@sap-cloud-sdk/odata-common'; import { entityDeserializer } from '../de-serializers'; -import type { DeSerializers } from '../de-serializers/de-serializers'; +import type { DeSerializers } from '../de-serializers'; import type { Entity } from '../entity'; import { getSingleResult, getCollectionResult } from './response-data-accessor'; diff --git a/packages/odata-v2/src/selectable/custom-field.ts b/packages/odata-v2/src/selectable/custom-field.ts index 52f070f656..9df8a45351 100644 --- a/packages/odata-v2/src/selectable/custom-field.ts +++ b/packages/odata-v2/src/selectable/custom-field.ts @@ -1,6 +1,6 @@ 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 { DeSerializers } from '../de-serializers'; import type { Entity } from '../entity'; export class CustomField< diff --git a/packages/odata-v4/src/de-serializers/entity-deserializer.spec.ts b/packages/odata-v4/src/de-serializers/entity-deserializer.spec.ts index 7a5ad8cde1..f832d8ca4a 100644 --- a/packages/odata-v4/src/de-serializers/entity-deserializer.spec.ts +++ b/packages/odata-v4/src/de-serializers/entity-deserializer.spec.ts @@ -1,7 +1,7 @@ import { TestComplexType } from '@sap-cloud-sdk/test-services-odata-v4/test-service'; import { TestEnumType } from '@sap-cloud-sdk/test-services-odata-v4/test-service/TestEnumType'; -import { defaultDeSerializers } from '../de-serializers'; import { testEntityApi } from '../../test/test-util'; +import { defaultDeSerializers } from './default-de-serializers'; import { entityDeserializer } from './entity-deserializer'; describe('entity-deserializer', () => { diff --git a/packages/odata-v4/src/de-serializers/entity-deserializer.ts b/packages/odata-v4/src/de-serializers/entity-deserializer.ts index 62ac2c4f3a..b6205081a7 100644 --- a/packages/odata-v4/src/de-serializers/entity-deserializer.ts +++ b/packages/odata-v4/src/de-serializers/entity-deserializer.ts @@ -1,6 +1,7 @@ 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'; +// eslint-disable-next-line import/no-internal-modules import { getLinkedCollectionResult } from '../request-builder/response-data-accessor'; import type { DeSerializers } from './de-serializers'; diff --git a/packages/odata-v4/src/de-serializers/entity-serializer.spec.ts b/packages/odata-v4/src/de-serializers/entity-serializer.spec.ts index 2eaafaf2b2..9ed98cc0cd 100644 --- a/packages/odata-v4/src/de-serializers/entity-serializer.spec.ts +++ b/packages/odata-v4/src/de-serializers/entity-serializer.spec.ts @@ -2,8 +2,8 @@ import BigNumber from 'bignumber.js'; import { entitySerializer } from '@sap-cloud-sdk/odata-common'; import { TestComplexType } from '@sap-cloud-sdk/test-services-odata-v4/test-service'; import { TestEnumType } from '@sap-cloud-sdk/test-services-odata-v4/test-service/TestEnumType'; -import { defaultDeSerializers } from '../de-serializers'; import { testEntityApi, testEntitySingleLinkApi } from '../../test/test-util'; +import { defaultDeSerializers } from './default-de-serializers'; describe('entity-serializer', () => { const { serializeEntity, serializeComplexType } = diff --git a/packages/odata-v4/src/de-serializers/payload-value-converter.spec.ts b/packages/odata-v4/src/de-serializers/payload-value-converter.spec.ts index 1478361ae6..30e3b407ae 100644 --- a/packages/odata-v4/src/de-serializers/payload-value-converter.spec.ts +++ b/packages/odata-v4/src/de-serializers/payload-value-converter.spec.ts @@ -1,5 +1,5 @@ import moment from 'moment'; -import { defaultDeSerializers } from '../de-serializers'; +import { defaultDeSerializers } from './default-de-serializers'; import { edmToTs, tsToEdm } from './payload-value-converter'; describe('edmToTs()', () => { diff --git a/packages/odata-v4/src/index.ts b/packages/odata-v4/src/index.ts index 91e6bb50b5..c670b7c0e8 100644 --- a/packages/odata-v4/src/index.ts +++ b/packages/odata-v4/src/index.ts @@ -76,11 +76,9 @@ export type { BatchResponse } from './batch-response'; export type { ODataBoundActionRequestConfig, - ODataBoundActionImportRequestConfig -} from './request/odata-bound-action-request-config'; -export type { + ODataBoundActionImportRequestConfig, ODataBoundFunctionRequestConfig, OdataBoundFunctionImportRequestConfig -} from './request/odata-bound-function-request-config'; +} from './request'; export * from './common'; diff --git a/packages/openapi-generator/src/file-serializer/schema.ts b/packages/openapi-generator/src/file-serializer/schema.ts index 33824180a6..4ff4a8c809 100644 --- a/packages/openapi-generator/src/file-serializer/schema.ts +++ b/packages/openapi-generator/src/file-serializer/schema.ts @@ -4,7 +4,7 @@ import type { OpenApiObjectSchema, OpenApiObjectSchemaProperty } from '../openapi-types'; -import { getType } from '../parser/type-mapping'; +import { getType } from '../parser'; import { isReferenceObject, isArraySchema, diff --git a/packages/openapi-generator/src/generator.ts b/packages/openapi-generator/src/generator.ts index 37a5ae7fec..0d818551bc 100644 --- a/packages/openapi-generator/src/generator.ts +++ b/packages/openapi-generator/src/generator.ts @@ -25,13 +25,16 @@ import { getOptionsPerService, 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 { + apiFile, + packageJson, + readme, + schemaFile, + apiIndexFile, + schemaIndexFile +} from './file-serializer'; import type { OpenApiDocument } from './openapi-types'; -import { parseOpenApiDocument } from './parser/document'; +import { parseOpenApiDocument } from './parser'; import { convertOpenApiSpec } from './document-converter'; import { sdkMetadata } from './sdk-metadata'; import type { GeneratorOptions, ParsedGeneratorOptions } from './options'; diff --git a/packages/openapi-generator/src/schema-util.ts b/packages/openapi-generator/src/schema-util.ts index a917292725..54d66f467f 100644 --- a/packages/openapi-generator/src/schema-util.ts +++ b/packages/openapi-generator/src/schema-util.ts @@ -13,7 +13,7 @@ import type { OpenApiSchemaProperties, SchemaNaming } from './openapi-types'; -import type { SchemaRefMapping } from './parser/parsing-info'; +import type { SchemaRefMapping } from './parser'; /** * Collect all unique reference schemas within the given schemas. From f6d265fa66952b5b065a8da5c7685c29a2463bf9 Mon Sep 17 00:00:00 2001 From: Marika Marszalkowski Date: Thu, 26 Sep 2024 18:57:19 +0200 Subject: [PATCH 04/10] fixes after rebase --- packages/eslint-config/package.json | 2 + yarn.lock | 161 +++++++++++++--------------- 2 files changed, 78 insertions(+), 85 deletions(-) diff --git a/packages/eslint-config/package.json b/packages/eslint-config/package.json index 465149643b..d4abe49f59 100644 --- a/packages/eslint-config/package.json +++ b/packages/eslint-config/package.json @@ -27,7 +27,9 @@ "dependencies": { "@eslint/js": "^9.11.1", "@stylistic/eslint-plugin": "^2.8.0", + "@typescript-eslint/parser": "^8.7.0", "eslint-config-prettier": "^9.1.0", + "eslint-import-resolver-typescript": "^3.6.3", "eslint-plugin-import": "^2.30.0", "eslint-plugin-jsdoc": "^50.2.5", "eslint-plugin-prettier": "^5.2.1", diff --git a/yarn.lock b/yarn.lock index d2288320d8..b7194d3b25 100644 --- a/yarn.lock +++ b/yarn.lock @@ -433,6 +433,11 @@ resolved "https://registry.npmjs.org/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== +"@cap-js/cds-types@<=0.2.0": + version "0.2.0" + resolved "https://registry.npmjs.org/@cap-js/cds-types/-/cds-types-0.2.0.tgz#065c3df9f8891531e3d51a1e62398be14c665aa7" + integrity sha512-s4iVwAjf+rRIUu6jaEooXFcJv16+sP5CTkreQPxDUyxLWWGlhvEr67TuIH0C6Cnp4PPIsYmBK3AVxSW2mNc2wg== + "@changesets/apply-release-plan@^7.0.5": version "7.0.5" resolved "https://registry.npmjs.org/@changesets/apply-release-plan/-/apply-release-plan-7.0.5.tgz#3323c97afc08abc15e5136488f9c7cf1a864832e" @@ -823,13 +828,6 @@ wrap-ansi "^8.1.0" wrap-ansi-cjs "npm:wrap-ansi@^7.0.0" -"@isaacs/fs-minipass@^4.0.0": - version "4.0.1" - resolved "https://registry.npmjs.org/@isaacs/fs-minipass/-/fs-minipass-4.0.1.tgz#2d59ae3ab4b38fb4270bfa23d30f8e2e86c7fe32" - integrity sha512-wgm9Ehl2jpeqP3zw/7mo3kRHFp5MEDhqAdwy1fTGkHAwnkGOVsgpvQhL8B5n1qlb01jV3n/bI0ZfZp5lWA1k4w== - dependencies: - minipass "^7.0.4" - "@istanbuljs/load-nyc-config@^1.0.0": version "1.1.0" resolved "https://registry.npmjs.org/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz#fd3db1d59ecf7cf121e80650bb86712f9b55eced" @@ -1375,6 +1373,13 @@ resolved "https://registry.npmjs.org/@rtsao/scc/-/scc-1.1.0.tgz#927dd2fae9bc3361403ac2c7a00c32ddce9ad7e8" integrity sha512-zt6OdqaDoOnJ1ZYsCYGt9YmWzDXl4vQdKTyJev62gFhRGKdx7mcT54V9KIjg+d2wi9EXsPvAPKe7i7WjfVWB8g== +"@sap/cds-compiler@>=5.1": + version "5.2.0" + resolved "https://registry.npmjs.org/@sap/cds-compiler/-/cds-compiler-5.2.0.tgz#c83d153dc766860707ed962f33bf9e4bd5ff820a" + integrity sha512-ymp1ChXMbU5D6P6O7QOaM8J5DUVNjtm6hr8EXoQsywtwwKuMp5UfM5n6+ube1MmInU3L9nI57l/3G3MacK+6Qg== + dependencies: + antlr4 "4.9.3" + "@sap/cds-compiler@^3.2.0": version "3.9.12" resolved "https://registry.npmjs.org/@sap/cds-compiler/-/cds-compiler-3.9.12.tgz#3e40c0956bfbe2106b50a0ee9efabeca1b68f6c8" @@ -1382,6 +1387,13 @@ dependencies: antlr4 "4.9.3" +"@sap/cds-compiler@^4": + version "4.9.8" + resolved "https://registry.npmjs.org/@sap/cds-compiler/-/cds-compiler-4.9.8.tgz#7b3eb7dc31a3463060a5e29425ab45cd6e8c5123" + integrity sha512-DaodIJoYPpVygVf+9JU6XNW+WLDqX1sHklpj8qkrONLxM6G1TFBm5yrAT0P2YCibgNsGVhizA4eydgoHnVxUVQ== + dependencies: + antlr4 "4.9.3" + "@sap/cds-dk@7.9.4": version "7.9.4" resolved "https://registry.npmjs.org/@sap/cds-dk/-/cds-dk-7.9.4.tgz#199b4698468eb88f6eb1a92508f22ecbb5fd9d89" @@ -1404,6 +1416,11 @@ optionalDependencies: sqlite3 "^5.0.4" +"@sap/cds-fiori@^1": + version "1.2.7" + resolved "https://registry.npmjs.org/@sap/cds-fiori/-/cds-fiori-1.2.7.tgz#cdfec5437e6c35f3ce1f22db35701570abfc2787" + integrity sha512-F6Uf9wvkv0fXW+Fh7PiV2BbB/k+p1cFJLkQCCKDRJH8HvlxWEcXcn/YIvBrQGuX+GToi125MxB3wd712d8OLTA== + "@sap/cds-foss@^4": version "4.0.2" resolved "https://registry.npmjs.org/@sap/cds-foss/-/cds-foss-4.0.2.tgz#2910fa0a2f3dffb6a66c787de27cbfe564467412" @@ -1433,7 +1450,7 @@ "@sap/hdi-deploy" "^4" axios "^1" -"@sap/cds@>=5.6.0", "@sap/cds@^6.1.1", "@sap/cds@^7", "@sap/cds@^8.2.3": +"@sap/cds@>=5.6.0": version "6.8.4" resolved "https://registry.npmjs.org/@sap/cds/-/cds-6.8.4.tgz#c73adb8e61f9efb4eff705f125a717f214f8e49f" integrity sha512-CTf6Y732ABTIAQPwtFZpfLUzZgQLOs9ZqBIrHhFJRx3VQvopfBZlbWAhujz092xETM7u4msZudoUprkmRo0+hg== @@ -1441,6 +1458,25 @@ "@sap/cds-compiler" "^3.2.0" "@sap/cds-foss" "^4" +"@sap/cds@^7": + version "7.9.5" + resolved "https://registry.npmjs.org/@sap/cds/-/cds-7.9.5.tgz#8e3af0438badf7232ed3cbc418e43054a6269a0f" + integrity sha512-DNCpXWhwZzIShqjoxOTW9cyYB/mE8k/7d+lSp1BCRLnc30R2vEU0ScqZVngjIZfQFRKWkLePy9/FulAEhqv+wQ== + dependencies: + "@cap-js/cds-types" "<=0.2.0" + "@sap/cds-compiler" "^4" + "@sap/cds-fiori" "^1" + "@sap/cds-foss" "^5.0.0" + +"@sap/cds@^8.2.3": + version "8.2.3" + resolved "https://registry.npmjs.org/@sap/cds/-/cds-8.2.3.tgz#a685fd11aa97c13b10e15be7894c8985954e3baa" + integrity sha512-VZde7OvqMx2ehjwSIXfAqO20ROcn0G2H4ZBQA3FakQcFGz/7ay7fUsX+R/FWfQvDbwFUPqySHAWqoPPqkYJY+A== + dependencies: + "@sap/cds-compiler" ">=5.1" + "@sap/cds-fiori" "^1" + "@sap/cds-foss" "^5.0.0" + "@sap/eslint-plugin-cds@^3.0.1": version "3.0.2" resolved "https://registry.npmjs.org/@sap/eslint-plugin-cds/-/eslint-plugin-cds-3.0.2.tgz#c35d364fbd5a09287ea900e03db2ef5bb23aab0b" @@ -1768,11 +1804,6 @@ resolved "https://registry.npmjs.org/@types/license-checker/-/license-checker-25.0.6.tgz#c346285ee7e42bac58a4922059453f50a5d4175d" integrity sha512-ju/75+YPkNE5vX1iPer+qtI1eI/LqJVYZgOsmSHI1iiEM1bQL5Gh1lEvyjR9T7ZXVE1FwJa2doWJEEmPNwbZkw== -"@types/lodash@>=4.14.200": - version "4.17.9" - resolved "https://registry.npmjs.org/@types/lodash/-/lodash-4.17.9.tgz#0dc4902c229f6b8e2ac5456522104d7b1a230290" - integrity sha512-w9iWudx1XWOHW5lQRS9iKpK/XuRhnN+0T7HvdCCd802FYkT1AMTnxndJHGrNJwRoRHkslGr4S29tjm1cT7x/7w== - "@types/minimatch@^3.0.3": version "3.0.5" resolved "https://registry.npmjs.org/@types/minimatch/-/minimatch-3.0.5.tgz#1001cc5e6a3704b83c236027e77f2f58ea010f40" @@ -2757,7 +2788,7 @@ brace-expansion@^2.0.1: dependencies: balanced-match "^1.0.0" -braces@>=3.0.2, braces@^3.0.1, braces@^3.0.3, braces@~3.0.2: +braces@^3.0.1, braces@^3.0.3, braces@~3.0.2: version "3.0.3" resolved "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz#490332f40919452272d55a8480adc0c441358789" integrity sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA== @@ -2989,11 +3020,6 @@ chownr@^2.0.0: resolved "https://registry.npmjs.org/chownr/-/chownr-2.0.0.tgz#15bfbe53d2eab4cf70f18a8cd68ebe5b3cb1dece" integrity sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ== -chownr@^3.0.0: - version "3.0.0" - resolved "https://registry.npmjs.org/chownr/-/chownr-3.0.0.tgz#9855e64ecd240a9cc4267ce8a4aa5d24a1da15e4" - integrity sha512-+IxzY9BZOQd/XuYPRmrvEVjF/nqj5kgT4kEq7VofrDoM1MxoRjEWkrCC3EtLi59TVawxTAn+orJwFQcrqEN1+g== - chromium-bidi@0.6.5: version "0.6.5" resolved "https://registry.npmjs.org/chromium-bidi/-/chromium-bidi-0.6.5.tgz#31be98f9ee5c93fa99d240c680518c9293d8c6bb" @@ -3130,7 +3156,7 @@ color-name@^1.0.0, color-name@^1.1.4, color-name@~1.1.4: resolved "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2" integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA== -color-string@>=1.5.5, color-string@^1.6.0: +color-string@^1.6.0: version "1.9.1" resolved "https://registry.npmjs.org/color-string/-/color-string-1.9.1.tgz#4467f9146f036f855b764dfb5bf8582bf342c7a4" integrity sha512-shrVawQFojnZv6xM40anx4CkoDP+fZsw/ZerEMsW/pyzsRbElpsL/DBVW7q3ExxwusdNXI3lXpuhEZkzs8p5Eg== @@ -3607,13 +3633,12 @@ detective-es6@^5.0.0: dependencies: node-source-walk "^7.0.0" -detective-postcss@^6.1.0, detective-postcss@^7.0.0: - version "6.1.3" - resolved "https://registry.npmjs.org/detective-postcss/-/detective-postcss-6.1.3.tgz#51a2d4419327ad85d0af071c7054c79fafca7e73" - integrity sha512-7BRVvE5pPEvk2ukUWNQ+H2XOq43xENWbH0LcdCE14mwgTBEAMoAx+Fc1rdp76SmyZ4Sp48HlV7VedUnP6GA1Tw== +detective-postcss@^7.0.0: + version "7.0.0" + resolved "https://registry.npmjs.org/detective-postcss/-/detective-postcss-7.0.0.tgz#e9cff50836d67339a0bf4378f22dba4ed5809c01" + integrity sha512-pSXA6dyqmBPBuERpoOKKTUUjQCZwZPLRbd1VdsTbt6W+m/+6ROl4BbE87yQBUtLoK7yX8pvXHdKyM/xNIW9F7A== dependencies: is-url "^1.2.4" - postcss "^8.4.23" postcss-values-parser "^6.0.2" detective-sass@^6.0.0: @@ -3702,13 +3727,6 @@ doctrine@^3.0.0: dependencies: esutils "^2.0.2" -dot-prop@^6.0.1: - version "6.0.1" - resolved "https://registry.npmjs.org/dot-prop/-/dot-prop-6.0.1.tgz#fc26b3cf142b9e59b74dbd39ed66ce620c681083" - integrity sha512-tE7ztYzXHIeyvc7N+hR3oi7FIbf/NIjVP9hmAt3yMXzrQ072/fpjGLx2GxNxGxUl5V73MEqYzioOMoVhGMJ5cA== - dependencies: - is-obj "^2.0.0" - dotenv@10.0.0: version "10.0.0" resolved "https://registry.npmjs.org/dotenv/-/dotenv-10.0.0.tgz#3d4227b8fb95f81096cdd2b66653fb2c7085ba81" @@ -4841,18 +4859,6 @@ glob-parent@^6.0.2: dependencies: is-glob "^4.0.3" -glob@^10.3.7: - version "10.4.5" - resolved "https://registry.npmjs.org/glob/-/glob-10.4.5.tgz#f4d9f0b90ffdbab09c9d77f5f29b4262517b0956" - integrity sha512-7Bv8RF0k6xjo7d4A/PxYLbUCfb6c+Vpd2/mB2yRDlew7Jb5hEXiCD9ibfO7wpk8i4sevK6DFny9h7EYbM3/sHg== - dependencies: - foreground-child "^3.1.0" - jackspeak "^3.1.2" - minimatch "^9.0.4" - minipass "^7.1.2" - package-json-from-dist "^1.0.0" - path-scurry "^1.11.1" - glob@^10.4.3: version "10.4.3" resolved "https://registry.npmjs.org/glob/-/glob-10.4.3.tgz#e0ba2253dd21b3d0acdfb5d507c59a29f513fc7a" @@ -5409,11 +5415,6 @@ is-obj@^1.0.1: resolved "https://registry.npmjs.org/is-obj/-/is-obj-1.0.1.tgz#3e4729ac1f5fde025cd7d83a896dab9f4f67db0f" integrity sha512-l4RyHgRqGN4Y3+9JHVrNqO+tN0rV5My76uW5/nuO4K1b6vw5G8d/cmFjP9tRfEsdhZNt0IFdZuK/c2Vr4Nb+Qg== -is-obj@^2.0.0: - version "2.0.0" - resolved "https://registry.npmjs.org/is-obj/-/is-obj-2.0.0.tgz#473fb05d973705e3fd9620545018ca8e22ef4982" - integrity sha512-drqDG3cbczxxEJRoOXcOjtdp1J/lyp1mNn0xaznRs8+muBhgQcrnbspox5X5fOw0HnMnbfDzvnEMEtqDEJEo8w== - is-path-inside@^3.0.3: version "3.0.3" resolved "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.3.tgz#d231362e53a07ff2b0e0ea7fed049161ffd16283" @@ -6076,7 +6077,7 @@ json-schema-traverse@^1.0.0: resolved "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz#ae7bcb3656ab77a73ba5c49bf654f38e6b6860e2" integrity sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug== -json-schema@0.4.0, json-schema@>=0.4.0: +json-schema@0.4.0: version "0.4.0" resolved "https://registry.npmjs.org/json-schema/-/json-schema-0.4.0.tgz#f7de4cf6efab838ebaeb3236474cbba5a1930ab5" integrity sha512-es94M3nTIfsEPisRafak+HDLfHXnKBhV3vU5eqPcS3flIWqcxJWgXHXiey3YrpaNsanY5ei1VoYEbOzijuq9BA== @@ -6667,12 +6668,17 @@ minipass@^3.0.0, minipass@^3.1.0, minipass@^3.1.1, minipass@^3.1.3: dependencies: yallist "^4.0.0" -"minipass@^5.0.0 || ^6.0.2 || ^7.0.0", minipass@^7.0.4, minipass@^7.1.2: +minipass@^5.0.0: + version "5.0.0" + resolved "https://registry.npmjs.org/minipass/-/minipass-5.0.0.tgz#3e9788ffb90b694a5d0ec94479a45b5d8738133d" + integrity sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ== + +"minipass@^5.0.0 || ^6.0.2 || ^7.0.0", minipass@^7.1.2: version "7.1.2" resolved "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz#93a9626ce5e5e66bd4db86849e7515e92340a707" integrity sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw== -minizlib@^2.0.0: +minizlib@^2.0.0, minizlib@^2.1.1: version "2.1.2" resolved "https://registry.npmjs.org/minizlib/-/minizlib-2.1.2.tgz#e90d3466ba209b932451508a11ce3d3632145931" integrity sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg== @@ -6680,14 +6686,6 @@ minizlib@^2.0.0: minipass "^3.0.0" yallist "^4.0.0" -minizlib@^3.0.1: - version "3.0.1" - resolved "https://registry.npmjs.org/minizlib/-/minizlib-3.0.1.tgz#46d5329d1eb3c83924eff1d3b858ca0a31581012" - integrity sha512-umcy022ILvb5/3Djuu8LWeqUa8D68JaBzlttKeMWen48SjabqS3iY5w/vzeMzMUNhLDifyhbOwKDSznB1vvrwg== - dependencies: - minipass "^7.0.4" - rimraf "^5.0.5" - mitt@3.0.1: version "3.0.1" resolved "https://registry.npmjs.org/mitt/-/mitt-3.0.1.tgz#ea36cf0cc30403601ae074c8f77b7092cdab36d1" @@ -6839,7 +6837,7 @@ neo-async@^2.6.0: resolved "https://registry.npmjs.org/neo-async/-/neo-async-2.6.2.tgz#b4aafb93e3aeb2d8174ca53cf163ab7d7308305f" integrity sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw== -"netmask@>=2.0.1 ", netmask@^2.0.2: +netmask@^2.0.2: version "2.0.2" resolved "https://registry.npmjs.org/netmask/-/netmask-2.0.2.tgz#8b01a07644065d536383835823bc52004ebac5e7" integrity sha512-dBpDMdxv9Irdq66304OLfEmQ9tbNRFnFTuZiLo+bD+r332bBmMJ8GBLXklIXXgxd3+v9+KUnZaUR5PJMa75Gsg== @@ -7435,7 +7433,7 @@ path-key@^3.0.0, path-key@^3.1.0: resolved "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz#581f6ade658cbba65a0d3380de7753295054f375" integrity sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q== -path-parse@>=1.0.7, path-parse@^1.0.7: +path-parse@^1.0.7: version "1.0.7" resolved "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz#fbc114b60ca42b30d9daf5858e4bd68bbedb6735" integrity sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw== @@ -7627,7 +7625,7 @@ postcss-values-parser@^6.0.2: is-url-superb "^4.0.0" quote-unquote "^1.0.0" -postcss@>=8.2.10, postcss@^8.4.23, postcss@^8.4.38, postcss@^8.4.40, postcss@^8.4.47: +postcss@^8.4.38, postcss@^8.4.40, postcss@^8.4.47: version "8.4.47" resolved "https://registry.npmjs.org/postcss/-/postcss-8.4.47.tgz#5bf6c9a010f3e724c503bf03ef7947dcb0fea365" integrity sha512-56rxCq7G/XfB4EkXq9Egn5GCqugWvDFjafDOThIdMBsI15iqPqR5r15TfSr1YPYeEI19YeaXMCbY6u88Y76GLQ== @@ -8195,13 +8193,6 @@ rimraf@^3.0.2: dependencies: glob "^7.1.3" -rimraf@^5.0.5: - version "5.0.10" - resolved "https://registry.npmjs.org/rimraf/-/rimraf-5.0.10.tgz#23b9843d3dc92db71f96e1a2ce92e39fd2a8221c" - integrity sha512-l0OE8wL34P4nJH/H2ffoaniAokM2qSmrtXHmlpvYr5AVVX8msAyW0l8NVJFDxlSK4u3Uh/f41cQheDVdnYijwQ== - dependencies: - glob "^10.3.7" - run-parallel@^1.1.9: version "1.2.0" resolved "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz#66d1368da7bdf921eb9d95bd1a9229e7f21a43ee" @@ -9008,17 +8999,17 @@ tar-stream@^3.1.5, tar-stream@^3.1.6: fast-fifo "^1.2.0" streamx "^2.15.0" -tar@>=6.1.2, tar@^6.0.2, tar@^6.1.11, tar@^6.1.2, tar@^6.2.1: - version "7.4.3" - resolved "https://registry.npmjs.org/tar/-/tar-7.4.3.tgz#88bbe9286a3fcd900e94592cda7a22b192e80571" - integrity sha512-5S7Va8hKfV7W5U6g3aYxXmlPoZVAwUMy9AOKyF2fVuZa2UD3qZjg578OrLRt8PcNN1PleVaL/5/yYATNL0ICUw== +tar@^6.0.2, tar@^6.1.11, tar@^6.1.2, tar@^6.2.1: + version "6.2.1" + resolved "https://registry.npmjs.org/tar/-/tar-6.2.1.tgz#717549c541bc3c2af15751bea94b1dd068d4b03a" + integrity sha512-DZ4yORTwrbTj/7MZYq2w+/ZFdI6OZ/f9SFHR+71gIVUZhOQPHzVCLpvRnPgyaMpfWxxk/4ONva3GQSyNIKRv6A== dependencies: - "@isaacs/fs-minipass" "^4.0.0" - chownr "^3.0.0" - minipass "^7.1.2" - minizlib "^3.0.1" - mkdirp "^3.0.1" - yallist "^5.0.0" + chownr "^2.0.0" + fs-minipass "^2.0.0" + minipass "^5.0.0" + minizlib "^2.1.1" + mkdirp "^1.0.3" + yallist "^4.0.0" term-size@^2.1.0: version "2.2.1" @@ -9892,12 +9883,12 @@ yallist@^4.0.0: resolved "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72" integrity sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A== -yallist@^5.0.0: - version "5.0.0" - resolved "https://registry.npmjs.org/yallist/-/yallist-5.0.0.tgz#00e2de443639ed0d78fd87de0d27469fbcffb533" - integrity sha512-YgvUTfwqyc7UXVMrB+SImsVYSmTS8X/tSrtdNZMImM+n7+QTriRXyXim0mBrTXNeqzVF0KWGgHPeiyViFFrNDw== +yaml@^1.10.0: + version "1.10.2" + resolved "https://registry.npmjs.org/yaml/-/yaml-1.10.2.tgz#2301c5ffbf12b467de8da2333a459e29e7920e4b" + integrity sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg== -yaml@>=2.2.2, yaml@^1.10.0, yaml@^2.2.2, yaml@^2.5.1: +yaml@^2.2.2, yaml@^2.5.1: version "2.5.1" resolved "https://registry.npmjs.org/yaml/-/yaml-2.5.1.tgz#c9772aacf62cb7494a95b0c4f1fb065b563db130" integrity sha512-bLQOjaX/ADgQ20isPJRvF0iRUHIxVhYvr53Of7wGcWlO2jvtUlH5m87DsmulFVxRpNLOnI4tB6p/oh8D7kpn9Q== From fa7fca44a68ef34222a7e31bc522c8ae0ca8ea1a Mon Sep 17 00:00:00 2001 From: Marika Marszalkowski Date: Thu, 26 Sep 2024 19:14:22 +0200 Subject: [PATCH 05/10] add changeset --- .changeset/breezy-pugs-call.md | 5 + .changeset/seven-eagles-taste.md | 5 + yarn.lock | 161 ++++++++++++++++--------------- 3 files changed, 95 insertions(+), 76 deletions(-) create mode 100644 .changeset/breezy-pugs-call.md create mode 100644 .changeset/seven-eagles-taste.md diff --git a/.changeset/breezy-pugs-call.md b/.changeset/breezy-pugs-call.md new file mode 100644 index 0000000000..67e63008fe --- /dev/null +++ b/.changeset/breezy-pugs-call.md @@ -0,0 +1,5 @@ +--- +'@sap-cloud-sdk/eslint-config': minor +--- + +[Fixed Issue] Fix incorrect resolution of imports for TypeScript. This may result in a lot more findings. diff --git a/.changeset/seven-eagles-taste.md b/.changeset/seven-eagles-taste.md new file mode 100644 index 0000000000..ad54361db0 --- /dev/null +++ b/.changeset/seven-eagles-taste.md @@ -0,0 +1,5 @@ +--- +'@sap-cloud-sdk/eslint-config': minor +--- + +[Compatibility Note] Remove `import/no-relative-parent-imports` rule that has never worked correctly as provided. diff --git a/yarn.lock b/yarn.lock index b7194d3b25..d2288320d8 100644 --- a/yarn.lock +++ b/yarn.lock @@ -433,11 +433,6 @@ resolved "https://registry.npmjs.org/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@cap-js/cds-types@<=0.2.0": - version "0.2.0" - resolved "https://registry.npmjs.org/@cap-js/cds-types/-/cds-types-0.2.0.tgz#065c3df9f8891531e3d51a1e62398be14c665aa7" - integrity sha512-s4iVwAjf+rRIUu6jaEooXFcJv16+sP5CTkreQPxDUyxLWWGlhvEr67TuIH0C6Cnp4PPIsYmBK3AVxSW2mNc2wg== - "@changesets/apply-release-plan@^7.0.5": version "7.0.5" resolved "https://registry.npmjs.org/@changesets/apply-release-plan/-/apply-release-plan-7.0.5.tgz#3323c97afc08abc15e5136488f9c7cf1a864832e" @@ -828,6 +823,13 @@ wrap-ansi "^8.1.0" wrap-ansi-cjs "npm:wrap-ansi@^7.0.0" +"@isaacs/fs-minipass@^4.0.0": + version "4.0.1" + resolved "https://registry.npmjs.org/@isaacs/fs-minipass/-/fs-minipass-4.0.1.tgz#2d59ae3ab4b38fb4270bfa23d30f8e2e86c7fe32" + integrity sha512-wgm9Ehl2jpeqP3zw/7mo3kRHFp5MEDhqAdwy1fTGkHAwnkGOVsgpvQhL8B5n1qlb01jV3n/bI0ZfZp5lWA1k4w== + dependencies: + minipass "^7.0.4" + "@istanbuljs/load-nyc-config@^1.0.0": version "1.1.0" resolved "https://registry.npmjs.org/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz#fd3db1d59ecf7cf121e80650bb86712f9b55eced" @@ -1373,13 +1375,6 @@ resolved "https://registry.npmjs.org/@rtsao/scc/-/scc-1.1.0.tgz#927dd2fae9bc3361403ac2c7a00c32ddce9ad7e8" integrity sha512-zt6OdqaDoOnJ1ZYsCYGt9YmWzDXl4vQdKTyJev62gFhRGKdx7mcT54V9KIjg+d2wi9EXsPvAPKe7i7WjfVWB8g== -"@sap/cds-compiler@>=5.1": - version "5.2.0" - resolved "https://registry.npmjs.org/@sap/cds-compiler/-/cds-compiler-5.2.0.tgz#c83d153dc766860707ed962f33bf9e4bd5ff820a" - integrity sha512-ymp1ChXMbU5D6P6O7QOaM8J5DUVNjtm6hr8EXoQsywtwwKuMp5UfM5n6+ube1MmInU3L9nI57l/3G3MacK+6Qg== - dependencies: - antlr4 "4.9.3" - "@sap/cds-compiler@^3.2.0": version "3.9.12" resolved "https://registry.npmjs.org/@sap/cds-compiler/-/cds-compiler-3.9.12.tgz#3e40c0956bfbe2106b50a0ee9efabeca1b68f6c8" @@ -1387,13 +1382,6 @@ dependencies: antlr4 "4.9.3" -"@sap/cds-compiler@^4": - version "4.9.8" - resolved "https://registry.npmjs.org/@sap/cds-compiler/-/cds-compiler-4.9.8.tgz#7b3eb7dc31a3463060a5e29425ab45cd6e8c5123" - integrity sha512-DaodIJoYPpVygVf+9JU6XNW+WLDqX1sHklpj8qkrONLxM6G1TFBm5yrAT0P2YCibgNsGVhizA4eydgoHnVxUVQ== - dependencies: - antlr4 "4.9.3" - "@sap/cds-dk@7.9.4": version "7.9.4" resolved "https://registry.npmjs.org/@sap/cds-dk/-/cds-dk-7.9.4.tgz#199b4698468eb88f6eb1a92508f22ecbb5fd9d89" @@ -1416,11 +1404,6 @@ optionalDependencies: sqlite3 "^5.0.4" -"@sap/cds-fiori@^1": - version "1.2.7" - resolved "https://registry.npmjs.org/@sap/cds-fiori/-/cds-fiori-1.2.7.tgz#cdfec5437e6c35f3ce1f22db35701570abfc2787" - integrity sha512-F6Uf9wvkv0fXW+Fh7PiV2BbB/k+p1cFJLkQCCKDRJH8HvlxWEcXcn/YIvBrQGuX+GToi125MxB3wd712d8OLTA== - "@sap/cds-foss@^4": version "4.0.2" resolved "https://registry.npmjs.org/@sap/cds-foss/-/cds-foss-4.0.2.tgz#2910fa0a2f3dffb6a66c787de27cbfe564467412" @@ -1450,7 +1433,7 @@ "@sap/hdi-deploy" "^4" axios "^1" -"@sap/cds@>=5.6.0": +"@sap/cds@>=5.6.0", "@sap/cds@^6.1.1", "@sap/cds@^7", "@sap/cds@^8.2.3": version "6.8.4" resolved "https://registry.npmjs.org/@sap/cds/-/cds-6.8.4.tgz#c73adb8e61f9efb4eff705f125a717f214f8e49f" integrity sha512-CTf6Y732ABTIAQPwtFZpfLUzZgQLOs9ZqBIrHhFJRx3VQvopfBZlbWAhujz092xETM7u4msZudoUprkmRo0+hg== @@ -1458,25 +1441,6 @@ "@sap/cds-compiler" "^3.2.0" "@sap/cds-foss" "^4" -"@sap/cds@^7": - version "7.9.5" - resolved "https://registry.npmjs.org/@sap/cds/-/cds-7.9.5.tgz#8e3af0438badf7232ed3cbc418e43054a6269a0f" - integrity sha512-DNCpXWhwZzIShqjoxOTW9cyYB/mE8k/7d+lSp1BCRLnc30R2vEU0ScqZVngjIZfQFRKWkLePy9/FulAEhqv+wQ== - dependencies: - "@cap-js/cds-types" "<=0.2.0" - "@sap/cds-compiler" "^4" - "@sap/cds-fiori" "^1" - "@sap/cds-foss" "^5.0.0" - -"@sap/cds@^8.2.3": - version "8.2.3" - resolved "https://registry.npmjs.org/@sap/cds/-/cds-8.2.3.tgz#a685fd11aa97c13b10e15be7894c8985954e3baa" - integrity sha512-VZde7OvqMx2ehjwSIXfAqO20ROcn0G2H4ZBQA3FakQcFGz/7ay7fUsX+R/FWfQvDbwFUPqySHAWqoPPqkYJY+A== - dependencies: - "@sap/cds-compiler" ">=5.1" - "@sap/cds-fiori" "^1" - "@sap/cds-foss" "^5.0.0" - "@sap/eslint-plugin-cds@^3.0.1": version "3.0.2" resolved "https://registry.npmjs.org/@sap/eslint-plugin-cds/-/eslint-plugin-cds-3.0.2.tgz#c35d364fbd5a09287ea900e03db2ef5bb23aab0b" @@ -1804,6 +1768,11 @@ resolved "https://registry.npmjs.org/@types/license-checker/-/license-checker-25.0.6.tgz#c346285ee7e42bac58a4922059453f50a5d4175d" integrity sha512-ju/75+YPkNE5vX1iPer+qtI1eI/LqJVYZgOsmSHI1iiEM1bQL5Gh1lEvyjR9T7ZXVE1FwJa2doWJEEmPNwbZkw== +"@types/lodash@>=4.14.200": + version "4.17.9" + resolved "https://registry.npmjs.org/@types/lodash/-/lodash-4.17.9.tgz#0dc4902c229f6b8e2ac5456522104d7b1a230290" + integrity sha512-w9iWudx1XWOHW5lQRS9iKpK/XuRhnN+0T7HvdCCd802FYkT1AMTnxndJHGrNJwRoRHkslGr4S29tjm1cT7x/7w== + "@types/minimatch@^3.0.3": version "3.0.5" resolved "https://registry.npmjs.org/@types/minimatch/-/minimatch-3.0.5.tgz#1001cc5e6a3704b83c236027e77f2f58ea010f40" @@ -2788,7 +2757,7 @@ brace-expansion@^2.0.1: dependencies: balanced-match "^1.0.0" -braces@^3.0.1, braces@^3.0.3, braces@~3.0.2: +braces@>=3.0.2, braces@^3.0.1, braces@^3.0.3, braces@~3.0.2: version "3.0.3" resolved "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz#490332f40919452272d55a8480adc0c441358789" integrity sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA== @@ -3020,6 +2989,11 @@ chownr@^2.0.0: resolved "https://registry.npmjs.org/chownr/-/chownr-2.0.0.tgz#15bfbe53d2eab4cf70f18a8cd68ebe5b3cb1dece" integrity sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ== +chownr@^3.0.0: + version "3.0.0" + resolved "https://registry.npmjs.org/chownr/-/chownr-3.0.0.tgz#9855e64ecd240a9cc4267ce8a4aa5d24a1da15e4" + integrity sha512-+IxzY9BZOQd/XuYPRmrvEVjF/nqj5kgT4kEq7VofrDoM1MxoRjEWkrCC3EtLi59TVawxTAn+orJwFQcrqEN1+g== + chromium-bidi@0.6.5: version "0.6.5" resolved "https://registry.npmjs.org/chromium-bidi/-/chromium-bidi-0.6.5.tgz#31be98f9ee5c93fa99d240c680518c9293d8c6bb" @@ -3156,7 +3130,7 @@ color-name@^1.0.0, color-name@^1.1.4, color-name@~1.1.4: resolved "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2" integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA== -color-string@^1.6.0: +color-string@>=1.5.5, color-string@^1.6.0: version "1.9.1" resolved "https://registry.npmjs.org/color-string/-/color-string-1.9.1.tgz#4467f9146f036f855b764dfb5bf8582bf342c7a4" integrity sha512-shrVawQFojnZv6xM40anx4CkoDP+fZsw/ZerEMsW/pyzsRbElpsL/DBVW7q3ExxwusdNXI3lXpuhEZkzs8p5Eg== @@ -3633,12 +3607,13 @@ detective-es6@^5.0.0: dependencies: node-source-walk "^7.0.0" -detective-postcss@^7.0.0: - version "7.0.0" - resolved "https://registry.npmjs.org/detective-postcss/-/detective-postcss-7.0.0.tgz#e9cff50836d67339a0bf4378f22dba4ed5809c01" - integrity sha512-pSXA6dyqmBPBuERpoOKKTUUjQCZwZPLRbd1VdsTbt6W+m/+6ROl4BbE87yQBUtLoK7yX8pvXHdKyM/xNIW9F7A== +detective-postcss@^6.1.0, detective-postcss@^7.0.0: + version "6.1.3" + resolved "https://registry.npmjs.org/detective-postcss/-/detective-postcss-6.1.3.tgz#51a2d4419327ad85d0af071c7054c79fafca7e73" + integrity sha512-7BRVvE5pPEvk2ukUWNQ+H2XOq43xENWbH0LcdCE14mwgTBEAMoAx+Fc1rdp76SmyZ4Sp48HlV7VedUnP6GA1Tw== dependencies: is-url "^1.2.4" + postcss "^8.4.23" postcss-values-parser "^6.0.2" detective-sass@^6.0.0: @@ -3727,6 +3702,13 @@ doctrine@^3.0.0: dependencies: esutils "^2.0.2" +dot-prop@^6.0.1: + version "6.0.1" + resolved "https://registry.npmjs.org/dot-prop/-/dot-prop-6.0.1.tgz#fc26b3cf142b9e59b74dbd39ed66ce620c681083" + integrity sha512-tE7ztYzXHIeyvc7N+hR3oi7FIbf/NIjVP9hmAt3yMXzrQ072/fpjGLx2GxNxGxUl5V73MEqYzioOMoVhGMJ5cA== + dependencies: + is-obj "^2.0.0" + dotenv@10.0.0: version "10.0.0" resolved "https://registry.npmjs.org/dotenv/-/dotenv-10.0.0.tgz#3d4227b8fb95f81096cdd2b66653fb2c7085ba81" @@ -4859,6 +4841,18 @@ glob-parent@^6.0.2: dependencies: is-glob "^4.0.3" +glob@^10.3.7: + version "10.4.5" + resolved "https://registry.npmjs.org/glob/-/glob-10.4.5.tgz#f4d9f0b90ffdbab09c9d77f5f29b4262517b0956" + integrity sha512-7Bv8RF0k6xjo7d4A/PxYLbUCfb6c+Vpd2/mB2yRDlew7Jb5hEXiCD9ibfO7wpk8i4sevK6DFny9h7EYbM3/sHg== + dependencies: + foreground-child "^3.1.0" + jackspeak "^3.1.2" + minimatch "^9.0.4" + minipass "^7.1.2" + package-json-from-dist "^1.0.0" + path-scurry "^1.11.1" + glob@^10.4.3: version "10.4.3" resolved "https://registry.npmjs.org/glob/-/glob-10.4.3.tgz#e0ba2253dd21b3d0acdfb5d507c59a29f513fc7a" @@ -5415,6 +5409,11 @@ is-obj@^1.0.1: resolved "https://registry.npmjs.org/is-obj/-/is-obj-1.0.1.tgz#3e4729ac1f5fde025cd7d83a896dab9f4f67db0f" integrity sha512-l4RyHgRqGN4Y3+9JHVrNqO+tN0rV5My76uW5/nuO4K1b6vw5G8d/cmFjP9tRfEsdhZNt0IFdZuK/c2Vr4Nb+Qg== +is-obj@^2.0.0: + version "2.0.0" + resolved "https://registry.npmjs.org/is-obj/-/is-obj-2.0.0.tgz#473fb05d973705e3fd9620545018ca8e22ef4982" + integrity sha512-drqDG3cbczxxEJRoOXcOjtdp1J/lyp1mNn0xaznRs8+muBhgQcrnbspox5X5fOw0HnMnbfDzvnEMEtqDEJEo8w== + is-path-inside@^3.0.3: version "3.0.3" resolved "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.3.tgz#d231362e53a07ff2b0e0ea7fed049161ffd16283" @@ -6077,7 +6076,7 @@ json-schema-traverse@^1.0.0: resolved "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz#ae7bcb3656ab77a73ba5c49bf654f38e6b6860e2" integrity sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug== -json-schema@0.4.0: +json-schema@0.4.0, json-schema@>=0.4.0: version "0.4.0" resolved "https://registry.npmjs.org/json-schema/-/json-schema-0.4.0.tgz#f7de4cf6efab838ebaeb3236474cbba5a1930ab5" integrity sha512-es94M3nTIfsEPisRafak+HDLfHXnKBhV3vU5eqPcS3flIWqcxJWgXHXiey3YrpaNsanY5ei1VoYEbOzijuq9BA== @@ -6668,17 +6667,12 @@ minipass@^3.0.0, minipass@^3.1.0, minipass@^3.1.1, minipass@^3.1.3: dependencies: yallist "^4.0.0" -minipass@^5.0.0: - version "5.0.0" - resolved "https://registry.npmjs.org/minipass/-/minipass-5.0.0.tgz#3e9788ffb90b694a5d0ec94479a45b5d8738133d" - integrity sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ== - -"minipass@^5.0.0 || ^6.0.2 || ^7.0.0", minipass@^7.1.2: +"minipass@^5.0.0 || ^6.0.2 || ^7.0.0", minipass@^7.0.4, minipass@^7.1.2: version "7.1.2" resolved "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz#93a9626ce5e5e66bd4db86849e7515e92340a707" integrity sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw== -minizlib@^2.0.0, minizlib@^2.1.1: +minizlib@^2.0.0: version "2.1.2" resolved "https://registry.npmjs.org/minizlib/-/minizlib-2.1.2.tgz#e90d3466ba209b932451508a11ce3d3632145931" integrity sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg== @@ -6686,6 +6680,14 @@ minizlib@^2.0.0, minizlib@^2.1.1: minipass "^3.0.0" yallist "^4.0.0" +minizlib@^3.0.1: + version "3.0.1" + resolved "https://registry.npmjs.org/minizlib/-/minizlib-3.0.1.tgz#46d5329d1eb3c83924eff1d3b858ca0a31581012" + integrity sha512-umcy022ILvb5/3Djuu8LWeqUa8D68JaBzlttKeMWen48SjabqS3iY5w/vzeMzMUNhLDifyhbOwKDSznB1vvrwg== + dependencies: + minipass "^7.0.4" + rimraf "^5.0.5" + mitt@3.0.1: version "3.0.1" resolved "https://registry.npmjs.org/mitt/-/mitt-3.0.1.tgz#ea36cf0cc30403601ae074c8f77b7092cdab36d1" @@ -6837,7 +6839,7 @@ neo-async@^2.6.0: resolved "https://registry.npmjs.org/neo-async/-/neo-async-2.6.2.tgz#b4aafb93e3aeb2d8174ca53cf163ab7d7308305f" integrity sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw== -netmask@^2.0.2: +"netmask@>=2.0.1 ", netmask@^2.0.2: version "2.0.2" resolved "https://registry.npmjs.org/netmask/-/netmask-2.0.2.tgz#8b01a07644065d536383835823bc52004ebac5e7" integrity sha512-dBpDMdxv9Irdq66304OLfEmQ9tbNRFnFTuZiLo+bD+r332bBmMJ8GBLXklIXXgxd3+v9+KUnZaUR5PJMa75Gsg== @@ -7433,7 +7435,7 @@ path-key@^3.0.0, path-key@^3.1.0: resolved "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz#581f6ade658cbba65a0d3380de7753295054f375" integrity sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q== -path-parse@^1.0.7: +path-parse@>=1.0.7, path-parse@^1.0.7: version "1.0.7" resolved "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz#fbc114b60ca42b30d9daf5858e4bd68bbedb6735" integrity sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw== @@ -7625,7 +7627,7 @@ postcss-values-parser@^6.0.2: is-url-superb "^4.0.0" quote-unquote "^1.0.0" -postcss@^8.4.38, postcss@^8.4.40, postcss@^8.4.47: +postcss@>=8.2.10, postcss@^8.4.23, postcss@^8.4.38, postcss@^8.4.40, postcss@^8.4.47: version "8.4.47" resolved "https://registry.npmjs.org/postcss/-/postcss-8.4.47.tgz#5bf6c9a010f3e724c503bf03ef7947dcb0fea365" integrity sha512-56rxCq7G/XfB4EkXq9Egn5GCqugWvDFjafDOThIdMBsI15iqPqR5r15TfSr1YPYeEI19YeaXMCbY6u88Y76GLQ== @@ -8193,6 +8195,13 @@ rimraf@^3.0.2: dependencies: glob "^7.1.3" +rimraf@^5.0.5: + version "5.0.10" + resolved "https://registry.npmjs.org/rimraf/-/rimraf-5.0.10.tgz#23b9843d3dc92db71f96e1a2ce92e39fd2a8221c" + integrity sha512-l0OE8wL34P4nJH/H2ffoaniAokM2qSmrtXHmlpvYr5AVVX8msAyW0l8NVJFDxlSK4u3Uh/f41cQheDVdnYijwQ== + dependencies: + glob "^10.3.7" + run-parallel@^1.1.9: version "1.2.0" resolved "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz#66d1368da7bdf921eb9d95bd1a9229e7f21a43ee" @@ -8999,17 +9008,17 @@ tar-stream@^3.1.5, tar-stream@^3.1.6: fast-fifo "^1.2.0" streamx "^2.15.0" -tar@^6.0.2, tar@^6.1.11, tar@^6.1.2, tar@^6.2.1: - version "6.2.1" - resolved "https://registry.npmjs.org/tar/-/tar-6.2.1.tgz#717549c541bc3c2af15751bea94b1dd068d4b03a" - integrity sha512-DZ4yORTwrbTj/7MZYq2w+/ZFdI6OZ/f9SFHR+71gIVUZhOQPHzVCLpvRnPgyaMpfWxxk/4ONva3GQSyNIKRv6A== +tar@>=6.1.2, tar@^6.0.2, tar@^6.1.11, tar@^6.1.2, tar@^6.2.1: + version "7.4.3" + resolved "https://registry.npmjs.org/tar/-/tar-7.4.3.tgz#88bbe9286a3fcd900e94592cda7a22b192e80571" + integrity sha512-5S7Va8hKfV7W5U6g3aYxXmlPoZVAwUMy9AOKyF2fVuZa2UD3qZjg578OrLRt8PcNN1PleVaL/5/yYATNL0ICUw== dependencies: - chownr "^2.0.0" - fs-minipass "^2.0.0" - minipass "^5.0.0" - minizlib "^2.1.1" - mkdirp "^1.0.3" - yallist "^4.0.0" + "@isaacs/fs-minipass" "^4.0.0" + chownr "^3.0.0" + minipass "^7.1.2" + minizlib "^3.0.1" + mkdirp "^3.0.1" + yallist "^5.0.0" term-size@^2.1.0: version "2.2.1" @@ -9883,12 +9892,12 @@ yallist@^4.0.0: resolved "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72" integrity sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A== -yaml@^1.10.0: - version "1.10.2" - resolved "https://registry.npmjs.org/yaml/-/yaml-1.10.2.tgz#2301c5ffbf12b467de8da2333a459e29e7920e4b" - integrity sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg== +yallist@^5.0.0: + version "5.0.0" + resolved "https://registry.npmjs.org/yallist/-/yallist-5.0.0.tgz#00e2de443639ed0d78fd87de0d27469fbcffb533" + integrity sha512-YgvUTfwqyc7UXVMrB+SImsVYSmTS8X/tSrtdNZMImM+n7+QTriRXyXim0mBrTXNeqzVF0KWGgHPeiyViFFrNDw== -yaml@^2.2.2, yaml@^2.5.1: +yaml@>=2.2.2, yaml@^1.10.0, yaml@^2.2.2, yaml@^2.5.1: version "2.5.1" resolved "https://registry.npmjs.org/yaml/-/yaml-2.5.1.tgz#c9772aacf62cb7494a95b0c4f1fb065b563db130" integrity sha512-bLQOjaX/ADgQ20isPJRvF0iRUHIxVhYvr53Of7wGcWlO2jvtUlH5m87DsmulFVxRpNLOnI4tB6p/oh8D7kpn9Q== From e4b3e66b542df080b96d14db2aac80e0eb225f72 Mon Sep 17 00:00:00 2001 From: Marika Marszalkowski Date: Fri, 27 Sep 2024 16:29:00 +0200 Subject: [PATCH 06/10] fix get with body --- packages/connectivity/package.json | 2 +- packages/http-client/package.json | 2 +- packages/odata-v2/package.json | 2 +- packages/odata-v4/package.json | 2 +- packages/openapi/package.json | 2 +- .../src/openapi-request-builder.spec.ts | 11 +--- packages/resilience/package.json | 2 +- packages/util/package.json | 2 +- test-packages/integration-tests/package.json | 2 +- yarn.lock | 54 +++++++++++++++++-- 10 files changed, 60 insertions(+), 21 deletions(-) diff --git a/packages/connectivity/package.json b/packages/connectivity/package.json index 6ec6c8a805..b97985352a 100644 --- a/packages/connectivity/package.json +++ b/packages/connectivity/package.json @@ -47,7 +47,7 @@ }, "devDependencies": { "mock-fs": "^5.2.0", - "nock": "^14.0.0-beta.6", + "nock": "^14.0.0-beta.14", "typescript": "~5.6.2" } } diff --git a/packages/http-client/package.json b/packages/http-client/package.json index bddfc2a84d..85a7b0b7dc 100644 --- a/packages/http-client/package.json +++ b/packages/http-client/package.json @@ -44,7 +44,7 @@ }, "devDependencies": { "https-proxy-agent": "^7.0.5", - "nock": "^14.0.0-beta.6", + "nock": "^14.0.0-beta.14", "typescript": "~5.6.2", "jsonwebtoken": "^9.0.2" } diff --git a/packages/odata-v2/package.json b/packages/odata-v2/package.json index 16d908a9aa..2a30e56b74 100644 --- a/packages/odata-v2/package.json +++ b/packages/odata-v2/package.json @@ -48,7 +48,7 @@ "devDependencies": { "@sap-cloud-sdk/test-services-odata-v2": "^3.21.0", "@sap-cloud-sdk/resilience": "^3.21.0", - "nock": "^14.0.0-beta.6", + "nock": "^14.0.0-beta.14", "typescript": "~5.6.2" } } diff --git a/packages/odata-v4/package.json b/packages/odata-v4/package.json index b3eb001b88..021d0787a2 100644 --- a/packages/odata-v4/package.json +++ b/packages/odata-v4/package.json @@ -47,7 +47,7 @@ }, "devDependencies": { "@sap-cloud-sdk/test-services-odata-v4": "^3.21.0", - "nock": "^14.0.0-beta.6", + "nock": "^14.0.0-beta.14", "typescript": "~5.6.2" } } diff --git a/packages/openapi/package.json b/packages/openapi/package.json index 6c700f0c1f..1a4a2db424 100644 --- a/packages/openapi/package.json +++ b/packages/openapi/package.json @@ -44,7 +44,7 @@ "axios": "^1.7.7" }, "devDependencies": { - "nock": "^14.0.0-beta.6", + "nock": "^14.0.0-beta.14", "typescript": "~5.6.2" } } diff --git a/packages/openapi/src/openapi-request-builder.spec.ts b/packages/openapi/src/openapi-request-builder.spec.ts index 3d98c51e79..5cae70f56e 100644 --- a/packages/openapi/src/openapi-request-builder.spec.ts +++ b/packages/openapi/src/openapi-request-builder.spec.ts @@ -210,11 +210,7 @@ describe('openapi-request-builder', () => { .get(/.*/) .reply(200, 'iss token used on the way') ]; - const requestBuilder = new OpenApiRequestBuilder('get', '/test', { - body: { - limit: 100 - } - }); + const requestBuilder = new OpenApiRequestBuilder('get', '/test'); const response = await requestBuilder.executeRaw({ destinationName: 'ERNIE-UND-CERT', iss: onlyIssuerXsuaaUrl @@ -227,10 +223,7 @@ describe('openapi-request-builder', () => { middleware: [], url: '/test', headers: { requestConfig: {} }, - params: { requestConfig: {} }, - data: { - limit: 100 - } + params: { requestConfig: {} } }, { fetchCsrfToken: false } ); diff --git a/packages/resilience/package.json b/packages/resilience/package.json index 80183d0458..f623e92d2b 100644 --- a/packages/resilience/package.json +++ b/packages/resilience/package.json @@ -46,7 +46,7 @@ "devDependencies": { "@types/async-retry": "^1.4.8", "@types/opossum": "^8.1.7", - "nock": "^14.0.0-beta.6", + "nock": "^14.0.0-beta.14", "typescript": "~5.6.2" } } diff --git a/packages/util/package.json b/packages/util/package.json index f481bf8872..00f8e6c030 100644 --- a/packages/util/package.json +++ b/packages/util/package.json @@ -42,7 +42,7 @@ "winston-transport": "^4.7.1" }, "devDependencies": { - "nock": "^14.0.0-beta.6", + "nock": "^14.0.0-beta.14", "typescript": "~5.6.2", "mock-fs": "^5.2.0" } diff --git a/test-packages/integration-tests/package.json b/test-packages/integration-tests/package.json index 879f80e856..712a3118ca 100644 --- a/test-packages/integration-tests/package.json +++ b/test-packages/integration-tests/package.json @@ -35,7 +35,7 @@ "execa": "^5.0.0", "jsonwebtoken": "^9.0.2", "mock-fs": "^5.2.0", - "nock": "^14.0.0-beta.6", + "nock": "^14.0.0-beta.14", "winston": "^3.14.2" } } diff --git a/yarn.lock b/yarn.lock index d2288320d8..2a462c0f80 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1142,6 +1142,18 @@ jju "^1.4.0" js-yaml "^4.1.0" +"@mswjs/interceptors@^0.35.6": + version "0.35.9" + resolved "https://registry.npmjs.org/@mswjs/interceptors/-/interceptors-0.35.9.tgz#1e1488ff2f333683d374eccc8c0f4d5d851c6d3d" + integrity sha512-SSnyl/4ni/2ViHKkiZb8eajA/eN1DNFaHjhGiLUdZvDz6PKF4COSf/17xqSz64nOo2Ia29SA6B2KNCsyCbVmaQ== + dependencies: + "@open-draft/deferred-promise" "^2.2.0" + "@open-draft/logger" "^0.3.0" + "@open-draft/until" "^2.0.0" + is-node-process "^1.2.0" + outvariant "^1.4.3" + strict-event-emitter "^0.5.1" + "@nodelib/fs.scandir@2.1.5": version "2.1.5" resolved "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz#7619c2eb21b25483f6d167548b4cfd5a7488c3d5" @@ -1276,6 +1288,24 @@ dependencies: "@octokit/openapi-types" "^22.1.0" +"@open-draft/deferred-promise@^2.2.0": + version "2.2.0" + resolved "https://registry.npmjs.org/@open-draft/deferred-promise/-/deferred-promise-2.2.0.tgz#4a822d10f6f0e316be4d67b4d4f8c9a124b073bd" + integrity sha512-CecwLWx3rhxVQF6V4bAgPS5t+So2sTbPgAzafKkVizyi7tlwpcFpdFqq+wqF2OwNBmqFuu6tOyouTuxgpMfzmA== + +"@open-draft/logger@^0.3.0": + version "0.3.0" + resolved "https://registry.npmjs.org/@open-draft/logger/-/logger-0.3.0.tgz#2b3ab1242b360aa0adb28b85f5d7da1c133a0954" + integrity sha512-X2g45fzhxH238HKO4xbSr7+wBS8Fvw6ixhTDuvLd5mqh6bJJCFAPwU9mPDxbcrRtfxv4u5IHCEH77BmxvXmmxQ== + dependencies: + is-node-process "^1.2.0" + outvariant "^1.4.0" + +"@open-draft/until@^2.0.0": + version "2.1.0" + resolved "https://registry.npmjs.org/@open-draft/until/-/until-2.1.0.tgz#0acf32f470af2ceaf47f095cdecd40d68666efda" + integrity sha512-U69T3ItWHvLwGg5eJ0n3I62nWuE6ilHlmz7zM0npLBRvPRd7e6NYmg54vvRtP5mZG7kZqZCFVdsTWo7BPtBujg== + "@pkgjs/parseargs@^0.11.0": version "0.11.0" resolved "https://registry.npmjs.org/@pkgjs/parseargs/-/parseargs-0.11.0.tgz#a77ea742fab25775145434eb1d2328cf5013ac33" @@ -5392,6 +5422,11 @@ is-negative-zero@^2.0.3: resolved "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.3.tgz#ced903a027aca6381b777a5743069d7376a49747" integrity sha512-5KoIu2Ngpyek75jXodFvnafB6DJgr3u8uuK0LEZJjrU19DrMD3EVERaR8sjz8CCGgpZvxPl9SuE1GMVPFHx1mw== +is-node-process@^1.2.0: + version "1.2.0" + resolved "https://registry.npmjs.org/is-node-process/-/is-node-process-1.2.0.tgz#ea02a1b90ddb3934a19aea414e88edef7e11d134" + integrity sha512-Vg4o6/fqPxIjtxgUH5QLJhwZ7gW5diGCVlXpuUfELC62CuxM1iHcRe51f2W1FDy04Ai4KJkagKjx3XaqyfRKXw== + is-number-object@^1.0.4: version "1.0.7" resolved "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.7.tgz#59d50ada4c45251784e9904f5246c742f07a42fc" @@ -6844,11 +6879,12 @@ neo-async@^2.6.0: resolved "https://registry.npmjs.org/netmask/-/netmask-2.0.2.tgz#8b01a07644065d536383835823bc52004ebac5e7" integrity sha512-dBpDMdxv9Irdq66304OLfEmQ9tbNRFnFTuZiLo+bD+r332bBmMJ8GBLXklIXXgxd3+v9+KUnZaUR5PJMa75Gsg== -nock@^14.0.0-beta.6: - version "14.0.0-beta.7" - resolved "https://registry.npmjs.org/nock/-/nock-14.0.0-beta.7.tgz#bdb3f3cfa2276659c87412f6dff2aea9ee69a7fc" - integrity sha512-+EQMm5W9K8YnBE2Ceg4hnJynaCZmvK8ZlFXQ2fxGwtkOkBUq8GpQLTks2m1jpvse9XDxMDDOHgOWpiznFuh0bA== +nock@^14.0.0-beta.14: + version "14.0.0-beta.14" + resolved "https://registry.npmjs.org/nock/-/nock-14.0.0-beta.14.tgz#1d211b93a547386846d6054f455c2581ab34f750" + integrity sha512-nbUIuqYkixyazl4hWBQ+EJzb5F0/NJabIQFEEIQwBHPaG+RxvVSs4uSCasHMnCrNuCmOndxgUBqS860g6/OwJw== dependencies: + "@mswjs/interceptors" "^0.35.6" json-stringify-safe "^5.0.1" propagate "^2.0.0" @@ -7269,6 +7305,11 @@ outdent@^0.5.0: resolved "https://registry.npmjs.org/outdent/-/outdent-0.5.0.tgz#9e10982fdc41492bb473ad13840d22f9655be2ff" integrity sha512-/jHxFIzoMXdqPzTaCpFzAAWhpkSjZPF4Vsn6jAfNpmbH/ymsmd7Qc6VE9BGn0L6YMj6uwpQLxCECpus4ukKS9Q== +outvariant@^1.4.0, outvariant@^1.4.3: + version "1.4.3" + resolved "https://registry.npmjs.org/outvariant/-/outvariant-1.4.3.tgz#221c1bfc093e8fec7075497e7799fdbf43d14873" + integrity sha512-+Sl2UErvtsoajRDKCE5/dBz4DIvHXQQnAxtQTF04OJxY0+DyZXSo5P5Bb7XYWOh81syohlYL24hbDwxedPUJCA== + p-filter@^2.1.0: version "2.1.0" resolved "https://registry.npmjs.org/p-filter/-/p-filter-2.1.0.tgz#1b1472562ae7a0f742f0f3d3d3718ea66ff9c09c" @@ -8723,6 +8764,11 @@ streamx@^2.15.0, streamx@^2.16.1: optionalDependencies: bare-events "^2.2.0" +strict-event-emitter@^0.5.1: + version "0.5.1" + resolved "https://registry.npmjs.org/strict-event-emitter/-/strict-event-emitter-0.5.1.tgz#1602ece81c51574ca39c6815e09f1a3e8550bd93" + integrity sha512-vMgjE/GGEPEFnhFub6pa4FmJBRBVOLpIII2hvCZ8Kzb7K0hlHo7mQv6xYrBvCL2LtAIBwFUK8wvuJgTVSQ5MFQ== + string-length@^4.0.1: version "4.0.2" resolved "https://registry.npmjs.org/string-length/-/string-length-4.0.2.tgz#a8a8dc7bd5c1a82b9b3c8b87e125f66871b6e57a" From a8049ece2bf6c16db02d988ecf932d73f8568438 Mon Sep 17 00:00:00 2001 From: Marika Marszalkowski Date: Fri, 27 Sep 2024 16:30:30 +0200 Subject: [PATCH 07/10] Revert "fix get with body" This reverts commit e4b3e66b542df080b96d14db2aac80e0eb225f72. --- packages/connectivity/package.json | 2 +- packages/http-client/package.json | 2 +- packages/odata-v2/package.json | 2 +- packages/odata-v4/package.json | 2 +- packages/openapi/package.json | 2 +- .../src/openapi-request-builder.spec.ts | 11 +++- packages/resilience/package.json | 2 +- packages/util/package.json | 2 +- test-packages/integration-tests/package.json | 2 +- yarn.lock | 54 ++----------------- 10 files changed, 21 insertions(+), 60 deletions(-) diff --git a/packages/connectivity/package.json b/packages/connectivity/package.json index b97985352a..6ec6c8a805 100644 --- a/packages/connectivity/package.json +++ b/packages/connectivity/package.json @@ -47,7 +47,7 @@ }, "devDependencies": { "mock-fs": "^5.2.0", - "nock": "^14.0.0-beta.14", + "nock": "^14.0.0-beta.6", "typescript": "~5.6.2" } } diff --git a/packages/http-client/package.json b/packages/http-client/package.json index 85a7b0b7dc..bddfc2a84d 100644 --- a/packages/http-client/package.json +++ b/packages/http-client/package.json @@ -44,7 +44,7 @@ }, "devDependencies": { "https-proxy-agent": "^7.0.5", - "nock": "^14.0.0-beta.14", + "nock": "^14.0.0-beta.6", "typescript": "~5.6.2", "jsonwebtoken": "^9.0.2" } diff --git a/packages/odata-v2/package.json b/packages/odata-v2/package.json index 2a30e56b74..16d908a9aa 100644 --- a/packages/odata-v2/package.json +++ b/packages/odata-v2/package.json @@ -48,7 +48,7 @@ "devDependencies": { "@sap-cloud-sdk/test-services-odata-v2": "^3.21.0", "@sap-cloud-sdk/resilience": "^3.21.0", - "nock": "^14.0.0-beta.14", + "nock": "^14.0.0-beta.6", "typescript": "~5.6.2" } } diff --git a/packages/odata-v4/package.json b/packages/odata-v4/package.json index 021d0787a2..b3eb001b88 100644 --- a/packages/odata-v4/package.json +++ b/packages/odata-v4/package.json @@ -47,7 +47,7 @@ }, "devDependencies": { "@sap-cloud-sdk/test-services-odata-v4": "^3.21.0", - "nock": "^14.0.0-beta.14", + "nock": "^14.0.0-beta.6", "typescript": "~5.6.2" } } diff --git a/packages/openapi/package.json b/packages/openapi/package.json index 1a4a2db424..6c700f0c1f 100644 --- a/packages/openapi/package.json +++ b/packages/openapi/package.json @@ -44,7 +44,7 @@ "axios": "^1.7.7" }, "devDependencies": { - "nock": "^14.0.0-beta.14", + "nock": "^14.0.0-beta.6", "typescript": "~5.6.2" } } diff --git a/packages/openapi/src/openapi-request-builder.spec.ts b/packages/openapi/src/openapi-request-builder.spec.ts index 5cae70f56e..3d98c51e79 100644 --- a/packages/openapi/src/openapi-request-builder.spec.ts +++ b/packages/openapi/src/openapi-request-builder.spec.ts @@ -210,7 +210,11 @@ describe('openapi-request-builder', () => { .get(/.*/) .reply(200, 'iss token used on the way') ]; - const requestBuilder = new OpenApiRequestBuilder('get', '/test'); + const requestBuilder = new OpenApiRequestBuilder('get', '/test', { + body: { + limit: 100 + } + }); const response = await requestBuilder.executeRaw({ destinationName: 'ERNIE-UND-CERT', iss: onlyIssuerXsuaaUrl @@ -223,7 +227,10 @@ describe('openapi-request-builder', () => { middleware: [], url: '/test', headers: { requestConfig: {} }, - params: { requestConfig: {} } + params: { requestConfig: {} }, + data: { + limit: 100 + } }, { fetchCsrfToken: false } ); diff --git a/packages/resilience/package.json b/packages/resilience/package.json index f623e92d2b..80183d0458 100644 --- a/packages/resilience/package.json +++ b/packages/resilience/package.json @@ -46,7 +46,7 @@ "devDependencies": { "@types/async-retry": "^1.4.8", "@types/opossum": "^8.1.7", - "nock": "^14.0.0-beta.14", + "nock": "^14.0.0-beta.6", "typescript": "~5.6.2" } } diff --git a/packages/util/package.json b/packages/util/package.json index 00f8e6c030..f481bf8872 100644 --- a/packages/util/package.json +++ b/packages/util/package.json @@ -42,7 +42,7 @@ "winston-transport": "^4.7.1" }, "devDependencies": { - "nock": "^14.0.0-beta.14", + "nock": "^14.0.0-beta.6", "typescript": "~5.6.2", "mock-fs": "^5.2.0" } diff --git a/test-packages/integration-tests/package.json b/test-packages/integration-tests/package.json index 712a3118ca..879f80e856 100644 --- a/test-packages/integration-tests/package.json +++ b/test-packages/integration-tests/package.json @@ -35,7 +35,7 @@ "execa": "^5.0.0", "jsonwebtoken": "^9.0.2", "mock-fs": "^5.2.0", - "nock": "^14.0.0-beta.14", + "nock": "^14.0.0-beta.6", "winston": "^3.14.2" } } diff --git a/yarn.lock b/yarn.lock index 2a462c0f80..d2288320d8 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1142,18 +1142,6 @@ jju "^1.4.0" js-yaml "^4.1.0" -"@mswjs/interceptors@^0.35.6": - version "0.35.9" - resolved "https://registry.npmjs.org/@mswjs/interceptors/-/interceptors-0.35.9.tgz#1e1488ff2f333683d374eccc8c0f4d5d851c6d3d" - integrity sha512-SSnyl/4ni/2ViHKkiZb8eajA/eN1DNFaHjhGiLUdZvDz6PKF4COSf/17xqSz64nOo2Ia29SA6B2KNCsyCbVmaQ== - dependencies: - "@open-draft/deferred-promise" "^2.2.0" - "@open-draft/logger" "^0.3.0" - "@open-draft/until" "^2.0.0" - is-node-process "^1.2.0" - outvariant "^1.4.3" - strict-event-emitter "^0.5.1" - "@nodelib/fs.scandir@2.1.5": version "2.1.5" resolved "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz#7619c2eb21b25483f6d167548b4cfd5a7488c3d5" @@ -1288,24 +1276,6 @@ dependencies: "@octokit/openapi-types" "^22.1.0" -"@open-draft/deferred-promise@^2.2.0": - version "2.2.0" - resolved "https://registry.npmjs.org/@open-draft/deferred-promise/-/deferred-promise-2.2.0.tgz#4a822d10f6f0e316be4d67b4d4f8c9a124b073bd" - integrity sha512-CecwLWx3rhxVQF6V4bAgPS5t+So2sTbPgAzafKkVizyi7tlwpcFpdFqq+wqF2OwNBmqFuu6tOyouTuxgpMfzmA== - -"@open-draft/logger@^0.3.0": - version "0.3.0" - resolved "https://registry.npmjs.org/@open-draft/logger/-/logger-0.3.0.tgz#2b3ab1242b360aa0adb28b85f5d7da1c133a0954" - integrity sha512-X2g45fzhxH238HKO4xbSr7+wBS8Fvw6ixhTDuvLd5mqh6bJJCFAPwU9mPDxbcrRtfxv4u5IHCEH77BmxvXmmxQ== - dependencies: - is-node-process "^1.2.0" - outvariant "^1.4.0" - -"@open-draft/until@^2.0.0": - version "2.1.0" - resolved "https://registry.npmjs.org/@open-draft/until/-/until-2.1.0.tgz#0acf32f470af2ceaf47f095cdecd40d68666efda" - integrity sha512-U69T3ItWHvLwGg5eJ0n3I62nWuE6ilHlmz7zM0npLBRvPRd7e6NYmg54vvRtP5mZG7kZqZCFVdsTWo7BPtBujg== - "@pkgjs/parseargs@^0.11.0": version "0.11.0" resolved "https://registry.npmjs.org/@pkgjs/parseargs/-/parseargs-0.11.0.tgz#a77ea742fab25775145434eb1d2328cf5013ac33" @@ -5422,11 +5392,6 @@ is-negative-zero@^2.0.3: resolved "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.3.tgz#ced903a027aca6381b777a5743069d7376a49747" integrity sha512-5KoIu2Ngpyek75jXodFvnafB6DJgr3u8uuK0LEZJjrU19DrMD3EVERaR8sjz8CCGgpZvxPl9SuE1GMVPFHx1mw== -is-node-process@^1.2.0: - version "1.2.0" - resolved "https://registry.npmjs.org/is-node-process/-/is-node-process-1.2.0.tgz#ea02a1b90ddb3934a19aea414e88edef7e11d134" - integrity sha512-Vg4o6/fqPxIjtxgUH5QLJhwZ7gW5diGCVlXpuUfELC62CuxM1iHcRe51f2W1FDy04Ai4KJkagKjx3XaqyfRKXw== - is-number-object@^1.0.4: version "1.0.7" resolved "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.7.tgz#59d50ada4c45251784e9904f5246c742f07a42fc" @@ -6879,12 +6844,11 @@ neo-async@^2.6.0: resolved "https://registry.npmjs.org/netmask/-/netmask-2.0.2.tgz#8b01a07644065d536383835823bc52004ebac5e7" integrity sha512-dBpDMdxv9Irdq66304OLfEmQ9tbNRFnFTuZiLo+bD+r332bBmMJ8GBLXklIXXgxd3+v9+KUnZaUR5PJMa75Gsg== -nock@^14.0.0-beta.14: - version "14.0.0-beta.14" - resolved "https://registry.npmjs.org/nock/-/nock-14.0.0-beta.14.tgz#1d211b93a547386846d6054f455c2581ab34f750" - integrity sha512-nbUIuqYkixyazl4hWBQ+EJzb5F0/NJabIQFEEIQwBHPaG+RxvVSs4uSCasHMnCrNuCmOndxgUBqS860g6/OwJw== +nock@^14.0.0-beta.6: + version "14.0.0-beta.7" + resolved "https://registry.npmjs.org/nock/-/nock-14.0.0-beta.7.tgz#bdb3f3cfa2276659c87412f6dff2aea9ee69a7fc" + integrity sha512-+EQMm5W9K8YnBE2Ceg4hnJynaCZmvK8ZlFXQ2fxGwtkOkBUq8GpQLTks2m1jpvse9XDxMDDOHgOWpiznFuh0bA== dependencies: - "@mswjs/interceptors" "^0.35.6" json-stringify-safe "^5.0.1" propagate "^2.0.0" @@ -7305,11 +7269,6 @@ outdent@^0.5.0: resolved "https://registry.npmjs.org/outdent/-/outdent-0.5.0.tgz#9e10982fdc41492bb473ad13840d22f9655be2ff" integrity sha512-/jHxFIzoMXdqPzTaCpFzAAWhpkSjZPF4Vsn6jAfNpmbH/ymsmd7Qc6VE9BGn0L6YMj6uwpQLxCECpus4ukKS9Q== -outvariant@^1.4.0, outvariant@^1.4.3: - version "1.4.3" - resolved "https://registry.npmjs.org/outvariant/-/outvariant-1.4.3.tgz#221c1bfc093e8fec7075497e7799fdbf43d14873" - integrity sha512-+Sl2UErvtsoajRDKCE5/dBz4DIvHXQQnAxtQTF04OJxY0+DyZXSo5P5Bb7XYWOh81syohlYL24hbDwxedPUJCA== - p-filter@^2.1.0: version "2.1.0" resolved "https://registry.npmjs.org/p-filter/-/p-filter-2.1.0.tgz#1b1472562ae7a0f742f0f3d3d3718ea66ff9c09c" @@ -8764,11 +8723,6 @@ streamx@^2.15.0, streamx@^2.16.1: optionalDependencies: bare-events "^2.2.0" -strict-event-emitter@^0.5.1: - version "0.5.1" - resolved "https://registry.npmjs.org/strict-event-emitter/-/strict-event-emitter-0.5.1.tgz#1602ece81c51574ca39c6815e09f1a3e8550bd93" - integrity sha512-vMgjE/GGEPEFnhFub6pa4FmJBRBVOLpIII2hvCZ8Kzb7K0hlHo7mQv6xYrBvCL2LtAIBwFUK8wvuJgTVSQ5MFQ== - string-length@^4.0.1: version "4.0.2" resolved "https://registry.npmjs.org/string-length/-/string-length-4.0.2.tgz#a8a8dc7bd5c1a82b9b3c8b87e125f66871b6e57a" From 2d1f2879d8ca8b4ab9ab878a96a3fe2b73feae94 Mon Sep 17 00:00:00 2001 From: Tom Frenken Date: Mon, 30 Sep 2024 13:12:29 +0200 Subject: [PATCH 08/10] change improt --- packages/odata-common/src/order/orderable.ts | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/packages/odata-common/src/order/orderable.ts b/packages/odata-common/src/order/orderable.ts index ac2b53b772..e1d4d7e0b1 100644 --- a/packages/odata-common/src/order/orderable.ts +++ b/packages/odata-common/src/order/orderable.ts @@ -2,10 +2,9 @@ import type { DeSerializers } from '../de-serializers'; import type { EntityBase } from '../entity-base'; import type { ComplexTypePropertyFields, - SimpleTypeFields + SimpleTypeFields, + Link } from '../selectable'; -// eslint-disable-next-line import/no-internal-modules -import { Link } from '../selectable/link'; import type { EntityApi } from '../entity-api'; import { Order } from './order'; import type { OrderLink } from './order-link'; From 29937d5d647547e4fd04a00b4b21ef4fcd746c09 Mon Sep 17 00:00:00 2001 From: Tom Frenken Date: Mon, 30 Sep 2024 13:21:11 +0200 Subject: [PATCH 09/10] oopsie --- packages/odata-common/src/order/orderable.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/odata-common/src/order/orderable.ts b/packages/odata-common/src/order/orderable.ts index e1d4d7e0b1..4263a843d0 100644 --- a/packages/odata-common/src/order/orderable.ts +++ b/packages/odata-common/src/order/orderable.ts @@ -2,9 +2,9 @@ import type { DeSerializers } from '../de-serializers'; import type { EntityBase } from '../entity-base'; import type { ComplexTypePropertyFields, - SimpleTypeFields, - Link + SimpleTypeFields } from '../selectable'; +import { Link } from '../selectable'; import type { EntityApi } from '../entity-api'; import { Order } from './order'; import type { OrderLink } from './order-link'; From 977ee0b860f19fec19f4d9e592ade7f26022aa4c Mon Sep 17 00:00:00 2001 From: Marika Marszalkowski Date: Mon, 30 Sep 2024 13:23:09 +0200 Subject: [PATCH 10/10] remove unnecessary lint rules --- packages/odata-common/src/order/orderable.ts | 3 ++- packages/openapi-generator/src/options/options.ts | 1 - test-packages/type-tests/test/v2/link.test-d.ts | 1 - test-packages/type-tests/test/v2/schema-properties.test-d.ts | 1 - 4 files changed, 2 insertions(+), 4 deletions(-) diff --git a/packages/odata-common/src/order/orderable.ts b/packages/odata-common/src/order/orderable.ts index 4263a843d0..ac2b53b772 100644 --- a/packages/odata-common/src/order/orderable.ts +++ b/packages/odata-common/src/order/orderable.ts @@ -4,7 +4,8 @@ import type { ComplexTypePropertyFields, SimpleTypeFields } from '../selectable'; -import { Link } from '../selectable'; +// eslint-disable-next-line import/no-internal-modules +import { Link } from '../selectable/link'; import type { EntityApi } from '../entity-api'; import { Order } from './order'; import type { OrderLink } from './order-link'; diff --git a/packages/openapi-generator/src/options/options.ts b/packages/openapi-generator/src/options/options.ts index 7003490380..ef2c0b9ff3 100644 --- a/packages/openapi-generator/src/options/options.ts +++ b/packages/openapi-generator/src/options/options.ts @@ -1,4 +1,3 @@ -// eslint-disable-next-line import/no-internal-modules import type { ParsedOptions, Options, 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 db81eed5e1..aca991ab5b 100644 --- a/test-packages/type-tests/test/v2/link.test-d.ts +++ b/test-packages/type-tests/test/v2/link.test-d.ts @@ -1,5 +1,4 @@ /* eslint-disable no-unused-vars */ -/* eslint-disable import/no-internal-modules */ import { testService } from '@sap-cloud-sdk/test-services-odata-v2/test-service'; import { expectType } from 'tsd'; import type { TestEntitySingleLinkApi } from '@sap-cloud-sdk/test-services-odata-v2/test-service/TestEntitySingleLinkApi'; 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 3bbf5a6e61..8b0fb91a5b 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,4 +1,3 @@ -/* eslint-disable import/no-internal-modules */ 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';