@pnp/cli-microsoft365 5.9.0 → 6.0.0-beta.01ba480

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

@@ -39,7 +39,7 @@ class SpoAppListCommand extends SpoAppBaseCommand_1.SpoAppBaseCommand {
     }
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
-            const scope = (args.options.scope) ? args.options.scope.toLowerCase() : 'tenant';
+            const scope = (args.options.appCatalogScope) ? args.options.appCatalogScope.toLowerCase() : 'tenant';
             let appCatalogSiteUrl = '';
             let spoUrl = '';
             try {
@@ -75,12 +75,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]'
@@ -88,13 +88,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 validation_1.validation.isValidSharePointUrl(args.options.appCatalogUrl);

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

@@ -37,7 +37,7 @@ class SpoAppRemoveCommand extends SpoAppBaseCommand_1.SpoAppBaseCommand {
     }
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
-            const scope = (args.options.scope) ? args.options.scope.toLowerCase() : 'tenant';
+            const scope = (args.options.appCatalogScope) ? args.options.appCatalogScope.toLowerCase() : 'tenant';
             const removeApp = () => __awaiter(this, void 0, void 0, function* () {
                 try {
                     const spoUrl = yield spo_1.spo.getSpoUrl(logger, this.debug);
@@ -79,7 +79,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() {
@@ -88,7 +88,7 @@ _SpoAppRemoveCommand_instances = new WeakSet(), _SpoAppRemoveCommand_initTelemet
     }, {
         option: '-u, --appCatalogUrl [appCatalogUrl]'
     }, {
-        option: '-s, --scope [scope]',
+        option: '-s, --appCatalogScope [appCatalogScope]',
         autocomplete: ['tenant', 'sitecollection']
     }, {
         option: '--confirm'
@@ -96,13 +96,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 (!validation_1.validation.isValidGuid(args.options.id)) {

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

@@ -37,7 +37,7 @@ class SpoAppRetractCommand extends SpoAppBaseCommand_1.SpoAppBaseCommand {
     }
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
-            const scope = (args.options.scope) ? args.options.scope.toLowerCase() : 'tenant';
+            const scope = (args.options.appCatalogScope) ? args.options.appCatalogScope.toLowerCase() : 'tenant';
             const retractApp = () => __awaiter(this, void 0, void 0, function* () {
                 try {
                     const spoUrl = yield spo_1.spo.getSpoUrl(logger, this.debug);
@@ -79,7 +79,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() {
@@ -88,20 +88,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 (!validation_1.validation.isValidGuid(args.options.id)) {

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

@@ -37,7 +37,7 @@ class SpoAppUninstallCommand extends SpoCommand_1.default {
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
             const uninstallApp = () => __awaiter(this, void 0, void 0, function* () {
-                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}'...`);
                 }
@@ -75,7 +75,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() {
@@ -84,17 +84,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 (!validation_1.validation.isValidGuid(args.options.id)) {

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

@@ -35,7 +35,7 @@ class SpoAppUpgradeCommand extends SpoCommand_1.default {
     }
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
-            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}'...`);
             }
@@ -57,7 +57,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() {
@@ -66,15 +66,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 (!validation_1.validation.isValidGuid(args.options.id)) {

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

@@ -42,7 +42,7 @@ class SpoAppPageSetCommand extends SpoCommand_1.default {
                 },
                 responseType: 'json',
                 data: {
-                    serverRelativeUrl: `${urlUtil_1.urlUtil.getServerRelativePath(args.options.webUrl, '')}/SitePages/${args.options.pageName}`,
+                    serverRelativeUrl: `${urlUtil_1.urlUtil.getServerRelativePath(args.options.webUrl, '')}/SitePages/${args.options.name}`,
                     webPartDataAsJson: args.options.webPartData
                 }
             };
@@ -59,7 +59,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 {
     }
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
-            const cdnTypeString = args.options.type || 'Public';
+            const cdnTypeString = args.options.cdnType || 'Public';
             const cdnType = cdnTypeString === 'Private' ? 1 : 0;
             let spoAdminUrl = '';
             let tenantId = '';
@@ -83,20 +83,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

@@ -37,7 +37,7 @@ class SpoCdnPolicySetCommand extends SpoCommand_1.default {
     }
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
-            const cdnTypeString = args.options.type || 'Public';
+            const cdnTypeString = args.options.cdnType || 'Public';
             const cdnType = cdnTypeString === 'Private' ? 1 : 0;
             try {
                 const tenantId = yield spo_1.spo.getTenantId(logger, this.debug);
@@ -78,13 +78,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>',
@@ -94,10 +94,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

@@ -46,10 +46,10 @@ class SpoContentTypeFieldSetCommand extends SpoCommand_1.default {
             try {
                 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}...`);
                 }
                 let 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'
                     },
@@ -65,10 +65,10 @@ class SpoContentTypeFieldSetCommand extends SpoCommand_1.default {
                 else {
                     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}...`);
                     }
                     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'
                         },
@@ -80,10 +80,10 @@ class SpoContentTypeFieldSetCommand extends SpoCommand_1.default {
                 }
                 if (!this.fieldLink) {
                     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}...`);
                     }
                     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'
                         },
@@ -95,7 +95,7 @@ class SpoContentTypeFieldSetCommand extends SpoCommand_1.default {
                     }
                 }
                 if (!this.fieldLink) {
-                    throw `Couldn't find field link for field ${args.options.fieldId}`;
+                    throw `Couldn't find field link for field ${args.options.id}`;
                 }
                 let updateHidden = false;
                 let updateRequired = false;
@@ -224,7 +224,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:${formatting_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:${formatting_1.formatting.escapeXml(args.options.contentTypeId)}" /><Property Id="3" ParentId="1" Name="FieldLinks" /></ObjectPaths></Request>`
                 };
                 return request_1.default.post(requestOptions);
             })
@@ -246,7 +246,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;
@@ -258,7 +258,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',
@@ -315,7 +315,7 @@ _SpoContentTypeFieldSetCommand_instances = new WeakSet(), _SpoContentTypeFieldSe
     }, {
         option: '-c, --contentTypeId <contentTypeId>'
     }, {
-        option: '-f, --fieldId <fieldId>'
+        option: '-f, --id <id>'
     }, {
         option: '-r, --required [required]'
     }, {
@@ -323,8 +323,8 @@ _SpoContentTypeFieldSetCommand_instances = new WeakSet(), _SpoContentTypeFieldSe
     });
 }, _SpoContentTypeFieldSetCommand_initValidators = function _SpoContentTypeFieldSetCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (!validation_1.validation.isValidGuid(args.options.fieldId)) {
-            return `${args.options.fieldId} is not a valid GUID`;
+        if (!validation_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/customaction/customaction-add.js

@@ -55,7 +55,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'
                     },
@@ -184,7 +184,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>'
     }, {
@@ -225,7 +225,7 @@ _SpoCustomActionAddCommand_instances = new WeakSet(), _SpoCustomActionAddCommand
     });
 }, _SpoCustomActionAddCommand_initValidators = function _SpoCustomActionAddCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        const isValidSharePointUrl = validation_1.validation.isValidSharePointUrl(args.options.url);
+        const isValidSharePointUrl = validation_1.validation.isValidSharePointUrl(args.options.webUrl);
         if (isValidSharePointUrl !== true) {
             return isValidSharePointUrl;
         }

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

@@ -68,7 +68,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'
             },
@@ -106,7 +106,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']
@@ -115,7 +115,7 @@ _SpoCustomActionClearCommand_instances = new WeakSet(), _SpoCustomActionClearCom
     });
 }, _SpoCustomActionClearCommand_initValidators = function _SpoCustomActionClearCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        const isValidUrl = validation_1.validation.isValidSharePointUrl(args.options.url);
+        const isValidUrl = validation_1.validation.isValidSharePointUrl(args.options.webUrl);
         if (typeof isValidUrl === 'string') {
             return isValidUrl;
         }

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

@@ -83,7 +83,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'
             },
@@ -157,7 +157,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']
@@ -167,8 +167,9 @@ _SpoCustomActionGetCommand_instances = new WeakSet(), _SpoCustomActionGetCommand
         if (args.options.id && validation_1.validation.isValidGuid(args.options.id) === false) {
             return `${args.options.id} is not valid. Custom action id (Guid) expected.`;
         }
-        if (validation_1.validation.isValidSharePointUrl(args.options.url) !== true) {
-            return 'Missing required option url';
+        const isValidUrl = validation_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-list.js

@@ -70,7 +70,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'
             },
@@ -127,15 +127,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 (validation_1.validation.isValidSharePointUrl(args.options.url) !== true) {
-            return 'Missing required option url';
+        const isValidUrl = validation_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

@@ -77,7 +77,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'
             },
@@ -100,7 +100,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'
@@ -151,7 +151,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']
@@ -163,8 +163,9 @@ _SpoCustomActionRemoveCommand_instances = new WeakSet(), _SpoCustomActionRemoveC
         if (args.options.id && validation_1.validation.isValidGuid(args.options.id) === false) {
             return `${args.options.id} is not valid. Custom action Id (GUID) expected.`;
         }
-        if (validation_1.validation.isValidSharePointUrl(args.options.url) !== true) {
-            return 'Missing required option url';
+        const isValidUrl = validation_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

@@ -74,7 +74,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'
@@ -208,7 +208,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>'
     }, {
@@ -254,7 +254,7 @@ _SpoCustomActionSetCommand_instances = new WeakSet(), _SpoCustomActionSetCommand
         if (validation_1.validation.isValidGuid(args.options.id) === false) {
             return `${args.options.id} is not valid. Custom action id (Guid) expected`;
         }
-        const isValidSharePointUrl = validation_1.validation.isValidSharePointUrl(args.options.url);
+        const isValidSharePointUrl = validation_1.validation.isValidSharePointUrl(args.options.webUrl);
         if (isValidSharePointUrl !== true) {
             return isValidSharePointUrl;
         }

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

@@ -44,9 +44,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: {
@@ -71,9 +71,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']