Fixed lint issues

Author: eneufeld

packages/core/src/reducers/index.ts

@@ -22,16 +22,16 @@
   OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
   THE SOFTWARE.
 */
-import { combineReducers, Reducer } from 'redux';
-import * as _ from 'lodash';
-import { JsonFormsRendererRegistryEntry, rendererReducer } from './renderers';
-import { fieldReducer } from './fields';
-import { configReducer } from './config';
 import {
   defaultDataReducer,
   extractDefaultData,
   JsonFormsDefaultDataRegistryEntry
 } from './default-data';
+import { combineReducers, Reducer } from 'redux';
+import { JsonFormsRendererRegistryEntry, rendererReducer } from './renderers';
+import { fieldReducer } from './fields';
+import { configReducer } from './config';
+import * as _ from 'lodash';
 import {
   coreReducer,
   errorAt,
@@ -50,8 +50,8 @@ import { ControlElement, Generate, JsonSchema, UISchemaElement } from '..';
 import {
   fetchLocale,
   findLocalizedSchema,
-  i18nReducer,
-  findLocalizedUISchema
+  findLocalizedUISchema,
+  i18nReducer
 } from './i18n';
 
 export { rendererReducer, fieldReducer, coreReducer, UISchemaTester };

packages/core/src/testers/index.ts

@@ -360,6 +360,31 @@ export const isObjectArrayControl = and(
   schemaSubPathMatches('items', schema => schema.type === 'object')
 );
 
+const traverse = (
+  any: JsonSchema | JsonSchema[],
+  pred: (obj: JsonSchema) => boolean
+): boolean => {
+  if (_.isArray(any)) {
+    return _.reduce(any, (acc, el) => acc || traverse(el, pred), false);
+  }
+
+  if (pred(any)) {
+    return true;
+  }
+  if (any.items) {
+    return traverse(any.items, pred);
+  }
+  if (any.properties) {
+    return _.reduce(
+      _.toPairs(any.properties),
+      (acc, [_key, val]) => acc || traverse(val, pred),
+      false
+    );
+  }
+
+  return false;
+};
+
 export const isObjectArrayWithNesting = (
   uischema: UISchemaElement,
   schema: JsonSchema
@@ -412,31 +437,6 @@ export const isObjectArrayWithNesting = (
   return false;
 };
 
-const traverse = (
-  any: JsonSchema | JsonSchema[],
-  pred: (obj: JsonSchema) => boolean
-): boolean => {
-  if (_.isArray(any)) {
-    return _.reduce(any, (acc, el) => acc || traverse(el, pred), false);
-  }
-
-  if (pred(any)) {
-    return true;
-  }
-  if (any.items) {
-    return traverse(any.items, pred);
-  }
-  if (any.properties) {
-    return _.reduce(
-      _.toPairs(any.properties),
-      (acc, [_key, val]) => acc || traverse(val, pred),
-      false
-    );
-  }
-
-  return false;
-};
-
 /**
  * Synonym for isObjectArrayControl
  */

packages/core/src/util/field.ts

@@ -85,22 +85,6 @@ export interface DispatchFieldStateProps extends FieldProps {
   fields?: JsonFormsFieldRendererRegistryEntry[];
 }
 
-export const mapStateToDispatchFieldProps = (
-  state: JsonFormsState,
-  ownProps: OwnPropsOfField
-): DispatchFieldStateProps => {
-  const props: StatePropsOfField = mapStateToFieldProps(state, ownProps);
-  return {
-    ...props,
-    ...ownProps,
-    fields: state.jsonforms.fields || []
-  };
-};
-
-export interface DispatchFieldProps extends DispatchFieldStateProps {
-  showError: boolean;
-}
-
 /**
  * Map state to field props.
  *
@@ -145,6 +129,22 @@ export const mapStateToFieldProps = (
   };
 };
 
+export const mapStateToDispatchFieldProps = (
+  state: JsonFormsState,
+  ownProps: OwnPropsOfField
+): DispatchFieldStateProps => {
+  const props: StatePropsOfField = mapStateToFieldProps(state, ownProps);
+  return {
+    ...props,
+    ...ownProps,
+    fields: state.jsonforms.fields || []
+  };
+};
+
+export interface DispatchFieldProps extends DispatchFieldStateProps {
+  showError: boolean;
+}
+
 /**
  * Default mapStateToFieldProps for enum field. Options is used for populating dropdown list
  * @param state

packages/core/src/util/ids.ts

@@ -1,5 +1,13 @@
 const usedIds: Set<string> = new Set<string>();
 
+const makeId = (idBase: string, iteration: number) =>
+  iteration <= 1 ? idBase : idBase + iteration.toString();
+
+const isUniqueId = (idBase: string, iteration: number) => {
+  const newID = makeId(idBase, iteration);
+  return !usedIds.has(newID);
+};
+
 export const createId = (proposedId: string) => {
   if (proposedId === undefined) {
     // failsafe to avoid endless loops in error cases
@@ -16,12 +24,4 @@ export const createId = (proposedId: string) => {
 
 export const removeId = (id: string) => usedIds.delete(id);
 
-const isUniqueId = (idBase: string, iteration: number) => {
-  const newID = makeId(idBase, iteration);
-  return !usedIds.has(newID);
-};
-
-const makeId = (idBase: string, iteration: number) =>
-  iteration <= 1 ? idBase : idBase + iteration;
-
 export const clearAllIds = () => usedIds.clear();

packages/core/src/util/runtime.ts

@@ -60,14 +60,6 @@ const getConditionScope = (condition: Scopable, path: string): string => {
   return composeWithUi(condition, path);
 };
 
-const isRuleFulfilled = (
-  uischema: UISchemaElement,
-  data: any,
-  path: string
-): boolean => {
-  const condition = uischema.rule.condition;
-  return evaluateCondition(data, condition, path);
-};
 const evaluateCondition = (
   data: any,
   condition: Condition,
@@ -95,6 +87,15 @@ const evaluateCondition = (
   }
 };
 
+const isRuleFulfilled = (
+  uischema: UISchemaElement,
+  data: any,
+  path: string
+): boolean => {
+  const condition = uischema.rule.condition;
+  return evaluateCondition(data, condition, path);
+};
+
 export const evalVisibility = (
   uischema: UISchemaElement,
   data: any,

packages/material-tree-renderer/src/services/property.util.ts

@@ -159,7 +159,7 @@ const resolveAndMakeSchemaSelfContained = (
   return {
     ...schema,
     ...makeSchemaSelfContained(parentSchema, schema)
-  } as JsonSchema7;
+  };
 };
 
 /**

packages/vanilla/src/index.ts

@@ -69,6 +69,10 @@ import {
 } from './layouts';
 import DateTimeField from './fields/DateTimeField';
 
+export interface WithClassname {
+  className?: string;
+}
+
 /**
  * Additional renderer props specific to vanilla renderers.
  */
@@ -95,10 +99,6 @@ export interface WithChildren {
   children: any;
 }
 
-export interface WithClassname {
-  className?: string;
-}
-
 export * from './controls';
 export * from './complex';
 export * from './fields';

tslint.json

@@ -63,7 +63,6 @@
         "no-unsafe-any": false,
         "no-unsafe-finally": true,
         "no-unused-expression": true,
-        "no-unused-variable": true,
         "no-use-before-declare": true,
         "no-var-keyword": true,
         "radix": true,
@@ -74,7 +73,6 @@
             true,
             "allow-null-check"
         ],
-        "typeof-compare": true,
         "use-isnan": true,