@jsonforms/core 3.0.0-alpha.0 → 3.0.0-beta.0

package/{lib/configDefault.js → test/i18n/i18nUtil.test.ts}

@@ -1,9 +1,7 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
 /*
   The MIT License
   
-  Copyright (c) 2017-2019 EclipseSource Munich
+  Copyright (c) 2017-2021 EclipseSource Munich
   https://github.com/eclipsesource/jsonforms
   
   Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -24,24 +22,27 @@ Object.defineProperty(exports, "__esModule", { value: true });
   OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
   THE SOFTWARE.
 */
-exports.configDefault = {
-    /*
-     * [text] whether to restrict the number of characters to maxLength,
-     * if specified in the JSON schema
-     */
-    restrict: false,
-    /*
-     * [text] whether to resize the input's width to maxLength,
-     * if specified in the JSON schema
-     */
-    trim: false,
-    /*
-     * [text] if input descriptions should hide when not focused
-     */
-    showUnfocusedDescription: false,
-    /*
-     * [text] if asterisks in labels for required fields should be hidden
-     */
-    hideRequiredAsterisk: false
-};
-//# sourceMappingURL=configDefault.js.map
+import test from 'ava';
+
+import { transformPathToI18nPrefix } from '../../src';
+
+test('transformPathToI18nPrefix returns root when empty', t => {
+  t.is(transformPathToI18nPrefix(''), 'root');
+});
+
+test('transformPathToI18nPrefix does not modify non-array paths', t => {
+  t.is(transformPathToI18nPrefix('foo'), 'foo');
+  t.is(transformPathToI18nPrefix('foo.bar'), 'foo.bar');
+  t.is(transformPathToI18nPrefix('bar3.foo2'), 'bar3.foo2');
+});
+
+test('transformPathToI18nPrefix removes array indices', t => {
+  t.is(transformPathToI18nPrefix('foo.2.bar'), 'foo.bar');
+  t.is(transformPathToI18nPrefix('foo.234324234.bar'), 'foo.bar');
+  t.is(transformPathToI18nPrefix('foo.0.bar'), 'foo.bar');
+  t.is(transformPathToI18nPrefix('foo.0.bar.1.foobar'), 'foo.bar.foobar');
+  t.is(transformPathToI18nPrefix('3.foobar'), 'foobar');
+  t.is(transformPathToI18nPrefix('foobar.3'), 'foobar');
+  t.is(transformPathToI18nPrefix('foo1.23.b2ar3.1.5.foo'), 'foo1.b2ar3.foo');
+  t.is(transformPathToI18nPrefix('3'), 'root');
+});

package/test/reducers/core.test.ts

@@ -23,20 +23,19 @@
   THE SOFTWARE.
 */
 import test from 'ava';
-import AJV from 'ajv';
+import Ajv from 'ajv';
 import { coreReducer } from '../../src/reducers';
-import { init, update, updateErrors } from '../../src/actions';
+import { init, setSchema, setValidationMode, update, updateCore, updateErrors } from '../../src/actions';
 import { JsonSchema } from '../../src/models/jsonSchema';
 import {
   errorAt,
   JsonFormsCore,
-  sanitizeErrors,
+  validate,
   subErrorsAt
 } from '../../src/reducers/core';
 
-import { createAjv, updateCore } from '../../src';
-import { setSchema, setValidationMode } from '../../lib';
 import { cloneDeep } from 'lodash';
+import { createAjv } from '../../src/util/validator';
 
 test('core reducer should support v7', t => {
   const schema: JsonSchema = {
@@ -84,9 +83,7 @@ test('core reducer - no previous state - init with ajv as options object should
       }
     }
   };
-  const myAjv = new AJV({
-    errorDataPath: 'mypath'
-  });
+  const myAjv = new Ajv();
   const after = coreReducer(undefined, init({}, schema, undefined, myAjv));
   t.deepEqual(after.ajv, myAjv);
 });
@@ -115,9 +112,7 @@ test('core reducer - no previous state - init with options object with ajv', t =
       }
     }
   };
-  const myAjv = new AJV({
-    errorDataPath: 'mypath'
-  });
+  const myAjv = new Ajv();
   const after = coreReducer(
     undefined,
     init({}, schema, undefined, {
@@ -137,9 +132,7 @@ test('core reducer - previous state - init without options should keep previous
       }
     }
   };
-  const myAjv = new AJV({
-    errorDataPath: 'mypath'
-  });
+  const myAjv = new Ajv();
   const after = coreReducer(
     {
       data: {},
@@ -164,12 +157,8 @@ test('core reducer - previous state - init with ajv options object should overwr
       }
     }
   };
-  const previousAjv = new AJV({
-    errorDataPath: 'mypath'
-  });
-  const newAjv = new AJV({
-    errorDataPath: 'newajv'
-  });
+  const previousAjv = new Ajv();
+  const newAjv = new Ajv();
   const after = coreReducer(
     {
       data: {},
@@ -194,9 +183,7 @@ test('core reducer - previous state - init with empty options should not overwri
       }
     }
   };
-  const myAjv = new AJV({
-    errorDataPath: 'mypath'
-  });
+  const myAjv = new Ajv();
   const after = coreReducer(
     {
       data: {},
@@ -279,7 +266,7 @@ test('core reducer - update - undefined data should update for given path', t =>
       type: 'Label'
     },
     errors: [],
-    validator: new AJV().compile(schema)
+    validator: new Ajv().compile(schema)
   };
 
   const after = coreReducer(
@@ -386,7 +373,7 @@ test('core reducer - update - empty path should update root state', t => {
     uischema: {
       type: 'Label'
     },
-    validator: new AJV().compile(schema)
+    validator: new Ajv().compile(schema)
   };
 
   const after = coreReducer(
@@ -427,7 +414,7 @@ test('core reducer - update - providing a path should update data only belonging
     uischema: {
       type: 'Label'
     },
-    validator: new AJV().compile(schema)
+    validator: new Ajv().compile(schema)
   };
 
   const after = coreReducer(
@@ -467,7 +454,7 @@ test('core reducer - update - should update errors', t => {
     uischema: {
       type: 'Label'
     },
-    validator: new AJV().compile(schema)
+    validator: new Ajv().compile(schema)
   };
 
   const after = coreReducer(
@@ -482,9 +469,9 @@ test('core reducer - update - should update errors', t => {
     data: { ...before.data, color: 'Yellow' },
     errors: [
       {
-        dataPath: 'color',
+        instancePath: '/color',
         keyword: 'enum',
-        message: 'should be equal to one of the allowed values',
+        message: 'must be equal to one of the allowed values',
         params: {
           allowedValues: ['Blue', 'Green']
         },
@@ -514,7 +501,7 @@ test('core reducer - updateErrors - should update errors with error', t => {
   };
 
   const error = {
-    dataPath: 'color',
+    instancePath: '/color',
     keyword: 'enum',
     message: 'should be equal to one of the allowed values',
     params: {
@@ -556,7 +543,7 @@ test('errorAt filters enum', t => {
   };
   const data = { foo: '', bar: '' };
   const v = ajv.compile(schema);
-  const errors = sanitizeErrors(v, data);
+  const errors = validate(v, data);
 
   const state: JsonFormsCore = {
     data,
@@ -587,7 +574,7 @@ test('errorAt filters required', t => {
   };
   const data = {};
   const v = ajv.compile(schema);
-  const errors = sanitizeErrors(v, data);
+  const errors = validate(v, data);
 
   const state: JsonFormsCore = {
     data,
@@ -636,7 +623,7 @@ test('errorAt filters required in oneOf object', t => {
   };
   const data = { fooOrBar: { } };
   const v = ajv.compile(schema);
-  const errors = sanitizeErrors(v, data);
+  const errors = validate(v, data);
 
   const state: JsonFormsCore = {
     data,
@@ -688,7 +675,7 @@ test('errorAt filters required in anyOf object', t => {
   };
   const data = { fooOrBar: { } };
   const v = ajv.compile(schema);
-  const errors = sanitizeErrors(v, data);
+  const errors = validate(v, data);
 
   const state: JsonFormsCore = {
     data,
@@ -736,7 +723,7 @@ test('errorAt filters array minItems', t => {
     numbers: []
   };
   const v = ajv.compile(schema);
-  const errors = sanitizeErrors(v, data);
+  const errors = validate(v, data);
 
   const state: JsonFormsCore = {
     data,
@@ -781,7 +768,7 @@ test('errorAt filters array inner value', t => {
     numbers: ['Bar']
   };
   const v = ajv.compile(schema);
-  const errors = sanitizeErrors(v, data);
+  const errors = validate(v, data);
 
   const state: JsonFormsCore = {
     data,
@@ -817,7 +804,7 @@ test('errorAt filters oneOf simple', t => {
   };
   const data: { coloursOrNumbers: string } = { coloursOrNumbers: 'Foo' };
   const v = ajv.compile(schema);
-  const errors = sanitizeErrors(v, data);
+  const errors = validate(v, data);
 
   const state: JsonFormsCore = {
     data,
@@ -856,7 +843,7 @@ test('errorAt filters anyOf simple', t => {
   };
   const data: { coloursOrNumbers: string } = { coloursOrNumbers: 'Foo' };
   const v = ajv.compile(schema);
-  const errors = sanitizeErrors(v, data);
+  const errors = validate(v, data);
 
   const state: JsonFormsCore = {
     data,
@@ -910,7 +897,7 @@ test('errorAt filters oneOf objects', t => {
   };
   const data = { coloursOrNumbers: { colour: 'Foo' } };
   const v = ajv.compile(schema);
-  const errors = sanitizeErrors(v, data);
+  const errors = validate(v, data);
 
   const state: JsonFormsCore = {
     data,
@@ -962,7 +949,7 @@ test('errorAt filters oneOf objects same properties', t => {
   };
   const data = { coloursOrNumbers: { colourOrNumber: 'Foo' } };
   const v = ajv.compile(schema);
-  const errors = sanitizeErrors(v, data);
+  const errors = validate(v, data);
 
   const state: JsonFormsCore = {
     data,
@@ -1011,7 +998,7 @@ test('errorAt filters oneOf array', t => {
   };
   const data: { coloursOrNumbers: string[] } = { coloursOrNumbers: [] };
   const v = ajv.compile(schema);
-  const errors = sanitizeErrors(v, data);
+  const errors = validate(v, data);
 
   const state: JsonFormsCore = {
     data,
@@ -1060,7 +1047,7 @@ test('errorAt filters oneOf array inner', t => {
   };
   const data: { coloursOrNumbers: string[] } = { coloursOrNumbers: ['Foo'] };
   const v = ajv.compile(schema);
-  const errors = sanitizeErrors(v, data);
+  const errors = validate(v, data);
 
   const state: JsonFormsCore = {
     data,
@@ -1107,7 +1094,7 @@ test('subErrorsAt filters array inner', t => {
     numbers: ['Bar']
   };
   const v = ajv.compile(schema);
-  const errors = sanitizeErrors(v, data);
+  const errors = validate(v, data);
 
   const state: JsonFormsCore = {
     data,
@@ -1156,7 +1143,7 @@ test('subErrorsAt filters oneOf array inner', t => {
   };
   const data: { coloursOrNumbers: string[] } = { coloursOrNumbers: ['Foo'] };
   const v = ajv.compile(schema);
-  const errors = sanitizeErrors(v, data);
+  const errors = validate(v, data);
 
   const state: JsonFormsCore = {
     data,

package/test/util/cell.test.ts

@@ -286,7 +286,7 @@ test('mapStateToEnumCellProps - set default options for dropdown list', t => {
   const props = defaultMapStateToEnumCellProps(createState(uischema), ownProps);
   t.deepEqual(
     props.options,
-    ['DE', 'IT', 'JP', 'US', 'RU', 'Other'].map(enumToEnumOptionMapper)
+    ['DE', 'IT', 'JP', 'US', 'RU', 'Other'].map(e => enumToEnumOptionMapper(e))
   );
   t.is(props.data, undefined);
 });
@@ -315,7 +315,7 @@ test('mapStateToOneOfEnumCellProps - set one of options for dropdown list', t =>
   };
 
   const props = mapStateToOneOfEnumCellProps(createState(uischema), ownProps);
-  t.deepEqual(props.options, [{title: 'Australia' , const: 'AU', }, { title: 'New Zealand', const: 'NZ' }].map(oneOfToEnumOptionMapper));
+  t.deepEqual(props.options, [{title: 'Australia' , const: 'AU', }, { title: 'New Zealand', const: 'NZ' }].map(schema => oneOfToEnumOptionMapper(schema)));
   t.is(props.data, undefined);
 });