feat(API): Name exported package entities by slug and id (#37656)

Co-authored-by: Cursor <cursoragent@cursor.com>

Author: NourAlhadi

packages/cli/src/modules/n8n-packages/__tests__/export-folder.integration.test.ts

@@ -243,7 +243,7 @@ describe('folder package export', () => {
 		const { manifest, entries } = await readExport(stream);
 
 		const childEntry = manifest.workflows!.find(({ id }) => id === externalChild.id);
-		expect(childEntry?.target).toBe('workflows/external-child');
+		expect(childEntry?.target).toBe(`workflows/external-child-${externalChild.id}`);
 		expect(entries.find((e) => e.name === `${childEntry!.target}/workflow.json`)).toBeDefined();
 		expect(manifest.requirements?.workflows).toEqual([
 			{ id: externalChild.id, name: externalChild.name, usedByWorkflows: [parent.id] },
@@ -317,7 +317,7 @@ describe('folder package export', () => {
 		expect(folderShell(entries, grandchildEntry.target).parentFolderId).toBe(child.id);
 	});
 
-	it('disambiguates same-named sibling folders by creation order', async () => {
+	it('gives same-named sibling folders their own targets', async () => {
 		const owner = await createOwner();
 		const project = await createTeamProject('Project A', owner);
 		const older = await createFolder(project, {
@@ -338,9 +338,9 @@ describe('folder package export', () => {
 
 		const olderTarget = manifest.folders!.find((f) => f.id === older.id)!.target;
 		const newerTarget = manifest.folders!.find((f) => f.id === newer.id)!.target;
-		// Oldest keeps the bare slug; the allocator suffixes the newer one.
-		expect(olderTarget).toBe('folders/inprogress');
-		expect(newerTarget).toBe('folders/inprogress-2');
+		// Each keeps its own id, so neither target depends on which was created first.
+		expect(olderTarget).toBe(`folders/inprogress-${older.id}`);
+		expect(newerTarget).toBe(`folders/inprogress-${newer.id}`);
 	});
 
 	it('re-roots an exported folder whose parent is left out of the export', async () => {
@@ -507,7 +507,7 @@ describe('folder package export — with contained workflows', () => {
 			{
 				id: variable.id,
 				name: 'API_URL',
-				target: 'variables/apiurl',
+				target: `variables/apiurl-${variable.id}`,
 			},
 		]);
 		expect(manifest.requirements).toEqual({
@@ -602,8 +602,7 @@ describe('folder package export — with contained workflows', () => {
 		const subfolderTarget = manifest.folders!.find((f) => f.id === subfolder.id)!.target;
 		const workflowTarget = manifest.workflows!.find((w) => w.id === workflow.id)!.target;
 
-		// The subfolder is suffixed; the workflow stays under the parent's container.
-		expect(subfolderTarget).toMatch(/\/workflows-2$/);
+		expect(subfolderTarget).toMatch(new RegExp(`/workflows-${subfolder.id}$`));
 		expect(workflowTarget.startsWith(`${subfolderTarget}/`)).toBe(false);
 	});
 

packages/cli/src/modules/n8n-packages/__tests__/export-project-to-directory.integration.test.ts

@@ -59,9 +59,9 @@ describe('exportPackageToDirectory', () => {
 		const manifest = await readJson('manifest.json');
 		expect(manifest).toMatchObject({ packageFormatVersion: FORMAT_VERSION });
 		expect(manifest.projects).toEqual([
-			{ id: project.id, name: 'Alpha Project', target: 'projects/alpha-project' },
+			{ id: project.id, name: 'Alpha Project', target: `projects/alpha-project-${project.id}` },
 		]);
-		expect(await readJson('projects/alpha-project/project.json')).toEqual({
+		expect(await readJson(`projects/alpha-project-${project.id}/project.json`)).toEqual({
 			id: project.id,
 			name: 'Alpha Project',
 		});
@@ -81,8 +81,8 @@ describe('exportPackageToDirectory', () => {
 
 		const manifest = await readJson('manifest.json');
 		expect(manifest.projects).toEqual([
-			{ id: alpha.id, name: 'Alpha Project', target: 'projects/alpha-project' },
-			{ id: beta.id, name: 'Beta Project', target: 'projects/beta-project' },
+			{ id: alpha.id, name: 'Alpha Project', target: `projects/alpha-project-${alpha.id}` },
+			{ id: beta.id, name: 'Beta Project', target: `projects/beta-project-${beta.id}` },
 		]);
 		expect(await readdir(targetDir)).toEqual(expect.arrayContaining(['manifest.json', 'projects']));
 		expect(result.counts.workflows).toBe(2);

packages/cli/src/modules/n8n-packages/__tests__/export-project.integration.test.ts

@@ -127,8 +127,16 @@ describe('project package export', () => {
 		expect(manifest.projects).toHaveLength(2);
 		expect(manifest.projects).toEqual(
 			expect.arrayContaining([
-				{ id: firstProject.id, name: 'Alpha Project', target: 'projects/alpha-project' },
-				{ id: secondProject.id, name: 'Beta Project', target: 'projects/beta-project' },
+				{
+					id: firstProject.id,
+					name: 'Alpha Project',
+					target: `projects/alpha-project-${firstProject.id}`,
+				},
+				{
+					id: secondProject.id,
+					name: 'Beta Project',
+					target: `projects/beta-project-${secondProject.id}`,
+				},
 			]),
 		);