@jsonforms/core 3.6.0-alpha.1 → 3.6.0-beta.0

package/lib/jsonforms-core.esm.js

@@ -283,15 +283,15 @@ const resolveSchema = (schema, schemaPath, rootSchema) => {
     return resolveSchemaWithSegments(schema, segments, rootSchema);
 };
 const resolveSchemaWithSegments = (schema, pathSegments, rootSchema) => {
-    if (isEmpty(schema)) {
-        return undefined;
-    }
-    if (typeof schema.$ref === 'string') {
+    if (typeof schema?.$ref === 'string') {
         schema = resolveSchema(rootSchema, schema.$ref, rootSchema);
     }
     if (!pathSegments || pathSegments.length === 0) {
         return schema;
     }
+    if (isEmpty(schema)) {
+        return undefined;
+    }
     const [segment, ...remainingSegments] = pathSegments;
     if (invalidSegment(segment)) {
         return resolveSchemaWithSegments(schema, remainingSegments, rootSchema);
@@ -535,15 +535,17 @@ const isOrCondition = (condition) => condition.type === 'OR';
 const isAndCondition = (condition) => condition.type === 'AND';
 const isLeafCondition = (condition) => condition.type === 'LEAF';
 const isSchemaCondition = (condition) => has(condition, 'schema');
+const isValidateFunctionCondition = (condition) => has(condition, 'validate') &&
+    typeof condition.validate === 'function';
 const getConditionScope = (condition, path) => {
     return composeWithUi(condition, path);
 };
-const evaluateCondition = (data, condition, path, ajv) => {
+const evaluateCondition = (data, uischema, condition, path, ajv) => {
     if (isAndCondition(condition)) {
-        return condition.conditions.reduce((acc, cur) => acc && evaluateCondition(data, cur, path, ajv), true);
+        return condition.conditions.reduce((acc, cur) => acc && evaluateCondition(data, uischema, cur, path, ajv), true);
     }
     else if (isOrCondition(condition)) {
-        return condition.conditions.reduce((acc, cur) => acc || evaluateCondition(data, cur, path, ajv), false);
+        return condition.conditions.reduce((acc, cur) => acc || evaluateCondition(data, uischema, cur, path, ajv), false);
     }
     else if (isLeafCondition(condition)) {
         const value = resolveData(data, getConditionScope(condition, path));
@@ -556,13 +558,23 @@ const evaluateCondition = (data, condition, path, ajv) => {
         }
         return ajv.validate(condition.schema, value);
     }
+    else if (isValidateFunctionCondition(condition)) {
+        const value = resolveData(data, getConditionScope(condition, path));
+        const context = {
+            data: value,
+            fullData: data,
+            path,
+            uischemaElement: uischema,
+        };
+        return condition.validate(context);
+    }
     else {
         return true;
     }
 };
 const isRuleFulfilled = (uischema, data, path, ajv) => {
     const condition = uischema.rule.condition;
-    return evaluateCondition(data, condition, path, ajv);
+    return evaluateCondition(data, uischema, condition, path, ajv);
 };
 const evalVisibility = (uischema, data, path = undefined, ajv) => {
     const fulfilled = isRuleFulfilled(uischema, data, path, ajv);