@pnp/cli-microsoft365 7.2.0-beta.f440e15 → 7.2.0

package/dist/Auth.js

@@ -341,7 +341,7 @@ export class Auth {
         const cli = Cli.getInstance();
         cli.spinner.text = response.message;
         cli.spinner.spinner = {
-            frames: ['🌶️']
+            frames: ['🌶️ ']
         };
         // don't show spinner if running tests
         /* c8 ignore next 3 */

package/dist/Command.js

@@ -78,22 +78,22 @@ class Command {
         const shouldPrompt = Cli.getInstance().getSettingWithDefaultValue(settingsNames.prompt, true);
         let prompted = false;
         for (let i = 0; i < command.options.length; i++) {
-            if (!command.options[i].required ||
-                typeof args.options[command.options[i].name] !== 'undefined') {
+            const optionInfo = command.options[i];
+            if (!optionInfo.required ||
+                typeof args.options[optionInfo.name] !== 'undefined') {
                 continue;
             }
             if (!shouldPrompt) {
-                return `Required option ${command.options[i].name} not specified`;
+                return `Required option ${optionInfo.name} not specified`;
             }
             if (!prompted) {
                 prompted = true;
                 Cli.error('🌶️  Provide values for the following parameters:');
             }
-            const missingRequireOptionValue = await prompt.forInput({
-                name: 'missingRequireOptionValue',
-                message: `${command.options[i].name}: `
-            }).then(result => result.missingRequireOptionValue);
-            args.options[command.options[i].name] = missingRequireOptionValue;
+            const answer = optionInfo.autocomplete !== undefined
+                ? await prompt.forSelection({ message: `${optionInfo.name}: `, choices: optionInfo.autocomplete.map((choice) => { return { name: choice, value: choice }; }) })
+                : await prompt.forInput({ message: `${optionInfo.name}: ` });
+            args.options[optionInfo.name] = answer;
         }
         if (prompted) {
             Cli.error('');
@@ -130,29 +130,15 @@ class Command {
     }
     async promptForOptionSetNameAndValue(args, optionSet) {
         Cli.error(`🌶️  Please specify one of the following options:`);
-        const resultOptionName = await prompt.forInput({
-            type: 'list',
-            name: 'missingRequiredOptionName',
-            message: `Option to use:`,
-            choices: optionSet.options
-        });
-        const missingRequiredOptionName = resultOptionName.missingRequiredOptionName;
-        const resultOptionValue = await prompt.forInput({
-            name: 'missingRequiredOptionValue',
-            message: `${missingRequiredOptionName}:`
-        });
-        args.options[missingRequiredOptionName] = resultOptionValue.missingRequiredOptionValue;
+        const selectedOptionName = await prompt.forSelection({ message: `Option to use:`, choices: optionSet.options.map((choice) => { return { name: choice, value: choice }; }) });
+        const optionValue = await prompt.forInput({ message: `${selectedOptionName}:` });
+        args.options[selectedOptionName] = optionValue;
         Cli.error('');
     }
     async promptForSpecificOption(args, commonOptions) {
         Cli.error(`🌶️  Multiple options for an option set specified. Please specify the correct option that you wish to use.`);
-        const requiredOptionNameResult = await prompt.forInput({
-            type: 'list',
-            name: 'missingRequiredOptionName',
-            message: `Option to use:`,
-            choices: commonOptions
-        });
-        commonOptions.filter(y => y !== requiredOptionNameResult.missingRequiredOptionName).map(optionName => args.options[optionName] = undefined);
+        const selectedOptionName = await prompt.forSelection({ message: `Option to use:`, choices: commonOptions.map((choice) => { return { name: choice, value: choice }; }) });
+        commonOptions.filter(y => y !== selectedOptionName).map(optionName => args.options[optionName] = undefined);
         Cli.error('');
     }
     async validateOutput(args) {
@@ -474,7 +460,11 @@ class Command {
         if (logStatement && logStatement.length > 0 && !options.query) {
             logStatement.map(l => {
                 for (const x of Object.keys(l)) {
-                    if (typeof l[x] === 'object') {
+                    // Remove object-properties from the output
+                    // Excludes null from the check, because null is an object in JavaScript.  
+                    //  Properties with null values are not removed from the output, 
+                    //  as this can cause missing columns
+                    if (typeof l[x] === 'object' && l[x] !== null) {
                         delete l[x];
                     }
                 }

package/dist/api.js

@@ -1,13 +1,11 @@
 import { Cli } from "./cli/Cli.js";
-import path from 'path';
-export function executeCommand(commandName, options, listener) {
+export async function executeCommand(commandName, options, listener) {
     const cli = Cli.getInstance();
-    cli.commandsFolder = path.join(__dirname, 'm365');
-    cli.commands = [];
-    cli.loadCommandFromArgs(commandName.split(' '));
-    if (cli.commands.length !== 1) {
+    cli.loadAllCommandsInfo();
+    await cli.loadCommandFromArgs(commandName.split(' '));
+    if (!cli.commandToExecute) {
         return Promise.reject(`Command not found: ${commandName}`);
     }
-    return Cli.executeCommandWithOutput(cli.commands[0].command, { options: options ?? {} }, listener);
+    return Cli.executeCommandWithOutput(cli.commandToExecute.command, { options: options ?? {} }, listener);
 }
 //# sourceMappingURL=api.js.map

package/dist/chili/chili.js

@@ -1,5 +1,4 @@
 import fs from 'fs';
-import inquirer from 'inquirer';
 import ora from 'ora';
 import path from 'path';
 import url from 'url';
@@ -7,6 +6,7 @@ import { Cli } from '../cli/Cli.js';
 import request from '../request.js';
 import { settingsNames } from '../settingsNames.js';
 import { md } from '../utils/md.js';
+import { prompt } from '../utils/prompt.js';
 const __dirname = url.fileURLToPath(new URL('.', import.meta.url));
 const mendableApiKey = 'd3313d54-6f8e-40e0-90d3-4095019d4be7';
 let showHelp = false;
@@ -79,12 +79,7 @@ async function startConversation(args) {
     await runConversationTurn(conversationId, initialPrompt);
 }
 async function promptForPrompt() {
-    const answer = await inquirer.prompt([{
-            type: 'input',
-            name: 'prompt',
-            message: '🌶️  How can I help you?'
-        }]);
-    return answer.prompt;
+    return await prompt.forInput({ message: '🌶️  How can I help you?' });
 }
 async function runConversationTurn(conversationId, question) {
     console.log('');
@@ -120,60 +115,54 @@ async function runConversationTurn(conversationId, question) {
         }
         console.log('');
     }
-    const result = await inquirer.prompt([{
-            type: 'list',
-            name: 'chat',
-            message: 'What would you like to do next?',
-            choices: [
-                {
-                    name: '📝 I want to know more',
-                    value: 'ask'
-                },
-                {
-                    name: '👋 I know enough. Thanks!',
-                    value: 'end'
-                },
-                {
-                    name: '🔄 I want to ask about something else',
-                    value: 'new'
-                }
-            ]
-        }]);
-    switch (result.chat) {
+    const choices = [
+        {
+            name: '📝 I want to know more',
+            value: 'ask'
+        },
+        {
+            name: '👋 I know enough. Thanks!',
+            value: 'end'
+        },
+        {
+            name: '🔄 I want to ask about something else',
+            value: 'new'
+        }
+    ];
+    const result = await prompt.forSelection({ message: 'What would you like to do next?', choices });
+    switch (result) {
         case 'ask':
             const prompt = await promptForPrompt();
-            return await runConversationTurn(conversationId, prompt);
+            await runConversationTurn(conversationId, prompt);
+            break;
         case 'end':
             await endConversation(conversationId);
             console.log('');
             console.log('🌶️   Bye!');
-            return;
+            break;
         case 'new':
             initialPrompt = '';
-            return startConversation([]);
+            await startConversation([]);
+            break;
     }
 }
 async function rateResponse(messageId) {
-    const result = await inquirer.prompt([{
-            type: 'list',
-            name: 'rating',
-            message: 'Was this helpful?',
-            choices: [
-                {
-                    name: '👍 Yes',
-                    value: 1
-                },
-                {
-                    name: '👎 No',
-                    value: -1
-                },
-                {
-                    name: '🤔 Not sure/skip',
-                    value: 0
-                }
-            ]
-        }]);
-    if (result.rating === 0) {
+    const choices = [
+        {
+            name: '👍 Yes',
+            value: 1
+        },
+        {
+            name: '👎 No',
+            value: -1
+        },
+        {
+            name: '🤔 Not sure/skip',
+            value: 0
+        }
+    ];
+    const rating = await prompt.forSelection({ message: 'Was this helpful?', choices });
+    if (rating === 0) {
         return;
     }
     console.log('Thanks for letting us know! 😊');
@@ -192,7 +181,7 @@ async function rateResponse(messageId) {
             // eslint-disable-next-line camelcase
             message_id: messageId,
             // eslint-disable-next-line camelcase
-            rating_value: result.rating
+            rating_value: rating
         }
     };
     const spinner = ora('Sending rating...');