@jsonforms/core 3.4.1 → 3.5.0-beta.1

package/lib/jsonforms-core.esm.js

@@ -286,7 +286,7 @@ const resolveSchemaWithSegments = (schema, pathSegments, rootSchema) => {
     if (isEmpty(schema)) {
         return undefined;
     }
-    if (schema.$ref) {
+    if (typeof schema.$ref === 'string') {
         schema = resolveSchema(rootSchema, schema.$ref, rootSchema);
     }
     if (!pathSegments || pathSegments.length === 0) {
@@ -1990,7 +1990,13 @@ const showAsRequired = (required, hideRequiredAsterisk) => {
     return required && !hideRequiredAsterisk;
 };
 const createDefaultValue = (schema, rootSchema) => {
-    const resolvedSchema = Resolve.schema(schema, schema.$ref, rootSchema);
+    const defaultValue = doCreateDefaultValue(schema, rootSchema);
+    return defaultValue === undefined ? {} : defaultValue;
+};
+const doCreateDefaultValue = (schema, rootSchema) => {
+    const resolvedSchema = typeof schema.$ref === 'string'
+        ? Resolve.schema(rootSchema, schema.$ref, rootSchema)
+        : schema;
     if (resolvedSchema.default !== undefined) {
         return extractDefaults(resolvedSchema, rootSchema);
     }
@@ -2002,25 +2008,42 @@ const createDefaultValue = (schema, rootSchema) => {
         }
         return '';
     }
-    else if (hasType(resolvedSchema, 'integer') ||
-        hasType(resolvedSchema, 'number')) {
+    if (hasType(resolvedSchema, 'integer') || hasType(resolvedSchema, 'number')) {
         return 0;
     }
-    else if (hasType(resolvedSchema, 'boolean')) {
+    if (hasType(resolvedSchema, 'boolean')) {
         return false;
     }
-    else if (hasType(resolvedSchema, 'array')) {
+    if (hasType(resolvedSchema, 'array')) {
         return [];
     }
-    else if (hasType(resolvedSchema, 'object')) {
+    if (hasType(resolvedSchema, 'object')) {
         return extractDefaults(resolvedSchema, rootSchema);
     }
-    else if (hasType(resolvedSchema, 'null')) {
+    if (hasType(resolvedSchema, 'null')) {
         return null;
     }
-    else {
-        return {};
+    const combinators = ['oneOf', 'anyOf', 'allOf'];
+    for (const combinator of combinators) {
+        if (schema[combinator] && Array.isArray(schema[combinator])) {
+            const combinatorDefault = createDefaultValueForCombinatorSchema(schema[combinator], rootSchema);
+            if (combinatorDefault !== undefined) {
+                return combinatorDefault;
+            }
+        }
+    }
+    return undefined;
+};
+const createDefaultValueForCombinatorSchema = (combinatorSchemas, rootSchema) => {
+    if (combinatorSchemas.length > 0) {
+        for (const combinatorSchema of combinatorSchemas) {
+            const result = doCreateDefaultValue(combinatorSchema, rootSchema);
+            if (result !== undefined) {
+                return result;
+            }
+        }
     }
+    return undefined;
 };
 const extractDefaults = (schema, rootSchema) => {
     if (hasType(schema, 'object') && schema.default === undefined) {
@@ -2030,10 +2053,25 @@ const extractDefaults = (schema, rootSchema) => {
             const resolvedProperty = property.$ref
                 ? Resolve.schema(rootSchema, property.$ref, rootSchema)
                 : property;
-            if (resolvedProperty.default !== undefined) {
+            if (resolvedProperty && resolvedProperty.default !== undefined) {
                 result[key] = cloneDeep(resolvedProperty.default);
             }
         }
+        if (schema.allOf && Array.isArray(schema.allOf)) {
+            schema.allOf.forEach((allOfSchema) => {
+                if (allOfSchema && allOfSchema.properties) {
+                    for (const key in allOfSchema.properties) {
+                        const property = allOfSchema.properties[key];
+                        const resolvedProperty = property.$ref
+                            ? Resolve.schema(rootSchema, property.$ref, rootSchema)
+                            : property;
+                        if (resolvedProperty && resolvedProperty.default !== undefined) {
+                            result[key] = cloneDeep(resolvedProperty.default);
+                        }
+                    }
+                }
+            });
+        }
         return result;
     }
     return cloneDeep(schema.default);
@@ -2192,6 +2230,7 @@ const mapStateToArrayControlProps = (state, ownProps) => {
         path,
         uischema,
         schema: resolvedSchema,
+        arraySchema: schema,
         childErrors,
         renderers: ownProps.renderers || getRenderers(state),
         cells: ownProps.cells || getCells(state),
@@ -2378,6 +2417,7 @@ const mapStateToArrayLayoutProps = (state, ownProps) => {
         path,
         uischema,
         schema: resolvedSchema,
+        arraySchema: schema,
         data: props.data ? props.data.length : 0,
         errors: allErrors,
         minItems: schema.minItems,
@@ -2518,5 +2558,5 @@ const createCombinatorRenderInfos = (combinatorSubSchemas, rootSchema, keyword,
     };
 });
 
-export { ADD_CELL, ADD_DEFAULT_DATA, ADD_RENDERER, ADD_UI_SCHEMA, index$1 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 as Test, UPDATE_CORE, UPDATE_DATA, UPDATE_ERRORS, UPDATE_I18N, VALIDATE, addI18nKeyToPrefix, and, arrayDefaultTranslations, categorizationHasCategory, cellReducer, clearAllIds, combinatorDefaultTranslations, compose, compose as composePaths, composeWithUi, computeChildLabel, computeLabel, configReducer, controlDefaultProps, convertDateToString, convertToValidClassName, coreReducer, createAjv, createCleanLabel, createCombinatorRenderInfos, createControlElement, createDefaultValue, createId, createLabelDescriptionFrom, decode, defaultDataReducer, defaultDateFormat, defaultDateTimeFormat, defaultErrorTranslator, defaultJsonFormsI18nState, defaultMapDispatchToControlProps, defaultMapStateToEnumCellProps, defaultMiddleware, defaultTimeFormat, defaultTranslator, deriveLabelForUISchemaElement, deriveTypes, encode, enumToEnumOptionMapper, errorAt, errorsAt, evalEnablement, evalVisibility, extractAjv, extractData, extractDefaultData, extractDefaults, extractSchema, extractUiSchema, fetchErrorTranslator, fetchLocale, fetchTranslator, findAllRefs, findMatchingUISchema, findUISchema, findUiControl, formatErrorMessage, formatIs, generateDefaultUISchema, generateJsonSchema, getAdditionalErrors, getAjv, getArrayTranslations, getCells, getCombinatorTranslations, getCombinedErrorMessage, getConfig, getControlPath, getData, getDefaultData, getErrorAt, getErrorTranslator, getFirstPrimitiveProp, getI18nKey, getI18nKeyPrefix, getI18nKeyPrefixBySchema, getLocale, getOrCreateAjv, getPropPath, getRenderers, getSchema, getSubErrorsAt, getTranslator, getUISchemas, getUiSchema, getValidationMode, hasCategory, hasEnableRule, hasOption, hasShowRule, hasType, i18nReducer, init, initState, isAllOfControl, isAnyOfControl, isArrayObjectControl, isBooleanControl, isCategorization, isCategory, isControl, isControlElement, isDateControl, isDateTimeControl, isDescriptionHidden, isEnabled, isEnumControl, isEnumSchema, isGroup, isInherentlyEnabled, isIntegerControl, isInternationalized, isLabelable, isLabeled, isLayout, isMultiLineControl, isNumberControl, isNumberFormatControl, isObjectArray, isObjectArrayControl, isObjectArrayWithNesting, isObjectControl, isOneOfControl, isOneOfEnumControl, isOneOfEnumSchema, isPrimitiveArrayControl, isRangeControl, isScopable, isScoped, isStringControl, isTimeControl, isUpdateArrayContext, 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$1 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 as Test, UPDATE_CORE, UPDATE_DATA, UPDATE_ERRORS, UPDATE_I18N, VALIDATE, addI18nKeyToPrefix, and, arrayDefaultTranslations, categorizationHasCategory, cellReducer, clearAllIds, combinatorDefaultTranslations, compose, compose as composePaths, composeWithUi, computeChildLabel, computeLabel, configReducer, controlDefaultProps, convertDateToString, convertToValidClassName, coreReducer, createAjv, createCleanLabel, createCombinatorRenderInfos, createControlElement, createDefaultValue, createId, createLabelDescriptionFrom, decode, defaultDataReducer, defaultDateFormat, defaultDateTimeFormat, defaultErrorTranslator, defaultJsonFormsI18nState, defaultMapDispatchToControlProps, defaultMapStateToEnumCellProps, defaultMiddleware, defaultTimeFormat, defaultTranslator, deriveLabelForUISchemaElement, deriveTypes, doCreateDefaultValue, encode, enumToEnumOptionMapper, errorAt, errorsAt, evalEnablement, evalVisibility, extractAjv, extractData, extractDefaultData, extractDefaults, extractSchema, extractUiSchema, fetchErrorTranslator, fetchLocale, fetchTranslator, findAllRefs, findMatchingUISchema, findUISchema, findUiControl, formatErrorMessage, formatIs, generateDefaultUISchema, generateJsonSchema, getAdditionalErrors, getAjv, getArrayTranslations, getCells, getCombinatorTranslations, getCombinedErrorMessage, getConfig, getControlPath, getData, getDefaultData, getErrorAt, getErrorTranslator, getFirstPrimitiveProp, getI18nKey, getI18nKeyPrefix, getI18nKeyPrefixBySchema, getLocale, getOrCreateAjv, getPropPath, getRenderers, getSchema, getSubErrorsAt, getTranslator, getUISchemas, getUiSchema, getValidationMode, hasCategory, hasEnableRule, hasOption, hasShowRule, hasType, i18nReducer, init, initState, isAllOfControl, isAnyOfControl, isArrayObjectControl, isBooleanControl, isCategorization, isCategory, isControl, isControlElement, isDateControl, isDateTimeControl, isDescriptionHidden, isEnabled, isEnumControl, isEnumSchema, isGroup, isInherentlyEnabled, isIntegerControl, isInternationalized, isLabelable, isLabeled, isLayout, isMultiLineControl, isNumberControl, isNumberFormatControl, isObjectArray, isObjectArrayControl, isObjectArrayWithNesting, isObjectControl, isOneOfControl, isOneOfEnumControl, isOneOfEnumSchema, isPrimitiveArrayControl, isRangeControl, isScopable, isScoped, isStringControl, isTimeControl, isUpdateArrayContext, 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