@rjsf/utils 5.13.2 → 5.13.4

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 (9) hide show
  1. package/dist/index.js +37 -10
  2. package/dist/index.js.map +2 -2
  3. package/dist/utils.esm.js +37 -10
  4. package/dist/utils.esm.js.map +2 -2
  5. package/dist/utils.umd.js +37 -10
  6. package/lib/schema/toPathSchema.js +19 -3
  7. package/lib/schema/toPathSchema.js.map +1 -1
  8. package/package.json +3 -4
  9. package/src/schema/toPathSchema.ts +38 -10
package/dist/utils.umd.js CHANGED
@@ -1384,16 +1384,43 @@
1384
1384
  set3(pathSchema, RJSF_ADDITONAL_PROPERTIES_FLAG, true);
1385
1385
  }
1386
1386
  if (ITEMS_KEY in schema && Array.isArray(formData)) {
1387
- formData.forEach((element, i) => {
1388
- pathSchema[i] = toPathSchemaInternal(
1389
- validator,
1390
- schema.items,
1391
- `${name}.${i}`,
1392
- rootSchema,
1393
- element,
1394
- _recurseList
1395
- );
1396
- });
1387
+ const { items: schemaItems, additionalItems: schemaAdditionalItems } = schema;
1388
+ if (Array.isArray(schemaItems)) {
1389
+ formData.forEach((element, i) => {
1390
+ if (schemaItems[i]) {
1391
+ pathSchema[i] = toPathSchemaInternal(
1392
+ validator,
1393
+ schemaItems[i],
1394
+ `${name}.${i}`,
1395
+ rootSchema,
1396
+ element,
1397
+ _recurseList
1398
+ );
1399
+ } else if (schemaAdditionalItems) {
1400
+ pathSchema[i] = toPathSchemaInternal(
1401
+ validator,
1402
+ schemaAdditionalItems,
1403
+ `${name}.${i}`,
1404
+ rootSchema,
1405
+ element,
1406
+ _recurseList
1407
+ );
1408
+ } else {
1409
+ console.warn(`Unable to generate path schema for "${name}.${i}". No schema defined for it`);
1410
+ }
1411
+ });
1412
+ } else {
1413
+ formData.forEach((element, i) => {
1414
+ pathSchema[i] = toPathSchemaInternal(
1415
+ validator,
1416
+ schemaItems,
1417
+ `${name}.${i}`,
1418
+ rootSchema,
1419
+ element,
1420
+ _recurseList
1421
+ );
1422
+ });
1423
+ }
1397
1424
  } else if (PROPERTIES_KEY in schema) {
1398
1425
  for (const property in schema.properties) {
1399
1426
  const field = get8(schema, [PROPERTIES_KEY, property]);
package/lib/schema/toPathSchema.js CHANGED
@@ -38,9 +38,25 @@ function toPathSchemaInternal(validator, schema, name, rootSchema, formData, _re
38
38
  set(pathSchema, RJSF_ADDITONAL_PROPERTIES_FLAG, true);
39
39
  }
40
40
  if (ITEMS_KEY in schema && Array.isArray(formData)) {
41
- formData.forEach((element, i) => {
42
- pathSchema[i] = toPathSchemaInternal(validator, schema.items, `${name}.${i}`, rootSchema, element, _recurseList);
43
- });
41
+ const { items: schemaItems, additionalItems: schemaAdditionalItems } = schema;
42
+ if (Array.isArray(schemaItems)) {
43
+ formData.forEach((element, i) => {
44
+ if (schemaItems[i]) {
45
+ pathSchema[i] = toPathSchemaInternal(validator, schemaItems[i], `${name}.${i}`, rootSchema, element, _recurseList);
46
+ }
47
+ else if (schemaAdditionalItems) {
48
+ pathSchema[i] = toPathSchemaInternal(validator, schemaAdditionalItems, `${name}.${i}`, rootSchema, element, _recurseList);
49
+ }
50
+ else {
51
+ console.warn(`Unable to generate path schema for "${name}.${i}". No schema defined for it`);
52
+ }
53
+ });
54
+ }
55
+ else {
56
+ formData.forEach((element, i) => {
57
+ pathSchema[i] = toPathSchemaInternal(validator, schemaItems, `${name}.${i}`, rootSchema, element, _recurseList);
58
+ });
59
+ }
44
60
  }
45
61
  else if (PROPERTIES_KEY in schema) {
46
62
  for (const property in schema.properties) {
package/lib/schema/toPathSchema.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"toPathSchema.js","sourceRoot":"","sources":["../../src/schema/toPathSchema.ts"],"names":[],"mappings":"AAAA,OAAO,GAAG,MAAM,YAAY,CAAC;AAC7B,OAAO,OAAO,MAAM,gBAAgB,CAAC;AACrC,OAAO,GAAG,MAAM,YAAY,CAAC;AAE7B,OAAO,EACL,UAAU,EACV,UAAU,EACV,yBAAyB,EACzB,gBAAgB,EAChB,SAAS,EACT,QAAQ,EACR,UAAU,EACV,cAAc,EACd,OAAO,EACP,8BAA8B,GAC/B,MAAM,cAAc,CAAC;AACtB,OAAO,+BAA+B,MAAM,oCAAoC,CAAC;AAEjF,OAAO,wBAAwB,MAAM,4BAA4B,CAAC;AAClE,OAAO,cAAc,MAAM,kBAAkB,CAAC;AAE9C;;;;;;;;;;GAUG;AACH,SAAS,oBAAoB,CAC3B,SAAiC,EACjC,MAAS,EACT,IAAY,EACZ,UAAc,EACd,QAAY,EACZ,eAAoB,EAAE;IAEtB,IAAI,OAAO,IAAI,MAAM,IAAI,gBAAgB,IAAI,MAAM,IAAI,UAAU,IAAI,MAAM,EAAE;QAC3E,MAAM,OAAO,GAAG,cAAc,CAAU,SAAS,EAAE,MAAM,EAAE,UAAU,EAAE,QAAQ,CAAC,CAAC;QACjF,MAAM,eAAe,GAAG,YAAY,CAAC,SAAS,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CAAC;QACjF,IAAI,eAAe,KAAK,CAAC,CAAC,EAAE;YAC1B,OAAO,oBAAoB,CACzB,SAAS,EACT,OAAO,EACP,IAAI,EACJ,UAAU,EACV,QAAQ,EACR,YAAY,CAAC,MAAM,CAAC,OAAO,CAAC,CAC7B,CAAC;SACH;KACF;IAED,IAAI,UAAU,GAAe;QAC3B,CAAC,QAAQ,CAAC,EAAE,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC;KACtB,CAAC;IAEhB,IAAI,UAAU,IAAI,MAAM,IAAI,UAAU,IAAI,MAAM,EAAE;QAChD,MAAM,KAAK,GAAQ,UAAU,IAAI,MAAM,CAAC,CAAC,CAAE,MAAM,CAAC,KAAa,CAAC,CAAC,CAAE,MAAM,CAAC,KAAa,CAAC;QACxF,MAAM,aAAa,GAAG,+BAA+B,CAAI,MAAM,CAAC,CAAC;QACjE,MAAM,KAAK,GAAG,wBAAwB,CAAU,SAAS,EAAE,UAAW,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC,EAAE,aAAa,CAAC,CAAC;QAC3G,MAAM,OAAO,GAAM,KAAM,CAAC,KAAK,CAAM,CAAC;QACtC,UAAU,mCACL,UAAU,GACV,oBAAoB,CAAU,SAAS,EAAE,OAAO,EAAE,IAAI,EAAE,UAAU,EAAE,QAAQ,EAAE,YAAY,CAAC,CAC/F,CAAC;KACH;IAED,IAAI,yBAAyB,IAAI,MAAM,IAAI,MAAM,CAAC,yBAAyB,CAAC,KAAK,KAAK,EAAE;QACtF,GAAG,CAAC,UAAU,EAAE,8BAA8B,EAAE,IAAI,CAAC,CAAC;KACvD;IAED,IAAI,SAAS,IAAI,MAAM,IAAI,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE;QAClD,QAAQ,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,CAAS,EAAE,EAAE;YACtC,UAAU,CAAC,CAAC,CAAC,GAAG,oBAAoB,CAClC,SAAS,EACT,MAAM,CAAC,KAAU,EACjB,GAAG,IAAI,IAAI,CAAC,EAAE,EACd,UAAU,EACV,OAAO,EACP,YAAY,CACb,CAAC;QACJ,CAAC,CAAC,CAAC;KACJ;SAAM,IAAI,cAAc,IAAI,MAAM,EAAE;QACnC,KAAK,MAAM,QAAQ,IAAI,MAAM,CAAC,UAAU,EAAE;YACxC,MAAM,KAAK,GAAG,GAAG,CAAC,MAAM,EAAE,CAAC,cAAc,EAAE,QAAQ,CAAC,CAAC,CAAC;YACtD,UAAU,CAAC,QAAQ,CAAC,GAAG,oBAAoB,CACzC,SAAS,EACT,KAAK,EACL,GAAG,IAAI,IAAI,QAAQ,EAAE,EACrB,UAAU;YACV,wEAAwE;YACxE,kEAAkE;YAClE,GAAG,CAAC,QAAQ,EAAE,CAAC,QAAQ,CAAC,CAAC,EACzB,YAAY,CACb,CAAC;SACH;KACF;IACD,OAAO,UAA2B,CAAC;AACrC,CAAC;AAED;;;;;;;;GAQG;AACH,MAAM,CAAC,OAAO,UAAU,YAAY,CAClC,SAAiC,EACjC,MAAS,EACT,IAAI,GAAG,EAAE,EACT,UAAc,EACd,QAAY;IAEZ,OAAO,oBAAoB,CAAC,SAAS,EAAE,MAAM,EAAE,IAAI,EAAE,UAAU,EAAE,QAAQ,CAAC,CAAC;AAC7E,CAAC"}
1
+ {"version":3,"file":"toPathSchema.js","sourceRoot":"","sources":["../../src/schema/toPathSchema.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@rjsf/utils",
3
- "version": "5.13.2",
3
+ "version": "5.13.4",
4
4
  "main": "dist/index.js",
5
5
  "module": "lib/index.js",
6
6
  "typings": "lib/index.d.ts",
@@ -29,8 +29,7 @@
29
29
  },
30
30
  "lint-staged": {
31
31
  "{src,test}/**/*.ts?(x)": [
32
- "eslint --fix",
33
- "prettier --write"
32
+ "eslint --fix"
34
33
  ]
35
34
  },
36
35
  "peerDependencies": {
@@ -86,5 +85,5 @@
86
85
  "url": "git+https://github.com/rjsf-team/react-jsonschema-form.git"
87
86
  },
88
87
  "license": "Apache-2.0",
89
- "gitHead": "4cfaa984c3343d9cbaabd147c5c24b2c01e28726"
88
+ "gitHead": "455e15cec74e9aa6ae15a182490d43771d26ccf9"
90
89
  }
package/src/schema/toPathSchema.ts CHANGED
@@ -73,16 +73,44 @@ function toPathSchemaInternal<T = any, S extends StrictRJSFSchema = RJSFSchema,
73
73
  }
74
74
 
75
75
  if (ITEMS_KEY in schema && Array.isArray(formData)) {
76
- formData.forEach((element, i: number) => {
77
- pathSchema[i] = toPathSchemaInternal<T, S, F>(
78
- validator,
79
- schema.items as S,
80
- `${name}.${i}`,
81
- rootSchema,
82
- element,
83
- _recurseList
84
- );
85
- });
76
+ const { items: schemaItems, additionalItems: schemaAdditionalItems } = schema;
77
+
78
+ if (Array.isArray(schemaItems)) {
79
+ formData.forEach((element, i: number) => {
80
+ if (schemaItems[i]) {
81
+ pathSchema[i] = toPathSchemaInternal<T, S, F>(
82
+ validator,
83
+ schemaItems[i] as S,
84
+ `${name}.${i}`,
85
+ rootSchema,
86
+ element,
87
+ _recurseList
88
+ );
89
+ } else if (schemaAdditionalItems) {
90
+ pathSchema[i] = toPathSchemaInternal<T, S, F>(
91
+ validator,
92
+ schemaAdditionalItems as S,
93
+ `${name}.${i}`,
94
+ rootSchema,
95
+ element,
96
+ _recurseList
97
+ );
98
+ } else {
99
+ console.warn(`Unable to generate path schema for "${name}.${i}". No schema defined for it`);
100
+ }
101
+ });
102
+ } else {
103
+ formData.forEach((element, i: number) => {
104
+ pathSchema[i] = toPathSchemaInternal<T, S, F>(
105
+ validator,
106
+ schemaItems as S,
107
+ `${name}.${i}`,
108
+ rootSchema,
109
+ element,
110
+ _recurseList
111
+ );
112
+ });
113
+ }
86
114
  } else if (PROPERTIES_KEY in schema) {
87
115
  for (const property in schema.properties) {
88
116
  const field = get(schema, [PROPERTIES_KEY, property]);