@rjsf/utils 6.5.2 → 6.5.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/index.cjs +10 -8
- package/dist/index.cjs.map +2 -2
- package/dist/utils.esm.js +10 -8
- package/dist/utils.esm.js.map +2 -2
- package/dist/utils.umd.js +10 -8
- package/lib/createSchemaUtils.js.map +1 -1
- package/lib/enums.d.ts +2 -0
- package/lib/enums.js +2 -0
- package/lib/enums.js.map +1 -1
- package/lib/jsonSchemaAugmentation.d.ts +19 -0
- package/lib/jsonSchemaAugmentation.js +2 -0
- package/lib/jsonSchemaAugmentation.js.map +1 -0
- package/lib/mergeDefaultsWithFormData.js +1 -1
- package/lib/mergeDefaultsWithFormData.js.map +1 -1
- package/lib/schema/findFieldInSchema.d.ts +2 -2
- package/lib/schema/findFieldInSchema.js +6 -5
- package/lib/schema/findFieldInSchema.js.map +1 -1
- package/lib/schema/getFromSchema.d.ts +3 -3
- package/lib/schema/getFromSchema.js +2 -2
- package/lib/schema/getFromSchema.js.map +1 -1
- package/lib/tsconfig.tsbuildinfo +1 -1
- package/lib/types.d.ts +13 -4
- package/lib/types.js +1 -1
- package/lib/types.js.map +1 -1
- package/package.json +2 -2
- package/src/createSchemaUtils.ts +5 -4
- package/src/enums.ts +2 -0
- package/src/jsonSchemaAugmentation.ts +21 -0
- package/src/mergeDefaultsWithFormData.ts +2 -1
- package/src/schema/findFieldInSchema.ts +8 -6
- package/src/schema/getFromSchema.ts +14 -7
- package/src/types.ts +14 -4
package/dist/utils.esm.js
CHANGED
|
@@ -1024,9 +1024,9 @@ function getFromSchemaInternal(validator, rootSchema, schema, path, experimental
|
|
|
1024
1024
|
if (isEmpty3(path)) {
|
|
1025
1025
|
return fieldSchema;
|
|
1026
1026
|
}
|
|
1027
|
-
const pathList = Array.isArray(path) ? path : path.split(".");
|
|
1027
|
+
const pathList = Array.isArray(path) ? [...path] : path.split(".");
|
|
1028
1028
|
const [part, ...nestedPath] = pathList;
|
|
1029
|
-
if (part && has2(fieldSchema, part)) {
|
|
1029
|
+
if (part !== void 0 && part !== "" && has2(fieldSchema, part)) {
|
|
1030
1030
|
fieldSchema = get7(fieldSchema, part);
|
|
1031
1031
|
return getFromSchemaInternal(
|
|
1032
1032
|
validator,
|
|
@@ -1052,6 +1052,7 @@ function findFieldInSchema(validator, rootSchema, schema, path, formData = {}, e
|
|
|
1052
1052
|
const pathList = Array.isArray(path) ? [...path] : path.split(".");
|
|
1053
1053
|
let parentField = schema;
|
|
1054
1054
|
const fieldName = pathList.pop();
|
|
1055
|
+
const fieldNameKey = String(fieldName);
|
|
1055
1056
|
if (pathList.length) {
|
|
1056
1057
|
pathList.forEach((subPath) => {
|
|
1057
1058
|
parentField = getFromSchema(
|
|
@@ -1067,7 +1068,7 @@ function findFieldInSchema(validator, rootSchema, schema, path, formData = {}, e
|
|
|
1067
1068
|
validator,
|
|
1068
1069
|
rootSchema,
|
|
1069
1070
|
parentField,
|
|
1070
|
-
|
|
1071
|
+
fieldNameKey,
|
|
1071
1072
|
ONE_OF_KEY,
|
|
1072
1073
|
get8(formData, subPath),
|
|
1073
1074
|
experimental_customMergeAllOf
|
|
@@ -1077,7 +1078,7 @@ function findFieldInSchema(validator, rootSchema, schema, path, formData = {}, e
|
|
|
1077
1078
|
validator,
|
|
1078
1079
|
rootSchema,
|
|
1079
1080
|
parentField,
|
|
1080
|
-
|
|
1081
|
+
fieldNameKey,
|
|
1081
1082
|
ANY_OF_KEY,
|
|
1082
1083
|
get8(formData, subPath),
|
|
1083
1084
|
experimental_customMergeAllOf
|
|
@@ -1090,7 +1091,7 @@ function findFieldInSchema(validator, rootSchema, schema, path, formData = {}, e
|
|
|
1090
1091
|
validator,
|
|
1091
1092
|
rootSchema,
|
|
1092
1093
|
parentField,
|
|
1093
|
-
|
|
1094
|
+
fieldNameKey,
|
|
1094
1095
|
ONE_OF_KEY,
|
|
1095
1096
|
formData,
|
|
1096
1097
|
experimental_customMergeAllOf
|
|
@@ -1100,7 +1101,7 @@ function findFieldInSchema(validator, rootSchema, schema, path, formData = {}, e
|
|
|
1100
1101
|
validator,
|
|
1101
1102
|
rootSchema,
|
|
1102
1103
|
parentField,
|
|
1103
|
-
|
|
1104
|
+
fieldNameKey,
|
|
1104
1105
|
ANY_OF_KEY,
|
|
1105
1106
|
formData,
|
|
1106
1107
|
experimental_customMergeAllOf
|
|
@@ -1127,7 +1128,7 @@ function findFieldInSchema(validator, rootSchema, schema, path, formData = {}, e
|
|
|
1127
1128
|
);
|
|
1128
1129
|
let isRequired;
|
|
1129
1130
|
if (field && Array.isArray(requiredArray)) {
|
|
1130
|
-
isRequired = requiredArray.includes(
|
|
1131
|
+
isRequired = requiredArray.includes(fieldNameKey);
|
|
1131
1132
|
}
|
|
1132
1133
|
return { field, isRequired };
|
|
1133
1134
|
}
|
|
@@ -1297,7 +1298,7 @@ function mergeDefaultsWithFormData(defaults, formData, mergeExtraArrayDefaults =
|
|
|
1297
1298
|
const keyExistsInDefaults = isObject(defaults) && key in defaults;
|
|
1298
1299
|
const keyExistsInFormData = key in formData;
|
|
1299
1300
|
const keyDefault = get10(defaults, key) ?? {};
|
|
1300
|
-
const defaultValueIsNestedObject = keyExistsInDefaults && Object.
|
|
1301
|
+
const defaultValueIsNestedObject = keyExistsInDefaults && isObject(keyDefault) && Object.values(keyDefault).some((v) => isObject(v));
|
|
1301
1302
|
const keyDefaultIsObject = keyExistsInDefaults && isObject(get10(defaults, key));
|
|
1302
1303
|
const keyHasFormDataObject = keyExistsInFormData && isObject(keyValue);
|
|
1303
1304
|
if (keyDefaultIsObject && keyHasFormDataObject && !defaultValueIsNestedObject) {
|
|
@@ -3879,6 +3880,7 @@ var TranslatableString = /* @__PURE__ */ ((TranslatableString2) => {
|
|
|
3879
3880
|
TranslatableString2["OptionPrefix"] = "Option %1";
|
|
3880
3881
|
TranslatableString2["TitleOptionPrefix"] = "%1 option %2";
|
|
3881
3882
|
TranslatableString2["KeyLabel"] = "%1 Key";
|
|
3883
|
+
TranslatableString2["DeprecatedLabel"] = "%1 (deprecated)";
|
|
3882
3884
|
TranslatableString2["InvalidObjectField"] = 'Invalid "%1" object field configuration: _%2_.';
|
|
3883
3885
|
TranslatableString2["UnsupportedField"] = "Unsupported field schema.";
|
|
3884
3886
|
TranslatableString2["UnsupportedFieldWithId"] = "Unsupported field schema for field `%1`.";
|