@backstage/plugin-scaffolder 1.8.0 → 1.9.0-next.1

package/dist/esm/{index-a739a160.esm.js → index-cb47594c.esm.js}

@@ -16,19 +16,22 @@ import { Link } from 'react-router-dom';
 import AddCircleOutline from '@material-ui/icons/AddCircleOutline';
 import { catalogEntityCreatePermission } from '@backstage/plugin-catalog-common';
 import { usePermission } from '@backstage/plugin-permission-react';
-import { u as nextSelectedTemplateRouteRef, v as viewTechDocRouteRef, r as registerComponentRouteRef, s as selectedTemplateRouteRef, w as nextRouteRef, d as scaffolderTaskRouteRef, S as SecretsContext, c as scaffolderApiRef, F as FIELD_EXTENSION_WRAPPER_KEY, i as FIELD_EXTENSION_KEY, k as SecretsContextProvider } from './index-49f6be11.esm.js';
+import { B as nextSelectedTemplateRouteRef, v as viewTechDocRouteRef, r as registerComponentRouteRef, s as selectedTemplateRouteRef, C as nextRouteRef, d as scaffolderTaskRouteRef, S as SecretsContext, c as scaffolderApiRef, F as FIELD_EXTENSION_WRAPPER_KEY, i as FIELD_EXTENSION_KEY, k as SecretsContextProvider } from './index-102258f6.esm.js';
 import { RELATION_OWNED_BY, parseEntityRef, stringifyEntityRef, DEFAULT_NAMESPACE } from '@backstage/catalog-model';
 import LanguageIcon from '@material-ui/icons/Language';
 import useAsync from 'react-use/lib/useAsync';
 import { withTheme } from '@rjsf/core-v5';
 import { Draft07 } from 'json-schema-library';
+import { c as createFieldValidation, e as extractSchemaFromStep, D as DEFAULT_SCAFFOLDER_FIELD_EXTENSIONS } from './schema-4db0f1ff.esm.js';
 import validator from '@rjsf/validator-ajv8';
-import { D as DEFAULT_SCAFFOLDER_FIELD_EXTENSIONS } from './default-973d8e16.esm.js';
+import { getDefaultFormState } from '@rjsf/utils';
 import '@backstage/errors';
 import 'qs';
 import 'zen-observable';
 import '@material-ui/core/FormControl';
 import '@material-ui/lab/Autocomplete';
+import 'zod';
+import 'zod-to-json-schema';
 import 'react-use/lib/useEffectOnce';
 import '@backstage/integration-react';
 import '@material-ui/core/FormHelperText';
@@ -49,12 +52,8 @@ import 'luxon';
 import 'react-use/lib/useInterval';
 import 'use-immer';
 
-const icon = /* @__PURE__ */ React.createElement(CheckBoxOutlineBlankIcon, {
-  fontSize: "small"
-});
-const checkedIcon = /* @__PURE__ */ React.createElement(CheckBoxIcon, {
-  fontSize: "small"
-});
+const icon = /* @__PURE__ */ React.createElement(CheckBoxOutlineBlankIcon, { fontSize: "small" });
+const checkedIcon = /* @__PURE__ */ React.createElement(CheckBoxIcon, { fontSize: "small" });
 const CategoryPicker = () => {
   const alertApi = useApi(alertApiRef);
   const { error, loading, availableTypes, selectedTypes, setSelectedTypes } = useEntityTypeFilter();
@@ -69,32 +68,33 @@ const CategoryPicker = () => {
   }
   if (!availableTypes)
     return null;
-  return /* @__PURE__ */ React.createElement(Box, {
-    pb: 1,
-    pt: 1
-  }, /* @__PURE__ */ React.createElement(Typography, {
-    variant: "button"
-  }, "Categories"), /* @__PURE__ */ React.createElement(Autocomplete, {
-    multiple: true,
-    "aria-label": "Categories",
-    options: availableTypes,
-    value: selectedTypes,
-    onChange: (_, value) => setSelectedTypes(value),
-    renderOption: (option, { selected }) => /* @__PURE__ */ React.createElement(FormControlLabel, {
-      control: /* @__PURE__ */ React.createElement(Checkbox, {
-        icon,
-        checkedIcon,
-        checked: selected
-      }),
-      label: capitalize(option)
-    }),
-    size: "small",
-    popupIcon: /* @__PURE__ */ React.createElement(ExpandMoreIcon, null),
-    renderInput: (params) => /* @__PURE__ */ React.createElement(TextField, {
-      ...params,
-      variant: "outlined"
-    })
-  }));
+  return /* @__PURE__ */ React.createElement(Box, { pb: 1, pt: 1 }, /* @__PURE__ */ React.createElement(Typography, { variant: "button" }, "Categories"), /* @__PURE__ */ React.createElement(
+    Autocomplete,
+    {
+      multiple: true,
+      "aria-label": "Categories",
+      options: availableTypes,
+      value: selectedTypes,
+      onChange: (_, value) => setSelectedTypes(value),
+      renderOption: (option, { selected }) => /* @__PURE__ */ React.createElement(
+        FormControlLabel,
+        {
+          control: /* @__PURE__ */ React.createElement(
+            Checkbox,
+            {
+              icon,
+              checkedIcon,
+              checked: selected
+            }
+          ),
+          label: capitalize(option)
+        }
+      ),
+      size: "small",
+      popupIcon: /* @__PURE__ */ React.createElement(ExpandMoreIcon, null),
+      renderInput: (params) => /* @__PURE__ */ React.createElement(TextField, { ...params, variant: "outlined" })
+    }
+  ));
 };
 
 const RegisterExistingButton = (props) => {
@@ -108,18 +108,17 @@ const RegisterExistingButton = (props) => {
   if (!to || !allowed) {
     return null;
   }
-  return isXSScreen ? /* @__PURE__ */ React.createElement(IconButton, {
-    component: Link,
-    color: "primary",
-    title,
-    size: "small",
-    to
-  }, /* @__PURE__ */ React.createElement(AddCircleOutline, null)) : /* @__PURE__ */ React.createElement(Button, {
-    component: Link,
-    variant: "contained",
-    color: "primary",
-    to
-  }, title);
+  return isXSScreen ? /* @__PURE__ */ React.createElement(
+    IconButton,
+    {
+      component: Link,
+      color: "primary",
+      title,
+      size: "small",
+      to
+    },
+    /* @__PURE__ */ React.createElement(AddCircleOutline, null)
+  ) : /* @__PURE__ */ React.createElement(Button, { component: Link, variant: "contained", color: "primary", to }, title);
 };
 
 const useStyles$4 = makeStyles(
@@ -145,17 +144,15 @@ const CardHeader = (props) => {
   const styles = useStyles$4({
     cardBackgroundImage: themeForType.backgroundImage
   });
-  const SubtitleComponent = /* @__PURE__ */ React.createElement("div", {
-    className: styles.subtitleWrapper
-  }, /* @__PURE__ */ React.createElement("div", null, type), /* @__PURE__ */ React.createElement("div", null, /* @__PURE__ */ React.createElement(FavoriteEntity, {
-    entity: props.template,
-    style: { padding: 0 }
-  })));
-  return /* @__PURE__ */ React.createElement(ItemCardHeader, {
-    title: title != null ? title : name,
-    subtitle: SubtitleComponent,
-    classes: { root: styles.header }
-  });
+  const SubtitleComponent = /* @__PURE__ */ React.createElement("div", { className: styles.subtitleWrapper }, /* @__PURE__ */ React.createElement("div", null, type), /* @__PURE__ */ React.createElement("div", null, /* @__PURE__ */ React.createElement(FavoriteEntity, { entity: props.template, style: { padding: 0 } })));
+  return /* @__PURE__ */ React.createElement(
+    ItemCardHeader,
+    {
+      title: title != null ? title : name,
+      subtitle: SubtitleComponent,
+      classes: { root: styles.header }
+    }
+  );
 };
 
 const useStyles$3 = makeStyles(() => ({
@@ -166,14 +163,7 @@ const useStyles$3 = makeStyles(() => ({
 }));
 const CardLink = ({ icon: Icon, text, url }) => {
   const styles = useStyles$3();
-  return /* @__PURE__ */ React.createElement("div", {
-    className: styles.linkText
-  }, /* @__PURE__ */ React.createElement(Icon, {
-    fontSize: "small"
-  }), /* @__PURE__ */ React.createElement(Link$1, {
-    style: { marginLeft: "8px" },
-    to: url
-  }, text || url));
+  return /* @__PURE__ */ React.createElement("div", { className: styles.linkText }, /* @__PURE__ */ React.createElement(Icon, { fontSize: "small" }), /* @__PURE__ */ React.createElement(Link$1, { style: { marginLeft: "8px" }, to: url }, text || url));
 };
 
 const useStyles$2 = makeStyles((theme) => ({
@@ -235,97 +225,52 @@ const TemplateCard = (props) => {
     kind: template.kind,
     name: template.metadata.name
   });
-  return /* @__PURE__ */ React.createElement(Card, null, /* @__PURE__ */ React.createElement(CardHeader, {
-    template
-  }), /* @__PURE__ */ React.createElement(CardContent, null, /* @__PURE__ */ React.createElement(Grid, {
-    container: true,
-    spacing: 2
-  }, /* @__PURE__ */ React.createElement(Grid, {
-    item: true,
-    xs: 12
-  }, /* @__PURE__ */ React.createElement(Box, {
-    className: styles.box
-  }, /* @__PURE__ */ React.createElement(MarkdownContent, {
-    className: styles.markdown,
-    content: (_b = template.metadata.description) != null ? _b : "No description"
-  }))), ((_d = (_c = template.metadata.tags) == null ? void 0 : _c.length) != null ? _d : 0) > 0 && /* @__PURE__ */ React.createElement(React.Fragment, null, /* @__PURE__ */ React.createElement(Grid, {
-    item: true,
-    xs: 12
-  }, /* @__PURE__ */ React.createElement(Divider, null)), /* @__PURE__ */ React.createElement(Grid, {
-    item: true,
-    xs: 12
-  }, /* @__PURE__ */ React.createElement(Grid, {
-    container: true,
-    spacing: 2
-  }, (_e = template.metadata.tags) == null ? void 0 : _e.map((tag) => /* @__PURE__ */ React.createElement(Grid, {
-    item: true
-  }, /* @__PURE__ */ React.createElement(Chip, {
-    style: { margin: 0 },
-    size: "small",
-    label: tag,
-    key: tag
-  })))))), (!!viewTechDocsLink || ((_f = template.metadata.links) == null ? void 0 : _f.length)) && /* @__PURE__ */ React.createElement(React.Fragment, null, /* @__PURE__ */ React.createElement(Grid, {
-    item: true,
-    xs: 12
-  }, /* @__PURE__ */ React.createElement(Divider, null)), /* @__PURE__ */ React.createElement(Grid, {
-    item: true,
-    xs: 12
-  }, /* @__PURE__ */ React.createElement(Grid, {
-    container: true,
-    spacing: 2
-  }, viewTechDocsLink && /* @__PURE__ */ React.createElement(Grid, {
-    className: styles.linkText,
-    item: true,
-    xs: 6
-  }, /* @__PURE__ */ React.createElement(CardLink, {
-    icon: iconResolver("docs"),
-    text: "View TechDocs",
-    url: viewTechDocsLink
-  })), (_g = template.metadata.links) == null ? void 0 : _g.map(({ url, icon, title }) => /* @__PURE__ */ React.createElement(Grid, {
-    className: styles.linkText,
-    item: true,
-    xs: 6
-  }, /* @__PURE__ */ React.createElement(CardLink, {
-    icon: iconResolver(icon),
-    text: title || url,
-    url
-  })))))))), /* @__PURE__ */ React.createElement(CardActions, {
-    style: { padding: "16px" }
-  }, /* @__PURE__ */ React.createElement("div", {
-    className: styles.footer
-  }, /* @__PURE__ */ React.createElement("div", {
-    className: styles.ownedBy
-  }, ownedByRelations.length > 0 && /* @__PURE__ */ React.createElement(React.Fragment, null, /* @__PURE__ */ React.createElement(UserIcon, {
-    fontSize: "small"
-  }), /* @__PURE__ */ React.createElement(EntityRefLinks, {
-    style: { marginLeft: "8px" },
-    entityRefs: ownedByRelations,
-    defaultKind: "Group"
-  }))), /* @__PURE__ */ React.createElement(Button$1, {
-    size: "small",
-    variant: "outlined",
-    color: "primary",
-    to: href
-  }, "Choose"))));
+  return /* @__PURE__ */ React.createElement(Card, null, /* @__PURE__ */ React.createElement(CardHeader, { template }), /* @__PURE__ */ React.createElement(CardContent, null, /* @__PURE__ */ React.createElement(Grid, { container: true, spacing: 2 }, /* @__PURE__ */ React.createElement(Grid, { item: true, xs: 12 }, /* @__PURE__ */ React.createElement(Box, { className: styles.box }, /* @__PURE__ */ React.createElement(
+    MarkdownContent,
+    {
+      className: styles.markdown,
+      content: (_b = template.metadata.description) != null ? _b : "No description"
+    }
+  ))), ((_d = (_c = template.metadata.tags) == null ? void 0 : _c.length) != null ? _d : 0) > 0 && /* @__PURE__ */ React.createElement(React.Fragment, null, /* @__PURE__ */ React.createElement(Grid, { item: true, xs: 12 }, /* @__PURE__ */ React.createElement(Divider, null)), /* @__PURE__ */ React.createElement(Grid, { item: true, xs: 12 }, /* @__PURE__ */ React.createElement(Grid, { container: true, spacing: 2 }, (_e = template.metadata.tags) == null ? void 0 : _e.map((tag) => /* @__PURE__ */ React.createElement(Grid, { item: true }, /* @__PURE__ */ React.createElement(
+    Chip,
+    {
+      style: { margin: 0 },
+      size: "small",
+      label: tag,
+      key: tag
+    }
+  )))))), (!!viewTechDocsLink || ((_f = template.metadata.links) == null ? void 0 : _f.length)) && /* @__PURE__ */ React.createElement(React.Fragment, null, /* @__PURE__ */ React.createElement(Grid, { item: true, xs: 12 }, /* @__PURE__ */ React.createElement(Divider, null)), /* @__PURE__ */ React.createElement(Grid, { item: true, xs: 12 }, /* @__PURE__ */ React.createElement(Grid, { container: true, spacing: 2 }, viewTechDocsLink && /* @__PURE__ */ React.createElement(Grid, { className: styles.linkText, item: true, xs: 6 }, /* @__PURE__ */ React.createElement(
+    CardLink,
+    {
+      icon: iconResolver("docs"),
+      text: "View TechDocs",
+      url: viewTechDocsLink
+    }
+  )), (_g = template.metadata.links) == null ? void 0 : _g.map(({ url, icon, title }) => /* @__PURE__ */ React.createElement(Grid, { className: styles.linkText, item: true, xs: 6 }, /* @__PURE__ */ React.createElement(
+    CardLink,
+    {
+      icon: iconResolver(icon),
+      text: title || url,
+      url
+    }
+  )))))))), /* @__PURE__ */ React.createElement(CardActions, { style: { padding: "16px" } }, /* @__PURE__ */ React.createElement("div", { className: styles.footer }, /* @__PURE__ */ React.createElement("div", { className: styles.ownedBy }, ownedByRelations.length > 0 && /* @__PURE__ */ React.createElement(React.Fragment, null, /* @__PURE__ */ React.createElement(UserIcon, { fontSize: "small" }), /* @__PURE__ */ React.createElement(
+    EntityRefLinks,
+    {
+      style: { marginLeft: "8px" },
+      entityRefs: ownedByRelations,
+      defaultKind: "Group"
+    }
+  ))), /* @__PURE__ */ React.createElement(Button$1, { size: "small", variant: "outlined", color: "primary", to: href }, "Choose"))));
 };
 
 const TemplateGroup = (props) => {
   const { templates, title, components: { CardComponent } = {} } = props;
-  const titleComponent = typeof title === "string" ? /* @__PURE__ */ React.createElement(ContentHeader, {
-    title
-  }) : title;
+  const titleComponent = typeof title === "string" ? /* @__PURE__ */ React.createElement(ContentHeader, { title }) : title;
   if (templates.length === 0) {
-    return /* @__PURE__ */ React.createElement(Content, null, titleComponent, /* @__PURE__ */ React.createElement(Typography, {
-      variant: "body2"
-    }, "No templates found that match your filter. Learn more about", " ", /* @__PURE__ */ React.createElement(Link$1, {
-      to: "https://backstage.io/docs/features/software-templates/adding-templates"
-    }, "adding templates"), "."));
+    return /* @__PURE__ */ React.createElement(Content, null, titleComponent, /* @__PURE__ */ React.createElement(Typography, { variant: "body2" }, "No templates found that match your filter. Learn more about", " ", /* @__PURE__ */ React.createElement(Link$1, { to: "https://backstage.io/docs/features/software-templates/adding-templates" }, "adding templates"), "."));
   }
   const Card = CardComponent || TemplateCard;
-  return /* @__PURE__ */ React.createElement(Content, null, titleComponent, /* @__PURE__ */ React.createElement(ItemCardGrid, null, templates.map((template) => /* @__PURE__ */ React.createElement(Card, {
-    key: stringifyEntityRef(template),
-    template
-  }))));
+  return /* @__PURE__ */ React.createElement(Content, null, titleComponent, /* @__PURE__ */ React.createElement(ItemCardGrid, null, templates.map((template) => /* @__PURE__ */ React.createElement(Card, { key: stringifyEntityRef(template), template }))));
 };
 
 const TemplateGroups = (props) => {
@@ -340,20 +285,19 @@ const TemplateGroups = (props) => {
     return null;
   }
   if (!entities || !entities.length) {
-    return /* @__PURE__ */ React.createElement(Typography, {
-      variant: "body2"
-    }, "No templates found that match your filter. Learn more about", " ", /* @__PURE__ */ React.createElement(Link$1, {
-      to: "https://backstage.io/docs/features/software-templates/adding-templates"
-    }, "adding templates"), ".");
+    return /* @__PURE__ */ React.createElement(Typography, { variant: "body2" }, "No templates found that match your filter. Learn more about", " ", /* @__PURE__ */ React.createElement(Link$1, { to: "https://backstage.io/docs/features/software-templates/adding-templates" }, "adding templates"), ".");
   }
-  return /* @__PURE__ */ React.createElement(React.Fragment, null, groups.map(({ title, filter }, index) => /* @__PURE__ */ React.createElement(TemplateGroup, {
-    key: index,
-    templates: entities.filter(
-      (e) => filter(e)
-    ),
-    title,
-    components: { CardComponent: TemplateCardComponent }
-  })));
+  return /* @__PURE__ */ React.createElement(React.Fragment, null, groups.map(({ title, filter }, index) => /* @__PURE__ */ React.createElement(
+    TemplateGroup,
+    {
+      key: index,
+      templates: entities.filter(
+        (e) => filter(e)
+      ),
+      title,
+      components: { CardComponent: TemplateCardComponent }
+    }
+  )));
 };
 
 const defaultGroup = {
@@ -363,114 +307,32 @@ const defaultGroup = {
 const TemplateListPage = (props) => {
   const registerComponentLink = useRouteRef(registerComponentRouteRef);
   const { TemplateCardComponent, groups = [] } = props;
-  return /* @__PURE__ */ React.createElement(EntityListProvider, null, /* @__PURE__ */ React.createElement(Page, {
-    themeId: "website"
-  }, /* @__PURE__ */ React.createElement(Header, {
-    pageTitleOverride: "Create a new component",
-    title: "Create a new component",
-    subtitle: "Create new software components using standard templates in your organization"
-  }), /* @__PURE__ */ React.createElement(Content, null, /* @__PURE__ */ React.createElement(ContentHeader, {
-    title: "Available Templates"
-  }, /* @__PURE__ */ React.createElement(RegisterExistingButton, {
-    title: "Register Existing Component",
-    to: registerComponentLink && registerComponentLink()
-  }), /* @__PURE__ */ React.createElement(SupportButton, null, "Create new software components using standard templates. Different templates create different kinds of components (services, websites, documentation, ...).")), /* @__PURE__ */ React.createElement(CatalogFilterLayout, null, /* @__PURE__ */ React.createElement(CatalogFilterLayout.Filters, null, /* @__PURE__ */ React.createElement(EntitySearchBar, null), /* @__PURE__ */ React.createElement(EntityKindPicker, {
-    initialFilter: "template",
-    hidden: true
-  }), /* @__PURE__ */ React.createElement(UserListPicker, {
-    initialFilter: "all",
-    availableFilters: ["all", "starred"]
-  }), /* @__PURE__ */ React.createElement(CategoryPicker, null), /* @__PURE__ */ React.createElement(EntityTagPicker, null)), /* @__PURE__ */ React.createElement(CatalogFilterLayout.Content, null, /* @__PURE__ */ React.createElement(TemplateGroups, {
-    groups: [...groups, defaultGroup],
-    TemplateCardComponent
-  }))))));
-};
-
-function isObject(value) {
-  return typeof value === "object" && value !== null && !Array.isArray(value);
-}
-function extractUiSchema(schema, uiSchema) {
-  if (!isObject(schema)) {
-    return;
-  }
-  const { properties, items, anyOf, oneOf, allOf, dependencies } = schema;
-  for (const propName in schema) {
-    if (!schema.hasOwnProperty(propName)) {
-      continue;
-    }
-    if (propName.startsWith("ui:")) {
-      uiSchema[propName] = schema[propName];
-      delete schema[propName];
+  return /* @__PURE__ */ React.createElement(EntityListProvider, null, /* @__PURE__ */ React.createElement(Page, { themeId: "website" }, /* @__PURE__ */ React.createElement(
+    Header,
+    {
+      pageTitleOverride: "Create a new component",
+      title: "Create a new component",
+      subtitle: "Create new software components using standard templates in your organization"
     }
-  }
-  if (isObject(properties)) {
-    for (const propName in properties) {
-      if (!properties.hasOwnProperty(propName)) {
-        continue;
-      }
-      const schemaNode = properties[propName];
-      if (!isObject(schemaNode)) {
-        continue;
-      }
-      const innerUiSchema = {};
-      uiSchema[propName] = innerUiSchema;
-      extractUiSchema(schemaNode, innerUiSchema);
+  ), /* @__PURE__ */ React.createElement(Content, null, /* @__PURE__ */ React.createElement(ContentHeader, { title: "Available Templates" }, /* @__PURE__ */ React.createElement(
+    RegisterExistingButton,
+    {
+      title: "Register Existing Component",
+      to: registerComponentLink && registerComponentLink()
     }
-  }
-  if (isObject(items)) {
-    const innerUiSchema = {};
-    uiSchema.items = innerUiSchema;
-    extractUiSchema(items, innerUiSchema);
-  }
-  if (Array.isArray(anyOf)) {
-    for (const schemaNode of anyOf) {
-      if (!isObject(schemaNode)) {
-        continue;
-      }
-      extractUiSchema(schemaNode, uiSchema);
+  ), /* @__PURE__ */ React.createElement(SupportButton, null, "Create new software components using standard templates. Different templates create different kinds of components (services, websites, documentation, ...).")), /* @__PURE__ */ React.createElement(CatalogFilterLayout, null, /* @__PURE__ */ React.createElement(CatalogFilterLayout.Filters, null, /* @__PURE__ */ React.createElement(EntitySearchBar, null), /* @__PURE__ */ React.createElement(EntityKindPicker, { initialFilter: "template", hidden: true }), /* @__PURE__ */ React.createElement(
+    UserListPicker,
+    {
+      initialFilter: "all",
+      availableFilters: ["all", "starred"]
     }
-  }
-  if (Array.isArray(oneOf)) {
-    for (const schemaNode of oneOf) {
-      if (!isObject(schemaNode)) {
-        continue;
-      }
-      extractUiSchema(schemaNode, uiSchema);
+  ), /* @__PURE__ */ React.createElement(CategoryPicker, null), /* @__PURE__ */ React.createElement(EntityTagPicker, null)), /* @__PURE__ */ React.createElement(CatalogFilterLayout.Content, null, /* @__PURE__ */ React.createElement(
+    TemplateGroups,
+    {
+      groups: [...groups, defaultGroup],
+      TemplateCardComponent
     }
-  }
-  if (Array.isArray(allOf)) {
-    for (const schemaNode of allOf) {
-      if (!isObject(schemaNode)) {
-        continue;
-      }
-      extractUiSchema(schemaNode, uiSchema);
-    }
-  }
-  if (isObject(dependencies)) {
-    for (const depName of Object.keys(dependencies)) {
-      const schemaNode = dependencies[depName];
-      if (!isObject(schemaNode)) {
-        continue;
-      }
-      extractUiSchema(schemaNode, uiSchema);
-    }
-  }
-}
-const extractSchemaFromStep = (inputStep) => {
-  const uiSchema = {};
-  const returnSchema = JSON.parse(JSON.stringify(inputStep));
-  extractUiSchema(returnSchema, uiSchema);
-  return { uiSchema, schema: returnSchema };
-};
-const createFieldValidation = () => {
-  const fieldValidation = {
-    __errors: [],
-    addError: (message) => {
-      var _a;
-      (_a = fieldValidation.__errors) == null ? void 0 : _a.push(message);
-    }
-  };
-  return fieldValidation;
+  ))))));
 };
 
 const createAsyncValidators = (rootSchema, validators, context) => {
@@ -563,9 +425,7 @@ const ReviewState = (props) => {
       return [key, value];
     })
   );
-  return /* @__PURE__ */ React.createElement(StructuredMetadataTable, {
-    metadata: reviewData
-  });
+  return /* @__PURE__ */ React.createElement(StructuredMetadataTable, { metadata: reviewData });
 };
 
 const useStyles$1 = makeStyles((theme) => ({
@@ -613,12 +473,22 @@ const Stepper = (props) => {
   const handleNext = async ({
     formData
   }) => {
+    var _a, _b;
     setErrors(void 0);
-    const returnedValidation = await validation(formData);
+    const schema = (_a = steps[activeStep]) == null ? void 0 : _a.schema;
+    const rootSchema = (_b = steps[activeStep]) == null ? void 0 : _b.mergedSchema;
+    const newFormData = getDefaultFormState(
+      validator,
+      schema,
+      formData,
+      rootSchema,
+      true
+    );
+    const returnedValidation = await validation(newFormData);
     const hasErrors = Object.values(returnedValidation).some(
       (i) => {
-        var _a;
-        return (_a = i.__errors) == null ? void 0 : _a.length;
+        var _a2;
+        return (_a2 = i.__errors) == null ? void 0 : _a2.length;
       }
     );
     if (hasErrors) {
@@ -631,56 +501,54 @@ const Stepper = (props) => {
         return stepNum;
       });
     }
-    setFormState((current) => ({ ...current, ...formData }));
+    setFormState((current) => ({ ...current, ...newFormData }));
   };
-  return /* @__PURE__ */ React.createElement(React.Fragment, null, /* @__PURE__ */ React.createElement(Stepper$1, {
-    activeStep,
-    alternativeLabel: true,
-    variant: "elevation"
-  }, steps.map((step, index) => /* @__PURE__ */ React.createElement(Step, {
-    key: index
-  }, /* @__PURE__ */ React.createElement(StepLabel, null, step.title))), /* @__PURE__ */ React.createElement(Step, null, /* @__PURE__ */ React.createElement(StepLabel, null, "Review"))), /* @__PURE__ */ React.createElement("div", {
-    className: styles.formWrapper
-  }, activeStep < steps.length ? /* @__PURE__ */ React.createElement(Form, {
-    validator,
-    extraErrors: errors,
-    formData: formState,
-    formContext: { formData: formState },
-    schema: steps[activeStep].schema,
-    uiSchema: steps[activeStep].uiSchema,
-    onSubmit: handleNext,
-    fields: extensions,
-    showErrorList: false
-  }, /* @__PURE__ */ React.createElement("div", {
-    className: styles.footer
-  }, /* @__PURE__ */ React.createElement(Button$2, {
-    onClick: handleBack,
-    className: styles.backButton,
-    disabled: activeStep < 1
-  }, "Back"), /* @__PURE__ */ React.createElement(Button$2, {
-    variant: "contained",
-    color: "primary",
-    type: "submit"
-  }, activeStep === steps.length - 1 ? "Review" : "Next"))) : /* @__PURE__ */ React.createElement(React.Fragment, null, /* @__PURE__ */ React.createElement(ReviewState, {
-    formState,
-    schemas: steps
-  }), /* @__PURE__ */ React.createElement("div", {
-    className: styles.footer
-  }, /* @__PURE__ */ React.createElement(Button$2, {
-    onClick: handleBack,
-    className: styles.backButton,
-    disabled: activeStep < 1
-  }, "Back"), /* @__PURE__ */ React.createElement(Button$2, {
-    variant: "contained",
-    onClick: () => {
-      props.onComplete(formState);
-      const name = typeof formState.name === "string" ? formState.name : void 0;
-      analytics.captureEvent(
-        "create",
-        name || `new ${templateName}`
-      );
-    }
-  }, "Create")))));
+  return /* @__PURE__ */ React.createElement(React.Fragment, null, /* @__PURE__ */ React.createElement(Stepper$1, { activeStep, alternativeLabel: true, variant: "elevation" }, steps.map((step, index) => /* @__PURE__ */ React.createElement(Step, { key: index }, /* @__PURE__ */ React.createElement(StepLabel, null, step.title))), /* @__PURE__ */ React.createElement(Step, null, /* @__PURE__ */ React.createElement(StepLabel, null, "Review"))), /* @__PURE__ */ React.createElement("div", { className: styles.formWrapper }, activeStep < steps.length ? /* @__PURE__ */ React.createElement(
+    Form,
+    {
+      validator,
+      extraErrors: errors,
+      formData: formState,
+      formContext: { formData: formState },
+      schema: steps[activeStep].schema,
+      uiSchema: steps[activeStep].uiSchema,
+      onSubmit: handleNext,
+      fields: extensions,
+      showErrorList: false,
+      transformErrors: props.transformErrors
+    },
+    /* @__PURE__ */ React.createElement("div", { className: styles.footer }, /* @__PURE__ */ React.createElement(
+      Button$2,
+      {
+        onClick: handleBack,
+        className: styles.backButton,
+        disabled: activeStep < 1
+      },
+      "Back"
+    ), /* @__PURE__ */ React.createElement(Button$2, { variant: "contained", color: "primary", type: "submit" }, activeStep === steps.length - 1 ? "Review" : "Next"))
+  ) : /* @__PURE__ */ React.createElement(React.Fragment, null, /* @__PURE__ */ React.createElement(ReviewState, { formState, schemas: steps }), /* @__PURE__ */ React.createElement("div", { className: styles.footer }, /* @__PURE__ */ React.createElement(
+    Button$2,
+    {
+      onClick: handleBack,
+      className: styles.backButton,
+      disabled: activeStep < 1
+    },
+    "Back"
+  ), /* @__PURE__ */ React.createElement(
+    Button$2,
+    {
+      variant: "contained",
+      onClick: () => {
+        props.onComplete(formState);
+        const name = typeof formState.name === "string" ? formState.name : void 0;
+        analytics.captureEvent(
+          "create",
+          name || `new ${templateName}`
+        );
+      }
+    },
+    "Create"
+  )))));
 };
 
 const useStyles = makeStyles(() => ({
@@ -733,31 +601,39 @@ const TemplateWizardPage = (props) => {
     }
   }, [error, errorApi]);
   if (error) {
-    return /* @__PURE__ */ React.createElement(Navigate, {
-      to: rootRef()
-    });
+    return /* @__PURE__ */ React.createElement(Navigate, { to: rootRef() });
   }
-  return /* @__PURE__ */ React.createElement(AnalyticsContext, {
-    attributes: { entityRef: templateRef }
-  }, /* @__PURE__ */ React.createElement(Page, {
-    themeId: "website"
-  }, /* @__PURE__ */ React.createElement(Header, {
-    pageTitleOverride: "Create a new component",
-    title: "Create a new component",
-    subtitle: "Create new software components using standard templates in your organization"
-  }), /* @__PURE__ */ React.createElement(Content, null, loading && /* @__PURE__ */ React.createElement(Progress, null), manifest && /* @__PURE__ */ React.createElement(InfoCard, {
-    title: manifest.title,
-    subheader: /* @__PURE__ */ React.createElement(MarkdownContent, {
-      className: styles.markdown,
-      content: (_b = manifest.description) != null ? _b : "No description"
-    }),
-    noPadding: true,
-    titleTypographyProps: { component: "h2" }
-  }, /* @__PURE__ */ React.createElement(Stepper, {
-    manifest,
-    extensions: props.customFieldExtensions,
-    onComplete
-  })))));
+  return /* @__PURE__ */ React.createElement(AnalyticsContext, { attributes: { entityRef: templateRef } }, /* @__PURE__ */ React.createElement(Page, { themeId: "website" }, /* @__PURE__ */ React.createElement(
+    Header,
+    {
+      pageTitleOverride: "Create a new component",
+      title: "Create a new component",
+      subtitle: "Create new software components using standard templates in your organization"
+    }
+  ), /* @__PURE__ */ React.createElement(Content, null, loading && /* @__PURE__ */ React.createElement(Progress, null), manifest && /* @__PURE__ */ React.createElement(
+    InfoCard,
+    {
+      title: manifest.title,
+      subheader: /* @__PURE__ */ React.createElement(
+        MarkdownContent,
+        {
+          className: styles.markdown,
+          content: (_b = manifest.description) != null ? _b : "No description"
+        }
+      ),
+      noPadding: true,
+      titleTypographyProps: { component: "h2" }
+    },
+    /* @__PURE__ */ React.createElement(
+      Stepper,
+      {
+        manifest,
+        extensions: props.customFieldExtensions,
+        onComplete,
+        transformErrors: props.transformErrors
+      }
+    )
+  ))));
 };
 
 const Router = (props) => {
@@ -779,19 +655,26 @@ const Router = (props) => {
       )
     )
   ];
-  return /* @__PURE__ */ React.createElement(Routes, null, /* @__PURE__ */ React.createElement(Route, {
-    path: "/",
-    element: /* @__PURE__ */ React.createElement(TemplateListPage, {
-      TemplateCardComponent,
-      groups: props.groups
-    })
-  }), /* @__PURE__ */ React.createElement(Route, {
-    path: nextSelectedTemplateRouteRef.path,
-    element: /* @__PURE__ */ React.createElement(SecretsContextProvider, null, /* @__PURE__ */ React.createElement(TemplateWizardPage, {
-      customFieldExtensions: fieldExtensions
-    }))
-  }));
+  return /* @__PURE__ */ React.createElement(Routes, null, /* @__PURE__ */ React.createElement(
+    Route,
+    {
+      path: "/",
+      element: /* @__PURE__ */ React.createElement(
+        TemplateListPage,
+        {
+          TemplateCardComponent,
+          groups: props.groups
+        }
+      )
+    }
+  ), /* @__PURE__ */ React.createElement(
+    Route,
+    {
+      path: nextSelectedTemplateRouteRef.path,
+      element: /* @__PURE__ */ React.createElement(SecretsContextProvider, null, /* @__PURE__ */ React.createElement(TemplateWizardPage, { customFieldExtensions: fieldExtensions }))
+    }
+  ));
 };
 
 export { Router };
-//# sourceMappingURL=index-a739a160.esm.js.map
+//# sourceMappingURL=index-cb47594c.esm.js.map