fix(eslint): pass #9 (#1928)

## Describe your changes

- Run automated fix `npx eslint --fix`
- Added `.js` on type import (unfortunately it's a known limitation from
the package)
- Sync our usage of `ms` (types conflict)
- Bonus: naming the testcontainers was nice but it can conflict if you
relaunch the process very fast

.eslintrc

@@ -2,7 +2,6 @@
     "root": true,
     "parser": "@typescript-eslint/parser",
     "parserOptions": {
-        "ecmaVersion": 2018,
         "sourceType": "module",
         "ecmaFeatures": {
             "impliedStrict": true,

packages/server/lib/controllers/flow.controller.ts

@@ -232,7 +232,7 @@ class FlowController {
                 const syncs = await getSyncsByConnectionIdsAndEnvironmentIdAndSyncName(connections, environmentId, syncName);
 
                 for (const sync of syncs) {
-                    await syncOrchestrator.softDeleteSync(sync.id!, environmentId);
+                    await syncOrchestrator.softDeleteSync(sync.id, environmentId);
                 }
             }
 

packages/server/lib/controllers/sync.controller.ts

@@ -752,7 +752,7 @@ class SyncController {
             const setFrequency = `every ${frequency}`;
             for (const sync of syncs) {
                 const { success: updateScheduleSuccess, error: updateScheduleError } = await updateSyncScheduleFrequency(
-                    sync.id as string,
+                    sync.id,
                     setFrequency,
                     sync.name,
                     environment.id
@@ -868,7 +868,7 @@ class SyncController {
                 res.status(400).send({ message: 'Invalid sync_name' });
                 return;
             }
-            const syncId = syncs[0]!.id!;
+            const syncId = syncs[0]!.id;
 
             // When "frequency === null" we revert the value stored in the sync config
             if (!newFrequency) {

packages/shared/lib/db/seeders/account.seeder.ts

@@ -1,7 +1,7 @@
 import { v4 as uuid } from 'uuid';
-import type { Account } from '../../models';
+import type { Account } from '../../models/index.js';
 
-import accountService from '../../services/account.service';
+import accountService from '../../services/account.service.js';
 
 export async function createAccount(): Promise<Account> {
     const acc = await accountService.createAccount(uuid());

packages/shared/lib/db/seeders/activity.seeder.ts

@@ -1,5 +1,5 @@
 import * as activityService from '../../services/activity/activity.service.js';
-import type { ActivityLog } from '../../models/Activity';
+import type { ActivityLog } from '../../models/Activity.js';
 
 export const createActivityLogSeed = async (environmentId: number): Promise<number> => {
     const log = {

packages/shared/lib/models/Onboarding.ts

@@ -1,4 +1,4 @@
-import type { Timestamps } from './Generic';
+import type { Timestamps } from './Generic.js';
 
 export interface Onboarding extends Timestamps {
     id?: number;

packages/shared/lib/models/SlackNotification.ts

@@ -1,5 +1,5 @@
-import type { Timestamps } from './Generic';
-import type { SyncConfigType } from './Sync';
+import type { Timestamps } from './Generic.js';
+import type { SyncConfigType } from './Sync.js';
 
 export interface SlackNotification extends Timestamps {
     id?: number;

packages/shared/lib/models/index.ts

@@ -11,3 +11,4 @@ export * from './Flow.js';
 export * from './NangoConfig.js';
 export * from './Proxy.js';
 export * from './Runner.js';
+export * from './Onboarding.js';

packages/shared/lib/sdk/sync.ts

@@ -4,7 +4,7 @@ import paginateService from '../services/paginate.service.js';
 import proxyService from '../services/proxy.service.js';
 import axios from 'axios';
 import { getPersistAPIUrl, safeStringify } from '../utils/utils.js';
-import type { IntegrationWithCreds } from '@nangohq/node/lib/types.js';
+import type { IntegrationWithCreds } from '@nangohq/node';
 import type { UserProvidedProxyConfiguration } from '../models/Proxy.js';
 import { getLogger } from '../utils/temp/logger.js';
 import telemetry, { MetricTypes } from '../utils/telemetry.js';

packages/shared/lib/services/account.service.ts

@@ -1,6 +1,6 @@
 import db from '../db/database.js';
-import type { Account } from '../models/Admin';
-import type { Environment } from '../models/Environment';
+import type { Account } from '../models/Admin.js';
+import type { Environment } from '../models/Environment.js';
 import { LogActionEnum } from '../models/Activity.js';
 import environmentService from './environment.service.js';
 import errorManager, { ErrorSourceEnum } from '../utils/error.manager.js';

packages/shared/lib/services/flow.service.unit.test.ts

@@ -1,6 +1,6 @@
 import { expect, describe, it, vi, afterEach } from 'vitest';
-import type { Config } from './flow.service';
-import FlowService from './flow.service';
+import type { Config } from './flow.service.js';
+import FlowService from './flow.service.js';
 
 const flows = {
     integrations: {

packages/shared/lib/services/notification/slack.service.ts

@@ -1,7 +1,7 @@
 import { schema, dbNamespace } from '../../db/database.js';
-import type { SlackNotification } from '../../models/SlackNotification';
-import type { NangoConnection } from '../../models/Connection';
-import type { ServiceResponse } from '../../models/Generic';
+import type { SlackNotification } from '../../models/SlackNotification.js';
+import type { NangoConnection } from '../../models/Connection.js';
+import type { ServiceResponse } from '../../models/Generic.js';
 import { SyncType, SyncConfigType } from '../../models/Sync.js';
 import environmentService from '../environment.service.js';
 import type { LogLevel } from '../../models/Activity.js';

packages/shared/lib/services/notification/webhook.service.ts

@@ -6,10 +6,9 @@ import { backOff } from 'exponential-backoff';
 import crypto from 'crypto';
 import { SyncType } from '../../models/Sync.js';
 import type { NangoConnection, RecentlyCreatedConnection } from '../../models/Connection.js';
-import type { Environment } from '../../models/Environment';
+import type { Environment, SyncResult } from '../../models/index.js';
 import type { LogLevel } from '../../models/Activity.js';
 import { LogActionEnum } from '../../models/Activity.js';
-import type { SyncResult } from '../../models/Sync';
 import type { NangoSyncWebhookBody, NangoAuthWebhookBody, NangoForwardWebhookBody } from '../../models/Webhook.js';
 import { WebhookType } from '../../models/Webhook.js';
 import environmentService from '../environment.service.js';

packages/shared/lib/services/notification/webhook.service.unit.test.ts

@@ -4,7 +4,7 @@ import environmentService from '../environment.service.js';
 import { SyncType } from '../../models/Sync.js';
 import type { RecentlyCreatedConnection, NangoConnection } from '../../models/Connection.js';
 import WebhookService from './webhook.service.js';
-import type { Environment } from '../../models/Environment';
+import type { Environment } from '../../models/Environment.js';
 import { mockCreateActivityLog } from '../activity/mocks.js';
 
 vi.mock('axios', () => ({

packages/shared/lib/services/onboarding.service.ts

@@ -1,7 +1,6 @@
-import type { Onboarding } from '../models/Onboarding';
+import type { Onboarding, Config } from '../models/index.js';
 import db, { dbNamespace } from '../db/database.js';
 import configService from './config.service.js';
-import type { Config } from '../models';
 
 export const DEFAULT_GITHUB_CLIENT_ID = process.env['DEFAULT_GITHUB_CLIENT_ID'] || '';
 export const DEFAULT_GITHUB_CLIENT_SECRET = process.env['DEFAULT_GITHUB_CLIENT_SECRET'] || '';

packages/shared/lib/services/sync/config/endpoint.service.ts

@@ -5,7 +5,7 @@ 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';
-import type { ParameterObject } from 'openapi3-ts/dist/oas30.js';
+import type { ParameterObject } from 'openapi3-ts/oas31';
 
 const ENDPOINT_TABLE = dbNamespace + 'sync_endpoints';
 const SYNC_CONFIG_TABLE = dbNamespace + 'sync_configs';

packages/shared/lib/services/sync/orchestrator.service.ts

@@ -32,7 +32,7 @@ import type {
 } 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 type { ServiceResponse } from '../../models/Generic.js';
 import { SyncStatus, ScheduleStatus, SyncConfigType, SyncCommand, CommandToActivityLog } from '../../models/Sync.js';
 
 interface CreateSyncArgs {
@@ -144,7 +144,7 @@ export class Orchestrator {
         }
 
         for (const sync of syncs) {
-            await this.softDeleteSync(sync.id!, connection.environment_id);
+            await this.softDeleteSync(sync.id, connection.environment_id);
         }
     }
 
@@ -156,7 +156,7 @@ export class Orchestrator {
         }
 
         for (const sync of syncs) {
-            await this.softDeleteSync(sync.id as string, environmentId);
+            await this.softDeleteSync(sync.id, environmentId);
         }
     }
 
@@ -210,14 +210,14 @@ export class Orchestrator {
                 if (!sync) {
                     throw new Error(`Sync "${syncName}" doesn't exists.`);
                 }
-                const schedule = await getSchedule(sync.id as string);
+                const schedule = await getSchedule(sync.id);
                 if (!schedule) {
                     continue;
                 }
 
                 await syncClient.runSyncCommand(
                     schedule.schedule_id,
-                    sync?.id as string,
+                    sync?.id,
                     command,
                     activityLogId,
                     environmentId,
@@ -244,7 +244,7 @@ export class Orchestrator {
             }
 
             for (const sync of syncs) {
-                const schedule = await getSchedule(sync.id as string);
+                const schedule = await getSchedule(sync.id);
                 if (!schedule) {
                     continue;
                 }
@@ -256,7 +256,7 @@ export class Orchestrator {
 
                 await syncClient.runSyncCommand(
                     schedule.schedule_id,
-                    sync.id as string,
+                    sync.id,
                     command,
                     activityLogId,
                     environmentId,
@@ -310,7 +310,7 @@ export class Orchestrator {
                     continue;
                 }
 
-                const { schedule, latestJob, status, nextScheduledSyncAt } = await this.fetchSyncData(sync?.id as string, environmentId);
+                const { schedule, latestJob, status, nextScheduledSyncAt } = await this.fetchSyncData(sync?.id, environmentId);
                 const reportedStatus = await this.reportedStatus(sync, latestJob, schedule, status, nextScheduledSyncAt, includeJobStatus);
 
                 syncsWithStatus.push(reportedStatus);
@@ -326,7 +326,7 @@ export class Orchestrator {
             }
 
             for (const sync of syncs) {
-                const { schedule, latestJob, status, nextScheduledSyncAt } = await this.fetchSyncData(sync?.id as string, environmentId);
+                const { schedule, latestJob, status, nextScheduledSyncAt } = await this.fetchSyncData(sync?.id, environmentId);
                 const reportedStatus = await this.reportedStatus(sync, latestJob, schedule, status, nextScheduledSyncAt, includeJobStatus);
 
                 syncsWithStatus.push(reportedStatus);

packages/shared/lib/services/sync/run.service.ts

@@ -1,6 +1,6 @@
 import type { Context } from '@temporalio/activity';
 import { loadLocalNangoConfig, nangoConfigFile } from '../nango-config.service.js';
-import type { NangoConnection } from '../../models/Connection.js';
+import type { NangoConnection, Metadata } from '../../models/Connection.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';
@@ -21,8 +21,7 @@ import telemetry, { LogTypes, MetricTypes } from '../../utils/telemetry.js';
 import type { NangoIntegrationData, NangoIntegration } from '../../models/NangoConfig.js';
 import type { UpsertSummary } from '../../models/Data.js';
 import { LogActionEnum } from '../../models/Activity.js';
-import type { Environment } from '../../models/Environment';
-import type { Metadata } from '../../models/Connection';
+import type { Environment } from '../../models/Environment.js';
 import * as recordsService from './data/records.service.js';
 
 interface BigQueryClientInterface {

packages/shared/lib/services/sync/sync.service.ts

@@ -646,7 +646,7 @@ export const getAndReconcileDifferences = async (
                         for (const connection of connections) {
                             const syncId = await getSyncByIdAndName(connection.id as number, existingSync.sync_name);
                             if (syncId) {
-                                await syncOrchestrator.softDeleteSync(syncId.id!, environmentId);
+                                await syncOrchestrator.softDeleteSync(syncId.id, environmentId);
                             }
                         }
                     }

packages/shared/lib/utils/encryption.manager.ts

@@ -2,7 +2,7 @@ import type { CipherGCMTypes } from 'crypto';
 import utils from 'node:util';
 import crypto from 'crypto';
 import { getLogger } from '../utils/temp/logger.js';
-import type { Config as ProviderConfig } from '../models/Provider';
+import type { Config as ProviderConfig } from '../models/Provider.js';
 import type { DBConfig } from '../models/Generic.js';
 import type { Environment } from '../models/Environment.js';
 import type { EnvironmentVariable } from '../models/EnvironmentVariable.js';

packages/shared/lib/utils/error.manager.mocks.ts

@@ -1,6 +1,6 @@
 import { vi } from 'vitest';
-import environmentService from '../services/environment.service';
-import userService from '../services/user.service';
+import environmentService from '../services/environment.service.js';
+import userService from '../services/user.service.js';
 
 export function mockErrorManagerReport() {
     vi.spyOn(environmentService, 'getEnvironmentName').mockImplementation(() => {

packages/shared/lib/utils/kvstore/InMemoryStore.ts

@@ -1,4 +1,4 @@
-import type { KVStore } from './KVStore';
+import type { KVStore } from './KVStore.js';
 
 interface Value {
     value: string;

packages/shared/lib/utils/kvstore/RedisStore.ts

@@ -1,4 +1,4 @@
-import type { KVStore } from './KVStore';
+import type { KVStore } from './KVStore.js';
 import { createClient } from 'redis';
 import type { RedisClientType } from 'redis';
 

packages/shared/lib/vitest.d.ts

@@ -12,3 +12,7 @@ declare module 'vitest' {
     export interface AsymmetricMatchersContaining extends CustomMatchers {}
     export interface ExpectStatic<T = any> extends CustomMatchers<T> {}
 }
+
+declare module 'ms' {
+    export interface StringValue {}
+}

packages/webapp/package.json

@@ -53,7 +53,7 @@
         "env-cmd": "10.1.0",
         "js-cookie": "3.0.5",
         "lodash": "4.17.21",
-        "ms": "2.1.3",
+        "ms": "3.0.0-canary.1",
         "postcss": "8.4.35",
         "postcss-loader": "8.1.1",
         "posthog-js": "1.116.2",

packages/webapp/src/components/ErrorBoundary.tsx

@@ -1,4 +1,6 @@
-import React, { Component, ErrorInfo } from 'react';
+import type { ErrorInfo } from 'react';
+import type React from 'react';
+import { Component } from 'react';
 
 interface Props {
     children: React.ReactNode;

packages/webapp/src/components/ui/Info.tsx

@@ -1,4 +1,4 @@
-import React from 'react';
+import type React from 'react';
 import { Info as InfoIcon } from '@geist-ui/icons';
 
 interface InfoProps {

packages/webapp/src/components/ui/button/Button.tsx

@@ -1,7 +1,9 @@
 import { Loader } from '@geist-ui/icons';
-import { cva, VariantProps } from 'class-variance-authority';
+import type { VariantProps } from 'class-variance-authority';
+import { cva } from 'class-variance-authority';
 import classNames from 'classnames';
-import React, { forwardRef } from 'react';
+import type React from 'react';
+import { forwardRef } from 'react';
 
 const buttonStyles = cva('disabled:pointer-events-none disabled:opacity-50 rounded-md text-sm', {
     variants: {

packages/webapp/src/components/ui/input/SecretTextArea.tsx

@@ -1,4 +1,5 @@
-import { forwardRef, useCallback, useState, ChangeEvent, TextareaHTMLAttributes } from 'react';
+import type { ChangeEvent, TextareaHTMLAttributes } from 'react';
+import { forwardRef, useCallback, useState } from 'react';
 import { EyeIcon, EyeSlashIcon } from '@heroicons/react/24/outline';
 import classNames from 'classnames';
 import CopyButton from '../button/CopyButton';

packages/webapp/src/components/ui/label/http.tsx

@@ -1,4 +1,4 @@
-import { FlowEndpoint } from '../../../types';
+import type { FlowEndpoint } from '../../../types';
 
 interface HttpLabelProp {
     path: string;

packages/webapp/src/components/ui/typography/Typography.tsx

@@ -1,7 +1,8 @@
 import React, { forwardRef } from 'react';
 import { Tooltip } from '@geist-ui/core';
 import { HelpCircle } from '@geist-ui/icons';
-import { cva, VariantProps } from 'class-variance-authority';
+import type { VariantProps } from 'class-variance-authority';
+import { cva } from 'class-variance-authority';
 import classNames from 'classnames';
 
 const typographyStyles = cva('flex gap-2 items-center tracking-tight font-bold', {

packages/webapp/src/layout/DashboardLayout.tsx

@@ -1,5 +1,6 @@
 import { DebugMode } from '../components/DebugMode';
-import LeftNavBar, { LeftNavBarItems } from '../components/LeftNavBar';
+import type { LeftNavBarItems } from '../components/LeftNavBar';
+import LeftNavBar from '../components/LeftNavBar';
 import TopNavBar from '../components/TopNavBar';
 
 interface DashboardLayoutI {