Fix type-imports according to the release notes of TypeScript 3.8:

Type-Only Imports and Export: https://www.typescriptlang.org/docs/handbook/release-notes/typescript-3-8.html#type-only-imports-and-export
mirismaili · Dec 20, 2021 · 779e05e · 779e05e
1 parent 81f1f19
commit 779e05e
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 18 deletions.
diff --git a/packages/core/src/reducers/reducers.ts b/packages/core/src/reducers/reducers.ts
@@ -32,9 +32,9 @@ import {
 import { defaultDataReducer } from './default-data';
 import { rendererReducer } from './renderers';
 import { JsonFormsState } from '../store';
+import type { JsonFormsUISchemaRegistryEntry } from './uischemas';
 import {
   findMatchingUISchema,
-  JsonFormsUISchemaRegistryEntry,
   uischemaRegistryReducer,
 } from './uischemas';
 import {
@@ -59,7 +59,7 @@ export const jsonFormsReducerConfig = {
   config: configReducer,
   uischemas: uischemaRegistryReducer,
   defaultData: defaultDataReducer,
-  i18n: i18nReducer
+  i18n: i18nReducer,
 };
 
 /**

diff --git a/packages/core/src/util/cell.ts b/packages/core/src/util/cell.ts
@@ -25,14 +25,14 @@
 
 import isEmpty from 'lodash/isEmpty';
 import union from 'lodash/union';
+import type { JsonFormsCellRendererRegistryEntry } from '../reducers';
 import {
+  getAjv,
   getConfig,
   getData,
   getErrorAt,
   getSchema,
-  getAjv,
-  JsonFormsCellRendererRegistryEntry,
-  getTranslator
+  getTranslator,
 } from '../reducers';
 import { AnyAction, Dispatch } from './type';
 import {
@@ -57,7 +57,7 @@ import { JsonFormsState } from '../store';
 import { JsonSchema } from '../models';
 import { getI18nKeyPrefix } from '../i18n';
 
-export { JsonFormsCellRendererRegistryEntry };
+export type { JsonFormsCellRendererRegistryEntry };
 
 export interface OwnPropsOfCell extends OwnPropsOfControl {
   data?: any;

diff --git a/packages/core/src/util/renderer.ts b/packages/core/src/util/renderer.ts
@@ -26,6 +26,10 @@
 import get from 'lodash/get';
 import { ControlElement, JsonSchema, UISchemaElement } from '../models';
 import find from 'lodash/find';
+import type {
+  JsonFormsCellRendererRegistryEntry,
+  JsonFormsRendererRegistryEntry,
+} from '../reducers';
 import {
   findUISchema,
   getAjv,
@@ -39,19 +43,16 @@ import {
   getSubErrorsAt,
   getTranslator,
   getUiSchema,
-  JsonFormsCellRendererRegistryEntry,
-  JsonFormsRendererRegistryEntry,
   JsonFormsUISchemaRegistryEntry,
 } from '../reducers';
 import { RankedTester } from '../testers';
-import { isInherentlyEnabled, hasShowRule } from './runtime';
+import { hasShowRule, isInherentlyEnabled, isVisible } from './runtime';
 import { createLabelDescriptionFrom } from './label';
 import { CombinatorKeyword, resolveSubSchemas } from './combinators';
 import { moveDown, moveUp } from './array';
 import { AnyAction, Dispatch } from './type';
 import { Resolve } from './util';
 import { composePaths, composeWithUi } from './path';
-import { isVisible } from './runtime';
 import { CoreActions, update } from '../actions';
 import { ErrorObject } from 'ajv';
 import { JsonFormsState } from '../store';

diff --git a/packages/material/src/util/layout.tsx b/packages/material/src/util/layout.tsx
@@ -26,13 +26,13 @@ import isEmpty from 'lodash/isEmpty';
 import React from 'react';
 import { ComponentType } from 'react';
 import Ajv from 'ajv';
+import type { UISchemaElement } from '@jsonforms/core';
 import {
   getAjv,
   JsonFormsCellRendererRegistryEntry,
   JsonFormsRendererRegistryEntry,
   JsonSchema,
   OwnPropsOfRenderer,
-  UISchemaElement
 } from '@jsonforms/core';
 import { JsonFormsDispatch, useJsonForms } from '@jsonforms/react';
 import { Grid, Hidden } from '@mui/material';

diff --git a/packages/react/test/renderers/JsonForms.test.tsx b/packages/react/test/renderers/JsonForms.test.tsx
@@ -25,30 +25,31 @@
 import React from 'react';
 import { combineReducers, createStore } from 'redux';
 import { Provider } from 'react-redux';
-import {
+import type {
   ControlElement,
-  createAjv,
   DispatchCellProps,
-  jsonFormsReducerConfig,
   JsonFormsState,
   JsonFormsStore,
   JsonSchema,
   Layout,
+  RendererProps,
+  UISchemaElement,
+} from '@jsonforms/core';
+import {
+  createAjv,
+  jsonFormsReducerConfig,
   NOT_APPLICABLE,
   rankWith,
   registerCell,
   registerRenderer,
-  RendererProps,
   schemaMatches,
-  UISchemaElement,
   uiTypeIs,
   unregisterRenderer,
 } from '@jsonforms/core';
 import { isEqual } from 'lodash';
 import Enzyme from 'enzyme';
 import { mount, shallow } from 'enzyme';
-import { StatelessRenderer } from '../../src/Renderer';
-
+import type { StatelessRenderer } from '../../src/Renderer';
 import Adapter from '@wojtekmaj/enzyme-adapter-react-17';
 import {
   JsonForms,