@pnp/cli-microsoft365 8.0.0-beta.5dade25 → 8.0.0-beta.630e741

package/dist/Auth.js

@@ -354,15 +354,7 @@ export class Auth {
             await logger.logToStderr(response);
             await logger.logToStderr('');
         }
-        cli.spinner.text = response.message;
-        cli.spinner.spinner = {
-            frames: ['🌶️ ']
-        };
-        // don't show spinner if running tests
-        /* c8 ignore next 3 */
-        if (!cli.spinner.isSpinning && typeof global.it === 'undefined') {
-            cli.spinner.start();
-        }
+        await logger.logToStderr(`🌶️  ${response.message}`);
         if (cli.getSettingWithDefaultValue(settingsNames.autoOpenLinksInBrowser, false)) {
             await browserUtil.open(response.verificationUri);
         }

package/dist/chili/chili.js

@@ -1,22 +1,17 @@
 import fs from 'fs';
-import ora from 'ora';
 import path from 'path';
 import url from 'url';
-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 mendableBaseUrl = 'https://api.mendable.ai/v1';
 const mendableApiKey = 'd3313d54-6f8e-40e0-90d3-4095019d4be7';
-const spinner = ora({ discardStdin: false });
 let showHelp = false;
 let debug = false;
 let conversationId = 0;
 let initialPrompt = '';
 let history = [];
-const showSpinner = cli.getSettingWithDefaultValue(settingsNames.showSpinner, true) && typeof global.it === 'undefined';
 request.logger = {
     /* c8 ignore next 3 */
     log: async (msg) => console.log(msg),
@@ -74,20 +69,11 @@ async function promptForPrompt() {
 }
 async function runConversationTurn(conversationId, question) {
     console.log('');
-    /* c8 ignore next 4 */
-    if (showSpinner) {
-        spinner.text = 'Searching documentation...';
-        spinner.start();
-    }
     const response = await runMendableChat(conversationId, question);
     history.push({
         prompt: question,
         response: response.answer.text
     });
-    /* c8 ignore next 3 */
-    if (showSpinner) {
-        spinner.stop();
-    }
     console.log(md.md2plain(response.answer.text, ''));
     console.log('');
     console.log('Source:');
@@ -141,16 +127,7 @@ async function endConversation(conversationId) {
             conversation_id: conversationId
         }
     };
-    /* c8 ignore next 4 */
-    if (showSpinner) {
-        spinner.text = 'Ending conversation...';
-        spinner.start();
-    }
     await request.post(requestOptions);
-    /* c8 ignore next 3 */
-    if (showSpinner) {
-        spinner.stop();
-    }
 }
 async function runMendableChat(conversationId, question) {
     const requestOptions = {

package/dist/cli/cli.js

@@ -2,7 +2,6 @@ import Configstore from 'configstore';
 import fs from 'fs';
 import minimist from 'minimist';
 import { createRequire } from 'module';
-import ora from 'ora';
 import os from 'os';
 import path from 'path';
 import { fileURLToPath, pathToFileURL } from 'url';
@@ -21,9 +20,6 @@ import { browserUtil } from '../utils/browserUtil.js';
 const require = createRequire(import.meta.url);
 const __dirname = fileURLToPath(new URL('.', import.meta.url));
 let _config;
-// we assign it through exported function to support mocking
-// eslint-disable-next-line prefer-const
-let spinner = ora();
 const commands = [];
 /**
  * Command to execute
@@ -190,12 +186,6 @@ async function executeCommand(command, args) {
     // the command to execute
     const parentCommandName = cli.currentCommandName;
     cli.currentCommandName = command.getCommandName(cli.currentCommandName);
-    const showSpinner = cli.getSettingWithDefaultValue(settingsNames.showSpinner, true) && args.options.output !== 'none';
-    // don't show spinner if running tests
-    /* c8 ignore next 3 */
-    if (showSpinner && typeof global.it === 'undefined') {
-        cli.spinner.start();
-    }
     const startCommand = process.hrtime.bigint();
     try {
         await command.action(logger, args);
@@ -207,10 +197,6 @@ async function executeCommand(command, args) {
     finally {
         // restore the original command name
         cli.currentCommandName = parentCommandName;
-        /* c8 ignore next 3 */
-        if (cli.spinner.isSpinning) {
-            cli.spinner.stop();
-        }
         const endCommand = process.hrtime.bigint();
         timings.command.push(Number(endCommand - startCommand));
     }
@@ -758,29 +744,14 @@ async function closeWithError(error, args, showHelpIfEnabled = false) {
     /* c8 ignore next */
 }
 function log(message, ...optionalParams) {
-    const spinnerSpinning = cli.spinner.isSpinning;
-    /* c8 ignore next 3 */
-    if (spinnerSpinning) {
-        cli.spinner.stop();
-    }
     if (message) {
         console.log(message, ...optionalParams);
     }
     else {
         console.log();
     }
-    // Restart the spinner if it was running before the log
-    /* c8 ignore next 3 */
-    if (spinnerSpinning) {
-        cli.spinner.start();
-    }
 }
 async function error(message, ...optionalParams) {
-    const spinnerSpinning = cli.spinner.isSpinning;
-    /* c8 ignore next 3 */
-    if (spinnerSpinning) {
-        cli.spinner.stop();
-    }
     const errorOutput = cli.getSettingWithDefaultValue(settingsNames.errorOutput, 'stderr');
     if (errorOutput === 'stdout') {
         console.log(message, ...optionalParams);
@@ -788,40 +759,15 @@ async function error(message, ...optionalParams) {
     else {
         console.error(message, ...optionalParams);
     }
-    // Restart the spinner if it was running before the log
-    /* c8 ignore next 3 */
-    if (spinnerSpinning) {
-        cli.spinner.start();
-    }
 }
 async function promptForSelection(config) {
-    const spinnerSpinning = cli.spinner.isSpinning;
-    /* c8 ignore next 3 */
-    if (spinnerSpinning) {
-        cli.spinner.stop();
-    }
     const answer = await prompt.forSelection(config);
     await cli.error('');
-    // Restart the spinner if it was running before the prompt
-    /* c8 ignore next 3 */
-    if (spinnerSpinning) {
-        cli.spinner.start();
-    }
     return answer;
 }
 async function promptForConfirmation(config) {
-    const spinnerSpinning = cli.spinner.isSpinning;
-    /* c8 ignore next 3 */
-    if (spinnerSpinning) {
-        cli.spinner.stop();
-    }
     const answer = await prompt.forConfirmation(config);
     await cli.error('');
-    // Restart the spinner if it was running before the prompt
-    /* c8 ignore next 3 */
-    if (spinnerSpinning) {
-        cli.spinner.start();
-    }
     return answer;
 }
 async function handleMultipleResultsFound(message, values) {
@@ -885,14 +831,6 @@ export const cli = {
     printAvailableCommands,
     promptForConfirmation,
     promptForSelection,
-    shouldTrimOutput,
-    spinner
-};
-const spinnerOptions = {
-    text: 'Running command...',
-    /* c8 ignore next 1 */
-    stream: cli.getSettingWithDefaultValue('errorOutput', 'stderr') === 'stderr' ? process.stderr : process.stdout,
-    discardStdin: false
+    shouldTrimOutput
 };
-cli.spinner = ora(spinnerOptions);
 //# sourceMappingURL=cli.js.map

package/dist/m365/commands/setup.js

@@ -42,8 +42,6 @@ class SetupCommand extends AnonymousCommand {
             await this.configureSettings(settings, true, logger);
             return;
         }
-        // stop the spinner. Fixes #5598
-        cli.spinner.stop();
         await logger.logToStderr(`Welcome to the CLI for Microsoft 365 setup!`);
         await logger.logToStderr(`This command will guide you through the process of configuring the CLI for your needs.`);
         await logger.logToStderr(`Please, answer the following questions and we'll define a set of settings to best match how you intend to use the CLI.`);
@@ -85,8 +83,6 @@ class SetupCommand extends AnonymousCommand {
             await logger.logToStderr('');
             await logger.logToStderr('Configuring settings...');
             await logger.logToStderr('');
-            // start the spinner. Fixes #5598
-            cli.spinner.start();
             await this.configureSettings(settings, false, logger);
             if (!this.verbose) {
                 await logger.logToStderr('');

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',
@@ -114,17 +111,10 @@ class ExternalConnectionDoctorCommand extends GraphCommand {
             if (this.debug) {
                 await logger.logToStderr(`Running check ${check.id}...`);
             }
-            // don't show spinner if running tests
-            /* c8 ignore next 3 */
-            if (showSpinner) {
-                cli.spinner.start(check.text);
-            }
             // 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/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/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/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