From 8fb60cb2f133a36684dd13028b02de54cb623a49 Mon Sep 17 00:00:00 2001
From: blam <ben@blam.sh>
Date: Thu, 8 Aug 2024 13:41:00 +0200
Subject: [PATCH] chore: some more work
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Patrik Oldsberg <poldsberg@gmail.com>
Co-authored-by: Fredrik Adelöw <freben@users.noreply.github.com>
Co-authored-by: Camila Belo <camilaibs@users.noreply.github.com>

Signed-off-by: blam <ben@blam.sh>
---
 .changeset/thick-squids-drive.md              |  5 ++++-
 .../src/wiring/createExtension.test.ts        | 20 -------------------
 .../src/wiring/createExtension.ts             |  9 ++++++++-
 3 files changed, 12 insertions(+), 22 deletions(-)

diff --git a/.changeset/thick-squids-drive.md b/.changeset/thick-squids-drive.md
index 07654da27d..0e798063c0 100644
--- a/.changeset/thick-squids-drive.md
+++ b/.changeset/thick-squids-drive.md
@@ -11,12 +11,15 @@ const TestCard = EntityCardBlueprint.make({
 });
 
 TestCard.override({
-  attachTo: { id: 'something-else', input: 'overriden' },
+  // override attachment points
+  attachTo: { id: 'something-else', input: 'overridden' },
+  // extend the config schema
   config: {
     schema: {
       newConfig: z => z.string().optional(),
     }
   },
+  // override factory
   *factory(originalFactory, { inputs, config }){
     const originalOutput = originalFactory();
 
diff --git a/packages/frontend-plugin-api/src/wiring/createExtension.test.ts b/packages/frontend-plugin-api/src/wiring/createExtension.test.ts
index 547ec2a160..f9e39e98de 100644
--- a/packages/frontend-plugin-api/src/wiring/createExtension.test.ts
+++ b/packages/frontend-plugin-api/src/wiring/createExtension.test.ts
@@ -686,26 +686,6 @@ describe('createExtension', () => {
         },
       });
 
-      const overridden = testExtension.override({
-        output: [numberDataRef, stringDataRef],
-        *factory(originalFactory) {
-          const output = originalFactory();
-          yield* output.omit(numberDataRef);
-
-          yield numberDataRef(output.get(numberDataRef) + 1);
-        },
-      });
-
-      const overridden = testExtension.override({
-        output: [numberDataRef, stringDataRef],
-        *factory(originalFactory) {
-          const output = originalFactory();
-          yield* output;
-
-          yield numberDataRef(output.get(numberDataRef) + 1);
-        },
-      });
-
       const tester = createExtensionTester(overridden);
 
       expect(tester.data(numberDataRef)).toBe(43);
diff --git a/packages/frontend-plugin-api/src/wiring/createExtension.ts b/packages/frontend-plugin-api/src/wiring/createExtension.ts
index 6e75fc76e5..600b96ebe0 100644
--- a/packages/frontend-plugin-api/src/wiring/createExtension.ts
+++ b/packages/frontend-plugin-api/src/wiring/createExtension.ts
@@ -581,7 +581,7 @@ export function createExtension<
               >,
             });
           }
-          return overrideOptions.factory(
+          const parentResult = overrideOptions.factory(
             (innerContext?: {
               config?: {
                 [key in keyof TConfigSchema]: z.infer<
@@ -604,6 +604,13 @@ export function createExtension<
               inputs,
             },
           );
+
+          const deduplicatedResult = new Map<string, UOverrideFactoryOutput>();
+          for (const item of parentResult) {
+            deduplicatedResult.set(item.id, item);
+          }
+
+          return deduplicatedResult.values() as Iterable<UOverrideFactoryOutput>;
         },
       } as CreateExtensionOptions<AnyExtensionDataRef extends UNewOutput ? UOutput : UNewOutput, TInputs & TExtraInputs, TConfigSchema & TExtensionConfigSchema, UOverrideFactoryOutput>);
     },