@rjsf/utils 6.0.0-beta.12 → 6.0.0-beta.13

package/dist/utils.esm.js

@@ -75,6 +75,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_2019_09 = "https://json-schema.org/draft/2019-09/schema";
 var JSON_SCHEMA_DRAFT_2020_12 = "https://json-schema.org/draft/2020-12/schema";
 
 // src/getUiOptions.ts
@@ -177,7 +178,16 @@ function findEmbeddedSchemaRecursive(schema, ref) {
     return schema;
   }
   for (const subSchema of Object.values(schema)) {
-    if (isObject2(subSchema)) {
+    if (Array.isArray(subSchema)) {
+      for (const item of subSchema) {
+        if (isObject2(item)) {
+          const result = findEmbeddedSchemaRecursive(item, ref);
+          if (result !== void 0) {
+            return result;
+          }
+        }
+      }
+    } else if (isObject2(subSchema)) {
       const result = findEmbeddedSchemaRecursive(subSchema, ref);
       if (result !== void 0) {
         return result;
@@ -186,6 +196,23 @@ function findEmbeddedSchemaRecursive(schema, ref) {
   }
   return void 0;
 }
+function makeAllReferencesAbsolute(schema, baseURI) {
+  const currentURI = get(schema, ID_KEY, baseURI);
+  if (REF_KEY in schema) {
+    schema = { ...schema, [REF_KEY]: UriResolver.resolve(currentURI, schema[REF_KEY]) };
+  }
+  for (const [key, subSchema] of Object.entries(schema)) {
+    if (Array.isArray(subSchema)) {
+      schema = {
+        ...schema,
+        [key]: subSchema.map((item) => isObject2(item) ? makeAllReferencesAbsolute(item, currentURI) : item)
+      };
+    } else if (isObject2(subSchema)) {
+      schema = { ...schema, [key]: makeAllReferencesAbsolute(subSchema, currentURI) };
+    }
+  }
+  return schema;
+}
 function splitKeyElementFromObject(key, object) {
   const value = object[key];
   const remaining = omit(object, [key]);
@@ -231,7 +258,11 @@ function findSchemaDefinitionRecursive($ref, rootSchema = {}, recurseList = [],
     const [remaining, theRef] = splitKeyElementFromObject(REF_KEY, current);
     const subSchema = findSchemaDefinitionRecursive(theRef, rootSchema, [...recurseList, ref], baseURI);
     if (Object.keys(remaining).length > 0) {
-      return { ...remaining, ...subSchema };
+      if (rootSchema[SCHEMA_KEY] === JSON_SCHEMA_DRAFT_2019_09 || rootSchema[SCHEMA_KEY] === JSON_SCHEMA_DRAFT_2020_12) {
+        return { [ALL_OF_KEY]: [remaining, subSchema] };
+      } else {
+        return { ...remaining, ...subSchema };
+      }
     }
     return subSchema;
   }
@@ -618,7 +649,7 @@ function stubExistingAdditionalProperties(validator, theSchema, rootSchema, aFor
       if (!isEmpty2(matchingProperties)) {
         schema.properties[key] = retrieveSchema(
           validator,
-          { allOf: Object.values(matchingProperties) },
+          { [ALL_OF_KEY]: Object.values(matchingProperties) },
           rootSchema,
           get5(formData, [key]),
           experimental_customMergeAllOf
@@ -633,7 +664,7 @@ function stubExistingAdditionalProperties(validator, theSchema, rootSchema, aFor
         if (REF_KEY in schema.additionalProperties) {
           additionalProperties = retrieveSchema(
             validator,
-            { $ref: get5(schema.additionalProperties, [REF_KEY]) },
+            { [REF_KEY]: get5(schema.additionalProperties, [REF_KEY]) },
             rootSchema,
             formData,
             experimental_customMergeAllOf
@@ -1240,7 +1271,7 @@ function mergeDefaultsWithFormData(defaults, formData, mergeExtraArrayDefaults =
         return acc2;
       }
       acc2[key] = mergeDefaultsWithFormData(
-        get10(defaults, key) ?? {},
+        get10(defaults, key),
         keyValue,
         mergeExtraArrayDefaults,
         defaultSupercedesUndefined,
@@ -1400,8 +1431,12 @@ function getInnerSchemaForArrayItem(schema, additionalItems = 0 /* Ignore */, id
 }
 function maybeAddDefaultToObject(obj, key, computedDefault, includeUndefinedValues, isParentRequired, requiredFields = [], experimental_defaultFormStateBehavior = {}, isConst = false) {
   const { emptyObjectFields = "populateAllDefaults" } = experimental_defaultFormStateBehavior;
-  if (includeUndefinedValues || isConst) {
+  if (includeUndefinedValues === true || isConst) {
     obj[key] = computedDefault;
+  } else if (includeUndefinedValues === "excludeObjectChildren") {
+    if (!isObject(computedDefault) || !isEmpty4(computedDefault)) {
+      obj[key] = computedDefault;
+    }
   } else if (emptyObjectFields !== "skipDefaults") {
     const isSelfOrParentRequired = isParentRequired === void 0 ? requiredFields.includes(key) : isParentRequired;
     if (isObject(computedDefault)) {
@@ -2160,6 +2195,7 @@ function toPathSchema(validator, schema, name = "", rootSchema, formData, experi
 }
 
 // src/createSchemaUtils.ts
+import get16 from "lodash/get";
 var SchemaUtils = class {
   /** Constructs the `SchemaUtils` instance with the given `validator` and `rootSchema` stored as instance variables
    *
@@ -2169,7 +2205,11 @@ var SchemaUtils = class {
    * @param [experimental_customMergeAllOf] - Optional function that allows for custom merging of `allOf` schemas
    */
   constructor(validator, rootSchema, experimental_defaultFormStateBehavior, experimental_customMergeAllOf) {
-    this.rootSchema = rootSchema;
+    if (rootSchema[SCHEMA_KEY] === JSON_SCHEMA_DRAFT_2020_12) {
+      this.rootSchema = makeAllReferencesAbsolute(rootSchema, get16(rootSchema, ID_KEY, "#"));
+    } else {
+      this.rootSchema = rootSchema;
+    }
     this.validator = validator;
     this.experimental_defaultFormStateBehavior = experimental_defaultFormStateBehavior;
     this.experimental_customMergeAllOf = experimental_customMergeAllOf;
@@ -2500,6 +2540,31 @@ function dateRangeOptions(start, stop) {
   return options;
 }
 
+// src/shallowEquals.ts
+function shallowEquals(a, b) {
+  if (Object.is(a, b)) {
+    return true;
+  }
+  if (a == null || b == null) {
+    return false;
+  }
+  if (typeof a !== "object" || typeof b !== "object") {
+    return false;
+  }
+  const keysA = Object.keys(a);
+  const keysB = Object.keys(b);
+  if (keysA.length !== keysB.length) {
+    return false;
+  }
+  for (let i = 0; i < keysA.length; i++) {
+    const key = keysA[i];
+    if (!Object.prototype.hasOwnProperty.call(b, key) || !Object.is(a[key], b[key])) {
+      return false;
+    }
+  }
+  return true;
+}
+
 // src/replaceStringParameters.ts
 function replaceStringParameters(inputString, params) {
   let output = inputString;
@@ -2572,7 +2637,7 @@ function enumOptionsSelectValue(valueIndex, selected, allEnumOptions = []) {
 
 // src/ErrorSchemaBuilder.ts
 import cloneDeep from "lodash/cloneDeep";
-import get16 from "lodash/get";
+import get17 from "lodash/get";
 import set3 from "lodash/set";
 import setWith from "lodash/setWith";
 var ErrorSchemaBuilder = class {
@@ -2601,7 +2666,7 @@ var ErrorSchemaBuilder = class {
    */
   getOrCreateErrorBlock(pathOfError) {
     const hasPath = Array.isArray(pathOfError) && pathOfError.length > 0 || typeof pathOfError === "string";
-    let errorBlock = hasPath ? get16(this.errorSchema, pathOfError) : this.errorSchema;
+    let errorBlock = hasPath ? get17(this.errorSchema, pathOfError) : this.errorSchema;
     if (!errorBlock && pathOfError) {
       errorBlock = {};
       setWith(this.errorSchema, pathOfError, errorBlock, Object);
@@ -2627,7 +2692,7 @@ var ErrorSchemaBuilder = class {
    */
   addErrors(errorOrList, pathOfError) {
     const errorBlock = this.getOrCreateErrorBlock(pathOfError);
-    let errorsList = get16(errorBlock, ERRORS_KEY);
+    let errorsList = get17(errorBlock, ERRORS_KEY);
     if (!Array.isArray(errorsList)) {
       errorsList = [];
       errorBlock[ERRORS_KEY] = errorsList;
@@ -2776,9 +2841,9 @@ function getTemplate(name, registry, uiOptions = {}) {
 
 // src/getTestIds.ts
 import { nanoid } from "nanoid";
-import get17 from "lodash/get";
+import get18 from "lodash/get";
 function getTestIds() {
-  if (typeof process === "undefined" || get17(process, "env.NODE_ENV") !== "test") {
+  if (typeof process === "undefined" || get18(process, "env.NODE_ENV") !== "test") {
     return {};
   }
   const ids = /* @__PURE__ */ new Map();
@@ -2798,7 +2863,7 @@ function getTestIds() {
 // src/getWidget.tsx
 import { createElement } from "react";
 import ReactIs from "react-is";
-import get18 from "lodash/get";
+import get19 from "lodash/get";
 import set4 from "lodash/set";
 import { jsx } from "react/jsx-runtime";
 var widgetMap = {
@@ -2854,7 +2919,7 @@ var widgetMap = {
   }
 };
 function mergeWidgetOptions(AWidget) {
-  let MergedWidget = get18(AWidget, "MergedWidget");
+  let MergedWidget = get19(AWidget, "MergedWidget");
   if (!MergedWidget) {
     const defaultOptions = AWidget.defaultProps && AWidget.defaultProps.options || {};
     MergedWidget = ({ options, ...props }) => {
@@ -2967,14 +3032,14 @@ function localToUTC(dateString) {
 }
 
 // src/lookupFromFormContext.ts
-import get19 from "lodash/get";
+import get20 from "lodash/get";
 import has6 from "lodash/has";
 function lookupFromFormContext(regOrFc, toLookup, fallback) {
   const lookupPath = [LOOKUP_MAP_NAME];
   if (has6(regOrFc, FORM_CONTEXT_NAME)) {
     lookupPath.unshift(FORM_CONTEXT_NAME);
   }
-  return get19(regOrFc, [...lookupPath, toLookup], fallback);
+  return get20(regOrFc, [...lookupPath, toLookup], fallback);
 }
 
 // src/orderProperties.ts
@@ -3055,7 +3120,14 @@ function schemaRequiresTrueValue(schema) {
 }
 
 // src/shouldRender.ts
-function shouldRender(component, nextProps, nextState) {
+function shouldRender(component, nextProps, nextState, updateStrategy = "customDeep") {
+  if (updateStrategy === "always") {
+    return true;
+  }
+  if (updateStrategy === "shallow") {
+    const { props: props2, state: state2 } = component;
+    return !shallowEquals(props2, nextProps) || !shallowEquals(state2, nextState);
+  }
   const { props, state } = component;
   return !deepEquals(props, nextProps) || !deepEquals(state, nextState);
 }
@@ -3202,7 +3274,7 @@ function withIdRefPrefix(schemaNode) {
 import keys from "lodash/keys";
 import pickBy from "lodash/pickBy";
 import isPlainObject4 from "lodash/isPlainObject";
-import get20 from "lodash/get";
+import get21 from "lodash/get";
 import difference from "lodash/difference";
 function getChangedFields(a, b) {
   const aIsPlainObject = isPlainObject4(a);
@@ -3215,7 +3287,7 @@ function getChangedFields(a, b) {
   } else if (!aIsPlainObject && bIsPlainObject) {
     return keys(b);
   } else {
-    const unequalFields = keys(pickBy(a, (value, key) => !deepEquals(value, get20(b, key))));
+    const unequalFields = keys(pickBy(a, (value, key) => !deepEquals(value, get21(b, key))));
     const diffFields = difference(keys(b), keys(a));
     return [...unequalFields, ...diffFields];
   }
@@ -3260,7 +3332,7 @@ var TranslatableString = /* @__PURE__ */ ((TranslatableString2) => {
 import forEach from "lodash/forEach";
 
 // src/parser/ParserValidator.ts
-import get21 from "lodash/get";
+import get22 from "lodash/get";
 var ParserValidator = class {
   /** Construct the ParserValidator for the given `rootSchema`. This `rootSchema` will be stashed in the `schemaMap`
    * first.
@@ -3286,7 +3358,7 @@ var ParserValidator = class {
    * @param hash - The hash value at which to map the schema
    */
   addSchema(schema, hash) {
-    const key = get21(schema, ID_KEY, hash);
+    const key = get22(schema, ID_KEY, hash);
     const identifiedSchema = { ...schema, [ID_KEY]: key };
     const existing = this.schemaMap[key];
     if (!existing) {
@@ -3393,6 +3465,7 @@ export {
   ID_KEY,
   IF_KEY,
   ITEMS_KEY,
+  JSON_SCHEMA_DRAFT_2019_09,
   JSON_SCHEMA_DRAFT_2020_12,
   JUNK_OPTION_ID,
   LOOKUP_MAP_NAME,
@@ -3480,6 +3553,7 @@ export {
   sanitizeDataForNewSchema,
   schemaParser,
   schemaRequiresTrueValue,
+  shallowEquals,
   shouldRender,
   sortedJSONStringify,
   titleId,