@pnp/cli-microsoft365 6.0.0-beta.d4d33ed → 6.0.0-beta.db5e64c

package/dist/m365/graph/commands/subscription/subscription-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 _GraphSubscriptionAddCommand_instances, _GraphSubscriptionAddCommand_initTelemetry, _GraphSubscriptionAddCommand_initOptions, _GraphSubscriptionAddCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
 const utils_1 = require("../../../../utils");
@@ -24,19 +39,19 @@ const DEFAULT_EXPIRATION_DELAY_IN_MINUTES_PER_RESOURCE_TYPE = {
 const DEFAULT_EXPIRATION_DELAY_IN_MINUTES = 4230;
 const SAFE_MINUTES_DELTA = 1;
 class GraphSubscriptionAddCommand extends GraphCommand_1.default {
+    constructor() {
+        super();
+        _GraphSubscriptionAddCommand_instances.add(this);
+        __classPrivateFieldGet(this, _GraphSubscriptionAddCommand_instances, "m", _GraphSubscriptionAddCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _GraphSubscriptionAddCommand_instances, "m", _GraphSubscriptionAddCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _GraphSubscriptionAddCommand_instances, "m", _GraphSubscriptionAddCommand_initValidators).call(this);
+    }
     get name() {
         return commands_1.default.SUBSCRIPTION_ADD;
     }
     get description() {
         return 'Creates a Microsoft Graph subscription';
     }
-    getTelemetryProperties(args) {
-        const telemetryProps = super.getTelemetryProperties(args);
-        telemetryProps.changeType = args.options.changeType;
-        telemetryProps.expirationDateTime = typeof args.options.expirationDateTime !== 'undefined';
-        telemetryProps.clientState = typeof args.options.clientState !== 'undefined';
-        return telemetryProps;
-    }
     commandAction(logger, args, cb) {
         const data = {
             changeType: args.options.changeType,
@@ -107,29 +122,35 @@ class GraphSubscriptionAddCommand extends GraphCommand_1.default {
         }
         return actualExpirationIsoString;
     }
-    options() {
-        const options = [
-            {
-                option: '-r, --resource <resource>'
-            },
-            {
-                option: '-u, --notificationUrl <notificationUrl>'
-            },
-            {
-                option: '-c, --changeType <changeType>',
-                autocomplete: ['created', 'updated', 'deleted']
-            },
-            {
-                option: '-e, --expirationDateTime [expirationDateTime]'
-            },
-            {
-                option: '-s, --clientState [clientState]'
-            }
-        ];
-        const parentOptions = super.options();
-        return options.concat(parentOptions);
+    isValidChangeTypes(changeTypes) {
+        const validChangeTypes = ["created", "updated", "deleted"];
+        const invalidChangesTypes = changeTypes.split(",").filter(c => validChangeTypes.indexOf(c.trim()) < 0);
+        return invalidChangesTypes.length === 0;
     }
-    validate(args) {
+}
+_GraphSubscriptionAddCommand_instances = new WeakSet(), _GraphSubscriptionAddCommand_initTelemetry = function _GraphSubscriptionAddCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            changeType: args.options.changeType,
+            expirationDateTime: typeof args.options.expirationDateTime !== 'undefined',
+            clientState: typeof args.options.clientState !== 'undefined'
+        });
+    });
+}, _GraphSubscriptionAddCommand_initOptions = function _GraphSubscriptionAddCommand_initOptions() {
+    this.options.unshift({
+        option: '-r, --resource <resource>'
+    }, {
+        option: '-u, --notificationUrl <notificationUrl>'
+    }, {
+        option: '-c, --changeType <changeType>',
+        autocomplete: ['created', 'updated', 'deleted']
+    }, {
+        option: '-e, --expirationDateTime [expirationDateTime]'
+    }, {
+        option: '-s, --clientState [clientState]'
+    });
+}, _GraphSubscriptionAddCommand_initValidators = function _GraphSubscriptionAddCommand_initValidators() {
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
         if (args.options.notificationUrl.indexOf('https://') !== 0) {
             return `The specified notification URL '${args.options.notificationUrl}' does not start with 'https://'`;
         }
@@ -143,12 +164,7 @@ class GraphSubscriptionAddCommand extends GraphCommand_1.default {
             return 'The clientState value exceeds the maximum length of 128 characters';
         }
         return true;
-    }
-    isValidChangeTypes(changeTypes) {
-        const validChangeTypes = ["created", "updated", "deleted"];
-        const invalidChangesTypes = changeTypes.split(",").filter(c => validChangeTypes.indexOf(c.trim()) < 0);
-        return invalidChangesTypes.length === 0;
-    }
-}
+    }));
+};
 module.exports = new GraphSubscriptionAddCommand();
 //# sourceMappingURL=subscription-add.js.map

package/dist/m365/onenote/commands/notebook/notebook-list.js

@@ -0,0 +1,139 @@
+"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 _OneNoteNotebookListCommand_instances, _OneNoteNotebookListCommand_initTelemetry, _OneNoteNotebookListCommand_initOptions, _OneNoteNotebookListCommand_initValidators;
+Object.defineProperty(exports, "__esModule", { value: true });
+const request_1 = require("../../../../request");
+const utils_1 = require("../../../../utils");
+const aadGroup_1 = require("../../../../utils/aadGroup");
+const GraphCommand_1 = require("../../../base/GraphCommand");
+const commands_1 = require("../../commands");
+class OneNoteNotebookListCommand extends GraphCommand_1.default {
+    constructor() {
+        super();
+        _OneNoteNotebookListCommand_instances.add(this);
+        __classPrivateFieldGet(this, _OneNoteNotebookListCommand_instances, "m", _OneNoteNotebookListCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _OneNoteNotebookListCommand_instances, "m", _OneNoteNotebookListCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _OneNoteNotebookListCommand_instances, "m", _OneNoteNotebookListCommand_initValidators).call(this);
+    }
+    get name() {
+        return commands_1.default.NOTEBOOK_LIST;
+    }
+    get description() {
+        return 'Retrieve a list of notebooks';
+    }
+    getEndpointUrl(args) {
+        return new Promise((resolve, reject) => {
+            let endpoint = `${this.resource}/v1.0/me/onenote/notebooks`;
+            if (args.options.userId) {
+                endpoint = `${this.resource}/v1.0/users/${args.options.userId}/onenote/notebooks`;
+                return resolve(endpoint);
+            }
+            else if (args.options.userName) {
+                endpoint = `${this.resource}/v1.0/users/${args.options.userName}/onenote/notebooks`;
+                return resolve(endpoint);
+            }
+            else if (args.options.groupId) {
+                endpoint = `${this.resource}/v1.0/groups/${args.options.groupId}/onenote/notebooks`;
+                return resolve(endpoint);
+            }
+            else if (args.options.groupName) {
+                this
+                    .getGroupId(args)
+                    .then((retrievedgroupId) => {
+                    endpoint = `${this.resource}/v1.0/groups/${retrievedgroupId}/onenote/notebooks`;
+                    return resolve(endpoint);
+                })
+                    .catch((err) => {
+                    reject(err);
+                });
+            }
+            else if (args.options.webUrl) {
+                this
+                    .getSpoSiteId(args)
+                    .then((siteId) => {
+                    endpoint = `${this.resource}/v1.0/sites/${siteId}/onenote/notebooks`;
+                    return resolve(endpoint);
+                })
+                    .catch((err) => {
+                    reject(err);
+                });
+            }
+            else {
+                return resolve(endpoint);
+            }
+        });
+    }
+    defaultProperties() {
+        return ['createdDateTime', 'displayName', 'id'];
+    }
+    getGroupId(args) {
+        return aadGroup_1.aadGroup
+            .getGroupByDisplayName(args.options.groupName)
+            .then(group => group.id);
+    }
+    getSpoSiteId(args) {
+        const url = new URL(args.options.webUrl);
+        const requestOptions = {
+            url: `${this.resource}/v1.0/sites/${url.hostname}:${url.pathname}`,
+            headers: {
+                accept: 'application/json;odata.metadata=none'
+            },
+            responseType: 'json'
+        };
+        return request_1.default
+            .get(requestOptions)
+            .then((site) => site.id);
+    }
+    commandAction(logger, args, cb) {
+        this
+            .getEndpointUrl(args)
+            .then(endpoint => utils_1.odata.getAllItems(endpoint))
+            .then((items) => {
+            return Promise.resolve(items);
+        })
+            .then((items) => {
+            logger.log(items);
+            cb();
+        }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
+    }
+}
+_OneNoteNotebookListCommand_instances = new WeakSet(), _OneNoteNotebookListCommand_initTelemetry = function _OneNoteNotebookListCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            joined: args.options.joined
+        });
+    });
+}, _OneNoteNotebookListCommand_initOptions = function _OneNoteNotebookListCommand_initOptions() {
+    this.options.unshift({ option: '--userId [userId]' }, { option: '--userName [userName]' }, { option: '--groupId [groupId]' }, { option: '--groupName [groupName]' }, { option: '-u, --webUrl [webUrl]' });
+}, _OneNoteNotebookListCommand_initValidators = function _OneNoteNotebookListCommand_initValidators() {
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
+        if (args.options.userId && !utils_1.validation.isValidGuid(args.options.userId)) {
+            return `${args.options.userId} is not a valid GUID`;
+        }
+        if (args.options.groupId && !utils_1.validation.isValidGuid(args.options.groupId)) {
+            return `${args.options.groupId} is not a valid GUID`;
+        }
+        if (args.options.userId && args.options.userName) {
+            return 'Specify either userId or userName, but not both';
+        }
+        if (args.options.groupId && args.options.groupName) {
+            return 'Specify either groupId or groupName, but not both';
+        }
+        return true;
+    }));
+};
+module.exports = new OneNoteNotebookListCommand();
+//# sourceMappingURL=notebook-list.js.map

package/dist/m365/onenote/commands.js

@@ -0,0 +1,7 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const prefix = 'onenote';
+exports.default = {
+    NOTEBOOK_LIST: `${prefix} notebook list`
+};
+//# sourceMappingURL=commands.js.map

package/dist/m365/outlook/commands/mail/mail-send.js

@@ -1,9 +1,31 @@
 "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 _OutlookMailSendCommand_instances, _OutlookMailSendCommand_initTelemetry, _OutlookMailSendCommand_initOptions, _OutlookMailSendCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
 class OutlookMailSendCommand extends GraphCommand_1.default {
+    constructor() {
+        super();
+        _OutlookMailSendCommand_instances.add(this);
+        __classPrivateFieldGet(this, _OutlookMailSendCommand_instances, "m", _OutlookMailSendCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _OutlookMailSendCommand_instances, "m", _OutlookMailSendCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _OutlookMailSendCommand_instances, "m", _OutlookMailSendCommand_initValidators).call(this);
+    }
     get name() {
         return commands_1.default.MAIL_SEND;
     }
@@ -13,13 +35,6 @@ class OutlookMailSendCommand extends GraphCommand_1.default {
     alias() {
         return [commands_1.default.SENDMAIL];
     }
-    getTelemetryProperties(args) {
-        const telemetryProps = super.getTelemetryProperties(args);
-        telemetryProps.bodyContents = typeof args.options.bodyContents !== 'undefined';
-        telemetryProps.bodyContentType = args.options.bodyContentType;
-        telemetryProps.saveToSentItems = args.options.saveToSentItems;
-        return telemetryProps;
-    }
     commandAction(logger, args, cb) {
         const bodyContents = args.options.bodyContents;
         const requestOptions = {
@@ -51,29 +66,30 @@ class OutlookMailSendCommand extends GraphCommand_1.default {
             .post(requestOptions)
             .then(_ => cb(), (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
     }
-    options() {
-        const options = [
-            {
-                option: '-s, --subject <subject>'
-            },
-            {
-                option: '-t, --to <to>'
-            },
-            {
-                option: '--bodyContents <bodyContents>'
-            },
-            {
-                option: '--bodyContentType [bodyContentType]',
-                autocomplete: ['Text', 'HTML']
-            },
-            {
-                option: '--saveToSentItems [saveToSentItems]'
-            }
-        ];
-        const parentOptions = super.options();
-        return options.concat(parentOptions);
-    }
-    validate(args) {
+}
+_OutlookMailSendCommand_instances = new WeakSet(), _OutlookMailSendCommand_initTelemetry = function _OutlookMailSendCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            bodyContents: typeof args.options.bodyContents !== 'undefined',
+            bodyContentType: args.options.bodyContentType,
+            saveToSentItems: args.options.saveToSentItems
+        });
+    });
+}, _OutlookMailSendCommand_initOptions = function _OutlookMailSendCommand_initOptions() {
+    this.options.unshift({
+        option: '-s, --subject <subject>'
+    }, {
+        option: '-t, --to <to>'
+    }, {
+        option: '--bodyContents <bodyContents>'
+    }, {
+        option: '--bodyContentType [bodyContentType]',
+        autocomplete: ['Text', 'HTML']
+    }, {
+        option: '--saveToSentItems [saveToSentItems]'
+    });
+}, _OutlookMailSendCommand_initValidators = function _OutlookMailSendCommand_initValidators() {
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
         if (args.options.bodyContentType &&
             args.options.bodyContentType !== 'Text' &&
             args.options.bodyContentType !== 'HTML') {
@@ -85,7 +101,7 @@ class OutlookMailSendCommand extends GraphCommand_1.default {
             return `${args.options.saveToSentItems} is not a valid value for the saveToSentItems option. Allowed values are true|false`;
         }
         return true;
-    }
-}
+    }));
+};
 module.exports = new OutlookMailSendCommand();
 //# sourceMappingURL=mail-send.js.map

package/dist/m365/outlook/commands/message/message-list.js

@@ -1,4 +1,10 @@
 "use strict";
+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 _OutlookMessageListCommand_instances, _OutlookMessageListCommand_initTelemetry, _OutlookMessageListCommand_initOptions, _OutlookMessageListCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
 const os = require("os");
 const request_1 = require("../../../../request");
@@ -7,18 +13,19 @@ const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
 const Outlook_1 = require("../../Outlook");
 class OutlookMessageListCommand extends GraphCommand_1.default {
+    constructor() {
+        super();
+        _OutlookMessageListCommand_instances.add(this);
+        __classPrivateFieldGet(this, _OutlookMessageListCommand_instances, "m", _OutlookMessageListCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _OutlookMessageListCommand_instances, "m", _OutlookMessageListCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _OutlookMessageListCommand_instances, "m", _OutlookMessageListCommand_initOptionSets).call(this);
+    }
     get name() {
         return commands_1.default.MESSAGE_LIST;
     }
     get description() {
         return 'Gets all mail messages from the specified folder';
     }
-    getTelemetryProperties(args) {
-        const telemetryProps = super.getTelemetryProperties(args);
-        telemetryProps.folderId = typeof args.options.folderId !== 'undefined';
-        telemetryProps.folderName = typeof args.options.folderName !== 'undefined';
-        return telemetryProps;
-    }
     defaultProperties() {
         return ['subject', 'receivedDateTime'];
     }
@@ -67,31 +74,24 @@ class OutlookMessageListCommand extends GraphCommand_1.default {
             }, err => reject(err));
         });
     }
-    options() {
-        const options = [
-            {
-                option: '--folderName [folderName]',
-                autocomplete: Outlook_1.Outlook.wellKnownFolderNames
-            },
-            {
-                option: '--folderId [folderId]',
-                autocomplete: Outlook_1.Outlook.wellKnownFolderNames
-            }
-        ];
-        const parentOptions = super.options();
-        return options.concat(parentOptions);
-    }
-    validate(args) {
-        if (!args.options.folderId &&
-            !args.options.folderName) {
-            return 'Specify folderId or folderName';
-        }
-        if (args.options.folderId &&
-            args.options.folderName) {
-            return 'Specify either folderId or folderName but not both';
-        }
-        return true;
-    }
 }
+_OutlookMessageListCommand_instances = new WeakSet(), _OutlookMessageListCommand_initTelemetry = function _OutlookMessageListCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            folderId: typeof args.options.folderId !== 'undefined',
+            folderName: typeof args.options.folderName !== 'undefined'
+        });
+    });
+}, _OutlookMessageListCommand_initOptions = function _OutlookMessageListCommand_initOptions() {
+    this.options.unshift({
+        option: '--folderName [folderName]',
+        autocomplete: Outlook_1.Outlook.wellKnownFolderNames
+    }, {
+        option: '--folderId [folderId]',
+        autocomplete: Outlook_1.Outlook.wellKnownFolderNames
+    });
+}, _OutlookMessageListCommand_initOptionSets = function _OutlookMessageListCommand_initOptionSets() {
+    this.optionSets.push(['folderId', 'folderName']);
+};
 module.exports = new OutlookMessageListCommand();
 //# sourceMappingURL=message-list.js.map

package/dist/m365/outlook/commands/message/message-move.js

@@ -1,4 +1,10 @@
 "use strict";
+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 _OutlookMessageMoveCommand_instances, _OutlookMessageMoveCommand_initTelemetry, _OutlookMessageMoveCommand_initOptions, _OutlookMessageMoveCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
 const os = require("os");
 const request_1 = require("../../../../request");
@@ -6,20 +12,19 @@ const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
 const Outlook_1 = require("../../Outlook");
 class OutlookMessageMoveCommand extends GraphCommand_1.default {
+    constructor() {
+        super();
+        _OutlookMessageMoveCommand_instances.add(this);
+        __classPrivateFieldGet(this, _OutlookMessageMoveCommand_instances, "m", _OutlookMessageMoveCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _OutlookMessageMoveCommand_instances, "m", _OutlookMessageMoveCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _OutlookMessageMoveCommand_instances, "m", _OutlookMessageMoveCommand_initOptionSets).call(this);
+    }
     get name() {
         return commands_1.default.MESSAGE_MOVE;
     }
     get description() {
         return 'Moves message to the specified folder';
     }
-    getTelemetryProperties(args) {
-        const telemetryProps = super.getTelemetryProperties(args);
-        telemetryProps.sourceFolderId = typeof args.options.sourceFolderId !== 'undefined';
-        telemetryProps.sourceFolderName = typeof args.options.sourceFolderName !== 'undefined';
-        telemetryProps.targetFolderId = typeof args.options.targetFolderId !== 'undefined';
-        telemetryProps.targetFolderName = typeof args.options.targetFolderName !== 'undefined';
-        return telemetryProps;
-    }
     commandAction(logger, args, cb) {
         let sourceFolder;
         let targetFolder;
@@ -31,7 +36,7 @@ class OutlookMessageMoveCommand extends GraphCommand_1.default {
         })
             .then((folderId) => {
             targetFolder = folderId;
-            const messageUrl = `mailFolders/${sourceFolder}/messages/${args.options.messageId}`;
+            const messageUrl = `mailFolders/${sourceFolder}/messages/${args.options.id}`;
             const requestOptions = {
                 url: `${this.resource}/v1.0/me/${messageUrl}/move`,
                 headers: {
@@ -76,50 +81,34 @@ class OutlookMessageMoveCommand extends GraphCommand_1.default {
             }, err => reject(err));
         });
     }
-    options() {
-        const options = [
-            {
-                option: '--messageId <messageId>'
-            },
-            {
-                option: '--sourceFolderName [sourceFolderName]',
-                autocomplete: Outlook_1.Outlook.wellKnownFolderNames
-            },
-            {
-                option: '--sourceFolderId [sourceFolderId]',
-                autocomplete: Outlook_1.Outlook.wellKnownFolderNames
-            },
-            {
-                option: '--targetFolderName [targetFolderName]',
-                autocomplete: Outlook_1.Outlook.wellKnownFolderNames
-            },
-            {
-                option: '--targetFolderId [targetFolderId]',
-                autocomplete: Outlook_1.Outlook.wellKnownFolderNames
-            }
-        ];
-        const parentOptions = super.options();
-        return options.concat(parentOptions);
-    }
-    validate(args) {
-        if (!args.options.sourceFolderId &&
-            !args.options.sourceFolderName) {
-            return 'Specify sourceFolderId or sourceFolderName';
-        }
-        if (args.options.sourceFolderId &&
-            args.options.sourceFolderName) {
-            return 'Specify either sourceFolderId or sourceFolderName but not both';
-        }
-        if (!args.options.targetFolderId &&
-            !args.options.targetFolderName) {
-            return 'Specify targetFolderId or targetFolderName';
-        }
-        if (args.options.targetFolderId &&
-            args.options.targetFolderName) {
-            return 'Specify either targetFolderId or targetFolderName but not both';
-        }
-        return true;
-    }
 }
+_OutlookMessageMoveCommand_instances = new WeakSet(), _OutlookMessageMoveCommand_initTelemetry = function _OutlookMessageMoveCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            sourceFolderId: typeof args.options.sourceFolderId !== 'undefined',
+            sourceFolderName: typeof args.options.sourceFolderName !== 'undefined',
+            targetFolderId: typeof args.options.targetFolderId !== 'undefined',
+            targetFolderName: typeof args.options.targetFolderName !== 'undefined'
+        });
+    });
+}, _OutlookMessageMoveCommand_initOptions = function _OutlookMessageMoveCommand_initOptions() {
+    this.options.unshift({
+        option: '--id <id>'
+    }, {
+        option: '--sourceFolderName [sourceFolderName]',
+        autocomplete: Outlook_1.Outlook.wellKnownFolderNames
+    }, {
+        option: '--sourceFolderId [sourceFolderId]',
+        autocomplete: Outlook_1.Outlook.wellKnownFolderNames
+    }, {
+        option: '--targetFolderName [targetFolderName]',
+        autocomplete: Outlook_1.Outlook.wellKnownFolderNames
+    }, {
+        option: '--targetFolderId [targetFolderId]',
+        autocomplete: Outlook_1.Outlook.wellKnownFolderNames
+    });
+}, _OutlookMessageMoveCommand_initOptionSets = function _OutlookMessageMoveCommand_initOptionSets() {
+    this.optionSets.push(['sourceFolderId', 'sourceFolderName'], ['targetFolderId', 'targetFolderName']);
+};
 module.exports = new OutlookMessageMoveCommand();
 //# sourceMappingURL=message-move.js.map

package/dist/m365/outlook/commands/room/room-list.js

@@ -1,20 +1,27 @@
 "use strict";
+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 _OutlookRoomListCommand_instances, _OutlookRoomListCommand_initTelemetry, _OutlookRoomListCommand_initOptions;
 Object.defineProperty(exports, "__esModule", { value: true });
 const utils_1 = require("../../../../utils");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
 class OutlookRoomListCommand extends GraphCommand_1.default {
+    constructor() {
+        super();
+        _OutlookRoomListCommand_instances.add(this);
+        __classPrivateFieldGet(this, _OutlookRoomListCommand_instances, "m", _OutlookRoomListCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _OutlookRoomListCommand_instances, "m", _OutlookRoomListCommand_initOptions).call(this);
+    }
     get name() {
         return commands_1.default.ROOM_LIST;
     }
     get description() {
         return 'Get a collection of all available rooms';
     }
-    getTelemetryProperties(args) {
-        const telemetryProps = super.getTelemetryProperties(args);
-        telemetryProps.roomlistEmail = typeof args.options.roomlistEmail !== 'undefined';
-        return telemetryProps;
-    }
     defaultProperties() {
         return ['id', 'displayName', 'phone', 'emailAddress'];
     }
@@ -30,15 +37,17 @@ class OutlookRoomListCommand extends GraphCommand_1.default {
             cb();
         }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
     }
-    options() {
-        const options = [
-            {
-                option: '--roomlistEmail [roomlistEmail]'
-            }
-        ];
-        const parentOptions = super.options();
-        return options.concat(parentOptions);
-    }
 }
+_OutlookRoomListCommand_instances = new WeakSet(), _OutlookRoomListCommand_initTelemetry = function _OutlookRoomListCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            roomlistEmail: typeof args.options.roomlistEmail !== 'undefined'
+        });
+    });
+}, _OutlookRoomListCommand_initOptions = function _OutlookRoomListCommand_initOptions() {
+    this.options.unshift({
+        option: '--roomlistEmail [roomlistEmail]'
+    });
+};
 module.exports = new OutlookRoomListCommand();
 //# sourceMappingURL=room-list.js.map