Merge pull request #2 from wdoug/update-deps

Update deps

Author: wdoug

README.md

@@ -8,10 +8,10 @@ Transforms React code written in JavaScript to TypeScript.
 
 ## Features:
 
-*   Proxies `PropTypes` to `React.Component` generic type and removes PropTypes
-*   Provides state typing for `React.Component` based on initial state and `setState()` calls in the component
-*   Hoist large interfaces for props and state out of `React.Component<P, S>` into declared types
-*   Convert functional components with `PropTypes` property to TypeScript and uses propTypes to generate function type declaration
+-   Proxies `PropTypes` to `React.Component` generic type and removes PropTypes
+-   Provides state typing for `React.Component` based on initial state and `setState()` calls in the component
+-   Hoist large interfaces for props and state out of `React.Component<P, S>` into declared types
+-   Convert functional components with `PropTypes` property to TypeScript and uses propTypes to generate function type declaration
 
 ## Example
 

package.json

@@ -14,18 +14,28 @@
         "clean": "rm -rf dist",
         "prebuild": "npm run clean",
         "build": "tsc --pretty",
-        "precommit": "lint-staged",
-        "prettier": "prettier --write *.{js,json,css,md,ts,tsx}"
+        "prettier": "prettier --write \"**/*.{js,json,css,md,ts,tsx}\""
     },
     "jest": {
         "transform": {
             ".ts": "<rootDir>/node_modules/ts-jest/preprocessor.js"
         },
         "testRegex": "(/tests/.*|(\\.|/)(test|spec))\\.(jsx?|tsx?)$",
-        "moduleFileExtensions": ["ts", "js"]
+        "moduleFileExtensions": [
+            "ts",
+            "js"
+        ]
+    },
+    "husky": {
+        "hooks": {
+            "pre-commit": "lint-staged"
+        }
     },
     "lint-staged": {
-        "*.{js,json,css,md,ts,tsx}": ["node_modules/.bin/prettier --write", "git add"]
+        "*.{js,json,css,md,ts,tsx}": [
+            "prettier --write",
+            "git add"
+        ]
     },
     "bin": "dist/cli.js",
     "author": "Mohsen Azimi <me@azimi.me>",
@@ -36,25 +46,25 @@
         "detect-indent": "^5.0.0",
         "glob": "^7.1.2",
         "lodash": "^4.17.10",
-        "prettier": "^1.12.1",
-        "typescript": "2.8.3"
+        "prettier": "^1.18.2",
+        "typescript": "3.6.3"
     },
     "devDependencies": {
         "@types/chalk": "^2.2.0",
         "@types/commander": "^2.9.1",
         "@types/detect-indent": "^5.0.0",
         "@types/glob": "^5.0.35",
-        "@types/jest": "^22.2.3",
+        "@types/jest": "^24.0.18",
         "@types/lodash": "^4.14.109",
-        "@types/node": "^10.1.2",
-        "@types/prettier": "^1.12.2",
+        "@types/node": "^12.7.5",
+        "@types/prettier": "^1.18.2",
         "@types/react": "^16.3.14",
         "dedent": "^0.7.0",
-        "husky": "^0.14.3",
-        "jest": "^22.4.4",
+        "husky": "^3.0.5",
+        "jest": "^24.9.0",
         "lint-staged": "^7.1.1",
         "ts-jest": "^22.4.6",
-        "ts-node": "^6.0.3",
+        "ts-node": "^8.3.0",
         "tslint": "^5.10.0"
     }
 }

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

@@ -191,8 +191,10 @@ function getInitialStateFromClassDeclaration(
 
     if (initialStateMember && ts.isPropertyDeclaration(initialStateMember) && initialStateMember.initializer) {
         const type = typeChecker.getTypeAtLocation(initialStateMember.initializer)!;
-
-        return typeChecker.typeToTypeNode(type);
+        const typeNode = typeChecker.typeToTypeNode(type);
+        if (typeNode) {
+            return typeNode;
+        }
     }
 
     // Initial state in constructor
@@ -207,7 +209,10 @@ function getInitialStateFromClassDeclaration(
                 ts.isBinaryExpression(statement.expression) &&
                 statement.expression.left.getText() === 'this.state'
             ) {
-                return typeChecker.typeToTypeNode(typeChecker.getTypeAtLocation(statement.expression.right));
+                const typeNode = typeChecker.typeToTypeNode(typeChecker.getTypeAtLocation(statement.expression.right));
+                if (typeNode) {
+                    return typeNode;
+                }
             }
         }
     }
@@ -242,7 +247,10 @@ function getStateLookingForSetStateCalls(
             node.expression.expression.getText().match(/setState/)
         ) {
             const type = typeChecker.getTypeAtLocation(node.expression.arguments[0]);
-            typeNodes.push(typeChecker.typeToTypeNode(type));
+            const typeNode = typeChecker.typeToTypeNode(type);
+            if (typeNode) {
+                typeNodes.push(typeNode);
+            }
         }
     }
 }