@pnp/cli-microsoft365 6.0.0-beta.566a6b8 → 6.0.0-beta.5bdba89

package/dist/m365/aad/commands/approleassignment/approleassignment-remove.js

@@ -16,9 +16,9 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _AadAppRoleAssignmentRemoveCommand_instances, _AadAppRoleAssignmentRemoveCommand_initTelemetry, _AadAppRoleAssignmentRemoveCommand_initOptions, _AadAppRoleAssignmentRemoveCommand_initValidators, _AadAppRoleAssignmentRemoveCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
 const os = require("os");
-const cli_1 = require("../../../../cli");
+const Cli_1 = require("../../../../cli/Cli");
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const validation_1 = require("../../../../utils/validation");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
 class AadAppRoleAssignmentRemoveCommand extends GraphCommand_1.default {
@@ -72,7 +72,7 @@ class AadAppRoleAssignmentRemoveCommand extends GraphCommand_1.default {
                     }
                     // will perform resource name, appId or objectId search
                     let filter = `$filter=(displayName eq '${resource}' or startswith(displayName,'${resource}'))`;
-                    if (utils_1.validation.isValidGuid(resource)) {
+                    if (validation_1.validation.isValidGuid(resource)) {
                         filter += ` or appId eq '${resource}' or id eq '${resource}'`;
                     }
                     const requestOptions = {
@@ -122,7 +122,7 @@ class AadAppRoleAssignmentRemoveCommand extends GraphCommand_1.default {
                 yield removeAppRoleAssignment();
             }
             else {
-                const result = yield cli_1.Cli.prompt({
+                const result = yield Cli_1.Cli.prompt({
                     type: 'confirm',
                     name: 'continue',
                     default: false,
@@ -181,10 +181,10 @@ _AadAppRoleAssignmentRemoveCommand_instances = new WeakSet(), _AadAppRoleAssignm
     });
 }, _AadAppRoleAssignmentRemoveCommand_initValidators = function _AadAppRoleAssignmentRemoveCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (args.options.appId && !utils_1.validation.isValidGuid(args.options.appId)) {
+        if (args.options.appId && !validation_1.validation.isValidGuid(args.options.appId)) {
             return `${args.options.appId} is not a valid GUID`;
         }
-        if (args.options.appObjectId && !utils_1.validation.isValidGuid(args.options.appObjectId)) {
+        if (args.options.appObjectId && !validation_1.validation.isValidGuid(args.options.appObjectId)) {
             return `${args.options.appObjectId} is not a valid GUID`;
         }
         return true;

package/dist/m365/aad/commands/group/group-list.js

@@ -15,7 +15,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _AadGroupListCommand_instances, _AadGroupListCommand_initTelemetry, _AadGroupListCommand_initOptions;
 Object.defineProperty(exports, "__esModule", { value: true });
-const utils_1 = require("../../../../utils");
+const odata_1 = require("../../../../utils/odata");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
 class AadGroupListCommand extends GraphCommand_1.default {
@@ -38,7 +38,7 @@ class AadGroupListCommand extends GraphCommand_1.default {
         return __awaiter(this, void 0, void 0, function* () {
             const endpoint = args.options.deleted ? 'directory/deletedItems/microsoft.graph.group' : 'groups';
             try {
-                const groups = yield utils_1.odata.getAllItems(`${this.resource}/v1.0/${endpoint}`);
+                const groups = yield odata_1.odata.getAllItems(`${this.resource}/v1.0/${endpoint}`);
                 if (args.options.output === 'text') {
                     groups.forEach((group) => {
                         if (group.groupTypes && group.groupTypes.length > 0 && group.groupTypes[0] === 'Unified') {

package/dist/m365/aad/commands/groupsetting/groupsetting-add.js

@@ -16,7 +16,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _AadGroupSettingAddCommand_instances, _AadGroupSettingAddCommand_initOptions, _AadGroupSettingAddCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const validation_1 = require("../../../../utils/validation");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
 class AadGroupSettingAddCommand extends GraphCommand_1.default {
@@ -102,7 +102,7 @@ _AadGroupSettingAddCommand_instances = new WeakSet(), _AadGroupSettingAddCommand
     });
 }, _AadGroupSettingAddCommand_initValidators = function _AadGroupSettingAddCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (!utils_1.validation.isValidGuid(args.options.templateId)) {
+        if (!validation_1.validation.isValidGuid(args.options.templateId)) {
             return `${args.options.templateId} is not a valid GUID`;
         }
         return true;

package/dist/m365/aad/commands/groupsetting/groupsetting-get.js

@@ -16,7 +16,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _AadGroupSettingGetCommand_instances, _AadGroupSettingGetCommand_initOptions, _AadGroupSettingGetCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const validation_1 = require("../../../../utils/validation");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
 class AadGroupSettingGetCommand extends GraphCommand_1.default {
@@ -57,7 +57,7 @@ _AadGroupSettingGetCommand_instances = new WeakSet(), _AadGroupSettingGetCommand
     });
 }, _AadGroupSettingGetCommand_initValidators = function _AadGroupSettingGetCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (!utils_1.validation.isValidGuid(args.options.id)) {
+        if (!validation_1.validation.isValidGuid(args.options.id)) {
             return `${args.options.id} is not a valid GUID`;
         }
         return true;

package/dist/m365/aad/commands/groupsetting/groupsetting-list.js

@@ -9,7 +9,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const utils_1 = require("../../../../utils");
+const odata_1 = require("../../../../utils/odata");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
 class AadGroupSettingListCommand extends GraphCommand_1.default {
@@ -25,7 +25,7 @@ class AadGroupSettingListCommand extends GraphCommand_1.default {
     commandAction(logger) {
         return __awaiter(this, void 0, void 0, function* () {
             try {
-                const groupSettings = yield utils_1.odata.getAllItems(`${this.resource}/v1.0/groupSettings`);
+                const groupSettings = yield odata_1.odata.getAllItems(`${this.resource}/v1.0/groupSettings`);
                 logger.log(groupSettings);
             }
             catch (err) {

package/dist/m365/aad/commands/groupsetting/groupsetting-remove.js

@@ -15,9 +15,9 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _AadGroupSettingRemoveCommand_instances, _AadGroupSettingRemoveCommand_initTelemetry, _AadGroupSettingRemoveCommand_initOptions, _AadGroupSettingRemoveCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
-const cli_1 = require("../../../../cli");
+const Cli_1 = require("../../../../cli/Cli");
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const validation_1 = require("../../../../utils/validation");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
 class AadGroupSettingRemoveCommand extends GraphCommand_1.default {
@@ -57,7 +57,7 @@ class AadGroupSettingRemoveCommand extends GraphCommand_1.default {
                 yield removeGroupSetting();
             }
             else {
-                const result = yield cli_1.Cli.prompt({
+                const result = yield Cli_1.Cli.prompt({
                     type: 'confirm',
                     name: 'continue',
                     default: false,
@@ -84,7 +84,7 @@ _AadGroupSettingRemoveCommand_instances = new WeakSet(), _AadGroupSettingRemoveC
     });
 }, _AadGroupSettingRemoveCommand_initValidators = function _AadGroupSettingRemoveCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (!utils_1.validation.isValidGuid(args.options.id)) {
+        if (!validation_1.validation.isValidGuid(args.options.id)) {
             return `${args.options.id} is not a valid GUID`;
         }
         return true;

package/dist/m365/aad/commands/groupsetting/groupsetting-set.js

@@ -16,7 +16,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _AadGroupSettingSetCommand_instances, _AadGroupSettingSetCommand_initOptions, _AadGroupSettingSetCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const validation_1 = require("../../../../utils/validation");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
 class AadGroupSettingSetCommand extends GraphCommand_1.default {
@@ -102,7 +102,7 @@ _AadGroupSettingSetCommand_instances = new WeakSet(), _AadGroupSettingSetCommand
     });
 }, _AadGroupSettingSetCommand_initValidators = function _AadGroupSettingSetCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (!utils_1.validation.isValidGuid(args.options.id)) {
+        if (!validation_1.validation.isValidGuid(args.options.id)) {
             return `${args.options.id} is not a valid GUID`;
         }
         return true;

package/dist/m365/aad/commands/groupsettingtemplate/groupsettingtemplate-get.js

@@ -15,7 +15,8 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _AadGroupSettingTemplateGetCommand_instances, _AadGroupSettingTemplateGetCommand_initTelemetry, _AadGroupSettingTemplateGetCommand_initOptions, _AadGroupSettingTemplateGetCommand_initValidators, _AadGroupSettingTemplateGetCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
-const utils_1 = require("../../../../utils");
+const odata_1 = require("../../../../utils/odata");
+const validation_1 = require("../../../../utils/validation");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
 class AadGroupSettingTemplateGetCommand extends GraphCommand_1.default {
@@ -36,7 +37,7 @@ class AadGroupSettingTemplateGetCommand extends GraphCommand_1.default {
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
             try {
-                const templates = yield utils_1.odata.getAllItems(`${this.resource}/v1.0/groupSettingTemplates`);
+                const templates = yield odata_1.odata.getAllItems(`${this.resource}/v1.0/groupSettingTemplates`);
                 const groupSettingTemplate = templates.filter(t => args.options.id ? t.id === args.options.id : t.displayName === args.options.displayName);
                 if (groupSettingTemplate && groupSettingTemplate.length > 0) {
                     logger.log(groupSettingTemplate.pop());
@@ -67,7 +68,7 @@ _AadGroupSettingTemplateGetCommand_instances = new WeakSet(), _AadGroupSettingTe
 }, _AadGroupSettingTemplateGetCommand_initValidators = function _AadGroupSettingTemplateGetCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
         if (args.options.id &&
-            !utils_1.validation.isValidGuid(args.options.id)) {
+            !validation_1.validation.isValidGuid(args.options.id)) {
             return `${args.options.id} is not a valid GUID`;
         }
         return true;

package/dist/m365/aad/commands/groupsettingtemplate/groupsettingtemplate-list.js

@@ -9,7 +9,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const utils_1 = require("../../../../utils");
+const odata_1 = require("../../../../utils/odata");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
 class AadGroupSettingTemplateListCommand extends GraphCommand_1.default {
@@ -25,7 +25,7 @@ class AadGroupSettingTemplateListCommand extends GraphCommand_1.default {
     commandAction(logger) {
         return __awaiter(this, void 0, void 0, function* () {
             try {
-                const templates = yield utils_1.odata.getAllItems(`${this.resource}/v1.0/groupSettingTemplates`);
+                const templates = yield odata_1.odata.getAllItems(`${this.resource}/v1.0/groupSettingTemplates`);
                 logger.log(templates);
             }
             catch (err) {

package/dist/m365/aad/commands/o365group/o365group-add.js

@@ -18,7 +18,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const fs = require("fs");
 const path = require("path");
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const formatting_1 = require("../../../../utils/formatting");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
 class AadO365GroupAddCommand extends GraphCommand_1.default {
@@ -146,7 +146,7 @@ class AadO365GroupAddCommand extends GraphCommand_1.default {
         let userIds = [];
         promises = userArr.map(user => {
             const requestOptions = {
-                url: `${this.resource}/v1.0/users?$filter=userPrincipalName eq '${utils_1.formatting.encodeQueryParameter(user)}'&$select=id,userPrincipalName`,
+                url: `${this.resource}/v1.0/users?$filter=userPrincipalName eq '${formatting_1.formatting.encodeQueryParameter(user)}'&$select=id,userPrincipalName`,
                 headers: {
                     'content-type': 'application/json'
                 },

package/dist/m365/aad/commands/o365group/o365group-conversation-list.js

@@ -15,7 +15,8 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _AadO365GroupConversationListCommand_instances, _AadO365GroupConversationListCommand_initOptions, _AadO365GroupConversationListCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
-const utils_1 = require("../../../../utils");
+const odata_1 = require("../../../../utils/odata");
+const validation_1 = require("../../../../utils/validation");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
 class AadO365GroupConversationListCommand extends GraphCommand_1.default {
@@ -37,7 +38,7 @@ class AadO365GroupConversationListCommand extends GraphCommand_1.default {
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
             try {
-                const conversations = yield utils_1.odata.getAllItems(`${this.resource}/v1.0/groups/${args.options.groupId}/conversations`);
+                const conversations = yield odata_1.odata.getAllItems(`${this.resource}/v1.0/groups/${args.options.groupId}/conversations`);
                 logger.log(conversations);
             }
             catch (err) {
@@ -52,7 +53,7 @@ _AadO365GroupConversationListCommand_instances = new WeakSet(), _AadO365GroupCon
     });
 }, _AadO365GroupConversationListCommand_initValidators = function _AadO365GroupConversationListCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (!utils_1.validation.isValidGuid(args.options.groupId)) {
+        if (!validation_1.validation.isValidGuid(args.options.groupId)) {
             return `${args.options.groupId} is not a valid GUID`;
         }
         return true;

package/dist/m365/aad/commands/o365group/o365group-conversation-post-list.js

@@ -15,7 +15,8 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _AadO365GroupConversationPostListCommand_instances, _AadO365GroupConversationPostListCommand_initTelemetry, _AadO365GroupConversationPostListCommand_initOptions, _AadO365GroupConversationPostListCommand_initValidators, _AadO365GroupConversationPostListCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
-const utils_1 = require("../../../../utils");
+const odata_1 = require("../../../../utils/odata");
+const validation_1 = require("../../../../utils/validation");
 const aadGroup_1 = require("../../../../utils/aadGroup");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
@@ -41,7 +42,7 @@ class AadO365GroupConversationPostListCommand extends GraphCommand_1.default {
         return __awaiter(this, void 0, void 0, function* () {
             try {
                 const retrievedgroupId = yield this.getGroupId(args);
-                const posts = yield utils_1.odata.getAllItems(`${this.resource}/v1.0/groups/${retrievedgroupId}/threads/${args.options.threadId}/posts`);
+                const posts = yield odata_1.odata.getAllItems(`${this.resource}/v1.0/groups/${retrievedgroupId}/threads/${args.options.threadId}/posts`);
                 logger.log(posts);
             }
             catch (err) {
@@ -75,7 +76,7 @@ _AadO365GroupConversationPostListCommand_instances = new WeakSet(), _AadO365Grou
     });
 }, _AadO365GroupConversationPostListCommand_initValidators = function _AadO365GroupConversationPostListCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (args.options.groupId && !utils_1.validation.isValidGuid(args.options.groupId)) {
+        if (args.options.groupId && !validation_1.validation.isValidGuid(args.options.groupId)) {
             return `${args.options.groupId} is not a valid GUID`;
         }
         return true;

package/dist/m365/aad/commands/o365group/o365group-get.js

@@ -16,7 +16,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _AadO365GroupGetCommand_instances, _AadO365GroupGetCommand_initOptions, _AadO365GroupGetCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const validation_1 = require("../../../../utils/validation");
 const aadGroup_1 = require("../../../../utils/aadGroup");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
@@ -65,7 +65,7 @@ _AadO365GroupGetCommand_instances = new WeakSet(), _AadO365GroupGetCommand_initO
     });
 }, _AadO365GroupGetCommand_initValidators = function _AadO365GroupGetCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (!utils_1.validation.isValidGuid(args.options.id)) {
+        if (!validation_1.validation.isValidGuid(args.options.id)) {
             return `${args.options.id} is not a valid GUID`;
         }
         return true;

package/dist/m365/aad/commands/o365group/o365group-list.js

@@ -16,7 +16,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _AadO365GroupListCommand_instances, _AadO365GroupListCommand_initTelemetry, _AadO365GroupListCommand_initOptions, _AadO365GroupListCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const odata_1 = require("../../../../utils/odata");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
 class AadO365GroupListCommand extends GraphCommand_1.default {
@@ -49,7 +49,7 @@ class AadO365GroupListCommand extends GraphCommand_1.default {
             }
             try {
                 let groups = [];
-                groups = yield utils_1.odata.getAllItems(endpoint);
+                groups = yield odata_1.odata.getAllItems(endpoint);
                 if (args.options.orphaned) {
                     const orphanedGroups = [];
                     groups.forEach((group) => {

package/dist/m365/aad/commands/o365group/o365group-recyclebinitem-clear.js

@@ -15,9 +15,9 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _AadO365GroupRecycleBinItemClearCommand_instances, _AadO365GroupRecycleBinItemClearCommand_initTelemetry, _AadO365GroupRecycleBinItemClearCommand_initOptions;
 Object.defineProperty(exports, "__esModule", { value: true });
-const cli_1 = require("../../../../cli");
+const Cli_1 = require("../../../../cli/Cli");
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const odata_1 = require("../../../../utils/odata");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
 class AadO365GroupRecycleBinItemClearCommand extends GraphCommand_1.default {
@@ -47,7 +47,7 @@ class AadO365GroupRecycleBinItemClearCommand extends GraphCommand_1.default {
                 yield clearO365GroupRecycleBinItems();
             }
             else {
-                const response = yield cli_1.Cli.prompt({
+                const response = yield Cli_1.Cli.prompt({
                     type: 'confirm',
                     name: 'continue',
                     default: false,
@@ -63,7 +63,7 @@ class AadO365GroupRecycleBinItemClearCommand extends GraphCommand_1.default {
         const filter = `?$filter=groupTypes/any(c:c+eq+'Unified')`;
         const topCount = '&$top=100';
         const endpoint = `${this.resource}/v1.0/directory/deletedItems/Microsoft.Graph.Group${filter}${topCount}`;
-        return utils_1.odata
+        return odata_1.odata
             .getAllItems(endpoint)
             .then((recycleBinItems) => {
             if (recycleBinItems.length === 0) {

package/dist/m365/aad/commands/o365group/o365group-recyclebinitem-list.js

@@ -15,7 +15,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _AadO365GroupRecycleBinItemListCommand_instances, _AadO365GroupRecycleBinItemListCommand_initTelemetry, _AadO365GroupRecycleBinItemListCommand_initOptions;
 Object.defineProperty(exports, "__esModule", { value: true });
-const utils_1 = require("../../../../utils");
+const odata_1 = require("../../../../utils/odata");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
 class AadO365GroupRecycleBinItemListCommand extends GraphCommand_1.default {
@@ -42,7 +42,7 @@ class AadO365GroupRecycleBinItemListCommand extends GraphCommand_1.default {
                 const mailNicknameFilter = args.options.groupMailNickname ? ` and startswith(MailNickname,'${encodeURIComponent(args.options.groupMailNickname).replace(/'/g, `''`)}')` : '';
                 const topCount = '&$top=100';
                 const endpoint = `${this.resource}/v1.0/directory/deletedItems/Microsoft.Graph.Group${filter}${displayNameFilter}${mailNicknameFilter}${topCount}`;
-                const recycleBinItems = yield utils_1.odata.getAllItems(endpoint);
+                const recycleBinItems = yield odata_1.odata.getAllItems(endpoint);
                 logger.log(recycleBinItems);
             }
             catch (err) {

package/dist/m365/aad/commands/o365group/o365group-recyclebinitem-remove.js

@@ -15,9 +15,10 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _AadO365GroupRecycleBinItemRemoveCommand_instances, _AadO365GroupRecycleBinItemRemoveCommand_initTelemetry, _AadO365GroupRecycleBinItemRemoveCommand_initOptions, _AadO365GroupRecycleBinItemRemoveCommand_initValidators, _AadO365GroupRecycleBinItemRemoveCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
-const cli_1 = require("../../../../cli");
+const Cli_1 = require("../../../../cli/Cli");
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const formatting_1 = require("../../../../utils/formatting");
+const validation_1 = require("../../../../utils/validation");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
 class AadO365GroupRecycleBinItemRemoveCommand extends GraphCommand_1.default {
@@ -57,7 +58,7 @@ class AadO365GroupRecycleBinItemRemoveCommand extends GraphCommand_1.default {
                 yield removeGroup();
             }
             else {
-                const result = yield cli_1.Cli.prompt({
+                const result = yield Cli_1.Cli.prompt({
                     type: 'confirm',
                     name: 'continue',
                     default: false,
@@ -77,10 +78,10 @@ class AadO365GroupRecycleBinItemRemoveCommand extends GraphCommand_1.default {
             }
             let filterValue = '';
             if (displayName) {
-                filterValue = `displayName eq '${utils_1.formatting.encodeQueryParameter(displayName)}'`;
+                filterValue = `displayName eq '${formatting_1.formatting.encodeQueryParameter(displayName)}'`;
             }
             if (mailNickname) {
-                filterValue = `mailNickname eq '${utils_1.formatting.encodeQueryParameter(mailNickname)}'`;
+                filterValue = `mailNickname eq '${formatting_1.formatting.encodeQueryParameter(mailNickname)}'`;
             }
             const requestOptions = {
                 url: `${this.resource}/v1.0/directory/deletedItems/Microsoft.Graph.Group?$filter=${filterValue}`,
@@ -122,7 +123,7 @@ _AadO365GroupRecycleBinItemRemoveCommand_instances = new WeakSet(), _AadO365Grou
     });
 }, _AadO365GroupRecycleBinItemRemoveCommand_initValidators = function _AadO365GroupRecycleBinItemRemoveCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (args.options.id && !utils_1.validation.isValidGuid(args.options.id)) {
+        if (args.options.id && !validation_1.validation.isValidGuid(args.options.id)) {
             return `${args.options.id} is not a valid GUID`;
         }
         return true;

package/dist/m365/aad/commands/o365group/o365group-recyclebinitem-restore.js

@@ -16,7 +16,8 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _AadO365GroupRecycleBinItemRestoreCommand_instances, _AadO365GroupRecycleBinItemRestoreCommand_initTelemetry, _AadO365GroupRecycleBinItemRestoreCommand_initOptions, _AadO365GroupRecycleBinItemRestoreCommand_initValidators, _AadO365GroupRecycleBinItemRestoreCommand_initOptionSets;
 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 GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
 class AadO365GroupRecycleBinItemRestoreCommand extends GraphCommand_1.default {
@@ -63,10 +64,10 @@ class AadO365GroupRecycleBinItemRestoreCommand extends GraphCommand_1.default {
         }
         let filterValue = '';
         if (displayName) {
-            filterValue = `displayName eq '${utils_1.formatting.encodeQueryParameter(displayName)}'`;
+            filterValue = `displayName eq '${formatting_1.formatting.encodeQueryParameter(displayName)}'`;
         }
         if (mailNickname) {
-            filterValue = `mailNickname eq '${utils_1.formatting.encodeQueryParameter(mailNickname)}'`;
+            filterValue = `mailNickname eq '${formatting_1.formatting.encodeQueryParameter(mailNickname)}'`;
         }
         const requestOptions = {
             url: `${this.resource}/v1.0/directory/deletedItems/Microsoft.Graph.Group?$filter=${filterValue}`,
@@ -107,7 +108,7 @@ _AadO365GroupRecycleBinItemRestoreCommand_instances = new WeakSet(), _AadO365Gro
     });
 }, _AadO365GroupRecycleBinItemRestoreCommand_initValidators = function _AadO365GroupRecycleBinItemRestoreCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (args.options.id && !utils_1.validation.isValidGuid(args.options.id)) {
+        if (args.options.id && !validation_1.validation.isValidGuid(args.options.id)) {
             return `${args.options.id} is not a valid GUID`;
         }
         return true;

package/dist/m365/aad/commands/o365group/o365group-remove.js

@@ -15,9 +15,9 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _AadO365GroupRemoveCommand_instances, _AadO365GroupRemoveCommand_initTelemetry, _AadO365GroupRemoveCommand_initOptions, _AadO365GroupRemoveCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
-const cli_1 = require("../../../../cli");
+const Cli_1 = require("../../../../cli/Cli");
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const validation_1 = require("../../../../utils/validation");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
 class AadO365GroupRemoveCommand extends GraphCommand_1.default {
@@ -66,7 +66,7 @@ class AadO365GroupRemoveCommand extends GraphCommand_1.default {
                 yield removeGroup();
             }
             else {
-                const result = yield cli_1.Cli.prompt({
+                const result = yield Cli_1.Cli.prompt({
                     type: 'confirm',
                     name: 'continue',
                     default: false,
@@ -96,7 +96,7 @@ _AadO365GroupRemoveCommand_instances = new WeakSet(), _AadO365GroupRemoveCommand
     });
 }, _AadO365GroupRemoveCommand_initValidators = function _AadO365GroupRemoveCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (!utils_1.validation.isValidGuid(args.options.id)) {
+        if (!validation_1.validation.isValidGuid(args.options.id)) {
             return `${args.options.id} is not a valid GUID`;
         }
         return true;

package/dist/m365/aad/commands/o365group/o365group-renew.js

@@ -16,7 +16,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _AadO365GroupRenewCommand_instances, _AadO365GroupRenewCommand_initOptions, _AadO365GroupRenewCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const validation_1 = require("../../../../utils/validation");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
 class AadO365GroupRenewCommand extends GraphCommand_1.default {
@@ -58,7 +58,7 @@ _AadO365GroupRenewCommand_instances = new WeakSet(), _AadO365GroupRenewCommand_i
     });
 }, _AadO365GroupRenewCommand_initValidators = function _AadO365GroupRenewCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (!utils_1.validation.isValidGuid(args.options.id)) {
+        if (!validation_1.validation.isValidGuid(args.options.id)) {
             return `${args.options.id} is not a valid GUID`;
         }
         return true;

package/dist/m365/aad/commands/o365group/o365group-set.js

@@ -18,7 +18,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const fs = require("fs");
 const path = require("path");
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const validation_1 = require("../../../../utils/validation");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
 class AadO365GroupSetCommand extends GraphCommand_1.default {
@@ -211,7 +211,7 @@ _AadO365GroupSetCommand_instances = new WeakSet(), _AadO365GroupSetCommand_initT
             !args.options.logoPath) {
             return 'Specify at least one property to update';
         }
-        if (!utils_1.validation.isValidGuid(args.options.id)) {
+        if (!validation_1.validation.isValidGuid(args.options.id)) {
             return `${args.options.id} is not a valid GUID`;
         }
         if (args.options.owners) {

package/dist/m365/aad/commands/o365group/o365group-teamify.js

@@ -16,7 +16,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _AadO365GroupTeamifyCommand_instances, _AadO365GroupTeamifyCommand_initTelemetry, _AadO365GroupTeamifyCommand_initOptions, _AadO365GroupTeamifyCommand_initValidators, _AadO365GroupTeamifyCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const validation_1 = require("../../../../utils/validation");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
 class AadO365GroupTeamifyCommand extends GraphCommand_1.default {
@@ -107,7 +107,7 @@ _AadO365GroupTeamifyCommand_instances = new WeakSet(), _AadO365GroupTeamifyComma
     });
 }, _AadO365GroupTeamifyCommand_initValidators = function _AadO365GroupTeamifyCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (args.options.id && !utils_1.validation.isValidGuid(args.options.id)) {
+        if (args.options.id && !validation_1.validation.isValidGuid(args.options.id)) {
             return `${args.options.id} is not a valid GUID`;
         }
         return true;

package/dist/m365/aad/commands/o365group/o365group-user-add.js

@@ -16,7 +16,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _AadO365GroupUserAddCommand_instances, _AadO365GroupUserAddCommand_initTelemetry, _AadO365GroupUserAddCommand_initOptions, _AadO365GroupUserAddCommand_initValidators, _AadO365GroupUserAddCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const validation_1 = require("../../../../utils/validation");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../../teams/commands");
 const commands_2 = require("../../commands");
@@ -88,10 +88,10 @@ _AadO365GroupUserAddCommand_instances = new WeakSet(), _AadO365GroupUserAddComma
     });
 }, _AadO365GroupUserAddCommand_initValidators = function _AadO365GroupUserAddCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (args.options.teamId && !utils_1.validation.isValidGuid(args.options.teamId)) {
+        if (args.options.teamId && !validation_1.validation.isValidGuid(args.options.teamId)) {
             return `${args.options.teamId} is not a valid GUID`;
         }
-        if (args.options.groupId && !utils_1.validation.isValidGuid(args.options.groupId)) {
+        if (args.options.groupId && !validation_1.validation.isValidGuid(args.options.groupId)) {
             return `${args.options.groupId} is not a valid GUID`;
         }
         if (args.options.role) {

package/dist/m365/aad/commands/o365group/o365group-user-list.js

@@ -15,7 +15,8 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _AadO365GroupUserListCommand_instances, _AadO365GroupUserListCommand_initTelemetry, _AadO365GroupUserListCommand_initOptions, _AadO365GroupUserListCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
-const utils_1 = require("../../../../utils");
+const odata_1 = require("../../../../utils/odata");
+const validation_1 = require("../../../../utils/validation");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
 class AadO365GroupUserListCommand extends GraphCommand_1.default {
@@ -52,7 +53,7 @@ class AadO365GroupUserListCommand extends GraphCommand_1.default {
     }
     getOwners(logger, groupId) {
         const endpoint = `${this.resource}/v1.0/groups/${groupId}/owners?$select=id,displayName,userPrincipalName,userType`;
-        return utils_1.odata
+        return odata_1.odata
             .getAllItems(endpoint)
             .then(users => {
             // Currently there is a bug in the Microsoft Graph that returns Owners as
@@ -65,7 +66,7 @@ class AadO365GroupUserListCommand extends GraphCommand_1.default {
     }
     getMembersAndGuests(logger, groupId) {
         const endpoint = `${this.resource}/v1.0/groups/${groupId}/members?$select=id,displayName,userPrincipalName,userType`;
-        return utils_1.odata.getAllItems(endpoint);
+        return odata_1.odata.getAllItems(endpoint);
     }
 }
 _AadO365GroupUserListCommand_instances = new WeakSet(), _AadO365GroupUserListCommand_initTelemetry = function _AadO365GroupUserListCommand_initTelemetry() {
@@ -83,7 +84,7 @@ _AadO365GroupUserListCommand_instances = new WeakSet(), _AadO365GroupUserListCom
     });
 }, _AadO365GroupUserListCommand_initValidators = function _AadO365GroupUserListCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (!utils_1.validation.isValidGuid(args.options.groupId)) {
+        if (!validation_1.validation.isValidGuid(args.options.groupId)) {
             return `${args.options.groupId} is not a valid GUID`;
         }
         if (args.options.role) {