From 3bd848159abde2c76632f4fe6b0195da2de6ed95 Mon Sep 17 00:00:00 2001
From: blam <ben@blam.sh>
Date: Tue, 22 Feb 2022 16:59:31 +0100
Subject: [PATCH] chore: updating type parameters names to be TReturnValue

Signed-off-by: blam <ben@blam.sh>
---
 plugins/scaffolder/src/extensions/index.tsx |  4 ++--
 plugins/scaffolder/src/extensions/types.ts  | 18 ++++++++----------
 2 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/plugins/scaffolder/src/extensions/index.tsx b/plugins/scaffolder/src/extensions/index.tsx
index f9c167a6b0..1b3b845b4d 100644
--- a/plugins/scaffolder/src/extensions/index.tsx
+++ b/plugins/scaffolder/src/extensions/index.tsx
@@ -25,8 +25,8 @@ import { Extension, attachComponentData } from '@backstage/core-plugin-api';
 export const FIELD_EXTENSION_WRAPPER_KEY = 'scaffolder.extensions.wrapper.v1';
 export const FIELD_EXTENSION_KEY = 'scaffolder.extensions.field.v1';
 
-export function createScaffolderFieldExtension<T = any>(
-  options: FieldExtensionOptions<T>,
+export function createScaffolderFieldExtension<TReturnValue = unknown>(
+  options: FieldExtensionOptions<TReturnValue>,
 ): Extension<() => null> {
   return {
     expose() {
diff --git a/plugins/scaffolder/src/extensions/types.ts b/plugins/scaffolder/src/extensions/types.ts
index e1da9889e7..26fdbb1b23 100644
--- a/plugins/scaffolder/src/extensions/types.ts
+++ b/plugins/scaffolder/src/extensions/types.ts
@@ -21,13 +21,11 @@ import { FieldValidation, FieldProps } from '@rjsf/core';
  *
  * @public
  */
-export type CustomFieldValidator<T> =
-  | ((data: T, field: FieldValidation) => void)
-  | ((
-      data: T,
-      field: FieldValidation,
-      context: { apiHolder: ApiHolder },
-    ) => void);
+export type CustomFieldValidator<TReturnValue> = (
+  data: TReturnValue,
+  field: FieldValidation,
+  context: { apiHolder: ApiHolder },
+) => void;
 
 /**
  * Type for the Custom Field Extension with the
@@ -35,10 +33,10 @@ export type CustomFieldValidator<T> =
  *
  * @public
  */
-export type FieldExtensionOptions<T = any> = {
+export type FieldExtensionOptions<TReturnValue = unknown> = {
   name: string;
-  component: (props: FieldProps<T>) => JSX.Element | null;
-  validation?: CustomFieldValidator<T>;
+  component: (props: FieldProps<TReturnValue>) => JSX.Element | null;
+  validation?: CustomFieldValidator<TReturnValue>;
 };
 
 /**