@pnp/cli-microsoft365 5.7.0-beta.d90ad27 → 5.8.0-beta.421ec27

package/dist/m365/search/commands/externalconnection/externalconnection-remove.js

@@ -0,0 +1,101 @@
+"use strict";
+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 _SearchExternalConnectionRemoveCommand_instances, _SearchExternalConnectionRemoveCommand_initTelemetry, _SearchExternalConnectionRemoveCommand_initOptions, _SearchExternalConnectionRemoveCommand_initOptionSets;
+Object.defineProperty(exports, "__esModule", { value: true });
+const cli_1 = require("../../../../cli");
+const request_1 = require("../../../../request");
+const GraphCommand_1 = require("../../../base/GraphCommand");
+const commands_1 = require("../../commands");
+class SearchExternalConnectionRemoveCommand extends GraphCommand_1.default {
+    constructor() {
+        super();
+        _SearchExternalConnectionRemoveCommand_instances.add(this);
+        __classPrivateFieldGet(this, _SearchExternalConnectionRemoveCommand_instances, "m", _SearchExternalConnectionRemoveCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _SearchExternalConnectionRemoveCommand_instances, "m", _SearchExternalConnectionRemoveCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _SearchExternalConnectionRemoveCommand_instances, "m", _SearchExternalConnectionRemoveCommand_initOptionSets).call(this);
+    }
+    get name() {
+        return commands_1.default.EXTERNALCONNECTION_REMOVE;
+    }
+    get description() {
+        return 'Removes a specific External Connection from Microsoft Search';
+    }
+    getExternalConnectionId(args) {
+        if (args.options.id) {
+            return Promise.resolve(args.options.id);
+        }
+        const requestOptions = {
+            url: `${this.resource}/v1.0/external/connections?$filter=name eq '${encodeURIComponent(args.options.name)}'&$select=id`,
+            headers: {
+                accept: 'application/json;odata.metadata=none'
+            },
+            responseType: 'json'
+        };
+        return request_1.default
+            .get(requestOptions)
+            .then((res) => {
+            if (res.value.length === 1) {
+                return Promise.resolve(res.value[0].id);
+            }
+            if (res.value.length === 0) {
+                return Promise.reject(`The specified connection does not exist in Microsoft Search`);
+            }
+            return Promise.reject(`Multiple external connections with name ${args.options.name} found. Please disambiguate (IDs): ${res.value.map(x => x.id).join(', ')}`);
+        });
+    }
+    commandAction(logger, args, cb) {
+        const removeExternalConnection = () => {
+            this
+                .getExternalConnectionId(args)
+                .then((externalConnectionId) => {
+                const requestOptions = {
+                    url: `${this.resource}/v1.0/external/connections/${encodeURIComponent(externalConnectionId)}`,
+                    headers: {
+                        accept: 'application/json;odata.metadata=none'
+                    },
+                    responseType: 'json'
+                };
+                return request_1.default
+                    .delete(requestOptions);
+            })
+                .then(_ => cb(), (rawRes) => this.handleRejectedODataJsonPromise(rawRes, logger, cb));
+        };
+        if (args.options.confirm) {
+            removeExternalConnection();
+        }
+        else {
+            cli_1.Cli.prompt({
+                type: 'confirm',
+                name: 'continue',
+                default: false,
+                message: `Are you sure you want to remove the external connection '${args.options.id || args.options.name}'?`
+            }, (result) => {
+                if (!result.continue) {
+                    cb();
+                }
+                else {
+                    removeExternalConnection();
+                }
+            });
+        }
+    }
+}
+_SearchExternalConnectionRemoveCommand_instances = new WeakSet(), _SearchExternalConnectionRemoveCommand_initTelemetry = function _SearchExternalConnectionRemoveCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            id: typeof args.options.id !== 'undefined',
+            name: typeof args.options.name !== 'undefined',
+            confirm: (!(!args.options.confirm)).toString()
+        });
+    });
+}, _SearchExternalConnectionRemoveCommand_initOptions = function _SearchExternalConnectionRemoveCommand_initOptions() {
+    this.options.unshift({ option: '--id [id]' }, { option: '--name [name]' }, { option: '--confirm' });
+}, _SearchExternalConnectionRemoveCommand_initOptionSets = function _SearchExternalConnectionRemoveCommand_initOptionSets() {
+    this.optionSets.push(['id', 'name']);
+};
+module.exports = new SearchExternalConnectionRemoveCommand();
+//# sourceMappingURL=externalconnection-remove.js.map

package/dist/m365/search/commands.js

@@ -4,6 +4,7 @@ const prefix = 'search';
 exports.default = {
     EXTERNALCONNECTION_ADD: `${prefix} externalconnection add`,
     EXTERNALCONNECTION_GET: `${prefix} externalconnection get`,
-    EXTERNALCONNECTION_LIST: `${prefix} externalconnection list`
+    EXTERNALCONNECTION_LIST: `${prefix} externalconnection list`,
+    EXTERNALCONNECTION_REMOVE: `${prefix} externalconnection remove`
 };
 //# sourceMappingURL=commands.js.map

package/dist/m365/spfx/commands/project/project-upgrade/rules/FN010008_YORC_nodeVersion.js

@@ -0,0 +1,47 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.FN010008_YORC_nodeVersion = void 0;
+const JsonRule_1 = require("../../JsonRule");
+const process = require("process");
+class FN010008_YORC_nodeVersion extends JsonRule_1.JsonRule {
+    constructor() {
+        super();
+    }
+    get id() {
+        return 'FN010008';
+    }
+    get title() {
+        return '.yo-rc.json nodeVersion';
+    }
+    get description() {
+        return `Update nodeVersion in .yo-rc.json`;
+    }
+    get resolution() {
+        return `{
+  "@microsoft/generator-sharepoint": {
+    "nodeVersion": ${process.version.substring(1)}
+  }
+}`;
+    }
+    get resolutionType() {
+        return 'json';
+    }
+    get severity() {
+        return 'Recommended';
+    }
+    get file() {
+        return './.yo-rc.json';
+    }
+    visit(project, findings) {
+        if (!project.yoRcJson) {
+            return;
+        }
+        const nodeVersion = process.version.substring(1);
+        if (project.yoRcJson["@microsoft/generator-sharepoint"].nodeVersion !== nodeVersion) {
+            const node = this.getAstNodeFromFile(project.yoRcJson, '@microsoft/generator-sharepoint.nodeVersion');
+            this.addFindingWithPosition(findings, node);
+        }
+    }
+}
+exports.FN010008_YORC_nodeVersion = FN010008_YORC_nodeVersion;
+//# sourceMappingURL=FN010008_YORC_nodeVersion.js.map

package/dist/m365/spfx/commands/project/project-upgrade/rules/FN021003_PKG_engines_node.js

@@ -0,0 +1,48 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.FN021003_PKG_engines_node = void 0;
+const JsonRule_1 = require("../../JsonRule");
+class FN021003_PKG_engines_node extends JsonRule_1.JsonRule {
+    constructor(version) {
+        super();
+        this.version = version;
+    }
+    get id() {
+        return 'FN021003';
+    }
+    get title() {
+        return 'package.json engines.node';
+    }
+    get description() {
+        return 'Update package.json engines.node property';
+    }
+    get resolution() {
+        return `{
+  "engines": {
+    "node": "${this.version}"
+  }
+}`;
+    }
+    get resolutionType() {
+        return 'json';
+    }
+    get severity() {
+        return 'Required';
+    }
+    get file() {
+        return './package.json';
+    }
+    visit(project, findings) {
+        if (!project.packageJson) {
+            return;
+        }
+        if (!project.packageJson.engines ||
+            !project.packageJson.engines.node ||
+            project.packageJson.engines.node !== this.version) {
+            const node = this.getAstNodeFromFile(project.packageJson, 'engines.node');
+            this.addFindingWithPosition(findings, node);
+        }
+    }
+}
+exports.FN021003_PKG_engines_node = FN021003_PKG_engines_node;
+//# sourceMappingURL=FN021003_PKG_engines_node.js.map

package/dist/m365/spfx/commands/project/project-upgrade/upgrade-1.16.0-beta.1.js

@@ -0,0 +1,61 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const FN001001_DEP_microsoft_sp_core_library_1 = require("./rules/FN001001_DEP_microsoft_sp_core_library");
+const FN001002_DEP_microsoft_sp_lodash_subset_1 = require("./rules/FN001002_DEP_microsoft_sp_lodash_subset");
+const FN001003_DEP_microsoft_sp_office_ui_fabric_core_1 = require("./rules/FN001003_DEP_microsoft_sp_office_ui_fabric_core");
+const FN001004_DEP_microsoft_sp_webpart_base_1 = require("./rules/FN001004_DEP_microsoft_sp_webpart_base");
+const FN001011_DEP_microsoft_sp_dialog_1 = require("./rules/FN001011_DEP_microsoft_sp_dialog");
+const FN001012_DEP_microsoft_sp_application_base_1 = require("./rules/FN001012_DEP_microsoft_sp_application_base");
+const FN001013_DEP_microsoft_decorators_1 = require("./rules/FN001013_DEP_microsoft_decorators");
+const FN001014_DEP_microsoft_sp_listview_extensibility_1 = require("./rules/FN001014_DEP_microsoft_sp_listview_extensibility");
+const FN001021_DEP_microsoft_sp_property_pane_1 = require("./rules/FN001021_DEP_microsoft_sp_property_pane");
+const FN001022_DEP_office_ui_fabric_react_1 = require("./rules/FN001022_DEP_office_ui_fabric_react");
+const FN001023_DEP_microsoft_sp_component_base_1 = require("./rules/FN001023_DEP_microsoft_sp_component_base");
+const FN001024_DEP_microsoft_sp_diagnostics_1 = require("./rules/FN001024_DEP_microsoft_sp_diagnostics");
+const FN001025_DEP_microsoft_sp_dynamic_data_1 = require("./rules/FN001025_DEP_microsoft_sp_dynamic_data");
+const FN001026_DEP_microsoft_sp_extension_base_1 = require("./rules/FN001026_DEP_microsoft_sp_extension_base");
+const FN001027_DEP_microsoft_sp_http_1 = require("./rules/FN001027_DEP_microsoft_sp_http");
+const FN001028_DEP_microsoft_sp_list_subscription_1 = require("./rules/FN001028_DEP_microsoft_sp_list_subscription");
+const FN001029_DEP_microsoft_sp_loader_1 = require("./rules/FN001029_DEP_microsoft_sp_loader");
+const FN001030_DEP_microsoft_sp_module_interfaces_1 = require("./rules/FN001030_DEP_microsoft_sp_module_interfaces");
+const FN001031_DEP_microsoft_sp_odata_types_1 = require("./rules/FN001031_DEP_microsoft_sp_odata_types");
+const FN001032_DEP_microsoft_sp_page_context_1 = require("./rules/FN001032_DEP_microsoft_sp_page_context");
+const FN001034_DEP_microsoft_sp_adaptive_card_extension_base_1 = require("./rules/FN001034_DEP_microsoft_sp_adaptive_card_extension_base");
+const FN002001_DEVDEP_microsoft_sp_build_web_1 = require("./rules/FN002001_DEVDEP_microsoft_sp_build_web");
+const FN002002_DEVDEP_microsoft_sp_module_interfaces_1 = require("./rules/FN002002_DEVDEP_microsoft_sp_module_interfaces");
+const FN002022_DEVDEP_microsoft_eslint_plugin_spfx_1 = require("./rules/FN002022_DEVDEP_microsoft_eslint_plugin_spfx");
+const FN002023_DEVDEP_microsoft_eslint_config_spfx_1 = require("./rules/FN002023_DEVDEP_microsoft_eslint_config_spfx");
+const FN010001_YORC_version_1 = require("./rules/FN010001_YORC_version");
+const FN010008_YORC_nodeVersion_1 = require("./rules/FN010008_YORC_nodeVersion");
+const FN021003_PKG_engines_node_1 = require("./rules/FN021003_PKG_engines_node");
+module.exports = [
+    new FN001001_DEP_microsoft_sp_core_library_1.FN001001_DEP_microsoft_sp_core_library('1.16.0-beta.1'),
+    new FN001021_DEP_microsoft_sp_property_pane_1.FN001021_DEP_microsoft_sp_property_pane('1.16.0-beta.1'),
+    new FN001004_DEP_microsoft_sp_webpart_base_1.FN001004_DEP_microsoft_sp_webpart_base('1.16.0-beta.1'),
+    new FN001002_DEP_microsoft_sp_lodash_subset_1.FN001002_DEP_microsoft_sp_lodash_subset('1.16.0-beta.1'),
+    new FN001003_DEP_microsoft_sp_office_ui_fabric_core_1.FN001003_DEP_microsoft_sp_office_ui_fabric_core('1.16.0-beta.1'),
+    new FN001034_DEP_microsoft_sp_adaptive_card_extension_base_1.FN001034_DEP_microsoft_sp_adaptive_card_extension_base('1.16.0-beta.1'),
+    new FN001022_DEP_office_ui_fabric_react_1.FN001022_DEP_office_ui_fabric_react('7.192.0'),
+    new FN001023_DEP_microsoft_sp_component_base_1.FN001023_DEP_microsoft_sp_component_base('1.16.0-beta.1'),
+    new FN001024_DEP_microsoft_sp_diagnostics_1.FN001024_DEP_microsoft_sp_diagnostics('1.16.0-beta.1'),
+    new FN001025_DEP_microsoft_sp_dynamic_data_1.FN001025_DEP_microsoft_sp_dynamic_data('1.16.0-beta.1'),
+    new FN001026_DEP_microsoft_sp_extension_base_1.FN001026_DEP_microsoft_sp_extension_base('1.16.0-beta.1'),
+    new FN001027_DEP_microsoft_sp_http_1.FN001027_DEP_microsoft_sp_http('1.16.0-beta.1'),
+    new FN001028_DEP_microsoft_sp_list_subscription_1.FN001028_DEP_microsoft_sp_list_subscription('1.16.0-beta.1'),
+    new FN001029_DEP_microsoft_sp_loader_1.FN001029_DEP_microsoft_sp_loader('1.16.0-beta.1'),
+    new FN001030_DEP_microsoft_sp_module_interfaces_1.FN001030_DEP_microsoft_sp_module_interfaces('1.16.0-beta.1'),
+    new FN001031_DEP_microsoft_sp_odata_types_1.FN001031_DEP_microsoft_sp_odata_types('1.16.0-beta.1'),
+    new FN001032_DEP_microsoft_sp_page_context_1.FN001032_DEP_microsoft_sp_page_context('1.16.0-beta.1'),
+    new FN001013_DEP_microsoft_decorators_1.FN001013_DEP_microsoft_decorators('1.16.0-beta.1'),
+    new FN001011_DEP_microsoft_sp_dialog_1.FN001011_DEP_microsoft_sp_dialog('1.16.0-beta.1'),
+    new FN001012_DEP_microsoft_sp_application_base_1.FN001012_DEP_microsoft_sp_application_base('1.16.0-beta.1'),
+    new FN001014_DEP_microsoft_sp_listview_extensibility_1.FN001014_DEP_microsoft_sp_listview_extensibility('1.16.0-beta.1'),
+    new FN002022_DEVDEP_microsoft_eslint_plugin_spfx_1.FN002022_DEVDEP_microsoft_eslint_plugin_spfx('1.16.0-beta.1'),
+    new FN002023_DEVDEP_microsoft_eslint_config_spfx_1.FN002023_DEVDEP_microsoft_eslint_config_spfx('1.16.0-beta.1'),
+    new FN002001_DEVDEP_microsoft_sp_build_web_1.FN002001_DEVDEP_microsoft_sp_build_web('1.16.0-beta.1'),
+    new FN002002_DEVDEP_microsoft_sp_module_interfaces_1.FN002002_DEVDEP_microsoft_sp_module_interfaces('1.16.0-beta.1'),
+    new FN010001_YORC_version_1.FN010001_YORC_version('1.16.0-beta.1'),
+    new FN010008_YORC_nodeVersion_1.FN010008_YORC_nodeVersion(),
+    new FN021003_PKG_engines_node_1.FN021003_PKG_engines_node('>=16.13.0 <17.0.0')
+];
+//# sourceMappingURL=upgrade-1.16.0-beta.1.js.map

package/dist/m365/spfx/commands/project/project-upgrade.js

@@ -18,6 +18,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const fs = require("fs");
 const os = require("os");
 const path = require("path");
+// uncomment to support upgrading to preview releases
+const semver_1 = require("semver");
 const Command_1 = require("../../../../Command");
 const utils_1 = require("../../../../utils");
 const commands_1 = require("../../commands");
@@ -62,7 +64,8 @@ class SpfxProjectUpgradeCommand extends base_project_command_1.BaseProjectComman
             '1.13.1',
             '1.14.0',
             '1.15.0',
-            '1.15.2'
+            '1.15.2',
+            '1.16.0-beta.1'
         ];
         __classPrivateFieldGet(this, _SpfxProjectUpgradeCommand_instances, "m", _SpfxProjectUpgradeCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _SpfxProjectUpgradeCommand_instances, "m", _SpfxProjectUpgradeCommand_initOptions).call(this);
@@ -82,15 +85,15 @@ class SpfxProjectUpgradeCommand extends base_project_command_1.BaseProjectComman
         }
         this.toVersion = args.options.toVersion ? args.options.toVersion : this.supportedVersions[this.supportedVersions.length - 1];
         // uncomment to support upgrading to preview releases
-        // if (!args.options.toVersion &&
-        //   !args.options.preview &&
-        //   prerelease(this.toVersion)) {
-        //   // no version and no preview specified while the current version to
-        //   // upgrade to is a prerelease so let's grab the first non-preview version
-        //   // since we're supporting only one preview version, it's sufficient for
-        //   // us to take second to last version
-        //   this.toVersion = this.supportedVersions[this.supportedVersions.length - 2];
-        // }
+        if (!args.options.toVersion &&
+            !args.options.preview &&
+            (0, semver_1.prerelease)(this.toVersion)) {
+            // no version and no preview specified while the current version to
+            // upgrade to is a prerelease so let's grab the first non-preview version
+            // since we're supporting only one preview version, it's sufficient for
+            // us to take second to last version
+            this.toVersion = this.supportedVersions[this.supportedVersions.length - 2];
+        }
         this.packageManager = args.options.packageManager || 'npm';
         this.shell = args.options.shell || 'bash';
         if (this.supportedVersions.indexOf(this.toVersion) < 0) {
@@ -478,9 +481,9 @@ _SpfxProjectUpgradeCommand_instances = new WeakSet(), _SpfxProjectUpgradeCommand
             preview: args.options.preview
         });
         // uncomment to support upgrading to preview releases
-        // if (prerelease(this.telemetryProperties.toVersion) && !args.options.preview) {
-        //   this.telemetryProperties.toVersion = this.supportedVersions[this.supportedVersions.length - 2];
-        // }
+        if ((0, semver_1.prerelease)(this.telemetryProperties.toVersion) && !args.options.preview) {
+            this.telemetryProperties.toVersion = this.supportedVersions[this.supportedVersions.length - 2];
+        }
     });
 }, _SpfxProjectUpgradeCommand_initOptions = function _SpfxProjectUpgradeCommand_initOptions() {
     this.options.unshift({

package/dist/m365/spo/commands/app/app-deploy.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 _SpoAppDeployCommand_instances, _SpoAppDeployCommand_initTelemetry, _SpoAppDeployCommand_initOptions, _SpoAppDeployCommand_initValidators;
+var _SpoAppDeployCommand_instances, _SpoAppDeployCommand_initTelemetry, _SpoAppDeployCommand_initOptions, _SpoAppDeployCommand_initValidators, _SpoAppDeployCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
 const utils_1 = require("../../../../utils");
@@ -26,6 +26,7 @@ class SpoAppDeployCommand extends SpoAppBaseCommand_1.SpoAppBaseCommand {
         __classPrivateFieldGet(this, _SpoAppDeployCommand_instances, "m", _SpoAppDeployCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _SpoAppDeployCommand_instances, "m", _SpoAppDeployCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _SpoAppDeployCommand_instances, "m", _SpoAppDeployCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _SpoAppDeployCommand_instances, "m", _SpoAppDeployCommand_initOptionSets).call(this);
     }
     get name() {
         return commands_1.default.APP_DEPLOY;
@@ -118,12 +119,6 @@ _SpoAppDeployCommand_instances = new WeakSet(), _SpoAppDeployCommand_initTelemet
                 return `You must specify appCatalogUrl when the scope is sitecollection`;
             }
         }
-        if (!args.options.id && !args.options.name) {
-            return 'Specify either the id or the name';
-        }
-        if (args.options.id && args.options.name) {
-            return 'Specify either the id or the name but not both';
-        }
         if (args.options.id && !utils_1.validation.isValidGuid(args.options.id)) {
             return `${args.options.id} is not a valid GUID`;
         }
@@ -132,6 +127,8 @@ _SpoAppDeployCommand_instances = new WeakSet(), _SpoAppDeployCommand_initTelemet
         }
         return true;
     }));
+}, _SpoAppDeployCommand_initOptionSets = function _SpoAppDeployCommand_initOptionSets() {
+    this.optionSets.push(['id', 'name']);
 };
 module.exports = new SpoAppDeployCommand();
 //# sourceMappingURL=app-deploy.js.map

package/dist/m365/spo/commands/app/app-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 _SpoAppGetCommand_instances, _SpoAppGetCommand_initTelemetry, _SpoAppGetCommand_initOptions, _SpoAppGetCommand_initValidators;
+var _SpoAppGetCommand_instances, _SpoAppGetCommand_initTelemetry, _SpoAppGetCommand_initOptions, _SpoAppGetCommand_initValidators, _SpoAppGetCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
 const utils_1 = require("../../../../utils");
@@ -26,6 +26,7 @@ class SpoAppGetCommand extends SpoAppBaseCommand_1.SpoAppBaseCommand {
         __classPrivateFieldGet(this, _SpoAppGetCommand_instances, "m", _SpoAppGetCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _SpoAppGetCommand_instances, "m", _SpoAppGetCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _SpoAppGetCommand_instances, "m", _SpoAppGetCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _SpoAppGetCommand_instances, "m", _SpoAppGetCommand_initOptionSets).call(this);
     }
     get name() {
         return commands_1.default.APP_GET;
@@ -109,12 +110,6 @@ _SpoAppGetCommand_instances = new WeakSet(), _SpoAppGetCommand_initTelemetry = f
                 return `You must specify appCatalogUrl when the scope is sitecollection`;
             }
         }
-        if (!args.options.id && !args.options.name) {
-            return 'Specify either the id or the name';
-        }
-        if (args.options.id && args.options.name) {
-            return 'Specify either the id or the name but not both';
-        }
         if (args.options.id && !utils_1.validation.isValidGuid(args.options.id)) {
             return `${args.options.id} is not a valid GUID`;
         }
@@ -123,6 +118,8 @@ _SpoAppGetCommand_instances = new WeakSet(), _SpoAppGetCommand_initTelemetry = f
         }
         return true;
     }));
+}, _SpoAppGetCommand_initOptionSets = function _SpoAppGetCommand_initOptionSets() {
+    this.optionSets.push(['id', 'name']);
 };
 module.exports = new SpoAppGetCommand();
 //# sourceMappingURL=app-get.js.map

package/dist/m365/spo/commands/contenttype/contenttype-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 _SpoContentTypeGetCommand_instances, _SpoContentTypeGetCommand_initTelemetry, _SpoContentTypeGetCommand_initOptions, _SpoContentTypeGetCommand_initValidators, _SpoContentTypeGetCommand_initTypes;
+var _SpoContentTypeGetCommand_instances, _SpoContentTypeGetCommand_initTelemetry, _SpoContentTypeGetCommand_initOptions, _SpoContentTypeGetCommand_initValidators, _SpoContentTypeGetCommand_initTypes, _SpoContentTypeGetCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
 const Command_1 = require("../../../../Command");
 const request_1 = require("../../../../request");
@@ -28,6 +28,7 @@ class SpoContentTypeGetCommand extends SpoCommand_1.default {
         __classPrivateFieldGet(this, _SpoContentTypeGetCommand_instances, "m", _SpoContentTypeGetCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _SpoContentTypeGetCommand_instances, "m", _SpoContentTypeGetCommand_initValidators).call(this);
         __classPrivateFieldGet(this, _SpoContentTypeGetCommand_instances, "m", _SpoContentTypeGetCommand_initTypes).call(this);
+        __classPrivateFieldGet(this, _SpoContentTypeGetCommand_instances, "m", _SpoContentTypeGetCommand_initOptionSets).call(this);
     }
     get name() {
         return commands_1.default.CONTENTTYPE_GET;
@@ -98,16 +99,12 @@ _SpoContentTypeGetCommand_instances = new WeakSet(), _SpoContentTypeGetCommand_i
         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, one is required';
-        }
         return true;
     }));
 }, _SpoContentTypeGetCommand_initTypes = function _SpoContentTypeGetCommand_initTypes() {
     this.types.string.push('id', 'i');
+}, _SpoContentTypeGetCommand_initOptionSets = function _SpoContentTypeGetCommand_initOptionSets() {
+    this.optionSets.push(['id', 'name']);
 };
 module.exports = new SpoContentTypeGetCommand();
 //# sourceMappingURL=contenttype-get.js.map

package/dist/m365/spo/commands/contenttype/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 _SpoContentTypeRemoveCommand_instances, _SpoContentTypeRemoveCommand_initTelemetry, _SpoContentTypeRemoveCommand_initOptions, _SpoContentTypeRemoveCommand_initValidators, _SpoContentTypeRemoveCommand_initTypes;
+var _SpoContentTypeRemoveCommand_instances, _SpoContentTypeRemoveCommand_initTelemetry, _SpoContentTypeRemoveCommand_initOptions, _SpoContentTypeRemoveCommand_initValidators, _SpoContentTypeRemoveCommand_initTypes, _SpoContentTypeRemoveCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
 const cli_1 = require("../../../../cli");
 const Command_1 = require("../../../../Command");
@@ -29,6 +29,7 @@ class SpoContentTypeRemoveCommand extends SpoCommand_1.default {
         __classPrivateFieldGet(this, _SpoContentTypeRemoveCommand_instances, "m", _SpoContentTypeRemoveCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _SpoContentTypeRemoveCommand_instances, "m", _SpoContentTypeRemoveCommand_initValidators).call(this);
         __classPrivateFieldGet(this, _SpoContentTypeRemoveCommand_instances, "m", _SpoContentTypeRemoveCommand_initTypes).call(this);
+        __classPrivateFieldGet(this, _SpoContentTypeRemoveCommand_instances, "m", _SpoContentTypeRemoveCommand_initOptionSets).call(this);
     }
     get name() {
         return commands_1.default.CONTENTTYPE_REMOVE;
@@ -126,21 +127,11 @@ _SpoContentTypeRemoveCommand_instances = new WeakSet(), _SpoContentTypeRemoveCom
         option: '--confirm'
     });
 }, _SpoContentTypeRemoveCommand_initValidators = function _SpoContentTypeRemoveCommand_initValidators() {
-    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        const isValidSharePointUrl = utils_1.validation.isValidSharePointUrl(args.options.webUrl);
-        if (isValidSharePointUrl !== true) {
-            return isValidSharePointUrl;
-        }
-        if (!args.options.id && !args.options.name) {
-            return 'Specify either the id or the name';
-        }
-        if (args.options.id && args.options.name) {
-            return 'Specify either the id or the name but not both';
-        }
-        return true;
-    }));
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () { return utils_1.validation.isValidSharePointUrl(args.options.webUrl); }));
 }, _SpoContentTypeRemoveCommand_initTypes = function _SpoContentTypeRemoveCommand_initTypes() {
     this.types.string.push('id', 'i');
+}, _SpoContentTypeRemoveCommand_initOptionSets = function _SpoContentTypeRemoveCommand_initOptionSets() {
+    this.optionSets.push(['id', 'name']);
 };
 module.exports = new SpoContentTypeRemoveCommand();
 //# sourceMappingURL=contenttype-remove.js.map

package/dist/m365/spo/commands/file/file-checkin.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 _SpoFileCheckinCommand_instances, _SpoFileCheckinCommand_initTelemetry, _SpoFileCheckinCommand_initOptions, _SpoFileCheckinCommand_initValidators;
+var _SpoFileCheckinCommand_instances, _SpoFileCheckinCommand_initTelemetry, _SpoFileCheckinCommand_initOptions, _SpoFileCheckinCommand_initValidators, _SpoFileCheckinCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
 const utils_1 = require("../../../../utils");
@@ -32,6 +32,7 @@ class SpoFileCheckinCommand extends SpoCommand_1.default {
         __classPrivateFieldGet(this, _SpoFileCheckinCommand_instances, "m", _SpoFileCheckinCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _SpoFileCheckinCommand_instances, "m", _SpoFileCheckinCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _SpoFileCheckinCommand_instances, "m", _SpoFileCheckinCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _SpoFileCheckinCommand_instances, "m", _SpoFileCheckinCommand_initOptionSets).call(this);
     }
     get name() {
         return commands_1.default.FILE_CHECKIN;
@@ -106,12 +107,6 @@ _SpoFileCheckinCommand_instances = new WeakSet(), _SpoFileCheckinCommand_initTel
                 return `${args.options.id} is not a valid GUID`;
             }
         }
-        if (args.options.id && args.options.fileUrl) {
-            return 'Specify either fileUrl or id but not both';
-        }
-        if (!args.options.id && !args.options.fileUrl) {
-            return 'Specify fileUrl or id, one is required';
-        }
         if (args.options.comment && args.options.comment.length > 1023) {
             return 'The length of the comment must be less than 1024 letters';
         }
@@ -124,6 +119,8 @@ _SpoFileCheckinCommand_instances = new WeakSet(), _SpoFileCheckinCommand_initTel
         }
         return true;
     }));
+}, _SpoFileCheckinCommand_initOptionSets = function _SpoFileCheckinCommand_initOptionSets() {
+    this.optionSets.push(['fileUrl', 'id']);
 };
 module.exports = new SpoFileCheckinCommand();
 //# sourceMappingURL=file-checkin.js.map

package/dist/m365/spo/commands/file/file-checkout.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 _SpoFileCheckoutCommand_instances, _SpoFileCheckoutCommand_initTelemetry, _SpoFileCheckoutCommand_initOptions, _SpoFileCheckoutCommand_initValidators;
+var _SpoFileCheckoutCommand_instances, _SpoFileCheckoutCommand_initTelemetry, _SpoFileCheckoutCommand_initOptions, _SpoFileCheckoutCommand_initValidators, _SpoFileCheckoutCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
 const utils_1 = require("../../../../utils");
@@ -26,6 +26,7 @@ class SpoFileCheckoutCommand extends SpoCommand_1.default {
         __classPrivateFieldGet(this, _SpoFileCheckoutCommand_instances, "m", _SpoFileCheckoutCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _SpoFileCheckoutCommand_instances, "m", _SpoFileCheckoutCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _SpoFileCheckoutCommand_instances, "m", _SpoFileCheckoutCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _SpoFileCheckoutCommand_instances, "m", _SpoFileCheckoutCommand_initOptionSets).call(this);
     }
     get name() {
         return commands_1.default.FILE_CHECKOUT;
@@ -79,14 +80,10 @@ _SpoFileCheckoutCommand_instances = new WeakSet(), _SpoFileCheckoutCommand_initT
                 return `${args.options.id} is not a valid GUID`;
             }
         }
-        if (args.options.id && args.options.fileUrl) {
-            return 'Specify either id or fileUrl but not both';
-        }
-        if (!args.options.id && !args.options.fileUrl) {
-            return 'Specify id or fileUrl, one is required';
-        }
         return true;
     }));
+}, _SpoFileCheckoutCommand_initOptionSets = function _SpoFileCheckoutCommand_initOptionSets() {
+    this.optionSets.push(['id', 'fileUrl']);
 };
 module.exports = new SpoFileCheckoutCommand();
 //# sourceMappingURL=file-checkout.js.map

package/dist/m365/spo/commands/file/file-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 _SpoFileGetCommand_instances, _SpoFileGetCommand_initTelemetry, _SpoFileGetCommand_initOptions, _SpoFileGetCommand_initValidators;
+var _SpoFileGetCommand_instances, _SpoFileGetCommand_initTelemetry, _SpoFileGetCommand_initOptions, _SpoFileGetCommand_initValidators, _SpoFileGetCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
 const fs = require("fs");
 const path = require("path");
@@ -28,6 +28,7 @@ class SpoFileGetCommand extends SpoCommand_1.default {
         __classPrivateFieldGet(this, _SpoFileGetCommand_instances, "m", _SpoFileGetCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _SpoFileGetCommand_instances, "m", _SpoFileGetCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _SpoFileGetCommand_instances, "m", _SpoFileGetCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _SpoFileGetCommand_instances, "m", _SpoFileGetCommand_initOptionSets).call(this);
     }
     get name() {
         return commands_1.default.FILE_GET;
@@ -150,12 +151,6 @@ _SpoFileGetCommand_instances = new WeakSet(), _SpoFileGetCommand_initTelemetry =
                 return `${args.options.id} is not a valid GUID`;
             }
         }
-        if (args.options.id && args.options.url) {
-            return 'Specify id or url, but not both';
-        }
-        if (!args.options.id && !args.options.url) {
-            return 'Specify id or url, one is required';
-        }
         if (args.options.asFile && !args.options.path) {
             return 'The path should be specified when the --asFile option is used';
         }
@@ -174,6 +169,8 @@ _SpoFileGetCommand_instances = new WeakSet(), _SpoFileGetCommand_initTelemetry =
         }
         return true;
     }));
+}, _SpoFileGetCommand_initOptionSets = function _SpoFileGetCommand_initOptionSets() {
+    this.optionSets.push(['id', 'url']);
 };
 module.exports = new SpoFileGetCommand();
 //# sourceMappingURL=file-get.js.map

package/dist/m365/spo/commands/file/file-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 _SpoFileRemoveCommand_instances, _SpoFileRemoveCommand_initTelemetry, _SpoFileRemoveCommand_initOptions, _SpoFileRemoveCommand_initValidators;
+var _SpoFileRemoveCommand_instances, _SpoFileRemoveCommand_initTelemetry, _SpoFileRemoveCommand_initOptions, _SpoFileRemoveCommand_initValidators, _SpoFileRemoveCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
 const cli_1 = require("../../../../cli");
 const request_1 = require("../../../../request");
@@ -27,6 +27,7 @@ class SpoFileRemoveCommand extends SpoCommand_1.default {
         __classPrivateFieldGet(this, _SpoFileRemoveCommand_instances, "m", _SpoFileRemoveCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _SpoFileRemoveCommand_instances, "m", _SpoFileRemoveCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _SpoFileRemoveCommand_instances, "m", _SpoFileRemoveCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _SpoFileRemoveCommand_instances, "m", _SpoFileRemoveCommand_initOptionSets).call(this);
     }
     get name() {
         return commands_1.default.FILE_REMOVE;
@@ -131,14 +132,10 @@ _SpoFileRemoveCommand_instances = new WeakSet(), _SpoFileRemoveCommand_initTelem
             !utils_1.validation.isValidGuid(args.options.id)) {
             return `${args.options.id} is not a valid GUID`;
         }
-        if (args.options.id && args.options.url) {
-            return 'Specify id or url, but not both';
-        }
-        if (!args.options.id && !args.options.url) {
-            return 'Specify id or url';
-        }
         return true;
     }));
+}, _SpoFileRemoveCommand_initOptionSets = function _SpoFileRemoveCommand_initOptionSets() {
+    this.optionSets.push(['id', 'url']);
 };
 module.exports = new SpoFileRemoveCommand();
 //# sourceMappingURL=file-remove.js.map