n8n 2.43.3 → 2.44.0

package/dist/modules/community-packages/community-node.command.d.ts

@@ -25,7 +25,7 @@ export declare class CommunityNode extends BaseCommand<z.infer<typeof flagsSchem
     uninstallCredential(credentialType: string, userId: string): Promise<void>;
     findUserById(userId: string): Promise<User | null>;
     findCredentialsByType(credentialType: string): Promise<import("@n8n/db").CredentialsEntity[]>;
-    deleteCredential(user: User, credentialId: string): Promise<void>;
+    deleteCredential(user: User, credentialId: string): Promise<boolean>;
     uninstallPackage(packageName: string): Promise<void>;
     pruneDependencies(): Promise<void>;
     deleteCommunityNode(node: InstalledNodes): Promise<import("@n8n/typeorm").DeleteResult>;

package/dist/modules/community-packages/community-packages.config.d.ts

@@ -7,7 +7,7 @@ export declare class CommunityPackagesConfig {
     preventLoading: boolean;
     authToken: string;
     readonly aiNodeSdkVersion: number;
-    readonly nodesApiVersion: number;
+    readonly nodesApiVersion: string;
     private disabledModules;
     sanitize(): void;
 }

package/dist/modules/community-packages/community-packages.service.js

@@ -210,11 +210,11 @@ let CommunityPackagesService = class CommunityPackagesService {
         const check = (0, n8n_workflow_1.checkNodesApiVersion)(packageJson);
         if (check.compatible)
             return;
-        const isMalformed = check.reason === 'malformed';
-        throw new incompatible_nodes_api_version_error_1.IncompatibleNodesApiVersionError(isMalformed
-            ? `This community node declares an invalid n8n node API version (${JSON.stringify(check.declared)}). Install a version of the package with valid metadata or contact the package author.`
-            : "This community node isn't compatible with your version of n8n. Update n8n to use it.", {
-            requiredNodesApiVersion: isMalformed ? null : Number(check.declared),
+        if (check.reason === 'malformed') {
+            throw new incompatible_nodes_api_version_error_1.IncompatibleNodesApiVersionError(`This community node declares an invalid n8n node API version (${JSON.stringify(check.declared)}). Install a version of the package with valid metadata or contact the package author.`, { requiredNodesApiVersion: null, supportedNodesApiVersion: n8n_workflow_1.N8N_NODES_API_VERSION });
+        }
+        throw new incompatible_nodes_api_version_error_1.IncompatibleNodesApiVersionError("This community node isn't compatible with your version of n8n. Update n8n to use it.", {
+            requiredNodesApiVersion: check.required,
             supportedNodesApiVersion: n8n_workflow_1.N8N_NODES_API_VERSION,
         });
     }
@@ -250,7 +250,7 @@ let CommunityPackagesService = class CommunityPackagesService {
             if (apiVersionCheck && !apiVersionCheck.compatible) {
                 const requirement = apiVersionCheck.reason === 'malformed'
                     ? `an invalid n8nNodesApiVersion (${JSON.stringify(apiVersionCheck.declared)})`
-                    : `node API version ${String(apiVersionCheck.declared)}, but this n8n version supports up to ${n8n_workflow_1.N8N_NODES_API_VERSION}`;
+                    : `node API version ${apiVersionCheck.required}, but this n8n version supports up to ${n8n_workflow_1.N8N_NODES_API_VERSION}`;
                 this.logger.warn(`Not reinstalling package "${installedPackage.packageName}": it requires ${requirement}. Upgrade n8n to use this package, or uninstall it in Settings > Community nodes.`);
                 continue;
             }

package/dist/modules/community-packages/community-packages.service.js.map

@@ -1 +1 @@
-{"version":3,"file":"community-packages.service.js","sourceRoot":"","sources":["../../../src/modules/community-packages/community-packages.service.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"community-packages.service.js","sourceRoot":"","sources":["../../../src/modules/community-packages/community-packages.service.ts"],"names":[],"mappings":"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"}

package/dist/modules/data-table/data-table-column.repository.d.ts

@@ -1,18 +1,26 @@
 import { DataTableCreateColumnSchema } from '@n8n/api-types';
-import { DataSource, EntityManager, Repository } from '@n8n/typeorm';
+import { BaseRepository, type OperationContext, TransactionRunner } from '@n8n/db';
+import { DataSource, EntityManager } from '@n8n/typeorm';
 import { DataTableColumn } from './data-table-column.entity';
 import { DataTableDDLService } from './data-table-ddl.service';
 import { DataTable } from './data-table.entity';
-export declare class DataTableColumnRepository extends Repository<DataTableColumn> {
+export declare class DataTableColumnRepository extends BaseRepository<DataTableColumn> {
     private ddlService;
-    constructor(dataSource: DataSource, ddlService: DataTableDDLService);
+    constructor(dataSource: DataSource, ddlService: DataTableDDLService, transactionRunner: TransactionRunner);
     private validateNotSystemColumn;
     private validateUniqueColumnName;
     getColumns(dataTableId: string, trx?: EntityManager): Promise<DataTableColumn[]>;
+    findTableIdsByColumnIds(columnIds: string[]): Promise<Array<Pick<DataTableColumn, 'id' | 'dataTableId'>>>;
     getColumnByIdOrFail(dataTableId: string, columnId: string): Promise<DataTableColumn>;
     private normalizeAddColumnIndex;
-    addColumn(dataTableId: string, schema: DataTableCreateColumnSchema, trx?: EntityManager): Promise<DataTableColumn>;
+    addColumn(dataTableId: string, schema: DataTableCreateColumnSchema, trx?: EntityManager, explicitId?: string): Promise<DataTableColumn>;
     deleteColumn(dataTableId: string, column: DataTableColumn, trx?: EntityManager): Promise<void>;
+    replaceSchema(dataTableId: string, projectId: string, schema: {
+        name: string;
+        columns: Array<Pick<DataTableColumn, 'name' | 'type'> & {
+            id?: string;
+        }>;
+    }, ctx?: OperationContext): Promise<void>;
     moveColumn(dataTableId: string, column: DataTableColumn, targetIndex: number, trx?: EntityManager): Promise<void>;
     renameColumn(dataTableId: string, column: DataTableColumn, newName: string, trx?: EntityManager): Promise<{
         id: string;

package/dist/modules/data-table/data-table-column.repository.js

@@ -19,11 +19,13 @@ const data_table_ddl_service_1 = require("./data-table-ddl.service");
 const data_table_entity_1 = require("./data-table.entity");
 const data_table_column_name_conflict_error_1 = require("./errors/data-table-column-name-conflict.error");
 const data_table_column_not_found_error_1 = require("./errors/data-table-column-not-found.error");
+const data_table_not_found_error_1 = require("./errors/data-table-not-found.error");
 const data_table_system_column_name_conflict_error_1 = require("./errors/data-table-system-column-name-conflict.error");
 const data_table_validation_error_1 = require("./errors/data-table-validation.error");
-let DataTableColumnRepository = class DataTableColumnRepository extends typeorm_1.Repository {
-    constructor(dataSource, ddlService) {
-        super(data_table_column_entity_1.DataTableColumn, dataSource.manager);
+const pair_columns_1 = require("./utils/pair-columns");
+let DataTableColumnRepository = class DataTableColumnRepository extends db_1.BaseRepository {
+    constructor(dataSource, ddlService, transactionRunner) {
+        super(data_table_column_entity_1.DataTableColumn, dataSource.manager, transactionRunner);
         this.ddlService = ddlService;
     }
     validateNotSystemColumn(columnName) {
@@ -57,6 +59,9 @@ let DataTableColumnRepository = class DataTableColumnRepository extends typeorm_
         columns.sort((a, b) => a.index - b.index);
         return columns;
     }
+    async findTableIdsByColumnIds(columnIds) {
+        return await this.find({ select: ['id', 'dataTableId'], where: { id: (0, typeorm_1.In)(columnIds) } });
+    }
     async getColumnByIdOrFail(dataTableId, columnId) {
         const column = await this.findOneBy({ id: columnId, dataTableId });
         if (!column) {
@@ -73,7 +78,7 @@ let DataTableColumnRepository = class DataTableColumnRepository extends typeorm_
         }
         return index;
     }
-    async addColumn(dataTableId, schema, trx) {
+    async addColumn(dataTableId, schema, trx, explicitId) {
         return await (0, db_1.withTransaction)(this.manager, trx, async (em) => {
             this.validateNotSystemColumn(schema.name);
             await this.validateUniqueColumnName(schema.name, dataTableId, em);
@@ -84,7 +89,10 @@ let DataTableColumnRepository = class DataTableColumnRepository extends typeorm_
                 await this.shiftColumns(dataTableId, schema.index, 1, em);
             }
             const column = em.create(data_table_column_entity_1.DataTableColumn, {
-                ...schema,
+                id: explicitId,
+                name: schema.name,
+                type: schema.type,
+                index: schema.index,
                 dataTableId,
             });
             await em.insert(data_table_column_entity_1.DataTableColumn, column);
@@ -99,6 +107,43 @@ let DataTableColumnRepository = class DataTableColumnRepository extends typeorm_
             await this.shiftColumns(dataTableId, column.index, -1, em);
         });
     }
+    async replaceSchema(dataTableId, projectId, schema, ctx = {}) {
+        await this.runInTransaction(ctx, async (em) => {
+            if (!(await em.existsBy(data_table_entity_1.DataTable, { id: dataTableId, projectId }))) {
+                throw new data_table_not_found_error_1.DataTableNotFoundError(dataTableId);
+            }
+            const targetColumns = await this.getColumns(dataTableId, em);
+            const { pairs } = (0, pair_columns_1.pairDataTableColumns)(schema.columns, targetColumns);
+            const keptPairs = pairs.filter(({ source, target }) => source.type === target.type);
+            const renames = (0, pair_columns_1.orderColumnRenames)(pairs);
+            if (renames.blocked.length > 0) {
+                throw new n8n_workflow_1.UnexpectedError('Column name swaps and cycles must be rejected before this point');
+            }
+            const keptTargets = new Set(keptPairs.map(({ target }) => target));
+            for (const column of targetColumns) {
+                if (!keptTargets.has(column))
+                    await this.deleteColumn(dataTableId, column, em);
+            }
+            for (const { source, target } of renames.ordered) {
+                await this.renameColumn(dataTableId, target, source.name, em);
+            }
+            const keptSources = new Set(keptPairs.map(({ source }) => source));
+            for (const column of schema.columns) {
+                if (keptSources.has(column))
+                    continue;
+                await this.addColumn(dataTableId, { name: column.name, type: column.type }, em, column.id);
+            }
+            for (const { source, target } of keptPairs) {
+                if (source.id !== undefined && source.id !== target.id) {
+                    await em.update(data_table_column_entity_1.DataTableColumn, { id: target.id, dataTableId }, { id: source.id });
+                }
+            }
+            for (const [index, { name }] of schema.columns.entries()) {
+                await em.update(data_table_column_entity_1.DataTableColumn, { dataTableId, name }, { index });
+            }
+            await em.update(data_table_entity_1.DataTable, { id: dataTableId, projectId }, { name: schema.name, updatedAt: new Date() });
+        });
+    }
     async moveColumn(dataTableId, column, targetIndex, trx) {
         await (0, db_1.withTransaction)(this.manager, trx, async (em) => {
             const columnCount = await em.countBy(data_table_column_entity_1.DataTableColumn, { dataTableId });
@@ -142,6 +187,6 @@ let DataTableColumnRepository = class DataTableColumnRepository extends typeorm_
 exports.DataTableColumnRepository = DataTableColumnRepository;
 exports.DataTableColumnRepository = DataTableColumnRepository = __decorate([
     (0, di_1.Service)(),
-    __metadata("design:paramtypes", [typeorm_1.DataSource, data_table_ddl_service_1.DataTableDDLService])
+    __metadata("design:paramtypes", [typeorm_1.DataSource, data_table_ddl_service_1.DataTableDDLService, db_1.TransactionRunner])
 ], DataTableColumnRepository);
 //# sourceMappingURL=data-table-column.repository.js.map

package/dist/modules/data-table/data-table-column.repository.js.map

@@ -1 +1 @@
-{"version":3,"file":"data-table-column.repository.js","sourceRoot":"","sources":["../../../src/modules/data-table/data-table-column.repository.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"data-table-column.repository.js","sourceRoot":"","sources":["../../../src/modules/data-table/data-table-column.repository.ts"],"names":[],"mappings":"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"}

package/dist/modules/data-table/data-table-file-cleanup.service.d.ts

@@ -1,14 +1,12 @@
+import { Logger } from '@n8n/backend-common';
 import { GlobalConfig } from '@n8n/config';
-import { InstanceSettings } from 'n8n-core';
 export declare class DataTableFileCleanupService {
     private readonly globalConfig;
-    private readonly instanceSettings;
+    private readonly logger;
     private readonly uploadDir;
-    private cleanupInterval?;
-    constructor(globalConfig: GlobalConfig, instanceSettings: InstanceSettings);
+    constructor(globalConfig: GlobalConfig, logger: Logger);
     private isErrnoException;
-    start(): Promise<void>;
-    shutdown(): Promise<void>;
-    private cleanupOrphanedFiles;
+    private isNotFound;
+    cleanupOrphanedFiles(signal: AbortSignal): Promise<void>;
     deleteFile(fileId: string): Promise<void>;
 }

package/dist/modules/data-table/data-table-file-cleanup.service.js

@@ -13,13 +13,14 @@ exports.DataTableFileCleanupService = void 0;
 const backend_common_1 = require("@n8n/backend-common");
 const config_1 = require("@n8n/config");
 const di_1 = require("@n8n/di");
+const ensure_error_1 = require("@n8n/utils/errors/ensure-error");
 const fs_1 = require("fs");
-const n8n_core_1 = require("n8n-core");
 let DataTableFileCleanupService = class DataTableFileCleanupService {
-    constructor(globalConfig, instanceSettings) {
+    constructor(globalConfig, logger) {
         this.globalConfig = globalConfig;
-        this.instanceSettings = instanceSettings;
+        this.logger = logger;
         this.uploadDir = this.globalConfig.dataTable.uploadDir;
+        this.logger = this.logger.scoped('data-table');
     }
     isErrnoException(error) {
         return (typeof error === 'object' &&
@@ -27,41 +28,39 @@ let DataTableFileCleanupService = class DataTableFileCleanupService {
             'code' in error &&
             typeof error.code === 'string');
     }
-    async start() {
-        if (this.instanceSettings.instanceType !== 'main')
-            return;
-        this.cleanupInterval = setInterval(() => {
-            void this.cleanupOrphanedFiles();
-        }, this.globalConfig.dataTable.cleanupIntervalMs);
+    isNotFound(error) {
+        return this.isErrnoException(error) && error.code === 'ENOENT';
     }
-    async shutdown() {
-        if (this.cleanupInterval) {
-            clearInterval(this.cleanupInterval);
-            this.cleanupInterval = undefined;
-        }
-    }
-    async cleanupOrphanedFiles() {
+    async cleanupOrphanedFiles(signal) {
+        let files;
         try {
-            const files = await fs_1.promises.readdir(this.uploadDir);
-            const now = Date.now();
-            const maxAge = this.globalConfig.dataTable.fileMaxAgeMs;
-            for (const file of files) {
-                const filePath = (0, backend_common_1.safeJoinPath)(this.uploadDir, file);
-                try {
-                    const stats = await fs_1.promises.stat(filePath);
-                    const fileAge = now - stats.mtimeMs;
-                    if (fileAge > maxAge) {
-                        await fs_1.promises.unlink(filePath);
-                    }
-                }
-                catch (error) {
-                    continue;
-                }
-            }
+            files = await fs_1.promises.readdir(this.uploadDir);
         }
         catch (error) {
-            if (!this.isErrnoException(error) || error.code !== 'ENOENT') {
-                console.error('Error cleaning up orphaned CSV files:', error);
+            if (this.isNotFound(error))
+                return;
+            throw error;
+        }
+        const now = Date.now();
+        const maxAge = this.globalConfig.dataTable.fileMaxAgeMs;
+        for (const file of files) {
+            if (signal.aborted)
+                break;
+            const filePath = (0, backend_common_1.safeJoinPath)(this.uploadDir, file);
+            try {
+                const stats = await fs_1.promises.stat(filePath);
+                const fileAge = now - stats.mtimeMs;
+                if (fileAge > maxAge) {
+                    await fs_1.promises.unlink(filePath);
+                }
+            }
+            catch (error) {
+                if (this.isNotFound(error))
+                    continue;
+                this.logger.warn('Could not delete an orphaned data table upload file', {
+                    file,
+                    error: (0, ensure_error_1.ensureError)(error).message,
+                });
             }
         }
     }
@@ -71,15 +70,14 @@ let DataTableFileCleanupService = class DataTableFileCleanupService {
             await fs_1.promises.unlink(filePath);
         }
         catch (error) {
-            if (!this.isErrnoException(error) || error.code !== 'ENOENT') {
+            if (!this.isNotFound(error))
                 throw error;
-            }
         }
     }
 };
 exports.DataTableFileCleanupService = DataTableFileCleanupService;
 exports.DataTableFileCleanupService = DataTableFileCleanupService = __decorate([
     (0, di_1.Service)(),
-    __metadata("design:paramtypes", [config_1.GlobalConfig, n8n_core_1.InstanceSettings])
+    __metadata("design:paramtypes", [config_1.GlobalConfig, backend_common_1.Logger])
 ], DataTableFileCleanupService);
 //# sourceMappingURL=data-table-file-cleanup.service.js.map

package/dist/modules/data-table/data-table-file-cleanup.service.js.map

@@ -1 +1 @@
-{"version":3,"file":"data-table-file-cleanup.service.js","sourceRoot":"","sources":["../../../src/modules/data-table/data-table-file-cleanup.service.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"data-table-file-cleanup.service.js","sourceRoot":"","sources":["../../../src/modules/data-table/data-table-file-cleanup.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,wDAA2D;AAC3D,wCAA2C;AAC3C,gCAAkC;AAClC,iEAA6D;AAC7D,2BAAoC;AAG7B,IAAM,2BAA2B,GAAjC,MAAM,2BAA2B;IAGvC,YACkB,YAA0B,EAC1B,MAAc;4BADd,YAAY;sBACZ,MAAM;QAEvB,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,YAAY,CAAC,SAAS,CAAC,SAAS,CAAC;QACvD,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC;IAChD,CAAC;IAEO,gBAAgB,CAAC,KAAc;QACtC,OAAO,CACN,OAAO,KAAK,KAAK,QAAQ;YACzB,KAAK,KAAK,IAAI;YACd,MAAM,IAAI,KAAK;YACf,OAAO,KAAK,CAAC,IAAI,KAAK,QAAQ,CAC9B,CAAC;IACH,CAAC;IAEO,UAAU,CAAC,KAAc;QAChC,OAAO,IAAI,CAAC,gBAAgB,CAAC,KAAK,CAAC,IAAI,KAAK,CAAC,IAAI,KAAK,QAAQ,CAAC;IAChE,CAAC;IAMD,KAAK,CAAC,oBAAoB,CAAC,MAAmB;QAC7C,IAAI,KAAe,CAAC;QACpB,IAAI,CAAC;YACJ,KAAK,GAAG,MAAM,aAAE,CAAC,OAAO,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QAC1C,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YAChB,IAAI,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC;gBAAE,OAAO;YACnC,MAAM,KAAK,CAAC;QACb,CAAC;QAED,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QACvB,MAAM,MAAM,GAAG,IAAI,CAAC,YAAY,CAAC,SAAS,CAAC,YAAY,CAAC;QAExD,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;YAC1B,IAAI,MAAM,CAAC,OAAO;gBAAE,MAAM;YAE1B,MAAM,QAAQ,GAAG,IAAA,6BAAY,EAAC,IAAI,CAAC,SAAS,EAAE,IAAI,CAAC,CAAC;YACpD,IAAI,CAAC;gBACJ,MAAM,KAAK,GAAG,MAAM,aAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;gBACtC,MAAM,OAAO,GAAG,GAAG,GAAG,KAAK,CAAC,OAAO,CAAC;gBAEpC,IAAI,OAAO,GAAG,MAAM,EAAE,CAAC;oBACtB,MAAM,aAAE,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;gBAC3B,CAAC;YACF,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBAEhB,IAAI,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC;oBAAE,SAAS;gBACrC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,qDAAqD,EAAE;oBACvE,IAAI;oBACJ,KAAK,EAAE,IAAA,0BAAW,EAAC,KAAK,CAAC,CAAC,OAAO;iBACjC,CAAC,CAAC;YACJ,CAAC;QACF,CAAC;IACF,CAAC;IAKD,KAAK,CAAC,UAAU,CAAC,MAAc;QAC9B,MAAM,QAAQ,GAAG,IAAA,6BAAY,EAAC,IAAI,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC;QACtD,IAAI,CAAC;YACJ,MAAM,aAAE,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;QAC3B,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YAChB,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC;gBAAE,MAAM,KAAK,CAAC;QAC1C,CAAC;IACF,CAAC;CACD,CAAA;;sCAzEY,2BAA2B;IADvC,IAAA,YAAO,GAAE;qCAKuB,qBAAY,EAClB,uBAAM;GALpB,2BAA2B,CAyEvC"}

package/dist/modules/data-table/data-table-file-cleanup.task.d.ts

@@ -0,0 +1,14 @@
+import { GlobalConfig } from '@n8n/config';
+import { SystemTask } from '@n8n/decorators';
+import type { SystemTaskEffects, SystemTaskPlacement, SystemTaskSchedule } from '@n8n/decorators';
+import { DataTableFileCleanupService } from './data-table-file-cleanup.service';
+export declare class DataTableFileCleanupTask implements SystemTask {
+    private readonly globalConfig;
+    private readonly fileCleanupService;
+    readonly name = "data-table-file-cleanup";
+    readonly schedule: SystemTaskSchedule;
+    readonly effects: SystemTaskEffects;
+    readonly placement: SystemTaskPlacement;
+    constructor(globalConfig: GlobalConfig, fileCleanupService: DataTableFileCleanupService);
+    run(signal: AbortSignal): Promise<void>;
+}

package/dist/modules/data-table/data-table-file-cleanup.task.js

@@ -0,0 +1,37 @@
+"use strict";
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.DataTableFileCleanupTask = void 0;
+const config_1 = require("@n8n/config");
+const decorators_1 = require("@n8n/decorators");
+const data_table_file_cleanup_service_1 = require("./data-table-file-cleanup.service");
+let DataTableFileCleanupTask = class DataTableFileCleanupTask {
+    constructor(globalConfig, fileCleanupService) {
+        this.globalConfig = globalConfig;
+        this.fileCleanupService = fileCleanupService;
+        this.name = 'data-table-file-cleanup';
+        this.schedule = (0, decorators_1.intervalFromMilliseconds)(this.globalConfig.dataTable.cleanupIntervalMs);
+        this.effects = 'idempotent';
+        this.placement = {
+            scope: 'instance',
+            instanceTypes: ['main'],
+        };
+    }
+    async run(signal) {
+        await this.fileCleanupService.cleanupOrphanedFiles(signal);
+    }
+};
+exports.DataTableFileCleanupTask = DataTableFileCleanupTask;
+exports.DataTableFileCleanupTask = DataTableFileCleanupTask = __decorate([
+    (0, decorators_1.SystemTask)(),
+    __metadata("design:paramtypes", [config_1.GlobalConfig, data_table_file_cleanup_service_1.DataTableFileCleanupService])
+], DataTableFileCleanupTask);
+//# sourceMappingURL=data-table-file-cleanup.task.js.map

package/dist/modules/data-table/data-table-file-cleanup.task.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"data-table-file-cleanup.task.js","sourceRoot":"","sources":["../../../src/modules/data-table/data-table-file-cleanup.task.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,wCAA2C;AAC3C,gDAAuE;AAGvE,uFAAgF;AAMzE,IAAM,wBAAwB,GAA9B,MAAM,wBAAwB;IAepC,YACkB,YAA0B,EAC1B,kBAA+C;QAD/C,iBAAY,GAAZ,YAAY,CAAc;QAC1B,uBAAkB,GAAlB,kBAAkB,CAA6B;QAhBxD,SAAI,GAAG,yBAAyB,CAAC;QAEjC,aAAQ,GAAuB,IAAA,qCAAwB,EAC/D,IAAI,CAAC,YAAY,CAAC,SAAS,CAAC,iBAAiB,CAC7C,CAAC;QAEO,YAAO,GAAsB,YAAY,CAAC;QAG1C,cAAS,GAAwB;YACzC,KAAK,EAAE,UAAU;YACjB,aAAa,EAAE,CAAC,MAAM,CAAC;SACvB,CAAC;IAKC,CAAC;IAEJ,KAAK,CAAC,GAAG,CAAC,MAAmB;QAC5B,MAAM,IAAI,CAAC,kBAAkB,CAAC,oBAAoB,CAAC,MAAM,CAAC,CAAC;IAC5D,CAAC;CACD,CAAA;;mCAvBY,wBAAwB;IADpC,IAAA,uBAAU,GAAE;qCAiBoB,qBAAY,EACN,6DAA2B;GAjBrD,wBAAwB,CAuBpC"}

package/dist/modules/data-table/data-table.module.d.ts

@@ -1,6 +1,7 @@
-import type { ModuleInterface } from '@n8n/decorators';
+import type { ModuleInterface, SystemTaskClass } from '@n8n/decorators';
 export declare class DataTableModule implements ModuleInterface {
     init(): Promise<void>;
+    systemTasks(): Promise<SystemTaskClass[]>;
     shutdown(): Promise<void>;
     entities(): Promise<(typeof import("./data-table.entity.js").DataTable | typeof import("./data-table-column.entity.js").DataTableColumn)[]>;
     context(): Promise<{

package/dist/modules/data-table/data-table.module.js

@@ -33,16 +33,16 @@ let DataTableModule = class DataTableModule {
         registerFavoriteResolver();
         const { DataTableAggregateService } = await import('./data-table-aggregate.service.js');
         await di_1.Container.get(DataTableAggregateService).start();
-        const { DataTableFileCleanupService } = await import('./data-table-file-cleanup.service.js');
-        await di_1.Container.get(DataTableFileCleanupService).start();
+    }
+    async systemTasks() {
+        const { DataTableFileCleanupTask } = await import('./data-table-file-cleanup.task.js');
+        return [DataTableFileCleanupTask];
     }
     async shutdown() {
         const { DataTableService } = await import('./data-table.service.js');
         await di_1.Container.get(DataTableService).shutdown();
         const { DataTableAggregateService } = await import('./data-table-aggregate.service.js');
         await di_1.Container.get(DataTableAggregateService).shutdown();
-        const { DataTableFileCleanupService } = await import('./data-table-file-cleanup.service.js');
-        await di_1.Container.get(DataTableFileCleanupService).shutdown();
     }
     async entities() {
         const { DataTable } = await import('./data-table.entity.js');

package/dist/modules/data-table/data-table.module.js.map

@@ -1 +1 @@
-{"version":3,"file":"data-table.module.js","sourceRoot":"","sources":["../../../src/modules/data-table/data-table.module.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,4DAAyE;AAEzE,gDAA4D;AAC5D,gCAAoC;AAG7B,IAAM,eAAe,GAArB,MAAM,eAAe;IAC3B,KAAK,CAAC,IAAI;QACT,MAAM,MAAM,CAAC,4BAA4B,CAAC,CAAC;QAC3C,MAAM,MAAM,CAAC,sCAAsC,CAAC,CAAC;QACrD,MAAM,MAAM,CAAC,oCAAoC,CAAC,CAAC;QAEnD,MAAM,EAAE,gBAAgB,EAAE,GAAG,MAAM,MAAM,CAAC,yBAAyB,CAAC,CAAC;QACrE,MAAM,cAAS,CAAC,GAAG,CAAC,gBAAgB,CAAC,CAAC,KAAK,EAAE,CAAC;QAE9C,cAAS,CAAC,GAAG,CAIX,mDAAgC,CAAC,CAAC,QAAQ,CAAC;YAC5C,QAAQ,EAAE,YAAY;YACtB,WAAW,EAAE,KAAK,EAAE,aAAa,EAAE,WAAW,EAAE,GAAG,EAAE,EAAE;gBACtD,MAAM,cAAS,CAAC,GAAG,CAAC,gBAAgB,CAAC,CAAC,6BAA6B,CAClE,aAAa,EACb,WAAW,EACX,GAAG,CACH,CAAC;YACH,CAAC;YACD,SAAS,EAAE,KAAK,EAAE,SAAS,EAAE,EAAE;gBAC9B,MAAM,cAAS,CAAC,GAAG,CAAC,gBAAgB,CAAC,CAAC,0BAA0B,CAAC,SAAS,CAAC,CAAC;YAC7E,CAAC;SACD,CAAC,CAAC;QAEH,MAAM,EAAE,wBAAwB,EAAE,GAAG,MAAM,MAAM,CAAC,iCAAiC,CAAC,CAAC;QACrF,wBAAwB,EAAE,CAAC;QAE3B,MAAM,EAAE,yBAAyB,EAAE,GAAG,MAAM,MAAM,CAAC,mCAAmC,CAAC,CAAC;QACxF,MAAM,cAAS,CAAC,GAAG,CAAC,yBAAyB,CAAC,CAAC,KAAK,EAAE,CAAC;QAEvD,MAAM,EAAE,2BAA2B,EAAE,GAAG,MAAM,MAAM,CAAC,sCAAsC,CAAC,CAAC;QAC7F,MAAM,cAAS,CAAC,GAAG,CAAC,2BAA2B,CAAC,CAAC,KAAK,EAAE,CAAC;IAC1D,CAAC;IAGK,AAAN,KAAK,CAAC,QAAQ;QACb,MAAM,EAAE,gBAAgB,EAAE,GAAG,MAAM,MAAM,CAAC,yBAAyB,CAAC,CAAC;QACrE,MAAM,cAAS,CAAC,GAAG,CAAC,gBAAgB,CAAC,CAAC,QAAQ,EAAE,CAAC;QAEjD,MAAM,EAAE,yBAAyB,EAAE,GAAG,MAAM,MAAM,CAAC,mCAAmC,CAAC,CAAC;QACxF,MAAM,cAAS,CAAC,GAAG,CAAC,yBAAyB,CAAC,CAAC,QAAQ,EAAE,CAAC;QAE1D,MAAM,EAAE,2BAA2B,EAAE,GAAG,MAAM,MAAM,CAAC,sCAAsC,CAAC,CAAC;QAC7F,MAAM,cAAS,CAAC,GAAG,CAAC,2BAA2B,CAAC,CAAC,QAAQ,EAAE,CAAC;IAC7D,CAAC;IAED,KAAK,CAAC,QAAQ;QACb,MAAM,EAAE,SAAS,EAAE,GAAG,MAAM,MAAM,CAAC,wBAAwB,CAAC,CAAC;QAC7D,MAAM,EAAE,eAAe,EAAE,GAAG,MAAM,MAAM,CAAC,+BAA+B,CAAC,CAAC;QAE1E,OAAO,CAAC,SAAS,EAAE,eAAe,CAAC,CAAC;IACrC,CAAC;IAED,KAAK,CAAC,OAAO;QACZ,MAAM,EAAE,qBAAqB,EAAE,GAAG,MAAM,MAAM,CAAC,+BAA+B,CAAC,CAAC;QAEhF,OAAO,EAAE,sBAAsB,EAAE,cAAS,CAAC,GAAG,CAAC,qBAAqB,CAAC,EAAE,CAAC;IACzE,CAAC;CACD,CAAA;;AAvBM;IADL,IAAA,uBAAU,GAAE;;;;+CAUZ;0BA/CW,eAAe;IAD3B,IAAA,0BAAa,EAAC,EAAE,IAAI,EAAE,YAAY,EAAE,CAAC;GACzB,eAAe,CA6D3B"}
+{"version":3,"file":"data-table.module.js","sourceRoot":"","sources":["../../../src/modules/data-table/data-table.module.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,4DAAyE;AAEzE,gDAA4D;AAC5D,gCAAoC;AAG7B,IAAM,eAAe,GAArB,MAAM,eAAe;IAC3B,KAAK,CAAC,IAAI;QACT,MAAM,MAAM,CAAC,4BAA4B,CAAC,CAAC;QAC3C,MAAM,MAAM,CAAC,sCAAsC,CAAC,CAAC;QACrD,MAAM,MAAM,CAAC,oCAAoC,CAAC,CAAC;QAEnD,MAAM,EAAE,gBAAgB,EAAE,GAAG,MAAM,MAAM,CAAC,yBAAyB,CAAC,CAAC;QACrE,MAAM,cAAS,CAAC,GAAG,CAAC,gBAAgB,CAAC,CAAC,KAAK,EAAE,CAAC;QAE9C,cAAS,CAAC,GAAG,CAIX,mDAAgC,CAAC,CAAC,QAAQ,CAAC;YAC5C,QAAQ,EAAE,YAAY;YACtB,WAAW,EAAE,KAAK,EAAE,aAAa,EAAE,WAAW,EAAE,GAAG,EAAE,EAAE;gBACtD,MAAM,cAAS,CAAC,GAAG,CAAC,gBAAgB,CAAC,CAAC,6BAA6B,CAClE,aAAa,EACb,WAAW,EACX,GAAG,CACH,CAAC;YACH,CAAC;YACD,SAAS,EAAE,KAAK,EAAE,SAAS,EAAE,EAAE;gBAC9B,MAAM,cAAS,CAAC,GAAG,CAAC,gBAAgB,CAAC,CAAC,0BAA0B,CAAC,SAAS,CAAC,CAAC;YAC7E,CAAC;SACD,CAAC,CAAC;QAEH,MAAM,EAAE,wBAAwB,EAAE,GAAG,MAAM,MAAM,CAAC,iCAAiC,CAAC,CAAC;QACrF,wBAAwB,EAAE,CAAC;QAE3B,MAAM,EAAE,yBAAyB,EAAE,GAAG,MAAM,MAAM,CAAC,mCAAmC,CAAC,CAAC;QACxF,MAAM,cAAS,CAAC,GAAG,CAAC,yBAAyB,CAAC,CAAC,KAAK,EAAE,CAAC;IACxD,CAAC;IAED,KAAK,CAAC,WAAW;QAChB,MAAM,EAAE,wBAAwB,EAAE,GAAG,MAAM,MAAM,CAAC,mCAAmC,CAAC,CAAC;QACvF,OAAO,CAAC,wBAAwB,CAAC,CAAC;IACnC,CAAC;IAGK,AAAN,KAAK,CAAC,QAAQ;QACb,MAAM,EAAE,gBAAgB,EAAE,GAAG,MAAM,MAAM,CAAC,yBAAyB,CAAC,CAAC;QACrE,MAAM,cAAS,CAAC,GAAG,CAAC,gBAAgB,CAAC,CAAC,QAAQ,EAAE,CAAC;QAEjD,MAAM,EAAE,yBAAyB,EAAE,GAAG,MAAM,MAAM,CAAC,mCAAmC,CAAC,CAAC;QACxF,MAAM,cAAS,CAAC,GAAG,CAAC,yBAAyB,CAAC,CAAC,QAAQ,EAAE,CAAC;IAC3D,CAAC;IAED,KAAK,CAAC,QAAQ;QACb,MAAM,EAAE,SAAS,EAAE,GAAG,MAAM,MAAM,CAAC,wBAAwB,CAAC,CAAC;QAC7D,MAAM,EAAE,eAAe,EAAE,GAAG,MAAM,MAAM,CAAC,+BAA+B,CAAC,CAAC;QAE1E,OAAO,CAAC,SAAS,EAAE,eAAe,CAAC,CAAC;IACrC,CAAC;IAED,KAAK,CAAC,OAAO;QACZ,MAAM,EAAE,qBAAqB,EAAE,GAAG,MAAM,MAAM,CAAC,+BAA+B,CAAC,CAAC;QAEhF,OAAO,EAAE,sBAAsB,EAAE,cAAS,CAAC,GAAG,CAAC,qBAAqB,CAAC,EAAE,CAAC;IACzE,CAAC;CACD,CAAA;;AApBM;IADL,IAAA,uBAAU,GAAE;;;;+CAOZ;0BA9CW,eAAe;IAD3B,IAAA,0BAAa,EAAC,EAAE,IAAI,EAAE,YAAY,EAAE,CAAC;GACzB,eAAe,CA4D3B"}

package/dist/modules/data-table/data-table.repository.d.ts

@@ -11,7 +11,7 @@ export declare class DataTableRepository extends Repository<DataTable> {
     private readonly logger;
     constructor(dataSource: DataSource, ddlService: DataTableDDLService, globalConfig: GlobalConfig, logger: Logger);
     touchUpdatedAt(dataTableId: string, trx?: EntityManager): Promise<void>;
-    createDataTable(projectId: string, name: string, columns: DataTableCreateColumnSchema[], trx?: EntityManager, explicitId?: string): Promise<DataTable>;
+    createDataTable(projectId: string, name: string, columns: DataTableCreateColumnSchema[], trx?: EntityManager, explicitId?: string, explicitColumnIds?: Array<string | undefined>): Promise<DataTable>;
     deleteDataTable(dataTableId: string, trx?: EntityManager): Promise<boolean>;
     transferDataTableByProjectId(fromProjectId: string, toProjectId: string, trx?: EntityManager): Promise<boolean>;
     deleteDataTableByProjectId(projectId: string, trx?: EntityManager): Promise<boolean>;

package/dist/modules/data-table/data-table.repository.js

@@ -39,7 +39,7 @@ let DataTableRepository = class DataTableRepository extends typeorm_1.Repository
             this.logger.warn('Failed to update DataTable timestamp', { dataTableId, error });
         });
     }
-    async createDataTable(projectId, name, columns, trx, explicitId) {
+    async createDataTable(projectId, name, columns, trx, explicitId, explicitColumnIds) {
         return await (0, db_1.withTransaction)(this.manager, trx, async (em) => {
             if (columns.some((c) => !(0, sql_utils_1.isValidColumnName)(c.name))) {
                 throw new data_table_validation_error_1.DataTableValidationError(api_types_1.DATA_TABLE_COLUMN_ERROR_MESSAGE);
@@ -62,6 +62,7 @@ let DataTableRepository = class DataTableRepository extends typeorm_1.Repository
             await em.insert(data_table_entity_1.DataTable, dataTable);
             const dataTableId = dataTable.id;
             const columnEntities = columns.map((col, index) => em.create(data_table_column_entity_1.DataTableColumn, {
+                id: explicitColumnIds?.[index],
                 dataTableId,
                 name: col.name,
                 type: col.type,