feat(multi-app): determine active project via cwd path match

Author: imhoffd

packages/ionic/src/commands/start.ts

@@ -449,7 +449,7 @@ ${chalk.cyan('[1]')}: ${chalk.bold('https://ionicframework.com/docs/cli/starters
     this.namespace.root.project = project;
 
     if (!this.project) {
-      throw new FatalException('Error while loading new project. Please report this error!');
+      throw new FatalException('Error while loading project.');
     }
 
     this.env.shell.alterPath = p => prependNodeModulesBinToPath(projectDir, p);

packages/ionic/src/lib/index.ts

@@ -8,12 +8,12 @@ import * as path from 'path';
 
 import { ERROR_VERSION_TOO_OLD } from '../bootstrap';
 import { PROJECT_FILE } from '../constants';
-import { IProject, InfoItem, IonicContext, IonicEnvironment, IonicEnvironmentFlags, ProjectType } from '../definitions';
+import { IProject, InfoItem, IonicContext, IonicEnvironment, IonicEnvironmentFlags } from '../definitions';
 
 import { CONFIG_FILE, Config, DEFAULT_CONFIG_DIRECTORY, parseGlobalOptions } from './config';
 import { Environment } from './environment';
 import { Client } from './http';
-import { ProjectDeps, createProjectFromType, determineProjectType } from './project';
+import { ProjectDeps, ProjectDetails, createProjectFromType, determineProjectDetails } from './project';
 import { createOnFallback } from './prompts';
 import { ProSession } from './session';
 import { Shell, prependNodeModulesBinToPath } from './shell';
@@ -30,7 +30,7 @@ export async function getProject(projectDir: string | undefined, projectName: st
   const { log } = deps;
   const projectFilePath = path.resolve(projectDir, PROJECT_FILE);
   let projectFile: { [key: string]: any; } | undefined;
-  let type: ProjectType | undefined;
+  let projectDetails: ProjectDetails | undefined;
 
   try {
     projectFile = await readJsonFile(projectFilePath);
@@ -40,20 +40,25 @@ export async function getProject(projectDir: string | undefined, projectName: st
       `Attempted to load project config ${chalk.bold(prettyPath(projectFilePath))} but got error:\n\n` +
       chalk.red(e.toString())
     );
+    log.nl();
   }
 
   if (projectFile) {
-    projectName = projectName || projectFile.defaultProject;
-    type = await determineProjectType(projectDir, projectName, projectFile, deps);
-
-    debug(`Project name: ${chalk.bold(String(projectName))}`);
+    try {
+      projectDetails = await determineProjectDetails(projectDir, projectName, projectFile, deps);
+    } catch (e) {
+      log.warn(e.toString());
+      log.nl();
+    }
   }
 
-  if (!type) {
+  if (!projectDetails) {
     return;
   }
 
-  return createProjectFromType(projectFilePath, projectName, deps, type);
+  const { name, type } = projectDetails;
+
+  return createProjectFromType(projectFilePath, name, deps, type);
 }
 
 export async function generateIonicEnvironment(ctx: IonicContext, pargv: string[]): Promise<{ env: IonicEnvironment; project?: IProject; }> {
@@ -129,14 +134,7 @@ export async function generateIonicEnvironment(ctx: IonicContext, pargv: string[
     log.warn(`${chalk.green('--yarn')} / ${chalk.green('--no-yarn')} has been removed. Use ${chalk.green(`ionic config set -g npmClient ${argv['yarn'] ? 'yarn' : 'npm'}`)}.`);
   }
 
-  let project: IProject | undefined;
-
-  try {
-    project = await getProject(projectDir, projectName, deps);
-  } catch (e) {
-    log.warn(e.toString());
-    log.nl();
-  }
+  const project = await getProject(projectDir, projectName, deps);
 
   return { env, project };
 }

packages/ionic/src/lib/project/index.ts

@@ -18,13 +18,43 @@ import * as ζserve from '../serve';
 
 const debug = Debug('ionic:lib:project');
 
-export async function determineProjectType(projectDir: string, projectName: string | undefined, projectConfig: { [key: string]: any; } | undefined, deps: ProjectDeps): Promise<ProjectType | undefined> {
+export interface ProjectDetails {
+  name?: string;
+  type: ProjectType;
+}
+
+export async function determineProjectDetails(rootProjectDir: string, projectName: string | undefined, projectConfig: { [key: string]: any; } | undefined, deps: ProjectDeps): Promise<ProjectDetails | undefined> {
+  let name: string | undefined;
   let type: ProjectType | undefined;
 
+  if (projectName) {
+    name = projectName;
+    debug(`Project name from projectName: ${chalk.bold(name)}`);
+  }
+
   if (isProjectConfig(projectConfig)) {
     type = projectConfig.type;
   } else if (isMultiProjectConfig(projectConfig)) {
-    const name = projectName ? projectName : projectConfig.defaultProject;
+    if (!name) {
+      const { ctx } = deps;
+
+      for (const [ key, value ] of lodash.entries(projectConfig.projects)) {
+        if (value && value.root) {
+          const projectDir = path.resolve(rootProjectDir, value.root);
+
+          if (ctx.execPath.includes(projectDir)) {
+            name = key;
+            debug(`Project name from path match: ${chalk.bold(name)}`);
+            break;
+          }
+        }
+      }
+    }
+
+    if (!name && projectConfig.defaultProject) {
+      name = projectConfig.defaultProject;
+      debug(`Project name from defaultProject: ${chalk.bold(name)}`);
+    }
 
     if (!name) {
       throw new Error(
@@ -37,6 +67,7 @@ export async function determineProjectType(projectDir: string, projectName: stri
 
     if (config) {
       type = config.type;
+      debug(`Project type from config: ${chalk.bold(prettyProjectName(type))} ${type ? chalk.bold(`(${type})`) : ''}`);
     } else {
       throw new Error(
         `Multi-app workspace detected, but project was not found in configuration.\n` +
@@ -52,26 +83,28 @@ export async function determineProjectType(projectDir: string, projectName: stri
     }
   }
 
-  if (type && PROJECT_TYPES.includes(type)) {
-    debug(`Project type from config: ${chalk.bold(prettyProjectName(type))} ${type ? chalk.bold(`(${type})`) : ''}`);
-    return type;
-  }
-
-  for (const projectType of PROJECT_TYPES) {
-    const p = await createProjectFromType(path.resolve(projectDir, PROJECT_FILE), projectName, deps, projectType);
+  if (!type) {
+    for (const projectType of PROJECT_TYPES) {
+      const p = await createProjectFromType(path.resolve(rootProjectDir, PROJECT_FILE), projectName, deps, projectType);
 
-    if (await p.detected()) {
-      debug(`Project type detected: ${chalk.bold(prettyProjectName(p.type))} ${p.type ? chalk.bold(`(${p.type})`) : ''}`);
-      return p.type;
+      if (await p.detected()) {
+        debug(`Project type from detection: ${chalk.bold(prettyProjectName(p.type))} ${p.type ? chalk.bold(`(${p.type})`) : ''}`);
+        type = p.type;
+        break;
+      }
     }
   }
 
+  if (type && PROJECT_TYPES.includes(type)) {
+    return { name, type };
+  }
+
   const listWrapOptions = { width: TTY_WIDTH - 8 - 3, indentation: 1 };
 
   // TODO: move some of this to the CLI docs
 
   throw new Error(
-    `Could not determine project type (project config: ${chalk.bold(prettyPath(path.resolve(projectDir, PROJECT_FILE)))}).\n` +
+    `Could not determine project type (project config: ${chalk.bold(prettyPath(path.resolve(rootProjectDir, PROJECT_FILE)))}).\n` +
     `- ${wordWrap(`For ${chalk.bold(prettyProjectName('angular'))} projects, make sure ${chalk.green('@ionic/angular')} is listed as a dependency in ${chalk.bold('package.json')}.`, listWrapOptions)}\n` +
     `- ${wordWrap(`For ${chalk.bold(prettyProjectName('ionic-angular'))} projects, make sure ${chalk.green('ionic-angular')} is listed as a dependency in ${chalk.bold('package.json')}.`, listWrapOptions)}\n` +
     `- ${wordWrap(`For ${chalk.bold(prettyProjectName('ionic1'))} projects, make sure ${chalk.green('ionic')} is listed as a dependency in ${chalk.bold('bower.json')}.`, listWrapOptions)}\n\n` +