feat: sort out Lodash imports

P0lip · P0lip · commit 6db0cf960689 · 2019-01-11T13:26:55.000+01:00
diff --git a/src/JsonSchemaViewer.tsx b/src/JsonSchemaViewer.tsx
@@ -3,7 +3,8 @@ import * as React from 'react';
 import { safeParse } from '@stoplight/json';
 import { Dictionary, ISchema } from '@stoplight/types';
 import { Box } from '@stoplight/ui-kit';
-import * as _ from 'lodash';
+import dropRight = require('lodash/dropRight');
+import isEmpty = require('lodash/isEmpty');
 
 import { MutedText } from './common/MutedText';
 import { Row } from './common/Row';
@@ -68,7 +69,7 @@ export class JsonSchemaViewer extends React.Component<IJsonSchemaViewer, IJsonSc
     }
 
     try {
-      if (!dereferencedSchema || _.isEmpty(dereferencedSchema)) {
+      if (!dereferencedSchema || isEmpty(dereferencedSchema)) {
         parsed = dereferenceSchema(parsed, { definitions: schemas }, hideInheritedFrom);
       }
     } catch (e) {
@@ -122,11 +123,11 @@ export class JsonSchemaViewer extends React.Component<IJsonSchemaViewer, IJsonSc
 
     if (limitPropertyCount) {
       if (!showExtra && propOverflowCount > 0) {
-        rowElems = _.dropRight(rowElems, propOverflowCount);
+        rowElems = dropRight(rowElems, propOverflowCount);
       }
     }
 
-    if (_.isEmpty(rowElems)) {
+    if (isEmpty(rowElems)) {
       return emptyElem;
     }
 
diff --git a/src/dereferenceSchema.ts b/src/dereferenceSchema.ts
@@ -1,4 +1,9 @@
-import * as _ from 'lodash';
+import cloneDeep = require('lodash/cloneDeep');
+import get = require('lodash/get');
+import isArray = require('lodash/isArray');
+import isEmpty = require('lodash/isEmpty');
+import map = require('lodash/map');
+import mapValues = require('lodash/mapValues');
 import { IResolvedProp } from './types';
 
 const _dereferenceSchema = (options: any = {}) => {
@@ -18,11 +23,11 @@ const _dereferenceSchema = (options: any = {}) => {
   let isCombiner;
   let isAllOf;
 
-  if (_.isEmpty(schemas)) {
+  if (isEmpty(schemas)) {
     return schema;
   }
 
-  if (_.get(schema, '$ref')) {
+  if (get(schema, '$ref')) {
     schema = _dereferenceSchemaRef({
       target: schema,
       schemas,
@@ -34,9 +39,9 @@ const _dereferenceSchema = (options: any = {}) => {
       hideInheritedFrom,
       isRoot,
     });
-  } else if (_.get(schema, 'properties')) {
+  } else if (get(schema, 'properties')) {
     properties = schema.properties;
-  } else if (_.get(schema, 'items')) {
+  } else if (get(schema, 'items')) {
     if (schema.items.$ref) {
       schema.items = _dereferenceSchemaRef({
         target: schema.items,
@@ -60,21 +65,21 @@ const _dereferenceSchema = (options: any = {}) => {
       properties = schema.items.anyOf;
       isCombiner = true;
     }
-  } else if (_.get(schema, 'allOf')) {
+  } else if (get(schema, 'allOf')) {
     properties = schema.allOf;
     isCombiner = true;
     isAllOf = true;
-  } else if (_.get(schema, 'oneOf')) {
+  } else if (get(schema, 'oneOf')) {
     properties = schema.oneOf;
     isCombiner = true;
-  } else if (_.get(schema, 'anyOf')) {
+  } else if (get(schema, 'anyOf')) {
     properties = schema.anyOf;
     isCombiner = true;
-  } else if (_.get(schema, 'additionalProperties')) {
+  } else if (get(schema, 'additionalProperties')) {
     properties = schema.additionalProperties;
-  } else if (_.get(schema, 'patternProperties')) {
+  } else if (get(schema, 'patternProperties')) {
     properties = schema.patternProperties;
-  } else if (_.get(schema, 'dependencies')) {
+  } else if (get(schema, 'dependencies')) {
     properties = schema.dependencies;
   }
 
@@ -131,7 +136,7 @@ const _dereferenceSchemaRef = (options: any = {}) => {
 
   // defensive clone to protect against mutations :(
   const refPath = ref.replace('#/', '').split('/');
-  const schema = _.cloneDeep(_.get(schemas, refPath.concat('schema')) || _.get(schemas, refPath));
+  const schema = cloneDeep(get(schemas, refPath.concat('schema')) || get(schemas, refPath));
 
   if (schema) {
     let propsInherited: boolean | string = false;
@@ -161,12 +166,12 @@ const _dereferenceSchemaRef = (options: any = {}) => {
     }
 
     if (propsInherited) {
-      const iterFunc = _.isArray(schema[propsInherited]) ? _.map : _.mapValues;
+      const iterFunc = isArray(schema[propsInherited]) ? map : mapValues;
 
       // @ts-ignore
       schema[propsInherited] = iterFunc(schema[propsInherited], item => {
         if (item.properties) {
-          item.properties = _.mapValues(item.properties, val => {
+          item.properties = mapValues(item.properties, val => {
             return {
               ...val,
               // Don't show hideInheritedFrom for combiners anymore.
@@ -219,7 +224,7 @@ const _dereferenceSchemaRef = (options: any = {}) => {
 /**
  * Replace all $ref's with their respective JSON Schema objects
  * @param  {Object} target             - Schema to dereference
- * @param  {Object} schemas            - Schemas that the target may reference. For example a Swagger or {definitions: {}}. This function will use _.get and .split('/') to find the reference path. #/responses/foo will be in {responses: {foo: {}}}
+ * @param  {Object} schemas            - Schemas that the target may reference. For example a Swagger or {definitions: {}}. This function will use get and .split('/') to find the reference path. #/responses/foo will be in {responses: {foo: {}}}
  * @param  {Boolean} hideInheritedFrom - Don't add the __inheritedFrom property to the dereferenced schema
  * @return {Object}                    - An object with no $refs
  */
@@ -228,7 +233,7 @@ export const dereferenceSchema = (target: object, schemas: object, hideInherited
     return {};
   }
 
-  const schema = _.cloneDeep(target);
+  const schema = cloneDeep(target);
 
   return _dereferenceSchema({ target: schema, schemas, hideInheritedFrom, isRoot: true });
 };
diff --git a/src/renderers/renderCombiner.tsx b/src/renderers/renderCombiner.tsx
@@ -1,5 +1,6 @@
 import { Dictionary } from '@stoplight/types';
-import * as _ from 'lodash';
+import has = require('lodash/has');
+import set = require('lodash/set');
 import { ICommonProps, IProp, IResolvedProp } from '../types';
 import { renderProp } from './renderProp';
 import { renderRowDivider } from './renderRowDivider';
@@ -25,8 +26,8 @@ export const renderCombiner = ({
   jsonPath,
 }: IRenderCombinerProp) => {
   for (const [e, elem] of Object.entries(props)) {
-    if (!_.has(elem, 'type') && defaultType) {
-      _.set(elem, 'type', defaultType);
+    if (!has(elem, 'type') && defaultType) {
+      set(elem, 'type', defaultType);
     }
 
     const key = `${parentName}-c-${level}-${e}`;
diff --git a/src/renderers/renderProp.tsx b/src/renderers/renderProp.tsx
@@ -1,9 +1,11 @@
 /* @jsx jsx */
 import { jsx } from '@emotion/core';
 import { Box, Flex, Textarea } from '@stoplight/ui-kit';
-
-import * as _ from 'lodash';
+import has = require('lodash/has');
+import isEmpty = require('lodash/isEmpty');
+import isString = require('lodash/isString');
 import { ReactNode, ReactNodeArray } from 'react';
+
 import { MutedText } from '../common/MutedText';
 import { Row } from '../common/Row';
 import { RowType } from '../common/RowType';
@@ -52,9 +54,7 @@ export const renderProp = ({
   let childPropType: 'object' | 'anyOf' | 'oneOf' | 'array';
   let isBasic = false;
   let expandable = false;
-  const expanded = _.has(expandedRows, rowKey)
-    ? expandedRows[rowKey]
-    : expandedRows.all || level <= defaultExpandedDepth;
+  const expanded = has(expandedRows, rowKey) ? expandedRows[rowKey] : expandedRows.all || level <= defaultExpandedDepth;
 
   if (prop.items) {
     if (prop.items.allOf) {
@@ -81,13 +81,13 @@ export const renderProp = ({
     }
   } else if (prop.oneOf) {
     propType = 'oneOf';
-    expandable = !_.isEmpty(prop.oneOf);
+    expandable = !isEmpty(prop.oneOf);
   } else if (prop.anyOf) {
     propType = 'anyOf';
-    expandable = !_.isEmpty(prop.anyOf);
+    expandable = !isEmpty(prop.anyOf);
   } else if (prop.allOf) {
     propType = 'object';
-    expandable = !_.isEmpty(prop.allOf);
+    expandable = !isEmpty(prop.allOf);
   } else {
     propType = prop.type;
     isBasic = !!(prop.properties || prop.patternProperties || propType === 'object');
@@ -100,14 +100,14 @@ export const renderProp = ({
   if (jsonPath === 'root') expandable = false;
 
   let types: string[] = [];
-  if (_.isString(propType)) {
+  if (isString(propType)) {
     types = [propType];
   } else {
     types = propType;
   }
 
   let typeElems: ReactNodeArray = [];
-  if (!_.isEmpty(types)) {
+  if (!isEmpty(types)) {
     typeElems = types.reduce((acc: ReactNode[], type: string, i) => {
       acc.push(
         <span key={i} className={`sl--${type}`}>
@@ -158,7 +158,7 @@ export const renderProp = ({
     );
   }
 
-  const showInheritedFrom = !hideInheritedFrom && !_.isEmpty(prop.__inheritedFrom);
+  const showInheritedFrom = !hideInheritedFrom && !isEmpty(prop.__inheritedFrom);
 
   if (!(hideRoot && jsonPath === 'root')) {
     rowElems.push(
@@ -185,10 +185,10 @@ export const renderProp = ({
           <Flex alignItems="baseline">
             {name && name !== 'root' ? <Box mr={3}>{name}</Box> : null}
 
-            {!_.isEmpty(typeElems) && <RowType name={name}>{typeElems}</RowType>}
+            {!isEmpty(typeElems) && <RowType name={name}>{typeElems}</RowType>}
           </Flex>
 
-          {!_.isEmpty(prop.description) ? <Textarea className="text-muted text-sm" value={prop.description} /> : null}
+          {!isEmpty(prop.description) ? <Textarea className="text-muted text-sm" value={prop.description} /> : null}
         </Box>
 
         {requiredElem || showInheritedFrom || expanded ? (
diff --git a/src/renderers/renderSchema.tsx b/src/renderers/renderSchema.tsx
@@ -1,5 +1,6 @@
-import * as _ from 'lodash';
-
+import includes = require('lodash/includes');
+import isEmpty = require('lodash/isEmpty');
+import pick = require('lodash/pick');
 import { ICommonProps } from '../types';
 import { renderAllOf } from './renderAllOf';
 import { renderCombiner } from './renderCombiner';
@@ -23,7 +24,7 @@ export const renderSchema = ({
   jsonPath,
   hideRoot,
 }: IRenderSchemaProps) => {
-  if (!schema || _.isEmpty(schema)) {
+  if (!schema || isEmpty(schema)) {
     return rowElems;
   }
 
@@ -36,7 +37,7 @@ export const renderSchema = ({
     defaultExpandedDepth,
     parentName: name,
     propName: name,
-    required: _.includes(schema.required || [], name),
+    required: includes(schema.required || [], name),
     hideInheritedFrom,
     jsonPath,
     hideRoot,
@@ -50,7 +51,7 @@ export const renderSchema = ({
     };
 
     if (!hideInheritedFrom && schema.__inheritedFrom) {
-      Object.assign(prop, _.pick(schema, '__inheritedFrom'));
+      Object.assign(prop, pick(schema, '__inheritedFrom'));
     }
 
     rowElems = renderProp({
diff --git a/src/util/buildAllOfSchema.ts b/src/util/buildAllOfSchema.ts
@@ -1,4 +1,6 @@
-import * as _ from 'lodash';
+import isArray = require('lodash/isArray');
+import merge = require('lodash/merge');
+import union = require('lodash/union');
 
 export const buildAllOfSchema = ({ elems, schema = {} }: any) => {
   for (const e in elems) {
@@ -13,10 +15,10 @@ export const buildAllOfSchema = ({ elems, schema = {} }: any) => {
       buildAllOfSchema({ elems: targetElems.allOf, schema });
     } else {
       for (const key in targetElems) {
-        if (_.isArray(targetElems[key])) {
-          schema[key] = _.union(schema[key], targetElems[key]);
+        if (isArray(targetElems[key])) {
+          schema[key] = union(schema[key], targetElems[key]);
         } else if (typeof targetElems[key] === 'object') {
-          schema[key] = _.merge(schema[key], targetElems[key]);
+          schema[key] = merge(schema[key], targetElems[key]);
         } else {
           schema[key] = targetElems[key];
         }
diff --git a/src/util/isSchemaViewerEmpty.ts b/src/util/isSchemaViewerEmpty.ts
@@ -1,12 +1,14 @@
-import * as _ from 'lodash';
+import get = require('lodash/get');
+import isEmpty = require('lodash/isEmpty');
+import keys = require('lodash/keys');
 
 const combinerTypes = ['allOf', 'oneOf', 'anyOf'];
 
 export const isSchemaViewerEmpty = (schema: object | string) => {
-  const keys = _.keys(schema);
+  const objectKeys = keys(schema);
 
-  if (keys.length === 1 && combinerTypes.includes(keys[0])) {
-    return _.isEmpty(_.get(schema, keys[0], []));
+  if (objectKeys.length === 1 && combinerTypes.includes(objectKeys[0])) {
+    return isEmpty(get(schema, objectKeys[0], []));
   }
 
   return false;

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,8 @@ import * as React from 'react';`
`3`	`3`	`import { safeParse } from '@stoplight/json';`
`4`	`4`	`import { Dictionary, ISchema } from '@stoplight/types';`
`5`	`5`	`import { Box } from '@stoplight/ui-kit';`
`6`		`-import * as _ from 'lodash';`
	`6`	`+import dropRight = require('lodash/dropRight');`
	`7`	`+import isEmpty = require('lodash/isEmpty');`
`7`	`8`
`8`	`9`	`import { MutedText } from './common/MutedText';`
`9`	`10`	`import { Row } from './common/Row';`
`@@ -68,7 +69,7 @@ export class JsonSchemaViewer extends React.Component<IJsonSchemaViewer, IJsonSc`
`68`	`69`	`}`
`69`	`70`
`70`	`71`	`try {`
`71`		`- if (!dereferencedSchema \|\| _.isEmpty(dereferencedSchema)) {`
	`72`	`+ if (!dereferencedSchema \|\| isEmpty(dereferencedSchema)) {`
`72`	`73`	`parsed = dereferenceSchema(parsed, { definitions: schemas }, hideInheritedFrom);`
`73`	`74`	`}`
`74`	`75`	`} catch (e) {`
`@@ -122,11 +123,11 @@ export class JsonSchemaViewer extends React.Component<IJsonSchemaViewer, IJsonSc`
`122`	`123`
`123`	`124`	`if (limitPropertyCount) {`
`124`	`125`	`if (!showExtra && propOverflowCount > 0) {`
`125`		`- rowElems = _.dropRight(rowElems, propOverflowCount);`
	`126`	`+ rowElems = dropRight(rowElems, propOverflowCount);`
`126`	`127`	`}`
`127`	`128`	`}`
`128`	`129`
`129`		`- if (_.isEmpty(rowElems)) {`
	`130`	`+ if (isEmpty(rowElems)) {`
`130`	`131`	`return emptyElem;`
`131`	`132`	`}`
`132`	`133`