@rjsf/utils 5.19.3 → 5.20.0

package/dist/index.js

@@ -2378,22 +2378,41 @@ function toConstant(schema) {
 }
 
 // src/optionsList.ts
-function optionsList(schema) {
+function optionsList(schema, uiSchema) {
   const schemaWithEnumNames = schema;
-  if (schemaWithEnumNames.enumNames && true) {
-    console.warn("The enumNames property is deprecated and may be removed in a future major release.");
-  }
   if (schema.enum) {
+    let enumNames;
+    if (uiSchema) {
+      const { enumNames: uiEnumNames } = getUiOptions(uiSchema);
+      enumNames = uiEnumNames;
+    }
+    if (!enumNames && schemaWithEnumNames.enumNames) {
+      if (true) {
+        console.warn(
+          'The "enumNames" property in the schema is deprecated and will be removed in a future major release. Use the "ui:enumNames" property in the uiSchema instead.'
+        );
+      }
+      enumNames = schemaWithEnumNames.enumNames;
+    }
     return schema.enum.map((value, i) => {
-      const label = schemaWithEnumNames.enumNames && schemaWithEnumNames.enumNames[i] || String(value);
+      const label = enumNames?.[i] || String(value);
       return { label, value };
     });
   }
-  const altSchemas = schema.oneOf || schema.anyOf;
-  return altSchemas && altSchemas.map((aSchemaDef) => {
+  let altSchemas = void 0;
+  let altUiSchemas = void 0;
+  if (schema.anyOf) {
+    altSchemas = schema.anyOf;
+    altUiSchemas = uiSchema?.anyOf;
+  } else if (schema.oneOf) {
+    altSchemas = schema.oneOf;
+    altUiSchemas = uiSchema?.oneOf;
+  }
+  return altSchemas && altSchemas.map((aSchemaDef, index) => {
+    const { title } = getUiOptions(altUiSchemas?.[index]);
     const aSchema = aSchemaDef;
     const value = toConstant(aSchema);
-    const label = aSchema.title || String(value);
+    const label = title || aSchema.title || String(value);
     return {
       schema: aSchema,
       label,
@@ -2648,11 +2667,11 @@ var TranslatableString = /* @__PURE__ */ ((TranslatableString2) => {
   TranslatableString2["OptionPrefix"] = "Option %1";
   TranslatableString2["TitleOptionPrefix"] = "%1 option %2";
   TranslatableString2["KeyLabel"] = "%1 Key";
-  TranslatableString2["InvalidObjectField"] = 'Invalid "%1" object field configuration: <em>%2</em>.';
+  TranslatableString2["InvalidObjectField"] = 'Invalid "%1" object field configuration: _%2_.';
   TranslatableString2["UnsupportedField"] = "Unsupported field schema.";
-  TranslatableString2["UnsupportedFieldWithId"] = "Unsupported field schema for field <code>%1</code>.";
-  TranslatableString2["UnsupportedFieldWithReason"] = "Unsupported field schema: <em>%1</em>.";
-  TranslatableString2["UnsupportedFieldWithIdAndReason"] = "Unsupported field schema for field <code>%1</code>: <em>%2</em>.";
+  TranslatableString2["UnsupportedFieldWithId"] = "Unsupported field schema for field `%1`.";
+  TranslatableString2["UnsupportedFieldWithReason"] = "Unsupported field schema: _%1_.";
+  TranslatableString2["UnsupportedFieldWithIdAndReason"] = "Unsupported field schema for field `%1`: _%2_.";
   TranslatableString2["FilesInfo"] = "**%1** (%2, %3 bytes)";
   return TranslatableString2;
 })(TranslatableString || {});
@@ -2676,6 +2695,11 @@ var ParserValidator = class {
     this.rootSchema = rootSchema;
     this.addSchema(rootSchema, hashForSchema(rootSchema));
   }
+  /** Resets the internal AJV validator to clear schemas from it. Can be helpful for resetting the validator for tests.
+   */
+  reset() {
+    this.schemaMap = {};
+  }
   /** Adds the given `schema` to the `schemaMap` keyed by the `hash` or `ID_KEY` if present on the `schema`. If the
    * schema does not have an `ID_KEY`, then the `hash` will be added as the `ID_KEY` to allow the schema to be
    * associated with it's `hash` for future use (by a schema compiler).