@jsonforms/core 2.5.2 → 3.0.0-alpha.3

package/test/reducers/core.test.ts

@@ -23,35 +23,19 @@
   THE SOFTWARE.
 */
 import test from 'ava';
-import AJV from 'ajv';
-import RefParser from 'json-schema-ref-parser';
+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';
-
-const createRefParserOptions = (
-  encoding = 'testEncoding'
-): RefParser.Options => {
-  const parserOptions: RefParser.ParserOptions & { encoding?: string } = {
-    encoding
-  };
-  const myOptions: RefParser.Options = {
-    parse: {
-      text: parserOptions
-    }
-  };
-  return myOptions;
-};
+import { createAjv } from '../../src/util/validator';
 
 test('core reducer should support v7', t => {
   const schema: JsonSchema = {
@@ -75,7 +59,7 @@ test('core reducer should support v7', t => {
   t.is(after.errors.length, 1);
 });
 
-test('core reducer - no previous state - init without options should create new ajv and no ref parser options object', t => {
+test('core reducer - no previous state - init without options should create new ajv', t => {
   const schema: JsonSchema = {
     type: 'object',
     properties: {
@@ -87,7 +71,6 @@ test('core reducer - no previous state - init without options should create new
   };
   const after = coreReducer(undefined, init({}, schema, undefined, undefined));
   t.true(after.ajv !== undefined);
-  t.true(after.refParserOptions === undefined);
 });
 
 test('core reducer - no previous state - init with ajv as options object should use it', t => {
@@ -100,12 +83,9 @@ 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);
-  t.true(after.refParserOptions === undefined);
 });
 
 test('core reducer - no previous state - init with empty options object', t => {
@@ -120,7 +100,6 @@ test('core reducer - no previous state - init with empty options object', t => {
   };
   const after = coreReducer(undefined, init({}, schema, undefined, {}));
   t.true(after.ajv !== undefined);
-  t.true(after.refParserOptions === undefined);
 });
 
 test('core reducer - no previous state - init with options object with ajv', t => {
@@ -133,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, {
@@ -143,53 +120,6 @@ test('core reducer - no previous state - init with options object with ajv', t =
     })
   );
   t.deepEqual(after.ajv, myAjv);
-  t.true(after.refParserOptions === undefined);
-});
-
-test('core reducer - no previous state - init with options object with ref parser options', t => {
-  const schema: JsonSchema = {
-    type: 'object',
-    properties: {
-      foo: {
-        type: 'string',
-        const: 'bar'
-      }
-    }
-  };
-  const myOptions = createRefParserOptions();
-  const after = coreReducer(
-    undefined,
-    init({}, schema, undefined, {
-      refParserOptions: myOptions
-    })
-  );
-  t.true(after.ajv !== undefined);
-  t.deepEqual(after.refParserOptions, myOptions);
-});
-
-test('core reducer - no previous state - init with options object with ajv and ref parser options', t => {
-  const schema: JsonSchema = {
-    type: 'object',
-    properties: {
-      foo: {
-        type: 'string',
-        const: 'bar'
-      }
-    }
-  };
-  const myAjv = new AJV({
-    errorDataPath: 'mypath'
-  });
-  const myOptions = createRefParserOptions();
-  const after = coreReducer(
-    undefined,
-    init({}, schema, undefined, {
-      ajv: myAjv,
-      refParserOptions: myOptions
-    })
-  );
-  t.deepEqual(after.ajv, myAjv);
-  t.deepEqual(after.refParserOptions, myOptions);
 });
 
 test('core reducer - previous state - init without options should keep previous objects', t => {
@@ -202,10 +132,7 @@ test('core reducer - previous state - init without options should keep previous
       }
     }
   };
-  const myAjv = new AJV({
-    errorDataPath: 'mypath'
-  });
-  const myOptions = createRefParserOptions();
+  const myAjv = new Ajv();
   const after = coreReducer(
     {
       data: {},
@@ -214,15 +141,13 @@ test('core reducer - previous state - init without options should keep previous
         type: 'Label'
       },
       ajv: myAjv,
-      refParserOptions: myOptions
     },
     init({}, schema)
   );
   t.deepEqual(after.ajv, myAjv);
-  t.deepEqual(after.refParserOptions, myOptions);
 });
 
-test('core reducer - previous state - init with ajv options object should overwrite ajv and keep ref parser options', t => {
+test('core reducer - previous state - init with ajv options object should overwrite ajv', t => {
   const schema: JsonSchema = {
     type: 'object',
     properties: {
@@ -232,13 +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 myOptions = createRefParserOptions();
+  const previousAjv = new Ajv();
+  const newAjv = new Ajv();
   const after = coreReducer(
     {
       data: {},
@@ -247,117 +167,10 @@ test('core reducer - previous state - init with ajv options object should overwr
         type: 'Label'
       },
       ajv: previousAjv,
-      refParserOptions: myOptions
     },
     init({}, schema, undefined, newAjv)
   );
   t.deepEqual(after.ajv, newAjv);
-  t.deepEqual(after.refParserOptions, myOptions);
-});
-
-test('core reducer - previous state - init with options with ajv should overwrite ajv and keep ref parser options', t => {
-  const schema: JsonSchema = {
-    type: 'object',
-    properties: {
-      foo: {
-        type: 'string',
-        const: 'bar'
-      }
-    }
-  };
-  const previousAjv = new AJV({
-    errorDataPath: 'mypath'
-  });
-  const newAjv = new AJV({
-    errorDataPath: 'newajv'
-  });
-  const myOptions = createRefParserOptions();
-  const after = coreReducer(
-    {
-      data: {},
-      schema: {},
-      uischema: {
-        type: 'Label'
-      },
-      ajv: previousAjv,
-      refParserOptions: myOptions
-    },
-    init({}, schema, undefined, {
-      ajv: newAjv
-    })
-  );
-  t.deepEqual(after.ajv, newAjv);
-  t.deepEqual(after.refParserOptions, myOptions);
-});
-
-test('core reducer - previous state - init with options with ref parser options should overwrite ref parser options and keep ajv', t => {
-  const schema: JsonSchema = {
-    type: 'object',
-    properties: {
-      foo: {
-        type: 'string',
-        const: 'bar'
-      }
-    }
-  };
-  const myAjv = new AJV({
-    errorDataPath: 'mypath'
-  });
-  const previousOptions = createRefParserOptions();
-  const newOptions = createRefParserOptions('newEncoding');
-  const after = coreReducer(
-    {
-      data: {},
-      schema: {},
-      uischema: {
-        type: 'Label'
-      },
-      ajv: myAjv,
-      refParserOptions: previousOptions
-    },
-    init({}, schema, undefined, {
-      refParserOptions: newOptions
-    })
-  );
-  t.deepEqual(after.ajv, myAjv);
-  t.deepEqual(after.refParserOptions, newOptions);
-});
-
-test('core reducer - previous state - init with both options should overwrite both', t => {
-  const schema: JsonSchema = {
-    type: 'object',
-    properties: {
-      foo: {
-        type: 'string',
-        const: 'bar'
-      }
-    }
-  };
-  const previousAjv = new AJV({
-    errorDataPath: 'mypath'
-  });
-  const newAjv = new AJV({
-    errorDataPath: 'newajv'
-  });
-  const previousOptions = createRefParserOptions();
-  const newOptions = createRefParserOptions('newEncoding');
-  const after = coreReducer(
-    {
-      data: {},
-      schema: {},
-      uischema: {
-        type: 'Label'
-      },
-      ajv: previousAjv,
-      refParserOptions: previousOptions
-    },
-    init({}, schema, undefined, {
-      ajv: newAjv,
-      refParserOptions: newOptions
-    })
-  );
-  t.deepEqual(after.ajv, newAjv);
-  t.deepEqual(after.refParserOptions, newOptions);
 });
 
 test('core reducer - previous state - init with empty options should not overwrite', t => {
@@ -370,10 +183,7 @@ test('core reducer - previous state - init with empty options should not overwri
       }
     }
   };
-  const myAjv = new AJV({
-    errorDataPath: 'mypath'
-  });
-  const myOptions = createRefParserOptions();
+  const myAjv = new Ajv();
   const after = coreReducer(
     {
       data: {},
@@ -382,12 +192,10 @@ test('core reducer - previous state - init with empty options should not overwri
         type: 'Label'
       },
       ajv: myAjv,
-      refParserOptions: myOptions
     },
     init({}, schema, undefined, {})
   );
   t.deepEqual(after.ajv, myAjv);
-  t.deepEqual(after.refParserOptions, myOptions);
 });
 
 test('core reducer - previous state - init with undefined data should not change data', t => {
@@ -458,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(
@@ -565,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(
@@ -606,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(
@@ -646,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(
@@ -661,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']
         },
@@ -693,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: {
@@ -735,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,
@@ -766,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,
@@ -815,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,
@@ -867,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,
@@ -915,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,
@@ -960,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,
@@ -996,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,
@@ -1035,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,
@@ -1089,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,
@@ -1141,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,
@@ -1190,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,
@@ -1239,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,
@@ -1286,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,
@@ -1335,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,
@@ -1621,7 +1429,6 @@ test('core reducer - update core - unchanged state properties should be unchange
   t.true(before.schema === afterDataUpdate.schema);
   t.true(before.ajv === afterDataUpdate.ajv);
   t.true(before.errors === afterDataUpdate.errors);
-  t.true(before.refParserOptions === afterDataUpdate.refParserOptions);
   t.true(before.uischema === afterDataUpdate.uischema);
   t.true(before.validationMode === afterDataUpdate.validationMode);
   t.true(before.validator === afterDataUpdate.validator);

package/test/util/cell.test.ts

@@ -30,7 +30,7 @@ import {
   defaultMapDispatchToControlProps,
   defaultMapStateToEnumCellProps,
   DispatchPropsOfCell,
-  mapStateToCellProps
+  mapStateToCellProps, mapStateToOneOfEnumCellProps, oneOfToEnumOptionMapper
 } from '../../src/util';
 import { UPDATE_DATA, UpdateAction } from '../../src/actions';
 import configureStore from 'redux-mock-store';
@@ -284,7 +284,38 @@ 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));
+  t.deepEqual(
+    props.options,
+    ['DE', 'IT', 'JP', 'US', 'RU', 'Other'].map(e => enumToEnumOptionMapper(e))
+  );
+  t.is(props.data, undefined);
+});
+
+
+test('mapStateToOneOfEnumCellProps - set one of options for dropdown list', t => {
+  const uischema: ControlElement = {
+    type: 'Control',
+    scope: '#/properties/country'
+  };
+  const ownProps = {
+    schema: {
+      oneOf: [
+        {
+          const: 'AU',
+          title: 'Australia'
+        },
+        {
+          const: 'NZ',
+          title: 'New Zealand'
+        }
+      ]
+    },
+    uischema,
+    path: 'country'
+  };
+
+  const props = mapStateToOneOfEnumCellProps(createState(uischema), ownProps);
+  t.deepEqual(props.options, [{title: 'Australia' , const: 'AU', }, { title: 'New Zealand', const: 'NZ' }].map(schema => oneOfToEnumOptionMapper(schema)));
   t.is(props.data, undefined);
 });