fix(@angular-devkit/schematics-cli): correctly transform numbers from prompts

alan-agius4 · clydin · commit dfd03aa7c262 · 2023-03-07T09:55:23.000-05:00
This commits ports the same logic from the `@angular/cli` (https://github.com/angular/angular-cli/blob/693d78b80de9e91bd5313353ea5c524742196e0a/packages/angular/cli/src/command-builder/schematics-command-module.ts#L183-L211) to correctly handle numbers in prompts. Closes #24817 (cherry picked from commit d15d44d)
diff --git a/packages/angular_devkit/schematics_cli/bin/schematics.ts b/packages/angular_devkit/schematics_cli/bin/schematics.ts
@@ -79,6 +79,32 @@ function _createPromptProvider(): schema.PromptProvider{
 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;
+ };
 }
 
 switch (definition.type){

-Original file line number
+Diff line change
 constvalidator=definition.validator;
 if(validator){
 question.validate=(input)=>validator(input);
++
 +// Filter allows transformation of the value prior to validation
 +question.filter=async(input)=>{
 +for(consttypeofdefinition.propertyTypes){
 +letvalue;
 +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
 +constisValid=(awaitvalidator(value))===true;
 +if(isValid){
 +returnvalue;
 +}
 +}
++
 +returninput;
 +};
+}
 switch(definition.type){