n8n 2.31.5 → 2.32.1

package/dist/modules/n8n-packages/engine/import-orchestrator.js

@@ -11,33 +11,60 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ImportOrchestrator = void 0;
 const di_1 = require("@n8n/di");
+const import_blocked_error_1 = require("./import-blocked.error");
 const credential_importer_1 = require("../entities/credential/credential-importer");
 const credential_missing_mode_1 = require("../entities/credential/credential-missing-mode");
+const data_table_importer_1 = require("../entities/data-table/data-table-importer");
 const folder_importer_1 = require("../entities/folder/folder-importer");
 const workflow_importer_1 = require("../entities/workflow/workflow-importer");
 const workflow_publisher_1 = require("../entities/workflow/workflow-publisher");
 const n8n_packages_types_1 = require("../n8n-packages.types");
-const import_blocked_error_1 = require("./import-blocked.error");
 let ImportOrchestrator = class ImportOrchestrator {
-    constructor(credentialImporter, folderImporter, workflowImporter, workflowPublisher) {
+    constructor(credentialImporter, dataTableImporter, folderImporter, workflowImporter, workflowPublisher) {
         this.credentialImporter = credentialImporter;
+        this.dataTableImporter = dataTableImporter;
         this.folderImporter = folderImporter;
         this.workflowImporter = workflowImporter;
         this.workflowPublisher = workflowPublisher;
     }
     async import(input) {
-        const { context, folders, workflows, credentialRequest, options } = input;
-        await this.workflowPublisher.assertCanPublish(context.user, context.projectId, options.workflowPublishingPolicy);
+        const plan = await this.plan(input);
+        if (plan.blockingIssues.length > 0) {
+            throw (0, import_blocked_error_1.toImportBlockedError)(plan.blockingIssues);
+        }
+        return await this.apply(plan);
+    }
+    async plan(input) {
+        const { context, folders, workflows, credentialRequest, dataTableRequest, options } = input;
+        await this.workflowPublisher.assertCanPublish(context.user, context.projectId, options.workflowPublishingPolicy, input.projectPendingCreation);
         const credentialPlan = await this.credentialImporter.plan(context, credentialRequest);
+        const dataTablePlan = await this.dataTableImporter.plan(context, dataTableRequest);
         const workflowPlan = await this.workflowImporter.plan(context, workflows, options);
         const folderContext = { ...context, folderConflictPolicy: options.folderConflictPolicy };
         const folderPlan = await this.folderImporter.plan(folderContext, folders);
-        const blockingIssues = this.collectBlockingIssues(workflowPlan, credentialPlan, credentialRequest, folderPlan);
-        if (blockingIssues.length > 0) {
-            throw (0, import_blocked_error_1.toImportBlockedError)(blockingIssues);
-        }
+        const blockingIssues = this.collectBlockingIssues({
+            workflowPlan,
+            credentialPlan,
+            credentialRequest,
+            folderPlan,
+            dataTablePlan,
+        });
+        return {
+            input,
+            folderContext,
+            credentialPlan,
+            workflowPlan,
+            folderPlan,
+            dataTablePlan,
+            blockingIssues,
+        };
+    }
+    async apply(plan) {
+        const { input, folderContext, credentialPlan, workflowPlan, folderPlan, dataTablePlan } = plan;
+        const { context, credentialRequest, options } = input;
         const folderSummaries = await this.folderImporter.apply(folderContext, folderPlan);
         const credentialResult = await this.credentialImporter.apply(context, credentialRequest, credentialPlan);
+        await this.dataTableImporter.apply(context, dataTablePlan);
         const publishBlockedSourceWorkflowIds = (0, credential_missing_mode_1.workflowsBlockedFromPublish)(credentialRequest.requirements, new Set(credentialResult.stubbed));
         const { outcomes, bindings } = await this.workflowImporter.apply({
             ...context,
@@ -49,16 +76,18 @@ let ImportOrchestrator = class ImportOrchestrator {
             folderSummaries,
             bindings,
             credentialResult,
+            dataTablePlan,
         };
     }
-    collectBlockingIssues(workflowPlan, credentialResolution, credentialRequest, folderPlan) {
+    collectBlockingIssues({ workflowPlan, credentialPlan, credentialRequest, folderPlan, dataTablePlan, }) {
         return [
             ...workflowPlan.conflicts.map((conflict) => ({ type: 'workflow-conflict', ...conflict })),
             ...workflowPlan.idConflicts.map((conflict) => ({ type: 'workflow-id-conflict', ...conflict })),
             ...workflowPlan.folderConflicts.map((conflict) => ({ type: 'workflow-folder-conflict', ...conflict })),
             ...folderPlan.conflicts.map((conflict) => ({ type: 'folder-conflict', ...conflict })),
+            ...dataTablePlan.failures.map((failure) => ({ type: 'data-table-unresolved', ...failure })),
             ...this.credentialImporter
-                .blockingFailures(credentialRequest, credentialResolution)
+                .blockingFailures(credentialRequest, credentialPlan)
                 .map(toCredentialBlockingIssue),
         ];
     }
@@ -66,10 +95,7 @@ let ImportOrchestrator = class ImportOrchestrator {
 exports.ImportOrchestrator = ImportOrchestrator;
 exports.ImportOrchestrator = ImportOrchestrator = __decorate([
     (0, di_1.Service)(),
-    __metadata("design:paramtypes", [credential_importer_1.CredentialImporter,
-        folder_importer_1.FolderImporter,
-        workflow_importer_1.WorkflowImporter,
-        workflow_publisher_1.WorkflowPublisher])
+    __metadata("design:paramtypes", [credential_importer_1.CredentialImporter, data_table_importer_1.DataTableImporter, folder_importer_1.FolderImporter, workflow_importer_1.WorkflowImporter, workflow_publisher_1.WorkflowPublisher])
 ], ImportOrchestrator);
 function toCredentialBlockingIssue(failure) {
     const { kind, sourceId, targetId, expectedType, actualType, usedByWorkflows } = failure;

package/dist/modules/n8n-packages/engine/import-orchestrator.js.map

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

package/dist/modules/n8n-packages/engine/import-result.d.ts

@@ -1,14 +1,19 @@
-import type { WorkflowImportOutcome } from '../entities/workflow/workflow-import.types';
-import type { ImportCredentialSummary, ImportedFolderSummary, ImportedProjectSummary, ImportPackageSummary, ImportResult, PackageImportBindings } from '../n8n-packages.types';
+import type { PreparedWorkflow, WorkflowImportOutcome } from '../entities/workflow/workflow-import.types';
+import type { ImportBindingMap, ImportCredentialSummary, ImportedFolderSummary, ImportedProjectSummary, ImportedWorkflowSummary, ImportPackageSummary, ImportResult, PackageImportBindings } from '../n8n-packages.types';
 import type { PackageManifest } from '../spec/manifest.schema';
+import type { PackageCredentialRequirement } from '../spec/requirements.schema';
 export declare function toPackageSummary(manifest: PackageManifest): ImportPackageSummary;
+export declare function toImportedWorkflowSummaries(outcomes: WorkflowImportOutcome[], projectId: string): ImportedWorkflowSummary[];
 export declare function buildImportResult(input: {
     package: ImportPackageSummary;
-    projectId: string | null;
-    workflows: WorkflowImportOutcome[];
+    workflows: ImportedWorkflowSummary[];
     folders: ImportedFolderSummary[];
     projects: ImportedProjectSummary[];
     bindings: PackageImportBindings;
     credentials?: ImportCredentialSummary;
 }): ImportResult;
 export declare function assertPackageImportApiKeyScopes(apiKeyScopes: string[] | undefined, required: string[]): void;
+export declare function identifyRequirements<T extends {
+    usedByWorkflows: string[];
+}>(requirements: T[] | undefined, workflows: PreparedWorkflow[]): T[] | undefined;
+export declare function scopeCredentialBindingsToRequirements(bindings: ImportBindingMap | undefined, requirements: PackageCredentialRequirement[] | undefined): ImportBindingMap | undefined;

package/dist/modules/n8n-packages/engine/import-result.js

@@ -1,8 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.toPackageSummary = toPackageSummary;
+exports.toImportedWorkflowSummaries = toImportedWorkflowSummaries;
 exports.buildImportResult = buildImportResult;
 exports.assertPackageImportApiKeyScopes = assertPackageImportApiKeyScopes;
+exports.identifyRequirements = identifyRequirements;
+exports.scopeCredentialBindingsToRequirements = scopeCredentialBindingsToRequirements;
 const forbidden_error_1 = require("../../../errors/response-errors/forbidden.error");
 const n8n_packages_types_1 = require("../n8n-packages.types");
 function toPackageSummary(manifest) {
@@ -12,19 +15,22 @@ function toPackageSummary(manifest) {
         exportedAt: manifest.exportedAt,
     };
 }
+function toImportedWorkflowSummaries(outcomes, projectId) {
+    return outcomes.map(({ workflow, sourceWorkflowId, status, publishing }) => ({
+        sourceWorkflowId,
+        localId: workflow.id,
+        name: workflow.name,
+        projectId,
+        parentFolderId: workflow.parentFolder?.id ?? null,
+        activeVersionId: workflow.activeVersionId ?? null,
+        publishing,
+        status,
+    }));
+}
 function buildImportResult(input) {
     return {
         package: input.package,
-        workflows: input.workflows.map(({ workflow, sourceWorkflowId, status, publishing }) => ({
-            sourceWorkflowId,
-            localId: workflow.id,
-            name: workflow.name,
-            projectId: input.projectId ?? '',
-            parentFolderId: workflow.parentFolder?.id ?? null,
-            activeVersionId: workflow.activeVersionId ?? null,
-            publishing,
-            status,
-        })),
+        workflows: input.workflows,
         folders: input.folders,
         projects: input.projects,
         bindings: (0, n8n_packages_types_1.serializeBindings)(input.bindings),
@@ -40,4 +46,21 @@ function assertPackageImportApiKeyScopes(apiKeyScopes, required) {
         }
     }
 }
+function identifyRequirements(requirements, workflows) {
+    if (!requirements)
+        return undefined;
+    const importedIds = new Set(workflows.map((workflow) => workflow.sourceWorkflowId));
+    return requirements
+        .map((requirement) => ({
+        ...requirement,
+        usedByWorkflows: requirement.usedByWorkflows.filter((id) => importedIds.has(id)),
+    }))
+        .filter((requirement) => requirement.usedByWorkflows.length > 0);
+}
+function scopeCredentialBindingsToRequirements(bindings, requirements) {
+    if (!bindings)
+        return undefined;
+    const requirementIds = new Set((requirements ?? []).map((requirement) => requirement.id));
+    return new Map([...bindings].filter(([sourceId]) => requirementIds.has(sourceId)));
+}
 //# sourceMappingURL=import-result.js.map

package/dist/modules/n8n-packages/engine/import-result.js.map

@@ -1 +1 @@
-{"version":3,"file":"import-result.js","sourceRoot":"","sources":["../../../../src/modules/n8n-packages/engine/import-result.ts"],"names":[],"mappings":";;AAcA,4CAMC;AAGD,8CA0BC;AAMD,0EAUC;AAjED,8EAA0E;AAG1E,8DAA0D;AAW1D,SAAgB,gBAAgB,CAAC,QAAyB;IACzD,OAAO;QACN,gBAAgB,EAAE,QAAQ,CAAC,gBAAgB;QAC3C,QAAQ,EAAE,QAAQ,CAAC,QAAQ;QAC3B,UAAU,EAAE,QAAQ,CAAC,UAAU;KAC/B,CAAC;AACH,CAAC;AAGD,SAAgB,iBAAiB,CAAC,KAQjC;IACA,OAAO;QACN,OAAO,EAAE,KAAK,CAAC,OAAO;QACtB,SAAS,EAAE,KAAK,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,EAAE,QAAQ,EAAE,gBAAgB,EAAE,MAAM,EAAE,UAAU,EAAE,EAAE,EAAE,CAAC,CAAC;YACvF,gBAAgB;YAChB,OAAO,EAAE,QAAQ,CAAC,EAAE;YACpB,IAAI,EAAE,QAAQ,CAAC,IAAI;YACnB,SAAS,EAAE,KAAK,CAAC,SAAS,IAAI,EAAE;YAChC,cAAc,EAAE,QAAQ,CAAC,YAAY,EAAE,EAAE,IAAI,IAAI;YACjD,eAAe,EAAE,QAAQ,CAAC,eAAe,IAAI,IAAI;YACjD,UAAU;YACV,MAAM;SACN,CAAC,CAAC;QACH,OAAO,EAAE,KAAK,CAAC,OAAO;QACtB,QAAQ,EAAE,KAAK,CAAC,QAAQ;QACxB,QAAQ,EAAE,IAAA,sCAAiB,EAAC,KAAK,CAAC,QAAQ,CAAC;QAC3C,WAAW,EAAE,KAAK,CAAC,WAAW,IAAI,EAAE,OAAO,EAAE,EAAE,EAAE,OAAO,EAAE,EAAE,EAAE;KAC9D,CAAC;AACH,CAAC;AAMD,SAAgB,+BAA+B,CAC9C,YAAkC,EAClC,QAAkB;IAElB,IAAI,YAAY,KAAK,SAAS;QAAE,OAAO;IACvC,KAAK,MAAM,KAAK,IAAI,QAAQ,EAAE,CAAC;QAC9B,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC;YACnC,MAAM,IAAI,gCAAc,CAAC,WAAW,CAAC,CAAC;QACvC,CAAC;IACF,CAAC;AACF,CAAC"}
+{"version":3,"file":"import-result.js","sourceRoot":"","sources":["../../../../src/modules/n8n-packages/engine/import-result.ts"],"names":[],"mappings":";;;;;;;;AAAA,8EAA0E;AAM1E,8DAA0D;AAc1D,0BAAiC,QAAyB;IACzD,OAAO;QACN,gBAAgB,EAAE,QAAQ,CAAC,gBAAgB;QAC3C,QAAQ,EAAE,QAAQ,CAAC,QAAQ;QAC3B,UAAU,EAAE,QAAQ,CAAC,UAAU;KAC/B,CAAC;AACH,CAAC;AAED,qCACC,QAAiC,EACjC,SAAiB;IAEjB,OAAO,QAAQ,CAAC,GAAG,CAAC,CAAC,EAAE,QAAQ,EAAE,gBAAgB,EAAE,MAAM,EAAE,UAAU,EAAE,EAAE,EAAE,CAAC,CAAC;QAC5E,gBAAgB;QAChB,OAAO,EAAE,QAAQ,CAAC,EAAE;QACpB,IAAI,EAAE,QAAQ,CAAC,IAAI;QACnB,SAAS;QACT,cAAc,EAAE,QAAQ,CAAC,YAAY,EAAE,EAAE,IAAI,IAAI;QACjD,eAAe,EAAE,QAAQ,CAAC,eAAe,IAAI,IAAI;QACjD,UAAU;QACV,MAAM;KACN,CAAC,CAAC,CAAC;AACL,CAAC;AAED,2BAAkC,KAOjC;IACA,OAAO;QACN,OAAO,EAAE,KAAK,CAAC,OAAO;QACtB,SAAS,EAAE,KAAK,CAAC,SAAS;QAC1B,OAAO,EAAE,KAAK,CAAC,OAAO;QACtB,QAAQ,EAAE,KAAK,CAAC,QAAQ;QACxB,QAAQ,EAAE,IAAA,sCAAiB,EAAC,KAAK,CAAC,QAAQ,CAAC;QAC3C,WAAW,EAAE,KAAK,CAAC,WAAW,IAAI,EAAE,OAAO,EAAE,EAAE,EAAE,OAAO,EAAE,EAAE,EAAE;KAC9D,CAAC;AACH,CAAC;AAMD,yCACC,YAAkC,EAClC,QAAkB;IAElB,IAAI,YAAY,KAAK,SAAS;QAAE,OAAO;IACvC,KAAK,MAAM,KAAK,IAAI,QAAQ,EAAE,CAAC;QAC9B,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC;YACnC,MAAM,IAAI,gCAAc,CAAC,WAAW,CAAC,CAAC;QACvC,CAAC;IACF,CAAC;AACF,CAAC;AAGD,8BACC,YAA6B,EAC7B,SAA6B;IAE7B,IAAI,CAAC,YAAY;QAAE,OAAO,SAAS,CAAC;IAEpC,MAAM,WAAW,GAAG,IAAI,GAAG,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,gBAAgB,CAAC,CAAC,CAAC;IACpF,OAAO,YAAY;SACjB,GAAG,CAAC,CAAC,WAAW,EAAE,EAAE,CAAC,CAAC;QACtB,GAAG,WAAW;QACd,eAAe,EAAE,WAAW,CAAC,eAAe,CAAC,MAAM,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,WAAW,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;KAChF,CAAC,CAAC;SACF,MAAM,CAAC,CAAC,WAAW,EAAE,EAAE,CAAC,WAAW,CAAC,eAAe,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;AACnE,CAAC;AAOD,+CACC,QAAsC,EACtC,YAAwD;IAExD,IAAI,CAAC,QAAQ;QAAE,OAAO,SAAS,CAAC;IAEhC,MAAM,cAAc,GAAG,IAAI,GAAG,CAAC,CAAC,YAAY,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,WAAW,EAAE,EAAE,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC,CAAC;IAC1F,OAAO,IAAI,GAAG,CAAC,CAAC,GAAG,QAAQ,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,QAAQ,CAAC,EAAE,EAAE,CAAC,cAAc,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;AACpF,CAAC"}

package/dist/modules/n8n-packages/engine/import-telemetry.d.ts

@@ -0,0 +1,17 @@
+import type { EventService } from '../../../events/event.service';
+import type { CredentialBindingRequest } from '../entities/credential/credential.types';
+import type { DataTableImportRequest } from '../entities/data-table/data-table.types';
+import type { ImportContext, ImportPackageRequest } from '../n8n-packages.types';
+import type { ImportOrchestrationResult } from './import-orchestrator';
+import type { PackageManifest } from '../spec/manifest.schema';
+export interface PackageImportScope {
+    context: ImportContext;
+    imported: ImportOrchestrationResult;
+    credentialRequest: CredentialBindingRequest;
+    dataTableRequest: DataTableImportRequest;
+}
+export declare function emitPackageImportedEvent(eventService: EventService, params: {
+    request: ImportPackageRequest;
+    manifest: PackageManifest;
+    scopes: PackageImportScope[];
+}): void;

package/dist/modules/n8n-packages/engine/import-telemetry.js

@@ -0,0 +1,59 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.emitPackageImportedEvent = emitPackageImportedEvent;
+function emitPackageImportedEvent(eventService, params) {
+    const { request, manifest, scopes } = params;
+    const workflowOutcomes = scopes.flatMap(({ imported }) => imported.workflowOutcomes);
+    const credentialResults = scopes.map(({ imported }) => imported.credentialResult);
+    const importedWorkflows = workflowOutcomes.filter(({ status }) => status !== 'skipped');
+    const countByStatus = (status) => workflowOutcomes.filter((outcome) => outcome.status === status).length;
+    const credentialRequirements = scopes.reduce((total, { credentialRequest }) => total + (credentialRequest.requirements?.length ?? 0), 0);
+    const matchedCredentialIds = credentialResults.flatMap(({ matched, bindings }) => matched.map((sourceId) => bindings.get(sourceId)));
+    const createdCredentialIds = credentialResults.flatMap(({ stubbed, bindings }) => stubbed.map((sourceId) => bindings.get(sourceId)));
+    const dataTablePlans = scopes.map(({ imported }) => imported.dataTablePlan);
+    const dataTableRequirements = scopes.reduce((total, { dataTableRequest }) => total + (dataTableRequest.requirements?.length ?? 0), 0);
+    const dataTablesMatched = dataTablePlans.reduce((total, plan) => total + plan.matchedCount, 0);
+    const dataTablesCreated = dataTablePlans.reduce((total, plan) => total + plan.creations.length, 0);
+    const folderId = scopes.length === 1 ? scopes[0].context.folderId : null;
+    eventService.emit('n8n-package-imported', {
+        user: request.user,
+        projectIds: scopes.map(({ context }) => context.projectId),
+        folderId,
+        workflowIds: importedWorkflows.map(({ workflow }) => workflow.id),
+        options: {
+            workflowConflictPolicy: request.workflowConflictPolicy,
+            workflowIdPolicy: request.workflowIdPolicy,
+            credentialMatchingMode: request.credentialMatchingMode,
+            credentialMissingMode: request.credentialMissingMode,
+            workflowPublishingPolicy: request.workflowPublishingPolicy,
+            dataTableMatchingMode: request.dataTableMatchingMode,
+            dataTableMissingMode: request.dataTableMissingMode,
+            dataTableSchemaConflictPolicy: request.dataTableSchemaConflictPolicy,
+        },
+        packageSourceId: manifest.sourceId,
+        packageVersion: manifest.packageFormatVersion,
+        credentialIds: {
+            matched: matchedCredentialIds,
+            created: createdCredentialIds,
+            updated: [],
+        },
+        counts: {
+            workflows: {
+                created: countByStatus('created'),
+                updated: countByStatus('updated'),
+                skipped: countByStatus('skipped'),
+            },
+            credentials: {
+                matched: matchedCredentialIds.length,
+                created: createdCredentialIds.length,
+                requirements: credentialRequirements,
+            },
+            dataTables: {
+                matched: dataTablesMatched,
+                created: dataTablesCreated,
+                requirements: dataTableRequirements,
+            },
+        },
+    });
+}
+//# sourceMappingURL=import-telemetry.js.map

package/dist/modules/n8n-packages/engine/import-telemetry.js.map

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

package/dist/modules/n8n-packages/engine/n8n-package-parser.d.ts

@@ -4,15 +4,18 @@ import type { PreparedWorkflow } from '../entities/workflow/workflow-import.type
 import { WorkflowSerializer } from '../entities/workflow/workflow.serializer';
 import type { PackageReader } from '../io/package-reader';
 import type { PackageManifest } from '../spec/manifest.schema';
+import type { SerializedDataTable } from '../spec/serialized/data-table.schema';
 export declare class N8nPackageParser {
     private readonly workflowSerializer;
     constructor(workflowSerializer: WorkflowSerializer);
     getManifest(reader: PackageReader): Promise<PackageManifest>;
-    getWorkflows(reader: PackageReader): Promise<PreparedWorkflow[]>;
-    getFolders(reader: PackageReader): Promise<PreparedFolder[]>;
+    getWorkflows(reader: PackageReader, basePrefix?: string): Promise<PreparedWorkflow[]>;
+    getFolders(reader: PackageReader, basePrefix?: string): Promise<PreparedFolder[]>;
+    getDataTables(reader: PackageReader): Promise<SerializedDataTable[]>;
     getProjects(reader: PackageReader): Promise<PreparedProject[]>;
     private readWorkflow;
     private readFolder;
+    private readDataTable;
     private readProject;
     private readJson;
 }

package/dist/modules/n8n-packages/engine/n8n-package-parser.js

@@ -52,6 +52,7 @@ const WorkflowHelpers = __importStar(require("../../../workflow-helpers"));
 const package_layout_1 = require("./package-layout");
 const workflow_serializer_1 = require("../entities/workflow/workflow.serializer");
 const manifest_schema_1 = require("../spec/manifest.schema");
+const data_table_schema_1 = require("../spec/serialized/data-table.schema");
 const folder_schema_1 = require("../spec/serialized/folder.schema");
 const project_schema_1 = require("../spec/serialized/project.schema");
 let N8nPackageParser = class N8nPackageParser {
@@ -70,22 +71,32 @@ let N8nPackageParser = class N8nPackageParser {
             throw new bad_request_error_1.BadRequestError('Failed to read package manifest');
         }
     }
-    async getWorkflows(reader) {
+    async getWorkflows(reader, basePrefix = '') {
         const manifest = await this.getManifest(reader);
+        const folderTargetToId = new Map((manifest.folders ?? []).map((f) => [f.target, f.id]));
         const workflows = [];
-        for (const entry of (0, package_layout_1.topLevelWorkflows)(manifest.workflows)) {
-            workflows.push(await this.readWorkflow(reader, entry));
+        for (const entry of (0, package_layout_1.workflowsInScope)(manifest.workflows, basePrefix)) {
+            const parentFolderId = (0, package_layout_1.deriveParentFolderId)(entry.target, folderTargetToId);
+            workflows.push(await this.readWorkflow(reader, entry, parentFolderId));
         }
         return workflows;
     }
-    async getFolders(reader) {
+    async getFolders(reader, basePrefix = '') {
         const manifest = await this.getManifest(reader);
         const folders = [];
-        for (const entry of (0, package_layout_1.topLevelFolders)(manifest.folders)) {
+        for (const entry of (0, package_layout_1.foldersInScope)(manifest.folders, basePrefix)) {
             folders.push(await this.readFolder(reader, entry));
         }
         return folders;
     }
+    async getDataTables(reader) {
+        const manifest = await this.getManifest(reader);
+        const dataTables = [];
+        for (const entry of manifest.dataTables ?? []) {
+            dataTables.push(await this.readDataTable(reader, entry));
+        }
+        return dataTables;
+    }
     async getProjects(reader) {
         const manifest = await this.getManifest(reader);
         const projects = [];
@@ -94,7 +105,7 @@ let N8nPackageParser = class N8nPackageParser {
         }
         return projects;
     }
-    async readWorkflow(reader, entry) {
+    async readWorkflow(reader, entry, parentFolderId) {
         const path = `${entry.target}/workflow.json`;
         const wire = await this.readJson(reader, path, 'workflow');
         let entity;
@@ -111,18 +122,19 @@ let N8nPackageParser = class N8nPackageParser {
             throw cause;
         }
         WorkflowHelpers.validateWorkflowStructure(entity);
-        return { entity, sourceWorkflowId: entry.id, sourcePublished: wire.isPublished };
+        return {
+            entity,
+            sourceWorkflowId: entry.id,
+            sourcePublished: wire.isPublished,
+            parentFolderId,
+        };
     }
     async readFolder(reader, entry) {
         const path = `${entry.target}/folder.json`;
         const wire = await this.readJson(reader, path, 'folder');
+        let folder;
         try {
-            const folder = folder_schema_1.serializedFolderSchema.parse(wire);
-            return {
-                sourceFolderId: folder.id,
-                name: folder.name,
-                parentFolderId: folder.parentFolderId,
-            };
+            folder = folder_schema_1.serializedFolderSchema.parse(wire);
         }
         catch (cause) {
             if (cause instanceof zod_1.ZodError) {
@@ -130,18 +142,41 @@ let N8nPackageParser = class N8nPackageParser {
             }
             throw cause;
         }
+        if (folder.id !== entry.id) {
+            throw new n8n_workflow_1.UserError(`Package folder at ${path} declares id "${folder.id}" but the manifest lists it as "${entry.id}".`);
+        }
+        return {
+            sourceFolderId: folder.id,
+            name: folder.name,
+            parentFolderId: folder.parentFolderId,
+        };
+    }
+    async readDataTable(reader, entry) {
+        const path = `${entry.target}/data-table.json`;
+        const wire = await this.readJson(reader, path, 'data table');
+        let dataTable;
+        try {
+            dataTable = data_table_schema_1.serializedDataTableSchema.parse(wire);
+        }
+        catch (cause) {
+            if (cause instanceof zod_1.ZodError) {
+                throw new n8n_workflow_1.UserError(`Package data table file at ${path} failed schema validation.`, {
+                    cause,
+                });
+            }
+            throw cause;
+        }
+        if (dataTable.id !== entry.id) {
+            throw new n8n_workflow_1.UserError(`Package data table at ${path} declares id "${dataTable.id}" but the manifest lists it as "${entry.id}".`);
+        }
+        return dataTable;
     }
     async readProject(reader, entry) {
         const path = `${entry.target}/project.json`;
         const wire = await this.readJson(reader, path, 'project');
+        let project;
         try {
-            const project = project_schema_1.serializedProjectSchema.parse(wire);
-            return {
-                sourceProjectId: project.id,
-                name: project.name,
-                ...(project.description !== undefined ? { description: project.description } : {}),
-                ...(project.icon !== undefined ? { icon: project.icon } : {}),
-            };
+            project = project_schema_1.serializedProjectSchema.parse(wire);
         }
         catch (cause) {
             if (cause instanceof zod_1.ZodError) {
@@ -149,6 +184,15 @@ let N8nPackageParser = class N8nPackageParser {
             }
             throw cause;
         }
+        if (project.id !== entry.id) {
+            throw new n8n_workflow_1.UserError(`Package project at ${path} declares id "${project.id}" but the manifest lists it as "${entry.id}".`);
+        }
+        return {
+            sourceProjectId: project.id,
+            name: project.name,
+            ...(project.description !== undefined ? { description: project.description } : {}),
+            ...(project.icon !== undefined ? { icon: project.icon } : {}),
+        };
     }
     async readJson(reader, path, label) {
         let content;

package/dist/modules/n8n-packages/engine/n8n-package-parser.js.map

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

package/dist/modules/n8n-packages/engine/package-layout.d.ts

@@ -1,11 +1,4 @@
 import type { ManifestEntry } from '../spec/manifest.schema';
-export declare const PACKAGE_TOP_LEVEL_DIRS: {
-    readonly workflows: "workflows";
-    readonly folders: "folders";
-    readonly projects: "projects";
-};
-type TopLevelDir = (typeof PACKAGE_TOP_LEVEL_DIRS)[keyof typeof PACKAGE_TOP_LEVEL_DIRS];
-export declare function isTopLevelTarget(target: string, dir: TopLevelDir): boolean;
-export declare function topLevelFolders(entries: ManifestEntry[] | undefined): ManifestEntry[];
-export declare function topLevelWorkflows(entries: ManifestEntry[] | undefined): ManifestEntry[];
-export {};
+export declare function foldersInScope(entries: ManifestEntry[] | undefined, basePrefix?: string): ManifestEntry[];
+export declare function workflowsInScope(entries: ManifestEntry[] | undefined, basePrefix?: string): ManifestEntry[];
+export declare function deriveParentFolderId(workflowTarget: string, folderTargetToId: Map<string, string>): string | null;

package/dist/modules/n8n-packages/engine/package-layout.js

@@ -1,21 +1,27 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.PACKAGE_TOP_LEVEL_DIRS = void 0;
-exports.isTopLevelTarget = isTopLevelTarget;
-exports.topLevelFolders = topLevelFolders;
-exports.topLevelWorkflows = topLevelWorkflows;
-exports.PACKAGE_TOP_LEVEL_DIRS = {
-    workflows: 'workflows',
-    folders: 'folders',
-    projects: 'projects',
-};
-function isTopLevelTarget(target, dir) {
-    return target.startsWith(`${dir}/`);
+exports.foldersInScope = foldersInScope;
+exports.workflowsInScope = workflowsInScope;
+exports.deriveParentFolderId = deriveParentFolderId;
+const n8n_workflow_1 = require("n8n-workflow");
+function foldersInScope(entries, basePrefix = '') {
+    return (entries ?? []).filter((entry) => entry.target.startsWith(`${basePrefix}folders/`));
 }
-function topLevelFolders(entries) {
-    return (entries ?? []).filter((entry) => isTopLevelTarget(entry.target, 'folders'));
+function workflowsInScope(entries, basePrefix = '') {
+    return (entries ?? []).filter((entry) => entry.target.startsWith(`${basePrefix}workflows/`) ||
+        entry.target.startsWith(`${basePrefix}folders/`));
 }
-function topLevelWorkflows(entries) {
-    return (entries ?? []).filter((entry) => isTopLevelTarget(entry.target, 'workflows'));
+function deriveParentFolderId(workflowTarget, folderTargetToId) {
+    const idx = workflowTarget.lastIndexOf('/workflows/');
+    if (idx === -1)
+        return null;
+    const containerTarget = workflowTarget.slice(0, idx);
+    if (!containerTarget.includes('folders/'))
+        return null;
+    const folderId = folderTargetToId.get(containerTarget);
+    if (folderId === undefined) {
+        throw new n8n_workflow_1.UserError(`Package workflow at "${workflowTarget}" is nested under folder "${containerTarget}", which is missing from the manifest.`);
+    }
+    return folderId;
 }
 //# sourceMappingURL=package-layout.js.map

package/dist/modules/n8n-packages/engine/package-layout.js.map

@@ -1 +1 @@
-{"version":3,"file":"package-layout.js","sourceRoot":"","sources":["../../../../src/modules/n8n-packages/engine/package-layout.ts"],"names":[],"mappings":";;;AAYA,4CAEC;AAED,0CAEC;AAED,8CAEC;AApBY,QAAA,sBAAsB,GAAG;IACrC,SAAS,EAAE,WAAW;IACtB,OAAO,EAAE,SAAS;IAClB,QAAQ,EAAE,UAAU;CACX,CAAC;AAMX,SAAgB,gBAAgB,CAAC,MAAc,EAAE,GAAgB;IAChE,OAAO,MAAM,CAAC,UAAU,CAAC,GAAG,GAAG,GAAG,CAAC,CAAC;AACrC,CAAC;AAED,SAAgB,eAAe,CAAC,OAAoC;IACnE,OAAO,CAAC,OAAO,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,gBAAgB,CAAC,KAAK,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC,CAAC;AACrF,CAAC;AAED,SAAgB,iBAAiB,CAAC,OAAoC;IACrE,OAAO,CAAC,OAAO,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,gBAAgB,CAAC,KAAK,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC,CAAC;AACvF,CAAC"}
+{"version":3,"file":"package-layout.js","sourceRoot":"","sources":["../../../../src/modules/n8n-packages/engine/package-layout.ts"],"names":[],"mappings":";;;;;AAAA,+CAAyC;AAIzC,wBACC,OAAoC,EACpC,UAAU,GAAG,EAAE;IAEf,OAAO,CAAC,OAAO,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,MAAM,CAAC,UAAU,CAAC,GAAG,UAAU,UAAU,CAAC,CAAC,CAAC;AAC5F,CAAC;AAED,0BACC,OAAoC,EACpC,UAAU,GAAG,EAAE;IAEf,OAAO,CAAC,OAAO,IAAI,EAAE,CAAC,CAAC,MAAM,CAC5B,CAAC,KAAK,EAAE,EAAE,CACT,KAAK,CAAC,MAAM,CAAC,UAAU,CAAC,GAAG,UAAU,YAAY,CAAC;QAClD,KAAK,CAAC,MAAM,CAAC,UAAU,CAAC,GAAG,UAAU,UAAU,CAAC,CACjD,CAAC;AACH,CAAC;AAED,8BACC,cAAsB,EACtB,gBAAqC;IAErC,MAAM,GAAG,GAAG,cAAc,CAAC,WAAW,CAAC,aAAa,CAAC,CAAC;IACtD,IAAI,GAAG,KAAK,CAAC,CAAC;QAAE,OAAO,IAAI,CAAC;IAE5B,MAAM,eAAe,GAAG,cAAc,CAAC,KAAK,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC;IAErD,IAAI,CAAC,eAAe,CAAC,QAAQ,CAAC,UAAU,CAAC;QAAE,OAAO,IAAI,CAAC;IACvD,MAAM,QAAQ,GAAG,gBAAgB,CAAC,GAAG,CAAC,eAAe,CAAC,CAAC;IACvD,IAAI,QAAQ,KAAK,SAAS,EAAE,CAAC;QAC5B,MAAM,IAAI,wBAAS,CAClB,wBAAwB,cAAc,6BAA6B,eAAe,wCAAwC,CAC1H,CAAC;IACH,CAAC;IACD,OAAO,QAAQ,CAAC;AACjB,CAAC"}

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

@@ -1,11 +1,19 @@
+import { LicenseState } from '@n8n/backend-common';
+import { EventService } from '../../../events/event.service';
 import { ProjectImporter } from '../entities/project/project-importer';
 import type { PackageReader } from '../io/package-reader';
 import type { ImportPackageRequest, ImportResult } from '../n8n-packages.types';
+import { ImportOrchestrator } from './import-orchestrator';
 import { N8nPackageParser } from './n8n-package-parser';
 import type { PackageManifest } from '../spec/manifest.schema';
 export declare class ProjectPackageImporter {
     private readonly packageParser;
     private readonly projectImporter;
-    constructor(packageParser: N8nPackageParser, projectImporter: ProjectImporter);
+    private readonly importOrchestrator;
+    private readonly eventService;
+    private readonly licenseState;
+    constructor(packageParser: N8nPackageParser, projectImporter: ProjectImporter, importOrchestrator: ImportOrchestrator, eventService: EventService, licenseState: LicenseState);
     import(request: ImportPackageRequest, reader: PackageReader, manifest: PackageManifest): Promise<ImportResult>;
+    private buildImportContextForProject;
+    private assertAdequatePermissions;
 }