Merge pull request #6 from dabapps/classlike-guard

Class-like guard (and drop < ES5 support)

.npmignore

@@ -1 +1,7 @@
+/node_modules/*
+/coverage/*
+/build/*
 !/dist/*
+
+.DS_Store
+npm-debug.log*

package.json

@@ -1,10 +1,10 @@
 {
   "name": "@dabapps/react-shallow-renderer",
-  "version": "1.0.1",
+  "version": "2.0.0",
   "description": "A shallow renderer for React components",
   "main": "dist/index.js",
   "scripts": {
-    "dist": "./scripts/dist",
+    "dist": "rm -rf dist && tsc --project tsconfig.dist.json",
     "prettier-check": "prettier --check '**/*.{ts,tsx,js,jsx}'",
     "prettier": "prettier --write '**/*.{ts,tsx,js,jsx}'",
     "lint": "npm run prettier-check && tslint --project tsconfig.json '{src,tests}/**/*.{ts,tsx}'",
@@ -37,12 +37,12 @@
     "react-dom": ">=16"
   },
   "devDependencies": {
-    "@types/jest": "^24.0.11",
-    "jest": "^24.4.0",
+    "@types/jest": "^24.9.1",
+    "jest": "^24.9.0",
     "prettier": "^1.16.4",
     "ts-jest": "^24.0.0",
-    "tslint": "^5.13.1",
-    "tslint-config-dabapps": "github:dabapps/tslint-config-dabapps#v0.5.3",
+    "tslint": "^5.20.1",
+    "tslint-config-dabapps": "^0.6.2",
     "typescript": "^3.3.3333"
   },
   "peerDependencies": {

src/guards.ts

@@ -1,3 +1,5 @@
+import * as React from 'react';
+
 import {
   contextSymbol,
   elementSymbol,
@@ -35,15 +37,17 @@ export function isClass(node: ReactAnyNode): node is ReactClassNode {
   return (
     node.$$typeof === elementSymbol &&
     typeof node.type === 'function' &&
-    MATCHES_CLASS.test(Object.toString.call(node.type))
+    (node.type instanceof React.Component ||
+      (node.type.prototype && 'render' in node.type.prototype) ||
+      MATCHES_CLASS.test(Object.toString.call(node.type)))
   );
 }
 
 export function isFunction(node: ReactAnyNode): node is ReactFunctionNode {
   return (
     node.$$typeof === elementSymbol &&
     typeof node.type === 'function' &&
-    !MATCHES_CLASS.test(Object.toString.call(node.type))
+    !isClass(node)
   );
 }
 

src/renderer.ts

@@ -1,4 +1,5 @@
 import * as React from 'react';
+
 import { elementSymbol } from './constants';
 import {
   isArrayOfChildren,
@@ -44,8 +45,8 @@ export class ReactShallowRenderer {
       };
     }
 
-    if (isFunction(node)) {
-      const rendered = node.type(node.props) as ReactAnyChildren;
+    if (isClass(node)) {
+      const rendered = new node.type(node.props).render() as ReactAnyChildren;
       const children = this.resolveChildren(
         ([] as ReactAnyChildrenArray).concat(rendered)
       );
@@ -57,8 +58,8 @@ export class ReactShallowRenderer {
       return children;
     }
 
-    if (isClass(node)) {
-      const rendered = new node.type(node.props).render() as ReactAnyChildren;
+    if (isFunction(node)) {
+      const rendered = node.type(node.props) as ReactAnyChildren;
       const children = this.resolveChildren(
         ([] as ReactAnyChildrenArray).concat(rendered)
       );

src/types.ts

@@ -1,4 +1,5 @@
 import * as React from 'react';
+
 import {
   contextSymbol,
   elementSymbol,

tests/internal-methods.tsx

@@ -1,4 +1,5 @@
 import * as React from 'react';
+
 import { ReactAnyNode, ReactShallowRenderer } from '../src';
 
 describe('ReactShallowRenderer', () => {

tests/to-json/basic.tsx

@@ -1,4 +1,5 @@
 import * as React from 'react';
+
 import { ReactShallowRenderer } from '../../src';
 import { elementSymbol } from '../../src/constants';
 import { compare } from '../helpers/compare';

tests/to-json/component-class.tsx

@@ -1,4 +1,5 @@
 import * as React from 'react';
+
 import { ReactShallowRenderer } from '../../src';
 import { elementSymbol } from '../../src/constants';
 import { compare } from '../helpers/compare';

tests/to-json/component-function.tsx

@@ -1,4 +1,5 @@
 import * as React from 'react';
+
 import { ReactShallowRenderer } from '../../src';
 import { elementSymbol } from '../../src/constants';
 import { compare } from '../helpers/compare';

tests/to-json/context.tsx

@@ -1,4 +1,5 @@
 import * as React from 'react';
+
 import { ReactShallowRenderer } from '../../src';
 import { elementSymbol } from '../../src/constants';
 import { compare } from '../helpers/compare';

tests/to-json/forward-ref.tsx

@@ -1,4 +1,5 @@
 import * as React from 'react';
+
 import { ReactShallowRenderer } from '../../src';
 import { elementSymbol } from '../../src/constants';
 import { compare } from '../helpers/compare';
@@ -33,9 +34,10 @@ describe('ReactShallowRenderer', () => {
     </div>
   ));
 
-  const UnknownForwardRefComponent: React.FunctionComponent = React.forwardRef(
-    () => <p>Unknown name</p>
-  );
+  const UnknownForwardRefComponent: React.FunctionComponent = React.forwardRef<
+    unknown,
+    React.PropsWithChildren<{}>
+  >(() => <p>Unknown name</p>);
 
   const ComponentWithUnknownForwardRefChild: React.FunctionComponent = () => (
     <div>

tests/to-json/fragment.tsx

@@ -1,4 +1,5 @@
 import * as React from 'react';
+
 import { ReactShallowRenderer } from '../../src';
 import { elementSymbol } from '../../src/constants';
 import { compare } from '../helpers/compare';

tests/to-json/memo.tsx

@@ -1,4 +1,5 @@
 import * as React from 'react';
+
 import { ReactShallowRenderer } from '../../src';
 import { elementSymbol } from '../../src/constants';
 import { compare } from '../helpers/compare';

tests/to-json/portal.tsx

@@ -1,5 +1,6 @@
 import * as React from 'react';
 import * as ReactDOM from 'react-dom';
+
 import { ReactShallowRenderer } from '../../src';
 import { elementSymbol } from '../../src/constants';
 import { compare } from '../helpers/compare';

tsconfig.dist.json

@@ -4,7 +4,7 @@
     "declaration": true,
     "listEmittedFiles": true,
     "sourceMap": true,
-    "target": "es5",
+    "target": "es6",
     "module": "commonjs",
     "rootDir": "./src/",
     "outDir": "./dist/"