@jsonforms/core 3.0.0-alpha.2 → 3.0.0-alpha.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/docs/assets/js/search.json +1 -1
- package/docs/globals.html +159 -57
- package/docs/index.html +9 -0
- package/docs/interfaces/arraycontrolprops.html +21 -21
- package/docs/interfaces/arraylayoutprops.html +21 -21
- package/docs/interfaces/cellprops.html +12 -12
- package/docs/interfaces/combinatorrendererprops.html +13 -13
- package/docs/interfaces/controlprops.html +16 -16
- package/docs/interfaces/controlstate.html +2 -2
- package/docs/interfaces/controlwithdetailprops.html +17 -17
- package/docs/interfaces/dispatchcellprops.html +10 -10
- package/docs/interfaces/dispatchcellstateprops.html +10 -10
- package/docs/interfaces/dispatchpropsofarraycontrol.html +4 -4
- package/docs/interfaces/dispatchpropsofcontrol.html +1 -1
- package/docs/interfaces/dispatchpropsofmultienumcontrol.html +2 -2
- package/docs/interfaces/enumcellprops.html +13 -13
- package/docs/interfaces/enumoption.html +2 -2
- package/docs/interfaces/jsonformsprops.html +9 -9
- package/docs/interfaces/layoutprops.html +10 -10
- package/docs/interfaces/ownpropsofcell.html +9 -9
- package/docs/interfaces/ownpropsofcontrol.html +9 -9
- package/docs/interfaces/ownpropsofenum.html +1 -1
- package/docs/interfaces/ownpropsofenumcell.html +10 -10
- package/docs/interfaces/ownpropsofjsonformsrenderer.html +8 -8
- package/docs/interfaces/ownpropsoflayout.html +9 -9
- package/docs/interfaces/ownpropsofmasterlistitem.html +6 -6
- package/docs/interfaces/ownpropsofrenderer.html +8 -8
- package/docs/interfaces/rendererprops.html +9 -9
- package/docs/interfaces/statepropsofarraycontrol.html +17 -17
- package/docs/interfaces/statepropsofarraylayout.html +17 -17
- package/docs/interfaces/statepropsofcell.html +11 -11
- package/docs/interfaces/statepropsofcombinator.html +12 -12
- package/docs/interfaces/statepropsofcontrol.html +15 -15
- package/docs/interfaces/statepropsofcontrolwithdetail.html +16 -16
- package/docs/interfaces/statepropsofenumcell.html +12 -12
- package/docs/interfaces/statepropsofjsonformsrenderer.html +9 -9
- package/docs/interfaces/statepropsoflayout.html +10 -10
- package/docs/interfaces/statepropsofmasteritem.html +7 -7
- package/docs/interfaces/statepropsofrenderer.html +9 -9
- package/docs/interfaces/statepropsofscopedrenderer.html +12 -12
- package/docs/interfaces/withclassname.html +1 -1
- package/lib/i18n/i18nUtil.d.ts +10 -3
- package/lib/i18n/i18nUtil.js +29 -16
- package/lib/i18n/i18nUtil.js.map +1 -1
- package/lib/jsonforms-core.js +5 -5
- package/lib/jsonforms-core.js.map +1 -1
- package/lib/reducers/reducers.d.ts +2 -10
- package/lib/reducers/reducers.js +1 -10
- package/lib/reducers/reducers.js.map +1 -1
- package/lib/util/cell.js +5 -6
- package/lib/util/cell.js.map +1 -1
- package/lib/util/renderer.d.ts +3 -2
- package/lib/util/renderer.js +20 -22
- package/lib/util/renderer.js.map +1 -1
- package/package.json +2 -2
- package/src/i18n/i18nUtil.ts +43 -14
- package/src/reducers/reducers.ts +0 -20
- package/src/util/cell.ts +4 -4
- package/src/util/renderer.ts +14 -15
- package/test/i18n/i18nUtil.test.ts +48 -0
- package/test/reducers/core.test.ts +2 -3
- package/test/util/renderer.test.ts +72 -40
|
@@ -1,17 +1,10 @@
|
|
|
1
1
|
import { ControlElement, UISchemaElement } from '../models';
|
|
2
|
-
import { coreReducer, errorsAt, getControlPath, JsonFormsCore, ValidationMode } from './core';
|
|
3
|
-
import { rendererReducer } from './renderers';
|
|
4
2
|
import { JsonFormsState } from '../store';
|
|
5
|
-
import {
|
|
6
|
-
import { i18nReducer } from './i18n';
|
|
3
|
+
import { JsonFormsUISchemaRegistryEntry } from './uischemas';
|
|
7
4
|
import { JsonSchema } from '../models/jsonSchema';
|
|
8
|
-
import { cellReducer } from './cells';
|
|
9
|
-
import { configReducer } from './config';
|
|
10
5
|
import { ErrorTranslator, Translator } from '../i18n';
|
|
11
|
-
export { rendererReducer, cellReducer, coreReducer, i18nReducer, configReducer, UISchemaTester, uischemaRegistryReducer, findMatchingUISchema, JsonFormsUISchemaRegistryEntry };
|
|
12
|
-
export { JsonFormsCore, ValidationMode };
|
|
13
6
|
export declare const jsonFormsReducerConfig: {
|
|
14
|
-
core: import("..").Reducer<JsonFormsCore, import("..").CoreActions>;
|
|
7
|
+
core: import("..").Reducer<import("./core").JsonFormsCore, import("..").CoreActions>;
|
|
15
8
|
renderers: import("..").Reducer<import("./renderers").JsonFormsRendererRegistryEntry[], import("..").AddRendererAction | import("..").RemoveRendererAction>;
|
|
16
9
|
cells: import("..").Reducer<import("./cells").JsonFormsCellRendererRegistryState, import("..").AddCellRendererAction | import("..").RemoveCellRendererAction>;
|
|
17
10
|
config: import("..").Reducer<any, import("..").SetConfigAction>;
|
|
@@ -29,7 +22,6 @@ export declare const jsonFormsReducerConfig: {
|
|
|
29
22
|
*/
|
|
30
23
|
export declare const findUISchema: (uischemas: JsonFormsUISchemaRegistryEntry[], schema: JsonSchema, schemaPath: string, path: string, fallbackLayoutType?: string, control?: ControlElement, rootSchema?: JsonSchema) => UISchemaElement;
|
|
31
24
|
export declare const getErrorAt: (instancePath: string, schema: JsonSchema) => (state: JsonFormsState) => import("ajv").ErrorObject<string, Record<string, any>, unknown>[];
|
|
32
|
-
export { errorsAt, getControlPath };
|
|
33
25
|
export declare const getSubErrorsAt: (instancePath: string, schema: JsonSchema) => (state: JsonFormsState) => import("ajv").ErrorObject<string, Record<string, any>, unknown>[];
|
|
34
26
|
export declare const getConfig: (state: JsonFormsState) => any;
|
|
35
27
|
export declare const getLocale: (state: JsonFormsState) => string;
|
package/lib/reducers/reducers.js
CHANGED
|
@@ -24,25 +24,16 @@
|
|
|
24
24
|
THE SOFTWARE.
|
|
25
25
|
*/
|
|
26
26
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
27
|
-
exports.getErrorTranslator = exports.getTranslator = exports.getLocale = exports.getConfig = exports.getSubErrorsAt = exports.
|
|
27
|
+
exports.getErrorTranslator = exports.getTranslator = exports.getLocale = exports.getConfig = exports.getSubErrorsAt = exports.getErrorAt = exports.findUISchema = exports.jsonFormsReducerConfig = void 0;
|
|
28
28
|
var tslib_1 = require("tslib");
|
|
29
29
|
var core_1 = require("./core");
|
|
30
|
-
Object.defineProperty(exports, "coreReducer", { enumerable: true, get: function () { return core_1.coreReducer; } });
|
|
31
|
-
Object.defineProperty(exports, "errorsAt", { enumerable: true, get: function () { return core_1.errorsAt; } });
|
|
32
|
-
Object.defineProperty(exports, "getControlPath", { enumerable: true, get: function () { return core_1.getControlPath; } });
|
|
33
30
|
var default_data_1 = require("./default-data");
|
|
34
31
|
var renderers_1 = require("./renderers");
|
|
35
|
-
Object.defineProperty(exports, "rendererReducer", { enumerable: true, get: function () { return renderers_1.rendererReducer; } });
|
|
36
32
|
var uischemas_1 = require("./uischemas");
|
|
37
|
-
Object.defineProperty(exports, "findMatchingUISchema", { enumerable: true, get: function () { return uischemas_1.findMatchingUISchema; } });
|
|
38
|
-
Object.defineProperty(exports, "uischemaRegistryReducer", { enumerable: true, get: function () { return uischemas_1.uischemaRegistryReducer; } });
|
|
39
33
|
var i18n_1 = require("./i18n");
|
|
40
|
-
Object.defineProperty(exports, "i18nReducer", { enumerable: true, get: function () { return i18n_1.i18nReducer; } });
|
|
41
34
|
var generators_1 = require("../generators");
|
|
42
35
|
var cells_1 = require("./cells");
|
|
43
|
-
Object.defineProperty(exports, "cellReducer", { enumerable: true, get: function () { return cells_1.cellReducer; } });
|
|
44
36
|
var config_1 = require("./config");
|
|
45
|
-
Object.defineProperty(exports, "configReducer", { enumerable: true, get: function () { return config_1.configReducer; } });
|
|
46
37
|
var get_1 = tslib_1.__importDefault(require("lodash/get"));
|
|
47
38
|
var _1 = require(".");
|
|
48
39
|
exports.jsonFormsReducerConfig = {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"reducers.js","sourceRoot":"","sources":["../../src/reducers/reducers.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;;;;;;;;;EAuBE;;;;AAGF,+
|
|
1
|
+
{"version":3,"file":"reducers.js","sourceRoot":"","sources":["../../src/reducers/reducers.ts"],"names":[],"mappings":"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"}
|
package/lib/util/cell.js
CHANGED
|
@@ -32,6 +32,7 @@ var reducers_1 = require("../reducers");
|
|
|
32
32
|
var util_1 = require("./util");
|
|
33
33
|
var runtime_1 = require("./runtime");
|
|
34
34
|
var renderer_1 = require("./renderer");
|
|
35
|
+
var i18n_1 = require("../i18n");
|
|
35
36
|
/**
|
|
36
37
|
* Map state to cell props.
|
|
37
38
|
*
|
|
@@ -97,15 +98,14 @@ exports.mapStateToDispatchCellProps = mapStateToDispatchCellProps;
|
|
|
97
98
|
* @returns {StatePropsOfEnumCell}
|
|
98
99
|
*/
|
|
99
100
|
var defaultMapStateToEnumCellProps = function (state, ownProps) {
|
|
100
|
-
var _a
|
|
101
|
+
var _a;
|
|
101
102
|
var props = exports.mapStateToCellProps(state, ownProps);
|
|
102
103
|
var options = ownProps.options ||
|
|
103
104
|
((_a = props.schema.enum) === null || _a === void 0 ? void 0 : _a.map(function (e) {
|
|
104
|
-
|
|
105
|
-
return renderer_1.enumToEnumOptionMapper(e, reducers_1.getTranslator()(state), (_c = (_b = (_a = props.uischema) === null || _a === void 0 ? void 0 : _a.options) === null || _b === void 0 ? void 0 : _b.i18n) !== null && _c !== void 0 ? _c : props.schema.i18n);
|
|
105
|
+
return renderer_1.enumToEnumOptionMapper(e, reducers_1.getTranslator()(state), i18n_1.getI18nKeyPrefix(props.schema, props.uischema, props.path));
|
|
106
106
|
})) ||
|
|
107
107
|
(props.schema.const && [
|
|
108
|
-
renderer_1.enumToEnumOptionMapper(props.schema.const, reducers_1.getTranslator()(state), (
|
|
108
|
+
renderer_1.enumToEnumOptionMapper(props.schema.const, reducers_1.getTranslator()(state), i18n_1.getI18nKeyPrefix(props.schema, props.uischema, props.path))
|
|
109
109
|
]);
|
|
110
110
|
return tslib_1.__assign(tslib_1.__assign({}, props), { options: options });
|
|
111
111
|
};
|
|
@@ -121,8 +121,7 @@ var mapStateToOneOfEnumCellProps = function (state, ownProps) {
|
|
|
121
121
|
var props = exports.mapStateToCellProps(state, ownProps);
|
|
122
122
|
var options = ownProps.options ||
|
|
123
123
|
((_a = props.schema.oneOf) === null || _a === void 0 ? void 0 : _a.map(function (oneOfSubSchema) {
|
|
124
|
-
|
|
125
|
-
return renderer_1.oneOfToEnumOptionMapper(oneOfSubSchema, reducers_1.getTranslator()(state), (_b = (_a = props.uischema) === null || _a === void 0 ? void 0 : _a.options) === null || _b === void 0 ? void 0 : _b.i18n);
|
|
124
|
+
return renderer_1.oneOfToEnumOptionMapper(oneOfSubSchema, reducers_1.getTranslator()(state), i18n_1.getI18nKeyPrefix(props.schema, props.uischema, props.path));
|
|
126
125
|
}));
|
|
127
126
|
return tslib_1.__assign(tslib_1.__assign({}, props), { options: options });
|
|
128
127
|
};
|
package/lib/util/cell.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cell.js","sourceRoot":"","sources":["../../src/util/cell.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;;;;;;;;;EAuBE;;;;AAEF,mEAAqC;AACrC,+DAAiC;AACjC,wCAQqB;AAErB,+BAGgB;AAChB,qCAGmB;AACnB,uCASoB;
|
|
1
|
+
{"version":3,"file":"cell.js","sourceRoot":"","sources":["../../src/util/cell.ts"],"names":[],"mappings":"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"}
|
package/lib/util/renderer.d.ts
CHANGED
|
@@ -1,12 +1,12 @@
|
|
|
1
1
|
import { ControlElement, JsonSchema, UISchemaElement } from '../models';
|
|
2
2
|
import { JsonFormsCellRendererRegistryEntry, JsonFormsRendererRegistryEntry, JsonFormsUISchemaRegistryEntry } from '../reducers';
|
|
3
3
|
import { RankedTester } from '../testers';
|
|
4
|
+
import { CombinatorKeyword } from './combinators';
|
|
4
5
|
import { AnyAction, Dispatch } from './type';
|
|
5
6
|
import { CoreActions } from '../actions';
|
|
6
7
|
import { ErrorObject } from 'ajv';
|
|
7
8
|
import { JsonFormsState } from '../store';
|
|
8
9
|
import { Translator } from '../i18n';
|
|
9
|
-
export { JsonFormsRendererRegistryEntry, JsonFormsCellRendererRegistryEntry };
|
|
10
10
|
/**
|
|
11
11
|
* Adds an asterisk to the given label string based
|
|
12
12
|
* on the required parameter.
|
|
@@ -49,7 +49,7 @@ export interface EnumOption {
|
|
|
49
49
|
value: any;
|
|
50
50
|
}
|
|
51
51
|
export declare const enumToEnumOptionMapper: (e: any, t?: Translator, i18nKey?: string) => EnumOption;
|
|
52
|
-
export declare const oneOfToEnumOptionMapper: (e: any, t?: Translator,
|
|
52
|
+
export declare const oneOfToEnumOptionMapper: (e: any, t?: Translator, fallbackI18nKey?: string) => EnumOption;
|
|
53
53
|
export interface OwnPropsOfRenderer {
|
|
54
54
|
/**
|
|
55
55
|
* The UI schema to be rendered.
|
|
@@ -366,6 +366,7 @@ export interface StatePropsOfCombinator extends OwnPropsOfControl {
|
|
|
366
366
|
uischemas: JsonFormsUISchemaRegistryEntry[];
|
|
367
367
|
data: any;
|
|
368
368
|
}
|
|
369
|
+
export declare const mapStateToCombinatorRendererProps: (state: JsonFormsState, ownProps: OwnPropsOfControl, keyword: CombinatorKeyword) => StatePropsOfCombinator;
|
|
369
370
|
export interface CombinatorRendererProps extends StatePropsOfCombinator, DispatchPropsOfControl {
|
|
370
371
|
}
|
|
371
372
|
/**
|
package/lib/util/renderer.js
CHANGED
|
@@ -24,7 +24,7 @@
|
|
|
24
24
|
THE SOFTWARE.
|
|
25
25
|
*/
|
|
26
26
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
27
|
-
exports.mapStateToArrayLayoutProps = exports.mapStateToOneOfProps = exports.mapStateToAnyOfProps = exports.mapStateToAllOfProps = exports.controlDefaultProps = exports.mapStateToJsonFormsRendererProps = exports.mapStateToLayoutProps = exports.layoutDefaultProps = exports.mapDispatchToMultiEnumProps = exports.mapDispatchToArrayControlProps = exports.mapStateToArrayControlProps = exports.mapStateToControlWithDetailProps = exports.mapStateToMasterListItemProps = exports.mapStateToMultiEnumControlProps = exports.mapStateToOneOfEnumControlProps = exports.mapStateToEnumControlProps = exports.mapDispatchToControlProps = exports.mapStateToControlProps = exports.oneOfToEnumOptionMapper = exports.enumToEnumOptionMapper = exports.isDescriptionHidden = exports.createDefaultValue = exports.showAsRequired = exports.computeLabel = void 0;
|
|
27
|
+
exports.mapStateToArrayLayoutProps = exports.mapStateToOneOfProps = exports.mapStateToAnyOfProps = exports.mapStateToAllOfProps = exports.mapStateToCombinatorRendererProps = exports.controlDefaultProps = exports.mapStateToJsonFormsRendererProps = exports.mapStateToLayoutProps = exports.layoutDefaultProps = exports.mapDispatchToMultiEnumProps = exports.mapDispatchToArrayControlProps = exports.mapStateToArrayControlProps = exports.mapStateToControlWithDetailProps = exports.mapStateToMasterListItemProps = exports.mapStateToMultiEnumControlProps = exports.mapStateToOneOfEnumControlProps = exports.mapStateToEnumControlProps = exports.mapDispatchToControlProps = exports.mapStateToControlProps = exports.oneOfToEnumOptionMapper = exports.enumToEnumOptionMapper = exports.isDescriptionHidden = exports.createDefaultValue = exports.showAsRequired = exports.computeLabel = void 0;
|
|
28
28
|
var tslib_1 = require("tslib");
|
|
29
29
|
var get_1 = tslib_1.__importDefault(require("lodash/get"));
|
|
30
30
|
var find_1 = tslib_1.__importDefault(require("lodash/find"));
|
|
@@ -128,7 +128,7 @@ var enumToEnumOptionMapper = function (e, t, i18nKey) {
|
|
|
128
128
|
return { label: label, value: e };
|
|
129
129
|
};
|
|
130
130
|
exports.enumToEnumOptionMapper = enumToEnumOptionMapper;
|
|
131
|
-
var oneOfToEnumOptionMapper = function (e, t,
|
|
131
|
+
var oneOfToEnumOptionMapper = function (e, t, fallbackI18nKey) {
|
|
132
132
|
var _a;
|
|
133
133
|
var label = (_a = e.title) !== null && _a !== void 0 ? _a : (typeof e.const === 'string' ? e.const : JSON.stringify(e.const));
|
|
134
134
|
if (t) {
|
|
@@ -136,8 +136,8 @@ var oneOfToEnumOptionMapper = function (e, t, uiSchemaI18nKey) {
|
|
|
136
136
|
if (e.i18n) {
|
|
137
137
|
label = t(e.i18n, label);
|
|
138
138
|
}
|
|
139
|
-
else if (
|
|
140
|
-
label = t(
|
|
139
|
+
else if (fallbackI18nKey) {
|
|
140
|
+
label = t(fallbackI18nKey + "." + label, label);
|
|
141
141
|
}
|
|
142
142
|
else {
|
|
143
143
|
label = t(label, label);
|
|
@@ -156,7 +156,6 @@ exports.oneOfToEnumOptionMapper = oneOfToEnumOptionMapper;
|
|
|
156
156
|
* @returns {StatePropsOfControl} state props for a control
|
|
157
157
|
*/
|
|
158
158
|
var mapStateToControlProps = function (state, ownProps) {
|
|
159
|
-
var _a, _b;
|
|
160
159
|
var uischema = ownProps.uischema;
|
|
161
160
|
var rootData = reducers_1.getData(state);
|
|
162
161
|
var path = path_1.composeWithUi(uischema, ownProps.path);
|
|
@@ -179,9 +178,9 @@ var mapStateToControlProps = function (state, ownProps) {
|
|
|
179
178
|
var schema = resolvedSchema !== null && resolvedSchema !== void 0 ? resolvedSchema : rootSchema;
|
|
180
179
|
var t = reducers_1.getTranslator()(state);
|
|
181
180
|
var te = reducers_1.getErrorTranslator()(state);
|
|
182
|
-
var i18nLabel = t(
|
|
183
|
-
var i18nDescription = t(
|
|
184
|
-
var i18nErrorMessage = i18n_1.getCombinedErrorMessage(errors, te, t, schema, uischema);
|
|
181
|
+
var i18nLabel = t(i18n_1.getI18nKey(schema, uischema, path, 'label'), label);
|
|
182
|
+
var i18nDescription = t(i18n_1.getI18nKey(schema, uischema, path, 'description'), description);
|
|
183
|
+
var i18nErrorMessage = i18n_1.getCombinedErrorMessage(errors, te, t, schema, uischema, path);
|
|
185
184
|
return {
|
|
186
185
|
data: data,
|
|
187
186
|
description: i18nDescription,
|
|
@@ -220,15 +219,14 @@ exports.mapDispatchToControlProps = mapDispatchToControlProps;
|
|
|
220
219
|
* @returns {StatePropsOfControl & OwnPropsOfEnum}
|
|
221
220
|
*/
|
|
222
221
|
var mapStateToEnumControlProps = function (state, ownProps) {
|
|
223
|
-
var _a
|
|
222
|
+
var _a;
|
|
224
223
|
var props = exports.mapStateToControlProps(state, ownProps);
|
|
225
224
|
var options = ownProps.options ||
|
|
226
225
|
((_a = props.schema.enum) === null || _a === void 0 ? void 0 : _a.map(function (e) {
|
|
227
|
-
|
|
228
|
-
return exports.enumToEnumOptionMapper(e, reducers_1.getTranslator()(state), (_c = (_b = (_a = props.uischema) === null || _a === void 0 ? void 0 : _a.options) === null || _b === void 0 ? void 0 : _b.i18n) !== null && _c !== void 0 ? _c : props.schema.i18n);
|
|
226
|
+
return exports.enumToEnumOptionMapper(e, reducers_1.getTranslator()(state), i18n_1.getI18nKeyPrefix(props.schema, props.uischema, props.path));
|
|
229
227
|
})) ||
|
|
230
228
|
(props.schema.const && [
|
|
231
|
-
exports.enumToEnumOptionMapper(props.schema.const, reducers_1.getTranslator()(state), (
|
|
229
|
+
exports.enumToEnumOptionMapper(props.schema.const, reducers_1.getTranslator()(state), i18n_1.getI18nKeyPrefix(props.schema, props.uischema, props.path))
|
|
232
230
|
]);
|
|
233
231
|
return tslib_1.__assign(tslib_1.__assign({}, props), { options: options });
|
|
234
232
|
};
|
|
@@ -244,8 +242,7 @@ var mapStateToOneOfEnumControlProps = function (state, ownProps) {
|
|
|
244
242
|
var props = exports.mapStateToControlProps(state, ownProps);
|
|
245
243
|
var options = ownProps.options ||
|
|
246
244
|
((_a = props.schema.oneOf) === null || _a === void 0 ? void 0 : _a.map(function (oneOfSubSchema) {
|
|
247
|
-
|
|
248
|
-
return exports.oneOfToEnumOptionMapper(oneOfSubSchema, reducers_1.getTranslator()(state), (_b = (_a = props.uischema) === null || _a === void 0 ? void 0 : _a.options) === null || _b === void 0 ? void 0 : _b.i18n);
|
|
245
|
+
return exports.oneOfToEnumOptionMapper(oneOfSubSchema, reducers_1.getTranslator()(state), i18n_1.getI18nKeyPrefix(props.schema, props.uischema, props.path));
|
|
249
246
|
}));
|
|
250
247
|
return tslib_1.__assign(tslib_1.__assign({}, props), { options: options });
|
|
251
248
|
};
|
|
@@ -263,12 +260,12 @@ var mapStateToMultiEnumControlProps = function (state, ownProps) {
|
|
|
263
260
|
var options = ownProps.options ||
|
|
264
261
|
((items === null || items === void 0 ? void 0 : items.oneOf) &&
|
|
265
262
|
items.oneOf.map(function (oneOfSubSchema) {
|
|
266
|
-
var _a
|
|
267
|
-
return exports.oneOfToEnumOptionMapper(oneOfSubSchema, (_a = state.jsonforms.i18n) === null || _a === void 0 ? void 0 : _a.translate, (
|
|
263
|
+
var _a;
|
|
264
|
+
return exports.oneOfToEnumOptionMapper(oneOfSubSchema, (_a = state.jsonforms.i18n) === null || _a === void 0 ? void 0 : _a.translate, i18n_1.getI18nKeyPrefix(props.schema, props.uischema, props.path));
|
|
268
265
|
})) ||
|
|
269
266
|
((_a = items === null || items === void 0 ? void 0 : items.enum) === null || _a === void 0 ? void 0 : _a.map(function (e) {
|
|
270
|
-
var _a
|
|
271
|
-
return exports.enumToEnumOptionMapper(e, (_a = state.jsonforms.i18n) === null || _a === void 0 ? void 0 : _a.translate, (
|
|
267
|
+
var _a;
|
|
268
|
+
return exports.enumToEnumOptionMapper(e, (_a = state.jsonforms.i18n) === null || _a === void 0 ? void 0 : _a.translate, i18n_1.getI18nKeyPrefix(props.schema, props.uischema, props.path));
|
|
272
269
|
}));
|
|
273
270
|
return tslib_1.__assign(tslib_1.__assign({}, props), { options: options });
|
|
274
271
|
};
|
|
@@ -491,6 +488,7 @@ var mapStateToCombinatorRendererProps = function (state, ownProps, keyword) {
|
|
|
491
488
|
uischema: uischema
|
|
492
489
|
};
|
|
493
490
|
};
|
|
491
|
+
exports.mapStateToCombinatorRendererProps = mapStateToCombinatorRendererProps;
|
|
494
492
|
/**
|
|
495
493
|
* Map state to all of renderer props.
|
|
496
494
|
* @param state the store's state
|
|
@@ -498,15 +496,15 @@ var mapStateToCombinatorRendererProps = function (state, ownProps, keyword) {
|
|
|
498
496
|
* @returns {StatePropsOfCombinator} state props for a combinator
|
|
499
497
|
*/
|
|
500
498
|
var mapStateToAllOfProps = function (state, ownProps) {
|
|
501
|
-
return mapStateToCombinatorRendererProps(state, ownProps, 'allOf');
|
|
499
|
+
return exports.mapStateToCombinatorRendererProps(state, ownProps, 'allOf');
|
|
502
500
|
};
|
|
503
501
|
exports.mapStateToAllOfProps = mapStateToAllOfProps;
|
|
504
502
|
var mapStateToAnyOfProps = function (state, ownProps) {
|
|
505
|
-
return mapStateToCombinatorRendererProps(state, ownProps, 'anyOf');
|
|
503
|
+
return exports.mapStateToCombinatorRendererProps(state, ownProps, 'anyOf');
|
|
506
504
|
};
|
|
507
505
|
exports.mapStateToAnyOfProps = mapStateToAnyOfProps;
|
|
508
506
|
var mapStateToOneOfProps = function (state, ownProps) {
|
|
509
|
-
return mapStateToCombinatorRendererProps(state, ownProps, 'oneOf');
|
|
507
|
+
return exports.mapStateToCombinatorRendererProps(state, ownProps, 'oneOf');
|
|
510
508
|
};
|
|
511
509
|
exports.mapStateToOneOfProps = mapStateToOneOfProps;
|
|
512
510
|
/**
|
|
@@ -521,7 +519,7 @@ var mapStateToArrayLayoutProps = function (state, ownProps) {
|
|
|
521
519
|
var resolvedSchema = util_1.Resolve.schema(schema, 'items', props.rootSchema);
|
|
522
520
|
// TODO Does not consider a specialized '.custom' error message overriding all other error messages
|
|
523
521
|
// TODO Does not consider 'i18n' keys which are specified in the ui schemas of the sub errors
|
|
524
|
-
var childErrors = i18n_1.getCombinedErrorMessage(reducers_1.getSubErrorsAt(path, resolvedSchema)(state), reducers_1.getErrorTranslator()(state), reducers_1.getTranslator()(state), undefined, undefined);
|
|
522
|
+
var childErrors = i18n_1.getCombinedErrorMessage(reducers_1.getSubErrorsAt(path, resolvedSchema)(state), reducers_1.getErrorTranslator()(state), reducers_1.getTranslator()(state), undefined, undefined, undefined);
|
|
525
523
|
var allErrors = errors +
|
|
526
524
|
(errors.length > 0 && childErrors.length > 0 ? '\n' : '') +
|
|
527
525
|
childErrors;
|
package/lib/util/renderer.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"renderer.js","sourceRoot":"","sources":["../../src/util/renderer.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"renderer.js","sourceRoot":"","sources":["../../src/util/renderer.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@jsonforms/core",
|
|
3
|
-
"version": "3.0.0-alpha.
|
|
3
|
+
"version": "3.0.0-alpha.3",
|
|
4
4
|
"description": "Core module of JSON Forms",
|
|
5
5
|
"repository": "https://github.com/eclipsesource/jsonforms",
|
|
6
6
|
"bugs": "https://github.com/eclipsesource/jsonforms/issues",
|
|
@@ -85,5 +85,5 @@
|
|
|
85
85
|
"webpack": "^4.41.2",
|
|
86
86
|
"webpack-cli": "^3.2.1"
|
|
87
87
|
},
|
|
88
|
-
"gitHead": "
|
|
88
|
+
"gitHead": "81f1f19dac49b1864e712e9abbc5c5c6355a2b91"
|
|
89
89
|
}
|
package/src/i18n/i18nUtil.ts
CHANGED
|
@@ -1,32 +1,60 @@
|
|
|
1
1
|
import { ErrorObject } from 'ajv';
|
|
2
2
|
import { UISchemaElement } from '../models';
|
|
3
|
+
import { getControlPath } from '../reducers';
|
|
3
4
|
import { formatErrorMessage } from '../util';
|
|
4
5
|
import { i18nJsonSchema, ErrorTranslator, Translator } from './i18nTypes';
|
|
5
6
|
|
|
7
|
+
export const getI18nKeyPrefixBySchema = (
|
|
8
|
+
schema: i18nJsonSchema | undefined,
|
|
9
|
+
uischema: UISchemaElement | undefined
|
|
10
|
+
): string | undefined => {
|
|
11
|
+
return uischema?.options?.i18n ?? schema?.i18n ?? undefined;
|
|
12
|
+
};
|
|
13
|
+
|
|
14
|
+
/**
|
|
15
|
+
* Transforms a given path to a prefix which can be used for i18n keys.
|
|
16
|
+
* Returns 'root' for empty paths and removes array indices
|
|
17
|
+
*/
|
|
18
|
+
export const transformPathToI18nPrefix = (path: string) => {
|
|
19
|
+
return (
|
|
20
|
+
path
|
|
21
|
+
?.split('.')
|
|
22
|
+
.filter(segment => !/^\d+$/.test(segment))
|
|
23
|
+
.join('.') || 'root'
|
|
24
|
+
);
|
|
25
|
+
};
|
|
26
|
+
|
|
27
|
+
export const getI18nKeyPrefix = (
|
|
28
|
+
schema: i18nJsonSchema | undefined,
|
|
29
|
+
uischema: UISchemaElement | undefined,
|
|
30
|
+
path: string | undefined
|
|
31
|
+
): string | undefined => {
|
|
32
|
+
return (
|
|
33
|
+
getI18nKeyPrefixBySchema(schema, uischema) ??
|
|
34
|
+
transformPathToI18nPrefix(path)
|
|
35
|
+
);
|
|
36
|
+
};
|
|
37
|
+
|
|
6
38
|
export const getI18nKey = (
|
|
7
39
|
schema: i18nJsonSchema | undefined,
|
|
8
40
|
uischema: UISchemaElement | undefined,
|
|
41
|
+
path: string | undefined,
|
|
9
42
|
key: string
|
|
10
43
|
): string | undefined => {
|
|
11
|
-
|
|
12
|
-
return `${uischema.options.i18n}.${key}`;
|
|
13
|
-
}
|
|
14
|
-
if (schema?.i18n) {
|
|
15
|
-
return `${schema.i18n}.${key}`;
|
|
16
|
-
}
|
|
17
|
-
return undefined;
|
|
44
|
+
return `${getI18nKeyPrefix(schema, uischema, path)}.${key}`;
|
|
18
45
|
};
|
|
19
46
|
|
|
20
47
|
export const defaultTranslator: Translator = (_id: string, defaultMessage: string | undefined) => defaultMessage;
|
|
21
48
|
|
|
22
49
|
export const defaultErrorTranslator: ErrorTranslator = (error, t, uischema) => {
|
|
23
50
|
// check whether there is a special keyword message
|
|
24
|
-
const
|
|
51
|
+
const i18nKey = getI18nKey(
|
|
25
52
|
error.parentSchema,
|
|
26
53
|
uischema,
|
|
54
|
+
getControlPath(error),
|
|
27
55
|
`error.${error.keyword}`
|
|
28
56
|
);
|
|
29
|
-
const specializedKeywordMessage =
|
|
57
|
+
const specializedKeywordMessage = t(i18nKey, undefined);
|
|
30
58
|
if (specializedKeywordMessage !== undefined) {
|
|
31
59
|
return specializedKeywordMessage;
|
|
32
60
|
}
|
|
@@ -44,7 +72,7 @@ export const defaultErrorTranslator: ErrorTranslator = (error, t, uischema) => {
|
|
|
44
72
|
}
|
|
45
73
|
|
|
46
74
|
// rewrite required property messages (if they were not customized) as we place them next to the respective input
|
|
47
|
-
if (error.keyword === 'required') {
|
|
75
|
+
if (error.keyword === 'required' && error.message?.startsWith('must have required property')) {
|
|
48
76
|
return t('is a required property', 'is a required property');
|
|
49
77
|
}
|
|
50
78
|
|
|
@@ -53,19 +81,20 @@ export const defaultErrorTranslator: ErrorTranslator = (error, t, uischema) => {
|
|
|
53
81
|
|
|
54
82
|
/**
|
|
55
83
|
* Returns the determined error message for the given errors.
|
|
56
|
-
* All errors must correspond to the given schema
|
|
84
|
+
* All errors must correspond to the given schema, uischema or path.
|
|
57
85
|
*/
|
|
58
86
|
export const getCombinedErrorMessage = (
|
|
59
87
|
errors: ErrorObject[],
|
|
60
88
|
et: ErrorTranslator,
|
|
61
89
|
t: Translator,
|
|
62
90
|
schema?: i18nJsonSchema,
|
|
63
|
-
uischema?: UISchemaElement
|
|
91
|
+
uischema?: UISchemaElement,
|
|
92
|
+
path?: string
|
|
64
93
|
) => {
|
|
65
94
|
if (errors.length > 0 && t) {
|
|
66
95
|
// check whether there is a special message which overwrites all others
|
|
67
|
-
const
|
|
68
|
-
const specializedErrorMessage =
|
|
96
|
+
const customErrorKey = getI18nKey(schema, uischema, path, 'error.custom');
|
|
97
|
+
const specializedErrorMessage = t(customErrorKey, undefined);
|
|
69
98
|
if (specializedErrorMessage !== undefined) {
|
|
70
99
|
return specializedErrorMessage;
|
|
71
100
|
}
|
package/src/reducers/reducers.ts
CHANGED
|
@@ -27,11 +27,7 @@ import { ControlElement, UISchemaElement } from '../models';
|
|
|
27
27
|
import {
|
|
28
28
|
coreReducer,
|
|
29
29
|
errorAt,
|
|
30
|
-
errorsAt,
|
|
31
|
-
getControlPath,
|
|
32
|
-
JsonFormsCore,
|
|
33
30
|
subErrorsAt,
|
|
34
|
-
ValidationMode
|
|
35
31
|
} from './core';
|
|
36
32
|
import { defaultDataReducer } from './default-data';
|
|
37
33
|
import { rendererReducer } from './renderers';
|
|
@@ -40,7 +36,6 @@ import {
|
|
|
40
36
|
findMatchingUISchema,
|
|
41
37
|
JsonFormsUISchemaRegistryEntry,
|
|
42
38
|
uischemaRegistryReducer,
|
|
43
|
-
UISchemaTester
|
|
44
39
|
} from './uischemas';
|
|
45
40
|
import {
|
|
46
41
|
fetchErrorTranslator,
|
|
@@ -57,19 +52,6 @@ import get from 'lodash/get';
|
|
|
57
52
|
import { fetchTranslator } from '.';
|
|
58
53
|
import { ErrorTranslator, Translator } from '../i18n';
|
|
59
54
|
|
|
60
|
-
export {
|
|
61
|
-
rendererReducer,
|
|
62
|
-
cellReducer,
|
|
63
|
-
coreReducer,
|
|
64
|
-
i18nReducer,
|
|
65
|
-
configReducer,
|
|
66
|
-
UISchemaTester,
|
|
67
|
-
uischemaRegistryReducer,
|
|
68
|
-
findMatchingUISchema,
|
|
69
|
-
JsonFormsUISchemaRegistryEntry
|
|
70
|
-
};
|
|
71
|
-
export { JsonFormsCore, ValidationMode };
|
|
72
|
-
|
|
73
55
|
export const jsonFormsReducerConfig = {
|
|
74
56
|
core: coreReducer,
|
|
75
57
|
renderers: rendererReducer,
|
|
@@ -128,8 +110,6 @@ export const getErrorAt = (instancePath: string, schema: JsonSchema) => (
|
|
|
128
110
|
return errorAt(instancePath, schema)(state.jsonforms.core);
|
|
129
111
|
};
|
|
130
112
|
|
|
131
|
-
export { errorsAt, getControlPath };
|
|
132
|
-
|
|
133
113
|
export const getSubErrorsAt = (instancePath: string, schema: JsonSchema) => (
|
|
134
114
|
state: JsonFormsState
|
|
135
115
|
) => subErrorsAt(instancePath, schema)(state.jsonforms.core);
|
package/src/util/cell.ts
CHANGED
|
@@ -55,7 +55,7 @@ import {
|
|
|
55
55
|
} from './renderer';
|
|
56
56
|
import { JsonFormsState } from '../store';
|
|
57
57
|
import { JsonSchema } from '../models';
|
|
58
|
-
import {
|
|
58
|
+
import { getI18nKeyPrefix } from '../i18n';
|
|
59
59
|
|
|
60
60
|
export { JsonFormsCellRendererRegistryEntry };
|
|
61
61
|
|
|
@@ -202,14 +202,14 @@ export const defaultMapStateToEnumCellProps = (
|
|
|
202
202
|
enumToEnumOptionMapper(
|
|
203
203
|
e,
|
|
204
204
|
getTranslator()(state),
|
|
205
|
-
props.uischema
|
|
205
|
+
getI18nKeyPrefix(props.schema, props.uischema, props.path)
|
|
206
206
|
)
|
|
207
207
|
) ||
|
|
208
208
|
(props.schema.const && [
|
|
209
209
|
enumToEnumOptionMapper(
|
|
210
210
|
props.schema.const,
|
|
211
211
|
getTranslator()(state),
|
|
212
|
-
props.uischema
|
|
212
|
+
getI18nKeyPrefix(props.schema, props.uischema, props.path)
|
|
213
213
|
)
|
|
214
214
|
]);
|
|
215
215
|
return {
|
|
@@ -235,7 +235,7 @@ export const mapStateToOneOfEnumCellProps = (
|
|
|
235
235
|
oneOfToEnumOptionMapper(
|
|
236
236
|
oneOfSubSchema,
|
|
237
237
|
getTranslator()(state),
|
|
238
|
-
props.uischema
|
|
238
|
+
getI18nKeyPrefix(props.schema, props.uischema, props.path)
|
|
239
239
|
)
|
|
240
240
|
);
|
|
241
241
|
return {
|