@jsonforms/core 3.2.0-alpha.2 → 3.2.0-alpha.3

package/lib/jsonforms-core.cjs.js

@@ -477,13 +477,6 @@ var initState = {
     validationMode: 'ValidateAndShow',
     additionalErrors: [],
 };
-var reuseAjvForSchema = function (ajv, schema) {
-    if (Object.prototype.hasOwnProperty.call(schema, 'id') ||
-        Object.prototype.hasOwnProperty.call(schema, '$id')) {
-        ajv.removeSchema(schema);
-    }
-    return ajv;
-};
 var getOrCreateAjv = function (state, action) {
     if (action) {
         if (hasAjvOption(action.options)) {
@@ -495,12 +488,7 @@ var getOrCreateAjv = function (state, action) {
             }
         }
     }
-    if (state.ajv) {
-        return (action === null || action === void 0 ? void 0 : action.schema)
-            ? reuseAjvForSchema(state.ajv, action.schema)
-            : state.ajv;
-    }
-    return createAjv();
+    return state.ajv ? state.ajv : createAjv();
 };
 var hasAjvOption = function (option) {
     if (option) {
@@ -586,7 +574,7 @@ var coreReducer = function (state, action) {
         case SET_SCHEMA: {
             var needsNewValidator = action.schema && state.ajv && state.validationMode !== 'NoValidation';
             var v = needsNewValidator
-                ? reuseAjvForSchema(state.ajv, action.schema).compile(action.schema)
+                ? state.ajv.compile(action.schema)
                 : state.validator;
             var errors = validate(v, state.data);
             return __assign(__assign({}, state), { validator: v, schema: action.schema, errors: errors });
@@ -629,7 +617,7 @@ var coreReducer = function (state, action) {
                 return __assign(__assign({}, state), { errors: errors, validationMode: action.validationMode });
             }
             if (state.validationMode === 'NoValidation') {
-                var validator = reuseAjvForSchema(state.ajv, state.schema).compile(state.schema);
+                var validator = state.ajv.compile(state.schema);
                 var errors = validate(validator, state.data);
                 return __assign(__assign({}, state), { validator: validator,
                     errors: errors, validationMode: action.validationMode });
@@ -1311,7 +1299,7 @@ var findUISchema = function (uischemas, schema, schemaPath, path, fallback, cont
                 if (typeof fallback === 'function') {
                     return fallback();
                 }
-                return Generate.uiSchema(schema, fallback);
+                return Generate.uiSchema(schema, fallback, undefined, rootSchema);
             }
         }
         else if (typeof control.options.detail === 'object') {
@@ -1626,6 +1614,19 @@ var isInherentlyEnabled = function (state, ownProps, uischema, schema, rootData,
     return true;
 };
 
+var convertDateToString = function (date, format) {
+    var dateString = date.toISOString();
+    if (format === 'date-time') {
+        return dateString;
+    }
+    else if (format === 'date') {
+        return dateString.split('T')[0];
+    }
+    else if (format === 'time') {
+        return dateString.split('T')[1].split('.')[0];
+    }
+    return dateString;
+};
 var convertToValidClassName = function (s) {
     return s.replace('#', 'root').replace(new RegExp('/', 'g'), '_');
 };
@@ -1747,27 +1748,54 @@ var computeLabel = function (label, required, hideRequiredAsterisk) {
 var showAsRequired = function (required, hideRequiredAsterisk) {
     return required && !hideRequiredAsterisk;
 };
-var createDefaultValue = function (schema) {
-    switch (schema.type) {
-        case 'string':
-            if (schema.format === 'date-time' ||
-                schema.format === 'date' ||
-                schema.format === 'time') {
-                return new Date();
+var createDefaultValue = function (schema, rootSchema) {
+    var resolvedSchema = Resolve.schema(schema, schema.$ref, rootSchema);
+    if (resolvedSchema.default !== undefined) {
+        return extractDefaults(resolvedSchema, rootSchema);
+    }
+    if (hasType(resolvedSchema, 'string')) {
+        if (resolvedSchema.format === 'date-time' ||
+            resolvedSchema.format === 'date' ||
+            resolvedSchema.format === 'time') {
+            return convertDateToString(new Date(), resolvedSchema.format);
+        }
+        return '';
+    }
+    else if (hasType(resolvedSchema, 'integer') ||
+        hasType(resolvedSchema, 'number')) {
+        return 0;
+    }
+    else if (hasType(resolvedSchema, 'boolean')) {
+        return false;
+    }
+    else if (hasType(resolvedSchema, 'array')) {
+        return [];
+    }
+    else if (hasType(resolvedSchema, 'object')) {
+        return extractDefaults(resolvedSchema, rootSchema);
+    }
+    else if (hasType(resolvedSchema, 'null')) {
+        return null;
+    }
+    else {
+        return {};
+    }
+};
+var extractDefaults = function (schema, rootSchema) {
+    if (hasType(schema, 'object') && schema.default === undefined) {
+        var result = {};
+        for (var key in schema.properties) {
+            var property = schema.properties[key];
+            var resolvedProperty = property.$ref
+                ? Resolve.schema(rootSchema, property.$ref, rootSchema)
+                : property;
+            if (resolvedProperty.default !== undefined) {
+                result[key] = cloneDeep__default["default"](resolvedProperty.default);
             }
-            return '';
-        case 'integer':
-        case 'number':
-            return 0;
-        case 'boolean':
-            return false;
-        case 'array':
-            return [];
-        case 'null':
-            return null;
-        default:
-            return {};
+        }
+        return result;
     }
+    return cloneDeep__default["default"](schema.default);
 };
 var isDescriptionHidden = function (visible, description, isFocused, showUnfocusedDescription) {
     return (description === undefined ||
@@ -2261,7 +2289,7 @@ var iterateSchema = function (uischema, toApply) {
 };
 
 var createAjv = function (options) {
-    var ajv = new Ajv__default["default"](__assign({ allErrors: true, verbose: true, strict: false }, options));
+    var ajv = new Ajv__default["default"](__assign({ allErrors: true, verbose: true, strict: false, addUsedSchema: false }, options));
     addFormats__default["default"](ajv);
     return ajv;
 };
@@ -2586,6 +2614,7 @@ exports.composeWithUi = composeWithUi;
 exports.computeLabel = computeLabel;
 exports.configReducer = configReducer;
 exports.controlDefaultProps = controlDefaultProps;
+exports.convertDateToString = convertDateToString;
 exports.convertToValidClassName = convertToValidClassName;
 exports.coreReducer = coreReducer;
 exports.createAjv = createAjv;
@@ -2613,6 +2642,7 @@ exports.evalVisibility = evalVisibility;
 exports.extractAjv = extractAjv;
 exports.extractData = extractData;
 exports.extractDefaultData = extractDefaultData;
+exports.extractDefaults = extractDefaults;
 exports.extractSchema = extractSchema;
 exports.extractUiSchema = extractUiSchema;
 exports.fetchErrorTranslator = fetchErrorTranslator;