chore: fixing some more work

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

plugins/scaffolder-react/src/alpha.ts

@@ -15,6 +15,4 @@
  */
 
 export * from './next';
-export type { FormProps } from './next';
-
 export * from './legacy';

plugins/scaffolder-react/src/next/components/Form/Form.tsx

@@ -14,12 +14,13 @@
  * limitations under the License.
  */
 
-import { FormProps, withTheme } from '@rjsf/core-v5';
+import { withTheme } from '@rjsf/core-v5';
 import React from 'react';
 import { PropsWithChildren } from 'react';
 import { FieldTemplate } from './FieldTemplate';
 import { DescriptionFieldTemplate } from './DescriptionFieldTemplate';
 import { FieldProps } from '@rjsf/utils';
+import { ScaffolderRJSFFormProps } from '../../../extensions';
 
 // TODO(blam): We require here, as the types in this package depend on @rjsf/core explicitly
 // which is what we're using here as the default types, it needs to depend on @rjsf/core-v5 because
@@ -30,7 +31,7 @@ const WrappedForm = withTheme(require('@rjsf/material-ui-v5').Theme);
  * The Form component
  * @alpha
  */
-export const Form = (props: PropsWithChildren<FormProps>) => {
+export const Form = (props: PropsWithChildren<ScaffolderRJSFFormProps>) => {
   // This is where we unbreak the changes from RJSF, and make it work with our custom fields so we don't pass on this
   // breaking change to our users. We will look more into a better API for this in scaffolderv2.
   const wrappedFields = Object.fromEntries(

plugins/scaffolder-react/src/next/components/Stepper/Stepper.test.tsx

@@ -20,7 +20,7 @@ import { renderInTestApp } from '@backstage/test-utils';
 import { act, fireEvent } from '@testing-library/react';
 import type { RJSFValidationError } from '@rjsf/utils';
 import { JsonValue } from '@backstage/types';
-import { NextFieldExtensionComponentProps } from '../../../extensions';
+import { FieldExtensionComponentProps } from '../../../extensions';
 import { LayoutTemplate } from '../../../layouts';
 
 describe('Stepper', () => {
@@ -115,7 +115,7 @@ describe('Stepper', () => {
   it('should merge nested formData correctly in multiple steps', async () => {
     const Repo = ({
       onChange,
-    }: NextFieldExtensionComponentProps<{ repository: string }, any>) => (
+    }: FieldExtensionComponentProps<{ repository: string }, any>) => (
       <input
         aria-label="repo"
         type="text"
@@ -126,7 +126,7 @@ describe('Stepper', () => {
 
     const Owner = ({
       onChange,
-    }: NextFieldExtensionComponentProps<{ owner: string }, any>) => (
+    }: FieldExtensionComponentProps<{ owner: string }, any>) => (
       <input
         aria-label="owner"
         type="text"
@@ -312,7 +312,7 @@ describe('Stepper', () => {
         manifest={manifest}
         extensions={[]}
         onCreate={jest.fn()}
-        FormProps={{ transformErrors }}
+        formProps={{ transformErrors }}
       />,
     );
 

plugins/scaffolder-react/src/next/components/Stepper/createAsyncValidators.test.ts

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 import { JsonObject } from '@backstage/types';
-import { NextCustomFieldValidator } from '../../../extensions';
+import { CustomFieldValidator } from '../../../extensions';
 import { createAsyncValidators } from './createAsyncValidators';
 
 describe('createAsyncValidators', () => {
@@ -158,16 +158,13 @@ describe('createAsyncValidators', () => {
       },
     };
 
-    const NameField: NextCustomFieldValidator<string> = (
-      value,
-      { addError },
-    ) => {
+    const NameField: CustomFieldValidator<string> = (value, { addError }) => {
       if (!value) {
         addError('something is broken here!');
       }
     };
 
-    const AddressField: NextCustomFieldValidator<{
+    const AddressField: CustomFieldValidator<{
       street?: string;
       postcode?: string;
     }> = (value, { addError }) => {
@@ -183,8 +180,8 @@ describe('createAsyncValidators', () => {
     const validate = createAsyncValidators(
       schema,
       {
-        NameField: NameField as NextCustomFieldValidator<unknown>,
-        AddressField: AddressField as NextCustomFieldValidator<unknown>,
+        NameField: NameField as CustomFieldValidator<unknown>,
+        AddressField: AddressField as CustomFieldValidator<unknown>,
       },
       {
         apiHolder: { get: jest.fn() },
@@ -298,7 +295,7 @@ describe('createAsyncValidators', () => {
       },
     };
 
-    const AddressField: NextCustomFieldValidator<{
+    const AddressField: CustomFieldValidator<{
       street?: string;
       postcode?: string;
     }> = (value, { addError }) => {
@@ -311,18 +308,15 @@ describe('createAsyncValidators', () => {
       }
     };
 
-    const NameField: NextCustomFieldValidator<string> = (
-      value,
-      { addError },
-    ) => {
+    const NameField: CustomFieldValidator<string> = (value, { addError }) => {
       if (!value) {
         addError('something is broken here!');
       }
     };
 
     const validators = {
-      AddressField: AddressField as NextCustomFieldValidator<unknown>,
-      NameField: NameField as NextCustomFieldValidator<unknown>,
+      AddressField: AddressField as CustomFieldValidator<unknown>,
+      NameField: NameField as CustomFieldValidator<unknown>,
     };
 
     const validate = createAsyncValidators(schema, validators, {

plugins/scaffolder-react/src/next/components/Stepper/createAsyncValidators.ts

@@ -19,9 +19,11 @@ import type { JsonObject, JsonValue } from '@backstage/types';
 import { ApiHolder } from '@backstage/core-plugin-api';
 import { Draft07 as JSONSchema } from 'json-schema-library';
 import { createFieldValidation, extractSchemaFromStep } from '../../lib';
-import { NextCustomFieldValidator } from '../../../extensions';
+import {
+  CustomFieldValidator,
+  FieldExtensionUiSchema,
+} from '../../../extensions';
 import { isObject } from './utils';
-import { NextFieldExtensionUiSchema } from '../../extensions/types';
 
 /**
  * @internal
@@ -34,7 +36,7 @@ export const createAsyncValidators = (
   rootSchema: JsonObject,
   validators: Record<
     string,
-    undefined | NextCustomFieldValidator<unknown, unknown>
+    undefined | CustomFieldValidator<unknown, unknown>
   >,
   context: {
     apiHolder: ApiHolder;
@@ -53,7 +55,7 @@ export const createAsyncValidators = (
       key: string,
       value: JsonValue | undefined,
       schema: JsonObject,
-      uiSchema: NextFieldExtensionUiSchema<unknown, unknown>,
+      uiSchema: FieldExtensionUiSchema<unknown, unknown>,
     ) => {
       const validator = validators[validatorName];
       if (validator) {
@@ -82,7 +84,7 @@ export const createAsyncValidators = (
       const doValidateItem = async (
         propValue: JsonObject,
         itemSchema: JsonObject,
-        itemUiSchema: NextFieldExtensionUiSchema<unknown, unknown>,
+        itemUiSchema: FieldExtensionUiSchema<unknown, unknown>,
       ) => {
         await validateForm(
           propValue['ui:field'] as string,

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

@@ -14,6 +14,5 @@
  * limitations under the License.
  */
 export * from './components';
-export * from './types';
 export * from './lib';
 export * from './hooks';