diff --git a/packages/@n8n/nodes-langchain/nodes/agents/Agent/agents/SqlAgent/execute.ts b/packages/@n8n/nodes-langchain/nodes/agents/Agent/agents/SqlAgent/execute.ts index b52c0d1634ce7..edeb2e01a6dc0 100644 --- a/packages/@n8n/nodes-langchain/nodes/agents/Agent/agents/SqlAgent/execute.ts +++ b/packages/@n8n/nodes-langchain/nodes/agents/Agent/agents/SqlAgent/execute.ts @@ -9,7 +9,7 @@ import { SqlDatabase } from 'langchain/sql_db'; import type { SqlCreatePromptArgs } from 'langchain/agents/toolkits/sql'; import { SqlToolkit, createSqlAgent } from 'langchain/agents/toolkits/sql'; import type { BaseLanguageModel } from 'langchain/dist/base_language'; -import type { DataSource } from 'typeorm'; +import type { DataSource } from '@n8n/typeorm'; import { getSqliteDataSource } from './other/handlers/sqlite'; import { getPostgresDataSource } from './other/handlers/postgres'; diff --git a/packages/@n8n/nodes-langchain/nodes/agents/Agent/agents/SqlAgent/other/handlers/mysql.ts b/packages/@n8n/nodes-langchain/nodes/agents/Agent/agents/SqlAgent/other/handlers/mysql.ts index f04c84424867e..ea1b360f046fe 100644 --- a/packages/@n8n/nodes-langchain/nodes/agents/Agent/agents/SqlAgent/other/handlers/mysql.ts +++ b/packages/@n8n/nodes-langchain/nodes/agents/Agent/agents/SqlAgent/other/handlers/mysql.ts @@ -1,5 +1,5 @@ import { type IExecuteFunctions } from 'n8n-workflow'; -import { DataSource } from 'typeorm'; +import { DataSource } from '@n8n/typeorm'; export async function getMysqlDataSource(this: IExecuteFunctions): Promise { const credentials = await this.getCredentials('mySql'); diff --git a/packages/@n8n/nodes-langchain/nodes/agents/Agent/agents/SqlAgent/other/handlers/postgres.ts b/packages/@n8n/nodes-langchain/nodes/agents/Agent/agents/SqlAgent/other/handlers/postgres.ts index 9688ed6e65701..6971d9119f27a 100644 --- a/packages/@n8n/nodes-langchain/nodes/agents/Agent/agents/SqlAgent/other/handlers/postgres.ts +++ b/packages/@n8n/nodes-langchain/nodes/agents/Agent/agents/SqlAgent/other/handlers/postgres.ts @@ -1,5 +1,5 @@ import { type IExecuteFunctions } from 'n8n-workflow'; -import { DataSource } from 'typeorm'; +import { DataSource } from '@n8n/typeorm'; export async function getPostgresDataSource(this: IExecuteFunctions): Promise { const credentials = await this.getCredentials('postgres'); diff --git a/packages/@n8n/nodes-langchain/nodes/agents/Agent/agents/SqlAgent/other/handlers/sqlite.ts b/packages/@n8n/nodes-langchain/nodes/agents/Agent/agents/SqlAgent/other/handlers/sqlite.ts index a80027ea9f95c..27950390a3566 100644 --- a/packages/@n8n/nodes-langchain/nodes/agents/Agent/agents/SqlAgent/other/handlers/sqlite.ts +++ b/packages/@n8n/nodes-langchain/nodes/agents/Agent/agents/SqlAgent/other/handlers/sqlite.ts @@ -3,7 +3,7 @@ import type { IExecuteFunctions, INodeExecutionData } from 'n8n-workflow'; import { BINARY_ENCODING, NodeOperationError } from 'n8n-workflow'; import * as temp from 'temp'; import * as sqlite3 from 'sqlite3'; -import { DataSource } from 'typeorm'; +import { DataSource } from '@n8n/typeorm'; export function getSqliteDataSource( this: IExecuteFunctions, diff --git a/packages/@n8n/nodes-langchain/package.json b/packages/@n8n/nodes-langchain/package.json index e63febc66fad6..e229ed4036c03 100644 --- a/packages/@n8n/nodes-langchain/package.json +++ b/packages/@n8n/nodes-langchain/package.json @@ -131,6 +131,7 @@ "@huggingface/inference": "2.6.4", "@langchain/core": "0.1.8", "@langchain/mistralai": "0.0.6", + "@n8n/typeorm": "0.3.20", "@n8n/vm2": "3.9.20", "@pinecone-database/pinecone": "1.1.2", "@qdrant/js-client-rest": "1.7.0", @@ -154,7 +155,6 @@ "redis": "4.6.12", "sqlite3": "5.1.7", "temp": "0.9.4", - "typeorm": "0.3.20", "zod": "3.22.4", "zod-to-json-schema": "3.22.0" } diff --git a/packages/cli/package.json b/packages/cli/package.json index 4b4f95a19845b..c8707936c30af 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -97,6 +97,7 @@ "@n8n/localtunnel": "2.1.0", "@n8n/n8n-nodes-langchain": "workspace:*", "@n8n/permissions": "workspace:*", + "@n8n/typeorm": "0.3.20", "@n8n_io/license-sdk": "2.9.1", "@oclif/core": "3.18.1", "@rudderstack/rudder-sdk-node": "2.0.7", @@ -176,7 +177,6 @@ "swagger-ui-express": "5.0.0", "syslog-client": "1.1.1", "typedi": "0.10.0", - "typeorm": "0.3.20", "uuid": "8.3.2", "validator": "13.7.0", "winston": "3.8.2", diff --git a/packages/cli/src/Db.ts b/packages/cli/src/Db.ts index 839a0b187b0d3..69e9b5115fca7 100644 --- a/packages/cli/src/Db.ts +++ b/packages/cli/src/Db.ts @@ -1,7 +1,11 @@ /* eslint-disable @typescript-eslint/restrict-template-expressions */ import { Container } from 'typedi'; -import type { DataSourceOptions as ConnectionOptions, EntityManager, LoggerOptions } from 'typeorm'; -import { DataSource as Connection } from 'typeorm'; +import type { + DataSourceOptions as ConnectionOptions, + EntityManager, + LoggerOptions, +} from '@n8n/typeorm'; +import { DataSource as Connection } from '@n8n/typeorm'; import type { TlsOptions } from 'tls'; import { ApplicationError, ErrorReporterProxy as ErrorReporter } from 'n8n-workflow'; diff --git a/packages/cli/src/Ldap/ldap.service.ts b/packages/cli/src/Ldap/ldap.service.ts index c7eda15e3346a..0d7f45e58dfeb 100644 --- a/packages/cli/src/Ldap/ldap.service.ts +++ b/packages/cli/src/Ldap/ldap.service.ts @@ -1,5 +1,5 @@ import { Service } from 'typedi'; -import { QueryFailedError } from 'typeorm'; +import { QueryFailedError } from '@n8n/typeorm'; import type { Entry as LdapUser, ClientOptions } from 'ldapts'; import { Client } from 'ldapts'; import type { ConnectionOptions } from 'tls'; diff --git a/packages/cli/src/PublicApi/v1/handlers/workflows/workflows.handler.ts b/packages/cli/src/PublicApi/v1/handlers/workflows/workflows.handler.ts index bc1dcdc36f940..e6435efd88ca7 100644 --- a/packages/cli/src/PublicApi/v1/handlers/workflows/workflows.handler.ts +++ b/packages/cli/src/PublicApi/v1/handlers/workflows/workflows.handler.ts @@ -1,7 +1,7 @@ import type express from 'express'; import { Container } from 'typedi'; -import type { FindOptionsWhere } from 'typeorm'; -import { In } from 'typeorm'; +import type { FindOptionsWhere } from '@n8n/typeorm'; +import { In } from '@n8n/typeorm'; import { v4 as uuid } from 'uuid'; import { ActiveWorkflowRunner } from '@/ActiveWorkflowRunner'; diff --git a/packages/cli/src/commands/db/revert.ts b/packages/cli/src/commands/db/revert.ts index 967d4a8286453..c16219ea56649 100644 --- a/packages/cli/src/commands/db/revert.ts +++ b/packages/cli/src/commands/db/revert.ts @@ -1,6 +1,6 @@ import { Command, Flags } from '@oclif/core'; -import type { DataSourceOptions as ConnectionOptions } from 'typeorm'; -import { DataSource as Connection } from 'typeorm'; +import type { DataSourceOptions as ConnectionOptions } from '@n8n/typeorm'; +import { DataSource as Connection } from '@n8n/typeorm'; import { Container } from 'typedi'; import { Logger } from '@/Logger'; import { getConnectionOptions, setSchema } from '@/Db'; diff --git a/packages/cli/src/commands/import/credentials.ts b/packages/cli/src/commands/import/credentials.ts index 95a85fb90c80b..287452d7b6119 100644 --- a/packages/cli/src/commands/import/credentials.ts +++ b/packages/cli/src/commands/import/credentials.ts @@ -3,7 +3,7 @@ import { Flags } from '@oclif/core'; import { Cipher } from 'n8n-core'; import fs from 'fs'; import glob from 'fast-glob'; -import type { EntityManager } from 'typeorm'; +import type { EntityManager } from '@n8n/typeorm'; import * as Db from '@/Db'; import type { User } from '@db/entities/User'; diff --git a/packages/cli/src/credentials/credentials.service.ee.ts b/packages/cli/src/credentials/credentials.service.ee.ts index 1d56bb65c4695..0958a02db8d68 100644 --- a/packages/cli/src/credentials/credentials.service.ee.ts +++ b/packages/cli/src/credentials/credentials.service.ee.ts @@ -1,4 +1,4 @@ -import type { EntityManager, FindOptionsWhere } from 'typeorm'; +import type { EntityManager, FindOptionsWhere } from '@n8n/typeorm'; import type { SharedCredentials } from '@db/entities/SharedCredentials'; import type { User } from '@db/entities/User'; import { type CredentialsGetSharedOptions } from './credentials.service'; diff --git a/packages/cli/src/credentials/credentials.service.ts b/packages/cli/src/credentials/credentials.service.ts index 29ebdb5ecd227..9bfb505ea3ab8 100644 --- a/packages/cli/src/credentials/credentials.service.ts +++ b/packages/cli/src/credentials/credentials.service.ts @@ -6,7 +6,7 @@ import type { INodeProperties, } from 'n8n-workflow'; import { CREDENTIAL_EMPTY_VALUE, deepCopy, NodeHelpers } from 'n8n-workflow'; -import type { FindOptionsWhere } from 'typeorm'; +import type { FindOptionsWhere } from '@n8n/typeorm'; import type { Scope } from '@n8n/permissions'; import * as Db from '@/Db'; import type { ICredentialsDb } from '@/Interfaces'; diff --git a/packages/cli/src/databases/config.ts b/packages/cli/src/databases/config.ts index 881b50b3c916c..2b9377b816cbd 100644 --- a/packages/cli/src/databases/config.ts +++ b/packages/cli/src/databases/config.ts @@ -1,8 +1,8 @@ import path from 'path'; import { Container } from 'typedi'; -import type { SqliteConnectionOptions } from 'typeorm/driver/sqlite/SqliteConnectionOptions'; -import type { PostgresConnectionOptions } from 'typeorm/driver/postgres/PostgresConnectionOptions'; -import type { MysqlConnectionOptions } from 'typeorm/driver/mysql/MysqlConnectionOptions'; +import type { SqliteConnectionOptions } from '@n8n/typeorm/driver/sqlite/SqliteConnectionOptions'; +import type { PostgresConnectionOptions } from '@n8n/typeorm/driver/postgres/PostgresConnectionOptions'; +import type { MysqlConnectionOptions } from '@n8n/typeorm/driver/mysql/MysqlConnectionOptions'; import { InstanceSettings } from 'n8n-core'; import { entities } from './entities'; diff --git a/packages/cli/src/databases/dsl/Column.ts b/packages/cli/src/databases/dsl/Column.ts index 48d2191478977..aa5ff04e0d839 100644 --- a/packages/cli/src/databases/dsl/Column.ts +++ b/packages/cli/src/databases/dsl/Column.ts @@ -1,4 +1,4 @@ -import type { Driver, TableColumnOptions } from 'typeorm'; +import type { Driver, TableColumnOptions } from '@n8n/typeorm'; export class Column { private type: 'int' | 'boolean' | 'varchar' | 'text' | 'json' | 'timestamp' | 'uuid'; diff --git a/packages/cli/src/databases/dsl/Indices.ts b/packages/cli/src/databases/dsl/Indices.ts index 5e5a3346b8266..a5ec95e1012ed 100644 --- a/packages/cli/src/databases/dsl/Indices.ts +++ b/packages/cli/src/databases/dsl/Indices.ts @@ -1,5 +1,5 @@ -import type { QueryRunner } from 'typeorm'; -import { TableIndex } from 'typeorm'; +import type { QueryRunner } from '@n8n/typeorm'; +import { TableIndex } from '@n8n/typeorm'; import LazyPromise from 'p-lazy'; abstract class IndexOperation extends LazyPromise { diff --git a/packages/cli/src/databases/dsl/Table.ts b/packages/cli/src/databases/dsl/Table.ts index 94ed4392d0298..08cea8d29d40e 100644 --- a/packages/cli/src/databases/dsl/Table.ts +++ b/packages/cli/src/databases/dsl/Table.ts @@ -1,5 +1,5 @@ -import type { TableForeignKeyOptions, TableIndexOptions, QueryRunner } from 'typeorm'; -import { Table, TableColumn, TableForeignKey } from 'typeorm'; +import type { TableForeignKeyOptions, TableIndexOptions, QueryRunner } from '@n8n/typeorm'; +import { Table, TableColumn, TableForeignKey } from '@n8n/typeorm'; import LazyPromise from 'p-lazy'; import { Column } from './Column'; import { ApplicationError } from 'n8n-workflow'; diff --git a/packages/cli/src/databases/dsl/index.ts b/packages/cli/src/databases/dsl/index.ts index 2e108c0ef762a..bb5ef859ecf8f 100644 --- a/packages/cli/src/databases/dsl/index.ts +++ b/packages/cli/src/databases/dsl/index.ts @@ -1,4 +1,4 @@ -import type { QueryRunner } from 'typeorm'; +import type { QueryRunner } from '@n8n/typeorm'; import { Column } from './Column'; import { AddColumns, diff --git a/packages/cli/src/databases/entities/AbstractEntity.ts b/packages/cli/src/databases/entities/AbstractEntity.ts index 3c64a43aefa2e..48ed0079c5b34 100644 --- a/packages/cli/src/databases/entities/AbstractEntity.ts +++ b/packages/cli/src/databases/entities/AbstractEntity.ts @@ -1,11 +1,11 @@ -import type { ColumnOptions } from 'typeorm'; +import type { ColumnOptions } from '@n8n/typeorm'; import { BeforeInsert, BeforeUpdate, CreateDateColumn, PrimaryColumn, UpdateDateColumn, -} from 'typeorm'; +} from '@n8n/typeorm'; import config from '@/config'; import type { Class } from 'n8n-core'; import { generateNanoId } from '../utils/generators'; diff --git a/packages/cli/src/databases/entities/AuthIdentity.ts b/packages/cli/src/databases/entities/AuthIdentity.ts index 47289c9306b9b..ba3dd9d1c4052 100644 --- a/packages/cli/src/databases/entities/AuthIdentity.ts +++ b/packages/cli/src/databases/entities/AuthIdentity.ts @@ -1,4 +1,4 @@ -import { Column, Entity, ManyToOne, PrimaryColumn, Unique } from 'typeorm'; +import { Column, Entity, ManyToOne, PrimaryColumn, Unique } from '@n8n/typeorm'; import { WithTimestamps } from './AbstractEntity'; import { User } from './User'; diff --git a/packages/cli/src/databases/entities/AuthProviderSyncHistory.ts b/packages/cli/src/databases/entities/AuthProviderSyncHistory.ts index 51ef0077770f2..bb899b9da677e 100644 --- a/packages/cli/src/databases/entities/AuthProviderSyncHistory.ts +++ b/packages/cli/src/databases/entities/AuthProviderSyncHistory.ts @@ -1,4 +1,4 @@ -import { Column, Entity, PrimaryGeneratedColumn } from 'typeorm'; +import { Column, Entity, PrimaryGeneratedColumn } from '@n8n/typeorm'; import { datetimeColumnType } from './AbstractEntity'; import { AuthProviderType } from './AuthIdentity'; diff --git a/packages/cli/src/databases/entities/CredentialsEntity.ts b/packages/cli/src/databases/entities/CredentialsEntity.ts index 23a2e70760e24..cc365c2e7009e 100644 --- a/packages/cli/src/databases/entities/CredentialsEntity.ts +++ b/packages/cli/src/databases/entities/CredentialsEntity.ts @@ -1,5 +1,5 @@ import type { ICredentialNodeAccess } from 'n8n-workflow'; -import { Column, Entity, Index, OneToMany } from 'typeorm'; +import { Column, Entity, Index, OneToMany } from '@n8n/typeorm'; import { IsArray, IsObject, IsString, Length } from 'class-validator'; import type { SharedCredentials } from './SharedCredentials'; import { WithTimestampsAndStringId, jsonColumnType } from './AbstractEntity'; diff --git a/packages/cli/src/databases/entities/EventDestinations.ts b/packages/cli/src/databases/entities/EventDestinations.ts index b302e9a1a8015..27e594efa1707 100644 --- a/packages/cli/src/databases/entities/EventDestinations.ts +++ b/packages/cli/src/databases/entities/EventDestinations.ts @@ -1,5 +1,5 @@ import { MessageEventBusDestinationOptions } from 'n8n-workflow'; -import { Column, Entity, PrimaryColumn } from 'typeorm'; +import { Column, Entity, PrimaryColumn } from '@n8n/typeorm'; import { WithTimestamps, jsonColumnType } from './AbstractEntity'; @Entity({ name: 'event_destinations' }) diff --git a/packages/cli/src/databases/entities/ExecutionData.ts b/packages/cli/src/databases/entities/ExecutionData.ts index 06143c74fb839..5a1bd0cf587ce 100644 --- a/packages/cli/src/databases/entities/ExecutionData.ts +++ b/packages/cli/src/databases/entities/ExecutionData.ts @@ -1,4 +1,4 @@ -import { Column, Entity, ManyToOne, PrimaryColumn } from 'typeorm'; +import { Column, Entity, ManyToOne, PrimaryColumn } from '@n8n/typeorm'; import { idStringifier } from '../utils/transformers'; import { ExecutionEntity } from './ExecutionEntity'; import { jsonColumnType } from './AbstractEntity'; diff --git a/packages/cli/src/databases/entities/ExecutionEntity.ts b/packages/cli/src/databases/entities/ExecutionEntity.ts index d73267ee52003..14fad4d50e905 100644 --- a/packages/cli/src/databases/entities/ExecutionEntity.ts +++ b/packages/cli/src/databases/entities/ExecutionEntity.ts @@ -10,7 +10,7 @@ import { PrimaryColumn, Relation, DeleteDateColumn, -} from 'typeorm'; +} from '@n8n/typeorm'; import { datetimeColumnType } from './AbstractEntity'; import { idStringifier } from '../utils/transformers'; import type { ExecutionData } from './ExecutionData'; diff --git a/packages/cli/src/databases/entities/ExecutionMetadata.ts b/packages/cli/src/databases/entities/ExecutionMetadata.ts index 99ea8e01cec24..6e316ecfd7f04 100644 --- a/packages/cli/src/databases/entities/ExecutionMetadata.ts +++ b/packages/cli/src/databases/entities/ExecutionMetadata.ts @@ -1,4 +1,4 @@ -import { Column, Entity, ManyToOne, PrimaryGeneratedColumn, RelationId } from 'typeorm'; +import { Column, Entity, ManyToOne, PrimaryGeneratedColumn, RelationId } from '@n8n/typeorm'; import { ExecutionEntity } from './ExecutionEntity'; @Entity() diff --git a/packages/cli/src/databases/entities/InstalledNodes.ts b/packages/cli/src/databases/entities/InstalledNodes.ts index 7f2e94b6bca59..f3eee3ab9a7e6 100644 --- a/packages/cli/src/databases/entities/InstalledNodes.ts +++ b/packages/cli/src/databases/entities/InstalledNodes.ts @@ -1,4 +1,4 @@ -import { Column, Entity, JoinColumn, ManyToOne, PrimaryColumn } from 'typeorm'; +import { Column, Entity, JoinColumn, ManyToOne, PrimaryColumn } from '@n8n/typeorm'; import { InstalledPackages } from './InstalledPackages'; @Entity() diff --git a/packages/cli/src/databases/entities/InstalledPackages.ts b/packages/cli/src/databases/entities/InstalledPackages.ts index c0c06a00da63d..38cd52cd31c2f 100644 --- a/packages/cli/src/databases/entities/InstalledPackages.ts +++ b/packages/cli/src/databases/entities/InstalledPackages.ts @@ -1,4 +1,4 @@ -import { Column, Entity, JoinColumn, OneToMany, PrimaryColumn } from 'typeorm'; +import { Column, Entity, JoinColumn, OneToMany, PrimaryColumn } from '@n8n/typeorm'; import type { InstalledNodes } from './InstalledNodes'; import { WithTimestamps } from './AbstractEntity'; diff --git a/packages/cli/src/databases/entities/Settings.ts b/packages/cli/src/databases/entities/Settings.ts index 7f1f99cd1e1e3..8fcb38325a43d 100644 --- a/packages/cli/src/databases/entities/Settings.ts +++ b/packages/cli/src/databases/entities/Settings.ts @@ -1,5 +1,5 @@ import type { IDataObject } from 'n8n-workflow'; -import { Column, Entity, PrimaryColumn } from 'typeorm'; +import { Column, Entity, PrimaryColumn } from '@n8n/typeorm'; interface ISettingsDb { key: string; diff --git a/packages/cli/src/databases/entities/SharedCredentials.ts b/packages/cli/src/databases/entities/SharedCredentials.ts index 1685732004229..e43f3031d88f7 100644 --- a/packages/cli/src/databases/entities/SharedCredentials.ts +++ b/packages/cli/src/databases/entities/SharedCredentials.ts @@ -1,4 +1,4 @@ -import { Column, Entity, ManyToOne, PrimaryColumn } from 'typeorm'; +import { Column, Entity, ManyToOne, PrimaryColumn } from '@n8n/typeorm'; import { CredentialsEntity } from './CredentialsEntity'; import { User } from './User'; import { WithTimestamps } from './AbstractEntity'; diff --git a/packages/cli/src/databases/entities/SharedWorkflow.ts b/packages/cli/src/databases/entities/SharedWorkflow.ts index adb94beb5ab40..d5681f6467eae 100644 --- a/packages/cli/src/databases/entities/SharedWorkflow.ts +++ b/packages/cli/src/databases/entities/SharedWorkflow.ts @@ -1,4 +1,4 @@ -import { Column, Entity, ManyToOne, PrimaryColumn } from 'typeorm'; +import { Column, Entity, ManyToOne, PrimaryColumn } from '@n8n/typeorm'; import { WorkflowEntity } from './WorkflowEntity'; import { User } from './User'; import { WithTimestamps } from './AbstractEntity'; diff --git a/packages/cli/src/databases/entities/TagEntity.ts b/packages/cli/src/databases/entities/TagEntity.ts index c425b505ba5c5..5e7954df6665e 100644 --- a/packages/cli/src/databases/entities/TagEntity.ts +++ b/packages/cli/src/databases/entities/TagEntity.ts @@ -1,4 +1,4 @@ -import { Column, Entity, Index, ManyToMany, OneToMany } from 'typeorm'; +import { Column, Entity, Index, ManyToMany, OneToMany } from '@n8n/typeorm'; import { IsString, Length } from 'class-validator'; import type { WorkflowEntity } from './WorkflowEntity'; import type { WorkflowTagMapping } from './WorkflowTagMapping'; diff --git a/packages/cli/src/databases/entities/User.ts b/packages/cli/src/databases/entities/User.ts index 9a1a96d5f7248..a9da54fe0dea5 100644 --- a/packages/cli/src/databases/entities/User.ts +++ b/packages/cli/src/databases/entities/User.ts @@ -8,7 +8,7 @@ import { OneToMany, PrimaryGeneratedColumn, BeforeInsert, -} from 'typeorm'; +} from '@n8n/typeorm'; import { IsEmail, IsString, Length } from 'class-validator'; import type { IUser, IUserSettings } from 'n8n-workflow'; import type { SharedWorkflow } from './SharedWorkflow'; diff --git a/packages/cli/src/databases/entities/Variables.ts b/packages/cli/src/databases/entities/Variables.ts index 42f52c4ace51f..da8272853f73b 100644 --- a/packages/cli/src/databases/entities/Variables.ts +++ b/packages/cli/src/databases/entities/Variables.ts @@ -1,4 +1,4 @@ -import { Column, Entity } from 'typeorm'; +import { Column, Entity } from '@n8n/typeorm'; import { WithStringId } from './AbstractEntity'; @Entity() diff --git a/packages/cli/src/databases/entities/WebhookEntity.ts b/packages/cli/src/databases/entities/WebhookEntity.ts index 89b863d427cbd..b8dafabe2b897 100644 --- a/packages/cli/src/databases/entities/WebhookEntity.ts +++ b/packages/cli/src/databases/entities/WebhookEntity.ts @@ -1,5 +1,5 @@ import { IHttpRequestMethods } from 'n8n-workflow'; -import { Column, Entity, Index, PrimaryColumn } from 'typeorm'; +import { Column, Entity, Index, PrimaryColumn } from '@n8n/typeorm'; @Entity() @Index(['webhookId', 'method', 'pathLength']) diff --git a/packages/cli/src/databases/entities/WorkflowEntity.ts b/packages/cli/src/databases/entities/WorkflowEntity.ts index 332b71ecd55d5..0b1fb576f4325 100644 --- a/packages/cli/src/databases/entities/WorkflowEntity.ts +++ b/packages/cli/src/databases/entities/WorkflowEntity.ts @@ -3,7 +3,7 @@ import { Length } from 'class-validator'; import { IConnections, IDataObject, IWorkflowSettings, WorkflowFEMeta } from 'n8n-workflow'; import type { IBinaryKeyData, INode, IPairedItemData } from 'n8n-workflow'; -import { Column, Entity, Index, JoinColumn, JoinTable, ManyToMany, OneToMany } from 'typeorm'; +import { Column, Entity, Index, JoinColumn, JoinTable, ManyToMany, OneToMany } from '@n8n/typeorm'; import config from '@/config'; import type { TagEntity } from './TagEntity'; diff --git a/packages/cli/src/databases/entities/WorkflowHistory.ts b/packages/cli/src/databases/entities/WorkflowHistory.ts index a1db4ed177cae..b66bbff21014c 100644 --- a/packages/cli/src/databases/entities/WorkflowHistory.ts +++ b/packages/cli/src/databases/entities/WorkflowHistory.ts @@ -1,4 +1,4 @@ -import { Column, Entity, ManyToOne, PrimaryColumn } from 'typeorm'; +import { Column, Entity, ManyToOne, PrimaryColumn } from '@n8n/typeorm'; import { WithTimestamps, jsonColumnType } from './AbstractEntity'; import { IConnections } from 'n8n-workflow'; import type { INode } from 'n8n-workflow'; diff --git a/packages/cli/src/databases/entities/WorkflowStatistics.ts b/packages/cli/src/databases/entities/WorkflowStatistics.ts index 177000a0b02af..5bdeffcb7cae4 100644 --- a/packages/cli/src/databases/entities/WorkflowStatistics.ts +++ b/packages/cli/src/databases/entities/WorkflowStatistics.ts @@ -1,4 +1,4 @@ -import { Column, Entity, ManyToOne, PrimaryColumn } from 'typeorm'; +import { Column, Entity, ManyToOne, PrimaryColumn } from '@n8n/typeorm'; import { datetimeColumnType } from './AbstractEntity'; import { WorkflowEntity } from './WorkflowEntity'; diff --git a/packages/cli/src/databases/entities/WorkflowTagMapping.ts b/packages/cli/src/databases/entities/WorkflowTagMapping.ts index 69f74bc8a60f3..2f0727272c638 100644 --- a/packages/cli/src/databases/entities/WorkflowTagMapping.ts +++ b/packages/cli/src/databases/entities/WorkflowTagMapping.ts @@ -1,4 +1,4 @@ -import { Entity, JoinColumn, ManyToOne, PrimaryColumn } from 'typeorm'; +import { Entity, JoinColumn, ManyToOne, PrimaryColumn } from '@n8n/typeorm'; import type { TagEntity } from './TagEntity'; import type { WorkflowEntity } from './WorkflowEntity'; diff --git a/packages/cli/src/databases/repositories/authIdentity.repository.ts b/packages/cli/src/databases/repositories/authIdentity.repository.ts index 6ec5fe2310b85..d285d6858204e 100644 --- a/packages/cli/src/databases/repositories/authIdentity.repository.ts +++ b/packages/cli/src/databases/repositories/authIdentity.repository.ts @@ -1,5 +1,5 @@ import { Service } from 'typedi'; -import { DataSource, Repository } from 'typeorm'; +import { DataSource, Repository } from '@n8n/typeorm'; import { AuthIdentity } from '../entities/AuthIdentity'; @Service() diff --git a/packages/cli/src/databases/repositories/authProviderSyncHistory.repository.ts b/packages/cli/src/databases/repositories/authProviderSyncHistory.repository.ts index 092f4273ee00e..86bacfae1b43c 100644 --- a/packages/cli/src/databases/repositories/authProviderSyncHistory.repository.ts +++ b/packages/cli/src/databases/repositories/authProviderSyncHistory.repository.ts @@ -1,5 +1,5 @@ import { Service } from 'typedi'; -import { DataSource, Repository } from 'typeorm'; +import { DataSource, Repository } from '@n8n/typeorm'; import { AuthProviderSyncHistory } from '../entities/AuthProviderSyncHistory'; @Service() diff --git a/packages/cli/src/databases/repositories/credentials.repository.ts b/packages/cli/src/databases/repositories/credentials.repository.ts index 4c6e75cfcdcd1..0b11b4015122f 100644 --- a/packages/cli/src/databases/repositories/credentials.repository.ts +++ b/packages/cli/src/databases/repositories/credentials.repository.ts @@ -1,6 +1,6 @@ import { Service } from 'typedi'; -import { DataSource, In, Not, Repository, Like } from 'typeorm'; -import type { FindManyOptions, DeleteResult, EntityManager, FindOptionsWhere } from 'typeorm'; +import { DataSource, In, Not, Repository, Like } from '@n8n/typeorm'; +import type { FindManyOptions, DeleteResult, EntityManager, FindOptionsWhere } from '@n8n/typeorm'; import { CredentialsEntity } from '../entities/CredentialsEntity'; import { SharedCredentials } from '../entities/SharedCredentials'; import type { ListQuery } from '@/requests'; diff --git a/packages/cli/src/databases/repositories/eventDestinations.repository.ts b/packages/cli/src/databases/repositories/eventDestinations.repository.ts index 627a9638f18e5..98882bbb509c9 100644 --- a/packages/cli/src/databases/repositories/eventDestinations.repository.ts +++ b/packages/cli/src/databases/repositories/eventDestinations.repository.ts @@ -1,5 +1,5 @@ import { Service } from 'typedi'; -import { DataSource, Repository } from 'typeorm'; +import { DataSource, Repository } from '@n8n/typeorm'; import { EventDestinations } from '../entities/EventDestinations'; @Service() diff --git a/packages/cli/src/databases/repositories/execution.repository.ts b/packages/cli/src/databases/repositories/execution.repository.ts index 4a0f712be216b..dd04ec673fa5c 100644 --- a/packages/cli/src/databases/repositories/execution.repository.ts +++ b/packages/cli/src/databases/repositories/execution.repository.ts @@ -10,15 +10,15 @@ import { Not, Raw, Repository, -} from 'typeorm'; -import { DateUtils } from 'typeorm/util/DateUtils'; +} from '@n8n/typeorm'; +import { DateUtils } from '@n8n/typeorm/util/DateUtils'; import type { FindManyOptions, FindOneOptions, FindOperator, FindOptionsWhere, SelectQueryBuilder, -} from 'typeorm'; +} from '@n8n/typeorm'; import { parse, stringify } from 'flatted'; import { ApplicationError, diff --git a/packages/cli/src/databases/repositories/executionData.repository.ts b/packages/cli/src/databases/repositories/executionData.repository.ts index 3eebab012263c..5872f9888cd66 100644 --- a/packages/cli/src/databases/repositories/executionData.repository.ts +++ b/packages/cli/src/databases/repositories/executionData.repository.ts @@ -1,5 +1,5 @@ import { Service } from 'typedi'; -import { DataSource, In, Repository } from 'typeorm'; +import { DataSource, In, Repository } from '@n8n/typeorm'; import { ExecutionData } from '../entities/ExecutionData'; @Service() diff --git a/packages/cli/src/databases/repositories/executionMetadata.repository.ts b/packages/cli/src/databases/repositories/executionMetadata.repository.ts index 917ce755c81c0..d80cca12a6115 100644 --- a/packages/cli/src/databases/repositories/executionMetadata.repository.ts +++ b/packages/cli/src/databases/repositories/executionMetadata.repository.ts @@ -1,5 +1,5 @@ import { Service } from 'typedi'; -import { DataSource, Repository } from 'typeorm'; +import { DataSource, Repository } from '@n8n/typeorm'; import { ExecutionMetadata } from '../entities/ExecutionMetadata'; @Service() diff --git a/packages/cli/src/databases/repositories/installedNodes.repository.ts b/packages/cli/src/databases/repositories/installedNodes.repository.ts index 021535c31fd88..6750f5dc84592 100644 --- a/packages/cli/src/databases/repositories/installedNodes.repository.ts +++ b/packages/cli/src/databases/repositories/installedNodes.repository.ts @@ -1,5 +1,5 @@ import { Service } from 'typedi'; -import { DataSource, Repository } from 'typeorm'; +import { DataSource, Repository } from '@n8n/typeorm'; import { InstalledNodes } from '../entities/InstalledNodes'; @Service() diff --git a/packages/cli/src/databases/repositories/installedPackages.repository.ts b/packages/cli/src/databases/repositories/installedPackages.repository.ts index 743528e35fcf9..4dd4baaed5305 100644 --- a/packages/cli/src/databases/repositories/installedPackages.repository.ts +++ b/packages/cli/src/databases/repositories/installedPackages.repository.ts @@ -1,5 +1,5 @@ import { Service } from 'typedi'; -import { DataSource, Repository } from 'typeorm'; +import { DataSource, Repository } from '@n8n/typeorm'; import { InstalledPackages } from '../entities/InstalledPackages'; import { InstalledNodesRepository } from './installedNodes.repository'; import type { PackageDirectoryLoader } from 'n8n-core'; diff --git a/packages/cli/src/databases/repositories/settings.repository.ts b/packages/cli/src/databases/repositories/settings.repository.ts index a213ee78a3018..937b56b2c4300 100644 --- a/packages/cli/src/databases/repositories/settings.repository.ts +++ b/packages/cli/src/databases/repositories/settings.repository.ts @@ -1,6 +1,6 @@ import { EXTERNAL_SECRETS_DB_KEY } from '@/ExternalSecrets/constants'; import { Service } from 'typedi'; -import { DataSource, Repository } from 'typeorm'; +import { DataSource, Repository } from '@n8n/typeorm'; import { ErrorReporterProxy as ErrorReporter } from 'n8n-workflow'; import { Settings } from '../entities/Settings'; import config from '@/config'; diff --git a/packages/cli/src/databases/repositories/sharedCredentials.repository.ts b/packages/cli/src/databases/repositories/sharedCredentials.repository.ts index eb1d194dd2766..f6e5b1946a199 100644 --- a/packages/cli/src/databases/repositories/sharedCredentials.repository.ts +++ b/packages/cli/src/databases/repositories/sharedCredentials.repository.ts @@ -1,6 +1,6 @@ import { Service } from 'typedi'; -import type { EntityManager } from 'typeorm'; -import { DataSource, In, Not, Repository } from 'typeorm'; +import type { EntityManager } from '@n8n/typeorm'; +import { DataSource, In, Not, Repository } from '@n8n/typeorm'; import { type CredentialSharingRole, SharedCredentials } from '../entities/SharedCredentials'; import type { User } from '../entities/User'; diff --git a/packages/cli/src/databases/repositories/sharedWorkflow.repository.ts b/packages/cli/src/databases/repositories/sharedWorkflow.repository.ts index a457efb5a8b7b..3716daa45ecad 100644 --- a/packages/cli/src/databases/repositories/sharedWorkflow.repository.ts +++ b/packages/cli/src/databases/repositories/sharedWorkflow.repository.ts @@ -1,6 +1,6 @@ import { Service } from 'typedi'; -import { DataSource, Repository, In, Not } from 'typeorm'; -import type { EntityManager, FindManyOptions, FindOptionsWhere } from 'typeorm'; +import { DataSource, Repository, In, Not } from '@n8n/typeorm'; +import type { EntityManager, FindManyOptions, FindOptionsWhere } from '@n8n/typeorm'; import { SharedWorkflow, type WorkflowSharingRole } from '../entities/SharedWorkflow'; import { type User } from '../entities/User'; import type { Scope } from '@n8n/permissions'; diff --git a/packages/cli/src/databases/repositories/tag.repository.ts b/packages/cli/src/databases/repositories/tag.repository.ts index ff41a28b03315..1667ff29839f9 100644 --- a/packages/cli/src/databases/repositories/tag.repository.ts +++ b/packages/cli/src/databases/repositories/tag.repository.ts @@ -1,6 +1,6 @@ import { Service } from 'typedi'; -import type { EntityManager } from 'typeorm'; -import { DataSource, In, Repository } from 'typeorm'; +import type { EntityManager } from '@n8n/typeorm'; +import { DataSource, In, Repository } from '@n8n/typeorm'; import { TagEntity } from '../entities/TagEntity'; import type { WorkflowEntity } from '../entities/WorkflowEntity'; import intersection from 'lodash/intersection'; diff --git a/packages/cli/src/databases/repositories/usageMetrics.repository.ts b/packages/cli/src/databases/repositories/usageMetrics.repository.ts index 23f9ef34dc3dd..b0d88fc0a6cc1 100644 --- a/packages/cli/src/databases/repositories/usageMetrics.repository.ts +++ b/packages/cli/src/databases/repositories/usageMetrics.repository.ts @@ -1,6 +1,6 @@ import config from '@/config'; import { Service } from 'typedi'; -import { DataSource, Repository, Entity } from 'typeorm'; +import { DataSource, Repository, Entity } from '@n8n/typeorm'; @Entity() export class UsageMetrics {} diff --git a/packages/cli/src/databases/repositories/user.repository.ts b/packages/cli/src/databases/repositories/user.repository.ts index fd0039bb6c209..6b81f8984bff0 100644 --- a/packages/cli/src/databases/repositories/user.repository.ts +++ b/packages/cli/src/databases/repositories/user.repository.ts @@ -1,6 +1,6 @@ import { Service } from 'typedi'; -import type { EntityManager, FindManyOptions } from 'typeorm'; -import { DataSource, In, IsNull, Not, Repository } from 'typeorm'; +import type { EntityManager, FindManyOptions } from '@n8n/typeorm'; +import { DataSource, In, IsNull, Not, Repository } from '@n8n/typeorm'; import type { ListQuery } from '@/requests'; import { type GlobalRole, User } from '../entities/User'; diff --git a/packages/cli/src/databases/repositories/variables.repository.ts b/packages/cli/src/databases/repositories/variables.repository.ts index d787a8b98431e..e2a321ce576af 100644 --- a/packages/cli/src/databases/repositories/variables.repository.ts +++ b/packages/cli/src/databases/repositories/variables.repository.ts @@ -1,5 +1,5 @@ import { Service } from 'typedi'; -import { DataSource, Repository } from 'typeorm'; +import { DataSource, Repository } from '@n8n/typeorm'; import { Variables } from '../entities/Variables'; @Service() diff --git a/packages/cli/src/databases/repositories/webhook.repository.ts b/packages/cli/src/databases/repositories/webhook.repository.ts index 64bb49a643ecb..9f211ec0ad746 100644 --- a/packages/cli/src/databases/repositories/webhook.repository.ts +++ b/packages/cli/src/databases/repositories/webhook.repository.ts @@ -1,5 +1,5 @@ import { Service } from 'typedi'; -import { DataSource, Repository } from 'typeorm'; +import { DataSource, Repository } from '@n8n/typeorm'; import { WebhookEntity } from '../entities/WebhookEntity'; @Service() diff --git a/packages/cli/src/databases/repositories/workflow.repository.ts b/packages/cli/src/databases/repositories/workflow.repository.ts index addec8802cf65..3331b92f96bee 100644 --- a/packages/cli/src/databases/repositories/workflow.repository.ts +++ b/packages/cli/src/databases/repositories/workflow.repository.ts @@ -11,7 +11,7 @@ import { type EntityManager, type DeleteResult, Not, -} from 'typeorm'; +} from '@n8n/typeorm'; import type { ListQuery } from '@/requests'; import { isStringArray } from '@/utils'; import config from '@/config'; diff --git a/packages/cli/src/databases/repositories/workflowHistory.repository.ts b/packages/cli/src/databases/repositories/workflowHistory.repository.ts index bc21b3dca7d2f..4eb05b60fed1d 100644 --- a/packages/cli/src/databases/repositories/workflowHistory.repository.ts +++ b/packages/cli/src/databases/repositories/workflowHistory.repository.ts @@ -1,5 +1,5 @@ import { Service } from 'typedi'; -import { DataSource, LessThan, Repository } from 'typeorm'; +import { DataSource, LessThan, Repository } from '@n8n/typeorm'; import { WorkflowHistory } from '../entities/WorkflowHistory'; @Service() diff --git a/packages/cli/src/databases/repositories/workflowStatistics.repository.ts b/packages/cli/src/databases/repositories/workflowStatistics.repository.ts index 67601c00f1c40..0faef01840aec 100644 --- a/packages/cli/src/databases/repositories/workflowStatistics.repository.ts +++ b/packages/cli/src/databases/repositories/workflowStatistics.repository.ts @@ -1,5 +1,5 @@ import { Service } from 'typedi'; -import { DataSource, QueryFailedError, Repository } from 'typeorm'; +import { DataSource, QueryFailedError, Repository } from '@n8n/typeorm'; import config from '@/config'; import { StatisticsNames, WorkflowStatistics } from '../entities/WorkflowStatistics'; import type { User } from '@/databases/entities/User'; diff --git a/packages/cli/src/databases/repositories/workflowTagMapping.repository.ts b/packages/cli/src/databases/repositories/workflowTagMapping.repository.ts index e2098b3c621fb..6bf4aa6b2a80e 100644 --- a/packages/cli/src/databases/repositories/workflowTagMapping.repository.ts +++ b/packages/cli/src/databases/repositories/workflowTagMapping.repository.ts @@ -1,5 +1,5 @@ import { Service } from 'typedi'; -import { DataSource, Repository } from 'typeorm'; +import { DataSource, Repository } from '@n8n/typeorm'; import { WorkflowTagMapping } from '../entities/WorkflowTagMapping'; @Service() diff --git a/packages/cli/src/databases/types.ts b/packages/cli/src/databases/types.ts index 25a9363a00be0..e1dc8f20e9b2d 100644 --- a/packages/cli/src/databases/types.ts +++ b/packages/cli/src/databases/types.ts @@ -1,5 +1,5 @@ import type { INodeTypes } from 'n8n-workflow'; -import type { QueryRunner, ObjectLiteral } from 'typeorm'; +import type { QueryRunner, ObjectLiteral } from '@n8n/typeorm'; import type { Logger } from '@/Logger'; import type { createSchemaBuilder } from './dsl'; @@ -60,4 +60,4 @@ export interface Migration extends Function { export type InsertResult = Array<{ insertId: number }>; -export { QueryFailedError } from 'typeorm/error/QueryFailedError'; +export { QueryFailedError } from '@n8n/typeorm/error/QueryFailedError'; diff --git a/packages/cli/src/databases/utils/commandHelpers.ts b/packages/cli/src/databases/utils/commandHelpers.ts index 775d6cb6edcaf..f522da354e1a7 100644 --- a/packages/cli/src/databases/utils/commandHelpers.ts +++ b/packages/cli/src/databases/utils/commandHelpers.ts @@ -1,6 +1,6 @@ import type { WorkflowEntity } from '@db/entities/WorkflowEntity'; import type { CredentialsEntity } from '@db/entities/CredentialsEntity'; -import { getMetadataArgsStorage } from 'typeorm'; +import { getMetadataArgsStorage } from '@n8n/typeorm'; export const disableAutoGeneratedIds = ( entityClass: typeof WorkflowEntity | typeof CredentialsEntity, diff --git a/packages/cli/src/databases/utils/migrationHelpers.ts b/packages/cli/src/databases/utils/migrationHelpers.ts index 5586cba618a47..6909e765fbeb7 100644 --- a/packages/cli/src/databases/utils/migrationHelpers.ts +++ b/packages/cli/src/databases/utils/migrationHelpers.ts @@ -1,8 +1,8 @@ import { Container } from 'typedi'; import { readFileSync, rmSync } from 'fs'; import { InstanceSettings } from 'n8n-core'; -import type { ObjectLiteral } from 'typeorm'; -import type { QueryRunner } from 'typeorm/query-runner/QueryRunner'; +import type { ObjectLiteral } from '@n8n/typeorm'; +import type { QueryRunner } from '@n8n/typeorm/query-runner/QueryRunner'; import { ApplicationError, jsonParse } from 'n8n-workflow'; import config from '@/config'; import { inTest } from '@/constants'; diff --git a/packages/cli/src/databases/utils/transformers.ts b/packages/cli/src/databases/utils/transformers.ts index df084889565df..2ddd784c750c4 100644 --- a/packages/cli/src/databases/utils/transformers.ts +++ b/packages/cli/src/databases/utils/transformers.ts @@ -1,5 +1,5 @@ import { jsonParse } from 'n8n-workflow'; -import type { ValueTransformer, FindOperator } from 'typeorm'; +import type { ValueTransformer, FindOperator } from '@n8n/typeorm'; import config from '@/config'; export const idStringifier = { diff --git a/packages/cli/src/environments/sourceControl/sourceControlImport.service.ee.ts b/packages/cli/src/environments/sourceControl/sourceControlImport.service.ee.ts index fb8e8d22079c9..e4f464d322787 100644 --- a/packages/cli/src/environments/sourceControl/sourceControlImport.service.ee.ts +++ b/packages/cli/src/environments/sourceControl/sourceControlImport.service.ee.ts @@ -18,7 +18,7 @@ import { SharedCredentials } from '@db/entities/SharedCredentials'; import type { WorkflowTagMapping } from '@db/entities/WorkflowTagMapping'; import type { TagEntity } from '@db/entities/TagEntity'; import { ActiveWorkflowRunner } from '@/ActiveWorkflowRunner'; -import { In } from 'typeorm'; +import { In } from '@n8n/typeorm'; import { isUniqueConstraintError } from '@/ResponseHelper'; import type { SourceControlWorkflowVersionId } from './types/sourceControlWorkflowVersionId'; import { getCredentialExportPath, getWorkflowExportPath } from './sourceControlHelper.ee'; diff --git a/packages/cli/src/eventbus/MessageEventBus/MessageEventBus.ts b/packages/cli/src/eventbus/MessageEventBus/MessageEventBus.ts index e6784327c4fe6..6c897cb38d4e6 100644 --- a/packages/cli/src/eventbus/MessageEventBus/MessageEventBus.ts +++ b/packages/cli/src/eventbus/MessageEventBus/MessageEventBus.ts @@ -1,6 +1,6 @@ import { Service } from 'typedi'; -import type { DeleteResult } from 'typeorm'; -import { In } from 'typeorm'; +import type { DeleteResult } from '@n8n/typeorm'; +import { In } from '@n8n/typeorm'; import EventEmitter from 'events'; import uniqby from 'lodash/uniqBy'; import { jsonParse } from 'n8n-workflow'; diff --git a/packages/cli/src/services/userOnboarding.service.ts b/packages/cli/src/services/userOnboarding.service.ts index ab8dbb98c13dc..3f61a4aac03f4 100644 --- a/packages/cli/src/services/userOnboarding.service.ts +++ b/packages/cli/src/services/userOnboarding.service.ts @@ -1,5 +1,5 @@ import { Service } from 'typedi'; -import { In } from 'typeorm'; +import { In } from '@n8n/typeorm'; import type { User } from '@db/entities/User'; import { SharedWorkflowRepository } from '@db/repositories/sharedWorkflow.repository'; diff --git a/packages/cli/src/workflows/workflowSharing.service.ts b/packages/cli/src/workflows/workflowSharing.service.ts index 78f325c719bcb..93df8e0acaf2e 100644 --- a/packages/cli/src/workflows/workflowSharing.service.ts +++ b/packages/cli/src/workflows/workflowSharing.service.ts @@ -1,5 +1,5 @@ import { Service } from 'typedi'; -import { In, type FindOptionsWhere } from 'typeorm'; +import { In, type FindOptionsWhere } from '@n8n/typeorm'; import type { SharedWorkflow, WorkflowSharingRole } from '@db/entities/SharedWorkflow'; import type { User } from '@db/entities/User'; diff --git a/packages/cli/test/integration/controllers/invitation/invitation.controller.integration.test.ts b/packages/cli/test/integration/controllers/invitation/invitation.controller.integration.test.ts index 971360bc05438..b6371fdf9e361 100644 --- a/packages/cli/test/integration/controllers/invitation/invitation.controller.integration.test.ts +++ b/packages/cli/test/integration/controllers/invitation/invitation.controller.integration.test.ts @@ -1,6 +1,6 @@ import { mocked } from 'jest-mock'; import Container from 'typedi'; -import { Not } from 'typeorm'; +import { Not } from '@n8n/typeorm'; import { InternalHooks } from '@/InternalHooks'; import { ExternalHooks } from '@/ExternalHooks'; diff --git a/packages/cli/test/integration/credentials.ee.test.ts b/packages/cli/test/integration/credentials.ee.test.ts index 2e09bc905c1b2..ab09f4c14349e 100644 --- a/packages/cli/test/integration/credentials.ee.test.ts +++ b/packages/cli/test/integration/credentials.ee.test.ts @@ -1,6 +1,6 @@ import { Container } from 'typedi'; import type { SuperAgentTest } from 'supertest'; -import { In } from 'typeorm'; +import { In } from '@n8n/typeorm'; import type { IUser } from 'n8n-workflow'; import type { ListQuery } from '@/requests'; diff --git a/packages/cli/test/integration/ldap/ldap.api.test.ts b/packages/cli/test/integration/ldap/ldap.api.test.ts index d60e51595659d..f3a923d4bd85e 100644 --- a/packages/cli/test/integration/ldap/ldap.api.test.ts +++ b/packages/cli/test/integration/ldap/ldap.api.test.ts @@ -1,7 +1,7 @@ import Container from 'typedi'; import type { SuperAgentTest } from 'supertest'; import type { Entry as LdapUser } from 'ldapts'; -import { Not } from 'typeorm'; +import { Not } from '@n8n/typeorm'; import { jsonParse } from 'n8n-workflow'; import { Cipher } from 'n8n-core'; diff --git a/packages/cli/test/integration/me.api.test.ts b/packages/cli/test/integration/me.api.test.ts index 61dde8c92f97d..08261b7b08297 100644 --- a/packages/cli/test/integration/me.api.test.ts +++ b/packages/cli/test/integration/me.api.test.ts @@ -1,5 +1,5 @@ import type { SuperAgentTest } from 'supertest'; -import { IsNull } from 'typeorm'; +import { IsNull } from '@n8n/typeorm'; import validator from 'validator'; import type { User } from '@db/entities/User'; import { SUCCESS_RESPONSE_BODY } from './shared/constants'; diff --git a/packages/cli/test/integration/shared/db/workflows.ts b/packages/cli/test/integration/shared/db/workflows.ts index 5603db7ab9625..f0758088f1667 100644 --- a/packages/cli/test/integration/shared/db/workflows.ts +++ b/packages/cli/test/integration/shared/db/workflows.ts @@ -1,5 +1,5 @@ import Container from 'typedi'; -import type { DeepPartial } from 'typeorm'; +import type { DeepPartial } from '@n8n/typeorm'; import { v4 as uuid } from 'uuid'; import type { User } from '@db/entities/User'; diff --git a/packages/cli/test/integration/shared/testDb.ts b/packages/cli/test/integration/shared/testDb.ts index 1ed59388951a0..4158daccfe5a2 100644 --- a/packages/cli/test/integration/shared/testDb.ts +++ b/packages/cli/test/integration/shared/testDb.ts @@ -1,5 +1,5 @@ -import type { DataSourceOptions as ConnectionOptions, Repository } from 'typeorm'; -import { DataSource as Connection } from 'typeorm'; +import type { DataSourceOptions as ConnectionOptions, Repository } from '@n8n/typeorm'; +import { DataSource as Connection } from '@n8n/typeorm'; import { Container } from 'typedi'; import type { Class } from 'n8n-core'; diff --git a/packages/cli/test/integration/workflowHistoryManager.test.ts b/packages/cli/test/integration/workflowHistoryManager.test.ts index 181c7c926623c..0b20f77c4b2d0 100644 --- a/packages/cli/test/integration/workflowHistoryManager.test.ts +++ b/packages/cli/test/integration/workflowHistoryManager.test.ts @@ -1,5 +1,5 @@ import Container from 'typedi'; -import { In } from 'typeorm'; +import { In } from '@n8n/typeorm'; import { DateTime } from 'luxon'; import config from '@/config'; diff --git a/packages/cli/test/teardown.ts b/packages/cli/test/teardown.ts index 57ab9334192a5..25fd4e14fe63e 100644 --- a/packages/cli/test/teardown.ts +++ b/packages/cli/test/teardown.ts @@ -1,5 +1,5 @@ import 'tsconfig-paths/register'; -import { DataSource as Connection } from 'typeorm'; +import { DataSource as Connection } from '@n8n/typeorm'; import config from '@/config'; import { getBootstrapDBOptions, testDbPrefix } from './integration/shared/testDb'; diff --git a/packages/cli/test/unit/repositories/execution.repository.test.ts b/packages/cli/test/unit/repositories/execution.repository.test.ts index e101e77557204..57a223df25e2d 100644 --- a/packages/cli/test/unit/repositories/execution.repository.test.ts +++ b/packages/cli/test/unit/repositories/execution.repository.test.ts @@ -1,7 +1,7 @@ import { mock } from 'jest-mock-extended'; import Container from 'typedi'; -import type { EntityMetadata } from 'typeorm'; -import { EntityManager, DataSource, Not, LessThanOrEqual } from 'typeorm'; +import type { EntityMetadata } from '@n8n/typeorm'; +import { EntityManager, DataSource, Not, LessThanOrEqual } from '@n8n/typeorm'; import config from '@/config'; import { ExecutionEntity } from '@db/entities/ExecutionEntity'; diff --git a/packages/cli/test/unit/repositories/sharedCredentials.repository.test.ts b/packages/cli/test/unit/repositories/sharedCredentials.repository.test.ts index f14c2ee3548b4..4a808bfb35da6 100644 --- a/packages/cli/test/unit/repositories/sharedCredentials.repository.test.ts +++ b/packages/cli/test/unit/repositories/sharedCredentials.repository.test.ts @@ -1,5 +1,5 @@ import { Container } from 'typedi'; -import { DataSource, EntityManager, type EntityMetadata } from 'typeorm'; +import { DataSource, EntityManager, type EntityMetadata } from '@n8n/typeorm'; import { mock } from 'jest-mock-extended'; import type { User } from '@db/entities/User'; import type { CredentialsEntity } from '@db/entities/CredentialsEntity'; diff --git a/packages/cli/test/unit/repositories/workflowStatistics.test.ts b/packages/cli/test/unit/repositories/workflowStatistics.test.ts index 7aa0280600aab..ea56b2d84c8ed 100644 --- a/packages/cli/test/unit/repositories/workflowStatistics.test.ts +++ b/packages/cli/test/unit/repositories/workflowStatistics.test.ts @@ -1,5 +1,5 @@ import { WorkflowStatisticsRepository } from '@db/repositories/workflowStatistics.repository'; -import { DataSource, EntityManager, InsertResult, QueryFailedError } from 'typeorm'; +import { DataSource, EntityManager, InsertResult, QueryFailedError } from '@n8n/typeorm'; import { mockInstance } from '../../shared/mocking'; import { mock, mockClear } from 'jest-mock-extended'; import { StatisticsNames, WorkflowStatistics } from '@/databases/entities/WorkflowStatistics'; diff --git a/packages/cli/test/unit/services/events.service.test.ts b/packages/cli/test/unit/services/events.service.test.ts index 6504b691e80dd..afdd4091d3186 100644 --- a/packages/cli/test/unit/services/events.service.test.ts +++ b/packages/cli/test/unit/services/events.service.test.ts @@ -4,7 +4,7 @@ import { type DataSource, type EntityManager, type EntityMetadata, -} from 'typeorm'; +} from '@n8n/typeorm'; import { mocked } from 'jest-mock'; import { mock } from 'jest-mock-extended'; diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 59430b9326328..98f5f0d9290c0 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -196,6 +196,9 @@ importers: '@langchain/mistralai': specifier: 0.0.6 version: 0.0.6 + '@n8n/typeorm': + specifier: 0.3.20 + version: 0.3.20(mssql@9.1.1)(pg@8.11.3)(redis@4.6.12)(sqlite3@5.1.7) '@n8n/vm2': specifier: 3.9.20 version: 3.9.20 @@ -231,7 +234,7 @@ importers: version: 1.2.0 langchain: specifier: 0.0.198 - version: 0.0.198(@aws-sdk/client-bedrock-runtime@3.454.0)(@aws-sdk/credential-provider-node@3.451.0)(@getzep/zep-js@0.9.0)(@google-ai/generativelanguage@0.2.1)(@huggingface/inference@2.6.4)(@pinecone-database/pinecone@1.1.2)(@qdrant/js-client-rest@1.7.0)(@supabase/supabase-js@2.38.5)(@xata.io/client@0.25.3)(axios@1.6.7)(cohere-ai@6.2.2)(d3-dsv@2.0.0)(epub2@3.0.1)(html-to-text@9.0.5)(lodash@4.17.21)(mammoth@1.6.0)(pdf-parse@1.1.1)(pg@8.11.3)(redis@4.6.12)(typeorm@0.3.20) + version: 0.0.198(@aws-sdk/client-bedrock-runtime@3.454.0)(@aws-sdk/credential-provider-node@3.451.0)(@getzep/zep-js@0.9.0)(@google-ai/generativelanguage@0.2.1)(@huggingface/inference@2.6.4)(@pinecone-database/pinecone@1.1.2)(@qdrant/js-client-rest@1.7.0)(@supabase/supabase-js@2.38.5)(@xata.io/client@0.25.3)(axios@1.6.7)(cohere-ai@6.2.2)(d3-dsv@2.0.0)(epub2@3.0.1)(html-to-text@9.0.5)(lodash@4.17.21)(mammoth@1.6.0)(pdf-parse@1.1.1)(pg@8.11.3)(redis@4.6.12) lodash: specifier: 4.17.21 version: 4.17.21 @@ -265,9 +268,6 @@ importers: temp: specifier: 0.9.4 version: 0.9.4 - typeorm: - specifier: 0.3.20 - version: 0.3.20(mssql@9.1.1)(pg@8.11.3)(redis@4.6.12)(sqlite3@5.1.7) zod: specifier: 3.22.4 version: 3.22.4 @@ -373,6 +373,9 @@ importers: '@n8n/permissions': specifier: workspace:* version: link:../@n8n/permissions + '@n8n/typeorm': + specifier: 0.3.20 + version: 0.3.20(ioredis@5.3.2)(mysql2@2.3.3)(pg@8.11.3)(sqlite3@5.1.7) '@n8n_io/license-sdk': specifier: 2.9.1 version: 2.9.1 @@ -610,9 +613,6 @@ importers: typedi: specifier: 0.10.0 version: 0.10.0(patch_hash=sk6omkefrosihg7lmqbzh7vfxe) - typeorm: - specifier: 0.3.20 - version: 0.3.20(ioredis@5.3.2)(mysql2@2.3.3)(pg@8.11.3)(sqlite3@5.1.7) uuid: specifier: 8.3.2 version: 8.3.2 @@ -6131,6 +6131,166 @@ packages: recast: 0.22.0 dev: false + /@n8n/typeorm@0.3.20(ioredis@5.3.2)(mysql2@2.3.3)(pg@8.11.3)(sqlite3@5.1.7): + resolution: {integrity: sha512-8UQOwlKPHchtgMaYnN09WzqIw8/E8g5ggLjM+9XFxWAmbSLhW9a9PoYaackNotdNpvTa3uU/LXT+4sp8Pn5d2w==} + engines: {node: '>=16.13.0'} + hasBin: true + peerDependencies: + '@google-cloud/spanner': ^5.18.0 + '@sap/hana-client': ^2.12.25 + better-sqlite3: ^7.1.2 || ^8.0.0 || ^9.0.0 + hdb-pool: ^0.1.6 + ioredis: ^5.0.4 + mongodb: ^5.8.0 + mssql: ^9.1.1 || ^10.0.1 + mysql2: ^2.2.5 || ^3.0.1 + oracledb: ^6.3.0 + pg: ^8.5.1 + pg-native: ^3.0.0 + pg-query-stream: ^4.0.0 + redis: ^3.1.1 || ^4.0.0 + sql.js: ^1.4.0 + sqlite3: ^5.0.3 + ts-node: ^10.7.0 + typeorm-aurora-data-api-driver: ^2.0.0 + peerDependenciesMeta: + '@google-cloud/spanner': + optional: true + '@sap/hana-client': + optional: true + better-sqlite3: + optional: true + hdb-pool: + optional: true + ioredis: + optional: true + mongodb: + optional: true + mssql: + optional: true + mysql2: + optional: true + oracledb: + optional: true + pg: + optional: true + pg-native: + optional: true + pg-query-stream: + optional: true + redis: + optional: true + sql.js: + optional: true + sqlite3: + optional: true + ts-node: + optional: true + typeorm-aurora-data-api-driver: + optional: true + dependencies: + '@sqltools/formatter': 1.2.5 + app-root-path: 3.1.0 + buffer: 6.0.3 + chalk: 4.1.2 + dayjs: 1.11.10 + debug: 4.3.4(supports-color@8.1.1) + dotenv: 16.3.1 + glob: 10.3.10 + ioredis: 5.3.2 + mkdirp: 2.1.3 + mysql2: 2.3.3 + pg: 8.11.3 + reflect-metadata: 0.2.1 + sha.js: 2.4.11 + sqlite3: 5.1.7 + tslib: 2.6.1 + uuid: 9.0.0 + yargs: 17.7.2 + transitivePeerDependencies: + - supports-color + dev: false + + /@n8n/typeorm@0.3.20(mssql@9.1.1)(pg@8.11.3)(redis@4.6.12)(sqlite3@5.1.7): + resolution: {integrity: sha512-8UQOwlKPHchtgMaYnN09WzqIw8/E8g5ggLjM+9XFxWAmbSLhW9a9PoYaackNotdNpvTa3uU/LXT+4sp8Pn5d2w==} + engines: {node: '>=16.13.0'} + hasBin: true + peerDependencies: + '@google-cloud/spanner': ^5.18.0 + '@sap/hana-client': ^2.12.25 + better-sqlite3: ^7.1.2 || ^8.0.0 || ^9.0.0 + hdb-pool: ^0.1.6 + ioredis: ^5.0.4 + mongodb: ^5.8.0 + mssql: ^9.1.1 || ^10.0.1 + mysql2: ^2.2.5 || ^3.0.1 + oracledb: ^6.3.0 + pg: ^8.5.1 + pg-native: ^3.0.0 + pg-query-stream: ^4.0.0 + redis: ^3.1.1 || ^4.0.0 + sql.js: ^1.4.0 + sqlite3: ^5.0.3 + ts-node: ^10.7.0 + typeorm-aurora-data-api-driver: ^2.0.0 + peerDependenciesMeta: + '@google-cloud/spanner': + optional: true + '@sap/hana-client': + optional: true + better-sqlite3: + optional: true + hdb-pool: + optional: true + ioredis: + optional: true + mongodb: + optional: true + mssql: + optional: true + mysql2: + optional: true + oracledb: + optional: true + pg: + optional: true + pg-native: + optional: true + pg-query-stream: + optional: true + redis: + optional: true + sql.js: + optional: true + sqlite3: + optional: true + ts-node: + optional: true + typeorm-aurora-data-api-driver: + optional: true + dependencies: + '@sqltools/formatter': 1.2.5 + app-root-path: 3.1.0 + buffer: 6.0.3 + chalk: 4.1.2 + dayjs: 1.11.10 + debug: 4.3.4(supports-color@8.1.1) + dotenv: 16.3.1 + glob: 10.3.10 + mkdirp: 2.1.3 + mssql: 9.1.1 + pg: 8.11.3 + redis: 4.6.12 + reflect-metadata: 0.2.1 + sha.js: 2.4.11 + sqlite3: 5.1.7 + tslib: 2.6.1 + uuid: 9.0.0 + yargs: 17.7.2 + transitivePeerDependencies: + - supports-color + dev: false + /@n8n/vm2@3.9.20: resolution: {integrity: sha512-qk2oJYkuFRVSTxoro4obX/sv/wT1pViZjHh/isjOvFB93D52QIg3TCjMPsHOfHTmkxCKJffjLrUvjIwvWzSMCQ==} engines: {node: '>=18.10', pnpm: '>=8.6.12'} @@ -11601,10 +11761,6 @@ packages: resolution: {integrity: sha512-QXu7BPrP29VllRxH8GwB7x5iX5qWKAAMLqKQGWTeLWVlNHNOpVMJ91dsxQAIWXpjuW5wqvxu3Jd/nRjrJ+0pqg==} dev: false - /any-promise@1.3.0: - resolution: {integrity: sha512-7UvmKalWRt1wgjL1RrGxoSJW/0QZFIegpeGvZG9kjp8vrRu55XTHbwnqq2GpXm9uLbcuhxm3IqX9OB4MZR1b2A==} - dev: false - /anymatch@2.0.0: resolution: {integrity: sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==} dependencies: @@ -12888,19 +13044,6 @@ packages: dependencies: restore-cursor: 3.1.0 - /cli-highlight@2.1.11: - resolution: {integrity: sha512-9KDcoEVwyUXrjcJNvHD0NFc/hiwe/WPVYIleQh2O1N2Zro5gWJZ/K+3DGn8w8P/F6FxOgzyC5bxDyHIgCSPhGg==} - engines: {node: '>=8.0.0', npm: '>=5.0.0'} - hasBin: true - dependencies: - chalk: 4.1.2 - highlight.js: 10.7.3 - mz: 2.7.0 - parse5: 5.1.1 - parse5-htmlparser2-tree-adapter: 6.0.1 - yargs: 16.2.0 - dev: false - /cli-progress@3.12.0: resolution: {integrity: sha512-tRkV3HJ1ASwm19THiiLIXLO7Im7wlTuKnvkYaTkyoAPefqjNg7W7DHKUlGRxy9vxDvbyCYQkQozvptuMkGCg8A==} engines: {node: '>=4'} @@ -16644,10 +16787,6 @@ packages: resolution: {integrity: sha512-QFLV0taWQOZtvIRIAdBChesmogZrtuXvVWsFHZTk2SU+anspqZ2vMnoLg7IE1+Uk16N19APic1BuF8bC8c2m5g==} engines: {node: '>=8'} - /highlight.js@10.7.3: - resolution: {integrity: sha512-tzcUFauisWKNHaRkN4Wjl/ZA07gENAjFl3J/c480dprkGTg5EQstgaNFqBfUqCq54kZRIEcreTsAgF/m2quD7A==} - dev: false - /highlight.js@11.9.0: resolution: {integrity: sha512-fJ7cW7fQGCYAkgv4CPfwFHrfd/cLS4Hau96JuJ+ZTOWhjnhoeN1ub1tFmALm/+lW5z4WCAuAV9bm05AP0mS6Gw==} engines: {node: '>=12.0.0'} @@ -18662,7 +18801,7 @@ packages: resolution: {integrity: sha512-Xq9nH7KlWZmXAtodXDDRE7vs6DU1gTU8zYDHDiWLSip45Egwq3plLHzPn27NgvzL2r1LMPC1vdqh98sQxtqj4A==} dev: false - /langchain@0.0.198(@aws-sdk/client-bedrock-runtime@3.454.0)(@aws-sdk/credential-provider-node@3.451.0)(@getzep/zep-js@0.9.0)(@google-ai/generativelanguage@0.2.1)(@huggingface/inference@2.6.4)(@pinecone-database/pinecone@1.1.2)(@qdrant/js-client-rest@1.7.0)(@supabase/supabase-js@2.38.5)(@xata.io/client@0.25.3)(axios@1.6.7)(cohere-ai@6.2.2)(d3-dsv@2.0.0)(epub2@3.0.1)(html-to-text@9.0.5)(lodash@4.17.21)(mammoth@1.6.0)(pdf-parse@1.1.1)(pg@8.11.3)(redis@4.6.12)(typeorm@0.3.20): + /langchain@0.0.198(@aws-sdk/client-bedrock-runtime@3.454.0)(@aws-sdk/credential-provider-node@3.451.0)(@getzep/zep-js@0.9.0)(@google-ai/generativelanguage@0.2.1)(@huggingface/inference@2.6.4)(@pinecone-database/pinecone@1.1.2)(@qdrant/js-client-rest@1.7.0)(@supabase/supabase-js@2.38.5)(@xata.io/client@0.25.3)(axios@1.6.7)(cohere-ai@6.2.2)(d3-dsv@2.0.0)(epub2@3.0.1)(html-to-text@9.0.5)(lodash@4.17.21)(mammoth@1.6.0)(pdf-parse@1.1.1)(pg@8.11.3)(redis@4.6.12): resolution: {integrity: sha512-YC0O1g8r61InCWyF5NmiQjdghdq6LKcgMrDZtqLbgDxAe4RoSldonm+5oNXS3yjCISG0j3s5Cty+yB7klqvUpg==} engines: {node: '>=18'} peerDependencies: @@ -19001,7 +19140,6 @@ packages: pdf-parse: 1.1.1 pg: 8.11.3 redis: 4.6.12 - typeorm: 0.3.20(mssql@9.1.1)(pg@8.11.3)(redis@4.6.12)(sqlite3@5.1.7) uuid: 9.0.0 yaml: 2.3.4 zod: 3.22.4 @@ -20305,14 +20443,6 @@ packages: sqlstring: 2.3.3 dev: false - /mz@2.7.0: - resolution: {integrity: sha512-z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q==} - dependencies: - any-promise: 1.3.0 - object-assign: 4.1.1 - thenify-all: 1.6.0 - dev: false - /named-placeholders@1.1.2: resolution: {integrity: sha512-wiFWqxoLL3PGVReSZpjLVxyJ1bRqe+KKJVbr4hGs1KWfTZTQyezHFBbuKj9hsizHyGV2ne7EMjHdxEGAybD5SA==} engines: {node: '>=6.0.0'} @@ -21238,10 +21368,6 @@ packages: parse5: 6.0.1 dev: false - /parse5@5.1.1: - resolution: {integrity: sha512-ugq4DFI0Ptb+WWjAdOK16+u/nHfiIrcE+sh8kZMaM0WllQKLI9rOUq6c2b7cwPkXdzfQESqvoqK6ug7U/Yyzug==} - dev: false - /parse5@6.0.1: resolution: {integrity: sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw==} dev: false @@ -23607,17 +23733,10 @@ packages: resolution: {integrity: sha512-hr3Wtp/GZIc/6DAGPDcV4/9WoZhjrkXsi5B/07QgX8tsdc6ilr7BFM6PM6rbdAX1kFSDYeZGLipIZZKyQP0O5Q==} dev: false - /serialize-javascript@6.0.1: - resolution: {integrity: sha512-owoXEFjWRllis8/M1Q+Cw5k8ZH40e3zhp/ovX+Xr/vi1qj6QesbyXXViFbpNvWvPNAD62SutwEXavefrLJWj7w==} - dependencies: - randombytes: 2.1.0 - dev: true - /serialize-javascript@6.0.2: resolution: {integrity: sha512-Saa1xPByTTq2gdeFZYLLo+RFE35NHZkAbqZeWNd3BpzppeVisAqpDjcp8dyf6uIvEqJRd46jemmyA4iFIeVk8g==} dependencies: randombytes: 2.1.0 - dev: false /serve-static@1.15.0: resolution: {integrity: sha512-XGuRDNjXUijsUL0vl6nSD7cwURuzEgglbOaFuZM9g3kwDXOWVTck0jLzjPzGD+TazWbboZYu52/9/XPdUgne9g==} @@ -24862,7 +24981,7 @@ packages: esbuild: 0.18.17 jest-worker: 27.5.1 schema-utils: 3.1.1 - serialize-javascript: 6.0.1 + serialize-javascript: 6.0.2 terser: 5.16.1 webpack: 5.75.0(esbuild@0.18.17) dev: true @@ -24895,19 +25014,6 @@ packages: resolution: {integrity: sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==} dev: true - /thenify-all@1.6.0: - resolution: {integrity: sha512-RNxQH/qI8/t3thXJDwcstUO4zeqo64+Uy/+sNVRBx4Xn2OX+OZ9oP+iJnNFqplFra2ZUVeKCSa2oVWi3T4uVmA==} - engines: {node: '>=0.8'} - dependencies: - thenify: 3.3.1 - dev: false - - /thenify@3.3.1: - resolution: {integrity: sha512-RVZSIV5IG10Hk3enotrhvz0T9em6cyHBLkH/YAZuKqd8hRkKhSfCGIcP2KUY0EPxndzANBmNllzWPwak+bheSw==} - dependencies: - any-promise: 1.3.0 - dev: false - /thirty-two@1.0.2: resolution: {integrity: sha512-OEI0IWCe+Dw46019YLl6V10Us5bi574EvlJEOcAkB29IzQ/mYD1A6RyNHLjZPiHCmuodxvgF6U+vZO1L15lxVA==} engines: {node: '>=0.2.6'} @@ -25440,168 +25546,6 @@ packages: dev: false patched: true - /typeorm@0.3.20(ioredis@5.3.2)(mysql2@2.3.3)(pg@8.11.3)(sqlite3@5.1.7): - resolution: {integrity: sha512-sJ0T08dV5eoZroaq9uPKBoNcGslHBR4E4y+EBHs//SiGbblGe7IeduP/IH4ddCcj0qp3PHwDwGnuvqEAnKlq/Q==} - engines: {node: '>=16.13.0'} - hasBin: true - peerDependencies: - '@google-cloud/spanner': ^5.18.0 - '@sap/hana-client': ^2.12.25 - better-sqlite3: ^7.1.2 || ^8.0.0 || ^9.0.0 - hdb-pool: ^0.1.6 - ioredis: ^5.0.4 - mongodb: ^5.8.0 - mssql: ^9.1.1 || ^10.0.1 - mysql2: ^2.2.5 || ^3.0.1 - oracledb: ^6.3.0 - pg: ^8.5.1 - pg-native: ^3.0.0 - pg-query-stream: ^4.0.0 - redis: ^3.1.1 || ^4.0.0 - sql.js: ^1.4.0 - sqlite3: ^5.0.3 - ts-node: ^10.7.0 - typeorm-aurora-data-api-driver: ^2.0.0 - peerDependenciesMeta: - '@google-cloud/spanner': - optional: true - '@sap/hana-client': - optional: true - better-sqlite3: - optional: true - hdb-pool: - optional: true - ioredis: - optional: true - mongodb: - optional: true - mssql: - optional: true - mysql2: - optional: true - oracledb: - optional: true - pg: - optional: true - pg-native: - optional: true - pg-query-stream: - optional: true - redis: - optional: true - sql.js: - optional: true - sqlite3: - optional: true - ts-node: - optional: true - typeorm-aurora-data-api-driver: - optional: true - dependencies: - '@sqltools/formatter': 1.2.5 - app-root-path: 3.1.0 - buffer: 6.0.3 - chalk: 4.1.2 - cli-highlight: 2.1.11 - dayjs: 1.11.10 - debug: 4.3.4(supports-color@8.1.1) - dotenv: 16.3.1 - glob: 10.3.10 - ioredis: 5.3.2 - mkdirp: 2.1.3 - mysql2: 2.3.3 - pg: 8.11.3 - reflect-metadata: 0.2.1 - sha.js: 2.4.11 - sqlite3: 5.1.7 - tslib: 2.6.1 - uuid: 9.0.0 - yargs: 17.7.2 - transitivePeerDependencies: - - supports-color - dev: false - - /typeorm@0.3.20(mssql@9.1.1)(pg@8.11.3)(redis@4.6.12)(sqlite3@5.1.7): - resolution: {integrity: sha512-sJ0T08dV5eoZroaq9uPKBoNcGslHBR4E4y+EBHs//SiGbblGe7IeduP/IH4ddCcj0qp3PHwDwGnuvqEAnKlq/Q==} - engines: {node: '>=16.13.0'} - hasBin: true - peerDependencies: - '@google-cloud/spanner': ^5.18.0 - '@sap/hana-client': ^2.12.25 - better-sqlite3: ^7.1.2 || ^8.0.0 || ^9.0.0 - hdb-pool: ^0.1.6 - ioredis: ^5.0.4 - mongodb: ^5.8.0 - mssql: ^9.1.1 || ^10.0.1 - mysql2: ^2.2.5 || ^3.0.1 - oracledb: ^6.3.0 - pg: ^8.5.1 - pg-native: ^3.0.0 - pg-query-stream: ^4.0.0 - redis: ^3.1.1 || ^4.0.0 - sql.js: ^1.4.0 - sqlite3: ^5.0.3 - ts-node: ^10.7.0 - typeorm-aurora-data-api-driver: ^2.0.0 - peerDependenciesMeta: - '@google-cloud/spanner': - optional: true - '@sap/hana-client': - optional: true - better-sqlite3: - optional: true - hdb-pool: - optional: true - ioredis: - optional: true - mongodb: - optional: true - mssql: - optional: true - mysql2: - optional: true - oracledb: - optional: true - pg: - optional: true - pg-native: - optional: true - pg-query-stream: - optional: true - redis: - optional: true - sql.js: - optional: true - sqlite3: - optional: true - ts-node: - optional: true - typeorm-aurora-data-api-driver: - optional: true - dependencies: - '@sqltools/formatter': 1.2.5 - app-root-path: 3.1.0 - buffer: 6.0.3 - chalk: 4.1.2 - cli-highlight: 2.1.11 - dayjs: 1.11.10 - debug: 4.3.4(supports-color@8.1.1) - dotenv: 16.3.1 - glob: 10.3.10 - mkdirp: 2.1.3 - mssql: 9.1.1 - pg: 8.11.3 - redis: 4.6.12 - reflect-metadata: 0.2.1 - sha.js: 2.4.11 - sqlite3: 5.1.7 - tslib: 2.6.1 - uuid: 9.0.0 - yargs: 17.7.2 - transitivePeerDependencies: - - supports-color - dev: false - /typescript@5.3.2: resolution: {integrity: sha512-6l+RyNy7oAHDfxC4FzSJcz9vnjTKxrLpDG5M2Vu4SHRVNg6xzqZp6LYSR9zjqQTu8DU/f5xwxUdADOkbrIX2gQ==} engines: {node: '>=14.17'} @@ -27026,19 +26970,6 @@ packages: object.assign: 4.1.4 dev: true - /yargs@16.2.0: - resolution: {integrity: sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==} - engines: {node: '>=10'} - dependencies: - cliui: 7.0.4 - escalade: 3.1.1 - get-caller-file: 2.0.5 - require-directory: 2.1.1 - string-width: 4.2.3 - y18n: 5.0.8 - yargs-parser: 20.2.9 - dev: false - /yargs@17.0.1: resolution: {integrity: sha512-xBBulfCc8Y6gLFcrPvtqKz9hz8SO0l1Ni8GgDekvBX2ro0HRQImDGnikfc33cgzcYUSncapnNcZDjVFIH3f6KQ==} engines: {node: '>=12'}