refactor(@angular/cli): re-organize the Angular CLI package folder structure

Author: alan-agius4

packages/angular/cli/bin/postinstall/analytics-prompt.js

@@ -14,7 +14,7 @@ if ('NG_CLI_ANALYTICS' in process.env) {
 }
 
 try {
-  var analytics = require('../../models/analytics');
+  var analytics = require('../../src/analytics/analytics');
 
   analytics
     .hasGlobalAnalyticsConfiguration()

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

@@ -9,14 +9,14 @@
 import { schema } from '@angular-devkit/core';
 import { createConsoleLogger } from '@angular-devkit/core/node';
 import { format } from 'util';
-import { colors, removeColor } from '../../utilities/color';
-import { CommandModuleError } from '../../utilities/command-builder/command-module';
-import { AngularWorkspace, getWorkspaceRaw } from '../../utilities/config';
-import { writeErrorToLogFile } from '../../utilities/log-file';
-import { findWorkspaceFile } from '../../utilities/project';
-import { runCommand } from './command-runner';
+import { CommandModuleError } from '../../src/command-builder/command-module';
+import { runCommand } from '../../src/command-builder/command-runner';
+import { colors, removeColor } from '../../src/utilities/color';
+import { AngularWorkspace, getWorkspaceRaw } from '../../src/utilities/config';
+import { writeErrorToLogFile } from '../../src/utilities/log-file';
+import { findWorkspaceFile } from '../../src/utilities/project';
 
-export { VERSION } from '../../utilities/version';
+export { VERSION } from '../../src/utilities/version';
 
 const debugEnv = process.env['NG_DEBUG'];
 const isDebug = debugEnv !== undefined && debugEnv !== '0' && debugEnv.toLowerCase() !== 'false';

packages/angular/cli/lib/init.ts

@@ -11,9 +11,9 @@ import 'symbol-observable';
 import { promises as fs } from 'fs';
 import * as path from 'path';
 import { SemVer } from 'semver';
-import { colors } from '../utilities/color';
-import { isWarningEnabled } from '../utilities/config';
-import { VERSION } from '../utilities/version';
+import { colors } from '../src/utilities/color';
+import { isWarningEnabled } from '../src/utilities/config';
+import { VERSION } from '../src/utilities/version';
 
 (async () => {
   /**

packages/angular/cli/models/command.ts

@@ -7,8 +7,8 @@
  */
 
 import { analytics, logging } from '@angular-devkit/core';
-import { Option } from '../utilities/command-builder/json-schema';
-import { AngularWorkspace } from '../utilities/config';
+import { Option } from '../src/command-builder/utilities/json-schema';
+import { AngularWorkspace } from '../src/utilities/config';
 import { CommandContext } from './interface';
 
 export interface BaseCommandOptions {

packages/angular/cli/models/interface.ts

@@ -7,7 +7,7 @@
  */
 
 import { analytics, logging } from '@angular-devkit/core';
-import { AngularWorkspace } from '../utilities/config';
+import { AngularWorkspace } from '../src/utilities/config';
 
 /**
  * A command runner context.

packages/angular/cli/models/schematic-command.ts

@@ -16,12 +16,12 @@ import {
 } from '@angular-devkit/schematics/tools';
 import * as inquirer from 'inquirer';
 import * as systemPath from 'path';
-import { colors } from '../utilities/color';
-import { parseJsonSchemaToOptions } from '../utilities/command-builder/json-schema';
-import { getProjectByCwd, getSchematicDefaults, getWorkspace } from '../utilities/config';
-import { ensureCompatibleNpm, getPackageManager } from '../utilities/package-manager';
-import { isTTY } from '../utilities/tty';
-import { isPackageNameSafeForAnalytics } from './analytics';
+import { isPackageNameSafeForAnalytics } from '../src/analytics/analytics';
+import { parseJsonSchemaToOptions } from '../src/command-builder/utilities/json-schema';
+import { colors } from '../src/utilities/color';
+import { getProjectByCwd, getSchematicDefaults, getWorkspace } from '../src/utilities/config';
+import { ensureCompatibleNpm, getPackageManager } from '../src/utilities/package-manager';
+import { isTTY } from '../src/utilities/tty';
 import { BaseCommandOptions, Command } from './command';
 import { CommandContext } from './interface';
 import { SchematicEngineHost } from './schematic-engine-host';

packages/angular/cli/models/analytics-collector.ts renamed to packages/angular/cli/src/analytics/analytics-collector.ts

@@ -9,21 +9,17 @@
 import { Architect, Target } from '@angular-devkit/architect';
 import { WorkspaceNodeModulesArchitectHost } from '@angular-devkit/architect/node';
 import { json } from '@angular-devkit/core';
-import { existsSync } from 'fs';
-import { resolve } from 'path';
 import { Argv } from 'yargs';
-import { isPackageNameSafeForAnalytics } from '../../models/analytics';
-import { getPackageManager } from '../package-manager';
+import { isPackageNameSafeForAnalytics } from '../analytics/analytics';
 import {
-  CommandContext,
   CommandModule,
   CommandModuleError,
   CommandModuleImplementation,
   CommandScope,
   Options,
   OtherOptions,
 } from './command-module';
-import { Option, parseJsonSchemaToOptions } from './json-schema';
+import { getArchitectTargetOptions } from './utilities/architect';
 
 export interface ArchitectCommandArgs {
   configuration?: string;
@@ -234,63 +230,3 @@ export abstract class ArchitectCommandModule
     ));
   }
 }
-
-/**
- * Get architect target schema options.
- */
-export async function getArchitectTargetOptions(
-  context: CommandContext,
-  target: Target,
-): Promise<Option[]> {
-  const { workspace } = context;
-  if (!workspace) {
-    return [];
-  }
-
-  const architectHost = new WorkspaceNodeModulesArchitectHost(workspace, workspace.basePath);
-  const builderConf = await architectHost.getBuilderNameForTarget(target);
-
-  let builderDesc;
-  try {
-    builderDesc = await architectHost.resolveBuilder(builderConf);
-  } catch (e) {
-    if (e.code === 'MODULE_NOT_FOUND') {
-      await warnOnMissingNodeModules(context);
-      throw new CommandModuleError(`Could not find the '${builderConf}' builder's node package.`);
-    }
-
-    throw e;
-  }
-
-  return parseJsonSchemaToOptions(
-    new json.schema.CoreSchemaRegistry(),
-    builderDesc.optionSchema as json.JsonObject,
-    true,
-  );
-}
-
-export async function warnOnMissingNodeModules(context: CommandContext): Promise<void> {
-  const basePath = context.workspace?.basePath;
-  if (!basePath) {
-    return;
-  }
-
-  // Check for a `node_modules` directory (npm, yarn non-PnP, etc.)
-  if (existsSync(resolve(basePath, 'node_modules'))) {
-    return;
-  }
-
-  // Check for yarn PnP files
-  if (
-    existsSync(resolve(basePath, '.pnp.js')) ||
-    existsSync(resolve(basePath, '.pnp.cjs')) ||
-    existsSync(resolve(basePath, '.pnp.mjs'))
-  ) {
-    return;
-  }
-
-  const packageManager = await getPackageManager(basePath);
-  context.logger.warn(
-    `Node packages may not be installed. Try installing with '${packageManager} install'.`,
-  );
-}

packages/angular/cli/models/analytics.ts renamed to packages/angular/cli/src/analytics/analytics.ts

@@ -16,9 +16,9 @@ import {
   CommandModule as YargsCommandModule,
   Options as YargsOptions,
 } from 'yargs';
-import { createAnalytics } from '../../models/analytics';
-import { AngularWorkspace } from '../config';
-import { Option } from './json-schema';
+import { createAnalytics } from '../analytics/analytics';
+import { AngularWorkspace } from '../utilities/config';
+import { Option } from './utilities/json-schema';
 
 export type Options<T> = { [key in keyof T as CamelCaseKey<key>]: T[key] };