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

package/lib/util/schema.d.ts

@@ -1 +1,6 @@
+import { JsonSchema } from '../models';
 export declare const getFirstPrimitiveProp: (schema: any) => string;
+/**
+ * Tests whether the schema has an enum based on oneOf.
+ */
+export declare const isOneOfEnumSchema: (schema: JsonSchema) => boolean;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jsonforms/core",
-  "version": "3.1.0-alpha.2",
+  "version": "3.1.0-beta.0",
   "description": "Core module of JSON Forms",
   "repository": "https://github.com/eclipsesource/jsonforms",
   "bugs": "https://github.com/eclipsesource/jsonforms/issues",
@@ -99,5 +99,5 @@
     "typedoc": "^0.19.2",
     "typescript": "4.2.3"
   },
-  "gitHead": "1e1ccad5f7ebfaf80412c8af3e422faebb12d0d5"
+  "gitHead": "a5fdca6fb6afa9820eabe8051401785675f53ad7"
 }

package/src/generators/schema.ts

@@ -38,7 +38,7 @@ const distinct = (
 
   return properties.filter((item) => {
     const discriminatorValue = discriminator(item);
-    if (known.hasOwnProperty(discriminatorValue)) {
+    if (Object.prototype.hasOwnProperty.call(known, discriminatorValue)) {
       return false;
     } else {
       known[discriminatorValue] = true;
@@ -155,13 +155,17 @@ export const generateJsonSchema = (
     (optionName: string): boolean | string[] => {
       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);
           }
 

package/src/reducers/core.ts

@@ -45,7 +45,7 @@ import {
   UPDATE_CORE,
   UpdateCoreAction,
 } from '../actions';
-import { createAjv, Reducer } from '../util';
+import { createAjv, isOneOfEnumSchema, Reducer } from '../util';
 import type { JsonSchema, UISchemaElement } from '../models';
 
 export const validate = (
@@ -90,7 +90,10 @@ const initState: JsonFormsCore = {
 };
 
 const reuseAjvForSchema = (ajv: Ajv, schema: JsonSchema): Ajv => {
-  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;
@@ -389,7 +392,11 @@ export const errorsAt =
 
     return filter(errors, (error) => {
       // Filter errors that match any keyword that we don't want to show in the UI
-      if (filteredErrorKeywords.indexOf(error.keyword) !== -1) {
+      // but keep the errors for oneOf enums
+      if (
+        filteredErrorKeywords.indexOf(error.keyword) !== -1 &&
+        !isOneOfEnumSchema(error.parentSchema)
+      ) {
         return false;
       }
       const controlPath = getControlPath(error);
@@ -400,12 +407,13 @@ export const errorsAt =
       // In the primitive case the error's data path is the same for all subschemas:
       // It directly points to the property defining the anyOf/oneOf.
       // The same holds true for errors on the array level (e.g. min item amount).
-      // In contrast, this comparison must not be done for errors whose parent schema defines an object
+      // In contrast, this comparison must not be done for errors whose parent schema defines an object or a oneOf enum,
       // because the parent schema can never match the property schema (e.g. for 'required' checks).
       const parentSchema: JsonSchema | undefined = error.parentSchema;
       if (
         result &&
         !isObjectSchema(parentSchema) &&
+        !isOneOfEnumSchema(parentSchema) &&
         combinatorPaths.findIndex((p) => instancePath.startsWith(p)) !== -1
       ) {
         result = result && isEqual(parentSchema, schema);

package/src/testers/testers.ts

@@ -37,7 +37,12 @@ import type {
   JsonSchema,
   UISchemaElement,
 } from '../models';
-import { deriveTypes, hasType, resolveSchema } from '../util';
+import {
+  deriveTypes,
+  hasType,
+  isOneOfEnumSchema,
+  resolveSchema,
+} from '../util';
 
 /**
  * Constant that indicates that a tester is not capable of handling
@@ -320,17 +325,23 @@ export const isObjectControl = and(uiTypeIs('Control'), schemaTypeIs('object'));
 
 export const isAllOfControl = and(
   uiTypeIs('Control'),
-  schemaMatches((schema) => schema.hasOwnProperty('allOf'))
+  schemaMatches((schema) =>
+    Object.prototype.hasOwnProperty.call(schema, 'allOf')
+  )
 );
 
 export const isAnyOfControl = and(
   uiTypeIs('Control'),
-  schemaMatches((schema) => schema.hasOwnProperty('anyOf'))
+  schemaMatches((schema) =>
+    Object.prototype.hasOwnProperty.call(schema, 'anyOf')
+  )
 );
 
 export const isOneOfControl = and(
   uiTypeIs('Control'),
-  schemaMatches((schema) => schema.hasOwnProperty('oneOf'))
+  schemaMatches((schema) =>
+    Object.prototype.hasOwnProperty.call(schema, 'oneOf')
+  )
 );
 
 /**
@@ -341,8 +352,12 @@ export const isOneOfControl = and(
 export const isEnumControl = and(
   uiTypeIs('Control'),
   or(
-    schemaMatches((schema) => schema.hasOwnProperty('enum')),
-    schemaMatches((schema) => schema.hasOwnProperty('const'))
+    schemaMatches((schema) =>
+      Object.prototype.hasOwnProperty.call(schema, 'enum')
+    ),
+    schemaMatches((schema) =>
+      Object.prototype.hasOwnProperty.call(schema, 'const')
+    )
   )
 );
 
@@ -353,11 +368,7 @@ export const isEnumControl = and(
  */
 export const isOneOfEnumControl = and(
   uiTypeIs('Control'),
-  schemaMatches(
-    (schema) =>
-      schema.hasOwnProperty('oneOf') &&
-      (schema.oneOf as JsonSchema[]).every((s) => s.const !== undefined)
-  )
+  schemaMatches((schema) => isOneOfEnumSchema(schema))
 );
 
 /**
@@ -517,7 +528,7 @@ export const isObjectArrayWithNesting = (
           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')) {
@@ -591,9 +602,9 @@ export const isRangeControl = and(
   or(schemaTypeIs('number'), schemaTypeIs('integer')),
   schemaMatches(
     (schema) =>
-      schema.hasOwnProperty('maximum') &&
-      schema.hasOwnProperty('minimum') &&
-      schema.hasOwnProperty('default')
+      Object.prototype.hasOwnProperty.call(schema, 'maximum') &&
+      Object.prototype.hasOwnProperty.call(schema, 'minimum') &&
+      Object.prototype.hasOwnProperty.call(schema, 'default')
   ),
   optionIs('slider', true)
 );

package/src/util/resolvers.ts

@@ -49,7 +49,10 @@ export const resolveData = (instance: any, dataPath: string): any => {
   const dataPathSegments = dataPath.split('.');
 
   return dataPathSegments.reduce((curInstance, decodedSegment) => {
-    if (!curInstance || !curInstance.hasOwnProperty(decodedSegment)) {
+    if (
+      !curInstance ||
+      !Object.prototype.hasOwnProperty.call(curInstance, decodedSegment)
+    ) {
       return undefined;
     }
 

package/src/util/schema.ts

@@ -24,6 +24,7 @@
 */
 
 import find from 'lodash/find';
+import { JsonSchema } from '../models';
 
 export const getFirstPrimitiveProp = (schema: any) => {
   if (schema.properties) {
@@ -38,3 +39,12 @@ export const getFirstPrimitiveProp = (schema: any) => {
   }
   return undefined;
 };
+
+/**
+ * Tests whether the schema has an enum based on oneOf.
+ */
+export const isOneOfEnumSchema = (schema: JsonSchema) =>
+  !!schema &&
+  Object.prototype.hasOwnProperty.call(schema, 'oneOf') &&
+  schema.oneOf &&
+  (schema.oneOf as JsonSchema[]).every((s) => s.const !== undefined);