From 4c2399104791d31e56c4bb466df1608d85f2d119 Mon Sep 17 00:00:00 2001 From: forehalo Date: Fri, 13 Dec 2024 06:27:12 +0000 Subject: [PATCH] chore: rename fundamentals to base (#9119) --- .prettierignore | 2 +- packages/backend/server/src/app.controller.ts | 2 +- packages/backend/server/src/app.module.ts | 32 ++++++++----------- packages/backend/server/src/app.ts | 8 ++--- .../src/{fundamentals => base}/cache/def.ts | 0 .../src/{fundamentals => base}/cache/index.ts | 0 .../{fundamentals => base}/cache/instances.ts | 0 .../cache/interceptor.ts | 0 .../src/{fundamentals => base}/cache/local.ts | 0 .../src/{fundamentals => base}/config/def.ts | 0 .../{fundamentals => base}/config/default.ts | 0 .../src/{fundamentals => base}/config/env.ts | 0 .../{fundamentals => base}/config/index.ts | 0 .../{fundamentals => base}/config/provider.ts | 0 .../{fundamentals => base}/config/register.ts | 0 .../config/runtime/event.ts | 0 .../config/runtime/service.ts | 0 .../{fundamentals => base}/config/types.ts | 0 .../src/{fundamentals => base}/error/def.ts | 0 .../error/errors.gen.ts | 0 .../src/{fundamentals => base}/error/index.ts | 0 .../src/{fundamentals => base}/event/def.ts | 0 .../src/{fundamentals => base}/event/index.ts | 0 .../src/{fundamentals => base}/event/types.ts | 0 .../{fundamentals => base}/graphql/config.ts | 4 +-- .../{fundamentals => base}/graphql/index.ts | 0 .../graphql/logger-plugin.ts | 0 .../src/{fundamentals => base}/guard/guard.ts | 0 .../src/{fundamentals => base}/guard/index.ts | 0 .../{fundamentals => base}/guard/provider.ts | 0 .../helpers/__tests__/crypto.spec.ts | 0 .../helpers/__tests__/url.spec.ts | 0 .../{fundamentals => base}/helpers/config.ts | 0 .../{fundamentals => base}/helpers/crypto.ts | 0 .../{fundamentals => base}/helpers/index.ts | 0 .../src/{fundamentals => base}/helpers/url.ts | 0 .../src/{fundamentals => base}/index.ts | 0 .../{fundamentals => base}/mailer/config.ts | 0 .../{fundamentals => base}/mailer/index.ts | 0 .../mailer/mail.service.ts | 0 .../{fundamentals => base}/mailer/mailer.ts | 0 .../{fundamentals => base}/mailer/template.ts | 0 .../{fundamentals => base}/metrics/config.ts | 0 .../{fundamentals => base}/metrics/index.ts | 0 .../{fundamentals => base}/metrics/metrics.ts | 0 .../metrics/opentelemetry.ts | 0 .../{fundamentals => base}/metrics/prisma.ts | 0 .../{fundamentals => base}/metrics/utils.ts | 0 .../src/{fundamentals => base}/mutex/index.ts | 0 .../mutex/local-lock.ts | 0 .../src/{fundamentals => base}/mutex/lock.ts | 0 .../src/{fundamentals => base}/mutex/mutex.ts | 0 .../{fundamentals => base}/nestjs/config.ts | 4 +-- .../nestjs/exception.ts | 0 .../{fundamentals => base}/nestjs/index.ts | 0 .../nestjs/optional-module.ts | 0 .../{fundamentals => base}/prisma/config.ts | 0 .../{fundamentals => base}/prisma/index.ts | 0 .../{fundamentals => base}/prisma/service.ts | 0 .../storage/__tests__/fs.spec.ts | 0 .../{fundamentals => base}/storage/config.ts | 0 .../{fundamentals => base}/storage/index.ts | 0 .../storage/providers/fs.ts | 0 .../storage/providers/index.ts | 0 .../storage/providers/provider.ts | 0 .../storage/providers/utils.ts | 0 .../throttler/config.ts | 0 .../throttler/decorators.ts | 0 .../{fundamentals => base}/throttler/index.ts | 0 .../{fundamentals => base}/utils/promise.ts | 0 .../{fundamentals => base}/utils/request.ts | 0 .../src/{fundamentals => base}/utils/types.ts | 0 .../websocket/config.ts | 0 .../{fundamentals => base}/websocket/index.ts | 0 .../backend/server/src/core/auth/config.ts | 4 +-- .../server/src/core/auth/controller.ts | 2 +- .../backend/server/src/core/auth/guard.ts | 4 +-- .../backend/server/src/core/auth/resolver.ts | 2 +- .../backend/server/src/core/auth/service.ts | 2 +- .../backend/server/src/core/auth/session.ts | 2 +- .../backend/server/src/core/auth/token.ts | 2 +- .../server/src/core/common/admin-guard.ts | 5 +-- .../backend/server/src/core/config/config.ts | 4 +-- .../server/src/core/config/resolver.ts | 2 +- .../backend/server/src/core/config/types.ts | 2 +- .../src/core/doc-renderer/controller.ts | 2 +- .../server/src/core/doc-renderer/service.ts | 2 +- .../server/src/core/doc/adapters/userspace.ts | 2 +- .../server/src/core/doc/adapters/workspace.ts | 4 +-- .../backend/server/src/core/doc/config.ts | 4 +-- packages/backend/server/src/core/doc/job.ts | 2 +- .../backend/server/src/core/doc/options.ts | 2 +- .../server/src/core/doc/storage/doc.ts | 2 +- .../server/src/core/features/feature.ts | 2 +- .../server/src/core/features/management.ts | 2 +- .../server/src/core/features/resolver.ts | 2 +- .../server/src/core/features/service.ts | 2 +- .../server/src/core/permission/service.ts | 2 +- .../backend/server/src/core/quota/quota.ts | 2 +- .../backend/server/src/core/quota/service.ts | 4 +-- .../backend/server/src/core/quota/storage.ts | 2 +- .../server/src/core/selfhost/controller.ts | 2 +- .../server/src/core/selfhost/static.ts | 2 +- .../backend/server/src/core/storage/config.ts | 6 ++-- .../src/core/storage/wrappers/avatar.ts | 4 +-- .../server/src/core/storage/wrappers/blob.ts | 2 +- .../backend/server/src/core/sync/gateway.ts | 2 +- .../server/src/core/user/controller.ts | 2 +- .../backend/server/src/core/user/resolver.ts | 2 +- .../backend/server/src/core/user/service.ts | 2 +- .../backend/server/src/core/user/types.ts | 4 +-- .../server/src/core/utils/validators.ts | 2 +- .../server/src/core/workspaces/controller.ts | 2 +- .../server/src/core/workspaces/management.ts | 2 +- .../src/core/workspaces/resolvers/blob.ts | 4 +-- .../src/core/workspaces/resolvers/page.ts | 2 +- .../src/core/workspaces/resolvers/service.ts | 2 +- .../src/core/workspaces/resolvers/team.ts | 2 +- .../core/workspaces/resolvers/workspace.ts | 4 +-- .../data/migrations/99999-self-host-admin.ts | 2 +- packages/backend/server/src/index.ts | 2 +- .../server/src/plugins/captcha/config.ts | 4 +-- .../server/src/plugins/captcha/controller.ts | 2 +- .../server/src/plugins/captcha/guard.ts | 2 +- .../server/src/plugins/captcha/service.ts | 4 +-- packages/backend/server/src/plugins/config.ts | 4 +-- .../server/src/plugins/copilot/config.ts | 4 +-- .../server/src/plugins/copilot/controller.ts | 4 +-- .../server/src/plugins/copilot/message.ts | 2 +- .../src/plugins/copilot/providers/fal.ts | 2 +- .../src/plugins/copilot/providers/index.ts | 2 +- .../src/plugins/copilot/providers/openai.ts | 2 +- .../server/src/plugins/copilot/resolver.ts | 10 +++--- .../server/src/plugins/copilot/session.ts | 6 ++-- .../server/src/plugins/copilot/storage.ts | 4 +-- .../server/src/plugins/gcloud/config.ts | 2 +- .../server/src/plugins/gcloud/metrics.ts | 4 +-- .../server/src/plugins/oauth/config.ts | 2 +- .../server/src/plugins/oauth/controller.ts | 6 ++-- .../src/plugins/oauth/providers/github.ts | 2 +- .../src/plugins/oauth/providers/google.ts | 2 +- .../src/plugins/oauth/providers/oidc.ts | 2 +- .../server/src/plugins/oauth/register.ts | 2 +- .../server/src/plugins/oauth/service.ts | 2 +- .../server/src/plugins/payment/config.ts | 2 +- .../server/src/plugins/payment/controller.ts | 2 +- .../server/src/plugins/payment/cron.ts | 2 +- .../src/plugins/payment/manager/common.ts | 2 +- .../src/plugins/payment/manager/user.ts | 10 +++--- .../src/plugins/payment/manager/workspace.ts | 2 +- .../server/src/plugins/payment/quota.ts | 2 +- .../server/src/plugins/payment/resolver.ts | 10 +++--- .../server/src/plugins/payment/service.ts | 8 ++--- .../server/src/plugins/payment/stripe.ts | 2 +- .../server/src/plugins/payment/types.ts | 4 +-- .../backend/server/src/plugins/redis/cache.ts | 2 +- .../server/src/plugins/redis/config.ts | 2 +- .../backend/server/src/plugins/redis/index.ts | 6 ++-- .../server/src/plugins/redis/instances.ts | 2 +- .../backend/server/src/plugins/redis/mutex.ts | 2 +- .../server/src/plugins/redis/ws-adapter.ts | 2 +- .../backend/server/src/plugins/registry.ts | 2 +- .../server/src/plugins/storage/config.ts | 4 +-- .../server/src/plugins/storage/index.ts | 2 +- .../src/plugins/storage/providers/s3.ts | 2 +- packages/backend/server/src/prelude.ts | 5 +-- .../backend/server/tests/app/selfhost.e2e.ts | 2 +- .../backend/server/tests/auth/auth.e2e.ts | 2 +- .../server/tests/auth/controller.spec.ts | 2 +- packages/backend/server/tests/cache.spec.ts | 2 +- packages/backend/server/tests/config.spec.ts | 2 +- .../server/tests/copilot-provider.spec.ts | 2 +- packages/backend/server/tests/copilot.e2e.ts | 2 +- packages/backend/server/tests/copilot.spec.ts | 2 +- .../backend/server/tests/doc/cron.spec.ts | 2 +- .../server/tests/doc/workspace.spec.ts | 2 +- packages/backend/server/tests/feature.spec.ts | 2 +- packages/backend/server/tests/mailer.e2e.ts | 2 +- packages/backend/server/tests/mailer.spec.ts | 2 +- .../server/tests/nestjs/error-handler.spec.ts | 4 +-- .../server/tests/nestjs/throttler.spec.ts | 6 ++-- .../server/tests/oauth/controller.spec.ts | 4 +-- .../server/tests/payment/service.spec.ts | 4 +-- packages/backend/server/tests/utils/utils.ts | 4 +-- .../server/tests/workspace-invite.e2e.ts | 2 +- 185 files changed, 183 insertions(+), 193 deletions(-) rename packages/backend/server/src/{fundamentals => base}/cache/def.ts (100%) rename packages/backend/server/src/{fundamentals => base}/cache/index.ts (100%) rename packages/backend/server/src/{fundamentals => base}/cache/instances.ts (100%) rename packages/backend/server/src/{fundamentals => base}/cache/interceptor.ts (100%) rename packages/backend/server/src/{fundamentals => base}/cache/local.ts (100%) rename packages/backend/server/src/{fundamentals => base}/config/def.ts (100%) rename packages/backend/server/src/{fundamentals => base}/config/default.ts (100%) rename packages/backend/server/src/{fundamentals => base}/config/env.ts (100%) rename packages/backend/server/src/{fundamentals => base}/config/index.ts (100%) rename packages/backend/server/src/{fundamentals => base}/config/provider.ts (100%) rename packages/backend/server/src/{fundamentals => base}/config/register.ts (100%) rename packages/backend/server/src/{fundamentals => base}/config/runtime/event.ts (100%) rename packages/backend/server/src/{fundamentals => base}/config/runtime/service.ts (100%) rename packages/backend/server/src/{fundamentals => base}/config/types.ts (100%) rename packages/backend/server/src/{fundamentals => base}/error/def.ts (100%) rename packages/backend/server/src/{fundamentals => base}/error/errors.gen.ts (100%) rename packages/backend/server/src/{fundamentals => base}/error/index.ts (100%) rename packages/backend/server/src/{fundamentals => base}/event/def.ts (100%) rename packages/backend/server/src/{fundamentals => base}/event/index.ts (100%) rename packages/backend/server/src/{fundamentals => base}/event/types.ts (100%) rename packages/backend/server/src/{fundamentals => base}/graphql/config.ts (68%) rename packages/backend/server/src/{fundamentals => base}/graphql/index.ts (100%) rename packages/backend/server/src/{fundamentals => base}/graphql/logger-plugin.ts (100%) rename packages/backend/server/src/{fundamentals => base}/guard/guard.ts (100%) rename packages/backend/server/src/{fundamentals => base}/guard/index.ts (100%) rename packages/backend/server/src/{fundamentals => base}/guard/provider.ts (100%) rename packages/backend/server/src/{fundamentals => base}/helpers/__tests__/crypto.spec.ts (100%) rename packages/backend/server/src/{fundamentals => base}/helpers/__tests__/url.spec.ts (100%) rename packages/backend/server/src/{fundamentals => base}/helpers/config.ts (100%) rename packages/backend/server/src/{fundamentals => base}/helpers/crypto.ts (100%) rename packages/backend/server/src/{fundamentals => base}/helpers/index.ts (100%) rename packages/backend/server/src/{fundamentals => base}/helpers/url.ts (100%) rename packages/backend/server/src/{fundamentals => base}/index.ts (100%) rename packages/backend/server/src/{fundamentals => base}/mailer/config.ts (100%) rename packages/backend/server/src/{fundamentals => base}/mailer/index.ts (100%) rename packages/backend/server/src/{fundamentals => base}/mailer/mail.service.ts (100%) rename packages/backend/server/src/{fundamentals => base}/mailer/mailer.ts (100%) rename packages/backend/server/src/{fundamentals => base}/mailer/template.ts (100%) rename packages/backend/server/src/{fundamentals => base}/metrics/config.ts (100%) rename packages/backend/server/src/{fundamentals => base}/metrics/index.ts (100%) rename packages/backend/server/src/{fundamentals => base}/metrics/metrics.ts (100%) rename packages/backend/server/src/{fundamentals => base}/metrics/opentelemetry.ts (100%) rename packages/backend/server/src/{fundamentals => base}/metrics/prisma.ts (100%) rename packages/backend/server/src/{fundamentals => base}/metrics/utils.ts (100%) rename packages/backend/server/src/{fundamentals => base}/mutex/index.ts (100%) rename packages/backend/server/src/{fundamentals => base}/mutex/local-lock.ts (100%) rename packages/backend/server/src/{fundamentals => base}/mutex/lock.ts (100%) rename packages/backend/server/src/{fundamentals => base}/mutex/mutex.ts (100%) rename packages/backend/server/src/{fundamentals => base}/nestjs/config.ts (86%) rename packages/backend/server/src/{fundamentals => base}/nestjs/exception.ts (100%) rename packages/backend/server/src/{fundamentals => base}/nestjs/index.ts (100%) rename packages/backend/server/src/{fundamentals => base}/nestjs/optional-module.ts (100%) rename packages/backend/server/src/{fundamentals => base}/prisma/config.ts (100%) rename packages/backend/server/src/{fundamentals => base}/prisma/index.ts (100%) rename packages/backend/server/src/{fundamentals => base}/prisma/service.ts (100%) rename packages/backend/server/src/{fundamentals => base}/storage/__tests__/fs.spec.ts (100%) rename packages/backend/server/src/{fundamentals => base}/storage/config.ts (100%) rename packages/backend/server/src/{fundamentals => base}/storage/index.ts (100%) rename packages/backend/server/src/{fundamentals => base}/storage/providers/fs.ts (100%) rename packages/backend/server/src/{fundamentals => base}/storage/providers/index.ts (100%) rename packages/backend/server/src/{fundamentals => base}/storage/providers/provider.ts (100%) rename packages/backend/server/src/{fundamentals => base}/storage/providers/utils.ts (100%) rename packages/backend/server/src/{fundamentals => base}/throttler/config.ts (100%) rename packages/backend/server/src/{fundamentals => base}/throttler/decorators.ts (100%) rename packages/backend/server/src/{fundamentals => base}/throttler/index.ts (100%) rename packages/backend/server/src/{fundamentals => base}/utils/promise.ts (100%) rename packages/backend/server/src/{fundamentals => base}/utils/request.ts (100%) rename packages/backend/server/src/{fundamentals => base}/utils/types.ts (100%) rename packages/backend/server/src/{fundamentals => base}/websocket/config.ts (100%) rename packages/backend/server/src/{fundamentals => base}/websocket/index.ts (100%) diff --git a/.prettierignore b/.prettierignore index ccc0556999..56155271f2 100644 --- a/.prettierignore +++ b/.prettierignore @@ -12,7 +12,7 @@ storybook-static web-static public packages/backend/server/src/schema.gql -packages/backend/server/src/fundamentals/error/errors.gen.ts +packages/backend/server/src/base/error/errors.gen.ts packages/frontend/i18n/src/i18n-generated.ts packages/frontend/i18n/src/i18n-completenesses.json packages/frontend/graphql/src/graphql/index.ts diff --git a/packages/backend/server/src/app.controller.ts b/packages/backend/server/src/app.controller.ts index a0964b4fae..99f5a4990a 100644 --- a/packages/backend/server/src/app.controller.ts +++ b/packages/backend/server/src/app.controller.ts @@ -1,7 +1,7 @@ import { Controller, Get } from '@nestjs/common'; +import { Config, SkipThrottle } from './base'; import { Public } from './core/auth'; -import { Config, SkipThrottle } from './fundamentals'; @Controller('/info') export class AppController { diff --git a/packages/backend/server/src/app.module.ts b/packages/backend/server/src/app.module.ts index b9e8bf28e9..497d5d79ea 100644 --- a/packages/backend/server/src/app.module.ts +++ b/packages/backend/server/src/app.module.ts @@ -8,6 +8,20 @@ import { ScheduleModule } from '@nestjs/schedule'; import { get } from 'lodash-es'; import { AppController } from './app.controller'; +import { getOptionalModuleMetadata } from './base'; +import { CacheModule } from './base/cache'; +import { AFFiNEConfig, ConfigModule, mergeConfigOverride } from './base/config'; +import { ErrorModule } from './base/error'; +import { EventModule } from './base/event'; +import { GqlModule } from './base/graphql'; +import { HelpersModule } from './base/helpers'; +import { MailModule } from './base/mailer'; +import { MetricsModule } from './base/metrics'; +import { MutexModule } from './base/mutex'; +import { PrismaModule } from './base/prisma'; +import { StorageProviderModule } from './base/storage'; +import { RateLimiterModule } from './base/throttler'; +import { WebSocketModule } from './base/websocket'; import { AuthModule } from './core/auth'; import { ADD_ENABLED_FEATURES, ServerConfigModule } from './core/config'; import { DocStorageModule } from './core/doc'; @@ -20,24 +34,6 @@ import { StorageModule } from './core/storage'; import { SyncModule } from './core/sync'; import { UserModule } from './core/user'; import { WorkspaceModule } from './core/workspaces'; -import { getOptionalModuleMetadata } from './fundamentals'; -import { CacheModule } from './fundamentals/cache'; -import { - AFFiNEConfig, - ConfigModule, - mergeConfigOverride, -} from './fundamentals/config'; -import { ErrorModule } from './fundamentals/error'; -import { EventModule } from './fundamentals/event'; -import { GqlModule } from './fundamentals/graphql'; -import { HelpersModule } from './fundamentals/helpers'; -import { MailModule } from './fundamentals/mailer'; -import { MetricsModule } from './fundamentals/metrics'; -import { MutexModule } from './fundamentals/mutex'; -import { PrismaModule } from './fundamentals/prisma'; -import { StorageProviderModule } from './fundamentals/storage'; -import { RateLimiterModule } from './fundamentals/throttler'; -import { WebSocketModule } from './fundamentals/websocket'; import { REGISTERED_PLUGINS } from './plugins'; import { ENABLED_PLUGINS } from './plugins/registry'; diff --git a/packages/backend/server/src/app.ts b/packages/backend/server/src/app.ts index 28fc0da701..f6941f9a80 100644 --- a/packages/backend/server/src/app.ts +++ b/packages/backend/server/src/app.ts @@ -4,14 +4,14 @@ import type { NestExpressApplication } from '@nestjs/platform-express'; import cookieParser from 'cookie-parser'; import graphqlUploadExpress from 'graphql-upload/graphqlUploadExpress.mjs'; -import { AuthGuard } from './core/auth'; -import { ENABLED_FEATURES } from './core/config/server-feature'; import { CacheInterceptor, CloudThrottlerGuard, GlobalExceptionFilter, -} from './fundamentals'; -import { SocketIoAdapter, SocketIoAdapterImpl } from './fundamentals/websocket'; +} from './base'; +import { SocketIoAdapter, SocketIoAdapterImpl } from './base/websocket'; +import { AuthGuard } from './core/auth'; +import { ENABLED_FEATURES } from './core/config/server-feature'; import { serverTimingAndCache } from './middleware/timing'; export async function createApp() { diff --git a/packages/backend/server/src/fundamentals/cache/def.ts b/packages/backend/server/src/base/cache/def.ts similarity index 100% rename from packages/backend/server/src/fundamentals/cache/def.ts rename to packages/backend/server/src/base/cache/def.ts diff --git a/packages/backend/server/src/fundamentals/cache/index.ts b/packages/backend/server/src/base/cache/index.ts similarity index 100% rename from packages/backend/server/src/fundamentals/cache/index.ts rename to packages/backend/server/src/base/cache/index.ts diff --git a/packages/backend/server/src/fundamentals/cache/instances.ts b/packages/backend/server/src/base/cache/instances.ts similarity index 100% rename from packages/backend/server/src/fundamentals/cache/instances.ts rename to packages/backend/server/src/base/cache/instances.ts diff --git a/packages/backend/server/src/fundamentals/cache/interceptor.ts b/packages/backend/server/src/base/cache/interceptor.ts similarity index 100% rename from packages/backend/server/src/fundamentals/cache/interceptor.ts rename to packages/backend/server/src/base/cache/interceptor.ts diff --git a/packages/backend/server/src/fundamentals/cache/local.ts b/packages/backend/server/src/base/cache/local.ts similarity index 100% rename from packages/backend/server/src/fundamentals/cache/local.ts rename to packages/backend/server/src/base/cache/local.ts diff --git a/packages/backend/server/src/fundamentals/config/def.ts b/packages/backend/server/src/base/config/def.ts similarity index 100% rename from packages/backend/server/src/fundamentals/config/def.ts rename to packages/backend/server/src/base/config/def.ts diff --git a/packages/backend/server/src/fundamentals/config/default.ts b/packages/backend/server/src/base/config/default.ts similarity index 100% rename from packages/backend/server/src/fundamentals/config/default.ts rename to packages/backend/server/src/base/config/default.ts diff --git a/packages/backend/server/src/fundamentals/config/env.ts b/packages/backend/server/src/base/config/env.ts similarity index 100% rename from packages/backend/server/src/fundamentals/config/env.ts rename to packages/backend/server/src/base/config/env.ts diff --git a/packages/backend/server/src/fundamentals/config/index.ts b/packages/backend/server/src/base/config/index.ts similarity index 100% rename from packages/backend/server/src/fundamentals/config/index.ts rename to packages/backend/server/src/base/config/index.ts diff --git a/packages/backend/server/src/fundamentals/config/provider.ts b/packages/backend/server/src/base/config/provider.ts similarity index 100% rename from packages/backend/server/src/fundamentals/config/provider.ts rename to packages/backend/server/src/base/config/provider.ts diff --git a/packages/backend/server/src/fundamentals/config/register.ts b/packages/backend/server/src/base/config/register.ts similarity index 100% rename from packages/backend/server/src/fundamentals/config/register.ts rename to packages/backend/server/src/base/config/register.ts diff --git a/packages/backend/server/src/fundamentals/config/runtime/event.ts b/packages/backend/server/src/base/config/runtime/event.ts similarity index 100% rename from packages/backend/server/src/fundamentals/config/runtime/event.ts rename to packages/backend/server/src/base/config/runtime/event.ts diff --git a/packages/backend/server/src/fundamentals/config/runtime/service.ts b/packages/backend/server/src/base/config/runtime/service.ts similarity index 100% rename from packages/backend/server/src/fundamentals/config/runtime/service.ts rename to packages/backend/server/src/base/config/runtime/service.ts diff --git a/packages/backend/server/src/fundamentals/config/types.ts b/packages/backend/server/src/base/config/types.ts similarity index 100% rename from packages/backend/server/src/fundamentals/config/types.ts rename to packages/backend/server/src/base/config/types.ts diff --git a/packages/backend/server/src/fundamentals/error/def.ts b/packages/backend/server/src/base/error/def.ts similarity index 100% rename from packages/backend/server/src/fundamentals/error/def.ts rename to packages/backend/server/src/base/error/def.ts diff --git a/packages/backend/server/src/fundamentals/error/errors.gen.ts b/packages/backend/server/src/base/error/errors.gen.ts similarity index 100% rename from packages/backend/server/src/fundamentals/error/errors.gen.ts rename to packages/backend/server/src/base/error/errors.gen.ts diff --git a/packages/backend/server/src/fundamentals/error/index.ts b/packages/backend/server/src/base/error/index.ts similarity index 100% rename from packages/backend/server/src/fundamentals/error/index.ts rename to packages/backend/server/src/base/error/index.ts diff --git a/packages/backend/server/src/fundamentals/event/def.ts b/packages/backend/server/src/base/event/def.ts similarity index 100% rename from packages/backend/server/src/fundamentals/event/def.ts rename to packages/backend/server/src/base/event/def.ts diff --git a/packages/backend/server/src/fundamentals/event/index.ts b/packages/backend/server/src/base/event/index.ts similarity index 100% rename from packages/backend/server/src/fundamentals/event/index.ts rename to packages/backend/server/src/base/event/index.ts diff --git a/packages/backend/server/src/fundamentals/event/types.ts b/packages/backend/server/src/base/event/types.ts similarity index 100% rename from packages/backend/server/src/fundamentals/event/types.ts rename to packages/backend/server/src/base/event/types.ts diff --git a/packages/backend/server/src/fundamentals/graphql/config.ts b/packages/backend/server/src/base/graphql/config.ts similarity index 68% rename from packages/backend/server/src/fundamentals/graphql/config.ts rename to packages/backend/server/src/base/graphql/config.ts index 7985e29eed..8dc156b178 100644 --- a/packages/backend/server/src/fundamentals/graphql/config.ts +++ b/packages/backend/server/src/base/graphql/config.ts @@ -1,8 +1,8 @@ import { ApolloDriverConfig } from '@nestjs/apollo'; -import { defineStartupConfig, ModuleConfig } from '../../fundamentals/config'; +import { defineStartupConfig, ModuleConfig } from '../../base/config'; -declare module '../../fundamentals/config' { +declare module '../../base/config' { interface AppConfig { graphql: ModuleConfig; } diff --git a/packages/backend/server/src/fundamentals/graphql/index.ts b/packages/backend/server/src/base/graphql/index.ts similarity index 100% rename from packages/backend/server/src/fundamentals/graphql/index.ts rename to packages/backend/server/src/base/graphql/index.ts diff --git a/packages/backend/server/src/fundamentals/graphql/logger-plugin.ts b/packages/backend/server/src/base/graphql/logger-plugin.ts similarity index 100% rename from packages/backend/server/src/fundamentals/graphql/logger-plugin.ts rename to packages/backend/server/src/base/graphql/logger-plugin.ts diff --git a/packages/backend/server/src/fundamentals/guard/guard.ts b/packages/backend/server/src/base/guard/guard.ts similarity index 100% rename from packages/backend/server/src/fundamentals/guard/guard.ts rename to packages/backend/server/src/base/guard/guard.ts diff --git a/packages/backend/server/src/fundamentals/guard/index.ts b/packages/backend/server/src/base/guard/index.ts similarity index 100% rename from packages/backend/server/src/fundamentals/guard/index.ts rename to packages/backend/server/src/base/guard/index.ts diff --git a/packages/backend/server/src/fundamentals/guard/provider.ts b/packages/backend/server/src/base/guard/provider.ts similarity index 100% rename from packages/backend/server/src/fundamentals/guard/provider.ts rename to packages/backend/server/src/base/guard/provider.ts diff --git a/packages/backend/server/src/fundamentals/helpers/__tests__/crypto.spec.ts b/packages/backend/server/src/base/helpers/__tests__/crypto.spec.ts similarity index 100% rename from packages/backend/server/src/fundamentals/helpers/__tests__/crypto.spec.ts rename to packages/backend/server/src/base/helpers/__tests__/crypto.spec.ts diff --git a/packages/backend/server/src/fundamentals/helpers/__tests__/url.spec.ts b/packages/backend/server/src/base/helpers/__tests__/url.spec.ts similarity index 100% rename from packages/backend/server/src/fundamentals/helpers/__tests__/url.spec.ts rename to packages/backend/server/src/base/helpers/__tests__/url.spec.ts diff --git a/packages/backend/server/src/fundamentals/helpers/config.ts b/packages/backend/server/src/base/helpers/config.ts similarity index 100% rename from packages/backend/server/src/fundamentals/helpers/config.ts rename to packages/backend/server/src/base/helpers/config.ts diff --git a/packages/backend/server/src/fundamentals/helpers/crypto.ts b/packages/backend/server/src/base/helpers/crypto.ts similarity index 100% rename from packages/backend/server/src/fundamentals/helpers/crypto.ts rename to packages/backend/server/src/base/helpers/crypto.ts diff --git a/packages/backend/server/src/fundamentals/helpers/index.ts b/packages/backend/server/src/base/helpers/index.ts similarity index 100% rename from packages/backend/server/src/fundamentals/helpers/index.ts rename to packages/backend/server/src/base/helpers/index.ts diff --git a/packages/backend/server/src/fundamentals/helpers/url.ts b/packages/backend/server/src/base/helpers/url.ts similarity index 100% rename from packages/backend/server/src/fundamentals/helpers/url.ts rename to packages/backend/server/src/base/helpers/url.ts diff --git a/packages/backend/server/src/fundamentals/index.ts b/packages/backend/server/src/base/index.ts similarity index 100% rename from packages/backend/server/src/fundamentals/index.ts rename to packages/backend/server/src/base/index.ts diff --git a/packages/backend/server/src/fundamentals/mailer/config.ts b/packages/backend/server/src/base/mailer/config.ts similarity index 100% rename from packages/backend/server/src/fundamentals/mailer/config.ts rename to packages/backend/server/src/base/mailer/config.ts diff --git a/packages/backend/server/src/fundamentals/mailer/index.ts b/packages/backend/server/src/base/mailer/index.ts similarity index 100% rename from packages/backend/server/src/fundamentals/mailer/index.ts rename to packages/backend/server/src/base/mailer/index.ts diff --git a/packages/backend/server/src/fundamentals/mailer/mail.service.ts b/packages/backend/server/src/base/mailer/mail.service.ts similarity index 100% rename from packages/backend/server/src/fundamentals/mailer/mail.service.ts rename to packages/backend/server/src/base/mailer/mail.service.ts diff --git a/packages/backend/server/src/fundamentals/mailer/mailer.ts b/packages/backend/server/src/base/mailer/mailer.ts similarity index 100% rename from packages/backend/server/src/fundamentals/mailer/mailer.ts rename to packages/backend/server/src/base/mailer/mailer.ts diff --git a/packages/backend/server/src/fundamentals/mailer/template.ts b/packages/backend/server/src/base/mailer/template.ts similarity index 100% rename from packages/backend/server/src/fundamentals/mailer/template.ts rename to packages/backend/server/src/base/mailer/template.ts diff --git a/packages/backend/server/src/fundamentals/metrics/config.ts b/packages/backend/server/src/base/metrics/config.ts similarity index 100% rename from packages/backend/server/src/fundamentals/metrics/config.ts rename to packages/backend/server/src/base/metrics/config.ts diff --git a/packages/backend/server/src/fundamentals/metrics/index.ts b/packages/backend/server/src/base/metrics/index.ts similarity index 100% rename from packages/backend/server/src/fundamentals/metrics/index.ts rename to packages/backend/server/src/base/metrics/index.ts diff --git a/packages/backend/server/src/fundamentals/metrics/metrics.ts b/packages/backend/server/src/base/metrics/metrics.ts similarity index 100% rename from packages/backend/server/src/fundamentals/metrics/metrics.ts rename to packages/backend/server/src/base/metrics/metrics.ts diff --git a/packages/backend/server/src/fundamentals/metrics/opentelemetry.ts b/packages/backend/server/src/base/metrics/opentelemetry.ts similarity index 100% rename from packages/backend/server/src/fundamentals/metrics/opentelemetry.ts rename to packages/backend/server/src/base/metrics/opentelemetry.ts diff --git a/packages/backend/server/src/fundamentals/metrics/prisma.ts b/packages/backend/server/src/base/metrics/prisma.ts similarity index 100% rename from packages/backend/server/src/fundamentals/metrics/prisma.ts rename to packages/backend/server/src/base/metrics/prisma.ts diff --git a/packages/backend/server/src/fundamentals/metrics/utils.ts b/packages/backend/server/src/base/metrics/utils.ts similarity index 100% rename from packages/backend/server/src/fundamentals/metrics/utils.ts rename to packages/backend/server/src/base/metrics/utils.ts diff --git a/packages/backend/server/src/fundamentals/mutex/index.ts b/packages/backend/server/src/base/mutex/index.ts similarity index 100% rename from packages/backend/server/src/fundamentals/mutex/index.ts rename to packages/backend/server/src/base/mutex/index.ts diff --git a/packages/backend/server/src/fundamentals/mutex/local-lock.ts b/packages/backend/server/src/base/mutex/local-lock.ts similarity index 100% rename from packages/backend/server/src/fundamentals/mutex/local-lock.ts rename to packages/backend/server/src/base/mutex/local-lock.ts diff --git a/packages/backend/server/src/fundamentals/mutex/lock.ts b/packages/backend/server/src/base/mutex/lock.ts similarity index 100% rename from packages/backend/server/src/fundamentals/mutex/lock.ts rename to packages/backend/server/src/base/mutex/lock.ts diff --git a/packages/backend/server/src/fundamentals/mutex/mutex.ts b/packages/backend/server/src/base/mutex/mutex.ts similarity index 100% rename from packages/backend/server/src/fundamentals/mutex/mutex.ts rename to packages/backend/server/src/base/mutex/mutex.ts diff --git a/packages/backend/server/src/fundamentals/nestjs/config.ts b/packages/backend/server/src/base/nestjs/config.ts similarity index 86% rename from packages/backend/server/src/fundamentals/nestjs/config.ts rename to packages/backend/server/src/base/nestjs/config.ts index 46dcb45468..46d867e9cb 100644 --- a/packages/backend/server/src/fundamentals/nestjs/config.ts +++ b/packages/backend/server/src/base/nestjs/config.ts @@ -1,4 +1,4 @@ -import { defineStartupConfig, ModuleConfig } from '../../fundamentals/config'; +import { defineStartupConfig, ModuleConfig } from '../../base/config'; export interface ServerStartupConfigurations { /** @@ -24,7 +24,7 @@ export interface ServerStartupConfigurations { path: string; } -declare module '../../fundamentals/config' { +declare module '../../base/config' { interface AppConfig { server: ModuleConfig; } diff --git a/packages/backend/server/src/fundamentals/nestjs/exception.ts b/packages/backend/server/src/base/nestjs/exception.ts similarity index 100% rename from packages/backend/server/src/fundamentals/nestjs/exception.ts rename to packages/backend/server/src/base/nestjs/exception.ts diff --git a/packages/backend/server/src/fundamentals/nestjs/index.ts b/packages/backend/server/src/base/nestjs/index.ts similarity index 100% rename from packages/backend/server/src/fundamentals/nestjs/index.ts rename to packages/backend/server/src/base/nestjs/index.ts diff --git a/packages/backend/server/src/fundamentals/nestjs/optional-module.ts b/packages/backend/server/src/base/nestjs/optional-module.ts similarity index 100% rename from packages/backend/server/src/fundamentals/nestjs/optional-module.ts rename to packages/backend/server/src/base/nestjs/optional-module.ts diff --git a/packages/backend/server/src/fundamentals/prisma/config.ts b/packages/backend/server/src/base/prisma/config.ts similarity index 100% rename from packages/backend/server/src/fundamentals/prisma/config.ts rename to packages/backend/server/src/base/prisma/config.ts diff --git a/packages/backend/server/src/fundamentals/prisma/index.ts b/packages/backend/server/src/base/prisma/index.ts similarity index 100% rename from packages/backend/server/src/fundamentals/prisma/index.ts rename to packages/backend/server/src/base/prisma/index.ts diff --git a/packages/backend/server/src/fundamentals/prisma/service.ts b/packages/backend/server/src/base/prisma/service.ts similarity index 100% rename from packages/backend/server/src/fundamentals/prisma/service.ts rename to packages/backend/server/src/base/prisma/service.ts diff --git a/packages/backend/server/src/fundamentals/storage/__tests__/fs.spec.ts b/packages/backend/server/src/base/storage/__tests__/fs.spec.ts similarity index 100% rename from packages/backend/server/src/fundamentals/storage/__tests__/fs.spec.ts rename to packages/backend/server/src/base/storage/__tests__/fs.spec.ts diff --git a/packages/backend/server/src/fundamentals/storage/config.ts b/packages/backend/server/src/base/storage/config.ts similarity index 100% rename from packages/backend/server/src/fundamentals/storage/config.ts rename to packages/backend/server/src/base/storage/config.ts diff --git a/packages/backend/server/src/fundamentals/storage/index.ts b/packages/backend/server/src/base/storage/index.ts similarity index 100% rename from packages/backend/server/src/fundamentals/storage/index.ts rename to packages/backend/server/src/base/storage/index.ts diff --git a/packages/backend/server/src/fundamentals/storage/providers/fs.ts b/packages/backend/server/src/base/storage/providers/fs.ts similarity index 100% rename from packages/backend/server/src/fundamentals/storage/providers/fs.ts rename to packages/backend/server/src/base/storage/providers/fs.ts diff --git a/packages/backend/server/src/fundamentals/storage/providers/index.ts b/packages/backend/server/src/base/storage/providers/index.ts similarity index 100% rename from packages/backend/server/src/fundamentals/storage/providers/index.ts rename to packages/backend/server/src/base/storage/providers/index.ts diff --git a/packages/backend/server/src/fundamentals/storage/providers/provider.ts b/packages/backend/server/src/base/storage/providers/provider.ts similarity index 100% rename from packages/backend/server/src/fundamentals/storage/providers/provider.ts rename to packages/backend/server/src/base/storage/providers/provider.ts diff --git a/packages/backend/server/src/fundamentals/storage/providers/utils.ts b/packages/backend/server/src/base/storage/providers/utils.ts similarity index 100% rename from packages/backend/server/src/fundamentals/storage/providers/utils.ts rename to packages/backend/server/src/base/storage/providers/utils.ts diff --git a/packages/backend/server/src/fundamentals/throttler/config.ts b/packages/backend/server/src/base/throttler/config.ts similarity index 100% rename from packages/backend/server/src/fundamentals/throttler/config.ts rename to packages/backend/server/src/base/throttler/config.ts diff --git a/packages/backend/server/src/fundamentals/throttler/decorators.ts b/packages/backend/server/src/base/throttler/decorators.ts similarity index 100% rename from packages/backend/server/src/fundamentals/throttler/decorators.ts rename to packages/backend/server/src/base/throttler/decorators.ts diff --git a/packages/backend/server/src/fundamentals/throttler/index.ts b/packages/backend/server/src/base/throttler/index.ts similarity index 100% rename from packages/backend/server/src/fundamentals/throttler/index.ts rename to packages/backend/server/src/base/throttler/index.ts diff --git a/packages/backend/server/src/fundamentals/utils/promise.ts b/packages/backend/server/src/base/utils/promise.ts similarity index 100% rename from packages/backend/server/src/fundamentals/utils/promise.ts rename to packages/backend/server/src/base/utils/promise.ts diff --git a/packages/backend/server/src/fundamentals/utils/request.ts b/packages/backend/server/src/base/utils/request.ts similarity index 100% rename from packages/backend/server/src/fundamentals/utils/request.ts rename to packages/backend/server/src/base/utils/request.ts diff --git a/packages/backend/server/src/fundamentals/utils/types.ts b/packages/backend/server/src/base/utils/types.ts similarity index 100% rename from packages/backend/server/src/fundamentals/utils/types.ts rename to packages/backend/server/src/base/utils/types.ts diff --git a/packages/backend/server/src/fundamentals/websocket/config.ts b/packages/backend/server/src/base/websocket/config.ts similarity index 100% rename from packages/backend/server/src/fundamentals/websocket/config.ts rename to packages/backend/server/src/base/websocket/config.ts diff --git a/packages/backend/server/src/fundamentals/websocket/index.ts b/packages/backend/server/src/base/websocket/index.ts similarity index 100% rename from packages/backend/server/src/fundamentals/websocket/index.ts rename to packages/backend/server/src/base/websocket/index.ts diff --git a/packages/backend/server/src/core/auth/config.ts b/packages/backend/server/src/core/auth/config.ts index 780c0f97be..fbe4c45a54 100644 --- a/packages/backend/server/src/core/auth/config.ts +++ b/packages/backend/server/src/core/auth/config.ts @@ -2,7 +2,7 @@ import { defineRuntimeConfig, defineStartupConfig, ModuleConfig, -} from '../../fundamentals/config'; +} from '../../base/config'; export interface AuthStartupConfigurations { /** @@ -59,7 +59,7 @@ export interface AuthRuntimeConfigurations { }; } -declare module '../../fundamentals/config' { +declare module '../../base/config' { interface AppConfig { auth: ModuleConfig; } diff --git a/packages/backend/server/src/core/auth/controller.ts b/packages/backend/server/src/core/auth/controller.ts index b244148634..22001ce2e4 100644 --- a/packages/backend/server/src/core/auth/controller.ts +++ b/packages/backend/server/src/core/auth/controller.ts @@ -24,7 +24,7 @@ import { Throttle, URLHelper, UseNamedGuard, -} from '../../fundamentals'; +} from '../../base'; import { UserService } from '../user'; import { validators } from '../utils/validators'; import { Public } from './guard'; diff --git a/packages/backend/server/src/core/auth/guard.ts b/packages/backend/server/src/core/auth/guard.ts index 7eed13864d..eba48a0ffd 100644 --- a/packages/backend/server/src/core/auth/guard.ts +++ b/packages/backend/server/src/core/auth/guard.ts @@ -14,8 +14,8 @@ import { Config, getRequestResponseFromContext, parseCookies, -} from '../../fundamentals'; -import { WEBSOCKET_OPTIONS } from '../../fundamentals/websocket'; +} from '../../base'; +import { WEBSOCKET_OPTIONS } from '../../base/websocket'; import { AuthService } from './service'; import { Session } from './session'; diff --git a/packages/backend/server/src/core/auth/resolver.ts b/packages/backend/server/src/core/auth/resolver.ts index bb3f4640f4..37e9b912f4 100644 --- a/packages/backend/server/src/core/auth/resolver.ts +++ b/packages/backend/server/src/core/auth/resolver.ts @@ -20,7 +20,7 @@ import { SkipThrottle, Throttle, URLHelper, -} from '../../fundamentals'; +} from '../../base'; import { Admin } from '../common'; import { UserService } from '../user'; import { UserType } from '../user/types'; diff --git a/packages/backend/server/src/core/auth/service.ts b/packages/backend/server/src/core/auth/service.ts index deedb43363..f0bec9e2f8 100644 --- a/packages/backend/server/src/core/auth/service.ts +++ b/packages/backend/server/src/core/auth/service.ts @@ -5,7 +5,7 @@ import { PrismaClient } from '@prisma/client'; import type { CookieOptions, Request, Response } from 'express'; import { assign, pick } from 'lodash-es'; -import { Config, MailService, SignUpForbidden } from '../../fundamentals'; +import { Config, MailService, SignUpForbidden } from '../../base'; import { FeatureManagementService } from '../features/management'; import { QuotaService } from '../quota/service'; import { QuotaType } from '../quota/types'; diff --git a/packages/backend/server/src/core/auth/session.ts b/packages/backend/server/src/core/auth/session.ts index 2c7f778e08..3707d5aaab 100644 --- a/packages/backend/server/src/core/auth/session.ts +++ b/packages/backend/server/src/core/auth/session.ts @@ -2,7 +2,7 @@ import type { ExecutionContext } from '@nestjs/common'; import { createParamDecorator } from '@nestjs/common'; import { User, UserSession } from '@prisma/client'; -import { getRequestResponseFromContext } from '../../fundamentals'; +import { getRequestResponseFromContext } from '../../base'; /** * Used to fetch current user from the request context. diff --git a/packages/backend/server/src/core/auth/token.ts b/packages/backend/server/src/core/auth/token.ts index 4234c1c01c..3ee5a2a412 100644 --- a/packages/backend/server/src/core/auth/token.ts +++ b/packages/backend/server/src/core/auth/token.ts @@ -4,7 +4,7 @@ import { Injectable } from '@nestjs/common'; import { Cron, CronExpression } from '@nestjs/schedule'; import { PrismaClient } from '@prisma/client'; -import { CryptoHelper } from '../../fundamentals/helpers'; +import { CryptoHelper } from '../../base/helpers'; export enum TokenType { SignIn, diff --git a/packages/backend/server/src/core/common/admin-guard.ts b/packages/backend/server/src/core/common/admin-guard.ts index 40949b2d2a..062716f48d 100644 --- a/packages/backend/server/src/core/common/admin-guard.ts +++ b/packages/backend/server/src/core/common/admin-guard.ts @@ -6,10 +6,7 @@ import type { import { Injectable, UseGuards } from '@nestjs/common'; import { ModuleRef } from '@nestjs/core'; -import { - ActionForbidden, - getRequestResponseFromContext, -} from '../../fundamentals'; +import { ActionForbidden, getRequestResponseFromContext } from '../../base'; import { FeatureManagementService } from '../features/management'; @Injectable() diff --git a/packages/backend/server/src/core/config/config.ts b/packages/backend/server/src/core/config/config.ts index 8a0ba60102..aa3b2bb4c2 100644 --- a/packages/backend/server/src/core/config/config.ts +++ b/packages/backend/server/src/core/config/config.ts @@ -1,11 +1,11 @@ -import { defineRuntimeConfig, ModuleConfig } from '../../fundamentals/config'; +import { defineRuntimeConfig, ModuleConfig } from '../../base/config'; export interface ServerFlags { earlyAccessControl: boolean; syncClientVersionCheck: boolean; } -declare module '../../fundamentals/config' { +declare module '../../base/config' { interface AppConfig { flags: ModuleConfig; } diff --git a/packages/backend/server/src/core/config/resolver.ts b/packages/backend/server/src/core/config/resolver.ts index 6fab16b312..b68ce00471 100644 --- a/packages/backend/server/src/core/config/resolver.ts +++ b/packages/backend/server/src/core/config/resolver.ts @@ -12,7 +12,7 @@ import { import { RuntimeConfig, RuntimeConfigType } from '@prisma/client'; import { GraphQLJSON, GraphQLJSONObject } from 'graphql-scalars'; -import { Config, URLHelper } from '../../fundamentals'; +import { Config, URLHelper } from '../../base'; import { Public } from '../auth'; import { Admin } from '../common'; import { FeatureType } from '../features'; diff --git a/packages/backend/server/src/core/config/types.ts b/packages/backend/server/src/core/config/types.ts index 5af8bfef12..8e120ebe6b 100644 --- a/packages/backend/server/src/core/config/types.ts +++ b/packages/backend/server/src/core/config/types.ts @@ -1,6 +1,6 @@ import { Field, ObjectType, registerEnumType } from '@nestjs/graphql'; -import { DeploymentType } from '../../fundamentals'; +import { DeploymentType } from '../../base'; export enum ServerFeature { Captcha = 'captcha', diff --git a/packages/backend/server/src/core/doc-renderer/controller.ts b/packages/backend/server/src/core/doc-renderer/controller.ts index e0ef91c924..76998f9515 100644 --- a/packages/backend/server/src/core/doc-renderer/controller.ts +++ b/packages/backend/server/src/core/doc-renderer/controller.ts @@ -5,7 +5,7 @@ import { Controller, Get, Logger, Req, Res } from '@nestjs/common'; import type { Request, Response } from 'express'; import isMobile from 'is-mobile'; -import { Config, metrics, URLHelper } from '../../fundamentals'; +import { Config, metrics, URLHelper } from '../../base'; import { htmlSanitize } from '../../native'; import { Public } from '../auth'; import { PermissionService } from '../permission'; diff --git a/packages/backend/server/src/core/doc-renderer/service.ts b/packages/backend/server/src/core/doc-renderer/service.ts index 30946ca616..bac7da524f 100644 --- a/packages/backend/server/src/core/doc-renderer/service.ts +++ b/packages/backend/server/src/core/doc-renderer/service.ts @@ -1,7 +1,7 @@ import { Injectable } from '@nestjs/common'; import { applyUpdate, Doc } from 'yjs'; -import { Cache, type EventPayload, OnEvent } from '../../fundamentals'; +import { Cache, type EventPayload, OnEvent } from '../../base'; import { PgWorkspaceDocStorageAdapter } from '../doc'; import { type PageDocContent, diff --git a/packages/backend/server/src/core/doc/adapters/userspace.ts b/packages/backend/server/src/core/doc/adapters/userspace.ts index 99b9289e25..4b169a61a1 100644 --- a/packages/backend/server/src/core/doc/adapters/userspace.ts +++ b/packages/backend/server/src/core/doc/adapters/userspace.ts @@ -1,7 +1,7 @@ import { Injectable } from '@nestjs/common'; import { PrismaClient } from '@prisma/client'; -import { Mutex } from '../../../fundamentals'; +import { Mutex } from '../../../base'; import { DocStorageOptions } from '../options'; import { DocRecord, DocStorageAdapter } from '../storage'; diff --git a/packages/backend/server/src/core/doc/adapters/workspace.ts b/packages/backend/server/src/core/doc/adapters/workspace.ts index 23976c7f04..0f9b8cfa7d 100644 --- a/packages/backend/server/src/core/doc/adapters/workspace.ts +++ b/packages/backend/server/src/core/doc/adapters/workspace.ts @@ -11,8 +11,8 @@ import { FailedToUpsertSnapshot, metrics, Mutex, -} from '../../../fundamentals'; -import { retryable } from '../../../fundamentals/utils/promise'; +} from '../../../base'; +import { retryable } from '../../../base/utils/promise'; import { DocStorageOptions } from '../options'; import { DocRecord, diff --git a/packages/backend/server/src/core/doc/config.ts b/packages/backend/server/src/core/doc/config.ts index 64c9a58dfe..302c35eed1 100644 --- a/packages/backend/server/src/core/doc/config.ts +++ b/packages/backend/server/src/core/doc/config.ts @@ -2,7 +2,7 @@ import { defineRuntimeConfig, defineStartupConfig, ModuleConfig, -} from '../../fundamentals/config'; +} from '../../base/config'; interface DocStartupConfigurations { manager: { @@ -46,7 +46,7 @@ interface DocRuntimeConfigurations { experimentalMergeWithYOcto: boolean; } -declare module '../../fundamentals/config' { +declare module '../../base/config' { interface AppConfig { doc: ModuleConfig; } diff --git a/packages/backend/server/src/core/doc/job.ts b/packages/backend/server/src/core/doc/job.ts index 33413d1499..c1e6052b41 100644 --- a/packages/backend/server/src/core/doc/job.ts +++ b/packages/backend/server/src/core/doc/job.ts @@ -8,7 +8,7 @@ import { type EventPayload, metrics, OnEvent, -} from '../../fundamentals'; +} from '../../base'; import { PgWorkspaceDocStorageAdapter } from './adapters/workspace'; @Injectable() diff --git a/packages/backend/server/src/core/doc/options.ts b/packages/backend/server/src/core/doc/options.ts index 46523af9a4..c24322156d 100644 --- a/packages/backend/server/src/core/doc/options.ts +++ b/packages/backend/server/src/core/doc/options.ts @@ -7,7 +7,7 @@ import { Config, mergeUpdatesInApplyWay as yotcoMergeUpdates, metrics, -} from '../../fundamentals'; +} from '../../base'; import { PermissionService } from '../permission'; import { QuotaService } from '../quota'; import { DocStorageOptions as IDocStorageOptions } from './storage'; diff --git a/packages/backend/server/src/core/doc/storage/doc.ts b/packages/backend/server/src/core/doc/storage/doc.ts index 4bcbf4067b..5ce1b7795c 100644 --- a/packages/backend/server/src/core/doc/storage/doc.ts +++ b/packages/backend/server/src/core/doc/storage/doc.ts @@ -9,7 +9,7 @@ import { UndoManager, } from 'yjs'; -import { CallMetric } from '../../../fundamentals'; +import { CallMetric } from '../../../base'; import { Connection } from './connection'; import { SingletonLocker } from './lock'; diff --git a/packages/backend/server/src/core/features/feature.ts b/packages/backend/server/src/core/features/feature.ts index c52fb96bfc..bc5a554b56 100644 --- a/packages/backend/server/src/core/features/feature.ts +++ b/packages/backend/server/src/core/features/feature.ts @@ -1,4 +1,4 @@ -import { PrismaTransaction } from '../../fundamentals'; +import { PrismaTransaction } from '../../base'; import { Feature, FeatureSchema, FeatureType } from './types'; class FeatureConfig { diff --git a/packages/backend/server/src/core/features/management.ts b/packages/backend/server/src/core/features/management.ts index 1f6506a159..f27d3db795 100644 --- a/packages/backend/server/src/core/features/management.ts +++ b/packages/backend/server/src/core/features/management.ts @@ -1,6 +1,6 @@ import { Injectable, Logger } from '@nestjs/common'; -import { Config, type EventPayload, OnEvent } from '../../fundamentals'; +import { Config, type EventPayload, OnEvent } from '../../base'; import { UserService } from '../user/service'; import { FeatureService } from './service'; import { FeatureType } from './types'; diff --git a/packages/backend/server/src/core/features/resolver.ts b/packages/backend/server/src/core/features/resolver.ts index 5f86c88c43..cc672c27c0 100644 --- a/packages/backend/server/src/core/features/resolver.ts +++ b/packages/backend/server/src/core/features/resolver.ts @@ -8,7 +8,7 @@ import { } from '@nestjs/graphql'; import { difference } from 'lodash-es'; -import { Config } from '../../fundamentals'; +import { Config } from '../../base'; import { Admin } from '../common'; import { UserType } from '../user/types'; import { EarlyAccessType, FeatureManagementService } from './management'; diff --git a/packages/backend/server/src/core/features/service.ts b/packages/backend/server/src/core/features/service.ts index 7d7ff34e4c..c6e961987d 100644 --- a/packages/backend/server/src/core/features/service.ts +++ b/packages/backend/server/src/core/features/service.ts @@ -1,7 +1,7 @@ import { Injectable } from '@nestjs/common'; import { PrismaClient } from '@prisma/client'; -import { CannotDeleteAllAdminAccount } from '../../fundamentals'; +import { CannotDeleteAllAdminAccount } from '../../base'; import { WorkspaceType } from '../workspaces/types'; import { FeatureConfigType, getFeature } from './feature'; import { FeatureKind, FeatureType } from './types'; diff --git a/packages/backend/server/src/core/permission/service.ts b/packages/backend/server/src/core/permission/service.ts index bf7bb86c5a..ab2b81e10f 100644 --- a/packages/backend/server/src/core/permission/service.ts +++ b/packages/backend/server/src/core/permission/service.ts @@ -9,7 +9,7 @@ import { PrismaTransaction, SpaceAccessDenied, SpaceOwnerNotFound, -} from '../../fundamentals'; +} from '../../base'; import { FeatureKind } from '../features/types'; import { QuotaType } from '../quota/types'; import { Permission, PublicPageMode } from './types'; diff --git a/packages/backend/server/src/core/quota/quota.ts b/packages/backend/server/src/core/quota/quota.ts index be884c80c8..1930f0c136 100644 --- a/packages/backend/server/src/core/quota/quota.ts +++ b/packages/backend/server/src/core/quota/quota.ts @@ -1,6 +1,6 @@ import { pick } from 'lodash-es'; -import { PrismaTransaction } from '../../fundamentals'; +import { PrismaTransaction } from '../../base'; import { formatDate, formatSize, Quota, QuotaSchema } from './types'; const QuotaCache = new Map(); diff --git a/packages/backend/server/src/core/quota/service.ts b/packages/backend/server/src/core/quota/service.ts index 97d59630f9..e28795c00d 100644 --- a/packages/backend/server/src/core/quota/service.ts +++ b/packages/backend/server/src/core/quota/service.ts @@ -1,8 +1,8 @@ import { Injectable } from '@nestjs/common'; import { PrismaClient } from '@prisma/client'; -import type { EventPayload } from '../../fundamentals'; -import { OnEvent, PrismaTransaction } from '../../fundamentals'; +import type { EventPayload } from '../../base'; +import { OnEvent, PrismaTransaction } from '../../base'; import { FeatureManagementService } from '../features/management'; import { FeatureKind } from '../features/types'; import { QuotaConfig } from './quota'; diff --git a/packages/backend/server/src/core/quota/storage.ts b/packages/backend/server/src/core/quota/storage.ts index 54c79e0e5c..31196b987c 100644 --- a/packages/backend/server/src/core/quota/storage.ts +++ b/packages/backend/server/src/core/quota/storage.ts @@ -1,6 +1,6 @@ import { Injectable, Logger } from '@nestjs/common'; -import { MemberQuotaExceeded } from '../../fundamentals'; +import { MemberQuotaExceeded } from '../../base'; import { FeatureService, FeatureType } from '../features'; import { PermissionService } from '../permission'; import { WorkspaceBlobStorage } from '../storage'; diff --git a/packages/backend/server/src/core/selfhost/controller.ts b/packages/backend/server/src/core/selfhost/controller.ts index 6dd5ddd53d..e8116a9634 100644 --- a/packages/backend/server/src/core/selfhost/controller.ts +++ b/packages/backend/server/src/core/selfhost/controller.ts @@ -7,7 +7,7 @@ import { InternalServerError, Mutex, PasswordRequired, -} from '../../fundamentals'; +} from '../../base'; import { AuthService, Public } from '../auth'; import { ServerService } from '../config'; import { UserService } from '../user/service'; diff --git a/packages/backend/server/src/core/selfhost/static.ts b/packages/backend/server/src/core/selfhost/static.ts index 9542c2dd5b..4f900d6647 100644 --- a/packages/backend/server/src/core/selfhost/static.ts +++ b/packages/backend/server/src/core/selfhost/static.ts @@ -6,7 +6,7 @@ import type { Application } from 'express'; import { static as serveStatic } from 'express'; import isMobile from 'is-mobile'; -import { Config } from '../../fundamentals'; +import { Config } from '../../base'; import { SetupMiddleware } from './setup'; @Injectable() diff --git a/packages/backend/server/src/core/storage/config.ts b/packages/backend/server/src/core/storage/config.ts index 19ff6688fe..70301c0600 100644 --- a/packages/backend/server/src/core/storage/config.ts +++ b/packages/backend/server/src/core/storage/config.ts @@ -1,5 +1,5 @@ -import { defineStartupConfig, ModuleConfig } from '../../fundamentals/config'; -import { StorageProviderType } from '../../fundamentals/storage'; +import { defineStartupConfig, ModuleConfig } from '../../base/config'; +import { StorageProviderType } from '../../base/storage'; export type StorageConfig = { provider: StorageProviderType; @@ -14,7 +14,7 @@ export interface StorageStartupConfigurations { blob: StorageConfig; } -declare module '../../fundamentals/config' { +declare module '../../base/config' { interface AppConfig { storages: ModuleConfig; } diff --git a/packages/backend/server/src/core/storage/wrappers/avatar.ts b/packages/backend/server/src/core/storage/wrappers/avatar.ts index db4bf3243a..ee69794268 100644 --- a/packages/backend/server/src/core/storage/wrappers/avatar.ts +++ b/packages/backend/server/src/core/storage/wrappers/avatar.ts @@ -5,13 +5,13 @@ import type { EventPayload, PutObjectMetadata, StorageProvider, -} from '../../../fundamentals'; +} from '../../../base'; import { Config, OnEvent, StorageProviderFactory, URLHelper, -} from '../../../fundamentals'; +} from '../../../base'; @Injectable() export class AvatarStorage { diff --git a/packages/backend/server/src/core/storage/wrappers/blob.ts b/packages/backend/server/src/core/storage/wrappers/blob.ts index edc4b685ab..2ca900af67 100644 --- a/packages/backend/server/src/core/storage/wrappers/blob.ts +++ b/packages/backend/server/src/core/storage/wrappers/blob.ts @@ -12,7 +12,7 @@ import { PutObjectMetadata, type StorageProvider, StorageProviderFactory, -} from '../../../fundamentals'; +} from '../../../base'; @Injectable() export class WorkspaceBlobStorage { diff --git a/packages/backend/server/src/core/sync/gateway.ts b/packages/backend/server/src/core/sync/gateway.ts index d1c1c5ff77..78b7da016d 100644 --- a/packages/backend/server/src/core/sync/gateway.ts +++ b/packages/backend/server/src/core/sync/gateway.ts @@ -19,7 +19,7 @@ import { NotInSpace, SpaceAccessDenied, VersionRejected, -} from '../../fundamentals'; +} from '../../base'; import { CurrentUser } from '../auth'; import { DocStorageAdapter, diff --git a/packages/backend/server/src/core/user/controller.ts b/packages/backend/server/src/core/user/controller.ts index 0bfd50c3b0..3fec76c61e 100644 --- a/packages/backend/server/src/core/user/controller.ts +++ b/packages/backend/server/src/core/user/controller.ts @@ -1,7 +1,7 @@ import { Controller, Get, Param, Res } from '@nestjs/common'; import type { Response } from 'express'; -import { ActionForbidden, UserAvatarNotFound } from '../../fundamentals'; +import { ActionForbidden, UserAvatarNotFound } from '../../base'; import { Public } from '../auth/guard'; import { AvatarStorage } from '../storage'; diff --git a/packages/backend/server/src/core/user/resolver.ts b/packages/backend/server/src/core/user/resolver.ts index 4eba70f6da..23e861b37e 100644 --- a/packages/backend/server/src/core/user/resolver.ts +++ b/packages/backend/server/src/core/user/resolver.ts @@ -16,7 +16,7 @@ import { type FileUpload, Throttle, UserNotFound, -} from '../../fundamentals'; +} from '../../base'; import { Public } from '../auth/guard'; import { sessionUser } from '../auth/service'; import { CurrentUser } from '../auth/session'; diff --git a/packages/backend/server/src/core/user/service.ts b/packages/backend/server/src/core/user/service.ts index 4602e50f8c..7d9325fb2e 100644 --- a/packages/backend/server/src/core/user/service.ts +++ b/packages/backend/server/src/core/user/service.ts @@ -10,7 +10,7 @@ import { OnEvent, WrongSignInCredentials, WrongSignInMethod, -} from '../../fundamentals'; +} from '../../base'; import { PermissionService } from '../permission'; import { Quota_FreePlanV1_1 } from '../quota/schema'; import { validators } from '../utils/validators'; diff --git a/packages/backend/server/src/core/user/types.ts b/packages/backend/server/src/core/user/types.ts index d484e76e27..58062ba2bb 100644 --- a/packages/backend/server/src/core/user/types.ts +++ b/packages/backend/server/src/core/user/types.ts @@ -7,7 +7,7 @@ import { } from '@nestjs/graphql'; import type { User } from '@prisma/client'; -import type { Payload } from '../../fundamentals/event/def'; +import type { Payload } from '../../base/event/def'; import { type CurrentUser } from '../auth/session'; @ObjectType() @@ -92,7 +92,7 @@ export class ManageUserInput { name?: string; } -declare module '../../fundamentals/event/def' { +declare module '../../base/event/def' { interface UserEvents { admin: { created: Payload<{ id: string }>; diff --git a/packages/backend/server/src/core/utils/validators.ts b/packages/backend/server/src/core/utils/validators.ts index f470a62717..969b4c8d8e 100644 --- a/packages/backend/server/src/core/utils/validators.ts +++ b/packages/backend/server/src/core/utils/validators.ts @@ -1,6 +1,6 @@ import z from 'zod'; -import { InvalidEmail, InvalidPasswordLength } from '../../fundamentals'; +import { InvalidEmail, InvalidPasswordLength } from '../../base'; export function assertValidEmail(email: string) { const result = z.string().email().safeParse(email); diff --git a/packages/backend/server/src/core/workspaces/controller.ts b/packages/backend/server/src/core/workspaces/controller.ts index cecdf3360e..a6a403f86e 100644 --- a/packages/backend/server/src/core/workspaces/controller.ts +++ b/packages/backend/server/src/core/workspaces/controller.ts @@ -10,7 +10,7 @@ import { DocHistoryNotFound, DocNotFound, InvalidHistoryTimestamp, -} from '../../fundamentals'; +} from '../../base'; import { CurrentUser, Public } from '../auth'; import { PgWorkspaceDocStorageAdapter } from '../doc'; import { Permission, PermissionService, PublicPageMode } from '../permission'; diff --git a/packages/backend/server/src/core/workspaces/management.ts b/packages/backend/server/src/core/workspaces/management.ts index 8627fee483..1c6282950f 100644 --- a/packages/backend/server/src/core/workspaces/management.ts +++ b/packages/backend/server/src/core/workspaces/management.ts @@ -8,7 +8,7 @@ import { Resolver, } from '@nestjs/graphql'; -import { ActionForbidden } from '../../fundamentals'; +import { ActionForbidden } from '../../base'; import { CurrentUser } from '../auth'; import { Admin } from '../common'; import { FeatureManagementService, FeatureType } from '../features'; diff --git a/packages/backend/server/src/core/workspaces/resolvers/blob.ts b/packages/backend/server/src/core/workspaces/resolvers/blob.ts index 448d23741c..133cc725c4 100644 --- a/packages/backend/server/src/core/workspaces/resolvers/blob.ts +++ b/packages/backend/server/src/core/workspaces/resolvers/blob.ts @@ -12,8 +12,8 @@ import { } from '@nestjs/graphql'; import GraphQLUpload from 'graphql-upload/GraphQLUpload.mjs'; -import type { FileUpload } from '../../../fundamentals'; -import { BlobQuotaExceeded, CloudThrottlerGuard } from '../../../fundamentals'; +import type { FileUpload } from '../../../base'; +import { BlobQuotaExceeded, CloudThrottlerGuard } from '../../../base'; import { CurrentUser } from '../../auth'; import { Permission, PermissionService } from '../../permission'; import { QuotaManagementService } from '../../quota'; diff --git a/packages/backend/server/src/core/workspaces/resolvers/page.ts b/packages/backend/server/src/core/workspaces/resolvers/page.ts index 813a92d06e..a5497ff242 100644 --- a/packages/backend/server/src/core/workspaces/resolvers/page.ts +++ b/packages/backend/server/src/core/workspaces/resolvers/page.ts @@ -15,7 +15,7 @@ import { ExpectToPublishPage, ExpectToRevokePublicPage, PageIsNotPublic, -} from '../../../fundamentals'; +} from '../../../base'; import { CurrentUser } from '../../auth'; import { Permission, diff --git a/packages/backend/server/src/core/workspaces/resolvers/service.ts b/packages/backend/server/src/core/workspaces/resolvers/service.ts index 0a2ef1e284..a32c476537 100644 --- a/packages/backend/server/src/core/workspaces/resolvers/service.ts +++ b/packages/backend/server/src/core/workspaces/resolvers/service.ts @@ -2,7 +2,7 @@ import { Injectable, Logger } from '@nestjs/common'; import { PrismaClient } from '@prisma/client'; import { getStreamAsBuffer } from 'get-stream'; -import { Cache, MailService } from '../../../fundamentals'; +import { Cache, MailService } from '../../../base'; import { DocContentService } from '../../doc-renderer'; import { PermissionService } from '../../permission'; import { WorkspaceBlobStorage } from '../../storage'; diff --git a/packages/backend/server/src/core/workspaces/resolvers/team.ts b/packages/backend/server/src/core/workspaces/resolvers/team.ts index 4d9b8c4edf..a1e9cd92e3 100644 --- a/packages/backend/server/src/core/workspaces/resolvers/team.ts +++ b/packages/backend/server/src/core/workspaces/resolvers/team.ts @@ -18,7 +18,7 @@ import { RequestMutex, TooManyRequest, URLHelper, -} from '../../../fundamentals'; +} from '../../../base'; import { CurrentUser } from '../../auth'; import { Permission, PermissionService } from '../../permission'; import { QuotaManagementService } from '../../quota'; diff --git a/packages/backend/server/src/core/workspaces/resolvers/workspace.ts b/packages/backend/server/src/core/workspaces/resolvers/workspace.ts index b374e17cc0..679e7513e5 100644 --- a/packages/backend/server/src/core/workspaces/resolvers/workspace.ts +++ b/packages/backend/server/src/core/workspaces/resolvers/workspace.ts @@ -13,7 +13,7 @@ import { import { PrismaClient, WorkspaceMemberStatus } from '@prisma/client'; import GraphQLUpload from 'graphql-upload/GraphQLUpload.mjs'; -import type { FileUpload } from '../../../fundamentals'; +import type { FileUpload } from '../../../base'; import { AlreadyInSpace, Cache, @@ -30,7 +30,7 @@ import { TooManyRequest, UserFriendlyError, UserNotFound, -} from '../../../fundamentals'; +} from '../../../base'; import { CurrentUser, Public } from '../../auth'; import { type Editor, PgWorkspaceDocStorageAdapter } from '../../doc'; import { Permission, PermissionService } from '../../permission'; diff --git a/packages/backend/server/src/data/migrations/99999-self-host-admin.ts b/packages/backend/server/src/data/migrations/99999-self-host-admin.ts index 32cb389798..f21b022488 100644 --- a/packages/backend/server/src/data/migrations/99999-self-host-admin.ts +++ b/packages/backend/server/src/data/migrations/99999-self-host-admin.ts @@ -1,8 +1,8 @@ import { ModuleRef } from '@nestjs/core'; import { PrismaClient } from '@prisma/client'; +import { Config } from '../../base'; import { FeatureManagementService } from '../../core/features'; -import { Config } from '../../fundamentals'; export class SelfHostAdmin1 { // do the migration diff --git a/packages/backend/server/src/index.ts b/packages/backend/server/src/index.ts index 3bdf43534b..1a72bf719f 100644 --- a/packages/backend/server/src/index.ts +++ b/packages/backend/server/src/index.ts @@ -5,7 +5,7 @@ import { Logger } from '@nestjs/common'; import { omit } from 'lodash-es'; import { createApp } from './app'; -import { URLHelper } from './fundamentals'; +import { URLHelper } from './base'; const app = await createApp(); const listeningHost = '0.0.0.0'; diff --git a/packages/backend/server/src/plugins/captcha/config.ts b/packages/backend/server/src/plugins/captcha/config.ts index 29bd3d8280..3d283109f6 100644 --- a/packages/backend/server/src/plugins/captcha/config.ts +++ b/packages/backend/server/src/plugins/captcha/config.ts @@ -2,7 +2,7 @@ import { defineRuntimeConfig, defineStartupConfig, ModuleConfig, -} from '../../fundamentals/config'; +} from '../../base/config'; import { CaptchaConfig } from './types'; declare module '../config' { @@ -16,7 +16,7 @@ declare module '../config' { } } -declare module '../../fundamentals/guard' { +declare module '../../base/guard' { interface RegisterGuardName { captcha: 'captcha'; } diff --git a/packages/backend/server/src/plugins/captcha/controller.ts b/packages/backend/server/src/plugins/captcha/controller.ts index 58f6f09b75..ce72e834e6 100644 --- a/packages/backend/server/src/plugins/captcha/controller.ts +++ b/packages/backend/server/src/plugins/captcha/controller.ts @@ -1,7 +1,7 @@ import { Controller, Get } from '@nestjs/common'; +import { Throttle } from '../../base'; import { Public } from '../../core/auth'; -import { Throttle } from '../../fundamentals'; import { CaptchaService } from './service'; @Throttle('strict') diff --git a/packages/backend/server/src/plugins/captcha/guard.ts b/packages/backend/server/src/plugins/captcha/guard.ts index cd925486d4..599f6060a0 100644 --- a/packages/backend/server/src/plugins/captcha/guard.ts +++ b/packages/backend/server/src/plugins/captcha/guard.ts @@ -9,7 +9,7 @@ import { Config, getRequestResponseFromContext, GuardProvider, -} from '../../fundamentals'; +} from '../../base'; import { CaptchaService } from './service'; @Injectable() diff --git a/packages/backend/server/src/plugins/captcha/service.ts b/packages/backend/server/src/plugins/captcha/service.ts index 7b8f1c3986..eb95f2c114 100644 --- a/packages/backend/server/src/plugins/captcha/service.ts +++ b/packages/backend/server/src/plugins/captcha/service.ts @@ -6,12 +6,12 @@ import type { Request } from 'express'; import { nanoid } from 'nanoid'; import { z } from 'zod'; -import { TokenService, TokenType } from '../../core/auth/token'; import { CaptchaVerificationFailed, Config, verifyChallengeResponse, -} from '../../fundamentals'; +} from '../../base'; +import { TokenService, TokenType } from '../../core/auth/token'; import { CaptchaConfig } from './types'; const validator = z diff --git a/packages/backend/server/src/plugins/config.ts b/packages/backend/server/src/plugins/config.ts index 1285883d9c..5f747cccf2 100644 --- a/packages/backend/server/src/plugins/config.ts +++ b/packages/backend/server/src/plugins/config.ts @@ -1,9 +1,9 @@ -import { ModuleStartupConfigDescriptions } from '../fundamentals/config/types'; +import { ModuleStartupConfigDescriptions } from '../base/config/types'; export interface PluginsConfig {} export type AvailablePlugins = keyof PluginsConfig; -declare module '../fundamentals/config' { +declare module '../base/config' { interface AppConfig { plugins: PluginsConfig; } diff --git a/packages/backend/server/src/plugins/copilot/config.ts b/packages/backend/server/src/plugins/copilot/config.ts index 720d7dd033..516334d7ce 100644 --- a/packages/backend/server/src/plugins/copilot/config.ts +++ b/packages/backend/server/src/plugins/copilot/config.ts @@ -1,7 +1,7 @@ import type { ClientOptions as OpenAIClientOptions } from 'openai'; -import { defineStartupConfig, ModuleConfig } from '../../fundamentals/config'; -import { StorageConfig } from '../../fundamentals/storage/config'; +import { defineStartupConfig, ModuleConfig } from '../../base/config'; +import { StorageConfig } from '../../base/storage/config'; import type { FalConfig } from './providers/fal'; export interface CopilotStartupConfigurations { diff --git a/packages/backend/server/src/plugins/copilot/controller.ts b/packages/backend/server/src/plugins/copilot/controller.ts index 827c4d6857..c2ecb054b6 100644 --- a/packages/backend/server/src/plugins/copilot/controller.ts +++ b/packages/backend/server/src/plugins/copilot/controller.ts @@ -27,7 +27,6 @@ import { toArray, } from 'rxjs'; -import { CurrentUser, Public } from '../../core/auth'; import { BlobNotFound, CallMetric, @@ -38,7 +37,8 @@ import { metrics, NoCopilotProviderAvailable, UnsplashIsNotConfigured, -} from '../../fundamentals'; +} from '../../base'; +import { CurrentUser, Public } from '../../core/auth'; import { CopilotProviderService } from './providers'; import { ChatSession, ChatSessionService } from './session'; import { CopilotStorage } from './storage'; diff --git a/packages/backend/server/src/plugins/copilot/message.ts b/packages/backend/server/src/plugins/copilot/message.ts index 2810143eb8..8fe953d839 100644 --- a/packages/backend/server/src/plugins/copilot/message.ts +++ b/packages/backend/server/src/plugins/copilot/message.ts @@ -2,7 +2,7 @@ import { randomUUID } from 'node:crypto'; import { Injectable, Logger } from '@nestjs/common'; -import { SessionCache } from '../../fundamentals'; +import { SessionCache } from '../../base'; import { SubmittedMessage, SubmittedMessageSchema } from './types'; const CHAT_MESSAGE_KEY = 'chat-message'; diff --git a/packages/backend/server/src/plugins/copilot/providers/fal.ts b/packages/backend/server/src/plugins/copilot/providers/fal.ts index 5fd02ba2a1..a3ff367508 100644 --- a/packages/backend/server/src/plugins/copilot/providers/fal.ts +++ b/packages/backend/server/src/plugins/copilot/providers/fal.ts @@ -11,7 +11,7 @@ import { CopilotProviderSideError, metrics, UserFriendlyError, -} from '../../../fundamentals'; +} from '../../../base'; import { CopilotCapability, CopilotChatOptions, diff --git a/packages/backend/server/src/plugins/copilot/providers/index.ts b/packages/backend/server/src/plugins/copilot/providers/index.ts index e25ef693b1..a72cb307f5 100644 --- a/packages/backend/server/src/plugins/copilot/providers/index.ts +++ b/packages/backend/server/src/plugins/copilot/providers/index.ts @@ -2,7 +2,7 @@ import assert from 'node:assert'; import { Injectable, Logger } from '@nestjs/common'; -import { AFFiNEConfig, Config } from '../../../fundamentals'; +import { AFFiNEConfig, Config } from '../../../base'; import { CopilotStartupConfigurations } from '../config'; import { CapabilityToCopilotProvider, diff --git a/packages/backend/server/src/plugins/copilot/providers/openai.ts b/packages/backend/server/src/plugins/copilot/providers/openai.ts index d4aac5d646..c8a8fa62e4 100644 --- a/packages/backend/server/src/plugins/copilot/providers/openai.ts +++ b/packages/backend/server/src/plugins/copilot/providers/openai.ts @@ -6,7 +6,7 @@ import { CopilotProviderSideError, metrics, UserFriendlyError, -} from '../../../fundamentals'; +} from '../../../base'; import { ChatMessageRole, CopilotCapability, diff --git a/packages/backend/server/src/plugins/copilot/resolver.ts b/packages/backend/server/src/plugins/copilot/resolver.ts index d76d38e256..9498981455 100644 --- a/packages/backend/server/src/plugins/copilot/resolver.ts +++ b/packages/backend/server/src/plugins/copilot/resolver.ts @@ -19,10 +19,6 @@ import { AiPromptRole } from '@prisma/client'; import { GraphQLJSON, SafeIntResolver } from 'graphql-scalars'; import GraphQLUpload from 'graphql-upload/GraphQLUpload.mjs'; -import { CurrentUser } from '../../core/auth'; -import { Admin } from '../../core/common'; -import { PermissionService } from '../../core/permission'; -import { UserType } from '../../core/user'; import { CallMetric, CopilotFailedToCreateMessage, @@ -30,7 +26,11 @@ import { RequestMutex, Throttle, TooManyRequest, -} from '../../fundamentals'; +} from '../../base'; +import { CurrentUser } from '../../core/auth'; +import { Admin } from '../../core/common'; +import { PermissionService } from '../../core/permission'; +import { UserType } from '../../core/user'; import { PromptService } from './prompt'; import { ChatSessionService } from './session'; import { CopilotStorage } from './storage'; diff --git a/packages/backend/server/src/plugins/copilot/session.ts b/packages/backend/server/src/plugins/copilot/session.ts index 8b90decd2a..3e6414828f 100644 --- a/packages/backend/server/src/plugins/copilot/session.ts +++ b/packages/backend/server/src/plugins/copilot/session.ts @@ -3,8 +3,6 @@ import { randomUUID } from 'node:crypto'; import { Injectable, Logger } from '@nestjs/common'; import { AiPromptRole, PrismaClient } from '@prisma/client'; -import { FeatureManagementService } from '../../core/features'; -import { QuotaService } from '../../core/quota'; import { CopilotActionTaken, CopilotMessageNotFound, @@ -12,7 +10,9 @@ import { CopilotQuotaExceeded, CopilotSessionDeleted, CopilotSessionNotFound, -} from '../../fundamentals'; +} from '../../base'; +import { FeatureManagementService } from '../../core/features'; +import { QuotaService } from '../../core/quota'; import { ChatMessageCache } from './message'; import { PromptService } from './prompt'; import { diff --git a/packages/backend/server/src/plugins/copilot/storage.ts b/packages/backend/server/src/plugins/copilot/storage.ts index 24d3f87aca..e592274321 100644 --- a/packages/backend/server/src/plugins/copilot/storage.ts +++ b/packages/backend/server/src/plugins/copilot/storage.ts @@ -2,7 +2,6 @@ import { createHash } from 'node:crypto'; import { Injectable } from '@nestjs/common'; -import { QuotaManagementService } from '../../core/quota'; import { type BlobInputType, BlobQuotaExceeded, @@ -12,7 +11,8 @@ import { type StorageProvider, StorageProviderFactory, URLHelper, -} from '../../fundamentals'; +} from '../../base'; +import { QuotaManagementService } from '../../core/quota'; @Injectable() export class CopilotStorage { diff --git a/packages/backend/server/src/plugins/gcloud/config.ts b/packages/backend/server/src/plugins/gcloud/config.ts index b536236393..0dd6bb7d4f 100644 --- a/packages/backend/server/src/plugins/gcloud/config.ts +++ b/packages/backend/server/src/plugins/gcloud/config.ts @@ -1,4 +1,4 @@ -import { defineStartupConfig, ModuleConfig } from '../../fundamentals/config'; +import { defineStartupConfig, ModuleConfig } from '../../base/config'; export interface GCloudConfig { enabled: boolean; diff --git a/packages/backend/server/src/plugins/gcloud/metrics.ts b/packages/backend/server/src/plugins/gcloud/metrics.ts index 93cef580aa..a3c558365a 100644 --- a/packages/backend/server/src/plugins/gcloud/metrics.ts +++ b/packages/backend/server/src/plugins/gcloud/metrics.ts @@ -9,8 +9,8 @@ import { } from '@opentelemetry/sdk-metrics'; import { SpanExporter } from '@opentelemetry/sdk-trace-node'; -import { OptionalModule } from '../../fundamentals'; -import { OpentelemetryFactory } from '../../fundamentals/metrics'; +import { OptionalModule } from '../../base'; +import { OpentelemetryFactory } from '../../base/metrics'; export class GCloudOpentelemetryFactory extends OpentelemetryFactory { override getResource(): Resource { diff --git a/packages/backend/server/src/plugins/oauth/config.ts b/packages/backend/server/src/plugins/oauth/config.ts index ee060dd478..f3bff3a90b 100644 --- a/packages/backend/server/src/plugins/oauth/config.ts +++ b/packages/backend/server/src/plugins/oauth/config.ts @@ -1,4 +1,4 @@ -import { defineStartupConfig, ModuleConfig } from '../../fundamentals/config'; +import { defineStartupConfig, ModuleConfig } from '../../base/config'; export interface OAuthProviderConfig { clientId: string; diff --git a/packages/backend/server/src/plugins/oauth/controller.ts b/packages/backend/server/src/plugins/oauth/controller.ts index d553aedf22..f38eaa2eb0 100644 --- a/packages/backend/server/src/plugins/oauth/controller.ts +++ b/packages/backend/server/src/plugins/oauth/controller.ts @@ -10,15 +10,15 @@ import { import { ConnectedAccount, PrismaClient } from '@prisma/client'; import type { Request, Response } from 'express'; -import { AuthService, Public } from '../../core/auth'; -import { UserService } from '../../core/user'; import { InvalidOauthCallbackState, MissingOauthQueryParameter, OauthAccountAlreadyConnected, OauthStateExpired, UnknownOauthProvider, -} from '../../fundamentals'; +} from '../../base'; +import { AuthService, Public } from '../../core/auth'; +import { UserService } from '../../core/user'; import { OAuthProviderName } from './config'; import { OAuthAccount, Tokens } from './providers/def'; import { OAuthProviderFactory } from './register'; diff --git a/packages/backend/server/src/plugins/oauth/providers/github.ts b/packages/backend/server/src/plugins/oauth/providers/github.ts index cfd72e0ea2..a7727da791 100644 --- a/packages/backend/server/src/plugins/oauth/providers/github.ts +++ b/packages/backend/server/src/plugins/oauth/providers/github.ts @@ -1,6 +1,6 @@ import { Injectable } from '@nestjs/common'; -import { Config, URLHelper } from '../../../fundamentals'; +import { Config, URLHelper } from '../../../base'; import { OAuthProviderName } from '../config'; import { AutoRegisteredOAuthProvider } from '../register'; diff --git a/packages/backend/server/src/plugins/oauth/providers/google.ts b/packages/backend/server/src/plugins/oauth/providers/google.ts index 04c845c2f2..56c45eb5cf 100644 --- a/packages/backend/server/src/plugins/oauth/providers/google.ts +++ b/packages/backend/server/src/plugins/oauth/providers/google.ts @@ -1,6 +1,6 @@ import { Injectable } from '@nestjs/common'; -import { Config, URLHelper } from '../../../fundamentals'; +import { Config, URLHelper } from '../../../base'; import { OAuthProviderName } from '../config'; import { AutoRegisteredOAuthProvider } from '../register'; diff --git a/packages/backend/server/src/plugins/oauth/providers/oidc.ts b/packages/backend/server/src/plugins/oauth/providers/oidc.ts index e55fdefeaa..b0b8b6fc55 100644 --- a/packages/backend/server/src/plugins/oauth/providers/oidc.ts +++ b/packages/backend/server/src/plugins/oauth/providers/oidc.ts @@ -1,7 +1,7 @@ import { Injectable, Logger, OnModuleInit } from '@nestjs/common'; import { z } from 'zod'; -import { Config, URLHelper } from '../../../fundamentals'; +import { Config, URLHelper } from '../../../base'; import { OAuthOIDCProviderConfig, OAuthProviderName, diff --git a/packages/backend/server/src/plugins/oauth/register.ts b/packages/backend/server/src/plugins/oauth/register.ts index a4f225b5a0..a1399b68c7 100644 --- a/packages/backend/server/src/plugins/oauth/register.ts +++ b/packages/backend/server/src/plugins/oauth/register.ts @@ -1,6 +1,6 @@ import { Injectable, Logger, OnModuleInit } from '@nestjs/common'; -import { Config } from '../../fundamentals'; +import { Config } from '../../base'; import { OAuthProviderName } from './config'; import { OAuthProvider } from './providers/def'; diff --git a/packages/backend/server/src/plugins/oauth/service.ts b/packages/backend/server/src/plugins/oauth/service.ts index acccfc0f97..da0ccee9ce 100644 --- a/packages/backend/server/src/plugins/oauth/service.ts +++ b/packages/backend/server/src/plugins/oauth/service.ts @@ -2,7 +2,7 @@ import { randomUUID } from 'node:crypto'; import { Injectable } from '@nestjs/common'; -import { SessionCache } from '../../fundamentals'; +import { SessionCache } from '../../base'; import { OAuthProviderName } from './config'; import { OAuthProviderFactory } from './register'; diff --git a/packages/backend/server/src/plugins/payment/config.ts b/packages/backend/server/src/plugins/payment/config.ts index 707311b12f..114c5ed04c 100644 --- a/packages/backend/server/src/plugins/payment/config.ts +++ b/packages/backend/server/src/plugins/payment/config.ts @@ -4,7 +4,7 @@ import { defineRuntimeConfig, defineStartupConfig, ModuleConfig, -} from '../../fundamentals/config'; +} from '../../base/config'; export interface PaymentStartupConfig { stripe?: { diff --git a/packages/backend/server/src/plugins/payment/controller.ts b/packages/backend/server/src/plugins/payment/controller.ts index edbbeaaa72..1708cea947 100644 --- a/packages/backend/server/src/plugins/payment/controller.ts +++ b/packages/backend/server/src/plugins/payment/controller.ts @@ -6,8 +6,8 @@ import { EventEmitter2 } from '@nestjs/event-emitter'; import type { Request } from 'express'; import Stripe from 'stripe'; +import { Config, InternalServerError } from '../../base'; import { Public } from '../../core/auth'; -import { Config, InternalServerError } from '../../fundamentals'; @Controller('/api/stripe') export class StripeWebhookController { diff --git a/packages/backend/server/src/plugins/payment/cron.ts b/packages/backend/server/src/plugins/payment/cron.ts index 9b96cd634a..6c8028cba0 100644 --- a/packages/backend/server/src/plugins/payment/cron.ts +++ b/packages/backend/server/src/plugins/payment/cron.ts @@ -3,7 +3,7 @@ import { OnEvent } from '@nestjs/event-emitter'; import { Cron, CronExpression } from '@nestjs/schedule'; import { PrismaClient } from '@prisma/client'; -import { EventEmitter, type EventPayload } from '../../fundamentals'; +import { EventEmitter, type EventPayload } from '../../base'; import { SubscriptionPlan, SubscriptionRecurring, diff --git a/packages/backend/server/src/plugins/payment/manager/common.ts b/packages/backend/server/src/plugins/payment/manager/common.ts index fd9eb5166a..f8aede9e45 100644 --- a/packages/backend/server/src/plugins/payment/manager/common.ts +++ b/packages/backend/server/src/plugins/payment/manager/common.ts @@ -2,7 +2,7 @@ import { PrismaClient, UserStripeCustomer } from '@prisma/client'; import Stripe from 'stripe'; import { z } from 'zod'; -import { UserNotFound } from '../../../fundamentals'; +import { UserNotFound } from '../../../base'; import { ScheduleManager } from '../schedule'; import { encodeLookupKey, diff --git a/packages/backend/server/src/plugins/payment/manager/user.ts b/packages/backend/server/src/plugins/payment/manager/user.ts index 7df2e07c6d..4a196f9afb 100644 --- a/packages/backend/server/src/plugins/payment/manager/user.ts +++ b/packages/backend/server/src/plugins/payment/manager/user.ts @@ -4,10 +4,6 @@ import { omit, pick } from 'lodash-es'; import Stripe from 'stripe'; import { z } from 'zod'; -import { - EarlyAccessType, - FeatureManagementService, -} from '../../../core/features'; import { Config, EventEmitter, @@ -16,7 +12,11 @@ import { SubscriptionAlreadyExists, SubscriptionPlanNotFound, URLHelper, -} from '../../../fundamentals'; +} from '../../../base'; +import { + EarlyAccessType, + FeatureManagementService, +} from '../../../core/features'; import { CouponType, KnownStripeInvoice, diff --git a/packages/backend/server/src/plugins/payment/manager/workspace.ts b/packages/backend/server/src/plugins/payment/manager/workspace.ts index 5ea1971d7f..0c31e3d8d4 100644 --- a/packages/backend/server/src/plugins/payment/manager/workspace.ts +++ b/packages/backend/server/src/plugins/payment/manager/workspace.ts @@ -11,7 +11,7 @@ import { SubscriptionAlreadyExists, SubscriptionPlanNotFound, URLHelper, -} from '../../../fundamentals'; +} from '../../../base'; import { KnownStripeInvoice, KnownStripePrice, diff --git a/packages/backend/server/src/plugins/payment/quota.ts b/packages/backend/server/src/plugins/payment/quota.ts index 1b32b478dd..00ae9ce53a 100644 --- a/packages/backend/server/src/plugins/payment/quota.ts +++ b/packages/backend/server/src/plugins/payment/quota.ts @@ -1,9 +1,9 @@ import { Injectable } from '@nestjs/common'; import { OnEvent } from '@nestjs/event-emitter'; +import type { EventPayload } from '../../base'; import { PermissionService } from '../../core/permission'; import { QuotaManagementService, QuotaType } from '../../core/quota'; -import type { EventPayload } from '../../fundamentals'; @Injectable() export class TeamQuotaOverride { diff --git a/packages/backend/server/src/plugins/payment/resolver.ts b/packages/backend/server/src/plugins/payment/resolver.ts index e0c78c8e9b..010bfc0a72 100644 --- a/packages/backend/server/src/plugins/payment/resolver.ts +++ b/packages/backend/server/src/plugins/payment/resolver.ts @@ -18,15 +18,15 @@ import { GraphQLJSONObject } from 'graphql-scalars'; import { groupBy } from 'lodash-es'; import { z } from 'zod'; -import { CurrentUser, Public } from '../../core/auth'; -import { Permission, PermissionService } from '../../core/permission'; -import { UserType } from '../../core/user'; -import { WorkspaceType } from '../../core/workspaces'; import { AccessDenied, FailedToCheckout, WorkspaceIdRequiredToUpdateTeamSubscription, -} from '../../fundamentals'; +} from '../../base'; +import { CurrentUser, Public } from '../../core/auth'; +import { Permission, PermissionService } from '../../core/permission'; +import { UserType } from '../../core/user'; +import { WorkspaceType } from '../../core/workspaces'; import { Invoice, Subscription, WorkspaceSubscriptionManager } from './manager'; import { CheckoutParams, SubscriptionService } from './service'; import { diff --git a/packages/backend/server/src/plugins/payment/service.ts b/packages/backend/server/src/plugins/payment/service.ts index f5717d076a..9449aed284 100644 --- a/packages/backend/server/src/plugins/payment/service.ts +++ b/packages/backend/server/src/plugins/payment/service.ts @@ -4,9 +4,6 @@ import { PrismaClient } from '@prisma/client'; import Stripe from 'stripe'; import { z } from 'zod'; -import { CurrentUser } from '../../core/auth'; -import { FeatureManagementService } from '../../core/features'; -import { UserService } from '../../core/user'; import { ActionForbidden, CantUpdateOnetimePaymentSubscription, @@ -25,7 +22,10 @@ import { SubscriptionPlanNotFound, UnsupportedSubscriptionPlan, UserNotFound, -} from '../../fundamentals'; +} from '../../base'; +import { CurrentUser } from '../../core/auth'; +import { FeatureManagementService } from '../../core/features'; +import { UserService } from '../../core/user'; import { CheckoutParams, Invoice, diff --git a/packages/backend/server/src/plugins/payment/stripe.ts b/packages/backend/server/src/plugins/payment/stripe.ts index 1b984244bb..0ee8b8e43e 100644 --- a/packages/backend/server/src/plugins/payment/stripe.ts +++ b/packages/backend/server/src/plugins/payment/stripe.ts @@ -4,7 +4,7 @@ import { FactoryProvider } from '@nestjs/common'; import { omit } from 'lodash-es'; import Stripe from 'stripe'; -import { Config } from '../../fundamentals'; +import { Config } from '../../base'; export const StripeProvider: FactoryProvider = { provide: Stripe, diff --git a/packages/backend/server/src/plugins/payment/types.ts b/packages/backend/server/src/plugins/payment/types.ts index 8a241fbf13..f2179b0222 100644 --- a/packages/backend/server/src/plugins/payment/types.ts +++ b/packages/backend/server/src/plugins/payment/types.ts @@ -1,7 +1,7 @@ import type { User, Workspace } from '@prisma/client'; import Stripe from 'stripe'; -import type { Payload } from '../../fundamentals/event/def'; +import type { Payload } from '../../base/event/def'; export enum SubscriptionRecurring { Monthly = 'monthly', @@ -49,7 +49,7 @@ export enum CouponType { ProEarlyAccessAIOneYearFree = 'ai_pro_ea_one_year_free', } -declare module '../../fundamentals/event/def' { +declare module '../../base/event/def' { interface UserEvents { subscription: { activated: Payload<{ diff --git a/packages/backend/server/src/plugins/redis/cache.ts b/packages/backend/server/src/plugins/redis/cache.ts index 802a64ca15..13cc7a287d 100644 --- a/packages/backend/server/src/plugins/redis/cache.ts +++ b/packages/backend/server/src/plugins/redis/cache.ts @@ -1,6 +1,6 @@ import { Redis } from 'ioredis'; -import type { Cache, CacheSetOptions } from '../../fundamentals/cache/def'; +import type { Cache, CacheSetOptions } from '../../base/cache/def'; export class RedisCache implements Cache { constructor(private readonly redis: Redis) {} diff --git a/packages/backend/server/src/plugins/redis/config.ts b/packages/backend/server/src/plugins/redis/config.ts index 4916d31e73..5a3ee800eb 100644 --- a/packages/backend/server/src/plugins/redis/config.ts +++ b/packages/backend/server/src/plugins/redis/config.ts @@ -1,6 +1,6 @@ import { RedisOptions } from 'ioredis'; -import { defineStartupConfig, ModuleConfig } from '../../fundamentals/config'; +import { defineStartupConfig, ModuleConfig } from '../../base/config'; declare module '../config' { interface PluginsConfig { diff --git a/packages/backend/server/src/plugins/redis/index.ts b/packages/backend/server/src/plugins/redis/index.ts index 145ef4ccd4..94ca078bc0 100644 --- a/packages/backend/server/src/plugins/redis/index.ts +++ b/packages/backend/server/src/plugins/redis/index.ts @@ -4,9 +4,9 @@ import { Global, Provider, Type } from '@nestjs/common'; import { Redis } from 'ioredis'; import { ThrottlerStorageRedisService } from 'nestjs-throttler-storage-redis'; -import { Cache, Locker, SessionCache } from '../../fundamentals'; -import { ThrottlerStorage } from '../../fundamentals/throttler'; -import { SocketIoAdapterImpl } from '../../fundamentals/websocket'; +import { Cache, Locker, SessionCache } from '../../base'; +import { ThrottlerStorage } from '../../base/throttler'; +import { SocketIoAdapterImpl } from '../../base/websocket'; import { Plugin } from '../registry'; import { RedisCache } from './cache'; import { CacheRedis, SessionRedis, SocketIoRedis } from './instances'; diff --git a/packages/backend/server/src/plugins/redis/instances.ts b/packages/backend/server/src/plugins/redis/instances.ts index a1e369918b..5d1138ad4e 100644 --- a/packages/backend/server/src/plugins/redis/instances.ts +++ b/packages/backend/server/src/plugins/redis/instances.ts @@ -6,7 +6,7 @@ import { } from '@nestjs/common'; import { Redis as IORedis, RedisOptions } from 'ioredis'; -import { Config } from '../../fundamentals/config'; +import { Config } from '../../base/config'; class Redis extends IORedis implements OnModuleDestroy, OnModuleInit { logger = new Logger(Redis.name); diff --git a/packages/backend/server/src/plugins/redis/mutex.ts b/packages/backend/server/src/plugins/redis/mutex.ts index 7b6edfa6b2..651b0fd618 100644 --- a/packages/backend/server/src/plugins/redis/mutex.ts +++ b/packages/backend/server/src/plugins/redis/mutex.ts @@ -1,7 +1,7 @@ import { Injectable, Logger } from '@nestjs/common'; import { Command } from 'ioredis'; -import { ILocker, Lock } from '../../fundamentals'; +import { ILocker, Lock } from '../../base'; import { SessionRedis } from './instances'; // === atomic mutex lock === diff --git a/packages/backend/server/src/plugins/redis/ws-adapter.ts b/packages/backend/server/src/plugins/redis/ws-adapter.ts index 8f7c646c84..043a7b9aeb 100644 --- a/packages/backend/server/src/plugins/redis/ws-adapter.ts +++ b/packages/backend/server/src/plugins/redis/ws-adapter.ts @@ -2,7 +2,7 @@ import { createAdapter } from '@socket.io/redis-adapter'; import { Redis } from 'ioredis'; import { Server, ServerOptions } from 'socket.io'; -import { SocketIoAdapter } from '../../fundamentals/websocket'; +import { SocketIoAdapter } from '../../base/websocket'; export function createSockerIoAdapterImpl( redis: Redis diff --git a/packages/backend/server/src/plugins/registry.ts b/packages/backend/server/src/plugins/registry.ts index 4d838f851f..2d9dae9399 100644 --- a/packages/backend/server/src/plugins/registry.ts +++ b/packages/backend/server/src/plugins/registry.ts @@ -1,6 +1,6 @@ import { get, merge, omit, set } from 'lodash-es'; -import { OptionalModule, OptionalModuleMetadata } from '../fundamentals/nestjs'; +import { OptionalModule, OptionalModuleMetadata } from '../base/nestjs'; import { AvailablePlugins } from './config'; export const REGISTERED_PLUGINS = new Map(); diff --git a/packages/backend/server/src/plugins/storage/config.ts b/packages/backend/server/src/plugins/storage/config.ts index f70561ea83..780d1ddf4a 100644 --- a/packages/backend/server/src/plugins/storage/config.ts +++ b/packages/backend/server/src/plugins/storage/config.ts @@ -1,9 +1,9 @@ import { S3ClientConfig, S3ClientConfigType } from '@aws-sdk/client-s3'; -import { defineStartupConfig, ModuleConfig } from '../../fundamentals/config'; +import { defineStartupConfig, ModuleConfig } from '../../base/config'; type WARNING = '__YOU_SHOULD_NOT_MANUALLY_CONFIGURATE_THIS_TYPE__'; -declare module '../../fundamentals/storage/config' { +declare module '../../base/storage/config' { interface StorageProvidersConfig { // the type here is only existing for extends [StorageProviderType] with better type inference and checking. 'cloudflare-r2'?: WARNING; diff --git a/packages/backend/server/src/plugins/storage/index.ts b/packages/backend/server/src/plugins/storage/index.ts index 41bc6ac9bd..d4b74f472f 100644 --- a/packages/backend/server/src/plugins/storage/index.ts +++ b/packages/backend/server/src/plugins/storage/index.ts @@ -1,6 +1,6 @@ import './config'; -import { registerStorageProvider } from '../../fundamentals/storage'; +import { registerStorageProvider } from '../../base/storage'; import { Plugin } from '../registry'; import { R2StorageProvider } from './providers/r2'; import { S3StorageProvider } from './providers/s3'; diff --git a/packages/backend/server/src/plugins/storage/providers/s3.ts b/packages/backend/server/src/plugins/storage/providers/s3.ts index 451bd5f6af..2dbb819b36 100644 --- a/packages/backend/server/src/plugins/storage/providers/s3.ts +++ b/packages/backend/server/src/plugins/storage/providers/s3.ts @@ -19,7 +19,7 @@ import { PutObjectMetadata, StorageProvider, toBuffer, -} from '../../../fundamentals/storage'; +} from '../../../base/storage'; import type { S3StorageConfig } from '../config'; export class S3StorageProvider implements StorageProvider { diff --git a/packages/backend/server/src/prelude.ts b/packages/backend/server/src/prelude.ts index c231f4fa8b..9d1c1ba95b 100644 --- a/packages/backend/server/src/prelude.ts +++ b/packages/backend/server/src/prelude.ts @@ -7,10 +7,7 @@ import { fileURLToPath, pathToFileURL } from 'node:url'; import { config } from 'dotenv'; -import { - applyEnvToConfig, - getAFFiNEConfigModifier, -} from './fundamentals/config'; +import { applyEnvToConfig, getAFFiNEConfigModifier } from './base/config'; const PROJECT_CONFIG_PATH = join(fileURLToPath(import.meta.url), '../config'); const CUSTOM_CONFIG_PATH = `${homedir()}/.affine/config`; diff --git a/packages/backend/server/tests/app/selfhost.e2e.ts b/packages/backend/server/tests/app/selfhost.e2e.ts index d295f33a2b..86315fe05d 100644 --- a/packages/backend/server/tests/app/selfhost.e2e.ts +++ b/packages/backend/server/tests/app/selfhost.e2e.ts @@ -8,8 +8,8 @@ import ava from 'ava'; import request from 'supertest'; import { buildAppModule } from '../../src/app.module'; +import { Config } from '../../src/base'; import { ServerService } from '../../src/core/config'; -import { Config } from '../../src/fundamentals'; import { createTestingApp, initTestingDB } from '../utils'; const test = ava as TestFn<{ diff --git a/packages/backend/server/tests/auth/auth.e2e.ts b/packages/backend/server/tests/auth/auth.e2e.ts index bb15462ebf..594000713e 100644 --- a/packages/backend/server/tests/auth/auth.e2e.ts +++ b/packages/backend/server/tests/auth/auth.e2e.ts @@ -8,8 +8,8 @@ import type { INestApplication } from '@nestjs/common'; import type { TestFn } from 'ava'; import ava from 'ava'; +import { MailService } from '../../src/base/mailer'; import { AuthService } from '../../src/core/auth/service'; -import { MailService } from '../../src/fundamentals/mailer'; import { changeEmail, changePassword, diff --git a/packages/backend/server/tests/auth/controller.spec.ts b/packages/backend/server/tests/auth/controller.spec.ts index 7204fa2f7e..21422153dd 100644 --- a/packages/backend/server/tests/auth/controller.spec.ts +++ b/packages/backend/server/tests/auth/controller.spec.ts @@ -4,11 +4,11 @@ import ava, { TestFn } from 'ava'; import Sinon from 'sinon'; import request from 'supertest'; +import { MailService } from '../../src/base'; import { AuthModule, CurrentUser } from '../../src/core/auth'; import { AuthService } from '../../src/core/auth/service'; import { FeatureModule } from '../../src/core/features'; import { UserModule, UserService } from '../../src/core/user'; -import { MailService } from '../../src/fundamentals'; import { createTestingApp, getSession, sessionCookie } from '../utils'; const test = ava as TestFn<{ diff --git a/packages/backend/server/tests/cache.spec.ts b/packages/backend/server/tests/cache.spec.ts index 71f0f49184..fcc25fbbe1 100644 --- a/packages/backend/server/tests/cache.spec.ts +++ b/packages/backend/server/tests/cache.spec.ts @@ -1,7 +1,7 @@ import { TestingModule } from '@nestjs/testing'; import test from 'ava'; -import { Cache } from '../src/fundamentals/cache'; +import { Cache } from '../src/base/cache'; import { createTestingModule } from './utils'; let cache: Cache; diff --git a/packages/backend/server/tests/config.spec.ts b/packages/backend/server/tests/config.spec.ts index 00cc1cdcf9..3b6ef2c593 100644 --- a/packages/backend/server/tests/config.spec.ts +++ b/packages/backend/server/tests/config.spec.ts @@ -1,7 +1,7 @@ import { TestingModule } from '@nestjs/testing'; import test from 'ava'; -import { Config, ConfigModule } from '../src/fundamentals/config'; +import { Config, ConfigModule } from '../src/base/config'; import { createTestingModule } from './utils'; let config: Config; diff --git a/packages/backend/server/tests/copilot-provider.spec.ts b/packages/backend/server/tests/copilot-provider.spec.ts index 52f48139fc..c22493f987 100644 --- a/packages/backend/server/tests/copilot-provider.spec.ts +++ b/packages/backend/server/tests/copilot-provider.spec.ts @@ -4,9 +4,9 @@ import { TestingModule } from '@nestjs/testing'; import type { ExecutionContext, TestFn } from 'ava'; import ava from 'ava'; +import { ConfigModule } from '../src/base/config'; import { AuthService } from '../src/core/auth'; import { QuotaModule } from '../src/core/quota'; -import { ConfigModule } from '../src/fundamentals/config'; import { CopilotModule } from '../src/plugins/copilot'; import { prompts, PromptService } from '../src/plugins/copilot/prompt'; import { diff --git a/packages/backend/server/tests/copilot.e2e.ts b/packages/backend/server/tests/copilot.e2e.ts index ff9c2ee6e0..ec1ffc834b 100644 --- a/packages/backend/server/tests/copilot.e2e.ts +++ b/packages/backend/server/tests/copilot.e2e.ts @@ -7,9 +7,9 @@ import type { TestFn } from 'ava'; import ava from 'ava'; import Sinon from 'sinon'; +import { ConfigModule } from '../src/base/config'; import { AuthService } from '../src/core/auth'; import { WorkspaceModule } from '../src/core/workspaces'; -import { ConfigModule } from '../src/fundamentals/config'; import { CopilotModule } from '../src/plugins/copilot'; import { prompts, PromptService } from '../src/plugins/copilot/prompt'; import { diff --git a/packages/backend/server/tests/copilot.spec.ts b/packages/backend/server/tests/copilot.spec.ts index 1d02b7b628..9372fc893a 100644 --- a/packages/backend/server/tests/copilot.spec.ts +++ b/packages/backend/server/tests/copilot.spec.ts @@ -5,9 +5,9 @@ import type { TestFn } from 'ava'; import ava from 'ava'; import Sinon from 'sinon'; +import { ConfigModule } from '../src/base/config'; import { AuthService } from '../src/core/auth'; import { QuotaModule } from '../src/core/quota'; -import { ConfigModule } from '../src/fundamentals/config'; import { CopilotModule } from '../src/plugins/copilot'; import { prompts, PromptService } from '../src/plugins/copilot/prompt'; import { diff --git a/packages/backend/server/tests/doc/cron.spec.ts b/packages/backend/server/tests/doc/cron.spec.ts index 2625a91e29..ac9fa28de3 100644 --- a/packages/backend/server/tests/doc/cron.spec.ts +++ b/packages/backend/server/tests/doc/cron.spec.ts @@ -6,9 +6,9 @@ import { PrismaClient } from '@prisma/client'; import test from 'ava'; import * as Sinon from 'sinon'; +import { Config } from '../../src/base/config'; import { DocStorageModule } from '../../src/core/doc'; import { DocStorageCronJob } from '../../src/core/doc/job'; -import { Config } from '../../src/fundamentals/config'; import { createTestingModule } from '../utils'; let m: TestingModule; diff --git a/packages/backend/server/tests/doc/workspace.spec.ts b/packages/backend/server/tests/doc/workspace.spec.ts index 9e2526bc08..fafa6b547b 100644 --- a/packages/backend/server/tests/doc/workspace.spec.ts +++ b/packages/backend/server/tests/doc/workspace.spec.ts @@ -4,11 +4,11 @@ import test from 'ava'; import * as Sinon from 'sinon'; import { applyUpdate, Doc as YDoc, encodeStateAsUpdate } from 'yjs'; +import { ConfigModule } from '../../src/base/config'; import { DocStorageModule, PgWorkspaceDocStorageAdapter as Adapter, } from '../../src/core/doc'; -import { ConfigModule } from '../../src/fundamentals/config'; import { createTestingModule, initTestingDB } from '../utils'; let m: TestingModule; diff --git a/packages/backend/server/tests/feature.spec.ts b/packages/backend/server/tests/feature.spec.ts index 5aba7255e9..bbc5791f73 100644 --- a/packages/backend/server/tests/feature.spec.ts +++ b/packages/backend/server/tests/feature.spec.ts @@ -4,6 +4,7 @@ import { INestApplication } from '@nestjs/common'; import type { TestFn } from 'ava'; import ava from 'ava'; +import { Config, ConfigModule } from '../src/base/config'; import { AuthService } from '../src/core/auth/service'; import { FeatureManagementService, @@ -12,7 +13,6 @@ import { FeatureType, } from '../src/core/features'; import { WorkspaceResolver } from '../src/core/workspaces/resolvers'; -import { Config, ConfigModule } from '../src/fundamentals/config'; import { createTestingApp } from './utils'; import { WorkspaceResolverMock } from './utils/feature'; diff --git a/packages/backend/server/tests/mailer.e2e.ts b/packages/backend/server/tests/mailer.e2e.ts index 7a7221fc16..3b81224168 100644 --- a/packages/backend/server/tests/mailer.e2e.ts +++ b/packages/backend/server/tests/mailer.e2e.ts @@ -10,8 +10,8 @@ import { TestingModule } from '@nestjs/testing'; import type { TestFn } from 'ava'; import ava from 'ava'; +import { ConfigModule } from '../src/base/config'; import { AuthService } from '../src/core/auth/service'; -import { ConfigModule } from '../src/fundamentals/config'; import { createTestingModule } from './utils'; const test = ava as TestFn<{ diff --git a/packages/backend/server/tests/mailer.spec.ts b/packages/backend/server/tests/mailer.spec.ts index bb0e236563..df7a63ebe8 100644 --- a/packages/backend/server/tests/mailer.spec.ts +++ b/packages/backend/server/tests/mailer.spec.ts @@ -4,8 +4,8 @@ import ava from 'ava'; import Sinon from 'sinon'; import { AppModule } from '../src/app.module'; +import { MailService } from '../src/base/mailer'; import { FeatureManagementService } from '../src/core/features'; -import { MailService } from '../src/fundamentals/mailer'; import { createTestingApp, createWorkspace, inviteUser, signUp } from './utils'; const test = ava as TestFn<{ app: INestApplication; diff --git a/packages/backend/server/tests/nestjs/error-handler.spec.ts b/packages/backend/server/tests/nestjs/error-handler.spec.ts index c99b8c9d67..6dd142b661 100644 --- a/packages/backend/server/tests/nestjs/error-handler.spec.ts +++ b/packages/backend/server/tests/nestjs/error-handler.spec.ts @@ -16,12 +16,12 @@ import testFn, { TestFn } from 'ava'; import Sinon from 'sinon'; import request from 'supertest'; -import { Public } from '../../src/core/auth'; import { AccessDenied, GatewayErrorWrapper, UserFriendlyError, -} from '../../src/fundamentals'; +} from '../../src/base'; +import { Public } from '../../src/core/auth'; import { createTestingApp } from '../utils'; @Public() diff --git a/packages/backend/server/tests/nestjs/throttler.spec.ts b/packages/backend/server/tests/nestjs/throttler.spec.ts index f2a0038fba..2de7b2fe44 100644 --- a/packages/backend/server/tests/nestjs/throttler.spec.ts +++ b/packages/backend/server/tests/nestjs/throttler.spec.ts @@ -13,14 +13,14 @@ import Sinon from 'sinon'; import request, { type Response } from 'supertest'; import { AppModule } from '../../src/app.module'; -import { AuthService, Public } from '../../src/core/auth'; -import { ConfigModule } from '../../src/fundamentals/config'; +import { ConfigModule } from '../../src/base/config'; import { CloudThrottlerGuard, SkipThrottle, Throttle, ThrottlerStorage, -} from '../../src/fundamentals/throttler'; +} from '../../src/base/throttler'; +import { AuthService, Public } from '../../src/core/auth'; import { createTestingApp, initTestingDB, internalSignIn } from '../utils'; const test = ava as TestFn<{ diff --git a/packages/backend/server/tests/oauth/controller.spec.ts b/packages/backend/server/tests/oauth/controller.spec.ts index 130f312ab4..051b4f3a9f 100644 --- a/packages/backend/server/tests/oauth/controller.spec.ts +++ b/packages/backend/server/tests/oauth/controller.spec.ts @@ -7,11 +7,11 @@ import Sinon from 'sinon'; import request from 'supertest'; import { AppModule } from '../../src/app.module'; +import { URLHelper } from '../../src/base'; +import { ConfigModule } from '../../src/base/config'; import { CurrentUser } from '../../src/core/auth'; import { AuthService } from '../../src/core/auth/service'; import { UserService } from '../../src/core/user'; -import { URLHelper } from '../../src/fundamentals'; -import { ConfigModule } from '../../src/fundamentals/config'; import { OAuthProviderName } from '../../src/plugins/oauth/config'; import { GoogleOAuthProvider } from '../../src/plugins/oauth/providers/google'; import { OAuthService } from '../../src/plugins/oauth/service'; diff --git a/packages/backend/server/tests/payment/service.spec.ts b/packages/backend/server/tests/payment/service.spec.ts index 6bd603548a..ac70f51fc3 100644 --- a/packages/backend/server/tests/payment/service.spec.ts +++ b/packages/backend/server/tests/payment/service.spec.ts @@ -7,14 +7,14 @@ import Sinon from 'sinon'; import Stripe from 'stripe'; import { AppModule } from '../../src/app.module'; +import { EventEmitter } from '../../src/base'; +import { Config, ConfigModule, Runtime } from '../../src/base/config'; import { CurrentUser } from '../../src/core/auth'; import { AuthService } from '../../src/core/auth/service'; import { EarlyAccessType, FeatureManagementService, } from '../../src/core/features'; -import { EventEmitter } from '../../src/fundamentals'; -import { Config, ConfigModule, Runtime } from '../../src/fundamentals/config'; import { SubscriptionService } from '../../src/plugins/payment/service'; import { CouponType, diff --git a/packages/backend/server/tests/utils/utils.ts b/packages/backend/server/tests/utils/utils.ts index 78973de963..4841c0bca8 100644 --- a/packages/backend/server/tests/utils/utils.ts +++ b/packages/backend/server/tests/utils/utils.ts @@ -9,10 +9,10 @@ import type { Response } from 'supertest'; import supertest from 'supertest'; import { AppModule, FunctionalityModules } from '../../src/app.module'; +import { Config, GlobalExceptionFilter } from '../../src/base'; +import { GqlModule } from '../../src/base/graphql'; import { AuthGuard, AuthModule } from '../../src/core/auth'; import { UserFeaturesInit1698652531198 } from '../../src/data/migrations/1698652531198-user-features-init'; -import { Config, GlobalExceptionFilter } from '../../src/fundamentals'; -import { GqlModule } from '../../src/fundamentals/graphql'; export type PermissionEnum = 'Owner' | 'Admin' | 'Write' | 'Read'; diff --git a/packages/backend/server/tests/workspace-invite.e2e.ts b/packages/backend/server/tests/workspace-invite.e2e.ts index c92f2c66c0..a69930eb0f 100644 --- a/packages/backend/server/tests/workspace-invite.e2e.ts +++ b/packages/backend/server/tests/workspace-invite.e2e.ts @@ -8,9 +8,9 @@ import type { TestFn } from 'ava'; import ava from 'ava'; import { AppModule } from '../src/app.module'; +import { MailService } from '../src/base/mailer'; import { AuthService } from '../src/core/auth/service'; import { UserService } from '../src/core/user'; -import { MailService } from '../src/fundamentals/mailer'; import { acceptInviteById, createTestingApp,