frontend-plugin-api: test fixes + type cleanup

Signed-off-by: Patrik Oldsberg <poldsberg@gmail.com>

packages/frontend-plugin-api/src/extensions/createApiExtension.test.ts

@@ -38,10 +38,13 @@ describe('createApiExtension', () => {
       configSchema: undefined,
       inputs: {},
       output: {
-        api: {
+        api: expect.objectContaining({
           $$type: 'extension-data',
           id: 'core.api.factory',
-        },
+          config: {
+            optional: false,
+          },
+        }),
       },
       factory: expect.any(Function),
     });
@@ -71,10 +74,13 @@ describe('createApiExtension', () => {
       configSchema: undefined,
       inputs: {},
       output: {
-        api: {
+        api: expect.objectContaining({
           $$type: 'extension-data',
           id: 'core.api.factory',
-        },
+          config: {
+            optional: false,
+          },
+        }),
       },
       factory: expect.any(Function),
     });

packages/frontend-plugin-api/src/extensions/createApiExtension.ts

@@ -18,7 +18,7 @@ import { AnyApiFactory, AnyApiRef } from '@backstage/core-plugin-api';
 import { PortableSchema } from '../schema';
 import {
   AnyExtensionDataMap,
-  ExtensionDataValue,
+  ExtensionDataInputValues,
   createExtension,
   coreExtensionData,
 } from '../wiring';
@@ -33,11 +33,7 @@ export function createApiExtension<
         api: AnyApiRef;
         factory: (options: {
           config: TConfig;
-          inputs: {
-            [pointName in keyof TInputs]: ExtensionDataValue<
-              TInputs[pointName]['extensionData']
-            >[];
-          };
+          inputs: ExtensionDataInputValues<TInputs>;
         }) => AnyApiFactory;
       }
     | {

packages/frontend-plugin-api/src/extensions/createPageExtension.test.tsx

@@ -42,6 +42,7 @@ describe('createPageExtension', () => {
       output: {
         component: expect.anything(),
         path: expect.anything(),
+        routeRef: expect.anything(),
       },
       factory: expect.any(Function),
     });
@@ -73,6 +74,7 @@ describe('createPageExtension', () => {
       output: {
         component: expect.anything(),
         path: expect.anything(),
+        routeRef: expect.anything(),
       },
       factory: expect.any(Function),
     });
@@ -93,6 +95,7 @@ describe('createPageExtension', () => {
       output: {
         component: expect.anything(),
         path: expect.anything(),
+        routeRef: expect.anything(),
       },
       factory: expect.any(Function),
     });

packages/frontend-plugin-api/src/extensions/createPageExtension.tsx

@@ -23,7 +23,7 @@ import {
   coreExtensionData,
   createExtension,
   Extension,
-  ExtensionDataValue,
+  ExtensionDataInputValues,
 } from '../wiring';
 
 /**
@@ -50,11 +50,7 @@ export function createPageExtension<
     routeRef?: RouteRef;
     component: (props: {
       config: TConfig;
-      inputs: {
-        [pointName in keyof TInputs]: ExtensionDataValue<
-          TInputs[pointName]['extensionData']
-        >[];
-      };
+      inputs: ExtensionDataInputValues<TInputs>;
     }) => Promise<JSX.Element>;
   },
 ): Extension<TConfig> {