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

package/lib/jsonforms-core.esm.js

@@ -366,13 +366,6 @@ const initState = {
     validationMode: 'ValidateAndShow',
     additionalErrors: [],
 };
-const reuseAjvForSchema = (ajv, schema) => {
-    if (Object.prototype.hasOwnProperty.call(schema, 'id') ||
-        Object.prototype.hasOwnProperty.call(schema, '$id')) {
-        ajv.removeSchema(schema);
-    }
-    return ajv;
-};
 const getOrCreateAjv = (state, action) => {
     if (action) {
         if (hasAjvOption(action.options)) {
@@ -384,12 +377,7 @@ const getOrCreateAjv = (state, action) => {
             }
         }
     }
-    if (state.ajv) {
-        return action?.schema
-            ? reuseAjvForSchema(state.ajv, action.schema)
-            : state.ajv;
-    }
-    return createAjv();
+    return state.ajv ? state.ajv : createAjv();
 };
 const hasAjvOption = (option) => {
     if (option) {
@@ -498,7 +486,7 @@ const coreReducer = (state = initState, action) => {
         case SET_SCHEMA: {
             const needsNewValidator = action.schema && state.ajv && state.validationMode !== 'NoValidation';
             const v = needsNewValidator
-                ? reuseAjvForSchema(state.ajv, action.schema).compile(action.schema)
+                ? state.ajv.compile(action.schema)
                 : state.validator;
             const errors = validate(v, state.data);
             return {
@@ -564,7 +552,7 @@ const coreReducer = (state = initState, action) => {
                 };
             }
             if (state.validationMode === 'NoValidation') {
-                const validator = reuseAjvForSchema(state.ajv, state.schema).compile(state.schema);
+                const validator = state.ajv.compile(state.schema);
                 const errors = validate(validator, state.data);
                 return {
                     ...state,
@@ -1171,7 +1159,7 @@ const findUISchema = (uischemas, schema, schemaPath, path, fallback = 'VerticalL
                 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') {
@@ -1441,6 +1429,19 @@ const isInherentlyEnabled = (state, ownProps, uischema, schema, rootData, config
     return true;
 };
 
+const convertDateToString = (date, format) => {
+    const 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;
+};
 const convertToValidClassName = (s) => s.replace('#', 'root').replace(new RegExp('/', 'g'), '_');
 const formatErrorMessage = (errors) => {
     if (errors === undefined || errors === null) {
@@ -1558,27 +1559,54 @@ const computeLabel = (label, required, hideRequiredAsterisk) => {
 const showAsRequired = (required, hideRequiredAsterisk) => {
     return required && !hideRequiredAsterisk;
 };
-const createDefaultValue = (schema) => {
-    switch (schema.type) {
-        case 'string':
-            if (schema.format === 'date-time' ||
-                schema.format === 'date' ||
-                schema.format === 'time') {
-                return new Date();
+const createDefaultValue = (schema, rootSchema) => {
+    const 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 {};
+    }
+};
+const extractDefaults = (schema, rootSchema) => {
+    if (hasType(schema, 'object') && schema.default === undefined) {
+        const result = {};
+        for (const key in schema.properties) {
+            const property = schema.properties[key];
+            const resolvedProperty = property.$ref
+                ? Resolve.schema(rootSchema, property.$ref, rootSchema)
+                : property;
+            if (resolvedProperty.default !== undefined) {
+                result[key] = cloneDeep(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(schema.default);
 };
 const isDescriptionHidden = (visible, description, isFocused, showUnfocusedDescription) => {
     return (description === undefined ||
@@ -2107,6 +2135,7 @@ const createAjv = (options) => {
         allErrors: true,
         verbose: true,
         strict: false,
+        addUsedSchema: false,
         ...options,
     });
     addFormats(ajv);
@@ -2382,5 +2411,5 @@ const Helpers = {
     convertToValidClassName,
 };
 
-export { ADD_CELL, ADD_DEFAULT_DATA, ADD_RENDERER, ADD_UI_SCHEMA, index as Actions, ArrayTranslationEnum, CombinatorTranslationEnum, Draft4, Generate, Helpers, INIT, NOT_APPLICABLE, Paths, REMOVE_CELL, REMOVE_DEFAULT_DATA, REMOVE_RENDERER, REMOVE_UI_SCHEMA, Resolve, RuleEffect, Runtime, SET_AJV, SET_CONFIG, SET_LOCALE, SET_SCHEMA, SET_TRANSLATOR, SET_UISCHEMA, SET_VALIDATION_MODE, index$1 as Test, UPDATE_CORE, UPDATE_DATA, UPDATE_ERRORS, UPDATE_I18N, VALIDATE, addI18nKeyToPrefix, and, arrayDefaultTranslations, categorizationHasCategory, cellReducer, clearAllIds, combinatorDefaultTranslations, compose, compose as composePaths, composeWithUi, computeLabel, configReducer, controlDefaultProps, convertToValidClassName, coreReducer, createAjv, createCleanLabel, createCombinatorRenderInfos, createControlElement, createDefaultValue, createId, createLabelDescriptionFrom, decode, defaultDataReducer, defaultErrorTranslator, defaultJsonFormsI18nState, defaultMapDispatchToControlProps, defaultMapStateToEnumCellProps, defaultTranslator, deriveLabelForUISchemaElement, deriveTypes, encode, enumToEnumOptionMapper, errorAt, errorsAt, evalEnablement, evalVisibility, extractAjv, extractData, extractDefaultData, extractSchema, extractUiSchema, fetchErrorTranslator, fetchLocale, fetchTranslator, findAllRefs, findMatchingUISchema, findUISchema, formatErrorMessage, formatIs, generateDefaultUISchema, generateJsonSchema, getAjv, getArrayTranslations, getCells, getCombinatorTranslations, getCombinedErrorMessage, getConfig, getControlPath, getData, getDefaultData, getErrorAt, getErrorTranslator, getFirstPrimitiveProp, getI18nKey, getI18nKeyPrefix, getI18nKeyPrefixBySchema, getLocale, getRenderers, getSchema, getSubErrorsAt, getTranslator, getUISchemas, getUiSchema, hasCategory, hasEnableRule, hasShowRule, hasType, i18nReducer, init, isAllOfControl, isAnyOfControl, isArrayObjectControl, isBooleanControl, isCategorization, isCategory, isControl, isDateControl, isDateTimeControl, isDescriptionHidden, isEnabled, isEnumControl, isGroup, isInherentlyEnabled, isIntegerControl, isInternationalized, isLabelable, isLabeled, isLayout, isMultiLineControl, isNumberControl, isNumberFormatControl, isObjectArray, isObjectArrayControl, isObjectArrayWithNesting, isObjectControl, isOneOfControl, isOneOfEnumControl, isOneOfEnumSchema, isPrimitiveArrayControl, isRangeControl, isScopable, isScoped, isStringControl, isTimeControl, isVisible, iterateSchema, jsonFormsReducerConfig, layoutDefaultProps, mapDispatchToArrayControlProps, mapDispatchToCellProps, mapDispatchToControlProps, mapDispatchToMultiEnumProps, mapStateToAllOfProps, mapStateToAnyOfProps, mapStateToArrayControlProps, mapStateToArrayLayoutProps, mapStateToCellProps, mapStateToCombinatorRendererProps, mapStateToControlProps, mapStateToControlWithDetailProps, mapStateToDispatchCellProps, mapStateToEnumControlProps, mapStateToJsonFormsRendererProps, mapStateToLabelProps, mapStateToLayoutProps, mapStateToMasterListItemProps, mapStateToMultiEnumControlProps, mapStateToOneOfEnumCellProps, mapStateToOneOfEnumControlProps, mapStateToOneOfProps, moveDown, moveUp, not, oneOfToEnumOptionMapper, optionIs, or, rankWith, registerCell, registerDefaultData, registerRenderer, registerUISchema, removeId, rendererReducer, resolveData, resolveSchema, schemaMatches, schemaSubPathMatches, schemaTypeIs, scopeEndIs, scopeEndsWith, setAjv, setConfig, setLocale, setReadonly, setSchema, setTranslator, setUISchema, setValidationMode, showAsRequired, subErrorsAt, toDataPath, toDataPathSegments, transformPathToI18nPrefix, uiTypeIs, uischemaRegistryReducer, unregisterCell, unregisterDefaultData, unregisterRenderer, unregisterUISchema, unsetReadonly, update, updateCore, updateErrors, updateI18n, validate, withIncreasedRank };
+export { ADD_CELL, ADD_DEFAULT_DATA, ADD_RENDERER, ADD_UI_SCHEMA, index as Actions, ArrayTranslationEnum, CombinatorTranslationEnum, Draft4, Generate, Helpers, INIT, NOT_APPLICABLE, Paths, REMOVE_CELL, REMOVE_DEFAULT_DATA, REMOVE_RENDERER, REMOVE_UI_SCHEMA, Resolve, RuleEffect, Runtime, SET_AJV, SET_CONFIG, SET_LOCALE, SET_SCHEMA, SET_TRANSLATOR, SET_UISCHEMA, SET_VALIDATION_MODE, index$1 as Test, UPDATE_CORE, UPDATE_DATA, UPDATE_ERRORS, UPDATE_I18N, VALIDATE, addI18nKeyToPrefix, and, arrayDefaultTranslations, categorizationHasCategory, cellReducer, clearAllIds, combinatorDefaultTranslations, compose, compose as composePaths, composeWithUi, computeLabel, configReducer, controlDefaultProps, convertDateToString, convertToValidClassName, coreReducer, createAjv, createCleanLabel, createCombinatorRenderInfos, createControlElement, createDefaultValue, createId, createLabelDescriptionFrom, decode, defaultDataReducer, defaultErrorTranslator, defaultJsonFormsI18nState, defaultMapDispatchToControlProps, defaultMapStateToEnumCellProps, defaultTranslator, deriveLabelForUISchemaElement, deriveTypes, encode, enumToEnumOptionMapper, errorAt, errorsAt, evalEnablement, evalVisibility, extractAjv, extractData, extractDefaultData, extractDefaults, extractSchema, extractUiSchema, fetchErrorTranslator, fetchLocale, fetchTranslator, findAllRefs, findMatchingUISchema, findUISchema, formatErrorMessage, formatIs, generateDefaultUISchema, generateJsonSchema, getAjv, getArrayTranslations, getCells, getCombinatorTranslations, getCombinedErrorMessage, getConfig, getControlPath, getData, getDefaultData, getErrorAt, getErrorTranslator, getFirstPrimitiveProp, getI18nKey, getI18nKeyPrefix, getI18nKeyPrefixBySchema, getLocale, getRenderers, getSchema, getSubErrorsAt, getTranslator, getUISchemas, getUiSchema, hasCategory, hasEnableRule, hasShowRule, hasType, i18nReducer, init, isAllOfControl, isAnyOfControl, isArrayObjectControl, isBooleanControl, isCategorization, isCategory, isControl, isDateControl, isDateTimeControl, isDescriptionHidden, isEnabled, isEnumControl, isGroup, isInherentlyEnabled, isIntegerControl, isInternationalized, isLabelable, isLabeled, isLayout, isMultiLineControl, isNumberControl, isNumberFormatControl, isObjectArray, isObjectArrayControl, isObjectArrayWithNesting, isObjectControl, isOneOfControl, isOneOfEnumControl, isOneOfEnumSchema, isPrimitiveArrayControl, isRangeControl, isScopable, isScoped, isStringControl, isTimeControl, isVisible, iterateSchema, jsonFormsReducerConfig, layoutDefaultProps, mapDispatchToArrayControlProps, mapDispatchToCellProps, mapDispatchToControlProps, mapDispatchToMultiEnumProps, mapStateToAllOfProps, mapStateToAnyOfProps, mapStateToArrayControlProps, mapStateToArrayLayoutProps, mapStateToCellProps, mapStateToCombinatorRendererProps, mapStateToControlProps, mapStateToControlWithDetailProps, mapStateToDispatchCellProps, mapStateToEnumControlProps, mapStateToJsonFormsRendererProps, mapStateToLabelProps, mapStateToLayoutProps, mapStateToMasterListItemProps, mapStateToMultiEnumControlProps, mapStateToOneOfEnumCellProps, mapStateToOneOfEnumControlProps, mapStateToOneOfProps, moveDown, moveUp, not, oneOfToEnumOptionMapper, optionIs, or, rankWith, registerCell, registerDefaultData, registerRenderer, registerUISchema, removeId, rendererReducer, resolveData, resolveSchema, schemaMatches, schemaSubPathMatches, schemaTypeIs, scopeEndIs, scopeEndsWith, setAjv, setConfig, setLocale, setReadonly, setSchema, setTranslator, setUISchema, setValidationMode, showAsRequired, subErrorsAt, toDataPath, toDataPathSegments, transformPathToI18nPrefix, uiTypeIs, uischemaRegistryReducer, unregisterCell, unregisterDefaultData, unregisterRenderer, unregisterUISchema, unsetReadonly, update, updateCore, updateErrors, updateI18n, validate, withIncreasedRank };
 //# sourceMappingURL=jsonforms-core.esm.js.map