@rjsf/utils 6.0.0-beta.19 → 6.0.0-beta.20

package/dist/utils.esm.js

@@ -66,6 +66,8 @@ var REQUIRED_KEY = "required";
 var SUBMIT_BTN_OPTIONS_KEY = "submitButtonOptions";
 var REF_KEY = "$ref";
 var SCHEMA_KEY = "$schema";
+var DEFAULT_ID_PREFIX = "root";
+var DEFAULT_ID_SEPARATOR = "_";
 var DISCRIMINATOR_PATH = ["discriminator", "propertyName"];
 var FORM_CONTEXT_NAME = "formContext";
 var LOOKUP_MAP_NAME = "layoutGridLookupMap";
@@ -2022,80 +2024,8 @@ function sanitizeDataForNewSchema(validator, rootSchema, newSchema, oldSchema, d
   return newFormData;
 }
 
-// src/schema/toIdSchema.ts
-import get14 from "lodash/get";
-function toIdSchemaInternal(validator, schema, idPrefix, idSeparator, id, rootSchema, formData, _recurseList = [], experimental_customMergeAllOf) {
-  const $id = id || idPrefix;
-  const idSchema = { $id };
-  if (typeof schema === "object") {
-    if (REF_KEY in schema || DEPENDENCIES_KEY in schema || ALL_OF_KEY in schema) {
-      const _schema = retrieveSchema(validator, schema, rootSchema, formData, experimental_customMergeAllOf);
-      const sameSchemaIndex = _recurseList.findIndex((item) => deepEquals(item, _schema));
-      if (sameSchemaIndex === -1) {
-        return toIdSchemaInternal(
-          validator,
-          _schema,
-          idPrefix,
-          idSeparator,
-          id,
-          rootSchema,
-          formData,
-          _recurseList.concat(_schema),
-          experimental_customMergeAllOf
-        );
-      }
-    }
-    if (ITEMS_KEY in schema && !get14(schema, [ITEMS_KEY, REF_KEY])) {
-      return toIdSchemaInternal(
-        validator,
-        get14(schema, ITEMS_KEY),
-        idPrefix,
-        idSeparator,
-        id,
-        rootSchema,
-        formData,
-        _recurseList,
-        experimental_customMergeAllOf
-      );
-    }
-    if (getSchemaType(schema) === "object" && PROPERTIES_KEY in schema) {
-      for (const name in schema.properties) {
-        const field = schema[PROPERTIES_KEY][name];
-        const fieldId = idSchema[ID_KEY] + idSeparator + name;
-        idSchema[name] = toIdSchemaInternal(
-          validator,
-          field,
-          idPrefix,
-          idSeparator,
-          fieldId,
-          rootSchema,
-          // It's possible that formData is not an object -- this can happen if an
-          // array item has just been added, but not populated with data yet
-          get14(formData, [name]),
-          _recurseList,
-          experimental_customMergeAllOf
-        );
-      }
-    }
-  }
-  return idSchema;
-}
-function toIdSchema(validator, schema, id, rootSchema, formData, idPrefix = "root", idSeparator = "_", experimental_customMergeAllOf) {
-  return toIdSchemaInternal(
-    validator,
-    schema,
-    idPrefix,
-    idSeparator,
-    id,
-    rootSchema,
-    formData,
-    void 0,
-    experimental_customMergeAllOf
-  );
-}
-
 // src/schema/toPathSchema.ts
-import get15 from "lodash/get";
+import get14 from "lodash/get";
 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) {
@@ -2188,7 +2118,7 @@ function toPathSchemaInternal(validator, schema, name, rootSchema, formData, _re
     }
   } else if (PROPERTIES_KEY in schema) {
     for (const property in schema.properties) {
-      const field = get15(schema, [PROPERTIES_KEY, property], {});
+      const field = get14(schema, [PROPERTIES_KEY, property], {});
       pathSchema[property] = toPathSchemaInternal(
         validator,
         field,
@@ -2196,7 +2126,7 @@ function toPathSchemaInternal(validator, schema, name, rootSchema, formData, _re
         rootSchema,
         // It's possible that formData is not an object -- this can happen if an
         // array item has just been added, but not populated with data yet
-        get15(formData, [property]),
+        get14(formData, [property]),
         _recurseList,
         experimental_customMergeAllOf
       );
@@ -2209,7 +2139,7 @@ function toPathSchema(validator, schema, name = "", rootSchema, formData, experi
 }
 
 // src/createSchemaUtils.ts
-import get16 from "lodash/get";
+import get15 from "lodash/get";
 var SchemaUtils = class {
   /** Constructs the `SchemaUtils` instance with the given `validator` and `rootSchema` stored as instance variables
    *
@@ -2220,7 +2150,7 @@ var SchemaUtils = class {
    */
   constructor(validator, rootSchema, experimental_defaultFormStateBehavior, experimental_customMergeAllOf) {
     if (rootSchema && rootSchema[SCHEMA_KEY] === JSON_SCHEMA_DRAFT_2020_12) {
-      this.rootSchema = makeAllReferencesAbsolute(rootSchema, get16(rootSchema, ID_KEY, "#"));
+      this.rootSchema = makeAllReferencesAbsolute(rootSchema, get15(rootSchema, ID_KEY, "#"));
     } else {
       this.rootSchema = rootSchema;
     }
@@ -2448,27 +2378,6 @@ var SchemaUtils = class {
       this.experimental_customMergeAllOf
     );
   }
-  /** Generates an `IdSchema` object for the `schema`, recursively
-   *
-   * @param schema - The schema for which the display label flag is desired
-   * @param [id] - The base id for the schema
-   * @param [formData] - The current formData, if any, onto which to provide any missing defaults
-   * @param [idPrefix='root'] - The prefix to use for the id
-   * @param [idSeparator='_'] - The separator to use for the path segments in the id
-   * @returns - The `IdSchema` object for the `schema`
-   */
-  toIdSchema(schema, id, formData, idPrefix = "root", idSeparator = "_") {
-    return toIdSchema(
-      this.validator,
-      schema,
-      id,
-      this.rootSchema,
-      formData,
-      idPrefix,
-      idSeparator,
-      this.experimental_customMergeAllOf
-    );
-  }
   /** Generates an `PathSchema` object for the `schema`, recursively
    *
    * @param schema - The schema for which the display label flag is desired
@@ -2651,7 +2560,7 @@ function enumOptionsSelectValue(valueIndex, selected, allEnumOptions = []) {
 
 // src/ErrorSchemaBuilder.ts
 import cloneDeep from "lodash/cloneDeep";
-import get17 from "lodash/get";
+import get16 from "lodash/get";
 import set3 from "lodash/set";
 import setWith from "lodash/setWith";
 var ErrorSchemaBuilder = class {
@@ -2680,7 +2589,7 @@ var ErrorSchemaBuilder = class {
    */
   getOrCreateErrorBlock(pathOfError) {
     const hasPath = Array.isArray(pathOfError) && pathOfError.length > 0 || typeof pathOfError === "string";
-    let errorBlock = hasPath ? get17(this.errorSchema, pathOfError) : this.errorSchema;
+    let errorBlock = hasPath ? get16(this.errorSchema, pathOfError) : this.errorSchema;
     if (!errorBlock && pathOfError) {
       errorBlock = {};
       setWith(this.errorSchema, pathOfError, errorBlock, Object);
@@ -2706,7 +2615,7 @@ var ErrorSchemaBuilder = class {
    */
   addErrors(errorOrList, pathOfError) {
     const errorBlock = this.getOrCreateErrorBlock(pathOfError);
-    let errorsList = get17(errorBlock, ERRORS_KEY);
+    let errorsList = get16(errorBlock, ERRORS_KEY);
     if (!Array.isArray(errorsList)) {
       errorsList = [];
       errorBlock[ERRORS_KEY] = errorsList;
@@ -2854,10 +2763,10 @@ function getTemplate(name, registry, uiOptions = {}) {
 }
 
 // src/getTestIds.ts
-import get18 from "lodash/get";
+import get17 from "lodash/get";
 import uniqueId from "lodash/uniqueId";
 function getTestIds() {
-  if (typeof process === "undefined" || get18(process, "env.NODE_ENV") !== "test") {
+  if (typeof process === "undefined" || get17(process, "env.NODE_ENV") !== "test") {
     return {};
   }
   const ids = /* @__PURE__ */ new Map();
@@ -2877,7 +2786,7 @@ function getTestIds() {
 // src/getWidget.tsx
 import { createElement } from "react";
 import ReactIs from "react-is";
-import get19 from "lodash/get";
+import get18 from "lodash/get";
 import set4 from "lodash/set";
 import { jsx } from "react/jsx-runtime";
 var widgetMap = {
@@ -2933,7 +2842,7 @@ var widgetMap = {
   }
 };
 function mergeWidgetOptions(AWidget) {
-  let MergedWidget = get19(AWidget, "MergedWidget");
+  let MergedWidget = get18(AWidget, "MergedWidget");
   if (!MergedWidget) {
     const defaultOptions = AWidget.defaultProps && AWidget.defaultProps.options || {};
     MergedWidget = ({ options, ...props }) => {
@@ -3046,14 +2955,14 @@ function localToUTC(dateString) {
 }
 
 // src/lookupFromFormContext.ts
-import get20 from "lodash/get";
+import get19 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 get20(regOrFc, [...lookupPath, toLookup], fallback);
+  return get19(regOrFc, [...lookupPath, toLookup], fallback);
 }
 
 // src/orderProperties.ts
@@ -3203,6 +3112,15 @@ function toErrorSchema(errors) {
   return builder.ErrorSchema;
 }
 
+// src/toFieldPathId.ts
+function toFieldPathId(fieldPath, globalFormOptions, parentPath) {
+  const basePath = Array.isArray(parentPath) ? parentPath : parentPath?.path;
+  const childPath = fieldPath === "" ? [] : [fieldPath];
+  const path = basePath ? basePath.concat(...childPath) : childPath;
+  const id = [globalFormOptions.idPrefix, ...path].join(globalFormOptions.idSeparator);
+  return { path, [ID_KEY]: id };
+}
+
 // src/unwrapErrorHandler.ts
 import isPlainObject3 from "lodash/isPlainObject";
 function unwrapErrorHandler(errorHandler) {
@@ -3288,7 +3206,7 @@ function withIdRefPrefix(schemaNode) {
 import keys from "lodash/keys";
 import pickBy from "lodash/pickBy";
 import isPlainObject4 from "lodash/isPlainObject";
-import get21 from "lodash/get";
+import get20 from "lodash/get";
 import difference from "lodash/difference";
 function getChangedFields(a, b) {
   const aIsPlainObject = isPlainObject4(a);
@@ -3301,7 +3219,7 @@ function getChangedFields(a, b) {
   } else if (!aIsPlainObject && bIsPlainObject) {
     return keys(b);
   } else {
-    const unequalFields = keys(pickBy(a, (value, key) => !deepEquals(value, get21(b, key))));
+    const unequalFields = keys(pickBy(a, (value, key) => !deepEquals(value, get20(b, key))));
     const diffFields = difference(keys(b), keys(a));
     return [...unequalFields, ...diffFields];
   }
@@ -3346,7 +3264,7 @@ var TranslatableString = /* @__PURE__ */ ((TranslatableString2) => {
 import forEach from "lodash/forEach";
 
 // src/parser/ParserValidator.ts
-import get22 from "lodash/get";
+import get21 from "lodash/get";
 var ParserValidator = class {
   /** Construct the ParserValidator for the given `rootSchema`. This `rootSchema` will be stashed in the `schemaMap`
    * first.
@@ -3372,7 +3290,7 @@ var ParserValidator = class {
    * @param hash - The hash value at which to map the schema
    */
   addSchema(schema, hash) {
-    const key = get22(schema, ID_KEY, hash);
+    const key = get21(schema, ID_KEY, hash);
     const identifiedSchema = { ...schema, [ID_KEY]: key };
     const existing = this.schemaMap[key];
     if (!existing) {
@@ -3468,6 +3386,8 @@ export {
   ALL_OF_KEY,
   ANY_OF_KEY,
   CONST_KEY,
+  DEFAULT_ID_PREFIX,
+  DEFAULT_ID_SEPARATOR,
   DEFAULT_KEY,
   DEFINITIONS_KEY,
   DEPENDENCIES_KEY,
@@ -3575,7 +3495,7 @@ export {
   toDateString,
   toErrorList,
   toErrorSchema,
-  toIdSchema,
+  toFieldPathId,
   toPathSchema,
   unwrapErrorHandler,
   utcToLocal,