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

package/lib/jsonforms-core.cjs.js

@@ -388,15 +388,15 @@ var resolveSchema = function (schema, schemaPath, rootSchema) {
 };
 var resolveSchemaWithSegments = function (schema, pathSegments, rootSchema) {
     var _a, _b, _c, _d, _e;
-    if (isEmpty__default["default"](schema)) {
-        return undefined;
-    }
-    if (typeof schema.$ref === 'string') {
+    if (typeof (schema === null || schema === void 0 ? void 0 : schema.$ref) === 'string') {
         schema = resolveSchema(rootSchema, schema.$ref, rootSchema);
     }
     if (!pathSegments || pathSegments.length === 0) {
         return schema;
     }
+    if (isEmpty__default["default"](schema)) {
+        return undefined;
+    }
     var segment = pathSegments[0], remainingSegments = pathSegments.slice(1);
     if (invalidSegment(segment)) {
         return resolveSchemaWithSegments(schema, remainingSegments, rootSchema);
@@ -665,15 +665,19 @@ var isLeafCondition = function (condition) {
     return condition.type === 'LEAF';
 };
 var isSchemaCondition = function (condition) { return has__default["default"](condition, 'schema'); };
+var isValidateFunctionCondition = function (condition) {
+    return has__default["default"](condition, 'validate') &&
+        typeof condition.validate === 'function';
+};
 var getConditionScope = function (condition, path) {
     return composeWithUi(condition, path);
 };
-var evaluateCondition = function (data, condition, path, ajv) {
+var evaluateCondition = function (data, uischema, condition, path, ajv) {
     if (isAndCondition(condition)) {
-        return condition.conditions.reduce(function (acc, cur) { return acc && evaluateCondition(data, cur, path, ajv); }, true);
+        return condition.conditions.reduce(function (acc, cur) { return acc && evaluateCondition(data, uischema, cur, path, ajv); }, true);
     }
     else if (isOrCondition(condition)) {
-        return condition.conditions.reduce(function (acc, cur) { return acc || evaluateCondition(data, cur, path, ajv); }, false);
+        return condition.conditions.reduce(function (acc, cur) { return acc || evaluateCondition(data, uischema, cur, path, ajv); }, false);
     }
     else if (isLeafCondition(condition)) {
         var value = resolveData(data, getConditionScope(condition, path));
@@ -686,13 +690,23 @@ var evaluateCondition = function (data, condition, path, ajv) {
         }
         return ajv.validate(condition.schema, value);
     }
+    else if (isValidateFunctionCondition(condition)) {
+        var value = resolveData(data, getConditionScope(condition, path));
+        var context = {
+            data: value,
+            fullData: data,
+            path: path,
+            uischemaElement: uischema,
+        };
+        return condition.validate(context);
+    }
     else {
         return true;
     }
 };
 var isRuleFulfilled = function (uischema, data, path, ajv) {
     var condition = uischema.rule.condition;
-    return evaluateCondition(data, condition, path, ajv);
+    return evaluateCondition(data, uischema, condition, path, ajv);
 };
 var evalVisibility = function (uischema, data, path, ajv) {
     if (path === void 0) { path = undefined; }