Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Migrate to imports/order #578

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion eslint.config.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,11 @@ export default tseslint.config(
rules: {
"@typescript-eslint/no-require-imports": "off",
"@typescript-eslint/no-explicit-any": "off",
"sort-imports": "error"
"import/order": ["error", {
"groups": [
"builtin", "external", "internal", "parent","sibling", "index", "type"
],
}],
}
}
);
14 changes: 7 additions & 7 deletions src/client.ts
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
import ApiDecoratorService from './services/ApiDecoratorService'
import { HttpClient } from './services/http/HttpClient'
import IConfiguration from './configuration/IConfiguration'
import IDecorator from './services/decorators/IDecorator'
import { IHttpOptions } from './services/http/IHttpOptions'
import LimiterDecorator from './services/decorators/LimiterDecorator'
import { Request } from './services/http/Request'
import RetryDecorator from './services/decorators/RetryDecorator'
import type AutomationDiscovery from './discovery/automation/AutomationDiscovery'
import type CmsDiscovery from './discovery/cms/CmsDiscovery'
import type CommunicationPreferencesDiscovery from './discovery/communicationPreferences/CommunicationPreferencesDiscovery'
import type ConversationsDiscovery from './discovery/conversations/ConversationsDiscovery'
import type CrmDiscovery from './discovery/crm/CrmDiscovery'
import type EventsDiscovery from './discovery/events/EventsDiscovery'
import type FilesDiscovery from './discovery/files/FilesDiscovery'
import { HttpClient } from './services/http/HttpClient'
import IConfiguration from './configuration/IConfiguration'
import IDecorator from './services/decorators/IDecorator'
import { IHttpOptions } from './services/http/IHttpOptions'
import LimiterDecorator from './services/decorators/LimiterDecorator'
import type MarketingDiscovery from './discovery/marketing/MarketingDiscovery'
import type OauthDiscovery from './discovery/oauth/OauthDiscovery'
import { Request } from './services/http/Request'
import RetryDecorator from './services/decorators/RetryDecorator'
import type SettingsDiscovery from './discovery/settings/SettingsDiscovery'
import type WebhooksDiscovery from './discovery/webhooks/WebhooksDiscovery'

Expand Down
4 changes: 2 additions & 2 deletions src/configuration/ApiClientConfigurator.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import IConfiguration from './IConfiguration'
import merge from 'lodash.merge'
import { IRequestContext } from '../services/IRequestContext'
import IConfiguration from './IConfiguration'
import { VERSION } from './version'
import merge from 'lodash.merge'

export class ApiClientConfigurator {
public static getParams<
Expand Down
2 changes: 1 addition & 1 deletion src/discovery/automation/AutomationDiscovery.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import type ActionsDiscovery from './actions/ActionsDiscovery'
import BaseDiscovery from '../BaseDiscovery'
import type ActionsDiscovery from './actions/ActionsDiscovery'

export default class AutomationDiscovery extends BaseDiscovery {
protected _actions: ActionsDiscovery | undefined
Expand Down
2 changes: 1 addition & 1 deletion src/discovery/cms/CmsDiscovery.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import type AuditLogsDiscovery from './audit_logs/AuditLogsDiscovery'
import BaseDiscovery from '../BaseDiscovery'
import type AuditLogsDiscovery from './audit_logs/AuditLogsDiscovery'
import type BlogsDiscovery from './blogs/BlogsDiscovery'
import type DomainsDiscovery from './domains/DomainsDiscovery'
import type HubdbDiscovery from './hubdb/HubdbDiscovery'
Expand Down
2 changes: 1 addition & 1 deletion src/discovery/cms/blogs/BlogsDiscovery.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import type AuthorsDiscovery from './authors/AuthorsDiscovery'
import BaseDiscovery from '../../BaseDiscovery'
import type AuthorsDiscovery from './authors/AuthorsDiscovery'
import type BlogPostsDiscovery from './blog_posts/BlogPostsDiscovery'
import type TagsDiscovery from './tags/TagsDiscovery'

Expand Down
2 changes: 1 addition & 1 deletion src/discovery/crm/CrmDiscovery.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import type AssociationsDiscovery from './associations/AssociationsDiscovery'
import BaseDiscovery from '../BaseDiscovery'
import type AssociationsDiscovery from './associations/AssociationsDiscovery'
import type CompaniesDiscovery from './companies/CompaniesDiscovery'
import type ContactsDiscovery from './contacts/ContactsDiscovery'
import type DealsDiscovery from './deals/DealsDiscovery'
Expand Down
2 changes: 1 addition & 1 deletion src/discovery/crm/associations/AssociationsDiscovery.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ import {
} from '../../../../codegen/crm/associations/index'
import { ApiClientConfigurator } from '../../../configuration/ApiClientConfigurator'
import ApiDecoratorService from '../../../services/ApiDecoratorService'
import type AssociationsV4Discovery from './v4/AssociationsDiscovery'
import BaseDiscovery from '../../BaseDiscovery'
import IConfiguration from '../../../configuration/IConfiguration'
import { Observable } from '../../../../codegen/crm/associations/rxjsStub'
import type AssociationsV4Discovery from './v4/AssociationsDiscovery'
import type SchemaDiscovery from './schema/SchemaDiscovery'

export default class AssociationsDiscovery extends BaseDiscovery {
Expand Down
4 changes: 2 additions & 2 deletions src/discovery/crm/objects/ObjectsDiscovery.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,16 +10,16 @@ import {
import { ApiClientConfigurator } from '../../../configuration/ApiClientConfigurator'
import ApiDecoratorService from '../../../services/ApiDecoratorService'
import BaseDiscovery from '../../BaseDiscovery'
import IConfiguration from '../../../configuration/IConfiguration'
import { Observable } from '../../../../codegen/crm/objects/rxjsStub'
import type CallsDiscovery from './calls/CallsDiscovery'
import type CommunicationsDiscovery from './communications/CommunicationsDiscovery'
import type EmailsDiscovery from './emails/EmailsDiscovery'
import type FeedbackSubmissionsDiscovery from './feedback_submissions/FeedbackSubmissionsDiscovery'
import type GoalsDiscovery from './goals/GoalsDiscovery'
import IConfiguration from '../../../configuration/IConfiguration'
import type LeadsDiscovery from './leads/LeadsDiscovery'
import type MeetingsDiscovery from './meetings/MeetingsDiscovery'
import type NotesDiscovery from './notes/NotesDiscovery'
import { Observable } from '../../../../codegen/crm/objects/rxjsStub'
import type PostalMailDiscovery from './postal_mail/PostalMailDiscovery'
import type TasksDiscovery from './tasks/TasksDiscovery'
import type TaxesDiscovery from './taxes/TaxesDiscovery'
Expand Down
4 changes: 2 additions & 2 deletions src/services/decorators/RetryDecorator.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import IDecorator from './IDecorator'
import { StatusCodes } from '../http/StatusCodes'
import get from 'lodash.get'
import { StatusCodes } from '../http/StatusCodes'
import IDecorator from './IDecorator'

export default class RetryDecorator implements IDecorator {
public readonly tenSecondlyRolling = 'TEN_SECONDLY_ROLLING'
Expand Down
4 changes: 2 additions & 2 deletions src/services/http/Auth.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { AuthTypes } from './AuthTypes'
import get from 'lodash.get'
import IConfiguration from '../../configuration/IConfiguration'
import { AuthTypes } from './AuthTypes'
import { IHttpOptions } from './IHttpOptions'
import get from 'lodash.get'

export class Auth {
public static chooseAuth(opts: IHttpOptions = {}, config: IConfiguration = {}): string | undefined {
Expand Down
2 changes: 1 addition & 1 deletion src/services/http/HttpClient.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Request } from './Request'
import fetch from 'node-fetch'
import { Request } from './Request'

export class HttpClient {
public static async send(request: Request) {
Expand Down
4 changes: 2 additions & 2 deletions src/services/http/Request.ts
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import get from 'lodash.get'
import { ApiClientConfigurator } from '../../configuration/ApiClientConfigurator'
import IConfiguration from '../../configuration/IConfiguration'
import { Auth } from './Auth'
import { AuthMethods } from './AuthMethods'
import { AuthTypes } from './AuthTypes'
import IConfiguration from '../../configuration/IConfiguration'
import { IHttpOptions } from './IHttpOptions'
import get from 'lodash.get'

export interface IHeaders {
[key: string]: string
Expand Down