namespace import lodash & use lodash.find directly

Author: vincentbel

src/helpers/index.ts

@@ -1,5 +1,5 @@
 import * as ts from 'typescript';
-import { find, indexOf, slice } from 'lodash';
+import * as _ from 'lodash';
 
 /**
  * If a class declaration a react class?
@@ -78,7 +78,7 @@ export function hasStaticModifier(classMember: ts.ClassElement) {
     if (!classMember.modifiers) {
         return false;
     }
-    const staticModifier = find(classMember.modifiers, (modifier) => {
+    const staticModifier = _.find(classMember.modifiers, (modifier) => {
         return modifier.kind == ts.SyntaxKind.StaticKeyword;
     });
     return staticModifier !== undefined;
@@ -97,22 +97,18 @@ export function isPropTypesMember(classMember: ts.ClassElement, sourceFile: ts.S
     }
 }
 
-
-export { find };
-
-// export const has = some
 /**
  * Insert an item in middle of an array after a specific item
  * @param collection
  * @param afterItem
  * @param newItem
  */
 export function insertAfter<T>(collection: ArrayLike<T>, afterItem: T, newItem: T) {
-    const index = indexOf(collection, afterItem) + 1;
+    const index = _.indexOf(collection, afterItem) + 1;
 
-    return slice(collection, 0, index)
+    return _.slice(collection, 0, index)
         .concat(newItem)
-        .concat(slice(collection, index));
+        .concat(_.slice(collection, index));
 }
 
 /**
@@ -122,11 +118,11 @@ export function insertAfter<T>(collection: ArrayLike<T>, afterItem: T, newItem:
  * @param newItem
  */
 export function insertBefore<T>(collection: ArrayLike<T>, beforeItem: T, newItems: T | T[]) {
-    const index = indexOf(collection, beforeItem);
+    const index = _.indexOf(collection, beforeItem);
 
-    return slice(collection, 0, index)
+    return _.slice(collection, 0, index)
         .concat(newItems)
-        .concat(slice(collection, index));
+        .concat(_.slice(collection, index));
 }
 
 /**
@@ -136,10 +132,10 @@ export function insertBefore<T>(collection: ArrayLike<T>, beforeItem: T, newItem
  * @param newItem
  */
 export function replaceItem<T>(collection: ArrayLike<T>, item: T, newItem: T) {
-    const index = indexOf(collection, item);
-    return slice(collection, 0, index)
+    const index = _.indexOf(collection, item);
+    return _.slice(collection, 0, index)
         .concat(newItem)
-        .concat(slice(collection, index + 1));
+        .concat(_.slice(collection, index + 1));
 }
 
 /**
@@ -149,6 +145,6 @@ export function replaceItem<T>(collection: ArrayLike<T>, item: T, newItem: T) {
  * @param newItem
  */
 export function removeItem<T>(collection: ArrayLike<T>, item: T) {
-    const index = indexOf(collection, item);
-    return slice(collection, 0, index).concat(slice(collection, index + 1));
+    const index = _.indexOf(collection, item);
+    return _.slice(collection, 0, index).concat(_.slice(collection, index + 1));
 }

src/transforms/collapse-intersection-interfaces-transform.ts

@@ -33,8 +33,10 @@ export function collapseIntersectionInterfacesTransformFactoryFactory(
             function visitTypeAliasDeclaration(node: ts.TypeAliasDeclaration) {
                 if (
                     ts.isIntersectionTypeNode(node.type)
-                    && node.type.types.every((type) => ts.isTypeLiteralNode(type))
+                    && node.type.types.every(ts.isTypeLiteralNode)
                 ) {
+                    // We need cast `node.type.types` to `ts.NodeArray<ts.TypeLiteralNode>`
+                    // because TypeScript can't figure out `node.type.types.every(ts.isTypeLiteralNode)`
                     const allMembers = (node.type.types as ts.NodeArray<ts.TypeLiteralNode>)
                         .map((type) => type.members)
                         .reduce((all, members) => ts.createNodeArray(all.concat(members)), ts.createNodeArray([]));

src/transforms/react-hoist-generics-transform.ts

@@ -1,4 +1,5 @@
 import * as ts from 'typescript';
+import * as _ from 'lodash';
 
 import * as helpers from '../helpers';
 
@@ -45,7 +46,7 @@ function hoist(reactClass: ts.ClassDeclaration, sourceFile: ts.SourceFile) {
         return sourceFile;
     }
     const className = reactClass && reactClass.name && reactClass.name.getText(sourceFile);
-    const reactHeritageClauses =  helpers.find(reactClass.heritageClauses, helpers.isReactHeritageClause);
+    const reactHeritageClauses = _.find(reactClass.heritageClauses, helpers.isReactHeritageClause);
 
     if (reactHeritageClauses === undefined || !reactHeritageClauses.types == undefined) {
         return sourceFile;
@@ -97,7 +98,7 @@ function insertTypeRefs(
     if (reactClassDeclaration.heritageClauses === undefined) {
         return reactClassDeclaration;
     }
-    const reactHeritageClause = helpers.find(reactClassDeclaration.heritageClauses, helpers.isReactHeritageClause);
+    const reactHeritageClause = _.find(reactClassDeclaration.heritageClauses, helpers.isReactHeritageClause);
 
     if (reactHeritageClause === undefined) {
         return reactClassDeclaration;

src/transforms/react-js-make-props-and-state-transform.ts

@@ -1,5 +1,5 @@
 import * as ts from 'typescript';
-
+import * as _ from 'lodash';
 import * as helpers from '../helpers';
 
 export type Factory = ts.TransformerFactory<ts.SourceFile>;
@@ -77,7 +77,7 @@ function getPropsTypeOfReactComponentClass(
     classDeclaration: ts.ClassDeclaration,
     sourceFile: ts.SourceFile,
 ): ts.TypeNode {
-    const staticPropTypesMember = helpers.find(classDeclaration.members, (member) => {
+    const staticPropTypesMember = _.find(classDeclaration.members, (member) => {
         return ts.isPropertyDeclaration(member) &&
             helpers.hasStaticModifier(member) &&
             helpers.isPropTypesMember(member, sourceFile);
@@ -92,7 +92,7 @@ function getPropsTypeOfReactComponentClass(
         return buildInterfaceFromPropTypeObjectLiteral(staticPropTypesMember.initializer)
     }
 
-    const staticPropTypesGetterMember = helpers.find(classDeclaration.members, (member) => {
+    const staticPropTypesGetterMember = _.find(classDeclaration.members, (member) => {
         return ts.isGetAccessorDeclaration(member) &&
             helpers.hasStaticModifier(member) &&
             helpers.isPropTypesMember(member, sourceFile);
@@ -102,7 +102,7 @@ function getPropsTypeOfReactComponentClass(
         staticPropTypesGetterMember !== undefined
         && ts.isGetAccessorDeclaration(staticPropTypesGetterMember) // check to satisfy typechecker
     ) {
-        const returnStatement = helpers.find(
+        const returnStatement = _.find(
             staticPropTypesGetterMember.body.statements,
             (statement) => ts.isReturnStatement(statement),
         );
@@ -149,7 +149,7 @@ function getInitialStateFromClassDeclaration(
 ): ts.TypeNode {
     // initial state class member
 
-    const initialStateMember = helpers.find(classDeclaration.members, (member) => {
+    const initialStateMember = _.find(classDeclaration.members, (member) => {
         try {
             return ts.isPropertyDeclaration(member) &&
                 member.name &&
@@ -169,7 +169,7 @@ function getInitialStateFromClassDeclaration(
     }
 
     // Initial state in constructor
-    const constructor = helpers.find(
+    const constructor = _.find(
         classDeclaration.members,
         (member) => member.kind === ts.SyntaxKind.Constructor,
     ) as ts.ConstructorDeclaration | undefined;

src/transforms/react-move-prop-types-to-class-transform.ts

@@ -1,4 +1,5 @@
 import * as ts from 'typescript';
+import * as _ from 'lodash';
 
 import * as helpers from '../helpers';
 
@@ -56,7 +57,7 @@ function visitSourceFile(sourceFile: ts.SourceFile, typeChecker: ts.TypeChecker)
         // Look for the class declarations with the same name
         const componentName = getComponentName(propTypeAssignment, sourceFile);
 
-        const classStatement = helpers.find(
+        const classStatement = _.find(
             statements,
             (statement) => ts.isClassDeclaration(statement) &&
                 statement.name !== undefined &&