diff --git a/src/lib/db/access-store.test.ts b/src/lib/db/access-store.test.ts index 0f3758b2e1..cd14be42c9 100644 --- a/src/lib/db/access-store.test.ts +++ b/src/lib/db/access-store.test.ts @@ -1,8 +1,8 @@ import dbInit, { ITestDb } from '../../test/e2e/helpers/database-init'; import getLogger from '../../test/fixtures/no-logger'; -import { PermissionRef } from 'lib/services/access-service'; +import { PermissionRef } from '../services/access-service'; import { AccessStore } from './access-store'; -import { BadDataError } from '../../lib/error'; +import { BadDataError } from '../error'; let db: ITestDb; diff --git a/src/lib/db/access-store.ts b/src/lib/db/access-store.ts index 6bf9194257..bdc4e70e76 100644 --- a/src/lib/db/access-store.ts +++ b/src/lib/db/access-store.ts @@ -25,7 +25,7 @@ import { IdPermissionRef, NamePermissionRef, PermissionRef, -} from 'lib/services/access-service'; +} from '../services/access-service'; import { inTransaction } from './transaction'; import BadDataError from '../error/bad-data-error'; diff --git a/src/lib/db/project-stats-store.ts b/src/lib/db/project-stats-store.ts index 7915ba0b6a..51c79f7da2 100644 --- a/src/lib/db/project-stats-store.ts +++ b/src/lib/db/project-stats-store.ts @@ -3,13 +3,13 @@ import { Logger, LogProvider } from '../logger'; import metricsHelper from '../util/metrics-helper'; import { DB_TIME } from '../metric-events'; import EventEmitter from 'events'; -import { IProjectStats } from 'lib/services/project-service'; +import { IProjectStats } from '../services/project-service'; import { ICreateEnabledDates, IProjectStatsStore, -} from 'lib/types/stores/project-stats-store-type'; +} from '../types/stores/project-stats-store-type'; import { Db } from './db'; -import { DoraFeaturesSchema } from 'lib/openapi'; +import { DoraFeaturesSchema } from '../openapi'; const TABLE = 'project_stats'; diff --git a/src/lib/db/role-store.ts b/src/lib/db/role-store.ts index f5386b4e68..5c80844293 100644 --- a/src/lib/db/role-store.ts +++ b/src/lib/db/role-store.ts @@ -1,16 +1,16 @@ import EventEmitter from 'events'; import { Logger, LogProvider } from '../logger'; import NotFoundError from '../error/notfound-error'; -import { ICustomRole } from 'lib/types/model'; +import { ICustomRole } from '../types/model'; import { ICustomRoleInsert, ICustomRoleUpdate, IRoleStore, -} from 'lib/types/stores/role-store'; -import { IRole, IUserRole } from 'lib/types/stores/access-store'; +} from '../types/stores/role-store'; +import { IRole, IUserRole } from '../types/stores/access-store'; import { Db } from './db'; import { PROJECT_ROLE_TYPES, ROOT_ROLE_TYPES } from '../util'; -import { RoleSchema } from 'lib/openapi'; +import { RoleSchema } from '../openapi'; const T = { ROLE_USER: 'role_user', diff --git a/src/lib/db/transaction.ts b/src/lib/db/transaction.ts index b26231356b..afc4167864 100644 --- a/src/lib/db/transaction.ts +++ b/src/lib/db/transaction.ts @@ -1,5 +1,5 @@ import { Knex } from 'knex'; -import { IUnleashConfig } from 'lib/server-impl'; +import { IUnleashConfig } from '../server-impl'; export type KnexTransaction = Knex.Transaction; diff --git a/src/lib/domain/project-health/project-health.test.ts b/src/lib/domain/project-health/project-health.test.ts index fa678c3773..6dd844d166 100644 --- a/src/lib/domain/project-health/project-health.test.ts +++ b/src/lib/domain/project-health/project-health.test.ts @@ -1,5 +1,5 @@ import { subDays } from 'date-fns'; -import type { IFeatureType } from 'lib/types/stores/feature-type-store'; +import type { IFeatureType } from '../../types/stores/feature-type-store'; import { calculateProjectHealth, calculateHealthRating, diff --git a/src/lib/domain/project-health/project-health.ts b/src/lib/domain/project-health/project-health.ts index bd2299b889..248719e9e3 100644 --- a/src/lib/domain/project-health/project-health.ts +++ b/src/lib/domain/project-health/project-health.ts @@ -1,6 +1,6 @@ import { hoursToMilliseconds } from 'date-fns'; -import type { IProjectHealthReport } from 'lib/types'; -import type { IFeatureType } from 'lib/types/stores/feature-type-store'; +import type { IProjectHealthReport } from '../../types'; +import type { IFeatureType } from '../../types/stores/feature-type-store'; type IPartialFeatures = Array<{ stale?: boolean; diff --git a/src/lib/features/access/createAccessService.ts b/src/lib/features/access/createAccessService.ts index ea8befb993..bd4fed2bc1 100644 --- a/src/lib/features/access/createAccessService.ts +++ b/src/lib/features/access/createAccessService.ts @@ -1,4 +1,4 @@ -import { Db, IUnleashConfig } from 'lib/server-impl'; +import { Db, IUnleashConfig } from '../../server-impl'; import GroupStore from '../../db/group-store'; import { AccountStore } from '../../db/account-store'; import RoleStore from '../../db/role-store'; diff --git a/src/lib/features/change-request-access-service/createChangeRequestAccessReadModel.ts b/src/lib/features/change-request-access-service/createChangeRequestAccessReadModel.ts index 4e7cb88e0b..81dc9419b0 100644 --- a/src/lib/features/change-request-access-service/createChangeRequestAccessReadModel.ts +++ b/src/lib/features/change-request-access-service/createChangeRequestAccessReadModel.ts @@ -1,4 +1,4 @@ -import { Db, IUnleashConfig } from 'lib/server-impl'; +import { Db, IUnleashConfig } from '../../server-impl'; import { ChangeRequestAccessReadModel } from './sql-change-request-access-read-model'; import { createAccessService } from '../access/createAccessService'; import { FakeChangeRequestAccessReadModel } from './fake-change-request-access-read-model'; diff --git a/src/lib/features/change-request-segment-usage-service/change-request-segment-usage-read-model.test.ts b/src/lib/features/change-request-segment-usage-service/change-request-segment-usage-read-model.test.ts index 41f039e54a..b5816b1cea 100644 --- a/src/lib/features/change-request-segment-usage-service/change-request-segment-usage-read-model.test.ts +++ b/src/lib/features/change-request-segment-usage-service/change-request-segment-usage-read-model.test.ts @@ -1,4 +1,4 @@ -import { IUser } from 'lib/server-impl'; +import { IUser } from '../../server-impl'; import dbInit, { ITestDb } from '../../../test/e2e/helpers/database-init'; import getLogger from '../../../test/fixtures/no-logger'; import { IChangeRequestSegmentUsageReadModel } from './change-request-segment-usage-read-model'; diff --git a/src/lib/features/change-request-segment-usage-service/createChangeRequestSegmentUsageReadModel.ts b/src/lib/features/change-request-segment-usage-service/createChangeRequestSegmentUsageReadModel.ts index 522013fdec..c5490c4f87 100644 --- a/src/lib/features/change-request-segment-usage-service/createChangeRequestSegmentUsageReadModel.ts +++ b/src/lib/features/change-request-segment-usage-service/createChangeRequestSegmentUsageReadModel.ts @@ -1,4 +1,4 @@ -import { Db } from 'lib/server-impl'; +import { Db } from '../../server-impl'; import { ChangeRequestSegmentUsageReadModel } from './sql-change-request-segment-usage-read-model'; import { FakeChangeRequestSegmentUsageReadModel } from './fake-change-request-segment-usage-read-model'; import { IChangeRequestSegmentUsageReadModel } from './change-request-segment-usage-read-model'; diff --git a/src/lib/features/export-import-toggles/createExportImportService.ts b/src/lib/features/export-import-toggles/createExportImportService.ts index 785d4c78d4..7623b34fdd 100644 --- a/src/lib/features/export-import-toggles/createExportImportService.ts +++ b/src/lib/features/export-import-toggles/createExportImportService.ts @@ -43,7 +43,7 @@ import { createFakePrivateProjectChecker, createPrivateProjectChecker, } from '../private-project/createPrivateProjectChecker'; -import { DeferredServiceFactory } from 'lib/db/transaction'; +import { DeferredServiceFactory } from '../../db/transaction'; import { DependentFeaturesReadModel } from '../dependent-features/dependent-features-read-model'; import { FakeDependentFeaturesReadModel } from '../dependent-features/fake-dependent-features-read-model'; import { diff --git a/src/lib/features/feature-search/fake-feature-search-store.ts b/src/lib/features/feature-search/fake-feature-search-store.ts index 90720a83c7..0e3875c556 100644 --- a/src/lib/features/feature-search/fake-feature-search-store.ts +++ b/src/lib/features/feature-search/fake-feature-search-store.ts @@ -1,4 +1,4 @@ -import { IFeatureOverview } from 'lib/types'; +import { IFeatureOverview } from '../../types'; import { IFeatureSearchParams, IQueryParam, diff --git a/src/lib/features/feature-toggle/fakes/fake-feature-toggle-store.ts b/src/lib/features/feature-toggle/fakes/fake-feature-toggle-store.ts index 925a837bef..fab6579f8d 100644 --- a/src/lib/features/feature-toggle/fakes/fake-feature-toggle-store.ts +++ b/src/lib/features/feature-toggle/fakes/fake-feature-toggle-store.ts @@ -10,7 +10,7 @@ import { IFeatureToggleQuery, IFeatureTypeCount, IVariant, -} from 'lib/types/model'; +} from '../../../types/model'; import { LastSeenInput } from '../../metrics/last-seen/last-seen-service'; import { EnvironmentFeatureNames, diff --git a/src/lib/features/feature-toggle/feature-toggle-service.ts b/src/lib/features/feature-toggle/feature-toggle-service.ts index d5294c07a1..23a165a32b 100644 --- a/src/lib/features/feature-toggle/feature-toggle-service.ts +++ b/src/lib/features/feature-toggle/feature-toggle-service.ts @@ -86,8 +86,8 @@ import { validateSemver, validateString, } from '../../util/validators/constraint-types'; -import { IContextFieldStore } from 'lib/types/stores/context-field-store'; -import { SetStrategySortOrderSchema } from 'lib/openapi/spec/set-strategy-sort-order-schema'; +import { IContextFieldStore } from '../../types/stores/context-field-store'; +import { SetStrategySortOrderSchema } from '../../openapi/spec/set-strategy-sort-order-schema'; import { getDefaultStrategy, getProjectDefaultStrategy, @@ -96,7 +96,7 @@ import { AccessService } from '../../services/access-service'; import { IUser } from '../../server-impl'; import { IFeatureProjectUserParams } from './feature-toggle-controller'; import { unique } from '../../util/unique'; -import { ISegmentService } from 'lib/segments/segment-service-interface'; +import { ISegmentService } from '../../segments/segment-service-interface'; import { IChangeRequestAccessReadModel } from '../change-request-access-service/change-request-access-read-model'; import { checkFeatureFlagNamesAgainstPattern } from '../feature-naming-pattern/feature-naming-validation'; import { IPrivateProjectChecker } from '../private-project/privateProjectCheckerType'; diff --git a/src/lib/features/feature-toggle/tests/feature-toggle-strategies-store.e2e.test.ts b/src/lib/features/feature-toggle/tests/feature-toggle-strategies-store.e2e.test.ts index b00d9bb0cf..e350468c37 100644 --- a/src/lib/features/feature-toggle/tests/feature-toggle-strategies-store.e2e.test.ts +++ b/src/lib/features/feature-toggle/tests/feature-toggle-strategies-store.e2e.test.ts @@ -1,5 +1,5 @@ -import { IFeatureStrategiesStore } from 'lib/features/feature-toggle/types/feature-toggle-strategies-store-type'; -import { IFeatureToggleStore } from 'lib/features/feature-toggle/types/feature-toggle-store-type'; +import { IFeatureStrategiesStore } from '../../../features/feature-toggle/types/feature-toggle-strategies-store-type'; +import { IFeatureToggleStore } from '../../../features/feature-toggle/types/feature-toggle-store-type'; import dbInit, { ITestDb } from '../../../../test/e2e/helpers/database-init'; import getLogger from '../../../../test/fixtures/no-logger'; import { IUnleashStores } from '../../../types'; diff --git a/src/lib/features/feature-toggle/tests/feature-toggles.e2e.test.ts b/src/lib/features/feature-toggle/tests/feature-toggles.e2e.test.ts index 8818fb4bd5..2d30c5e89d 100644 --- a/src/lib/features/feature-toggle/tests/feature-toggles.e2e.test.ts +++ b/src/lib/features/feature-toggle/tests/feature-toggles.e2e.test.ts @@ -26,7 +26,10 @@ import { v4 as uuidv4 } from 'uuid'; import supertest from 'supertest'; import { randomId } from '../../../util/random-id'; import { DEFAULT_PROJECT } from '../../../types'; -import { FeatureStrategySchema, SetStrategySortOrderSchema } from 'lib/openapi'; +import { + FeatureStrategySchema, + SetStrategySortOrderSchema, +} from '../../../openapi'; import { ForbiddenError } from '../../../error'; let app: IUnleashTest; diff --git a/src/lib/features/instance-stats/getActiveUsers.ts b/src/lib/features/instance-stats/getActiveUsers.ts index 2033def06b..bfe1363f19 100644 --- a/src/lib/features/instance-stats/getActiveUsers.ts +++ b/src/lib/features/instance-stats/getActiveUsers.ts @@ -1,4 +1,4 @@ -import { type Db } from 'lib/server-impl'; +import { type Db } from '../../server-impl'; export type GetActiveUsers = () => Promise<{ last7: number; diff --git a/src/lib/features/instance-stats/getProductionChanges.ts b/src/lib/features/instance-stats/getProductionChanges.ts index dfe9ee98a7..80e2bcd95f 100644 --- a/src/lib/features/instance-stats/getProductionChanges.ts +++ b/src/lib/features/instance-stats/getProductionChanges.ts @@ -1,4 +1,4 @@ -import { type Db } from 'lib/server-impl'; +import { type Db } from '../../server-impl'; export type GetProductionChanges = () => Promise<{ last30: number; diff --git a/src/lib/features/maintenance/maintenance-controller.ts b/src/lib/features/maintenance/maintenance-controller.ts index b8cab5483e..9b16b697a6 100644 --- a/src/lib/features/maintenance/maintenance-controller.ts +++ b/src/lib/features/maintenance/maintenance-controller.ts @@ -15,8 +15,8 @@ import { MaintenanceSchema, maintenanceSchema, } from '../../openapi/spec/maintenance-schema'; -import MaintenanceService from 'lib/features/maintenance/maintenance-service'; -import { ToggleMaintenanceSchema } from 'lib/openapi/spec/toggle-maintenance-schema'; +import MaintenanceService from '../../features/maintenance/maintenance-service'; +import { ToggleMaintenanceSchema } from '../../openapi/spec/toggle-maintenance-schema'; export default class MaintenanceController extends Controller { private maintenanceService: MaintenanceService; diff --git a/src/lib/features/metrics/client-metrics/metrics-service-v2.test.ts b/src/lib/features/metrics/client-metrics/metrics-service-v2.test.ts index 70322600d4..b88f8ffc8b 100644 --- a/src/lib/features/metrics/client-metrics/metrics-service-v2.test.ts +++ b/src/lib/features/metrics/client-metrics/metrics-service-v2.test.ts @@ -5,7 +5,7 @@ import getLogger from '../../../../test/fixtures/no-logger'; import createStores from '../../../../test/fixtures/store'; import EventEmitter from 'events'; import { LastSeenService } from '../last-seen/last-seen-service'; -import { IClientMetricsStoreV2, IUnleashConfig } from 'lib/types'; +import { IClientMetricsStoreV2, IUnleashConfig } from '../../../../lib/types'; import { endOfDay, startOfHour, subDays, subHours } from 'date-fns'; import { IClientMetricsEnv } from './client-metrics-store-v2-type'; diff --git a/src/lib/features/metrics/client-metrics/metrics-service-v2.ts b/src/lib/features/metrics/client-metrics/metrics-service-v2.ts index d33e649d4a..50796e4c2a 100644 --- a/src/lib/features/metrics/client-metrics/metrics-service-v2.ts +++ b/src/lib/features/metrics/client-metrics/metrics-service-v2.ts @@ -19,7 +19,7 @@ import { generateHourBuckets, HourBucket, } from '../../../util/time-utils'; -import { ClientMetricsSchema } from 'lib/openapi'; +import { ClientMetricsSchema } from '../../../../lib/openapi'; import { nameSchema } from '../../../schema/feature-schema'; export default class ClientMetricsServiceV2 { diff --git a/src/lib/features/metrics/shared/schema.ts b/src/lib/features/metrics/shared/schema.ts index fd83204f27..577c736f34 100644 --- a/src/lib/features/metrics/shared/schema.ts +++ b/src/lib/features/metrics/shared/schema.ts @@ -1,5 +1,5 @@ import joi from 'joi'; -import { IMetricsBucket } from 'lib/types'; +import { IMetricsBucket } from '../../../types'; const countSchema = joi .object() diff --git a/src/lib/features/playground/feature-evaluator/client.ts b/src/lib/features/playground/feature-evaluator/client.ts index 92bd849664..0c0678f746 100644 --- a/src/lib/features/playground/feature-evaluator/client.ts +++ b/src/lib/features/playground/feature-evaluator/client.ts @@ -9,7 +9,7 @@ import { } from './variant'; import { Context } from './context'; import { SegmentForEvaluation } from './strategy/strategy'; -import { PlaygroundStrategySchema } from 'lib/openapi/spec/playground-strategy-schema'; +import { PlaygroundStrategySchema } from '../../../openapi/spec/playground-strategy-schema'; import { playgroundStrategyEvaluation } from '../../../openapi/spec/playground-strategy-schema'; export type StrategyEvaluationResult = Pick< diff --git a/src/lib/features/playground/feature-evaluator/strategy/strategy.ts b/src/lib/features/playground/feature-evaluator/strategy/strategy.ts index c7275bf3ba..661e6dad9f 100644 --- a/src/lib/features/playground/feature-evaluator/strategy/strategy.ts +++ b/src/lib/features/playground/feature-evaluator/strategy/strategy.ts @@ -1,5 +1,5 @@ -import { PlaygroundConstraintSchema } from 'lib/openapi/spec/playground-constraint-schema'; -import { PlaygroundSegmentSchema } from 'lib/openapi/spec/playground-segment-schema'; +import { PlaygroundConstraintSchema } from '../../../../openapi/spec/playground-constraint-schema'; +import { PlaygroundSegmentSchema } from '../../../../openapi/spec/playground-segment-schema'; import { StrategyEvaluationResult } from '../client'; import { Constraint, operators } from '../constraint'; import { Context } from '../context'; diff --git a/src/lib/features/playground/offline-unleash-client.ts b/src/lib/features/playground/offline-unleash-client.ts index 20d0229d38..1b966fbc85 100644 --- a/src/lib/features/playground/offline-unleash-client.ts +++ b/src/lib/features/playground/offline-unleash-client.ts @@ -1,8 +1,8 @@ -import { SdkContextSchema } from 'lib/openapi/spec/sdk-context-schema'; +import { SdkContextSchema } from '../../openapi/spec/sdk-context-schema'; import { InMemStorageProvider, FeatureEvaluator } from './feature-evaluator'; -import { FeatureConfigurationClient } from 'lib/features/feature-toggle/types/feature-toggle-strategies-store-type'; +import { FeatureConfigurationClient } from '../../features/feature-toggle/types/feature-toggle-strategies-store-type'; import { Segment } from './feature-evaluator/strategy/strategy'; -import { ISegment } from 'lib/types/model'; +import { ISegment } from '../../types/model'; import { serializeDates } from '../../types/serialize-dates'; import { Operator } from './feature-evaluator/constraint'; import { FeatureInterface } from 'unleash-client/lib/feature'; diff --git a/src/lib/features/playground/playground-service.ts b/src/lib/features/playground/playground-service.ts index 3aa7035fd0..6d5e3543c6 100644 --- a/src/lib/features/playground/playground-service.ts +++ b/src/lib/features/playground/playground-service.ts @@ -1,17 +1,17 @@ import FeatureToggleService from '../feature-toggle/feature-toggle-service'; -import { SdkContextSchema } from 'lib/openapi/spec/sdk-context-schema'; -import { IUnleashServices } from 'lib/types/services'; +import { SdkContextSchema } from '../../openapi/spec/sdk-context-schema'; +import { IUnleashServices } from '../../types/services'; import { ALL } from '../../types/models/api-token'; -import { PlaygroundFeatureSchema } from 'lib/openapi/spec/playground-feature-schema'; +import { PlaygroundFeatureSchema } from '../../openapi/spec/playground-feature-schema'; import { Logger } from '../../logger'; -import { IFlagResolver, ISegment, IUnleashConfig } from 'lib/types'; +import { IFlagResolver, ISegment, IUnleashConfig } from '../../types'; import { offlineUnleashClient } from './offline-unleash-client'; -import { FeatureInterface } from 'lib/features/playground/feature-evaluator/feature'; +import { FeatureInterface } from '../../features/playground/feature-evaluator/feature'; import { EvaluatedPlaygroundStrategy, FeatureStrategiesEvaluationResult, -} from 'lib/features/playground/feature-evaluator/client'; -import { ISegmentService } from 'lib/segments/segment-service-interface'; +} from '../../features/playground/feature-evaluator/client'; +import { ISegmentService } from '../../segments/segment-service-interface'; import { FeatureConfigurationClient } from '../feature-toggle/types/feature-toggle-strategies-store-type'; import { generateObjectCombinations } from './generateObjectCombinations'; import groupBy from 'lodash.groupby'; @@ -19,7 +19,7 @@ import { omitKeys } from '../../util'; import { AdvancedPlaygroundFeatureSchema } from '../../openapi'; import { AdvancedPlaygroundEnvironmentFeatureSchema } from '../../openapi/spec/advanced-playground-environment-feature-schema'; import { validateQueryComplexity } from './validateQueryComplexity'; -import { playgroundStrategyEvaluation } from 'lib/openapi'; +import { playgroundStrategyEvaluation } from '../../openapi'; import { IPrivateProjectChecker } from '../private-project/privateProjectCheckerType'; import { getDefaultVariant } from './feature-evaluator/variant'; diff --git a/src/lib/features/playground/playground-view-model.ts b/src/lib/features/playground/playground-view-model.ts index b1c2d56232..8c57a0d05a 100644 --- a/src/lib/features/playground/playground-view-model.ts +++ b/src/lib/features/playground/playground-view-model.ts @@ -4,7 +4,7 @@ import { PlaygroundRequestSchema, PlaygroundResponseSchema, PlaygroundStrategySchema, -} from 'lib/openapi'; +} from '../../openapi'; import { AdvancedPlaygroundFeatureEvaluationResult, PlaygroundFeatureEvaluationResult, diff --git a/src/lib/features/private-project/createPrivateProjectChecker.ts b/src/lib/features/private-project/createPrivateProjectChecker.ts index 7000815dcb..8b9e4b8d3b 100644 --- a/src/lib/features/private-project/createPrivateProjectChecker.ts +++ b/src/lib/features/private-project/createPrivateProjectChecker.ts @@ -1,4 +1,4 @@ -import { Db, IUnleashConfig } from 'lib/server-impl'; +import { Db, IUnleashConfig } from '../../server-impl'; import PrivateProjectStore from './privateProjectStore'; import { PrivateProjectChecker } from './privateProjectChecker'; import { FakePrivateProjectChecker } from './fakePrivateProjectChecker'; diff --git a/src/lib/features/project-environments/environment-service.ts b/src/lib/features/project-environments/environment-service.ts index 616fddf715..bf2e77c129 100644 --- a/src/lib/features/project-environments/environment-service.ts +++ b/src/lib/features/project-environments/environment-service.ts @@ -17,9 +17,9 @@ import { BadDataError, UNIQUE_CONSTRAINT_VIOLATION } from '../../error'; import NameExistsError from '../../error/name-exists-error'; import { sortOrderSchema } from '../../services/state-schema'; import NotFoundError from '../../error/notfound-error'; -import { IProjectStore } from 'lib/types/stores/project-store'; +import { IProjectStore } from '../../types/stores/project-store'; import MinimumOneEnvironmentError from '../../error/minimum-one-environment-error'; -import { IFlagResolver } from 'lib/types/experimental'; +import { IFlagResolver } from '../../types/experimental'; import { CreateFeatureStrategySchema } from '../../openapi'; import EventService from '../../services/event-service'; diff --git a/src/lib/features/project/createProjectService.ts b/src/lib/features/project/createProjectService.ts index 9bf31d7eae..a34145314c 100644 --- a/src/lib/features/project/createProjectService.ts +++ b/src/lib/features/project/createProjectService.ts @@ -1,4 +1,4 @@ -import { Db, IUnleashConfig } from 'lib/server-impl'; +import { Db, IUnleashConfig } from '../../server-impl'; import EventStore from '../../db/event-store'; import GroupStore from '../../db/group-store'; import { AccountStore } from '../../db/account-store'; diff --git a/src/lib/features/segment/createSegmentService.ts b/src/lib/features/segment/createSegmentService.ts index 7a40831353..958d88cddf 100644 --- a/src/lib/features/segment/createSegmentService.ts +++ b/src/lib/features/segment/createSegmentService.ts @@ -1,4 +1,4 @@ -import { Db, IUnleashConfig } from 'lib/server-impl'; +import { Db, IUnleashConfig } from '../../server-impl'; import { EventService, SegmentService } from '../../services'; import FakeEventStore from '../../../test/fixtures/fake-event-store'; import { ISegmentService } from '../../segments/segment-service-interface'; diff --git a/src/lib/middleware/api-token-middleware.test.ts b/src/lib/middleware/api-token-middleware.test.ts index 4f2685301d..ff17a942ca 100644 --- a/src/lib/middleware/api-token-middleware.test.ts +++ b/src/lib/middleware/api-token-middleware.test.ts @@ -6,8 +6,8 @@ import { ALL, ApiTokenType } from '../types/models/api-token'; import apiTokenMiddleware, { TOKEN_TYPE_ERROR_MESSAGE, } from './api-token-middleware'; -import { ApiTokenService } from 'lib/services'; -import { IUnleashConfig } from 'lib/types'; +import { ApiTokenService } from '../services'; +import { IUnleashConfig } from '../types'; let config: IUnleashConfig; diff --git a/src/lib/middleware/api-token-middleware.ts b/src/lib/middleware/api-token-middleware.ts index 9b7c4f9133..56d8e7c339 100644 --- a/src/lib/middleware/api-token-middleware.ts +++ b/src/lib/middleware/api-token-middleware.ts @@ -1,7 +1,7 @@ import { ApiTokenType } from '../types/models/api-token'; import { IUnleashConfig } from '../types/option'; import { IApiRequest, IAuthRequest } from '../routes/unleash-types'; -import { IUnleashServices } from 'lib/server-impl'; +import { IUnleashServices } from '../server-impl'; const isClientApi = ({ path }) => { return path && path.indexOf('/api/client') > -1; diff --git a/src/lib/middleware/demo-authentication.ts b/src/lib/middleware/demo-authentication.ts index d637232f8c..241c07bfb5 100644 --- a/src/lib/middleware/demo-authentication.ts +++ b/src/lib/middleware/demo-authentication.ts @@ -4,8 +4,8 @@ import { IUnleashServices } from '../types/services'; import { IUnleashConfig } from '../types/option'; import ApiUser from '../types/api-user'; import { ApiTokenType } from '../types/models/api-token'; -import { IAuthRequest } from 'lib/server-impl'; -import { IApiRequest } from 'lib/routes/unleash-types'; +import { IAuthRequest } from '../server-impl'; +import { IApiRequest } from '../routes/unleash-types'; import { encrypt } from '../util'; function demoAuthentication( diff --git a/src/lib/middleware/no-authentication.test.ts b/src/lib/middleware/no-authentication.test.ts index 420f774511..34cfa4ed11 100644 --- a/src/lib/middleware/no-authentication.test.ts +++ b/src/lib/middleware/no-authentication.test.ts @@ -1,4 +1,4 @@ -import { IAuthRequest } from 'lib/routes/unleash-types'; +import { IAuthRequest } from '../routes/unleash-types'; import supertest from 'supertest'; import express from 'express'; import noAuthentication from './no-authentication'; diff --git a/src/lib/middleware/response-time-metrics.ts b/src/lib/middleware/response-time-metrics.ts index 5da362ec9a..fd585b12c3 100644 --- a/src/lib/middleware/response-time-metrics.ts +++ b/src/lib/middleware/response-time-metrics.ts @@ -2,7 +2,7 @@ import * as responseTime from 'response-time'; import EventEmitter from 'events'; import { REQUEST_TIME } from '../metric-events'; import { IFlagResolver } from '../types/experimental'; -import { InstanceStatsService } from 'lib/services'; +import { InstanceStatsService } from '../services'; // eslint-disable-next-line @typescript-eslint/naming-convention const _responseTime = responseTime.default; diff --git a/src/lib/routes/admin-api/addon.ts b/src/lib/routes/admin-api/addon.ts index 7ded8039c5..351cf7c8d6 100644 --- a/src/lib/routes/admin-api/addon.ts +++ b/src/lib/routes/admin-api/addon.ts @@ -22,7 +22,7 @@ import { emptyResponse, getStandardResponses, } from '../../openapi/util/standard-responses'; -import { AddonCreateUpdateSchema } from 'lib/openapi/spec/addon-create-update-schema'; +import { AddonCreateUpdateSchema } from '../../openapi/spec/addon-create-update-schema'; type AddonServices = Pick; diff --git a/src/lib/routes/admin-api/config.ts b/src/lib/routes/admin-api/config.ts index 5270da77b6..b7632b944c 100644 --- a/src/lib/routes/admin-api/config.ts +++ b/src/lib/routes/admin-api/config.ts @@ -4,8 +4,8 @@ import { IUnleashServices } from '../../types/services'; import { IAuthType, IUnleashConfig } from '../../types/option'; import version from '../../util/version'; import Controller from '../controller'; -import VersionService from 'lib/services/version-service'; -import SettingService from 'lib/services/setting-service'; +import VersionService from '../../services/version-service'; +import SettingService from '../../services/setting-service'; import { simpleAuthSettingsKey, SimpleAuthSettings, @@ -24,8 +24,8 @@ import { extractUsername } from '../../util/extract-user'; import NotFoundError from '../../error/notfound-error'; import { SetUiConfigSchema } from '../../openapi/spec/set-ui-config-schema'; import { createRequestSchema } from '../../openapi/util/create-request-schema'; -import { ProxyService } from 'lib/services'; -import MaintenanceService from 'lib/features/maintenance/maintenance-service'; +import { ProxyService } from '../../services'; +import MaintenanceService from '../../features/maintenance/maintenance-service'; class ConfigController extends Controller { private versionService: VersionService; diff --git a/src/lib/routes/admin-api/context.ts b/src/lib/routes/admin-api/context.ts index 45ffaa079f..065e10b326 100644 --- a/src/lib/routes/admin-api/context.ts +++ b/src/lib/routes/admin-api/context.ts @@ -38,8 +38,8 @@ import { ContextFieldStrategiesSchema, contextFieldStrategiesSchema, } from '../../openapi/spec/context-field-strategies-schema'; -import { UpdateContextFieldSchema } from 'lib/openapi/spec/update-context-field-schema'; -import { CreateContextFieldSchema } from 'lib/openapi/spec/create-context-field-schema'; +import { UpdateContextFieldSchema } from '../../openapi/spec/update-context-field-schema'; +import { CreateContextFieldSchema } from '../../openapi/spec/create-context-field-schema'; interface ContextParam { contextField: string; diff --git a/src/lib/routes/admin-api/project/project-api.ts b/src/lib/routes/admin-api/project/project-api.ts index 6bdac85dfb..2525575019 100644 --- a/src/lib/routes/admin-api/project/project-api.ts +++ b/src/lib/routes/admin-api/project/project-api.ts @@ -31,7 +31,7 @@ import ProjectArchiveController from './project-archive'; import { createKnexTransactionStarter } from '../../../db/transaction'; import { Db } from '../../../db/db'; import DependentFeaturesController from '../../../features/dependent-features/dependent-features-controller'; -import { ProjectOverviewSchema } from 'lib/openapi/spec/project-overview-schema'; +import { ProjectOverviewSchema } from '../../../openapi/spec/project-overview-schema'; export default class ProjectApi extends Controller { private projectService: ProjectService; diff --git a/src/lib/routes/admin-api/project/variants.ts b/src/lib/routes/admin-api/project/variants.ts index 8d85d33775..ae4b11c6a7 100644 --- a/src/lib/routes/admin-api/project/variants.ts +++ b/src/lib/routes/admin-api/project/variants.ts @@ -18,8 +18,8 @@ import { createRequestSchema } from '../../../openapi/util/create-request-schema import { createResponseSchema } from '../../../openapi/util/create-response-schema'; import { AccessService } from '../../../services'; import { BadDataError, PermissionError } from '../../../../lib/error'; -import { IUser } from 'lib/server-impl'; -import { PushVariantsSchema } from 'lib/openapi/spec/push-variants-schema'; +import { IUser } from '../../../server-impl'; +import { PushVariantsSchema } from '../../../openapi/spec/push-variants-schema'; import { getStandardResponses } from '../../../openapi'; const PREFIX = '/:projectId/features/:featureName/variants'; diff --git a/src/lib/routes/admin-api/tag.ts b/src/lib/routes/admin-api/tag.ts index a7b6b71535..719ad472bb 100644 --- a/src/lib/routes/admin-api/tag.ts +++ b/src/lib/routes/admin-api/tag.ts @@ -25,7 +25,7 @@ import { emptyResponse, getStandardResponses, } from '../../openapi/util/standard-responses'; -import FeatureTagService from 'lib/services/feature-tag-service'; +import FeatureTagService from '../../services/feature-tag-service'; import { IFlagResolver } from '../../types'; const version = 1; diff --git a/src/lib/routes/admin-api/telemetry.ts b/src/lib/routes/admin-api/telemetry.ts index 2925ef062a..4f1a026fb0 100644 --- a/src/lib/routes/admin-api/telemetry.ts +++ b/src/lib/routes/admin-api/telemetry.ts @@ -1,10 +1,10 @@ import { Response } from 'express'; -import { OpenApiService } from 'lib/services'; +import { OpenApiService } from '../../services'; import { IAuthRequest } from '../unleash-types'; import { IUnleashConfig } from '../../types/option'; import Controller from '../controller'; import { NONE } from '../../types/permissions'; -import { IUnleashServices } from 'lib/types'; +import { IUnleashServices } from '../../types'; import { createResponseSchema } from '../../openapi/util/create-response-schema'; import { telemetrySettingsSchema, diff --git a/src/lib/routes/admin-api/user-splash.ts b/src/lib/routes/admin-api/user-splash.ts index 4ccb1318ff..2b257dfe0e 100644 --- a/src/lib/routes/admin-api/user-splash.ts +++ b/src/lib/routes/admin-api/user-splash.ts @@ -10,7 +10,7 @@ import { OpenApiService } from '../../services/openapi-service'; import { createResponseSchema } from '../../openapi/util/create-response-schema'; import { splashRequestSchema } from '../../openapi/spec/splash-request-schema'; import { getStandardResponses } from '../../openapi'; -import { SplashResponseSchema } from 'lib/openapi/spec/splash-response-schema'; +import { SplashResponseSchema } from '../../openapi/spec/splash-response-schema'; class UserSplashController extends Controller { private logger: Logger; diff --git a/src/lib/routes/controller.ts b/src/lib/routes/controller.ts index db0c8e56df..37f2995e7f 100644 --- a/src/lib/routes/controller.ts +++ b/src/lib/routes/controller.ts @@ -1,5 +1,5 @@ import { IRouter, Router, Request, Response, RequestHandler } from 'express'; -import { Logger } from 'lib/logger'; +import { Logger } from '../logger'; import { IUnleashConfig, NONE } from '../types'; import { handleErrors } from './util'; import requireContentType from '../middleware/content_type_checker'; diff --git a/src/lib/routes/public-invite.test.ts b/src/lib/routes/public-invite.test.ts index bf6c112647..c5d950f57e 100644 --- a/src/lib/routes/public-invite.test.ts +++ b/src/lib/routes/public-invite.test.ts @@ -5,7 +5,7 @@ import getApp from '../app'; import supertest, { Test } from 'supertest'; import permissions from '../../test/fixtures/permissions'; import { RoleName, RoleType } from '../types/model'; -import { IUnleashStores } from 'lib/types'; +import { IUnleashStores } from '../types'; import TestAgent from 'supertest/lib/agent'; describe('Public Signup API', () => { diff --git a/src/lib/segments/segment-service-interface.ts b/src/lib/segments/segment-service-interface.ts index 0be5052590..0300f52408 100644 --- a/src/lib/segments/segment-service-interface.ts +++ b/src/lib/segments/segment-service-interface.ts @@ -1,6 +1,6 @@ -import { ChangeRequestStrategy } from 'lib/features/change-request-segment-usage-service/change-request-segment-usage-read-model'; -import { UpsertSegmentSchema } from 'lib/openapi'; -import { IClientSegment, IFeatureStrategy, ISegment, IUser } from 'lib/types'; +import { ChangeRequestStrategy } from '../features/change-request-segment-usage-service/change-request-segment-usage-read-model'; +import { UpsertSegmentSchema } from '../openapi'; +import { IClientSegment, IFeatureStrategy, ISegment, IUser } from '../types'; export type StrategiesUsingSegment = { strategies: IFeatureStrategy[]; diff --git a/src/lib/services/account-service.ts b/src/lib/services/account-service.ts index 4913f70712..f3efb6e1bd 100644 --- a/src/lib/services/account-service.ts +++ b/src/lib/services/account-service.ts @@ -4,7 +4,7 @@ import { IUnleashConfig } from '../types/option'; import { IAccountStore, IUnleashStores } from '../types/stores'; import { AccessService } from './access-service'; import { RoleName } from '../types/model'; -import { IAdminCount } from 'lib/types/stores/account-store'; +import { IAdminCount } from '../types/stores/account-store'; interface IUserWithRole extends IUser { rootRole: number; diff --git a/src/lib/services/api-token-service.ts b/src/lib/services/api-token-service.ts index a7bb939700..5072c91756 100644 --- a/src/lib/services/api-token-service.ts +++ b/src/lib/services/api-token-service.ts @@ -17,7 +17,7 @@ import { import { IApiTokenStore } from '../types/stores/api-token-store'; import { FOREIGN_KEY_VIOLATION } from '../error/db-error'; import BadDataError from '../error/bad-data-error'; -import { IEnvironmentStore } from 'lib/features/project-environments/environment-store-type'; +import { IEnvironmentStore } from '../features/project-environments/environment-store-type'; import { constantTimeCompare } from '../util/constantTimeCompare'; import { ApiTokenCreatedEvent, diff --git a/src/lib/services/feature-service-potentially-stale.test.ts b/src/lib/services/feature-service-potentially-stale.test.ts index 51ec34a7af..1db2214a83 100644 --- a/src/lib/services/feature-service-potentially-stale.test.ts +++ b/src/lib/services/feature-service-potentially-stale.test.ts @@ -7,8 +7,8 @@ import { import { createTestConfig } from '../../test/config/test-config'; import FeatureToggleService from '../features/feature-toggle/feature-toggle-service'; import { AccessService } from './access-service'; -import { IChangeRequestAccessReadModel } from 'lib/features/change-request-access-service/change-request-access-read-model'; -import { ISegmentService } from 'lib/segments/segment-service-interface'; +import { IChangeRequestAccessReadModel } from '../features/change-request-access-service/change-request-access-read-model'; +import { ISegmentService } from '../segments/segment-service-interface'; import { IPrivateProjectChecker } from '../features/private-project/privateProjectCheckerType'; import { IDependentFeaturesReadModel } from '../features/dependent-features/dependent-features-read-model-type'; import EventService from './event-service'; diff --git a/src/lib/services/project-service.ts b/src/lib/services/project-service.ts index e0901af9aa..43c856be5f 100644 --- a/src/lib/services/project-service.ts +++ b/src/lib/services/project-service.ts @@ -57,13 +57,13 @@ import IncompatibleProjectError from '../error/incompatible-project-error'; import ProjectWithoutOwnerError from '../error/project-without-owner-error'; import { arraysHaveSameItems } from '../util'; import { GroupService } from './group-service'; -import { IGroupRole } from 'lib/types/group'; +import { IGroupRole } from '../types/group'; import { FavoritesService } from './favorites-service'; import { calculateAverageTimeToProd } from '../features/feature-toggle/time-to-production/time-to-production'; -import { IProjectStatsStore } from 'lib/types/stores/project-stats-store-type'; +import { IProjectStatsStore } from '../types/stores/project-stats-store-type'; import { uniqueByKey } from '../util/unique'; import { BadDataError, PermissionError } from '../error'; -import { ProjectDoraMetricsSchema } from 'lib/openapi'; +import { ProjectDoraMetricsSchema } from '../openapi'; import { checkFeatureNamingData } from '../features/feature-naming-pattern/feature-naming-validation'; import { IPrivateProjectChecker } from '../features/private-project/privateProjectCheckerType'; import EventService from './event-service'; diff --git a/src/lib/services/public-signup-token-service.ts b/src/lib/services/public-signup-token-service.ts index f7f3246cd9..947578fedd 100644 --- a/src/lib/services/public-signup-token-service.ts +++ b/src/lib/services/public-signup-token-service.ts @@ -6,7 +6,7 @@ import { PublicSignupTokenSchema } from '../openapi/spec/public-signup-token-sch import { IRoleStore } from '../types/stores/role-store'; import { IPublicSignupTokenCreate } from '../types/models/public-signup-token'; import { PublicSignupTokenCreateSchema } from '../openapi/spec/public-signup-token-create-schema'; -import { CreateInvitedUserSchema } from 'lib/openapi/spec/create-invited-user-schema'; +import { CreateInvitedUserSchema } from '../openapi/spec/create-invited-user-schema'; import { RoleName } from '../types/model'; import { PublicSignupTokenCreatedEvent, diff --git a/src/lib/services/segment-service.ts b/src/lib/services/segment-service.ts index 2c5daa1ab0..ccd8b82233 100644 --- a/src/lib/services/segment-service.ts +++ b/src/lib/services/segment-service.ts @@ -27,7 +27,7 @@ import { PermissionError } from '../error'; import { IChangeRequestAccessReadModel } from '../features/change-request-access-service/change-request-access-read-model'; import { IPrivateProjectChecker } from '../features/private-project/privateProjectCheckerType'; import EventService from './event-service'; -import { IChangeRequestSegmentUsageReadModel } from 'lib/features/change-request-segment-usage-service/change-request-segment-usage-read-model'; +import { IChangeRequestSegmentUsageReadModel } from '../features/change-request-segment-usage-service/change-request-segment-usage-read-model'; export class SegmentService implements ISegmentService { private logger: Logger; diff --git a/src/lib/services/version-service.ts b/src/lib/services/version-service.ts index ee0987ffce..4cd56a2f6b 100644 --- a/src/lib/services/version-service.ts +++ b/src/lib/services/version-service.ts @@ -16,7 +16,7 @@ import { IUnleashConfig } from '../types/option'; import version from '../util/version'; import { Logger } from '../logger'; import { ISettingStore } from '../types/stores/settings-store'; -import { IStrategyStore } from 'lib/types'; +import { IStrategyStore } from '../types'; import { FEATURES_EXPORTED, FEATURES_IMPORTED } from '../types'; import { CUSTOM_ROOT_ROLE_TYPE } from '../util'; import { GetActiveUsers } from '../features/instance-stats/getActiveUsers'; diff --git a/src/lib/types/core.test.ts b/src/lib/types/core.test.ts index 2420e73bf8..006762f9d9 100644 --- a/src/lib/types/core.test.ts +++ b/src/lib/types/core.test.ts @@ -2,7 +2,7 @@ import { getDbConfig } from '../../test/e2e/helpers/database-config'; import { createTestConfig } from '../../test/config/test-config'; import { log } from 'db-migrate-shared'; import { Client } from 'pg'; -import { IDBOption } from 'lib/types'; +import { IDBOption } from '../../lib/types'; import { migrateDb } from '../../migrator'; import { SYSTEM_USER } from './core'; diff --git a/src/lib/types/model.ts b/src/lib/types/model.ts index 5a99e70612..75a74d36a8 100644 --- a/src/lib/types/model.ts +++ b/src/lib/types/model.ts @@ -3,7 +3,7 @@ import { LogProvider } from '../logger'; import { IRole } from './stores/access-store'; import { IUser } from './user'; import { ALL_OPERATORS } from '../util'; -import { IProjectStats } from 'lib/services/project-service'; +import { IProjectStats } from '../services/project-service'; import { CreateFeatureStrategySchema } from '../openapi'; import { ProjectEnvironment } from './stores/project-store'; diff --git a/src/lib/types/services.ts b/src/lib/types/services.ts index 4821fabdc6..8305cb5a12 100644 --- a/src/lib/types/services.ts +++ b/src/lib/types/services.ts @@ -26,7 +26,7 @@ import ClientMetricsServiceV2 from '../features/metrics/client-metrics/metrics-s import UserSplashService from '../services/user-splash-service'; import { OpenApiService } from '../services/openapi-service'; import { ClientSpecService } from '../services/client-spec-service'; -import { PlaygroundService } from 'lib/features/playground/playground-service'; +import { PlaygroundService } from '../features/playground/playground-service'; import { GroupService } from '../services/group-service'; import { ProxyService } from '../services/proxy-service'; import EdgeService from '../services/edge-service'; @@ -45,12 +45,12 @@ import { } from '../features/export-import-toggles/export-import-service'; import { ISegmentService } from '../segments/segment-service-interface'; import ConfigurationRevisionService from '../features/feature-toggle/configuration-revision-service'; -import EventAnnouncerService from 'lib/services/event-announcer-service'; +import EventAnnouncerService from '../services/event-announcer-service'; import { IPrivateProjectChecker } from '../features/private-project/privateProjectCheckerType'; import { DependentFeaturesService } from '../features/dependent-features/dependent-features-service'; -import { WithTransactional } from 'lib/db/transaction'; -import { ClientFeatureToggleService } from 'lib/features/client-feature-toggles/client-feature-toggle-service'; -import { FeatureSearchService } from 'lib/features/feature-search/feature-search-service'; +import { WithTransactional } from '../db/transaction'; +import { ClientFeatureToggleService } from '../features/client-feature-toggles/client-feature-toggle-service'; +import { FeatureSearchService } from '../features/feature-search/feature-search-service'; export interface IUnleashServices { accessService: AccessService; diff --git a/src/lib/types/stores/access-store.ts b/src/lib/types/stores/access-store.ts index f0a830ae8d..e0a081f1bd 100644 --- a/src/lib/types/stores/access-store.ts +++ b/src/lib/types/stores/access-store.ts @@ -1,4 +1,4 @@ -import { PermissionRef } from 'lib/services/access-service'; +import { PermissionRef } from '../../services/access-service'; import { IGroupModelWithProjectRole } from '../group'; import { IPermission, IUserAccessOverview, IUserWithRole } from '../model'; import { Store } from './store'; diff --git a/src/lib/types/stores/event-store.ts b/src/lib/types/stores/event-store.ts index 307a6695df..d18aa6c2bc 100644 --- a/src/lib/types/stores/event-store.ts +++ b/src/lib/types/stores/event-store.ts @@ -2,7 +2,7 @@ import { IBaseEvent, IEvent } from '../events'; import { Store } from './store'; import { SearchEventsSchema } from '../../openapi/spec/search-events-schema'; import EventEmitter from 'events'; -import { IQueryOperations } from 'lib/db/event-store'; +import { IQueryOperations } from '../../db/event-store'; export interface IEventStore extends Store, diff --git a/src/lib/types/stores/project-stats-store-type.ts b/src/lib/types/stores/project-stats-store-type.ts index 6d80d2029f..f91a2ce3ea 100644 --- a/src/lib/types/stores/project-stats-store-type.ts +++ b/src/lib/types/stores/project-stats-store-type.ts @@ -1,5 +1,5 @@ -import { DoraFeaturesSchema } from 'lib/openapi'; -import { IProjectStats } from 'lib/services/project-service'; +import { DoraFeaturesSchema } from '../../openapi'; +import { IProjectStats } from '../../services/project-service'; export interface ICreateEnabledDates { created: Date; diff --git a/src/lib/types/stores/role-store.ts b/src/lib/types/stores/role-store.ts index 27ca9b7f6f..c63a60ec40 100644 --- a/src/lib/types/stores/role-store.ts +++ b/src/lib/types/stores/role-store.ts @@ -1,4 +1,4 @@ -import { RoleSchema } from 'lib/openapi'; +import { RoleSchema } from '../../openapi'; import { ICustomRole } from '../model'; import { IRole, IUserRole } from './access-store'; import { Store } from './store'; diff --git a/src/lib/types/stores/strategy-store.ts b/src/lib/types/stores/strategy-store.ts index d3a888dd1e..4daf7d7c6c 100644 --- a/src/lib/types/stores/strategy-store.ts +++ b/src/lib/types/stores/strategy-store.ts @@ -1,4 +1,4 @@ -import { CreateStrategySchema } from 'lib/openapi'; +import { CreateStrategySchema } from '../../openapi'; import { Store } from './store'; export interface IStrategy { diff --git a/src/test/arbitraries.test.ts b/src/test/arbitraries.test.ts index d6cfd528e4..b94a2262f6 100644 --- a/src/test/arbitraries.test.ts +++ b/src/test/arbitraries.test.ts @@ -4,8 +4,8 @@ import { ALL_OPERATORS } from '../lib/util/constants'; import { ClientFeatureSchema } from '../lib/openapi/spec/client-feature-schema'; import { IVariant, WeightType } from '../lib/types/model'; import { FeatureStrategySchema } from '../lib/openapi/spec/feature-strategy-schema'; -import { ConstraintSchema } from 'lib/openapi/spec/constraint-schema'; -import { SegmentSchema } from 'lib/openapi/spec/segment-schema'; +import { ConstraintSchema } from '../lib/openapi/spec/constraint-schema'; +import { SegmentSchema } from '../lib/openapi/spec/segment-schema'; export const urlFriendlyString = (): Arbitrary => fc diff --git a/src/test/e2e/api/admin/api-token.auth.e2e.test.ts b/src/test/e2e/api/admin/api-token.auth.e2e.test.ts index 532c9eaa5a..0fd0b5dfd3 100644 --- a/src/test/e2e/api/admin/api-token.auth.e2e.test.ts +++ b/src/test/e2e/api/admin/api-token.auth.e2e.test.ts @@ -14,7 +14,7 @@ import { UPDATE_CLIENT_API_TOKEN, } from '../../../../lib/types'; import { addDays } from 'date-fns'; -import { AccessService, UserService } from 'lib/services'; +import { AccessService, UserService } from '../../../../lib/services'; let stores: IUnleashStores; let db: ITestDb; diff --git a/src/test/e2e/api/admin/playground.e2e.test.ts b/src/test/e2e/api/admin/playground.e2e.test.ts index d23f6b8417..d5cb74499f 100644 --- a/src/test/e2e/api/admin/playground.e2e.test.ts +++ b/src/test/e2e/api/admin/playground.e2e.test.ts @@ -10,10 +10,10 @@ import { ApiTokenType, IApiToken, } from '../../../../lib/types/models/api-token'; -import { PlaygroundFeatureSchema } from 'lib/openapi/spec/playground-feature-schema'; -import { ClientFeatureSchema } from 'lib/openapi/spec/client-feature-schema'; -import { PlaygroundResponseSchema } from 'lib/openapi/spec/playground-response-schema'; -import { PlaygroundRequestSchema } from 'lib/openapi/spec/playground-request-schema'; +import { PlaygroundFeatureSchema } from '../../../../lib/openapi/spec/playground-feature-schema'; +import { ClientFeatureSchema } from '../../../../lib/openapi/spec/client-feature-schema'; +import { PlaygroundResponseSchema } from '../../../../lib/openapi/spec/playground-response-schema'; +import { PlaygroundRequestSchema } from '../../../../lib/openapi/spec/playground-request-schema'; let app: IUnleashTest; let db: ITestDb; diff --git a/src/test/e2e/api/admin/project/projects.e2e.test.ts b/src/test/e2e/api/admin/project/projects.e2e.test.ts index b9c232f025..7f68ea1e7a 100644 --- a/src/test/e2e/api/admin/project/projects.e2e.test.ts +++ b/src/test/e2e/api/admin/project/projects.e2e.test.ts @@ -7,7 +7,7 @@ import { } from '../../../helpers/test-helper'; import getLogger from '../../../../fixtures/no-logger'; -import { IProjectStore } from 'lib/types'; +import { IProjectStore } from '../../../../../lib/types'; import { DEFAULT_ENV } from '../../../../../lib/util'; let app: IUnleashTest; diff --git a/src/test/e2e/api/admin/segment.e2e.test.ts b/src/test/e2e/api/admin/segment.e2e.test.ts index 2d1c330a7c..f480a4d9e9 100644 --- a/src/test/e2e/api/admin/segment.e2e.test.ts +++ b/src/test/e2e/api/admin/segment.e2e.test.ts @@ -11,7 +11,7 @@ import { IUnleashTest, setupAppWithCustomConfig, } from '../../helpers/test-helper'; -import { StrategiesUsingSegment } from 'lib/segments/segment-service-interface'; +import { StrategiesUsingSegment } from '../../../../lib/segments/segment-service-interface'; import { IUser } from '../../../../lib/types'; let app: IUnleashTest; diff --git a/src/test/e2e/api/admin/user-admin.e2e.test.ts b/src/test/e2e/api/admin/user-admin.e2e.test.ts index 174f9e4bc0..92b099d6a0 100644 --- a/src/test/e2e/api/admin/user-admin.e2e.test.ts +++ b/src/test/e2e/api/admin/user-admin.e2e.test.ts @@ -13,7 +13,7 @@ import { IRole } from '../../../../lib/types/stores/access-store'; import { IEventStore } from '../../../../lib/types/stores/event-store'; import { IUserStore } from '../../../../lib/types/stores/user-store'; import { RoleName } from '../../../../lib/types/model'; -import { IRoleStore } from 'lib/types/stores/role-store'; +import { IRoleStore } from '../../../../lib/types/stores/role-store'; import { randomId } from '../../../../lib/util/random-id'; import { omitKeys } from '../../../../lib/util/omit-keys'; import { ISessionStore } from '../../../../lib/types/stores/session-store'; diff --git a/src/test/e2e/api/client/segment.e2e.test.ts b/src/test/e2e/api/client/segment.e2e.test.ts index 181a0ae4d6..a2d35dddcb 100644 --- a/src/test/e2e/api/client/segment.e2e.test.ts +++ b/src/test/e2e/api/client/segment.e2e.test.ts @@ -22,7 +22,7 @@ import { CreateFeatureStrategySchema, FeatureStrategySchema, UpsertSegmentSchema, -} from 'lib/openapi'; +} from '../../../../lib/openapi'; import { DEFAULT_ENV } from '../../../../lib/util'; import { DEFAULT_PROJECT } from '../../../../lib/types'; diff --git a/src/test/e2e/dedupe-permissions.e2e.test.ts b/src/test/e2e/dedupe-permissions.e2e.test.ts index a02632f7ee..9171dd33c1 100644 --- a/src/test/e2e/dedupe-permissions.e2e.test.ts +++ b/src/test/e2e/dedupe-permissions.e2e.test.ts @@ -3,7 +3,7 @@ import { createTestConfig } from '../config/test-config'; import { getInstance } from 'db-migrate'; import { log } from 'db-migrate-shared'; import { Client } from 'pg'; -import { IDBOption } from 'lib/types'; +import { IDBOption } from '../../lib/types'; log.setLogLevel('error'); diff --git a/src/test/e2e/favor-permission-name-over-id.e2e.test.ts b/src/test/e2e/favor-permission-name-over-id.e2e.test.ts index f8c4198996..215a615c58 100644 --- a/src/test/e2e/favor-permission-name-over-id.e2e.test.ts +++ b/src/test/e2e/favor-permission-name-over-id.e2e.test.ts @@ -3,7 +3,7 @@ import { createTestConfig } from '../config/test-config'; import { getInstance } from 'db-migrate'; import { log } from 'db-migrate-shared'; import { Client } from 'pg'; -import { IDBOption } from 'lib/types'; +import { IDBOption } from '../../lib/types'; log.setLogLevel('error'); diff --git a/src/test/e2e/helpers/app.utils.ts b/src/test/e2e/helpers/app.utils.ts index 9d271e46c3..eed8a6b3e7 100644 --- a/src/test/e2e/helpers/app.utils.ts +++ b/src/test/e2e/helpers/app.utils.ts @@ -1,4 +1,4 @@ -import { CreateFeatureStrategySchema } from 'lib/openapi'; +import { CreateFeatureStrategySchema } from '../../../lib/openapi'; import { IUnleashTest } from './test-helper'; export const FEATURES_BASE_PATH = '/api/admin/projects/default/features'; diff --git a/src/test/e2e/helpers/database-init.ts b/src/test/e2e/helpers/database-init.ts index 4121c6a69f..cef2d50610 100644 --- a/src/test/e2e/helpers/database-init.ts +++ b/src/test/e2e/helpers/database-init.ts @@ -10,7 +10,7 @@ import EnvironmentStore from '../../../lib/features/project-environments/environ import { IUnleashStores } from '../../../lib/types'; import { IFeatureEnvironmentStore } from '../../../lib/types/stores/feature-environment-store'; import { DEFAULT_ENV } from '../../../lib/util/constants'; -import { IUnleashOptions, Knex } from 'lib/server-impl'; +import { IUnleashOptions, Knex } from '../../../lib/server-impl'; // require('db-migrate-shared').log.silence(false); diff --git a/src/test/e2e/helpers/test-helper.ts b/src/test/e2e/helpers/test-helper.ts index e56ff1da23..f56b5aa6f7 100644 --- a/src/test/e2e/helpers/test-helper.ts +++ b/src/test/e2e/helpers/test-helper.ts @@ -13,7 +13,7 @@ import { } from '../../../lib/types'; import { IUnleashServices } from '../../../lib/types/services'; import { Db } from '../../../lib/db/db'; -import { IContextFieldDto } from 'lib/types/stores/context-field-store'; +import { IContextFieldDto } from '../../../lib/types/stores/context-field-store'; import { DEFAULT_ENV } from '../../../lib/util'; import { CreateFeatureSchema, diff --git a/src/test/e2e/migrator.e2e.test.ts b/src/test/e2e/migrator.e2e.test.ts index 297b4870f0..62c1458f14 100644 --- a/src/test/e2e/migrator.e2e.test.ts +++ b/src/test/e2e/migrator.e2e.test.ts @@ -3,7 +3,7 @@ import { createTestConfig } from '../config/test-config'; import { getInstance } from 'db-migrate'; import { log } from 'db-migrate-shared'; import { Client } from 'pg'; -import { IDBOption } from 'lib/types'; +import { IDBOption } from '../../lib/types'; log.setLogLevel('error'); diff --git a/src/test/e2e/seed/segment.seed.ts b/src/test/e2e/seed/segment.seed.ts index 60b14606b5..d9942f96a4 100644 --- a/src/test/e2e/seed/segment.seed.ts +++ b/src/test/e2e/seed/segment.seed.ts @@ -9,7 +9,7 @@ import { ISegment, } from '../../../lib/types/model'; import { IUnleashTest, setupApp } from '../helpers/test-helper'; -import { UpsertSegmentSchema } from 'lib/openapi'; +import { UpsertSegmentSchema } from '../../../lib/openapi'; interface ISeedSegmentSpec { featuresCount: number; diff --git a/src/test/e2e/services/api-token-service.e2e.test.ts b/src/test/e2e/services/api-token-service.e2e.test.ts index b7df749bed..49a863a67f 100644 --- a/src/test/e2e/services/api-token-service.e2e.test.ts +++ b/src/test/e2e/services/api-token-service.e2e.test.ts @@ -8,7 +8,7 @@ import { addDays, subDays } from 'date-fns'; import ProjectService from '../../../lib/services/project-service'; import { createProjectService } from '../../../lib/features'; import { EventService } from '../../../lib/services'; -import { IUnleashStores } from 'lib/types'; +import { IUnleashStores } from '../../../lib/types'; let db: ITestDb; let stores: IUnleashStores; diff --git a/src/test/e2e/services/playground-service.test.ts b/src/test/e2e/services/playground-service.test.ts index 12a6325fcf..17778c3bba 100644 --- a/src/test/e2e/services/playground-service.test.ts +++ b/src/test/e2e/services/playground-service.test.ts @@ -15,11 +15,11 @@ import FeatureToggleService from '../../../lib/features/feature-toggle/feature-t import { FeatureToggle, ISegment, WeightType } from '../../../lib/types/model'; import { PlaygroundFeatureSchema } from '../../../lib/openapi/spec/playground-feature-schema'; import { offlineUnleashClientNode } from '../../../lib/features/playground/offline-unleash-client.test'; -import { ClientFeatureSchema } from 'lib/openapi/spec/client-feature-schema'; -import { SdkContextSchema } from 'lib/openapi/spec/sdk-context-schema'; -import { SegmentSchema } from 'lib/openapi/spec/segment-schema'; +import { ClientFeatureSchema } from '../../../lib/openapi/spec/client-feature-schema'; +import { SdkContextSchema } from '../../../lib/openapi/spec/sdk-context-schema'; +import { SegmentSchema } from '../../../lib/openapi/spec/segment-schema'; import { playgroundStrategyEvaluation } from '../../../lib/openapi/spec/playground-strategy-schema'; -import { PlaygroundSegmentSchema } from 'lib/openapi/spec/playground-segment-schema'; +import { PlaygroundSegmentSchema } from '../../../lib/openapi/spec/playground-segment-schema'; import { ISegmentService } from '../../../lib/segments/segment-service-interface'; import { createPrivateProjectChecker } from '../../../lib/features/private-project/createPrivateProjectChecker'; import { diff --git a/src/test/e2e/services/project-service.e2e.test.ts b/src/test/e2e/services/project-service.e2e.test.ts index e6dd1c6ff1..0097b5e220 100644 --- a/src/test/e2e/services/project-service.e2e.test.ts +++ b/src/test/e2e/services/project-service.e2e.test.ts @@ -23,7 +23,7 @@ import { SYSTEM_USER, SYSTEM_USER_ID, } from '../../../lib/types'; -import { User } from 'lib/server-impl'; +import { User } from '../../../lib/server-impl'; let stores: IUnleashStores; let db: ITestDb; diff --git a/src/test/e2e/stores/client-application-store.e2e.test.ts b/src/test/e2e/stores/client-application-store.e2e.test.ts index af28175406..9a0bf6438a 100644 --- a/src/test/e2e/stores/client-application-store.e2e.test.ts +++ b/src/test/e2e/stores/client-application-store.e2e.test.ts @@ -1,7 +1,7 @@ import faker from 'faker'; import dbInit, { ITestDb } from '../helpers/database-init'; import getLogger from '../../fixtures/no-logger'; -import { IClientApplicationsStore, IUnleashStores } from 'lib/types'; +import { IClientApplicationsStore, IUnleashStores } from '../../../lib/types'; import { IClientApplication } from '../../../lib/types/stores/client-applications-store'; let db: ITestDb; diff --git a/src/test/e2e/stores/context-field-store.e2e.test.ts b/src/test/e2e/stores/context-field-store.e2e.test.ts index 66d4bee466..d9e592eb3e 100644 --- a/src/test/e2e/stores/context-field-store.e2e.test.ts +++ b/src/test/e2e/stores/context-field-store.e2e.test.ts @@ -1,8 +1,8 @@ import dbInit, { ITestDb } from '../helpers/database-init'; import getLogger from '../../fixtures/no-logger'; -import { IContextFieldDto } from 'lib/types/stores/context-field-store'; +import { IContextFieldDto } from '../../../lib/types/stores/context-field-store'; import fc, { Arbitrary } from 'fast-check'; -import { IUnleashStores } from 'lib/types'; +import { IUnleashStores } from '../../../lib/types'; let stores: IUnleashStores; let db: ITestDb; diff --git a/src/test/e2e/stores/feature-tag-store.e2e.test.ts b/src/test/e2e/stores/feature-tag-store.e2e.test.ts index b022f20ec7..303c2fb128 100644 --- a/src/test/e2e/stores/feature-tag-store.e2e.test.ts +++ b/src/test/e2e/stores/feature-tag-store.e2e.test.ts @@ -1,9 +1,9 @@ -import { IFeatureTagStore } from 'lib/types/stores/feature-tag-store'; -import { IFeatureToggleStore } from 'lib/features/feature-toggle/types/feature-toggle-store-type'; +import { IFeatureTagStore } from '../../../lib/types/stores/feature-tag-store'; +import { IFeatureToggleStore } from '../../../lib/features/feature-toggle/types/feature-toggle-store-type'; import dbInit, { ITestDb } from '../helpers/database-init'; import getLogger from '../../fixtures/no-logger'; import NotFoundError from '../../../lib/error/notfound-error'; -import { IUnleashStores } from 'lib/types'; +import { IUnleashStores } from '../../../lib/types'; let stores: IUnleashStores; let db: ITestDb; diff --git a/src/test/e2e/stores/feature-type-store.e2e.test.ts b/src/test/e2e/stores/feature-type-store.e2e.test.ts index 114fe879ef..2a0c838340 100644 --- a/src/test/e2e/stores/feature-type-store.e2e.test.ts +++ b/src/test/e2e/stores/feature-type-store.e2e.test.ts @@ -1,4 +1,4 @@ -import { IFeatureTypeStore } from 'lib/types/stores/feature-type-store'; +import { IFeatureTypeStore } from '../../../lib/types/stores/feature-type-store'; import dbInit, { ITestDb } from '../helpers/database-init'; import getLogger from '../../fixtures/no-logger'; import { IUnleashStores } from '../../../lib/types'; diff --git a/src/test/e2e/stores/project-store.e2e.test.ts b/src/test/e2e/stores/project-store.e2e.test.ts index b640611167..c6dc004353 100644 --- a/src/test/e2e/stores/project-store.e2e.test.ts +++ b/src/test/e2e/stores/project-store.e2e.test.ts @@ -1,5 +1,8 @@ -import { IProjectInsert, IProjectStore } from 'lib/types/stores/project-store'; -import { IEnvironmentStore } from 'lib/features/project-environments/environment-store-type'; +import { + IProjectInsert, + IProjectStore, +} from '../../../lib/types/stores/project-store'; +import { IEnvironmentStore } from '../../../lib/features/project-environments/environment-store-type'; import dbInit, { ITestDb } from '../helpers/database-init'; import getLogger from '../../fixtures/no-logger'; diff --git a/src/test/e2e/stores/user-feedback-store.e2e.test.ts b/src/test/e2e/stores/user-feedback-store.e2e.test.ts index a0de4e188d..509d947ff0 100644 --- a/src/test/e2e/stores/user-feedback-store.e2e.test.ts +++ b/src/test/e2e/stores/user-feedback-store.e2e.test.ts @@ -1,5 +1,5 @@ -import { IUserFeedbackStore } from 'lib/types/stores/user-feedback-store'; -import { IUserStore } from 'lib/types/stores/user-store'; +import { IUserFeedbackStore } from '../../../lib/types/stores/user-feedback-store'; +import { IUserStore } from '../../../lib/types/stores/user-store'; import dbInit, { ITestDb } from '../helpers/database-init'; import getLogger from '../../fixtures/no-logger'; import { IUnleashStores, IUser } from '../../../lib/types'; diff --git a/src/test/e2e/stores/user-splash-store.e2e.test.ts b/src/test/e2e/stores/user-splash-store.e2e.test.ts index 6aa85787a6..fc8cb28557 100644 --- a/src/test/e2e/stores/user-splash-store.e2e.test.ts +++ b/src/test/e2e/stores/user-splash-store.e2e.test.ts @@ -1,5 +1,5 @@ -import { IUserSplashStore } from 'lib/types/stores/user-splash-store'; -import { IUserStore } from 'lib/types/stores/user-store'; +import { IUserSplashStore } from '../../../lib/types/stores/user-splash-store'; +import { IUserStore } from '../../../lib/types/stores/user-store'; import dbInit, { ITestDb } from '../helpers/database-init'; import getLogger from '../../fixtures/no-logger'; import { IUnleashStores, IUser } from '../../../lib/types'; diff --git a/src/test/e2e/system-user-migration.test.ts b/src/test/e2e/system-user-migration.test.ts index cc508b1027..7e8599a938 100644 --- a/src/test/e2e/system-user-migration.test.ts +++ b/src/test/e2e/system-user-migration.test.ts @@ -3,7 +3,7 @@ import { createTestConfig } from '../config/test-config'; import { getInstance } from 'db-migrate'; import { log } from 'db-migrate-shared'; import { Client } from 'pg'; -import { IDBOption } from 'lib/types'; +import { IDBOption } from '../../lib/types'; log.setLogLevel('error'); @@ -50,7 +50,7 @@ test('System user creation migration correctly sets is_system', async () => { await client.query(` INSERT INTO "system_user_migration_test"."users" - (name, username, email, created_by_user_id) + (name, username, email, created_by_user_id) VALUES ('Test Person', 'testperson', 'testperson@getunleash.io', 1); `); diff --git a/src/test/fixtures/fake-access-store.ts b/src/test/fixtures/fake-access-store.ts index 3177d8331c..c0000a6c83 100644 --- a/src/test/fixtures/fake-access-store.ts +++ b/src/test/fixtures/fake-access-store.ts @@ -17,7 +17,7 @@ import { RoleType, } from '../../lib/types'; import FakeRoleStore from './fake-role-store'; -import { PermissionRef } from 'lib/services/access-service'; +import { PermissionRef } from '../../lib/services/access-service'; class AccessStoreMock implements IAccessStore { fakeRolesStore: IRoleStore; diff --git a/src/test/fixtures/fake-event-store.ts b/src/test/fixtures/fake-event-store.ts index 7dcfc558af..6e8c4720c2 100644 --- a/src/test/fixtures/fake-event-store.ts +++ b/src/test/fixtures/fake-event-store.ts @@ -1,7 +1,7 @@ import { IEventStore } from '../../lib/types/stores/event-store'; import { IEvent } from '../../lib/types/events'; import { sharedEventEmitter } from '../../lib/util/anyEventEmitter'; -import { IQueryOperations } from 'lib/db/event-store'; +import { IQueryOperations } from '../../lib/db/event-store'; import { SearchEventsSchema } from '../../lib/openapi'; import EventEmitter from 'events'; diff --git a/src/test/fixtures/fake-project-stats-store.ts b/src/test/fixtures/fake-project-stats-store.ts index bfcbabad2c..38206eaf11 100644 --- a/src/test/fixtures/fake-project-stats-store.ts +++ b/src/test/fixtures/fake-project-stats-store.ts @@ -1,8 +1,8 @@ -import { IProjectStats } from 'lib/services/project-service'; +import { IProjectStats } from '../../lib/services/project-service'; import { ICreateEnabledDates, IProjectStatsStore, -} from 'lib/types/stores/project-stats-store-type'; +} from '../../lib/types/stores/project-stats-store-type'; /* eslint-disable @typescript-eslint/no-unused-vars */ export default class FakeProjectStatsStore implements IProjectStatsStore { diff --git a/src/test/fixtures/fake-project-store.ts b/src/test/fixtures/fake-project-store.ts index 2322e1f28d..cd58b558fa 100644 --- a/src/test/fixtures/fake-project-store.ts +++ b/src/test/fixtures/fake-project-store.ts @@ -10,7 +10,7 @@ import { IEnvironmentProjectLink, IProjectMembersCount, ProjectModeCount, -} from 'lib/db/project-store'; +} from '../../lib/db/project-store'; import { CreateFeatureStrategySchema } from '../../lib/openapi'; export default class FakeProjectStore implements IProjectStore { diff --git a/src/test/fixtures/fake-role-store.ts b/src/test/fixtures/fake-role-store.ts index d674d6f5d6..67bd90df88 100644 --- a/src/test/fixtures/fake-role-store.ts +++ b/src/test/fixtures/fake-role-store.ts @@ -1,12 +1,12 @@ /* eslint-disable @typescript-eslint/no-unused-vars */ -import { RoleSchema } from 'lib/openapi'; -import { ICustomRole } from 'lib/types/model'; -import { IRole, IUserRole } from 'lib/types/stores/access-store'; +import { RoleSchema } from '../../lib/openapi'; +import { ICustomRole } from '../../lib/types/model'; +import { IRole, IUserRole } from '../../lib/types/stores/access-store'; import { ICustomRoleInsert, ICustomRoleUpdate, IRoleStore, -} from 'lib/types/stores/role-store'; +} from '../../lib/types/stores/role-store'; export default class FakeRoleStore implements IRoleStore { count(): Promise { diff --git a/tsconfig.json b/tsconfig.json index 19aa4c24ef..fa61b49aaa 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -41,7 +41,7 @@ // "noUncheckedIndexedAccess": true, /* Include 'undefined' in index signature results */ /* Module Resolution Options */ // "moduleResolution": "node", /* Specify module resolution strategy: 'node' (Node.js) or 'classic' (TypeScript pre-1.6). */ - "baseUrl": "./src" /* Base directory to resolve non-absolute module names. */, + // "baseUrl": "./src" /* Base directory to resolve non-absolute module names. */, // "paths": {}, /* A series of entries which re-map imports to lookup locations relative to the 'baseUrl'. */ // "rootDirs": [], /* List of root folders whose combined content represents the structure of the project at runtime. */ // "typeRoots": [], /* List of folders to include type definitions from. */