From 51b271f4d387cd5e1f72d7d70e110270a91b8ed1 Mon Sep 17 00:00:00 2001
From: Patrik Oldsberg <poldsberg@gmail.com>
Date: Sat, 10 Aug 2024 17:48:36 +0200
Subject: [PATCH] frontend-plugin-api: validate blueprint original factory
 output

Signed-off-by: Patrik Oldsberg <poldsberg@gmail.com>
---
 .../wiring/createExtensionBlueprint.test.tsx  | 37 +++++++++++++++++++
 .../src/wiring/createExtensionBlueprint.ts    |  1 +
 2 files changed, 38 insertions(+)

diff --git a/packages/frontend-plugin-api/src/wiring/createExtensionBlueprint.test.tsx b/packages/frontend-plugin-api/src/wiring/createExtensionBlueprint.test.tsx
index fa85cbf981..efca17459b 100644
--- a/packages/frontend-plugin-api/src/wiring/createExtensionBlueprint.test.tsx
+++ b/packages/frontend-plugin-api/src/wiring/createExtensionBlueprint.test.tsx
@@ -689,6 +689,43 @@ describe('createExtensionBlueprint', () => {
     expect(factoryOutput(ext)).toEqual([testDataRef2('foobar')]);
   });
 
+  it('should reject invalid output from original factory', () => {
+    const testDataRef1 = createExtensionDataRef<string>().with({ id: 'test1' });
+    const testDataRef2 = createExtensionDataRef<string>().with({ id: 'test2' });
+
+    expect(() =>
+      factoryOutput(
+        // @ts-expect-error
+        createExtensionBlueprint({
+          kind: 'test-extension',
+          attachTo: { id: 'test', input: 'default' },
+          output: [testDataRef1],
+          factory() {
+            return [testDataRef2('foo')];
+          },
+        }).makeWithOverrides({ factory: orig => orig({}) }),
+      ),
+    ).toThrowErrorMatchingInlineSnapshot(
+      `"Invalid data value provided, 'test2' was not declared"`,
+    );
+
+    expect(() =>
+      factoryOutput(
+        // @ts-expect-error
+        createExtensionBlueprint({
+          kind: 'test-extension',
+          attachTo: { id: 'test', input: 'default' },
+          output: [testDataRef1],
+          factory() {
+            return [];
+          },
+        }).makeWithOverrides({ factory: orig => orig({}) }),
+      ),
+    ).toThrowErrorMatchingInlineSnapshot(
+      `"Missing required data values for 'test1'"`,
+    );
+  });
+
   it('should allow returning of the parent data container', () => {
     const testDataRef1 = createExtensionDataRef<string>().with({ id: 'test1' });
     const testDataRef2 = createExtensionDataRef<string>().with({ id: 'test2' });
diff --git a/packages/frontend-plugin-api/src/wiring/createExtensionBlueprint.ts b/packages/frontend-plugin-api/src/wiring/createExtensionBlueprint.ts
index 2ad58e2ef9..8ce3dab4d5 100644
--- a/packages/frontend-plugin-api/src/wiring/createExtensionBlueprint.ts
+++ b/packages/frontend-plugin-api/src/wiring/createExtensionBlueprint.ts
@@ -505,6 +505,7 @@ class ExtensionBlueprintImpl<
                 config: innerContext?.config ?? config,
                 inputs: forwardedInputs as any, // TODO: Might be able to improve this once legacy inputs are gone
               }),
+              this.options.output,
             );
           },
           {