@rjsf/utils 6.6.1 → 6.7.0

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.
Files changed (289) hide show
  1. package/LICENSE.md +201 -0
  2. package/dist/index.cjs +534 -376
  3. package/dist/index.cjs.map +4 -4
  4. package/dist/utils.esm.js +534 -376
  5. package/dist/utils.esm.js.map +4 -4
  6. package/dist/utils.umd.js +561 -400
  7. package/lib/ErrorSchemaBuilder.d.ts +1 -1
  8. package/lib/SelectedOptionDescription.d.ts +4 -0
  9. package/lib/SelectedOptionDescription.js +24 -0
  10. package/lib/SelectedOptionDescription.js.map +1 -0
  11. package/lib/allowAdditionalItems.d.ts +1 -1
  12. package/lib/allowAdditionalItems.js +1 -0
  13. package/lib/allowAdditionalItems.js.map +1 -1
  14. package/lib/asNumber.js +2 -0
  15. package/lib/asNumber.js.map +1 -1
  16. package/lib/canExpand.d.ts +1 -1
  17. package/lib/constIsAjvDataReference.d.ts +1 -1
  18. package/lib/constants.d.ts +8 -5
  19. package/lib/constants.js +10 -7
  20. package/lib/constants.js.map +1 -1
  21. package/lib/createErrorHandler.d.ts +1 -1
  22. package/lib/createErrorHandler.js +2 -6
  23. package/lib/createErrorHandler.js.map +1 -1
  24. package/lib/createSchemaUtils.d.ts +1 -1
  25. package/lib/createSchemaUtils.js +3 -1
  26. package/lib/createSchemaUtils.js.map +1 -1
  27. package/lib/dataURItoBlob.js +3 -3
  28. package/lib/dataURItoBlob.js.map +1 -1
  29. package/lib/dateRangeOptions.d.ts +1 -1
  30. package/lib/dateRangeOptions.js +8 -7
  31. package/lib/dateRangeOptions.js.map +1 -1
  32. package/lib/englishStringTranslator.d.ts +1 -1
  33. package/lib/enumOptionSelectedValue.d.ts +1 -1
  34. package/lib/enumOptionValueDecoder.d.ts +1 -1
  35. package/lib/enumOptionValueDecoder.js +1 -1
  36. package/lib/enumOptionValueDecoder.js.map +1 -1
  37. package/lib/enumOptionValueEncoder.d.ts +1 -1
  38. package/lib/enumOptionsDeselectValue.d.ts +1 -1
  39. package/lib/enumOptionsIndexForValue.d.ts +1 -1
  40. package/lib/enumOptionsIndexForValue.js.map +1 -1
  41. package/lib/enumOptionsIsSelected.d.ts +1 -1
  42. package/lib/enumOptionsSelectValue.d.ts +1 -1
  43. package/lib/enumOptionsValueForIndex.d.ts +2 -2
  44. package/lib/enumOptionsValueForIndex.js.map +1 -1
  45. package/lib/enums.d.ts +4 -0
  46. package/lib/enums.js +4 -0
  47. package/lib/enums.js.map +1 -1
  48. package/lib/findSchemaDefinition.d.ts +1 -1
  49. package/lib/findSchemaDefinition.js +15 -15
  50. package/lib/findSchemaDefinition.js.map +1 -1
  51. package/lib/getChangedFields.js +4 -6
  52. package/lib/getChangedFields.js.map +1 -1
  53. package/lib/getDateElementProps.d.ts +3 -3
  54. package/lib/getDiscriminatorFieldFromSchema.d.ts +1 -1
  55. package/lib/getDiscriminatorFieldFromSchema.js +1 -0
  56. package/lib/getDiscriminatorFieldFromSchema.js.map +1 -1
  57. package/lib/getInputProps.d.ts +1 -1
  58. package/lib/getOptionMatchingSimpleDiscriminator.d.ts +1 -1
  59. package/lib/getOptionMatchingSimpleDiscriminator.js +10 -11
  60. package/lib/getOptionMatchingSimpleDiscriminator.js.map +1 -1
  61. package/lib/getOptionValueFormat.d.ts +1 -1
  62. package/lib/getSchemaType.d.ts +1 -1
  63. package/lib/getSchemaType.js +2 -1
  64. package/lib/getSchemaType.js.map +1 -1
  65. package/lib/getSubmitButtonOptions.d.ts +1 -1
  66. package/lib/getSubmitButtonOptions.js +1 -1
  67. package/lib/getSubmitButtonOptions.js.map +1 -1
  68. package/lib/getTemplate.d.ts +1 -1
  69. package/lib/getTestIds.d.ts +1 -1
  70. package/lib/getUiOptions.d.ts +1 -1
  71. package/lib/getUiOptions.js +2 -1
  72. package/lib/getUiOptions.js.map +1 -1
  73. package/lib/getWidget.d.ts +1 -1
  74. package/lib/getWidget.js +4 -4
  75. package/lib/getWidget.js.map +1 -1
  76. package/lib/guessType.js +1 -1
  77. package/lib/guessType.js.map +1 -1
  78. package/lib/hasWidget.d.ts +1 -1
  79. package/lib/hashForSchema.d.ts +3 -1
  80. package/lib/hashForSchema.js +11 -4
  81. package/lib/hashForSchema.js.map +1 -1
  82. package/lib/idGenerators.d.ts +1 -1
  83. package/lib/index.d.ts +14 -7
  84. package/lib/index.js +5 -2
  85. package/lib/index.js.map +1 -1
  86. package/lib/isConstant.d.ts +1 -1
  87. package/lib/isCustomWidget.d.ts +1 -1
  88. package/lib/isCustomWidget.js +1 -1
  89. package/lib/isCustomWidget.js.map +1 -1
  90. package/lib/isFixedItems.d.ts +3 -3
  91. package/lib/isFixedItems.js +3 -3
  92. package/lib/isFixedItems.js.map +1 -1
  93. package/lib/isRootSchema.d.ts +1 -1
  94. package/lib/isRootSchema.js +2 -3
  95. package/lib/isRootSchema.js.map +1 -1
  96. package/lib/labelValue.d.ts +1 -1
  97. package/lib/logUnsupportedDefaultForEnum.d.ts +9 -0
  98. package/lib/logUnsupportedDefaultForEnum.js +18 -0
  99. package/lib/logUnsupportedDefaultForEnum.js.map +1 -0
  100. package/lib/lookupFromFormContext.d.ts +1 -1
  101. package/lib/mergeDefaultsWithFormData.js +6 -5
  102. package/lib/mergeDefaultsWithFormData.js.map +1 -1
  103. package/lib/mergeObjects.d.ts +4 -2
  104. package/lib/mergeObjects.js +1 -1
  105. package/lib/mergeObjects.js.map +1 -1
  106. package/lib/mergeSchemas.d.ts +4 -2
  107. package/lib/mergeSchemas.js +13 -6
  108. package/lib/mergeSchemas.js.map +1 -1
  109. package/lib/nameGenerators.d.ts +1 -1
  110. package/lib/optionsList.d.ts +1 -1
  111. package/lib/optionsList.js +22 -21
  112. package/lib/optionsList.js.map +1 -1
  113. package/lib/orderProperties.js +3 -3
  114. package/lib/orderProperties.js.map +1 -1
  115. package/lib/pad.js +1 -1
  116. package/lib/pad.js.map +1 -1
  117. package/lib/parseDateString.d.ts +1 -1
  118. package/lib/parseDateString.js +1 -1
  119. package/lib/parseDateString.js.map +1 -1
  120. package/lib/parser/ParserValidator.d.ts +2 -4
  121. package/lib/parser/ParserValidator.js +2 -0
  122. package/lib/parser/ParserValidator.js.map +1 -1
  123. package/lib/parser/index.d.ts +1 -1
  124. package/lib/parser/schemaParser.d.ts +2 -2
  125. package/lib/parser/schemaParser.js +7 -7
  126. package/lib/parser/schemaParser.js.map +1 -1
  127. package/lib/rangeSpec.d.ts +1 -2
  128. package/lib/rangeSpec.js.map +1 -1
  129. package/lib/removeOptionalEmptyObjects.d.ts +1 -1
  130. package/lib/removeOptionalEmptyObjects.js +6 -8
  131. package/lib/removeOptionalEmptyObjects.js.map +1 -1
  132. package/lib/resolveUiSchema.d.ts +1 -1
  133. package/lib/resolveUiSchema.js +16 -16
  134. package/lib/resolveUiSchema.js.map +1 -1
  135. package/lib/schema/findFieldInSchema.d.ts +1 -1
  136. package/lib/schema/findSelectedOptionInXxxOf.d.ts +1 -1
  137. package/lib/schema/findSelectedOptionInXxxOf.js +1 -3
  138. package/lib/schema/findSelectedOptionInXxxOf.js.map +1 -1
  139. package/lib/schema/getClosestMatchingOption.d.ts +1 -1
  140. package/lib/schema/getClosestMatchingOption.js +6 -9
  141. package/lib/schema/getClosestMatchingOption.js.map +1 -1
  142. package/lib/schema/getDefaultFormState.d.ts +4 -4
  143. package/lib/schema/getDefaultFormState.js +81 -43
  144. package/lib/schema/getDefaultFormState.js.map +1 -1
  145. package/lib/schema/getDisplayLabel.d.ts +1 -1
  146. package/lib/schema/getDisplayLabel.js +2 -3
  147. package/lib/schema/getDisplayLabel.js.map +1 -1
  148. package/lib/schema/getFirstMatchingOption.d.ts +1 -1
  149. package/lib/schema/getFirstMatchingOption.js +2 -2
  150. package/lib/schema/getFirstMatchingOption.js.map +1 -1
  151. package/lib/schema/getFromSchema.d.ts +1 -1
  152. package/lib/schema/index.js +9 -3
  153. package/lib/schema/index.js.map +1 -1
  154. package/lib/schema/isFilesArray.d.ts +1 -1
  155. package/lib/schema/isMultiSelect.d.ts +1 -1
  156. package/lib/schema/isMultiSelect.js.map +1 -1
  157. package/lib/schema/isSelect.d.ts +1 -1
  158. package/lib/schema/isSelect.js +1 -1
  159. package/lib/schema/isSelect.js.map +1 -1
  160. package/lib/schema/omitExtraData.d.ts +1 -1
  161. package/lib/schema/omitExtraData.js +66 -52
  162. package/lib/schema/omitExtraData.js.map +1 -1
  163. package/lib/schema/retrieveSchema.d.ts +7 -3
  164. package/lib/schema/retrieveSchema.js +83 -56
  165. package/lib/schema/retrieveSchema.js.map +1 -1
  166. package/lib/schema/sanitizeDataForNewSchema.d.ts +1 -1
  167. package/lib/schema/sanitizeDataForNewSchema.js +48 -7
  168. package/lib/schema/sanitizeDataForNewSchema.js.map +1 -1
  169. package/lib/schema/toPathSchema.d.ts +1 -1
  170. package/lib/schema/toPathSchema.js +9 -5
  171. package/lib/schema/toPathSchema.js.map +1 -1
  172. package/lib/schemaRequiresTrueValue.d.ts +1 -1
  173. package/lib/schemaRequiresTrueValue.js +4 -3
  174. package/lib/schemaRequiresTrueValue.js.map +1 -1
  175. package/lib/shallowEquals.js +2 -2
  176. package/lib/shallowEquals.js.map +1 -1
  177. package/lib/shouldRenderOptionalField.d.ts +1 -1
  178. package/lib/toConstant.d.ts +1 -1
  179. package/lib/toDateString.d.ts +1 -1
  180. package/lib/toErrorList.d.ts +1 -1
  181. package/lib/toErrorList.js +3 -3
  182. package/lib/toErrorList.js.map +1 -1
  183. package/lib/toErrorSchema.d.ts +1 -1
  184. package/lib/toFieldPathId.d.ts +1 -1
  185. package/lib/tsconfig.tsbuildinfo +1 -1
  186. package/lib/types.d.ts +63 -57
  187. package/lib/unwrapErrorHandler.d.ts +1 -1
  188. package/lib/unwrapErrorHandler.js +7 -9
  189. package/lib/unwrapErrorHandler.js.map +1 -1
  190. package/lib/useAltDateWidgetProps.d.ts +6 -6
  191. package/lib/useAltDateWidgetProps.js +3 -3
  192. package/lib/useAltDateWidgetProps.js.map +1 -1
  193. package/lib/useFileWidgetProps.d.ts +2 -2
  194. package/lib/useFileWidgetProps.js +3 -3
  195. package/lib/useFileWidgetProps.js.map +1 -1
  196. package/lib/validationDataMerge.d.ts +1 -1
  197. package/lib/withIdRefPrefix.d.ts +1 -1
  198. package/lib/withIdRefPrefix.js +12 -12
  199. package/lib/withIdRefPrefix.js.map +1 -1
  200. package/package.json +19 -19
  201. package/src/ErrorSchemaBuilder.ts +1 -1
  202. package/src/SelectedOptionDescription.tsx +48 -0
  203. package/src/allowAdditionalItems.ts +2 -1
  204. package/src/asNumber.ts +2 -0
  205. package/src/canExpand.ts +1 -1
  206. package/src/constIsAjvDataReference.ts +2 -2
  207. package/src/constants.ts +10 -7
  208. package/src/createErrorHandler.ts +6 -7
  209. package/src/createSchemaUtils.ts +4 -2
  210. package/src/dataURItoBlob.ts +3 -3
  211. package/src/dateRangeOptions.ts +9 -7
  212. package/src/englishStringTranslator.ts +1 -1
  213. package/src/enumOptionSelectedValue.ts +1 -1
  214. package/src/enumOptionValueDecoder.ts +2 -2
  215. package/src/enumOptionValueEncoder.ts +1 -1
  216. package/src/enumOptionsDeselectValue.ts +1 -1
  217. package/src/enumOptionsIndexForValue.ts +2 -2
  218. package/src/enumOptionsIsSelected.ts +1 -1
  219. package/src/enumOptionsSelectValue.ts +1 -1
  220. package/src/enumOptionsValueForIndex.ts +2 -2
  221. package/src/enums.ts +4 -0
  222. package/src/findSchemaDefinition.ts +18 -17
  223. package/src/getChangedFields.ts +5 -5
  224. package/src/getDateElementProps.ts +3 -3
  225. package/src/getDiscriminatorFieldFromSchema.ts +2 -1
  226. package/src/getInputProps.ts +1 -1
  227. package/src/getOptionMatchingSimpleDiscriminator.ts +11 -15
  228. package/src/getOptionValueFormat.ts +1 -1
  229. package/src/getSchemaType.ts +3 -2
  230. package/src/getSubmitButtonOptions.ts +3 -3
  231. package/src/getTemplate.ts +1 -1
  232. package/src/getTestIds.ts +1 -1
  233. package/src/getUiOptions.ts +10 -2
  234. package/src/getWidget.tsx +5 -6
  235. package/src/guessType.ts +1 -1
  236. package/src/hasWidget.ts +1 -1
  237. package/src/hashForSchema.ts +12 -5
  238. package/src/idGenerators.ts +1 -1
  239. package/src/index.ts +16 -5
  240. package/src/isConstant.ts +1 -1
  241. package/src/isCustomWidget.ts +2 -2
  242. package/src/isFixedItems.ts +4 -4
  243. package/src/isRootSchema.ts +3 -5
  244. package/src/labelValue.ts +1 -1
  245. package/src/logUnsupportedDefaultForEnum.ts +28 -0
  246. package/src/lookupFromFormContext.ts +1 -1
  247. package/src/mergeDefaultsWithFormData.ts +8 -7
  248. package/src/mergeObjects.ts +2 -2
  249. package/src/mergeSchemas.ts +14 -7
  250. package/src/nameGenerators.ts +1 -1
  251. package/src/optionsList.ts +21 -23
  252. package/src/orderProperties.ts +4 -4
  253. package/src/pad.ts +1 -1
  254. package/src/parseDateString.ts +2 -2
  255. package/src/parser/ParserValidator.ts +4 -4
  256. package/src/parser/index.ts +1 -1
  257. package/src/parser/schemaParser.ts +10 -9
  258. package/src/rangeSpec.ts +1 -2
  259. package/src/removeOptionalEmptyObjects.ts +8 -11
  260. package/src/resolveUiSchema.ts +32 -25
  261. package/src/schema/findFieldInSchema.ts +1 -1
  262. package/src/schema/findSelectedOptionInXxxOf.ts +17 -7
  263. package/src/schema/getClosestMatchingOption.ts +17 -11
  264. package/src/schema/getDefaultFormState.ts +104 -43
  265. package/src/schema/getDisplayLabel.ts +4 -5
  266. package/src/schema/getFirstMatchingOption.ts +3 -3
  267. package/src/schema/getFromSchema.ts +1 -1
  268. package/src/schema/index.ts +3 -0
  269. package/src/schema/isFilesArray.ts +1 -1
  270. package/src/schema/isMultiSelect.ts +7 -1
  271. package/src/schema/isSelect.ts +8 -2
  272. package/src/schema/omitExtraData.ts +73 -60
  273. package/src/schema/retrieveSchema.ts +131 -83
  274. package/src/schema/sanitizeDataForNewSchema.ts +57 -8
  275. package/src/schema/toPathSchema.ts +11 -7
  276. package/src/schemaRequiresTrueValue.ts +4 -4
  277. package/src/shallowEquals.ts +2 -2
  278. package/src/shouldRenderOptionalField.ts +1 -1
  279. package/src/toConstant.ts +1 -1
  280. package/src/toDateString.ts +1 -1
  281. package/src/toErrorList.ts +4 -4
  282. package/src/toErrorSchema.ts +1 -1
  283. package/src/toFieldPathId.ts +1 -1
  284. package/src/types.ts +92 -63
  285. package/src/unwrapErrorHandler.ts +11 -12
  286. package/src/useAltDateWidgetProps.tsx +10 -8
  287. package/src/useFileWidgetProps.ts +7 -7
  288. package/src/validationDataMerge.ts +1 -1
  289. package/src/withIdRefPrefix.ts +12 -12
@@ -1 +1 @@
1
- {"version":3,"file":"resolveUiSchema.js","sourceRoot":"","sources":["../src/resolveUiSchema.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"resolveUiSchema.js","sourceRoot":"","sources":["../src/resolveUiSchema.ts"],"names":[],"mappings":"AAAA,OAAO,OAAO,MAAM,gBAAgB,CAAC;AAErC,OAAO,EAAE,UAAU,EAAE,UAAU,EAAE,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAC5E,OAAO,oBAAoB,MAAM,wBAAwB,CAAC;AAC1D,OAAO,YAAY,MAAM,gBAAgB,CAAC;AAW1C;;;;;;;;;;;;;;;GAeG;AACH,MAAM,CAAC,OAAO,UAAU,eAAe,CAIrC,MAAS,EAAE,aAA4C,EAAE,QAA2B;;IACpF,MAAM,GAAG,GAAG,CAAC,MAAC,MAA2B,CAAC,YAAY,CAAC,mCAAI,MAAM,CAAC,OAAO,CAAC,CAAuB,CAAC;IAClG,MAAM,WAAW,GAAG,QAAQ,CAAC,mBAAmB,CAAC;IACjD,MAAM,kBAAkB,GAAG,GAAG,IAAI,WAAW,CAAC,CAAC,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;IAE7E,IAAI,MAAyB,CAAC;IAC9B,IAAI,CAAC,kBAAkB,EAAE,CAAC;QACxB,MAAM,GAAG,aAAa,IAAI,EAAE,CAAC;IAC/B,CAAC;SAAM,IAAI,CAAC,aAAa,IAAI,OAAO,CAAC,aAAa,CAAC,EAAE,CAAC;QACpD,MAAM,GAAG,EAAE,GAAG,kBAAkB,EAAE,CAAC;IACrC,CAAC;SAAM,CAAC;QACN,MAAM,GAAG,YAAY,CAAC,kBAAuC,EAAE,aAAkC,CAIhG,CAAC;IACJ,CAAC;IAED,iFAAiF;IACjF,uDAAuD;IACvD,IAAI,WAAW,EAAE,CAAC;QAChB,IAAI,cAAc,GAAM,MAAM,CAAC;QAC/B,IAAI,GAAG,IAAI,MAAM,CAAC,OAAO,CAAC,IAAI,CAAE,MAA2B,CAAC,YAAY,CAAC,EAAE,CAAC;YAC1E,IAAI,CAAC;gBACH,cAAc,GAAG,oBAAoB,CAAI,GAAG,EAAE,QAAQ,CAAC,UAAU,CAAC,CAAC;YACrE,CAAC;YAAC,OAAO,CAAC,EAAE,CAAC;gBACX,sCAAsC;gBACtC,OAAO,CAAC,IAAI,CAAC,8CAA8C,EAAE,CAAC,CAAC,CAAC;gBAChE,OAAO,MAAM,CAAC;YAChB,CAAC;QACH,CAAC;QAED,KAAK,MAAM,OAAO,IAAI,CAAC,UAAU,EAAE,UAAU,CAAU,EAAE,CAAC;YACxD,MAAM,aAAa,GAAG,cAAc,CAAC,OAAO,CAAC,CAAC;YAC9C,IAAI,KAAK,CAAC,OAAO,CAAC,aAAa,CAAC,IAAI,aAAa,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBAC7D,MAAM,oBAAoB,GAAI,MAA4B,CAAC,OAAO,CAAC,CAAC;gBACpE,MAAM,aAAa,GAAwB,KAAK,CAAC,OAAO,CAAC,oBAAoB,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,oBAAoB,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;gBAEhH,IAAI,WAAW,GAAG,KAAK,CAAC;gBACxB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,aAAa,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;oBAC9C,MAAM,MAAM,GAAG,aAAa,CAAC,CAAC,CAAkC,CAAC;oBACjE,MAAM,SAAS,GAAG,CAAC,MAAC,MAA2B,aAA3B,MAAM,uBAAN,MAAM,CAAwB,YAAY,CAAC,mCAAI,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAG,OAAO,CAAC,CAAuB,CAAC;oBAC5G,IAAI,SAAS,IAAI,SAAS,IAAI,WAAW,EAAE,CAAC;wBAC1C,MAAM,cAAc,GAAG,CAAC,aAAa,CAAC,CAAC,CAAC,IAAI,EAAE,CAAsB,CAAC;wBACrE,aAAa,CAAC,CAAC,CAAC,GAAG,YAAY,CAAC,WAAW,CAAC,SAAS,CAAsB,EAAE,cAAc,CAI1F,CAAC;wBACF,WAAW,GAAG,IAAI,CAAC;oBACrB,CAAC;gBACH,CAAC;gBAED,IAAI,WAAW,EAAE,CAAC;oBACf,MAA4B,CAAC,OAAO,CAAC,GAAG,aAAa,CAAC;gBACzD,CAAC;YACH,CAAC;QACH,CAAC;IACH,CAAC;IAED,OAAO,MAAM,CAAC;AAChB,CAAC"}
@@ -1,4 +1,4 @@
1
- import { Experimental_CustomMergeAllOf, FormContextType, FoundFieldType, RJSFSchema, SchemaFieldPath, StrictRJSFSchema, ValidatorType } from '../types.js';
1
+ import type { Experimental_CustomMergeAllOf, FormContextType, FoundFieldType, RJSFSchema, SchemaFieldPath, StrictRJSFSchema, ValidatorType } from '../types.js';
2
2
  /** Unique schema that represents no schema was found, exported for testing purposes */
3
3
  export declare const NOT_FOUND_SCHEMA: {
4
4
  title: string;
@@ -1,4 +1,4 @@
1
- import { Experimental_CustomMergeAllOf, FormContextType, RJSFSchema, StrictRJSFSchema, ValidatorType } from '../types.js';
1
+ import type { Experimental_CustomMergeAllOf, FormContextType, RJSFSchema, StrictRJSFSchema, ValidatorType } from '../types.js';
2
2
  /** Finds the option inside the `schema['any/oneOf']` list which has the `properties[selectorField].default` or
3
3
  * `properties[selectorField].const` that matches the `formData[selectorField]` value. For the purposes of this
4
4
  * function, `selectorField` is either `schema.discriminator.propertyName` or `fallbackField`. The `LayoutGridField`
@@ -24,9 +24,7 @@ export default function findSelectedOptionInXxxOf(validator, rootSchema, schema,
24
24
  const xxxOfs = schema[xxx].map((xxxOf) => retrieveSchema(validator, xxxOf, rootSchema, formData, experimental_customMergeAllOf));
25
25
  const data = get(formData, selectorField);
26
26
  if (data !== undefined) {
27
- return xxxOfs.find((xxx) => {
28
- return deepEquals(get(xxx, [PROPERTIES_KEY, selectorField, DEFAULT_KEY], get(xxx, [PROPERTIES_KEY, selectorField, CONST_KEY])), data);
29
- });
27
+ return xxxOfs.find((xxxOfOption) => deepEquals(get(xxxOfOption, [PROPERTIES_KEY, selectorField, DEFAULT_KEY], get(xxxOfOption, [PROPERTIES_KEY, selectorField, CONST_KEY])), data));
30
28
  }
31
29
  }
32
30
  return undefined;
@@ -1 +1 @@
1
- {"version":3,"file":"findSelectedOptionInXxxOf.js","sourceRoot":"","sources":["../../src/schema/findSelectedOptionInXxxOf.ts"],"names":[],"mappings":"AAAA,OAAO,GAAG,MAAM,YAAY,CAAC;AAE7B,OAAO,EAAE,SAAS,EAAE,WAAW,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AACtE,OAAO,UAAU,MAAM,eAAe,CAAC;AACvC,OAAO,+BAA+B,MAAM,oCAAoC,CAAC;AAEjF,OAAO,cAAc,MAAM,kBAAkB,CAAC;AAE9C;;;;;;;;;;;;;GAaG;AACH,MAAM,CAAC,OAAO,UAAU,yBAAyB,CAK/C,SAAiC,EACjC,UAAa,EACb,MAAS,EACT,aAAqB,EACrB,GAAsB,EACtB,WAAc,EAAO,EACrB,6BAAgE;IAEhE,IAAI,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC;QAC/B,MAAM,aAAa,GAAG,+BAA+B,CAAI,MAAM,CAAC,CAAC;QACjE,MAAM,aAAa,GAAG,aAAa,IAAI,aAAa,CAAC;QACrD,MAAM,MAAM,GAAG,MAAM,CAAC,GAAG,CAAE,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CACxC,cAAc,CAAU,SAAS,EAAE,KAAU,EAAE,UAAU,EAAE,QAAQ,EAAE,6BAA6B,CAAC,CACpG,CAAC;QACF,MAAM,IAAI,GAAG,GAAG,CAAC,QAAQ,EAAE,aAAa,CAAC,CAAC;QAC1C,IAAI,IAAI,KAAK,SAAS,EAAE,CAAC;YACvB,OAAO,MAAM,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE;gBACzB,OAAO,UAAU,CACf,GAAG,CAAC,GAAG,EAAE,CAAC,cAAc,EAAE,aAAa,EAAE,WAAW,CAAC,EAAE,GAAG,CAAC,GAAG,EAAE,CAAC,cAAc,EAAE,aAAa,EAAE,SAAS,CAAC,CAAC,CAAC,EAC5G,IAAI,CACL,CAAC;YACJ,CAAC,CAAC,CAAC;QACL,CAAC;IACH,CAAC;IACD,OAAO,SAAS,CAAC;AACnB,CAAC"}
1
+ {"version":3,"file":"findSelectedOptionInXxxOf.js","sourceRoot":"","sources":["../../src/schema/findSelectedOptionInXxxOf.ts"],"names":[],"mappings":"AAAA,OAAO,GAAG,MAAM,YAAY,CAAC;AAE7B,OAAO,EAAE,SAAS,EAAE,WAAW,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AACtE,OAAO,UAAU,MAAM,eAAe,CAAC;AACvC,OAAO,+BAA+B,MAAM,oCAAoC,CAAC;AAQjF,OAAO,cAAc,MAAM,kBAAkB,CAAC;AAE9C;;;;;;;;;;;;;GAaG;AACH,MAAM,CAAC,OAAO,UAAU,yBAAyB,CAK/C,SAAiC,EACjC,UAAa,EACb,MAAS,EACT,aAAqB,EACrB,GAAsB,EACtB,WAAc,EAAO,EACrB,6BAAgE;IAEhE,IAAI,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC;QAC/B,MAAM,aAAa,GAAG,+BAA+B,CAAI,MAAM,CAAC,CAAC;QACjE,MAAM,aAAa,GAAG,aAAa,IAAI,aAAa,CAAC;QACrD,MAAM,MAAM,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CACvC,cAAc,CAAU,SAAS,EAAE,KAAU,EAAE,UAAU,EAAE,QAAQ,EAAE,6BAA6B,CAAC,CACpG,CAAC;QACF,MAAM,IAAI,GAAG,GAAG,CAAC,QAAQ,EAAE,aAAa,CAAC,CAAC;QAC1C,IAAI,IAAI,KAAK,SAAS,EAAE,CAAC;YACvB,OAAO,MAAM,CAAC,IAAI,CAAC,CAAC,WAAW,EAAE,EAAE,CACjC,UAAU,CACR,GAAG,CACD,WAAW,EACX,CAAC,cAAc,EAAE,aAAa,EAAE,WAAW,CAAC,EAC5C,GAAG,CAAC,WAAW,EAAE,CAAC,cAAc,EAAE,aAAa,EAAE,SAAS,CAAC,CAAC,CAC7D,EACD,IAAI,CACL,CACF,CAAC;QACJ,CAAC;IACH,CAAC;IACD,OAAO,SAAS,CAAC;AACnB,CAAC"}
@@ -1,4 +1,4 @@
1
- import { Experimental_CustomMergeAllOf, FormContextType, RJSFSchema, StrictRJSFSchema, ValidatorType } from '../types.js';
1
+ import type { Experimental_CustomMergeAllOf, FormContextType, RJSFSchema, StrictRJSFSchema, ValidatorType } from '../types.js';
2
2
  /** A junk option used to determine when the getFirstMatchingOption call really matches an option rather than returning
3
3
  * the first item
4
4
  */
@@ -59,17 +59,16 @@ export function calculateIndexScore(validator, rootSchema, schema, formData, exp
59
59
  calculateIndexScore(validator, rootSchema, newSchema, formValue || {}, experimental_customMergeAllOf));
60
60
  }
61
61
  if ((has(value, ONE_OF_KEY) || has(value, ANY_OF_KEY)) && formValue) {
62
- const key = has(value, ONE_OF_KEY) ? ONE_OF_KEY : ANY_OF_KEY;
62
+ const xxxOfKey = has(value, ONE_OF_KEY) ? ONE_OF_KEY : ANY_OF_KEY;
63
63
  const discriminator = getDiscriminatorFieldFromSchema(value);
64
64
  return (score +
65
- getClosestMatchingOption(validator, rootSchema, formValue, get(value, key), -1, discriminator, experimental_customMergeAllOf));
65
+ getClosestMatchingOption(validator, rootSchema, formValue, get(value, xxxOfKey), -1, discriminator, experimental_customMergeAllOf));
66
66
  }
67
67
  if (value.type === 'object') {
68
- if (isObject(formValue)) {
69
- // If the structure is matching then give it a little boost in score
70
- score += 1;
71
- }
68
+ // If the structure is matching then give it a little boost in score
69
+ const structureBoost = isObject(formValue) ? 1 : 0;
72
70
  return (score +
71
+ structureBoost +
73
72
  calculateIndexScore(validator, rootSchema, value, formValue, experimental_customMergeAllOf));
74
73
  }
75
74
  if (value.type === guessType(formValue)) {
@@ -122,9 +121,7 @@ export function calculateIndexScore(validator, rootSchema, schema, formData, exp
122
121
  */
123
122
  export default function getClosestMatchingOption(validator, rootSchema, formData, options, selectedOption = -1, discriminatorField, experimental_customMergeAllOf) {
124
123
  // First resolve any refs in the options
125
- const resolvedOptions = options.map((option) => {
126
- return resolveAllReferences(option, rootSchema, []);
127
- });
124
+ const resolvedOptions = options.map((option) => resolveAllReferences(option, rootSchema, []));
128
125
  const simpleDiscriminatorMatch = getOptionMatchingSimpleDiscriminator(formData, options, discriminatorField);
129
126
  if (isNumber(simpleDiscriminatorMatch)) {
130
127
  return simpleDiscriminatorMatch;
@@ -1 +1 @@
1
- {"version":3,"file":"getClosestMatchingOption.js","sourceRoot":"","sources":["../../src/schema/getClosestMatchingOption.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"getClosestMatchingOption.js","sourceRoot":"","sources":["../../src/schema/getClosestMatchingOption.ts"],"names":[],"mappings":"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"}
@@ -1,4 +1,4 @@
1
- import { Experimental_CustomMergeAllOf, Experimental_DefaultFormStateBehavior, FormContextType, RJSFSchema, StrictRJSFSchema, ValidatorType } from '../types.js';
1
+ import type { Experimental_CustomMergeAllOf, Experimental_DefaultFormStateBehavior, FormContextType, RJSFSchema, StrictRJSFSchema, ValidatorType } from '../types.js';
2
2
  /** Enum that indicates how `schema.additionalItems` should be handled by the `getInnerSchemaForArrayItem()` function.
3
3
  */
4
4
  export declare enum AdditionalItemsHandling {
@@ -95,10 +95,10 @@ export declare function getObjectDefaults<T = any, S extends StrictRJSFSchema =
95
95
  * @param validator - an implementation of the `ValidatorType` interface that will be used when necessary
96
96
  * @param rawSchema - The schema for which the default state is desired
97
97
  * @param computeDefaultsProps - Optional props for this function
98
- * @param defaults - Optional props for this function
98
+ * @param initialDefaults - Optional props for this function
99
99
  * @returns - The default value based on the schema type if they are defined for object or array schemas.
100
100
  */
101
- export declare function getArrayDefaults<T = any, S extends StrictRJSFSchema = RJSFSchema, F extends FormContextType = any>(validator: ValidatorType<T, S, F>, rawSchema: S, { rawFormData, rootSchema, _recurseList, experimental_defaultFormStateBehavior, experimental_customMergeAllOf, required, requiredAsRoot, shouldMergeDefaultsIntoFormData, initialDefaultsGenerated, }?: ComputeDefaultsProps<T, S>, defaults?: T[]): T[] | undefined;
101
+ export declare function getArrayDefaults<T = any, S extends StrictRJSFSchema = RJSFSchema, F extends FormContextType = any>(validator: ValidatorType<T, S, F>, rawSchema: S, { rawFormData, rootSchema, _recurseList, experimental_defaultFormStateBehavior, experimental_customMergeAllOf, required, requiredAsRoot, shouldMergeDefaultsIntoFormData, initialDefaultsGenerated, }?: ComputeDefaultsProps<T, S>, initialDefaults?: T[]): T[] | undefined;
102
102
  /** Computes the default value based on the schema type.
103
103
  *
104
104
  * @param validator - an implementation of the `ValidatorType` interface that will be used when necessary
@@ -107,7 +107,7 @@ export declare function getArrayDefaults<T = any, S extends StrictRJSFSchema = R
107
107
  * @param defaults - Optional props for this function
108
108
  * @returns - The default value based on the schema type if they are defined for object or array schemas.
109
109
  */
110
- export declare function getDefaultBasedOnSchemaType<T = any, S extends StrictRJSFSchema = RJSFSchema, F extends FormContextType = any>(validator: ValidatorType<T, S, F>, rawSchema: S, computeDefaultsProps?: ComputeDefaultsProps<T, S>, defaults?: T | T[] | undefined): T | T[] | void;
110
+ export declare function getDefaultBasedOnSchemaType<T = any, S extends StrictRJSFSchema = RJSFSchema, F extends FormContextType = any>(validator: ValidatorType<T, S, F>, rawSchema: S, computeDefaultsProps?: ComputeDefaultsProps<T, S>, defaults?: T | T[]): T | T[] | undefined;
111
111
  /** Returns the superset of `formData` that includes the given set updated to include any missing fields that have
112
112
  * computed to have defaults provided in the `schema`.
113
113
  *
@@ -77,7 +77,7 @@ export function computeDefaultBasedOnSchemaTypeAndDefaults(schema, computedDefau
77
77
  * includeUndefinedValues` is false and `emptyObjectFields` is not "skipDefaults", then non-undefined and non-empty-object
78
78
  * values will be added based on certain conditions.
79
79
  *
80
- * @param obj - The object into which the computed default may be added
80
+ * @param acc - The object into which the computed default may be added
81
81
  * @param key - The key into the object at which the computed default may be added
82
82
  * @param computedDefault - The computed default value that maybe should be added to the obj
83
83
  * @param includeUndefinedValues - Optional flag, if true, cause undefined values to be added as defaults.
@@ -92,18 +92,18 @@ export function computeDefaultBasedOnSchemaTypeAndDefaults(schema, computedDefau
92
92
  * @param isConst - Optional flag, if true, indicates that the schema has a const property defined, thus we should always return the computedDefault since it's coming from the const.
93
93
  * @param isNullType - The type of the schema is null
94
94
  */
95
- function maybeAddDefaultToObject(obj, key, computedDefault, includeUndefinedValues, isParentRequired, requiredFields = [], experimental_defaultFormStateBehavior = {}, isConst = false, isNullType = false) {
95
+ function maybeAddDefaultToObject(acc, key, computedDefault, includeUndefinedValues, isParentRequired, requiredFields = [], experimental_defaultFormStateBehavior = {}, isConst = false, isNullType = false) {
96
96
  const { emptyObjectFields = 'populateAllDefaults' } = experimental_defaultFormStateBehavior;
97
97
  if (includeUndefinedValues === true || isConst) {
98
98
  // If includeUndefinedValues is explicitly true
99
99
  // Or if the schema has a const property defined, then we should always return the computedDefault since it's coming from the const.
100
- obj[key] = computedDefault;
100
+ acc[key] = computedDefault;
101
101
  }
102
102
  else if (includeUndefinedValues === 'excludeObjectChildren') {
103
103
  // Fix for Issue #4709: When in 'excludeObjectChildren' mode, don't set primitive fields to empty objects
104
104
  // Only add the computed default if it's not an empty object placeholder for a primitive field
105
105
  if ((isNullType && computedDefault !== undefined) || !isObject(computedDefault) || !isEmpty(computedDefault)) {
106
- obj[key] = computedDefault;
106
+ acc[key] = computedDefault;
107
107
  }
108
108
  // If computedDefault is an empty object {}, don't add it - let the field stay undefined
109
109
  }
@@ -115,14 +115,14 @@ function maybeAddDefaultToObject(obj, key, computedDefault, includeUndefinedValu
115
115
  // If emptyObjectFields 'skipEmptyDefaults' store computedDefault if it's a non-empty object(e.g. not {})
116
116
  if (emptyObjectFields === 'skipEmptyDefaults') {
117
117
  if (!isEmpty(computedDefault)) {
118
- obj[key] = computedDefault;
118
+ acc[key] = computedDefault;
119
119
  }
120
120
  } // Else store computedDefault if it's a non-empty object(e.g. not {}) and satisfies certain conditions
121
121
  // Condition 1: If computedDefault is not empty or if the key is a required field
122
122
  // Condition 2: If the parent object is required or emptyObjectFields is not 'populateRequiredDefaults'
123
123
  else if ((!isEmpty(computedDefault) || requiredFields.includes(key)) &&
124
124
  (isSelfOrParentRequired || emptyObjectFields !== 'populateRequiredDefaults')) {
125
- obj[key] = computedDefault;
125
+ acc[key] = computedDefault;
126
126
  }
127
127
  }
128
128
  else if (
@@ -134,7 +134,7 @@ function maybeAddDefaultToObject(obj, key, computedDefault, includeUndefinedValu
134
134
  (emptyObjectFields === 'populateAllDefaults' ||
135
135
  emptyObjectFields === 'skipEmptyDefaults' ||
136
136
  (isSelfOrParentRequired && requiredFields.includes(key)))) {
137
- obj[key] = computedDefault;
137
+ acc[key] = computedDefault;
138
138
  }
139
139
  }
140
140
  }
@@ -147,11 +147,12 @@ function maybeAddDefaultToObject(obj, key, computedDefault, includeUndefinedValu
147
147
  * @returns - The resulting `formData` with all the defaults provided
148
148
  */
149
149
  export function computeDefaults(validator, rawSchema, computeDefaultsProps = {}) {
150
- const { parentDefaults, rawFormData, rootSchema = {}, includeUndefinedValues = false, _recurseList = [], experimental_defaultFormStateBehavior = undefined, experimental_customMergeAllOf = undefined, required, shouldMergeDefaultsIntoFormData = false, initialDefaultsGenerated, } = computeDefaultsProps;
150
+ const { parentDefaults, rawFormData, rootSchema = {}, includeUndefinedValues = false, _recurseList = [], experimental_defaultFormStateBehavior, experimental_customMergeAllOf, required, shouldMergeDefaultsIntoFormData = false, initialDefaultsGenerated, } = computeDefaultsProps;
151
151
  let formData = (isObject(rawFormData) ? rawFormData : {});
152
152
  const schema = isObject(rawSchema) ? rawSchema : {};
153
- // Compute the defaults recursively: give highest priority to deepest nodes.
153
+ // Compute the defaults recursively: give highest priority to deepest nodes unless nestedDefaultsPrecedence is ancestorWins.
154
154
  let defaults = parentDefaults;
155
+ const preferParentDefaults = defaults && (experimental_defaultFormStateBehavior === null || experimental_defaultFormStateBehavior === void 0 ? void 0 : experimental_defaultFormStateBehavior.nestedDefaultsPrecedence) === 'ancestorWins';
155
156
  // If we get a new schema, then we need to recompute defaults again for the new schema found.
156
157
  let schemaToCompute = null;
157
158
  let experimental_dfsb_to_compute = experimental_defaultFormStateBehavior;
@@ -166,13 +167,25 @@ export function computeDefaults(validator, rawSchema, computeDefaultsProps = {})
166
167
  !schema[ANY_OF_KEY] &&
167
168
  !schema[ONE_OF_KEY] &&
168
169
  !schema[REF_KEY]) {
169
- // For object defaults, only override parent defaults that are defined in
170
- // schema.default. Skip this for anyOf/oneOf/$ref schemas - they need special handling.
171
- defaults = mergeObjects(defaults, schema.default);
170
+ // For object defaults, merge defaults by precedence setting.
171
+ // Skip this for anyOf/oneOf/$ref schemas - they need special handling.
172
+ if (preferParentDefaults) {
173
+ // Use schema.default as the base and only override values that are defined in parent defaults.
174
+ defaults = mergeObjects(schema.default, defaults);
175
+ }
176
+ else {
177
+ // Only override parent defaults that are defined in schema.default.
178
+ defaults = mergeObjects(defaults, schema.default);
179
+ }
172
180
  }
173
- else if (DEFAULT_KEY in schema && !schema[ANY_OF_KEY] && !schema[ONE_OF_KEY] && !schema[REF_KEY]) {
174
- // If the schema has a default value, then we should use it as the default.
175
- // And if the schema does not have anyOf or oneOf, this is done because we need to merge the defaults with the formData.
181
+ else if (DEFAULT_KEY in schema &&
182
+ !preferParentDefaults &&
183
+ !schema[ANY_OF_KEY] &&
184
+ !schema[ONE_OF_KEY] &&
185
+ !schema[REF_KEY]) {
186
+ // If the schema has a default value and parentDefaults does not have precedence
187
+ // And if the schema does not have anyOf or oneOf (since we need to merge the defaults with the formData)
188
+ // Then we should use it as the default.
176
189
  defaults = schema.default;
177
190
  }
178
191
  else if (REF_KEY in schema) {
@@ -204,9 +217,11 @@ export function computeDefaults(validator, rawSchema, computeDefaultsProps = {})
204
217
  ...formData,
205
218
  };
206
219
  const resolvedSchema = resolveDependencies(validator, schema, rootSchema, false, [], defaultFormData, experimental_customMergeAllOf);
207
- schemaToCompute = resolvedSchema[0]; // pick the first element from resolve dependencies
220
+ [schemaToCompute] = resolvedSchema; // pick the first element from resolve dependencies
208
221
  }
209
- else if (isFixedItems(schema)) {
222
+ else if (isFixedItems(schema) && !preferParentDefaults) {
223
+ // If the schema contains fixed items and parentDefaults does not have precedence
224
+ // Then construct defaults from defaults of array items.
210
225
  defaults = schema.items.map((itemSchema, idx) => computeDefaults(validator, itemSchema, {
211
226
  rootSchema,
212
227
  includeUndefinedValues,
@@ -255,7 +270,7 @@ export function computeDefaults(validator, rawSchema, computeDefaultsProps = {})
255
270
  experimental_defaultFormStateBehavior: experimental_dfsb_to_compute,
256
271
  experimental_customMergeAllOf,
257
272
  parentDefaults: defaults,
258
- rawFormData: (rawFormData !== null && rawFormData !== void 0 ? rawFormData : formData),
273
+ rawFormData: rawFormData !== null && rawFormData !== void 0 ? rawFormData : formData,
259
274
  required,
260
275
  shouldMergeDefaultsIntoFormData,
261
276
  initialDefaultsGenerated,
@@ -292,17 +307,31 @@ export function computeDefaults(validator, rawSchema, computeDefaultsProps = {})
292
307
  * @returns - valid formData that matches schema
293
308
  */
294
309
  export function ensureFormDataMatchingSchema(validator, schema, rootSchema, formData, experimental_defaultFormStateBehavior, experimental_customMergeAllOf) {
295
- const isSelectField = !isConstant(schema) && isSelect(validator, schema, rootSchema, experimental_customMergeAllOf);
310
+ const shouldRetrieveAllOf = (experimental_defaultFormStateBehavior === null || experimental_defaultFormStateBehavior === void 0 ? void 0 : experimental_defaultFormStateBehavior.allOf) === 'populateDefaults' && ALL_OF_KEY in schema;
311
+ const schemaToMatch = shouldRetrieveAllOf
312
+ ? retrieveSchema(validator, schema, rootSchema, formData, experimental_customMergeAllOf)
313
+ : schema;
314
+ const isSelectField = !isConstant(schemaToMatch) &&
315
+ isSelect(validator, schemaToMatch, rootSchema, experimental_customMergeAllOf);
296
316
  let validFormData = formData;
297
317
  if (isSelectField) {
298
- const getOptionsList = optionsList(schema);
318
+ const getOptionsList = optionsList(schemaToMatch);
299
319
  const isValid = getOptionsList === null || getOptionsList === void 0 ? void 0 : getOptionsList.some((option) => deepEquals(option.value, formData));
300
320
  validFormData = isValid ? formData : undefined;
301
321
  }
302
322
  // Override the formData with the const if the constAsDefaults is set to always
303
- const constTakesPrecedence = schema[CONST_KEY] && (experimental_defaultFormStateBehavior === null || experimental_defaultFormStateBehavior === void 0 ? void 0 : experimental_defaultFormStateBehavior.constAsDefaults) === 'always';
323
+ const constTakesPrecedence = schemaToMatch[CONST_KEY] && (experimental_defaultFormStateBehavior === null || experimental_defaultFormStateBehavior === void 0 ? void 0 : experimental_defaultFormStateBehavior.constAsDefaults) === 'always';
304
324
  if (constTakesPrecedence) {
305
- validFormData = schema.const;
325
+ validFormData = schemaToMatch.const;
326
+ }
327
+ else if (isObject(validFormData) && isObject(schemaToMatch.properties)) {
328
+ validFormData = Object.keys(schemaToMatch.properties).reduce((acc, key) => {
329
+ const propertySchema = get(schemaToMatch, [PROPERTIES_KEY, key], {});
330
+ if (key in acc && (shouldRetrieveAllOf || (isObject(propertySchema) && ALL_OF_KEY in propertySchema))) {
331
+ acc[key] = ensureFormDataMatchingSchema(validator, propertySchema, rootSchema, get(acc, key), experimental_defaultFormStateBehavior, experimental_customMergeAllOf);
332
+ }
333
+ return acc;
334
+ }, { ...validFormData });
306
335
  }
307
336
  return validFormData;
308
337
  }
@@ -314,7 +343,7 @@ export function ensureFormDataMatchingSchema(validator, schema, rootSchema, form
314
343
  * @param defaults - Optional props for this function
315
344
  * @returns - The default value based on the schema type if they are defined for object or array schemas.
316
345
  */
317
- export function getObjectDefaults(validator, rawSchema, { rawFormData, rootSchema = {}, includeUndefinedValues = false, _recurseList = [], experimental_defaultFormStateBehavior = undefined, experimental_customMergeAllOf = undefined, required, shouldMergeDefaultsIntoFormData, initialDefaultsGenerated, } = {}, defaults) {
346
+ export function getObjectDefaults(validator, rawSchema, { rawFormData, rootSchema = {}, includeUndefinedValues = false, _recurseList = [], experimental_defaultFormStateBehavior, experimental_customMergeAllOf, required, shouldMergeDefaultsIntoFormData, initialDefaultsGenerated, } = {}, defaults) {
318
347
  {
319
348
  const formData = (isObject(rawFormData) ? rawFormData : {});
320
349
  const schema = rawSchema;
@@ -401,11 +430,12 @@ export function getObjectDefaults(validator, rawSchema, { rawFormData, rootSchem
401
430
  * @param validator - an implementation of the `ValidatorType` interface that will be used when necessary
402
431
  * @param rawSchema - The schema for which the default state is desired
403
432
  * @param computeDefaultsProps - Optional props for this function
404
- * @param defaults - Optional props for this function
433
+ * @param initialDefaults - Optional props for this function
405
434
  * @returns - The default value based on the schema type if they are defined for object or array schemas.
406
435
  */
407
- export function getArrayDefaults(validator, rawSchema, { rawFormData, rootSchema = {}, _recurseList = [], experimental_defaultFormStateBehavior = undefined, experimental_customMergeAllOf = undefined, required, requiredAsRoot = false, shouldMergeDefaultsIntoFormData, initialDefaultsGenerated, } = {}, defaults) {
436
+ export function getArrayDefaults(validator, rawSchema, { rawFormData, rootSchema = {}, _recurseList = [], experimental_defaultFormStateBehavior, experimental_customMergeAllOf, required, requiredAsRoot = false, shouldMergeDefaultsIntoFormData, initialDefaultsGenerated, } = {}, initialDefaults) {
408
437
  var _a, _b;
438
+ let defaults = initialDefaults;
409
439
  const schema = rawSchema;
410
440
  const arrayMinItemsStateBehavior = (_a = experimental_defaultFormStateBehavior === null || experimental_defaultFormStateBehavior === void 0 ? void 0 : experimental_defaultFormStateBehavior.arrayMinItems) !== null && _a !== void 0 ? _a : {};
411
441
  const { populate: arrayMinItemsPopulate, mergeExtraDefaults: arrayMergeExtraDefaults } = arrayMinItemsStateBehavior;
@@ -440,35 +470,40 @@ export function getArrayDefaults(validator, rawSchema, { rawFormData, rootSchema
440
470
  defaults = rawFormData;
441
471
  }
442
472
  else {
443
- const itemDefaults = rawFormData.map((item, idx) => {
444
- return computeDefaults(validator, schemaItem, {
445
- rootSchema,
446
- _recurseList,
447
- experimental_defaultFormStateBehavior,
448
- experimental_customMergeAllOf,
449
- rawFormData: item,
450
- parentDefaults: get(defaults, [idx]),
451
- required,
452
- shouldMergeDefaultsIntoFormData,
453
- initialDefaultsGenerated,
454
- });
455
- });
473
+ const itemDefaults = rawFormData.map((item, idx) => computeDefaults(validator, schemaItem, {
474
+ rootSchema,
475
+ _recurseList,
476
+ experimental_defaultFormStateBehavior,
477
+ experimental_customMergeAllOf,
478
+ rawFormData: item,
479
+ parentDefaults: get(defaults, [idx]),
480
+ required,
481
+ shouldMergeDefaultsIntoFormData,
482
+ initialDefaultsGenerated,
483
+ }));
456
484
  // If the populate 'requiredOnly' flag is set then we only merge and include extra defaults if they are required.
457
485
  // Or if populate 'all' is set we merge and include extra defaults.
458
486
  const mergeExtraDefaults = ((ignoreMinItemsFlagSet && required) || isPopulateAll) && arrayMergeExtraDefaults;
459
487
  defaults = mergeDefaultsWithFormData(defaults, itemDefaults, mergeExtraDefaults);
460
488
  }
461
489
  }
490
+ const defaultsLength = Array.isArray(defaults) ? defaults.length : 0;
462
491
  if (neverPopulate) {
492
+ if (shouldMergeDefaultsIntoFormData) {
493
+ if (schema.minItems && schema.minItems > defaultsLength) {
494
+ const fillerEntries = Array.from({ length: schema.minItems - defaultsLength }, () => null);
495
+ return (defaults !== null && defaults !== void 0 ? defaults : []).concat(fillerEntries);
496
+ }
497
+ return defaults;
498
+ }
463
499
  return defaults !== null && defaults !== void 0 ? defaults : emptyDefault;
464
500
  }
465
501
  if (ignoreMinItemsFlagSet && !required) {
466
502
  // If no form data exists or defaults are set leave the field empty/non-existent, otherwise
467
503
  // return form data/defaults
468
- return defaults ? defaults : undefined;
504
+ return defaults || undefined;
469
505
  }
470
506
  let arrayDefault;
471
- const defaultsLength = Array.isArray(defaults) ? defaults.length : 0;
472
507
  if (!schema.minItems ||
473
508
  isMultiSelect(validator, schema, rootSchema, experimental_customMergeAllOf) ||
474
509
  computeSkipPopulate(validator, schema, rootSchema) ||
@@ -477,7 +512,7 @@ export function getArrayDefaults(validator, rawSchema, { rawFormData, rootSchema
477
512
  arrayDefault = defaults || (!required && !requiredAsRoot) ? defaults : emptyDefault;
478
513
  }
479
514
  else {
480
- const defaultEntries = (defaults || []);
515
+ const defaultEntries = defaults || [];
481
516
  const fillerSchema = getInnerSchemaForArrayItem(schema, AdditionalItemsHandling.Invert);
482
517
  const fillerDefault = fillerSchema.default;
483
518
  // Calculate filler entries for remaining items (minItems - existing raw data/defaults)
@@ -512,6 +547,8 @@ export function getDefaultBasedOnSchemaType(validator, rawSchema, computeDefault
512
547
  case 'array': {
513
548
  return getArrayDefaults(validator, rawSchema, computeDefaultsProps, defaults);
514
549
  }
550
+ default:
551
+ return undefined;
515
552
  }
516
553
  }
517
554
  /** Returns the superset of `formData` that includes the given set updated to include any missing fields that have
@@ -531,7 +568,7 @@ export function getDefaultBasedOnSchemaType(validator, rawSchema, computeDefault
531
568
  */
532
569
  export default function getDefaultFormState(validator, theSchema, formData, rootSchema, includeUndefinedValues = false, experimental_defaultFormStateBehavior, experimental_customMergeAllOf, initialDefaultsGenerated) {
533
570
  if (!isObject(theSchema)) {
534
- throw new Error('Invalid schema: ' + theSchema);
571
+ throw new Error(`Invalid schema: ${theSchema}`);
535
572
  }
536
573
  const schema = retrieveSchema(validator, theSchema, rootSchema, formData, experimental_customMergeAllOf);
537
574
  // Get the computed defaults with 'shouldMergeDefaultsIntoFormData' set to true to merge defaults into formData.
@@ -558,7 +595,8 @@ export default function getDefaultFormState(validator, theSchema, formData, root
558
595
  if (isObject(formData) || Array.isArray(formData)) {
559
596
  const { mergeDefaultsIntoFormData } = experimental_defaultFormStateBehavior || {};
560
597
  const defaultSupercedesUndefined = mergeDefaultsIntoFormData === 'useDefaultIfFormDataUndefined';
561
- const result = mergeDefaultsWithFormData(defaults, formData, true, // set to true to add any additional default array entries.
598
+ const matchingFormData = ensureFormDataMatchingSchema(validator, schema, rootSchema !== null && rootSchema !== void 0 ? rootSchema : schema, formData, experimental_defaultFormStateBehavior, experimental_customMergeAllOf);
599
+ const result = mergeDefaultsWithFormData(defaults, matchingFormData, true, // set to true to add any additional default array entries.
562
600
  defaultSupercedesUndefined, true);
563
601
  return result;
564
602
  }
@@ -1 +1 @@
1
- {"version":3,"file":"getDefaultFormState.js","sourceRoot":"","sources":["../../src/schema/getDefaultFormState.ts"],"names":[],"mappings":"AACA,OAAO,GAAG,MAAM,YAAY,CAAC;AAC7B,OAAO,OAAO,MAAM,gBAAgB,CAAC;AAErC,OAAO,EACL,UAAU,EACV,UAAU,EACV,SAAS,EACT,WAAW,EACX,gBAAgB,EAChB,MAAM,EACN,UAAU,EACV,cAAc,EACd,OAAO,GACR,MAAM,cAAc,CAAC;AACtB,OAAO,uBAAuB,MAAM,4BAA4B,CAAC;AACjE,OAAO,UAAU,MAAM,eAAe,CAAC;AACvC,OAAO,oBAAoB,MAAM,yBAAyB,CAAC;AAC3D,OAAO,+BAA+B,MAAM,oCAAoC,CAAC;AACjF,OAAO,aAAa,MAAM,kBAAkB,CAAC;AAC7C,OAAO,UAAU,MAAM,eAAe,CAAC;AACvC,OAAO,YAAY,MAAM,iBAAiB,CAAC;AAC3C,OAAO,QAAQ,MAAM,aAAa,CAAC;AACnC,OAAO,yBAAyB,MAAM,8BAA8B,CAAC;AACrE,OAAO,YAAY,MAAM,iBAAiB,CAAC;AAC3C,OAAO,YAAY,MAAM,iBAAiB,CAAC;AAC3C,OAAO,WAAW,MAAM,gBAAgB,CAAC;AAUzC,OAAO,wBAAwB,MAAM,4BAA4B,CAAC;AAClE,OAAO,aAAa,MAAM,iBAAiB,CAAC;AAC5C,OAAO,QAAQ,MAAM,YAAY,CAAC;AAClC,OAAO,cAAc,EAAE,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AAEvE,MAAM,eAAe,GAAG,CAAC,QAAQ,EAAE,QAAQ,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,CAAC,CAAC;AAE3E;GACG;AACH,MAAM,CAAN,IAAY,uBAIX;AAJD,WAAY,uBAAuB;IACjC,yEAAM,CAAA;IACN,yEAAM,CAAA;IACN,6EAAQ,CAAA;AACV,CAAC,EAJW,uBAAuB,KAAvB,uBAAuB,QAIlC;AAED;;;;;;;;;;;;;;GAcG;AACH,MAAM,UAAU,0BAA0B,CACxC,MAAS,EACT,kBAA2C,uBAAuB,CAAC,MAAM,EACzE,GAAG,GAAG,CAAC,CAAC;IAER,IAAI,GAAG,IAAI,CAAC,EAAE,CAAC;QACb,IAAI,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,GAAG,GAAG,MAAM,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC;YAC7D,MAAM,IAAI,GAAG,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YAC/B,IAAI,OAAO,IAAI,KAAK,SAAS,EAAE,CAAC;gBAC9B,OAAO,IAAS,CAAC;YACnB,CAAC;QACH,CAAC;IACH,CAAC;SAAM,IAAI,MAAM,CAAC,KAAK,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,OAAO,MAAM,CAAC,KAAK,KAAK,SAAS,EAAE,CAAC;QAC7F,OAAO,MAAM,CAAC,KAAU,CAAC;IAC3B,CAAC;IACD,IAAI,eAAe,KAAK,uBAAuB,CAAC,MAAM,IAAI,QAAQ,CAAC,MAAM,CAAC,eAAe,CAAC,EAAE,CAAC;QAC3F,OAAO,MAAM,CAAC,eAAoB,CAAC;IACrC,CAAC;IACD,OAAO,EAAO,CAAC;AACjB,CAAC;AAED;;;;;;;GAOG;AACH,MAAM,UAAU,0CAA0C,CACxD,MAAS,EACT,eAAkB;IAElB,MAAM,EAAE,OAAO,EAAE,aAAa,EAAE,IAAI,EAAE,GAAG,MAAM,CAAC;IAChD,MAAM,yBAAyB,GAC7B,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,IAAI,OAAO,CAAC,eAAe,CAAC,IAAI,aAAa,KAAK,IAAI,CAAC;IACrG,OAAO,yBAAyB,CAAC,CAAC,CAAE,IAAU,CAAC,CAAC,CAAC,eAAe,CAAC;AACnE,CAAC;AAED;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,SAAS,uBAAuB,CAC9B,GAAsB,EACtB,GAAW,EACX,eAAoC,EACpC,sBAAyD,EACzD,gBAA0B,EAC1B,iBAA2B,EAAE,EAC7B,wCAA+E,EAAE,EACjF,OAAO,GAAG,KAAK,EACf,UAAU,GAAG,KAAK;IAElB,MAAM,EAAE,iBAAiB,GAAG,qBAAqB,EAAE,GAAG,qCAAqC,CAAC;IAE5F,IAAI,sBAAsB,KAAK,IAAI,IAAI,OAAO,EAAE,CAAC;QAC/C,+CAA+C;QAC/C,oIAAoI;QACpI,GAAG,CAAC,GAAG,CAAC,GAAG,eAAe,CAAC;IAC7B,CAAC;SAAM,IAAI,sBAAsB,KAAK,uBAAuB,EAAE,CAAC;QAC9D,yGAAyG;QACzG,8FAA8F;QAC9F,IAAI,CAAC,UAAU,IAAI,eAAe,KAAK,SAAS,CAAC,IAAI,CAAC,QAAQ,CAAC,eAAe,CAAC,IAAI,CAAC,OAAO,CAAC,eAAe,CAAC,EAAE,CAAC;YAC7G,GAAG,CAAC,GAAG,CAAC,GAAG,eAAe,CAAC;QAC7B,CAAC;QACD,wFAAwF;IAC1F,CAAC;SAAM,IAAI,iBAAiB,KAAK,cAAc,EAAE,CAAC;QAChD,gHAAgH;QAChH,mDAAmD;QACnD,MAAM,sBAAsB,GAAG,gBAAgB,KAAK,SAAS,CAAC,CAAC,CAAC,cAAc,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,gBAAgB,CAAC;QAEhH,IAAI,QAAQ,CAAC,eAAe,CAAC,EAAE,CAAC;YAC9B,yGAAyG;YACzG,IAAI,iBAAiB,KAAK,mBAAmB,EAAE,CAAC;gBAC9C,IAAI,CAAC,OAAO,CAAC,eAAe,CAAC,EAAE,CAAC;oBAC9B,GAAG,CAAC,GAAG,CAAC,GAAG,eAAe,CAAC;gBAC7B,CAAC;YACH,CAAC,CAAC,sGAAsG;YACxG,iFAAiF;YACjF,uGAAuG;iBAClG,IACH,CAAC,CAAC,OAAO,CAAC,eAAe,CAAC,IAAI,cAAc,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;gBAC3D,CAAC,sBAAsB,IAAI,iBAAiB,KAAK,0BAA0B,CAAC,EAC5E,CAAC;gBACD,GAAG,CAAC,GAAG,CAAC,GAAG,eAAe,CAAC;YAC7B,CAAC;QACH,CAAC;aAAM;QACL,kGAAkG;QAClG,gDAAgD;QAChD,oFAAoF;QACpF,yEAAyE;QACzE,eAAe,KAAK,SAAS;YAC7B,CAAC,iBAAiB,KAAK,qBAAqB;gBAC1C,iBAAiB,KAAK,mBAAmB;gBACzC,CAAC,sBAAsB,IAAI,cAAc,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAC3D,CAAC;YACD,GAAG,CAAC,GAAG,CAAC,GAAG,eAAe,CAAC;QAC7B,CAAC;IACH,CAAC;AACH,CAAC;AAgCD;;;;;;;GAOG;AACH,MAAM,UAAU,eAAe,CAC7B,SAAiC,EACjC,SAAY,EACZ,uBAAmD,EAAE;IAErD,MAAM,EACJ,cAAc,EACd,WAAW,EACX,UAAU,GAAG,EAAO,EACpB,sBAAsB,GAAG,KAAK,EAC9B,YAAY,GAAG,EAAE,EACjB,qCAAqC,GAAG,SAAS,EACjD,6BAA6B,GAAG,SAAS,EACzC,QAAQ,EACR,+BAA+B,GAAG,KAAK,EACvC,wBAAwB,GACzB,GAAG,oBAAoB,CAAC;IACzB,IAAI,QAAQ,GAAM,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,EAAE,CAAM,CAAC;IAClE,MAAM,MAAM,GAAM,QAAQ,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAE,EAAQ,CAAC;IAC9D,4EAA4E;IAC5E,IAAI,QAAQ,GAAwB,cAAc,CAAC;IACnD,6FAA6F;IAC7F,IAAI,eAAe,GAAa,IAAI,CAAC;IACrC,IAAI,4BAA4B,GAAG,qCAAqC,CAAC;IACzE,IAAI,kBAAkB,GAAG,YAAY,CAAC;IACtC,IACE,MAAM,CAAC,SAAS,CAAC,KAAK,SAAS;QAC/B,CAAA,qCAAqC,aAArC,qCAAqC,uBAArC,qCAAqC,CAAE,eAAe,MAAK,OAAO;QAClE,CAAC,uBAAuB,CAAC,MAAM,CAAC,EAChC,CAAC;QACD,QAAQ,GAAG,MAAM,CAAC,SAAS,CAAiB,CAAC;IAC/C,CAAC;SAAM,IACL,QAAQ,CAAC,QAAQ,CAAC;QAClB,QAAQ,CAAC,MAAM,CAAC,OAAO,CAAC;QACxB,CAAC,MAAM,CAAC,UAAU,CAAC;QACnB,CAAC,MAAM,CAAC,UAAU,CAAC;QACnB,CAAC,MAAM,CAAC,OAAO,CAAC,EAChB,CAAC;QACD,yEAAyE;QACzE,uFAAuF;QACvF,QAAQ,GAAG,YAAY,CAAC,QAAS,EAAE,MAAM,CAAC,OAA4B,CAAM,CAAC;IAC/E,CAAC;SAAM,IAAI,WAAW,IAAI,MAAM,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,CAAC;QACnG,2EAA2E;QAC3E,wHAAwH;QACxH,QAAQ,GAAG,MAAM,CAAC,OAAuB,CAAC;IAC5C,CAAC;SAAM,IAAI,OAAO,IAAI,MAAM,EAAE,CAAC;QAC7B,MAAM,OAAO,GAAG,MAAM,CAAC,OAAO,CAAC,CAAC;QAChC,gDAAgD;QAChD,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,OAAQ,CAAC,EAAE,CAAC;YACrC,kBAAkB,GAAG,YAAY,CAAC,MAAM,CAAC,OAAQ,CAAC,CAAC;YACnD,eAAe,GAAG,oBAAoB,CAAI,OAAO,EAAE,UAAU,CAAC,CAAC;QACjE,CAAC;QAED,gEAAgE;QAChE,2EAA2E;QAC3E,yGAAyG;QACzG,6FAA6F;QAC7F,MAAM,iBAAiB,GAAG,WAAW,KAAK,SAAS,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,IAAI,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC;QACvG,IAAI,eAAe,IAAI,CAAC,QAAQ,IAAI,iBAAiB,EAAE,CAAC;YACtD,QAAQ,GAAG,MAAM,CAAC,OAAwB,CAAC;QAC7C,CAAC;QAED,6CAA6C;QAC7C,sEAAsE;QACtE,2CAA2C;QAC3C,IAAI,+BAA+B,IAAI,eAAe,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,EAAE,CAAC;YACjF,QAAQ,GAAG,WAAgB,CAAC;QAC9B,CAAC;IACH,CAAC;SAAM,IAAI,gBAAgB,IAAI,MAAM,EAAE,CAAC;QACtC,wGAAwG;QACxG,MAAM,eAAe,GAAM;YACzB,GAAG,2BAA2B,CAAC,SAAS,EAAE,MAAM,EAAE,oBAAoB,EAAE,QAAQ,CAAC;YACjF,GAAG,QAAQ;SACZ,CAAC;QACF,MAAM,cAAc,GAAG,mBAAmB,CACxC,SAAS,EACT,MAAM,EACN,UAAU,EACV,KAAK,EACL,EAAE,EACF,eAAe,EACf,6BAA6B,CAC9B,CAAC;QACF,eAAe,GAAG,cAAc,CAAC,CAAC,CAAC,CAAC,CAAC,mDAAmD;IAC1F,CAAC;SAAM,IAAI,YAAY,CAAC,MAAM,CAAC,EAAE,CAAC;QAChC,QAAQ,GAAI,MAAM,CAAC,KAAc,CAAC,GAAG,CAAC,CAAC,UAAa,EAAE,GAAW,EAAE,EAAE,CACnE,eAAe,CAAO,SAAS,EAAE,UAAU,EAAE;YAC3C,UAAU;YACV,sBAAsB;YACtB,YAAY;YACZ,qCAAqC;YACrC,6BAA6B;YAC7B,cAAc,EAAE,KAAK,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,cAAc,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,SAAS;YAC/E,WAAW,EAAE,QAAa;YAC1B,QAAQ;YACR,+BAA+B;SAChC,CAAC,CACI,CAAC;IACX,CAAC;SAAM,IAAI,UAAU,IAAI,MAAM,EAAE,CAAC;QAChC,MAAM,EAAE,KAAK,EAAE,GAAG,SAAS,EAAE,GAAG,MAAM,CAAC;QACvC,IAAI,KAAM,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACxB,OAAO,SAAS,CAAC;QACnB,CAAC;QACD,MAAM,aAAa,GAAG,+BAA+B,CAAI,MAAM,CAAC,CAAC;QACjE,MAAM,EAAE,IAAI,GAAG,MAAM,EAAE,GAAG,SAAS,CAAC;QACpC,IACE,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC;YACpB,eAAe,CAAC,QAAQ,CAAC,IAAI,CAAC;YAC9B,CAAA,4BAA4B,aAA5B,4BAA4B,uBAA5B,4BAA4B,CAAE,eAAe,MAAK,WAAW,EAC7D,CAAC;YACD,8GAA8G;YAC9G,4BAA4B,GAAG;gBAC7B,GAAG,4BAA4B;gBAC/B,eAAe,EAAE,OAAO;aACzB,CAAC;QACJ,CAAC;QACD,eAAe,GAAG,KAAM,CACtB,wBAAwB,CACtB,SAAS,EACT,UAAU,EACV,WAAW,aAAX,WAAW,cAAX,WAAW,GAAK,MAAM,CAAC,OAAa,EACpC,KAAY,EACZ,CAAC,EACD,aAAa,EACb,6BAA6B,CAC9B,CACG,CAAC;QACP,eAAe,GAAG,YAAY,CAAC,SAAS,EAAE,eAAe,CAAM,CAAC;IAClE,CAAC;SAAM,IAAI,UAAU,IAAI,MAAM,EAAE,CAAC;QAChC,MAAM,EAAE,KAAK,EAAE,GAAG,SAAS,EAAE,GAAG,MAAM,CAAC;QACvC,IAAI,KAAM,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACxB,OAAO,SAAS,CAAC;QACnB,CAAC;QACD,MAAM,aAAa,GAAG,+BAA+B,CAAI,MAAM,CAAC,CAAC;QACjE,eAAe,GAAG,KAAM,CACtB,wBAAwB,CACtB,SAAS,EACT,UAAU,EACV,WAAW,aAAX,WAAW,cAAX,WAAW,GAAK,MAAM,CAAC,OAAa,EACpC,KAAY,EACZ,CAAC,EACD,aAAa,EACb,6BAA6B,CAC9B,CACG,CAAC;QACP,eAAe,GAAG,YAAY,CAAC,SAAS,EAAE,eAAe,CAAM,CAAC;IAClE,CAAC;IAED,IAAI,eAAe,EAAE,CAAC;QACpB,OAAO,eAAe,CAAU,SAAS,EAAE,eAAe,EAAE;YAC1D,UAAU;YACV,sBAAsB;YACtB,YAAY,EAAE,kBAAkB;YAChC,qCAAqC,EAAE,4BAA4B;YACnE,6BAA6B;YAC7B,cAAc,EAAE,QAAyB;YACzC,WAAW,EAAE,CAAC,WAAW,aAAX,WAAW,cAAX,WAAW,GAAI,QAAQ,CAAM;YAC3C,QAAQ;YACR,+BAA+B;YAC/B,wBAAwB;SACzB,CAAC,CAAC;IACL,CAAC;IAED,qEAAqE;IACrE,IAAI,QAAQ,KAAK,SAAS,EAAE,CAAC;QAC3B,QAAQ,GAAG,MAAM,CAAC,OAAuB,CAAC;IAC5C,CAAC;IAED,MAAM,wBAAwB,GAAG,2BAA2B,CAAC,SAAS,EAAE,MAAM,EAAE,oBAAoB,EAAE,QAAQ,CAAC,CAAC;IAEhH,IAAI,oBAAoB,GAAG,wBAAwB,aAAxB,wBAAwB,cAAxB,wBAAwB,GAAI,QAAQ,CAAC;IAChE,yFAAyF;IACzF,IAAI,+BAA+B,EAAE,CAAC;QACpC,MAAM,EAAE,aAAa,GAAG,EAAE,EAAE,GAAG,qCAAqC,IAAI,EAAE,CAAC;QAC3E,MAAM,EAAE,kBAAkB,EAAE,GAAG,aAAa,CAAC;QAE7C,MAAM,gBAAgB,GAAG,4BAA4B,CACnD,SAAS,EACT,MAAM,EACN,UAAU,EACV,WAAW,EACX,qCAAqC,EACrC,6BAA6B,CAC9B,CAAC;QACF,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,IAAI,UAAU,IAAI,MAAM,EAAE,CAAC;YACnD,6HAA6H;YAC7H,+HAA+H;YAC/H,oBAAoB,GAAG,yBAAyB,CAC9C,oBAAyB,EACzB,gBAAqB,EACrB,kBAAkB,EAClB,IAAI,CACA,CAAC;QACT,CAAC;IACH,CAAC;IAED,OAAO,oBAAoB,CAAC;AAC9B,CAAC;AAED;;;;;;;;;;GAUG;AACH,MAAM,UAAU,4BAA4B,CAK1C,SAAiC,EACjC,MAAS,EACT,UAAa,EACb,QAAuB,EACvB,qCAA6E,EAC7E,6BAAgE;IAEhE,MAAM,aAAa,GACjB,CAAC,UAAU,CAAI,MAAM,CAAC,IAAI,QAAQ,CAAU,SAAS,EAAE,MAAM,EAAE,UAAU,EAAE,6BAA6B,CAAC,CAAC;IAC5G,IAAI,aAAa,GAAwB,QAAQ,CAAC;IAClD,IAAI,aAAa,EAAE,CAAC;QAClB,MAAM,cAAc,GAAG,WAAW,CAAU,MAAM,CAAC,CAAC;QACpD,MAAM,OAAO,GAAG,cAAc,aAAd,cAAc,uBAAd,cAAc,CAAE,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,UAAU,CAAC,MAAM,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC,CAAC;QACrF,aAAa,GAAG,OAAO,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,SAAS,CAAC;IACjD,CAAC;IAED,+EAA+E;IAC/E,MAAM,oBAAoB,GAAG,MAAM,CAAC,SAAS,CAAC,IAAI,CAAA,qCAAqC,aAArC,qCAAqC,uBAArC,qCAAqC,CAAE,eAAe,MAAK,QAAQ,CAAC;IACtH,IAAI,oBAAoB,EAAE,CAAC;QACzB,aAAa,GAAG,MAAM,CAAC,KAAU,CAAC;IACpC,CAAC;IAED,OAAO,aAAa,CAAC;AACvB,CAAC;AAED;;;;;;;GAOG;AACH,MAAM,UAAU,iBAAiB,CAC/B,SAAiC,EACjC,SAAY,EACZ,EACE,WAAW,EACX,UAAU,GAAG,EAAO,EACpB,sBAAsB,GAAG,KAAK,EAC9B,YAAY,GAAG,EAAE,EACjB,qCAAqC,GAAG,SAAS,EACjD,6BAA6B,GAAG,SAAS,EACzC,QAAQ,EACR,+BAA+B,EAC/B,wBAAwB,MACM,EAAE,EAClC,QAAkB;IAElB,CAAC;QACC,MAAM,QAAQ,GAAM,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,EAAE,CAAM,CAAC;QACpE,MAAM,MAAM,GAAM,SAAS,CAAC;QAC5B,uBAAuB;QACvB,8GAA8G;QAC9G,4FAA4F;QAC5F,8EAA8E;QAC9E,MAAM,oBAAoB,GACxB,CAAC,CAAA,qCAAqC,aAArC,qCAAqC,uBAArC,qCAAqC,CAAE,KAAK,MAAK,kBAAkB,IAAI,UAAU,IAAI,MAAM,CAAC;YAC7F,CAAC,CAAA,qCAAqC,aAArC,qCAAqC,uBAArC,qCAAqC,CAAE,iBAAiB,MAAK,mBAAmB,IAAI,MAAM,IAAI,MAAM,CAAC,CAAC;QACzG,MAAM,eAAe,GAAG,oBAAoB;YAC1C,CAAC,CAAC,cAAc,CAAU,SAAS,EAAE,MAAM,EAAE,UAAU,EAAE,QAAQ,EAAE,6BAA6B,CAAC;YACjG,CAAC,CAAC,MAAM,CAAC;QACX,MAAM,WAAW,GAAG,eAAe,CAAC,SAAS,CAAC,CAAC;QAC/C,MAAM,cAAc,GAAG,MAAM,CAAC,IAAI,CAAC,eAAe,CAAC,UAAU,IAAI,EAAE,CAAC,CAAC,MAAM,CACzE,CAAC,GAAsB,EAAE,GAAW,EAAE,EAAE;;YACtC,MAAM,cAAc,GAAM,GAAG,CAAC,eAAe,EAAE,CAAC,cAAc,EAAE,GAAG,CAAC,EAAE,EAAE,CAAM,CAAC;YAC/E,2GAA2G;YAC3G,6EAA6E;YAC7E,MAAM,cAAc,GAAG,QAAQ,CAAC,WAAW,CAAC,IAAK,WAAiC,CAAC,GAAG,CAAC,KAAK,SAAS,CAAC;YACtG,MAAM,QAAQ,GACZ,CAAC,CAAC,QAAQ,CAAC,cAAc,CAAC,IAAI,SAAS,IAAI,cAAc,CAAC,IAAI,cAAc,CAAC;gBAC7E,CAAA,qCAAqC,aAArC,qCAAqC,uBAArC,qCAAqC,CAAE,eAAe,MAAK,OAAO;gBAClE,CAAC,uBAAuB,CAAC,cAAc,CAAC,CAAC;YAC3C,wEAAwE;YACxE,2CAA2C;YAC3C,MAAM,eAAe,GAAG,eAAe,CAAU,SAAS,EAAE,cAAc,EAAE;gBAC1E,UAAU;gBACV,YAAY;gBACZ,qCAAqC;gBACrC,6BAA6B;gBAC7B,sBAAsB,EAAE,sBAAsB,KAAK,IAAI;gBACvD,cAAc,EAAE,GAAG,CAAC,QAAQ,EAAE,CAAC,GAAG,CAAC,CAAC;gBACpC,WAAW,EAAE,GAAG,CAAC,QAAQ,EAAE,CAAC,GAAG,CAAC,CAAC;gBACjC,QAAQ,EAAE,MAAA,eAAe,CAAC,QAAQ,0CAAE,QAAQ,CAAC,GAAG,CAAC;gBACjD,+BAA+B;gBAC/B,wBAAwB;aACzB,CAAC,CAAC;YAEH,uBAAuB,CACrB,GAAG,EACH,GAAG,EACH,eAAe,EACf,sBAAsB,EACtB,QAAQ,EACR,eAAe,CAAC,QAAQ,EACxB,qCAAqC,EACrC,QAAQ,EACR,CAAA,cAAc,aAAd,cAAc,uBAAd,cAAc,CAAE,IAAI,MAAK,MAAM,CAChC,CAAC;YAEF,OAAO,GAAG,CAAC;QACb,CAAC,EACD,EAAE,CACE,CAAC;QACP,IAAI,eAAe,CAAC,oBAAoB,IAAI,CAAC,wBAAwB,EAAE,CAAC;YACtE,mEAAmE;YACnE,MAAM,0BAA0B,GAAG,QAAQ,CAAC,eAAe,CAAC,oBAAoB,CAAC;gBAC/E,CAAC,CAAC,eAAe,CAAC,oBAAoB;gBACtC,CAAC,CAAC,EAAE,CAAC;YAEP,MAAM,IAAI,GAAG,IAAI,GAAG,EAAU,CAAC;YAC/B,MAAM,gBAAgB,GAAa,EAAE,CAAC;YACtC,MAAM,CAAC,IAAI,CAAC,QAA6B,CAAC;iBACvC,MAAM,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,eAAe,CAAC,UAAU,IAAI,CAAC,eAAe,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC;iBAChF,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE;gBACf,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;gBACd,gBAAgB,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;YAC7B,CAAC,CAAC,CAAC;YACL,4FAA4F;YAC5F,uFAAuF;YACvF,yDAAyD;YACzD,IAAI,QAAQ,CAAC,QAAQ,CAAC,IAAI,gBAAgB,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;gBACxD,MAAM,CAAC,IAAI,CAAC,QAA6B,CAAC;qBACvC,MAAM,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,eAAe,CAAC,UAAU,IAAI,CAAC,eAAe,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC;qBAChF,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC;YACrC,CAAC;YACD,IAAI,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE;;gBACnB,MAAM,eAAe,GAAG,eAAe,CAAC,SAAS,EAAE,0BAA+B,EAAE;oBAClF,UAAU;oBACV,YAAY;oBACZ,qCAAqC;oBACrC,6BAA6B;oBAC7B,sBAAsB,EAAE,sBAAsB,KAAK,IAAI;oBACvD,cAAc,EAAE,GAAG,CAAC,QAAQ,EAAE,CAAC,GAAG,CAAC,CAAC;oBACpC,WAAW,EAAE,GAAG,CAAC,QAAQ,EAAE,CAAC,GAAG,CAAC,CAAC;oBACjC,QAAQ,EAAE,MAAA,eAAe,CAAC,QAAQ,0CAAE,QAAQ,CAAC,GAAG,CAAC;oBACjD,+BAA+B;oBAC/B,wBAAwB;iBACzB,CAAC,CAAC;gBACH,8GAA8G;gBAC9G,uBAAuB,CACrB,cAAmC,EACnC,GAAG,EACH,eAAe,EACf,sBAAsB,EACtB,QAAQ,EACR,gBAAgB,CACjB,CAAC;YACJ,CAAC,CAAC,CAAC;QACL,CAAC;QACD,OAAO,0CAA0C,CAAO,SAAS,EAAE,cAAc,CAAC,CAAC;IACrF,CAAC;AACH,CAAC;AAED;;;;;;;GAOG;AACH,MAAM,UAAU,gBAAgB,CAC9B,SAAiC,EACjC,SAAY,EACZ,EACE,WAAW,EACX,UAAU,GAAG,EAAO,EACpB,YAAY,GAAG,EAAE,EACjB,qCAAqC,GAAG,SAAS,EACjD,6BAA6B,GAAG,SAAS,EACzC,QAAQ,EACR,cAAc,GAAG,KAAK,EACtB,+BAA+B,EAC/B,wBAAwB,MACM,EAAE,EAClC,QAAc;;IAEd,MAAM,MAAM,GAAM,SAAS,CAAC;IAE5B,MAAM,0BAA0B,GAAG,MAAA,qCAAqC,aAArC,qCAAqC,uBAArC,qCAAqC,CAAE,aAAa,mCAAI,EAAE,CAAC;IAC9F,MAAM,EAAE,QAAQ,EAAE,qBAAqB,EAAE,kBAAkB,EAAE,uBAAuB,EAAE,GAAG,0BAA0B,CAAC;IAEpH,MAAM,aAAa,GAAG,qBAAqB,KAAK,OAAO,CAAC;IACxD,MAAM,qBAAqB,GAAG,qBAAqB,KAAK,cAAc,CAAC;IACvE,MAAM,aAAa,GAAG,qBAAqB,KAAK,KAAK,IAAI,CAAC,CAAC,aAAa,IAAI,CAAC,qBAAqB,CAAC,CAAC;IACpG,MAAM,mBAAmB,GAAG,MAAA,0BAA0B,aAA1B,0BAA0B,uBAA1B,0BAA0B,CAAE,mBAAmB,mCAAI,CAAC,GAAG,EAAE,CAAC,KAAK,CAAC,CAAC;IAC7F,MAAM,mBAAmB,GAAG,CAAA,qCAAqC,aAArC,qCAAqC,uBAArC,qCAAqC,CAAE,iBAAiB,MAAK,mBAAmB,CAAC;IAE7G,MAAM,YAAY,GAAoB,mBAAmB,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC;IAE3E,+CAA+C;IAC/C,IAAI,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,CAAC;QAC5B,QAAQ,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,GAAG,EAAE,EAAE;YACpC,MAAM,UAAU,GAAM,0BAA0B,CAAI,MAAM,EAAE,uBAAuB,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC;YACnG,MAAM,YAAY,GAAG,KAAK,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;YAC/E,OAAO,eAAe,CAAU,SAAS,EAAE,UAAU,EAAE;gBACrD,UAAU;gBACV,YAAY;gBACZ,qCAAqC;gBACrC,6BAA6B;gBAC7B,cAAc,EAAE,IAAI;gBACpB,WAAW,EAAE,YAAY;gBACzB,QAAQ;gBACR,+BAA+B;gBAC/B,wBAAwB;aACzB,CAAC,CAAC;QACL,CAAC,CAAQ,CAAC;IACZ,CAAC;IAED,yDAAyD;IACzD,IAAI,KAAK,CAAC,OAAO,CAAC,WAAW,CAAC,EAAE,CAAC;QAC/B,MAAM,UAAU,GAAM,0BAA0B,CAAI,MAAM,CAAC,CAAC;QAC5D,IAAI,aAAa,EAAE,CAAC;YAClB,QAAQ,GAAG,WAA8B,CAAC;QAC5C,CAAC;aAAM,CAAC;YACN,MAAM,YAAY,GAAG,WAAW,CAAC,GAAG,CAAC,CAAC,IAAO,EAAE,GAAW,EAAE,EAAE;gBAC5D,OAAO,eAAe,CAAU,SAAS,EAAE,UAAU,EAAE;oBACrD,UAAU;oBACV,YAAY;oBACZ,qCAAqC;oBACrC,6BAA6B;oBAC7B,WAAW,EAAE,IAAI;oBACjB,cAAc,EAAE,GAAG,CAAC,QAAQ,EAAE,CAAC,GAAG,CAAC,CAAC;oBACpC,QAAQ;oBACR,+BAA+B;oBAC/B,wBAAwB;iBACzB,CAAC,CAAC;YACL,CAAC,CAAQ,CAAC;YAEV,iHAAiH;YACjH,mEAAmE;YACnE,MAAM,kBAAkB,GAAG,CAAC,CAAC,qBAAqB,IAAI,QAAQ,CAAC,IAAI,aAAa,CAAC,IAAI,uBAAuB,CAAC;YAC7G,QAAQ,GAAG,yBAAyB,CAAC,QAAQ,EAAE,YAAY,EAAE,kBAAkB,CAAC,CAAC;QACnF,CAAC;IACH,CAAC;IAED,IAAI,aAAa,EAAE,CAAC;QAClB,OAAO,QAAQ,aAAR,QAAQ,cAAR,QAAQ,GAAI,YAAY,CAAC;IAClC,CAAC;IACD,IAAI,qBAAqB,IAAI,CAAC,QAAQ,EAAE,CAAC;QACvC,2FAA2F;QAC3F,4BAA4B;QAC5B,OAAO,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,SAAS,CAAC;IACzC,CAAC;IAED,IAAI,YAA6B,CAAC;IAClC,MAAM,cAAc,GAAG,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;IACrE,IACE,CAAC,MAAM,CAAC,QAAQ;QAChB,aAAa,CAAU,SAAS,EAAE,MAAM,EAAE,UAAU,EAAE,6BAA6B,CAAC;QACpF,mBAAmB,CAAU,SAAS,EAAE,MAAM,EAAE,UAAU,CAAC;QAC3D,MAAM,CAAC,QAAQ,IAAI,cAAc,EACjC,CAAC;QACD,0FAA0F;QAC1F,YAAY,GAAG,QAAQ,IAAI,CAAC,CAAC,QAAQ,IAAI,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,YAAY,CAAC;IACtF,CAAC;SAAM,CAAC;QACN,MAAM,cAAc,GAAQ,CAAC,QAAQ,IAAI,EAAE,CAAQ,CAAC;QACpD,MAAM,YAAY,GAAM,0BAA0B,CAAI,MAAM,EAAE,uBAAuB,CAAC,MAAM,CAAC,CAAC;QAC9F,MAAM,aAAa,GAAG,YAAY,CAAC,OAAO,CAAC;QAE3C,uFAAuF;QACvF,MAAM,aAAa,GAAQ,KAAK,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,MAAM,CAAC,QAAQ,GAAG,cAAc,EAAE,EAAE,GAAG,EAAE,CACvF,eAAe,CAAY,SAAS,EAAE,YAAY,EAAE;YAClD,cAAc,EAAE,aAAa;YAC7B,UAAU;YACV,YAAY;YACZ,qCAAqC;YACrC,6BAA6B;YAC7B,QAAQ;YACR,+BAA+B;SAChC,CAAC,CACI,CAAC;QACT,8EAA8E;QAC9E,YAAY,GAAG,cAAc,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC;IACtD,CAAC;IAED,OAAO,0CAA0C,CAAqB,SAAS,EAAE,YAAY,CAAC,CAAC;AACjG,CAAC;AAED;;;;;;;GAOG;AACH,MAAM,UAAU,2BAA2B,CAKzC,SAAiC,EACjC,SAAY,EACZ,uBAAmD,EAAE,EACrD,QAA8B;IAE9B,QAAQ,aAAa,CAAI,SAAS,CAAC,EAAE,CAAC;QACpC,6DAA6D;QAC7D,KAAK,QAAQ,CAAC,CAAC,CAAC;YACd,OAAO,iBAAiB,CAAC,SAAS,EAAE,SAAS,EAAE,oBAAoB,EAAE,QAAQ,CAAC,CAAC;QACjF,CAAC;QACD,KAAK,OAAO,CAAC,CAAC,CAAC;YACb,OAAO,gBAAgB,CAAC,SAAS,EAAE,SAAS,EAAE,oBAAoB,EAAE,QAAe,CAAC,CAAC;QACvF,CAAC;IACH,CAAC;AACH,CAAC;AAED;;;;;;;;;;;;;;GAcG;AACH,MAAM,CAAC,OAAO,UAAU,mBAAmB,CAKzC,SAAiC,EACjC,SAAY,EACZ,QAAY,EACZ,UAAc,EACd,yBAA4D,KAAK,EACjE,qCAA6E,EAC7E,6BAAgE,EAChE,wBAAkC;IAElC,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE,CAAC;QACzB,MAAM,IAAI,KAAK,CAAC,kBAAkB,GAAG,SAAS,CAAC,CAAC;IAClD,CAAC;IACD,MAAM,MAAM,GAAG,cAAc,CAAU,SAAS,EAAE,SAAS,EAAE,UAAU,EAAE,QAAQ,EAAE,6BAA6B,CAAC,CAAC;IAElH,gHAAgH;IAChH,8GAA8G;IAC9G,8FAA8F;IAC9F,MAAM,QAAQ,GAAG,eAAe,CAAU,SAAS,EAAE,MAAM,EAAE;QAC3D,UAAU;QACV,sBAAsB;QACtB,qCAAqC;QACrC,6BAA6B;QAC7B,WAAW,EAAE,QAAQ;QACrB,+BAA+B,EAAE,IAAI;QACrC,wBAAwB;QACxB,cAAc,EAAE,IAAI;KACrB,CAAC,CAAC;IAEH,IAAI,MAAM,CAAC,IAAI,KAAK,QAAQ,IAAI,QAAQ,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,CAAC;QACzD,OAAO;YACL,GAAG,QAAQ;YACX,GAAG,QAAQ;SACP,CAAC;IACT,CAAC;IAED,+GAA+G;IAC/G,gEAAgE;IAChE,IAAI,QAAQ,CAAC,QAAQ,CAAC,IAAI,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,CAAC;QAClD,MAAM,EAAE,yBAAyB,EAAE,GAAG,qCAAqC,IAAI,EAAE,CAAC;QAClF,MAAM,0BAA0B,GAAG,yBAAyB,KAAK,+BAA+B,CAAC;QACjG,MAAM,MAAM,GAAG,yBAAyB,CACtC,QAAQ,EACR,QAAQ,EACR,IAAI,EAAE,2DAA2D;QACjE,0BAA0B,EAC1B,IAAI,CACL,CAAC;QACF,OAAO,MAAM,CAAC;IAChB,CAAC;IAED,OAAO,QAAQ,CAAC;AAClB,CAAC"}
1
+ {"version":3,"file":"getDefaultFormState.js","sourceRoot":"","sources":["../../src/schema/getDefaultFormState.ts"],"names":[],"mappings":"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"}
@@ -1,4 +1,4 @@
1
- import { FormContextType, GlobalUISchemaOptions, RJSFSchema, StrictRJSFSchema, UiSchema, ValidatorType, Experimental_CustomMergeAllOf } from '../types.js';
1
+ import type { FormContextType, GlobalUISchemaOptions, RJSFSchema, StrictRJSFSchema, UiSchema, ValidatorType, Experimental_CustomMergeAllOf } from '../types.js';
2
2
  /** Determines whether the combination of `schema` and `uiSchema` properties indicates that the label for the `schema`
3
3
  * should be displayed in a UI.
4
4
  *
@@ -1,4 +1,3 @@
1
- import get from 'lodash-es/get.js';
2
1
  import { ADDITIONAL_PROPERTY_FLAG, UI_FIELD_KEY, UI_WIDGET_KEY } from '../constants.js';
3
2
  import getSchemaType from '../getSchemaType.js';
4
3
  import getUiOptions from '../getUiOptions.js';
@@ -22,7 +21,7 @@ export default function getDisplayLabel(validator, schema, uiSchema = {}, rootSc
22
21
  let displayLabel = Boolean(label);
23
22
  if (displayLabel) {
24
23
  const schemaType = getSchemaType(schema);
25
- const addedByAdditionalProperty = get(schema, ADDITIONAL_PROPERTY_FLAG, false);
24
+ const addedByAdditionalProperty = Boolean(schema[ADDITIONAL_PROPERTY_FLAG]);
26
25
  if (schemaType === 'array') {
27
26
  displayLabel =
28
27
  addedByAdditionalProperty ||
@@ -36,7 +35,7 @@ export default function getDisplayLabel(validator, schema, uiSchema = {}, rootSc
36
35
  if (schemaType === 'boolean' && uiSchema && !uiSchema[UI_WIDGET_KEY]) {
37
36
  displayLabel = false;
38
37
  }
39
- if (uiSchema && uiSchema[UI_FIELD_KEY]) {
38
+ if (uiSchema === null || uiSchema === void 0 ? void 0 : uiSchema[UI_FIELD_KEY]) {
40
39
  displayLabel = false;
41
40
  }
42
41
  }
@@ -1 +1 @@
1
- {"version":3,"file":"getDisplayLabel.js","sourceRoot":"","sources":["../../src/schema/getDisplayLabel.ts"],"names":[],"mappings":"AAAA,OAAO,GAAG,MAAM,YAAY,CAAC;AAE7B,OAAO,EAAE,wBAAwB,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AACrF,OAAO,aAAa,MAAM,kBAAkB,CAAC;AAC7C,OAAO,YAAY,MAAM,iBAAiB,CAAC;AAC3C,OAAO,cAAc,MAAM,mBAAmB,CAAC;AAU/C,OAAO,YAAY,MAAM,gBAAgB,CAAC;AAC1C,OAAO,aAAa,MAAM,iBAAiB,CAAC;AAE5C;;;;;;;;;;GAUG;AACH,MAAM,CAAC,OAAO,UAAU,eAAe,CAKrC,SAAiC,EACjC,MAAS,EACT,WAA8B,EAAE,EAChC,UAAc,EACd,aAAqC,EACrC,6BAAgE;IAEhE,MAAM,SAAS,GAAG,YAAY,CAAU,QAAQ,EAAE,aAAa,CAAC,CAAC;IACjE,MAAM,EAAE,KAAK,GAAG,IAAI,EAAE,GAAG,SAAS,CAAC;IACnC,IAAI,YAAY,GAAG,OAAO,CAAC,KAAK,CAAC,CAAC;IAClC,IAAI,YAAY,EAAE,CAAC;QACjB,MAAM,UAAU,GAAG,aAAa,CAAI,MAAM,CAAC,CAAC;QAC5C,MAAM,yBAAyB,GAAG,GAAG,CAAC,MAAM,EAAE,wBAAwB,EAAE,KAAK,CAAC,CAAC;QAE/E,IAAI,UAAU,KAAK,OAAO,EAAE,CAAC;YAC3B,YAAY;gBACV,yBAAyB;oBACzB,aAAa,CAAU,SAAS,EAAE,MAAM,EAAE,UAAU,EAAE,6BAA6B,CAAC;oBACpF,YAAY,CAAU,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAE,UAAU,EAAE,6BAA6B,CAAC;oBAC7F,cAAc,CAAC,QAAQ,CAAC,CAAC;QAC7B,CAAC;QAED,IAAI,UAAU,KAAK,QAAQ,EAAE,CAAC;YAC5B,YAAY,GAAG,yBAAyB,CAAC;QAC3C,CAAC;QACD,IAAI,UAAU,KAAK,SAAS,IAAI,QAAQ,IAAI,CAAC,QAAQ,CAAC,aAAa,CAAC,EAAE,CAAC;YACrE,YAAY,GAAG,KAAK,CAAC;QACvB,CAAC;QACD,IAAI,QAAQ,IAAI,QAAQ,CAAC,YAAY,CAAC,EAAE,CAAC;YACvC,YAAY,GAAG,KAAK,CAAC;QACvB,CAAC;IACH,CAAC;IACD,OAAO,YAAY,CAAC;AACtB,CAAC"}
1
+ {"version":3,"file":"getDisplayLabel.js","sourceRoot":"","sources":["../../src/schema/getDisplayLabel.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,wBAAwB,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AACrF,OAAO,aAAa,MAAM,kBAAkB,CAAC;AAC7C,OAAO,YAAY,MAAM,iBAAiB,CAAC;AAC3C,OAAO,cAAc,MAAM,mBAAmB,CAAC;AAW/C,OAAO,YAAY,MAAM,gBAAgB,CAAC;AAC1C,OAAO,aAAa,MAAM,iBAAiB,CAAC;AAE5C;;;;;;;;;;GAUG;AACH,MAAM,CAAC,OAAO,UAAU,eAAe,CAKrC,SAAiC,EACjC,MAAS,EACT,WAA8B,EAAE,EAChC,UAAc,EACd,aAAqC,EACrC,6BAAgE;IAEhE,MAAM,SAAS,GAAG,YAAY,CAAU,QAAQ,EAAE,aAAa,CAAC,CAAC;IACjE,MAAM,EAAE,KAAK,GAAG,IAAI,EAAE,GAAG,SAAS,CAAC;IACnC,IAAI,YAAY,GAAG,OAAO,CAAC,KAAK,CAAC,CAAC;IAClC,IAAI,YAAY,EAAE,CAAC;QACjB,MAAM,UAAU,GAAG,aAAa,CAAI,MAAM,CAAC,CAAC;QAC5C,MAAM,yBAAyB,GAAG,OAAO,CAAE,MAA2B,CAAC,wBAAwB,CAAC,CAAC,CAAC;QAElG,IAAI,UAAU,KAAK,OAAO,EAAE,CAAC;YAC3B,YAAY;gBACV,yBAAyB;oBACzB,aAAa,CAAU,SAAS,EAAE,MAAM,EAAE,UAAU,EAAE,6BAA6B,CAAC;oBACpF,YAAY,CAAU,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAE,UAAU,EAAE,6BAA6B,CAAC;oBAC7F,cAAc,CAAC,QAAQ,CAAC,CAAC;QAC7B,CAAC;QAED,IAAI,UAAU,KAAK,QAAQ,EAAE,CAAC;YAC5B,YAAY,GAAG,yBAAyB,CAAC;QAC3C,CAAC;QACD,IAAI,UAAU,KAAK,SAAS,IAAI,QAAQ,IAAI,CAAC,QAAQ,CAAC,aAAa,CAAC,EAAE,CAAC;YACrE,YAAY,GAAG,KAAK,CAAC;QACvB,CAAC;QACD,IAAI,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAG,YAAY,CAAC,EAAE,CAAC;YAC7B,YAAY,GAAG,KAAK,CAAC;QACvB,CAAC;IACH,CAAC;IACD,OAAO,YAAY,CAAC;AACtB,CAAC"}
@@ -1,4 +1,4 @@
1
- import { FormContextType, RJSFSchema, StrictRJSFSchema, ValidatorType } from '../types.js';
1
+ import type { FormContextType, RJSFSchema, StrictRJSFSchema, ValidatorType } from '../types.js';
2
2
  /** Given the `formData` and list of `options`, attempts to find the index of the first option that matches the data.
3
3
  * Always returns the first option if there is nothing that matches.
4
4
  *
@@ -24,7 +24,7 @@ export default function getFirstMatchingOption(validator, formData, options, roo
24
24
  if (isNumber(simpleDiscriminatorMatch)) {
25
25
  return simpleDiscriminatorMatch;
26
26
  }
27
- for (let i = 0; i < options.length; i++) {
27
+ for (let i = 0; i < options.length; i += 1) {
28
28
  const option = options[i];
29
29
  // If we have a discriminator field, then we will use this to make the determination
30
30
  if (discriminatorField && has(option, [PROPERTIES_KEY, discriminatorField])) {
@@ -66,7 +66,7 @@ export default function getFirstMatchingOption(validator, formData, options, roo
66
66
  augmentedSchema = shallowClone;
67
67
  }
68
68
  else {
69
- augmentedSchema = Object.assign({}, option, requiresAnyOf);
69
+ augmentedSchema = { ...option, ...requiresAnyOf };
70
70
  }
71
71
  // Remove the "required" field as it's likely that not all fields have
72
72
  // been filled in yet, which will mean that the schema is not valid
@@ -1 +1 @@
1
- {"version":3,"file":"getFirstMatchingOption.js","sourceRoot":"","sources":["../../src/schema/getFirstMatchingOption.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"getFirstMatchingOption.js","sourceRoot":"","sources":["../../src/schema/getFirstMatchingOption.ts"],"names":[],"mappings":"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"}
@@ -1,4 +1,4 @@
1
- import { Experimental_CustomMergeAllOf, FormContextType, RJSFSchema, SchemaFieldPath, StrictRJSFSchema, ValidatorType } from '../types.js';
1
+ import type { Experimental_CustomMergeAllOf, FormContextType, RJSFSchema, SchemaFieldPath, StrictRJSFSchema, ValidatorType } from '../types.js';
2
2
  /** Helper that acts like lodash's `get` but additionally retrieves `$ref`s as needed to get the path for schemas
3
3
  * containing potentially nested `$ref`s.
4
4
  *