@angular/cli 14.0.0-next.5 → 14.0.0-next.8

package/src/commands/update/schematic/index.js

@@ -8,7 +8,11 @@
  */
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];
@@ -282,6 +286,7 @@ function _getUpdateMetadata(packageJson, logger) {
         }
         else if (typeof packageGroup == 'object' &&
             packageGroup &&
+            !Array.isArray(packageGroup) &&
             Object.values(packageGroup).every((x) => typeof x == 'string')) {
             result.packageGroup = packageGroup;
         }
@@ -358,23 +363,26 @@ function _usageMessage(options, infoMap, logger) {
     })
         .filter(({ info, version, target }) => (target === null || target === void 0 ? void 0 : target['ng-update']) && semver.compare(info.installed.version, version) < 0)
         .map(({ name, info, version, tag, target }) => {
-        var _a;
+        var _a, _b, _c;
         // Look for packageGroup.
-        const packageGroup = target['ng-update']['packageGroup'];
+        const packageGroup = (_a = target['ng-update']) === null || _a === void 0 ? void 0 : _a['packageGroup'];
         if (packageGroup) {
-            const packageGroupName = target['ng-update']['packageGroupName'] || packageGroup[0];
+            const packageGroupNames = Array.isArray(packageGroup)
+                ? packageGroup
+                : Object.keys(packageGroup);
+            const packageGroupName = ((_b = target['ng-update']) === null || _b === void 0 ? void 0 : _b['packageGroupName']) || packageGroupNames[0];
             if (packageGroupName) {
                 if (packageGroups.has(name)) {
                     return null;
                 }
-                packageGroup.forEach((x) => packageGroups.set(x, packageGroupName));
+                packageGroupNames.forEach((x) => packageGroups.set(x, packageGroupName));
                 packageGroups.set(packageGroupName, packageGroupName);
                 name = packageGroupName;
             }
         }
         let command = `ng update ${name}`;
         if (!tag) {
-            command += `@${((_a = semver.parse(version)) === null || _a === void 0 ? void 0 : _a.major) || version}`;
+            command += `@${((_c = semver.parse(version)) === null || _c === void 0 ? void 0 : _c.major) || version}`;
         }
         else if (tag == 'next') {
             command += ' --next';
@@ -504,29 +512,34 @@ function _addPackageGroup(tree, packages, allDependencies, npmPackageJson, logge
     if (!ngUpdateMetadata) {
         return;
     }
-    let packageGroup = ngUpdateMetadata['packageGroup'];
+    const packageGroup = ngUpdateMetadata['packageGroup'];
     if (!packageGroup) {
         return;
     }
+    let packageGroupNormalized = {};
     if (Array.isArray(packageGroup) && !packageGroup.some((x) => typeof x != 'string')) {
-        packageGroup = packageGroup.reduce((acc, curr) => {
+        packageGroupNormalized = packageGroup.reduce((acc, curr) => {
             acc[curr] = maybePackage;
             return acc;
         }, {});
     }
-    // Only need to check if it's an object because we set it right the time before.
-    if (typeof packageGroup != 'object' ||
-        packageGroup === null ||
-        Object.values(packageGroup).some((v) => typeof v != 'string')) {
-        logger.warn(`packageGroup metadata of package ${npmPackageJson.name} is malformed.`);
+    else if (typeof packageGroup == 'object' &&
+        packageGroup &&
+        !Array.isArray(packageGroup) &&
+        Object.values(packageGroup).every((x) => typeof x == 'string')) {
+        packageGroupNormalized = packageGroup;
+    }
+    else {
+        logger.warn(`packageGroup metadata of package ${npmPackageJson.name} is malformed. Ignoring.`);
         return;
     }
-    Object.keys(packageGroup)
-        .filter((name) => !packages.has(name)) // Don't override names from the command line.
-        .filter((name) => allDependencies.has(name)) // Remove packages that aren't installed.
-        .forEach((name) => {
-        packages.set(name, packageGroup[name]);
-    });
+    for (const [name, value] of Object.entries(packageGroupNormalized)) {
+        // Don't override names from the command line.
+        // Remove packages that aren't installed.
+        if (!packages.has(name) && allDependencies.has(name)) {
+            packages.set(name, value);
+        }
+    }
 }
 /**
  * Add peer dependencies of packages on the command line to the list of packages to update.

package/src/commands/version/cli.d.ts

@@ -15,5 +15,4 @@ export declare class VersionCommandModule extends CommandModule implements Comma
     builder(localYargs: Argv): Argv;
     run(): Promise<void>;
     private getVersion;
-    private getPackageManagerVersion;
 }

package/src/commands/version/cli.js

@@ -11,12 +11,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.VersionCommandModule = void 0;
-const child_process_1 = require("child_process");
 const module_1 = __importDefault(require("module"));
 const path_1 = require("path");
 const command_module_1 = require("../../command-builder/command-module");
 const color_1 = require("../../utilities/color");
-const package_manager_1 = require("../../utilities/package-manager");
 /**
  * Major versions of Node.js that are officially supported by Angular.
  */
@@ -44,10 +42,11 @@ class VersionCommandModule extends command_module_1.CommandModule {
         return localYargs;
     }
     async run() {
-        const logger = this.context.logger;
+        var _a;
+        const { packageManager, logger, root } = this.context;
         const localRequire = module_1.default.createRequire((0, path_1.resolve)(__filename, '../../../'));
         // Trailing slash is used to allow the path to be treated as a directory
-        const workspaceRequire = module_1.default.createRequire(this.context.root + '/');
+        const workspaceRequire = module_1.default.createRequire(root + '/');
         const cliPackage = localRequire('./package.json');
         let workspacePackage;
         try {
@@ -56,21 +55,18 @@ class VersionCommandModule extends command_module_1.CommandModule {
         catch { }
         const [nodeMajor] = process.versions.node.split('.').map((part) => Number(part));
         const unsupportedNodeVersion = !SUPPORTED_NODE_MAJORS.includes(nodeMajor);
-        const packageNames = [
-            ...Object.keys(cliPackage.dependencies || {}),
-            ...Object.keys(cliPackage.devDependencies || {}),
-            ...Object.keys((workspacePackage === null || workspacePackage === void 0 ? void 0 : workspacePackage.dependencies) || {}),
-            ...Object.keys((workspacePackage === null || workspacePackage === void 0 ? void 0 : workspacePackage.devDependencies) || {}),
-        ];
-        const versions = packageNames
-            .filter((x) => PACKAGE_PATTERNS.some((p) => p.test(x)))
-            .reduce((acc, name) => {
-            if (name in acc) {
-                return acc;
+        const packageNames = new Set(Object.keys({
+            ...cliPackage.dependencies,
+            ...cliPackage.devDependencies,
+            ...workspacePackage === null || workspacePackage === void 0 ? void 0 : workspacePackage.dependencies,
+            ...workspacePackage === null || workspacePackage === void 0 ? void 0 : workspacePackage.devDependencies,
+        }));
+        const versions = {};
+        for (const name of packageNames) {
+            if (PACKAGE_PATTERNS.some((p) => p.test(name))) {
+                versions[name] = this.getVersion(name, workspaceRequire, localRequire);
             }
-            acc[name] = this.getVersion(name, workspaceRequire, localRequire);
-            return acc;
-        }, {});
+        }
         const ngCliVersion = cliPackage.version;
         let angularCoreVersion = '';
         const angularSameAsCore = [];
@@ -78,11 +74,10 @@ class VersionCommandModule extends command_module_1.CommandModule {
             // Filter all angular versions that are the same as core.
             angularCoreVersion = versions['@angular/core'];
             if (angularCoreVersion) {
-                for (const angularPackage of Object.keys(versions)) {
-                    if (versions[angularPackage] == angularCoreVersion &&
-                        angularPackage.startsWith('@angular/')) {
-                        angularSameAsCore.push(angularPackage.replace(/^@angular\//, ''));
-                        delete versions[angularPackage];
+                for (const [name, version] of Object.entries(versions)) {
+                    if (version === angularCoreVersion && name.startsWith('@angular/')) {
+                        angularSameAsCore.push(name.replace(/^@angular\//, ''));
+                        delete versions[name];
                     }
                 }
                 // Make sure we list them in alphabetical order.
@@ -105,7 +100,7 @@ class VersionCommandModule extends command_module_1.CommandModule {
         logger.info(`
       Angular CLI: ${ngCliVersion}
       Node: ${process.versions.node}${unsupportedNodeVersion ? ' (Unsupported)' : ''}
-      Package Manager: ${await this.getPackageManagerVersion()}
+      Package Manager: ${packageManager.name} ${(_a = packageManager.version) !== null && _a !== void 0 ? _a : '<error>'} 
       OS: ${process.platform} ${process.arch}
 
       Angular: ${angularCoreVersion}
@@ -162,24 +157,5 @@ class VersionCommandModule extends command_module_1.CommandModule {
         }
         return '<error>';
     }
-    async getPackageManagerVersion() {
-        try {
-            const manager = await (0, package_manager_1.getPackageManager)(this.context.root);
-            const version = (0, child_process_1.execSync)(`${manager} --version`, {
-                encoding: 'utf8',
-                stdio: ['ignore', 'pipe', 'ignore'],
-                env: {
-                    ...process.env,
-                    //  NPM updater notifier will prevents the child process from closing until it timeout after 3 minutes.
-                    NO_UPDATE_NOTIFIER: '1',
-                    NPM_CONFIG_UPDATE_NOTIFIER: 'false',
-                },
-            }).trim();
-            return `${manager} ${version}`;
-        }
-        catch {
-            return '<error>';
-        }
-    }
 }
 exports.VersionCommandModule = VersionCommandModule;

package/src/typings-bazel.d.ts

@@ -0,0 +1,14 @@
+/**
+ * @license
+ * Copyright Google LLC All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+
+/* eslint-disable import/no-extraneous-dependencies */
+// Workaround for https://github.com/bazelbuild/rules_nodejs/issues/1033
+// Alternative approach instead of https://github.com/angular/angular/pull/33226
+declare module '@yarnpkg/lockfile' {
+  export * from '@types/yarnpkg__lockfile';
+}

package/src/typings.d.ts

@@ -5,20 +5,7 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
-declare module '@yarnpkg/lockfile' {
-    function parse(data: string): Record<string, any>;
-}
-declare module 'ini' {
-    function parse(data: string): Record<string, any>;
-}
 declare module 'npm-pick-manifest' {
     function pickManifest(metadata: import('./utilities/package-metadata').PackageMetadata, selector: string): import('./utilities/package-metadata').PackageManifest;
     export = pickManifest;
 }
-declare module 'pacote' {
-    function manifest(specifier: string, options: Record<string, unknown>): Promise<{
-        name: string;
-        version: string;
-    }>;
-    function packument(specifier: string, options: Record<string, unknown>): Promise<import('./utilities/package-metadata').NpmRepositoryPackageJson>;
-}

package/src/utilities/color.js

@@ -8,7 +8,11 @@
  */
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];

package/src/utilities/config.d.ts

@@ -20,7 +20,7 @@ export declare class AngularWorkspace {
     getProjectCli(projectName: string): Record<string, any>;
     static load(workspaceFilePath: string): Promise<AngularWorkspace>;
 }
-export declare function getWorkspace(level?: 'local' | 'global'): Promise<AngularWorkspace | null>;
+export declare function getWorkspace(level?: 'local' | 'global'): Promise<AngularWorkspace | undefined>;
 export declare function createGlobalSettings(): string;
 export declare function getWorkspaceRaw(level?: 'local' | 'global'): [JSONFile | null, string | null];
 export declare function validateWorkspace(data: json.JsonObject): Promise<void>;

package/src/utilities/config.js

@@ -8,7 +8,11 @@
  */
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];
@@ -38,15 +42,16 @@ function isJsonObject(value) {
 }
 function createWorkspaceHost() {
     return {
-        async readFile(path) {
-            return (0, fs_1.readFileSync)(path, 'utf-8');
+        readFile(path) {
+            return fs_1.promises.readFile(path, 'utf-8');
         },
         async writeFile(path, data) {
-            (0, fs_1.writeFileSync)(path, data);
+            await fs_1.promises.writeFile(path, data);
         },
         async isDirectory(path) {
             try {
-                return (0, fs_1.statSync)(path).isDirectory();
+                const stats = await fs_1.promises.stat(path);
+                return stats.isDirectory();
             }
             catch {
                 return false;
@@ -54,7 +59,8 @@ function createWorkspaceHost() {
         },
         async isFile(path) {
             try {
-                return (0, fs_1.statSync)(path).isFile();
+                const stats = await fs_1.promises.stat(path);
+                return stats.isFile();
             }
             catch {
                 return false;
@@ -143,14 +149,13 @@ class AngularWorkspace {
 exports.AngularWorkspace = AngularWorkspace;
 const cachedWorkspaces = new Map();
 async function getWorkspace(level = 'local') {
-    const cached = cachedWorkspaces.get(level);
-    if (cached !== undefined) {
-        return cached;
+    if (cachedWorkspaces.has(level)) {
+        return cachedWorkspaces.get(level);
     }
     const configPath = level === 'local' ? projectFilePath() : globalFilePath();
     if (!configPath) {
-        cachedWorkspaces.set(level, null);
-        return null;
+        cachedWorkspaces.set(level, undefined);
+        return undefined;
     }
     try {
         const workspace = await AngularWorkspace.load(configPath);
@@ -233,6 +238,7 @@ function findProjectByPath(workspace, location) {
     }
     return projects[0][1];
 }
+let defaultProjectDeprecationWarningShown = false;
 function getProjectByCwd(workspace) {
     if (workspace.projects.size === 1) {
         // If there is only one project, return that one.
@@ -245,6 +251,11 @@ function getProjectByCwd(workspace) {
     const defaultProject = workspace.extensions['defaultProject'];
     if (defaultProject && typeof defaultProject === 'string') {
         // If there is a default project name, return it.
+        if (!defaultProjectDeprecationWarningShown) {
+            console.warn(`DEPRECATED: The 'defaultProject' workspace option has been deprecated. ` +
+                `The project to use will be determined from the current working directory.`);
+            defaultProjectDeprecationWarningShown = true;
+        }
         return defaultProject;
     }
     return null;

package/src/utilities/environment-options.d.ts

@@ -0,0 +1,12 @@
+/**
+ * @license
+ * Copyright Google LLC All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+export declare const analyticsDisabled: boolean;
+export declare const analyticsShareDisabled: boolean;
+export declare const isCI: boolean;
+export declare const disableVersionCheck: boolean;
+export declare const ngDebug: boolean;

package/src/utilities/environment-options.js

@@ -0,0 +1,24 @@
+"use strict";
+/**
+ * @license
+ * Copyright Google LLC All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ngDebug = exports.disableVersionCheck = exports.isCI = exports.analyticsShareDisabled = exports.analyticsDisabled = void 0;
+function isPresent(variable) {
+    return typeof variable === 'string' && variable !== '';
+}
+function isDisabled(variable) {
+    return isPresent(variable) && (variable === '0' || variable.toLowerCase() === 'false');
+}
+function isEnabled(variable) {
+    return isPresent(variable) && (variable === '1' || variable.toLowerCase() === 'true');
+}
+exports.analyticsDisabled = isDisabled(process.env['NG_CLI_ANALYTICS']);
+exports.analyticsShareDisabled = isDisabled(process.env['NG_CLI_ANALYTICS_SHARE']);
+exports.isCI = isEnabled(process.env['CI']);
+exports.disableVersionCheck = isEnabled(process.env['NG_DISABLE_VERSION_CHECK']);
+exports.ngDebug = isEnabled(process.env['NG_DEBUG']);

package/src/utilities/find-up.js

@@ -8,7 +8,11 @@
  */
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];

package/src/utilities/memoize.d.ts

@@ -0,0 +1,15 @@
+/**
+ * @license
+ * Copyright Google LLC All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+/**
+ * A decorator that memoizes methods and getters.
+ *
+ * **Note**: Be cautious where and how to use this decorator as the size of the cache will grow unbounded.
+ *
+ * @see https://en.wikipedia.org/wiki/Memoization
+ */
+export declare function memoize<T>(target: Object, propertyKey: string | symbol, descriptor: TypedPropertyDescriptor<T>): TypedPropertyDescriptor<T>;

package/src/utilities/memoize.js

@@ -0,0 +1,69 @@
+"use strict";
+/**
+ * @license
+ * Copyright Google LLC All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.memoize = void 0;
+/**
+ * A decorator that memoizes methods and getters.
+ *
+ * **Note**: Be cautious where and how to use this decorator as the size of the cache will grow unbounded.
+ *
+ * @see https://en.wikipedia.org/wiki/Memoization
+ */
+function memoize(target, propertyKey, descriptor) {
+    const descriptorPropertyName = descriptor.get ? 'get' : 'value';
+    const originalMethod = descriptor[descriptorPropertyName];
+    if (typeof originalMethod !== 'function') {
+        throw new Error('Memoize decorator can only be used on methods or get accessors.');
+    }
+    const cache = new Map();
+    return {
+        ...descriptor,
+        [descriptorPropertyName]: function (...args) {
+            for (const arg of args) {
+                if (!isJSONSerializable(arg)) {
+                    throw new Error(`Argument ${isNonPrimitive(arg) ? arg.toString() : arg} is JSON serializable.`);
+                }
+            }
+            const key = JSON.stringify(args);
+            if (cache.has(key)) {
+                return cache.get(key);
+            }
+            const result = originalMethod.apply(this, args);
+            cache.set(key, result);
+            return result;
+        },
+    };
+}
+exports.memoize = memoize;
+/** Method to check if value is a non primitive. */
+function isNonPrimitive(value) {
+    return ((value !== null && typeof value === 'object') ||
+        typeof value === 'function' ||
+        typeof value === 'symbol');
+}
+/** Method to check if the values are JSON serializable */
+function isJSONSerializable(value) {
+    if (!isNonPrimitive(value)) {
+        // Can be seralized since it's a primitive.
+        return true;
+    }
+    let nestedValues;
+    if (Array.isArray(value)) {
+        // It's an array, check each item.
+        nestedValues = value;
+    }
+    else if (Object.prototype.toString.call(value) === '[object Object]') {
+        // It's a plain object, check each value.
+        nestedValues = Object.values(value);
+    }
+    if (!nestedValues || nestedValues.some((v) => !isJSONSerializable(v))) {
+        return false;
+    }
+    return true;
+}

package/src/utilities/package-manager.d.ts

@@ -6,8 +6,36 @@
  * found in the LICENSE file at https://angular.io/license
  */
 import { PackageManager } from '../../lib/config/workspace-schema';
-export declare function getPackageManager(root: string): Promise<PackageManager>;
-/**
- * Checks if the npm version is a supported 7.x version.  If not, display a warning.
- */
-export declare function ensureCompatibleNpm(root: string): Promise<void>;
+import { AngularWorkspace } from './config';
+export interface PackageManagerUtilsContext {
+    globalConfiguration?: AngularWorkspace;
+    workspace?: AngularWorkspace;
+    root: string;
+}
+export declare class PackageManagerUtils {
+    private readonly context;
+    constructor(context: PackageManagerUtilsContext);
+    /** Get the package manager name. */
+    get name(): PackageManager;
+    /** Get the package manager version. */
+    get version(): string | undefined;
+    /**
+     * Checks if the package manager is supported. If not, display a warning.
+     */
+    ensureCompatibility(): void;
+    /** Install a single package. */
+    install(packageName: string, save?: 'dependencies' | 'devDependencies' | true, extraArgs?: string[], cwd?: string): Promise<boolean>;
+    /** Install all packages. */
+    installAll(extraArgs?: string[], cwd?: string): Promise<boolean>;
+    /** Install a single package temporary. */
+    installTemp(packageName: string, extraArgs?: string[]): Promise<{
+        success: boolean;
+        tempNodeModules: string;
+    }>;
+    private getArguments;
+    private run;
+    private getVersion;
+    private getName;
+    private hasLockfile;
+    private getConfiguredPackageManager;
+}