@angular/cli 14.0.0-next.7 → 14.0.0-rc.0

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.js

@@ -6,6 +6,12 @@
  * 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
  */
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PackageManagerUtils = void 0;
 const core_1 = require("@angular-devkit/core");
@@ -16,6 +22,7 @@ const path_1 = require("path");
 const semver_1 = require("semver");
 const workspace_schema_1 = require("../../lib/config/workspace-schema");
 const config_1 = require("./config");
+const memoize_1 = require("./memoize");
 const spinner_1 = require("./spinner");
 class PackageManagerUtils {
     constructor(context) {
@@ -168,7 +175,6 @@ class PackageManagerUtils {
             (_b = childProcess.stderr) === null || _b === void 0 ? void 0 : _b.on('data', (data) => bufferedOutput.push({ stream: process.stderr, data: data }));
         });
     }
-    // TODO(alan-agius4): use the memoize decorator when it's merged.
     getVersion(name) {
         try {
             return (0, child_process_1.execSync)(`${name} --version`, {
@@ -186,7 +192,6 @@ class PackageManagerUtils {
             return undefined;
         }
     }
-    // TODO(alan-agius4): use the memoize decorator when it's merged.
     getName() {
         const packageManager = this.getConfiguredPackageManager();
         if (packageManager) {
@@ -273,4 +278,10 @@ class PackageManagerUtils {
         return result;
     }
 }
+__decorate([
+    memoize_1.memoize
+], PackageManagerUtils.prototype, "getVersion", null);
+__decorate([
+    memoize_1.memoize
+], PackageManagerUtils.prototype, "getName", null);
 exports.PackageManagerUtils = PackageManagerUtils;

package/src/utilities/prompt.d.ts

@@ -5,4 +5,6 @@
  * 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
  */
+import type { ListChoiceOptions } from 'inquirer';
 export declare function askConfirmation(message: string, defaultResponse: boolean, noTTYResponse?: boolean): Promise<boolean>;
+export declare function askQuestion(message: string, choices: ListChoiceOptions[], defaultResponseIndex: number, noTTYResponse: null | string): Promise<string | null>;

package/src/utilities/prompt.js

@@ -30,7 +30,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.askConfirmation = void 0;
+exports.askQuestion = exports.askConfirmation = void 0;
 const tty_1 = require("./tty");
 async function askConfirmation(message, defaultResponse, noTTYResponse) {
     if (!(0, tty_1.isTTY)()) {
@@ -48,3 +48,20 @@ async function askConfirmation(message, defaultResponse, noTTYResponse) {
     return answers['confirmation'];
 }
 exports.askConfirmation = askConfirmation;
+async function askQuestion(message, choices, defaultResponseIndex, noTTYResponse) {
+    if (!(0, tty_1.isTTY)()) {
+        return noTTYResponse;
+    }
+    const question = {
+        type: 'list',
+        name: 'answer',
+        prefix: '',
+        message,
+        choices,
+        default: defaultResponseIndex,
+    };
+    const { prompt } = await Promise.resolve().then(() => __importStar(require('inquirer')));
+    const answers = await prompt([question]);
+    return answers['answer'];
+}
+exports.askQuestion = askQuestion;