@rjsf/utils 6.3.1 → 6.4.1

package/dist/utils.esm.js

@@ -65,6 +65,7 @@ var READONLY_KEY = "readonly";
 var REQUIRED_KEY = "required";
 var SUBMIT_BTN_OPTIONS_KEY = "submitButtonOptions";
 var REF_KEY = "$ref";
+var RJSF_REF_KEY = "__rjsf_ref";
 var SCHEMA_KEY = "$schema";
 var DEFAULT_ID_PREFIX = "root";
 var DEFAULT_ID_SEPARATOR = "_";
@@ -619,7 +620,7 @@ function resolveAllReferences(schema, rootSchema, recurseList, baseURI, resolveA
     }
     recurseList.push($ref);
     const refSchema = findSchemaDefinition($ref, rootSchema, baseURI);
-    resolvedSchema = { ...refSchema, ...localSchema };
+    resolvedSchema = { ...refSchema, ...localSchema, [RJSF_REF_KEY]: $ref };
     if (ID_KEY in resolvedSchema) {
       baseURI = resolvedSchema[ID_KEY];
     }
@@ -1400,17 +1401,35 @@ function toConstant(schema) {
 }
 
 // src/optionsList.ts
+function applyEnumOrder(options, order) {
+  const optionsByValue = new Map(options.map((opt) => [String(opt.value), opt]));
+  const orderedKeys = new Set(order.filter((v) => v !== "*").map(String));
+  const rest = options.filter((opt) => !orderedKeys.has(String(opt.value)));
+  return order.flatMap((entry) => {
+    if (entry === "*") {
+      return rest;
+    }
+    const opt = optionsByValue.get(String(entry));
+    return opt ? [opt] : [];
+  });
+}
 function optionsList(schema, uiSchema) {
   if (schema.enum) {
     let enumNames;
+    let enumOrder;
     if (uiSchema) {
-      const { enumNames: uiEnumNames } = getUiOptions(uiSchema);
+      const { enumNames: uiEnumNames, enumOrder: uiEnumOrder } = getUiOptions(uiSchema);
       enumNames = uiEnumNames;
+      enumOrder = uiEnumOrder;
     }
-    return schema.enum.map((value, i) => {
-      const label = enumNames?.[i] || String(value);
+    let options = schema.enum.map((value, i) => {
+      const label = Array.isArray(enumNames) ? enumNames[i] || String(value) : enumNames?.[String(value)] || String(value);
       return { label, value };
     });
+    if (enumOrder) {
+      options = applyEnumOrder(options, enumOrder);
+    }
+    return options;
   }
   let altSchemas = void 0;
   let altUiSchemas = void 0;
@@ -1949,6 +1968,7 @@ import get15 from "lodash/get";
 
 // src/schema/toPathSchema.ts
 import get14 from "lodash/get";
+import isObject4 from "lodash/isObject";
 import set2 from "lodash/set";
 function toPathSchemaInternal(validator, schema, name, rootSchema, formData, _recurseList = [], experimental_customMergeAllOf) {
   if (REF_KEY in schema || DEPENDENCIES_KEY in schema || ALL_OF_KEY in schema || IF_KEY in schema) {
@@ -1997,6 +2017,21 @@ function toPathSchemaInternal(validator, schema, name, rootSchema, formData, _re
   }
   if (ADDITIONAL_PROPERTIES_KEY in schema && schema[ADDITIONAL_PROPERTIES_KEY] !== false) {
     set2(pathSchema, RJSF_ADDITIONAL_PROPERTIES_FLAG, true);
+    const additionalSchema = isObject4(schema[ADDITIONAL_PROPERTIES_KEY]) ? schema[ADDITIONAL_PROPERTIES_KEY] : {};
+    const definedProperties = get14(schema, PROPERTIES_KEY, {});
+    for (const key of Object.keys(formData ?? {})) {
+      if (!(key in definedProperties)) {
+        pathSchema[key] = toPathSchemaInternal(
+          validator,
+          additionalSchema,
+          `${name}.${key}`,
+          rootSchema,
+          get14(formData, [key]),
+          _recurseList,
+          experimental_customMergeAllOf
+        );
+      }
+    }
   }
   if (ITEMS_KEY in schema && Array.isArray(formData)) {
     const { items: schemaItems, additionalItems: schemaAdditionalItems } = schema;
@@ -3093,13 +3128,14 @@ function optionalControlsId(id, element) {
 // src/isFormDataAvailable.ts
 import isNil3 from "lodash/isNil";
 import isEmpty6 from "lodash/isEmpty";
-import isObject4 from "lodash/isObject";
+import isObject5 from "lodash/isObject";
 function isFormDataAvailable(formData) {
-  return !isNil3(formData) && (!isObject4(formData) || Array.isArray(formData) || !isEmpty6(formData));
+  return !isNil3(formData) && (!isObject5(formData) || Array.isArray(formData) || !isEmpty6(formData));
 }
 
 // src/isRootSchema.ts
 import isEqual2 from "lodash/isEqual";
+import omit2 from "lodash/omit";
 function isRootSchema(registry, schemaToCompare) {
   const { rootSchema, schemaUtils } = registry;
   if (isEqual2(schemaToCompare, rootSchema)) {
@@ -3107,7 +3143,7 @@ function isRootSchema(registry, schemaToCompare) {
   }
   if (REF_KEY in rootSchema) {
     const resolvedSchema = schemaUtils.retrieveSchema(rootSchema);
-    return isEqual2(schemaToCompare, resolvedSchema);
+    return isEqual2(schemaToCompare, omit2(resolvedSchema, RJSF_REF_KEY));
   }
   return false;
 }
@@ -3258,7 +3294,7 @@ function expandUiSchemaDefinitions(currentSchema, uiSchema, registry, visited =
   return result;
 }
 function resolveUiSchema(schema, localUiSchema, registry) {
-  const ref = schema[REF_KEY];
+  const ref = schema[RJSF_REF_KEY] ?? schema[REF_KEY];
   const definitionUiSchema = ref ? registry.uiSchemaDefinitions?.[ref] : void 0;
   if (!definitionUiSchema) {
     return localUiSchema || {};
@@ -3304,11 +3340,11 @@ function shouldRender(component, nextProps, nextState, updateStrategy = "customD
 }
 
 // src/shouldRenderOptionalField.ts
-import isObject5 from "lodash/isObject";
+import isObject6 from "lodash/isObject";
 import uniq2 from "lodash/uniq";
 function getSchemaTypesForXxxOf(schemas) {
   const allTypes = uniq2(
-    schemas.map((s) => isObject5(s) ? getSchemaType(s) : void 0).flat().filter((t) => t !== void 0)
+    schemas.map((s) => isObject6(s) ? getSchemaType(s) : void 0).flat().filter((t) => t !== void 0)
   );
   return allTypes.length === 1 ? allTypes[0] : allTypes;
 }
@@ -3654,7 +3690,7 @@ function validationDataMerge(validationData, additionalErrorSchema, preventDupli
 }
 
 // src/withIdRefPrefix.ts
-import isObject6 from "lodash/isObject";
+import isObject7 from "lodash/isObject";
 function withIdRefPrefixObject(node) {
   for (const key in node) {
     const realObj = node;
@@ -3677,7 +3713,7 @@ function withIdRefPrefix(schemaNode) {
   if (Array.isArray(schemaNode)) {
     return withIdRefPrefixArray([...schemaNode]);
   }
-  if (isObject6(schemaNode)) {
+  if (isObject7(schemaNode)) {
     return withIdRefPrefixObject({ ...schemaNode });
   }
   return schemaNode;
@@ -3896,6 +3932,7 @@ export {
   REF_KEY,
   REQUIRED_KEY,
   RJSF_ADDITIONAL_PROPERTIES_FLAG,
+  RJSF_REF_KEY,
   ROOT_SCHEMA_PREFIX,
   SCHEMA_KEY,
   SUBMIT_BTN_OPTIONS_KEY,