@pnp/cli-microsoft365 5.8.0 → 5.9.0-beta.5aade58

package/dist/m365/teams/commands/team/team-get.js

@@ -16,7 +16,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _TeamsTeamGetCommand_instances, _TeamsTeamGetCommand_initTelemetry, _TeamsTeamGetCommand_initOptions, _TeamsTeamGetCommand_initValidators, _TeamsTeamGetCommand_initOptionSets;
 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");
@@ -83,7 +83,7 @@ _TeamsTeamGetCommand_instances = new WeakSet(), _TeamsTeamGetCommand_initTelemet
     });
 }, _TeamsTeamGetCommand_initValidators = function _TeamsTeamGetCommand_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/teams/commands/team/team-list.js

@@ -16,7 +16,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _TeamsTeamListCommand_instances, _TeamsTeamListCommand_initTelemetry, _TeamsTeamListCommand_initOptions;
 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 TeamsTeamListCommand extends GraphCommand_1.default {
@@ -39,7 +39,7 @@ class TeamsTeamListCommand extends GraphCommand_1.default {
                 endpoint = `${this.resource}/v1.0/me/joinedTeams`;
             }
             try {
-                const items = yield utils_1.odata.getAllItems(endpoint);
+                const items = yield odata_1.odata.getAllItems(endpoint);
                 if (args.options.joined) {
                     logger.log(items);
                 }

package/dist/m365/teams/commands/team/team-remove.js

@@ -15,9 +15,9 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _TeamsTeamRemoveCommand_instances, _TeamsTeamRemoveCommand_initTelemetry, _TeamsTeamRemoveCommand_initOptions, _TeamsTeamRemoveCommand_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 aadGroup_1 = require("../../../../utils/aadGroup");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
@@ -74,7 +74,7 @@ class TeamsTeamRemoveCommand extends GraphCommand_1.default {
                 yield removeTeam();
             }
             else {
-                const result = yield cli_1.Cli.prompt({
+                const result = yield Cli_1.Cli.prompt({
                     type: 'confirm',
                     name: 'continue',
                     default: false,
@@ -111,10 +111,10 @@ _TeamsTeamRemoveCommand_instances = new WeakSet(), _TeamsTeamRemoveCommand_initT
         if (args.options.name && (args.options.id || args.options.teamId)) {
             return 'Specify either id or name but not both';
         }
-        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.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/teams/commands/team/team-set.js

@@ -16,7 +16,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _TeamsTeamSetCommand_instances, _TeamsTeamSetCommand_initTelemetry, _TeamsTeamSetCommand_initOptions, _TeamsTeamSetCommand_initValidators, _TeamsTeamSetCommand_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 TeamsTeamSetCommand extends GraphCommand_1.default {
@@ -108,10 +108,10 @@ _TeamsTeamSetCommand_instances = new WeakSet(), _TeamsTeamSetCommand_initTelemet
     });
 }, _TeamsTeamSetCommand_initValidators = function _TeamsTeamSetCommand_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.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`;
         }
         if (args.options.visibility) {

package/dist/m365/teams/commands/team/team-unarchive.js

@@ -16,7 +16,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _TeamsTeamUnarchiveCommand_instances, _TeamsTeamUnarchiveCommand_initOptions, _TeamsTeamUnarchiveCommand_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");
@@ -87,10 +87,10 @@ _TeamsTeamUnarchiveCommand_instances = new WeakSet(), _TeamsTeamUnarchiveCommand
         if (args.options.name && (args.options.id || args.options.teamId)) {
             return 'Specify either id or name but not both';
         }
-        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.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/teams/commands/user/user-app-add.js

@@ -16,7 +16,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _TeamsUserAppAddCommand_instances, _TeamsUserAppAddCommand_initOptions, _TeamsUserAppAddCommand_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 TeamsUserAppAddCommand extends GraphCommand_1.default {
@@ -63,10 +63,10 @@ _TeamsUserAppAddCommand_instances = new WeakSet(), _TeamsUserAppAddCommand_initO
     });
 }, _TeamsUserAppAddCommand_initValidators = function _TeamsUserAppAddCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (!utils_1.validation.isValidGuid(args.options.appId)) {
+        if (!validation_1.validation.isValidGuid(args.options.appId)) {
             return `${args.options.appId} is not a valid GUID`;
         }
-        if (!utils_1.validation.isValidGuid(args.options.userId)) {
+        if (!validation_1.validation.isValidGuid(args.options.userId)) {
             return `${args.options.userId} is not a valid GUID`;
         }
         return true;

package/dist/m365/teams/commands/user/user-app-list.js

@@ -16,7 +16,8 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _TeamsUserAppListCommand_instances, _TeamsUserAppListCommand_initTelemetry, _TeamsUserAppListCommand_initOptions, _TeamsUserAppListCommand_initValidators, _TeamsUserAppListCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
-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 TeamsUserAppListCommand extends GraphCommand_1.default {
@@ -39,7 +40,7 @@ class TeamsUserAppListCommand extends GraphCommand_1.default {
             try {
                 const userId = (yield this.getUserId(args)).value;
                 const endpoint = `${this.resource}/v1.0/users/${encodeURIComponent(userId)}/teamwork/installedApps?$expand=teamsAppDefinition`;
-                const items = yield utils_1.odata.getAllItems(endpoint);
+                const items = yield odata_1.odata.getAllItems(endpoint);
                 items.forEach(i => {
                     const userAppId = Buffer.from(i.id, 'base64').toString('ascii');
                     const appId = userAppId.substr(userAppId.indexOf("##") + 2, userAppId.length - userId.length - 2);
@@ -93,10 +94,10 @@ _TeamsUserAppListCommand_instances = new WeakSet(), _TeamsUserAppListCommand_ini
     });
 }, _TeamsUserAppListCommand_initValidators = function _TeamsUserAppListCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (args.options.userId && !utils_1.validation.isValidGuid(args.options.userId)) {
+        if (args.options.userId && !validation_1.validation.isValidGuid(args.options.userId)) {
             return `${args.options.userId} is not a valid GUID`;
         }
-        if (args.options.userName && !utils_1.validation.isValidUserPrincipalName(args.options.userName)) {
+        if (args.options.userName && !validation_1.validation.isValidUserPrincipalName(args.options.userName)) {
             return `${args.options.userName} is not a valid userName`;
         }
         return true;

package/dist/m365/teams/commands/user/user-app-remove.js

@@ -15,9 +15,9 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _TeamsUserAppRemoveCommand_instances, _TeamsUserAppRemoveCommand_initTelemetry, _TeamsUserAppRemoveCommand_initOptions, _TeamsUserAppRemoveCommand_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 TeamsUserAppRemoveCommand extends GraphCommand_1.default {
@@ -56,7 +56,7 @@ class TeamsUserAppRemoveCommand extends GraphCommand_1.default {
                 yield removeApp();
             }
             else {
-                const result = yield cli_1.Cli.prompt({
+                const result = yield Cli_1.Cli.prompt({
                     type: 'confirm',
                     name: 'continue',
                     default: false,
@@ -85,7 +85,7 @@ _TeamsUserAppRemoveCommand_instances = new WeakSet(), _TeamsUserAppRemoveCommand
     });
 }, _TeamsUserAppRemoveCommand_initValidators = function _TeamsUserAppRemoveCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (!utils_1.validation.isValidGuid(args.options.userId)) {
+        if (!validation_1.validation.isValidGuid(args.options.userId)) {
             return `${args.options.userId} is not a valid GUID`;
         }
         return true;

package/dist/m365/teams/commands/user/user-list.js

@@ -15,7 +15,8 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _TeamsUserListCommand_instances, _TeamsUserListCommand_initTelemetry, _TeamsUserListCommand_initOptions, _TeamsUserListCommand_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 TeamsUserListCommand extends GraphCommand_1.default {
@@ -54,7 +55,7 @@ class TeamsUserListCommand 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.getAllItems(endpoint).then((items) => {
+        return odata_1.odata.getAllItems(endpoint).then((items) => {
             this.items = this.items.concat(items);
             // Currently there is a bug in the Microsoft Graph that returns Owners as
             // userType 'member'. We therefore update all returned user as owner
@@ -65,7 +66,7 @@ class TeamsUserListCommand 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);
     }
 }
 _TeamsUserListCommand_instances = new WeakSet(), _TeamsUserListCommand_initTelemetry = function _TeamsUserListCommand_initTelemetry() {
@@ -83,7 +84,7 @@ _TeamsUserListCommand_instances = new WeakSet(), _TeamsUserListCommand_initTelem
     });
 }, _TeamsUserListCommand_initValidators = function _TeamsUserListCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (!utils_1.validation.isValidGuid(args.options.teamId)) {
+        if (!validation_1.validation.isValidGuid(args.options.teamId)) {
             return `${args.options.teamId} is not a valid GUID`;
         }
         if (args.options.role) {

package/dist/m365/tenant/commands/id/id-get.js

@@ -18,7 +18,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const Auth_1 = require("../../../../Auth");
 const Command_1 = require("../../../../Command");
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const accessToken_1 = require("../../../../utils/accessToken");
 const commands_1 = require("../../commands");
 class TenantIdGetCommand extends Command_1.default {
     constructor() {
@@ -37,7 +37,7 @@ class TenantIdGetCommand extends Command_1.default {
         return __awaiter(this, void 0, void 0, function* () {
             let domainName = args.options.domainName;
             if (!domainName) {
-                const userName = utils_1.accessToken.getUserNameFromAccessToken(Auth_1.default.service.accessTokens[Auth_1.default.defaultResource].accessToken);
+                const userName = accessToken_1.accessToken.getUserNameFromAccessToken(Auth_1.default.service.accessTokens[Auth_1.default.defaultResource].accessToken);
                 domainName = userName.split('@')[1];
             }
             const requestOptions = {

package/dist/m365/tenant/commands/report/report-office365activationcounts.js

@@ -10,7 +10,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 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 TenantReportOffice365ActivationCountsCommand extends GraphCommand_1.default {
@@ -40,7 +40,7 @@ class TenantReportOffice365ActivationCountsCommand extends GraphCommand_1.defaul
                 let content = '';
                 const cleanResponse = this.removeEmptyLines(res);
                 if (output && output.toLowerCase() === 'json') {
-                    content = utils_1.formatting.parseCsvToJson(cleanResponse);
+                    content = formatting_1.formatting.parseCsvToJson(cleanResponse);
                 }
                 else {
                     content = cleanResponse;

package/dist/m365/tenant/commands/report/report-office365activationsusercounts.js

@@ -10,7 +10,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 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 TenantReportOffice365ActivationsUserCountsCommand extends GraphCommand_1.default {
@@ -40,7 +40,7 @@ class TenantReportOffice365ActivationsUserCountsCommand extends GraphCommand_1.d
                 let content = '';
                 const cleanResponse = this.removeEmptyLines(res);
                 if (output && output.toLowerCase() === 'json') {
-                    content = utils_1.formatting.parseCsvToJson(cleanResponse);
+                    content = formatting_1.formatting.parseCsvToJson(cleanResponse);
                 }
                 else {
                     content = cleanResponse;

package/dist/m365/tenant/commands/report/report-office365activationsuserdetail.js

@@ -10,7 +10,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 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 TenantReportOffice365ActivationsUserDetailCommand extends GraphCommand_1.default {
@@ -40,7 +40,7 @@ class TenantReportOffice365ActivationsUserDetailCommand extends GraphCommand_1.d
                 let content = '';
                 const cleanResponse = this.removeEmptyLines(res);
                 if (output && output.toLowerCase() === 'json') {
-                    content = utils_1.formatting.parseCsvToJson(cleanResponse);
+                    content = formatting_1.formatting.parseCsvToJson(cleanResponse);
                 }
                 else {
                     content = cleanResponse;

package/dist/m365/tenant/commands/serviceannouncement/serviceannouncement-healthissue-list.js

@@ -15,7 +15,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _TenantServiceAnnouncementHealthIssueListCommand_instances, _TenantServiceAnnouncementHealthIssueListCommand_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 TenantServiceAnnouncementHealthIssueListCommand extends GraphCommand_1.default {
@@ -40,7 +40,7 @@ class TenantServiceAnnouncementHealthIssueListCommand extends GraphCommand_1.def
                 endpoint += `?$filter=service eq '${encodeURIComponent(args.options.service)}'`;
             }
             try {
-                const items = yield utils_1.odata.getAllItems(endpoint);
+                const items = yield odata_1.odata.getAllItems(endpoint);
                 logger.log(items);
             }
             catch (err) {

package/dist/m365/tenant/commands/serviceannouncement/serviceannouncement-message-list.js

@@ -15,7 +15,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _TenantServiceAnnouncementMessageListCommand_instances, _TenantServiceAnnouncementMessageListCommand_initTelemetry, _TenantServiceAnnouncementMessageListCommand_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 TenantServiceAnnouncementMessageListCommand extends GraphCommand_1.default {
@@ -41,7 +41,7 @@ class TenantServiceAnnouncementMessageListCommand extends GraphCommand_1.default
                 endpoint += `?$filter=services/any(c:c+eq+'${encodeURIComponent(args.options.service)}')`;
             }
             try {
-                const items = yield utils_1.odata.getAllItems(endpoint);
+                const items = yield odata_1.odata.getAllItems(endpoint);
                 logger.log(items);
             }
             catch (err) {

package/dist/m365/todo/commands/list/list-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 TodoListListCommand extends GraphCommand_1.default {
@@ -25,7 +25,7 @@ class TodoListListCommand extends GraphCommand_1.default {
     commandAction(logger) {
         return __awaiter(this, void 0, void 0, function* () {
             try {
-                const items = yield utils_1.odata.getAllItems(`${this.resource}/v1.0/me/todo/lists`);
+                const items = yield odata_1.odata.getAllItems(`${this.resource}/v1.0/me/todo/lists`);
                 logger.log(items);
             }
             catch (err) {

package/dist/m365/todo/commands/list/list-remove.js

@@ -15,7 +15,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _TodoListRemoveCommand_instances, _TodoListRemoveCommand_initTelemetry, _TodoListRemoveCommand_initOptions, _TodoListRemoveCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
-const cli_1 = require("../../../../cli");
+const Cli_1 = require("../../../../cli/Cli");
 const request_1 = require("../../../../request");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
@@ -73,7 +73,7 @@ class TodoListRemoveCommand extends GraphCommand_1.default {
                 yield removeList();
             }
             else {
-                const result = yield cli_1.Cli.prompt({
+                const result = yield Cli_1.Cli.prompt({
                     type: 'confirm',
                     name: 'continue',
                     default: false,

package/dist/m365/todo/commands/task/task-list.js

@@ -16,7 +16,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _TodoTaskListCommand_instances, _TodoTaskListCommand_initTelemetry, _TodoTaskListCommand_initOptions, _TodoTaskListCommand_initOptionSets;
 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 TodoTaskListCommand extends GraphCommand_1.default {
@@ -61,7 +61,7 @@ class TodoTaskListCommand extends GraphCommand_1.default {
             try {
                 const listId = yield this.getTodoListId(args);
                 const endpoint = `${this.resource}/v1.0/me/todo/lists/${listId}/tasks`;
-                const items = yield utils_1.odata.getAllItems(endpoint);
+                const items = yield odata_1.odata.getAllItems(endpoint);
                 if (args.options.output === 'json') {
                     logger.log(items);
                 }

package/dist/m365/todo/commands/task/task-remove.js

@@ -15,7 +15,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _TodoTaskRemoveCommand_instances, _TodoTaskRemoveCommand_initTelemetry, _TodoTaskRemoveCommand_initOptions, _TodoTaskRemoveCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
-const cli_1 = require("../../../../cli");
+const Cli_1 = require("../../../../cli/Cli");
 const request_1 = require("../../../../request");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
@@ -73,7 +73,7 @@ class TodoTaskRemoveCommand extends GraphCommand_1.default {
                 yield removeToDoTask();
             }
             else {
-                const result = yield cli_1.Cli.prompt({
+                const result = yield Cli_1.Cli.prompt({
                     type: 'confirm',
                     name: 'continue',
                     default: false,

package/dist/m365/viva/commands/connections/connections-app-create.js

@@ -19,7 +19,7 @@ const AdmZip = require("adm-zip");
 const fs = require("fs");
 const path = require("path");
 const uuid_1 = require("uuid");
-const cli_1 = require("../../../../cli");
+const Cli_1 = require("../../../../cli/Cli");
 const AnonymousCommand_1 = require("../../../base/AnonymousCommand");
 const spoWebGetCommand = require("../../../spo/commands/web/web-get");
 const commands_1 = require("../../commands");
@@ -156,7 +156,7 @@ class VivaConnectionsAppCreateCommand extends AnonymousCommand_1.default {
             debug: this.debug,
             verbose: this.verbose
         };
-        return cli_1.Cli.executeCommandWithOutput(spoWebGetCommand, { options: Object.assign(Object.assign({}, options), { _: [] }) });
+        return Cli_1.Cli.executeCommandWithOutput(spoWebGetCommand, { options: Object.assign(Object.assign({}, options), { _: [] }) });
     }
 }
 _VivaConnectionsAppCreateCommand_instances = new WeakSet(), _VivaConnectionsAppCreateCommand_initOptions = function _VivaConnectionsAppCreateCommand_initOptions() {

package/dist/m365/yammer/commands/group/group-user-remove.js

@@ -15,7 +15,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _YammerGroupUserRemoveCommand_instances, _YammerGroupUserRemoveCommand_initTelemetry, _YammerGroupUserRemoveCommand_initOptions, _YammerGroupUserRemoveCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
-const cli_1 = require("../../../../cli");
+const Cli_1 = require("../../../../cli/Cli");
 const request_1 = require("../../../../request");
 const YammerCommand_1 = require("../../../base/YammerCommand");
 const commands_1 = require("../../commands");
@@ -64,7 +64,7 @@ class YammerGroupUserRemoveCommand extends YammerCommand_1.default {
                 if (args.options.userId) {
                     messagePrompt = `Are you sure you want to remove the user ${args.options.userId} from the group ${args.options.id}?`;
                 }
-                const result = yield cli_1.Cli.prompt({
+                const result = yield Cli_1.Cli.prompt({
                     type: 'confirm',
                     name: 'continue',
                     default: false,

package/dist/m365/yammer/commands/message/message-like-set.js

@@ -15,7 +15,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _YammerMessageLikeSetCommand_instances, _YammerMessageLikeSetCommand_initTelemetry, _YammerMessageLikeSetCommand_initOptions, _YammerMessageLikeSetCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
-const cli_1 = require("../../../../cli");
+const Cli_1 = require("../../../../cli/Cli");
 const request_1 = require("../../../../request");
 const YammerCommand_1 = require("../../../base/YammerCommand");
 const commands_1 = require("../../commands");
@@ -66,7 +66,7 @@ class YammerMessageLikeSetCommand extends YammerCommand_1.default {
                 }
                 else {
                     const messagePrompt = `Are you sure you want to unlike message ${args.options.id}?`;
-                    const result = yield cli_1.Cli.prompt({
+                    const result = yield Cli_1.Cli.prompt({
                         type: 'confirm',
                         name: 'continue',
                         default: false,

package/dist/m365/yammer/commands/message/message-remove.js

@@ -15,7 +15,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _YammerMessageRemoveCommand_instances, _YammerMessageRemoveCommand_initTelemetry, _YammerMessageRemoveCommand_initOptions, _YammerMessageRemoveCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
-const cli_1 = require("../../../../cli");
+const Cli_1 = require("../../../../cli/Cli");
 const request_1 = require("../../../../request");
 const YammerCommand_1 = require("../../../base/YammerCommand");
 const commands_1 = require("../../commands");
@@ -55,7 +55,7 @@ class YammerMessageRemoveCommand extends YammerCommand_1.default {
                 yield removeMessage();
             }
             else {
-                const result = yield cli_1.Cli.prompt({
+                const result = yield Cli_1.Cli.prompt({
                     type: 'confirm',
                     name: 'continue',
                     default: false,

package/dist/request.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const axios_1 = require("axios");
 const stream_1 = require("stream");
 const Auth_1 = require("./Auth");
-const utils_1 = require("./utils");
+const formatting_1 = require("./utils/formatting");
 const packageJSON = require('../package.json');
 class Request {
     constructor() {
@@ -60,7 +60,7 @@ class Request {
                     if (config.responseType !== 'stream') {
                         properties.push('data');
                     }
-                    this._logger.logToStderr(JSON.stringify(utils_1.formatting.filterObject(config, properties), null, 2));
+                    this._logger.logToStderr(JSON.stringify(formatting_1.formatting.filterObject(config, properties), null, 2));
                 }
                 return config;
             });
@@ -75,14 +75,14 @@ class Request {
                         response.headers['content-type'].indexOf('json') > -1) {
                         properties.push('data');
                     }
-                    this._logger.logToStderr(JSON.stringify(Object.assign({ url: response.config.url }, utils_1.formatting.filterObject(response, properties)), null, 2));
+                    this._logger.logToStderr(JSON.stringify(Object.assign({ url: response.config.url }, formatting_1.formatting.filterObject(response, properties)), null, 2));
                 }
                 return response;
             }, (error) => {
                 if (this._logger) {
                     const properties = ['status', 'statusText', 'headers'];
                     this._logger.logToStderr('Request error:');
-                    this._logger.logToStderr(JSON.stringify(Object.assign(Object.assign({ url: error.config.url }, utils_1.formatting.filterObject(error.response, properties)), { error: error.error }), null, 2));
+                    this._logger.logToStderr(JSON.stringify(Object.assign(Object.assign({ url: error.config.url }, formatting_1.formatting.filterObject(error.response, properties)), { error: error.error }), null, 2));
                 }
                 throw error;
             });

package/dist/utils/spo.js

@@ -2,7 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.spo = void 0;
 const url = require("url");
-const _1 = require(".");
+const urlUtil_1 = require("./urlUtil");
+const validation_1 = require("./validation");
 const Auth_1 = require("../Auth");
 const config_1 = require("../config");
 const base_permissions_1 = require("../m365/spo/base-permissions");
@@ -20,7 +21,7 @@ exports.spo = {
     },
     ensureFormDigest(siteUrl, logger, context, debug) {
         return new Promise((resolve, reject) => {
-            if (_1.validation.isValidFormDigest(context)) {
+            if (validation_1.validation.isValidFormDigest(context)) {
                 if (debug) {
                     logger.logToStderr('Existing form digest still valid');
                 }
@@ -255,7 +256,7 @@ exports.spo = {
             webFullUrl[webFullUrlLastCharPos] === '/') {
             webFullUrl = webFullUrl.substring(0, webFullUrlLastCharPos);
         }
-        folderToEnsure = _1.urlUtil.getWebRelativePath(webFullUrl, folderToEnsure);
+        folderToEnsure = urlUtil_1.urlUtil.getWebRelativePath(webFullUrl, folderToEnsure);
         if (debug) {
             logger.log(`folderToEnsure`);
             logger.log(folderToEnsure);
@@ -282,7 +283,7 @@ exports.spo = {
             // append the next sub-folder to the folder path and check if it exists
             prevFolder = nextFolder;
             nextFolder += `/${folders[folderIndex]}`;
-            const folderServerRelativeUrl = _1.urlUtil.getServerRelativePath(webFullUrl, nextFolder);
+            const folderServerRelativeUrl = urlUtil_1.urlUtil.getServerRelativePath(webFullUrl, nextFolder);
             const requestOptions = {
                 url: `${webFullUrl}/_api/web/GetFolderByServerRelativeUrl('${encodeURIComponent(folderServerRelativeUrl)}')`,
                 headers: {
@@ -296,7 +297,7 @@ exports.spo = {
                 checkOrAddFolder(resolve, reject);
             })
                 .catch(() => {
-                const prevFolderServerRelativeUrl = _1.urlUtil.getServerRelativePath(webFullUrl, prevFolder);
+                const prevFolderServerRelativeUrl = urlUtil_1.urlUtil.getServerRelativePath(webFullUrl, prevFolder);
                 const requestOptions = {
                     url: `${webFullUrl}/_api/web/GetFolderByServerRelativePath(DecodedUrl=@a1)/AddSubFolderUsingPath(DecodedUrl=@a2)?@a1=%27${encodeURIComponent(prevFolderServerRelativeUrl)}%27&@a2=%27${encodeURIComponent(folders[folderIndex])}%27`,
                     headers: {
@@ -402,7 +403,7 @@ exports.spo = {
       * @param formDigestValue formDigestValue
       */
     getFolderIdentity(webObjectIdentity, webUrl, siteRelativeUrl, formDigestValue) {
-        const serverRelativePath = _1.urlUtil.getServerRelativePath(webUrl, siteRelativeUrl);
+        const serverRelativePath = urlUtil_1.urlUtil.getServerRelativePath(webUrl, siteRelativeUrl);
         const requestOptions = {
             url: `${webUrl}/_vti_bin/client.svc/ProcessQuery`,
             headers: {