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

package/dist/index.cjs

@@ -35,6 +35,8 @@ __export(index_exports, {
   ALL_OF_KEY: () => ALL_OF_KEY,
   ANY_OF_KEY: () => ANY_OF_KEY,
   CONST_KEY: () => CONST_KEY,
+  DEFAULT_ID_PREFIX: () => DEFAULT_ID_PREFIX,
+  DEFAULT_ID_SEPARATOR: () => DEFAULT_ID_SEPARATOR,
   DEFAULT_KEY: () => DEFAULT_KEY,
   DEFINITIONS_KEY: () => DEFINITIONS_KEY,
   DEPENDENCIES_KEY: () => DEPENDENCIES_KEY,
@@ -142,7 +144,7 @@ __export(index_exports, {
   toDateString: () => toDateString,
   toErrorList: () => toErrorList,
   toErrorSchema: () => toErrorSchema,
-  toIdSchema: () => toIdSchema,
+  toFieldPathId: () => toFieldPathId,
   toPathSchema: () => toPathSchema,
   unwrapErrorHandler: () => unwrapErrorHandler,
   utcToLocal: () => utcToLocal,
@@ -219,6 +221,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";
@@ -2175,80 +2179,8 @@ function sanitizeDataForNewSchema(validator, rootSchema, newSchema, oldSchema, d
   return newFormData;
 }
 
-// src/schema/toIdSchema.ts
-var import_get14 = __toESM(require("lodash/get"), 1);
-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 && !(0, import_get14.default)(schema, [ITEMS_KEY, REF_KEY])) {
-      return toIdSchemaInternal(
-        validator,
-        (0, import_get14.default)(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
-          (0, import_get14.default)(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
-var import_get15 = __toESM(require("lodash/get"), 1);
+var import_get14 = __toESM(require("lodash/get"), 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) {
@@ -2341,7 +2273,7 @@ function toPathSchemaInternal(validator, schema, name, rootSchema, formData, _re
     }
   } else if (PROPERTIES_KEY in schema) {
     for (const property in schema.properties) {
-      const field = (0, import_get15.default)(schema, [PROPERTIES_KEY, property], {});
+      const field = (0, import_get14.default)(schema, [PROPERTIES_KEY, property], {});
       pathSchema[property] = toPathSchemaInternal(
         validator,
         field,
@@ -2349,7 +2281,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
-        (0, import_get15.default)(formData, [property]),
+        (0, import_get14.default)(formData, [property]),
         _recurseList,
         experimental_customMergeAllOf
       );
@@ -2362,7 +2294,7 @@ function toPathSchema(validator, schema, name = "", rootSchema, formData, experi
 }
 
 // src/createSchemaUtils.ts
-var import_get16 = __toESM(require("lodash/get"), 1);
+var import_get15 = __toESM(require("lodash/get"), 1);
 var SchemaUtils = class {
   /** Constructs the `SchemaUtils` instance with the given `validator` and `rootSchema` stored as instance variables
    *
@@ -2373,7 +2305,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, (0, import_get16.default)(rootSchema, ID_KEY, "#"));
+      this.rootSchema = makeAllReferencesAbsolute(rootSchema, (0, import_get15.default)(rootSchema, ID_KEY, "#"));
     } else {
       this.rootSchema = rootSchema;
     }
@@ -2601,27 +2533,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
@@ -2804,7 +2715,7 @@ function enumOptionsSelectValue(valueIndex, selected, allEnumOptions = []) {
 
 // src/ErrorSchemaBuilder.ts
 var import_cloneDeep = __toESM(require("lodash/cloneDeep"), 1);
-var import_get17 = __toESM(require("lodash/get"), 1);
+var import_get16 = __toESM(require("lodash/get"), 1);
 var import_set3 = __toESM(require("lodash/set"), 1);
 var import_setWith = __toESM(require("lodash/setWith"), 1);
 var ErrorSchemaBuilder = class {
@@ -2833,7 +2744,7 @@ var ErrorSchemaBuilder = class {
    */
   getOrCreateErrorBlock(pathOfError) {
     const hasPath = Array.isArray(pathOfError) && pathOfError.length > 0 || typeof pathOfError === "string";
-    let errorBlock = hasPath ? (0, import_get17.default)(this.errorSchema, pathOfError) : this.errorSchema;
+    let errorBlock = hasPath ? (0, import_get16.default)(this.errorSchema, pathOfError) : this.errorSchema;
     if (!errorBlock && pathOfError) {
       errorBlock = {};
       (0, import_setWith.default)(this.errorSchema, pathOfError, errorBlock, Object);
@@ -2859,7 +2770,7 @@ var ErrorSchemaBuilder = class {
    */
   addErrors(errorOrList, pathOfError) {
     const errorBlock = this.getOrCreateErrorBlock(pathOfError);
-    let errorsList = (0, import_get17.default)(errorBlock, ERRORS_KEY);
+    let errorsList = (0, import_get16.default)(errorBlock, ERRORS_KEY);
     if (!Array.isArray(errorsList)) {
       errorsList = [];
       errorBlock[ERRORS_KEY] = errorsList;
@@ -3007,10 +2918,10 @@ function getTemplate(name, registry, uiOptions = {}) {
 }
 
 // src/getTestIds.ts
-var import_get18 = __toESM(require("lodash/get"), 1);
+var import_get17 = __toESM(require("lodash/get"), 1);
 var import_uniqueId = __toESM(require("lodash/uniqueId"), 1);
 function getTestIds() {
-  if (typeof process === "undefined" || (0, import_get18.default)(process, "env.NODE_ENV") !== "test") {
+  if (typeof process === "undefined" || (0, import_get17.default)(process, "env.NODE_ENV") !== "test") {
     return {};
   }
   const ids = /* @__PURE__ */ new Map();
@@ -3030,7 +2941,7 @@ function getTestIds() {
 // src/getWidget.tsx
 var import_react = require("react");
 var import_react_is = __toESM(require("react-is"), 1);
-var import_get19 = __toESM(require("lodash/get"), 1);
+var import_get18 = __toESM(require("lodash/get"), 1);
 var import_set4 = __toESM(require("lodash/set"), 1);
 var import_jsx_runtime = require("react/jsx-runtime");
 var widgetMap = {
@@ -3086,7 +2997,7 @@ var widgetMap = {
   }
 };
 function mergeWidgetOptions(AWidget) {
-  let MergedWidget = (0, import_get19.default)(AWidget, "MergedWidget");
+  let MergedWidget = (0, import_get18.default)(AWidget, "MergedWidget");
   if (!MergedWidget) {
     const defaultOptions = AWidget.defaultProps && AWidget.defaultProps.options || {};
     MergedWidget = ({ options, ...props }) => {
@@ -3199,14 +3110,14 @@ function localToUTC(dateString) {
 }
 
 // src/lookupFromFormContext.ts
-var import_get20 = __toESM(require("lodash/get"), 1);
+var import_get19 = __toESM(require("lodash/get"), 1);
 var import_has6 = __toESM(require("lodash/has"), 1);
 function lookupFromFormContext(regOrFc, toLookup, fallback) {
   const lookupPath = [LOOKUP_MAP_NAME];
   if ((0, import_has6.default)(regOrFc, FORM_CONTEXT_NAME)) {
     lookupPath.unshift(FORM_CONTEXT_NAME);
   }
-  return (0, import_get20.default)(regOrFc, [...lookupPath, toLookup], fallback);
+  return (0, import_get19.default)(regOrFc, [...lookupPath, toLookup], fallback);
 }
 
 // src/orderProperties.ts
@@ -3356,6 +3267,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
 var import_isPlainObject3 = __toESM(require("lodash/isPlainObject"), 1);
 function unwrapErrorHandler(errorHandler) {
@@ -3441,7 +3361,7 @@ function withIdRefPrefix(schemaNode) {
 var import_keys = __toESM(require("lodash/keys"), 1);
 var import_pickBy = __toESM(require("lodash/pickBy"), 1);
 var import_isPlainObject4 = __toESM(require("lodash/isPlainObject"), 1);
-var import_get21 = __toESM(require("lodash/get"), 1);
+var import_get20 = __toESM(require("lodash/get"), 1);
 var import_difference = __toESM(require("lodash/difference"), 1);
 function getChangedFields(a, b) {
   const aIsPlainObject = (0, import_isPlainObject4.default)(a);
@@ -3454,7 +3374,7 @@ function getChangedFields(a, b) {
   } else if (!aIsPlainObject && bIsPlainObject) {
     return (0, import_keys.default)(b);
   } else {
-    const unequalFields = (0, import_keys.default)((0, import_pickBy.default)(a, (value, key) => !deepEquals(value, (0, import_get21.default)(b, key))));
+    const unequalFields = (0, import_keys.default)((0, import_pickBy.default)(a, (value, key) => !deepEquals(value, (0, import_get20.default)(b, key))));
     const diffFields = (0, import_difference.default)((0, import_keys.default)(b), (0, import_keys.default)(a));
     return [...unequalFields, ...diffFields];
   }
@@ -3499,7 +3419,7 @@ var TranslatableString = /* @__PURE__ */ ((TranslatableString2) => {
 var import_forEach = __toESM(require("lodash/forEach"), 1);
 
 // src/parser/ParserValidator.ts
-var import_get22 = __toESM(require("lodash/get"), 1);
+var import_get21 = __toESM(require("lodash/get"), 1);
 var ParserValidator = class {
   /** Construct the ParserValidator for the given `rootSchema`. This `rootSchema` will be stashed in the `schemaMap`
    * first.
@@ -3525,7 +3445,7 @@ var ParserValidator = class {
    * @param hash - The hash value at which to map the schema
    */
   addSchema(schema, hash) {
-    const key = (0, import_get22.default)(schema, ID_KEY, hash);
+    const key = (0, import_get21.default)(schema, ID_KEY, hash);
     const identifiedSchema = { ...schema, [ID_KEY]: key };
     const existing = this.schemaMap[key];
     if (!existing) {