@jsonforms/core 3.0.0-rc.0 → 3.0.0-rc.1

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 (14) hide show
  1. package/docs/globals.html +14 -14
  2. package/docs/interfaces/arraylayoutprops.html +2 -2
  3. package/docs/interfaces/labelprops.html +1 -1
  4. package/docs/interfaces/statepropsofarraylayout.html +2 -2
  5. package/docs/interfaces/statepropsoflabel.html +1 -1
  6. package/lib/jsonforms-core.cjs.js +11 -3
  7. package/lib/jsonforms-core.cjs.js.map +1 -1
  8. package/lib/jsonforms-core.esm.js +10 -2
  9. package/lib/jsonforms-core.esm.js.map +1 -1
  10. package/package.json +2 -2
  11. package/src/testers/testers.ts +3 -0
  12. package/src/util/renderer.ts +9 -3
  13. package/stats.html +1 -1
  14. package/test/testers.test.ts +55 -0
package/docs/globals.html CHANGED
@@ -1499,7 +1499,7 @@
1499
1499
  <div class="tsd-signature tsd-kind-icon">is<wbr>Array<wbr>Object<wbr>Control<span class="tsd-signature-symbol">:</span> <a href="globals.html#tester" class="tsd-signature-type">Tester</a><span class="tsd-signature-symbol"> = isObjectArrayControl</span></div>
1500
1500
  <aside class="tsd-sources">
1501
1501
  <ul>
1502
- <li>Defined in packages/core/src/testers/testers.ts:501</li>
1502
+ <li>Defined in packages/core/src/testers/testers.ts:504</li>
1503
1503
  </ul>
1504
1504
  </aside>
1505
1505
  <div class="tsd-comment tsd-typography">
@@ -1625,7 +1625,7 @@
1625
1625
  <div class="tsd-signature tsd-kind-icon">is<wbr>Number<wbr>Format<wbr>Control<span class="tsd-signature-symbol">:</span> <a href="globals.html#tester" class="tsd-signature-type">Tester</a><span class="tsd-signature-symbol"> = and(uiTypeIs(&#x27;Control&#x27;),schemaTypeIs(&#x27;integer&#x27;),optionIs(&#x27;format&#x27;, true))</span></div>
1626
1626
  <aside class="tsd-sources">
1627
1627
  <ul>
1628
- <li>Defined in packages/core/src/testers/testers.ts:548</li>
1628
+ <li>Defined in packages/core/src/testers/testers.ts:551</li>
1629
1629
  </ul>
1630
1630
  </aside>
1631
1631
  <div class="tsd-comment tsd-typography">
@@ -1708,7 +1708,7 @@
1708
1708
  <div class="tsd-signature tsd-kind-icon">is<wbr>Primitive<wbr>Array<wbr>Control<span class="tsd-signature-symbol">:</span> <a href="globals.html#tester" class="tsd-signature-type">Tester</a><span class="tsd-signature-symbol"> = and(uiTypeIs(&#x27;Control&#x27;),schemaMatches((schema, rootSchema) &#x3D;&gt;deriveTypes(schema).length !&#x3D;&#x3D; 0 &amp;&amp;!Array.isArray(resolveSchema(schema, &#x27;items&#x27;, rootSchema)) // we don&#x27;t care about tuples),schemaSubPathMatches(&#x27;items&#x27;, (schema, rootSchema) &#x3D;&gt; {const resolvedSchema &#x3D; schema.$ref ? resolveSchema(rootSchema, schema.$ref, rootSchema) : schema;const types &#x3D; deriveTypes(resolvedSchema);return (types.length &#x3D;&#x3D;&#x3D; 1 &amp;&amp;includes([&#x27;integer&#x27;, &#x27;number&#x27;, &#x27;boolean&#x27;, &#x27;string&#x27;], types[0]));}))</span></div>
1709
1709
  <aside class="tsd-sources">
1710
1710
  <ul>
1711
- <li>Defined in packages/core/src/testers/testers.ts:508</li>
1711
+ <li>Defined in packages/core/src/testers/testers.ts:511</li>
1712
1712
  </ul>
1713
1713
  </aside>
1714
1714
  <div class="tsd-comment tsd-typography">
@@ -1724,7 +1724,7 @@
1724
1724
  <div class="tsd-signature tsd-kind-icon">is<wbr>Range<wbr>Control<span class="tsd-signature-symbol">:</span> <a href="globals.html#tester" class="tsd-signature-type">Tester</a><span class="tsd-signature-symbol"> = and(uiTypeIs(&#x27;Control&#x27;),or(schemaTypeIs(&#x27;number&#x27;), schemaTypeIs(&#x27;integer&#x27;)),schemaMatches(schema &#x3D;&gt;schema.hasOwnProperty(&#x27;maximum&#x27;) &amp;&amp;schema.hasOwnProperty(&#x27;minimum&#x27;) &amp;&amp;schema.hasOwnProperty(&#x27;default&#x27;)),optionIs(&#x27;slider&#x27;, true))</span></div>
1725
1725
  <aside class="tsd-sources">
1726
1726
  <ul>
1727
- <li>Defined in packages/core/src/testers/testers.ts:531</li>
1727
+ <li>Defined in packages/core/src/testers/testers.ts:534</li>
1728
1728
  </ul>
1729
1729
  </aside>
1730
1730
  <div class="tsd-comment tsd-typography">
@@ -1925,7 +1925,7 @@
1925
1925
  <li class="tsd-description">
1926
1926
  <aside class="tsd-sources">
1927
1927
  <ul>
1928
- <li>Defined in packages/core/src/testers/testers.ts:573</li>
1928
+ <li>Defined in packages/core/src/testers/testers.ts:576</li>
1929
1929
  </ul>
1930
1930
  </aside>
1931
1931
  <h4 class="tsd-parameters-title">Parameters</h4>
@@ -4268,7 +4268,7 @@
4268
4268
  <li class="tsd-description">
4269
4269
  <aside class="tsd-sources">
4270
4270
  <ul>
4271
- <li>Defined in packages/core/src/testers/testers.ts:561</li>
4271
+ <li>Defined in packages/core/src/testers/testers.ts:564</li>
4272
4272
  </ul>
4273
4273
  </aside>
4274
4274
  <h4 class="tsd-parameters-title">Parameters</h4>
@@ -4530,7 +4530,7 @@
4530
4530
  <li class="tsd-description">
4531
4531
  <aside class="tsd-sources">
4532
4532
  <ul>
4533
- <li>Defined in packages/core/src/testers/testers.ts:554</li>
4533
+ <li>Defined in packages/core/src/testers/testers.ts:557</li>
4534
4534
  </ul>
4535
4535
  </aside>
4536
4536
  <h4 class="tsd-parameters-title">Parameters</h4>
@@ -4553,7 +4553,7 @@
4553
4553
  <li class="tsd-description">
4554
4554
  <aside class="tsd-sources">
4555
4555
  <ul>
4556
- <li>Defined in packages/core/src/testers/testers.ts:558</li>
4556
+ <li>Defined in packages/core/src/testers/testers.ts:561</li>
4557
4557
  </ul>
4558
4558
  </aside>
4559
4559
  <h4 class="tsd-parameters-title">Parameters</h4>
@@ -5360,7 +5360,7 @@
5360
5360
  <li class="tsd-description">
5361
5361
  <aside class="tsd-sources">
5362
5362
  <ul>
5363
- <li>Defined in packages/core/src/util/renderer.ts:986</li>
5363
+ <li>Defined in packages/core/src/util/renderer.ts:992</li>
5364
5364
  </ul>
5365
5365
  </aside>
5366
5366
  <div class="tsd-comment tsd-typography">
@@ -5402,7 +5402,7 @@
5402
5402
  <li class="tsd-description">
5403
5403
  <aside class="tsd-sources">
5404
5404
  <ul>
5405
- <li>Defined in packages/core/src/util/renderer.ts:992</li>
5405
+ <li>Defined in packages/core/src/util/renderer.ts:998</li>
5406
5406
  </ul>
5407
5407
  </aside>
5408
5408
  <h4 class="tsd-parameters-title">Parameters</h4>
@@ -5470,7 +5470,7 @@
5470
5470
  <li class="tsd-description">
5471
5471
  <aside class="tsd-sources">
5472
5472
  <ul>
5473
- <li>Defined in packages/core/src/util/renderer.ts:1017</li>
5473
+ <li>Defined in packages/core/src/util/renderer.ts:1023</li>
5474
5474
  </ul>
5475
5475
  </aside>
5476
5476
  <div class="tsd-comment tsd-typography">
@@ -5750,7 +5750,7 @@
5750
5750
  <li class="tsd-description">
5751
5751
  <aside class="tsd-sources">
5752
5752
  <ul>
5753
- <li>Defined in packages/core/src/util/renderer.ts:1069</li>
5753
+ <li>Defined in packages/core/src/util/renderer.ts:1075</li>
5754
5754
  </ul>
5755
5755
  </aside>
5756
5756
  <h4 class="tsd-parameters-title">Parameters</h4>
@@ -5969,7 +5969,7 @@
5969
5969
  <li class="tsd-description">
5970
5970
  <aside class="tsd-sources">
5971
5971
  <ul>
5972
- <li>Defined in packages/core/src/util/renderer.ts:999</li>
5972
+ <li>Defined in packages/core/src/util/renderer.ts:1005</li>
5973
5973
  </ul>
5974
5974
  </aside>
5975
5975
  <h4 class="tsd-parameters-title">Parameters</h4>
@@ -6076,7 +6076,7 @@
6076
6076
  <li class="tsd-description">
6077
6077
  <aside class="tsd-sources">
6078
6078
  <ul>
6079
- <li>Defined in packages/core/src/testers/testers.ts:576</li>
6079
+ <li>Defined in packages/core/src/testers/testers.ts:579</li>
6080
6080
  </ul>
6081
6081
  </aside>
6082
6082
  <h4 class="tsd-parameters-title">Parameters</h4>
package/docs/interfaces/arraylayoutprops.html CHANGED
@@ -163,7 +163,7 @@
163
163
  <p>Inherited from <a href="statepropsofarraylayout.html">StatePropsOfArrayLayout</a>.<a href="statepropsofarraylayout.html#data">data</a></p>
164
164
  <p>Overrides <a href="statepropsofscopedrenderer.html">StatePropsOfScopedRenderer</a>.<a href="statepropsofscopedrenderer.html#data">data</a></p>
165
165
  <ul>
166
- <li>Defined in packages/core/src/util/renderer.ts:1007</li>
166
+ <li>Defined in packages/core/src/util/renderer.ts:1013</li>
167
167
  </ul>
168
168
  </aside>
169
169
  </section>
@@ -254,7 +254,7 @@
254
254
  <aside class="tsd-sources">
255
255
  <p>Inherited from <a href="statepropsofarraylayout.html">StatePropsOfArrayLayout</a>.<a href="statepropsofarraylayout.html#minitems">minItems</a></p>
256
256
  <ul>
257
- <li>Defined in packages/core/src/util/renderer.ts:1008</li>
257
+ <li>Defined in packages/core/src/util/renderer.ts:1014</li>
258
258
  </ul>
259
259
  </aside>
260
260
  </section>
package/docs/interfaces/labelprops.html CHANGED
@@ -220,7 +220,7 @@
220
220
  <aside class="tsd-sources">
221
221
  <p>Inherited from <a href="statepropsoflabel.html">StatePropsOfLabel</a>.<a href="statepropsoflabel.html#text">text</a></p>
222
222
  <ul>
223
- <li>Defined in packages/core/src/util/renderer.ts:1064</li>
223
+ <li>Defined in packages/core/src/util/renderer.ts:1070</li>
224
224
  </ul>
225
225
  </aside>
226
226
  </section>
package/docs/interfaces/statepropsofarraylayout.html CHANGED
@@ -148,7 +148,7 @@
148
148
  <aside class="tsd-sources">
149
149
  <p>Overrides <a href="statepropsofscopedrenderer.html">StatePropsOfScopedRenderer</a>.<a href="statepropsofscopedrenderer.html#data">data</a></p>
150
150
  <ul>
151
- <li>Defined in packages/core/src/util/renderer.ts:1007</li>
151
+ <li>Defined in packages/core/src/util/renderer.ts:1013</li>
152
152
  </ul>
153
153
  </aside>
154
154
  </section>
@@ -238,7 +238,7 @@
238
238
  <div class="tsd-signature tsd-kind-icon">min<wbr>Items<span class="tsd-signature-symbol">:</span> <span class="tsd-signature-type">number</span></div>
239
239
  <aside class="tsd-sources">
240
240
  <ul>
241
- <li>Defined in packages/core/src/util/renderer.ts:1008</li>
241
+ <li>Defined in packages/core/src/util/renderer.ts:1014</li>
242
242
  </ul>
243
243
  </aside>
244
244
  </section>
package/docs/interfaces/statepropsoflabel.html CHANGED
@@ -224,7 +224,7 @@
224
224
  <div class="tsd-signature tsd-kind-icon">text<span class="tsd-signature-symbol">:</span> <span class="tsd-signature-type">string</span></div>
225
225
  <aside class="tsd-sources">
226
226
  <ul>
227
- <li>Defined in packages/core/src/util/renderer.ts:1064</li>
227
+ <li>Defined in packages/core/src/util/renderer.ts:1070</li>
228
228
  </ul>
229
229
  </aside>
230
230
  </section>
package/lib/jsonforms-core.cjs.js CHANGED
@@ -980,6 +980,9 @@ var isObjectArrayWithNesting = function (uischema, schema, context) {
980
980
  if (val.$ref !== undefined) {
981
981
  return false;
982
982
  }
983
+ if (val.anyOf || val.oneOf) {
984
+ return true;
985
+ }
983
986
  if (hasType(val, 'object')) {
984
987
  objectDepth++;
985
988
  if (objectDepth === 2) {
@@ -1800,7 +1803,7 @@ var mapStateToJsonFormsRendererProps = function (state, ownProps) {
1800
1803
  var controlDefaultProps = __assign(__assign({}, layoutDefaultProps), { errors: [] });
1801
1804
  var mapStateToCombinatorRendererProps = function (state, ownProps, keyword) {
1802
1805
  var _a;
1803
- var _b = mapStateToControlProps(state, ownProps), data = _b.data, schema = _b.schema, props = __rest(_b, ["data", "schema"]);
1806
+ var _b = mapStateToControlProps(state, ownProps), data = _b.data, schema = _b.schema, rootSchema = _b.rootSchema, props = __rest(_b, ["data", "schema", "rootSchema"]);
1804
1807
  var ajv = state.jsonforms.core.ajv;
1805
1808
  var structuralKeywords = [
1806
1809
  'required',
@@ -1817,7 +1820,11 @@ var mapStateToCombinatorRendererProps = function (state, ownProps, keyword) {
1817
1820
  var indexOfFittingSchema;
1818
1821
  for (var i = 0; i < ((_a = schema[keyword]) === null || _a === void 0 ? void 0 : _a.length); i++) {
1819
1822
  try {
1820
- var valFn = ajv.compile(schema[keyword][i]);
1823
+ var _schema = schema[keyword][i];
1824
+ if (_schema.$ref) {
1825
+ _schema = Resolve.schema(rootSchema, _schema.$ref, rootSchema);
1826
+ }
1827
+ var valFn = ajv.compile(_schema);
1821
1828
  valFn(data);
1822
1829
  if (dataIsValid(valFn.errors)) {
1823
1830
  indexOfFittingSchema = i;
@@ -1829,7 +1836,8 @@ var mapStateToCombinatorRendererProps = function (state, ownProps, keyword) {
1829
1836
  }
1830
1837
  }
1831
1838
  return __assign(__assign({ data: data,
1832
- schema: schema }, props), { indexOfFittingSchema: indexOfFittingSchema, uischemas: getUISchemas(state) });
1839
+ schema: schema,
1840
+ rootSchema: rootSchema }, props), { indexOfFittingSchema: indexOfFittingSchema, uischemas: getUISchemas(state) });
1833
1841
  };
1834
1842
  var mapStateToAllOfProps = function (state, ownProps) {
1835
1843
  return mapStateToCombinatorRendererProps(state, ownProps, 'allOf');