@pnp/cli-microsoft365 9.0.0-beta.2f8dd1e → 9.0.0-beta.39e78b2

package/dist/m365/pa/commands/app/app-export.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 _PaAppExportCommand_instances, _PaAppExportCommand_initTelemetry, _PaAppExportCommand_initOptions, _PaAppExportCommand_initValidators;
+var _PaAppExportCommand_instances, _PaAppExportCommand_initTelemetry, _PaAppExportCommand_initOptions, _PaAppExportCommand_initValidators, _PaAppExportCommand_initTypes;
 import fs from 'fs';
 import path from 'path';
 import { setTimeout } from 'timers/promises';
@@ -26,14 +26,18 @@ class PaAppExportCommand extends PowerPlatformCommand {
         __classPrivateFieldGet(this, _PaAppExportCommand_instances, "m", _PaAppExportCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _PaAppExportCommand_instances, "m", _PaAppExportCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _PaAppExportCommand_instances, "m", _PaAppExportCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _PaAppExportCommand_instances, "m", _PaAppExportCommand_initTypes).call(this);
     }
     async commandAction(logger, args) {
         try {
             const location = await this.exportPackage(args, logger);
-            const packageLink = await this.getPackageLink(args, logger, location);
-            //Replace all illegal characters from the file name
-            const illegalCharsRegEx = /[\\\/:*?"<>|]/g;
-            const filename = args.options.packageDisplayName.replace(illegalCharsRegEx, '_');
+            const packageLink = await this.getPackageLink(logger, location);
+            let filename = args.options.name;
+            if (args.options.packageDisplayName) {
+                //Replace all illegal characters from the file name
+                const illegalCharsRegEx = /[\\\/:*?"<>|]/g;
+                filename = args.options.packageDisplayName.replace(illegalCharsRegEx, '_');
+            }
             const requestOptions = {
                 url: packageLink,
                 // Set responseType to arraybuffer, otherwise binary data will be encoded
@@ -98,7 +102,7 @@ class PaAppExportCommand extends PowerPlatformCommand {
                 details: {
                     creator: args.options.packageCreatedBy,
                     description: args.options.packageDescription,
-                    displayName: args.options.packageDisplayName,
+                    displayName: args.options.packageDisplayName || args.options.name,
                     sourceEnvironment: args.options.packageSourceEnvironment
                 },
                 resources: resources
@@ -108,7 +112,7 @@ class PaAppExportCommand extends PowerPlatformCommand {
         const response = await request.post(requestOptions);
         return response.headers.location;
     }
-    async getPackageLink(args, logger, location) {
+    async getPackageLink(logger, location) {
         if (this.verbose) {
             await logger.logToStderr('Retrieving the package link and waiting on the exported package.');
         }
@@ -172,6 +176,8 @@ _PaAppExportCommand_instances = new WeakSet(), _PaAppExportCommand_initTelemetry
         }
         return true;
     });
+}, _PaAppExportCommand_initTypes = function _PaAppExportCommand_initTypes() {
+    this.types.string.push('name', 'environmentName', 'packageDisplayName', 'packageDescription', 'packageCreatedBy', 'packageSourceEnvironment', 'path');
 };
 export default new PaAppExportCommand();
 //# sourceMappingURL=app-export.js.map

package/dist/m365/spe/ContainerTypeProperties.js

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=ContainerTypeProperties.js.map

package/dist/m365/spe/commands/containertype/containertype-list.js

@@ -0,0 +1,49 @@
+import config from '../../../../config.js';
+import request from '../../../../request.js';
+import { spo } from '../../../../utils/spo.js';
+import SpoCommand from '../../../base/SpoCommand.js';
+import commands from '../../commands.js';
+class SpeContainertypeListCommand extends SpoCommand {
+    get name() {
+        return commands.CONTAINERTYPE_LIST;
+    }
+    get description() {
+        return 'Lists all Container Types';
+    }
+    defaultProperties() {
+        return ['ContainerTypeId', 'DisplayName', 'OwningAppId'];
+    }
+    async commandAction(logger) {
+        try {
+            const spoAdminUrl = await spo.getSpoAdminUrl(logger, this.debug);
+            if (this.verbose) {
+                await logger.logToStderr(`Retrieving list of Container types...`);
+            }
+            const allContainerTypes = await this.getAllContainerTypes(spoAdminUrl, logger);
+            await logger.log(allContainerTypes);
+        }
+        catch (err) {
+            this.handleRejectedPromise(err);
+        }
+    }
+    async getAllContainerTypes(spoAdminUrl, logger) {
+        const formDigestInfo = await spo.ensureFormDigest(spoAdminUrl, logger, undefined, this.debug);
+        const requestOptions = {
+            url: `${spoAdminUrl}/_vti_bin/client.svc/ProcessQuery`,
+            headers: {
+                'X-RequestDigest': formDigestInfo.FormDigestValue
+            },
+            data: `<Request AddExpandoFieldTypeSuffix="true" SchemaVersion="15.0.0.0" LibraryVersion="16.0.0.0" ApplicationName="${config.applicationName}" xmlns="http://schemas.microsoft.com/sharepoint/clientquery/2009"><Actions><ObjectPath Id="46" ObjectPathId="45" /><Method Name="GetSPOContainerTypes" Id="47" ObjectPathId="45"><Parameters><Parameter Type="Enum">1</Parameter></Parameters></Method></Actions><ObjectPaths><Constructor Id="45" TypeId="{268004ae-ef6b-4e9b-8425-127220d84719}" /></ObjectPaths></Request>`
+        };
+        const res = await request.post(requestOptions);
+        const json = JSON.parse(res);
+        const response = json[0];
+        if (response.ErrorInfo) {
+            throw response.ErrorInfo.ErrorMessage;
+        }
+        const containerTypes = json[json.length - 1];
+        return containerTypes;
+    }
+}
+export default new SpeContainertypeListCommand();
+//# sourceMappingURL=containertype-list.js.map

package/dist/m365/spe/commands.js

@@ -1,5 +1,6 @@
 const prefix = 'spe';
 export default {
-    CONTAINERTYPE_ADD: `${prefix} containertype add`
+    CONTAINERTYPE_ADD: `${prefix} containertype add`,
+    CONTAINERTYPE_LIST: `${prefix} containertype list`
 };
 //# sourceMappingURL=commands.js.map

package/dist/m365/spfx/commands/project/DeployWorkflow.js

@@ -46,7 +46,7 @@ export const workflow = {
                     with: {
                         "APP_FILE_PATH": "sharepoint/solution/{{ solutionName }}.sppkg",
                         "SKIP_FEATURE_DEPLOYMENT": false,
-                        "OVERWRITE": false
+                        "OVERWRITE": true
                     }
                 }
             ]

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-github-workflow-add.js

@@ -33,9 +33,6 @@ class SpfxProjectGithubWorkflowAddCommand extends BaseProjectCommand {
         if (this.projectRootPath === null) {
             throw new CommandError(`Couldn't find project root folder`, _a.ERROR_NO_PROJECT_ROOT_FOLDER);
         }
-        if (!args.options.overwrite) {
-            await this.warn(logger, `We recommend always using the --overwrite option and it will become the default behavior in next major release. Overwriting your sppkg file on every deployment is required to make continuous delivery of the latest version of your app which is the aim of the continuous delivery pipeline.`);
-        }
         const solutionPackageJsonFile = path.join(this.projectRootPath, 'package.json');
         const packageJson = fs.readFileSync(solutionPackageJsonFile, 'utf-8');
         const solutionName = JSON.parse(packageJson).name;
@@ -81,9 +78,6 @@ class SpfxProjectGithubWorkflowAddCommand extends BaseProjectCommand {
         if (options.skipFeatureDeployment) {
             this.getDeployAction(workflow).with.SKIP_FEATURE_DEPLOYMENT = true;
         }
-        if (options.overwrite) {
-            this.getDeployAction(workflow).with.OVERWRITE = true;
-        }
         if (options.loginMethod === 'user') {
             const loginAction = this.getLoginAction(workflow);
             loginAction.with = {
@@ -125,8 +119,7 @@ _a = SpfxProjectGithubWorkflowAddCommand, _SpfxProjectGithubWorkflowAddCommand_i
             manuallyTrigger: !!args.options.manuallyTrigger,
             loginMethod: typeof args.options.loginMethod !== 'undefined',
             scope: typeof args.options.scope !== 'undefined',
-            skipFeatureDeployment: !!args.options.skipFeatureDeployment,
-            overwrite: !!args.options.overwrite
+            skipFeatureDeployment: !!args.options.skipFeatureDeployment
         });
     });
 }, _SpfxProjectGithubWorkflowAddCommand_initOptions = function _SpfxProjectGithubWorkflowAddCommand_initOptions() {
@@ -146,8 +139,6 @@ _a = SpfxProjectGithubWorkflowAddCommand, _SpfxProjectGithubWorkflowAddCommand_i
         option: '-u, --siteUrl [siteUrl]'
     }, {
         option: '--skipFeatureDeployment'
-    }, {
-        option: '--overwrite'
     });
 }, _SpfxProjectGithubWorkflowAddCommand_initValidators = function _SpfxProjectGithubWorkflowAddCommand_initValidators() {
     this.validators.push(async (args) => {

package/dist/m365/spo/commands/applicationcustomizer/applicationcustomizer-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 _SpoApplicationCustomizerGetCommand_instances, _SpoApplicationCustomizerGetCommand_initTelemetry, _SpoApplicationCustomizerGetCommand_initOptions, _SpoApplicationCustomizerGetCommand_initValidators, _SpoApplicationCustomizerGetCommand_initOptionSets;
+var _SpoApplicationCustomizerGetCommand_instances, _SpoApplicationCustomizerGetCommand_initTelemetry, _SpoApplicationCustomizerGetCommand_initOptions, _SpoApplicationCustomizerGetCommand_initValidators, _SpoApplicationCustomizerGetCommand_initOptionSets, _SpoApplicationCustomizerGetCommand_initTypes;
 import { formatting } from '../../../../utils/formatting.js';
 import { spo } from '../../../../utils/spo.js';
 import { validation } from '../../../../utils/validation.js';
@@ -25,33 +25,21 @@ class SpoApplicationCustomizerGetCommand extends SpoCommand {
         __classPrivateFieldGet(this, _SpoApplicationCustomizerGetCommand_instances, "m", _SpoApplicationCustomizerGetCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _SpoApplicationCustomizerGetCommand_instances, "m", _SpoApplicationCustomizerGetCommand_initValidators).call(this);
         __classPrivateFieldGet(this, _SpoApplicationCustomizerGetCommand_instances, "m", _SpoApplicationCustomizerGetCommand_initOptionSets).call(this);
+        __classPrivateFieldGet(this, _SpoApplicationCustomizerGetCommand_instances, "m", _SpoApplicationCustomizerGetCommand_initTypes).call(this);
     }
     async commandAction(logger, args) {
         try {
             const customAction = await this.getCustomAction(args.options);
-            if (customAction) {
+            if (!args.options.clientSideComponentProperties) {
                 await logger.log({
-                    ClientSideComponentId: customAction.ClientSideComponentId,
-                    ClientSideComponentProperties: customAction.ClientSideComponentProperties,
-                    CommandUIExtension: customAction.CommandUIExtension,
-                    Description: customAction.Description,
-                    Group: customAction.Group,
-                    Id: customAction.Id,
-                    ImageUrl: customAction.ImageUrl,
-                    Location: customAction.Location,
-                    Name: customAction.Name,
-                    RegistrationId: customAction.RegistrationId,
-                    RegistrationType: customAction.RegistrationType,
-                    Rights: JSON.stringify(customAction.Rights),
-                    Scope: this.humanizeScope(customAction.Scope),
-                    ScriptBlock: customAction.ScriptBlock,
-                    ScriptSrc: customAction.ScriptSrc,
-                    Sequence: customAction.Sequence,
-                    Title: customAction.Title,
-                    Url: customAction.Url,
-                    VersionOfUserCustomAction: customAction.VersionOfUserCustomAction
+                    ...customAction,
+                    Scope: this.humanizeScope(customAction.Scope)
                 });
             }
+            else {
+                const properties = formatting.tryParseJson(customAction.ClientSideComponentProperties);
+                await logger.log(properties);
+            }
         }
         catch (err) {
             this.handleRejectedPromise(err);
@@ -95,7 +83,8 @@ _SpoApplicationCustomizerGetCommand_instances = new WeakSet(), _SpoApplicationCu
             title: typeof args.options.title !== 'undefined',
             id: typeof args.options.id !== 'undefined',
             clientSideComponentId: typeof args.options.clientSideComponentId !== 'undefined',
-            scope: typeof args.options.scope !== 'undefined'
+            scope: typeof args.options.scope !== 'undefined',
+            clientSideComponentProperties: !!args.options.clientSideComponentProperties
         });
     });
 }, _SpoApplicationCustomizerGetCommand_initOptions = function _SpoApplicationCustomizerGetCommand_initOptions() {
@@ -110,6 +99,8 @@ _SpoApplicationCustomizerGetCommand_instances = new WeakSet(), _SpoApplicationCu
     }, {
         option: '-s, --scope [scope]',
         autocomplete: this.allowedScopes
+    }, {
+        option: '-p, --clientSideComponentProperties'
     });
 }, _SpoApplicationCustomizerGetCommand_initValidators = function _SpoApplicationCustomizerGetCommand_initValidators() {
     this.validators.push(async (args) => {
@@ -126,6 +117,9 @@ _SpoApplicationCustomizerGetCommand_instances = new WeakSet(), _SpoApplicationCu
     });
 }, _SpoApplicationCustomizerGetCommand_initOptionSets = function _SpoApplicationCustomizerGetCommand_initOptionSets() {
     this.optionSets.push({ options: ['title', 'id', 'clientSideComponentId'] });
+}, _SpoApplicationCustomizerGetCommand_initTypes = function _SpoApplicationCustomizerGetCommand_initTypes() {
+    this.types.string.push('webUrl', 'title', 'id', 'clientSideComponentId', 'scope');
+    this.types.boolean.push('clientSideComponentProperties');
 };
 export default new SpoApplicationCustomizerGetCommand();
 //# sourceMappingURL=applicationcustomizer-get.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

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

@@ -19,6 +19,7 @@ class SpoCdnSetCommand extends SpoCommand {
     constructor() {
         super();
         _SpoCdnSetCommand_instances.add(this);
+        this.validTypes = ['Public', 'Private', 'Both'];
         __classPrivateFieldGet(this, _SpoCdnSetCommand_instances, "m", _SpoCdnSetCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _SpoCdnSetCommand_instances, "m", _SpoCdnSetCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _SpoCdnSetCommand_instances, "m", _SpoCdnSetCommand_initTypes).call(this);
@@ -104,7 +105,7 @@ _SpoCdnSetCommand_instances = new WeakSet(), _SpoCdnSetCommand_initTelemetry = f
         Object.assign(this.telemetryProperties, {
             cdnType: args.options.type || 'Public',
             enabled: args.options.enabled,
-            noDefaultOrigins: (!(!args.options.noDefaultOrigins)).toString()
+            noDefaultOrigins: !!args.options.noDefaultOrigins
         });
     });
 }, _SpoCdnSetCommand_initOptions = function _SpoCdnSetCommand_initOptions() {
@@ -113,18 +114,19 @@ _SpoCdnSetCommand_instances = new WeakSet(), _SpoCdnSetCommand_initTelemetry = f
         autocomplete: ['true', 'false']
     }, {
         option: '-t, --type [type]',
-        autocomplete: ['Public', 'Private', 'Both']
+        autocomplete: this.validTypes
     }, {
         option: '--noDefaultOrigins'
     });
 }, _SpoCdnSetCommand_initTypes = function _SpoCdnSetCommand_initTypes() {
-    this.types.boolean.push('enabled');
+    this.types.boolean.push('enabled', 'noDefaultOrigins');
+    this.types.string.push('type');
 }, _SpoCdnSetCommand_initValidators = function _SpoCdnSetCommand_initValidators() {
     this.validators.push(async (args) => {
         if (args.options.type) {
             if (args.options.type !== 'Public' && args.options.type !== 'Both' &&
                 args.options.type !== 'Private') {
-                return `${args.options.type} is not a valid CDN type. Allowed values are Public|Private|Both`;
+                return `${args.options.type} is not a valid CDN type. Allowed values are ${this.validTypes.join(', ')}.`;
             }
         }
         return true;