@pnp/cli-microsoft365 6.0.0 → 6.1.0-beta.11542c0

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

@@ -13,7 +13,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 _SpoPageSetCommand_instances, _SpoPageSetCommand_initTelemetry, _SpoPageSetCommand_initOptions, _SpoPageSetCommand_initValidators;
+var _SpoPageSetCommand_instances, _SpoPageSetCommand_initTelemetry, _SpoPageSetCommand_initOptions, _SpoPageSetCommand_initTypes, _SpoPageSetCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
 const Auth_1 = require("../../../../Auth");
 const request_1 = require("../../../../request");
@@ -28,19 +28,20 @@ const spoFileGetCommand = require("../file/file-get");
 const spoListItemSetCommand = require("../listitem/listitem-set");
 const Cli_1 = require("../../../../cli/Cli");
 class SpoPageSetCommand extends SpoCommand_1.default {
+    get name() {
+        return commands_1.default.PAGE_SET;
+    }
+    get description() {
+        return 'Updates modern page properties';
+    }
     constructor() {
         super();
         _SpoPageSetCommand_instances.add(this);
         __classPrivateFieldGet(this, _SpoPageSetCommand_instances, "m", _SpoPageSetCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _SpoPageSetCommand_instances, "m", _SpoPageSetCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _SpoPageSetCommand_instances, "m", _SpoPageSetCommand_initTypes).call(this);
         __classPrivateFieldGet(this, _SpoPageSetCommand_instances, "m", _SpoPageSetCommand_initValidators).call(this);
     }
-    get name() {
-        return commands_1.default.PAGE_SET;
-    }
-    get description() {
-        return 'Updates modern page properties';
-    }
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
             const resource = Auth_1.Auth.getResourceFromUrl(args.options.webUrl);
@@ -76,28 +77,21 @@ class SpoPageSetCommand extends SpoCommand_1.default {
                     authorByline = page.AuthorByline;
                 }
                 if (args.options.layoutType) {
-                    const requestOptions = {
-                        url: `${args.options.webUrl}/_api/web/getfilebyserverrelativeurl('${serverRelativeFileUrl}')/ListItemAllFields`,
-                        headers: {
-                            'X-RequestDigest': requestDigest,
-                            'content-type': 'application/json;odata=nometadata',
-                            'X-HTTP-Method': 'MERGE',
-                            'IF-MATCH': '*',
-                            accept: 'application/json;odata=nometadata'
-                        },
-                        data: {
-                            PageLayoutType: args.options.layoutType
-                        },
-                        responseType: 'json'
+                    const itemId = yield this.getFileListItemId(args.options.webUrl, serverRelativeFileUrl);
+                    const listItemSetOptions = {
+                        webUrl: args.options.webUrl,
+                        listUrl: listServerRelativeUrl,
+                        id: itemId,
+                        systemUpdate: true,
+                        PageLayoutType: args.options.layoutType,
+                        verbose: this.verbose,
+                        debug: this.debug
                     };
                     if (args.options.layoutType === 'Article') {
-                        requestOptions.data.PromotedState = 0;
-                        requestOptions.data.BannerImageUrl = {
-                            Description: '/_layouts/15/images/sitepagethumbnail.png',
-                            Url: `${resource}/_layouts/15/images/sitepagethumbnail.png`
-                        };
+                        listItemSetOptions.PromotedState = 0;
+                        listItemSetOptions.BannerImageUrl = `${resource}/_layouts/15/images/sitepagethumbnail.png, /_layouts/15/images/sitepagethumbnail.png`;
                     }
-                    yield request_1.default.post(requestOptions);
+                    yield Cli_1.Cli.executeCommand(spoListItemSetCommand, { options: Object.assign(Object.assign({}, listItemSetOptions), { _: [] }) });
                 }
                 if (args.options.promoteAs) {
                     const requestOptions = {
@@ -116,60 +110,50 @@ class SpoPageSetCommand extends SpoCommand_1.default {
                             requestOptions.data = {
                                 WelcomePage: `SitePages/${pageName}`
                             };
+                            yield request_1.default.post(requestOptions);
                             break;
                         case 'NewsPage':
-                            requestOptions.url = `${args.options.webUrl}/_api/web/getfilebyserverrelativeurl('${serverRelativeFileUrl}')/ListItemAllFields`;
-                            requestOptions.headers = {
-                                'X-RequestDigest': requestDigest,
-                                'X-HTTP-Method': 'MERGE',
-                                'IF-MATCH': '*',
-                                'content-type': 'application/json;odata=nometadata',
-                                accept: 'application/json;odata=nometadata'
-                            };
-                            requestOptions.data = {
+                            const newsPageItemId = yield this.getFileListItemId(args.options.webUrl, serverRelativeFileUrl);
+                            const listItemSetOptions = {
+                                webUrl: args.options.webUrl,
+                                listUrl: listServerRelativeUrl,
+                                id: newsPageItemId,
+                                systemUpdate: true,
                                 PromotedState: 2,
-                                FirstPublishedDate: new Date().toISOString().replace('Z', '')
+                                FirstPublishedDate: new Date().toISOString(),
+                                verbose: this.verbose,
+                                debug: this.debug
                             };
+                            yield Cli_1.Cli.executeCommand(spoListItemSetCommand, { options: Object.assign(Object.assign({}, listItemSetOptions), { _: [] }) });
                             break;
                         case 'Template':
-                            requestOptions.url = `${args.options.webUrl}/_api/web/getfilebyserverrelativeurl('${serverRelativeFileUrl}')/ListItemAllFields`;
+                            const templateItemId = yield this.getFileListItemId(args.options.webUrl, serverRelativeFileUrl);
                             requestOptions.headers = {
-                                'X-RequestDigest': requestDigest,
-                                'content-type': 'application/json;odata=nometadata',
-                                accept: 'application/json;odata=nometadata'
-                            };
-                            break;
-                    }
-                    const pageRes = yield request_1.default.post(requestOptions);
-                    if (args.options.promoteAs === 'Template') {
-                        const requestOptions = {
-                            responseType: 'json',
-                            url: `${args.options.webUrl}/_api/SitePages/Pages(${pageRes.Id})/SavePageAsTemplate`,
-                            headers: {
                                 'X-RequestDigest': requestDigest,
                                 'content-type': 'application/json;odata=nometadata',
                                 'X-HTTP-Method': 'POST',
                                 'IF-MATCH': '*',
                                 accept: 'application/json;odata=nometadata'
+                            };
+                            requestOptions.url = `${args.options.webUrl}/_api/SitePages/Pages(${templateItemId})/SavePageAsTemplate`;
+                            const res = yield request_1.default.post(requestOptions);
+                            if (fileNameWithoutExtension) {
+                                pageData.Title = fileNameWithoutExtension;
+                            }
+                            if (pageDescription) {
+                                pageData.Description = pageDescription;
+                            }
+                            if (res.BannerImageUrl) {
+                                pageData.BannerImageUrl = res.BannerImageUrl;
+                            }
+                            if (res.LayoutWebpartsContent) {
+                                pageData.LayoutWebpartsContent = res.LayoutWebpartsContent;
                             }
-                        };
-                        const res = yield request_1.default.post(requestOptions);
-                        if (fileNameWithoutExtension) {
-                            pageData.Title = fileNameWithoutExtension;
-                        }
-                        if (pageDescription) {
-                            pageData.Description = pageDescription;
-                        }
-                        if (res.BannerImageUrl) {
-                            pageData.BannerImageUrl = res.BannerImageUrl;
-                        }
-                        if (res.LayoutWebpartsContent) {
-                            pageData.LayoutWebpartsContent = res.LayoutWebpartsContent;
-                        }
-                        if (res.CanvasContent1) {
-                            pageData.CanvasContent1 = res.CanvasContent1;
-                        }
-                        pageId = res.Id;
+                            if (res.CanvasContent1) {
+                                pageData.CanvasContent1 = res.CanvasContent1;
+                            }
+                            pageId = res.Id;
+                            break;
                     }
                 }
                 if (args.options.promoteAs !== 'Template') {
@@ -227,7 +211,7 @@ class SpoPageSetCommand extends SpoCommand_1.default {
                 }
                 if (typeof args.options.commentsEnabled !== 'undefined') {
                     const requestOptions = {
-                        url: `${args.options.webUrl}/_api/web/getfilebyserverrelativeurl('${serverRelativeFileUrl}')/ListItemAllFields/SetCommentsDisabled(${args.options.commentsEnabled === 'false'})`,
+                        url: `${args.options.webUrl}/_api/web/getfilebyserverrelativeurl('${serverRelativeFileUrl}')/ListItemAllFields/SetCommentsDisabled(${args.options.commentsEnabled === false})`,
                         headers: {
                             'X-RequestDigest': requestDigest,
                             'content-type': 'application/json;odata=nometadata',
@@ -238,19 +222,11 @@ class SpoPageSetCommand extends SpoCommand_1.default {
                     yield request_1.default.post(requestOptions);
                 }
                 if (args.options.demoteFrom === 'NewsPage') {
-                    const fileGetOptions = {
-                        webUrl: args.options.webUrl,
-                        url: serverRelativeFileUrl,
-                        asListItem: true,
-                        verbose: this.verbose,
-                        debug: this.debug
-                    };
-                    const fileGetOutput = yield Cli_1.Cli.executeCommandWithOutput(spoFileGetCommand, { options: Object.assign(Object.assign({}, fileGetOptions), { _: [] }) });
-                    const fileGetOutputJson = JSON.parse(fileGetOutput.stdout);
+                    const fileId = yield this.getFileListItemId(args.options.webUrl, serverRelativeFileUrl);
                     const listItemSetOptions = {
                         webUrl: args.options.webUrl,
                         listUrl: listServerRelativeUrl,
-                        id: fileGetOutputJson.Id,
+                        id: fileId,
                         systemUpdate: true,
                         PromotedState: 0,
                         verbose: this.verbose,
@@ -291,6 +267,20 @@ class SpoPageSetCommand extends SpoCommand_1.default {
             }
         });
     }
+    getFileListItemId(webUrl, serverRelativeFileUrl) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const fileGetOptions = {
+                webUrl: webUrl,
+                url: serverRelativeFileUrl,
+                asListItem: true,
+                verbose: this.verbose,
+                debug: this.debug
+            };
+            const fileGetOutput = yield Cli_1.Cli.executeCommandWithOutput(spoFileGetCommand, { options: Object.assign(Object.assign({}, fileGetOptions), { _: [] }) });
+            const fileGetOutputJson = JSON.parse(fileGetOutput.stdout);
+            return fileGetOutputJson.Id;
+        });
+    }
 }
 _SpoPageSetCommand_instances = new WeakSet(), _SpoPageSetCommand_initTelemetry = function _SpoPageSetCommand_initTelemetry() {
     this.telemetry.push((args) => {
@@ -331,6 +321,8 @@ _SpoPageSetCommand_instances = new WeakSet(), _SpoPageSetCommand_initTelemetry =
     }, {
         option: '--title [title]'
     });
+}, _SpoPageSetCommand_initTypes = function _SpoPageSetCommand_initTypes() {
+    this.types.boolean.push('commentsEnabled');
 }, _SpoPageSetCommand_initValidators = function _SpoPageSetCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
         const isValidSharePointUrl = validation_1.validation.isValidSharePointUrl(args.options.webUrl);
@@ -355,11 +347,6 @@ _SpoPageSetCommand_instances = new WeakSet(), _SpoPageSetCommand_initTelemetry =
         if (args.options.promoteAs === 'NewsPage' && args.options.layoutType && args.options.layoutType !== 'Article') {
             return 'You can only promote article pages as news article';
         }
-        if (typeof args.options.commentsEnabled !== 'undefined' &&
-            args.options.commentsEnabled !== 'true' &&
-            args.options.commentsEnabled !== 'false') {
-            return `${args.options.commentsEnabled} is not a valid value for commentsEnabled. Allowed values true|false`;
-        }
         return true;
     }));
 };

package/dist/m365/spo/commands/page/page-template-list.js

@@ -20,12 +20,6 @@ const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoPageTemplateListCommand extends SpoCommand_1.default {
-    constructor() {
-        super();
-        _SpoPageTemplateListCommand_instances.add(this);
-        __classPrivateFieldGet(this, _SpoPageTemplateListCommand_instances, "m", _SpoPageTemplateListCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _SpoPageTemplateListCommand_instances, "m", _SpoPageTemplateListCommand_initValidators).call(this);
-    }
     get name() {
         return commands_1.default.PAGE_TEMPLATE_LIST;
     }
@@ -35,6 +29,12 @@ class SpoPageTemplateListCommand extends SpoCommand_1.default {
     defaultProperties() {
         return ['Title', 'FileName', 'Id', 'PageLayoutType', 'Url'];
     }
+    constructor() {
+        super();
+        _SpoPageTemplateListCommand_instances.add(this);
+        __classPrivateFieldGet(this, _SpoPageTemplateListCommand_instances, "m", _SpoPageTemplateListCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _SpoPageTemplateListCommand_instances, "m", _SpoPageTemplateListCommand_initValidators).call(this);
+    }
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
             if (this.verbose) {

package/dist/m365/spo/commands/page/page-text-add.js

@@ -25,6 +25,12 @@ const commands_1 = require("../../commands");
 const clientsidepages_1 = require("./clientsidepages");
 const Page_1 = require("./Page");
 class SpoPageTextAddCommand extends SpoCommand_1.default {
+    get name() {
+        return commands_1.default.PAGE_TEXT_ADD;
+    }
+    get description() {
+        return 'Adds text to a modern page';
+    }
     constructor() {
         super();
         _SpoPageTextAddCommand_instances.add(this);
@@ -32,12 +38,6 @@ class SpoPageTextAddCommand extends SpoCommand_1.default {
         __classPrivateFieldGet(this, _SpoPageTextAddCommand_instances, "m", _SpoPageTextAddCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _SpoPageTextAddCommand_instances, "m", _SpoPageTextAddCommand_initValidators).call(this);
     }
-    get name() {
-        return commands_1.default.PAGE_TEXT_ADD;
-    }
-    get description() {
-        return 'Adds text to a modern page';
-    }
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
             let requestDigest = '';

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

@@ -20,6 +20,12 @@ const validation_1 = require("../../../../utils/validation");
 const commands_1 = require("../../commands");
 const propertybag_base_1 = require("./propertybag-base");
 class SpoPropertyBagGetCommand extends propertybag_base_1.SpoPropertyBagBaseCommand {
+    get name() {
+        return commands_1.default.PROPERTYBAG_GET;
+    }
+    get description() {
+        return 'Gets the value of the specified property from the property bag';
+    }
     constructor() {
         super();
         _SpoPropertyBagGetCommand_instances.add(this);
@@ -27,12 +33,6 @@ class SpoPropertyBagGetCommand extends propertybag_base_1.SpoPropertyBagBaseComm
         __classPrivateFieldGet(this, _SpoPropertyBagGetCommand_instances, "m", _SpoPropertyBagGetCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _SpoPropertyBagGetCommand_instances, "m", _SpoPropertyBagGetCommand_initValidators).call(this);
     }
-    get name() {
-        return commands_1.default.PROPERTYBAG_GET;
-    }
-    get description() {
-        return 'Gets the value of the specified property from the property bag';
-    }
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
             try {

package/dist/m365/spo/commands/propertybag/propertybag-list.js

@@ -20,6 +20,12 @@ const validation_1 = require("../../../../utils/validation");
 const commands_1 = require("../../commands");
 const propertybag_base_1 = require("./propertybag-base");
 class SpoPropertyBagListCommand extends propertybag_base_1.SpoPropertyBagBaseCommand {
+    get name() {
+        return commands_1.default.PROPERTYBAG_LIST;
+    }
+    get description() {
+        return 'Gets property bag values';
+    }
     constructor() {
         super();
         _SpoPropertyBagListCommand_instances.add(this);
@@ -27,12 +33,6 @@ class SpoPropertyBagListCommand extends propertybag_base_1.SpoPropertyBagBaseCom
         __classPrivateFieldGet(this, _SpoPropertyBagListCommand_instances, "m", _SpoPropertyBagListCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _SpoPropertyBagListCommand_instances, "m", _SpoPropertyBagListCommand_initValidators).call(this);
     }
-    get name() {
-        return commands_1.default.PROPERTYBAG_LIST;
-    }
-    get description() {
-        return 'Gets property bag values';
-    }
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
             try {

package/dist/m365/spo/commands/propertybag/propertybag-remove.js

@@ -24,6 +24,12 @@ const validation_1 = require("../../../../utils/validation");
 const commands_1 = require("../../commands");
 const propertybag_base_1 = require("./propertybag-base");
 class SpoPropertyBagRemoveCommand extends propertybag_base_1.SpoPropertyBagBaseCommand {
+    get name() {
+        return commands_1.default.PROPERTYBAG_REMOVE;
+    }
+    get description() {
+        return 'Removes specified property from the property bag';
+    }
     constructor() {
         super();
         _SpoPropertyBagRemoveCommand_instances.add(this);
@@ -31,12 +37,6 @@ class SpoPropertyBagRemoveCommand extends propertybag_base_1.SpoPropertyBagBaseC
         __classPrivateFieldGet(this, _SpoPropertyBagRemoveCommand_instances, "m", _SpoPropertyBagRemoveCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _SpoPropertyBagRemoveCommand_instances, "m", _SpoPropertyBagRemoveCommand_initValidators).call(this);
     }
-    get name() {
-        return commands_1.default.PROPERTYBAG_REMOVE;
-    }
-    get description() {
-        return 'Removes specified property from the property bag';
-    }
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
             const removeProperty = () => __awaiter(this, void 0, void 0, function* () {

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

@@ -20,6 +20,12 @@ const validation_1 = require("../../../../utils/validation");
 const commands_1 = require("../../commands");
 const propertybag_base_1 = require("./propertybag-base");
 class SpoPropertyBagSetCommand extends propertybag_base_1.SpoPropertyBagBaseCommand {
+    get name() {
+        return commands_1.default.PROPERTYBAG_SET;
+    }
+    get description() {
+        return 'Sets the value of the specified property in the property bag. Adds the property if it does not exist';
+    }
     constructor() {
         super();
         _SpoPropertyBagSetCommand_instances.add(this);
@@ -27,12 +33,6 @@ class SpoPropertyBagSetCommand extends propertybag_base_1.SpoPropertyBagBaseComm
         __classPrivateFieldGet(this, _SpoPropertyBagSetCommand_instances, "m", _SpoPropertyBagSetCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _SpoPropertyBagSetCommand_instances, "m", _SpoPropertyBagSetCommand_initValidators).call(this);
     }
-    get name() {
-        return commands_1.default.PROPERTYBAG_SET;
-    }
-    get description() {
-        return 'Sets the value of the specified property in the property bag. Adds the property if it does not exist';
-    }
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
             try {

package/dist/m365/spo/commands/roledefinition/roledefinition-add.js

@@ -21,13 +21,6 @@ const SpoCommand_1 = require("../../../base/SpoCommand");
 const base_permissions_1 = require("../../base-permissions");
 const commands_1 = require("../../commands");
 class SpoRoleDefinitionAddCommand extends SpoCommand_1.default {
-    constructor() {
-        super();
-        _SpoRoleDefinitionAddCommand_instances.add(this);
-        __classPrivateFieldGet(this, _SpoRoleDefinitionAddCommand_instances, "m", _SpoRoleDefinitionAddCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _SpoRoleDefinitionAddCommand_instances, "m", _SpoRoleDefinitionAddCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _SpoRoleDefinitionAddCommand_instances, "m", _SpoRoleDefinitionAddCommand_initValidators).call(this);
-    }
     get name() {
         return commands_1.default.ROLEDEFINITION_ADD;
     }
@@ -43,6 +36,13 @@ class SpoRoleDefinitionAddCommand extends SpoCommand_1.default {
         }
         return result;
     }
+    constructor() {
+        super();
+        _SpoRoleDefinitionAddCommand_instances.add(this);
+        __classPrivateFieldGet(this, _SpoRoleDefinitionAddCommand_instances, "m", _SpoRoleDefinitionAddCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _SpoRoleDefinitionAddCommand_instances, "m", _SpoRoleDefinitionAddCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _SpoRoleDefinitionAddCommand_instances, "m", _SpoRoleDefinitionAddCommand_initValidators).call(this);
+    }
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
             if (this.verbose) {

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

@@ -22,18 +22,18 @@ const base_permissions_1 = require("../../base-permissions");
 const commands_1 = require("../../commands");
 const RoleType_1 = require("./RoleType");
 class SpoRoleDefinitionGetCommand extends SpoCommand_1.default {
-    constructor() {
-        super();
-        _SpoRoleDefinitionGetCommand_instances.add(this);
-        __classPrivateFieldGet(this, _SpoRoleDefinitionGetCommand_instances, "m", _SpoRoleDefinitionGetCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _SpoRoleDefinitionGetCommand_instances, "m", _SpoRoleDefinitionGetCommand_initValidators).call(this);
-    }
     get name() {
         return commands_1.default.ROLEDEFINITION_GET;
     }
     get description() {
         return 'Gets specified role definition from web by id';
     }
+    constructor() {
+        super();
+        _SpoRoleDefinitionGetCommand_instances.add(this);
+        __classPrivateFieldGet(this, _SpoRoleDefinitionGetCommand_instances, "m", _SpoRoleDefinitionGetCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _SpoRoleDefinitionGetCommand_instances, "m", _SpoRoleDefinitionGetCommand_initValidators).call(this);
+    }
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
             if (this.verbose) {

package/dist/m365/spo/commands/roledefinition/roledefinition-list.js

@@ -16,18 +16,11 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _SpoRoleDefinitionListCommand_instances, _SpoRoleDefinitionListCommand_initOptions, _SpoRoleDefinitionListCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
 const odata_1 = require("../../../../utils/odata");
+const formatting_1 = require("../../../../utils/formatting");
 const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
-const base_permissions_1 = require("../../base-permissions");
 const commands_1 = require("../../commands");
-const RoleType_1 = require("./RoleType");
 class SpoRoleDefinitionListCommand extends SpoCommand_1.default {
-    constructor() {
-        super();
-        _SpoRoleDefinitionListCommand_instances.add(this);
-        __classPrivateFieldGet(this, _SpoRoleDefinitionListCommand_instances, "m", _SpoRoleDefinitionListCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _SpoRoleDefinitionListCommand_instances, "m", _SpoRoleDefinitionListCommand_initValidators).call(this);
-    }
     get name() {
         return commands_1.default.ROLEDEFINITION_LIST;
     }
@@ -37,6 +30,12 @@ class SpoRoleDefinitionListCommand extends SpoCommand_1.default {
     defaultProperties() {
         return ['Id', 'Name'];
     }
+    constructor() {
+        super();
+        _SpoRoleDefinitionListCommand_instances.add(this);
+        __classPrivateFieldGet(this, _SpoRoleDefinitionListCommand_instances, "m", _SpoRoleDefinitionListCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _SpoRoleDefinitionListCommand_instances, "m", _SpoRoleDefinitionListCommand_initValidators).call(this);
+    }
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
             if (this.verbose) {
@@ -44,7 +43,7 @@ class SpoRoleDefinitionListCommand extends SpoCommand_1.default {
             }
             try {
                 const res = yield odata_1.odata.getAllItems(`${args.options.webUrl}/_api/web/roledefinitions`);
-                const response = this.setFriendlyPermissions(res);
+                const response = formatting_1.formatting.setFriendlyPermissions(res);
                 logger.log(response);
             }
             catch (err) {
@@ -52,16 +51,6 @@ class SpoRoleDefinitionListCommand extends SpoCommand_1.default {
             }
         });
     }
-    setFriendlyPermissions(response) {
-        response.forEach((r) => {
-            const permissions = new base_permissions_1.BasePermissions();
-            permissions.high = r.BasePermissions.High;
-            permissions.low = r.BasePermissions.Low;
-            r.BasePermissionsValue = permissions.parse();
-            r.RoleTypeKindValue = RoleType_1.RoleType[r.RoleTypeKind];
-        });
-        return response;
-    }
 }
 _SpoRoleDefinitionListCommand_instances = new WeakSet(), _SpoRoleDefinitionListCommand_initOptions = function _SpoRoleDefinitionListCommand_initOptions() {
     this.options.unshift({

package/dist/m365/spo/commands/roledefinition/roledefinition-remove.js

@@ -21,6 +21,12 @@ const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoRoleDefinitionRemoveCommand extends SpoCommand_1.default {
+    get name() {
+        return commands_1.default.ROLEDEFINITION_REMOVE;
+    }
+    get description() {
+        return 'Removes the role definition from the specified site';
+    }
     constructor() {
         super();
         _SpoRoleDefinitionRemoveCommand_instances.add(this);
@@ -28,12 +34,6 @@ class SpoRoleDefinitionRemoveCommand extends SpoCommand_1.default {
         __classPrivateFieldGet(this, _SpoRoleDefinitionRemoveCommand_instances, "m", _SpoRoleDefinitionRemoveCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _SpoRoleDefinitionRemoveCommand_instances, "m", _SpoRoleDefinitionRemoveCommand_initValidators).call(this);
     }
-    get name() {
-        return commands_1.default.ROLEDEFINITION_REMOVE;
-    }
-    get description() {
-        return 'Removes the role definition from the specified site';
-    }
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
             const removeRoleDefinition = () => __awaiter(this, void 0, void 0, function* () {

package/dist/m365/spo/commands/serviceprincipal/serviceprincipal-grant-add.js

@@ -22,11 +22,6 @@ const spo_1 = require("../../../../utils/spo");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoServicePrincipalGrantAddCommand extends SpoCommand_1.default {
-    constructor() {
-        super();
-        _SpoServicePrincipalGrantAddCommand_instances.add(this);
-        __classPrivateFieldGet(this, _SpoServicePrincipalGrantAddCommand_instances, "m", _SpoServicePrincipalGrantAddCommand_initOptions).call(this);
-    }
     get name() {
         return commands_1.default.SERVICEPRINCIPAL_GRANT_ADD;
     }
@@ -36,6 +31,11 @@ class SpoServicePrincipalGrantAddCommand extends SpoCommand_1.default {
     alias() {
         return [commands_1.default.SP_GRANT_ADD];
     }
+    constructor() {
+        super();
+        _SpoServicePrincipalGrantAddCommand_instances.add(this);
+        __classPrivateFieldGet(this, _SpoServicePrincipalGrantAddCommand_instances, "m", _SpoServicePrincipalGrantAddCommand_initOptions).call(this);
+    }
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
             try {

package/dist/m365/spo/commands/serviceprincipal/serviceprincipal-grant-revoke.js

@@ -22,11 +22,6 @@ const spo_1 = require("../../../../utils/spo");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoServicePrincipalGrantRevokeCommand extends SpoCommand_1.default {
-    constructor() {
-        super();
-        _SpoServicePrincipalGrantRevokeCommand_instances.add(this);
-        __classPrivateFieldGet(this, _SpoServicePrincipalGrantRevokeCommand_instances, "m", _SpoServicePrincipalGrantRevokeCommand_initOptions).call(this);
-    }
     get name() {
         return commands_1.default.SERVICEPRINCIPAL_GRANT_REVOKE;
     }
@@ -36,6 +31,11 @@ class SpoServicePrincipalGrantRevokeCommand extends SpoCommand_1.default {
     alias() {
         return [commands_1.default.SP_GRANT_REVOKE];
     }
+    constructor() {
+        super();
+        _SpoServicePrincipalGrantRevokeCommand_instances.add(this);
+        __classPrivateFieldGet(this, _SpoServicePrincipalGrantRevokeCommand_instances, "m", _SpoServicePrincipalGrantRevokeCommand_initOptions).call(this);
+    }
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
             try {