Skip to content

Commit

Permalink
chore: eslint import improvement (#706)
Browse files Browse the repository at this point in the history
* Enable import plugin rules

* Enable more rules

* Forbid imports like ./index
  • Loading branch information
Florian Richter authored Nov 18, 2020
1 parent a92f0a4 commit f96b2f7
Show file tree
Hide file tree
Showing 11 changed files with 34 additions and 19 deletions.
22 changes: 19 additions & 3 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -158,11 +158,21 @@ module.exports = {
'guard-for-in': 'off',
'id-blacklist': 'off',
'id-match': 'off',
'import/no-absolute-path': 'error',
'import/no-unresolved': 'off',
'import/named': 'error',
'import/no-extraneous-dependencies': 'off',
'import/default': 'error',
'import/namespace': 'error',
'import/no-absolute-path': 'error',
'import/no-dynamic-require': 'error',
'import/no-internal-modules': 'error',
'import/no-self-import': 'error',
'import/no-cycle': 'error',
'import/no-useless-path-segments': 'error',
'import/no-relative-parent-imports': 'error',
'import/export': 'error',
'import/order': 'error',
'import/no-extraneous-dependencies': 'off',
'import/no-duplicates': 'error',
indent: 'off',
// Does not work for typescript yet
// "lines-around-comment": [
Expand Down Expand Up @@ -202,7 +212,13 @@ module.exports = {
'no-new-wrappers': 'error',
'no-redeclare': 'off',
'@typescript-eslint/no-redeclare': ['error'],
'no-restricted-imports': ['error', '../', './'],
'no-restricted-imports': [
'error',
{
paths: ['../', '../../', './'],
patterns: ['*/index']
}
],
'no-return-await': 'error',
'no-sequences': 'error',
'no-shadow': 'off',
Expand Down
2 changes: 1 addition & 1 deletion packages/core/src/connectivity/scp-cf/get-protocol.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { createLogger } from '@sap-cloud-sdk/util';
import { Destination } from './destination';
import { Protocol } from './protocol';
import { Destination } from './index';

const logger = createLogger({
package: 'core',
Expand Down
3 changes: 2 additions & 1 deletion packages/core/src/connectivity/scp-cf/protocol.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
/* eslint-disable-next-line */
export enum Protocol {
HTTP = 'http',
HTTPS = 'https'
}

/* eslint-disable-next-line @typescript-eslint/no-redeclare */
/* eslint-disable-next-line */
export namespace Protocol {
/**
* Get [[Protocol]] from its string representation.
Expand Down
12 changes: 5 additions & 7 deletions packages/core/src/connectivity/scp-cf/proxy-util.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,11 @@ import { HttpProxyAgent } from 'http-proxy-agent';
import { HttpsProxyAgent } from 'https-proxy-agent';
import { createLogger } from '@sap-cloud-sdk/util';
import { HttpAgentConfig, HttpsAgentConfig } from '../../http-client';
import {
Destination,
ProxyConfiguration,
Protocol,
basicHeader,
getProtocolOrDefault
} from './index';
import { getProtocolOrDefault } from './get-protocol';
import { Destination } from './destination';
import { Protocol } from './protocol';
import { ProxyConfiguration } from './connectivity-service-types';
import { basicHeader } from './authorization-header';

const logger = createLogger({
package: 'core',
Expand Down
2 changes: 1 addition & 1 deletion packages/core/src/odata-common/header-builder.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { ODataRequest, ODataRequestConfig } from './index';
import { ODataRequest, ODataRequestConfig } from './request';

/**
* Create object containing all headers, including custom headers for a given OData request configuration and destination.
Expand Down
2 changes: 1 addition & 1 deletion packages/core/src/odata-common/properties-util.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { EntityBase } from './entity';
import { toStaticPropertyFormat } from './name-converter';
import { EntityBase } from './index';

export const nonEnumerable = (target: any, propertyKey: string) => {
const descriptor = Object.getOwnPropertyDescriptor(target, propertyKey) || {};
Expand Down
2 changes: 1 addition & 1 deletion packages/core/test/odata/v4/entity-deserializer.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import {
TestEntity,
TestComplexType
} from '../../test-util/test-services/v4/test-service';
import { deserializeEntityV4, deserializeComplexTypeV4 } from '../../../src/';
import { deserializeEntityV4, deserializeComplexTypeV4 } from '../../../src';
import { TestEnumType } from '../../test-util/test-services/v4/test-service/TestEnumType';

describe('entity-deserializer', () => {
Expand Down
2 changes: 1 addition & 1 deletion packages/core/test/payload-value-converter-v4.spec.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import moment from 'moment';
import { edmToTsV4, tsToEdmV4 } from '../src/';
import { edmToTsV4, tsToEdmV4 } from '../src';

describe('edmToTsV4()', () => {
it('should parse Edm.Date to moment', () => {
Expand Down
2 changes: 1 addition & 1 deletion packages/core/test/util/properties-util.spec.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { TestEntity } from '../test-util/test-services/v2/test-service';
import { isNavigationProperty } from '../../src/odata-common/';
import { isNavigationProperty } from '../../src/odata-common';

describe('properties-util', () => {
describe('isNavigationProperty', () => {
Expand Down
2 changes: 1 addition & 1 deletion packages/generator/src/generator.ts
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ import {
genericDescription,
s4hanaCloudDescription
} from './package-description';
import { parseAllServices } from './edmx-to-vdm/';
import { parseAllServices } from './edmx-to-vdm';
import { requestBuilderSourceFile } from './request-builder/file';
import { serviceMappingFile } from './service-mapping';
import { csn } from './service/csn';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { any } from '@sap-cloud-sdk/core';
import { resetDataSource } from '@sap-cloud-sdk/test-services-e2e/TripPin/microsoft-o-data-service-sample-trippin-in-memory-models-service/action-imports';
import { PersonGender } from '@sap-cloud-sdk/test-services-e2e/TripPin/microsoft-o-data-service-sample-trippin-in-memory-models-service/PersonGender';
import { People } from '../../../test-services-e2e/TripPin/microsoft-o-data-service-sample-trippin-in-memory-models-service';
import { People } from '@sap-cloud-sdk/test-services-e2e/TripPin/microsoft-o-data-service-sample-trippin-in-memory-models-service';

const url = 'https://services.odata.org/';
const destination = { url };
Expand Down

0 comments on commit f96b2f7

Please sign in to comment.