@angular-devkit/schematics-cli 18.1.0-next.1 → 18.1.0-next.2

package/bin/schematics.d.ts

@@ -4,7 +4,7 @@
  * 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
+ * found in the LICENSE file at https://angular.dev/license
  */
 import 'symbol-observable';
 import { ProcessOutput } from '@angular-devkit/core/node';
@@ -14,16 +14,3 @@ export interface MainOptions {
     stderr?: ProcessOutput;
 }
 export declare function main({ args, stdout, stderr, }: MainOptions): Promise<0 | 1>;
-/**
- * This uses a dynamic import to load a module which may be ESM.
- * CommonJS code can load ESM code via a dynamic import. Unfortunately, TypeScript
- * will currently, unconditionally downlevel dynamic import into a require call.
- * require calls cannot load ESM code and will result in a runtime error. To workaround
- * this, a Function constructor is used to prevent TypeScript from changing the dynamic import.
- * Once TypeScript provides support for keeping the dynamic import this workaround can
- * be dropped.
- *
- * @param modulePath The path of the module to load.
- * @returns A Promise that resolves to the dynamically imported module.
- */
-export declare function loadEsmModule<T>(modulePath: string | URL): Promise<T>;

package/bin/schematics.js

@@ -5,7 +5,7 @@
  * 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
+ * found in the LICENSE file at https://angular.dev/license
  */
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
@@ -35,7 +35,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.main = main;
-exports.loadEsmModule = loadEsmModule;
 // symbol polyfill must go first
 require("symbol-observable");
 const node_1 = require("@angular-devkit/core/node");
@@ -84,66 +83,82 @@ function _listSchematics(workflow, collectionName, logger) {
 }
 function _createPromptProvider() {
     return async (definitions) => {
-        const questions = definitions.map((definition) => {
-            const question = {
-                name: definition.id,
-                message: definition.message,
-                default: definition.default,
-            };
-            const validator = definition.validator;
-            if (validator) {
-                question.validate = (input) => validator(input);
-                // Filter allows transformation of the value prior to validation
-                question.filter = async (input) => {
-                    for (const type of definition.propertyTypes) {
-                        let value;
-                        switch (type) {
-                            case 'string':
-                                value = String(input);
-                                break;
-                            case 'integer':
-                            case 'number':
-                                value = Number(input);
-                                break;
-                            default:
-                                value = input;
-                                break;
-                        }
-                        // Can be a string if validation fails
-                        const isValid = (await validator(value)) === true;
-                        if (isValid) {
-                            return value;
-                        }
-                    }
-                    return input;
-                };
-            }
+        let prompts;
+        const answers = {};
+        for (const definition of definitions) {
+            // Only load prompt package if needed
+            prompts ??= await Promise.resolve().then(() => __importStar(require('@inquirer/prompts')));
             switch (definition.type) {
                 case 'confirmation':
-                    return { ...question, type: 'confirm' };
+                    answers[definition.id] = await prompts.confirm({
+                        message: definition.message,
+                        default: definition.default,
+                    });
+                    break;
                 case 'list':
-                    return {
-                        ...question,
-                        type: definition.multiselect ? 'checkbox' : 'list',
-                        choices: definition.items &&
-                            definition.items.map((item) => {
-                                if (typeof item == 'string') {
-                                    return item;
+                    if (!definition.items?.length) {
+                        continue;
+                    }
+                    const choices = definition.items?.map((item) => {
+                        return typeof item == 'string'
+                            ? {
+                                name: item,
+                                value: item,
+                            }
+                            : {
+                                name: item.label,
+                                value: item.value,
+                            };
+                    });
+                    answers[definition.id] = await (definition.multiselect ? prompts.checkbox : prompts.select)({
+                        message: definition.message,
+                        default: definition.default,
+                        choices,
+                    });
+                    break;
+                case 'input':
+                    let finalValue;
+                    answers[definition.id] = await prompts.input({
+                        message: definition.message,
+                        default: definition.default,
+                        async validate(value) {
+                            if (definition.validator === undefined) {
+                                return true;
+                            }
+                            let lastValidation = false;
+                            for (const type of definition.propertyTypes) {
+                                let potential;
+                                switch (type) {
+                                    case 'string':
+                                        potential = String(value);
+                                        break;
+                                    case 'integer':
+                                    case 'number':
+                                        potential = Number(value);
+                                        break;
+                                    default:
+                                        potential = value;
+                                        break;
                                 }
-                                else {
-                                    return {
-                                        name: item.label,
-                                        value: item.value,
-                                    };
+                                lastValidation = await definition.validator(potential);
+                                // Can be a string if validation fails
+                                if (lastValidation === true) {
+                                    finalValue = potential;
+                                    return true;
                                 }
-                            }),
-                    };
-                default:
-                    return { ...question, type: definition.type };
+                            }
+                            return lastValidation;
+                        },
+                    });
+                    // Use validated value if present.
+                    // This ensures the correct type is inserted into the final schema options.
+                    if (finalValue !== undefined) {
+                        answers[definition.id] = finalValue;
+                    }
+                    break;
             }
-        });
-        const { default: inquirer } = await loadEsmModule('inquirer');
-        return inquirer.prompt(questions);
+        }
+        return answers;
     };
 }
 function findUp(names, from) {
@@ -431,23 +446,3 @@ if (require.main === module) {
         throw e;
     });
 }
-/**
- * Lazily compiled dynamic import loader function.
- */
-let load;
-/**
- * This uses a dynamic import to load a module which may be ESM.
- * CommonJS code can load ESM code via a dynamic import. Unfortunately, TypeScript
- * will currently, unconditionally downlevel dynamic import into a require call.
- * require calls cannot load ESM code and will result in a runtime error. To workaround
- * this, a Function constructor is used to prevent TypeScript from changing the dynamic import.
- * Once TypeScript provides support for keeping the dynamic import this workaround can
- * be dropped.
- *
- * @param modulePath The path of the module to load.
- * @returns A Promise that resolves to the dynamically imported module.
- */
-function loadEsmModule(modulePath) {
-    load ??= new Function('modulePath', `return import(modulePath);`);
-    return load(modulePath);
-}

package/blank/factory.d.ts

@@ -3,7 +3,7 @@
  * 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
+ * found in the LICENSE file at https://angular.dev/license
  */
 import { Rule } from '@angular-devkit/schematics';
 import { Schema } from './schema';

package/blank/factory.js

@@ -4,7 +4,7 @@
  * 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
+ * found in the LICENSE file at https://angular.dev/license
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = default_1;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@angular-devkit/schematics-cli",
-  "version": "18.1.0-next.1",
+  "version": "18.1.0-next.2",
   "description": "Angular Schematics - CLI",
   "homepage": "https://github.com/angular/angular-cli",
   "bin": {
@@ -21,13 +21,14 @@
   ],
   "schematics": "./collection.json",
   "dependencies": {
-    "@angular-devkit/core": "18.1.0-next.1",
-    "@angular-devkit/schematics": "18.1.0-next.1",
+    "@angular-devkit/core": "18.1.0-next.2",
+    "@angular-devkit/schematics": "18.1.0-next.2",
+    "@inquirer/prompts": "5.0.5",
     "ansi-colors": "4.1.3",
-    "inquirer": "9.2.23",
     "symbol-observable": "4.0.0",
     "yargs-parser": "21.1.1"
   },
+  "packageManager": "yarn@4.2.2",
   "repository": {
     "type": "git",
     "url": "https://github.com/angular/angular-cli.git"
@@ -41,5 +42,13 @@
   "license": "MIT",
   "bugs": {
     "url": "https://github.com/angular/angular-cli/issues"
+  },
+  "dependenciesMeta": {
+    "esbuild": {
+      "built": true
+    },
+    "puppeteer": {
+      "built": true
+    }
   }
 }

package/schematic/factory.d.ts

@@ -3,7 +3,7 @@
  * 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
+ * found in the LICENSE file at https://angular.dev/license
  */
 import { Rule } from '@angular-devkit/schematics';
 import { Schema } from './schema';

package/schematic/factory.js

@@ -4,7 +4,7 @@
  * 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
+ * found in the LICENSE file at https://angular.dev/license
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = default_1;