Skip to content

Commit

Permalink
fix(eslint): pass #8 (#1882)
Browse files Browse the repository at this point in the history
## Describe your changes

- Run only automated fix `npx eslint --fix`
  • Loading branch information
bodinsamuel committed Mar 20, 2024
1 parent 32c0a31 commit e6a91ee
Show file tree
Hide file tree
Showing 34 changed files with 84 additions and 77 deletions.
3 changes: 2 additions & 1 deletion packages/jobs/lib/client.ts
@@ -1,4 +1,5 @@
import { CreateTRPCProxyClient, createTRPCProxyClient, httpBatchLink } from '@trpc/client';
import type { CreateTRPCProxyClient } from '@trpc/client';
import { createTRPCProxyClient, httpBatchLink } from '@trpc/client';
import type { AppRouter } from './server.js';
import superjson from 'superjson';

Expand Down
4 changes: 2 additions & 2 deletions packages/jobs/lib/crons/autoIdleDemo.ts
Expand Up @@ -11,9 +11,9 @@ import {
updateScheduleStatus,
isErr,
findPausableDemoSyncs,
logger
logger,
SpanTypes
} from '@nangohq/shared';
import { SpanTypes } from '@nangohq/shared';
import tracer from 'dd-trace';

export function cronAutoIdleDemo(): void {
Expand Down
3 changes: 2 additions & 1 deletion packages/jobs/lib/runner/local.runner.ts
@@ -1,6 +1,7 @@
import type { Runner } from './runner.js';
import { RunnerType } from './runner.js';
import { execSync, spawn, ChildProcess } from 'child_process';
import type { ChildProcess } from 'child_process';
import { execSync, spawn } from 'child_process';
import { getRunnerClient } from '@nangohq/nango-runner';
import { logger } from '@nangohq/shared';

Expand Down
6 changes: 4 additions & 2 deletions packages/runner/lib/client.ts
@@ -1,7 +1,9 @@
import { CreateTRPCProxyClient, createTRPCProxyClient, httpBatchLink } from '@trpc/client';
import type { CreateTRPCProxyClient } from '@trpc/client';
import { createTRPCProxyClient, httpBatchLink } from '@trpc/client';
import type { AppRouter } from './server.js';
import superjson from 'superjson';
import { fetch, Agent, RequestInit } from 'undici';
import type { RequestInit } from 'undici';
import { fetch, Agent } from 'undici';

export type ProxyAppRouter = CreateTRPCProxyClient<AppRouter>;

Expand Down
3 changes: 1 addition & 2 deletions packages/server/lib/clients/auth.client.ts
Expand Up @@ -4,12 +4,11 @@ import { BasicStrategy } from 'passport-http';
import express from 'express';
import session from 'express-session';
import path from 'path';
import { dirname, isCloud, isBasicAuthEnabled, userService } from '@nangohq/shared';
import { dirname, isCloud, isBasicAuthEnabled, userService, database } from '@nangohq/shared';
import crypto from 'crypto';
import util from 'util';
import cookieParser from 'cookie-parser';
import connectSessionKnex from 'connect-session-knex';
import { database } from '@nangohq/shared';

const KnexSessionStore = connectSessionKnex(session);

Expand Down
3 changes: 2 additions & 1 deletion packages/server/lib/clients/publisher.client.unit.test.ts
@@ -1,5 +1,6 @@
import { describe, it, expect, vi, beforeEach } from 'vitest';
import { Publisher, WebSocketClientId } from './publisher.client';
import type { WebSocketClientId } from './publisher.client';
import { Publisher } from './publisher.client';
import type { WebSocket } from 'ws';
import * as uuid from 'uuid';

Expand Down
3 changes: 1 addition & 2 deletions packages/server/lib/controllers/activity.controller.ts
@@ -1,5 +1,4 @@
import type { Request, Response } from 'express';
import type { NextFunction } from 'express';
import type { Request, Response, NextFunction } from 'express';

import { getUserAccountAndEnvironmentFromSession } from '../utils/utils.js';
import { activityFilter, getAllSyncAndActionNames, getTopLevelLogByEnvironment, getLogMessagesForLogs, errorManager } from '@nangohq/shared';
Expand Down
6 changes: 3 additions & 3 deletions packages/server/lib/controllers/ratelimit.middleware.ts
@@ -1,8 +1,8 @@
import type { Request, Response, NextFunction } from 'express';
import { createClient } from 'redis';
import { RateLimiterRedis, RateLimiterMemory, RateLimiterRes } from 'rate-limiter-flexible';
import { getAccount, getRedisUrl } from '@nangohq/shared';
import { logger } from '@nangohq/shared';
import type { RateLimiterRes } from 'rate-limiter-flexible';
import { RateLimiterRedis, RateLimiterMemory } from 'rate-limiter-flexible';
import { getAccount, getRedisUrl, logger } from '@nangohq/shared';

const rateLimiter = await (async () => {
const opts = {
Expand Down
9 changes: 4 additions & 5 deletions packages/shared/lib/clients/oauth2.client.ts
@@ -1,14 +1,13 @@
import {
import type {
Config as ProviderConfig,
TemplateOAuth2 as ProviderTemplateOAuth2,
AuthModes as ProviderAuthModes,
Template as ProviderTemplate,
OAuth2Credentials,
OAuthAuthorizationMethod,
OAuthBodyFormat,
Connection
} from '../models/index.js';
import { AuthorizationCode, AccessToken } from 'simple-oauth2';
import { AuthModes as ProviderAuthModes, OAuthAuthorizationMethod, OAuthBodyFormat } from '../models/index.js';
import type { AccessToken } from 'simple-oauth2';
import { AuthorizationCode } from 'simple-oauth2';
import connectionsManager from '../services/connection.service.js';
import type { ServiceResponse } from '../models/Generic.js';
import { LogActionEnum } from '../models/Activity.js';
Expand Down
5 changes: 3 additions & 2 deletions packages/shared/lib/clients/provider.client.ts
@@ -1,16 +1,17 @@
import braintree from 'braintree';
import {
import type {
Config as ProviderConfig,
Connection,
AuthModes as ProviderAuthModes,
AuthorizationTokenResponse,
RefreshTokenResponse,
TemplateOAuth2 as ProviderTemplateOAuth2
} from '../models/index.js';
import { AuthModes as ProviderAuthModes } from '../models/index.js';
import axios from 'axios';
import qs from 'qs';
import { parseTokenExpirationDate, isTokenExpired } from '../utils/utils.js';
import { NangoError } from '../utils/error.js';

const stripeAppExpiresIn = 3600;

class ProviderClient {
Expand Down
12 changes: 8 additions & 4 deletions packages/shared/lib/clients/sync.client.ts
@@ -1,12 +1,16 @@
import { Client, Connection, ScheduleOverlapPolicy, ScheduleDescription } from '@temporalio/client';
import type { ScheduleDescription } from '@temporalio/client';
import { Client, Connection, ScheduleOverlapPolicy } from '@temporalio/client';
import type { NangoConnection, Connection as NangoFullConnection } from '../models/Connection.js';
import ms, { StringValue } from 'ms';
import type { StringValue } from 'ms';
import ms from 'ms';
import fs from 'fs-extra';
import type { Config as ProviderConfig } from '../models/Provider.js';
import type { NangoIntegrationData, NangoConfig, NangoIntegration } from '../models/NangoConfig.js';
import { Sync, SyncStatus, SyncType, ScheduleStatus, SyncCommand, SyncWithSchedule } from '../models/Sync.js';
import type { Sync, SyncWithSchedule } from '../models/Sync.js';
import { SyncStatus, SyncType, ScheduleStatus, SyncCommand } from '../models/Sync.js';
import type { ServiceResponse } from '../models/Generic.js';
import { LogActionEnum, LogLevel } from '../models/Activity.js';
import type { LogLevel } from '../models/Activity.js';
import { LogActionEnum } from '../models/Activity.js';
import { SYNC_TASK_QUEUE, WEBHOOK_TASK_QUEUE } from '../constants.js';
import {
createActivityLog,
Expand Down
3 changes: 2 additions & 1 deletion packages/shared/lib/db/seeders/sync-job.seeder.ts
@@ -1,7 +1,8 @@
import db from '../database.js';
import * as jobService from '../../services/sync/job.service.js';
import { createSyncSeeds } from './sync.seeder.js';
import { Job, SyncType, SyncStatus } from '../../models/Sync.js';
import type { Job } from '../../models/Sync.js';
import { SyncType, SyncStatus } from '../../models/Sync.js';

export const createSyncJobSeeds = async (connectionId = 1): Promise<Job> => {
const sync = await createSyncSeeds(connectionId);
Expand Down
3 changes: 2 additions & 1 deletion packages/shared/lib/hooks/hooks.ts
Expand Up @@ -11,7 +11,8 @@ import integrationPostConnectionScript from '../integrations/scripts/connection/
import webhookService from '../services/notification/webhook.service.js';
import { SpanTypes } from '../utils/telemetry.js';
import { isCloud, isLocal, isEnterprise } from '../utils/utils.js';
import { Result, resultOk, resultErr } from '../utils/result.js';
import type { Result } from '../utils/result.js';
import { resultOk, resultErr } from '../utils/result.js';
import { NangoError } from '../utils/error.js';

export const connectionCreated = async (
Expand Down
@@ -1,6 +1,7 @@
import type { AxiosError, AxiosResponse } from 'axios';
import type { RecentlyCreatedConnection, Connection, ConnectionConfig } from '../../../models/Connection.js';
import { LogLevel, LogActionEnum } from '../../../models/Activity.js';
import type { LogLevel } from '../../../models/Activity.js';
import { LogActionEnum } from '../../../models/Activity.js';
import { createActivityLogAndLogMessage } from '../../../services/activity/activity.service.js';
import type { HTTP_VERB } from '../../../models/Generic.js';
import type { UserProvidedProxyConfiguration } from '../../../models/Proxy.js';
Expand Down
@@ -1,5 +1,6 @@
import type { InternalNango as Nango } from './connection.manager.js';
import { AuthModes, OAuth2Credentials } from '../../../models/Auth.js';
import type { OAuth2Credentials } from '../../../models/Auth.js';
import { AuthModes } from '../../../models/Auth.js';
import axios from 'axios';

export default async function execute(nango: Nango) {
Expand Down
3 changes: 2 additions & 1 deletion packages/shared/lib/sdk/sync.unit.test.ts
@@ -1,7 +1,8 @@
import { Nango } from '@nangohq/node';
import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
import { mockErrorManagerReport } from '../utils/error.manager.mocks.js';
import { AuthModes, Template } from '../models/index.js';
import type { Template } from '../models/index.js';
import { AuthModes } from '../models/index.js';
import configService from '../services/config.service.js';
import type { CursorPagination, LinkPagination, OffsetPagination } from '../models/Proxy.js';
import { NangoAction } from './sync.js';
Expand Down
@@ -1,8 +1,7 @@
import { expect, describe, it, beforeAll } from 'vitest';
import { multipleMigrations } from '../../db/database.js';
import db, { multipleMigrations } from '../../db/database.js';
import * as ActivityService from './activity.service.js';
import type { ActivityLog } from '../../models/Activity.js';
import db from '../../db/database.js';

describe('Activity service integration tests', () => {
beforeAll(async () => {
Expand Down
3 changes: 2 additions & 1 deletion packages/shared/lib/services/activity/activity.service.ts
@@ -1,5 +1,6 @@
import db from '../../db/database.js';
import { ActivityLog, ActivityLogMessage, LogAction, LogActionEnum } from '../../models/Activity.js';
import type { ActivityLog, ActivityLogMessage, LogAction } from '../../models/Activity.js';
import { LogActionEnum } from '../../models/Activity.js';
import errorManager, { ErrorSourceEnum } from '../../utils/error.manager.js';

import logger from '../../logger/console.js';
Expand Down
8 changes: 3 additions & 5 deletions packages/shared/lib/services/connection.service.ts
@@ -1,6 +1,6 @@
import jwt from 'jsonwebtoken';
import axios from 'axios';
import db from '../db/database.js';
import db, { schema } from '../db/database.js';
import analytics, { AnalyticsTypes } from '../utils/analytics.js';
import providerClientManager from '../clients/provider.client.js';
import type {
Expand Down Expand Up @@ -30,18 +30,16 @@ import type { Metadata, ConnectionConfig, Connection, StoredConnection, BaseConn
import type { ServiceResponse } from '../models/Generic.js';
import encryptionManager from '../utils/encryption.manager.js';
import telemetry, { LogTypes } from '../utils/telemetry.js';
import {
import type {
AppCredentials,
AuthModes as ProviderAuthModes,
AppStoreCredentials,
OAuth2Credentials,
ImportedCredentials,
ApiKeyCredentials,
BasicApiCredentials,
AuthOperation,
ConnectionUpsertResponse
} from '../models/Auth.js';
import { schema } from '../db/database.js';
import { AuthModes as ProviderAuthModes, AuthOperation } from '../models/Auth.js';
import { interpolateStringFromObject, parseTokenExpirationDate, isTokenExpired, getRedisUrl } from '../utils/utils.js';
import { connectionCreated as connectionCreatedHook } from '../hooks/hooks.js';
import { Locking } from '../utils/lock/locking.js';
Expand Down
3 changes: 2 additions & 1 deletion packages/shared/lib/services/flow.service.unit.test.ts
@@ -1,5 +1,6 @@
import { expect, describe, it, vi } from 'vitest';
import FlowService, { Config } from './flow.service';
import type { Config } from './flow.service';
import FlowService from './flow.service';

const flows = {
integrations: {
Expand Down
3 changes: 2 additions & 1 deletion packages/shared/lib/services/nango-config.service.ts
Expand Up @@ -3,7 +3,8 @@ import chalk from 'chalk';
import path, { dirname } from 'path';
import { fileURLToPath } from 'url';
import yaml from 'js-yaml';
import ms, { StringValue } from 'ms';
import type { StringValue } from 'ms';
import ms from 'ms';
import type {
NangoConfig,
NangoConfigV1,
Expand Down
3 changes: 2 additions & 1 deletion packages/shared/lib/services/notification/slack.service.ts
Expand Up @@ -4,7 +4,8 @@ import type { NangoConnection } from '../../models/Connection';
import type { ServiceResponse } from '../../models/Generic';
import { SyncType, SyncConfigType } from '../../models/Sync.js';
import environmentService from '../environment.service.js';
import { LogActionEnum, LogLevel } from '../../models/Activity.js';
import type { LogLevel } from '../../models/Activity.js';
import { LogActionEnum } from '../../models/Activity.js';
import { updateSuccess as updateSuccessActivityLog, createActivityLogMessage, createActivityLog } from '../activity/activity.service.js';
import { getBasePublicUrl } from '../../utils/utils.js';
import connectionService from '../connection.service.js';
Expand Down
Expand Up @@ -2,9 +2,8 @@ import { vi, expect, describe, it, beforeEach } from 'vitest';
import axios from 'axios';
import environmentService from '../environment.service.js';
import { SyncType } from '../../models/Sync.js';
import type { RecentlyCreatedConnection } from '../../models/Connection.js';
import type { RecentlyCreatedConnection, NangoConnection } from '../../models/Connection.js';
import WebhookService from './webhook.service.js';
import type { NangoConnection } from '../../models/Connection.js';
import type { Environment } from '../../models/Environment';
import { mockCreateActivityLog } from '../activity/mocks.js';

Expand Down
3 changes: 2 additions & 1 deletion packages/shared/lib/services/proxy.service.unit.test.ts
@@ -1,6 +1,7 @@
import { expect, describe, it } from 'vitest';
import proxyService from './proxy.service.js';
import { HTTP_VERB, AuthModes, UserProvidedProxyConfiguration, InternalProxyConfiguration, OAuth2Credentials } from '../models/index.js';
import type { HTTP_VERB, UserProvidedProxyConfiguration, InternalProxyConfiguration, OAuth2Credentials } from '../models/index.js';
import { AuthModes } from '../models/index.js';
import type { ApplicationConstructedProxyConfiguration } from '../models/Proxy.js';
import type { AxiosError, AxiosResponse, InternalAxiosRequestConfig } from 'axios';

Expand Down
3 changes: 2 additions & 1 deletion packages/shared/lib/services/sync/config/config.service.ts
Expand Up @@ -4,7 +4,8 @@ import logger from '../../../logger/console.js';
import configService from '../../config.service.js';
import remoteFileService from '../../file/remote.service.js';
import { LogActionEnum } from '../../../models/Activity.js';
import { Action, SyncConfigWithProvider, SyncType, SyncConfig, SlimSync, SyncConfigType, NangoConfigMetadata } from '../../../models/Sync.js';
import type { Action, SyncConfigWithProvider, SyncType, SyncConfig, SlimSync, NangoConfigMetadata } from '../../../models/Sync.js';
import { SyncConfigType } from '../../../models/Sync.js';
import { convertV2ConfigObject } from '../../nango-config.service.js';
import type { NangoConnection } from '../../../models/Connection.js';
import type { Config as ProviderConfig } from '../../../models/Provider.js';
Expand Down
7 changes: 4 additions & 3 deletions packages/shared/lib/services/sync/config/deploy.service.ts
Expand Up @@ -12,18 +12,19 @@ import {
createActivityLogDatabaseErrorMessageAndEnd
} from '../../activity/activity.service.js';
import { getSyncsByProviderConfigAndSyncName } from '../sync.service.js';
import { LogActionEnum, LogLevel } from '../../../models/Activity.js';
import type { LogLevel } from '../../../models/Activity.js';
import { LogActionEnum } from '../../../models/Activity.js';
import type { HTTP_VERB, ServiceResponse } from '../../../models/Generic.js';
import {
import type {
SyncModelSchema,
IncomingFlowConfig,
SyncConfig,
SyncDeploymentResult,
SyncConfigResult,
SyncConfigType,
IncomingPreBuiltFlowConfig,
SyncEndpoint
} from '../../../models/Sync.js';
import { SyncConfigType } from '../../../models/Sync.js';
import { NangoError } from '../../../utils/error.js';
import telemetry, { LogTypes } from '../../../utils/telemetry.js';
import { getEnv } from '../../../utils/utils.js';
Expand Down
@@ -1,5 +1,6 @@
import { expect, describe, it, vi } from 'vitest';
import { IncomingFlowConfig, SyncConfigType } from '../../../models/Sync.js';
import type { IncomingFlowConfig } from '../../../models/Sync.js';
import { SyncConfigType } from '../../../models/Sync.js';
import environmentService from '../../environment.service.js';
import * as SyncConfigService from './config.service.js';
import * as SyncService from '../sync.service.js';
Expand Down
3 changes: 2 additions & 1 deletion packages/shared/lib/services/sync/config/endpoint.service.ts
@@ -1,6 +1,7 @@
import { schema, dbNamespace } from '../../../db/database.js';
import configService from '../../config.service.js';
import { SyncConfig, SyncConfigType } from '../../../models/Sync.js';
import type { SyncConfig } from '../../../models/Sync.js';
import { SyncConfigType } from '../../../models/Sync.js';
import type { NangoConnection } from '../../../models/Connection.js';
import type { HTTP_VERB } from '../../../models/Generic.js';
import { OpenApiBuilder } from 'openapi3-ts/oas31';
Expand Down
17 changes: 7 additions & 10 deletions packages/shared/lib/services/sync/orchestrator.service.ts
Expand Up @@ -21,22 +21,19 @@ import SyncClient from '../../clients/sync.client.js';
import configService from '../config.service.js';
import type { LogLevel } from '../../models/Activity.js';
import type { Connection } from '../../models/Connection.js';
import type { Job as SyncJob, Schedule as SyncSchedule } from '../../models/Sync.js';
import { NangoError } from '../../utils/error.js';
import type { Config as ProviderConfig } from '../../models/Provider.js';
import type { ServiceResponse } from '../../models/Generic';
import {
SyncStatus,
ScheduleStatus,
SyncConfigType,
import type {
Job as SyncJob,
Schedule as SyncSchedule,
SyncDeploymentResult,
IncomingFlowConfig,
Sync,
SyncType,
SyncCommand,
CommandToActivityLog,
ReportedSyncJobStatus
} from '../../models/Sync.js';
import { NangoError } from '../../utils/error.js';
import type { Config as ProviderConfig } from '../../models/Provider.js';
import type { ServiceResponse } from '../../models/Generic';
import { SyncStatus, ScheduleStatus, SyncConfigType, SyncCommand, CommandToActivityLog } from '../../models/Sync.js';

interface CreateSyncArgs {
connections: Connection[];
Expand Down
3 changes: 2 additions & 1 deletion packages/shared/lib/services/sync/run.service.ts
@@ -1,7 +1,8 @@
import type { Context } from '@temporalio/activity';
import { loadLocalNangoConfig, nangoConfigFile } from '../nango-config.service.js';
import type { NangoConnection } from '../../models/Connection.js';
import { SyncResult, SyncType, SyncStatus, Job as SyncJob, IntegrationServiceInterface } from '../../models/Sync.js';
import type { SyncResult, SyncType, Job as SyncJob, IntegrationServiceInterface } from '../../models/Sync.js';
import { SyncStatus } from '../../models/Sync.js';
import type { ServiceResponse } from '../../models/Generic.js';
import { createActivityLogMessage, createActivityLogMessageAndEnd, updateSuccess as updateSuccessActivityLog } from '../activity/activity.service.js';
import { addSyncConfigToJob, updateSyncJobResult, updateSyncJobStatus } from '../sync/job.service.js';
Expand Down
3 changes: 2 additions & 1 deletion packages/shared/lib/services/sync/run.service.unit.test.ts
Expand Up @@ -3,7 +3,8 @@ import SyncRun from './run.service.js';
import * as ConfigService from './config/config.service.js';
import environmentService from '../environment.service.js';
import LocalFileService from '../file/local.service.js';
import { IntegrationServiceInterface, SyncType } from '../../models/Sync.js';
import type { IntegrationServiceInterface } from '../../models/Sync.js';
import { SyncType } from '../../models/Sync.js';
import type { Environment } from '../../models/Environment.js';

class integrationServiceMock implements IntegrationServiceInterface {
Expand Down
3 changes: 2 additions & 1 deletion packages/shared/lib/services/sync/schedule.service.ts
@@ -1,5 +1,6 @@
import db, { schema, dbNamespace } from '../../db/database.js';
import { Schedule as SyncSchedule, ScheduleStatus, SyncCommandToScheduleStatus, SyncCommand } from '../../models/Sync.js';
import type { Schedule as SyncSchedule, SyncCommand } from '../../models/Sync.js';
import { ScheduleStatus, SyncCommandToScheduleStatus } from '../../models/Sync.js';
import type { ServiceResponse } from '../../models/Generic.js';
import { getInterval } from '../nango-config.service.js';
import SyncClient from '../../clients/sync.client.js';
Expand Down

0 comments on commit e6a91ee

Please sign in to comment.