From f3f2558f0cd863165217d1c4531d2b7fbeeffea6 Mon Sep 17 00:00:00 2001
From: Pine Wu <t-zhwu@microsoft.com>
Date: Thu, 17 Nov 2016 10:12:45 -0800
Subject: [PATCH] Handle a error case and name consistency

---
 tree-explorer-sample/src/extension.ts | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/tree-explorer-sample/src/extension.ts b/tree-explorer-sample/src/extension.ts
index b1e613b4..067bcd2b 100644
--- a/tree-explorer-sample/src/extension.ts
+++ b/tree-explorer-sample/src/extension.ts
@@ -55,7 +55,7 @@ class DepNodeProvider implements TreeExplorerNodeProvider<DepNode> {
       switch(node.kind) {
         case 'root':
           const packageJsonPath = path.join(this.workspaceRoot, 'package.json');
-          if (this.fileExists(packageJsonPath)) {
+          if (this.pathExists(packageJsonPath)) {
             resolve(this.getDepsInPackageJson(packageJsonPath));
           } else {
             vscode.window.showInformationMessage('Workspace has no package.json');
@@ -78,28 +78,32 @@ class DepNodeProvider implements TreeExplorerNodeProvider<DepNode> {
    * Given the path to package.json, read all its dependencies and devDependencies.
    */
   private getDepsInPackageJson(packageJsonPath: string): DepNode[] {
-    if (this.fileExists(packageJsonPath)) {
+    if (this.pathExists(packageJsonPath)) {
       const packageJson = JSON.parse(fs.readFileSync(packageJsonPath, 'utf-8'));
     
       const toDep = (moduleName: string): DepNode => {
-        if (this.fileExists(path.join(this.workspaceRoot, 'node_modules', moduleName))) {
+        if (this.pathExists(path.join(this.workspaceRoot, 'node_modules', moduleName))) {
           return new Node(moduleName);
         } else {
           return new Leaf(moduleName);
         }
       }
 
-      const deps = Object.keys(packageJson.dependencies).map(toDep);
-      const devDeps = Object.keys(packageJson.devDependencies).map(toDep);
+      const deps = packageJson.dependencies
+                 ? Object.keys(packageJson.dependencies).map(toDep)
+                 : [];
+      const devDeps = packageJson.devDependencies
+                    ? Object.keys(packageJson.devDependencies).map(toDep)
+                    : [];
       return deps.concat(devDeps);
     } else {
       return [];
     }
   }
 
-  private fileExists(filePath: string): boolean {
+  private pathExists(p: string): boolean {
     try {
-      fs.accessSync(filePath);
+      fs.accessSync(p);
     } catch (err) {
       return false;
     }