chore: Use correct eslint deps (#5034)

* 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](import-js/eslint-plugin-import@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] <[email protected]> * chore: add missing dependencies * fix lint issues * fixes after rebase * add changeset * fix get with body * Revert "fix get with body" This reverts commit e4b3e66. * change improt * oopsie * remove unnecessary lint rules --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Tom Frenken <[email protected]>
SAP · Sep 30, 2024 · a729a72 · a729a72
1 parent 00a0442
commit a729a72
Show file tree

Hide file tree

Showing 97 changed files with 280 additions and 214 deletions.
diff --git a/.changeset/breezy-pugs-call.md 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
@@ -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/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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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/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
@@ -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/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.3.0",
     "eslint-plugin-prettier": "^5.2.1",

diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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