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

package/dist/m365/cli/commands/cli-doctor.js

@@ -11,9 +11,9 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 const os = require("os");
 const Auth_1 = require("../../../Auth");
-const cli_1 = require("../../../cli");
+const Cli_1 = require("../../../cli/Cli");
 const Command_1 = require("../../../Command");
-const utils_1 = require("../../../utils");
+const validation_1 = require("../../../utils/validation");
 const commands_1 = require("../commands");
 const packageJSON = require('../../../../package.json');
 class CliDoctorCommand extends Command_1.default {
@@ -41,10 +41,10 @@ class CliDoctorCommand extends Command_1.default {
                 cliVersion: packageJSON.version,
                 nodeVersion: process.version,
                 cliAadAppId: Auth_1.default.service.appId,
-                cliAadAppTenant: utils_1.validation.isValidGuid(Auth_1.default.service.tenant) ? 'single' : Auth_1.default.service.tenant,
+                cliAadAppTenant: validation_1.validation.isValidGuid(Auth_1.default.service.tenant) ? 'single' : Auth_1.default.service.tenant,
                 authMode: Auth_1.AuthType[Auth_1.default.service.authType],
                 cliEnvironment: process.env.CLIMICROSOFT365_ENV ? process.env.CLIMICROSOFT365_ENV : '',
-                cliConfig: cli_1.Cli.getInstance().config.all,
+                cliConfig: Cli_1.Cli.getInstance().config.all,
                 roles: roles,
                 scopes: scopes
             };

package/dist/m365/cli/commands/cli-reconsent.js

@@ -9,7 +9,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const cli_1 = require("../../../cli");
+const Cli_1 = require("../../../cli/Cli");
 const config_1 = require("../../../config");
 const settingsNames_1 = require("../../../settingsNames");
 const AnonymousCommand_1 = require("../../base/AnonymousCommand");
@@ -24,7 +24,7 @@ class CliReconsentCommand extends AnonymousCommand_1.default {
     commandAction(logger) {
         return __awaiter(this, void 0, void 0, function* () {
             const url = `https://login.microsoftonline.com/${config_1.default.tenant}/oauth2/authorize?client_id=${config_1.default.cliAadAppId}&response_type=code&prompt=admin_consent`;
-            if (cli_1.Cli.getInstance().getSettingWithDefaultValue(settingsNames_1.settingsNames.autoOpenLinksInBrowser, false) === false) {
+            if (Cli_1.Cli.getInstance().getSettingWithDefaultValue(settingsNames_1.settingsNames.autoOpenLinksInBrowser, false) === false) {
                 logger.log(`To re-consent the PnP Microsoft 365 Management Shell Azure AD application navigate in your web browser to ${url}`);
                 return;
             }

package/dist/m365/cli/commands/config/config-get.js

@@ -15,7 +15,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _CliConfigGetCommand_instances, _CliConfigGetCommand_initTelemetry, _CliConfigGetCommand_initOptions, _CliConfigGetCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
-const cli_1 = require("../../../../cli");
+const Cli_1 = require("../../../../cli/Cli");
 const settingsNames_1 = require("../../../../settingsNames");
 const AnonymousCommand_1 = require("../../../base/AnonymousCommand");
 const commands_1 = require("../../commands");
@@ -35,7 +35,7 @@ class CliConfigGetCommand extends AnonymousCommand_1.default {
     }
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
-            logger.log(cli_1.Cli.getInstance().config.get(args.options.key));
+            logger.log(Cli_1.Cli.getInstance().config.get(args.options.key));
         });
     }
 }

package/dist/m365/cli/commands/config/config-reset.js

@@ -15,7 +15,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _CliConfigResetCommand_instances, _CliConfigResetCommand_initTelemetry, _CliConfigResetCommand_initOptions, _CliConfigResetCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
-const cli_1 = require("../../../../cli");
+const Cli_1 = require("../../../../cli/Cli");
 const settingsNames_1 = require("../../../../settingsNames");
 const AnonymousCommand_1 = require("../../../base/AnonymousCommand");
 const commands_1 = require("../../commands");
@@ -36,10 +36,10 @@ class CliConfigResetCommand extends AnonymousCommand_1.default {
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
             if (args.options.key) {
-                cli_1.Cli.getInstance().config.delete(args.options.key);
+                Cli_1.Cli.getInstance().config.delete(args.options.key);
             }
             else {
-                cli_1.Cli.getInstance().config.clear();
+                Cli_1.Cli.getInstance().config.clear();
             }
         });
     }

package/dist/m365/cli/commands/config/config-set.js

@@ -15,7 +15,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _CliConfigSetCommand_instances, _CliConfigSetCommand_initTelemetry, _CliConfigSetCommand_initOptions, _CliConfigSetCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
-const cli_1 = require("../../../../cli");
+const Cli_1 = require("../../../../cli/Cli");
 const settingsNames_1 = require("../../../../settingsNames");
 const AnonymousCommand_1 = require("../../../base/AnonymousCommand");
 const commands_1 = require("../../commands");
@@ -50,7 +50,7 @@ class CliConfigSetCommand extends AnonymousCommand_1.default {
                     value = args.options.value;
                     break;
             }
-            cli_1.Cli.getInstance().config.set(args.options.key, value);
+            Cli_1.Cli.getInstance().config.set(args.options.key, value);
         });
     }
 }

package/dist/m365/commands/status.js

@@ -11,7 +11,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 const Auth_1 = require("../../Auth");
 const Command_1 = require("../../Command");
-const utils_1 = require("../../utils");
+const accessToken_1 = require("../../utils/accessToken");
 const commands_1 = require("./commands");
 class StatusCommand extends Command_1.default {
     get name() {
@@ -35,14 +35,19 @@ class StatusCommand extends Command_1.default {
                 }
                 if (this.debug) {
                     logger.logToStderr({
-                        connectedAs: utils_1.accessToken.getUserNameFromAccessToken(Auth_1.default.service.accessTokens[Auth_1.default.defaultResource].accessToken),
+                        connectedAs: accessToken_1.accessToken.getUserNameFromAccessToken(Auth_1.default.service.accessTokens[Auth_1.default.defaultResource].accessToken),
                         authType: Auth_1.AuthType[Auth_1.default.service.authType],
+                        appId: Auth_1.default.service.appId,
+                        appTenant: Auth_1.default.service.tenant,
                         accessTokens: JSON.stringify(Auth_1.default.service.accessTokens, null, 2)
                     });
                 }
                 else {
                     logger.log({
-                        connectedAs: utils_1.accessToken.getUserNameFromAccessToken(Auth_1.default.service.accessTokens[Auth_1.default.defaultResource].accessToken)
+                        connectedAs: accessToken_1.accessToken.getUserNameFromAccessToken(Auth_1.default.service.accessTokens[Auth_1.default.defaultResource].accessToken),
+                        authType: Auth_1.AuthType[Auth_1.default.service.authType],
+                        appId: Auth_1.default.service.appId,
+                        appTenant: Auth_1.default.service.tenant
                     });
                 }
             }

package/dist/m365/file/commands/file-add.js

@@ -19,7 +19,7 @@ const fs = require("fs");
 const path = require("path");
 const url = require("url");
 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 FileAddCommand extends GraphCommand_1.default {
@@ -257,12 +257,12 @@ _FileAddCommand_instances = new WeakSet(), _FileAddCommand_initTelemetry = funct
             return `Specified source file ${args.options.sourceFile} doesn't exist`;
         }
         if (args.options.siteUrl) {
-            const isValidSiteUrl = utils_1.validation.isValidSharePointUrl(args.options.siteUrl);
+            const isValidSiteUrl = validation_1.validation.isValidSharePointUrl(args.options.siteUrl);
             if (isValidSiteUrl !== true) {
                 return isValidSiteUrl;
             }
         }
-        return utils_1.validation.isValidSharePointUrl(args.options.folderUrl);
+        return validation_1.validation.isValidSharePointUrl(args.options.folderUrl);
     }));
 };
 module.exports = new FileAddCommand();

package/dist/m365/file/commands/file-list.js

@@ -16,7 +16,8 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _FileListCommand_instances, _FileListCommand_initTelemetry, _FileListCommand_initOptions, _FileListCommand_initValidators;
 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 FileListCommand extends GraphCommand_1.default {
@@ -172,7 +173,7 @@ class FileListCommand extends GraphCommand_1.default {
             .all(folderIds.map((folderId) => 
         // get items from folder. Because we can't filter out folders here
         // we need to get all items from the folder and filter them out later
-        utils_1.odata.getAllItems(`${this.resource}/v1.0/drives/${driveId}/items/${folderId}/children`)))
+        odata_1.odata.getAllItems(`${this.resource}/v1.0/drives/${driveId}/items/${folderId}/children`)))
             .then(res => {
             // flatten data from all promises
             files = files.concat(...res);
@@ -192,7 +193,7 @@ _FileListCommand_instances = new WeakSet(), _FileListCommand_initTelemetry = fun
 }, _FileListCommand_initOptions = function _FileListCommand_initOptions() {
     this.options.unshift({ option: '-u, --webUrl <webUrl>' }, { option: '-f, --folderUrl <folderUrl>' }, { option: '--recursive' });
 }, _FileListCommand_initValidators = function _FileListCommand_initValidators() {
-    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () { return utils_1.validation.isValidSharePointUrl(args.options.webUrl); }));
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () { return validation_1.validation.isValidSharePointUrl(args.options.webUrl); }));
 };
 module.exports = new FileListCommand();
 //# sourceMappingURL=file-list.js.map

package/dist/m365/flow/commands/flow-export.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 AzmgmtCommand_1 = require("../../base/AzmgmtCommand");
 const commands_1 = require("../commands");
 class FlowExportCommand extends AzmgmtCommand_1.default {
@@ -180,7 +180,7 @@ _FlowExportCommand_instances = new WeakSet(), _FlowExportCommand_initTelemetry =
 }, _FlowExportCommand_initValidators = function _FlowExportCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
         const lowerCaseFormat = args.options.format ? args.options.format.toLowerCase() : '';
-        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.format && (lowerCaseFormat !== 'json' && lowerCaseFormat !== 'zip')) {

package/dist/m365/flow/commands/flow-remove.js

@@ -16,9 +16,9 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _FlowRemoveCommand_instances, _FlowRemoveCommand_initTelemetry, _FlowRemoveCommand_initOptions, _FlowRemoveCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
 const chalk = require("chalk");
-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 AzmgmtCommand_1 = require("../../base/AzmgmtCommand");
 const commands_1 = require("../commands");
 class FlowRemoveCommand extends AzmgmtCommand_1.default {
@@ -65,7 +65,7 @@ class FlowRemoveCommand extends AzmgmtCommand_1.default {
                 yield removeFlow();
             }
             else {
-                const result = yield cli_1.Cli.prompt({
+                const result = yield Cli_1.Cli.prompt({
                     type: 'confirm',
                     name: 'continue',
                     default: false,
@@ -97,7 +97,7 @@ _FlowRemoveCommand_instances = new WeakSet(), _FlowRemoveCommand_initTelemetry =
     });
 }, _FlowRemoveCommand_initValidators = function _FlowRemoveCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (!utils_1.validation.isValidGuid(args.options.name)) {
+        if (!validation_1.validation.isValidGuid(args.options.name)) {
             return `${args.options.name} is not a valid GUID`;
         }
         return true;

package/dist/m365/flow/commands/run/run-cancel.js

@@ -15,9 +15,9 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _FlowRunCancelCommand_instances, _FlowRunCancelCommand_initOptions, _FlowRunCancelCommand_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 AzmgmtCommand_1 = require("../../../base/AzmgmtCommand");
 const commands_1 = require("../../commands");
 class FlowRunCancelCommand extends AzmgmtCommand_1.default {
@@ -57,7 +57,7 @@ class FlowRunCancelCommand extends AzmgmtCommand_1.default {
                 yield cancelFlow();
             }
             else {
-                const result = yield cli_1.Cli.prompt({
+                const result = yield Cli_1.Cli.prompt({
                     type: 'confirm',
                     name: 'continue',
                     default: false,
@@ -82,7 +82,7 @@ _FlowRunCancelCommand_instances = new WeakSet(), _FlowRunCancelCommand_initOptio
     });
 }, _FlowRunCancelCommand_initValidators = function _FlowRunCancelCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (!utils_1.validation.isValidGuid(args.options.flowName)) {
+        if (!validation_1.validation.isValidGuid(args.options.flowName)) {
             return `${args.options.flowName} is not a valid GUID`;
         }
         return true;

package/dist/m365/flow/commands/run/run-resubmit.js

@@ -16,9 +16,9 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _FlowRunResubmitCommand_instances, _FlowRunResubmitCommand_initTelemetry, _FlowRunResubmitCommand_initOptions, _FlowRunResubmitCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
 const chalk = require("chalk");
-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 AzmgmtCommand_1 = require("../../../base/AzmgmtCommand");
 const commands_1 = require("../../commands");
 class FlowRunResubmitCommand extends AzmgmtCommand_1.default {
@@ -63,7 +63,7 @@ class FlowRunResubmitCommand extends AzmgmtCommand_1.default {
                 yield resubmitFlow();
             }
             else {
-                const result = yield cli_1.Cli.prompt({
+                const result = yield Cli_1.Cli.prompt({
                     type: 'confirm',
                     name: 'continue',
                     default: false,
@@ -106,7 +106,7 @@ _FlowRunResubmitCommand_instances = new WeakSet(), _FlowRunResubmitCommand_initT
     });
 }, _FlowRunResubmitCommand_initValidators = function _FlowRunResubmitCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (!utils_1.validation.isValidGuid(args.options.flowName)) {
+        if (!validation_1.validation.isValidGuid(args.options.flowName)) {
             return `${args.options.flowName} is not a valid GUID`;
         }
         return true;

package/dist/m365/graph/commands/changelog/changelog-list.js

@@ -15,7 +15,8 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _GraphChangelogListCommand_instances, _GraphChangelogListCommand_initTelemetry, _GraphChangelogListCommand_initOptions, _GraphChangelogListCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
-const utils_1 = require("../../../../utils");
+const md_1 = require("../../../../utils/md");
+const validation_1 = require("../../../../utils/validation");
 const AnonymousCommand_1 = require("../../../base/AnonymousCommand");
 const commands_1 = require("../../commands");
 const request_1 = require("../../../../request");
@@ -106,7 +107,7 @@ class GraphChangelogListCommand extends AnonymousCommand_1.default {
         };
         Array.from(xmlDoc.getElementsByTagName('item')).forEach((item) => {
             const description = args.options.output === 'text' ?
-                utils_1.md.md2plain(item.getElementsByTagName('description').item(0).textContent, '') :
+                md_1.md.md2plain(item.getElementsByTagName('description').item(0).textContent, '') :
                 item.getElementsByTagName('description').item(0).textContent;
             changelog.items.push({
                 guid: item.getElementsByTagName('guid').item(0).textContent,
@@ -147,10 +148,10 @@ _GraphChangelogListCommand_instances = new WeakSet(), _GraphChangelogListCommand
             args.options.services.toLocaleLowerCase().split(',').some(x => !this.allowedServices.map(y => y.toLocaleLowerCase()).includes(x))) {
             return `The services contains invalid value. Specify either ${this.allowedServices.join(', ')} as properties`;
         }
-        if (args.options.startDate && !utils_1.validation.isValidISODate(args.options.startDate)) {
+        if (args.options.startDate && !validation_1.validation.isValidISODate(args.options.startDate)) {
             return 'The startDate is not a valid ISO date string';
         }
-        if (args.options.endDate && !utils_1.validation.isValidISODate(args.options.endDate)) {
+        if (args.options.endDate && !validation_1.validation.isValidISODate(args.options.endDate)) {
             return 'The endDate is not a valid ISO date string';
         }
         if (args.options.endDate && args.options.startDate && new Date(args.options.endDate) < new Date(args.options.startDate)) {

package/dist/m365/graph/commands/schemaextension/schemaextension-add.js

@@ -16,7 +16,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _GraphSchemaExtensionAddCommand_instances, _GraphSchemaExtensionAddCommand_initOptions, _GraphSchemaExtensionAddCommand_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 GraphSchemaExtensionAddCommand extends GraphCommand_1.default {
@@ -112,7 +112,7 @@ _GraphSchemaExtensionAddCommand_instances = new WeakSet(), _GraphSchemaExtension
     });
 }, _GraphSchemaExtensionAddCommand_initValidators = function _GraphSchemaExtensionAddCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (args.options.owner && !utils_1.validation.isValidGuid(args.options.owner)) {
+        if (args.options.owner && !validation_1.validation.isValidGuid(args.options.owner)) {
             return `The specified owner '${args.options.owner}' is not a valid App Id`;
         }
         return this.validateProperties(args.options.properties);

package/dist/m365/graph/commands/schemaextension/schemaextension-list.js

@@ -16,7 +16,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _GraphSchemaExtensionListCommand_instances, _GraphSchemaExtensionListCommand_initTelemetry, _GraphSchemaExtensionListCommand_initOptions, _GraphSchemaExtensionListCommand_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 GraphSchemaExtensionListCommand extends GraphCommand_1.default {
@@ -114,7 +114,7 @@ _GraphSchemaExtensionListCommand_instances = new WeakSet(), _GraphSchemaExtensio
     });
 }, _GraphSchemaExtensionListCommand_initValidators = function _GraphSchemaExtensionListCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (args.options.owner && !utils_1.validation.isValidGuid(args.options.owner)) {
+        if (args.options.owner && !validation_1.validation.isValidGuid(args.options.owner)) {
             return `${args.options.owner} is not a valid GUID`;
         }
         if (args.options.pageNumber && parseInt(args.options.pageNumber) < 1) {

package/dist/m365/graph/commands/schemaextension/schemaextension-remove.js

@@ -15,7 +15,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _GraphSchemaExtensionRemoveCommand_instances, _GraphSchemaExtensionRemoveCommand_initTelemetry, _GraphSchemaExtensionRemoveCommand_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");
@@ -57,7 +57,7 @@ class GraphSchemaExtensionRemoveCommand extends GraphCommand_1.default {
                 yield removeSchemaExtension();
             }
             else {
-                const result = yield cli_1.Cli.prompt({
+                const result = yield Cli_1.Cli.prompt({
                     type: 'confirm',
                     name: 'continue',
                     default: false,

package/dist/m365/graph/commands/schemaextension/schemaextension-set.js

@@ -16,7 +16,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _GraphSchemaExtensionSetCommand_instances, _GraphSchemaExtensionSetCommand_initTelemetry, _GraphSchemaExtensionSetCommand_initOptions, _GraphSchemaExtensionSetCommand_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 GraphSchemaExtensionSetCommand extends GraphCommand_1.default {
@@ -151,7 +151,7 @@ _GraphSchemaExtensionSetCommand_instances = new WeakSet(), _GraphSchemaExtension
     });
 }, _GraphSchemaExtensionSetCommand_initValidators = function _GraphSchemaExtensionSetCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (!utils_1.validation.isValidGuid(args.options.owner)) {
+        if (!validation_1.validation.isValidGuid(args.options.owner)) {
             return `The specified owner '${args.options.owner}' is not a valid App Id`;
         }
         if (!args.options.status && !args.options.properties && !args.options.targetTypes && !args.options.description) {

package/dist/m365/graph/commands/subscription/subscription-add.js

@@ -16,7 +16,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _GraphSubscriptionAddCommand_instances, _GraphSubscriptionAddCommand_initTelemetry, _GraphSubscriptionAddCommand_initOptions, _GraphSubscriptionAddCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const validation_1 = require("../../../../utils/validation");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
 const DEFAULT_EXPIRATION_DELAY_IN_MINUTES_PER_RESOURCE_TYPE = {
@@ -160,7 +160,7 @@ _GraphSubscriptionAddCommand_instances = new WeakSet(), _GraphSubscriptionAddCom
         if (!this.isValidChangeTypes(args.options.changeType)) {
             return `The specified changeType is invalid. Valid options are 'created', 'updated' and 'deleted'`;
         }
-        if (args.options.expirationDateTime && !utils_1.validation.isValidISODateTime(args.options.expirationDateTime)) {
+        if (args.options.expirationDateTime && !validation_1.validation.isValidISODateTime(args.options.expirationDateTime)) {
             return 'The expirationDateTime is not a valid ISO date string';
         }
         if (args.options.clientState && args.options.clientState.length > 128) {

package/dist/m365/onedrive/commands/onedrive-list.js

@@ -11,7 +11,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 const config_1 = require("../../../config");
 const request_1 = require("../../../request");
-const utils_1 = require("../../../utils");
+const spo_1 = require("../../../utils/spo");
 const SpoCommand_1 = require("../../base/SpoCommand");
 const commands_1 = require("../commands");
 class OneDriveListCommand extends SpoCommand_1.default {
@@ -27,7 +27,7 @@ class OneDriveListCommand extends SpoCommand_1.default {
     commandAction(logger) {
         return __awaiter(this, void 0, void 0, function* () {
             try {
-                const spoAdminUrl = yield utils_1.spo.getSpoAdminUrl(logger, this.debug);
+                const spoAdminUrl = yield spo_1.spo.getSpoAdminUrl(logger, this.debug);
                 if (this.verbose) {
                     logger.logToStderr(`Retrieving list of OneDrive sites...`);
                 }
@@ -42,7 +42,7 @@ class OneDriveListCommand extends SpoCommand_1.default {
     }
     getAllSites(spoAdminUrl, startIndex, formDigest, logger) {
         return new Promise((resolve, reject) => {
-            utils_1.spo
+            spo_1.spo
                 .ensureFormDigest(spoAdminUrl, logger, formDigest, this.debug)
                 .then((res) => {
                 const requestOptions = {

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

@@ -16,7 +16,8 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _OneNoteNotebookListCommand_instances, _OneNoteNotebookListCommand_initTelemetry, _OneNoteNotebookListCommand_initOptions, _OneNoteNotebookListCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const 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");
@@ -101,7 +102,7 @@ class OneNoteNotebookListCommand extends GraphCommand_1.default {
         return __awaiter(this, void 0, void 0, function* () {
             try {
                 const endpoint = yield this.getEndpointUrl(args);
-                const items = yield utils_1.odata.getAllItems(endpoint);
+                const items = yield odata_1.odata.getAllItems(endpoint);
                 logger.log(items);
             }
             catch (err) {
@@ -120,10 +121,10 @@ _OneNoteNotebookListCommand_instances = new WeakSet(), _OneNoteNotebookListComma
     this.options.unshift({ option: '--userId [userId]' }, { option: '--userName [userName]' }, { option: '--groupId [groupId]' }, { option: '--groupName [groupName]' }, { option: '-u, --webUrl [webUrl]' });
 }, _OneNoteNotebookListCommand_initValidators = function _OneNoteNotebookListCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (args.options.userId && !utils_1.validation.isValidGuid(args.options.userId)) {
+        if (args.options.userId && !validation_1.validation.isValidGuid(args.options.userId)) {
             return `${args.options.userId} is not a valid GUID`;
         }
-        if (args.options.groupId && !utils_1.validation.isValidGuid(args.options.groupId)) {
+        if (args.options.groupId && !validation_1.validation.isValidGuid(args.options.groupId)) {
             return `${args.options.groupId} is not a valid GUID`;
         }
         if (args.options.userId && args.options.userName) {