fix(core): handle file change conflicts between sync generators

nrwl · Aug 29, 2024 · 9fdc29d · 9fdc29d
1 parent 81acded
commit 9fdc29d
Show file tree

Hide file tree

Showing 3 changed files with 301 additions and 73 deletions.
diff --git a/packages/nx/src/daemon/server/sync-generators.spec.ts b/packages/nx/src/daemon/server/sync-generators.spec.ts
@@ -0,0 +1,66 @@
+import type { SyncGeneratorChangesResult } from '../../utils/sync-generators';
+import { _getConflictingGeneratorGroups } from './sync-generators';
+
+describe('_getConflictingGeneratorGroups', () => {
+  it('should return grouped conflicting generators', () => {
+    const results: SyncGeneratorChangesResult[] = [
+      {
+        generatorName: 'a',
+        changes: [
+          { type: 'UPDATE', path: 'file1.txt', content: Buffer.from('') },
+          { type: 'UPDATE', path: 'file2.txt', content: Buffer.from('') },
+          { type: 'UPDATE', path: 'file3.txt', content: Buffer.from('') },
+        ],
+      },
+      {
+        generatorName: 'b',
+        changes: [
+          { type: 'UPDATE', path: 'file1.txt', content: Buffer.from('') },
+        ],
+      },
+      {
+        generatorName: 'c',
+        changes: [
+          { type: 'UPDATE', path: 'file3.txt', content: Buffer.from('') },
+          { type: 'UPDATE', path: 'file4.txt', content: Buffer.from('') },
+        ],
+      },
+      {
+        generatorName: 'd',
+        changes: [
+          { type: 'UPDATE', path: 'file5.txt', content: Buffer.from('') },
+        ],
+      },
+      {
+        generatorName: 'e',
+        changes: [
+          { type: 'UPDATE', path: 'file4.txt', content: Buffer.from('') },
+          { type: 'UPDATE', path: 'file6.txt', content: Buffer.from('') },
+        ],
+      },
+      {
+        generatorName: 'f',
+        changes: [
+          { type: 'UPDATE', path: 'file7.txt', content: Buffer.from('') },
+        ],
+      },
+      {
+        generatorName: 'g',
+        changes: [
+          { type: 'UPDATE', path: 'file7.txt', content: Buffer.from('') },
+        ],
+      },
+      {
+        generatorName: 'h',
+        changes: [
+          { type: 'UPDATE', path: 'file8.txt', content: Buffer.from('') },
+        ],
+      },
+    ];
+
+    expect(_getConflictingGeneratorGroups(results)).toStrictEqual([
+      ['a', 'b', 'c', 'e'],
+      ['f', 'g'],
+    ]);
+  });
+});