Change type import rule (#13751)
Forcing "type" to be explicit, works best will rollup on the frontend to exclude depdendencies
This commit is contained in:
+1
-1
@@ -1,6 +1,6 @@
|
||||
import { Inject } from '@nestjs/common';
|
||||
|
||||
import { MessageQueue } from 'src/engine/core-modules/message-queue/message-queue.constants';
|
||||
import { type MessageQueue } from 'src/engine/core-modules/message-queue/message-queue.constants';
|
||||
import { getQueueToken } from 'src/engine/core-modules/message-queue/utils/get-queue-token.util';
|
||||
|
||||
export const InjectMessageQueue = (queueName: MessageQueue) => {
|
||||
|
||||
+2
-2
@@ -1,8 +1,8 @@
|
||||
import { Scope, SetMetadata } from '@nestjs/common';
|
||||
import { type Scope, SetMetadata } from '@nestjs/common';
|
||||
import { SCOPE_OPTIONS_METADATA } from '@nestjs/common/constants';
|
||||
|
||||
import {
|
||||
MessageQueue,
|
||||
type MessageQueue,
|
||||
PROCESSOR_METADATA,
|
||||
} from 'src/engine/core-modules/message-queue/message-queue.constants';
|
||||
|
||||
|
||||
+14
-8
@@ -1,18 +1,24 @@
|
||||
import { OnModuleDestroy } from '@nestjs/common';
|
||||
import { type OnModuleDestroy } from '@nestjs/common';
|
||||
|
||||
import { JobsOptions, MetricsTime, Queue, QueueOptions, Worker } from 'bullmq';
|
||||
import {
|
||||
type JobsOptions,
|
||||
MetricsTime,
|
||||
Queue,
|
||||
type QueueOptions,
|
||||
Worker,
|
||||
} from 'bullmq';
|
||||
import { isDefined } from 'twenty-shared/utils';
|
||||
import { v4 } from 'uuid';
|
||||
|
||||
import {
|
||||
QueueCronJobOptions,
|
||||
QueueJobOptions,
|
||||
type QueueCronJobOptions,
|
||||
type QueueJobOptions,
|
||||
} from 'src/engine/core-modules/message-queue/drivers/interfaces/job-options.interface';
|
||||
import { MessageQueueDriver } from 'src/engine/core-modules/message-queue/drivers/interfaces/message-queue-driver.interface';
|
||||
import { MessageQueueJob } from 'src/engine/core-modules/message-queue/interfaces/message-queue-job.interface';
|
||||
import { MessageQueueWorkerOptions } from 'src/engine/core-modules/message-queue/interfaces/message-queue-worker-options.interface';
|
||||
import { type MessageQueueDriver } from 'src/engine/core-modules/message-queue/drivers/interfaces/message-queue-driver.interface';
|
||||
import { type MessageQueueJob } from 'src/engine/core-modules/message-queue/interfaces/message-queue-job.interface';
|
||||
import { type MessageQueueWorkerOptions } from 'src/engine/core-modules/message-queue/interfaces/message-queue-worker-options.interface';
|
||||
|
||||
import { MessageQueue } from 'src/engine/core-modules/message-queue/message-queue.constants';
|
||||
import { type MessageQueue } from 'src/engine/core-modules/message-queue/message-queue.constants';
|
||||
import { getJobKey } from 'src/engine/core-modules/message-queue/utils/get-job-key.util';
|
||||
|
||||
export type BullMQDriverOptions = QueueOptions;
|
||||
|
||||
+5
-5
@@ -1,11 +1,11 @@
|
||||
import {
|
||||
QueueCronJobOptions,
|
||||
QueueJobOptions,
|
||||
type QueueCronJobOptions,
|
||||
type QueueJobOptions,
|
||||
} from 'src/engine/core-modules/message-queue/drivers/interfaces/job-options.interface';
|
||||
import { MessageQueueJobData } from 'src/engine/core-modules/message-queue/interfaces/message-queue-job.interface';
|
||||
import { MessageQueueWorkerOptions } from 'src/engine/core-modules/message-queue/interfaces/message-queue-worker-options.interface';
|
||||
import { type MessageQueueJobData } from 'src/engine/core-modules/message-queue/interfaces/message-queue-job.interface';
|
||||
import { type MessageQueueWorkerOptions } from 'src/engine/core-modules/message-queue/interfaces/message-queue-worker-options.interface';
|
||||
|
||||
import { MessageQueue } from 'src/engine/core-modules/message-queue/message-queue.constants';
|
||||
import { type MessageQueue } from 'src/engine/core-modules/message-queue/message-queue.constants';
|
||||
|
||||
export interface MessageQueueDriver {
|
||||
add<T extends MessageQueueJobData>(
|
||||
|
||||
+7
-7
@@ -1,16 +1,16 @@
|
||||
import { OnModuleDestroy, OnModuleInit } from '@nestjs/common';
|
||||
import { type OnModuleDestroy, type OnModuleInit } from '@nestjs/common';
|
||||
|
||||
import PgBoss from 'pg-boss';
|
||||
|
||||
import {
|
||||
QueueCronJobOptions,
|
||||
QueueJobOptions,
|
||||
type QueueCronJobOptions,
|
||||
type QueueJobOptions,
|
||||
} from 'src/engine/core-modules/message-queue/drivers/interfaces/job-options.interface';
|
||||
import { MessageQueueJob } from 'src/engine/core-modules/message-queue/interfaces/message-queue-job.interface';
|
||||
import { MessageQueueWorkerOptions } from 'src/engine/core-modules/message-queue/interfaces/message-queue-worker-options.interface';
|
||||
import { MessageQueueDriver } from 'src/engine/core-modules/message-queue/drivers/interfaces/message-queue-driver.interface';
|
||||
import { type MessageQueueJob } from 'src/engine/core-modules/message-queue/interfaces/message-queue-job.interface';
|
||||
import { type MessageQueueWorkerOptions } from 'src/engine/core-modules/message-queue/interfaces/message-queue-worker-options.interface';
|
||||
import { type MessageQueueDriver } from 'src/engine/core-modules/message-queue/drivers/interfaces/message-queue-driver.interface';
|
||||
|
||||
import { MessageQueue } from 'src/engine/core-modules/message-queue/message-queue.constants';
|
||||
import { type MessageQueue } from 'src/engine/core-modules/message-queue/message-queue.constants';
|
||||
import { getJobKey } from 'src/engine/core-modules/message-queue/utils/get-job-key.util';
|
||||
|
||||
export type PgBossDriverOptions = PgBoss.ConstructorOptions;
|
||||
|
||||
@@ -1,12 +1,12 @@
|
||||
import { Logger } from '@nestjs/common';
|
||||
|
||||
import {
|
||||
MessageQueueJobData,
|
||||
MessageQueueJob,
|
||||
type MessageQueueJobData,
|
||||
type MessageQueueJob,
|
||||
} from 'src/engine/core-modules/message-queue/interfaces/message-queue-job.interface';
|
||||
import { MessageQueueDriver } from 'src/engine/core-modules/message-queue/drivers/interfaces/message-queue-driver.interface';
|
||||
import { type MessageQueueDriver } from 'src/engine/core-modules/message-queue/drivers/interfaces/message-queue-driver.interface';
|
||||
|
||||
import { MessageQueue } from 'src/engine/core-modules/message-queue/message-queue.constants';
|
||||
import { type MessageQueue } from 'src/engine/core-modules/message-queue/message-queue.constants';
|
||||
|
||||
export class SyncDriver implements MessageQueueDriver {
|
||||
private readonly logger = new Logger(SyncDriver.name);
|
||||
|
||||
+2
-2
@@ -1,5 +1,5 @@
|
||||
import { BullMQDriverOptions } from 'src/engine/core-modules/message-queue/drivers/bullmq.driver';
|
||||
import { PgBossDriverOptions } from 'src/engine/core-modules/message-queue/drivers/pg-boss.driver';
|
||||
import { type BullMQDriverOptions } from 'src/engine/core-modules/message-queue/drivers/bullmq.driver';
|
||||
import { type PgBossDriverOptions } from 'src/engine/core-modules/message-queue/drivers/pg-boss.driver';
|
||||
|
||||
export enum MessageQueueDriverType {
|
||||
PgBoss = 'pg-boss',
|
||||
|
||||
+5
-5
@@ -1,12 +1,12 @@
|
||||
import {
|
||||
DynamicModule,
|
||||
type DynamicModule,
|
||||
Global,
|
||||
Logger,
|
||||
Module,
|
||||
Provider,
|
||||
type Provider,
|
||||
} from '@nestjs/common';
|
||||
|
||||
import { MessageQueueDriver } from 'src/engine/core-modules/message-queue/drivers/interfaces/message-queue-driver.interface';
|
||||
import { type MessageQueueDriver } from 'src/engine/core-modules/message-queue/drivers/interfaces/message-queue-driver.interface';
|
||||
|
||||
import { MessageQueueDriverType } from 'src/engine/core-modules/message-queue/interfaces';
|
||||
import {
|
||||
@@ -19,9 +19,9 @@ import { BullMQDriver } from 'src/engine/core-modules/message-queue/drivers/bull
|
||||
import { SyncDriver } from 'src/engine/core-modules/message-queue/drivers/sync.driver';
|
||||
import { getQueueToken } from 'src/engine/core-modules/message-queue/utils/get-queue-token.util';
|
||||
import {
|
||||
ASYNC_OPTIONS_TYPE,
|
||||
type ASYNC_OPTIONS_TYPE,
|
||||
ConfigurableModuleClass,
|
||||
OPTIONS_TYPE,
|
||||
type OPTIONS_TYPE,
|
||||
} from 'src/engine/core-modules/message-queue/message-queue.module-definition';
|
||||
|
||||
@Global()
|
||||
|
||||
+3
-3
@@ -1,9 +1,9 @@
|
||||
/* eslint-disable @typescript-eslint/ban-types */
|
||||
import { Injectable, Type } from '@nestjs/common';
|
||||
import { Injectable, type Type } from '@nestjs/common';
|
||||
import { Reflector } from '@nestjs/core';
|
||||
|
||||
import { MessageQueueProcessOptions } from 'src/engine/core-modules/message-queue/decorators/process.decorator';
|
||||
import { MessageQueueProcessorOptions } from 'src/engine/core-modules/message-queue/decorators/processor.decorator';
|
||||
import { type MessageQueueProcessOptions } from 'src/engine/core-modules/message-queue/decorators/process.decorator';
|
||||
import { type MessageQueueProcessorOptions } from 'src/engine/core-modules/message-queue/decorators/processor.decorator';
|
||||
import {
|
||||
PROCESSOR_METADATA,
|
||||
PROCESS_METADATA,
|
||||
|
||||
+7
-7
@@ -1,4 +1,4 @@
|
||||
import { Injectable, Logger, OnModuleInit } from '@nestjs/common';
|
||||
import { Injectable, Logger, type OnModuleInit } from '@nestjs/common';
|
||||
import {
|
||||
DiscoveryService,
|
||||
MetadataScanner,
|
||||
@@ -6,18 +6,18 @@ import {
|
||||
createContextId,
|
||||
} from '@nestjs/core';
|
||||
import { Injector } from '@nestjs/core/injector/injector';
|
||||
import { InstanceWrapper } from '@nestjs/core/injector/instance-wrapper';
|
||||
import { Module } from '@nestjs/core/injector/module';
|
||||
import { type InstanceWrapper } from '@nestjs/core/injector/instance-wrapper';
|
||||
import { type Module } from '@nestjs/core/injector/module';
|
||||
|
||||
import {
|
||||
MessageQueueJob,
|
||||
MessageQueueJobData,
|
||||
type MessageQueueJob,
|
||||
type MessageQueueJobData,
|
||||
} from 'src/engine/core-modules/message-queue/interfaces/message-queue-job.interface';
|
||||
import { MessageQueueWorkerOptions } from 'src/engine/core-modules/message-queue/interfaces/message-queue-worker-options.interface';
|
||||
import { type MessageQueueWorkerOptions } from 'src/engine/core-modules/message-queue/interfaces/message-queue-worker-options.interface';
|
||||
|
||||
import { ExceptionHandlerService } from 'src/engine/core-modules/exception-handler/exception-handler.service';
|
||||
import { MessageQueueMetadataAccessor } from 'src/engine/core-modules/message-queue/message-queue-metadata.accessor';
|
||||
import { MessageQueueService } from 'src/engine/core-modules/message-queue/services/message-queue.service';
|
||||
import { type MessageQueueService } from 'src/engine/core-modules/message-queue/services/message-queue.service';
|
||||
import { getQueueToken } from 'src/engine/core-modules/message-queue/utils/get-queue-token.util';
|
||||
import { shouldCaptureException } from 'src/engine/utils/global-exception-handler.util';
|
||||
|
||||
|
||||
+1
-1
@@ -1,6 +1,6 @@
|
||||
import { ConfigurableModuleBuilder } from '@nestjs/common';
|
||||
|
||||
import { MessageQueueModuleOptions } from 'src/engine/core-modules/message-queue/interfaces';
|
||||
import { type MessageQueueModuleOptions } from 'src/engine/core-modules/message-queue/interfaces';
|
||||
|
||||
export const {
|
||||
ConfigurableModuleClass,
|
||||
|
||||
+4
-4
@@ -1,10 +1,10 @@
|
||||
import {
|
||||
BullMQDriverFactoryOptions,
|
||||
type BullMQDriverFactoryOptions,
|
||||
MessageQueueDriverType,
|
||||
MessageQueueModuleOptions,
|
||||
type MessageQueueModuleOptions,
|
||||
} from 'src/engine/core-modules/message-queue/interfaces';
|
||||
import { RedisClientService } from 'src/engine/core-modules/redis-client/redis-client.service';
|
||||
import { TwentyConfigService } from 'src/engine/core-modules/twenty-config/twenty-config.service';
|
||||
import { type RedisClientService } from 'src/engine/core-modules/redis-client/redis-client.service';
|
||||
import { type TwentyConfigService } from 'src/engine/core-modules/twenty-config/twenty-config.service';
|
||||
|
||||
/**
|
||||
* MessageQueue Module factory
|
||||
|
||||
+3
-3
@@ -1,12 +1,12 @@
|
||||
import { DynamicModule, Global, Module } from '@nestjs/common';
|
||||
import { type DynamicModule, Global, Module } from '@nestjs/common';
|
||||
import { DiscoveryModule } from '@nestjs/core';
|
||||
|
||||
import { MessageQueueCoreModule } from 'src/engine/core-modules/message-queue/message-queue-core.module';
|
||||
import { MessageQueueMetadataAccessor } from 'src/engine/core-modules/message-queue/message-queue-metadata.accessor';
|
||||
import { MessageQueueExplorer } from 'src/engine/core-modules/message-queue/message-queue.explorer';
|
||||
import {
|
||||
ASYNC_OPTIONS_TYPE,
|
||||
OPTIONS_TYPE,
|
||||
type ASYNC_OPTIONS_TYPE,
|
||||
type OPTIONS_TYPE,
|
||||
} from 'src/engine/core-modules/message-queue/message-queue.module-definition';
|
||||
|
||||
@Global()
|
||||
|
||||
+2
-2
@@ -1,6 +1,6 @@
|
||||
import { Test, TestingModule } from '@nestjs/testing';
|
||||
import { Test, type TestingModule } from '@nestjs/testing';
|
||||
|
||||
import { MessageQueueDriver } from 'src/engine/core-modules/message-queue/drivers/interfaces/message-queue-driver.interface';
|
||||
import { type MessageQueueDriver } from 'src/engine/core-modules/message-queue/drivers/interfaces/message-queue-driver.interface';
|
||||
|
||||
import {
|
||||
QUEUE_DRIVER,
|
||||
|
||||
+5
-5
@@ -1,15 +1,15 @@
|
||||
import { Inject, Injectable } from '@nestjs/common';
|
||||
|
||||
import {
|
||||
QueueCronJobOptions,
|
||||
QueueJobOptions,
|
||||
type QueueCronJobOptions,
|
||||
type QueueJobOptions,
|
||||
} from 'src/engine/core-modules/message-queue/drivers/interfaces/job-options.interface';
|
||||
import { MessageQueueDriver } from 'src/engine/core-modules/message-queue/drivers/interfaces/message-queue-driver.interface';
|
||||
import {
|
||||
MessageQueueJobData,
|
||||
MessageQueueJob,
|
||||
type MessageQueueJobData,
|
||||
type MessageQueueJob,
|
||||
} from 'src/engine/core-modules/message-queue/interfaces/message-queue-job.interface';
|
||||
import { MessageQueueWorkerOptions } from 'src/engine/core-modules/message-queue/interfaces/message-queue-worker-options.interface';
|
||||
import { type MessageQueueWorkerOptions } from 'src/engine/core-modules/message-queue/interfaces/message-queue-worker-options.interface';
|
||||
|
||||
import {
|
||||
MessageQueue,
|
||||
|
||||
Reference in New Issue
Block a user