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

package/dist/m365/spo/commands/list/list-view-field-set.js

@@ -38,13 +38,13 @@ class SpoListViewFieldSetCommand extends SpoCommand_1.default {
         const listSelector = args.options.listId ? `(guid'${utils_1.formatting.encodeQueryParameter(args.options.listId)}')` : `/GetByTitle('${utils_1.formatting.encodeQueryParameter(args.options.listTitle)}')`;
         const viewSelector = args.options.viewId ? `('${utils_1.formatting.encodeQueryParameter(args.options.viewId)}')` : `/GetByTitle('${utils_1.formatting.encodeQueryParameter(args.options.viewTitle)}')`;
         if (this.verbose) {
-            logger.logToStderr(`Getting field ${args.options.fieldId || args.options.fieldTitle}...`);
+            logger.logToStderr(`Getting field ${args.options.id || args.options.title}...`);
         }
         this
             .getField(args.options, listSelector)
             .then((field) => {
             if (this.verbose) {
-                logger.logToStderr(`Moving the field ${args.options.fieldId || args.options.fieldTitle} in view ${args.options.viewId || args.options.viewTitle} to position ${args.options.fieldPosition}...`);
+                logger.logToStderr(`Moving the field ${args.options.id || args.options.title} in view ${args.options.viewId || args.options.viewTitle} to position ${args.options.position}...`);
             }
             const moveRequestUrl = `${args.options.webUrl}/_api/web/lists${listSelector}/views${viewSelector}/viewfields/moveviewfieldto`;
             const moveRequestOptions = {
@@ -54,7 +54,7 @@ class SpoListViewFieldSetCommand extends SpoCommand_1.default {
                 },
                 data: {
                     field: field.InternalName,
-                    index: args.options.fieldPosition
+                    index: args.options.position
                 },
                 responseType: 'json'
             };
@@ -63,7 +63,7 @@ class SpoListViewFieldSetCommand extends SpoCommand_1.default {
             .then(_ => cb(), (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
     }
     getField(options, listSelector) {
-        const fieldSelector = options.fieldId ? `/getbyid('${encodeURIComponent(options.fieldId)}')` : `/getbyinternalnameortitle('${encodeURIComponent(options.fieldTitle)}')`;
+        const fieldSelector = options.id ? `/getbyid('${encodeURIComponent(options.id)}')` : `/getbyinternalnameortitle('${encodeURIComponent(options.title)}')`;
         const getRequestUrl = `${options.webUrl}/_api/web/lists${listSelector}/fields${fieldSelector}`;
         const requestOptions = {
             url: getRequestUrl,
@@ -82,8 +82,8 @@ _SpoListViewFieldSetCommand_instances = new WeakSet(), _SpoListViewFieldSetComma
             listTitle: typeof args.options.listTitle !== 'undefined',
             viewId: typeof args.options.viewId !== 'undefined',
             viewTitle: typeof args.options.viewTitle !== 'undefined',
-            fieldId: typeof args.options.fieldId !== 'undefined',
-            fieldTitle: typeof args.options.fieldTitle !== 'undefined'
+            id: typeof args.options.id !== 'undefined',
+            title: typeof args.options.title !== 'undefined'
         });
     });
 }, _SpoListViewFieldSetCommand_initOptions = function _SpoListViewFieldSetCommand_initOptions() {
@@ -98,11 +98,11 @@ _SpoListViewFieldSetCommand_instances = new WeakSet(), _SpoListViewFieldSetComma
     }, {
         option: '--viewTitle [viewTitle]'
     }, {
-        option: '--fieldId [fieldId]'
+        option: '--id [id]'
     }, {
-        option: '--fieldTitle [fieldTitle]'
+        option: '--title [title]'
     }, {
-        option: '--fieldPosition <fieldPosition>'
+        option: '--position <position>'
     });
 }, _SpoListViewFieldSetCommand_initValidators = function _SpoListViewFieldSetCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
@@ -120,19 +120,19 @@ _SpoListViewFieldSetCommand_instances = new WeakSet(), _SpoListViewFieldSetComma
                 return `${args.options.viewId} is not a valid GUID`;
             }
         }
-        if (args.options.fieldId) {
-            if (!utils_1.validation.isValidGuid(args.options.fieldId)) {
-                return `${args.options.fieldId} is not a valid GUID`;
+        if (args.options.id) {
+            if (!utils_1.validation.isValidGuid(args.options.id)) {
+                return `${args.options.id} is not a valid GUID`;
             }
         }
-        const position = parseInt(args.options.fieldPosition);
+        const position = parseInt(args.options.position);
         if (isNaN(position)) {
-            return `${args.options.fieldPosition} is not a number`;
+            return `${args.options.position} is not a number`;
         }
         return true;
     }));
 }, _SpoListViewFieldSetCommand_initOptionSets = function _SpoListViewFieldSetCommand_initOptionSets() {
-    this.optionSets.push(['listId', 'listTitle'], ['viewId', 'viewTitle'], ['fieldId', 'fieldTitle']);
+    this.optionSets.push(['listId', 'listTitle'], ['viewId', 'viewTitle'], ['id', 'title']);
 };
 module.exports = new SpoListViewFieldSetCommand();
 //# sourceMappingURL=list-view-field-set.js.map

package/dist/m365/spo/commands/list/list-view-get.js

@@ -47,7 +47,7 @@ class SpoListViewGetCommand extends SpoCommand_1.default {
             const listServerRelativeUrl = utils_1.urlUtil.getServerRelativePath(args.options.webUrl, args.options.listUrl);
             listRestUrl = `/GetList('${utils_1.formatting.encodeQueryParameter(listServerRelativeUrl)}')`;
         }
-        const viewRestUrl = `/views/${(args.options.viewId ? `getById('${utils_1.formatting.encodeQueryParameter(args.options.viewId)}')` : `getByTitle('${utils_1.formatting.encodeQueryParameter(args.options.viewTitle)}')`)}`;
+        const viewRestUrl = `/views/${(args.options.id ? `getById('${utils_1.formatting.encodeQueryParameter(args.options.id)}')` : `getByTitle('${utils_1.formatting.encodeQueryParameter(args.options.title)}')`)}`;
         const requestOptions = {
             url: `${baseRestUrl}${listRestUrl}${viewRestUrl}`,
             headers: {
@@ -69,8 +69,8 @@ _SpoListViewGetCommand_instances = new WeakSet(), _SpoListViewGetCommand_initTel
             listId: typeof args.options.listId !== 'undefined',
             listTitle: typeof args.options.listTitle !== 'undefined',
             listUrl: typeof args.options.listUrl !== 'undefined',
-            viewId: typeof args.options.viewId !== 'undefined',
-            viewTitle: typeof args.options.viewTitle !== 'undefined'
+            id: typeof args.options.id !== 'undefined',
+            title: typeof args.options.title !== 'undefined'
         });
     });
 }, _SpoListViewGetCommand_initOptions = function _SpoListViewGetCommand_initOptions() {
@@ -83,9 +83,9 @@ _SpoListViewGetCommand_instances = new WeakSet(), _SpoListViewGetCommand_initTel
     }, {
         option: '--listUrl [listUrl]'
     }, {
-        option: '--viewId [viewId]'
+        option: '--id [id]'
     }, {
-        option: '--viewTitle [viewTitle]'
+        option: '--title [title]'
     });
 }, _SpoListViewGetCommand_initValidators = function _SpoListViewGetCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
@@ -97,14 +97,14 @@ _SpoListViewGetCommand_instances = new WeakSet(), _SpoListViewGetCommand_initTel
             !utils_1.validation.isValidGuid(args.options.listId)) {
             return `${args.options.listId} in option listId is not a valid GUID`;
         }
-        if (args.options.viewId &&
-            !utils_1.validation.isValidGuid(args.options.viewId)) {
-            return `${args.options.viewId} in option viewId is not a valid GUID`;
+        if (args.options.id &&
+            !utils_1.validation.isValidGuid(args.options.id)) {
+            return `${args.options.id} in option id is not a valid GUID`;
         }
         return true;
     }));
 }, _SpoListViewGetCommand_initOptionSets = function _SpoListViewGetCommand_initOptionSets() {
-    this.optionSets.push(['listId', 'listTitle', 'listUrl'], ['viewId', 'viewTitle']);
+    this.optionSets.push(['listId', 'listTitle', 'listUrl'], ['id', 'title']);
 };
 module.exports = new SpoListViewGetCommand();
 //# sourceMappingURL=list-view-get.js.map

package/dist/m365/spo/commands/list/list-view-remove.js

@@ -39,11 +39,11 @@ class SpoListViewRemoveCommand extends SpoCommand_1.default {
         const removeViewFromList = () => {
             if (this.verbose) {
                 const list = (args.options.listId ? args.options.listId : args.options.listTitle);
-                logger.logToStderr(`Removing view ${args.options.viewId || args.options.viewTitle} from list ${list} in site at ${args.options.webUrl}...`);
+                logger.logToStderr(`Removing view ${args.options.id || args.options.title} from list ${list} in site at ${args.options.webUrl}...`);
             }
             let requestUrl = '';
             const listSelector = args.options.listId ? `(guid'${utils_1.formatting.encodeQueryParameter(args.options.listId)}')` : `/GetByTitle('${utils_1.formatting.encodeQueryParameter(args.options.listTitle)}')`;
-            const viewSelector = args.options.viewId ? `(guid'${utils_1.formatting.encodeQueryParameter(args.options.viewId)}')` : `/GetByTitle('${utils_1.formatting.encodeQueryParameter(args.options.viewTitle)}')`;
+            const viewSelector = args.options.id ? `(guid'${utils_1.formatting.encodeQueryParameter(args.options.id)}')` : `/GetByTitle('${utils_1.formatting.encodeQueryParameter(args.options.title)}')`;
             requestUrl = `${args.options.webUrl}/_api/web/lists${listSelector}/views${viewSelector}`;
             const requestOptions = {
                 url: requestUrl,
@@ -69,7 +69,7 @@ class SpoListViewRemoveCommand extends SpoCommand_1.default {
                 type: 'confirm',
                 name: 'continue',
                 default: false,
-                message: `Are you sure you want to remove the view ${args.options.viewId || args.options.viewTitle} from the list ${args.options.listId || args.options.listTitle} in site ${args.options.webUrl}?`
+                message: `Are you sure you want to remove the view ${args.options.id || args.options.title} from the list ${args.options.listId || args.options.listTitle} in site ${args.options.webUrl}?`
             }, (result) => {
                 if (!result.continue) {
                     cb();
@@ -86,8 +86,8 @@ _SpoListViewRemoveCommand_instances = new WeakSet(), _SpoListViewRemoveCommand_i
         Object.assign(this.telemetryProperties, {
             listId: typeof args.options.listId !== 'undefined',
             listTitle: typeof args.options.listTitle !== 'undefined',
-            viewId: typeof args.options.viewId !== 'undefined',
-            viewTitle: typeof args.options.viewTitle !== 'undefined',
+            id: typeof args.options.id !== 'undefined',
+            title: typeof args.options.title !== 'undefined',
             confirm: (!(!args.options.confirm)).toString()
         });
     });
@@ -99,9 +99,9 @@ _SpoListViewRemoveCommand_instances = new WeakSet(), _SpoListViewRemoveCommand_i
     }, {
         option: '--listTitle [listTitle]'
     }, {
-        option: '--viewId [viewId]'
+        option: '--id [id]'
     }, {
-        option: '--viewTitle [viewTitle]'
+        option: '--title [title]'
     }, {
         option: '--confirm'
     });
@@ -116,15 +116,15 @@ _SpoListViewRemoveCommand_instances = new WeakSet(), _SpoListViewRemoveCommand_i
                 return `${args.options.listId} is not a valid GUID`;
             }
         }
-        if (args.options.viewId) {
-            if (!utils_1.validation.isValidGuid(args.options.viewId)) {
-                return `${args.options.viewId} is not a valid GUID`;
+        if (args.options.id) {
+            if (!utils_1.validation.isValidGuid(args.options.id)) {
+                return `${args.options.id} is not a valid GUID`;
             }
         }
         return true;
     }));
 }, _SpoListViewRemoveCommand_initOptionSets = function _SpoListViewRemoveCommand_initOptionSets() {
-    this.optionSets.push(['listId', 'listTitle'], ['viewId', 'viewTitle']);
+    this.optionSets.push(['listId', 'listTitle'], ['id', 'title']);
 };
 module.exports = new SpoListViewRemoveCommand();
 //# sourceMappingURL=list-view-remove.js.map

package/dist/m365/spo/commands/list/list-view-set.js

@@ -42,7 +42,7 @@ class SpoListViewSetCommand extends SpoCommand_1.default {
         const listRestUrl = args.options.listId ?
             `(guid'${utils_1.formatting.encodeQueryParameter(args.options.listId)}')`
             : `/getByTitle('${utils_1.formatting.encodeQueryParameter(args.options.listTitle)}')`;
-        const viewRestUrl = `/views/${(args.options.viewId ? `getById('${utils_1.formatting.encodeQueryParameter(args.options.viewId)}')` : `getByTitle('${utils_1.formatting.encodeQueryParameter(args.options.viewTitle)}')`)}`;
+        const viewRestUrl = `/views/${(args.options.id ? `getById('${utils_1.formatting.encodeQueryParameter(args.options.id)}')` : `getByTitle('${utils_1.formatting.encodeQueryParameter(args.options.title)}')`)}`;
         utils_1.spo
             .getRequestDigest(args.options.webUrl)
             .then((res) => {
@@ -66,8 +66,8 @@ class SpoListViewSetCommand extends SpoCommand_1.default {
             'webUrl',
             'listId',
             'listTitle',
-            'viewId',
-            'viewTitle',
+            'id',
+            'title',
             'debug',
             'verbose',
             'output'
@@ -85,8 +85,8 @@ _SpoListViewSetCommand_instances = new WeakSet(), _SpoListViewSetCommand_initTel
         Object.assign(this.telemetryProperties, {
             listId: typeof args.options.listId !== 'undefined',
             listTitle: typeof args.options.listTitle !== 'undefined',
-            viewId: typeof args.options.viewId !== 'undefined',
-            viewTitle: typeof args.options.viewTitle !== 'undefined'
+            id: typeof args.options.id !== 'undefined',
+            title: typeof args.options.title !== 'undefined'
         });
     });
 }, _SpoListViewSetCommand_initOptions = function _SpoListViewSetCommand_initOptions() {
@@ -97,9 +97,9 @@ _SpoListViewSetCommand_instances = new WeakSet(), _SpoListViewSetCommand_initTel
     }, {
         option: '--listTitle [listTitle]'
     }, {
-        option: '--viewId [viewId]'
+        option: '--id [id]'
     }, {
-        option: '--viewTitle [viewTitle]'
+        option: '--title [title]'
     });
 }, _SpoListViewSetCommand_initValidators = function _SpoListViewSetCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
@@ -111,14 +111,14 @@ _SpoListViewSetCommand_instances = new WeakSet(), _SpoListViewSetCommand_initTel
             !utils_1.validation.isValidGuid(args.options.listId)) {
             return `${args.options.listId} in option listId is not a valid GUID`;
         }
-        if (args.options.viewId &&
-            !utils_1.validation.isValidGuid(args.options.viewId)) {
-            return `${args.options.viewId} in option viewId is not a valid GUID`;
+        if (args.options.id &&
+            !utils_1.validation.isValidGuid(args.options.id)) {
+            return `${args.options.id} in option id is not a valid GUID`;
         }
         return true;
     }));
 }, _SpoListViewSetCommand_initOptionSets = function _SpoListViewSetCommand_initOptionSets() {
-    this.optionSets.push(['listId', 'listTitle'], ['viewId', 'viewTitle']);
+    this.optionSets.push(['listId', 'listTitle'], ['id', 'title']);
 };
 module.exports = new SpoListViewSetCommand();
 //# sourceMappingURL=list-view-set.js.map

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

@@ -35,14 +35,8 @@ class SpoListItemListCommand extends SpoCommand_1.default {
         return 'Gets a list of items from the specified list';
     }
     commandAction(logger, args, cb) {
-        if (args.options.id) {
-            this.warn(logger, `Option 'id' is deprecated. Please use 'listId' instead.`);
-        }
-        if (args.options.title) {
-            this.warn(logger, `Option 'title' is deprecated. Please use 'listTitle' instead.`);
-        }
-        const listIdArgument = args.options.listId || args.options.id || '';
-        const listTitleArgument = args.options.listTitle || args.options.title || '';
+        const listIdArgument = args.options.listId || '';
+        const listTitleArgument = args.options.listTitle || '';
         let formDigestValue = '';
         const fieldsArray = args.options.fields ? args.options.fields.split(",")
             : (!args.options.output || args.options.output === "text") ? ["Title", "Id"] : [];
@@ -120,10 +114,8 @@ class SpoListItemListCommand extends SpoCommand_1.default {
 _SpoListItemListCommand_instances = new WeakSet(), _SpoListItemListCommand_initTelemetry = function _SpoListItemListCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
-            id: typeof args.options.id !== 'undefined',
             listId: typeof args.options.listId !== 'undefined',
             listTitle: typeof args.options.listTitle !== 'undefined',
-            title: typeof args.options.title !== 'undefined',
             fields: typeof args.options.fields !== 'undefined',
             filter: typeof args.options.filter !== 'undefined',
             pageNumber: typeof args.options.pageNumber !== 'undefined',
@@ -134,10 +126,6 @@ _SpoListItemListCommand_instances = new WeakSet(), _SpoListItemListCommand_initT
 }, _SpoListItemListCommand_initOptions = function _SpoListItemListCommand_initOptions() {
     this.options.unshift({
         option: '-u, --webUrl <webUrl>'
-    }, {
-        option: '--id [id]'
-    }, {
-        option: '--title [title]'
     }, {
         option: '-i, --listId [listId]'
     }, {
@@ -159,15 +147,11 @@ _SpoListItemListCommand_instances = new WeakSet(), _SpoListItemListCommand_initT
         if (isValidSharePointUrl !== true) {
             return isValidSharePointUrl;
         }
-        if (!args.options.id && !args.options.title && !args.options.listId && !args.options.listTitle) {
+        if (!args.options.listId && !args.options.listTitle) {
             return `Specify listId or listTitle`;
         }
-        if (args.options.id && args.options.title) {
-            return `Specify list id or title but not both`;
-        }
-        // Check if only one of the 4 options is specified
-        if ([args.options.id, args.options.title, args.options.listId, args.options.listTitle].filter(o => o).length > 1) {
-            return 'Specify listId or listTitle but not both';
+        if (args.options.listId && args.options.listTitle) {
+            return `Specify listId or listTitle but not both`;
         }
         if (args.options.camlQuery && args.options.fields) {
             return `Specify camlQuery or fields but not both`;
@@ -190,13 +174,10 @@ _SpoListItemListCommand_instances = new WeakSet(), _SpoListItemListCommand_initT
         if (args.options.listId && !utils_1.validation.isValidGuid(args.options.listId)) {
             return `${args.options.listId} is not a valid GUID`;
         }
-        if (args.options.id && !utils_1.validation.isValidGuid(args.options.id)) {
-            return `${args.options.id} in option id is not a valid GUID`;
-        }
         return true;
     }));
 }, _SpoListItemListCommand_initTypes = function _SpoListItemListCommand_initTypes() {
-    this.types.string.push('webUrl', 'id', 'title', 'camlQuery', 'pageSize', 'pageNumber', 'fields', 'filter');
+    this.types.string.push('webUrl', 'camlQuery', 'pageSize', 'pageNumber', 'fields', 'filter');
 };
 module.exports = new SpoListItemListCommand();
 //# sourceMappingURL=listitem-list.js.map

package/dist/m365/spo/commands/listitem/listitem-record-declare.js

@@ -65,7 +65,7 @@ class SpoListItemRecordDeclareCommand extends SpoCommand_1.default {
         })
             .then((res) => {
             listId = res.Id;
-            const requestBody = this.getDeclareRecordRequestBody(webIdentity, listId, args.options.id, args.options.date || '');
+            const requestBody = this.getDeclareRecordRequestBody(webIdentity, listId, args.options.listItemId, args.options.date || '');
             const requestOptions = {
                 url: `${args.options.webUrl}/_vti_bin/client.svc/ProcessQuery`,
                 headers: {
@@ -116,7 +116,7 @@ _SpoListItemRecordDeclareCommand_instances = new WeakSet(), _SpoListItemRecordDe
     }, {
         option: '-t, --listTitle [listTitle]'
     }, {
-        option: '-i, --id <id>'
+        option: '-i, --listItemId <listItemId>'
     }, {
         option: '-d, --date [date]'
     });
@@ -129,9 +129,9 @@ _SpoListItemRecordDeclareCommand_instances = new WeakSet(), _SpoListItemRecordDe
         if (args.options.listId && !utils_1.validation.isValidGuid(args.options.listId)) {
             return `${args.options.listId} in option listId is not a valid GUID`;
         }
-        const id = parseInt(args.options.id);
+        const id = parseInt(args.options.listItemId);
         if (isNaN(id)) {
-            return `${args.options.id} is not a number`;
+            return `${args.options.listItemId} is not a number`;
         }
         if (id < 1) {
             return `Item ID must be a positive number`;

package/dist/m365/spo/commands/listitem/listitem-record-undeclare.js

@@ -80,7 +80,7 @@ class SpoListItemRecordUndeclareCommand extends SpoCommand_1.default {
                     'Content-Type': 'text/xml',
                     'X-RequestDigest': formDigestValue
                 },
-                data: `<Request AddExpandoFieldTypeSuffix="true" SchemaVersion="15.0.0.0" LibraryVersion="16.0.0.0" ApplicationName="${config_1.default.applicationName}" xmlns="http://schemas.microsoft.com/sharepoint/clientquery/2009"><Actions><StaticMethod TypeId="{ea8e1356-5910-4e69-bc05-d0c30ed657fc}" Name="UndeclareItemAsRecord" Id="53"><Parameters><Parameter ObjectPathId="49" /></Parameters></StaticMethod></Actions><ObjectPaths><Identity Id="49" Name="${objectIdentity.objectIdentity}:list:${environmentListId}:item:${args.options.id},1" /></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><StaticMethod TypeId="{ea8e1356-5910-4e69-bc05-d0c30ed657fc}" Name="UndeclareItemAsRecord" Id="53"><Parameters><Parameter ObjectPathId="49" /></Parameters></StaticMethod></Actions><ObjectPaths><Identity Id="49" Name="${objectIdentity.objectIdentity}:list:${environmentListId}:item:${args.options.listItemId},1" /></ObjectPaths></Request>`
             };
             return request_1.default.post(requestOptions);
         })
@@ -101,7 +101,7 @@ _SpoListItemRecordUndeclareCommand_instances = new WeakSet(), _SpoListItemRecord
     this.options.unshift({
         option: '-u, --webUrl <webUrl>'
     }, {
-        option: '-i, --id <id>'
+        option: '-i, --listItemId <listItemId>'
     }, {
         option: '-l, --listId [listId]'
     }, {
@@ -109,9 +109,9 @@ _SpoListItemRecordUndeclareCommand_instances = new WeakSet(), _SpoListItemRecord
     });
 }, _SpoListItemRecordUndeclareCommand_initValidators = function _SpoListItemRecordUndeclareCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        const id = parseInt(args.options.id);
+        const id = parseInt(args.options.listItemId);
         if (isNaN(id)) {
-            return `${args.options.id} is not a valid list item ID`;
+            return `${args.options.listItemId} is not a valid list item ID`;
         }
         const isValidSharePointUrl = utils_1.validation.isValidSharePointUrl(args.options.webUrl);
         if (isValidSharePointUrl !== true) {

package/dist/m365/spo/commands/page/page-column-get.js

@@ -34,7 +34,7 @@ class SpoPageColumnGetCommand extends SpoCommand_1.default {
     }
     commandAction(logger, args, cb) {
         Page_1.Page
-            .getPage(args.options.name, args.options.webUrl, logger, this.debug, this.verbose)
+            .getPage(args.options.pageName, args.options.webUrl, logger, this.debug, this.verbose)
             .then((clientSidePage) => {
             const sections = clientSidePage.sections
                 .filter(section => section.order === args.options.section);
@@ -61,7 +61,7 @@ _SpoPageColumnGetCommand_instances = new WeakSet(), _SpoPageColumnGetCommand_ini
     this.options.unshift({
         option: '-u, --webUrl <webUrl>'
     }, {
-        option: '-n, --name <name>'
+        option: '-n, --pageName <pageName>'
     }, {
         option: '-s, --section <section>'
     }, {

package/dist/m365/spo/commands/page/page-column-list.js

@@ -34,7 +34,7 @@ class SpoPageColumnListCommand extends SpoCommand_1.default {
     }
     commandAction(logger, args, cb) {
         Page_1.Page
-            .getPage(args.options.name, args.options.webUrl, logger, this.debug, this.verbose)
+            .getPage(args.options.pageName, args.options.webUrl, logger, this.debug, this.verbose)
             .then((clientSidePage) => {
             const sections = clientSidePage.sections
                 .filter(section => section.order === args.options.section);
@@ -54,7 +54,7 @@ _SpoPageColumnListCommand_instances = new WeakSet(), _SpoPageColumnListCommand_i
     this.options.unshift({
         option: '-u, --webUrl <webUrl>'
     }, {
-        option: '-n, --name <name>'
+        option: '-n, --pageName <pageName>'
     }, {
         option: '-s, --section <sectionId>'
     });

package/dist/m365/spo/commands/page/page-control-get.js

@@ -34,8 +34,8 @@ class SpoPageControlGetCommand extends SpoCommand_1.default {
         return 'Gets information about the specific control on a modern page';
     }
     commandAction(logger, args, cb) {
-        let pageName = args.options.name;
-        if (args.options.name.indexOf('.aspx') < 0) {
+        let pageName = args.options.pageName;
+        if (args.options.pageName.indexOf('.aspx') < 0) {
             pageName += '.aspx';
         }
         const requestOptions = {
@@ -64,7 +64,7 @@ class SpoPageControlGetCommand extends SpoCommand_1.default {
             }
             else {
                 if (this.verbose) {
-                    logger.logToStderr(`Control with ID ${args.options.id} not found on page ${args.options.name}`);
+                    logger.logToStderr(`Control with ID ${args.options.id} not found on page ${args.options.pageName}`);
                 }
             }
             cb();
@@ -75,7 +75,7 @@ _SpoPageControlGetCommand_instances = new WeakSet(), _SpoPageControlGetCommand_i
     this.options.unshift({
         option: '-i, --id <id>'
     }, {
-        option: '-n, --name <name>'
+        option: '-n, --pageName <pageName>'
     }, {
         option: '-u, --webUrl <webUrl>'
     });

package/dist/m365/spo/commands/page/page-control-list.js

@@ -37,8 +37,8 @@ class SpoPageControlListCommand extends SpoCommand_1.default {
         return ['id', 'type', 'title'];
     }
     commandAction(logger, args, cb) {
-        let pageName = args.options.name;
-        if (args.options.name.indexOf('.aspx') < 0) {
+        let pageName = args.options.pageName;
+        if (args.options.pageName.indexOf('.aspx') < 0) {
             pageName += '.aspx';
         }
         const requestOptions = {
@@ -70,7 +70,7 @@ class SpoPageControlListCommand extends SpoCommand_1.default {
 }
 _SpoPageControlListCommand_instances = new WeakSet(), _SpoPageControlListCommand_initOptions = function _SpoPageControlListCommand_initOptions() {
     this.options.unshift({
-        option: '-n, --name <name>'
+        option: '-n, --pageName <pageName>'
     }, {
         option: '-u, --webUrl <webUrl>'
     });

package/dist/m365/spo/commands/page/page-control-set.js

@@ -35,8 +35,8 @@ class SpoPageControlSetCommand extends SpoCommand_1.default {
         return 'Updates web part data or properties of a control on a modern page';
     }
     commandAction(logger, args, cb) {
-        let pageName = args.options.name;
-        if (args.options.name.indexOf('.aspx') < 0) {
+        let pageName = args.options.pageName;
+        if (args.options.pageName.indexOf('.aspx') < 0) {
             pageName += '.aspx';
         }
         const requestOptions = {
@@ -151,7 +151,7 @@ _SpoPageControlSetCommand_instances = new WeakSet(), _SpoPageControlSetCommand_i
     this.options.unshift({
         option: '-i, --id <id>'
     }, {
-        option: '-n, --name <name>'
+        option: '-n, --pageName <pageName>'
     }, {
         option: '-u, --webUrl <webUrl>'
     }, {

package/dist/m365/spo/commands/page/page-section-add.js

@@ -36,7 +36,7 @@ class SpoPageSectionAddCommand extends SpoCommand_1.default {
         return 'Adds section to modern page';
     }
     commandAction(logger, args, cb) {
-        let pageFullName = args.options.name.toLowerCase();
+        let pageFullName = args.options.pageName.toLowerCase();
         if (pageFullName.indexOf('.aspx') < 0) {
             pageFullName += '.aspx';
         }
@@ -174,7 +174,7 @@ _SpoPageSectionAddCommand_instances = new WeakSet(), _SpoPageSectionAddCommand_i
     });
 }, _SpoPageSectionAddCommand_initOptions = function _SpoPageSectionAddCommand_initOptions() {
     this.options.unshift({
-        option: '-n, --name <name>'
+        option: '-n, --pageName <pageName>'
     }, {
         option: '-u, --webUrl <webUrl>'
     }, {

package/dist/m365/spo/commands/page/page-section-get.js

@@ -34,7 +34,7 @@ class SpoPageSectionGetCommand extends SpoCommand_1.default {
     }
     commandAction(logger, args, cb) {
         Page_1.Page
-            .getPage(args.options.name, args.options.webUrl, logger, this.debug, this.verbose)
+            .getPage(args.options.pageName, args.options.webUrl, logger, this.debug, this.verbose)
             .then((clientSidePage) => {
             const sections = clientSidePage.sections
                 .filter(section => section.order === args.options.section);
@@ -50,7 +50,7 @@ _SpoPageSectionGetCommand_instances = new WeakSet(), _SpoPageSectionGetCommand_i
     this.options.unshift({
         option: '-u, --webUrl <webUrl>'
     }, {
-        option: '-n, --name <name>'
+        option: '-n, --pageName <pageName>'
     }, {
         option: '-s, --section <section>'
     });

package/dist/m365/spo/commands/page/page-section-list.js

@@ -34,7 +34,7 @@ class SpoPageSectionListCommand extends SpoCommand_1.default {
     }
     commandAction(logger, args, cb) {
         Page_1.Page
-            .getPage(args.options.name, args.options.webUrl, logger, this.debug, this.verbose)
+            .getPage(args.options.pageName, args.options.webUrl, logger, this.debug, this.verbose)
             .then((clientSidePage) => {
             const sections = clientSidePage.sections;
             const isJSONOutput = args.options.output === 'json';
@@ -60,7 +60,7 @@ _SpoPageSectionListCommand_instances = new WeakSet(), _SpoPageSectionListCommand
     this.options.unshift({
         option: '-u, --webUrl <webUrl>'
     }, {
-        option: '-n, --name <name>'
+        option: '-n, --pageName <pageName>'
     });
 }, _SpoPageSectionListCommand_initValidators = function _SpoPageSectionListCommand_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/serviceprincipal/serviceprincipal-grant-revoke.js

@@ -44,7 +44,7 @@ class SpoServicePrincipalGrantRevokeCommand extends SpoCommand_1.default {
                 headers: {
                     'X-RequestDigest': res.FormDigestValue
                 },
-                data: `<Request AddExpandoFieldTypeSuffix="true" SchemaVersion="15.0.0.0" LibraryVersion="16.0.0.0" ApplicationName="${config_1.default.applicationName}" xmlns="http://schemas.microsoft.com/sharepoint/clientquery/2009"><Actions><ObjectPath Id="10" ObjectPathId="9" /><ObjectPath Id="12" ObjectPathId="11" /><ObjectPath Id="14" ObjectPathId="13" /><Method Name="DeleteObject" Id="15" ObjectPathId="13" /><Query Id="16" ObjectPathId="13"><Query SelectAllProperties="true"><Properties /></Query></Query></Actions><ObjectPaths><Constructor Id="9" TypeId="{104e8f06-1e00-4675-99c6-1b9b504ed8d8}" /><Property Id="11" ParentId="9" Name="PermissionGrants" /><Method Id="13" ParentId="11" Name="GetByObjectId"><Parameters><Parameter Type="String">${utils_1.formatting.escapeXml(args.options.grantId)}</Parameter></Parameters></Method></ObjectPaths></Request>`
+                data: `<Request AddExpandoFieldTypeSuffix="true" SchemaVersion="15.0.0.0" LibraryVersion="16.0.0.0" ApplicationName="${config_1.default.applicationName}" xmlns="http://schemas.microsoft.com/sharepoint/clientquery/2009"><Actions><ObjectPath Id="10" ObjectPathId="9" /><ObjectPath Id="12" ObjectPathId="11" /><ObjectPath Id="14" ObjectPathId="13" /><Method Name="DeleteObject" Id="15" ObjectPathId="13" /><Query Id="16" ObjectPathId="13"><Query SelectAllProperties="true"><Properties /></Query></Query></Actions><ObjectPaths><Constructor Id="9" TypeId="{104e8f06-1e00-4675-99c6-1b9b504ed8d8}" /><Property Id="11" ParentId="9" Name="PermissionGrants" /><Method Id="13" ParentId="11" Name="GetByObjectId"><Parameters><Parameter Type="String">${utils_1.formatting.escapeXml(args.options.id)}</Parameter></Parameters></Method></ObjectPaths></Request>`
             };
             return request_1.default.post(requestOptions);
         })
@@ -61,7 +61,7 @@ class SpoServicePrincipalGrantRevokeCommand extends SpoCommand_1.default {
 }
 _SpoServicePrincipalGrantRevokeCommand_instances = new WeakSet(), _SpoServicePrincipalGrantRevokeCommand_initOptions = function _SpoServicePrincipalGrantRevokeCommand_initOptions() {
     this.options.unshift({
-        option: '-i, --grantId <grantId>'
+        option: '-i, --id <id>'
     });
 };
 module.exports = new SpoServicePrincipalGrantRevokeCommand();

package/dist/m365/spo/commands/serviceprincipal/serviceprincipal-permissionrequest-approve.js

@@ -54,7 +54,7 @@ class SpoServicePrincipalPermissionRequestApproveCommand extends SpoCommand_1.de
                 headers: {
                     'X-RequestDigest': res.FormDigestValue
                 },
-                data: `<Request AddExpandoFieldTypeSuffix="true" SchemaVersion="15.0.0.0" LibraryVersion="16.0.0.0" ApplicationName="${config_1.default.applicationName}" xmlns="http://schemas.microsoft.com/sharepoint/clientquery/2009"><Actions><ObjectPath Id="16" ObjectPathId="15" /><ObjectPath Id="18" ObjectPathId="17" /><ObjectPath Id="20" ObjectPathId="19" /><ObjectPath Id="22" ObjectPathId="21" /><Query Id="23" ObjectPathId="21"><Query SelectAllProperties="true"><Properties /></Query></Query></Actions><ObjectPaths><Constructor Id="15" TypeId="{104e8f06-1e00-4675-99c6-1b9b504ed8d8}" /><Property Id="17" ParentId="15" Name="PermissionRequests" /><Method Id="19" ParentId="17" Name="GetById"><Parameters><Parameter Type="Guid">{${utils_1.formatting.escapeXml(args.options.requestId)}}</Parameter></Parameters></Method><Method Id="21" ParentId="19" Name="Approve" /></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" /><ObjectPath Id="18" ObjectPathId="17" /><ObjectPath Id="20" ObjectPathId="19" /><ObjectPath Id="22" ObjectPathId="21" /><Query Id="23" ObjectPathId="21"><Query SelectAllProperties="true"><Properties /></Query></Query></Actions><ObjectPaths><Constructor Id="15" TypeId="{104e8f06-1e00-4675-99c6-1b9b504ed8d8}" /><Property Id="17" ParentId="15" Name="PermissionRequests" /><Method Id="19" ParentId="17" Name="GetById"><Parameters><Parameter Type="Guid">{${utils_1.formatting.escapeXml(args.options.id)}}</Parameter></Parameters></Method><Method Id="21" ParentId="19" Name="Approve" /></ObjectPaths></Request>`
             };
             return request_1.default.post(requestOptions);
         })
@@ -76,12 +76,12 @@ class SpoServicePrincipalPermissionRequestApproveCommand extends SpoCommand_1.de
 }
 _SpoServicePrincipalPermissionRequestApproveCommand_instances = new WeakSet(), _SpoServicePrincipalPermissionRequestApproveCommand_initOptions = function _SpoServicePrincipalPermissionRequestApproveCommand_initOptions() {
     this.options.unshift({
-        option: '-i, --requestId <requestId>'
+        option: '-i, --id <id>'
     });
 }, _SpoServicePrincipalPermissionRequestApproveCommand_initValidators = function _SpoServicePrincipalPermissionRequestApproveCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (!utils_1.validation.isValidGuid(args.options.requestId)) {
-            return `${args.options.requestId} is not a valid GUID`;
+        if (!utils_1.validation.isValidGuid(args.options.id)) {
+            return `${args.options.id} is not a valid GUID`;
         }
         return true;
     }));