@rjsf/utils 6.3.0 → 6.4.0

package/dist/index.cjs

@@ -61,6 +61,7 @@ __export(index_exports, {
   REF_KEY: () => REF_KEY,
   REQUIRED_KEY: () => REQUIRED_KEY,
   RJSF_ADDITIONAL_PROPERTIES_FLAG: () => RJSF_ADDITIONAL_PROPERTIES_FLAG,
+  RJSF_REF_KEY: () => RJSF_REF_KEY,
   ROOT_SCHEMA_PREFIX: () => ROOT_SCHEMA_PREFIX,
   SCHEMA_KEY: () => SCHEMA_KEY,
   SUBMIT_BTN_OPTIONS_KEY: () => SUBMIT_BTN_OPTIONS_KEY,
@@ -236,6 +237,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 = "_";
@@ -790,7 +792,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];
     }
@@ -1571,17 +1573,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;
@@ -2120,6 +2140,7 @@ var import_get15 = __toESM(require("lodash/get"), 1);
 
 // src/schema/toPathSchema.ts
 var import_get14 = __toESM(require("lodash/get"), 1);
+var import_isObject11 = __toESM(require("lodash/isObject"), 1);
 var import_set2 = __toESM(require("lodash/set"), 1);
 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) {
@@ -2168,6 +2189,21 @@ function toPathSchemaInternal(validator, schema, name, rootSchema, formData, _re
   }
   if (ADDITIONAL_PROPERTIES_KEY in schema && schema[ADDITIONAL_PROPERTIES_KEY] !== false) {
     (0, import_set2.default)(pathSchema, RJSF_ADDITIONAL_PROPERTIES_FLAG, true);
+    const additionalSchema = (0, import_isObject11.default)(schema[ADDITIONAL_PROPERTIES_KEY]) ? schema[ADDITIONAL_PROPERTIES_KEY] : {};
+    const definedProperties = (0, import_get14.default)(schema, PROPERTIES_KEY, {});
+    for (const key of Object.keys(formData ?? {})) {
+      if (!(key in definedProperties)) {
+        pathSchema[key] = toPathSchemaInternal(
+          validator,
+          additionalSchema,
+          `${name}.${key}`,
+          rootSchema,
+          (0, import_get14.default)(formData, [key]),
+          _recurseList,
+          experimental_customMergeAllOf
+        );
+      }
+    }
   }
   if (ITEMS_KEY in schema && Array.isArray(formData)) {
     const { items: schemaItems, additionalItems: schemaAdditionalItems } = schema;
@@ -3264,13 +3300,14 @@ function optionalControlsId(id, element) {
 // src/isFormDataAvailable.ts
 var import_isNil3 = __toESM(require("lodash/isNil"), 1);
 var import_isEmpty6 = __toESM(require("lodash/isEmpty"), 1);
-var import_isObject11 = __toESM(require("lodash/isObject"), 1);
+var import_isObject12 = __toESM(require("lodash/isObject"), 1);
 function isFormDataAvailable(formData) {
-  return !(0, import_isNil3.default)(formData) && (!(0, import_isObject11.default)(formData) || Array.isArray(formData) || !(0, import_isEmpty6.default)(formData));
+  return !(0, import_isNil3.default)(formData) && (!(0, import_isObject12.default)(formData) || Array.isArray(formData) || !(0, import_isEmpty6.default)(formData));
 }
 
 // src/isRootSchema.ts
 var import_isEqual2 = __toESM(require("lodash/isEqual"), 1);
+var import_omit2 = __toESM(require("lodash/omit"), 1);
 function isRootSchema(registry, schemaToCompare) {
   const { rootSchema, schemaUtils } = registry;
   if ((0, import_isEqual2.default)(schemaToCompare, rootSchema)) {
@@ -3278,7 +3315,7 @@ function isRootSchema(registry, schemaToCompare) {
   }
   if (REF_KEY in rootSchema) {
     const resolvedSchema = schemaUtils.retrieveSchema(rootSchema);
-    return (0, import_isEqual2.default)(schemaToCompare, resolvedSchema);
+    return (0, import_isEqual2.default)(schemaToCompare, (0, import_omit2.default)(resolvedSchema, RJSF_REF_KEY));
   }
   return false;
 }
@@ -3429,7 +3466,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 || {};
@@ -3475,11 +3512,11 @@ function shouldRender(component, nextProps, nextState, updateStrategy = "customD
 }
 
 // src/shouldRenderOptionalField.ts
-var import_isObject13 = __toESM(require("lodash/isObject"), 1);
+var import_isObject14 = __toESM(require("lodash/isObject"), 1);
 var import_uniq2 = __toESM(require("lodash/uniq"), 1);
 function getSchemaTypesForXxxOf(schemas) {
   const allTypes = (0, import_uniq2.default)(
-    schemas.map((s) => (0, import_isObject13.default)(s) ? getSchemaType(s) : void 0).flat().filter((t) => t !== void 0)
+    schemas.map((s) => (0, import_isObject14.default)(s) ? getSchemaType(s) : void 0).flat().filter((t) => t !== void 0)
   );
   return allTypes.length === 1 ? allTypes[0] : allTypes;
 }
@@ -3825,7 +3862,7 @@ function validationDataMerge(validationData, additionalErrorSchema, preventDupli
 }
 
 // src/withIdRefPrefix.ts
-var import_isObject14 = __toESM(require("lodash/isObject"), 1);
+var import_isObject15 = __toESM(require("lodash/isObject"), 1);
 function withIdRefPrefixObject(node) {
   for (const key in node) {
     const realObj = node;
@@ -3848,7 +3885,7 @@ function withIdRefPrefix(schemaNode) {
   if (Array.isArray(schemaNode)) {
     return withIdRefPrefixArray([...schemaNode]);
   }
-  if ((0, import_isObject14.default)(schemaNode)) {
+  if ((0, import_isObject15.default)(schemaNode)) {
     return withIdRefPrefixObject({ ...schemaNode });
   }
   return schemaNode;