@rjsf/utils 6.0.0-beta.1 → 6.0.0-beta.2

package/dist/index.js

@@ -46,6 +46,7 @@ __export(index_exports, {
   ID_KEY: () => ID_KEY,
   IF_KEY: () => IF_KEY,
   ITEMS_KEY: () => ITEMS_KEY,
+  JSON_SCHEMA_DRAFT_2020_12: () => JSON_SCHEMA_DRAFT_2020_12,
   JUNK_OPTION_ID: () => JUNK_OPTION_ID,
   LOOKUP_MAP_NAME: () => LOOKUP_MAP_NAME,
   NAME_KEY: () => NAME_KEY,
@@ -57,6 +58,7 @@ __export(index_exports, {
   REQUIRED_KEY: () => REQUIRED_KEY,
   RJSF_ADDITIONAL_PROPERTIES_FLAG: () => RJSF_ADDITIONAL_PROPERTIES_FLAG,
   ROOT_SCHEMA_PREFIX: () => ROOT_SCHEMA_PREFIX,
+  SCHEMA_KEY: () => SCHEMA_KEY,
   SUBMIT_BTN_OPTIONS_KEY: () => SUBMIT_BTN_OPTIONS_KEY,
   TranslatableString: () => TranslatableString,
   UI_FIELD_KEY: () => UI_FIELD_KEY,
@@ -214,6 +216,7 @@ var READONLY_KEY = "readonly";
 var REQUIRED_KEY = "required";
 var SUBMIT_BTN_OPTIONS_KEY = "submitButtonOptions";
 var REF_KEY = "$ref";
+var SCHEMA_KEY = "$schema";
 var DISCRIMINATOR_PATH = ["discriminator", "propertyName"];
 var FORM_CONTEXT_NAME = "formContext";
 var LOOKUP_MAP_NAME = "layoutGridLookupMap";
@@ -223,6 +226,7 @@ var UI_FIELD_KEY = "ui:field";
 var UI_WIDGET_KEY = "ui:widget";
 var UI_OPTIONS_KEY = "ui:options";
 var UI_GLOBAL_OPTIONS_KEY = "ui:globalOptions";
+var JSON_SCHEMA_DRAFT_2020_12 = "https://json-schema.org/draft/2020-12/schema";
 
 // src/getUiOptions.ts
 function getUiOptions(uiSchema = {}, globalOptions = {}) {
@@ -315,20 +319,52 @@ var import_json_schema_merge_allof = __toESM(require("json-schema-merge-allof"),
 // src/findSchemaDefinition.ts
 var import_jsonpointer = __toESM(require("jsonpointer"), 1);
 var import_omit = __toESM(require("lodash/omit"), 1);
+var import_isObject3 = __toESM(require("lodash/isObject"), 1);
+var import_isEmpty = __toESM(require("lodash/isEmpty"), 1);
+var import_fast_uri = __toESM(require("fast-uri"), 1);
+function findEmbeddedSchemaRecursive(schema, ref) {
+  if (ID_KEY in schema && import_fast_uri.default.equal(schema[ID_KEY], ref)) {
+    return schema;
+  }
+  for (const subSchema of Object.values(schema)) {
+    if ((0, import_isObject3.default)(subSchema)) {
+      const result = findEmbeddedSchemaRecursive(subSchema, ref);
+      if (result !== void 0) {
+        return result;
+      }
+    }
+  }
+  return void 0;
+}
 function splitKeyElementFromObject(key, object) {
   const value = object[key];
   const remaining = (0, import_omit.default)(object, [key]);
   return [remaining, value];
 }
-function findSchemaDefinitionRecursive($ref, rootSchema = {}, recurseList = []) {
+function findSchemaDefinitionRecursive($ref, rootSchema = {}, recurseList = [], baseURI = ID_KEY in rootSchema ? rootSchema[ID_KEY] : void 0) {
   const ref = $ref || "";
-  let decodedRef;
+  let current = void 0;
   if (ref.startsWith("#")) {
-    decodedRef = decodeURIComponent(ref.substring(1));
-  } else {
-    throw new Error(`Could not find a definition for ${$ref}.`);
+    const decodedRef = decodeURIComponent(ref.substring(1));
+    if (baseURI === void 0 || ID_KEY in rootSchema && rootSchema[ID_KEY] === baseURI) {
+      current = import_jsonpointer.default.get(rootSchema, decodedRef);
+    } else if (rootSchema[SCHEMA_KEY] === JSON_SCHEMA_DRAFT_2020_12) {
+      current = findEmbeddedSchemaRecursive(rootSchema, baseURI.replace(/\/$/, ""));
+      if (current !== void 0) {
+        current = import_jsonpointer.default.get(current, decodedRef);
+      }
+    }
+  } else if (rootSchema[SCHEMA_KEY] === JSON_SCHEMA_DRAFT_2020_12) {
+    const resolvedRef = baseURI ? import_fast_uri.default.resolve(baseURI, ref) : ref;
+    const [refId, ...refAnchor] = resolvedRef.replace(/#\/?$/, "").split("#");
+    current = findEmbeddedSchemaRecursive(rootSchema, refId.replace(/\/$/, ""));
+    if (current !== void 0) {
+      baseURI = current[ID_KEY];
+      if (!(0, import_isEmpty.default)(refAnchor)) {
+        current = import_jsonpointer.default.get(current, decodeURIComponent(refAnchor.join("#")));
+      }
+    }
   }
-  const current = import_jsonpointer.default.get(rootSchema, decodedRef);
   if (current === void 0) {
     throw new Error(`Could not find a definition for ${$ref}.`);
   }
@@ -343,7 +379,7 @@ function findSchemaDefinitionRecursive($ref, rootSchema = {}, recurseList = [])
       throw new Error(`Definition for ${firstRef} contains a circular reference through ${circularPath}`);
     }
     const [remaining, theRef] = splitKeyElementFromObject(REF_KEY, current);
-    const subSchema = findSchemaDefinitionRecursive(theRef, rootSchema, [...recurseList, ref]);
+    const subSchema = findSchemaDefinitionRecursive(theRef, rootSchema, [...recurseList, ref], baseURI);
     if (Object.keys(remaining).length > 0) {
       return { ...remaining, ...subSchema };
     }
@@ -351,9 +387,9 @@ function findSchemaDefinitionRecursive($ref, rootSchema = {}, recurseList = [])
   }
   return current;
 }
-function findSchemaDefinition($ref, rootSchema = {}) {
+function findSchemaDefinition($ref, rootSchema = {}, baseURI = ID_KEY in rootSchema ? rootSchema[ID_KEY] : void 0) {
   const recurseList = [];
-  return findSchemaDefinitionRecursive($ref, rootSchema, recurseList);
+  return findSchemaDefinitionRecursive($ref, rootSchema, recurseList, baseURI);
 }
 
 // src/getDiscriminatorFieldFromSchema.ts
@@ -512,7 +548,7 @@ function getFirstMatchingOption(validator, formData, options, rootSchema, discri
 }
 
 // src/schema/retrieveSchema.ts
-var import_isEmpty = __toESM(require("lodash/isEmpty"), 1);
+var import_isEmpty2 = __toESM(require("lodash/isEmpty"), 1);
 function retrieveSchema(validator, schema, rootSchema = {}, rawFormData, experimental_customMergeAllOf) {
   return retrieveSchemaInternal(
     validator,
@@ -678,7 +714,7 @@ function resolveReference(validator, schema, rootSchema, expandAllBranches, recu
   }
   return [schema];
 }
-function resolveAllReferences(schema, rootSchema, recurseList) {
+function resolveAllReferences(schema, rootSchema, recurseList, baseURI) {
   if (!isObject(schema)) {
     return schema;
   }
@@ -689,8 +725,11 @@ function resolveAllReferences(schema, rootSchema, recurseList) {
       return resolvedSchema;
     }
     recurseList.push($ref);
-    const refSchema = findSchemaDefinition($ref, rootSchema);
+    const refSchema = findSchemaDefinition($ref, rootSchema, baseURI);
     resolvedSchema = { ...refSchema, ...localSchema };
+    if (ID_KEY in resolvedSchema) {
+      baseURI = resolvedSchema[ID_KEY];
+    }
   }
   if (PROPERTIES_KEY in resolvedSchema) {
     const childrenLists = [];
@@ -698,7 +737,7 @@ function resolveAllReferences(schema, rootSchema, recurseList) {
       resolvedSchema[PROPERTIES_KEY],
       (result, value, key) => {
         const childList = [...recurseList];
-        result[key] = resolveAllReferences(value, rootSchema, childList);
+        result[key] = resolveAllReferences(value, rootSchema, childList, baseURI);
         childrenLists.push(childList);
       },
       {}
@@ -709,7 +748,7 @@ function resolveAllReferences(schema, rootSchema, recurseList) {
   if (ITEMS_KEY in resolvedSchema && !Array.isArray(resolvedSchema.items) && typeof resolvedSchema.items !== "boolean") {
     resolvedSchema = {
       ...resolvedSchema,
-      items: resolveAllReferences(resolvedSchema.items, rootSchema, recurseList)
+      items: resolveAllReferences(resolvedSchema.items, rootSchema, recurseList, baseURI)
     };
   }
   return deepEquals(schema, resolvedSchema) ? schema : resolvedSchema;
@@ -726,7 +765,7 @@ function stubExistingAdditionalProperties(validator, theSchema, rootSchema, aFor
     }
     if (PATTERN_PROPERTIES_KEY in schema) {
       const matchingProperties = getMatchingPatternProperties(schema, key);
-      if (!(0, import_isEmpty.default)(matchingProperties)) {
+      if (!(0, import_isEmpty2.default)(matchingProperties)) {
         schema.properties[key] = retrieveSchema(
           validator,
           { allOf: Object.values(matchingProperties) },
@@ -816,7 +855,10 @@ function retrieveSchemaInternal(validator, schema, rootSchema, rawFormData, expa
           resolvedSchema = { ...resolvedSchema, allOf: withoutContainsSchemas };
         }
         resolvedSchema = experimental_customMergeAllOf ? experimental_customMergeAllOf(resolvedSchema) : (0, import_json_schema_merge_allof.default)(resolvedSchema, {
-          deep: false
+          deep: false,
+          resolvers: {
+            $defs: import_json_schema_merge_allof.default.options.resolvers.definitions
+          }
         });
         if (withContainsSchemas.length) {
           resolvedSchema.allOf = withContainsSchemas;
@@ -831,7 +873,7 @@ function retrieveSchemaInternal(validator, schema, rootSchema, rawFormData, expa
       resolvedSchema = Object.keys(resolvedSchema.properties).reduce(
         (schema2, key) => {
           const matchingProperties = getMatchingPatternProperties(schema2, key);
-          if (!(0, import_isEmpty.default)(matchingProperties)) {
+          if (!(0, import_isEmpty2.default)(matchingProperties)) {
             schema2.properties[key] = retrieveSchema(
               validator,
               { allOf: [schema2.properties[key], ...Object.values(matchingProperties)] },
@@ -1055,13 +1097,13 @@ function findSelectedOptionInXxxOf(validator, rootSchema, schema, fallbackField,
 // src/schema/getFromSchema.ts
 var import_get6 = __toESM(require("lodash/get"), 1);
 var import_has2 = __toESM(require("lodash/has"), 1);
-var import_isEmpty2 = __toESM(require("lodash/isEmpty"), 1);
+var import_isEmpty3 = __toESM(require("lodash/isEmpty"), 1);
 function getFromSchemaInternal(validator, rootSchema, schema, path, experimental_customMergeAllOf) {
   let fieldSchema = schema;
   if ((0, import_has2.default)(schema, REF_KEY)) {
     fieldSchema = retrieveSchema(validator, schema, rootSchema, void 0, experimental_customMergeAllOf);
   }
-  if ((0, import_isEmpty2.default)(path)) {
+  if ((0, import_isEmpty3.default)(path)) {
     return fieldSchema;
   }
   const pathList = Array.isArray(path) ? path : path.split(".");
@@ -1174,13 +1216,13 @@ function findFieldInSchema(validator, rootSchema, schema, path, formData = {}, e
 
 // src/schema/getDefaultFormState.ts
 var import_get11 = __toESM(require("lodash/get"), 1);
-var import_isEmpty3 = __toESM(require("lodash/isEmpty"), 1);
+var import_isEmpty4 = __toESM(require("lodash/isEmpty"), 1);
 
 // src/schema/getClosestMatchingOption.ts
 var import_get8 = __toESM(require("lodash/get"), 1);
 var import_has4 = __toESM(require("lodash/has"), 1);
 var import_isNumber2 = __toESM(require("lodash/isNumber"), 1);
-var import_isObject5 = __toESM(require("lodash/isObject"), 1);
+var import_isObject6 = __toESM(require("lodash/isObject"), 1);
 var import_isString2 = __toESM(require("lodash/isString"), 1);
 var import_reduce = __toESM(require("lodash/reduce"), 1);
 var import_times2 = __toESM(require("lodash/times"), 1);
@@ -1196,7 +1238,7 @@ var JUNK_OPTION = {
 function calculateIndexScore(validator, rootSchema, schema, formData, experimental_customMergeAllOf) {
   let totalScore = 0;
   if (schema) {
-    if ((0, import_isObject5.default)(schema.properties)) {
+    if ((0, import_isObject6.default)(schema.properties)) {
       totalScore += (0, import_reduce.default)(
         schema.properties,
         (score, value, key) => {
@@ -1234,7 +1276,7 @@ function calculateIndexScore(validator, rootSchema, schema, formData, experiment
             );
           }
           if (value.type === "object") {
-            if ((0, import_isObject5.default)(formValue)) {
+            if ((0, import_isObject6.default)(formValue)) {
               score += 1;
             }
             return score + calculateIndexScore(validator, rootSchema, value, formValue, experimental_customMergeAllOf);
@@ -1503,10 +1545,10 @@ function maybeAddDefaultToObject(obj, key, computedDefault, includeUndefinedValu
     const isSelfOrParentRequired = isParentRequired === void 0 ? requiredFields.includes(key) : isParentRequired;
     if (isObject(computedDefault)) {
       if (emptyObjectFields === "skipEmptyDefaults") {
-        if (!(0, import_isEmpty3.default)(computedDefault)) {
+        if (!(0, import_isEmpty4.default)(computedDefault)) {
           obj[key] = computedDefault;
         }
-      } else if ((!(0, import_isEmpty3.default)(computedDefault) || requiredFields.includes(key)) && (isSelfOrParentRequired || emptyObjectFields !== "populateRequiredDefaults")) {
+      } else if ((!(0, import_isEmpty4.default)(computedDefault) || requiredFields.includes(key)) && (isSelfOrParentRequired || emptyObjectFields !== "populateRequiredDefaults")) {
         obj[key] = computedDefault;
       }
     } else if (
@@ -1542,7 +1584,7 @@ function computeDefaults(validator, rawSchema, computeDefaultsProps = {}) {
     defaults = schema[CONST_KEY];
   } else if (isObject(defaults) && isObject(schema.default)) {
     defaults = mergeObjects(defaults, schema.default);
-  } else if (DEFAULT_KEY in schema && !schema[ANY_OF_KEY] && !schema[ONE_OF_KEY]) {
+  } else if (DEFAULT_KEY in schema && !schema[ANY_OF_KEY] && !schema[ONE_OF_KEY] && !schema[REF_KEY]) {
     defaults = schema.default;
   } else if (REF_KEY in schema) {
     const refName = schema[REF_KEY];
@@ -1550,6 +1592,9 @@ function computeDefaults(validator, rawSchema, computeDefaultsProps = {}) {
       updatedRecurseList = _recurseList.concat(refName);
       schemaToCompute = findSchemaDefinition(refName, rootSchema);
     }
+    if (schemaToCompute && !defaults) {
+      defaults = schema.default;
+    }
   } else if (DEPENDENCIES_KEY in schema) {
     const defaultFormData = {
       ...getDefaultBasedOnSchemaType(validator, schema, computeDefaultsProps, defaults),
@@ -3231,7 +3276,7 @@ function utcToLocal(jsonDate) {
 }
 
 // src/validationDataMerge.ts
-var import_isEmpty4 = __toESM(require("lodash/isEmpty"), 1);
+var import_isEmpty5 = __toESM(require("lodash/isEmpty"), 1);
 function validationDataMerge(validationData, additionalErrorSchema) {
   if (!additionalErrorSchema) {
     return validationData;
@@ -3239,7 +3284,7 @@ function validationDataMerge(validationData, additionalErrorSchema) {
   const { errors: oldErrors, errorSchema: oldErrorSchema } = validationData;
   let errors = toErrorList(additionalErrorSchema);
   let errorSchema = additionalErrorSchema;
-  if (!(0, import_isEmpty4.default)(oldErrorSchema)) {
+  if (!(0, import_isEmpty5.default)(oldErrorSchema)) {
     errorSchema = mergeObjects(oldErrorSchema, additionalErrorSchema, true);
     errors = [...oldErrors].concat(errors);
   }
@@ -3247,7 +3292,7 @@ function validationDataMerge(validationData, additionalErrorSchema) {
 }
 
 // src/withIdRefPrefix.ts
-var import_isObject10 = __toESM(require("lodash/isObject"), 1);
+var import_isObject11 = __toESM(require("lodash/isObject"), 1);
 function withIdRefPrefixObject(node) {
   for (const key in node) {
     const realObj = node;
@@ -3270,7 +3315,7 @@ function withIdRefPrefix(schemaNode) {
   if (Array.isArray(schemaNode)) {
     return withIdRefPrefixArray([...schemaNode]);
   }
-  if ((0, import_isObject10.default)(schemaNode)) {
+  if ((0, import_isObject11.default)(schemaNode)) {
     return withIdRefPrefixObject({ ...schemaNode });
   }
   return schemaNode;