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

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

@@ -50,7 +50,7 @@ class SpoSiteDesignRightsGrantCommand extends SpoCommand_1.default {
                     accept: 'application/json;odata=nometadata'
                 },
                 data: {
-                    id: args.options.id,
+                    id: args.options.siteDesignId,
                     principalNames: args.options.principals.split(',').map(p => p.trim()),
                     grantedRights: grantedRights
                 },
@@ -63,7 +63,7 @@ class SpoSiteDesignRightsGrantCommand extends SpoCommand_1.default {
 }
 _SpoSiteDesignRightsGrantCommand_instances = new WeakSet(), _SpoSiteDesignRightsGrantCommand_initOptions = function _SpoSiteDesignRightsGrantCommand_initOptions() {
     this.options.unshift({
-        option: '-i, --id <id>'
+        option: '-i, --siteDesignId <siteDesignId>'
     }, {
         option: '-p, --principals <principals>'
     }, {
@@ -72,8 +72,8 @@ _SpoSiteDesignRightsGrantCommand_instances = new WeakSet(), _SpoSiteDesignRights
     });
 }, _SpoSiteDesignRightsGrantCommand_initValidators = function _SpoSiteDesignRightsGrantCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (!utils_1.validation.isValidGuid(args.options.id)) {
-            return `${args.options.id} is not a valid GUID`;
+        if (!utils_1.validation.isValidGuid(args.options.siteDesignId)) {
+            return `${args.options.siteDesignId} is not a valid GUID`;
         }
         if (args.options.rights !== 'View') {
             return `${args.options.rights} is not a valid rights value. Allowed values View`;

package/dist/m365/spo/commands/sitedesign/sitedesign-rights-list.js

@@ -48,7 +48,7 @@ class SpoSiteDesignRightsListCommand extends SpoCommand_1.default {
                     'content-type': 'application/json;charset=utf-8',
                     accept: 'application/json;odata=nometadata'
                 },
-                data: { id: args.options.id },
+                data: { id: args.options.siteDesignId },
                 responseType: 'json'
             };
             return request_1.default.post(requestOptions);
@@ -64,12 +64,12 @@ class SpoSiteDesignRightsListCommand extends SpoCommand_1.default {
 }
 _SpoSiteDesignRightsListCommand_instances = new WeakSet(), _SpoSiteDesignRightsListCommand_initOptions = function _SpoSiteDesignRightsListCommand_initOptions() {
     this.options.unshift({
-        option: '-i, --id <id>'
+        option: '-i, --siteDesignId <siteDesignId>'
     });
 }, _SpoSiteDesignRightsListCommand_initValidators = function _SpoSiteDesignRightsListCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (!utils_1.validation.isValidGuid(args.options.id)) {
-            return `${args.options.id} is not a valid GUID`;
+        if (!utils_1.validation.isValidGuid(args.options.siteDesignId)) {
+            return `${args.options.siteDesignId} is not a valid GUID`;
         }
         return true;
     }));

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

@@ -52,7 +52,7 @@ class SpoSiteDesignRightsRevokeCommand extends SpoCommand_1.default {
                         accept: 'application/json;odata=nometadata'
                     },
                     data: {
-                        id: args.options.id,
+                        id: args.options.siteDesignId,
                         principalNames: args.options.principals.split(',').map(p => p.trim())
                     },
                     responseType: 'json'
@@ -69,7 +69,7 @@ class SpoSiteDesignRightsRevokeCommand extends SpoCommand_1.default {
                 type: 'confirm',
                 name: 'continue',
                 default: false,
-                message: `Are you sure you want to revoke access to site design ${args.options.id} from the specified users?`
+                message: `Are you sure you want to revoke access to site design ${args.options.siteDesignId} from the specified users?`
             }, (result) => {
                 if (!result.continue) {
                     cb();
@@ -89,7 +89,7 @@ _SpoSiteDesignRightsRevokeCommand_instances = new WeakSet(), _SpoSiteDesignRight
     });
 }, _SpoSiteDesignRightsRevokeCommand_initOptions = function _SpoSiteDesignRightsRevokeCommand_initOptions() {
     this.options.unshift({
-        option: '-i, --id <id>'
+        option: '-i, --siteDesignId <siteDesignId>'
     }, {
         option: '-p, --principals <principals>'
     }, {
@@ -97,8 +97,8 @@ _SpoSiteDesignRightsRevokeCommand_instances = new WeakSet(), _SpoSiteDesignRight
     });
 }, _SpoSiteDesignRightsRevokeCommand_initValidators = function _SpoSiteDesignRightsRevokeCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (!utils_1.validation.isValidGuid(args.options.id)) {
-            return `${args.options.id} is not a valid GUID`;
+        if (!utils_1.validation.isValidGuid(args.options.siteDesignId)) {
+            return `${args.options.siteDesignId} is not a valid GUID`;
         }
         return true;
     }));

package/dist/m365/spo/commands/sitedesign/sitedesign-task-get.js

@@ -42,7 +42,7 @@ class SpoSiteDesignTaskGetCommand extends SpoCommand_1.default {
                     accept: 'application/json;odata=nometadata'
                 },
                 data: {
-                    taskId: args.options.taskId
+                    taskId: args.options.id
                 },
                 responseType: 'json'
             };
@@ -58,12 +58,12 @@ class SpoSiteDesignTaskGetCommand extends SpoCommand_1.default {
 }
 _SpoSiteDesignTaskGetCommand_instances = new WeakSet(), _SpoSiteDesignTaskGetCommand_initOptions = function _SpoSiteDesignTaskGetCommand_initOptions() {
     this.options.unshift({
-        option: '-i, --taskId <taskId>'
+        option: '-i, --id <id>'
     });
 }, _SpoSiteDesignTaskGetCommand_initValidators = function _SpoSiteDesignTaskGetCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (!utils_1.validation.isValidGuid(args.options.taskId)) {
-            return `${args.options.taskId} 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/sitedesign/sitedesign-task-remove.js

@@ -45,7 +45,7 @@ class SpoSiteDesignTaskRemoveCommand extends SpoCommand_1.default {
                         accept: 'application/json;odata=nometadata'
                     },
                     data: {
-                        taskId: args.options.taskId
+                        taskId: args.options.id
                     },
                     responseType: 'json'
                 };
@@ -61,7 +61,7 @@ class SpoSiteDesignTaskRemoveCommand extends SpoCommand_1.default {
                 type: 'confirm',
                 name: 'continue',
                 default: false,
-                message: `Are you sure you want to remove the site design task ${args.options.taskId}?`
+                message: `Are you sure you want to remove the site design task ${args.options.id}?`
             }, (result) => {
                 if (!result.continue) {
                     cb();
@@ -81,14 +81,14 @@ _SpoSiteDesignTaskRemoveCommand_instances = new WeakSet(), _SpoSiteDesignTaskRem
     });
 }, _SpoSiteDesignTaskRemoveCommand_initOptions = function _SpoSiteDesignTaskRemoveCommand_initOptions() {
     this.options.unshift({
-        option: '-i, --taskId <taskId>'
+        option: '-i, --id <id>'
     }, {
         option: '--confirm'
     });
 }, _SpoSiteDesignTaskRemoveCommand_initValidators = function _SpoSiteDesignTaskRemoveCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (!utils_1.validation.isValidGuid(args.options.taskId)) {
-            return `${args.options.taskId} 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/tenant/tenant-recyclebinitem-remove.js

@@ -46,14 +46,14 @@ class SpoTenantRecycleBinItemRemoveCommand extends SpoCommand_1.default {
                 .then((res) => {
                 this.context = res;
                 if (this.verbose) {
-                    logger.logToStderr(`Removing deleted site collection ${args.options.url}...`);
+                    logger.logToStderr(`Removing deleted site collection ${args.options.siteUrl}...`);
                 }
                 const requestOptions = {
                     url: `${this.spoAdminUrl}/_vti_bin/client.svc/ProcessQuery`,
                     headers: {
                         'X-RequestDigest': this.context.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="16" ObjectPathId="15" /><Query Id="17" ObjectPathId="15"><Query SelectAllProperties="false"><Properties><Property Name="PollingInterval" ScalarProperty="true" /><Property Name="IsComplete" ScalarProperty="true" /></Properties></Query></Query></Actions><ObjectPaths><Method Id="15" ParentId="1" Name="RemoveDeletedSite"><Parameters><Parameter Type="String">${utils_1.formatting.escapeXml(args.options.url)}</Parameter></Parameters></Method><Constructor Id="1" 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="16" ObjectPathId="15" /><Query Id="17" ObjectPathId="15"><Query SelectAllProperties="false"><Properties><Property Name="PollingInterval" ScalarProperty="true" /><Property Name="IsComplete" ScalarProperty="true" /></Properties></Query></Query></Actions><ObjectPaths><Method Id="15" ParentId="1" Name="RemoveDeletedSite"><Parameters><Parameter Type="String">${utils_1.formatting.escapeXml(args.options.siteUrl)}</Parameter></Parameters></Method><Constructor Id="1" TypeId="{268004ae-ef6b-4e9b-8425-127220d84719}" /></ObjectPaths></Request>`
                 };
                 return request_1.default.post(requestOptions);
             })
@@ -97,7 +97,7 @@ class SpoTenantRecycleBinItemRemoveCommand extends SpoCommand_1.default {
                 type: 'confirm',
                 name: 'continue',
                 default: false,
-                message: `Are you sure you want to remove the deleted site collection ${args.options.url} from tenant recycle bin?`
+                message: `Are you sure you want to remove the deleted site collection ${args.options.siteUrl} from tenant recycle bin?`
             }, (result) => {
                 if (!result.continue) {
                     cb();
@@ -118,14 +118,14 @@ _SpoTenantRecycleBinItemRemoveCommand_instances = new WeakSet(), _SpoTenantRecyc
     });
 }, _SpoTenantRecycleBinItemRemoveCommand_initOptions = function _SpoTenantRecycleBinItemRemoveCommand_initOptions() {
     this.options.unshift({
-        option: '-u, --url <url>'
+        option: '-u, --siteUrl <siteUrl>'
     }, {
         option: '--wait'
     }, {
         option: '--confirm'
     });
 }, _SpoTenantRecycleBinItemRemoveCommand_initValidators = function _SpoTenantRecycleBinItemRemoveCommand_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 SpoTenantRecycleBinItemRemoveCommand();
 //# sourceMappingURL=tenant-recyclebinitem-remove.js.map

package/dist/m365/spo/commands/tenant/tenant-recyclebinitem-restore.js

@@ -44,7 +44,7 @@ class SpoTenantRecycleBinItemRestoreCommand extends SpoCommand_1.default {
                     'content-type': 'application/json;charset=utf-8'
                 },
                 data: {
-                    siteUrl: args.options.url
+                    siteUrl: args.options.siteUrl
                 }
             };
             return request_1.default.post(requestOptions);
@@ -63,12 +63,12 @@ _SpoTenantRecycleBinItemRestoreCommand_instances = new WeakSet(), _SpoTenantRecy
     });
 }, _SpoTenantRecycleBinItemRestoreCommand_initOptions = function _SpoTenantRecycleBinItemRestoreCommand_initOptions() {
     this.options.unshift({
-        option: '-u, --url <url>'
+        option: '-u, --siteUrl <siteUrl>'
     }, {
         option: '--wait'
     });
 }, _SpoTenantRecycleBinItemRestoreCommand_initValidators = function _SpoTenantRecycleBinItemRestoreCommand_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 SpoTenantRecycleBinItemRestoreCommand();
 //# sourceMappingURL=tenant-recyclebinitem-restore.js.map

package/dist/m365/spo/commands/term/term-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 _SpoTermAddCommand_instances, _SpoTermAddCommand_initTelemetry, _SpoTermAddCommand_initOptions, _SpoTermAddCommand_initValidators;
+var _SpoTermAddCommand_instances, _SpoTermAddCommand_initTelemetry, _SpoTermAddCommand_initOptions, _SpoTermAddCommand_initValidators, _SpoTermAddCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
 const uuid_1 = require("uuid");
 const Command_1 = require("../../../../Command");
@@ -29,6 +29,7 @@ class SpoTermAddCommand extends SpoCommand_1.default {
         __classPrivateFieldGet(this, _SpoTermAddCommand_instances, "m", _SpoTermAddCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _SpoTermAddCommand_instances, "m", _SpoTermAddCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _SpoTermAddCommand_instances, "m", _SpoTermAddCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _SpoTermAddCommand_instances, "m", _SpoTermAddCommand_initOptionSets).call(this);
     }
     get name() {
         return commands_1.default.TERM_ADD;
@@ -191,12 +192,6 @@ _SpoTermAddCommand_instances = new WeakSet(), _SpoTermAddCommand_initTelemetry =
                 return 'Specify either parentTermId, termSetId or termSetName but not both';
             }
         }
-        if (!args.options.termGroupId && !args.options.termGroupName) {
-            return 'Specify termGroupId or termGroupName';
-        }
-        if (args.options.termGroupId && args.options.termGroupName) {
-            return 'Specify termGroupId or termGroupName but not both';
-        }
         if (args.options.termGroupId) {
             if (!utils_1.validation.isValidGuid(args.options.termGroupId)) {
                 return `${args.options.termGroupId} is not a valid GUID`;
@@ -231,6 +226,8 @@ _SpoTermAddCommand_instances = new WeakSet(), _SpoTermAddCommand_initTelemetry =
         }
         return true;
     }));
+}, _SpoTermAddCommand_initOptionSets = function _SpoTermAddCommand_initOptionSets() {
+    this.optionSets.push(['termGroupId', 'termGroupName']);
 };
 module.exports = new SpoTermAddCommand();
 //# sourceMappingURL=term-add.js.map

package/dist/m365/spo/commands/term/term-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 _SpoTermGetCommand_instances, _SpoTermGetCommand_initTelemetry, _SpoTermGetCommand_initOptions, _SpoTermGetCommand_initValidators;
+var _SpoTermGetCommand_instances, _SpoTermGetCommand_initTelemetry, _SpoTermGetCommand_initOptions, _SpoTermGetCommand_initValidators, _SpoTermGetCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
 const Command_1 = require("../../../../Command");
 const config_1 = require("../../../../config");
@@ -28,6 +28,7 @@ class SpoTermGetCommand extends SpoCommand_1.default {
         __classPrivateFieldGet(this, _SpoTermGetCommand_instances, "m", _SpoTermGetCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _SpoTermGetCommand_instances, "m", _SpoTermGetCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _SpoTermGetCommand_instances, "m", _SpoTermGetCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _SpoTermGetCommand_instances, "m", _SpoTermGetCommand_initOptionSets).call(this);
     }
     get name() {
         return commands_1.default.TERM_GET;
@@ -114,12 +115,6 @@ _SpoTermGetCommand_instances = new WeakSet(), _SpoTermGetCommand_initTelemetry =
     });
 }, _SpoTermGetCommand_initValidators = function _SpoTermGetCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (!args.options.id && !args.options.name) {
-            return 'Specify either id or name';
-        }
-        if (args.options.id && args.options.name) {
-            return 'Specify either id or name but not both';
-        }
         if (args.options.id) {
             if (!utils_1.validation.isValidGuid(args.options.id)) {
                 return `${args.options.id} is not a valid GUID`;
@@ -151,6 +146,8 @@ _SpoTermGetCommand_instances = new WeakSet(), _SpoTermGetCommand_initTelemetry =
         }
         return true;
     }));
+}, _SpoTermGetCommand_initOptionSets = function _SpoTermGetCommand_initOptionSets() {
+    this.optionSets.push(['id', 'name']);
 };
 module.exports = new SpoTermGetCommand();
 //# sourceMappingURL=term-get.js.map

package/dist/m365/spo/commands/term/term-group-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 _SpoTermGroupGetCommand_instances, _SpoTermGroupGetCommand_initTelemetry, _SpoTermGroupGetCommand_initOptions, _SpoTermGroupGetCommand_initValidators;
+var _SpoTermGroupGetCommand_instances, _SpoTermGroupGetCommand_initTelemetry, _SpoTermGroupGetCommand_initOptions, _SpoTermGroupGetCommand_initValidators, _SpoTermGroupGetCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
 const Command_1 = require("../../../../Command");
 const config_1 = require("../../../../config");
@@ -28,6 +28,7 @@ class SpoTermGroupGetCommand extends SpoCommand_1.default {
         __classPrivateFieldGet(this, _SpoTermGroupGetCommand_instances, "m", _SpoTermGroupGetCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _SpoTermGroupGetCommand_instances, "m", _SpoTermGroupGetCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _SpoTermGroupGetCommand_instances, "m", _SpoTermGroupGetCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _SpoTermGroupGetCommand_instances, "m", _SpoTermGroupGetCommand_initOptionSets).call(this);
     }
     get name() {
         return commands_1.default.TERM_GROUP_GET;
@@ -90,12 +91,6 @@ _SpoTermGroupGetCommand_instances = new WeakSet(), _SpoTermGroupGetCommand_initT
     });
 }, _SpoTermGroupGetCommand_initValidators = function _SpoTermGroupGetCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (!args.options.id && !args.options.name) {
-            return 'Specify either id or name';
-        }
-        if (args.options.id && args.options.name) {
-            return 'Specify either id or name but not both';
-        }
         if (args.options.id) {
             if (!utils_1.validation.isValidGuid(args.options.id)) {
                 return `${args.options.id} is not a valid GUID`;
@@ -103,6 +98,8 @@ _SpoTermGroupGetCommand_instances = new WeakSet(), _SpoTermGroupGetCommand_initT
         }
         return true;
     }));
+}, _SpoTermGroupGetCommand_initOptionSets = function _SpoTermGroupGetCommand_initOptionSets() {
+    this.optionSets.push(['id', 'name']);
 };
 module.exports = new SpoTermGroupGetCommand();
 //# sourceMappingURL=term-group-get.js.map

package/dist/m365/spo/commands/term/term-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 _SpoTermListCommand_instances, _SpoTermListCommand_initTelemetry, _SpoTermListCommand_initOptions, _SpoTermListCommand_initValidators;
+var _SpoTermListCommand_instances, _SpoTermListCommand_initTelemetry, _SpoTermListCommand_initOptions, _SpoTermListCommand_initValidators, _SpoTermListCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
 const Command_1 = require("../../../../Command");
 const config_1 = require("../../../../config");
@@ -28,6 +28,7 @@ class SpoTermListCommand extends SpoCommand_1.default {
         __classPrivateFieldGet(this, _SpoTermListCommand_instances, "m", _SpoTermListCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _SpoTermListCommand_instances, "m", _SpoTermListCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _SpoTermListCommand_instances, "m", _SpoTermListCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _SpoTermListCommand_instances, "m", _SpoTermListCommand_initOptionSets).call(this);
     }
     get name() {
         return commands_1.default.TERM_LIST;
@@ -102,23 +103,11 @@ _SpoTermListCommand_instances = new WeakSet(), _SpoTermListCommand_initTelemetry
     });
 }, _SpoTermListCommand_initValidators = function _SpoTermListCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (!args.options.termGroupId && !args.options.termGroupName) {
-            return 'Specify either termGroupId or termGroupName';
-        }
-        if (args.options.termGroupId && args.options.termGroupName) {
-            return 'Specify either termGroupId or termGroupName but not both';
-        }
         if (args.options.termGroupId) {
             if (!utils_1.validation.isValidGuid(args.options.termGroupId)) {
                 return `${args.options.termGroupId} is not a valid GUID`;
             }
         }
-        if (!args.options.termSetId && !args.options.termSetName) {
-            return 'Specify either termSetId or termSetName';
-        }
-        if (args.options.termSetId && args.options.termSetName) {
-            return 'Specify either termSetId or termSetName but not both';
-        }
         if (args.options.termSetId) {
             if (!utils_1.validation.isValidGuid(args.options.termSetId)) {
                 return `${args.options.termSetId} is not a valid GUID`;
@@ -126,6 +115,8 @@ _SpoTermListCommand_instances = new WeakSet(), _SpoTermListCommand_initTelemetry
         }
         return true;
     }));
+}, _SpoTermListCommand_initOptionSets = function _SpoTermListCommand_initOptionSets() {
+    this.optionSets.push(['termGroupId', 'termGroupName'], ['termSetId', 'termSetName']);
 };
 module.exports = new SpoTermListCommand();
 //# sourceMappingURL=term-list.js.map

package/dist/m365/spo/commands/term/term-set-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 _SpoTermSetAddCommand_instances, _SpoTermSetAddCommand_initTelemetry, _SpoTermSetAddCommand_initOptions, _SpoTermSetAddCommand_initValidators;
+var _SpoTermSetAddCommand_instances, _SpoTermSetAddCommand_initTelemetry, _SpoTermSetAddCommand_initOptions, _SpoTermSetAddCommand_initValidators, _SpoTermSetAddCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
 const uuid_1 = require("uuid");
 const Command_1 = require("../../../../Command");
@@ -29,6 +29,7 @@ class SpoTermSetAddCommand extends SpoCommand_1.default {
         __classPrivateFieldGet(this, _SpoTermSetAddCommand_instances, "m", _SpoTermSetAddCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _SpoTermSetAddCommand_instances, "m", _SpoTermSetAddCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _SpoTermSetAddCommand_instances, "m", _SpoTermSetAddCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _SpoTermSetAddCommand_instances, "m", _SpoTermSetAddCommand_initOptionSets).call(this);
     }
     get name() {
         return commands_1.default.TERM_SET_ADD;
@@ -159,12 +160,6 @@ _SpoTermSetAddCommand_instances = new WeakSet(), _SpoTermSetAddCommand_initTelem
                 return `${args.options.id} is not a valid GUID`;
             }
         }
-        if (!args.options.termGroupId && !args.options.termGroupName) {
-            return 'Specify termGroupId or termGroupName';
-        }
-        if (args.options.termGroupId && args.options.termGroupName) {
-            return 'Specify termGroupId or termGroupName but not both';
-        }
         if (args.options.termGroupId) {
             if (!utils_1.validation.isValidGuid(args.options.termGroupId)) {
                 return `${args.options.termGroupId} is not a valid GUID`;
@@ -180,6 +175,8 @@ _SpoTermSetAddCommand_instances = new WeakSet(), _SpoTermSetAddCommand_initTelem
         }
         return true;
     }));
+}, _SpoTermSetAddCommand_initOptionSets = function _SpoTermSetAddCommand_initOptionSets() {
+    this.optionSets.push(['termGroupId', 'termGroupName']);
 };
 module.exports = new SpoTermSetAddCommand();
 //# sourceMappingURL=term-set-add.js.map

package/dist/m365/spo/commands/term/term-set-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 _SpoTermSetGetCommand_instances, _SpoTermSetGetCommand_initTelemetry, _SpoTermSetGetCommand_initOptions, _SpoTermSetGetCommand_initValidators;
+var _SpoTermSetGetCommand_instances, _SpoTermSetGetCommand_initTelemetry, _SpoTermSetGetCommand_initOptions, _SpoTermSetGetCommand_initValidators, _SpoTermSetGetCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
 const Command_1 = require("../../../../Command");
 const config_1 = require("../../../../config");
@@ -28,6 +28,7 @@ class SpoTermSetGetCommand extends SpoCommand_1.default {
         __classPrivateFieldGet(this, _SpoTermSetGetCommand_instances, "m", _SpoTermSetGetCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _SpoTermSetGetCommand_instances, "m", _SpoTermSetGetCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _SpoTermSetGetCommand_instances, "m", _SpoTermSetGetCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _SpoTermSetGetCommand_instances, "m", _SpoTermSetGetCommand_initOptionSets).call(this);
     }
     get name() {
         return commands_1.default.TERM_SET_GET;
@@ -97,23 +98,11 @@ _SpoTermSetGetCommand_instances = new WeakSet(), _SpoTermSetGetCommand_initTelem
     });
 }, _SpoTermSetGetCommand_initValidators = function _SpoTermSetGetCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (!args.options.id && !args.options.name) {
-            return 'Specify either id or name';
-        }
-        if (args.options.id && args.options.name) {
-            return 'Specify either id or name but not both';
-        }
         if (args.options.id) {
             if (!utils_1.validation.isValidGuid(args.options.id)) {
                 return `${args.options.id} is not a valid GUID`;
             }
         }
-        if (!args.options.termGroupId && !args.options.termGroupName) {
-            return 'Specify termGroupId or termGroupName';
-        }
-        if (args.options.termGroupId && args.options.termGroupName) {
-            return 'Specify termGroupId or termGroupName but not both';
-        }
         if (args.options.termGroupId) {
             if (!utils_1.validation.isValidGuid(args.options.termGroupId)) {
                 return `${args.options.termGroupId} is not a valid GUID`;
@@ -121,6 +110,8 @@ _SpoTermSetGetCommand_instances = new WeakSet(), _SpoTermSetGetCommand_initTelem
         }
         return true;
     }));
+}, _SpoTermSetGetCommand_initOptionSets = function _SpoTermSetGetCommand_initOptionSets() {
+    this.optionSets.push(['id', 'name'], ['termGroupId', 'termGroupName']);
 };
 module.exports = new SpoTermSetGetCommand();
 //# sourceMappingURL=term-set-get.js.map

package/dist/m365/spo/commands/term/term-set-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 _SpoTermSetListCommand_instances, _SpoTermSetListCommand_initTelemetry, _SpoTermSetListCommand_initOptions, _SpoTermSetListCommand_initValidators;
+var _SpoTermSetListCommand_instances, _SpoTermSetListCommand_initTelemetry, _SpoTermSetListCommand_initOptions, _SpoTermSetListCommand_initValidators, _SpoTermSetListCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
 const Command_1 = require("../../../../Command");
 const config_1 = require("../../../../config");
@@ -28,6 +28,7 @@ class SpoTermSetListCommand extends SpoCommand_1.default {
         __classPrivateFieldGet(this, _SpoTermSetListCommand_instances, "m", _SpoTermSetListCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _SpoTermSetListCommand_instances, "m", _SpoTermSetListCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _SpoTermSetListCommand_instances, "m", _SpoTermSetListCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _SpoTermSetListCommand_instances, "m", _SpoTermSetListCommand_initOptionSets).call(this);
     }
     get name() {
         return commands_1.default.TERM_SET_LIST;
@@ -96,12 +97,6 @@ _SpoTermSetListCommand_instances = new WeakSet(), _SpoTermSetListCommand_initTel
     });
 }, _SpoTermSetListCommand_initValidators = function _SpoTermSetListCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (!args.options.termGroupId && !args.options.termGroupName) {
-            return 'Specify either termGroupId or termGroupName';
-        }
-        if (args.options.termGroupId && args.options.termGroupName) {
-            return 'Specify either termGroupId or termGroupName but not both';
-        }
         if (args.options.termGroupId) {
             if (!utils_1.validation.isValidGuid(args.options.termGroupId)) {
                 return `${args.options.termGroupId} is not a valid GUID`;
@@ -109,6 +104,8 @@ _SpoTermSetListCommand_instances = new WeakSet(), _SpoTermSetListCommand_initTel
         }
         return true;
     }));
+}, _SpoTermSetListCommand_initOptionSets = function _SpoTermSetListCommand_initOptionSets() {
+    this.optionSets.push(['termGroupId', 'termGroupName']);
 };
 module.exports = new SpoTermSetListCommand();
 //# sourceMappingURL=term-set-list.js.map

package/dist/m365/spo/commands/user/user-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 _SpoUserGetCommand_instances, _SpoUserGetCommand_initTelemetry, _SpoUserGetCommand_initOptions, _SpoUserGetCommand_initValidators;
+var _SpoUserGetCommand_instances, _SpoUserGetCommand_initTelemetry, _SpoUserGetCommand_initOptions, _SpoUserGetCommand_initValidators, _SpoUserGetCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
 const utils_1 = require("../../../../utils");
@@ -26,6 +26,7 @@ class SpoUserGetCommand extends SpoCommand_1.default {
         __classPrivateFieldGet(this, _SpoUserGetCommand_instances, "m", _SpoUserGetCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _SpoUserGetCommand_instances, "m", _SpoUserGetCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _SpoUserGetCommand_instances, "m", _SpoUserGetCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _SpoUserGetCommand_instances, "m", _SpoUserGetCommand_initOptionSets).call(this);
     }
     get name() {
         return commands_1.default.USER_GET;
@@ -83,20 +84,14 @@ _SpoUserGetCommand_instances = new WeakSet(), _SpoUserGetCommand_initTelemetry =
     });
 }, _SpoUserGetCommand_initValidators = function _SpoUserGetCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (!args.options.id && !args.options.email && !args.options.loginName) {
-            return 'Specify id, email or loginName, one is required';
-        }
-        if ((args.options.id && args.options.email) ||
-            (args.options.id && args.options.loginName) ||
-            (args.options.loginName && args.options.email)) {
-            return 'Use either email, id or loginName, but not all';
-        }
         if (args.options.id &&
             typeof args.options.id !== 'number') {
             return `Specified id ${args.options.id} is not a number`;
         }
         return utils_1.validation.isValidSharePointUrl(args.options.webUrl);
     }));
+}, _SpoUserGetCommand_initOptionSets = function _SpoUserGetCommand_initOptionSets() {
+    this.optionSets.push(['id', 'email', 'loginName']);
 };
 module.exports = new SpoUserGetCommand();
 //# sourceMappingURL=user-get.js.map

package/dist/m365/spo/commands/user/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 _SpoUserRemoveCommand_instances, _SpoUserRemoveCommand_initTelemetry, _SpoUserRemoveCommand_initOptions, _SpoUserRemoveCommand_initValidators;
+var _SpoUserRemoveCommand_instances, _SpoUserRemoveCommand_initTelemetry, _SpoUserRemoveCommand_initOptions, _SpoUserRemoveCommand_initValidators, _SpoUserRemoveCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
 const cli_1 = require("../../../../cli");
 const request_1 = require("../../../../request");
@@ -27,6 +27,7 @@ class SpoUserRemoveCommand extends SpoCommand_1.default {
         __classPrivateFieldGet(this, _SpoUserRemoveCommand_instances, "m", _SpoUserRemoveCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _SpoUserRemoveCommand_instances, "m", _SpoUserRemoveCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _SpoUserRemoveCommand_instances, "m", _SpoUserRemoveCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _SpoUserRemoveCommand_instances, "m", _SpoUserRemoveCommand_initOptionSets).call(this);
     }
     get name() {
         return commands_1.default.USER_REMOVE;
@@ -97,14 +98,10 @@ _SpoUserRemoveCommand_instances = new WeakSet(), _SpoUserRemoveCommand_initTelem
     });
 }, _SpoUserRemoveCommand_initValidators = function _SpoUserRemoveCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (!args.options.id && !args.options.loginName) {
-            return 'Required option id or loginName missing, one is required';
-        }
-        if (args.options.id && args.options.loginName) {
-            return 'Use either id or loginName, but not both';
-        }
         return utils_1.validation.isValidSharePointUrl(args.options.webUrl);
     }));
+}, _SpoUserRemoveCommand_initOptionSets = function _SpoUserRemoveCommand_initOptionSets() {
+    this.optionSets.push(['id', 'loginName']);
 };
 module.exports = new SpoUserRemoveCommand();
 //# sourceMappingURL=user-remove.js.map