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

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

@@ -65,7 +65,7 @@ class SpoCustomActionListCommand extends SpoCommand_1.default {
     }
     getCustomActions(options) {
         const requestOptions = {
-            url: `${options.url}/_api/${options.scope}/UserCustomActions`,
+            url: `${options.webUrl}/_api/${options.scope}/UserCustomActions`,
             headers: {
                 accept: 'application/json;odata=nometadata'
             },
@@ -122,15 +122,16 @@ _SpoCustomActionListCommand_instances = new WeakSet(), _SpoCustomActionListComma
     });
 }, _SpoCustomActionListCommand_initOptions = function _SpoCustomActionListCommand_initOptions() {
     this.options.unshift({
-        option: '-u, --url <url>'
+        option: '-u, --webUrl <webUrl>'
     }, {
         option: '-s, --scope [scope]',
         autocomplete: ['Site', 'Web', 'All']
     });
 }, _SpoCustomActionListCommand_initValidators = function _SpoCustomActionListCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (utils_1.validation.isValidSharePointUrl(args.options.url) !== true) {
-            return 'Missing required option url';
+        const isValidUrl = utils_1.validation.isValidSharePointUrl(args.options.webUrl);
+        if (typeof isValidUrl === 'string') {
+            return isValidUrl;
         }
         if (args.options.scope) {
             if (args.options.scope !== 'Site' &&

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

@@ -76,7 +76,7 @@ class SpoCustomActionRemoveCommand extends SpoCommand_1.default {
             return Promise.resolve(options.id);
         }
         const customActionRequestOptions = {
-            url: `${options.url}/_api/${options.scope}/UserCustomActions?$filter=Title eq '${encodeURIComponent(options.title)}'`,
+            url: `${options.webUrl}/_api/${options.scope}/UserCustomActions?$filter=Title eq '${encodeURIComponent(options.title)}'`,
             headers: {
                 accept: 'application/json;odata=nometadata'
             },
@@ -99,7 +99,7 @@ class SpoCustomActionRemoveCommand extends SpoCommand_1.default {
             .getCustomActionId(options)
             .then((customActionId) => {
             const requestOptions = {
-                url: `${options.url}/_api/${options.scope}/UserCustomActions('${encodeURIComponent(customActionId)}')')`,
+                url: `${options.webUrl}/_api/${options.scope}/UserCustomActions('${encodeURIComponent(customActionId)}')')`,
                 headers: {
                     accept: 'application/json;odata=nometadata',
                     'X-HTTP-Method': 'DELETE'
@@ -150,7 +150,7 @@ _SpoCustomActionRemoveCommand_instances = new WeakSet(), _SpoCustomActionRemoveC
     }, {
         option: '-t, --title [title]'
     }, {
-        option: '-u, --url <url>'
+        option: '-u, --webUrl <webUrl>'
     }, {
         option: '-s, --scope [scope]',
         autocomplete: ['Site', 'Web', 'All']
@@ -162,8 +162,9 @@ _SpoCustomActionRemoveCommand_instances = new WeakSet(), _SpoCustomActionRemoveC
         if (args.options.id && utils_1.validation.isValidGuid(args.options.id) === false) {
             return `${args.options.id} is not valid. Custom action Id (GUID) expected.`;
         }
-        if (utils_1.validation.isValidSharePointUrl(args.options.url) !== true) {
-            return 'Missing required option url';
+        const isValidUrl = utils_1.validation.isValidSharePointUrl(args.options.webUrl);
+        if (typeof isValidUrl === 'string') {
+            return isValidUrl;
         }
         if (args.options.scope) {
             if (args.options.scope !== 'Site' &&

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

@@ -69,7 +69,7 @@ class SpoCustomActionSetCommand extends SpoCommand_1.default {
     updateCustomAction(options) {
         const requestBody = this.mapRequestBody(options);
         const requestOptions = {
-            url: `${options.url}/_api/${options.scope}/UserCustomActions('${encodeURIComponent(options.id)}')`,
+            url: `${options.webUrl}/_api/${options.scope}/UserCustomActions('${encodeURIComponent(options.id)}')`,
             headers: {
                 accept: 'application/json;odata=nometadata',
                 'X-HTTP-Method': 'MERGE'
@@ -203,7 +203,7 @@ _SpoCustomActionSetCommand_instances = new WeakSet(), _SpoCustomActionSetCommand
     });
 }, _SpoCustomActionSetCommand_initOptions = function _SpoCustomActionSetCommand_initOptions() {
     this.options.unshift({
-        option: '-u, --url <url>'
+        option: '-u, --webUrl <webUrl>'
     }, {
         option: '-i, --id <id>'
     }, {
@@ -249,7 +249,7 @@ _SpoCustomActionSetCommand_instances = new WeakSet(), _SpoCustomActionSetCommand
         if (utils_1.validation.isValidGuid(args.options.id) === false) {
             return `${args.options.id} is not valid. Custom action id (Guid) expected`;
         }
-        const isValidSharePointUrl = utils_1.validation.isValidSharePointUrl(args.options.url);
+        const isValidSharePointUrl = utils_1.validation.isValidSharePointUrl(args.options.webUrl);
         if (isValidSharePointUrl !== true) {
             return isValidSharePointUrl;
         }

package/dist/m365/spo/commands/feature/feature-disable.js

@@ -43,9 +43,9 @@ class SpoFeatureDisableCommand extends SpoCommand_1.default {
             force = false;
         }
         if (this.verbose) {
-            logger.logToStderr(`Disabling feature '${args.options.featureId}' on scope '${scope}' for url '${args.options.url}' (force='${force}')...`);
+            logger.logToStderr(`Disabling feature '${args.options.id}' on scope '${scope}' for url '${args.options.webUrl}' (force='${force}')...`);
         }
-        const url = `${args.options.url}/_api/${scope}/features/remove(featureId=guid'${args.options.featureId}',force=${force})`;
+        const url = `${args.options.webUrl}/_api/${scope}/features/remove(featureId=guid'${args.options.id}',force=${force})`;
         const requestOptions = {
             url: url,
             headers: {
@@ -66,9 +66,9 @@ _SpoFeatureDisableCommand_instances = new WeakSet(), _SpoFeatureDisableCommand_i
     });
 }, _SpoFeatureDisableCommand_initOptions = function _SpoFeatureDisableCommand_initOptions() {
     this.options.unshift({
-        option: '-u, --url <url>'
+        option: '-u, --webUrl <webUrl>'
     }, {
-        option: '-f, --featureId <id>'
+        option: '-i, --id <id>'
     }, {
         option: '-s, --scope [scope]',
         autocomplete: ['Site', 'Web']

package/dist/m365/spo/commands/feature/feature-enable.js

@@ -44,9 +44,9 @@ class SpoFeatureEnableCommand extends SpoCommand_1.default {
             force = false;
         }
         if (this.verbose) {
-            logger.logToStderr(`Enabling feature '${args.options.featureId}' on scope '${scope}' for url '${args.options.url}' (force='${force}')...`);
+            logger.logToStderr(`Enabling feature '${args.options.id}' on scope '${scope}' for url '${args.options.webUrl}' (force='${force}')...`);
         }
-        const url = `${args.options.url}/_api/${scope}/features/add(featureId=guid'${args.options.featureId}',force=${force})`;
+        const url = `${args.options.webUrl}/_api/${scope}/features/add(featureId=guid'${args.options.id}',force=${force})`;
         const requestOptions = {
             url: url,
             headers: {
@@ -67,9 +67,9 @@ _SpoFeatureEnableCommand_instances = new WeakSet(), _SpoFeatureEnableCommand_ini
     });
 }, _SpoFeatureEnableCommand_initOptions = function _SpoFeatureEnableCommand_initOptions() {
     this.options.unshift({
-        option: '-u, --url <url>'
+        option: '-u, --webUrl <webUrl>'
     }, {
-        option: '-f, --featureId <id>'
+        option: '-i, --id <id>'
     }, {
         option: '-s, --scope [scope]',
         autocomplete: ['Site', 'Web']
@@ -83,7 +83,7 @@ _SpoFeatureEnableCommand_instances = new WeakSet(), _SpoFeatureEnableCommand_ini
                 return `${args.options.scope} is not a valid Feature scope. Allowed values are Site|Web`;
             }
         }
-        return utils_1.validation.isValidSharePointUrl(args.options.url);
+        return utils_1.validation.isValidSharePointUrl(args.options.webUrl);
     }));
 }, _SpoFeatureEnableCommand_initTypes = function _SpoFeatureEnableCommand_initTypes() {
     this.types.string.push('scope', 's');

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

@@ -36,7 +36,7 @@ class SpoFeatureListCommand extends SpoCommand_1.default {
     commandAction(logger, args, cb) {
         const scope = (args.options.scope) ? args.options.scope : 'Web';
         const requestOptions = {
-            url: `${args.options.url}/_api/${scope}/Features?$select=DisplayName,DefinitionId`,
+            url: `${args.options.webUrl}/_api/${scope}/Features?$select=DisplayName,DefinitionId`,
             headers: {
                 accept: 'application/json;odata=nometadata'
             },
@@ -65,7 +65,7 @@ _SpoFeatureListCommand_instances = new WeakSet(), _SpoFeatureListCommand_initTel
     });
 }, _SpoFeatureListCommand_initOptions = function _SpoFeatureListCommand_initOptions() {
     this.options.unshift({
-        option: '-u, --url <url>'
+        option: '-u, --webUrl <webUrl>'
     }, {
         option: '-s, --scope [scope]',
         autocomplete: ['Site', 'Web']
@@ -78,7 +78,7 @@ _SpoFeatureListCommand_instances = new WeakSet(), _SpoFeatureListCommand_initTel
                 return `${args.options.scope} is not a valid Feature scope. Allowed values are Site|Web`;
             }
         }
-        return utils_1.validation.isValidSharePointUrl(args.options.url);
+        return utils_1.validation.isValidSharePointUrl(args.options.webUrl);
     }));
 };
 module.exports = new SpoFeatureListCommand();

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

@@ -35,10 +35,6 @@ class SpoFieldGetCommand extends SpoCommand_1.default {
         return 'Retrieves information about the specified list- or site column';
     }
     commandAction(logger, args, cb) {
-        if (args.options.fieldTitle) {
-            args.options.title = args.options.fieldTitle;
-            this.warn(logger, `Option 'fieldTitle' is deprecated. Please use 'title' instead.`);
-        }
         let listRestUrl = '';
         if (args.options.listId) {
             listRestUrl = `lists(guid'${utils_1.formatting.encodeQueryParameter(args.options.listId)}')/`;
@@ -93,8 +89,6 @@ _SpoFieldGetCommand_instances = new WeakSet(), _SpoFieldGetCommand_initTelemetry
         option: '--listUrl [listUrl]'
     }, {
         option: '-i, --id [id]'
-    }, {
-        option: '--fieldTitle [fieldTitle]'
     }, {
         option: '-t, --title [title]'
     });
@@ -113,7 +107,7 @@ _SpoFieldGetCommand_instances = new WeakSet(), _SpoFieldGetCommand_initTelemetry
         return true;
     }));
 }, _SpoFieldGetCommand_initOptionSets = function _SpoFieldGetCommand_initOptionSets() {
-    this.optionSets.push(['id', 'title', 'fieldTitle']);
+    this.optionSets.push(['id', 'title']);
 };
 module.exports = new SpoFieldGetCommand();
 //# sourceMappingURL=field-get.js.map

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

@@ -36,10 +36,6 @@ class SpoFieldRemoveCommand extends SpoCommand_1.default {
         return 'Removes the specified list- or site column';
     }
     commandAction(logger, args, cb) {
-        if (args.options.fieldTitle) {
-            args.options.title = args.options.fieldTitle;
-            this.warn(logger, `Option 'fieldTitle' is deprecated. Please use 'title' instead.`);
-        }
         let messageEnd;
         if (args.options.listId || args.options.listTitle) {
             messageEnd = `in list ${args.options.listId || args.options.listTitle}`;
@@ -164,8 +160,6 @@ _SpoFieldRemoveCommand_instances = new WeakSet(), _SpoFieldRemoveCommand_initTel
         option: '--listUrl [listUrl]'
     }, {
         option: '-i, --id [id]'
-    }, {
-        option: '--fieldTitle [fieldTitle]'
     }, {
         option: '-t, --title [title]'
     }, {
@@ -188,7 +182,7 @@ _SpoFieldRemoveCommand_instances = new WeakSet(), _SpoFieldRemoveCommand_initTel
         return true;
     }));
 }, _SpoFieldRemoveCommand_initOptionSets = function _SpoFieldRemoveCommand_initOptionSets() {
-    this.optionSets.push(['id', 'title', 'fieldTitle', 'group']);
+    this.optionSets.push(['id', 'title', 'group']);
 };
 module.exports = new SpoFieldRemoveCommand();
 //# sourceMappingURL=field-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;
@@ -58,8 +59,8 @@ class SpoFileCheckinCommand extends SpoCommand_1.default {
         if (args.options.id) {
             requestUrl = `${args.options.webUrl}/_api/web/GetFileById('${encodeURIComponent(args.options.id)}')/checkin(comment='${comment}',checkintype=${type})`;
         }
-        if (args.options.fileUrl) {
-            requestUrl = `${args.options.webUrl}/_api/web/GetFileByServerRelativeUrl('${encodeURIComponent(args.options.fileUrl)}')/checkin(comment='${comment}',checkintype=${type})`;
+        if (args.options.url) {
+            requestUrl = `${args.options.webUrl}/_api/web/GetFileByServerRelativeUrl('${encodeURIComponent(args.options.url)}')/checkin(comment='${comment}',checkintype=${type})`;
         }
         const requestOptions = {
             url: requestUrl,
@@ -77,7 +78,7 @@ _SpoFileCheckinCommand_instances = new WeakSet(), _SpoFileCheckinCommand_initTel
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
             id: (!(!args.options.id)).toString(),
-            url: (!(!args.options.fileUrl)).toString(),
+            url: (!(!args.options.url)).toString(),
             type: args.options.type || 'Major',
             comment: typeof args.options.comment !== 'undefined'
         });
@@ -86,7 +87,7 @@ _SpoFileCheckinCommand_instances = new WeakSet(), _SpoFileCheckinCommand_initTel
     this.options.unshift({
         option: '-u, --webUrl <webUrl>'
     }, {
-        option: '-f, --fileUrl [fileUrl]'
+        option: '-f, --url [url]'
     }, {
         option: '-i, --id [id]'
     }, {
@@ -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(['url', '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;
@@ -38,8 +39,8 @@ class SpoFileCheckoutCommand extends SpoCommand_1.default {
         if (args.options.id) {
             requestUrl = `${args.options.webUrl}/_api/web/GetFileById('${encodeURIComponent(args.options.id)}')/checkout`;
         }
-        if (args.options.fileUrl) {
-            requestUrl = `${args.options.webUrl}/_api/web/GetFileByServerRelativeUrl('${encodeURIComponent(args.options.fileUrl)}')/checkout`;
+        if (args.options.url) {
+            requestUrl = `${args.options.webUrl}/_api/web/GetFileByServerRelativeUrl('${encodeURIComponent(args.options.url)}')/checkout`;
         }
         const requestOptions = {
             url: requestUrl,
@@ -57,14 +58,14 @@ _SpoFileCheckoutCommand_instances = new WeakSet(), _SpoFileCheckoutCommand_initT
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
             id: (!(!args.options.id)).toString(),
-            fileUrl: (!(!args.options.fileUrl)).toString()
+            url: (!(!args.options.url)).toString()
         });
     });
 }, _SpoFileCheckoutCommand_initOptions = function _SpoFileCheckoutCommand_initOptions() {
     this.options.unshift({
         option: '-u, --webUrl <webUrl>'
     }, {
-        option: '-f, --fileUrl [fileUrl]'
+        option: '-f, --url [url]'
     }, {
         option: '-i, --id [id]'
     });
@@ -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', 'url']);
 };
 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

package/dist/m365/spo/commands/file/file-sharinginfo-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 _SpoFileSharinginfoGetCommand_instances, _SpoFileSharinginfoGetCommand_initTelemetry, _SpoFileSharinginfoGetCommand_initOptions, _SpoFileSharinginfoGetCommand_initValidators;
+var _SpoFileSharinginfoGetCommand_instances, _SpoFileSharinginfoGetCommand_initTelemetry, _SpoFileSharinginfoGetCommand_initOptions, _SpoFileSharinginfoGetCommand_initValidators, _SpoFileSharinginfoGetCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
 const utils_1 = require("../../../../utils");
@@ -27,6 +27,7 @@ class SpoFileSharinginfoGetCommand extends SpoCommand_1.default {
         __classPrivateFieldGet(this, _SpoFileSharinginfoGetCommand_instances, "m", _SpoFileSharinginfoGetCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _SpoFileSharinginfoGetCommand_instances, "m", _SpoFileSharinginfoGetCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _SpoFileSharinginfoGetCommand_instances, "m", _SpoFileSharinginfoGetCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _SpoFileSharinginfoGetCommand_instances, "m", _SpoFileSharinginfoGetCommand_initOptionSets).call(this);
     }
     get name() {
         return commands_1.default.FILE_SHARINGINFO_GET;
@@ -35,7 +36,7 @@ class SpoFileSharinginfoGetCommand extends SpoCommand_1.default {
         return 'Generates a sharing information report for the specified file';
     }
     getExcludedOptionsWithUrls() {
-        return ['url'];
+        return ['fileUrl'];
     }
     commandAction(logger, args, cb) {
         if (this.verbose) {
@@ -89,11 +90,11 @@ class SpoFileSharinginfoGetCommand extends SpoCommand_1.default {
     }
     getNeededFileInformation(args) {
         let requestUrl = '';
-        if (args.options.id) {
-            requestUrl = `${args.options.webUrl}/_api/web/GetFileById('${escape(args.options.id)}')/?$select=ListItemAllFields/Id,ListItemAllFields/ParentList/Title&$expand=ListItemAllFields/ParentList`;
+        if (args.options.fileId) {
+            requestUrl = `${args.options.webUrl}/_api/web/GetFileById('${escape(args.options.fileId)}')/?$select=ListItemAllFields/Id,ListItemAllFields/ParentList/Title&$expand=ListItemAllFields/ParentList`;
         }
         else {
-            requestUrl = `${args.options.webUrl}/_api/web/GetFileByServerRelativePath(decodedUrl='${encodeURIComponent(args.options.url)}')?$select=ListItemAllFields/Id,ListItemAllFields/ParentList/Title&$expand=ListItemAllFields/ParentList`;
+            requestUrl = `${args.options.webUrl}/_api/web/GetFileByServerRelativePath(decodedUrl='${encodeURIComponent(args.options.fileUrl)}')?$select=ListItemAllFields/Id,ListItemAllFields/ParentList/Title&$expand=ListItemAllFields/ParentList`;
         }
         const requestOptions = {
             url: requestUrl,
@@ -112,17 +113,17 @@ class SpoFileSharinginfoGetCommand extends SpoCommand_1.default {
 _SpoFileSharinginfoGetCommand_instances = new WeakSet(), _SpoFileSharinginfoGetCommand_initTelemetry = function _SpoFileSharinginfoGetCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
-            id: (!(!args.options.id)).toString(),
-            url: (!(!args.options.url)).toString()
+            fileId: (!(!args.options.fileId)).toString(),
+            fileUrl: (!(!args.options.fileUrl)).toString()
         });
     });
 }, _SpoFileSharinginfoGetCommand_initOptions = function _SpoFileSharinginfoGetCommand_initOptions() {
     this.options.unshift({
-        option: '-w, --webUrl <webUrl>'
+        option: '-u, --webUrl <webUrl>'
     }, {
-        option: '-i, --id [id]'
+        option: '-i, --fileId [fileId]'
     }, {
-        option: '-u, --url [url]'
+        option: '-f, --fileUrl [fileUrl]'
     });
 }, _SpoFileSharinginfoGetCommand_initValidators = function _SpoFileSharinginfoGetCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
@@ -130,19 +131,15 @@ _SpoFileSharinginfoGetCommand_instances = new WeakSet(), _SpoFileSharinginfoGetC
         if (isValidSharePointUrl !== true) {
             return isValidSharePointUrl;
         }
-        if (args.options.id) {
-            if (!utils_1.validation.isValidGuid(args.options.id)) {
-                return `${args.options.id} is not a valid GUID`;
+        if (args.options.fileId) {
+            if (!utils_1.validation.isValidGuid(args.options.fileId)) {
+                return `${args.options.fileId} 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';
-        }
         return true;
     }));
+}, _SpoFileSharinginfoGetCommand_initOptionSets = function _SpoFileSharinginfoGetCommand_initOptionSets() {
+    this.optionSets.push(['fileId', 'fileUrl']);
 };
 module.exports = new SpoFileSharinginfoGetCommand();
 //# sourceMappingURL=file-sharinginfo-get.js.map

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

@@ -37,7 +37,7 @@ class SpoFolderGetCommand extends SpoCommand_1.default {
         if (this.verbose) {
             logger.logToStderr(`Retrieving folder from site ${args.options.webUrl}...`);
         }
-        const serverRelativeUrl = utils_1.urlUtil.getServerRelativePath(args.options.webUrl, args.options.folderUrl);
+        const serverRelativeUrl = utils_1.urlUtil.getServerRelativePath(args.options.webUrl, args.options.url);
         const requestUrl = `${args.options.webUrl}/_api/web/GetFolderByServerRelativeUrl('${encodeURIComponent(serverRelativeUrl)}')`;
         const requestOptions = {
             url: requestUrl,
@@ -64,7 +64,7 @@ _SpoFolderGetCommand_instances = new WeakSet(), _SpoFolderGetCommand_initOptions
     this.options.unshift({
         option: '-u, --webUrl <webUrl>'
     }, {
-        option: '-f, --folderUrl <folderUrl>'
+        option: '-f, --url <url>'
     });
 }, _SpoFolderGetCommand_initValidators = function _SpoFolderGetCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () { return utils_1.validation.isValidSharePointUrl(args.options.webUrl); }));

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

@@ -39,7 +39,7 @@ class SpoFolderRemoveCommand extends SpoCommand_1.default {
             if (this.verbose) {
                 logger.logToStderr(`Removing folder in site at ${args.options.webUrl}...`);
             }
-            const serverRelativeUrl = utils_1.urlUtil.getServerRelativePath(args.options.webUrl, args.options.folderUrl);
+            const serverRelativeUrl = utils_1.urlUtil.getServerRelativePath(args.options.webUrl, args.options.url);
             let requestUrl = `${args.options.webUrl}/_api/web/GetFolderByServerRelativeUrl('${encodeURIComponent(serverRelativeUrl)}')`;
             if (args.options.recycle) {
                 requestUrl += `/recycle()`;
@@ -66,7 +66,7 @@ class SpoFolderRemoveCommand extends SpoCommand_1.default {
                 type: 'confirm',
                 name: 'continue',
                 default: false,
-                message: `Are you sure you want to ${args.options.recycle ? "recycle" : "remove"} the folder ${args.options.folderUrl} located in site ${args.options.webUrl}?`
+                message: `Are you sure you want to ${args.options.recycle ? "recycle" : "remove"} the folder ${args.options.url} located in site ${args.options.webUrl}?`
             }, (result) => {
                 if (!result.continue) {
                     cb();
@@ -89,7 +89,7 @@ _SpoFolderRemoveCommand_instances = new WeakSet(), _SpoFolderRemoveCommand_initT
     this.options.unshift({
         option: '-u, --webUrl <webUrl>'
     }, {
-        option: '-f, --folderUrl <folderUrl>'
+        option: '-f, --url <url>'
     }, {
         option: '--recycle'
     }, {

package/dist/m365/spo/commands/folder/folder-rename.js

@@ -42,13 +42,13 @@ class SpoFolderRenameCommand extends SpoCommand_1.default {
             return utils_1.spo.getCurrentWebIdentity(args.options.webUrl, formDigestValue);
         })
             .then((webIdentityResp) => {
-            return utils_1.spo.getFolderIdentity(webIdentityResp.objectIdentity, args.options.webUrl, args.options.folderUrl, formDigestValue);
+            return utils_1.spo.getFolderIdentity(webIdentityResp.objectIdentity, args.options.webUrl, args.options.url, formDigestValue);
         })
             .then((folderObjectIdentity) => {
             if (this.verbose) {
-                logger.logToStderr(`Renaming folder ${args.options.folderUrl} to ${args.options.name}`);
+                logger.logToStderr(`Renaming folder ${args.options.url} to ${args.options.name}`);
             }
-            const serverRelativeUrl = utils_1.urlUtil.getServerRelativePath(args.options.webUrl, args.options.folderUrl);
+            const serverRelativeUrl = utils_1.urlUtil.getServerRelativePath(args.options.webUrl, args.options.url);
             const serverRelativeUrlWithoutOldFolder = serverRelativeUrl.substring(0, serverRelativeUrl.lastIndexOf('/'));
             const renamedServerRelativeUrl = `${serverRelativeUrlWithoutOldFolder}/${args.options.name}`;
             const requestOptions = {
@@ -76,7 +76,7 @@ _SpoFolderRenameCommand_instances = new WeakSet(), _SpoFolderRenameCommand_initO
     this.options.unshift({
         option: '-u, --webUrl <webUrl>'
     }, {
-        option: '-f, --folderUrl <folderUrl>'
+        option: '-f, --url <url>'
     }, {
         option: '-n, --name <name>'
     });