@pnp/cli-microsoft365 5.8.0 → 5.9.0-beta.21a8d94

package/dist/m365/planner/commands/task/task-checklistitem-list.js

@@ -17,7 +17,7 @@ var _PlannerTaskChecklistItemListCommand_instances, _PlannerTaskChecklistItemLis
 Object.defineProperty(exports, "__esModule", { value: true });
 const Auth_1 = require("../../../../Auth");
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const accessToken_1 = require("../../../../utils/accessToken");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
 class PlannerTaskChecklistItemListCommand extends GraphCommand_1.default {
@@ -37,7 +37,7 @@ class PlannerTaskChecklistItemListCommand extends GraphCommand_1.default {
     }
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
-            if (utils_1.accessToken.isAppOnlyAccessToken(Auth_1.default.service.accessTokens[this.resource].accessToken)) {
+            if (accessToken_1.accessToken.isAppOnlyAccessToken(Auth_1.default.service.accessTokens[this.resource].accessToken)) {
                 this.handleError('This command does not support application permissions.');
                 return;
             }

package/dist/m365/planner/commands/task/task-checklistitem-remove.js

@@ -15,7 +15,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _PlannerTaskChecklistItemRemoveCommand_instances, _PlannerTaskChecklistItemRemoveCommand_initTelemetry, _PlannerTaskChecklistItemRemoveCommand_initOptions;
 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");
@@ -38,7 +38,7 @@ class PlannerTaskChecklistItemRemoveCommand extends GraphCommand_1.default {
                 yield this.removeChecklistitem(args);
             }
             else {
-                const result = yield cli_1.Cli.prompt({
+                const result = yield Cli_1.Cli.prompt({
                     type: 'confirm',
                     name: 'continue',
                     default: false,

package/dist/m365/planner/commands/task/task-get.js

@@ -17,7 +17,8 @@ var _PlannerTaskGetCommand_instances, _PlannerTaskGetCommand_initTelemetry, _Pla
 Object.defineProperty(exports, "__esModule", { value: true });
 const Auth_1 = require("../../../../Auth");
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const accessToken_1 = require("../../../../utils/accessToken");
+const validation_1 = require("../../../../utils/validation");
 const aadGroup_1 = require("../../../../utils/aadGroup");
 const planner_1 = require("../../../../utils/planner");
 const GraphCommand_1 = require("../../../base/GraphCommand");
@@ -47,7 +48,7 @@ class PlannerTaskGetCommand extends GraphCommand_1.default {
                 args.options.planTitle = args.options.planName;
                 this.warn(logger, `Option 'planName' is deprecated. Please use 'planTitle' instead`);
             }
-            if (utils_1.accessToken.isAppOnlyAccessToken(Auth_1.default.service.accessTokens[this.resource].accessToken)) {
+            if (accessToken_1.accessToken.isAppOnlyAccessToken(Auth_1.default.service.accessTokens[this.resource].accessToken)) {
                 this.handleError('This command does not support application permissions.');
                 return;
             }
@@ -208,7 +209,7 @@ _PlannerTaskGetCommand_instances = new WeakSet(), _PlannerTaskGetCommand_initTel
         if ((args.options.planName || args.options.planTitle) && args.options.ownerGroupId && args.options.ownerGroupName) {
             return 'Specify either ownerGroupId or ownerGroupName when using planTitle but not both';
         }
-        if (args.options.ownerGroupId && !utils_1.validation.isValidGuid(args.options.ownerGroupId)) {
+        if (args.options.ownerGroupId && !validation_1.validation.isValidGuid(args.options.ownerGroupId)) {
             return `${args.options.ownerGroupId} is not a valid GUID`;
         }
         return true;

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

@@ -17,7 +17,9 @@ var _PlannerTaskListCommand_instances, _PlannerTaskListCommand_initTelemetry, _P
 Object.defineProperty(exports, "__esModule", { value: true });
 const Auth_1 = require("../../../../Auth");
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const accessToken_1 = require("../../../../utils/accessToken");
+const odata_1 = require("../../../../utils/odata");
+const validation_1 = require("../../../../utils/validation");
 const aadGroup_1 = require("../../../../utils/aadGroup");
 const planner_1 = require("../../../../utils/planner");
 const GraphCommand_1 = require("../../../base/GraphCommand");
@@ -45,7 +47,7 @@ class PlannerTaskListCommand extends GraphCommand_1.default {
                 args.options.planTitle = args.options.planName;
                 this.warn(logger, `Option 'planName' is deprecated. Please use 'planTitle' instead`);
             }
-            if (utils_1.accessToken.isAppOnlyAccessToken(Auth_1.default.service.accessTokens[this.resource].accessToken)) {
+            if (accessToken_1.accessToken.isAppOnlyAccessToken(Auth_1.default.service.accessTokens[this.resource].accessToken)) {
                 this.handleError('This command does not support application permissions.');
                 return;
             }
@@ -57,8 +59,8 @@ class PlannerTaskListCommand extends GraphCommand_1.default {
             if (bucketId || bucketName) {
                 try {
                     bucketId = yield this.getBucketId(args);
-                    taskItems = yield utils_1.odata.getAllItems(`${this.resource}/v1.0/planner/buckets/${bucketId}/tasks`);
-                    const betaTasks = yield utils_1.odata.getAllItems(`${this.resource}/beta/planner/buckets/${bucketId}/tasks`);
+                    taskItems = yield odata_1.odata.getAllItems(`${this.resource}/v1.0/planner/buckets/${bucketId}/tasks`);
+                    const betaTasks = yield odata_1.odata.getAllItems(`${this.resource}/beta/planner/buckets/${bucketId}/tasks`);
                     logger.log(this.mergeTaskPriority(taskItems, betaTasks));
                 }
                 catch (err) {
@@ -68,8 +70,8 @@ class PlannerTaskListCommand extends GraphCommand_1.default {
             else if (planId || planTitle) {
                 try {
                     planId = yield this.getPlanId(args);
-                    taskItems = yield utils_1.odata.getAllItems(`${this.resource}/v1.0/planner/plans/${planId}/tasks`);
-                    const betaTasks = yield utils_1.odata.getAllItems(`${this.resource}/beta/planner/plans/${planId}/tasks`);
+                    taskItems = yield odata_1.odata.getAllItems(`${this.resource}/v1.0/planner/plans/${planId}/tasks`);
+                    const betaTasks = yield odata_1.odata.getAllItems(`${this.resource}/beta/planner/plans/${planId}/tasks`);
                     logger.log(this.mergeTaskPriority(taskItems, betaTasks));
                 }
                 catch (err) {
@@ -78,8 +80,8 @@ class PlannerTaskListCommand extends GraphCommand_1.default {
             }
             else {
                 try {
-                    taskItems = yield utils_1.odata.getAllItems(`${this.resource}/v1.0/me/planner/tasks`);
-                    const betaTasks = yield utils_1.odata.getAllItems(`${this.resource}/beta/me/planner/tasks`);
+                    taskItems = yield odata_1.odata.getAllItems(`${this.resource}/v1.0/me/planner/tasks`);
+                    const betaTasks = yield odata_1.odata.getAllItems(`${this.resource}/beta/me/planner/tasks`);
                     logger.log(this.mergeTaskPriority(taskItems, betaTasks));
                 }
                 catch (err) {
@@ -186,7 +188,7 @@ _PlannerTaskListCommand_instances = new WeakSet(), _PlannerTaskListCommand_initT
         if ((args.options.planName || args.options.planTitle) && args.options.ownerGroupId && args.options.ownerGroupName) {
             return 'Specify either ownerGroupId or ownerGroupName when using planTitle but not both';
         }
-        if (args.options.ownerGroupId && !utils_1.validation.isValidGuid(args.options.ownerGroupId)) {
+        if (args.options.ownerGroupId && !validation_1.validation.isValidGuid(args.options.ownerGroupId)) {
             return `${args.options.ownerGroupId} is not a valid GUID`;
         }
         return true;

package/dist/m365/planner/commands/task/task-reference-add.js

@@ -16,7 +16,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _PlannerTaskReferenceAddCommand_instances, _PlannerTaskReferenceAddCommand_initTelemetry, _PlannerTaskReferenceAddCommand_initOptions, _PlannerTaskReferenceAddCommand_initValidators;
 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 PlannerTaskReferenceAddCommand extends GraphCommand_1.default {
@@ -47,7 +47,7 @@ class PlannerTaskReferenceAddCommand extends GraphCommand_1.default {
                     responseType: 'json',
                     data: {
                         references: {
-                            [utils_1.formatting.openTypesEncoder(args.options.url)]: Object.assign(Object.assign({ '@odata.type': 'microsoft.graph.plannerExternalReference', previewPriority: ' !' }, (args.options.alias && { alias: args.options.alias })), (args.options.type && { type: args.options.type }))
+                            [formatting_1.formatting.openTypesEncoder(args.options.url)]: Object.assign(Object.assign({ '@odata.type': 'microsoft.graph.plannerExternalReference', previewPriority: ' !' }, (args.options.alias && { alias: args.options.alias })), (args.options.type && { type: args.options.type }))
                         }
                     }
                 };

package/dist/m365/planner/commands/task/task-reference-list.js

@@ -17,7 +17,7 @@ var _PlannerTaskReferenceListCommand_instances, _PlannerTaskReferenceListCommand
 Object.defineProperty(exports, "__esModule", { value: true });
 const Auth_1 = require("../../../../Auth");
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const accessToken_1 = require("../../../../utils/accessToken");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
 class PlannerTaskReferenceListCommand extends GraphCommand_1.default {
@@ -34,7 +34,7 @@ class PlannerTaskReferenceListCommand extends GraphCommand_1.default {
     }
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
-            if (utils_1.accessToken.isAppOnlyAccessToken(Auth_1.default.service.accessTokens[this.resource].accessToken)) {
+            if (accessToken_1.accessToken.isAppOnlyAccessToken(Auth_1.default.service.accessTokens[this.resource].accessToken)) {
                 this.handleError('This command does not support application permissions.');
                 return;
             }

package/dist/m365/planner/commands/task/task-reference-remove.js

@@ -15,9 +15,9 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _PlannerTaskReferenceRemoveCommand_instances, _PlannerTaskReferenceRemoveCommand_initTelemetry, _PlannerTaskReferenceRemoveCommand_initOptions, _PlannerTaskReferenceRemoveCommand_initValidators, _PlannerTaskReferenceRemoveCommand_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 GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
 class PlannerTaskReferenceRemoveCommand extends GraphCommand_1.default {
@@ -41,7 +41,7 @@ class PlannerTaskReferenceRemoveCommand extends GraphCommand_1.default {
                 yield this.removeReference(logger, args);
             }
             else {
-                const result = yield cli_1.Cli.prompt({
+                const result = yield Cli_1.Cli.prompt({
                     type: 'confirm',
                     name: 'continue',
                     default: false,
@@ -67,7 +67,7 @@ class PlannerTaskReferenceRemoveCommand extends GraphCommand_1.default {
                     responseType: 'json',
                     data: {
                         references: {
-                            [utils_1.formatting.openTypesEncoder(url)]: null
+                            [formatting_1.formatting.openTypesEncoder(url)]: null
                         }
                     }
                 };

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

@@ -16,9 +16,11 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _PlannerTaskRemoveCommand_instances, _PlannerTaskRemoveCommand_initTelemetry, _PlannerTaskRemoveCommand_initOptions, _PlannerTaskRemoveCommand_initValidators, _PlannerTaskRemoveCommand_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 aadGroup_1 = require("../../../../utils/aadGroup");
+const odata_1 = require("../../../../utils/odata");
+const validation_1 = require("../../../../utils/validation");
 const planner_1 = require("../../../../utils/planner");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
@@ -60,7 +62,7 @@ class PlannerTaskRemoveCommand extends GraphCommand_1.default {
                 yield removeTask();
             }
             else {
-                const result = yield cli_1.Cli.prompt({
+                const result = yield Cli_1.Cli.prompt({
                     type: 'confirm',
                     name: 'continue',
                     default: false,
@@ -88,7 +90,7 @@ class PlannerTaskRemoveCommand extends GraphCommand_1.default {
             .getBucketId(options)
             .then(bucketId => {
             // $filter is not working on the buckets/{bucketId}/tasks endpoint, hence it is not being used.
-            return utils_1.odata.getAllItems(`${this.resource}/v1.0/planner/buckets/${bucketId}/tasks?$select=title,id`, 'minimal');
+            return odata_1.odata.getAllItems(`${this.resource}/v1.0/planner/buckets/${bucketId}/tasks?$select=title,id`, 'minimal');
         })
             .then(tasks => {
             const filteredtasks = tasks.filter(b => title.toLocaleLowerCase() === b.title.toLocaleLowerCase());
@@ -144,7 +146,7 @@ class PlannerTaskRemoveCommand extends GraphCommand_1.default {
         if (ownerGroupId) {
             return Promise.resolve(ownerGroupId);
         }
-        return utils_1.aadGroup
+        return aadGroup_1.aadGroup
             .getGroupByDisplayName(ownerGroupName)
             .then(group => group.id);
     }
@@ -195,7 +197,7 @@ _PlannerTaskRemoveCommand_instances = new WeakSet(), _PlannerTaskRemoveCommand_i
                     return 'Specify either ownerGroupId or ownerGroupName when using planTitle but not both';
                 }
             }
-            if (args.options.ownerGroupId && !utils_1.validation.isValidGuid(args.options.ownerGroupId)) {
+            if (args.options.ownerGroupId && !validation_1.validation.isValidGuid(args.options.ownerGroupId)) {
                 return `${args.options.ownerGroupId} is not a valid GUID`;
             }
         }

package/dist/m365/planner/commands/task/task-set.js

@@ -17,7 +17,9 @@ var _PlannerTaskSetCommand_instances, _PlannerTaskSetCommand_initTelemetry, _Pla
 Object.defineProperty(exports, "__esModule", { value: true });
 const Auth_1 = require("../../../../Auth");
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const accessToken_1 = require("../../../../utils/accessToken");
+const formatting_1 = require("../../../../utils/formatting");
+const validation_1 = require("../../../../utils/validation");
 const aadGroup_1 = require("../../../../utils/aadGroup");
 const planner_1 = require("../../../../utils/planner");
 const GraphCommand_1 = require("../../../base/GraphCommand");
@@ -44,7 +46,7 @@ class PlannerTaskSetCommand extends GraphCommand_1.default {
                 args.options.planTitle = args.options.planName;
                 this.warn(logger, `Option 'planName' is deprecated. Please use 'planTitle' instead`);
             }
-            if (utils_1.accessToken.isAppOnlyAccessToken(Auth_1.default.service.accessTokens[this.resource].accessToken)) {
+            if (accessToken_1.accessToken.isAppOnlyAccessToken(Auth_1.default.service.accessTokens[this.resource].accessToken)) {
                 this.handleError('This command does not support application permissions.');
                 return;
             }
@@ -156,7 +158,7 @@ class PlannerTaskSetCommand extends GraphCommand_1.default {
         let userIds = [];
         const 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: {
                     'accept ': 'application/json;odata.metadata=none'
                 },
@@ -299,13 +301,13 @@ _PlannerTaskSetCommand_instances = new WeakSet(), _PlannerTaskSetCommand_initTel
         if ((args.options.planName || args.options.planTitle) && args.options.ownerGroupId && args.options.ownerGroupName) {
             return 'Specify either ownerGroupId or ownerGroupName when using planTitle but not both';
         }
-        if (args.options.ownerGroupId && !utils_1.validation.isValidGuid(args.options.ownerGroupId)) {
+        if (args.options.ownerGroupId && !validation_1.validation.isValidGuid(args.options.ownerGroupId)) {
             return `${args.options.ownerGroupId} is not a valid GUID`;
         }
-        if (args.options.startDateTime && !utils_1.validation.isValidISODateTime(args.options.startDateTime)) {
+        if (args.options.startDateTime && !validation_1.validation.isValidISODateTime(args.options.startDateTime)) {
             return 'The startDateTime is not a valid ISO date string';
         }
-        if (args.options.dueDateTime && !utils_1.validation.isValidISODateTime(args.options.dueDateTime)) {
+        if (args.options.dueDateTime && !validation_1.validation.isValidISODateTime(args.options.dueDateTime)) {
             return 'The dueDateTime is not a valid ISO date string';
         }
         if (args.options.percentComplete && isNaN(args.options.percentComplete)) {
@@ -314,7 +316,7 @@ _PlannerTaskSetCommand_instances = new WeakSet(), _PlannerTaskSetCommand_initTel
         if (args.options.percentComplete && (args.options.percentComplete < 0 || args.options.percentComplete > 100)) {
             return `percentComplete should be between 0 and 100`;
         }
-        if (args.options.assignedToUserIds && !utils_1.validation.isValidGuidArray(args.options.assignedToUserIds.split(','))) {
+        if (args.options.assignedToUserIds && !validation_1.validation.isValidGuidArray(args.options.assignedToUserIds.split(','))) {
             return 'assignedToUserIds contains invalid GUID';
         }
         if (args.options.assignedToUserIds && args.options.assignedToUserNames) {

package/dist/m365/planner/commands/tenant/tenant-settings-set.js

@@ -16,7 +16,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _PlannerTenantSettingsSetCommand_instances, _PlannerTenantSettingsSetCommand_initTelemetry, _PlannerTenantSettingsSetCommand_initOptions, _PlannerTenantSettingsSetCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const validation_1 = require("../../../../utils/validation");
 const PlannerCommand_1 = require("../../../base/PlannerCommand");
 const commands_1 = require("../../commands");
 class PlannerTenantSettingsSetCommand extends PlannerCommand_1.default {
@@ -102,7 +102,7 @@ _PlannerTenantSettingsSetCommand_instances = new WeakSet(), _PlannerTenantSettin
             return 'You must specify at least one option';
         }
         for (const option of optionsArray) {
-            if (typeof option !== 'undefined' && !utils_1.validation.isValidBoolean(option)) {
+            if (typeof option !== 'undefined' && !validation_1.validation.isValidBoolean(option)) {
                 return `Value '${option}' is not a valid boolean`;
             }
         }

package/dist/m365/pp/commands/managementapp/managementapp-add.js

@@ -16,7 +16,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _PpManagementAppAddCommand_instances, _PpManagementAppAddCommand_initTelemetry, _PpManagementAppAddCommand_initOptions, _PpManagementAppAddCommand_initValidators, _PpManagementAppAddCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const validation_1 = require("../../../../utils/validation");
 const PowerPlatformCommand_1 = require("../../../base/PowerPlatformCommand");
 const commands_1 = require("../../commands");
 class PpManagementAppAddCommand extends PowerPlatformCommand_1.default {
@@ -95,10 +95,10 @@ _PpManagementAppAddCommand_instances = new WeakSet(), _PpManagementAppAddCommand
     this.options.unshift({ option: '--appId [appId]' }, { option: '--objectId [objectId]' }, { option: '--name [name]' });
 }, _PpManagementAppAddCommand_initValidators = function _PpManagementAppAddCommand_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.objectId && !utils_1.validation.isValidGuid(args.options.objectId)) {
+        if (args.options.objectId && !validation_1.validation.isValidGuid(args.options.objectId)) {
             return `${args.options.objectId} is not a valid GUID`;
         }
         return true;

package/dist/m365/pp/commands/managementapp/managementapp-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 PowerPlatformCommand_1 = require("../../../base/PowerPlatformCommand");
 const commands_1 = require("../../commands");
 class PpManagementAppListCommand extends PowerPlatformCommand_1.default {
@@ -23,7 +23,7 @@ class PpManagementAppListCommand extends PowerPlatformCommand_1.default {
         return __awaiter(this, void 0, void 0, function* () {
             const endpoint = `${this.resource}/providers/Microsoft.BusinessAppPlatform/adminApplications?api-version=2020-06-01`;
             try {
-                const managementApps = yield utils_1.odata.getAllItems(endpoint);
+                const managementApps = yield odata_1.odata.getAllItems(endpoint);
                 logger.log(managementApps);
             }
             catch (err) {

package/dist/m365/search/commands/externalconnection/externalconnection-list.js

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

package/dist/m365/search/commands/externalconnection/externalconnection-remove.js

@@ -15,7 +15,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _SearchExternalConnectionRemoveCommand_instances, _SearchExternalConnectionRemoveCommand_initTelemetry, _SearchExternalConnectionRemoveCommand_initOptions, _SearchExternalConnectionRemoveCommand_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");
@@ -78,7 +78,7 @@ class SearchExternalConnectionRemoveCommand extends GraphCommand_1.default {
                 yield removeExternalConnection();
             }
             else {
-                const result = yield cli_1.Cli.prompt({
+                const result = yield Cli_1.Cli.prompt({
                     type: 'confirm',
                     name: 'continue',
                     default: false,

package/dist/m365/spfx/commands/package/package-generate.js

@@ -20,7 +20,7 @@ const fs = require("fs");
 const os = require("os");
 const path = require("path");
 const uuid_1 = require("uuid");
-const utils_1 = require("../../../../utils");
+const fsUtil_1 = require("../../../../utils/fsUtil");
 const AnonymousCommand_1 = require("../../../base/AnonymousCommand");
 const commands_1 = require("../../commands");
 class SpfxPackageGenerateCommand extends AnonymousCommand_1.default {
@@ -83,8 +83,8 @@ class SpfxPackageGenerateCommand extends AnonymousCommand_1.default {
                     logger.log('Copying files...');
                 }
                 const src = path.join(__dirname, 'package-generate', 'assets');
-                utils_1.fsUtil.copyRecursiveSync(src, tmpDir, s => SpfxPackageGenerateCommand.replaceTokens(s, tokens));
-                const files = utils_1.fsUtil.readdirR(tmpDir);
+                fsUtil_1.fsUtil.copyRecursiveSync(src, tmpDir, s => SpfxPackageGenerateCommand.replaceTokens(s, tokens));
+                const files = fsUtil_1.fsUtil.readdirR(tmpDir);
                 if (this.verbose) {
                     logger.log('Processing files...');
                 }
@@ -122,7 +122,7 @@ class SpfxPackageGenerateCommand extends AnonymousCommand_1.default {
                 if (!this.archive) {
                     this.archive = new AdmZip();
                 }
-                const filesToZip = utils_1.fsUtil.readdirR(tmpDir);
+                const filesToZip = fsUtil_1.fsUtil.readdirR(tmpDir);
                 filesToZip.forEach(f => {
                     if (this.debug) {
                         logger.log(`Adding ${f} to archive...`);

package/dist/m365/spfx/commands/project/base-project-command.js

@@ -3,7 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.BaseProjectCommand = void 0;
 const fs = require("fs");
 const path = require("path");
-const utils_1 = require("../../../../utils");
+const formatting_1 = require("../../../../utils/formatting");
+const fsUtil_1 = require("../../../../utils/fsUtil");
 const AnonymousCommand_1 = require("../../../base/AnonymousCommand");
 const project_model_1 = require("./project-model");
 class BaseProjectCommand extends AnonymousCommand_1.default {
@@ -36,7 +37,7 @@ class BaseProjectCommand extends AnonymousCommand_1.default {
         const configJsonPath = path.join(projectRootPath, 'config/config.json');
         if (fs.existsSync(configJsonPath)) {
             try {
-                const source = utils_1.formatting.removeSingleLineComments(fs.readFileSync(configJsonPath, 'utf-8'));
+                const source = formatting_1.formatting.removeSingleLineComments(fs.readFileSync(configJsonPath, 'utf-8'));
                 project.configJson = JSON.parse(source);
                 project.configJson.source = source;
             }
@@ -45,7 +46,7 @@ class BaseProjectCommand extends AnonymousCommand_1.default {
         const copyAssetsJsonPath = path.join(projectRootPath, 'config/copy-assets.json');
         if (fs.existsSync(copyAssetsJsonPath)) {
             try {
-                const source = utils_1.formatting.removeSingleLineComments(fs.readFileSync(copyAssetsJsonPath, 'utf-8'));
+                const source = formatting_1.formatting.removeSingleLineComments(fs.readFileSync(copyAssetsJsonPath, 'utf-8'));
                 project.copyAssetsJson = JSON.parse(source);
                 project.copyAssetsJson.source = source;
             }
@@ -54,7 +55,7 @@ class BaseProjectCommand extends AnonymousCommand_1.default {
         const deployAzureStorageJsonPath = path.join(projectRootPath, 'config/deploy-azure-storage.json');
         if (fs.existsSync(deployAzureStorageJsonPath)) {
             try {
-                const source = utils_1.formatting.removeSingleLineComments(fs.readFileSync(deployAzureStorageJsonPath, 'utf-8'));
+                const source = formatting_1.formatting.removeSingleLineComments(fs.readFileSync(deployAzureStorageJsonPath, 'utf-8'));
                 project.deployAzureStorageJson = JSON.parse(source);
                 project.deployAzureStorageJson.source = source;
             }
@@ -63,7 +64,7 @@ class BaseProjectCommand extends AnonymousCommand_1.default {
         const packageJsonPath = path.join(projectRootPath, 'package.json');
         if (fs.existsSync(packageJsonPath)) {
             try {
-                const source = utils_1.formatting.removeSingleLineComments(fs.readFileSync(packageJsonPath, 'utf-8'));
+                const source = formatting_1.formatting.removeSingleLineComments(fs.readFileSync(packageJsonPath, 'utf-8'));
                 project.packageJson = JSON.parse(source);
                 project.packageJson.source = source;
             }
@@ -72,7 +73,7 @@ class BaseProjectCommand extends AnonymousCommand_1.default {
         const packageSolutionJsonPath = path.join(projectRootPath, 'config/package-solution.json');
         if (fs.existsSync(packageSolutionJsonPath)) {
             try {
-                const source = utils_1.formatting.removeSingleLineComments(fs.readFileSync(packageSolutionJsonPath, 'utf-8'));
+                const source = formatting_1.formatting.removeSingleLineComments(fs.readFileSync(packageSolutionJsonPath, 'utf-8'));
                 project.packageSolutionJson = JSON.parse(source);
                 project.packageSolutionJson.source = source;
             }
@@ -81,7 +82,7 @@ class BaseProjectCommand extends AnonymousCommand_1.default {
         const serveJsonPath = path.join(projectRootPath, 'config/serve.json');
         if (fs.existsSync(serveJsonPath)) {
             try {
-                const source = utils_1.formatting.removeSingleLineComments(fs.readFileSync(serveJsonPath, 'utf-8'));
+                const source = formatting_1.formatting.removeSingleLineComments(fs.readFileSync(serveJsonPath, 'utf-8'));
                 project.serveJson = JSON.parse(source);
                 project.serveJson.source = source;
             }
@@ -90,7 +91,7 @@ class BaseProjectCommand extends AnonymousCommand_1.default {
         const tsConfigJsonPath = path.join(projectRootPath, 'tsconfig.json');
         if (fs.existsSync(tsConfigJsonPath)) {
             try {
-                const source = utils_1.formatting.removeSingleLineComments(fs.readFileSync(tsConfigJsonPath, 'utf-8'));
+                const source = formatting_1.formatting.removeSingleLineComments(fs.readFileSync(tsConfigJsonPath, 'utf-8'));
                 project.tsConfigJson = JSON.parse(source);
                 project.tsConfigJson.source = source;
             }
@@ -99,7 +100,7 @@ class BaseProjectCommand extends AnonymousCommand_1.default {
         const tsLintJsonPath = path.join(projectRootPath, 'config/tslint.json');
         if (fs.existsSync(tsLintJsonPath)) {
             try {
-                const source = utils_1.formatting.removeSingleLineComments(fs.readFileSync(tsLintJsonPath, 'utf-8'));
+                const source = formatting_1.formatting.removeSingleLineComments(fs.readFileSync(tsLintJsonPath, 'utf-8'));
                 project.tsLintJson = JSON.parse(source);
                 project.tsLintJson.source = source;
             }
@@ -108,7 +109,7 @@ class BaseProjectCommand extends AnonymousCommand_1.default {
         const tsLintJsonRootPath = path.join(projectRootPath, 'tslint.json');
         if (fs.existsSync(tsLintJsonRootPath)) {
             try {
-                const source = utils_1.formatting.removeSingleLineComments(fs.readFileSync(tsLintJsonRootPath, 'utf-8'));
+                const source = formatting_1.formatting.removeSingleLineComments(fs.readFileSync(tsLintJsonRootPath, 'utf-8'));
                 project.tsLintJsonRoot = JSON.parse(source);
                 project.tsLintJsonRoot.source = source;
             }
@@ -117,7 +118,7 @@ class BaseProjectCommand extends AnonymousCommand_1.default {
         const writeManifestJsonPath = path.join(projectRootPath, 'config/write-manifests.json');
         if (fs.existsSync(writeManifestJsonPath)) {
             try {
-                const source = utils_1.formatting.removeSingleLineComments(fs.readFileSync(writeManifestJsonPath, 'utf-8'));
+                const source = formatting_1.formatting.removeSingleLineComments(fs.readFileSync(writeManifestJsonPath, 'utf-8'));
                 project.writeManifestsJson = JSON.parse(source);
                 project.writeManifestsJson.source = source;
             }
@@ -126,7 +127,7 @@ class BaseProjectCommand extends AnonymousCommand_1.default {
         const yoRcJsonPath = path.join(projectRootPath, '.yo-rc.json');
         if (fs.existsSync(yoRcJsonPath)) {
             try {
-                const source = utils_1.formatting.removeSingleLineComments(fs.readFileSync(yoRcJsonPath, 'utf-8'));
+                const source = formatting_1.formatting.removeSingleLineComments(fs.readFileSync(yoRcJsonPath, 'utf-8'));
                 project.yoRcJson = JSON.parse(source);
                 project.yoRcJson.source = source;
             }
@@ -146,7 +147,7 @@ class BaseProjectCommand extends AnonymousCommand_1.default {
         const vsCodeSettingsPath = path.join(projectRootPath, '.vscode', 'settings.json');
         if (fs.existsSync(vsCodeSettingsPath)) {
             try {
-                const source = utils_1.formatting.removeSingleLineComments(fs.readFileSync(vsCodeSettingsPath, 'utf-8'));
+                const source = formatting_1.formatting.removeSingleLineComments(fs.readFileSync(vsCodeSettingsPath, 'utf-8'));
                 project.vsCode.settingsJson = JSON.parse(source);
                 project.vsCode.settingsJson.source = source;
             }
@@ -155,7 +156,7 @@ class BaseProjectCommand extends AnonymousCommand_1.default {
         const vsCodeExtensionsPath = path.join(projectRootPath, '.vscode', 'extensions.json');
         if (fs.existsSync(vsCodeExtensionsPath)) {
             try {
-                const source = utils_1.formatting.removeSingleLineComments(fs.readFileSync(vsCodeExtensionsPath, 'utf-8'));
+                const source = formatting_1.formatting.removeSingleLineComments(fs.readFileSync(vsCodeExtensionsPath, 'utf-8'));
                 project.vsCode.extensionsJson = JSON.parse(source);
                 project.vsCode.extensionsJson.source = source;
             }
@@ -164,17 +165,17 @@ class BaseProjectCommand extends AnonymousCommand_1.default {
         const vsCodeLaunchPath = path.join(projectRootPath, '.vscode', 'launch.json');
         if (fs.existsSync(vsCodeLaunchPath)) {
             try {
-                const source = utils_1.formatting.removeSingleLineComments(fs.readFileSync(vsCodeLaunchPath, 'utf-8'));
+                const source = formatting_1.formatting.removeSingleLineComments(fs.readFileSync(vsCodeLaunchPath, 'utf-8'));
                 project.vsCode.launchJson = JSON.parse(source);
                 project.vsCode.launchJson.source = source;
             }
             catch (_r) { }
         }
-        const srcFiles = utils_1.fsUtil.readdirR(path.join(projectRootPath, 'src'));
+        const srcFiles = fsUtil_1.fsUtil.readdirR(path.join(projectRootPath, 'src'));
         const manifestFiles = srcFiles.filter(f => f.endsWith('.manifest.json'));
         const manifests = manifestFiles.map((f) => {
-            const manifestStr = utils_1.formatting.removeSingleLineComments(fs.readFileSync(f, 'utf-8'));
-            const manifest = utils_1.formatting.parseJsonWithBom(manifestStr);
+            const manifestStr = formatting_1.formatting.removeSingleLineComments(fs.readFileSync(f, 'utf-8'));
+            const manifest = formatting_1.formatting.parseJsonWithBom(manifestStr);
             manifest.path = f;
             manifest.source = manifestStr;
             return manifest;

package/dist/m365/spfx/commands/project/project-doctor/rules/FN001008_DEP_react.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.FN001008_DEP_react = void 0;
-const utils_1 = require("../../../../../../utils");
+const spfx_1 = require("../../../../../../utils/spfx");
 const DependencyRule_1 = require("./DependencyRule");
 class FN001008_DEP_react extends DependencyRule_1.DependencyRule {
     constructor(supportedRange) {
@@ -11,7 +11,7 @@ class FN001008_DEP_react extends DependencyRule_1.DependencyRule {
         return 'FN001008';
     }
     customCondition(project) {
-        return utils_1.spfx.isReactProject(project);
+        return spfx_1.spfx.isReactProject(project);
     }
 }
 exports.FN001008_DEP_react = FN001008_DEP_react;

package/dist/m365/spfx/commands/project/project-doctor/rules/FN001009_DEP_react_dom.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.FN001009_DEP_react_dom = void 0;
-const utils_1 = require("../../../../../../utils");
+const spfx_1 = require("../../../../../../utils/spfx");
 const DependencyRule_1 = require("./DependencyRule");
 class FN001009_DEP_react_dom extends DependencyRule_1.DependencyRule {
     constructor(supportedRange) {
@@ -11,7 +11,7 @@ class FN001009_DEP_react_dom extends DependencyRule_1.DependencyRule {
         return 'FN001009';
     }
     customCondition(project) {
-        return utils_1.spfx.isReactProject(project);
+        return spfx_1.spfx.isReactProject(project);
     }
 }
 exports.FN001009_DEP_react_dom = FN001009_DEP_react_dom;