n8n 2.45.4 → 2.46.0

package/dist/modules/n8n-packages/entities/data-table/data-table.serializer.d.ts

@@ -1,5 +1,5 @@
+import { type SerializedDataTable } from '@n8n/api-types';
 import type { DataTable } from '../../../../modules/data-table/data-table.entity';
-import { type SerializedDataTable } from '../../spec/serialized/data-table.schema';
 export declare class DataTableSerializer {
     serialize(dataTable: DataTable): SerializedDataTable;
 }

package/dist/modules/n8n-packages/entities/data-table/data-table.serializer.js

@@ -7,8 +7,8 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DataTableSerializer = void 0;
+const api_types_1 = require("@n8n/api-types");
 const di_1 = require("@n8n/di");
-const data_table_schema_1 = require("../../spec/serialized/data-table.schema");
 const package_serialization_types_1 = require("../package-serialization.types");
 const serializeDataTablePayload = (0, package_serialization_types_1.definePackageSerializationPayload)();
 const serializeColumnPayload = (0, package_serialization_types_1.definePackageSerializationPayload)();
@@ -22,7 +22,7 @@ let DataTableSerializer = class DataTableSerializer {
             type: column.type,
             index: column.index,
         }));
-        return data_table_schema_1.serializedDataTableSchema.parse(serializeDataTablePayload({
+        return api_types_1.serializedDataTableSchema.parse(serializeDataTablePayload({
             id: dataTable.id,
             name: dataTable.name,
             columns,

package/dist/modules/n8n-packages/entities/data-table/data-table.serializer.js.map

@@ -1 +1 @@
-{"version":3,"file":"data-table.serializer.js","sourceRoot":"","sources":["../../../../../src/modules/n8n-packages/entities/data-table/data-table.serializer.ts"],"names":[],"mappings":";;;;;;;;;AAAA,gCAAkC;AAKlC,+EAIiD;AACjD,gFAAmF;AAuBnF,MAAM,yBAAyB,GAAG,IAAA,+DAAiC,GAIhE,CAAC;AAEJ,MAAM,sBAAsB,GAAG,IAAA,+DAAiC,GAI7D,CAAC;AAGG,IAAM,mBAAmB,GAAzB,MAAM,mBAAmB;IAC/B,SAAS,CAAC,SAAoB;QAC7B,MAAM,OAAO,GAAG,CAAC,GAAG,SAAS,CAAC,OAAO,CAAC;aACpC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,GAAG,CAAC,CAAC,KAAK,CAAC;aACjC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CACf,sBAAsB,CAAC;YACtB,EAAE,EAAE,MAAM,CAAC,EAAE;YACb,IAAI,EAAE,MAAM,CAAC,IAAI;YACjB,IAAI,EAAE,MAAM,CAAC,IAAI;YACjB,KAAK,EAAE,MAAM,CAAC,KAAK;SACnB,CAAC,CACF,CAAC;QAEH,OAAO,6CAAyB,CAAC,KAAK,CACrC,yBAAyB,CAAC;YACzB,EAAE,EAAE,SAAS,CAAC,EAAE;YAChB,IAAI,EAAE,SAAS,CAAC,IAAI;YACpB,OAAO;SACP,CAAC,CACF,CAAC;IACH,CAAC;CACD,CAAA;;8BArBY,mBAAmB;IAD/B,IAAA,YAAO,GAAE;GACG,mBAAmB,CAqB/B"}
+{"version":3,"file":"data-table.serializer.js","sourceRoot":"","sources":["../../../../../src/modules/n8n-packages/entities/data-table/data-table.serializer.ts"],"names":[],"mappings":";;;;;;;;;AAAA,8CAIwB;AACxB,gCAAkC;AAKlC,gFAAmF;AAuBnF,MAAM,yBAAyB,GAAG,IAAA,+DAAiC,GAIhE,CAAC;AAEJ,MAAM,sBAAsB,GAAG,IAAA,+DAAiC,GAI7D,CAAC;AAGG,IAAM,mBAAmB,GAAzB,MAAM,mBAAmB;IAC/B,SAAS,CAAC,SAAoB;QAC7B,MAAM,OAAO,GAAG,CAAC,GAAG,SAAS,CAAC,OAAO,CAAC;aACpC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,GAAG,CAAC,CAAC,KAAK,CAAC;aACjC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CACf,sBAAsB,CAAC;YACtB,EAAE,EAAE,MAAM,CAAC,EAAE;YACb,IAAI,EAAE,MAAM,CAAC,IAAI;YACjB,IAAI,EAAE,MAAM,CAAC,IAAI;YACjB,KAAK,EAAE,MAAM,CAAC,KAAK;SACnB,CAAC,CACF,CAAC;QAEH,OAAO,qCAAyB,CAAC,KAAK,CACrC,yBAAyB,CAAC;YACzB,EAAE,EAAE,SAAS,CAAC,EAAE;YAChB,IAAI,EAAE,SAAS,CAAC,IAAI;YACpB,OAAO;SACP,CAAC,CACF,CAAC;IACH,CAAC;CACD,CAAA;;8BArBY,mBAAmB;IAD/B,IAAA,YAAO,GAAE;GACG,mBAAmB,CAqB/B"}

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

@@ -1,7 +1,7 @@
+import type { SerializedDataTable } from '@n8n/api-types';
 import type { DataTableColumnType } from 'n8n-workflow';
 import type { DataTableMatchingMode, DataTableMissingMode, DataTableSchemaConflictPolicy } from '../../n8n-packages.types';
 import type { PackageDataTableRequirement } from '../../spec/requirements.schema';
-import type { SerializedDataTable } from '../../spec/serialized/data-table.schema';
 import type { RequirementSource } from '../requirement-source';
 export type DataTableRequirement = RequirementSource & {
     dataTableId: string;

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

@@ -1,4 +1,4 @@
-import type { FolderConflict, FolderConflictPolicy, ImportContext } from '../../n8n-packages.types';
+import type { FolderConflict, FolderConflictPolicy, ImportContext, LayoutConflictPolicy } from '../../n8n-packages.types';
 export interface PreparedFolder {
     sourceFolderId: string;
     name: string;
@@ -6,13 +6,17 @@ export interface PreparedFolder {
 }
 export interface FolderImportContext extends ImportContext {
     folderConflictPolicy: FolderConflictPolicy;
+    layoutConflictPolicy?: LayoutConflictPolicy;
+    movableFolderIds?: ReadonlySet<string>;
 }
-export type FolderPlannedAction = 'create' | 'skip';
+export type FolderPlannedAction = 'create' | 'skip' | 'update';
 export interface FolderPlanItem {
     action: FolderPlannedAction;
     sourceFolderId: string;
     name: string;
     targetParentFolderId: string | null;
+    moved?: true;
+    renamed?: true;
 }
 export interface FolderImportPlan {
     items: FolderPlanItem[];

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

@@ -5,6 +5,8 @@ export declare class FolderImporter {
     private readonly folderService;
     constructor(folderService: FolderService);
     plan(context: FolderImportContext, folders: PreparedFolder[]): Promise<FolderImportPlan>;
-    apply(context: FolderImportContext, plan: FolderImportPlan): Promise<ImportedFolderSummary[]>;
+    apply(context: FolderImportContext, plan: FolderImportPlan): Promise<void>;
+    applyUpdates(context: FolderImportContext, plan: FolderImportPlan): Promise<void>;
     private findExisting;
 }
+export declare function toFolderSummaries(plan: FolderImportPlan): ImportedFolderSummary[];

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

@@ -10,10 +10,12 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.FolderImporter = void 0;
+exports.toFolderSummaries = toFolderSummaries;
 const di_1 = require("@n8n/di");
 const n8n_workflow_1 = require("n8n-workflow");
 const folder_service_1 = require("../../../../services/folder.service");
 const folder_conflict_policy_1 = require("./folder-conflict-policy");
+const n8n_packages_types_1 = require("../../n8n-packages.types");
 let FolderImporter = class FolderImporter {
     constructor(folderService) {
         this.folderService = folderService;
@@ -44,7 +46,9 @@ let FolderImporter = class FolderImporter {
                 });
                 continue;
             }
-            if (match.parentFolderId !== targetParentFolderId) {
+            const followsPackage = context.layoutConflictPolicy === n8n_packages_types_1.LayoutConflictPolicy.FollowPackage;
+            const moved = match.parentFolderId !== targetParentFolderId;
+            if (moved && !followsPackage) {
                 conflicts.push({
                     kind: 'parent-mismatch',
                     sourceFolderId: folder.sourceFolderId,
@@ -62,26 +66,43 @@ let FolderImporter = class FolderImporter {
                 });
                 continue;
             }
+            const renamed = followsPackage && match.name !== folder.name;
+            if ((moved || renamed) && (context.movableFolderIds?.has(folder.sourceFolderId) ?? true)) {
+                items.push({
+                    action: 'update',
+                    sourceFolderId: folder.sourceFolderId,
+                    name: folder.name,
+                    targetParentFolderId,
+                    ...(moved ? { moved: true } : {}),
+                    ...(renamed ? { renamed: true } : {}),
+                });
+                continue;
+            }
             items.push({
                 action: 'skip',
                 sourceFolderId: folder.sourceFolderId,
                 name: folder.name,
-                targetParentFolderId,
+                targetParentFolderId: match.parentFolderId,
             });
         }
         return { items, conflicts };
     }
     async apply(context, plan) {
-        const summaries = [];
         for (const item of plan.items) {
-            if (item.action === 'skip') {
-                summaries.push(toSummary(item, 'skipped'));
+            if (item.action !== 'create')
                 continue;
-            }
             await this.folderService.createFolder({ name: item.name, parentFolderId: item.targetParentFolderId ?? undefined }, context.projectId, item.sourceFolderId);
-            summaries.push(toSummary(item, 'created'));
         }
-        return summaries;
+    }
+    async applyUpdates(context, plan) {
+        for (const item of plan.items) {
+            if (item.action !== 'update')
+                continue;
+            await this.folderService.updateFolder(item.sourceFolderId, context.projectId, {
+                ...(item.renamed ? { name: item.name } : {}),
+                ...(item.moved ? { parentFolderId: item.targetParentFolderId ?? n8n_workflow_1.PROJECT_ROOT } : {}),
+            });
+        }
     }
     async findExisting(folderIds) {
         const folders = await this.folderService.getFoldersByIds(folderIds);
@@ -100,14 +121,21 @@ exports.FolderImporter = FolderImporter = __decorate([
     (0, di_1.Service)(),
     __metadata("design:paramtypes", [folder_service_1.FolderService])
 ], FolderImporter);
-function toSummary(item, status) {
-    return {
-        sourceFolderId: item.sourceFolderId,
-        localId: item.sourceFolderId,
-        name: item.name,
-        parentFolderId: item.targetParentFolderId,
-        status,
-    };
+const SUMMARY_STATUS = {
+    create: 'created',
+    skip: 'skipped',
+    update: 'updated',
+};
+function toFolderSummaries(plan) {
+    return plan.items.map(({ action, sourceFolderId, name, targetParentFolderId, moved, renamed }) => ({
+        sourceFolderId,
+        localId: sourceFolderId,
+        name,
+        parentFolderId: targetParentFolderId,
+        status: SUMMARY_STATUS[action],
+        ...(moved ? { moved } : {}),
+        ...(renamed ? { renamed } : {}),
+    }));
 }
 function orderParentsFirst(folders) {
     const byId = new Map(folders.map((folder) => [folder.sourceFolderId, folder]));

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

@@ -1 +1 @@
-{"version":3,"file":"folder-importer.js","sourceRoot":"","sources":["../../../../../src/modules/n8n-packages/entities/folder/folder-importer.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,gCAAkC;AAClC,+CAAyC;AAEzC,8DAA0D;AAE1D,qEAA+D;AAgBxD,IAAM,cAAc,GAApB,MAAM,cAAc;IAC1B,YAA6B,aAA4B;6BAA5B,aAAa;IAAkB,CAAC;IAE7D,KAAK,CAAC,IAAI,CAAC,OAA4B,EAAE,OAAyB;QACjE,MAAM,OAAO,GAAG,iBAAiB,CAAC,OAAO,CAAC,CAAC;QAC3C,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,EAAE,cAAc,EAAE,EAAE,EAAE,CAAC,cAAc,CAAC,CAAC,CAAC;QAE9F,MAAM,KAAK,GAAqB,EAAE,CAAC;QACnC,MAAM,SAAS,GAAqB,EAAE,CAAC;QAEvC,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE,CAAC;YAC9B,MAAM,oBAAoB,GACzB,MAAM,CAAC,cAAc,KAAK,IAAI,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,QAAQ,IAAI,IAAI,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,cAAc,CAAC;YAErF,MAAM,KAAK,GAAG,QAAQ,CAAC,GAAG,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC;YAElD,IAAI,CAAC,KAAK,EAAE,CAAC;gBACZ,KAAK,CAAC,IAAI,CAAC;oBACV,MAAM,EAAE,QAAQ;oBAChB,cAAc,EAAE,MAAM,CAAC,cAAc;oBACrC,IAAI,EAAE,MAAM,CAAC,IAAI;oBACjB,oBAAoB;iBACpB,CAAC,CAAC;gBACH,SAAS;YACV,CAAC;YAED,IAAI,KAAK,CAAC,SAAS,KAAK,OAAO,CAAC,SAAS,EAAE,CAAC;gBAC3C,SAAS,CAAC,IAAI,CAAC;oBACd,IAAI,EAAE,qBAAqB;oBAC3B,cAAc,EAAE,MAAM,CAAC,cAAc;oBACrC,IAAI,EAAE,MAAM,CAAC,IAAI;oBACjB,iBAAiB,EAAE,KAAK,CAAC,SAAS;iBAClC,CAAC,CAAC;gBACH,SAAS;YACV,CAAC;YAGD,IAAI,KAAK,CAAC,cAAc,KAAK,oBAAoB,EAAE,CAAC;gBACnD,SAAS,CAAC,IAAI,CAAC;oBACd,IAAI,EAAE,iBAAiB;oBACvB,cAAc,EAAE,MAAM,CAAC,cAAc;oBACrC,IAAI,EAAE,MAAM,CAAC,IAAI;oBACjB,sBAAsB,EAAE,KAAK,CAAC,cAAc;oBAC5C,sBAAsB,EAAE,oBAAoB;iBAC5C,CAAC,CAAC;gBACH,SAAS;YACV,CAAC;YAED,IAAI,IAAA,4CAAmB,EAAC,OAAO,CAAC,oBAAoB,CAAC,CAAC,OAAO,EAAE,CAAC;gBAC/D,SAAS,CAAC,IAAI,CAAC;oBACd,IAAI,EAAE,aAAa;oBACnB,cAAc,EAAE,MAAM,CAAC,cAAc;oBACrC,IAAI,EAAE,MAAM,CAAC,IAAI;iBACjB,CAAC,CAAC;gBACH,SAAS;YACV,CAAC;YAGD,KAAK,CAAC,IAAI,CAAC;gBACV,MAAM,EAAE,MAAM;gBACd,cAAc,EAAE,MAAM,CAAC,cAAc;gBACrC,IAAI,EAAE,MAAM,CAAC,IAAI;gBACjB,oBAAoB;aACpB,CAAC,CAAC;QACJ,CAAC;QAED,OAAO,EAAE,KAAK,EAAE,SAAS,EAAE,CAAC;IAC7B,CAAC;IAED,KAAK,CAAC,KAAK,CACV,OAA4B,EAC5B,IAAsB;QAEtB,MAAM,SAAS,GAA4B,EAAE,CAAC;QAE9C,KAAK,MAAM,IAAI,IAAI,IAAI,CAAC,KAAK,EAAE,CAAC;YAC/B,IAAI,IAAI,CAAC,MAAM,KAAK,MAAM,EAAE,CAAC;gBAC5B,SAAS,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC,CAAC;gBAC3C,SAAS;YACV,CAAC;YAED,MAAM,IAAI,CAAC,aAAa,CAAC,YAAY,CACpC,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,cAAc,EAAE,IAAI,CAAC,oBAAoB,IAAI,SAAS,EAAE,EAC3E,OAAO,CAAC,SAAS,EACjB,IAAI,CAAC,cAAc,CACnB,CAAC;YACF,SAAS,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC,CAAC;QAC5C,CAAC;QAED,OAAO,SAAS,CAAC;IAClB,CAAC;IAEO,KAAK,CAAC,YAAY,CAAC,SAAmB;QAC7C,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,eAAe,CAAC,SAAS,CAAC,CAAC;QACpE,OAAO,IAAI,GAAG,CACb,OAAO,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC;YACvB,MAAM,CAAC,EAAE;YACT;gBACC,SAAS,EAAE,MAAM,CAAC,WAAW,CAAC,EAAE;gBAChC,cAAc,EAAE,MAAM,CAAC,cAAc;gBACrC,IAAI,EAAE,MAAM,CAAC,IAAI;aACjB;SACD,CAAC,CACF,CAAC;IACH,CAAC;CACD,CAAA;;yBAzGY,cAAc;IAD1B,IAAA,YAAO,GAAE;qCAEmC,8BAAa;GAD7C,cAAc,CAyG1B;AAED,SAAS,SAAS,CACjB,IAAoB,EACpB,MAAuC;IAEvC,OAAO;QACN,cAAc,EAAE,IAAI,CAAC,cAAc;QACnC,OAAO,EAAE,IAAI,CAAC,cAAc;QAC5B,IAAI,EAAE,IAAI,CAAC,IAAI;QACf,cAAc,EAAE,IAAI,CAAC,oBAAoB;QACzC,MAAM;KACN,CAAC;AACH,CAAC;AAMD,SAAS,iBAAiB,CAAC,OAAyB;IACnD,MAAM,IAAI,GAAG,IAAI,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,MAAM,CAAC,cAAc,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC;IAC/E,MAAM,OAAO,GAAqB,EAAE,CAAC;IACrC,MAAM,OAAO,GAAG,IAAI,GAAG,EAAU,CAAC;IAClC,MAAM,OAAO,GAAG,IAAI,GAAG,EAAU,CAAC;IAElC,MAAM,KAAK,GAAG,CAAC,MAAsB,EAAQ,EAAE;QAC9C,IAAI,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,cAAc,CAAC;YAAE,OAAO;QAC/C,IAAI,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,cAAc,CAAC,EAAE,CAAC;YACxC,MAAM,IAAI,wBAAS,CAAC,4CAA4C,CAAC,CAAC;QACnE,CAAC;QACD,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC;QAEnC,MAAM,QAAQ,GAAG,MAAM,CAAC,cAAc,CAAC;QACvC,IAAI,QAAQ,KAAK,IAAI,EAAE,CAAC;YACvB,MAAM,MAAM,GAAG,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;YAClC,IAAI,CAAC,MAAM,EAAE,CAAC;gBACb,MAAM,IAAI,wBAAS,CAClB,mBAAmB,MAAM,CAAC,IAAI,0DAA0D,CACxF,CAAC;YACH,CAAC;YACD,KAAK,CAAC,MAAM,CAAC,CAAC;QACf,CAAC;QAED,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC;QACtC,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC;QACnC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IACtB,CAAC,CAAC;IAEF,KAAK,MAAM,MAAM,IAAI,OAAO;QAAE,KAAK,CAAC,MAAM,CAAC,CAAC;IAC5C,OAAO,OAAO,CAAC;AAChB,CAAC"}
+{"version":3,"file":"folder-importer.js","sourceRoot":"","sources":["../../../../../src/modules/n8n-packages/entities/folder/folder-importer.ts"],"names":[],"mappings":"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"}

package/dist/modules/n8n-packages/entities/folder/folder-remover.d.ts

@@ -1,5 +1,6 @@
 import { FolderService } from '../../../../services/folder.service';
 import { ProjectService } from '../../../../services/project.service.ee';
+import type { FolderPlanItem } from './folder-import.types';
 import type { FolderRemovalPlan } from './folder-removal.types';
 import type { ImportContext, RemovedFolderSummary } from '../../n8n-packages.types';
 export declare class FolderRemover {
@@ -9,6 +10,7 @@ export declare class FolderRemover {
     plan(context: ImportContext, input: {
         packageFolderIds: string[];
         occupiedFolderIds: string[];
+        folderItems: FolderPlanItem[];
     }): Promise<FolderRemovalPlan>;
     apply(context: ImportContext, plan: FolderRemovalPlan): Promise<RemovedFolderSummary[]>;
 }

package/dist/modules/n8n-packages/entities/folder/folder-remover.js

@@ -13,6 +13,7 @@ exports.FolderRemover = void 0;
 const di_1 = require("@n8n/di");
 const folder_service_1 = require("../../../../services/folder.service");
 const project_service_ee_1 = require("../../../../services/project.service.ee");
+const planned_placements_1 = require("../planned-placements");
 let FolderRemover = class FolderRemover {
     constructor(folderService, projectService) {
         this.folderService = folderService;
@@ -20,9 +21,10 @@ let FolderRemover = class FolderRemover {
     }
     async plan(context, input) {
         const nothingToRemove = { removals: [], failures: [] };
-        const placements = await this.folderService.getFolderPlacementsInProject(context.projectId);
-        if (placements.length === 0)
+        const current = await this.folderService.getFolderPlacementsInProject(context.projectId);
+        if (current.length === 0)
             return nothingToRemove;
+        const placements = (0, planned_placements_1.withPlannedParents)(current, plannedFolderParents(input.folderItems));
         const packageFolderIds = new Set(input.packageFolderIds);
         const candidates = placements.filter(({ id }) => !packageFolderIds.has(id));
         if (candidates.length === 0)
@@ -107,4 +109,12 @@ function folderDepths(placements) {
         depthOf(id);
     return depths;
 }
+function plannedFolderParents(items) {
+    return new Map(items
+        .filter(({ moved }) => moved)
+        .map(({ sourceFolderId, targetParentFolderId }) => [
+        sourceFolderId,
+        targetParentFolderId,
+    ]));
+}
 //# sourceMappingURL=folder-remover.js.map

package/dist/modules/n8n-packages/entities/folder/folder-remover.js.map

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

package/dist/modules/n8n-packages/entities/folder/folder.serializer.d.ts

@@ -1,5 +1,5 @@
+import { type SerializedFolder } from '@n8n/api-types';
 import type { Folder } from '@n8n/db';
-import { type SerializedFolder } from '../../spec/serialized/folder.schema';
 export declare class FolderSerializer {
     serialize(folder: Folder, parentFolderId: string | null): SerializedFolder;
 }

package/dist/modules/n8n-packages/entities/folder/folder.serializer.js

@@ -7,13 +7,13 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.FolderSerializer = void 0;
+const api_types_1 = require("@n8n/api-types");
 const di_1 = require("@n8n/di");
-const folder_schema_1 = require("../../spec/serialized/folder.schema");
 const package_serialization_types_1 = require("../package-serialization.types");
 const serializePayload = (0, package_serialization_types_1.definePackageSerializationPayload)();
 let FolderSerializer = class FolderSerializer {
     serialize(folder, parentFolderId) {
-        return folder_schema_1.serializedFolderSchema.parse(serializePayload({
+        return api_types_1.serializedFolderSchema.parse(serializePayload({
             id: folder.id,
             name: folder.name,
             parentFolderId,

package/dist/modules/n8n-packages/entities/folder/folder.serializer.js.map

@@ -1 +1 @@
-{"version":3,"file":"folder.serializer.js","sourceRoot":"","sources":["../../../../../src/modules/n8n-packages/entities/folder/folder.serializer.ts"],"names":[],"mappings":";;;;;;;;;AACA,gCAAkC;AAElC,uEAAoG;AACpG,gFAAmF;AAenF,MAAM,gBAAgB,GAAG,IAAA,+DAAiC,GAIvD,CAAC;AAGG,IAAM,gBAAgB,GAAtB,MAAM,gBAAgB;IAC5B,SAAS,CAAC,MAAc,EAAE,cAA6B;QACtD,OAAO,sCAAsB,CAAC,KAAK,CAClC,gBAAgB,CAAC;YAChB,EAAE,EAAE,MAAM,CAAC,EAAE;YACb,IAAI,EAAE,MAAM,CAAC,IAAI;YACjB,cAAc;SACd,CAAC,CACF,CAAC;IACH,CAAC;CACD,CAAA;;2BAVY,gBAAgB;IAD5B,IAAA,YAAO,GAAE;GACG,gBAAgB,CAU5B"}
+{"version":3,"file":"folder.serializer.js","sourceRoot":"","sources":["../../../../../src/modules/n8n-packages/entities/folder/folder.serializer.ts"],"names":[],"mappings":";;;;;;;;;AAAA,8CAA+E;AAE/E,gCAAkC;AAElC,gFAAmF;AAenF,MAAM,gBAAgB,GAAG,IAAA,+DAAiC,GAIvD,CAAC;AAGG,IAAM,gBAAgB,GAAtB,MAAM,gBAAgB;IAC5B,SAAS,CAAC,MAAc,EAAE,cAA6B;QACtD,OAAO,kCAAsB,CAAC,KAAK,CAClC,gBAAgB,CAAC;YAChB,EAAE,EAAE,MAAM,CAAC,EAAE;YACb,IAAI,EAAE,MAAM,CAAC,IAAI;YACjB,cAAc;SACd,CAAC,CACF,CAAC;IACH,CAAC;CACD,CAAA;;2BAVY,gBAAgB;IAD5B,IAAA,YAAO,GAAE;GACG,gBAAgB,CAU5B"}

package/dist/modules/n8n-packages/entities/import-conflict-policy.d.ts

@@ -0,0 +1,6 @@
+import type { WorkflowConflictPolicy } from '../n8n-packages.types';
+export interface ImportDecision {
+    action: 'create' | 'update' | 'skip';
+    blocked: boolean;
+}
+export declare function decideImportConflictAction(policy: WorkflowConflictPolicy, exists: boolean): ImportDecision;

package/dist/modules/n8n-packages/entities/import-conflict-policy.js

@@ -0,0 +1,12 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.decideImportConflictAction = decideImportConflictAction;
+const CONFLICT_POLICIES = {
+    'new-version': (exists) => ({ action: exists ? 'update' : 'create', blocked: false }),
+    fail: (exists) => ({ action: 'create', blocked: exists }),
+    skip: (exists) => ({ action: exists ? 'skip' : 'create', blocked: false }),
+};
+function decideImportConflictAction(policy, exists) {
+    return CONFLICT_POLICIES[policy](exists);
+}
+//# sourceMappingURL=import-conflict-policy.js.map

package/dist/modules/n8n-packages/entities/import-conflict-policy.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"import-conflict-policy.js","sourceRoot":"","sources":["../../../../src/modules/n8n-packages/entities/import-conflict-policy.ts"],"names":[],"mappings":";;;AAQA,MAAM,iBAAiB,GAAwE;IAC9F,aAAa,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,QAAQ,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC;IACrF,IAAI,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,EAAE,MAAM,EAAE,QAAQ,EAAE,OAAO,EAAE,MAAM,EAAE,CAAC;IACzD,IAAI,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,QAAQ,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC;CAC1E,CAAC;AAGF,oCACC,MAA8B,EAC9B,MAAe;IAEf,OAAO,iBAAiB,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,CAAC;AAC1C,CAAC"}

package/dist/modules/n8n-packages/entities/import-id-policy.d.ts

@@ -0,0 +1,2 @@
+import type { WorkflowIdPolicy } from '../n8n-packages.types';
+export declare function decideImportId(policy: WorkflowIdPolicy, sourceId: string): string;

package/dist/modules/n8n-packages/entities/import-id-policy.js

@@ -0,0 +1,12 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.decideImportId = decideImportId;
+const generate_nano_id_1 = require("@n8n/utils/generate-nano-id");
+const IMPORT_ID_POLICIES = {
+    new: () => (0, generate_nano_id_1.generateNanoId)(),
+    source: (sourceId) => sourceId,
+};
+function decideImportId(policy, sourceId) {
+    return IMPORT_ID_POLICIES[policy](sourceId);
+}
+//# sourceMappingURL=import-id-policy.js.map

package/dist/modules/n8n-packages/entities/import-id-policy.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"import-id-policy.js","sourceRoot":"","sources":["../../../../src/modules/n8n-packages/entities/import-id-policy.ts"],"names":[],"mappings":";;;AAAA,kEAA6D;AAK7D,MAAM,kBAAkB,GAA2D;IAClF,GAAG,EAAE,GAAG,EAAE,CAAC,IAAA,iCAAc,GAAE;IAC3B,MAAM,EAAE,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ;CAC9B,CAAC;AAEF,wBAA+B,MAAwB,EAAE,QAAgB;IACxE,OAAO,kBAAkB,CAAC,MAAM,CAAC,CAAC,QAAQ,CAAC,CAAC;AAC7C,CAAC"}

package/dist/modules/n8n-packages/entities/match-source-ids.d.ts

@@ -0,0 +1,6 @@
+export declare function matchSourceIds<T extends {
+    id: string;
+}>(sourceIds: string[], candidates: T[], getSourceId: (candidate: T) => string | null): {
+    matches: Map<string, T>;
+    ambiguous: Map<string, T[]>;
+};

package/dist/modules/n8n-packages/entities/match-source-ids.js

@@ -0,0 +1,32 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.matchSourceIds = matchSourceIds;
+function matchSourceIds(sourceIds, candidates, getSourceId) {
+    const requested = new Set(sourceIds);
+    const bySourceId = new Map();
+    for (const candidate of candidates) {
+        const sourceId = getSourceId(candidate);
+        if (sourceId === null || !requested.has(sourceId))
+            continue;
+        const group = bySourceId.get(sourceId) ?? [];
+        group.push(candidate);
+        bySourceId.set(sourceId, group);
+    }
+    const matches = new Map();
+    const ambiguous = new Map();
+    for (const [sourceId, group] of bySourceId) {
+        if (group.length === 1)
+            matches.set(sourceId, group[0]);
+        else
+            ambiguous.set(sourceId, group.toSorted((left, right) => left.id.localeCompare(right.id)));
+    }
+    for (const candidate of candidates) {
+        if (getSourceId(candidate) !== null ||
+            !requested.has(candidate.id) ||
+            bySourceId.has(candidate.id))
+            continue;
+        matches.set(candidate.id, candidate);
+    }
+    return { matches, ambiguous };
+}
+//# sourceMappingURL=match-source-ids.js.map

package/dist/modules/n8n-packages/entities/match-source-ids.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"match-source-ids.js","sourceRoot":"","sources":["../../../../src/modules/n8n-packages/entities/match-source-ids.ts"],"names":[],"mappings":";;;AACA,wBACC,SAAmB,EACnB,UAAe,EACf,WAA4C;IAE5C,MAAM,SAAS,GAAG,IAAI,GAAG,CAAC,SAAS,CAAC,CAAC;IACrC,MAAM,UAAU,GAAG,IAAI,GAAG,EAAe,CAAC;IAC1C,KAAK,MAAM,SAAS,IAAI,UAAU,EAAE,CAAC;QACpC,MAAM,QAAQ,GAAG,WAAW,CAAC,SAAS,CAAC,CAAC;QACxC,IAAI,QAAQ,KAAK,IAAI,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,QAAQ,CAAC;YAAE,SAAS;QAC5D,MAAM,KAAK,GAAG,UAAU,CAAC,GAAG,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAC;QAC7C,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QACtB,UAAU,CAAC,GAAG,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAC;IACjC,CAAC;IACD,MAAM,OAAO,GAAG,IAAI,GAAG,EAAa,CAAC;IACrC,MAAM,SAAS,GAAG,IAAI,GAAG,EAAe,CAAC;IACzC,KAAK,MAAM,CAAC,QAAQ,EAAE,KAAK,CAAC,IAAI,UAAU,EAAE,CAAC;QAC5C,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC;YAAE,OAAO,CAAC,GAAG,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;;YAEvD,SAAS,CAAC,GAAG,CACZ,QAAQ,EACR,KAAK,CAAC,QAAQ,CAAC,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,aAAa,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,CAChE,CAAC;IACJ,CAAC;IACD,KAAK,MAAM,SAAS,IAAI,UAAU,EAAE,CAAC;QACpC,IACC,WAAW,CAAC,SAAS,CAAC,KAAK,IAAI;YAC/B,CAAC,SAAS,CAAC,GAAG,CAAC,SAAS,CAAC,EAAE,CAAC;YAC5B,UAAU,CAAC,GAAG,CAAC,SAAS,CAAC,EAAE,CAAC;YAE5B,SAAS;QACV,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,EAAE,EAAE,SAAS,CAAC,CAAC;IACtC,CAAC;IACD,OAAO,EAAE,OAAO,EAAE,SAAS,EAAE,CAAC;AAC/B,CAAC"}

package/dist/modules/n8n-packages/entities/planned-placements.d.ts

@@ -0,0 +1,6 @@
+interface Placement {
+    id: string;
+    parentFolderId: string | null;
+}
+export declare function withPlannedParents<T extends Placement>(placements: T[], plannedParents: ReadonlyMap<string, string | null>): T[];
+export {};

package/dist/modules/n8n-packages/entities/planned-placements.js

@@ -0,0 +1,12 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.withPlannedParents = withPlannedParents;
+function withPlannedParents(placements, plannedParents) {
+    if (plannedParents.size === 0)
+        return placements;
+    return placements.map((placement) => {
+        const parentFolderId = plannedParents.get(placement.id);
+        return parentFolderId === undefined ? placement : { ...placement, parentFolderId };
+    });
+}
+//# sourceMappingURL=planned-placements.js.map

package/dist/modules/n8n-packages/entities/planned-placements.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"planned-placements.js","sourceRoot":"","sources":["../../../../src/modules/n8n-packages/entities/planned-placements.ts"],"names":[],"mappings":";;;AASA,4BACC,UAAe,EACf,cAAkD;IAElD,IAAI,cAAc,CAAC,IAAI,KAAK,CAAC;QAAE,OAAO,UAAU,CAAC;IACjD,OAAO,UAAU,CAAC,GAAG,CAAC,CAAC,SAAS,EAAE,EAAE;QACnC,MAAM,cAAc,GAAG,cAAc,CAAC,GAAG,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC;QAExD,OAAO,cAAc,KAAK,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,GAAG,SAAS,EAAE,cAAc,EAAE,CAAC;IACpF,CAAC,CAAC,CAAC;AACJ,CAAC"}

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

@@ -1,5 +1,5 @@
+import type { SerializedProject } from '@n8n/api-types';
 import type { ProjectConflict } from '../../n8n-packages.types';
-import type { SerializedProject } from '../../spec/serialized/project.schema';
 export interface PreparedProject {
     sourceProjectId: string;
     name: string;

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

@@ -1,5 +1,5 @@
+import { type SerializedProject } from '@n8n/api-types';
 import type { Project } from '@n8n/db';
-import { type SerializedProject } from '../../spec/serialized/project.schema';
 export declare class ProjectSerializer {
     serialize(project: Project): SerializedProject;
 }

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

@@ -7,13 +7,13 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ProjectSerializer = void 0;
+const api_types_1 = require("@n8n/api-types");
 const di_1 = require("@n8n/di");
-const project_schema_1 = require("../../spec/serialized/project.schema");
 const package_serialization_types_1 = require("../package-serialization.types");
 const serializePayload = (0, package_serialization_types_1.definePackageSerializationPayload)();
 let ProjectSerializer = class ProjectSerializer {
     serialize(project) {
-        return project_schema_1.serializedProjectSchema.parse(serializePayload({
+        return api_types_1.serializedProjectSchema.parse(serializePayload({
             id: project.id,
             name: project.name,
             ...(project.description !== null ? { description: project.description } : {}),

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

@@ -1 +1 @@
-{"version":3,"file":"project.serializer.js","sourceRoot":"","sources":["../../../../../src/modules/n8n-packages/entities/project/project.serializer.ts"],"names":[],"mappings":";;;;;;;;;AACA,gCAAkC;AAElC,yEAG8C;AAC9C,gFAAmF;AAqBnF,MAAM,gBAAgB,GAAG,IAAA,+DAAiC,GAIvD,CAAC;AAGG,IAAM,iBAAiB,GAAvB,MAAM,iBAAiB;IAC7B,SAAS,CAAC,OAAgB;QACzB,OAAO,wCAAuB,CAAC,KAAK,CACnC,gBAAgB,CAAC;YAChB,EAAE,EAAE,OAAO,CAAC,EAAE;YACd,IAAI,EAAE,OAAO,CAAC,IAAI;YAClB,GAAG,CAAC,OAAO,CAAC,WAAW,KAAK,IAAI,CAAC,CAAC,CAAC,EAAE,WAAW,EAAE,OAAO,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YAC7E,GAAG,CAAC,OAAO,CAAC,IAAI,KAAK,IAAI,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,OAAO,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YACxD,GAAG,CAAC,OAAO,CAAC,mBAAmB,EAAE,MAAM;gBACtC,CAAC,CAAC,EAAE,mBAAmB,EAAE,OAAO,CAAC,mBAAmB,EAAE;gBACtD,CAAC,CAAC,EAAE,CAAC;SACN,CAAC,CACF,CAAC;IACH,CAAC;CACD,CAAA;;4BAdY,iBAAiB;IAD7B,IAAA,YAAO,GAAE;GACG,iBAAiB,CAc7B"}
+{"version":3,"file":"project.serializer.js","sourceRoot":"","sources":["../../../../../src/modules/n8n-packages/entities/project/project.serializer.ts"],"names":[],"mappings":";;;;;;;;;AAAA,8CAAiF;AAEjF,gCAAkC;AAElC,gFAAmF;AAqBnF,MAAM,gBAAgB,GAAG,IAAA,+DAAiC,GAIvD,CAAC;AAGG,IAAM,iBAAiB,GAAvB,MAAM,iBAAiB;IAC7B,SAAS,CAAC,OAAgB;QACzB,OAAO,mCAAuB,CAAC,KAAK,CACnC,gBAAgB,CAAC;YAChB,EAAE,EAAE,OAAO,CAAC,EAAE;YACd,IAAI,EAAE,OAAO,CAAC,IAAI;YAClB,GAAG,CAAC,OAAO,CAAC,WAAW,KAAK,IAAI,CAAC,CAAC,CAAC,EAAE,WAAW,EAAE,OAAO,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YAC7E,GAAG,CAAC,OAAO,CAAC,IAAI,KAAK,IAAI,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,OAAO,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YACxD,GAAG,CAAC,OAAO,CAAC,mBAAmB,EAAE,MAAM;gBACtC,CAAC,CAAC,EAAE,mBAAmB,EAAE,OAAO,CAAC,mBAAmB,EAAE;gBACtD,CAAC,CAAC,EAAE,CAAC;SACN,CAAC,CACF,CAAC;IACH,CAAC;CACD,CAAA;;4BAdY,iBAAiB;IAD7B,IAAA,YAAO,GAAE;GACG,iBAAiB,CAc7B"}

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

@@ -1,11 +1,18 @@
 import { GlobalConfig } from '@n8n/config';
 import { TagService } from '../../../../services/tag.service';
-import type { ReferencingWorkflow, TagImportPlan, TagImportRequest } from './tag.types';
+import type { ReferencingWorkflow, TagImportPlan, TagImportRequest, TagRef } from './tag.types';
 import type { ImportContext } from '../../n8n-packages.types';
 export declare class TagImporter {
     private readonly tagService;
     private readonly globalConfig;
     constructor(tagService: TagService, globalConfig: GlobalConfig);
     plan(context: ImportContext, request: TagImportRequest, appliedWorkflows: ReferencingWorkflow[]): Promise<TagImportPlan>;
+    findLocalTags(tags: ReadonlyArray<{
+        id: string;
+        name: string;
+    }>): Promise<{
+        byId: Map<string, TagRef>;
+        byName: Map<string, TagRef>;
+    }>;
     apply(context: ImportContext, plan: TagImportPlan): Promise<void>;
 }

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

@@ -44,13 +44,11 @@ let TagImporter = class TagImporter {
             }
             return requirement;
         });
-        const targetsById = new Map((await this.tagService.getByIds(referencedTagIds)).map((tag) => [tag.id, toTagRef(tag)]));
-        const wantedNames = [...new Set(referencedRequirements.map(({ name }) => name.trim()))];
-        const holdersByName = new Map((await this.tagService.getByNames(wantedNames)).map((tag) => [tag.name, toTagRef(tag)]));
+        const local = await this.findLocalTags(referencedRequirements);
         const decisionFailures = [];
         for (const requirement of referencedRequirements) {
-            const holder = holdersByName.get(requirement.name.trim());
-            const effect = (0, tag_import_decision_1.decideTagImportAction)(requirement, targetsById.get(requirement.id), holder && holder.id !== requirement.id ? holder : undefined, request.missingMode, request.conflictPolicy);
+            const holder = local.byName.get(requirement.name.trim());
+            const effect = (0, tag_import_decision_1.decideTagImportAction)(requirement, local.byId.get(requirement.id), holder && holder.id !== requirement.id ? holder : undefined, request.missingMode, request.conflictPolicy);
             if (effect.action === 'attach')
                 plan.matched.push(effect.target);
             else if (effect.action === 'create')
@@ -75,6 +73,16 @@ let TagImporter = class TagImporter {
         }
         return plan;
     }
+    async findLocalTags(tags) {
+        const [byId, byName] = await Promise.all([
+            this.tagService.getByIds([...new Set(tags.map(({ id }) => id))]),
+            this.tagService.getByNames([...new Set(tags.map(({ name }) => name.trim()))]),
+        ]);
+        return {
+            byId: new Map(byId.map((tag) => [tag.id, toTagRef(tag)])),
+            byName: new Map(byName.map((tag) => [tag.name, toTagRef(tag)])),
+        };
+    }
     async apply(context, plan) {
         if (plan.creations.length === 0 && plan.renames.length === 0 && plan.reconciles.length === 0) {
             return;

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

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

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

@@ -1,7 +1,12 @@
+import { type SerializedTag } from '@n8n/api-types';
 import type { PackageWriter } from '../../io/package-writer';
 import type { ManifestEntry } from '../../spec/manifest.schema';
 import type { PackageTagRequirement } from '../../spec/requirements.schema';
 import { type WorkflowTagUsage } from './tag.types';
+export declare function serializeTag({ id, name }: {
+    id: string;
+    name: string;
+}): SerializedTag;
 export interface TagExportRequest {
     usages: WorkflowTagUsage[];
     writer: PackageWriter;

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

@@ -7,12 +7,16 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TagExporter = void 0;
+exports.serializeTag = serializeTag;
+const api_types_1 = require("@n8n/api-types");
 const di_1 = require("@n8n/di");
 const manifest_entry_1 = require("../../io/manifest-entry");
-const tag_schema_1 = require("../../spec/serialized/tag.schema");
 const package_serialization_types_1 = require("../package-serialization.types");
 const tag_types_1 = require("./tag.types");
 const serializePayload = (0, package_serialization_types_1.definePackageSerializationPayload)();
+function serializeTag({ id, name }) {
+    return api_types_1.serializedTagSchema.parse(serializePayload({ id, name }));
+}
 let TagExporter = class TagExporter {
     async export(request) {
         const requirementsByTagId = new Map();
@@ -31,8 +35,7 @@ let TagExporter = class TagExporter {
         const tagsDir = (0, manifest_entry_1.packageDirectory)('tags');
         const entries = [];
         for (const { id, name } of requirements) {
-            const serializedTag = tag_schema_1.serializedTagSchema.parse(serializePayload({ id, name }));
-            entries.push(await (0, manifest_entry_1.writeManifestEntry)(request.writer, 'tags', tagsDir, { id, name }, serializedTag));
+            entries.push(await (0, manifest_entry_1.writeManifestEntry)(request.writer, 'tags', tagsDir, { id, name }, serializeTag({ id, name })));
         }
         return { entries, requirements };
     }