fix(@angular/cli): Update project root determination

fixes #10513

Author: Brocco

package-lock.json

@@ -2,7 +2,7 @@ import * as path from 'path';
 import { filter } from 'rxjs/operators';
 import { logging, terminal } from '@angular-devkit/core';
 import { runCommand } from '../../models/command-runner';
-import { findUp } from '../../utilities/find-up';
+import { getProjectDetails } from '../../utilities/project';
 
 
 function loadCommands() {
@@ -53,15 +53,12 @@ export default async function(options: any) {
     loggingSubscription = initializeLogging(logger);
   }
 
-  const possibleConfigNames = ['angular.json', '.angular.json'];
-  const workspacePath = findUp(possibleConfigNames, process.cwd());
-  const projectRoot = workspacePath !== null
-    ? path.dirname(workspacePath)
-    : process.cwd();
+  let projectDetails = getProjectDetails();
+  if (projectDetails === null) {
+    projectDetails = { root: process.cwd() };
+  }
   const context = {
-    project: {
-      root: projectRoot
-    }
+    project: projectDetails
   };
 
   try {

packages/@angular/cli/lib/cli/index.ts

@@ -1,7 +1,65 @@
+import * as fs from 'fs';
+import * as os from 'os';
+import * as path from 'path';
 import { findUp } from './find-up';
 
 export function insideProject(): boolean {
   const possibleConfigFiles = ['angular.json', '.angular.json'];
 
   return findUp(possibleConfigFiles, process.cwd()) !== null;
 }
+
+export interface ProjectDetails {
+  root: string;
+  configFile?: string;
+}
+
+export function getProjectDetails(): ProjectDetails | null {
+  const currentDir = process.cwd();
+  const possibleConfigFiles = [
+    'angular.json',
+    '.angular.json',
+    'angular-cli.json',
+    '.angular-cli.json',
+  ];
+  const configFilePath = findUp(possibleConfigFiles, currentDir);
+  if (configFilePath === null) {
+    return null;
+  }
+  const configFileName = path.basename(configFilePath);
+
+  const possibleDir = path.dirname(configFilePath);
+
+  const homedir = os.homedir();
+  if (possibleDir === homedir) {
+    const packageJsonPath = path.join(possibleDir, 'package.json');
+    if (!fs.existsSync(packageJsonPath)) {
+      // No package.json
+      return null;
+    }
+    const packageJsonBuffer = fs.readFileSync(packageJsonPath);
+    const packageJsonText = packageJsonBuffer === null ? '{}' : packageJsonBuffer.toString();
+    const packageJson = JSON.parse(packageJsonText);
+    if (!containsCliDep(packageJson)) {
+      // No CLI dependency
+      return null;
+    }
+  }
+  return {
+    root: possibleDir,
+    configFile: configFileName,
+  };
+}
+
+function containsCliDep(obj: any): boolean {
+  const pkgName = '@angular/cli';
+  if (obj) {
+    if (obj.dependencies && obj.dependencies[pkgName]) {
+      return true;
+    }
+    if (obj.devDependencies && obj.devDependencies[pkgName]) {
+      return true;
+    }
+  }
+  return false;
+}

packages/@angular/cli/utilities/project.ts

@@ -0,0 +1,104 @@
+import { getProjectDetails } from '@angular/cli/utilities/project';
+import * as mockFs from 'mock-fs';
+import * as os from 'os';
+import {join} from 'path';
+
+const homedir = os.homedir();
+const cwds = [`${homedir}/proj`, `${homedir}/proj/abc`];
+cwds.forEach(cwd => {
+  describe(`getProjectDetails (cwd: ${cwd})`, () => {
+    beforeEach(() => {
+      spyOn(process, 'cwd').and.callFake(() => cwd);
+    });
+
+    afterEach(() => {
+      mockFs.restore();
+    });
+
+    it('should handle finding "angular.json"', () => {
+      mockFs({
+        [`${homedir}/proj/angular.json`]: 'foo'
+      });
+      const result = getProjectDetails();
+      expect(result.root).toEqual(join(homedir, 'proj'));
+      expect(result.configFile).toEqual('angular.json');
+    });
+
+    it('should handle finding ".angular.json"', () => {
+      mockFs({
+        [`${homedir}/proj/.angular.json`]: 'foo'
+      });
+      const result = getProjectDetails();
+      expect(result.root).toEqual(join(homedir, 'proj'));
+      expect(result.configFile).toEqual('.angular.json');
+    });
+
+    it('should handle finding "angular-cli.json"', () => {
+      mockFs({
+        [`${homedir}/proj/angular-cli.json`]: 'foo'
+      });
+      const result = getProjectDetails();
+      expect(result.root).toEqual(join(homedir, 'proj'));
+      expect(result.configFile).toEqual('angular-cli.json');
+    });
+
+    it('should handle finding ".angular-cli.json"', () => {
+      mockFs({
+        [`${homedir}/proj/.angular-cli.json`]: 'foo'
+      });
+      const result = getProjectDetails();
+      expect(result.root).toEqual(join(homedir, 'proj'));
+      expect(result.configFile).toEqual('.angular-cli.json');
+    });
+
+    it('should handle not finding a config file at all', () => {
+      mockFs({});
+      const result = getProjectDetails();
+      expect(result).toEqual(null);
+    });
+
+    it('should handle searching up the home directory', () => {
+      mockFs({
+        [`${homedir}/angular.json`]: 'foo'
+      });
+      const result = getProjectDetails();
+      expect(result).toEqual(null);
+    });
+
+    it('should handle searching up the home directory', () => {
+      mockFs({
+        [`${homedir}/.angular-cli.json`]: 'foo'
+      });
+      const result = getProjectDetails();
+      expect(result).toEqual(null);
+    });
+
+    it('should handle searching up the home directory and finding a project', () => {
+      mockFs({
+        [`${homedir}/angular.json`]: 'foo',
+        [`${homedir}/package.json`]: JSON.stringify({
+          dependencies: {
+            '@angular/cli': '0.0.0'
+          }
+        })
+      });
+      const result = getProjectDetails();
+      expect(result.root).toEqual(homedir);
+      expect(result.configFile).toEqual('angular.json');
+    });
+
+    it('should handle searching up the home directory and finding a project', () => {
+      mockFs({
+        [`${homedir}/.angular-cli.json`]: 'foo',
+        [`${homedir}/package.json`]: JSON.stringify({
+          dependencies: {
+            '@angular/cli': '0.0.0'
+          }
+        })
+      });
+      const result = getProjectDetails();
+      expect(result.root).toEqual(homedir);
+      expect(result.configFile).toEqual('.angular-cli.json');
+    });
+  });
+});