Fixed exports and imports

Author: eneufeld

packages/core/src/util/index.ts

@@ -148,3 +148,4 @@ export * from './runtime';
 export * from './Formatted';
 export * from './ids';
 export * from './validator';
+export * from './combinators';

packages/core/src/util/renderer.ts

@@ -22,15 +22,8 @@
   OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
   THE SOFTWARE.
 */
+import get from 'lodash/get';
 import { ControlElement, UISchemaElement } from '../models/uischema';
-import {
-  composeWithUi,
-  createLabelDescriptionFrom,
-  formatErrorMessage,
-  isEnabled,
-  isVisible,
-  Resolve
-} from '../util';
 import union from 'lodash/union';
 import RefParser from 'json-schema-ref-parser';
 import {
@@ -42,19 +35,27 @@ import {
   getSchema,
   getSubErrorsAt,
   getUiSchema,
-  UISchemaTester
+  UISchemaTester,
 } from '../reducers';
 import { RankedTester } from '../testers';
 import { JsonSchema } from '../models/jsonSchema';
-import get from 'lodash/get';
+import {
+  CombinatorKeyword,
+  composeWithUi,
+  createLabelDescriptionFrom,
+  formatErrorMessage,
+  isEnabled,
+  isVisible,
+  Resolve,
+  resolveSubSchemas
+} from '../util';
 import has from 'lodash/has';
 import { update } from '../actions';
 import { ErrorObject } from 'ajv';
 import { generateDefaultUISchema } from '../generators';
 import { JsonFormsState } from '../store';
 import { AnyAction, Dispatch } from 'redux';
 import { JsonFormsRendererRegistryEntry } from '../reducers/renderers';
-import { CombinatorKeyword, resolveSubSchemas } from './combinators';
 
 export { JsonFormsRendererRegistryEntry };
 

packages/material/src/complex/MaterialAllOfRenderer.tsx

@@ -27,15 +27,16 @@ import { connect } from 'react-redux';
 import { Hidden } from '@material-ui/core';
 
 import {
+  createCombinatorRenderInfos,
   isAllOfControl,
   JsonSchema,
   mapStateToAllOfProps,
   RankedTester,
   rankWith,
+  resolveSubSchemas,
   StatePropsOfCombinator
 } from '@jsonforms/core';
 import { ResolvedJsonForms } from '@jsonforms/react';
-import { createCombinatorRenderInfos, resolveSubSchemas } from '@jsonforms/core/src/util/combinators';
 
 class MaterialAllOfRenderer extends React.Component<StatePropsOfCombinator, any> {
 

packages/material/src/complex/MaterialAnyOfRenderer.tsx

@@ -26,16 +26,17 @@ import React from 'react';
 import { connect } from 'react-redux';
 
 import {
+  createCombinatorRenderInfos,
   isAnyOfControl,
   JsonSchema,
   mapStateToAnyOfProps,
   RankedTester,
   rankWith,
+  resolveSubSchemas,
   StatePropsOfCombinator
 } from '@jsonforms/core';
 import { ResolvedJsonForms } from '@jsonforms/react';
 import CombinatorProperties from './CombinatorProperties';
-import { createCombinatorRenderInfos, resolveSubSchemas } from '@jsonforms/core/src/util/combinators';
 import { Hidden, Tab, Tabs } from '@material-ui/core';
 
 interface MaterialAnyOfState {

packages/material/src/complex/MaterialOneOfRenderer.tsx

@@ -26,13 +26,15 @@ import React from 'react';
 
 import {
   CombinatorRendererProps,
+  createCombinatorRenderInfos,
   createDefaultValue,
   isOneOfControl,
   JsonSchema,
   mapDispatchToControlProps,
   mapStateToOneOfProps,
   RankedTester,
-  rankWith
+  rankWith,
+  resolveSubSchemas
 } from '@jsonforms/core';
 import {
   Button,
@@ -47,7 +49,6 @@ import {
 } from '@material-ui/core';
 import { connect } from 'react-redux';
 import { ResolvedJsonForms } from '@jsonforms/react';
-import { createCombinatorRenderInfos, resolveSubSchemas } from '@jsonforms/core/src/util/combinators';
 import CombinatorProperties from './CombinatorProperties';
 
 interface MaterialOneOfState {