n8n 2.30.4 → 2.31.0

package/dist/modules/n8n-packages/entities/project/project-import.types.d.ts

@@ -0,0 +1,15 @@
+import type { SerializedProject } from '../../spec/serialized/project.schema';
+export interface PreparedProject {
+    sourceProjectId: string;
+    name: string;
+    description?: string;
+    icon?: SerializedProject['icon'];
+}
+export type ProjectPlannedAction = 'create' | 'update';
+export interface ProjectPlanItem {
+    action: ProjectPlannedAction;
+    sourceProjectId: string;
+    name: string;
+    description?: string;
+    icon?: SerializedProject['icon'];
+}

package/dist/modules/n8n-packages/entities/project/project-import.types.js

@@ -0,0 +1,3 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+//# sourceMappingURL=project-import.types.js.map

package/dist/modules/n8n-packages/entities/project/project-import.types.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"project-import.types.js","sourceRoot":"","sources":["../../../../../src/modules/n8n-packages/entities/project/project-import.types.ts"],"names":[],"mappings":""}

package/dist/modules/n8n-packages/entities/project/project-importer.d.ts

@@ -0,0 +1,13 @@
+import { LicenseState } from '@n8n/backend-common';
+import type { User } from '@n8n/db';
+import { ProjectService } from '../../../../services/project.service.ee';
+import type { PreparedProject, ProjectPlanItem } from './project-import.types';
+import type { ImportedProjectSummary } from '../../n8n-packages.types';
+export declare class ProjectImporter {
+    private readonly projectService;
+    private readonly licenseState;
+    constructor(projectService: ProjectService, licenseState: LicenseState);
+    plan(user: User, projects: PreparedProject[]): Promise<ProjectPlanItem[]>;
+    apply(user: User, items: ProjectPlanItem[]): Promise<ImportedProjectSummary[]>;
+    private assertCanCreateProjects;
+}

package/dist/modules/n8n-packages/entities/project/project-importer.js

@@ -0,0 +1,97 @@
+"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.ProjectImporter = void 0;
+const backend_common_1 = require("@n8n/backend-common");
+const di_1 = require("@n8n/di");
+const permissions_1 = require("@n8n/permissions");
+const forbidden_error_1 = require("../../../../errors/response-errors/forbidden.error");
+const project_service_ee_1 = require("../../../../services/project.service.ee");
+let ProjectImporter = class ProjectImporter {
+    constructor(projectService, licenseState) {
+        this.projectService = projectService;
+        this.licenseState = licenseState;
+    }
+    async plan(user, projects) {
+        const items = [];
+        for (const project of projects) {
+            const existing = await this.projectService.findProject(project.sourceProjectId);
+            if (existing) {
+                if (existing.type !== 'team') {
+                    throw new forbidden_error_1.ForbiddenError(`Cannot import project "${project.name}": its id belongs to a non-team project on this instance.`);
+                }
+                const authorized = await this.projectService.getProjectWithScope(user, existing.id, [
+                    'project:update',
+                ]);
+                if (!authorized) {
+                    throw new forbidden_error_1.ForbiddenError(`You do not have permission to update the existing project "${project.name}".`);
+                }
+                items.push({ action: 'update', ...toFields(project) });
+            }
+            else {
+                this.assertCanCreateProjects(user);
+                items.push({ action: 'create', ...toFields(project) });
+            }
+        }
+        return items;
+    }
+    async apply(user, items) {
+        const summaries = [];
+        for (const item of items) {
+            if (item.action === 'create') {
+                const project = await this.projectService.createTeamProject(user, { name: item.name, icon: item.icon }, { id: item.sourceProjectId, description: item.description ?? null });
+                summaries.push({
+                    sourceProjectId: item.sourceProjectId,
+                    localId: project.id,
+                    name: project.name,
+                    status: 'created',
+                });
+            }
+            else {
+                await this.projectService.updateProject(item.sourceProjectId, {
+                    name: item.name,
+                    icon: item.icon,
+                    description: item.description,
+                });
+                summaries.push({
+                    sourceProjectId: item.sourceProjectId,
+                    localId: item.sourceProjectId,
+                    name: item.name,
+                    status: 'updated',
+                });
+            }
+        }
+        return summaries;
+    }
+    assertCanCreateProjects(user) {
+        if (!(0, permissions_1.hasGlobalScope)(user, 'project:create')) {
+            throw new forbidden_error_1.ForbiddenError('You do not have permission to create projects.');
+        }
+        if (!this.licenseState.isLicensed('feat:projectRole:admin')) {
+            throw new forbidden_error_1.ForbiddenError('Your license does not allow creating team projects. Project import requires a license that supports team projects.');
+        }
+    }
+};
+exports.ProjectImporter = ProjectImporter;
+exports.ProjectImporter = ProjectImporter = __decorate([
+    (0, di_1.Service)(),
+    __metadata("design:paramtypes", [project_service_ee_1.ProjectService,
+        backend_common_1.LicenseState])
+], ProjectImporter);
+function toFields(project) {
+    return {
+        sourceProjectId: project.sourceProjectId,
+        name: project.name,
+        ...(project.description !== undefined ? { description: project.description } : {}),
+        ...(project.icon !== undefined ? { icon: project.icon } : {}),
+    };
+}
+//# sourceMappingURL=project-importer.js.map

package/dist/modules/n8n-packages/entities/project/project-importer.js.map

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

package/dist/modules/n8n-packages/entities/project/project.exporter.d.ts

@@ -1,20 +1,38 @@
 import type { User } from '@n8n/db';
+import { FolderFinderService } from '../../../../services/folder-finder.service';
+import { ProjectService } from '../../../../services/project.service.ee';
+import { WorkflowFinderService } from '../../../../workflows/workflow-finder.service';
 import { ProjectSerializer } from './project.serializer';
 import type { PackageWriter } from '../../io/package-writer';
 import type { ManifestEntry } from '../../spec/manifest.schema';
-import { ProjectService } from '../../../../services/project.service.ee';
+import { FolderExporter } from '../folder/folder.exporter';
+import type { WorkflowExportRequirements } from '../requirements.types';
+import { WorkflowExporter } from '../workflow/workflow.exporter';
 export interface ProjectExportRequest {
     user: User;
     projectIds: string[];
     writer: PackageWriter;
 }
-export interface ProjectExportResult {
+interface ProjectExportResult {
     entries: ManifestEntry[];
+    folderEntries: ManifestEntry[];
+    workflowEntries: ManifestEntry[];
+    requirements: WorkflowExportRequirements;
+    projectTargetsById: Map<string, string>;
 }
 export declare class ProjectExporter {
     private readonly projectService;
     private readonly projectSerializer;
-    constructor(projectService: ProjectService, projectSerializer: ProjectSerializer);
+    private readonly folderFinder;
+    private readonly workflowFinder;
+    private readonly folderExporter;
+    private readonly workflowExporter;
+    constructor(projectService: ProjectService, projectSerializer: ProjectSerializer, folderFinder: FolderFinderService, workflowFinder: WorkflowFinderService, folderExporter: FolderExporter, workflowExporter: WorkflowExporter);
     export(request: ProjectExportRequest): Promise<ProjectExportResult>;
-    private assertAllRequestedProjectsFound;
+    private exportProject;
+    private exportProjectShell;
+    private exportProjectFolders;
+    private exportProjectRootWorkflows;
+    private mergeProjectExportResults;
 }
+export {};

package/dist/modules/n8n-packages/entities/project/project.exporter.js

@@ -11,49 +11,94 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ProjectExporter = void 0;
 const di_1 = require("@n8n/di");
-const n8n_workflow_1 = require("n8n-workflow");
+const folder_finder_service_1 = require("../../../../services/folder-finder.service");
+const project_service_ee_1 = require("../../../../services/project.service.ee");
+const workflow_finder_service_1 = require("../../../../workflows/workflow-finder.service");
 const project_serializer_1 = require("./project.serializer");
 const unique_filename_allocator_1 = require("../../io/unique-filename-allocator");
-const project_service_ee_1 = require("../../../../services/project.service.ee");
+const folder_exporter_1 = require("../folder/folder.exporter");
+const package_export_errors_1 = require("../package-export.errors");
+const requirements_types_1 = require("../requirements.types");
+const workflow_exporter_1 = require("../workflow/workflow.exporter");
 let ProjectExporter = class ProjectExporter {
-    constructor(projectService, projectSerializer) {
+    constructor(projectService, projectSerializer, folderFinder, workflowFinder, folderExporter, workflowExporter) {
         this.projectService = projectService;
         this.projectSerializer = projectSerializer;
+        this.folderFinder = folderFinder;
+        this.workflowFinder = workflowFinder;
+        this.folderExporter = folderExporter;
+        this.workflowExporter = workflowExporter;
     }
     async export(request) {
         const projects = await this.projectService.findProjectsByIdsForUser(request.user, request.projectIds, ['project:export']);
-        this.assertAllRequestedProjectsFound(request.projectIds, projects);
-        const entries = [];
-        const targets = new unique_filename_allocator_1.UniqueFilenameAllocator('projects', 'project');
+        await (0, package_export_errors_1.assertEveryRequestedEntityAccessible)('project', request.projectIds, projects, async (ids) => await this.projectService.findExistingProjectIds(ids));
+        const allocator = new unique_filename_allocator_1.UniqueFilenameAllocator('projects', 'project');
+        const results = [];
         for (const project of projects) {
-            const target = targets.allocate(project.name);
-            const serialized = this.projectSerializer.serialize(project);
-            request.writer.writeDirectory(target);
-            request.writer.writeFile(`${target}/project.json`, JSON.stringify(serialized, null, '\t'));
-            entries.push({
-                id: project.id,
-                name: project.name,
-                target,
-            });
+            const target = allocator.allocate(project.name);
+            results.push(await this.exportProject(project, target, request));
         }
-        return { entries };
+        return this.mergeProjectExportResults(results);
+    }
+    async exportProject(project, target, request) {
+        this.exportProjectShell(project, target, request.writer);
+        const folders = await this.exportProjectFolders(project.id, target, request);
+        const rootWorkflows = await this.exportProjectRootWorkflows(project.id, target, request);
+        return {
+            entries: [{ id: project.id, name: project.name, target }],
+            folderEntries: folders.entries,
+            workflowEntries: [...folders.workflowEntries, ...rootWorkflows.entries],
+            requirements: (0, requirements_types_1.mergeRequirements)(folders.requirements, rootWorkflows.requirements),
+            projectTargetsById: new Map([[project.id, target]]),
+        };
+    }
+    exportProjectShell(project, target, writer) {
+        const serialized = this.projectSerializer.serialize(project);
+        writer.writeDirectory(target);
+        writer.writeFile(`${target}/project.json`, JSON.stringify(serialized, null, '\t'));
     }
-    assertAllRequestedProjectsFound(requestedProjectIds, foundProjects) {
-        const foundProjectIds = new Set(foundProjects.map(({ id }) => id));
-        const missingProjectIds = requestedProjectIds.filter((id) => !foundProjectIds.has(id));
-        if (missingProjectIds.length > 0) {
-            const displayedProjectIds = missingProjectIds.slice(0, 20);
-            const omittedCount = missingProjectIds.length - displayedProjectIds.length;
-            throw new n8n_workflow_1.UserError(`${missingProjectIds.length} project(s) not found or not accessible. Export aborted.`, {
-                description: `Missing project IDs: ${displayedProjectIds.join(', ')}${omittedCount > 0 ? `, and ${omittedCount} more` : ''}`,
-            });
+    async exportProjectFolders(projectId, target, request) {
+        const folderIds = await this.folderFinder.findFolderIdsInProject(projectId);
+        if (folderIds.length === 0) {
+            return { entries: [], workflowEntries: [], requirements: (0, requirements_types_1.mergeRequirements)() };
         }
+        return await this.folderExporter.export({
+            user: request.user,
+            folderIds,
+            writer: request.writer,
+            basePrefix: target,
+        });
+    }
+    async exportProjectRootWorkflows(projectId, target, request) {
+        const rootWorkflowIds = await this.workflowFinder.findRootWorkflowIdsInProject(projectId);
+        if (rootWorkflowIds.length === 0) {
+            return { entries: [], requirements: (0, requirements_types_1.mergeRequirements)() };
+        }
+        return await this.workflowExporter.export({
+            user: request.user,
+            workflowIds: rootWorkflowIds,
+            writer: request.writer,
+            basePrefix: target,
+        });
+    }
+    mergeProjectExportResults(results) {
+        return {
+            entries: results.flatMap((result) => result.entries),
+            folderEntries: results.flatMap((result) => result.folderEntries),
+            workflowEntries: results.flatMap((result) => result.workflowEntries),
+            requirements: (0, requirements_types_1.mergeRequirements)(...results.map((result) => result.requirements)),
+            projectTargetsById: new Map(results.flatMap((result) => [...result.projectTargetsById])),
+        };
     }
 };
 exports.ProjectExporter = ProjectExporter;
 exports.ProjectExporter = ProjectExporter = __decorate([
     (0, di_1.Service)(),
     __metadata("design:paramtypes", [project_service_ee_1.ProjectService,
-        project_serializer_1.ProjectSerializer])
+        project_serializer_1.ProjectSerializer,
+        folder_finder_service_1.FolderFinderService,
+        workflow_finder_service_1.WorkflowFinderService,
+        folder_exporter_1.FolderExporter,
+        workflow_exporter_1.WorkflowExporter])
 ], ProjectExporter);
 //# sourceMappingURL=project.exporter.js.map

package/dist/modules/n8n-packages/entities/project/project.exporter.js.map

@@ -1 +1 @@
-{"version":3,"file":"project.exporter.js","sourceRoot":"","sources":["../../../../../src/modules/n8n-packages/entities/project/project.exporter.ts"],"names":[],"mappings":";;;;;;;;;;;;AACA,gCAAkC;AAClC,+CAAyC;AAEzC,6DAAyD;AAEzD,kFAA6E;AAG7E,sEAA+D;AAaxD,IAAM,eAAe,GAArB,MAAM,eAAe;IAC3B,YACkB,cAA8B,EAC9B,iBAAoC;QADpC,mBAAc,GAAd,cAAc,CAAgB;QAC9B,sBAAiB,GAAjB,iBAAiB,CAAmB;IACnD,CAAC;IAEJ,KAAK,CAAC,MAAM,CAAC,OAA6B;QACzC,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,wBAAwB,CAClE,OAAO,CAAC,IAAI,EACZ,OAAO,CAAC,UAAU,EAClB,CAAC,gBAAgB,CAAC,CAClB,CAAC;QAEF,IAAI,CAAC,+BAA+B,CAAC,OAAO,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAC;QAEnE,MAAM,OAAO,GAAoB,EAAE,CAAC;QACpC,MAAM,OAAO,GAAG,IAAI,mDAAuB,CAAC,UAAU,EAAE,SAAS,CAAC,CAAC;QAEnE,KAAK,MAAM,OAAO,IAAI,QAAQ,EAAE,CAAC;YAChC,MAAM,MAAM,GAAG,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;YAC9C,MAAM,UAAU,GAAG,IAAI,CAAC,iBAAiB,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC;YAE7D,OAAO,CAAC,MAAM,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC;YACtC,OAAO,CAAC,MAAM,CAAC,SAAS,CAAC,GAAG,MAAM,eAAe,EAAE,IAAI,CAAC,SAAS,CAAC,UAAU,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC;YAE3F,OAAO,CAAC,IAAI,CAAC;gBACZ,EAAE,EAAE,OAAO,CAAC,EAAE;gBACd,IAAI,EAAE,OAAO,CAAC,IAAI;gBAClB,MAAM;aACN,CAAC,CAAC;QACJ,CAAC;QAED,OAAO,EAAE,OAAO,EAAE,CAAC;IACpB,CAAC;IAEO,+BAA+B,CACtC,mBAA6B,EAC7B,aAAoC;QAEpC,MAAM,eAAe,GAAG,IAAI,GAAG,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;QACnE,MAAM,iBAAiB,GAAG,mBAAmB,CAAC,MAAM,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC,eAAe,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC;QAEvF,IAAI,iBAAiB,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAClC,MAAM,mBAAmB,GAAG,iBAAiB,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;YAC3D,MAAM,YAAY,GAAG,iBAAiB,CAAC,MAAM,GAAG,mBAAmB,CAAC,MAAM,CAAC;YAE3E,MAAM,IAAI,wBAAS,CAClB,GAAG,iBAAiB,CAAC,MAAM,0DAA0D,EACrF;gBACC,WAAW,EAAE,wBAAwB,mBAAmB,CAAC,IAAI,CAAC,IAAI,CAAC,GAClE,YAAY,GAAG,CAAC,CAAC,CAAC,CAAC,SAAS,YAAY,OAAO,CAAC,CAAC,CAAC,EACnD,EAAE;aACF,CACD,CAAC;QACH,CAAC;IACF,CAAC;CACD,CAAA;AAxDY,0CAAe;0BAAf,eAAe;IAD3B,IAAA,YAAO,GAAE;qCAGyB,mCAAc;QACX,sCAAiB;GAH1C,eAAe,CAwD3B"}
+{"version":3,"file":"project.exporter.js","sourceRoot":"","sources":["../../../../../src/modules/n8n-packages/entities/project/project.exporter.ts"],"names":[],"mappings":"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"}

package/dist/modules/n8n-packages/entities/requirements.types.d.ts

@@ -1,5 +1,7 @@
 import type { WorkflowCredentialRequirement } from './credential/credential.types';
+import type { WorkflowDataTableRequirement } from './data-table/data-table.types';
 export interface WorkflowExportRequirements {
     credentials: WorkflowCredentialRequirement[];
+    dataTables: WorkflowDataTableRequirement[];
 }
 export declare const mergeRequirements: (...parts: Array<WorkflowExportRequirements | undefined>) => WorkflowExportRequirements;

package/dist/modules/n8n-packages/entities/requirements.types.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.mergeRequirements = void 0;
 const mergeRequirements = (...parts) => ({
     credentials: parts.flatMap((part) => part?.credentials ?? []),
+    dataTables: parts.flatMap((part) => part?.dataTables ?? []),
 });
 exports.mergeRequirements = mergeRequirements;
 //# sourceMappingURL=requirements.types.js.map

package/dist/modules/n8n-packages/entities/requirements.types.js.map

@@ -1 +1 @@
-{"version":3,"file":"requirements.types.js","sourceRoot":"","sources":["../../../../src/modules/n8n-packages/entities/requirements.types.ts"],"names":[],"mappings":";;;AAMO,MAAM,iBAAiB,GAAG,CAChC,GAAG,KAAoD,EAC1B,EAAE,CAAC,CAAC;IACjC,WAAW,EAAE,KAAK,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,EAAE,WAAW,IAAI,EAAE,CAAC;CAC7D,CAAC,CAAC;AAJU,QAAA,iBAAiB,qBAI3B"}
+{"version":3,"file":"requirements.types.js","sourceRoot":"","sources":["../../../../src/modules/n8n-packages/entities/requirements.types.ts"],"names":[],"mappings":";;;AAQO,MAAM,iBAAiB,GAAG,CAChC,GAAG,KAAoD,EAC1B,EAAE,CAAC,CAAC;IACjC,WAAW,EAAE,KAAK,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,EAAE,WAAW,IAAI,EAAE,CAAC;IAC7D,UAAU,EAAE,KAAK,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,EAAE,UAAU,IAAI,EAAE,CAAC;CAC3D,CAAC,CAAC;AALU,QAAA,iBAAiB,qBAK3B"}

package/dist/modules/n8n-packages/entities/workflow/workflow.exporter.d.ts

@@ -1,10 +1,11 @@
 import type { User } from '@n8n/db';
+import { WorkflowFinderService } from '../../../../workflows/workflow-finder.service';
 import { WorkflowSerializer } from './workflow.serializer';
 import type { PackageWriter } from '../../io/package-writer';
 import type { ManifestEntry } from '../../spec/manifest.schema';
 import { CredentialRequirementsExtractor } from '../credential/credential-requirements.extractor';
+import { DataTableRequirementsExtractor } from '../data-table/data-table-requirements.extractor';
 import type { WorkflowExportRequirements } from '../requirements.types';
-import { WorkflowFinderService } from '../../../../workflows/workflow-finder.service';
 export interface WorkflowExportRequest {
     user: User;
     workflowIds: string[];
@@ -19,7 +20,7 @@ export declare class WorkflowExporter {
     private readonly workflowFinder;
     private readonly workflowSerializer;
     private readonly credentialRequirementsExtractor;
-    constructor(workflowFinder: WorkflowFinderService, workflowSerializer: WorkflowSerializer, credentialRequirementsExtractor: CredentialRequirementsExtractor);
+    private readonly dataTableRequirementsExtractor;
+    constructor(workflowFinder: WorkflowFinderService, workflowSerializer: WorkflowSerializer, credentialRequirementsExtractor: CredentialRequirementsExtractor, dataTableRequirementsExtractor: DataTableRequirementsExtractor);
     export(request: WorkflowExportRequest): Promise<WorkflowExportResult>;
-    private assertAllRequestedWorkflowsFound;
 }

package/dist/modules/n8n-packages/entities/workflow/workflow.exporter.js

@@ -11,22 +11,25 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.WorkflowExporter = void 0;
 const di_1 = require("@n8n/di");
-const n8n_workflow_1 = require("n8n-workflow");
+const workflow_finder_service_1 = require("../../../../workflows/workflow-finder.service");
 const workflow_serializer_1 = require("./workflow.serializer");
 const unique_filename_allocator_1 = require("../../io/unique-filename-allocator");
 const credential_requirements_extractor_1 = require("../credential/credential-requirements.extractor");
-const workflow_finder_service_1 = require("../../../../workflows/workflow-finder.service");
+const data_table_requirements_extractor_1 = require("../data-table/data-table-requirements.extractor");
+const package_export_errors_1 = require("../package-export.errors");
 let WorkflowExporter = class WorkflowExporter {
-    constructor(workflowFinder, workflowSerializer, credentialRequirementsExtractor) {
+    constructor(workflowFinder, workflowSerializer, credentialRequirementsExtractor, dataTableRequirementsExtractor) {
         this.workflowFinder = workflowFinder;
         this.workflowSerializer = workflowSerializer;
         this.credentialRequirementsExtractor = credentialRequirementsExtractor;
+        this.dataTableRequirementsExtractor = dataTableRequirementsExtractor;
     }
     async export(request) {
         const workflows = await this.workflowFinder.findWorkflowsByIdsForUser(request.workflowIds, request.user, ['workflow:export'], { includeParentFolder: true });
-        this.assertAllRequestedWorkflowsFound(request.workflowIds, workflows);
+        await (0, package_export_errors_1.assertEveryRequestedEntityAccessible)('workflow', request.workflowIds, workflows, async (ids) => await this.workflowFinder.findExistingWorkflowIds(ids));
         const entries = [];
         const credentials = [];
+        const dataTables = [];
         const fileNames = new unique_filename_allocator_1.UniqueFilenameAllocator(request.basePrefix ? `${request.basePrefix}/workflows` : 'workflows', 'workflow');
         for (const workflow of workflows) {
             const target = fileNames.allocate(workflow.name);
@@ -39,19 +42,9 @@ let WorkflowExporter = class WorkflowExporter {
                 target,
             });
             credentials.push(...this.credentialRequirementsExtractor.extract(workflow));
+            dataTables.push(...this.dataTableRequirementsExtractor.extract(workflow));
         }
-        return { entries, requirements: { credentials } };
-    }
-    assertAllRequestedWorkflowsFound(requestedWorkflowIds, foundWorkflows) {
-        const foundWorkflowIds = new Set(foundWorkflows.map(({ id }) => id));
-        const missingWorkflowIds = requestedWorkflowIds.filter((id) => !foundWorkflowIds.has(id));
-        if (missingWorkflowIds.length > 0) {
-            const displayedWorkflowIds = missingWorkflowIds.slice(0, 20);
-            const omittedCount = missingWorkflowIds.length - displayedWorkflowIds.length;
-            throw new n8n_workflow_1.UserError(`${missingWorkflowIds.length} workflow(s) not found or not accessible. Export aborted.`, {
-                description: `Missing workflow IDs: ${displayedWorkflowIds.join(', ')}${omittedCount > 0 ? `, and ${omittedCount} more` : ''}`,
-            });
-        }
+        return { entries, requirements: { credentials, dataTables } };
     }
 };
 exports.WorkflowExporter = WorkflowExporter;
@@ -59,6 +52,7 @@ exports.WorkflowExporter = WorkflowExporter = __decorate([
     (0, di_1.Service)(),
     __metadata("design:paramtypes", [workflow_finder_service_1.WorkflowFinderService,
         workflow_serializer_1.WorkflowSerializer,
-        credential_requirements_extractor_1.CredentialRequirementsExtractor])
+        credential_requirements_extractor_1.CredentialRequirementsExtractor,
+        data_table_requirements_extractor_1.DataTableRequirementsExtractor])
 ], WorkflowExporter);
 //# sourceMappingURL=workflow.exporter.js.map

package/dist/modules/n8n-packages/entities/workflow/workflow.exporter.js.map

@@ -1 +1 @@
-{"version":3,"file":"workflow.exporter.js","sourceRoot":"","sources":["../../../../../src/modules/n8n-packages/entities/workflow/workflow.exporter.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"workflow.exporter.js","sourceRoot":"","sources":["../../../../../src/modules/n8n-packages/entities/workflow/workflow.exporter.ts"],"names":[],"mappings":";;;;;;;;;;;;AACA,gCAAkC;AAElC,iFAA4E;AAE5E,+DAA2D;AAE3D,kFAA6E;AAE7E,uGAAkG;AAElG,uGAAiG;AAEjG,oEAAgF;AAkBzE,IAAM,gBAAgB,GAAtB,MAAM,gBAAgB;IAC5B,YACkB,cAAqC,EACrC,kBAAsC,EACtC,+BAAgE,EAChE,8BAA8D;QAH9D,mBAAc,GAAd,cAAc,CAAuB;QACrC,uBAAkB,GAAlB,kBAAkB,CAAoB;QACtC,oCAA+B,GAA/B,+BAA+B,CAAiC;QAChE,mCAA8B,GAA9B,8BAA8B,CAAgC;IAC7E,CAAC;IAEJ,KAAK,CAAC,MAAM,CAAC,OAA8B;QAC1C,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,yBAAyB,CACpE,OAAO,CAAC,WAAW,EACnB,OAAO,CAAC,IAAI,EACZ,CAAC,iBAAiB,CAAC,EACnB,EAAE,mBAAmB,EAAE,IAAI,EAAE,CAC7B,CAAC;QAEF,MAAM,IAAA,4DAAoC,EACzC,UAAU,EACV,OAAO,CAAC,WAAW,EACnB,SAAS,EACT,KAAK,EAAE,GAAG,EAAE,EAAE,CAAC,MAAM,IAAI,CAAC,cAAc,CAAC,uBAAuB,CAAC,GAAG,CAAC,CACrE,CAAC;QAEF,MAAM,OAAO,GAAoB,EAAE,CAAC;QACpC,MAAM,WAAW,GAAoC,EAAE,CAAC;QACxD,MAAM,UAAU,GAAmC,EAAE,CAAC;QACtD,MAAM,SAAS,GAAG,IAAI,mDAAuB,CAC5C,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,UAAU,YAAY,CAAC,CAAC,CAAC,WAAW,EACpE,UAAU,CACV,CAAC;QAEF,KAAK,MAAM,QAAQ,IAAI,SAAS,EAAE,CAAC;YAClC,MAAM,MAAM,GAAG,SAAS,CAAC,QAAQ,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;YACjD,MAAM,UAAU,GAAG,IAAI,CAAC,kBAAkB,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC;YAE/D,OAAO,CAAC,MAAM,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC;YACtC,OAAO,CAAC,MAAM,CAAC,SAAS,CAAC,GAAG,MAAM,gBAAgB,EAAE,IAAI,CAAC,SAAS,CAAC,UAAU,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC;YAE5F,OAAO,CAAC,IAAI,CAAC;gBACZ,EAAE,EAAE,QAAQ,CAAC,EAAE;gBACf,IAAI,EAAE,QAAQ,CAAC,IAAI;gBACnB,MAAM;aACN,CAAC,CAAC;YAEH,WAAW,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,+BAA+B,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC;YAC5E,UAAU,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,8BAA8B,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC;QAC3E,CAAC;QAED,OAAO,EAAE,OAAO,EAAE,YAAY,EAAE,EAAE,WAAW,EAAE,UAAU,EAAE,EAAE,CAAC;IAC/D,CAAC;CACD,CAAA;AAlDY,4CAAgB;2BAAhB,gBAAgB;IAD5B,IAAA,YAAO,GAAE;qCAGyB,+CAAqB;QACjB,wCAAkB;QACL,mEAA+B;QAChC,kEAA8B;GALpE,gBAAgB,CAkD5B"}

package/dist/modules/n8n-packages/n8n-packages.service.d.ts

@@ -1,11 +1,15 @@
 import { InstanceSettings } from 'n8n-core';
 import type { Readable } from 'node:stream';
 import { EventService } from '../../events/event.service';
-import { ImportPipeline } from './engine/import-pipeline';
+import { N8nPackageParser } from './engine/n8n-package-parser';
+import { ProjectPackageImporter } from './engine/project-package-importer';
+import { WorkflowPackageImporter } from './engine/workflow-package-importer';
 import { CredentialExporter } from './entities/credential/credential.exporter';
+import { DataTableExporter } from './entities/data-table/data-table.exporter';
 import { FolderExporter } from './entities/folder/folder.exporter';
 import { ProjectExporter } from './entities/project/project.exporter';
 import { WorkflowExporter } from './entities/workflow/workflow.exporter';
+import { PackageImportConfig } from './n8n-packages.config';
 import type { ExportPackageRequest, ImportPackageRequest, ImportResult } from './n8n-packages.types';
 import { type ManifestEntry } from './spec/manifest.schema';
 export declare class N8nPackagesService {
@@ -13,11 +17,16 @@ export declare class N8nPackagesService {
     private readonly workflowExporter;
     private readonly folderExporter;
     private readonly credentialExporter;
+    private readonly dataTableExporter;
     private readonly instanceSettings;
-    private readonly importPipeline;
+    private readonly packageParser;
+    private readonly packageImportConfig;
+    private readonly projectPackageImporter;
+    private readonly workflowPackageImporter;
     private readonly eventService;
-    constructor(projectExporter: ProjectExporter, workflowExporter: WorkflowExporter, folderExporter: FolderExporter, credentialExporter: CredentialExporter, instanceSettings: InstanceSettings, importPipeline: ImportPipeline, eventService: EventService);
+    constructor(projectExporter: ProjectExporter, workflowExporter: WorkflowExporter, folderExporter: FolderExporter, credentialExporter: CredentialExporter, dataTableExporter: DataTableExporter, instanceSettings: InstanceSettings, packageParser: N8nPackageParser, packageImportConfig: PackageImportConfig, projectPackageImporter: ProjectPackageImporter, workflowPackageImporter: WorkflowPackageImporter, eventService: EventService);
     exportPackage(request: ExportPackageRequest): Promise<Readable>;
     importPackage(request: ImportPackageRequest): Promise<ImportResult>;
     filterWorkflowsAlreadyInFolders(workflowsInFolders: ManifestEntry[] | undefined, workflowIds: string[]): string[];
+    private buildManifestRequirements;
 }

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

@@ -14,23 +14,32 @@ const di_1 = require("@n8n/di");
 const n8n_core_1 = require("n8n-core");
 const constants_1 = require("../../constants");
 const event_service_1 = require("../../events/event.service");
-const import_pipeline_1 = require("./engine/import-pipeline");
+const n8n_package_parser_1 = require("./engine/n8n-package-parser");
+const project_package_importer_1 = require("./engine/project-package-importer");
+const workflow_package_importer_1 = require("./engine/workflow-package-importer");
 const credential_exporter_1 = require("./entities/credential/credential.exporter");
+const data_table_exporter_1 = require("./entities/data-table/data-table.exporter");
 const folder_exporter_1 = require("./entities/folder/folder.exporter");
 const project_exporter_1 = require("./entities/project/project.exporter");
 const requirements_types_1 = require("./entities/requirements.types");
 const workflow_exporter_1 = require("./entities/workflow/workflow.exporter");
+const tar_package_reader_1 = require("./io/tar/tar-package-reader");
 const tar_package_writer_1 = require("./io/tar/tar-package-writer");
+const n8n_packages_config_1 = require("./n8n-packages.config");
 const constants_2 = require("./spec/constants");
 const manifest_schema_1 = require("./spec/manifest.schema");
 let N8nPackagesService = class N8nPackagesService {
-    constructor(projectExporter, workflowExporter, folderExporter, credentialExporter, instanceSettings, importPipeline, eventService) {
+    constructor(projectExporter, workflowExporter, folderExporter, credentialExporter, dataTableExporter, instanceSettings, packageParser, packageImportConfig, projectPackageImporter, workflowPackageImporter, eventService) {
         this.projectExporter = projectExporter;
         this.workflowExporter = workflowExporter;
         this.folderExporter = folderExporter;
         this.credentialExporter = credentialExporter;
+        this.dataTableExporter = dataTableExporter;
         this.instanceSettings = instanceSettings;
-        this.importPipeline = importPipeline;
+        this.packageParser = packageParser;
+        this.packageImportConfig = packageImportConfig;
+        this.projectPackageImporter = projectPackageImporter;
+        this.workflowPackageImporter = workflowPackageImporter;
         this.eventService = eventService;
     }
     async exportPackage(request) {
@@ -60,16 +69,29 @@ let N8nPackagesService = class N8nPackagesService {
                 writer,
             })
             : undefined;
-        const requirements = (0, requirements_types_1.mergeRequirements)(workflowExportResult?.requirements, folderExportResult?.requirements);
+        const requirements = (0, requirements_types_1.mergeRequirements)(workflowExportResult?.requirements, folderExportResult?.requirements, projectExportResult?.requirements);
         const credentialExportResult = await this.credentialExporter.export({
             user: request.user,
             requirements: requirements.credentials,
             writer,
+            projectTargetsById: projectExportResult?.projectTargetsById,
         });
+        const dataTableExportResult = await this.dataTableExporter.export({
+            user: request.user,
+            requirements: requirements.dataTables,
+            writer,
+            projectTargetsById: projectExportResult?.projectTargetsById,
+        });
+        const allFolders = [
+            ...(folderExportResult?.entries ?? []),
+            ...(projectExportResult?.folderEntries ?? []),
+        ];
         const allWorkflowsInPackage = [
             ...(workflowExportResult?.entries ?? []),
             ...(folderExportResult?.workflowEntries ?? []),
+            ...(projectExportResult?.workflowEntries ?? []),
         ];
+        const manifestRequirements = this.buildManifestRequirements(credentialExportResult.requirements, dataTableExportResult.requirements);
         const manifest = manifest_schema_1.packageManifestSchema.parse({
             packageFormatVersion: constants_2.FORMAT_VERSION,
             exportedAt: new Date().toISOString(),
@@ -78,11 +100,9 @@ let N8nPackagesService = class N8nPackagesService {
             ...(credentialExportResult.entries.length > 0
                 ? { credentials: credentialExportResult.entries }
                 : {}),
-            ...(credentialExportResult.requirements.length > 0
-                ? { requirements: { credentials: credentialExportResult.requirements } }
-                : {}),
+            ...(manifestRequirements ? { requirements: manifestRequirements } : {}),
             ...(allWorkflowsInPackage.length > 0 ? { workflows: allWorkflowsInPackage } : {}),
-            ...(folderExportResult?.entries ? { folders: folderExportResult.entries } : {}),
+            ...(allFolders.length > 0 ? { folders: allFolders } : {}),
             ...(projectExportResult?.entries ? { projects: projectExportResult.entries } : {}),
         });
         writer.writeFile('manifest.json', JSON.stringify(manifest, null, '\t'));
@@ -100,19 +120,32 @@ let N8nPackagesService = class N8nPackagesService {
                 : {}),
             counts: {
                 workflows: allWorkflowsInPackage.length,
-                folders: folderExportResult?.entries.length ?? 0,
+                folders: allFolders.length,
                 credentials: credentialExportResult.entries.length,
+                dataTables: dataTableExportResult.entries.length,
             },
         });
         return stream;
     }
     async importPackage(request) {
-        return await this.importPipeline.run(request);
+        const reader = new tar_package_reader_1.TarPackageReader(request.packageBuffer, this.packageImportConfig);
+        const manifest = await this.packageParser.getManifest(reader);
+        if (isProjectPackage(manifest)) {
+            return await this.projectPackageImporter.import(request, reader, manifest);
+        }
+        return await this.workflowPackageImporter.import(request, reader, manifest);
     }
     filterWorkflowsAlreadyInFolders(workflowsInFolders = [], workflowIds) {
         const folderWorkflowIds = new Set(workflowsInFolders.map((entry) => entry.id) ?? []);
         return workflowIds.filter((id) => !folderWorkflowIds.has(id));
     }
+    buildManifestRequirements(credentials, dataTables) {
+        const requirements = {
+            ...(credentials?.length ? { credentials } : {}),
+            ...(dataTables?.length ? { dataTables } : {}),
+        };
+        return Object.keys(requirements).length > 0 ? requirements : undefined;
+    }
 };
 exports.N8nPackagesService = N8nPackagesService;
 exports.N8nPackagesService = N8nPackagesService = __decorate([
@@ -121,8 +154,15 @@ exports.N8nPackagesService = N8nPackagesService = __decorate([
         workflow_exporter_1.WorkflowExporter,
         folder_exporter_1.FolderExporter,
         credential_exporter_1.CredentialExporter,
+        data_table_exporter_1.DataTableExporter,
         n8n_core_1.InstanceSettings,
-        import_pipeline_1.ImportPipeline,
+        n8n_package_parser_1.N8nPackageParser,
+        n8n_packages_config_1.PackageImportConfig,
+        project_package_importer_1.ProjectPackageImporter,
+        workflow_package_importer_1.WorkflowPackageImporter,
         event_service_1.EventService])
 ], N8nPackagesService);
+function isProjectPackage(manifest) {
+    return (manifest.projects?.length ?? 0) > 0;
+}
 //# sourceMappingURL=n8n-packages.service.js.map