@jsonforms/core 3.1.1-alpha.0 → 3.2.0-alpha.1

package/lib/models/uischema.d.ts

@@ -93,6 +93,18 @@ export interface LeafCondition extends Condition, Scoped {
 }
 export interface SchemaBasedCondition extends Condition, Scoped {
     schema: JsonSchema;
+    /**
+     * When the scope resolves to undefined and `failWhenUndefined` is set to `true`, the condition
+     * will fail. Therefore the reverse effect will be applied.
+     *
+     * Background:
+     * Most JSON Schemas will successfully validate against `undefined` data. Specifying that a
+     * condition shall fail when data is `undefined` requires to lift the scope to being able to use
+     * JSON Schema's `required`.
+     *
+     * Using `failWhenUndefined` allows to more conveniently express this condition.
+     */
+    failWhenUndefined?: boolean;
 }
 /**
  * A composable condition.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jsonforms/core",
-  "version": "3.1.1-alpha.0",
+  "version": "3.2.0-alpha.1",
   "description": "Core module of JSON Forms",
   "repository": "https://github.com/eclipsesource/jsonforms",
   "bugs": "https://github.com/eclipsesource/jsonforms/issues",
@@ -42,8 +42,8 @@
     "lint": "eslint .",
     "lint:fix": "eslint --fix .",
     "report": "nyc report --reporter=html",
-    "test": "cross-env TS_NODE_COMPILER_OPTIONS={\\\"module\\\":\\\"commonjs\\\",\\\"target\\\":\\\"es5\\\"} ava",
-    "test-cov": "rimraf -rf .nyc_output && cross-env TS_NODE_COMPILER_OPTIONS={\\\"module\\\":\\\"commonjs\\\",\\\"target\\\":\\\"es5\\\"} nyc ava",
+    "test": "ava",
+    "test-cov": "rimraf -rf .nyc_output && nyc ava",
     "doc": "typedoc --name 'JSON Forms Core' --excludeExternals --theme ../../typedoc-jsonforms --out docs src"
   },
   "ava": {
@@ -55,7 +55,7 @@
       "ts"
     ],
     "require": [
-      "ts-node/register",
+      "./test-config/ts-node.config.js",
       "source-map-support/register"
     ]
   },
@@ -77,7 +77,6 @@
     "@typescript-eslint/eslint-plugin": "^5.54.1",
     "@typescript-eslint/parser": "^5.54.1",
     "ava": "~2.4.0",
-    "cross-env": "^7.0.2",
     "document-register-element": "^1.14.3",
     "eslint": "^7.32.0",
     "eslint-config-prettier": "^8.7.0",
@@ -100,5 +99,5 @@
     "typedoc": "~0.21.9",
     "typescript": "4.2.3"
   },
-  "gitHead": "071b32056d62e9548fb2b300a3a173cdbcb5b69a"
+  "gitHead": "deb2c7cd71f6065cca7777420b1018f17e73052a"
 }

package/src/models/uischema.ts

@@ -135,6 +135,19 @@ export interface LeafCondition extends Condition, Scoped {
 
 export interface SchemaBasedCondition extends Condition, Scoped {
   schema: JsonSchema;
+
+  /**
+   * When the scope resolves to undefined and `failWhenUndefined` is set to `true`, the condition
+   * will fail. Therefore the reverse effect will be applied.
+   *
+   * Background:
+   * Most JSON Schemas will successfully validate against `undefined` data. Specifying that a
+   * condition shall fail when data is `undefined` requires to lift the scope to being able to use
+   * JSON Schema's `required`.
+   *
+   * Using `failWhenUndefined` allows to more conveniently express this condition.
+   */
+  failWhenUndefined?: boolean;
 }
 
 /**

package/src/util/combinators.ts

@@ -35,18 +35,6 @@ export interface CombinatorSubSchemaRenderInfo {
 
 export type CombinatorKeyword = 'anyOf' | 'oneOf' | 'allOf';
 
-const createLabel = (
-  subSchema: JsonSchema,
-  subSchemaIndex: number,
-  keyword: CombinatorKeyword
-): string => {
-  if (subSchema.title) {
-    return subSchema.title;
-  } else {
-    return keyword + '-' + subSchemaIndex;
-  }
-};
-
 export const createCombinatorRenderInfos = (
   combinatorSubSchemas: JsonSchema[],
   rootSchema: JsonSchema,
@@ -56,9 +44,11 @@ export const createCombinatorRenderInfos = (
   uischemas: JsonFormsUISchemaRegistryEntry[]
 ): CombinatorSubSchemaRenderInfo[] =>
   combinatorSubSchemas.map((subSchema, subSchemaIndex) => {
-    const schema = subSchema.$ref
-      ? Resolve.schema(rootSchema, subSchema.$ref, rootSchema)
-      : subSchema;
+    const resolvedSubSchema =
+      subSchema.$ref && Resolve.schema(rootSchema, subSchema.$ref, rootSchema);
+
+    const schema = resolvedSubSchema ?? subSchema;
+
     return {
       schema,
       uischema: findUISchema(
@@ -70,6 +60,9 @@ export const createCombinatorRenderInfos = (
         control,
         rootSchema
       ),
-      label: createLabel(subSchema, subSchemaIndex, keyword),
+      label:
+        subSchema.title ??
+        resolvedSubSchema?.title ??
+        `${keyword}-${subSchemaIndex}`,
     };
   });

package/src/util/path.ts

@@ -57,7 +57,7 @@ export { compose as composePaths };
  */
 export const toDataPathSegments = (schemaPath: string): string[] => {
   const s = schemaPath
-    .replace(/(anyOf|allOf|oneOf)\/[\d]\//g, '')
+    .replace(/(anyOf|allOf|oneOf)\/[\d]+\//g, '')
     .replace(/(then|else)\//g, '');
   const segments = s.split('/');
 

package/src/util/renderer.ts

@@ -799,7 +799,7 @@ export const mapDispatchToArrayControlProps = (
     dispatch(
       update(path, (array) => {
         toDelete
-          .sort()
+          .sort((a, b) => a - b)
           .reverse()
           .forEach((s) => array.splice(s, 1));
         return array;

package/src/util/runtime.ts

@@ -79,6 +79,9 @@ const evaluateCondition = (
     return value === condition.expectedValue;
   } else if (isSchemaCondition(condition)) {
     const value = resolveData(data, getConditionScope(condition, path));
+    if (condition.failWhenUndefined && value === undefined) {
+      return false;
+    }
     return ajv.validate(condition.schema, value) as boolean;
   } else {
     // unknown condition