@pnp/cli-microsoft365 6.0.0-beta.cd80a69 → 6.0.0-beta.d557a48

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

@@ -19,6 +19,7 @@ const config_1 = require("../../../../config");
 const request_1 = require("../../../../request");
 const formatting_1 = require("../../../../utils/formatting");
 const spo_1 = require("../../../../utils/spo");
+const urlUtil_1 = require("../../../../utils/urlUtil");
 const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
@@ -43,35 +44,41 @@ class SpoListItemSetCommand extends SpoCommand_1.default {
     }
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
-            const listIdArgument = args.options.listId || '';
-            const listTitleArgument = args.options.listTitle || '';
-            const listRestUrl = (args.options.listId ?
-                `${args.options.webUrl}/_api/web/lists(guid'${formatting_1.formatting.encodeQueryParameter(listIdArgument)}')`
-                : `${args.options.webUrl}/_api/web/lists/getByTitle('${formatting_1.formatting.encodeQueryParameter(listTitleArgument)}')`);
             let contentTypeName = '';
-            let formDigestValue = '';
-            let environmentListId = '';
+            let listId = '';
             try {
-                if (args.options.systemUpdate) {
+                let requestUrl = `${args.options.webUrl}/_api/web`;
+                if (args.options.listId) {
+                    listId = args.options.listId;
+                    requestUrl += `/lists(guid'${formatting_1.formatting.encodeQueryParameter(args.options.listId)}')`;
+                }
+                else if (args.options.listTitle) {
+                    requestUrl += `/lists/getByTitle('${formatting_1.formatting.encodeQueryParameter(args.options.listTitle)}')`;
+                }
+                else if (args.options.listUrl) {
+                    const listServerRelativeUrl = urlUtil_1.urlUtil.getServerRelativePath(args.options.webUrl, args.options.listUrl);
+                    requestUrl += `/GetList('${formatting_1.formatting.encodeQueryParameter(listServerRelativeUrl)}')`;
+                }
+                if (args.options.systemUpdate && !args.options.listId) {
                     if (this.verbose) {
                         logger.logToStderr(`Getting list id...`);
                     }
                     const listRequestOptions = {
-                        url: `${listRestUrl}/id`,
+                        url: `${requestUrl}?$select=Id`,
                         headers: {
                             'accept': 'application/json;odata=nometadata'
                         },
                         responseType: 'json'
                     };
-                    const dataReturned = yield request_1.default.get(listRequestOptions);
-                    environmentListId = dataReturned.value;
+                    const list = yield request_1.default.get(listRequestOptions);
+                    listId = list.Id;
                 }
                 if (args.options.contentType) {
                     if (this.verbose) {
                         logger.logToStderr(`Getting content types for list...`);
                     }
                     const requestOptions = {
-                        url: `${listRestUrl}/contenttypes?$select=Name,Id`,
+                        url: `${requestUrl}/contenttypes?$select=Name,Id`,
                         headers: {
                             'accept': 'application/json;odata=nometadata'
                         },
@@ -112,9 +119,9 @@ class SpoListItemSetCommand extends SpoCommand_1.default {
                     res = yield spo_1.spo.getRequestDigest(args.options.webUrl);
                 }
                 if (this.verbose) {
-                    logger.logToStderr(`Updating item in list ${args.options.listId || args.options.listTitle} in site ${args.options.webUrl}...`);
+                    logger.logToStderr(`Updating item in list ${args.options.listId || args.options.listTitle || args.options.listUrl} in site ${args.options.webUrl}...`);
                 }
-                formDigestValue = args.options.systemUpdate ? res['FormDigestValue'] : '';
+                const formDigestValue = args.options.systemUpdate ? res['FormDigestValue'] : '';
                 let objectIdentity = '';
                 if (args.options.systemUpdate) {
                     objectIdentity = yield this.requestObjectIdentity(args.options.webUrl, logger, formDigestValue);
@@ -133,7 +140,7 @@ class SpoListItemSetCommand extends SpoCommand_1.default {
             <Method Name="SystemUpdate" Id="2" ObjectPathId="147" />
           </Actions>
           <ObjectPaths>
-            <Identity Id="147" Name="${objectIdentity}:list:${environmentListId}:item:${args.options.id},1" />
+            <Identity Id="147" Name="${objectIdentity}:list:${listId}:item:${args.options.id},1" />
           </ObjectPaths>
         </Request>`
                     : {
@@ -158,7 +165,7 @@ class SpoListItemSetCommand extends SpoCommand_1.default {
                         data: requestBody
                     } :
                     {
-                        url: `${listRestUrl}/items(${args.options.id})/ValidateUpdateListItem()`,
+                        url: `${requestUrl}/items(${args.options.id})/ValidateUpdateListItem()`,
                         headers: {
                             'accept': 'application/json;odata=nometadata'
                         },
@@ -186,7 +193,7 @@ class SpoListItemSetCommand extends SpoCommand_1.default {
                     }
                 }
                 const requestOptionsItems = {
-                    url: `${listRestUrl}/items(${itemId})`,
+                    url: `${requestUrl}/items(${itemId})`,
                     headers: {
                         'accept': 'application/json;odata=nometadata'
                     },
@@ -205,6 +212,7 @@ class SpoListItemSetCommand extends SpoCommand_1.default {
         const excludeOptions = [
             'listTitle',
             'listId',
+            'listUrl',
             'webUrl',
             'id',
             'contentType',
@@ -247,31 +255,28 @@ class SpoListItemSetCommand extends SpoCommand_1.default {
      * @param cmd command cmd
      */
     requestObjectIdentity(webUrl, logger, formDigestValue) {
-        const requestOptions = {
-            url: `${webUrl}/_vti_bin/client.svc/ProcessQuery`,
-            headers: {
-                'X-RequestDigest': formDigestValue
-            },
-            data: `<Request AddExpandoFieldTypeSuffix="true" SchemaVersion="15.0.0.0" LibraryVersion="16.0.0.0" ApplicationName="${config_1.default.applicationName}" xmlns="http://schemas.microsoft.com/sharepoint/clientquery/2009"><Actions><Query Id="1" ObjectPathId="5"><Query SelectAllProperties="false"><Properties><Property Name="ServerRelativeUrl" ScalarProperty="true" /></Properties></Query></Query></Actions><ObjectPaths><Property Id="5" ParentId="3" Name="Web" /><StaticProperty Id="3" TypeId="{3747adcd-a3c3-41b9-bfab-4a64dd2f1e0a}" Name="Current" /></ObjectPaths></Request>`
-        };
-        return new Promise((resolve, reject) => {
-            request_1.default.post(requestOptions).then((res) => {
-                if (this.debug) {
-                    logger.logToStderr('Attempt to get _ObjectIdentity_ key values');
-                }
-                const json = JSON.parse(res);
-                const contents = json.find(x => { return x['ErrorInfo']; });
-                if (contents && contents.ErrorInfo) {
-                    reject(contents.ErrorInfo.ErrorMessage || 'ClientSvc unknown error');
-                }
-                const identityObject = json.find(x => { return x['_ObjectIdentity_']; });
-                if (identityObject) {
-                    resolve(identityObject['_ObjectIdentity_']);
-                }
-                reject('Cannot proceed. _ObjectIdentity_ not found'); // this is not supposed to happen
-            }).catch((err) => {
-                reject(err);
-            });
+        return __awaiter(this, void 0, void 0, function* () {
+            const requestOptions = {
+                url: `${webUrl}/_vti_bin/client.svc/ProcessQuery`,
+                headers: {
+                    'X-RequestDigest': formDigestValue
+                },
+                data: `<Request AddExpandoFieldTypeSuffix="true" SchemaVersion="15.0.0.0" LibraryVersion="16.0.0.0" ApplicationName="${config_1.default.applicationName}" xmlns="http://schemas.microsoft.com/sharepoint/clientquery/2009"><Actions><Query Id="1" ObjectPathId="5"><Query SelectAllProperties="false"><Properties><Property Name="ServerRelativeUrl" ScalarProperty="true" /></Properties></Query></Query></Actions><ObjectPaths><Property Id="5" ParentId="3" Name="Web" /><StaticProperty Id="3" TypeId="{3747adcd-a3c3-41b9-bfab-4a64dd2f1e0a}" Name="Current" /></ObjectPaths></Request>`
+            };
+            const response = yield request_1.default.post(requestOptions);
+            if (this.debug) {
+                logger.logToStderr('Attempt to get _ObjectIdentity_ key values');
+            }
+            const json = JSON.parse(response);
+            const contents = json.find(x => { return x['ErrorInfo']; });
+            if (contents && contents.ErrorInfo) {
+                throw contents.ErrorInfo.ErrorMessage || 'ClientSvc unknown error';
+            }
+            const identityObject = json.find(x => { return x['_ObjectIdentity_']; });
+            if (identityObject) {
+                return identityObject['_ObjectIdentity_'];
+            }
+            throw 'Cannot proceed. _ObjectIdentity_ not found'; // this is not supposed to happen
         });
     }
 }
@@ -280,6 +285,7 @@ _SpoListItemSetCommand_instances = new WeakSet(), _SpoListItemSetCommand_initTel
         Object.assign(this.telemetryProperties, {
             listId: typeof args.options.listId !== 'undefined',
             listTitle: typeof args.options.listTitle !== 'undefined',
+            listUrl: typeof args.options.listUrl !== 'undefined',
             contentType: typeof args.options.contentType !== 'undefined',
             systemUpdate: typeof args.options.systemUpdate !== 'undefined'
         });
@@ -293,6 +299,8 @@ _SpoListItemSetCommand_instances = new WeakSet(), _SpoListItemSetCommand_initTel
         option: '-l, --listId [listId]'
     }, {
         option: '-t, --listTitle [listTitle]'
+    }, {
+        option: '--listUrl [listUrl]'
     }, {
         option: '-c, --contentType [contentType]'
     }, {
@@ -311,10 +319,10 @@ _SpoListItemSetCommand_instances = new WeakSet(), _SpoListItemSetCommand_initTel
         return true;
     }));
 }, _SpoListItemSetCommand_initTypes = function _SpoListItemSetCommand_initTypes() {
-    this.types.string.push('webUrl', 'listId', 'listTitle', 'id', 'contentType');
+    this.types.string.push('webUrl', 'listId', 'listTitle', 'listUrl', 'id', 'contentType');
     this.types.boolean.push('systemUpdate');
 }, _SpoListItemSetCommand_initOptionSets = function _SpoListItemSetCommand_initOptionSets() {
-    this.optionSets.push(['listId', 'listTitle']);
+    this.optionSets.push(['listId', 'listTitle', 'listUrl']);
 };
 module.exports = new SpoListItemSetCommand();
 //# sourceMappingURL=listitem-set.js.map

package/dist/m365/spo/commands/page/page-clientsidewebpart-add.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 _SpoPageClientSideWebPartAddCommand_instances, _SpoPageClientSideWebPartAddCommand_initTelemetry, _SpoPageClientSideWebPartAddCommand_initOptions, _SpoPageClientSideWebPartAddCommand_initValidators;
+var _SpoPageClientSideWebPartAddCommand_instances, _SpoPageClientSideWebPartAddCommand_initTelemetry, _SpoPageClientSideWebPartAddCommand_initOptions, _SpoPageClientSideWebPartAddCommand_initValidators, _SpoPageClientSideWebPartAddCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
 const util_1 = require("util");
 const uuid_1 = require("uuid");
@@ -29,6 +29,7 @@ class SpoPageClientSideWebPartAddCommand extends SpoCommand_1.default {
         __classPrivateFieldGet(this, _SpoPageClientSideWebPartAddCommand_instances, "m", _SpoPageClientSideWebPartAddCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _SpoPageClientSideWebPartAddCommand_instances, "m", _SpoPageClientSideWebPartAddCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _SpoPageClientSideWebPartAddCommand_instances, "m", _SpoPageClientSideWebPartAddCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _SpoPageClientSideWebPartAddCommand_instances, "m", _SpoPageClientSideWebPartAddCommand_initOptionSets).call(this);
     }
     get name() {
         return commands_1.default.PAGE_CLIENTSIDEWEBPART_ADD;
@@ -362,12 +363,6 @@ _SpoPageClientSideWebPartAddCommand_instances = new WeakSet(), _SpoPageClientSid
     });
 }, _SpoPageClientSideWebPartAddCommand_initValidators = function _SpoPageClientSideWebPartAddCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (!args.options.standardWebPart && !args.options.webPartId) {
-            return 'Specify either the standardWebPart or the webPartId option';
-        }
-        if (args.options.standardWebPart && args.options.webPartId) {
-            return 'Specify either the standardWebPart or the webPartId option but not both';
-        }
         if (args.options.webPartId && !validation_1.validation.isValidGuid(args.options.webPartId)) {
             return `The webPartId '${args.options.webPartId}' is not a valid GUID`;
         }
@@ -403,6 +398,8 @@ _SpoPageClientSideWebPartAddCommand_instances = new WeakSet(), _SpoPageClientSid
         }
         return validation_1.validation.isValidSharePointUrl(args.options.webUrl);
     }));
+}, _SpoPageClientSideWebPartAddCommand_initOptionSets = function _SpoPageClientSideWebPartAddCommand_initOptionSets() {
+    this.optionSets.push(['standardWebPart', 'webPartId']);
 };
 module.exports = new SpoPageClientSideWebPartAddCommand();
 //# sourceMappingURL=page-clientsidewebpart-add.js.map

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

@@ -18,7 +18,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
 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();
@@ -48,14 +50,25 @@ class SpoRoleDefinitionListCommand extends SpoCommand_1.default {
                 responseType: 'json'
             };
             try {
-                const response = yield request_1.default.get(requestOptions);
-                logger.log(response.value);
+                const res = yield request_1.default.get(requestOptions);
+                const response = this.setFriendlyPermissions(res.value);
+                logger.log(response);
             }
             catch (err) {
                 this.handleRejectedODataJsonPromise(err);
             }
         });
     }
+    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/site/site-add.js

@@ -15,7 +15,6 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _SpoSiteAddCommand_instances, _SpoSiteAddCommand_initTelemetry, _SpoSiteAddCommand_initOptions, _SpoSiteAddCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
-const chalk = require("chalk");
 const config_1 = require("../../../../config");
 const request_1 = require("../../../../request");
 const formatting_1 = require("../../../../utils/formatting");
@@ -59,9 +58,6 @@ class SpoSiteAddCommand extends SpoCommand_1.default {
             const isTeamSite = args.options.type !== 'CommunicationSite';
             try {
                 const spoUrl = yield spo_1.spo.getSpoUrl(logger, this.debug);
-                if (args.options.allowFileSharingForGuestUsers && this.verbose) {
-                    logger.logToStderr(chalk.yellow(`Option 'allowFileSharingForGuestUsers' is deprecated. Please use 'shareByEmailEnabled' instead`));
-                }
                 if (this.verbose) {
                     logger.logToStderr(`Creating new site...`);
                 }
@@ -130,7 +126,7 @@ class SpoSiteAddCommand extends SpoCommand_1.default {
                             request: {
                                 Title: args.options.title,
                                 Url: args.options.url,
-                                ShareByEmailEnabled: args.options.shareByEmailEnabled || args.options.allowFileSharingForGuestUsers,
+                                ShareByEmailEnabled: args.options.shareByEmailEnabled,
                                 Description: args.options.description || '',
                                 Classification: args.options.classification || '',
                                 WebTemplate: 'SITEPAGEPUBLISHING#0',
@@ -388,7 +384,6 @@ _SpoSiteAddCommand_instances = new WeakSet(), _SpoSiteAddCommand_initTelemetry =
         telemetryProps.lcid = args.options.lcid;
         telemetryProps.owners = typeof args.options.owners !== 'undefined';
         if (isCommunicationSite) {
-            telemetryProps.allowFileSharingForGuestUsers = args.options.allowFileSharingForGuestUsers || false;
             telemetryProps.shareByEmailEnabled = args.options.shareByEmailEnabled || false;
             telemetryProps.siteDesign = args.options.siteDesign;
             telemetryProps.siteDesignId = (!(!args.options.siteDesignId)).toString();
@@ -431,8 +426,6 @@ _SpoSiteAddCommand_instances = new WeakSet(), _SpoSiteAddCommand_initTelemetry =
         autocomplete: ['Topic', 'Showcase', 'Blank']
     }, {
         option: '--siteDesignId [siteDesignId]'
-    }, {
-        option: '--allowFileSharingForGuestUsers'
     }, {
         option: '--shareByEmailEnabled'
     }, {
@@ -466,7 +459,7 @@ _SpoSiteAddCommand_instances = new WeakSet(), _SpoSiteAddCommand_initTelemetry =
             if (!args.options.alias) {
                 return 'Required option alias missing';
             }
-            if (args.options.url || args.options.siteDesign || args.options.removeDeletedSite || args.options.wait || args.options.shareByEmailEnabled || args.options.allowFileSharingForGuestUsers || args.options.siteDesignId || args.options.timeZone || args.options.resourceQuota || args.options.resourceQuotaWarningLevel || args.options.storageQuota || args.options.storageQuotaWarningLevel || args.options.webTemplate) {
+            if (args.options.url || args.options.siteDesign || args.options.removeDeletedSite || args.options.wait || args.options.shareByEmailEnabled || args.options.siteDesignId || args.options.timeZone || args.options.resourceQuota || args.options.resourceQuotaWarningLevel || args.options.storageQuota || args.options.storageQuotaWarningLevel || args.options.webTemplate) {
                 return "Type TeamSite supports only the parameters title, lcid, alias, owners, classification, isPublic, and description";
             }
         }
@@ -497,7 +490,7 @@ _SpoSiteAddCommand_instances = new WeakSet(), _SpoSiteAddCommand_initTelemetry =
                 return 'Specify siteDesign or siteDesignId but not both';
             }
             if (args.options.timeZone || args.options.isPublic || args.options.removeDeletedSite || args.options.wait || args.options.alias || args.options.resourceQuota || args.options.resourceQuotaWarningLevel || args.options.storageQuota || args.options.storageQuotaWarningLevel || args.options.webTemplate) {
-                return "Type CommunicationSite supports only the parameters url, title, lcid, classification, siteDesign, shareByEmailEnabled, allowFileSharingForGuestUsers, siteDesignId, owners, and description";
+                return "Type CommunicationSite supports only the parameters url, title, lcid, classification, siteDesign, shareByEmailEnabled, siteDesignId, owners, and description";
             }
         }
         else {
@@ -550,7 +543,7 @@ _SpoSiteAddCommand_instances = new WeakSet(), _SpoSiteAddCommand_initTelemetry =
             if (args.options.storageQuotaWarningLevel > args.options.storageQuota) {
                 return `storageQuotaWarningLevel cannot exceed storageQuota`;
             }
-            if (args.options.classification || args.options.shareByEmailEnabled || args.options.allowFileSharingForGuestUsers || args.options.siteDesignId || args.options.siteDesignId || args.options.alias || args.options.isPublic) {
+            if (args.options.classification || args.options.shareByEmailEnabled || args.options.siteDesignId || args.options.siteDesignId || args.options.alias || args.options.isPublic) {
                 return "Type ClassicSite supports only the parameters url, title, lcid, storageQuota, storageQuotaWarningLevel, resourceQuota, resourceQuotaWarningLevel, webTemplate, owners, and description";
             }
         }

package/dist/m365/spo/commands/site/site-hubsite-connect.js

@@ -0,0 +1,75 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
+    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 _SpoSiteHubSiteConnectCommand_instances, _SpoSiteHubSiteConnectCommand_initOptions, _SpoSiteHubSiteConnectCommand_initValidators;
+Object.defineProperty(exports, "__esModule", { value: true });
+const request_1 = require("../../../../request");
+const spo_1 = require("../../../../utils/spo");
+const validation_1 = require("../../../../utils/validation");
+const SpoCommand_1 = require("../../../base/SpoCommand");
+const commands_1 = require("../../commands");
+class SpoSiteHubSiteConnectCommand extends SpoCommand_1.default {
+    constructor() {
+        super();
+        _SpoSiteHubSiteConnectCommand_instances.add(this);
+        __classPrivateFieldGet(this, _SpoSiteHubSiteConnectCommand_instances, "m", _SpoSiteHubSiteConnectCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _SpoSiteHubSiteConnectCommand_instances, "m", _SpoSiteHubSiteConnectCommand_initValidators).call(this);
+    }
+    get name() {
+        return commands_1.default.SITE_HUBSITE_CONNECT;
+    }
+    get description() {
+        return 'Connects the specified site collection to the given hub site';
+    }
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                const res = yield spo_1.spo.getRequestDigest(args.options.siteUrl);
+                const requestOptions = {
+                    url: `${args.options.siteUrl}/_api/site/JoinHubSite('${encodeURIComponent(args.options.id)}')`,
+                    headers: {
+                        'X-RequestDigest': res.FormDigestValue,
+                        accept: 'application/json;odata=nometadata'
+                    },
+                    responseType: 'json'
+                };
+                yield request_1.default.post(requestOptions);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
+    }
+}
+_SpoSiteHubSiteConnectCommand_instances = new WeakSet(), _SpoSiteHubSiteConnectCommand_initOptions = function _SpoSiteHubSiteConnectCommand_initOptions() {
+    this.options.unshift({
+        option: '-u, --siteUrl <siteUrl>'
+    }, {
+        option: '-i, --id <id>'
+    });
+}, _SpoSiteHubSiteConnectCommand_initValidators = function _SpoSiteHubSiteConnectCommand_initValidators() {
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
+        const isValidSharePointUrl = validation_1.validation.isValidSharePointUrl(args.options.siteUrl);
+        if (isValidSharePointUrl !== true) {
+            return isValidSharePointUrl;
+        }
+        if (!validation_1.validation.isValidGuid(args.options.id)) {
+            return `${args.options.id} is not a valid GUID`;
+        }
+        return true;
+    }));
+};
+module.exports = new SpoSiteHubSiteConnectCommand();
+//# sourceMappingURL=site-hubsite-connect.js.map

package/dist/m365/spo/commands/site/site-hubsite-disconnect.js

@@ -0,0 +1,93 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
+    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 _SpoSiteHubSiteDisconnectCommand_instances, _SpoSiteHubSiteDisconnectCommand_initTelemetry, _SpoSiteHubSiteDisconnectCommand_initOptions, _SpoSiteHubSiteDisconnectCommand_initValidators;
+Object.defineProperty(exports, "__esModule", { value: true });
+const Cli_1 = require("../../../../cli/Cli");
+const request_1 = require("../../../../request");
+const spo_1 = require("../../../../utils/spo");
+const validation_1 = require("../../../../utils/validation");
+const SpoCommand_1 = require("../../../base/SpoCommand");
+const commands_1 = require("../../commands");
+class SpoSiteHubSiteDisconnectCommand extends SpoCommand_1.default {
+    constructor() {
+        super();
+        _SpoSiteHubSiteDisconnectCommand_instances.add(this);
+        __classPrivateFieldGet(this, _SpoSiteHubSiteDisconnectCommand_instances, "m", _SpoSiteHubSiteDisconnectCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _SpoSiteHubSiteDisconnectCommand_instances, "m", _SpoSiteHubSiteDisconnectCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _SpoSiteHubSiteDisconnectCommand_instances, "m", _SpoSiteHubSiteDisconnectCommand_initValidators).call(this);
+    }
+    get name() {
+        return commands_1.default.SITE_HUBSITE_DISCONNECT;
+    }
+    get description() {
+        return 'Disconnects the specifies site collection from its hub site';
+    }
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const disconnectHubSite = () => __awaiter(this, void 0, void 0, function* () {
+                try {
+                    const res = yield spo_1.spo.getRequestDigest(args.options.siteUrl);
+                    if (this.verbose) {
+                        logger.logToStderr(`Disconnecting site collection ${args.options.siteUrl} from its hubsite...`);
+                    }
+                    const requestOptions = {
+                        url: `${args.options.siteUrl}/_api/site/JoinHubSite('00000000-0000-0000-0000-000000000000')`,
+                        headers: {
+                            'X-RequestDigest': res.FormDigestValue,
+                            accept: 'application/json;odata=nometadata'
+                        },
+                        responseType: 'json'
+                    };
+                    yield request_1.default.post(requestOptions);
+                }
+                catch (err) {
+                    this.handleRejectedODataJsonPromise(err);
+                }
+            });
+            if (args.options.confirm) {
+                yield disconnectHubSite();
+            }
+            else {
+                const result = yield Cli_1.Cli.prompt({
+                    type: 'confirm',
+                    name: 'continue',
+                    default: false,
+                    message: `Are you sure you want to disconnect the site collection ${args.options.siteUrl} from its hub site?`
+                });
+                if (result.continue) {
+                    yield disconnectHubSite();
+                }
+            }
+        });
+    }
+}
+_SpoSiteHubSiteDisconnectCommand_instances = new WeakSet(), _SpoSiteHubSiteDisconnectCommand_initTelemetry = function _SpoSiteHubSiteDisconnectCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            confirm: args.options.confirm || false
+        });
+    });
+}, _SpoSiteHubSiteDisconnectCommand_initOptions = function _SpoSiteHubSiteDisconnectCommand_initOptions() {
+    this.options.unshift({
+        option: '-u, --siteUrl <siteUrl>'
+    }, {
+        option: '--confirm'
+    });
+}, _SpoSiteHubSiteDisconnectCommand_initValidators = function _SpoSiteHubSiteDisconnectCommand_initValidators() {
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () { return validation_1.validation.isValidSharePointUrl(args.options.siteUrl); }));
+};
+module.exports = new SpoSiteHubSiteDisconnectCommand();
+//# sourceMappingURL=site-hubsite-disconnect.js.map

package/dist/m365/spo/commands/{hubsite/hubsite-theme-sync.js → site/site-hubsite-theme-sync.js}

@@ -13,24 +13,24 @@ 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 _SpoHubSiteThemeSyncCommand_instances, _SpoHubSiteThemeSyncCommand_initOptions, _SpoHubSiteThemeSyncCommand_initValidators;
+var _SpoSiteHubSiteThemeSyncCommand_instances, _SpoSiteHubSiteThemeSyncCommand_initOptions, _SpoSiteHubSiteThemeSyncCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
 const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
-class SpoHubSiteThemeSyncCommand extends SpoCommand_1.default {
+class SpoSiteHubSiteThemeSyncCommand extends SpoCommand_1.default {
     constructor() {
         super();
-        _SpoHubSiteThemeSyncCommand_instances.add(this);
-        __classPrivateFieldGet(this, _SpoHubSiteThemeSyncCommand_instances, "m", _SpoHubSiteThemeSyncCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _SpoHubSiteThemeSyncCommand_instances, "m", _SpoHubSiteThemeSyncCommand_initValidators).call(this);
+        _SpoSiteHubSiteThemeSyncCommand_instances.add(this);
+        __classPrivateFieldGet(this, _SpoSiteHubSiteThemeSyncCommand_instances, "m", _SpoSiteHubSiteThemeSyncCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _SpoSiteHubSiteThemeSyncCommand_instances, "m", _SpoSiteHubSiteThemeSyncCommand_initValidators).call(this);
     }
     get name() {
-        return commands_1.default.HUBSITE_THEME_SYNC;
+        return commands_1.default.SITE_HUBSITE_THEME_SYNC;
     }
     get description() {
-        return 'Applies any theme updates from the parent hub site.';
+        return 'Applies any theme updates from the hub site the site is connected to.';
     }
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
@@ -53,12 +53,12 @@ class SpoHubSiteThemeSyncCommand extends SpoCommand_1.default {
         });
     }
 }
-_SpoHubSiteThemeSyncCommand_instances = new WeakSet(), _SpoHubSiteThemeSyncCommand_initOptions = function _SpoHubSiteThemeSyncCommand_initOptions() {
+_SpoSiteHubSiteThemeSyncCommand_instances = new WeakSet(), _SpoSiteHubSiteThemeSyncCommand_initOptions = function _SpoSiteHubSiteThemeSyncCommand_initOptions() {
     this.options.unshift({
         option: '-u, --webUrl <webUrl>'
     });
-}, _SpoHubSiteThemeSyncCommand_initValidators = function _SpoHubSiteThemeSyncCommand_initValidators() {
+}, _SpoSiteHubSiteThemeSyncCommand_initValidators = function _SpoSiteHubSiteThemeSyncCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () { return validation_1.validation.isValidSharePointUrl(args.options.webUrl); }));
 };
-module.exports = new SpoHubSiteThemeSyncCommand();
-//# sourceMappingURL=hubsite-theme-sync.js.map
+module.exports = new SpoSiteHubSiteThemeSyncCommand();
+//# sourceMappingURL=site-hubsite-theme-sync.js.map

package/dist/m365/spo/commands/sitedesign/sitedesign-get.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 _SpoSiteDesignGetCommand_instances, _SpoSiteDesignGetCommand_initTelemetry, _SpoSiteDesignGetCommand_initOptions, _SpoSiteDesignGetCommand_initValidators;
+var _SpoSiteDesignGetCommand_instances, _SpoSiteDesignGetCommand_initTelemetry, _SpoSiteDesignGetCommand_initOptions, _SpoSiteDesignGetCommand_initValidators, _SpoSiteDesignGetCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
 const spo_1 = require("../../../../utils/spo");
@@ -27,6 +27,7 @@ class SpoSiteDesignGetCommand extends SpoCommand_1.default {
         __classPrivateFieldGet(this, _SpoSiteDesignGetCommand_instances, "m", _SpoSiteDesignGetCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _SpoSiteDesignGetCommand_instances, "m", _SpoSiteDesignGetCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _SpoSiteDesignGetCommand_instances, "m", _SpoSiteDesignGetCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _SpoSiteDesignGetCommand_instances, "m", _SpoSiteDesignGetCommand_initOptionSets).call(this);
     }
     get name() {
         return commands_1.default.SITEDESIGN_GET;
@@ -96,17 +97,13 @@ _SpoSiteDesignGetCommand_instances = new WeakSet(), _SpoSiteDesignGetCommand_ini
     });
 }, _SpoSiteDesignGetCommand_initValidators = function _SpoSiteDesignGetCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (args.options.id && args.options.title) {
-            return 'Specify either id or title, but not both.';
-        }
-        if (!args.options.id && !args.options.title) {
-            return 'Specify id or title, one is required';
-        }
         if (args.options.id && !validation_1.validation.isValidGuid(args.options.id)) {
             return `${args.options.id} is not a valid GUID`;
         }
         return true;
     }));
+}, _SpoSiteDesignGetCommand_initOptionSets = function _SpoSiteDesignGetCommand_initOptionSets() {
+    this.optionSets.push(['id', 'title']);
 };
 module.exports = new SpoSiteDesignGetCommand();
 //# sourceMappingURL=sitedesign-get.js.map

package/dist/m365/spo/commands/web/web-roleassignment-add.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 _SpoWebRoleAssignmentAddCommand_instances, _SpoWebRoleAssignmentAddCommand_initTelemetry, _SpoWebRoleAssignmentAddCommand_initOptions, _SpoWebRoleAssignmentAddCommand_initValidators;
+var _SpoWebRoleAssignmentAddCommand_instances, _SpoWebRoleAssignmentAddCommand_initTelemetry, _SpoWebRoleAssignmentAddCommand_initOptions, _SpoWebRoleAssignmentAddCommand_initValidators, _SpoWebRoleAssignmentAddCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
 const Cli_1 = require("../../../../cli/Cli");
 const request_1 = require("../../../../request");
@@ -30,6 +30,7 @@ class SpoWebRoleAssignmentAddCommand extends SpoCommand_1.default {
         __classPrivateFieldGet(this, _SpoWebRoleAssignmentAddCommand_instances, "m", _SpoWebRoleAssignmentAddCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _SpoWebRoleAssignmentAddCommand_instances, "m", _SpoWebRoleAssignmentAddCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _SpoWebRoleAssignmentAddCommand_instances, "m", _SpoWebRoleAssignmentAddCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _SpoWebRoleAssignmentAddCommand_instances, "m", _SpoWebRoleAssignmentAddCommand_initOptionSets).call(this);
     }
     get name() {
         return commands_1.default.WEB_ROLEASSIGNMENT_ADD;
@@ -165,22 +166,10 @@ _SpoWebRoleAssignmentAddCommand_instances = new WeakSet(), _SpoWebRoleAssignment
         if (args.options.roleDefinitionId && isNaN(args.options.roleDefinitionId)) {
             return `Specified roleDefinitionId ${args.options.roleDefinitionId} is not a number`;
         }
-        const principalOptions = [args.options.principalId, args.options.upn, args.options.groupName];
-        if (principalOptions.some(item => item !== undefined) && principalOptions.filter(item => item !== undefined).length > 1) {
-            return `Specify either principalId id or upn or groupName`;
-        }
-        if (principalOptions.filter(item => item !== undefined).length === 0) {
-            return `Specify at least principalId id or upn or groupName`;
-        }
-        const roleDefinitionOptions = [args.options.roleDefinitionId, args.options.roleDefinitionName];
-        if (roleDefinitionOptions.some(item => item !== undefined) && roleDefinitionOptions.filter(item => item !== undefined).length > 1) {
-            return `Specify either roleDefinitionId id or roleDefinitionName`;
-        }
-        if (roleDefinitionOptions.filter(item => item !== undefined).length === 0) {
-            return `Specify at least roleDefinitionId id or roleDefinitionName`;
-        }
         return true;
     }));
+}, _SpoWebRoleAssignmentAddCommand_initOptionSets = function _SpoWebRoleAssignmentAddCommand_initOptionSets() {
+    this.optionSets.push(['principalId', 'upn', 'groupName'], ['roleDefinitionId', 'roleDefinitionName']);
 };
 module.exports = new SpoWebRoleAssignmentAddCommand();
 //# sourceMappingURL=web-roleassignment-add.js.map