@jsonforms/core 3.1.0-alpha.2 → 3.1.0-beta.0

package/lib/jsonforms-core.cjs.js

@@ -58,7 +58,7 @@ var distinct = function (properties, discriminator) {
     var known = {};
     return properties.filter(function (item) {
         var discriminatorValue = discriminator(item);
-        if (known.hasOwnProperty(discriminatorValue)) {
+        if (Object.prototype.hasOwnProperty.call(known, discriminatorValue)) {
             return false;
         }
         else {
@@ -157,12 +157,12 @@ instance, options) {
         return function (optionName) {
             switch (optionName) {
                 case ADDITIONAL_PROPERTIES:
-                    if (options.hasOwnProperty(ADDITIONAL_PROPERTIES)) {
+                    if (Object.prototype.hasOwnProperty.call(options, ADDITIONAL_PROPERTIES)) {
                         return options[ADDITIONAL_PROPERTIES];
                     }
                     return true;
                 case REQUIRED_PROPERTIES:
-                    if (options.hasOwnProperty(REQUIRED_PROPERTIES)) {
+                    if (Object.prototype.hasOwnProperty.call(options, REQUIRED_PROPERTIES)) {
                         return options[REQUIRED_PROPERTIES](props);
                     }
                     return Object.keys(props);
@@ -471,7 +471,8 @@ var initState = {
     additionalErrors: [],
 };
 var reuseAjvForSchema = function (ajv, schema) {
-    if (schema.hasOwnProperty('id') || schema.hasOwnProperty('$id')) {
+    if (Object.prototype.hasOwnProperty.call(schema, 'id') ||
+        Object.prototype.hasOwnProperty.call(schema, '$id')) {
         ajv.removeSchema(schema);
     }
     return ajv;
@@ -659,7 +660,8 @@ var errorsAt = function (instancePath, schema, matchPath) {
     return function (errors) {
         var combinatorPaths = filter__default["default"](errors, function (error) { return error.keyword === 'oneOf' || error.keyword === 'anyOf'; }).map(function (error) { return getControlPath(error); });
         return filter__default["default"](errors, function (error) {
-            if (filteredErrorKeywords.indexOf(error.keyword) !== -1) {
+            if (filteredErrorKeywords.indexOf(error.keyword) !== -1 &&
+                !isOneOfEnumSchema(error.parentSchema)) {
                 return false;
             }
             var controlPath = getControlPath(error);
@@ -667,6 +669,7 @@ var errorsAt = function (instancePath, schema, matchPath) {
             var parentSchema = error.parentSchema;
             if (result &&
                 !isObjectSchema$1(parentSchema) &&
+                !isOneOfEnumSchema(parentSchema) &&
                 combinatorPaths.findIndex(function (p) { return instancePath.startsWith(p); }) !== -1) {
                 result = result && isEqual__default["default"](parentSchema, schema);
             }
@@ -1034,14 +1037,21 @@ var withIncreasedRank = function (by, rankedTester) {
 };
 var isBooleanControl = and(uiTypeIs('Control'), schemaTypeIs('boolean'));
 var isObjectControl = and(uiTypeIs('Control'), schemaTypeIs('object'));
-var isAllOfControl = and(uiTypeIs('Control'), schemaMatches(function (schema) { return schema.hasOwnProperty('allOf'); }));
-var isAnyOfControl = and(uiTypeIs('Control'), schemaMatches(function (schema) { return schema.hasOwnProperty('anyOf'); }));
-var isOneOfControl = and(uiTypeIs('Control'), schemaMatches(function (schema) { return schema.hasOwnProperty('oneOf'); }));
-var isEnumControl = and(uiTypeIs('Control'), or(schemaMatches(function (schema) { return schema.hasOwnProperty('enum'); }), schemaMatches(function (schema) { return schema.hasOwnProperty('const'); })));
-var isOneOfEnumControl = and(uiTypeIs('Control'), schemaMatches(function (schema) {
-    return schema.hasOwnProperty('oneOf') &&
-        schema.oneOf.every(function (s) { return s.const !== undefined; });
+var isAllOfControl = and(uiTypeIs('Control'), schemaMatches(function (schema) {
+    return Object.prototype.hasOwnProperty.call(schema, 'allOf');
+}));
+var isAnyOfControl = and(uiTypeIs('Control'), schemaMatches(function (schema) {
+    return Object.prototype.hasOwnProperty.call(schema, 'anyOf');
+}));
+var isOneOfControl = and(uiTypeIs('Control'), schemaMatches(function (schema) {
+    return Object.prototype.hasOwnProperty.call(schema, 'oneOf');
 }));
+var isEnumControl = and(uiTypeIs('Control'), or(schemaMatches(function (schema) {
+    return Object.prototype.hasOwnProperty.call(schema, 'enum');
+}), schemaMatches(function (schema) {
+    return Object.prototype.hasOwnProperty.call(schema, 'const');
+})));
+var isOneOfEnumControl = and(uiTypeIs('Control'), schemaMatches(function (schema) { return isOneOfEnumSchema(schema); }));
 var isIntegerControl = and(uiTypeIs('Control'), schemaTypeIs('integer'));
 var isNumberControl = and(uiTypeIs('Control'), schemaTypeIs('number'));
 var isStringControl = and(uiTypeIs('Control'), schemaTypeIs('string'));
@@ -1103,7 +1113,7 @@ var isObjectArrayWithNesting = function (uischema, schema, context) {
             if (val.anyOf || val.allOf) {
                 return true;
             }
-            if (val.oneOf && !isOneOfEnumControl(uischema, val, context)) {
+            if (val.oneOf && !isOneOfEnumSchema(val)) {
                 return true;
             }
             if (hasType(val, 'object')) {
@@ -1145,9 +1155,9 @@ var isPrimitiveArrayControl = and(uiTypeIs('Control'), schemaMatches(function (s
         includes__default["default"](['integer', 'number', 'boolean', 'string'], types[0]));
 }));
 var isRangeControl = and(uiTypeIs('Control'), or(schemaTypeIs('number'), schemaTypeIs('integer')), schemaMatches(function (schema) {
-    return schema.hasOwnProperty('maximum') &&
-        schema.hasOwnProperty('minimum') &&
-        schema.hasOwnProperty('default');
+    return Object.prototype.hasOwnProperty.call(schema, 'maximum') &&
+        Object.prototype.hasOwnProperty.call(schema, 'minimum') &&
+        Object.prototype.hasOwnProperty.call(schema, 'default');
 }), optionIs('slider', true));
 var isNumberFormatControl = and(uiTypeIs('Control'), schemaTypeIs('integer'), optionIs('format', true));
 var isCategorization = function (category) { return category.type === 'Categorization'; };
@@ -1379,7 +1389,8 @@ var resolveData = function (instance, dataPath) {
     }
     var dataPathSegments = dataPath.split('.');
     return dataPathSegments.reduce(function (curInstance, decodedSegment) {
-        if (!curInstance || !curInstance.hasOwnProperty(decodedSegment)) {
+        if (!curInstance ||
+            !Object.prototype.hasOwnProperty.call(curInstance, decodedSegment)) {
             return undefined;
         }
         return curInstance[decodedSegment];
@@ -2164,6 +2175,12 @@ var getFirstPrimitiveProp = function (schema) {
     }
     return undefined;
 };
+var isOneOfEnumSchema = function (schema) {
+    return !!schema &&
+        Object.prototype.hasOwnProperty.call(schema, 'oneOf') &&
+        schema.oneOf &&
+        schema.oneOf.every(function (s) { return s.const !== undefined; });
+};
 
 var setReadonlyPropertyValue = function (value) {
     return function (child) {
@@ -2609,6 +2626,7 @@ exports.isObjectArrayWithNesting = isObjectArrayWithNesting;
 exports.isObjectControl = isObjectControl;
 exports.isOneOfControl = isOneOfControl;
 exports.isOneOfEnumControl = isOneOfEnumControl;
+exports.isOneOfEnumSchema = isOneOfEnumSchema;
 exports.isPrimitiveArrayControl = isPrimitiveArrayControl;
 exports.isRangeControl = isRangeControl;
 exports.isScopable = isScopable;