chore: small refactor and moving types around

Signed-off-by: benjdlambert <ben@blam.sh>

plugins/scaffolder-react/src/next/api/FormFieldsApi.ts

@@ -20,9 +20,9 @@ import {
   createExtensionInput,
 } from '@backstage/frontend-plugin-api';
 import { formFieldsApiRef } from './ref';
-import { ScaffolderFormFieldsApi } from './types';
+import { FormField, ScaffolderFormFieldsApi } from './types';
 import { FormFieldBlueprint } from '../blueprints';
-import { FormField, OpaqueFormField } from '@internal/scaffolder';
+import { OpaqueFormField } from '@internal/scaffolder';
 
 class DefaultScaffolderFormFieldsApi implements ScaffolderFormFieldsApi {
   constructor(

plugins/scaffolder-react/src/next/api/index.ts

@@ -16,4 +16,4 @@
 
 export { formFieldsApi } from './FormFieldsApi';
 export { formFieldsApiRef } from './ref';
-export type { ScaffolderFormFieldsApi } from './types';
+export type { ScaffolderFormFieldsApi, FormField } from './types';

plugins/scaffolder-react/src/next/api/types.ts

@@ -23,3 +23,8 @@ import { FormFieldExtensionData } from '../blueprints';
 export interface ScaffolderFormFieldsApi {
   getFormFields(): Promise<FormFieldExtensionData[]>;
 }
+
+/** @alpha */
+export interface FormField {
+  readonly $$type: '@backstage/scaffolder/FormField';
+}

plugins/scaffolder-react/src/next/blueprints/FormFieldBlueprint.tsx

@@ -19,8 +19,9 @@ import {
 } from '@backstage/frontend-plugin-api';
 import { z } from 'zod';
 
-import { OpaqueFormField, FormField } from '@internal/scaffolder';
+import { OpaqueFormField } from '@internal/scaffolder';
 import { FormFieldExtensionData } from './types';
+import { FormField } from '../api';
 
 const formFieldExtensionDataRef = createExtensionDataRef<
   () => Promise<FormField>