fix(core): generate should handle multiselect shorthand

nrwl · Oct 23, 2023 · 6a68dc1 · 6a68dc1
1 parent f619c80
commit 6a68dc1
Show file tree

Hide file tree

Showing 2 changed files with 55 additions and 4 deletions.
diff --git a/packages/nx/src/utils/params.spec.ts b/packages/nx/src/utils/params.spec.ts
@@ -1743,6 +1743,44 @@ describe('params', () => {
       ]);
     });
 
+    it('should use a multiselect if type is array and x-prompt uses shorthand', () => {
+      const prompts = getPromptsForSchema(
+        {},
+        {
+          properties: {
+            pets: {
+              type: 'array',
+              'x-prompt': 'What kind of pets do you have?',
+              items: {
+                enum: ['cat', 'dog', 'fish'],
+              },
+            },
+          },
+        },
+        {
+          version: 2,
+          projects: {},
+        }
+      );
+
+      expect(prompts).toMatchInlineSnapshot(`
+        [
+          {
+            "choices": [
+              "cat",
+              "dog",
+              "fish",
+            ],
+            "limit": 10,
+            "message": "What kind of pets do you have?",
+            "name": "pets",
+            "type": "multiselect",
+            "validate": [Function],
+          },
+        ]
+      `);
+    });
+
     describe('Project prompts', () => {
       it('should use an autocomplete prompt for a property named project', () => {
         const prompts = getPromptsForSchema(

diff --git a/packages/nx/src/utils/params.ts b/packages/nx/src/utils/params.ts
@@ -785,10 +785,23 @@ export function getPromptsForSchema(
       // Normalize x-prompt
       if (typeof v['x-prompt'] === 'string') {
         const message = v['x-prompt'];
-        v['x-prompt'] = {
-          type: v.type === 'boolean' ? 'confirm' : 'input',
-          message,
-        };
+        if (v.type === 'boolean') {
+          v['x-prompt'] = {
+            type: 'confirm',
+            message,
+          };
+        } else if (v.type === 'array' && v.items?.enum) {
+          v['x-prompt'] = {
+            type: 'multiselect',
+            items: v.items.enum,
+            message,
+          };
+        } else {
+          v['x-prompt'] = {
+            type: 'input',
+            message,
+          };
+        }
       }
 
       question.message = v['x-prompt'].message;