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

package/dist/m365/spo/commands/app/app-install.js

@@ -34,7 +34,7 @@ class SpoAppInstallCommand extends SpoCommand_1.default {
         return 'Installs an app from the specified app catalog in the site';
     }
     commandAction(logger, args, cb) {
-        const scope = (args.options.scope) ? args.options.scope.toLowerCase() : 'tenant';
+        const scope = (args.options.appCatalogScope) ? args.options.appCatalogScope.toLowerCase() : 'tenant';
         if (this.verbose) {
             logger.logToStderr(`Installing app '${args.options.id}' in site '${args.options.siteUrl}'...`);
         }
@@ -52,7 +52,7 @@ class SpoAppInstallCommand extends SpoCommand_1.default {
 _SpoAppInstallCommand_instances = new WeakSet(), _SpoAppInstallCommand_initTelemetry = function _SpoAppInstallCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
-            scope: args.options.scope || 'tenant'
+            appCatalogScope: args.options.appCatalogScope || 'tenant'
         });
     });
 }, _SpoAppInstallCommand_initOptions = function _SpoAppInstallCommand_initOptions() {
@@ -61,15 +61,15 @@ _SpoAppInstallCommand_instances = new WeakSet(), _SpoAppInstallCommand_initTelem
     }, {
         option: '-s, --siteUrl <siteUrl>'
     }, {
-        option: '--scope [scope]',
+        option: '--appCatalogScope [appCatalogScope]',
         autocomplete: ['tenant', 'sitecollection']
     });
 }, _SpoAppInstallCommand_initValidators = function _SpoAppInstallCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (args.options.scope) {
-            const testScope = args.options.scope.toLowerCase();
+        if (args.options.appCatalogScope) {
+            const testScope = args.options.appCatalogScope.toLowerCase();
             if (!(testScope === 'tenant' || testScope === 'sitecollection')) {
-                return `Scope must be either 'tenant' or 'sitecollection' if specified`;
+                return `appCatalogScope must be either 'tenant' or 'sitecollection' if specified`;
             }
         }
         if (!utils_1.validation.isValidGuid(args.options.id)) {

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

@@ -37,7 +37,7 @@ class SpoAppListCommand extends SpoAppBaseCommand_1.SpoAppBaseCommand {
         return [`Title`, `ID`, `Deployed`, `AppCatalogVersion`];
     }
     commandAction(logger, args, cb) {
-        const scope = (args.options.scope) ? args.options.scope.toLowerCase() : 'tenant';
+        const scope = (args.options.appCatalogScope) ? args.options.appCatalogScope.toLowerCase() : 'tenant';
         let appCatalogSiteUrl = '';
         let spoUrl = '';
         utils_1.spo
@@ -77,12 +77,12 @@ _SpoAppListCommand_instances = new WeakSet(), _SpoAppListCommand_initTelemetry =
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
             appCatalogUrl: (!(!args.options.appCatalogUrl)).toString(),
-            scope: args.options.scope || 'tenant'
+            appCatalogScope: args.options.appCatalogScope || 'tenant'
         });
     });
 }, _SpoAppListCommand_initOptions = function _SpoAppListCommand_initOptions() {
     this.options.unshift({
-        option: '-s, --scope [scope]',
+        option: '-s, --appCatalogScope [appCatalogScope]',
         autocomplete: ['tenant', 'sitecollection']
     }, {
         option: '-u, --appCatalogUrl [appCatalogUrl]'
@@ -90,13 +90,13 @@ _SpoAppListCommand_instances = new WeakSet(), _SpoAppListCommand_initTelemetry =
 }, _SpoAppListCommand_initValidators = function _SpoAppListCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
         // verify either 'tenant' or 'sitecollection' specified if scope provided
-        if (args.options.scope) {
-            const testScope = args.options.scope.toLowerCase();
+        if (args.options.appCatalogScope) {
+            const testScope = args.options.appCatalogScope.toLowerCase();
             if (!(testScope === 'tenant' || testScope === 'sitecollection')) {
-                return `Scope must be either 'tenant' or 'sitecollection'`;
+                return `appCatalogScope must be either 'tenant' or 'sitecollection'`;
             }
             if (testScope === 'sitecollection' && !args.options.appCatalogUrl) {
-                return `You must specify appCatalogUrl when the scope is sitecollection`;
+                return `You must specify appCatalogUrl when the appCatalogScope is sitecollection`;
             }
             if (args.options.appCatalogUrl) {
                 return utils_1.validation.isValidSharePointUrl(args.options.appCatalogUrl);

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

@@ -35,7 +35,7 @@ class SpoAppRemoveCommand extends SpoAppBaseCommand_1.SpoAppBaseCommand {
         return 'Removes the specified app from the specified app catalog';
     }
     commandAction(logger, args, cb) {
-        const scope = (args.options.scope) ? args.options.scope.toLowerCase() : 'tenant';
+        const scope = (args.options.appCatalogScope) ? args.options.appCatalogScope.toLowerCase() : 'tenant';
         const removeApp = () => {
             utils_1.spo
                 .getSpoUrl(logger, this.debug)
@@ -81,7 +81,7 @@ _SpoAppRemoveCommand_instances = new WeakSet(), _SpoAppRemoveCommand_initTelemet
         Object.assign(this.telemetryProperties, {
             appCatalogUrl: (!(!args.options.appCatalogUrl)).toString(),
             confirm: (!(!args.options.confirm)).toString(),
-            scope: args.options.scope || 'tenant'
+            appCatalogScope: args.options.appCatalogScope || 'tenant'
         });
     });
 }, _SpoAppRemoveCommand_initOptions = function _SpoAppRemoveCommand_initOptions() {
@@ -90,7 +90,7 @@ _SpoAppRemoveCommand_instances = new WeakSet(), _SpoAppRemoveCommand_initTelemet
     }, {
         option: '-u, --appCatalogUrl [appCatalogUrl]'
     }, {
-        option: '-s, --scope [scope]',
+        option: '-s, --appCatalogScope [appCatalogScope]',
         autocomplete: ['tenant', 'sitecollection']
     }, {
         option: '--confirm'
@@ -98,13 +98,13 @@ _SpoAppRemoveCommand_instances = new WeakSet(), _SpoAppRemoveCommand_initTelemet
 }, _SpoAppRemoveCommand_initValidators = function _SpoAppRemoveCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
         // verify either 'tenant' or 'sitecollection' specified if scope provided
-        if (args.options.scope) {
-            const testScope = args.options.scope.toLowerCase();
+        if (args.options.appCatalogScope) {
+            const testScope = args.options.appCatalogScope.toLowerCase();
             if (!(testScope === 'tenant' || testScope === 'sitecollection')) {
-                return `Scope must be either 'tenant' or 'sitecollection' if specified`;
+                return `appCatalogScope must be either 'tenant' or 'sitecollection' if specified`;
             }
             if (testScope === 'sitecollection' && !args.options.appCatalogUrl) {
-                return `You must specify appCatalogUrl when the scope is sitecollection`;
+                return `You must specify appCatalogUrl when the appCatalogScope is sitecollection`;
             }
         }
         if (!utils_1.validation.isValidGuid(args.options.id)) {

package/dist/m365/spo/commands/app/app-retract.js

@@ -35,7 +35,7 @@ class SpoAppRetractCommand extends SpoAppBaseCommand_1.SpoAppBaseCommand {
         return 'Retracts the specified app from the specified app catalog';
     }
     commandAction(logger, args, cb) {
-        const scope = (args.options.scope) ? args.options.scope.toLowerCase() : 'tenant';
+        const scope = (args.options.appCatalogScope) ? args.options.appCatalogScope.toLowerCase() : 'tenant';
         const retractApp = () => {
             utils_1.spo
                 .getSpoUrl(logger, this.debug)
@@ -81,7 +81,7 @@ _SpoAppRetractCommand_instances = new WeakSet(), _SpoAppRetractCommand_initTelem
         Object.assign(this.telemetryProperties, {
             appCatalogUrl: (!(!args.options.appCatalogUrl)).toString(),
             confirm: (!(!args.options.confirm)).toString(),
-            scope: args.options.scope || 'tenant'
+            appCatalogScope: args.options.appCatalogScope || 'tenant'
         });
     });
 }, _SpoAppRetractCommand_initOptions = function _SpoAppRetractCommand_initOptions() {
@@ -90,20 +90,20 @@ _SpoAppRetractCommand_instances = new WeakSet(), _SpoAppRetractCommand_initTelem
     }, {
         option: '-u, --appCatalogUrl [appCatalogUrl]'
     }, {
-        option: '-s, --scope [scope]',
+        option: '-s, --appCatalogScope [appCatalogScope]',
         autocomplete: ['tenant', 'sitecollection']
     }, {
         option: '--confirm'
     });
 }, _SpoAppRetractCommand_initValidators = function _SpoAppRetractCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (args.options.scope) {
-            const testScope = args.options.scope.toLowerCase();
+        if (args.options.appCatalogScope) {
+            const testScope = args.options.appCatalogScope.toLowerCase();
             if (!(testScope === 'tenant' || testScope === 'sitecollection')) {
-                return `Scope must be either 'tenant' or 'sitecollection' if specified`;
+                return `appCatalogScope must be either 'tenant' or 'sitecollection' if specified`;
             }
             if (testScope === 'sitecollection' && !args.options.appCatalogUrl) {
-                return `You must specify appCatalogUrl when the scope is sitecollection`;
+                return `You must specify appCatalogUrl when the appCatalogScope is sitecollection`;
             }
         }
         if (!utils_1.validation.isValidGuid(args.options.id)) {

package/dist/m365/spo/commands/app/app-uninstall.js

@@ -36,7 +36,7 @@ class SpoAppUninstallCommand extends SpoCommand_1.default {
     }
     commandAction(logger, args, cb) {
         const uninstallApp = () => {
-            const scope = (args.options.scope) ? args.options.scope.toLowerCase() : 'tenant';
+            const scope = (args.options.appCatalogScope) ? args.options.appCatalogScope.toLowerCase() : 'tenant';
             if (this.verbose) {
                 logger.logToStderr(`Uninstalling app '${args.options.id}' from the site '${args.options.siteUrl}'...`);
             }
@@ -74,7 +74,7 @@ _SpoAppUninstallCommand_instances = new WeakSet(), _SpoAppUninstallCommand_initT
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
             confirm: (!(!args.options.confirm)).toString(),
-            scope: args.options.scope || 'tenant'
+            appCatalogScope: args.options.appCatalogScope || 'tenant'
         });
     });
 }, _SpoAppUninstallCommand_initOptions = function _SpoAppUninstallCommand_initOptions() {
@@ -83,17 +83,17 @@ _SpoAppUninstallCommand_instances = new WeakSet(), _SpoAppUninstallCommand_initT
     }, {
         option: '-s, --siteUrl <siteUrl>'
     }, {
-        option: '--scope [scope]',
+        option: '--appCatalogScope [appCatalogScope]',
         autocomplete: ['tenant', 'sitecollection']
     }, {
         option: '--confirm'
     });
 }, _SpoAppUninstallCommand_initValidators = function _SpoAppUninstallCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (args.options.scope) {
-            const testScope = args.options.scope.toLowerCase();
+        if (args.options.appCatalogScope) {
+            const testScope = args.options.appCatalogScope.toLowerCase();
             if (!(testScope === 'tenant' || testScope === 'sitecollection')) {
-                return `Scope must be either 'tenant' or 'sitecollection' if specified`;
+                return `appCatalogScope must be either 'tenant' or 'sitecollection' if specified`;
             }
         }
         if (!utils_1.validation.isValidGuid(args.options.id)) {

package/dist/m365/spo/commands/app/app-upgrade.js

@@ -34,7 +34,7 @@ class SpoAppUpgradeCommand extends SpoCommand_1.default {
         return 'Upgrades app in the specified site';
     }
     commandAction(logger, args, cb) {
-        const scope = (args.options.scope) ? args.options.scope.toLowerCase() : 'tenant';
+        const scope = (args.options.appCatalogScope) ? args.options.appCatalogScope.toLowerCase() : 'tenant';
         if (this.verbose) {
             logger.logToStderr(`Upgrading app '${args.options.id}' in site '${args.options.siteUrl}'...`);
         }
@@ -52,7 +52,7 @@ class SpoAppUpgradeCommand extends SpoCommand_1.default {
 _SpoAppUpgradeCommand_instances = new WeakSet(), _SpoAppUpgradeCommand_initTelemetry = function _SpoAppUpgradeCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
-            scope: args.options.scope || 'tenant'
+            appCatalogScope: args.options.appCatalogScope || 'tenant'
         });
     });
 }, _SpoAppUpgradeCommand_initOptions = function _SpoAppUpgradeCommand_initOptions() {
@@ -61,15 +61,15 @@ _SpoAppUpgradeCommand_instances = new WeakSet(), _SpoAppUpgradeCommand_initTelem
     }, {
         option: '-s, --siteUrl <siteUrl>'
     }, {
-        option: '--scope [scope]',
+        option: '--appCatalogScope [appCatalogScope]',
         autocomplete: ['tenant', 'sitecollection']
     });
 }, _SpoAppUpgradeCommand_initValidators = function _SpoAppUpgradeCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (args.options.scope) {
-            const testScope = args.options.scope.toLowerCase();
+        if (args.options.appCatalogScope) {
+            const testScope = args.options.appCatalogScope.toLowerCase();
             if (!(testScope === 'tenant' || testScope === 'sitecollection')) {
-                return `Scope must be either 'tenant' or 'sitecollection' if specified`;
+                return `appCatalogScope must be either 'tenant' or 'sitecollection' if specified`;
             }
         }
         if (!utils_1.validation.isValidGuid(args.options.id)) {

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

@@ -41,7 +41,7 @@ class SpoAppPageSetCommand extends SpoCommand_1.default {
             },
             responseType: 'json',
             data: {
-                serverRelativeUrl: `${utils_1.urlUtil.getServerRelativePath(args.options.webUrl, '')}/SitePages/${args.options.pageName}`,
+                serverRelativeUrl: `${utils_1.urlUtil.getServerRelativePath(args.options.webUrl, '')}/SitePages/${args.options.name}`,
                 webPartDataAsJson: args.options.webPartData
             }
         };
@@ -54,7 +54,7 @@ _SpoAppPageSetCommand_instances = new WeakSet(), _SpoAppPageSetCommand_initOptio
     this.options.unshift({
         option: '-u, --webUrl <webUrl>'
     }, {
-        option: '-n, --pageName <pageName>'
+        option: '-n, --name <name>'
     }, {
         option: '-d, --webPartData <webPartData>'
     });

package/dist/m365/spo/commands/cdn/cdn-policy-list.js

@@ -36,7 +36,7 @@ class SpoCdnPolicyListCommand extends SpoCommand_1.default {
         return 'Lists CDN policies settings for the current SharePoint Online tenant';
     }
     commandAction(logger, args, cb) {
-        const cdnTypeString = args.options.type || 'Public';
+        const cdnTypeString = args.options.cdnType || 'Public';
         const cdnType = cdnTypeString === 'Private' ? 1 : 0;
         let spoAdminUrl = '';
         let tenantId = '';
@@ -90,20 +90,20 @@ class SpoCdnPolicyListCommand extends SpoCommand_1.default {
 _SpoCdnPolicyListCommand_instances = new WeakSet(), _SpoCdnPolicyListCommand_initTelemetry = function _SpoCdnPolicyListCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
-            cdnType: args.options.type || 'Public'
+            cdnType: args.options.cdnType || 'Public'
         });
     });
 }, _SpoCdnPolicyListCommand_initOptions = function _SpoCdnPolicyListCommand_initOptions() {
     this.options.unshift({
-        option: '-t, --type [type]',
+        option: '-t, --cdnType [cdnType]',
         autocomplete: ['Public', 'Private']
     });
 }, _SpoCdnPolicyListCommand_initValidators = function _SpoCdnPolicyListCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (args.options.type) {
-            if (args.options.type !== 'Public' &&
-                args.options.type !== 'Private') {
-                return `${args.options.type} is not a valid CDN type. Allowed values are Public|Private`;
+        if (args.options.cdnType) {
+            if (args.options.cdnType !== 'Public' &&
+                args.options.cdnType !== 'Private') {
+                return `${args.options.cdnType} is not a valid CDN type. Allowed values are Public|Private`;
             }
         }
         return true;

package/dist/m365/spo/commands/cdn/cdn-policy-set.js

@@ -36,7 +36,7 @@ class SpoCdnPolicySetCommand extends SpoCommand_1.default {
         return 'Sets CDN policy value for the current SharePoint Online tenant';
     }
     commandAction(logger, args, cb) {
-        const cdnTypeString = args.options.type || 'Public';
+        const cdnTypeString = args.options.cdnType || 'Public';
         const cdnType = cdnTypeString === 'Private' ? 1 : 0;
         let spoAdminUrl = '';
         let tenantId = '';
@@ -86,13 +86,13 @@ class SpoCdnPolicySetCommand extends SpoCommand_1.default {
 _SpoCdnPolicySetCommand_instances = new WeakSet(), _SpoCdnPolicySetCommand_initTelemetry = function _SpoCdnPolicySetCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
-            cdnType: args.options.type || 'Public',
+            cdnType: args.options.cdnType || 'Public',
             policy: args.options.policy
         });
     });
 }, _SpoCdnPolicySetCommand_initOptions = function _SpoCdnPolicySetCommand_initOptions() {
     this.options.unshift({
-        option: '-t, --type [type]',
+        option: '-t, --cdnType [cdnType]',
         autocomplete: ['Public', 'Private']
     }, {
         option: '-p, --policy <policy>',
@@ -102,10 +102,10 @@ _SpoCdnPolicySetCommand_instances = new WeakSet(), _SpoCdnPolicySetCommand_initT
     });
 }, _SpoCdnPolicySetCommand_initValidators = function _SpoCdnPolicySetCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (args.options.type) {
-            if (args.options.type !== 'Public' &&
-                args.options.type !== 'Private') {
-                return `${args.options.type} is not a valid CDN type. Allowed values are Public|Private`;
+        if (args.options.cdnType) {
+            if (args.options.cdnType !== 'Public' &&
+                args.options.cdnType !== 'Private') {
+                return `${args.options.cdnType} is not a valid CDN type. Allowed values are Public|Private`;
             }
         }
         if (!args.options.policy ||

package/dist/m365/spo/commands/contenttype/contenttype-field-set.js

@@ -43,10 +43,10 @@ class SpoContentTypeFieldSetCommand extends SpoCommand_1.default {
     commandAction(logger, args, cb) {
         let schemaXmlWithResourceTokens = '';
         if (this.verbose) {
-            logger.logToStderr(`Retrieving field link for field ${args.options.fieldId}...`);
+            logger.logToStderr(`Retrieving field link for field ${args.options.id}...`);
         }
         const requestOptions = {
-            url: `${args.options.webUrl}/_api/web/contenttypes('${encodeURIComponent(args.options.contentTypeId)}')/fieldlinks('${args.options.fieldId}')`,
+            url: `${args.options.webUrl}/_api/web/contenttypes('${encodeURIComponent(args.options.contentTypeId)}')/fieldlinks('${args.options.id}')`,
             headers: {
                 accept: 'application/json;odata=nometadata'
             },
@@ -64,10 +64,10 @@ class SpoContentTypeFieldSetCommand extends SpoCommand_1.default {
             }
             if (this.verbose) {
                 logger.logToStderr('Field link not found. Creating...');
-                logger.logToStderr(`Retrieving information about site column ${args.options.fieldId}...`);
+                logger.logToStderr(`Retrieving information about site column ${args.options.id}...`);
             }
             const requestOptions = {
-                url: `${args.options.webUrl}/_api/web/fields('${args.options.fieldId}')?$select=SchemaXmlWithResourceTokens`,
+                url: `${args.options.webUrl}/_api/web/fields('${args.options.id}')?$select=SchemaXmlWithResourceTokens`,
                 headers: {
                     accept: 'application/json;odata=nometadata'
                 },
@@ -87,10 +87,10 @@ class SpoContentTypeFieldSetCommand extends SpoCommand_1.default {
                 return Promise.resolve(undefined);
             }
             if (this.verbose) {
-                logger.logToStderr(`Retrieving information about field link for field ${args.options.fieldId}...`);
+                logger.logToStderr(`Retrieving information about field link for field ${args.options.id}...`);
             }
             const requestOptions = {
-                url: `${args.options.webUrl}/_api/web/contenttypes('${encodeURIComponent(args.options.contentTypeId)}')/fieldlinks('${args.options.fieldId}')`,
+                url: `${args.options.webUrl}/_api/web/contenttypes('${encodeURIComponent(args.options.contentTypeId)}')/fieldlinks('${args.options.id}')`,
                 headers: {
                     accept: 'application/json;odata=nometadata'
                 },
@@ -103,7 +103,7 @@ class SpoContentTypeFieldSetCommand extends SpoCommand_1.default {
                 this.fieldLink = res;
             }
             if (!this.fieldLink) {
-                return Promise.reject(`Couldn't find field link for field ${args.options.fieldId}`);
+                return Promise.reject(`Couldn't find field link for field ${args.options.id}`);
             }
             let updateHidden = false;
             let updateRequired = false;
@@ -248,7 +248,7 @@ class SpoContentTypeFieldSetCommand extends SpoCommand_1.default {
                     headers: {
                         'X-RequestDigest': this.requestDigest
                     },
-                    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="5" ObjectPathId="4" /><ObjectIdentityQuery Id="6" ObjectPathId="4" /><Method Name="Update" Id="7" ObjectPathId="1"><Parameters><Parameter Type="Boolean">true</Parameter></Parameters></Method></Actions><ObjectPaths><Identity Id="2" Name="d6667b9e-50fb-0000-2693-032ae7a0df25|740c6a0b-85e2-48a0-a494-e0f1759d4aa7:site:${this.siteId}:web:${this.webId}:field:${args.options.fieldId}" /><Method Id="4" ParentId="3" Name="Add"><Parameters><Parameter TypeId="{63fb2c92-8f65-4bbb-a658-b6cd294403f4}"><Property Name="Field" ObjectPathId="2" /></Parameter></Parameters></Method><Identity Id="1" Name="d6667b9e-80f4-0000-2693-05528ff416bf|740c6a0b-85e2-48a0-a494-e0f1759d4aa7:site:${this.siteId}:web:${this.webId}:contenttype:${utils_1.formatting.escapeXml(args.options.contentTypeId)}" /><Property Id="3" ParentId="1" Name="FieldLinks" /></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="5" ObjectPathId="4" /><ObjectIdentityQuery Id="6" ObjectPathId="4" /><Method Name="Update" Id="7" ObjectPathId="1"><Parameters><Parameter Type="Boolean">true</Parameter></Parameters></Method></Actions><ObjectPaths><Identity Id="2" Name="d6667b9e-50fb-0000-2693-032ae7a0df25|740c6a0b-85e2-48a0-a494-e0f1759d4aa7:site:${this.siteId}:web:${this.webId}:field:${args.options.id}" /><Method Id="4" ParentId="3" Name="Add"><Parameters><Parameter TypeId="{63fb2c92-8f65-4bbb-a658-b6cd294403f4}"><Property Name="Field" ObjectPathId="2" /></Parameter></Parameters></Method><Identity Id="1" Name="d6667b9e-80f4-0000-2693-05528ff416bf|740c6a0b-85e2-48a0-a494-e0f1759d4aa7:site:${this.siteId}:web:${this.webId}:contenttype:${utils_1.formatting.escapeXml(args.options.contentTypeId)}" /><Property Id="3" ParentId="1" Name="FieldLinks" /></ObjectPaths></Request>`
                 };
                 return request_1.default.post(requestOptions);
             })
@@ -270,7 +270,7 @@ class SpoContentTypeFieldSetCommand extends SpoCommand_1.default {
         return new Promise((resolve, reject) => {
             if (!requiresUpdate) {
                 if (this.verbose) {
-                    logger.logToStderr(`Schema of field ${args.options.fieldId} is already up-to-date`);
+                    logger.logToStderr(`Schema of field ${args.options.id} is already up-to-date`);
                 }
                 resolve();
                 return;
@@ -282,7 +282,7 @@ class SpoContentTypeFieldSetCommand extends SpoCommand_1.default {
                     logger.logToStderr(`Updating field schema...`);
                 }
                 const requestOptions = {
-                    url: `${args.options.webUrl}/_api/web/fields('${args.options.fieldId}')`,
+                    url: `${args.options.webUrl}/_api/web/fields('${args.options.id}')`,
                     headers: {
                         accept: 'application/json;odata=nometadata',
                         'content-type': 'application/json;odata=nometadata',
@@ -339,7 +339,7 @@ _SpoContentTypeFieldSetCommand_instances = new WeakSet(), _SpoContentTypeFieldSe
     }, {
         option: '-c, --contentTypeId <contentTypeId>'
     }, {
-        option: '-f, --fieldId <fieldId>'
+        option: '-f, --id <id>'
     }, {
         option: '-r, --required [required]'
     }, {
@@ -347,8 +347,8 @@ _SpoContentTypeFieldSetCommand_instances = new WeakSet(), _SpoContentTypeFieldSe
     });
 }, _SpoContentTypeFieldSetCommand_initValidators = function _SpoContentTypeFieldSetCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (!utils_1.validation.isValidGuid(args.options.fieldId)) {
-            return `${args.options.fieldId} is not a valid GUID`;
+        if (!utils_1.validation.isValidGuid(args.options.id)) {
+            return `${args.options.id} is not a valid GUID`;
         }
         if (typeof args.options.required !== 'undefined') {
             if (args.options.required !== 'true' &&

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/customaction/customaction-add.js

@@ -53,7 +53,7 @@ class SpoCustomActionAddCommand extends SpoCommand_1.default {
         }
         const requestBody = this.mapRequestBody(args.options);
         const requestOptions = {
-            url: `${args.options.url}/_api/${args.options.scope}/UserCustomActions`,
+            url: `${args.options.webUrl}/_api/${args.options.scope}/UserCustomActions`,
             headers: {
                 accept: 'application/json;odata=nometadata'
             },
@@ -181,7 +181,7 @@ _SpoCustomActionAddCommand_instances = new WeakSet(), _SpoCustomActionAddCommand
     });
 }, _SpoCustomActionAddCommand_initOptions = function _SpoCustomActionAddCommand_initOptions() {
     this.options.unshift({
-        option: '-u, --url <url>'
+        option: '-u, --webUrl <webUrl>'
     }, {
         option: '-n, --name <name>'
     }, {
@@ -222,7 +222,7 @@ _SpoCustomActionAddCommand_instances = new WeakSet(), _SpoCustomActionAddCommand
     });
 }, _SpoCustomActionAddCommand_initValidators = function _SpoCustomActionAddCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        const isValidSharePointUrl = utils_1.validation.isValidSharePointUrl(args.options.url);
+        const isValidSharePointUrl = utils_1.validation.isValidSharePointUrl(args.options.webUrl);
         if (isValidSharePointUrl !== true) {
             return isValidSharePointUrl;
         }

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

@@ -66,7 +66,7 @@ class SpoCustomActionClearCommand extends SpoCommand_1.default {
     }
     clearScopedCustomActions(options) {
         const requestOptions = {
-            url: `${options.url}/_api/${options.scope}/UserCustomActions/clear`,
+            url: `${options.webUrl}/_api/${options.scope}/UserCustomActions/clear`,
             headers: {
                 accept: 'application/json;odata=nometadata'
             },
@@ -104,7 +104,7 @@ _SpoCustomActionClearCommand_instances = new WeakSet(), _SpoCustomActionClearCom
     });
 }, _SpoCustomActionClearCommand_initOptions = function _SpoCustomActionClearCommand_initOptions() {
     this.options.unshift({
-        option: '-u, --url <url>'
+        option: '-u, --webUrl <webUrl>'
     }, {
         option: '-s, --scope [scope]',
         autocomplete: ['Site', 'Web', 'All']
@@ -113,7 +113,7 @@ _SpoCustomActionClearCommand_instances = new WeakSet(), _SpoCustomActionClearCom
     });
 }, _SpoCustomActionClearCommand_initValidators = function _SpoCustomActionClearCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        const isValidUrl = utils_1.validation.isValidSharePointUrl(args.options.url);
+        const isValidUrl = utils_1.validation.isValidSharePointUrl(args.options.webUrl);
         if (typeof isValidUrl === 'string') {
             return isValidUrl;
         }

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

@@ -78,7 +78,7 @@ class SpoCustomActionGetCommand extends SpoCommand_1.default {
             `('${encodeURIComponent(options.id)}')` :
             `?$filter=Title eq '${encodeURIComponent(options.title)}'`;
         const requestOptions = {
-            url: `${options.url}/_api/${options.scope}/UserCustomActions${filter}`,
+            url: `${options.webUrl}/_api/${options.scope}/UserCustomActions${filter}`,
             headers: {
                 accept: 'application/json;odata=nometadata'
             },
@@ -152,7 +152,7 @@ _SpoCustomActionGetCommand_instances = new WeakSet(), _SpoCustomActionGetCommand
     }, {
         option: '-t, --title [title]'
     }, {
-        option: '-u, --url <url>'
+        option: '-u, --webUrl <webUrl>'
     }, {
         option: '-s, --scope [scope]',
         autocomplete: ['Site', 'Web', 'All']
@@ -162,8 +162,9 @@ _SpoCustomActionGetCommand_instances = new WeakSet(), _SpoCustomActionGetCommand
         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' &&