@jsonforms/core 2.5.2-alpha.0 → 3.0.0-alpha.2

package/lib/util/cell.js

@@ -1,6 +1,4 @@
 "use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-var tslib_1 = require("tslib");
 /*
   The MIT License
 
@@ -25,10 +23,14 @@ var tslib_1 = require("tslib");
   OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
   THE SOFTWARE.
 */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.defaultMapDispatchToControlProps = exports.mapDispatchToCellProps = exports.mapStateToOneOfEnumCellProps = exports.defaultMapStateToEnumCellProps = exports.mapStateToDispatchCellProps = exports.mapStateToCellProps = void 0;
+var tslib_1 = require("tslib");
 var isEmpty_1 = tslib_1.__importDefault(require("lodash/isEmpty"));
 var union_1 = tslib_1.__importDefault(require("lodash/union"));
 var reducers_1 = require("../reducers");
-var _1 = require(".");
+var util_1 = require("./util");
+var runtime_1 = require("./runtime");
 var renderer_1 = require("./renderer");
 /**
  * Map state to cell props.
@@ -37,21 +39,36 @@ var renderer_1 = require("./renderer");
  * @param ownProps any own props
  * @returns {StatePropsOfCell} state props of a cell
  */
-exports.mapStateToCellProps = function (state, ownProps) {
+var mapStateToCellProps = function (state, ownProps) {
     var id = ownProps.id, schema = ownProps.schema, path = ownProps.path, uischema = ownProps.uischema, renderers = ownProps.renderers, cells = ownProps.cells;
     var rootData = reducers_1.getData(state);
     var visible = ownProps.visible !== undefined
         ? ownProps.visible
-        : _1.isVisible(uischema, rootData, undefined, reducers_1.getAjv(state));
-    var readonly = state.jsonforms.readonly;
-    var enabled = !readonly && (ownProps.enabled !== undefined
-        ? ownProps.enabled
-        : _1.isEnabled(uischema, rootData, undefined, reducers_1.getAjv(state)));
-    var errors = _1.formatErrorMessage(union_1.default(reducers_1.getErrorAt(path, schema)(state).map(function (error) { return error.message; })));
-    var isValid = isEmpty_1.default(errors);
+        : runtime_1.isVisible(uischema, rootData, undefined, reducers_1.getAjv(state));
     var rootSchema = reducers_1.getSchema(state);
+    var config = reducers_1.getConfig(state);
+    /* When determining the enabled state of cells we take a shortcut: At the
+     * moment it's only possible to configure enablement and disablement at the
+     * control level. Therefore the renderer using the cell, for example a
+     * table renderer, determines whether a cell is enabled and should hand
+     * over the prop themselves. If that prop was given, we prefer it over
+     * anything else to save evaluation effort (except for the global readonly
+     * flag). For example it would be quite expensive to evaluate the same ui schema
+     * rule again and again for each cell of a table. */
+    var enabled;
+    if (state.jsonforms.readonly === true) {
+        enabled = false;
+    }
+    else if (typeof ownProps.enabled === 'boolean') {
+        enabled = ownProps.enabled;
+    }
+    else {
+        enabled = runtime_1.isInherentlyEnabled(state, ownProps, uischema, schema || rootSchema, rootData, config);
+    }
+    var errors = util_1.formatErrorMessage(union_1.default(reducers_1.getErrorAt(path, schema)(state).map(function (error) { return error.message; })));
+    var isValid = isEmpty_1.default(errors);
     return {
-        data: _1.Resolve.data(rootData, path),
+        data: util_1.Resolve.data(rootData, path),
         visible: visible,
         enabled: enabled,
         id: id,
@@ -66,24 +83,50 @@ exports.mapStateToCellProps = function (state, ownProps) {
         cells: cells
     };
 };
-exports.mapStateToDispatchCellProps = function (state, ownProps) {
+exports.mapStateToCellProps = mapStateToCellProps;
+var mapStateToDispatchCellProps = function (state, ownProps) {
     var props = exports.mapStateToCellProps(state, ownProps);
     var renderers = ownProps.renderers, cells = ownProps.cells, otherOwnProps = tslib_1.__rest(ownProps, ["renderers", "cells"]);
     return tslib_1.__assign(tslib_1.__assign(tslib_1.__assign({}, props), otherOwnProps), { cells: cells || state.jsonforms.cells || [] });
 };
+exports.mapStateToDispatchCellProps = mapStateToDispatchCellProps;
 /**
  * Default mapStateToCellProps for enum cell. Options is used for populating dropdown list
  * @param state
  * @param ownProps
  * @returns {StatePropsOfEnumCell}
  */
-exports.defaultMapStateToEnumCellProps = function (state, ownProps) {
+var defaultMapStateToEnumCellProps = function (state, ownProps) {
+    var _a, _b, _c, _d;
+    var props = exports.mapStateToCellProps(state, ownProps);
+    var options = ownProps.options ||
+        ((_a = props.schema.enum) === null || _a === void 0 ? void 0 : _a.map(function (e) {
+            var _a, _b, _c;
+            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);
+        })) ||
+        (props.schema.const && [
+            renderer_1.enumToEnumOptionMapper(props.schema.const, reducers_1.getTranslator()(state), (_d = (_c = (_b = props.uischema) === null || _b === void 0 ? void 0 : _b.options) === null || _c === void 0 ? void 0 : _c.i18n) !== null && _d !== void 0 ? _d : props.schema.i18n)
+        ]);
+    return tslib_1.__assign(tslib_1.__assign({}, props), { options: options });
+};
+exports.defaultMapStateToEnumCellProps = defaultMapStateToEnumCellProps;
+/**
+ * mapStateToOneOfEnumCellProps for one of enum cell. Options is used for populating dropdown list from oneOf
+ * @param state
+ * @param ownProps
+ * @returns {StatePropsOfEnumCell}
+ */
+var mapStateToOneOfEnumCellProps = function (state, ownProps) {
     var _a;
     var props = exports.mapStateToCellProps(state, ownProps);
-    var options = ownProps.options || ((_a = props.schema.enum) === null || _a === void 0 ? void 0 : _a.map(renderer_1.enumToEnumOptionMapper)) ||
-        props.schema.const && [renderer_1.enumToEnumOptionMapper(props.schema.const)];
+    var options = ownProps.options ||
+        ((_a = props.schema.oneOf) === null || _a === void 0 ? void 0 : _a.map(function (oneOfSubSchema) {
+            var _a, _b;
+            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);
+        }));
     return tslib_1.__assign(tslib_1.__assign({}, props), { options: options });
 };
+exports.mapStateToOneOfEnumCellProps = mapStateToOneOfEnumCellProps;
 /**
  * Synonym for mapDispatchToControlProps.
  *
@@ -94,7 +137,7 @@ exports.mapDispatchToCellProps = renderer_1.mapDispatchToControlProps;
  * Default dispatch to control props which can be customized to set handleChange action
  *
  */
-exports.defaultMapDispatchToControlProps = 
+var defaultMapDispatchToControlProps = 
 // TODO: ownProps types
 function (dispatch, ownProps) {
     var handleChange = exports.mapDispatchToCellProps(dispatch).handleChange;
@@ -102,4 +145,5 @@ function (dispatch, ownProps) {
         handleChange: ownProps.handleChange || handleChange
     };
 };
+exports.defaultMapDispatchToControlProps = defaultMapDispatchToControlProps;
 //# sourceMappingURL=cell.js.map

package/lib/util/cell.js.map

@@ -1 +1 @@
-{"version":3,"file":"cell.js","sourceRoot":"","sources":["../../src/util/cell.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"cell.js","sourceRoot":"","sources":["../../src/util/cell.ts"],"names":[],"mappings":"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"}

package/lib/util/combinators.d.ts

@@ -1,6 +1,5 @@
-import { JsonSchema } from '../models/jsonSchema';
-import { ControlElement, UISchemaElement } from '../models/uischema';
-import { JsonFormsUISchemaRegistryEntry } from '../reducers/uischemas';
+import { ControlElement, JsonSchema, UISchemaElement } from '../models';
+import { JsonFormsUISchemaRegistryEntry } from '../reducers';
 export interface CombinatorSubSchemaRenderInfo {
     schema: JsonSchema;
     uischema: UISchemaElement;

package/lib/util/combinators.js

@@ -24,6 +24,7 @@
   THE SOFTWARE.
 */
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.createCombinatorRenderInfos = exports.resolveSubSchemas = void 0;
 var tslib_1 = require("tslib");
 var resolvers_1 = require("./resolvers");
 var reducers_1 = require("../reducers");
@@ -35,7 +36,7 @@ var createLabel = function (subSchema, subSchemaIndex, keyword) {
         return keyword + '-' + subSchemaIndex;
     }
 };
-exports.resolveSubSchemas = function (schema, rootSchema, keyword) {
+var resolveSubSchemas = function (schema, rootSchema, keyword) {
     var _a;
     // resolve any $refs, otherwise the generated UI schema can't match the schema???
     var schemas = schema[keyword];
@@ -46,11 +47,13 @@ exports.resolveSubSchemas = function (schema, rootSchema, keyword) {
     }
     return schema;
 };
-exports.createCombinatorRenderInfos = function (combinatorSubSchemas, rootSchema, keyword, control, path, uischemas) {
+exports.resolveSubSchemas = resolveSubSchemas;
+var createCombinatorRenderInfos = function (combinatorSubSchemas, rootSchema, keyword, control, path, uischemas) {
     return combinatorSubSchemas.map(function (subSchema, subSchemaIndex) { return ({
         schema: subSchema,
         uischema: reducers_1.findUISchema(uischemas, subSchema, control.scope, path, undefined, control, rootSchema),
         label: createLabel(subSchema, subSchemaIndex, keyword)
     }); });
 };
+exports.createCombinatorRenderInfos = createCombinatorRenderInfos;
 //# sourceMappingURL=combinators.js.map

package/lib/util/combinators.js.map

@@ -1 +1 @@
-{"version":3,"file":"combinators.js","sourceRoot":"","sources":["../../src/util/combinators.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;;;;;;;;;EAuBE;;;AAIF,yCAA4C;AAC5C,wCAA2C;AAW3C,IAAM,WAAW,GAAG,UAClB,SAAqB,EACrB,cAAsB,EACtB,OAA0B;IAE1B,IAAI,SAAS,CAAC,KAAK,EAAE;QACnB,OAAO,SAAS,CAAC,KAAK,CAAC;KACxB;SAAM;QACL,OAAO,OAAO,GAAG,GAAG,GAAG,cAAc,CAAC;KACvC;AACH,CAAC,CAAC;AAEW,QAAA,iBAAiB,GAAG,UAC/B,MAAkB,EAClB,UAAsB,EACtB,OAA0B;;IAE1B,iFAAiF;IACjF,IAAM,OAAO,GAAG,MAAM,CAAC,OAAO,CAAU,CAAC;IACzC,IAAI,OAAO,CAAC,SAAS,CAAC,UAAA,CAAC,IAAI,OAAA,CAAC,CAAC,IAAI,KAAK,SAAS,EAApB,CAAoB,CAAC,KAAK,CAAC,CAAC,EAAE;QACvD,6CACK,MAAM,gBACR,OAAO,IAAI,MAAM,CAAC,OAAO,CAAW,CAAC,GAAG,CAAC,UAAA,CAAC;YACzC,OAAA,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,yBAAa,CAAC,UAAU,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;QAA9C,CAA8C,CAC/C,OACD;KACH;IACD,OAAO,MAAM,CAAC;AAChB,CAAC,CAAC;AAEW,QAAA,2BAA2B,GAAG,UACzC,oBAAkC,EAClC,UAAsB,EACtB,OAA0B,EAC1B,OAAuB,EACvB,IAAY,EACZ,SAA2C;IAE3C,OAAA,oBAAoB,CAAC,GAAG,CAAC,UAAC,SAAS,EAAE,cAAc,IAAK,OAAA,CAAC;QACvD,MAAM,EAAE,SAAS;QACjB,QAAQ,EAAE,uBAAY,CACpB,SAAS,EACT,SAAS,EACT,OAAO,CAAC,KAAK,EACb,IAAI,EACJ,SAAS,EACT,OAAO,EACP,UAAU,CACX;QACD,KAAK,EAAE,WAAW,CAAC,SAAS,EAAE,cAAc,EAAE,OAAO,CAAC;KACvD,CAAC,EAZsD,CAYtD,CAAC;AAZH,CAYG,CAAC"}
+{"version":3,"file":"combinators.js","sourceRoot":"","sources":["../../src/util/combinators.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;;;;;;;;;EAuBE;;;;AAGF,yCAA4C;AAC5C,wCAA2E;AAU3E,IAAM,WAAW,GAAG,UAClB,SAAqB,EACrB,cAAsB,EACtB,OAA0B;IAE1B,IAAI,SAAS,CAAC,KAAK,EAAE;QACnB,OAAO,SAAS,CAAC,KAAK,CAAC;KACxB;SAAM;QACL,OAAO,OAAO,GAAG,GAAG,GAAG,cAAc,CAAC;KACvC;AACH,CAAC,CAAC;AAEK,IAAM,iBAAiB,GAAG,UAC/B,MAAkB,EAClB,UAAsB,EACtB,OAA0B;;IAE1B,iFAAiF;IACjF,IAAM,OAAO,GAAG,MAAM,CAAC,OAAO,CAAU,CAAC;IACzC,IAAI,OAAO,CAAC,SAAS,CAAC,UAAA,CAAC,IAAI,OAAA,CAAC,CAAC,IAAI,KAAK,SAAS,EAApB,CAAoB,CAAC,KAAK,CAAC,CAAC,EAAE;QACvD,6CACK,MAAM,gBACR,OAAO,IAAI,MAAM,CAAC,OAAO,CAAW,CAAC,GAAG,CAAC,UAAA,CAAC;YACzC,OAAA,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,yBAAa,CAAC,UAAU,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;QAA9C,CAA8C,CAC/C,OACD;KACH;IACD,OAAO,MAAM,CAAC;AAChB,CAAC,CAAC;AAhBW,QAAA,iBAAiB,qBAgB5B;AAEK,IAAM,2BAA2B,GAAG,UACzC,oBAAkC,EAClC,UAAsB,EACtB,OAA0B,EAC1B,OAAuB,EACvB,IAAY,EACZ,SAA2C;IAE3C,OAAA,oBAAoB,CAAC,GAAG,CAAC,UAAC,SAAS,EAAE,cAAc,IAAK,OAAA,CAAC;QACvD,MAAM,EAAE,SAAS;QACjB,QAAQ,EAAE,uBAAY,CACpB,SAAS,EACT,SAAS,EACT,OAAO,CAAC,KAAK,EACb,IAAI,EACJ,SAAS,EACT,OAAO,EACP,UAAU,CACX;QACD,KAAK,EAAE,WAAW,CAAC,SAAS,EAAE,cAAc,EAAE,OAAO,CAAC;KACvD,CAAC,EAZsD,CAYtD,CAAC;AAZH,CAYG,CAAC;AApBO,QAAA,2BAA2B,+BAoBlC"}

package/lib/util/ids.js

@@ -1,5 +1,4 @@
 "use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
 /*
   The MIT License
   
@@ -24,6 +23,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
   OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
   THE SOFTWARE.
 */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.clearAllIds = exports.removeId = exports.createId = void 0;
 var usedIds = new Set();
 var makeId = function (idBase, iteration) {
     return iteration <= 1 ? idBase : idBase + iteration.toString();
@@ -32,7 +33,7 @@ var isUniqueId = function (idBase, iteration) {
     var newID = makeId(idBase, iteration);
     return !usedIds.has(newID);
 };
-exports.createId = function (proposedId) {
+var createId = function (proposedId) {
     if (proposedId === undefined) {
         // failsafe to avoid endless loops in error cases
         proposedId = 'undefined';
@@ -45,6 +46,9 @@ exports.createId = function (proposedId) {
     usedIds.add(newID);
     return newID;
 };
-exports.removeId = function (id) { return usedIds.delete(id); };
-exports.clearAllIds = function () { return usedIds.clear(); };
+exports.createId = createId;
+var removeId = function (id) { return usedIds.delete(id); };
+exports.removeId = removeId;
+var clearAllIds = function () { return usedIds.clear(); };
+exports.clearAllIds = clearAllIds;
 //# sourceMappingURL=ids.js.map

package/lib/util/ids.js.map

@@ -1 +1 @@
-{"version":3,"file":"ids.js","sourceRoot":"","sources":["../../src/util/ids.ts"],"names":[],"mappings":";;AAAA;;;;;;;;;;;;;;;;;;;;;;;EAuBE;AACF,IAAM,OAAO,GAAgB,IAAI,GAAG,EAAU,CAAC;AAE/C,IAAM,MAAM,GAAG,UAAC,MAAc,EAAE,SAAiB;IAC/C,OAAA,SAAS,IAAI,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,GAAG,SAAS,CAAC,QAAQ,EAAE;AAAvD,CAAuD,CAAC;AAE1D,IAAM,UAAU,GAAG,UAAC,MAAc,EAAE,SAAiB;IACnD,IAAM,KAAK,GAAG,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;IACxC,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;AAC7B,CAAC,CAAC;AAEW,QAAA,QAAQ,GAAG,UAAC,UAAkB;IACzC,IAAI,UAAU,KAAK,SAAS,EAAE;QAC5B,iDAAiD;QACjD,UAAU,GAAG,WAAW,CAAC;KAC1B;IACD,IAAI,KAAK,GAAG,CAAC,CAAC;IACd,OAAO,CAAC,UAAU,CAAC,UAAU,EAAE,KAAK,CAAC,EAAE;QACrC,KAAK,EAAE,CAAC;KACT;IACD,IAAM,KAAK,GAAG,MAAM,CAAC,UAAU,EAAE,KAAK,CAAC,CAAC;IACxC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;IACnB,OAAO,KAAK,CAAC;AACf,CAAC,CAAC;AAEW,QAAA,QAAQ,GAAG,UAAC,EAAU,IAAK,OAAA,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC,EAAlB,CAAkB,CAAC;AAE9C,QAAA,WAAW,GAAG,cAAM,OAAA,OAAO,CAAC,KAAK,EAAE,EAAf,CAAe,CAAC"}
+{"version":3,"file":"ids.js","sourceRoot":"","sources":["../../src/util/ids.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;;;;;;;;;EAuBE;;;AAEF,IAAM,OAAO,GAAgB,IAAI,GAAG,EAAU,CAAC;AAE/C,IAAM,MAAM,GAAG,UAAC,MAAc,EAAE,SAAiB;IAC/C,OAAA,SAAS,IAAI,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,GAAG,SAAS,CAAC,QAAQ,EAAE;AAAvD,CAAuD,CAAC;AAE1D,IAAM,UAAU,GAAG,UAAC,MAAc,EAAE,SAAiB;IACnD,IAAM,KAAK,GAAG,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;IACxC,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;AAC7B,CAAC,CAAC;AAEK,IAAM,QAAQ,GAAG,UAAC,UAAkB;IACzC,IAAI,UAAU,KAAK,SAAS,EAAE;QAC5B,iDAAiD;QACjD,UAAU,GAAG,WAAW,CAAC;KAC1B;IACD,IAAI,KAAK,GAAG,CAAC,CAAC;IACd,OAAO,CAAC,UAAU,CAAC,UAAU,EAAE,KAAK,CAAC,EAAE;QACrC,KAAK,EAAE,CAAC;KACT;IACD,IAAM,KAAK,GAAG,MAAM,CAAC,UAAU,EAAE,KAAK,CAAC,CAAC;IACxC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;IACnB,OAAO,KAAK,CAAC;AACf,CAAC,CAAC;AAZW,QAAA,QAAQ,YAYnB;AAEK,IAAM,QAAQ,GAAG,UAAC,EAAU,IAAK,OAAA,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC,EAAlB,CAAkB,CAAC;AAA9C,QAAA,QAAQ,YAAsC;AAEpD,IAAM,WAAW,GAAG,cAAM,OAAA,OAAO,CAAC,KAAK,EAAE,EAAf,CAAe,CAAC;AAApC,QAAA,WAAW,eAAyB"}

package/lib/util/index.d.ts

@@ -1,49 +1,15 @@
-import { JsonSchema, Scopable, UISchemaElement } from '../';
-import { compose as composePaths, composeWithUi, toDataPath } from './path';
-import { isEnabled, isVisible } from './runtime';
-import { Ajv } from 'ajv';
-export { createCleanLabel, createLabelDescriptionFrom } from './label';
-/**
- * Escape the given string such that it can be used as a class name,
- * i.e. hashes and slashes will be replaced.
- *
- * @param {string} s the string that should be converted to a valid class name
- * @returns {string} the escaped string
- */
-export declare const convertToValidClassName: (s: string) => string;
-export declare const formatErrorMessage: (errors: string[]) => string;
-declare const hasType: (jsonSchema: JsonSchema, expected: string) => boolean;
-/**
- * Derives the type of the jsonSchema element
- */
-declare const deriveTypes: (jsonSchema: JsonSchema) => string[];
-/**
- * Convenience wrapper around resolveData and resolveSchema.
- */
-declare const Resolve: {
-    schema(schema: JsonSchema, schemaPath: string, rootSchema?: JsonSchema): JsonSchema;
-    data(data: any, path: string): any;
-};
-export { resolveData, resolveSchema, findRefs, SchemaRef, SchemaRefs } from './resolvers';
-export { Resolve };
-declare const Paths: {
-    compose: (path1: string, path2: string) => string;
-    fromScopable: (scopable: Scopable) => string;
-};
-export { composePaths, composeWithUi, Paths, toDataPath };
-declare const Runtime: {
-    isEnabled(uischema: UISchemaElement, data: any, ajv: Ajv): boolean;
-    isVisible(uischema: UISchemaElement, data: any, ajv: Ajv): boolean;
-};
-export { isEnabled, isVisible, Runtime, deriveTypes, hasType };
-export * from './renderer';
+export * from './array';
 export * from './cell';
-export * from './runtime';
+export * from './combinators';
 export * from './Formatted';
 export * from './ids';
-export * from './validator';
-export * from './combinators';
-export * from './uischema';
-export * from './array';
-export * from './type';
+export * from './label';
+export * from './path';
+export * from './renderer';
+export * from './resolvers';
+export * from './runtime';
 export * from './schema';
+export * from './type';
+export * from './uischema';
+export * from './util';
+export * from './validator';

package/lib/util/index.js

@@ -1,6 +1,4 @@
 "use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-var tslib_1 = require("tslib");
 /*
   The MIT License
   
@@ -25,109 +23,21 @@ var tslib_1 = require("tslib");
   OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
   THE SOFTWARE.
 */
-var isEmpty_1 = tslib_1.__importDefault(require("lodash/isEmpty"));
-var isArray_1 = tslib_1.__importDefault(require("lodash/isArray"));
-var includes_1 = tslib_1.__importDefault(require("lodash/includes"));
-var find_1 = tslib_1.__importDefault(require("lodash/find"));
-var resolvers_1 = require("./resolvers");
-var path_1 = require("./path");
-exports.composePaths = path_1.compose;
-exports.composeWithUi = path_1.composeWithUi;
-exports.toDataPath = path_1.toDataPath;
-var runtime_1 = require("./runtime");
-exports.isEnabled = runtime_1.isEnabled;
-exports.isVisible = runtime_1.isVisible;
-var label_1 = require("./label");
-exports.createCleanLabel = label_1.createCleanLabel;
-exports.createLabelDescriptionFrom = label_1.createLabelDescriptionFrom;
-/**
- * Escape the given string such that it can be used as a class name,
- * i.e. hashes and slashes will be replaced.
- *
- * @param {string} s the string that should be converted to a valid class name
- * @returns {string} the escaped string
- */
-exports.convertToValidClassName = function (s) {
-    return s.replace('#', 'root').replace(new RegExp('/', 'g'), '_');
-};
-exports.formatErrorMessage = function (errors) {
-    if (errors === undefined || errors === null) {
-        return '';
-    }
-    return errors.join('\n');
-};
-var hasType = function (jsonSchema, expected) {
-    return includes_1.default(deriveTypes(jsonSchema), expected);
-};
-exports.hasType = hasType;
-/**
- * Derives the type of the jsonSchema element
- */
-var deriveTypes = function (jsonSchema) {
-    if (isEmpty_1.default(jsonSchema)) {
-        return [];
-    }
-    if (!isEmpty_1.default(jsonSchema.type) && typeof jsonSchema.type === 'string') {
-        return [jsonSchema.type];
-    }
-    if (isArray_1.default(jsonSchema.type)) {
-        return jsonSchema.type;
-    }
-    if (!isEmpty_1.default(jsonSchema.properties) ||
-        !isEmpty_1.default(jsonSchema.additionalProperties)) {
-        return ['object'];
-    }
-    if (!isEmpty_1.default(jsonSchema.items)) {
-        return ['array'];
-    }
-    if (!isEmpty_1.default(jsonSchema.allOf)) {
-        var allOfType = find_1.default(jsonSchema.allOf, function (schema) { return deriveTypes(schema).length !== 0; });
-        if (allOfType) {
-            return deriveTypes(allOfType);
-        }
-    }
-    // ignore all remaining cases
-    return [];
-};
-exports.deriveTypes = deriveTypes;
-/**
- * Convenience wrapper around resolveData and resolveSchema.
- */
-var Resolve = {
-    schema: resolvers_1.resolveSchema,
-    data: resolvers_1.resolveData
-};
-exports.Resolve = Resolve;
-var resolvers_2 = require("./resolvers");
-exports.resolveData = resolvers_2.resolveData;
-exports.resolveSchema = resolvers_2.resolveSchema;
-exports.findRefs = resolvers_2.findRefs;
-// Paths --
-var fromScopable = function (scopable) {
-    return path_1.toDataPathSegments(scopable.scope).join('.');
-};
-var Paths = {
-    compose: path_1.compose,
-    fromScopable: fromScopable
-};
-exports.Paths = Paths;
-// Runtime --
-var Runtime = {
-    isEnabled: function (uischema, data, ajv) {
-        return runtime_1.isEnabled(uischema, data, undefined, ajv);
-    },
-    isVisible: function (uischema, data, ajv) {
-        return runtime_1.isVisible(uischema, data, undefined, ajv);
-    }
-};
-exports.Runtime = Runtime;
-tslib_1.__exportStar(require("./renderer"), exports);
+Object.defineProperty(exports, "__esModule", { value: true });
+var tslib_1 = require("tslib");
+tslib_1.__exportStar(require("./array"), exports);
 tslib_1.__exportStar(require("./cell"), exports);
-tslib_1.__exportStar(require("./runtime"), exports);
-tslib_1.__exportStar(require("./ids"), exports);
-tslib_1.__exportStar(require("./validator"), exports);
 tslib_1.__exportStar(require("./combinators"), exports);
-tslib_1.__exportStar(require("./uischema"), exports);
-tslib_1.__exportStar(require("./array"), exports);
+tslib_1.__exportStar(require("./Formatted"), exports);
+tslib_1.__exportStar(require("./ids"), exports);
+tslib_1.__exportStar(require("./label"), exports);
+tslib_1.__exportStar(require("./path"), exports);
+tslib_1.__exportStar(require("./renderer"), exports);
+tslib_1.__exportStar(require("./resolvers"), exports);
+tslib_1.__exportStar(require("./runtime"), exports);
 tslib_1.__exportStar(require("./schema"), exports);
+tslib_1.__exportStar(require("./type"), exports);
+tslib_1.__exportStar(require("./uischema"), exports);
+tslib_1.__exportStar(require("./util"), exports);
+tslib_1.__exportStar(require("./validator"), exports);
 //# sourceMappingURL=index.js.map

package/lib/util/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/util/index.ts"],"names":[],"mappings":";;;AAAA;;;;;;;;;;;;;;;;;;;;;;;EAuBE;AACF,mEAAqC;AACrC,mEAAqC;AACrC,qEAAuC;AACvC,6DAA+B;AAE/B,yCAAyD;AACzD,+BAKgB;AAgGP,uBApGI,cAAY,CAoGJ;AAAE,wBAnGrB,oBAAa,CAmGqB;AAAS,qBAlG3C,iBAAU,CAkG2C;AA/FvD,qCAAiD;AA0GxC,oBA1GA,mBAAS,CA0GA;AAAE,oBA1GA,mBAAS,CA0GA;AAvG7B,iCAAuE;AAA9D,mCAAA,gBAAgB,CAAA;AAAE,6CAAA,0BAA0B,CAAA;AAErD;;;;;;GAMG;AACU,QAAA,uBAAuB,GAAG,UAAC,CAAS;IAC/C,OAAA,CAAC,CAAC,OAAO,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC,OAAO,CAAC,IAAI,MAAM,CAAC,GAAG,EAAE,GAAG,CAAC,EAAE,GAAG,CAAC;AAAzD,CAAyD,CAAC;AAE/C,QAAA,kBAAkB,GAAG,UAAC,MAAgB;IACjD,IAAI,MAAM,KAAK,SAAS,IAAI,MAAM,KAAK,IAAI,EAAE;QAC3C,OAAO,EAAE,CAAC;KACX;IAED,OAAO,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AAC3B,CAAC,CAAC;AAEF,IAAM,OAAO,GAAG,UAAC,UAAsB,EAAE,QAAgB;IACvD,OAAO,kBAAQ,CAAC,WAAW,CAAC,UAAU,CAAC,EAAE,QAAQ,CAAC,CAAC;AACrD,CAAC,CAAC;AAiFmD,0BAAO;AA/E5D;;GAEG;AACH,IAAM,WAAW,GAAG,UAAC,UAAsB;IACzC,IAAI,iBAAO,CAAC,UAAU,CAAC,EAAE;QACvB,OAAO,EAAE,CAAC;KACX;IACD,IAAI,CAAC,iBAAO,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,OAAO,UAAU,CAAC,IAAI,KAAK,QAAQ,EAAE;QACpE,OAAO,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;KAC1B;IACD,IAAI,iBAAO,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE;QAC5B,OAAO,UAAU,CAAC,IAAI,CAAC;KACxB;IACD,IACE,CAAC,iBAAO,CAAC,UAAU,CAAC,UAAU,CAAC;QAC/B,CAAC,iBAAO,CAAC,UAAU,CAAC,oBAAoB,CAAC,EACzC;QACA,OAAO,CAAC,QAAQ,CAAC,CAAC;KACnB;IACD,IAAI,CAAC,iBAAO,CAAC,UAAU,CAAC,KAAK,CAAC,EAAE;QAC9B,OAAO,CAAC,OAAO,CAAC,CAAC;KAClB;IAED,IAAI,CAAC,iBAAO,CAAC,UAAU,CAAC,KAAK,CAAC,EAAE;QAC9B,IAAM,SAAS,GAAG,cAAI,CACpB,UAAU,CAAC,KAAK,EAChB,UAAC,MAAkB,IAAK,OAAA,WAAW,CAAC,MAAM,CAAC,CAAC,MAAM,KAAK,CAAC,EAAhC,CAAgC,CACzD,CAAC;QAEF,IAAI,SAAS,EAAE;YACb,OAAO,WAAW,CAAC,SAAS,CAAC,CAAC;SAC/B;KACF;IACD,6BAA6B;IAC7B,OAAO,EAAE,CAAC;AACZ,CAAC,CAAC;AA4CsC,kCAAW;AA1CnD;;GAEG;AACH,IAAM,OAAO,GAOT;IACF,MAAM,EAAE,yBAAa;IACrB,IAAI,EAAE,uBAAW;CAClB,CAAC;AAQO,0BAAO;AAPhB,yCAMqB;AALnB,kCAAA,WAAW,CAAA;AACX,oCAAA,aAAa,CAAA;AACb,+BAAA,QAAQ,CAAA;AAMV,WAAW;AACX,IAAM,YAAY,GAAG,UAAC,QAAkB;IACtC,OAAA,yBAAkB,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC;AAA5C,CAA4C,CAAC;AAE/C,IAAM,KAAK,GAAG;IACZ,OAAO,EAAE,cAAY;IACrB,YAAY,cAAA;CACb,CAAC;AACoC,sBAAK;AAE3C,aAAa;AACb,IAAM,OAAO,GAAG;IACd,SAAS,EAAT,UAAU,QAAyB,EAAE,IAAS,EAAE,GAAQ;QACtD,OAAO,mBAAS,CAAC,QAAQ,EAAE,IAAI,EAAC,SAAS,EAAE,GAAG,CAAC,CAAC;IAClD,CAAC;IACD,SAAS,EAAT,UAAU,QAAyB,EAAE,IAAS,EAAE,GAAQ;QACtD,OAAO,mBAAS,CAAC,QAAQ,EAAE,IAAI,EAAE,SAAS,EAAE,GAAG,CAAC,CAAC;IACnD,CAAC;CACF,CAAC;AAC6B,0BAAO;AAEtC,qDAA2B;AAC3B,iDAAuB;AACvB,oDAA0B;AAE1B,gDAAsB;AACtB,sDAA4B;AAC5B,wDAA8B;AAC9B,qDAA2B;AAC3B,kDAAwB;AAExB,mDAAyB"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/util/index.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;;;;;;;;;EAuBE;;;AAEF,kDAAwB;AACxB,iDAAuB;AACvB,wDAA8B;AAC9B,sDAA4B;AAC5B,gDAAsB;AACtB,kDAAwB;AACxB,iDAAuB;AACvB,qDAA2B;AAC3B,sDAA4B;AAC5B,oDAA0B;AAC1B,mDAAyB;AACzB,iDAAuB;AACvB,qDAA2B;AAC3B,iDAAuB;AACvB,sDAA4B"}

package/lib/util/label.d.ts

@@ -1,5 +1,4 @@
-import { ControlElement, LabelDescription } from '../models/uischema';
-import { JsonSchema } from '../models/jsonSchema';
+import { ControlElement, JsonSchema, LabelDescription } from '../models';
 export declare const createCleanLabel: (label: string) => string;
 /**
  * Return a label object based on the given control and schema element.

package/lib/util/label.js

@@ -1,6 +1,4 @@
 "use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-var tslib_1 = require("tslib");
 /*
   The MIT License
   
@@ -25,6 +23,9 @@ var tslib_1 = require("tslib");
   OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
   THE SOFTWARE.
 */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.createLabelDescriptionFrom = exports.createCleanLabel = void 0;
+var tslib_1 = require("tslib");
 var startCase_1 = tslib_1.__importDefault(require("lodash/startCase"));
 var deriveLabel = function (controlElement, schemaElement) {
     if (schemaElement && typeof schemaElement.title === 'string') {
@@ -37,16 +38,17 @@ var deriveLabel = function (controlElement, schemaElement) {
     }
     return '';
 };
-exports.createCleanLabel = function (label) {
+var createCleanLabel = function (label) {
     return startCase_1.default(label.replace('_', ' '));
 };
+exports.createCleanLabel = createCleanLabel;
 /**
  * Return a label object based on the given control and schema element.
  * @param {ControlElement} withLabel the UI schema to obtain a label object for
  * @param {JsonSchema} schema optional: the corresponding schema element
  * @returns {LabelDescription}
  */
-exports.createLabelDescriptionFrom = function (withLabel, schema) {
+var createLabelDescriptionFrom = function (withLabel, schema) {
     var labelProperty = withLabel.label;
     if (typeof labelProperty === 'boolean') {
         return labelDescription(deriveLabel(withLabel, schema), labelProperty);
@@ -63,6 +65,7 @@ exports.createLabelDescriptionFrom = function (withLabel, schema) {
     }
     return labelDescription(deriveLabel(withLabel, schema), true);
 };
+exports.createLabelDescriptionFrom = createLabelDescriptionFrom;
 var labelDescription = function (text, show) { return ({
     text: text,
     show: show

package/lib/util/label.js.map

@@ -1 +1 @@
-{"version":3,"file":"label.js","sourceRoot":"","sources":["../../src/util/label.ts"],"names":[],"mappings":";;;AAAA;;;;;;;;;;;;;;;;;;;;;;;EAuBE;AACF,uEAAyC;AAKzC,IAAM,WAAW,GAAG,UAClB,cAA8B,EAC9B,aAA0B;IAE1B,IAAI,aAAa,IAAI,OAAO,aAAa,CAAC,KAAK,KAAK,QAAQ,EAAE;QAC5D,OAAO,aAAa,CAAC,KAAK,CAAC;KAC5B;IACD,IAAI,OAAO,cAAc,CAAC,KAAK,KAAK,QAAQ,EAAE;QAC5C,IAAM,GAAG,GAAG,cAAc,CAAC,KAAK,CAAC;QACjC,IAAM,KAAK,GAAG,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,WAAW,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC;QAEnD,OAAO,mBAAS,CAAC,KAAK,CAAC,CAAC;KACzB;IAED,OAAO,EAAE,CAAC;AACZ,CAAC,CAAC;AAEW,QAAA,gBAAgB,GAAG,UAAC,KAAa;IAC5C,OAAO,mBAAS,CAAC,KAAK,CAAC,OAAO,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC,CAAC;AAC5C,CAAC,CAAC;AAEF;;;;;GAKG;AACU,QAAA,0BAA0B,GAAG,UACxC,SAAyB,EACzB,MAAmB;IAEnB,IAAM,aAAa,GAAG,SAAS,CAAC,KAAK,CAAC;IACtC,IAAI,OAAO,aAAa,KAAK,SAAS,EAAE;QACtC,OAAO,gBAAgB,CAAC,WAAW,CAAC,SAAS,EAAE,MAAM,CAAC,EAAE,aAAa,CAAC,CAAC;KACxE;IACD,IAAI,OAAO,aAAa,KAAK,QAAQ,EAAE;QACrC,OAAO,gBAAgB,CAAC,aAAa,EAAE,IAAI,CAAC,CAAC;KAC9C;IACD,IAAI,OAAO,aAAa,KAAK,QAAQ,EAAE;QACrC,IAAM,KAAK,GACT,OAAO,aAAa,CAAC,IAAI,KAAK,QAAQ;YACpC,CAAC,CAAC,aAAa,CAAC,IAAI;YACpB,CAAC,CAAC,WAAW,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC;QACrC,IAAM,IAAI,GACR,OAAO,aAAa,CAAC,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC;QACtE,OAAO,gBAAgB,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;KACtC;IACD,OAAO,gBAAgB,CAAC,WAAW,CAAC,SAAS,EAAE,MAAM,CAAC,EAAE,IAAI,CAAC,CAAC;AAChE,CAAC,CAAC;AAEF,IAAM,gBAAgB,GAAG,UAAC,IAAY,EAAE,IAAa,IAAuB,OAAA,CAAC;IAC3E,IAAI,EAAE,IAAI;IACV,IAAI,EAAE,IAAI;CACX,CAAC,EAH0E,CAG1E,CAAC"}
+{"version":3,"file":"label.js","sourceRoot":"","sources":["../../src/util/label.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;;;;;;;;;EAuBE;;;;AAEF,uEAAyC;AAIzC,IAAM,WAAW,GAAG,UAClB,cAA8B,EAC9B,aAA0B;IAE1B,IAAI,aAAa,IAAI,OAAO,aAAa,CAAC,KAAK,KAAK,QAAQ,EAAE;QAC5D,OAAO,aAAa,CAAC,KAAK,CAAC;KAC5B;IACD,IAAI,OAAO,cAAc,CAAC,KAAK,KAAK,QAAQ,EAAE;QAC5C,IAAM,GAAG,GAAG,cAAc,CAAC,KAAK,CAAC;QACjC,IAAM,KAAK,GAAG,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,WAAW,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC;QAEnD,OAAO,mBAAS,CAAC,KAAK,CAAC,CAAC;KACzB;IAED,OAAO,EAAE,CAAC;AACZ,CAAC,CAAC;AAEK,IAAM,gBAAgB,GAAG,UAAC,KAAa;IAC5C,OAAO,mBAAS,CAAC,KAAK,CAAC,OAAO,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC,CAAC;AAC5C,CAAC,CAAC;AAFW,QAAA,gBAAgB,oBAE3B;AAEF;;;;;GAKG;AACI,IAAM,0BAA0B,GAAG,UACxC,SAAyB,EACzB,MAAmB;IAEnB,IAAM,aAAa,GAAG,SAAS,CAAC,KAAK,CAAC;IACtC,IAAI,OAAO,aAAa,KAAK,SAAS,EAAE;QACtC,OAAO,gBAAgB,CAAC,WAAW,CAAC,SAAS,EAAE,MAAM,CAAC,EAAE,aAAa,CAAC,CAAC;KACxE;IACD,IAAI,OAAO,aAAa,KAAK,QAAQ,EAAE;QACrC,OAAO,gBAAgB,CAAC,aAAa,EAAE,IAAI,CAAC,CAAC;KAC9C;IACD,IAAI,OAAO,aAAa,KAAK,QAAQ,EAAE;QACrC,IAAM,KAAK,GACT,OAAO,aAAa,CAAC,IAAI,KAAK,QAAQ;YACpC,CAAC,CAAC,aAAa,CAAC,IAAI;YACpB,CAAC,CAAC,WAAW,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC;QACrC,IAAM,IAAI,GACR,OAAO,aAAa,CAAC,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC;QACtE,OAAO,gBAAgB,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;KACtC;IACD,OAAO,gBAAgB,CAAC,WAAW,CAAC,SAAS,EAAE,MAAM,CAAC,EAAE,IAAI,CAAC,CAAC;AAChE,CAAC,CAAC;AArBW,QAAA,0BAA0B,8BAqBrC;AAEF,IAAM,gBAAgB,GAAG,UAAC,IAAY,EAAE,IAAa,IAAuB,OAAA,CAAC;IAC3E,IAAI,EAAE,IAAI;IACV,IAAI,EAAE,IAAI;CACX,CAAC,EAH0E,CAG1E,CAAC"}

package/lib/util/path.d.ts

@@ -1,5 +1,6 @@
-import { Scopable } from '../';
+import { Scopable } from '../models';
 export declare const compose: (path1: string, path2: string) => string;
+export { compose as composePaths };
 /**
  * Convert a schema path (i.e. JSON pointer) to an array by splitting
  * at the '/' character and removing all schema-specific keywords.

package/lib/util/path.js

@@ -1,6 +1,4 @@
 "use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-var tslib_1 = require("tslib");
 /*
   The MIT License
   
@@ -25,9 +23,12 @@ var tslib_1 = require("tslib");
   OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
   THE SOFTWARE.
 */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.composeWithUi = exports.toDataPath = exports.toDataPathSegments = exports.composePaths = exports.compose = void 0;
+var tslib_1 = require("tslib");
 var isEmpty_1 = tslib_1.__importDefault(require("lodash/isEmpty"));
 var range_1 = tslib_1.__importDefault(require("lodash/range"));
-exports.compose = function (path1, path2) {
+var compose = function (path1, path2) {
     var p1 = path1;
     if (!isEmpty_1.default(path1) && !isEmpty_1.default(path2) && !path2.startsWith('[')) {
         p1 = path1 + '.';
@@ -42,6 +43,8 @@ exports.compose = function (path1, path2) {
         return "" + p1 + path2;
     }
 };
+exports.compose = compose;
+exports.composePaths = exports.compose;
 /**
  * Convert a schema path (i.e. JSON pointer) to an array by splitting
  * at the '/' character and removing all schema-specific keywords.
@@ -53,7 +56,7 @@ exports.compose = function (path1, path2) {
  * @param {string} schemaPath the schema path to be converted
  * @returns {string[]} an array containing only non-schema-specific segments
  */
-exports.toDataPathSegments = function (schemaPath) {
+var toDataPathSegments = function (schemaPath) {
     var s = schemaPath
         .replace(/anyOf\/[\d]\//g, '')
         .replace(/allOf\/[\d]\//g, '')
@@ -63,6 +66,7 @@ exports.toDataPathSegments = function (schemaPath) {
     var startIndex = startFromRoot ? 2 : 1;
     return range_1.default(startIndex, segments.length, 2).map(function (idx) { return segments[idx]; });
 };
+exports.toDataPathSegments = toDataPathSegments;
 /**
  * Remove all schema-specific keywords (e.g. 'properties') from a given path.
  * @example
@@ -71,14 +75,16 @@ exports.toDataPathSegments = function (schemaPath) {
  * @param {string} schemaPath the schema path to be converted
  * @returns {string} the path without schema-specific keywords
  */
-exports.toDataPath = function (schemaPath) {
+var toDataPath = function (schemaPath) {
     return exports.toDataPathSegments(schemaPath).join('.');
 };
-exports.composeWithUi = function (scopableUi, path) {
+exports.toDataPath = toDataPath;
+var composeWithUi = function (scopableUi, path) {
     var segments = exports.toDataPathSegments(scopableUi.scope);
     if (isEmpty_1.default(segments) && path === undefined) {
         return '';
     }
     return isEmpty_1.default(segments) ? path : exports.compose(path, segments.join('.'));
 };
+exports.composeWithUi = composeWithUi;
 //# sourceMappingURL=path.js.map

package/lib/util/path.js.map

@@ -1 +1 @@
-{"version":3,"file":"path.js","sourceRoot":"","sources":["../../src/util/path.ts"],"names":[],"mappings":";;;AAAA;;;;;;;;;;;;;;;;;;;;;;;EAuBE;AACF,mEAAqC;AACrC,+DAAiC;AAGpB,QAAA,OAAO,GAAG,UAAC,KAAa,EAAE,KAAa;IAClD,IAAI,EAAE,GAAG,KAAK,CAAC;IACf,IAAI,CAAC,iBAAO,CAAC,KAAK,CAAC,IAAI,CAAC,iBAAO,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE;QAChE,EAAE,GAAG,KAAK,GAAG,GAAG,CAAC;KAClB;IAED,IAAI,iBAAO,CAAC,EAAE,CAAC,EAAE;QACf,OAAO,KAAK,CAAC;KACd;SAAM,IAAI,iBAAO,CAAC,KAAK,CAAC,EAAE;QACzB,OAAO,EAAE,CAAC;KACX;SAAM;QACL,OAAO,KAAG,EAAE,GAAG,KAAO,CAAC;KACxB;AACH,CAAC,CAAC;AAEF;;;;;;;;;;GAUG;AACU,QAAA,kBAAkB,GAAG,UAAC,UAAkB;IACnD,IAAM,CAAC,GAAG,UAAU;SACjB,OAAO,CAAC,gBAAgB,EAAE,EAAE,CAAC;SAC7B,OAAO,CAAC,gBAAgB,EAAE,EAAE,CAAC;SAC7B,OAAO,CAAC,gBAAgB,EAAE,EAAE,CAAC,CAAC;IACjC,IAAM,QAAQ,GAAG,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IAE9B,IAAM,aAAa,GAAG,QAAQ,CAAC,CAAC,CAAC,KAAK,GAAG,IAAI,QAAQ,CAAC,CAAC,CAAC,KAAK,EAAE,CAAC;IAChE,IAAM,UAAU,GAAG,aAAa,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IACzC,OAAO,eAAK,CAAC,UAAU,EAAE,QAAQ,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,UAAA,GAAG,IAAI,OAAA,QAAQ,CAAC,GAAG,CAAC,EAAb,CAAa,CAAC,CAAC;AACzE,CAAC,CAAC;AAEF;;;;;;;GAOG;AACU,QAAA,UAAU,GAAG,UAAC,UAAkB;IAC3C,OAAO,0BAAkB,CAAC,UAAU,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AAClD,CAAC,CAAC;AAEW,QAAA,aAAa,GAAG,UAAC,UAAoB,EAAE,IAAY;IAC9D,IAAM,QAAQ,GAAG,0BAAkB,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC;IAEtD,IAAI,iBAAO,CAAC,QAAQ,CAAC,IAAI,IAAI,KAAK,SAAS,EAAE;QAC3C,OAAO,EAAE,CAAC;KACX;IAED,OAAO,iBAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,eAAO,CAAC,IAAI,EAAE,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;AACtE,CAAC,CAAC"}
+{"version":3,"file":"path.js","sourceRoot":"","sources":["../../src/util/path.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;;;;;;;;;EAuBE;;;;AAEF,mEAAqC;AACrC,+DAAiC;AAG1B,IAAM,OAAO,GAAG,UAAC,KAAa,EAAE,KAAa;IAClD,IAAI,EAAE,GAAG,KAAK,CAAC;IACf,IAAI,CAAC,iBAAO,CAAC,KAAK,CAAC,IAAI,CAAC,iBAAO,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE;QAChE,EAAE,GAAG,KAAK,GAAG,GAAG,CAAC;KAClB;IAED,IAAI,iBAAO,CAAC,EAAE,CAAC,EAAE;QACf,OAAO,KAAK,CAAC;KACd;SAAM,IAAI,iBAAO,CAAC,KAAK,CAAC,EAAE;QACzB,OAAO,EAAE,CAAC;KACX;SAAM;QACL,OAAO,KAAG,EAAE,GAAG,KAAO,CAAC;KACxB;AACH,CAAC,CAAC;AAbW,QAAA,OAAO,WAalB;AAEkB,uBAfP,eAAO,CAeY;AAEhC;;;;;;;;;;GAUG;AACI,IAAM,kBAAkB,GAAG,UAAC,UAAkB;IACnD,IAAM,CAAC,GAAG,UAAU;SACjB,OAAO,CAAC,gBAAgB,EAAE,EAAE,CAAC;SAC7B,OAAO,CAAC,gBAAgB,EAAE,EAAE,CAAC;SAC7B,OAAO,CAAC,gBAAgB,EAAE,EAAE,CAAC,CAAC;IACjC,IAAM,QAAQ,GAAG,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IAE9B,IAAM,aAAa,GAAG,QAAQ,CAAC,CAAC,CAAC,KAAK,GAAG,IAAI,QAAQ,CAAC,CAAC,CAAC,KAAK,EAAE,CAAC;IAChE,IAAM,UAAU,GAAG,aAAa,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IACzC,OAAO,eAAK,CAAC,UAAU,EAAE,QAAQ,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,UAAA,GAAG,IAAI,OAAA,QAAQ,CAAC,GAAG,CAAC,EAAb,CAAa,CAAC,CAAC;AACzE,CAAC,CAAC;AAVW,QAAA,kBAAkB,sBAU7B;AAEF;;;;;;;GAOG;AACI,IAAM,UAAU,GAAG,UAAC,UAAkB;IAC3C,OAAO,0BAAkB,CAAC,UAAU,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AAClD,CAAC,CAAC;AAFW,QAAA,UAAU,cAErB;AAEK,IAAM,aAAa,GAAG,UAAC,UAAoB,EAAE,IAAY;IAC9D,IAAM,QAAQ,GAAG,0BAAkB,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC;IAEtD,IAAI,iBAAO,CAAC,QAAQ,CAAC,IAAI,IAAI,KAAK,SAAS,EAAE;QAC3C,OAAO,EAAE,CAAC;KACX;IAED,OAAO,iBAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,eAAO,CAAC,IAAI,EAAE,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;AACtE,CAAC,CAAC;AARW,QAAA,aAAa,iBAQxB"}