Make us importAll with react and namespace Component references

Author: Timur Amirov

Diff for: src/typings.ts

@@ -47,11 +47,7 @@ export function createTypings(moduleName: string|null, programAst: any, options:
   const tripleSlashDirectives: dom.TripleSlashDirective[] = [];
   const m = dom.create.module(moduleName || 'moduleName');
 
-  if (hasReactClass(ast, reactComponentName)) {
-    m.members.push(dom.create.importNamed(reactComponentName || 'Component', reactImport));
-  } else {
-    tripleSlashDirectives.push(dom.create.tripleSlashReferenceTypesDirective('react'));
-  }
+  m.members.push(dom.create.importAll('React', reactImport));
 
   if (importStatements.length > 0) {
     importStatements.forEach(importStatement => {
@@ -104,7 +100,7 @@ function createExportedTypes(m: dom.ModuleDeclaration, ast: AstQuery, componentN
 function createExportedClassComponent(m: dom.ModuleDeclaration, componentName: string,
     reactComponentName: string|undefined, exportType: dom.DeclarationFlags, interf: dom.InterfaceDeclaration): void {
   const classDecl = dom.create.class(componentName);
-  classDecl.baseType = dom.create.interface(`${reactComponentName || 'Component'}<${interf.name}, any>`);
+  classDecl.baseType = dom.create.interface(`React.${reactComponentName || 'Component'}<${interf.name}, any>`);
   classDecl.flags = exportType;
   classDecl.members.push(dom.create.method('render', [], dom.create.namedTypeReference('JSX.Element')));
   m.members.push(classDecl);
@@ -271,36 +267,6 @@ function getImportedPropTypes(ast: AstQuery): ImportedPropType[] {
   }));
 }
 
-function hasReactClass(ast: AstQuery, reactComponentName: string|undefined): boolean {
-  const res = ast.query(`
-      // ClassDeclaration[
-        '${reactComponentName}' == 'undefined'
-        ?
-          /:superClass MemberExpression[
-            /:object Identifier[@name == 'React'] &&
-            /:property Identifier[@name == 'Component']
-          ]
-        :
-          /:superClass Identifier[@name == '${reactComponentName}']
-      ]
-    ,
-      // VariableDeclaration
-      / VariableDeclarator[
-        /:init CallExpression[
-          '${reactComponentName}' == 'undefined'
-          ?
-            /:arguments MemberExpression[
-              /:object Identifier[@name == 'React'] &&
-              /:property Identifier[@name == 'Component']
-            ]
-          :
-            /:arguments Identifier[@name == '${reactComponentName}']
-        ]
-      ]
-  `);
-  return res.length > 0;
-}
-
 function getInstanceOfPropTypes(ast: AstQuery, importedPropTypes: ImportedPropTypes): string[] {
   const {propTypesName, propTypes} = importedPropTypes;
   const instanceOfPropType = propTypes.find(({importedName}) => importedName === 'instanceOf');

Diff for: tests/component-without-proptypes.d.ts

@@ -1,10 +1,10 @@
 declare module 'component' {
-  import {Component} from 'react';
+  import * as React from 'react';
 
   export interface TestProps {
   }
 
-  export default class Test extends Component<TestProps, any> {
+  export default class Test extends React.Component<TestProps, any> {
     render(): JSX.Element;
   }
 

Diff for: tests/es6-class.d.ts

@@ -1,5 +1,5 @@
 declare module 'component' {
-  import {Component} from 'react';
+  import * as React from 'react';
 
   import Message from './path/to/Message';
 
@@ -52,7 +52,7 @@ declare module 'component' {
     requiredSymbol: Symbol;
   }
 
-  export class Component extends Component<ComponentProps, any> {
+  export class Component extends React.Component<ComponentProps, any> {
     render(): JSX.Element;
   }
 }

Diff for: tests/es7-class-babeled-to-es6.d.ts

@@ -1,5 +1,5 @@
 declare module 'component' {
-  import {Component} from 'react';
+  import * as React from 'react';
 
   import Message from './path/to/Message';
 
@@ -52,7 +52,7 @@ declare module 'component' {
     requiredSymbol: Symbol;
   }
 
-  export class MyComponent extends Component<MyComponentProps, any> {
+  export class MyComponent extends React.Component<MyComponentProps, any> {
     render(): JSX.Element;
   }
 }

Diff for: tests/es7-class-separate-export.d.ts

@@ -1,11 +1,11 @@
 declare module 'component' {
-  import {Component} from 'react';
+  import * as React from 'react';
 
   export interface ComponentProps {
     optionalAny?: any;
   }
 
-  export default class Component extends Component<ComponentProps, any> {
+  export default class Component extends React.Component<ComponentProps, any> {
     render(): JSX.Element;
   }
 }

Diff for: tests/es7-class-top-level-module.d.ts

@@ -1,4 +1,4 @@
-import {Component} from 'react';
+import * as React from 'react';
 import Message from './path/to/Message';
 
 export type ComponentOptionalUnion = string | number;
@@ -27,6 +27,6 @@ export interface ComponentProps {
   requiredArrayOf: string[];
 }
 
-export default class Component extends Component<ComponentProps, any> {
+export default class Component extends React.Component<ComponentProps, any> {
   render(): JSX.Element;
 }

Diff for: tests/es7-class.d.ts

@@ -1,5 +1,5 @@
 declare module 'component' {
-  import {Component} from 'react';
+  import * as React from 'react';
   import Message from './path/to/Message';
 
   export type ComponentOptionalUnion = string | number;
@@ -28,7 +28,7 @@ declare module 'component' {
     requiredArrayOf: string[];
   }
 
-  export default class Component extends Component<ComponentProps, any> {
+  export default class Component extends React.Component<ComponentProps, any> {
     render(): JSX.Element;
   }
 }

Diff for: tests/import-react-component.d.ts

@@ -1,3 +1,3 @@
 declare module 'component' {
-  import {Component} from 'react';
+  import * as React from 'react';
 }

Diff for: tests/instance-of-proptype-names.d.ts

@@ -1,12 +1,12 @@
 declare module 'component' {
-  import {Component} from 'react';
+  import * as React from 'react';
   import Member from './member';
 
   export interface TestProps {
     test?: Member;
   }
 
-  export class Test extends Component<TestProps, any> {
+  export class Test extends React.Component<TestProps, any> {
     render(): JSX.Element;
   }
 }

Diff for: tests/named-export-specifiers.d.ts

@@ -1,5 +1,6 @@
-/// <reference types="react" />
 declare module 'component' {
+  import * as React from 'react';
+  
   export interface ComponentProps {
     optionalAny?: any;
   }

Diff for: tests/preact-definition.d.ts

@@ -1,11 +1,11 @@
 declare module 'path' {
-  import {Component} from 'preact';
+  import * as React from 'preact';
 
   export interface SomeComponentProps {
     onClick?: (...args: any[]) => any;
   }
 
-  export class SomeComponent extends Component<SomeComponentProps, any> {
+  export class SomeComponent extends React.Component<SomeComponentProps, any> {
     render(): JSX.Element;
   }
 }

Diff for: tests/prop-types.d.ts

@@ -1,11 +1,11 @@
 declare module 'path' {
-  import {Component} from 'react';
+  import * as React from 'react';
 
   export interface Props {
     optionalString?: string;
   }
 
-  export default class extends Component<Props, any> {
+  export default class extends React.Component<Props, any> {
     render(): JSX.Element;
   }
 }

Diff for: tests/pure-component.d.ts

@@ -1,11 +1,11 @@
 declare module 'component' {
-  import {PureComponent} from 'react';
+  import * as React from 'react';
 
   export interface Props {
     optionalString?: string;
   }
 
-  export default class extends PureComponent<Props, any> {
+  export default class extends React.PureComponent<Props, any> {
     render(): JSX.Element;
   }
 }

Diff for: tests/reference-as-proptypes.d.ts

@@ -1,11 +1,11 @@
 declare module 'component' {
-  import {Component} from 'react';
+  import * as React from 'react';
 
   export interface SomeComponentProps {
     someString?: string;
   }
 
-  export default class SomeComponent extends Component<SomeComponentProps, any> {
+  export default class SomeComponent extends React.Component<SomeComponentProps, any> {
     render(): JSX.Element;
   }
 }

Diff for: tests/references-in-proptypes.d.ts

@@ -1,5 +1,5 @@
 declare module 'component' {
-  import {Component} from 'react';
+  import * as React from 'react';
 
   export type SomeComponentSomeOneOf = "foo" | "bar";
   export type SomeComponentAnotherOneOf = "foo" | "bar";
@@ -14,7 +14,7 @@ declare module 'component' {
     someShape?: SomeComponentSomeShape;
   }
 
-  export default class SomeComponent extends Component<SomeComponentProps, any> {
+  export default class SomeComponent extends React.Component<SomeComponentProps, any> {
     render(): JSX.Element;
   }
 }

Diff for: tests/stateless-export-as-default.d.ts

@@ -1,5 +1,6 @@
-/// <reference types="react" />
 declare module 'component' {
+  import * as React from 'react';
+  
   export interface ComponentProps {
     text: string;
     className?: string;

Diff for: tests/stateless.d.ts

@@ -1,5 +1,6 @@
-/// <reference types="react" />
 declare module 'component' {
+  import * as React from 'react';
+  
   export interface ComponentProps {
     optionalAny?: any;
   }

Diff for: tests/unnamed-default-export.d.ts

@@ -1,11 +1,11 @@
 declare module 'path' {
-  import {Component} from 'react';
+  import * as React from 'react';
 
   export interface Props {
     onClick?: (...args: any[]) => any;
   }
 
-  export default class extends Component<Props, any> {
+  export default class extends React.Component<Props, any> {
     render(): JSX.Element;
   }
 }