@pnp/cli-microsoft365 5.8.0-beta.40c8ac8 → 6.0.0-beta.076a3a5

package/dist/m365/spo/commands/group/group-remove.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 _SpoGroupRemoveCommand_instances, _SpoGroupRemoveCommand_initTelemetry, _SpoGroupRemoveCommand_initOptions, _SpoGroupRemoveCommand_initValidators;
+var _SpoGroupRemoveCommand_instances, _SpoGroupRemoveCommand_initTelemetry, _SpoGroupRemoveCommand_initOptions, _SpoGroupRemoveCommand_initValidators, _SpoGroupRemoveCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
 const cli_1 = require("../../../../cli");
 const request_1 = require("../../../../request");
@@ -27,6 +27,7 @@ class SpoGroupRemoveCommand extends SpoCommand_1.default {
         __classPrivateFieldGet(this, _SpoGroupRemoveCommand_instances, "m", _SpoGroupRemoveCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _SpoGroupRemoveCommand_instances, "m", _SpoGroupRemoveCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _SpoGroupRemoveCommand_instances, "m", _SpoGroupRemoveCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _SpoGroupRemoveCommand_instances, "m", _SpoGroupRemoveCommand_initOptionSets).call(this);
     }
     get name() {
         return commands_1.default.GROUP_REMOVE;
@@ -117,17 +118,13 @@ _SpoGroupRemoveCommand_instances = new WeakSet(), _SpoGroupRemoveCommand_initTel
         if (isValidSharePointUrl !== true) {
             return isValidSharePointUrl;
         }
-        if (args.options.id && args.options.name) {
-            return 'Specify id or name, but not both';
-        }
-        if (!args.options.id && !args.options.name) {
-            return 'Specify id or name';
-        }
         if (args.options.id && typeof args.options.id !== 'number') {
             return `${args.options.id} is not a number`;
         }
         return true;
     }));
+}, _SpoGroupRemoveCommand_initOptionSets = function _SpoGroupRemoveCommand_initOptionSets() {
+    this.optionSets.push(['id', 'name']);
 };
 module.exports = new SpoGroupRemoveCommand();
 //# sourceMappingURL=group-remove.js.map

package/dist/m365/spo/commands/group/group-user-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 _SpoGroupUserAddCommand_instances, _SpoGroupUserAddCommand_initTelemetry, _SpoGroupUserAddCommand_initOptions, _SpoGroupUserAddCommand_initValidators;
+var _SpoGroupUserAddCommand_instances, _SpoGroupUserAddCommand_initTelemetry, _SpoGroupUserAddCommand_initOptions, _SpoGroupUserAddCommand_initValidators, _SpoGroupUserAddCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
 const cli_1 = require("../../../../cli");
 const Command_1 = require("../../../../Command");
@@ -29,6 +29,7 @@ class SpoGroupUserAddCommand extends SpoCommand_1.default {
         __classPrivateFieldGet(this, _SpoGroupUserAddCommand_instances, "m", _SpoGroupUserAddCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _SpoGroupUserAddCommand_instances, "m", _SpoGroupUserAddCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _SpoGroupUserAddCommand_instances, "m", _SpoGroupUserAddCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _SpoGroupUserAddCommand_instances, "m", _SpoGroupUserAddCommand_initOptionSets).call(this);
     }
     get name() {
         return commands_1.default.GROUP_USER_ADD;
@@ -171,23 +172,13 @@ _SpoGroupUserAddCommand_instances = new WeakSet(), _SpoGroupUserAddCommand_initT
         if (isValidSharePointUrl !== true) {
             return isValidSharePointUrl;
         }
-        if (!args.options.groupId && !args.options.groupName) {
-            return 'Specify either groupId or groupName';
-        }
-        if (args.options.groupId && args.options.groupName) {
-            return 'Specify either groupId or groupName but not both';
-        }
-        if (!args.options.userName && !args.options.email) {
-            return 'Specify either userName or email';
-        }
-        if (args.options.userName && args.options.email) {
-            return 'Specify either userName or email but not both';
-        }
         if (args.options.groupId && isNaN(args.options.groupId)) {
             return `Specified groupId ${args.options.groupId} is not a number`;
         }
         return true;
     }));
+}, _SpoGroupUserAddCommand_initOptionSets = function _SpoGroupUserAddCommand_initOptionSets() {
+    this.optionSets.push(['groupId', 'groupName'], ['userName', 'email']);
 };
 module.exports = new SpoGroupUserAddCommand();
 //# sourceMappingURL=group-user-add.js.map

package/dist/m365/spo/commands/group/group-user-list.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 _SpoGroupUserListCommand_instances, _SpoGroupUserListCommand_initTelemetry, _SpoGroupUserListCommand_initOptions, _SpoGroupUserListCommand_initValidators;
+var _SpoGroupUserListCommand_instances, _SpoGroupUserListCommand_initTelemetry, _SpoGroupUserListCommand_initOptions, _SpoGroupUserListCommand_initValidators, _SpoGroupUserListCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
 const utils_1 = require("../../../../utils");
@@ -26,6 +26,7 @@ class SpoGroupUserListCommand extends SpoCommand_1.default {
         __classPrivateFieldGet(this, _SpoGroupUserListCommand_instances, "m", _SpoGroupUserListCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _SpoGroupUserListCommand_instances, "m", _SpoGroupUserListCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _SpoGroupUserListCommand_instances, "m", _SpoGroupUserListCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _SpoGroupUserListCommand_instances, "m", _SpoGroupUserListCommand_initOptionSets).call(this);
     }
     get name() {
         return commands_1.default.GROUP_USER_LIST;
@@ -75,17 +76,13 @@ _SpoGroupUserListCommand_instances = new WeakSet(), _SpoGroupUserListCommand_ini
     });
 }, _SpoGroupUserListCommand_initValidators = function _SpoGroupUserListCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (args.options.groupId && args.options.groupName) {
-            return 'Use either "groupName" or "groupId", but not both';
-        }
-        if (!args.options.groupId && !args.options.groupName) {
-            return 'Either "groupName" or "groupId" is required';
-        }
         if (args.options.groupId && isNaN(args.options.groupId)) {
             return `Specified "groupId" ${args.options.groupId} is not valid`;
         }
         return utils_1.validation.isValidSharePointUrl(args.options.webUrl);
     }));
+}, _SpoGroupUserListCommand_initOptionSets = function _SpoGroupUserListCommand_initOptionSets() {
+    this.optionSets.push(['groupName', 'groupId']);
 };
 module.exports = new SpoGroupUserListCommand();
 //# sourceMappingURL=group-user-list.js.map

package/dist/m365/spo/commands/group/group-user-remove.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 _SpoGroupUserRemoveCommand_instances, _SpoGroupUserRemoveCommand_initTelemetry, _SpoGroupUserRemoveCommand_initOptions, _SpoGroupUserRemoveCommand_initValidators;
+var _SpoGroupUserRemoveCommand_instances, _SpoGroupUserRemoveCommand_initTelemetry, _SpoGroupUserRemoveCommand_initOptions, _SpoGroupUserRemoveCommand_initValidators, _SpoGroupUserRemoveCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
 const cli_1 = require("../../../../cli");
 const request_1 = require("../../../../request");
@@ -27,6 +27,7 @@ class SpoGroupUserRemoveCommand extends SpoCommand_1.default {
         __classPrivateFieldGet(this, _SpoGroupUserRemoveCommand_instances, "m", _SpoGroupUserRemoveCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _SpoGroupUserRemoveCommand_instances, "m", _SpoGroupUserRemoveCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _SpoGroupUserRemoveCommand_instances, "m", _SpoGroupUserRemoveCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _SpoGroupUserRemoveCommand_instances, "m", _SpoGroupUserRemoveCommand_initOptionSets).call(this);
     }
     get name() {
         return commands_1.default.GROUP_USER_REMOVE;
@@ -101,17 +102,13 @@ _SpoGroupUserRemoveCommand_instances = new WeakSet(), _SpoGroupUserRemoveCommand
     });
 }, _SpoGroupUserRemoveCommand_initValidators = function _SpoGroupUserRemoveCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (args.options.groupId && args.options.groupName) {
-            return 'Use either "groupName" or "groupId", but not both';
-        }
-        if (!args.options.groupId && !args.options.groupName) {
-            return 'Either "groupName" or "groupId" is required';
-        }
         if (args.options.groupId && isNaN(args.options.groupId)) {
             return `Specified "groupId" ${args.options.groupId} is not valid`;
         }
         return utils_1.validation.isValidSharePointUrl(args.options.webUrl);
     }));
+}, _SpoGroupUserRemoveCommand_initOptionSets = function _SpoGroupUserRemoveCommand_initOptionSets() {
+    this.optionSets.push(['groupName', 'groupId']);
 };
 module.exports = new SpoGroupUserRemoveCommand();
 //# sourceMappingURL=group-user-remove.js.map

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

@@ -34,10 +34,10 @@ class SpoHubSiteConnectCommand extends SpoCommand_1.default {
     }
     commandAction(logger, args, cb) {
         utils_1.spo
-            .getRequestDigest(args.options.url)
+            .getRequestDigest(args.options.siteUrl)
             .then((res) => {
             const requestOptions = {
-                url: `${args.options.url}/_api/site/JoinHubSite('${encodeURIComponent(args.options.hubSiteId)}')`,
+                url: `${args.options.siteUrl}/_api/site/JoinHubSite('${encodeURIComponent(args.options.id)}')`,
                 headers: {
                     'X-RequestDigest': res.FormDigestValue,
                     accept: 'application/json;odata=nometadata'
@@ -51,18 +51,18 @@ class SpoHubSiteConnectCommand extends SpoCommand_1.default {
 }
 _SpoHubSiteConnectCommand_instances = new WeakSet(), _SpoHubSiteConnectCommand_initOptions = function _SpoHubSiteConnectCommand_initOptions() {
     this.options.unshift({
-        option: '-u, --url <url>'
+        option: '-u, --siteUrl <siteUrl>'
     }, {
-        option: '-i, --hubSiteId <hubSiteId>'
+        option: '-i, --id <id>'
     });
 }, _SpoHubSiteConnectCommand_initValidators = function _SpoHubSiteConnectCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        const isValidSharePointUrl = utils_1.validation.isValidSharePointUrl(args.options.url);
+        const isValidSharePointUrl = utils_1.validation.isValidSharePointUrl(args.options.siteUrl);
         if (isValidSharePointUrl !== true) {
             return isValidSharePointUrl;
         }
-        if (!utils_1.validation.isValidGuid(args.options.hubSiteId)) {
-            return `${args.options.hubSiteId} is not a valid GUID`;
+        if (!utils_1.validation.isValidGuid(args.options.id)) {
+            return `${args.options.id} is not a valid GUID`;
         }
         return true;
     }));

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

@@ -37,13 +37,13 @@ class SpoHubSiteDisconnectCommand extends SpoCommand_1.default {
     commandAction(logger, args, cb) {
         const disconnectHubSite = () => {
             utils_1.spo
-                .getRequestDigest(args.options.url)
+                .getRequestDigest(args.options.siteUrl)
                 .then((res) => {
                 if (this.verbose) {
-                    logger.logToStderr(`Disconnecting site collection ${args.options.url} from its hubsite...`);
+                    logger.logToStderr(`Disconnecting site collection ${args.options.siteUrl} from its hubsite...`);
                 }
                 const requestOptions = {
-                    url: `${args.options.url}/_api/site/JoinHubSite('00000000-0000-0000-0000-000000000000')`,
+                    url: `${args.options.siteUrl}/_api/site/JoinHubSite('00000000-0000-0000-0000-000000000000')`,
                     headers: {
                         'X-RequestDigest': res.FormDigestValue,
                         accept: 'application/json;odata=nometadata'
@@ -62,7 +62,7 @@ class SpoHubSiteDisconnectCommand extends SpoCommand_1.default {
                 type: 'confirm',
                 name: 'continue',
                 default: false,
-                message: `Are you sure you want to disconnect the site collection ${args.options.url} from its hub site?`
+                message: `Are you sure you want to disconnect the site collection ${args.options.siteUrl} from its hub site?`
             }, (result) => {
                 if (!result.continue) {
                     cb();
@@ -82,12 +82,12 @@ _SpoHubSiteDisconnectCommand_instances = new WeakSet(), _SpoHubSiteDisconnectCom
     });
 }, _SpoHubSiteDisconnectCommand_initOptions = function _SpoHubSiteDisconnectCommand_initOptions() {
     this.options.unshift({
-        option: '-u, --url <url>'
+        option: '-u, --siteUrl <siteUrl>'
     }, {
         option: '--confirm'
     });
 }, _SpoHubSiteDisconnectCommand_initValidators = function _SpoHubSiteDisconnectCommand_initValidators() {
-    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () { return utils_1.validation.isValidSharePointUrl(args.options.url); }));
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () { return utils_1.validation.isValidSharePointUrl(args.options.siteUrl); }));
 };
 module.exports = new SpoHubSiteDisconnectCommand();
 //# sourceMappingURL=hubsite-disconnect.js.map

package/dist/m365/spo/commands/hubsite/hubsite-register.js

@@ -34,10 +34,10 @@ class SpoHubSiteRegisterCommand extends SpoCommand_1.default {
     }
     commandAction(logger, args, cb) {
         utils_1.spo
-            .getRequestDigest(args.options.url)
+            .getRequestDigest(args.options.siteUrl)
             .then((res) => {
             const requestOptions = {
-                url: `${args.options.url}/_api/site/RegisterHubSite`,
+                url: `${args.options.siteUrl}/_api/site/RegisterHubSite`,
                 headers: {
                     'X-RequestDigest': res.FormDigestValue,
                     accept: 'application/json;odata=nometadata'
@@ -54,10 +54,10 @@ class SpoHubSiteRegisterCommand extends SpoCommand_1.default {
 }
 _SpoHubSiteRegisterCommand_instances = new WeakSet(), _SpoHubSiteRegisterCommand_initOptions = function _SpoHubSiteRegisterCommand_initOptions() {
     this.options.unshift({
-        option: '-u, --url <url>'
+        option: '-u, --siteUrl <siteUrl>'
     });
 }, _SpoHubSiteRegisterCommand_initValidators = function _SpoHubSiteRegisterCommand_initValidators() {
-    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () { return utils_1.validation.isValidSharePointUrl(args.options.url); }));
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () { return utils_1.validation.isValidSharePointUrl(args.options.siteUrl); }));
 };
 module.exports = new SpoHubSiteRegisterCommand();
 //# sourceMappingURL=hubsite-register.js.map

package/dist/m365/spo/commands/hubsite/hubsite-rights-grant.js

@@ -44,7 +44,7 @@ class SpoHubSiteRightsGrantCommand extends SpoCommand_1.default {
         })
             .then((res) => {
             if (this.verbose) {
-                logger.logToStderr(`Granting permissions to join the hub site ${args.options.url} to principals ${args.options.principals}...`);
+                logger.logToStderr(`Granting permissions to join the hub site ${args.options.hubSiteUrl} to principals ${args.options.principals}...`);
             }
             const principals = args.options.principals
                 .split(',')
@@ -56,7 +56,7 @@ class SpoHubSiteRightsGrantCommand extends SpoCommand_1.default {
                 headers: {
                     'X-RequestDigest': res.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><ObjectPath Id="37" ObjectPathId="36" /><Method Name="GrantHubSiteRights" Id="38" ObjectPathId="36"><Parameters><Parameter Type="String">${utils_1.formatting.escapeXml(args.options.url)}</Parameter><Parameter Type="Array">${principals}</Parameter><Parameter Type="Enum">${grantedRights}</Parameter></Parameters></Method></Actions><ObjectPaths><Constructor Id="36" TypeId="{268004ae-ef6b-4e9b-8425-127220d84719}" /></ObjectPaths></Request>`
+                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><ObjectPath Id="37" ObjectPathId="36" /><Method Name="GrantHubSiteRights" Id="38" ObjectPathId="36"><Parameters><Parameter Type="String">${utils_1.formatting.escapeXml(args.options.hubSiteUrl)}</Parameter><Parameter Type="Array">${principals}</Parameter><Parameter Type="Enum">${grantedRights}</Parameter></Parameters></Method></Actions><ObjectPaths><Constructor Id="36" TypeId="{268004ae-ef6b-4e9b-8425-127220d84719}" /></ObjectPaths></Request>`
             };
             return request_1.default.post(requestOptions);
         })
@@ -73,7 +73,7 @@ class SpoHubSiteRightsGrantCommand extends SpoCommand_1.default {
 }
 _SpoHubSiteRightsGrantCommand_instances = new WeakSet(), _SpoHubSiteRightsGrantCommand_initOptions = function _SpoHubSiteRightsGrantCommand_initOptions() {
     this.options.unshift({
-        option: '-u, --url <url>'
+        option: '-u, --hubSiteUrl <hubSiteUrl>'
     }, {
         option: '-p, --principals <principals>'
     }, {
@@ -82,7 +82,7 @@ _SpoHubSiteRightsGrantCommand_instances = new WeakSet(), _SpoHubSiteRightsGrantC
     });
 }, _SpoHubSiteRightsGrantCommand_initValidators = function _SpoHubSiteRightsGrantCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        const isValidSharePointUrl = utils_1.validation.isValidSharePointUrl(args.options.url);
+        const isValidSharePointUrl = utils_1.validation.isValidSharePointUrl(args.options.hubSiteUrl);
         if (isValidSharePointUrl !== true) {
             return isValidSharePointUrl;
         }

package/dist/m365/spo/commands/hubsite/hubsite-rights-revoke.js

@@ -40,7 +40,7 @@ class SpoHubSiteRightsRevokeCommand extends SpoCommand_1.default {
         const revokeRights = () => {
             let spoAdminUrl = '';
             if (this.verbose) {
-                logger.logToStderr(`Revoking rights for ${args.options.principals} from ${args.options.url}...`);
+                logger.logToStderr(`Revoking rights for ${args.options.principals} from ${args.options.hubSiteUrl}...`);
             }
             utils_1.spo
                 .getSpoAdminUrl(logger, this.debug)
@@ -58,7 +58,7 @@ class SpoHubSiteRightsRevokeCommand extends SpoCommand_1.default {
                     headers: {
                         'X-RequestDigest': res.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><ObjectPath Id="10" ObjectPathId="9" /><Method Name="RevokeHubSiteRights" Id="11" ObjectPathId="9"><Parameters><Parameter Type="String">${utils_1.formatting.escapeXml(args.options.url)}</Parameter><Parameter Type="Array">${principals}</Parameter></Parameters></Method></Actions><ObjectPaths><Constructor Id="9" TypeId="{268004ae-ef6b-4e9b-8425-127220d84719}" /></ObjectPaths></Request>`
+                    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><ObjectPath Id="10" ObjectPathId="9" /><Method Name="RevokeHubSiteRights" Id="11" ObjectPathId="9"><Parameters><Parameter Type="String">${utils_1.formatting.escapeXml(args.options.hubSiteUrl)}</Parameter><Parameter Type="Array">${principals}</Parameter></Parameters></Method></Actions><ObjectPaths><Constructor Id="9" TypeId="{268004ae-ef6b-4e9b-8425-127220d84719}" /></ObjectPaths></Request>`
                 };
                 return request_1.default.post(requestOptions);
             })
@@ -80,7 +80,7 @@ class SpoHubSiteRightsRevokeCommand extends SpoCommand_1.default {
                 type: 'confirm',
                 name: 'continue',
                 default: false,
-                message: `Are you sure you want to revoke rights to join sites to the hub site ${args.options.url} from the specified users?`
+                message: `Are you sure you want to revoke rights to join sites to the hub site ${args.options.hubSiteUrl} from the specified users?`
             }, (result) => {
                 if (!result.continue) {
                     cb();
@@ -100,14 +100,14 @@ _SpoHubSiteRightsRevokeCommand_instances = new WeakSet(), _SpoHubSiteRightsRevok
     });
 }, _SpoHubSiteRightsRevokeCommand_initOptions = function _SpoHubSiteRightsRevokeCommand_initOptions() {
     this.options.unshift({
-        option: '-u, --url <url>'
+        option: '-u, --hubSiteUrl <hubSiteUrl>'
     }, {
         option: '-p, --principals <principals>'
     }, {
         option: '--confirm'
     });
 }, _SpoHubSiteRightsRevokeCommand_initValidators = function _SpoHubSiteRightsRevokeCommand_initValidators() {
-    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () { return utils_1.validation.isValidSharePointUrl(args.options.url); }));
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () { return utils_1.validation.isValidSharePointUrl(args.options.hubSiteUrl); }));
 };
 module.exports = new SpoHubSiteRightsRevokeCommand();
 //# sourceMappingURL=hubsite-rights-revoke.js.map

package/dist/m365/spo/commands/hubsite/hubsite-unregister.js

@@ -32,7 +32,7 @@ class SpoHubSiteUnregisterCommand extends SpoCommand_1.default {
         return commands_1.default.HUBSITE_UNREGISTER;
     }
     get description() {
-        return 'Unregisters the specifies site collection as a hub site';
+        return 'Unregisters the specified site collection as a hub site';
     }
     commandAction(logger, args, cb) {
         const unregisterHubSite = () => {

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

@@ -44,14 +44,14 @@ class SpoKnowledgehubSetCommand extends SpoCommand_1.default {
         })
             .then((res) => {
             if (this.verbose) {
-                logger.logToStderr(`Adding ${args.options.url} as the Knowledge Hub Site`);
+                logger.logToStderr(`Adding ${args.options.siteUrl} as the Knowledge Hub Site`);
             }
             const requestOptions = {
                 url: `${spoAdminUrl}/_vti_bin/client.svc/ProcessQuery`,
                 headers: {
                     'X-RequestDigest': res.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> <ObjectPath Id="35" ObjectPathId="34" /> <Method Name="SetKnowledgeHubSite" Id="36" ObjectPathId="34"> <Parameters> <Parameter Type="String">${utils_1.formatting.escapeXml(args.options.url)}</Parameter> </Parameters> </Method> </Actions> <ObjectPaths> <Constructor Id="34" TypeId="{268004ae-ef6b-4e9b-8425-127220d84719}" /> </ObjectPaths></Request>`
+                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> <ObjectPath Id="35" ObjectPathId="34" /> <Method Name="SetKnowledgeHubSite" Id="36" ObjectPathId="34"> <Parameters> <Parameter Type="String">${utils_1.formatting.escapeXml(args.options.siteUrl)}</Parameter> </Parameters> </Method> </Actions> <ObjectPaths> <Constructor Id="34" TypeId="{268004ae-ef6b-4e9b-8425-127220d84719}" /> </ObjectPaths></Request>`
             };
             return request_1.default.post(requestOptions);
         })
@@ -70,10 +70,10 @@ class SpoKnowledgehubSetCommand extends SpoCommand_1.default {
 }
 _SpoKnowledgehubSetCommand_instances = new WeakSet(), _SpoKnowledgehubSetCommand_initOptions = function _SpoKnowledgehubSetCommand_initOptions() {
     this.options.unshift({
-        option: '-u, --url <url>'
+        option: '-u, --siteUrl <siteUrl>'
     });
 }, _SpoKnowledgehubSetCommand_initValidators = function _SpoKnowledgehubSetCommand_initValidators() {
-    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () { return utils_1.validation.isValidSharePointUrl(args.options.url); }));
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () { return utils_1.validation.isValidSharePointUrl(args.options.siteUrl); }));
 };
 module.exports = new SpoKnowledgehubSetCommand();
 //# sourceMappingURL=knowledgehub-set.js.map

package/dist/m365/spo/commands/list/list-contenttype-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 _SpoListContentTypeAddCommand_instances, _SpoListContentTypeAddCommand_initTelemetry, _SpoListContentTypeAddCommand_initOptions, _SpoListContentTypeAddCommand_initValidators, _SpoListContentTypeAddCommand_initTypes;
+var _SpoListContentTypeAddCommand_instances, _SpoListContentTypeAddCommand_initTelemetry, _SpoListContentTypeAddCommand_initOptions, _SpoListContentTypeAddCommand_initValidators, _SpoListContentTypeAddCommand_initTypes, _SpoListContentTypeAddCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
 const utils_1 = require("../../../../utils");
@@ -27,6 +27,7 @@ class SpoListContentTypeAddCommand extends SpoCommand_1.default {
         __classPrivateFieldGet(this, _SpoListContentTypeAddCommand_instances, "m", _SpoListContentTypeAddCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _SpoListContentTypeAddCommand_instances, "m", _SpoListContentTypeAddCommand_initValidators).call(this);
         __classPrivateFieldGet(this, _SpoListContentTypeAddCommand_instances, "m", _SpoListContentTypeAddCommand_initTypes).call(this);
+        __classPrivateFieldGet(this, _SpoListContentTypeAddCommand_instances, "m", _SpoListContentTypeAddCommand_initOptionSets).call(this);
     }
     get name() {
         return commands_1.default.LIST_CONTENTTYPE_ADD;
@@ -37,7 +38,7 @@ class SpoListContentTypeAddCommand extends SpoCommand_1.default {
     commandAction(logger, args, cb) {
         if (this.verbose) {
             const list = (args.options.listId ? args.options.listId : args.options.listTitle);
-            logger.logToStderr(`Adding content type ${args.options.contentTypeId} to list ${list} in site at ${args.options.webUrl}...`);
+            logger.logToStderr(`Adding content type ${args.options.id} to list ${list} in site at ${args.options.webUrl}...`);
         }
         let requestUrl = '';
         if (args.options.listId) {
@@ -64,7 +65,7 @@ class SpoListContentTypeAddCommand extends SpoCommand_1.default {
     }
     mapRequestBody(options) {
         return {
-            contentTypeId: options.contentTypeId
+            contentTypeId: options.id
         };
     }
 }
@@ -83,7 +84,7 @@ _SpoListContentTypeAddCommand_instances = new WeakSet(), _SpoListContentTypeAddC
     }, {
         option: '-t, --listTitle [listTitle]'
     }, {
-        option: '-c, --contentTypeId <contentTypeId>'
+        option: '-i, --id <id>'
     });
 }, _SpoListContentTypeAddCommand_initValidators = function _SpoListContentTypeAddCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
@@ -96,16 +97,12 @@ _SpoListContentTypeAddCommand_instances = new WeakSet(), _SpoListContentTypeAddC
                 return `${args.options.listId} is not a valid GUID`;
             }
         }
-        if (args.options.listId && args.options.listTitle) {
-            return 'Specify listId or listTitle, but not both';
-        }
-        if (!args.options.listId && !args.options.listTitle) {
-            return 'Specify listId or listTitle, one is required';
-        }
         return true;
     }));
 }, _SpoListContentTypeAddCommand_initTypes = function _SpoListContentTypeAddCommand_initTypes() {
-    this.types.string.push('contentTypeId', 'c');
+    this.types.string.push('id', 'i');
+}, _SpoListContentTypeAddCommand_initOptionSets = function _SpoListContentTypeAddCommand_initOptionSets() {
+    this.optionSets.push(['listId', 'listTitle']);
 };
 module.exports = new SpoListContentTypeAddCommand();
 //# sourceMappingURL=list-contenttype-add.js.map

package/dist/m365/spo/commands/list/list-contenttype-default-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 _SpoListContentTypeDefaultSetCommand_instances, _SpoListContentTypeDefaultSetCommand_initTelemetry, _SpoListContentTypeDefaultSetCommand_initOptions, _SpoListContentTypeDefaultSetCommand_initValidators, _SpoListContentTypeDefaultSetCommand_initTypes;
+var _SpoListContentTypeDefaultSetCommand_instances, _SpoListContentTypeDefaultSetCommand_initTelemetry, _SpoListContentTypeDefaultSetCommand_initOptions, _SpoListContentTypeDefaultSetCommand_initValidators, _SpoListContentTypeDefaultSetCommand_initTypes, _SpoListContentTypeDefaultSetCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
 const utils_1 = require("../../../../utils");
@@ -27,6 +27,7 @@ class SpoListContentTypeDefaultSetCommand extends SpoCommand_1.default {
         __classPrivateFieldGet(this, _SpoListContentTypeDefaultSetCommand_instances, "m", _SpoListContentTypeDefaultSetCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _SpoListContentTypeDefaultSetCommand_instances, "m", _SpoListContentTypeDefaultSetCommand_initValidators).call(this);
         __classPrivateFieldGet(this, _SpoListContentTypeDefaultSetCommand_instances, "m", _SpoListContentTypeDefaultSetCommand_initTypes).call(this);
+        __classPrivateFieldGet(this, _SpoListContentTypeDefaultSetCommand_instances, "m", _SpoListContentTypeDefaultSetCommand_initOptionSets).call(this);
     }
     get name() {
         return commands_1.default.LIST_CONTENTTYPE_DEFAULT_SET;
@@ -180,16 +181,12 @@ _SpoListContentTypeDefaultSetCommand_instances = new WeakSet(), _SpoListContentT
                 return `${args.options.listId} is not a valid GUID`;
             }
         }
-        if (args.options.listId && args.options.listTitle) {
-            return 'Specify listId or listTitle, but not both';
-        }
-        if (!args.options.listId && !args.options.listTitle) {
-            return 'Specify listId or listTitle, one is required';
-        }
         return true;
     }));
 }, _SpoListContentTypeDefaultSetCommand_initTypes = function _SpoListContentTypeDefaultSetCommand_initTypes() {
     this.types.string.push('contentTypeId', 'c');
+}, _SpoListContentTypeDefaultSetCommand_initOptionSets = function _SpoListContentTypeDefaultSetCommand_initOptionSets() {
+    this.optionSets.push(['listId', 'listTitle']);
 };
 module.exports = new SpoListContentTypeDefaultSetCommand();
 //# sourceMappingURL=list-contenttype-default-set.js.map

package/dist/m365/spo/commands/list/list-contenttype-list.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 _SpoListContentTypeListCommand_instances, _SpoListContentTypeListCommand_initTelemetry, _SpoListContentTypeListCommand_initOptions, _SpoListContentTypeListCommand_initValidators;
+var _SpoListContentTypeListCommand_instances, _SpoListContentTypeListCommand_initTelemetry, _SpoListContentTypeListCommand_initOptions, _SpoListContentTypeListCommand_initValidators, _SpoListContentTypeListCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
 const utils_1 = require("../../../../utils");
@@ -26,6 +26,7 @@ class SpoListContentTypeListCommand extends SpoCommand_1.default {
         __classPrivateFieldGet(this, _SpoListContentTypeListCommand_instances, "m", _SpoListContentTypeListCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _SpoListContentTypeListCommand_instances, "m", _SpoListContentTypeListCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _SpoListContentTypeListCommand_instances, "m", _SpoListContentTypeListCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _SpoListContentTypeListCommand_instances, "m", _SpoListContentTypeListCommand_initOptionSets).call(this);
     }
     get name() {
         return commands_1.default.LIST_CONTENTTYPE_LIST;
@@ -90,14 +91,10 @@ _SpoListContentTypeListCommand_instances = new WeakSet(), _SpoListContentTypeLis
                 return `${args.options.listId} is not a valid GUID`;
             }
         }
-        if (args.options.listId && args.options.listTitle) {
-            return 'Specify listId or listTitle, but not both';
-        }
-        if (!args.options.listId && !args.options.listTitle) {
-            return 'Specify listId or listTitle, one is required';
-        }
         return true;
     }));
+}, _SpoListContentTypeListCommand_initOptionSets = function _SpoListContentTypeListCommand_initOptionSets() {
+    this.optionSets.push(['listId', 'listTitle']);
 };
 module.exports = new SpoListContentTypeListCommand();
 //# sourceMappingURL=list-contenttype-list.js.map

package/dist/m365/spo/commands/list/list-contenttype-remove.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 _SpoListContentTypeRemoveCommand_instances, _SpoListContentTypeRemoveCommand_initTelemetry, _SpoListContentTypeRemoveCommand_initOptions, _SpoListContentTypeRemoveCommand_initValidators, _SpoListContentTypeRemoveCommand_initTypes;
+var _SpoListContentTypeRemoveCommand_instances, _SpoListContentTypeRemoveCommand_initTelemetry, _SpoListContentTypeRemoveCommand_initOptions, _SpoListContentTypeRemoveCommand_initValidators, _SpoListContentTypeRemoveCommand_initTypes, _SpoListContentTypeRemoveCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
 const cli_1 = require("../../../../cli");
 const request_1 = require("../../../../request");
@@ -28,6 +28,7 @@ class SpoListContentTypeRemoveCommand extends SpoCommand_1.default {
         __classPrivateFieldGet(this, _SpoListContentTypeRemoveCommand_instances, "m", _SpoListContentTypeRemoveCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _SpoListContentTypeRemoveCommand_instances, "m", _SpoListContentTypeRemoveCommand_initValidators).call(this);
         __classPrivateFieldGet(this, _SpoListContentTypeRemoveCommand_instances, "m", _SpoListContentTypeRemoveCommand_initTypes).call(this);
+        __classPrivateFieldGet(this, _SpoListContentTypeRemoveCommand_instances, "m", _SpoListContentTypeRemoveCommand_initOptionSets).call(this);
     }
     get name() {
         return commands_1.default.LIST_CONTENTTYPE_REMOVE;
@@ -39,14 +40,14 @@ class SpoListContentTypeRemoveCommand extends SpoCommand_1.default {
         const removeContentTypeFromList = () => {
             if (this.verbose) {
                 const list = (args.options.listId ? args.options.listId : args.options.listTitle);
-                logger.logToStderr(`Removing content type ${args.options.contentTypeId} from list ${list} in site at ${args.options.webUrl}...`);
+                logger.logToStderr(`Removing content type ${args.options.id} from list ${list} in site at ${args.options.webUrl}...`);
             }
             let requestUrl = '';
             if (args.options.listId) {
-                requestUrl = `${args.options.webUrl}/_api/web/lists(guid'${utils_1.formatting.encodeQueryParameter(args.options.listId)}')/ContentTypes('${encodeURIComponent(args.options.contentTypeId)}')`;
+                requestUrl = `${args.options.webUrl}/_api/web/lists(guid'${utils_1.formatting.encodeQueryParameter(args.options.listId)}')/ContentTypes('${encodeURIComponent(args.options.id)}')`;
             }
             else {
-                requestUrl = `${args.options.webUrl}/_api/web/lists/GetByTitle('${utils_1.formatting.encodeQueryParameter(args.options.listTitle)}')/ContentTypes('${encodeURIComponent(args.options.contentTypeId)}')`;
+                requestUrl = `${args.options.webUrl}/_api/web/lists/GetByTitle('${utils_1.formatting.encodeQueryParameter(args.options.listTitle)}')/ContentTypes('${encodeURIComponent(args.options.id)}')`;
             }
             const requestOptions = {
                 url: requestUrl,
@@ -72,7 +73,7 @@ class SpoListContentTypeRemoveCommand extends SpoCommand_1.default {
                 type: 'confirm',
                 name: 'continue',
                 default: false,
-                message: `Are you sure you want to remove the content type ${args.options.contentTypeId} from the list ${args.options.listId || args.options.listTitle} in site ${args.options.webUrl}?`
+                message: `Are you sure you want to remove the content type ${args.options.id} from the list ${args.options.listId || args.options.listTitle} in site ${args.options.webUrl}?`
             }, (result) => {
                 if (!result.continue) {
                     cb();
@@ -100,7 +101,7 @@ _SpoListContentTypeRemoveCommand_instances = new WeakSet(), _SpoListContentTypeR
     }, {
         option: '-t, --listTitle [listTitle]'
     }, {
-        option: '-c, --contentTypeId <contentTypeId>'
+        option: '-i, --id <id>'
     }, {
         option: '--confirm'
     });
@@ -115,16 +116,12 @@ _SpoListContentTypeRemoveCommand_instances = new WeakSet(), _SpoListContentTypeR
                 return `${args.options.listId} is not a valid GUID`;
             }
         }
-        if (args.options.listId && args.options.listTitle) {
-            return 'Specify listId or listTitle, but not both';
-        }
-        if (!args.options.listId && !args.options.listTitle) {
-            return 'Specify listId or listTitle, one is required';
-        }
         return true;
     }));
 }, _SpoListContentTypeRemoveCommand_initTypes = function _SpoListContentTypeRemoveCommand_initTypes() {
-    this.types.string.push('contentTypeId', 'c');
+    this.types.string.push('id', 'i');
+}, _SpoListContentTypeRemoveCommand_initOptionSets = function _SpoListContentTypeRemoveCommand_initOptionSets() {
+    this.optionSets.push(['listId', 'listTitle']);
 };
 module.exports = new SpoListContentTypeRemoveCommand();
 //# sourceMappingURL=list-contenttype-remove.js.map