@pnp/cli-microsoft365 6.0.0-beta.6a854fc → 6.0.0-beta.7920dfd

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

@@ -1,11 +1,34 @@
 "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 _SpoCustomActionSetCommand_instances, _SpoCustomActionSetCommand_initTelemetry, _SpoCustomActionSetCommand_initOptions, _SpoCustomActionSetCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const formatting_1 = require("../../../../utils/formatting");
+const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const base_permissions_1 = require("../../base-permissions");
 const commands_1 = require("../../commands");
 class SpoCustomActionSetCommand extends SpoCommand_1.default {
+    constructor() {
+        super();
+        _SpoCustomActionSetCommand_instances.add(this);
+        __classPrivateFieldGet(this, _SpoCustomActionSetCommand_instances, "m", _SpoCustomActionSetCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _SpoCustomActionSetCommand_instances, "m", _SpoCustomActionSetCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _SpoCustomActionSetCommand_instances, "m", _SpoCustomActionSetCommand_initValidators).call(this);
+    }
     get name() {
         return commands_1.default.CUSTOMACTION_SET;
     }
@@ -25,156 +48,34 @@ class SpoCustomActionSetCommand 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 = 'All';
-            }
-            if (args.options.scope.toLowerCase() !== "all") {
-                return this.updateCustomAction(args.options);
-            }
-            return this.searchAllScopes(args.options);
-        })()
-            .then((customAction) => {
-            if (this.verbose) {
-                if (customAction && customAction["odata.null"] === true) {
-                    logger.logToStderr(`Custom action with id ${args.options.id} not found`);
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                let customAction;
+                if (!args.options.scope) {
+                    args.options.scope = 'All';
                 }
-            }
-            cb();
-        }, (err) => this.handleRejectedPromise(err, logger, cb));
-    }
-    options() {
-        const options = [
-            {
-                option: '-u, --url <url>'
-            },
-            {
-                option: '-i, --id <id>'
-            },
-            {
-                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', 'All']
-            },
-            {
-                option: '--scriptBlock [scriptBlock]'
-            },
-            {
-                option: '--scriptSrc [scriptSrc]'
-            },
-            {
-                option: '-c, --clientSideComponentId [clientSideComponentId]'
-            },
-            {
-                option: '-p, --clientSideComponentProperties [clientSideComponentProperties]'
-            }
-        ];
-        const parentOptions = super.options();
-        return options.concat(parentOptions);
-    }
-    validate(args) {
-        if (utils_1.validation.isValidGuid(args.options.id) === false) {
-            return `${args.options.id} is not valid. Custom action id (Guid) expected`;
-        }
-        const isValidSharePointUrl = utils_1.validation.isValidSharePointUrl(args.options.url);
-        if (isValidSharePointUrl !== true) {
-            return isValidSharePointUrl;
-        }
-        if (!args.options.title && !args.options.name && !args.options.location &&
-            !args.options.actionUrl && !args.options.clientSideComponentId && !args.options.clientSideComponentProperties &&
-            !args.options.commandUIExtension && !args.options.group && !args.options.imageUrl &&
-            !args.options.description && !args.options.registrationId && !args.options.registrationType &&
-            !args.options.rights && !args.options.scriptBlock && !args.options.scriptSrc &&
-            !args.options.sequence) {
-            return 'Please specify option to be updated';
-        }
-        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.scope &&
-            args.options.scope !== 'Site' &&
-            args.options.scope !== 'Web' &&
-            args.options.scope !== 'All') {
-            return `${args.options.scope} is not a valid custom action scope. Allowed values are Site|Web|All`;
-        }
-        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`;
+                if (args.options.scope.toLowerCase() !== "all") {
+                    customAction = yield this.updateCustomAction(args.options);
+                }
+                else {
+                    customAction = yield this.searchAllScopes(args.options);
+                }
+                if (this.verbose) {
+                    if (customAction && customAction["odata.null"] === true) {
+                        logger.logToStderr(`Custom action with id ${args.options.id} not found`);
+                    }
                 }
             }
-        }
-        return true;
+            catch (err) {
+                this.handleRejectedPromise(err);
+            }
+        });
     }
     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('${formatting_1.formatting.encodeQueryParameter(options.id)}')`,
             headers: {
                 accept: 'application/json;odata=nometadata',
                 'X-HTTP-Method': 'MERGE'
@@ -286,5 +187,112 @@ class SpoCustomActionSetCommand extends SpoCommand_1.default {
         return 0; // None
     }
 }
+_SpoCustomActionSetCommand_instances = new WeakSet(), _SpoCustomActionSetCommand_initTelemetry = function _SpoCustomActionSetCommand_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()
+        });
+    });
+}, _SpoCustomActionSetCommand_initOptions = function _SpoCustomActionSetCommand_initOptions() {
+    this.options.unshift({
+        option: '-u, --webUrl <webUrl>'
+    }, {
+        option: '-i, --id <id>'
+    }, {
+        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', 'All']
+    }, {
+        option: '--scriptBlock [scriptBlock]'
+    }, {
+        option: '--scriptSrc [scriptSrc]'
+    }, {
+        option: '-c, --clientSideComponentId [clientSideComponentId]'
+    }, {
+        option: '-p, --clientSideComponentProperties [clientSideComponentProperties]'
+    });
+}, _SpoCustomActionSetCommand_initValidators = function _SpoCustomActionSetCommand_initValidators() {
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
+        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.webUrl);
+        if (isValidSharePointUrl !== true) {
+            return isValidSharePointUrl;
+        }
+        if (!args.options.title && !args.options.name && !args.options.location &&
+            !args.options.actionUrl && !args.options.clientSideComponentId && !args.options.clientSideComponentProperties &&
+            !args.options.commandUIExtension && !args.options.group && !args.options.imageUrl &&
+            !args.options.description && !args.options.registrationId && !args.options.registrationType &&
+            !args.options.rights && !args.options.scriptBlock && !args.options.scriptSrc &&
+            !args.options.sequence) {
+            return 'Please specify option to be updated';
+        }
+        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 && validation_1.validation.isValidGuid(args.options.clientSideComponentId) === false) {
+            return `ClientSideComponentId ${args.options.clientSideComponentId} is not a valid GUID`;
+        }
+        if (args.options.scope &&
+            args.options.scope !== 'Site' &&
+            args.options.scope !== 'Web' &&
+            args.options.scope !== 'All') {
+            return `${args.options.scope} is not a valid custom action scope. Allowed values are Site|Web|All`;
+        }
+        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 SpoCustomActionSetCommand();
 //# sourceMappingURL=customaction-set.js.map

package/dist/m365/spo/commands/eventreceiver/EventReceiver.js

@@ -0,0 +1,3 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+//# sourceMappingURL=EventReceiver.js.map

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

@@ -1,101 +1,132 @@
 "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 _SpoEventreceiverGetCommand_instances, _SpoEventreceiverGetCommand_initTelemetry, _SpoEventreceiverGetCommand_initOptions, _SpoEventreceiverGetCommand_initValidators, _SpoEventreceiverGetCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const formatting_1 = require("../../../../utils/formatting");
+const urlUtil_1 = require("../../../../utils/urlUtil");
+const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoEventreceiverGetCommand extends SpoCommand_1.default {
+    constructor() {
+        super();
+        _SpoEventreceiverGetCommand_instances.add(this);
+        __classPrivateFieldGet(this, _SpoEventreceiverGetCommand_instances, "m", _SpoEventreceiverGetCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _SpoEventreceiverGetCommand_instances, "m", _SpoEventreceiverGetCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _SpoEventreceiverGetCommand_instances, "m", _SpoEventreceiverGetCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _SpoEventreceiverGetCommand_instances, "m", _SpoEventreceiverGetCommand_initOptionSets).call(this);
+    }
     get name() {
         return commands_1.default.EVENTRECEIVER_GET;
     }
     get description() {
         return 'Gets a specific event receiver attached to the web, site or list (if any of the list options are filled in) by receiver name of id';
     }
-    getTelemetryProperties(args) {
-        const telemetryProps = super.getTelemetryProperties(args);
-        telemetryProps.listId = typeof args.options.listId !== 'undefined';
-        telemetryProps.listTitle = typeof args.options.listTitle !== 'undefined';
-        telemetryProps.listUrl = typeof args.options.listUrl !== 'undefined';
-        telemetryProps.scope = typeof args.options.scope !== 'undefined';
-        telemetryProps.id = typeof args.options.id !== 'undefined';
-        telemetryProps.name = typeof args.options.name !== 'undefined';
-        return telemetryProps;
-    }
-    commandAction(logger, args, cb) {
-        let requestUrl = `${args.options.webUrl}/_api/`;
-        let listUrl = '';
-        let filter = '?$filter=';
-        if (args.options.listId) {
-            listUrl = `lists(guid'${utils_1.formatting.encodeQueryParameter(args.options.listId)}')/`;
-        }
-        else if (args.options.listTitle) {
-            listUrl = `lists/getByTitle('${utils_1.formatting.encodeQueryParameter(args.options.listTitle)}')/`;
-        }
-        else if (args.options.listUrl) {
-            const listServerRelativeUrl = utils_1.urlUtil.getServerRelativePath(args.options.webUrl, args.options.listUrl);
-            listUrl = `GetList('${utils_1.formatting.encodeQueryParameter(listServerRelativeUrl)}')/`;
-        }
-        if (!args.options.scope || args.options.scope === 'web') {
-            requestUrl += `web/${listUrl}eventreceivers`;
-        }
-        else {
-            requestUrl += 'site/eventreceivers';
-        }
-        if (args.options.id) {
-            filter += `receiverid eq (guid'${args.options.id}')`;
-        }
-        else {
-            filter += `receivername eq '${args.options.name}'`;
-        }
-        const requestOptions = {
-            url: requestUrl + filter,
-            headers: {
-                'accept': 'application/json;odata=nometadata'
-            },
-            responseType: 'json'
-        };
-        request_1.default
-            .get(requestOptions)
-            .then((res) => {
-            logger.log(res.value);
-            cb();
-        }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
-    }
-    options() {
-        const options = [
-            {
-                option: '-u, --webUrl <webUrl>'
-            },
-            {
-                option: '--listTitle [listTitle]'
-            },
-            {
-                option: '--listId  [listId]'
-            },
-            {
-                option: '--listUrl [listUrl]'
-            },
-            {
-                option: '-n, --name [name]'
-            },
-            {
-                option: '-i, --id [id]'
-            },
-            {
-                option: '-s, --scope [scope]',
-                autocomplete: ['web', 'site']
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                const eventReceiver = yield this.getEventReceiver(args);
+                logger.log(eventReceiver);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
             }
-        ];
-        const parentOptions = super.options();
-        return options.concat(parentOptions);
+        });
     }
-    optionSets() {
-        return [
-            ['name', 'id']
-        ];
+    getEventReceiver(args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const requestOptions = {
+                url: `${args.options.webUrl}/_api`,
+                headers: {
+                    'accept': 'application/json;odata=nometadata'
+                },
+                responseType: 'json'
+            };
+            if (!args.options.scope || args.options.scope === 'web') {
+                requestOptions.url += `/web`;
+            }
+            else {
+                requestOptions.url += '/site';
+            }
+            if (args.options.listId) {
+                requestOptions.url += `/lists(guid'${formatting_1.formatting.encodeQueryParameter(args.options.listId)}')`;
+            }
+            else if (args.options.listTitle) {
+                requestOptions.url += `/lists/getByTitle('${formatting_1.formatting.encodeQueryParameter(args.options.listTitle)}')`;
+            }
+            else if (args.options.listUrl) {
+                const listServerRelativeUrl = urlUtil_1.urlUtil.getServerRelativePath(args.options.webUrl, args.options.listUrl);
+                requestOptions.url += `/GetList('${formatting_1.formatting.encodeQueryParameter(listServerRelativeUrl)}')`;
+            }
+            requestOptions.url += '/eventreceivers';
+            if (args.options.id) {
+                requestOptions.url += `(guid'${args.options.id}')`;
+                const res = yield request_1.default.get(requestOptions);
+                // Instead of failing, the request will return an 'odata.null' object if the event receiver doesn't exist.
+                if (res && res['odata.null']) {
+                    throw `The specified event receiver '${args.options.id}' does not exist.`;
+                }
+                return res;
+            }
+            else {
+                requestOptions.url += `?$filter=receivername eq '${args.options.name}'`;
+                const res = yield request_1.default.get(requestOptions);
+                if (res.value.length === 0) {
+                    throw `The specified event receiver '${args.options.name}' does not exist.`;
+                }
+                if (res.value && res.value.length > 1) {
+                    throw `Multiple event receivers with name '${args.options.name}' found: ${res.value.map(x => x.ReceiverId)}`;
+                }
+                return res.value[0];
+            }
+        });
     }
-    validate(args) {
-        const isValidSharePointUrl = utils_1.validation.isValidSharePointUrl(args.options.webUrl);
+}
+_SpoEventreceiverGetCommand_instances = new WeakSet(), _SpoEventreceiverGetCommand_initTelemetry = function _SpoEventreceiverGetCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            listId: typeof args.options.listId !== 'undefined',
+            listTitle: typeof args.options.listTitle !== 'undefined',
+            listUrl: typeof args.options.listUrl !== 'undefined',
+            scope: typeof args.options.scope !== 'undefined',
+            id: typeof args.options.id !== 'undefined',
+            name: typeof args.options.name !== 'undefined'
+        });
+    });
+}, _SpoEventreceiverGetCommand_initOptions = function _SpoEventreceiverGetCommand_initOptions() {
+    this.options.unshift({
+        option: '-u, --webUrl <webUrl>'
+    }, {
+        option: '--listTitle [listTitle]'
+    }, {
+        option: '--listId  [listId]'
+    }, {
+        option: '--listUrl [listUrl]'
+    }, {
+        option: '-n, --name [name]'
+    }, {
+        option: '-i, --id [id]'
+    }, {
+        option: '-s, --scope [scope]',
+        autocomplete: ['web', 'site']
+    });
+}, _SpoEventreceiverGetCommand_initValidators = function _SpoEventreceiverGetCommand_initValidators() {
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
+        const isValidSharePointUrl = validation_1.validation.isValidSharePointUrl(args.options.webUrl);
         if (isValidSharePointUrl !== true) {
             return isValidSharePointUrl;
         }
@@ -103,7 +134,7 @@ class SpoEventreceiverGetCommand extends SpoCommand_1.default {
         if (listOptions.some(item => item !== undefined) && listOptions.filter(item => item !== undefined).length > 1) {
             return `Specify either list id or title or list url`;
         }
-        if (args.options.listId && !utils_1.validation.isValidGuid(args.options.listId)) {
+        if (args.options.listId && !validation_1.validation.isValidGuid(args.options.listId)) {
             return `${args.options.listId} is not a valid GUID`;
         }
         if (args.options.scope && ['web', 'site'].indexOf(args.options.scope) === -1) {
@@ -113,7 +144,9 @@ class SpoEventreceiverGetCommand extends SpoCommand_1.default {
             return 'Scope cannot be set to site when retrieving list event receivers.';
         }
         return true;
-    }
-}
+    }));
+}, _SpoEventreceiverGetCommand_initOptionSets = function _SpoEventreceiverGetCommand_initOptionSets() {
+    this.optionSets.push({ options: ['name', 'id'] });
+};
 module.exports = new SpoEventreceiverGetCommand();
 //# sourceMappingURL=eventreceiver-get.js.map