@pnp/cli-microsoft365 7.11.0-beta.c513557 → 8.0.0-beta.630e741

package/dist/m365/entra/commands/m365group/m365group-user-list.js

@@ -32,7 +32,7 @@ class EntraM365GroupUserListCommand extends GraphCommand {
         await this.showDeprecationWarning(logger, aadCommands.M365GROUP_USER_LIST, commands.M365GROUP_USER_LIST);
         try {
             if (args.options.role === 'Guest') {
-                this.warn(logger, `Value 'Guest' for the option role is deprecated. Use --filter "userType eq 'Guest'" instead.`);
+                await this.warn(logger, `Value 'Guest' for the option role is deprecated. Use --filter "userType eq 'Guest'" instead.`);
             }
             const groupId = await this.getGroupId(args.options, logger);
             const isUnifiedGroup = await entraGroup.isUnifiedGroup(groupId);

package/dist/m365/external/commands/connection/connection-doctor.js

@@ -5,11 +5,10 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _ExternalConnectionDoctorCommand_instances, _a, _ExternalConnectionDoctorCommand_initOptions, _ExternalConnectionDoctorCommand_initValidators;
 import os from 'os';
-import { cli } from '../../../../cli/cli.js';
 import request from '../../../../request.js';
-import { settingsNames } from '../../../../settingsNames.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 import commands from '../../commands.js';
+import { CheckStatus, formatting } from '../../../../utils/formatting.js';
 class ExternalConnectionDoctorCommand extends GraphCommand {
     get name() {
         return commands.CONNECTION_DOCTOR;
@@ -28,9 +27,7 @@ class ExternalConnectionDoctorCommand extends GraphCommand {
         const ux = args.options.ux ?? 'all';
         const output = args.options.output;
         this.checksStatus = [];
-        const showSpinner = cli.getSettingWithDefaultValue(settingsNames.showSpinner, true) &&
-            output === 'text' &&
-            typeof global.it === 'undefined';
+        const show = output === 'text';
         let checks = [
             {
                 id: 'loadExternalConnection',
@@ -112,19 +109,12 @@ class ExternalConnectionDoctorCommand extends GraphCommand {
         checks = checks.filter((check, index, self) => self.findIndex(c => c.id === check.id) === index);
         for (const check of checks) {
             if (this.debug) {
-                logger.logToStderr(`Running check ${check.id}...`);
-            }
-            // don't show spinner if running tests
-            /* c8 ignore next 3 */
-            if (showSpinner) {
-                cli.spinner.start(check.text);
+                await logger.logToStderr(`Running check ${check.id}...`);
             }
             // only automated checks have functions
             if (!check.fn) {
-                // don't show spinner if running tests
-                /* c8 ignore next 3 */
-                if (showSpinner) {
-                    cli.spinner.info(`${check.text} (manual)`);
+                if (show) {
+                    await logger.log(formatting.getStatus(CheckStatus.Information, `${check.text} (manual)`));
                 }
                 this.checksStatus.push({
                     ...check,
@@ -135,23 +125,19 @@ class ExternalConnectionDoctorCommand extends GraphCommand {
             const result = await check.fn.bind(this)(check.id, args);
             this.checksStatus.push({ ...check, ...result });
             if (result.status === 'passed') {
-                // don't show spinner if running tests
-                /* c8 ignore next 3 */
-                if (showSpinner) {
-                    cli.spinner.succeed();
+                if (show) {
+                    await logger.log(formatting.getStatus(CheckStatus.Success, check.text));
                 }
                 continue;
             }
             if (result.status === 'failed') {
-                // don't show spinner if running tests
-                /* c8 ignore next 9 */
-                if (showSpinner) {
+                if (show) {
                     const message = `${check.text}: ${result.errorMessage}`;
                     if (check.type === 'required') {
-                        cli.spinner.fail(message);
+                        await logger.log(formatting.getStatus(CheckStatus.Failure, message));
                     }
                     else {
-                        cli.spinner.warn(message);
+                        await logger.log(formatting.getStatus(CheckStatus.Warning, check.text));
                     }
                 }
                 if (result.shouldStop) {
@@ -159,7 +145,7 @@ class ExternalConnectionDoctorCommand extends GraphCommand {
                 }
             }
         }
-        if (output === 'text' || output === 'none') {
+        if (show || output === 'none') {
             return;
         }
         this.checksStatus.forEach(s => {

package/dist/m365/external/commands/connection/connection-schema-add.js

@@ -39,19 +39,19 @@ class ExternalConnectionSchemaAddCommand extends GraphCommand {
         try {
             const res = await request.patch(requestOptions);
             const location = res.headers.location;
-            logger.log(location);
+            await logger.log(location);
             if (!args.options.wait) {
                 return;
             }
             let status;
             do {
                 if (this.verbose) {
-                    logger.logToStderr(`Waiting 60 seconds...`);
+                    await logger.logToStderr(`Waiting 60 seconds...`);
                 }
                 // waiting 60s before polling as recommended by Microsoft
                 await new Promise(resolve => setTimeout(resolve, 60000));
                 if (this.debug) {
-                    logger.logToStderr(`Checking schema operation status...`);
+                    await logger.logToStderr(`Checking schema operation status...`);
                 }
                 const operation = await request.get({
                     url: location,
@@ -62,7 +62,7 @@ class ExternalConnectionSchemaAddCommand extends GraphCommand {
                 });
                 status = operation.status;
                 if (this.verbose) {
-                    logger.logToStderr(`Schema operation status: ${status}`);
+                    await logger.logToStderr(`Schema operation status: ${status}`);
                 }
                 if (status === 'failed') {
                     throw `Provisioning schema failed: ${operation.error?.message}`;

package/dist/m365/file/commands/file-copy.js

@@ -31,7 +31,7 @@ class FileCopyCommand extends GraphCommand {
             const sourcePath = this.getAbsoluteUrl(webUrl, sourceUrl);
             const destinationPath = this.getAbsoluteUrl(webUrl, targetUrl);
             if (this.verbose) {
-                logger.logToStderr(`Copying file '${sourcePath}' to '${destinationPath}'...`);
+                await logger.logToStderr(`Copying file '${sourcePath}' to '${destinationPath}'...`);
             }
             const copyUrl = await this.getCopyUrl(args.options, sourcePath, logger);
             const { targetDriveId, targetItemId } = await this.getTargetDriveAndItemId(webUrl, targetUrl, logger, verbose);
@@ -83,7 +83,7 @@ class FileCopyCommand extends GraphCommand {
     }
     async getDocumentLibrary(siteId, folderUrl, folderUrlFromUser, logger) {
         if (this.verbose) {
-            logger.logToStderr(`Getting document library...`);
+            await logger.logToStderr(`Getting document library...`);
         }
         const requestOptions = {
             url: `${this.resource}/v1.0/sites/${siteId}/drives?$select=webUrl,id`,
@@ -110,7 +110,7 @@ class FileCopyCommand extends GraphCommand {
     }
     async getStartingFolderId(documentLibrary, folderUrl, logger) {
         if (this.verbose) {
-            logger.logToStderr(`Getting starting folder id...`);
+            await logger.logToStderr(`Getting starting folder id...`);
         }
         const documentLibraryRelativeFolderUrl = folderUrl.href.replace(new RegExp(`${documentLibrary.webUrl}`, 'i'), '').replace(/\/+$/, '');
         const requestOptions = {

package/dist/m365/flow/commands/flow-list.js

@@ -3,7 +3,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
-var _FlowListCommand_instances, _FlowListCommand_initTelemetry, _FlowListCommand_initOptions, _FlowListCommand_initValidators;
+var _FlowListCommand_instances, _FlowListCommand_initTelemetry, _FlowListCommand_initOptions, _FlowListCommand_initValidators, _FlowListCommand_initTypes;
 import { formatting } from '../../../utils/formatting.js';
 import { odata } from '../../../utils/odata.js';
 import PowerAutomateCommand from '../../base/PowerAutomateCommand.js';
@@ -13,7 +13,7 @@ class FlowListCommand extends PowerAutomateCommand {
         return commands.LIST;
     }
     get description() {
-        return 'Lists Microsoft Flows in the given environment';
+        return 'Lists Power Automate flows in the given environment';
     }
     defaultProperties() {
         return ['name', 'displayName'];
@@ -25,8 +25,12 @@ class FlowListCommand extends PowerAutomateCommand {
         __classPrivateFieldGet(this, _FlowListCommand_instances, "m", _FlowListCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _FlowListCommand_instances, "m", _FlowListCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _FlowListCommand_instances, "m", _FlowListCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _FlowListCommand_instances, "m", _FlowListCommand_initTypes).call(this);
     }
     async commandAction(logger, args) {
+        if (this.verbose) {
+            await logger.logToStderr(`Getting Power Automate flows${args.options.asAdmin && ' as admin'} in environment '${args.options.environmentName}'...`);
+        }
         try {
             const { environmentName, asAdmin, sharingStatus, includeSolutions } = args.options;
             let items = [];
@@ -50,34 +54,25 @@ class FlowListCommand extends PowerAutomateCommand {
             }
             // Remove duplicates
             items = items.filter((flow, index, self) => index === self.findIndex(f => f.id === flow.id));
-            if (items.length > 0) {
-                items.forEach(i => {
-                    i.displayName = i.properties.displayName;
+            if (args.options.output && args.options.output !== 'json') {
+                items.forEach(flow => {
+                    flow.displayName = flow.properties.displayName;
                 });
-                await logger.log(items);
-            }
-            else {
-                if (this.verbose) {
-                    await logger.logToStderr('No Flows found');
-                }
             }
+            await logger.log(items);
         }
         catch (err) {
             this.handleRejectedODataJsonPromise(err);
         }
     }
     getApiUrl(environmentName, asAdmin, includeSolutionFlows, filter) {
-        let url = `${this.resource}/providers/Microsoft.ProcessSimple${asAdmin ? '/scopes/admin' : ''}/environments/${formatting.encodeQueryParameter(environmentName)}/flows?api-version=2016-11-01`;
-        if (filter === 'personal') {
-            url += `&$filter=search('personal')`;
-        }
-        else if (filter === 'team') {
-            url += `&$filter=search('team')`;
-        }
-        if (includeSolutionFlows) {
-            url += '&include=includeSolutionCloudFlows';
-        }
-        return url;
+        const baseEndpoint = `${this.resource}/providers/Microsoft.ProcessSimple`;
+        const environmentSegment = `/environments/${formatting.encodeQueryParameter(environmentName)}`;
+        const adminSegment = `/scopes/admin${environmentSegment}/v2`;
+        const flowsEndpoint = '/flows?api-version=2016-11-01';
+        const filterQuery = filter === 'personal' || filter === 'team' ? `&$filter=search('${filter}')` : '';
+        const includeQuery = includeSolutionFlows ? '&include=includeSolutionCloudFlows' : '';
+        return `${baseEndpoint}${asAdmin ? adminSegment : environmentSegment}${flowsEndpoint}${filterQuery}${includeQuery}`;
     }
 }
 _FlowListCommand_instances = new WeakSet(), _FlowListCommand_initTelemetry = function _FlowListCommand_initTelemetry() {
@@ -105,10 +100,13 @@ _FlowListCommand_instances = new WeakSet(), _FlowListCommand_initTelemetry = fun
             return `The options asAdmin and sharingStatus cannot be specified together.`;
         }
         if (args.options.sharingStatus && !this.allowedSharingStatuses.some(status => status === args.options.sharingStatus)) {
-            return `${args.options.sharingStatus} is not a valid sharing status. Allowed values are: ${this.allowedSharingStatuses.join(',')}`;
+            return `${args.options.sharingStatus} is not a valid sharing status. Allowed values are: ${this.allowedSharingStatuses.join(', ')}`;
         }
         return true;
     });
+}, _FlowListCommand_initTypes = function _FlowListCommand_initTypes() {
+    this.types.string.push('environmentName', 'sharingStatus');
+    this.types.boolean.push('includeSolutions', 'asAdmin');
 };
 export default new FlowListCommand();
 //# sourceMappingURL=flow-list.js.map

package/dist/m365/pa/commands/app/app-export.js

@@ -128,7 +128,7 @@ class PaAppExportCommand extends PowerPlatformCommand {
                 link = response.properties.packageLink.value;
             }
             else {
-                setTimeout(this.pollingInterval);
+                await setTimeout(this.pollingInterval);
             }
             if (this.verbose) {
                 await logger.logToStderr(`Current status of the get package link: ${status}`);

package/dist/m365/pa/commands/app/app-owner-set.js

@@ -26,7 +26,7 @@ class PaAppOwnerSetCommand extends PowerAppsCommand {
     }
     async commandAction(logger, args) {
         if (this.verbose) {
-            logger.logToStderr(`Setting new owner ${args.options.userId || args.options.userName} for Power Apps app ${args.options.appName}...`);
+            await logger.logToStderr(`Setting new owner ${args.options.userId || args.options.userName} for Power Apps app ${args.options.appName}...`);
         }
         try {
             const userId = await this.getUserId(args.options);

package/dist/m365/pp/commands/solution/solution-publish.js

@@ -50,7 +50,7 @@ class PpSolutionPublishCommand extends PowerPlatformCommand {
                 await request.post(requestOptions);
             }
             else {
-                request.post(requestOptions);
+                void request.post(requestOptions);
             }
         }
         catch (err) {

package/dist/m365/purview/commands/threatassessment/threatassessment-list.js

@@ -26,7 +26,7 @@ class PurviewThreatAssessmentListCommand extends GraphCommand {
     }
     async commandAction(logger, args) {
         if (this.verbose) {
-            logger.logToStderr('Retrieving a list of threat assessments');
+            await logger.logToStderr('Retrieving a list of threat assessments');
         }
         try {
             const filter = this.getFilterQuery(args.options);

package/dist/m365/spfx/commands/project/base-project-command.js

@@ -4,6 +4,7 @@ import { formatting } from '../../../../utils/formatting.js';
 import { fsUtil } from '../../../../utils/fsUtil.js';
 import AnonymousCommand from "../../../base/AnonymousCommand.js";
 import { ScssFile, TsFile } from "./project-model/index.js";
+import { CommandError } from '../../../../Command.js';
 export class BaseProjectCommand extends AnonymousCommand {
     constructor() {
         super(...arguments);
@@ -31,105 +32,17 @@ export class BaseProjectCommand extends AnonymousCommand {
             }
             catch { }
         }
-        const configJsonPath = path.join(projectRootPath, 'config/config.json');
-        if (fs.existsSync(configJsonPath)) {
-            try {
-                const source = formatting.removeSingleLineComments(fs.readFileSync(configJsonPath, 'utf-8'));
-                project.configJson = JSON.parse(source);
-                project.configJson.source = source;
-            }
-            catch { }
-        }
-        const copyAssetsJsonPath = path.join(projectRootPath, 'config/copy-assets.json');
-        if (fs.existsSync(copyAssetsJsonPath)) {
-            try {
-                const source = formatting.removeSingleLineComments(fs.readFileSync(copyAssetsJsonPath, 'utf-8'));
-                project.copyAssetsJson = JSON.parse(source);
-                project.copyAssetsJson.source = source;
-            }
-            catch { }
-        }
-        const deployAzureStorageJsonPath = path.join(projectRootPath, 'config/deploy-azure-storage.json');
-        if (fs.existsSync(deployAzureStorageJsonPath)) {
-            try {
-                const source = formatting.removeSingleLineComments(fs.readFileSync(deployAzureStorageJsonPath, 'utf-8'));
-                project.deployAzureStorageJson = JSON.parse(source);
-                project.deployAzureStorageJson.source = source;
-            }
-            catch { }
-        }
-        const packageJsonPath = path.join(projectRootPath, 'package.json');
-        if (fs.existsSync(packageJsonPath)) {
-            try {
-                const source = formatting.removeSingleLineComments(fs.readFileSync(packageJsonPath, 'utf-8'));
-                project.packageJson = JSON.parse(source);
-                project.packageJson.source = source;
-            }
-            catch { }
-        }
-        const packageSolutionJsonPath = path.join(projectRootPath, 'config/package-solution.json');
-        if (fs.existsSync(packageSolutionJsonPath)) {
-            try {
-                const source = formatting.removeSingleLineComments(fs.readFileSync(packageSolutionJsonPath, 'utf-8'));
-                project.packageSolutionJson = JSON.parse(source);
-                project.packageSolutionJson.source = source;
-            }
-            catch { }
-        }
-        const serveJsonPath = path.join(projectRootPath, 'config/serve.json');
-        if (fs.existsSync(serveJsonPath)) {
-            try {
-                const source = formatting.removeSingleLineComments(fs.readFileSync(serveJsonPath, 'utf-8'));
-                project.serveJson = JSON.parse(source);
-                project.serveJson.source = source;
-            }
-            catch { }
-        }
-        const tsConfigJsonPath = path.join(projectRootPath, 'tsconfig.json');
-        if (fs.existsSync(tsConfigJsonPath)) {
-            try {
-                const source = formatting.removeSingleLineComments(fs.readFileSync(tsConfigJsonPath, 'utf-8'));
-                project.tsConfigJson = JSON.parse(source);
-                project.tsConfigJson.source = source;
-            }
-            catch { }
-        }
-        const tsLintJsonPath = path.join(projectRootPath, 'config/tslint.json');
-        if (fs.existsSync(tsLintJsonPath)) {
-            try {
-                const source = formatting.removeSingleLineComments(fs.readFileSync(tsLintJsonPath, 'utf-8'));
-                project.tsLintJson = JSON.parse(source);
-                project.tsLintJson.source = source;
-            }
-            catch { }
-        }
-        const tsLintJsonRootPath = path.join(projectRootPath, 'tslint.json');
-        if (fs.existsSync(tsLintJsonRootPath)) {
-            try {
-                const source = formatting.removeSingleLineComments(fs.readFileSync(tsLintJsonRootPath, 'utf-8'));
-                project.tsLintJsonRoot = JSON.parse(source);
-                project.tsLintJsonRoot.source = source;
-            }
-            catch { }
-        }
-        const writeManifestJsonPath = path.join(projectRootPath, 'config/write-manifests.json');
-        if (fs.existsSync(writeManifestJsonPath)) {
-            try {
-                const source = formatting.removeSingleLineComments(fs.readFileSync(writeManifestJsonPath, 'utf-8'));
-                project.writeManifestsJson = JSON.parse(source);
-                project.writeManifestsJson.source = source;
-            }
-            catch { }
-        }
-        const yoRcJsonPath = path.join(projectRootPath, '.yo-rc.json');
-        if (fs.existsSync(yoRcJsonPath)) {
-            try {
-                const source = formatting.removeSingleLineComments(fs.readFileSync(yoRcJsonPath, 'utf-8'));
-                project.yoRcJson = JSON.parse(source);
-                project.yoRcJson.source = source;
-            }
-            catch { }
-        }
+        this.readAndParseJsonFile(path.join(projectRootPath, 'config', 'config.json'), project, 'configJson');
+        this.readAndParseJsonFile(path.join(projectRootPath, 'config', 'copy-assets.json'), project, 'copyAssetsJson');
+        this.readAndParseJsonFile(path.join(projectRootPath, 'config', 'deploy-azure-storage.json'), project, 'deployAzureStorageJson');
+        this.readAndParseJsonFile(path.join(projectRootPath, 'package.json'), project, 'packageJson');
+        this.readAndParseJsonFile(path.join(projectRootPath, 'config', 'package-solution.json'), project, 'packageSolutionJson');
+        this.readAndParseJsonFile(path.join(projectRootPath, 'config', 'serve.json'), project, 'serveJson');
+        this.readAndParseJsonFile(path.join(projectRootPath, 'tsconfig.json'), project, 'tsConfigJson');
+        this.readAndParseJsonFile(path.join(projectRootPath, 'config', 'tslint.json'), project, 'tsLintJson');
+        this.readAndParseJsonFile(path.join(projectRootPath, 'tslint.json'), project, 'tsLintJsonRoot');
+        this.readAndParseJsonFile(path.join(projectRootPath, 'config', 'write-manifests.json'), project, 'writeManifestsJson');
+        this.readAndParseJsonFile(path.join(projectRootPath, '.yo-rc.json'), project, 'yoRcJson');
         const gulpfileJsPath = path.join(projectRootPath, 'gulpfile.js');
         if (fs.existsSync(gulpfileJsPath)) {
             project.gulpfileJs = {
@@ -141,33 +54,9 @@ export class BaseProjectCommand extends AnonymousCommand {
             project.esLintRcJs = new TsFile(esLintRcJsPath);
         }
         project.vsCode = {};
-        const vsCodeSettingsPath = path.join(projectRootPath, '.vscode', 'settings.json');
-        if (fs.existsSync(vsCodeSettingsPath)) {
-            try {
-                const source = formatting.removeSingleLineComments(fs.readFileSync(vsCodeSettingsPath, 'utf-8'));
-                project.vsCode.settingsJson = JSON.parse(source);
-                project.vsCode.settingsJson.source = source;
-            }
-            catch { }
-        }
-        const vsCodeExtensionsPath = path.join(projectRootPath, '.vscode', 'extensions.json');
-        if (fs.existsSync(vsCodeExtensionsPath)) {
-            try {
-                const source = formatting.removeSingleLineComments(fs.readFileSync(vsCodeExtensionsPath, 'utf-8'));
-                project.vsCode.extensionsJson = JSON.parse(source);
-                project.vsCode.extensionsJson.source = source;
-            }
-            catch { }
-        }
-        const vsCodeLaunchPath = path.join(projectRootPath, '.vscode', 'launch.json');
-        if (fs.existsSync(vsCodeLaunchPath)) {
-            try {
-                const source = formatting.removeSingleLineComments(fs.readFileSync(vsCodeLaunchPath, 'utf-8'));
-                project.vsCode.launchJson = JSON.parse(source);
-                project.vsCode.launchJson.source = source;
-            }
-            catch { }
-        }
+        this.readAndParseJsonFile(path.join(projectRootPath, '.vscode', 'settings.json'), project, 'vsCode.settingsJson');
+        this.readAndParseJsonFile(path.join(projectRootPath, '.vscode', 'extensions.json'), project, 'vsCode.extensionsJson');
+        this.readAndParseJsonFile(path.join(projectRootPath, '.vscode', 'launch.json'), project, 'vsCode.launchJson');
         const srcFiles = fsUtil.readdirR(path.join(projectRootPath, 'src'));
         const manifestFiles = srcFiles.filter(f => f.endsWith('.manifest.json'));
         const manifests = manifestFiles.map((f) => {
@@ -233,5 +122,26 @@ export class BaseProjectCommand extends AnonymousCommand {
         catch { }
         return undefined;
     }
+    readAndParseJsonFile(filePath, project, keyPath) {
+        if (fs.existsSync(filePath)) {
+            try {
+                const source = formatting.removeSingleLineComments(fs.readFileSync(filePath, 'utf-8'));
+                const keys = keyPath.split('.');
+                let current = project;
+                for (let i = 0; i < keys.length - 1; i++) {
+                    current = current[keys[i]];
+                }
+                const finalKey = keys[keys.length - 1];
+                current[finalKey] = JSON.parse(source);
+                if (typeof current[finalKey] === 'object' && current[finalKey] !== null) {
+                    current[finalKey].source = source;
+                }
+            }
+            catch (error) {
+                throw new CommandError(`The file ${filePath} is not a valid JSON file or is not utf-8 encoded. Error: ${error}`);
+            }
+        }
+        return project;
+    }
 }
 //# sourceMappingURL=base-project-command.js.map

package/dist/m365/spfx/commands/project/project-azuredevops-pipeline-add.js

@@ -37,7 +37,7 @@ class SpfxProjectAzureDevOpsPipelineAddCommand extends BaseProjectCommand {
         const packageJson = fs.readFileSync(solutionPackageJsonFile, 'utf-8');
         const solutionName = JSON.parse(packageJson).name;
         if (this.debug) {
-            logger.logToStderr(`Adding Azure DevOps pipeline in the current SPFx project`);
+            await logger.logToStderr(`Adding Azure DevOps pipeline in the current SPFx project`);
         }
         try {
             this.updatePipeline(solutionName, pipeline, args.options);

package/dist/m365/spfx/commands/project/project-externalize.js

@@ -81,7 +81,7 @@ class SpfxProjectExternalizeCommand extends BaseProjectCommand {
             this.allEditSuggestions.push(...rulesResults.map(x => x.suggestions).reduce((x, y) => [...x, ...y]));
             //removing duplicates
             this.allFindings = this.allFindings.filter((x, i) => this.allFindings.findIndex(y => y.key === x.key) === i);
-            this.writeReport(this.allFindings, this.allEditSuggestions, logger, args.options);
+            await this.writeReport(this.allFindings, this.allEditSuggestions, logger, args.options);
         }
         catch (err) {
             throw new CommandError(err);

package/dist/m365/spfx/commands/project/project-github-workflow-add.js

@@ -40,7 +40,7 @@ class SpfxProjectGithubWorkflowAddCommand extends BaseProjectCommand {
         const packageJson = fs.readFileSync(solutionPackageJsonFile, 'utf-8');
         const solutionName = JSON.parse(packageJson).name;
         if (this.debug) {
-            logger.logToStderr(`Adding GitHub workflow in the current SPFx project`);
+            await logger.logToStderr(`Adding GitHub workflow in the current SPFx project`);
         }
         try {
             this.updateWorkflow(solutionName, workflow, args.options);

package/dist/m365/spfx/commands/spfx-doctor.js

@@ -713,7 +713,7 @@ class SpfxDoctorCommand extends BaseProjectCommand {
     }
     async checkNodeVersion(prerequisites) {
         const nodeVersion = this.getNodeVersion();
-        this.checkStatus('Node', nodeVersion, prerequisites.node);
+        await this.checkStatus('Node', nodeVersion, prerequisites.node);
     }
     async checkSharePointFrameworkVersion(spfxVersionRequested) {
         let spfxVersionDetected = await this.getSPFxVersionFromYoRcFile();
@@ -725,7 +725,7 @@ class SpfxDoctorCommand extends BaseProjectCommand {
             fix: `npm i -g @microsoft/generator-sharepoint@${spfxVersionRequested}`
         };
         if (spfxVersionDetected) {
-            this.checkStatus(`SharePoint Framework`, spfxVersionDetected, versionCheck);
+            await this.checkStatus(`SharePoint Framework`, spfxVersionDetected, versionCheck);
         }
         else {
             const message = `SharePoint Framework v${spfxVersionRequested} not found`;
@@ -742,7 +742,7 @@ class SpfxDoctorCommand extends BaseProjectCommand {
     async checkYo(prerequisites) {
         const yoVersion = await this.getPackageVersion('yo', PackageSearchMode.GlobalOnly, HandlePromise.Continue);
         if (yoVersion) {
-            this.checkStatus('yo', yoVersion, prerequisites.yo);
+            await this.checkStatus('yo', yoVersion, prerequisites.yo);
         }
         else {
             const message = 'yo not found';
@@ -758,7 +758,7 @@ class SpfxDoctorCommand extends BaseProjectCommand {
     async checkGulpCli(prerequisites) {
         const gulpCliVersion = await this.getPackageVersion('gulp-cli', PackageSearchMode.GlobalOnly, HandlePromise.Continue);
         if (gulpCliVersion) {
-            this.checkStatus('gulp-cli', gulpCliVersion, prerequisites.gulpCli);
+            await this.checkStatus('gulp-cli', gulpCliVersion, prerequisites.gulpCli);
         }
         else {
             const message = 'gulp-cli not found';

package/dist/m365/spo/commands/cdn/cdn-get.js

@@ -3,7 +3,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
-var _SpoCdnGetCommand_instances, _SpoCdnGetCommand_initTelemetry, _SpoCdnGetCommand_initOptions, _SpoCdnGetCommand_initValidators;
+var _SpoCdnGetCommand_instances, _SpoCdnGetCommand_initTelemetry, _SpoCdnGetCommand_initOptions, _SpoCdnGetCommand_initValidators, _SpoCdnGetCommand_initTypes;
 import config from '../../../../config.js';
 import request from '../../../../request.js';
 import { spo } from '../../../../utils/spo.js';
@@ -19,9 +19,11 @@ class SpoCdnGetCommand extends SpoCommand {
     constructor() {
         super();
         _SpoCdnGetCommand_instances.add(this);
+        this.validTypes = ['Public', 'Private'];
         __classPrivateFieldGet(this, _SpoCdnGetCommand_instances, "m", _SpoCdnGetCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _SpoCdnGetCommand_instances, "m", _SpoCdnGetCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _SpoCdnGetCommand_instances, "m", _SpoCdnGetCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _SpoCdnGetCommand_instances, "m", _SpoCdnGetCommand_initTypes).call(this);
     }
     async commandAction(logger, args) {
         const cdnTypeString = args.options.type || 'Public';
@@ -48,15 +50,11 @@ class SpoCdnGetCommand extends SpoCommand {
             if (response.ErrorInfo) {
                 throw response.ErrorInfo.ErrorMessage;
             }
-            else {
-                const result = json[json.length - 1];
-                if (this.verbose) {
-                    await logger.logToStderr(`${(cdnType === 0 ? 'Public' : 'Private')} CDN at ${spoAdminUrl} is ${(result === true ? 'enabled' : 'disabled')}`);
-                }
-                else {
-                    await logger.logToStderr(result);
-                }
+            const result = json[json.length - 1];
+            if (this.verbose) {
+                await logger.logToStderr(`${cdnType === 0 ? 'Public' : 'Private'} CDN at ${spoAdminUrl} is ${result === true ? 'enabled' : 'disabled'}`);
             }
+            await logger.log(result);
         }
         catch (err) {
             this.handleRejectedPromise(err);
@@ -72,18 +70,17 @@ _SpoCdnGetCommand_instances = new WeakSet(), _SpoCdnGetCommand_initTelemetry = f
 }, _SpoCdnGetCommand_initOptions = function _SpoCdnGetCommand_initOptions() {
     this.options.unshift({
         option: '-t, --type [type]',
-        autocomplete: ['Public', 'Private']
+        autocomplete: this.validTypes
     });
 }, _SpoCdnGetCommand_initValidators = function _SpoCdnGetCommand_initValidators() {
     this.validators.push(async (args) => {
-        if (args.options.type) {
-            if (args.options.type !== 'Public' &&
-                args.options.type !== 'Private') {
-                return `${args.options.type} is not a valid CDN type. Allowed values are Public|Private`;
-            }
+        if (args.options.type && !this.validTypes.includes(args.options.type)) {
+            return `'${args.options.type}' is not a valid CDN type. Allowed values are: ${this.validTypes.join(', ')}.`;
         }
         return true;
     });
+}, _SpoCdnGetCommand_initTypes = function _SpoCdnGetCommand_initTypes() {
+    this.types.string.push('type');
 };
 export default new SpoCdnGetCommand();
 //# sourceMappingURL=cdn-get.js.map