fix(core): param prompts should not accept empty string for required …

…properties (#15157)

packages/nx/src/utils/params.spec.ts

@@ -1501,6 +1501,7 @@ describe('params', () => {
               'x-prompt': 'What is your name?',
             },
           },
+          required: ['name'],
         },
         {
           version: 2,
@@ -1509,7 +1510,12 @@ describe('params', () => {
       );
 
       expect(prompts).toEqual([
-        { type: 'input', name: 'name', message: 'What is your name?' },
+        {
+          type: 'input',
+          name: 'name',
+          message: 'What is your name?',
+          validate: expect.any(Function),
+        },
       ]);
     });
 
@@ -1531,7 +1537,12 @@ describe('params', () => {
       );
 
       expect(prompts).toEqual([
-        { type: 'confirm', name: 'isAwesome', message: 'Is this awesome?' },
+        {
+          type: 'confirm',
+          name: 'isAwesome',
+          message: 'Is this awesome?',
+          validate: expect.any(Function),
+        },
       ]);
     });
 
@@ -1557,6 +1568,7 @@ describe('params', () => {
           type: 'numeral',
           name: 'age',
           message: 'How old are you?',
+          validate: expect.any(Function),
         },
       ]);
     });
@@ -1589,6 +1601,7 @@ describe('params', () => {
           name: 'pets',
           message: 'What kind of pets do you have?',
           choices: ['Cat', 'Dog', 'Fish'],
+          validate: expect.any(Function),
         },
       ]);
     });
@@ -1628,6 +1641,7 @@ describe('params', () => {
             { message: 'Dog', name: 'dog' },
             { message: 'Fish', name: 'fish' },
           ],
+          validate: expect.any(Function),
         },
       ]);
     });
@@ -1668,6 +1682,7 @@ describe('params', () => {
             { message: 'Dog', name: 'dog' },
             { message: 'Fish', name: 'fish' },
           ],
+          validate: expect.any(Function),
         },
       ]);
     });
@@ -1699,6 +1714,7 @@ describe('params', () => {
             name: 'project',
             message: 'Which project?',
             choices: ['projA', 'projB'],
+            validate: expect.any(Function),
           },
         ]);
       });
@@ -1729,6 +1745,7 @@ describe('params', () => {
             name: 'projectName',
             message: 'Which project?',
             choices: ['projA', 'projB'],
+            validate: expect.any(Function),
           },
         ]);
       });
@@ -1760,6 +1777,7 @@ describe('params', () => {
             name: 'projectName',
             message: 'Which project?',
             choices: ['projA', 'projB'],
+            validate: expect.any(Function),
           },
         ]);
       });
@@ -1793,6 +1811,7 @@ describe('params', () => {
             name: 'yourProject',
             message: 'Which project?',
             choices: ['projA', 'projB'],
+            validate: expect.any(Function),
           },
         ]);
       });
@@ -1822,6 +1841,7 @@ describe('params', () => {
           name: 'name',
           message: 'What is your name?',
           choices: ['Bob', 'Joe', 'Jeff'],
+          validate: expect.any(Function),
         },
       ]);
     });
@@ -1852,6 +1872,7 @@ describe('params', () => {
           message: 'What is your name?',
           choices: ['Bob', 'Joe', 'Jeff'],
           initial: 'Joe',
+          validate: expect.any(Function),
         },
       ]);
     });
@@ -1876,7 +1897,12 @@ describe('params', () => {
       );
 
       expect(prompts).toEqual([
-        { type: 'input', name: 'name', message: 'What is your name?' },
+        {
+          type: 'input',
+          name: 'name',
+          message: 'What is your name?',
+          validate: expect.any(Function),
+        },
       ]);
     });
   });

packages/nx/src/utils/params.ts

@@ -747,13 +747,13 @@ function getGeneratorDefaults(
   return defaults;
 }
 
-interface Prompt {
+type Prompt = ConstructorParameters<typeof import('enquirer').Prompt>[0] & {
   name: string;
   type: 'input' | 'autocomplete' | 'multiselect' | 'confirm' | 'numeral';
   message: string;
   initial?: any;
   choices?: (string | { name: string; message: string })[];
-}
+};
 
 export function getPromptsForSchema(
   opts: Options,
@@ -781,6 +781,14 @@ export function getPromptsForSchema(
       }
 
       question.message = v['x-prompt'].message;
+      question.validate = (s) => {
+        try {
+          validateProperty(k, s, schema, schema.definitions || {});
+          return true;
+        } catch (e) {
+          return e.message;
+        }
+      };
 
       if (v.type === 'string' && v.enum && Array.isArray(v.enum)) {
         question.type = 'autocomplete';
@@ -796,16 +804,13 @@ export function getPromptsForSchema(
         question.type = 'autocomplete';
         question.choices = Object.keys(projectsConfigurations.projects);
       } else if (v.type === 'number' || v['x-prompt'].type == 'number') {
-        question.message = v['x-prompt'].message;
         question.type = 'numeral';
       } else if (
         v['x-prompt'].type == 'confirmation' ||
         v['x-prompt'].type == 'confirm'
       ) {
-        question.message = v['x-prompt'].message;
         question.type = 'confirm';
       } else if (v['x-prompt'].items) {
-        question.message = v['x-prompt'].message;
         question.type =
           v['x-prompt'].multiselect || v.type === 'array'
             ? 'multiselect'
@@ -822,9 +827,10 @@ export function getPromptsForSchema(
               };
             }
           });
+      } else if (v.type === 'boolean') {
+        question.type = 'confirm';
       } else {
-        question.message = v['x-prompt'].message;
-        question.type = v.type === 'boolean' ? 'confirm' : 'input';
+        question.type = 'input';
       }
       prompts.push(question);
     }