@pnp/cli-microsoft365 6.0.0-beta.f94d570 → 6.0.0-beta.fcd7567

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

@@ -1,4 +1,19 @@
 "use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
+    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
+    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
+};
+var _SpoCustomActionAddCommand_instances, _SpoCustomActionAddCommand_initTelemetry, _SpoCustomActionAddCommand_initOptions, _SpoCustomActionAddCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
 const utils_1 = require("../../../../utils");
@@ -6,6 +21,13 @@ const SpoCommand_1 = require("../../../base/SpoCommand");
 const base_permissions_1 = require("../../base-permissions");
 const commands_1 = require("../../commands");
 class SpoCustomActionAddCommand extends SpoCommand_1.default {
+    constructor() {
+        super();
+        _SpoCustomActionAddCommand_instances.add(this);
+        __classPrivateFieldGet(this, _SpoCustomActionAddCommand_instances, "m", _SpoCustomActionAddCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _SpoCustomActionAddCommand_instances, "m", _SpoCustomActionAddCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _SpoCustomActionAddCommand_instances, "m", _SpoCustomActionAddCommand_initValidators).call(this);
+    }
     get name() {
         return commands_1.default.CUSTOMACTION_ADD;
     }
@@ -25,32 +47,13 @@ class SpoCustomActionAddCommand extends SpoCommand_1.default {
         }
         return result;
     }
-    getTelemetryProperties(args) {
-        const telemetryProps = super.getTelemetryProperties(args);
-        telemetryProps.location = args.options.location;
-        telemetryProps.scope = args.options.scope || 'Web';
-        telemetryProps.group = (!(!args.options.group)).toString();
-        telemetryProps.description = (!(!args.options.description)).toString();
-        telemetryProps.sequence = (!(!args.options.sequence)).toString();
-        telemetryProps.actionUrl = (!(!args.options.actionUrl)).toString();
-        telemetryProps.imageUrl = (!(!args.options.imageUrl)).toString();
-        telemetryProps.commandUIExtension = (!(!args.options.commandUIExtension)).toString();
-        telemetryProps.registrationId = args.options.registrationId;
-        telemetryProps.registrationType = args.options.registrationType;
-        telemetryProps.rights = args.options.rights;
-        telemetryProps.scriptSrc = (!(!args.options.scriptSrc)).toString();
-        telemetryProps.scriptBlock = (!(!args.options.scriptBlock)).toString();
-        telemetryProps.clientSideComponentId = (!(!args.options.clientSideComponentId)).toString();
-        telemetryProps.clientSideComponentProperties = (!(!args.options.clientSideComponentProperties)).toString();
-        return telemetryProps;
-    }
     commandAction(logger, args, cb) {
         if (!args.options.scope) {
             args.options.scope = 'Web';
         }
         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'
             },
@@ -86,127 +89,6 @@ class SpoCustomActionAddCommand extends SpoCommand_1.default {
             cb();
         }, (err) => this.handleRejectedPromise(err, logger, cb));
     }
-    options() {
-        const options = [
-            {
-                option: '-u, --url <url>'
-            },
-            {
-                option: '-n, --name <name>'
-            },
-            {
-                option: '-t, --title <title>'
-            },
-            {
-                option: '-l, --location <location>'
-            },
-            {
-                option: '-g, --group [group]'
-            },
-            {
-                option: '-d, --description [description]'
-            },
-            {
-                option: '--sequence [sequence]'
-            },
-            {
-                option: '--actionUrl [actionUrl]'
-            },
-            {
-                option: '--imageUrl [imageUrl]'
-            },
-            {
-                option: '-e, --commandUIExtension [commandUIExtension]'
-            },
-            {
-                option: '--registrationId [registrationId]'
-            },
-            {
-                option: '--registrationType [registrationType]',
-                autocomplete: ['None', 'List', 'ContentType', 'ProgId', 'FileType']
-            },
-            {
-                option: '--rights [rights]',
-                autocomplete: this.permissionsKindMap
-            },
-            {
-                option: '-s, --scope [scope]',
-                autocomplete: ['Site', 'Web']
-            },
-            {
-                option: '--scriptBlock [scriptBlock]'
-            },
-            {
-                option: '--scriptSrc [scriptSrc]'
-            },
-            {
-                option: '-c, --clientSideComponentId [clientSideComponentId]'
-            },
-            {
-                option: '-p, --clientSideComponentProperties [clientSideComponentProperties]'
-            }
-        ];
-        const parentOptions = super.options();
-        return options.concat(parentOptions);
-    }
-    validate(args) {
-        const isValidSharePointUrl = utils_1.validation.isValidSharePointUrl(args.options.url);
-        if (isValidSharePointUrl !== true) {
-            return isValidSharePointUrl;
-        }
-        if (args.options.registrationId && !args.options.registrationType) {
-            return 'Option registrationId is specified, but registrationType is missing';
-        }
-        if (args.options.registrationType && !args.options.registrationId) {
-            return 'Option registrationType is specified, but registrationId is missing';
-        }
-        const location = args.options.location.toLowerCase();
-        const locationsRequireGroup = [
-            'microsoft.sharepoint.standardmenu', 'microsoft.sharepoint.contenttypesettings',
-            'microsoft.sharepoint.contenttypetemplatesettings', 'microsoft.sharepoint.create',
-            'microsoft.sharepoint.groupspage', 'microsoft.sharepoint.listedit',
-            'microsoft.sharepoint.listedit.documentlibrary', 'microsoft.sharepoint.peoplepage',
-            'microsoft.sharepoint.sitesettings'
-        ];
-        if (locationsRequireGroup.indexOf(location) > -1 && !args.options.group) {
-            return `The location specified requires the group option to be specified as well`;
-        }
-        if (location === 'scriptlink' &&
-            !args.options.scriptSrc &&
-            !args.options.scriptBlock) {
-            return 'Option scriptSrc or scriptBlock is required when the location is set to ScriptLink';
-        }
-        if ((args.options.scriptSrc || args.options.scriptBlock) && location !== 'scriptlink') {
-            return 'Option scriptSrc or scriptBlock is specified, but the location option is different than ScriptLink. Please use --actionUrl, if the location should be different than ScriptLink';
-        }
-        if (args.options.scriptSrc && args.options.scriptBlock) {
-            return 'Either option scriptSrc or scriptBlock can be specified, but not both';
-        }
-        if (args.options.sequence && (args.options.sequence < 0 || args.options.sequence > 65536)) {
-            return 'Invalid option sequence. Expected value in range from 0 to 65536';
-        }
-        if (args.options.clientSideComponentId && utils_1.validation.isValidGuid(args.options.clientSideComponentId) === false) {
-            return `ClientSideComponentId ${args.options.clientSideComponentId} is not a valid GUID`;
-        }
-        if (args.options.clientSideComponentProperties && !args.options.clientSideComponentId) {
-            return `Option clientSideComponentProperties is specified, but the clientSideComponentId option is missing`;
-        }
-        if (args.options.scope &&
-            args.options.scope !== 'Site' &&
-            args.options.scope !== 'Web') {
-            return `${args.options.scope} is not a valid custom action scope. Allowed values are Site|Web`;
-        }
-        if (args.options.rights) {
-            const rights = args.options.rights.split(',');
-            for (const item of rights) {
-                const kind = base_permissions_1.PermissionKind[item.trim()];
-                if (!kind) {
-                    return `Rights option '${item}' is not recognized as valid PermissionKind choice. Please note it is case sensitive`;
-                }
-            }
-        }
-        return true;
-    }
     mapRequestBody(options) {
         const requestBody = {
             Title: options.title,
@@ -277,5 +159,126 @@ class SpoCustomActionAddCommand extends SpoCommand_1.default {
         return 0; // None
     }
 }
+_SpoCustomActionAddCommand_instances = new WeakSet(), _SpoCustomActionAddCommand_initTelemetry = function _SpoCustomActionAddCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            location: args.options.location,
+            scope: args.options.scope || 'Web',
+            group: (!(!args.options.group)).toString(),
+            description: (!(!args.options.description)).toString(),
+            sequence: (!(!args.options.sequence)).toString(),
+            actionUrl: (!(!args.options.actionUrl)).toString(),
+            imageUrl: (!(!args.options.imageUrl)).toString(),
+            commandUIExtension: (!(!args.options.commandUIExtension)).toString(),
+            registrationId: args.options.registrationId,
+            registrationType: args.options.registrationType,
+            rights: args.options.rights,
+            scriptSrc: (!(!args.options.scriptSrc)).toString(),
+            scriptBlock: (!(!args.options.scriptBlock)).toString(),
+            clientSideComponentId: (!(!args.options.clientSideComponentId)).toString(),
+            clientSideComponentProperties: (!(!args.options.clientSideComponentProperties)).toString()
+        });
+    });
+}, _SpoCustomActionAddCommand_initOptions = function _SpoCustomActionAddCommand_initOptions() {
+    this.options.unshift({
+        option: '-u, --webUrl <webUrl>'
+    }, {
+        option: '-n, --name <name>'
+    }, {
+        option: '-t, --title <title>'
+    }, {
+        option: '-l, --location <location>'
+    }, {
+        option: '-g, --group [group]'
+    }, {
+        option: '-d, --description [description]'
+    }, {
+        option: '--sequence [sequence]'
+    }, {
+        option: '--actionUrl [actionUrl]'
+    }, {
+        option: '--imageUrl [imageUrl]'
+    }, {
+        option: '-e, --commandUIExtension [commandUIExtension]'
+    }, {
+        option: '--registrationId [registrationId]'
+    }, {
+        option: '--registrationType [registrationType]',
+        autocomplete: ['None', 'List', 'ContentType', 'ProgId', 'FileType']
+    }, {
+        option: '--rights [rights]',
+        autocomplete: this.permissionsKindMap
+    }, {
+        option: '-s, --scope [scope]',
+        autocomplete: ['Site', 'Web']
+    }, {
+        option: '--scriptBlock [scriptBlock]'
+    }, {
+        option: '--scriptSrc [scriptSrc]'
+    }, {
+        option: '-c, --clientSideComponentId [clientSideComponentId]'
+    }, {
+        option: '-p, --clientSideComponentProperties [clientSideComponentProperties]'
+    });
+}, _SpoCustomActionAddCommand_initValidators = function _SpoCustomActionAddCommand_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.registrationId && !args.options.registrationType) {
+            return 'Option registrationId is specified, but registrationType is missing';
+        }
+        if (args.options.registrationType && !args.options.registrationId) {
+            return 'Option registrationType is specified, but registrationId is missing';
+        }
+        const location = args.options.location.toLowerCase();
+        const locationsRequireGroup = [
+            'microsoft.sharepoint.standardmenu', 'microsoft.sharepoint.contenttypesettings',
+            'microsoft.sharepoint.contenttypetemplatesettings', 'microsoft.sharepoint.create',
+            'microsoft.sharepoint.groupspage', 'microsoft.sharepoint.listedit',
+            'microsoft.sharepoint.listedit.documentlibrary', 'microsoft.sharepoint.peoplepage',
+            'microsoft.sharepoint.sitesettings'
+        ];
+        if (locationsRequireGroup.indexOf(location) > -1 && !args.options.group) {
+            return `The location specified requires the group option to be specified as well`;
+        }
+        if (location === 'scriptlink' &&
+            !args.options.scriptSrc &&
+            !args.options.scriptBlock) {
+            return 'Option scriptSrc or scriptBlock is required when the location is set to ScriptLink';
+        }
+        if ((args.options.scriptSrc || args.options.scriptBlock) && location !== 'scriptlink') {
+            return 'Option scriptSrc or scriptBlock is specified, but the location option is different than ScriptLink. Please use --actionUrl, if the location should be different than ScriptLink';
+        }
+        if (args.options.scriptSrc && args.options.scriptBlock) {
+            return 'Either option scriptSrc or scriptBlock can be specified, but not both';
+        }
+        if (args.options.sequence && (args.options.sequence < 0 || args.options.sequence > 65536)) {
+            return 'Invalid option sequence. Expected value in range from 0 to 65536';
+        }
+        if (args.options.clientSideComponentId && utils_1.validation.isValidGuid(args.options.clientSideComponentId) === false) {
+            return `ClientSideComponentId ${args.options.clientSideComponentId} is not a valid GUID`;
+        }
+        if (args.options.clientSideComponentProperties && !args.options.clientSideComponentId) {
+            return `Option clientSideComponentProperties is specified, but the clientSideComponentId option is missing`;
+        }
+        if (args.options.scope &&
+            args.options.scope !== 'Site' &&
+            args.options.scope !== 'Web') {
+            return `${args.options.scope} is not a valid custom action scope. Allowed values are Site|Web`;
+        }
+        if (args.options.rights) {
+            const rights = args.options.rights.split(',');
+            for (const item of rights) {
+                const kind = base_permissions_1.PermissionKind[item.trim()];
+                if (!kind) {
+                    return `Rights option '${item}' is not recognized as valid PermissionKind choice. Please note it is case sensitive`;
+                }
+            }
+        }
+        return true;
+    }));
+};
 module.exports = new SpoCustomActionAddCommand();
 //# sourceMappingURL=customaction-add.js.map

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

@@ -1,4 +1,19 @@
 "use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
+    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
+    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
+};
+var _SpoCustomActionClearCommand_instances, _SpoCustomActionClearCommand_initTelemetry, _SpoCustomActionClearCommand_initOptions, _SpoCustomActionClearCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
 const chalk = require("chalk");
 const cli_1 = require("../../../../cli");
@@ -7,18 +22,19 @@ const utils_1 = require("../../../../utils");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoCustomActionClearCommand extends SpoCommand_1.default {
+    constructor() {
+        super();
+        _SpoCustomActionClearCommand_instances.add(this);
+        __classPrivateFieldGet(this, _SpoCustomActionClearCommand_instances, "m", _SpoCustomActionClearCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _SpoCustomActionClearCommand_instances, "m", _SpoCustomActionClearCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _SpoCustomActionClearCommand_instances, "m", _SpoCustomActionClearCommand_initValidators).call(this);
+    }
     get name() {
         return commands_1.default.CUSTOMACTION_CLEAR;
     }
     get description() {
         return 'Deletes all custom actions in the collection';
     }
-    getTelemetryProperties(args) {
-        const telemetryProps = super.getTelemetryProperties(args);
-        telemetryProps.scope = args.options.scope || 'All';
-        telemetryProps.confirm = (!(!args.options.confirm)).toString();
-        return telemetryProps;
-    }
     commandAction(logger, args, cb) {
         const clearCustomActions = () => {
             (() => {
@@ -50,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'
             },
@@ -78,27 +94,26 @@ class SpoCustomActionClearCommand extends SpoCommand_1.default {
             });
         });
     }
-    options() {
-        const options = [
-            {
-                option: '-u, --url <url>'
-            },
-            {
-                option: '-s, --scope [scope]',
-                autocomplete: ['Site', 'Web', 'All']
-            },
-            {
-                option: '--confirm'
-            }
-        ];
-        const parentOptions = super.options();
-        return options.concat(parentOptions);
-    }
-    validate(args) {
-        if (!args.options.url) {
-            return 'Missing required option url';
-        }
-        const isValidUrl = utils_1.validation.isValidSharePointUrl(args.options.url);
+}
+_SpoCustomActionClearCommand_instances = new WeakSet(), _SpoCustomActionClearCommand_initTelemetry = function _SpoCustomActionClearCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            scope: args.options.scope || 'All',
+            confirm: (!(!args.options.confirm)).toString()
+        });
+    });
+}, _SpoCustomActionClearCommand_initOptions = function _SpoCustomActionClearCommand_initOptions() {
+    this.options.unshift({
+        option: '-u, --webUrl <webUrl>'
+    }, {
+        option: '-s, --scope [scope]',
+        autocomplete: ['Site', 'Web', 'All']
+    }, {
+        option: '--confirm'
+    });
+}, _SpoCustomActionClearCommand_initValidators = function _SpoCustomActionClearCommand_initValidators() {
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
+        const isValidUrl = utils_1.validation.isValidSharePointUrl(args.options.webUrl);
         if (typeof isValidUrl === 'string') {
             return isValidUrl;
         }
@@ -109,7 +124,7 @@ class SpoCustomActionClearCommand extends SpoCommand_1.default {
             return `${args.options.scope} is not a valid custom action scope. Allowed values are Site|Web|All`;
         }
         return true;
-    }
-}
+    }));
+};
 module.exports = new SpoCustomActionClearCommand();
 //# sourceMappingURL=customaction-clear.js.map

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

@@ -1,26 +1,39 @@
 "use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
+    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
+    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
+};
+var _SpoCustomActionGetCommand_instances, _SpoCustomActionGetCommand_initTelemetry, _SpoCustomActionGetCommand_initOptions, _SpoCustomActionGetCommand_initValidators, _SpoCustomActionGetCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
 const utils_1 = require("../../../../utils");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoCustomActionGetCommand extends SpoCommand_1.default {
+    constructor() {
+        super();
+        _SpoCustomActionGetCommand_instances.add(this);
+        __classPrivateFieldGet(this, _SpoCustomActionGetCommand_instances, "m", _SpoCustomActionGetCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _SpoCustomActionGetCommand_instances, "m", _SpoCustomActionGetCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _SpoCustomActionGetCommand_instances, "m", _SpoCustomActionGetCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _SpoCustomActionGetCommand_instances, "m", _SpoCustomActionGetCommand_initOptionSets).call(this);
+    }
     get name() {
         return commands_1.default.CUSTOMACTION_GET;
     }
     get description() {
         return 'Gets details for the specified custom action';
     }
-    optionSets() {
-        return [
-            ['id', 'title']
-        ];
-    }
-    getTelemetryProperties(args) {
-        const telemetryProps = super.getTelemetryProperties(args);
-        telemetryProps.scope = args.options.scope || 'All';
-        return telemetryProps;
-    }
     commandAction(logger, args, cb) {
         (() => {
             if (args.options.scope && args.options.scope.toLowerCase() !== "all") {
@@ -65,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'
             },
@@ -126,31 +139,32 @@ class SpoCustomActionGetCommand extends SpoCommand_1.default {
         }
         return `${scope}`;
     }
-    options() {
-        const options = [
-            {
-                option: '-i, --id [id]'
-            },
-            {
-                option: '-t, --title [title]'
-            },
-            {
-                option: '-u, --url <url>'
-            },
-            {
-                option: '-s, --scope [scope]',
-                autocomplete: ['Site', 'Web', 'All']
-            }
-        ];
-        const parentOptions = super.options();
-        return options.concat(parentOptions);
-    }
-    validate(args) {
+}
+_SpoCustomActionGetCommand_instances = new WeakSet(), _SpoCustomActionGetCommand_initTelemetry = function _SpoCustomActionGetCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            scope: args.options.scope || 'All'
+        });
+    });
+}, _SpoCustomActionGetCommand_initOptions = function _SpoCustomActionGetCommand_initOptions() {
+    this.options.unshift({
+        option: '-i, --id [id]'
+    }, {
+        option: '-t, --title [title]'
+    }, {
+        option: '-u, --webUrl <webUrl>'
+    }, {
+        option: '-s, --scope [scope]',
+        autocomplete: ['Site', 'Web', 'All']
+    });
+}, _SpoCustomActionGetCommand_initValidators = function _SpoCustomActionGetCommand_initValidators() {
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
         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' &&
@@ -160,7 +174,9 @@ class SpoCustomActionGetCommand extends SpoCommand_1.default {
             }
         }
         return true;
-    }
-}
+    }));
+}, _SpoCustomActionGetCommand_initOptionSets = function _SpoCustomActionGetCommand_initOptionSets() {
+    this.optionSets.push(['id', 'title']);
+};
 module.exports = new SpoCustomActionGetCommand();
 //# sourceMappingURL=customaction-get.js.map

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

@@ -1,21 +1,38 @@
 "use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
+    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
+    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
+};
+var _SpoCustomActionListCommand_instances, _SpoCustomActionListCommand_initTelemetry, _SpoCustomActionListCommand_initOptions, _SpoCustomActionListCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
 const utils_1 = require("../../../../utils");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoCustomActionListCommand extends SpoCommand_1.default {
+    constructor() {
+        super();
+        _SpoCustomActionListCommand_instances.add(this);
+        __classPrivateFieldGet(this, _SpoCustomActionListCommand_instances, "m", _SpoCustomActionListCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _SpoCustomActionListCommand_instances, "m", _SpoCustomActionListCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _SpoCustomActionListCommand_instances, "m", _SpoCustomActionListCommand_initValidators).call(this);
+    }
     get name() {
         return commands_1.default.CUSTOMACTION_LIST;
     }
     get description() {
         return 'Lists all user custom actions at the given scope';
     }
-    getTelemetryProperties(args) {
-        const telemetryProps = super.getTelemetryProperties(args);
-        telemetryProps.scope = args.options.scope || 'All';
-        return telemetryProps;
-    }
     defaultProperties() {
         return ['Name', 'Location', 'Scope', 'Id'];
     }
@@ -48,7 +65,7 @@ class SpoCustomActionListCommand extends SpoCommand_1.default {
     }
     getCustomActions(options) {
         const requestOptions = {
-            url: `${options.url}/_api/${options.scope}/UserCustomActions`,
+            url: `${options.webUrl}/_api/${options.scope}/UserCustomActions`,
             headers: {
                 accept: 'application/json;odata=nometadata'
             },
@@ -96,22 +113,25 @@ class SpoCustomActionListCommand extends SpoCommand_1.default {
         }
         return `${scope}`;
     }
-    options() {
-        const options = [
-            {
-                option: '-u, --url <url>'
-            },
-            {
-                option: '-s, --scope [scope]',
-                autocomplete: ['Site', 'Web', 'All']
-            }
-        ];
-        const parentOptions = super.options();
-        return options.concat(parentOptions);
-    }
-    validate(args) {
-        if (utils_1.validation.isValidSharePointUrl(args.options.url) !== true) {
-            return 'Missing required option url';
+}
+_SpoCustomActionListCommand_instances = new WeakSet(), _SpoCustomActionListCommand_initTelemetry = function _SpoCustomActionListCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            scope: args.options.scope || 'All'
+        });
+    });
+}, _SpoCustomActionListCommand_initOptions = function _SpoCustomActionListCommand_initOptions() {
+    this.options.unshift({
+        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* () {
+        const isValidUrl = utils_1.validation.isValidSharePointUrl(args.options.webUrl);
+        if (typeof isValidUrl === 'string') {
+            return isValidUrl;
         }
         if (args.options.scope) {
             if (args.options.scope !== 'Site' &&
@@ -121,7 +141,7 @@ class SpoCustomActionListCommand extends SpoCommand_1.default {
             }
         }
         return true;
-    }
-}
+    }));
+};
 module.exports = new SpoCustomActionListCommand();
 //# sourceMappingURL=customaction-list.js.map