@pnp/cli-microsoft365 5.8.0 → 5.9.0-beta.1672f8f

package/dist/m365/spo/commands/sitedesign/sitedesign-run-status-get.js

@@ -16,7 +16,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _SpoSiteDesignRunStatusGetCommand_instances, _SpoSiteDesignRunStatusGetCommand_initOptions, _SpoSiteDesignRunStatusGetCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoSiteDesignRunStatusGetCommand extends SpoCommand_1.default {
@@ -67,11 +67,11 @@ _SpoSiteDesignRunStatusGetCommand_instances = new WeakSet(), _SpoSiteDesignRunSt
     });
 }, _SpoSiteDesignRunStatusGetCommand_initValidators = function _SpoSiteDesignRunStatusGetCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        const isValidSharePointUrl = utils_1.validation.isValidSharePointUrl(args.options.webUrl);
+        const isValidSharePointUrl = validation_1.validation.isValidSharePointUrl(args.options.webUrl);
         if (isValidSharePointUrl !== true) {
             return isValidSharePointUrl;
         }
-        if (!utils_1.validation.isValidGuid(args.options.runId)) {
+        if (!validation_1.validation.isValidGuid(args.options.runId)) {
             return `${args.options.runId} is not a valid GUID`;
         }
         return true;

package/dist/m365/spo/commands/sitedesign/sitedesign-set.js

@@ -16,7 +16,8 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _SpoSiteDesignSetCommand_instances, _SpoSiteDesignSetCommand_initTelemetry, _SpoSiteDesignSetCommand_initOptions, _SpoSiteDesignSetCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const spo_1 = require("../../../../utils/spo");
+const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoSiteDesignSetCommand extends SpoCommand_1.default {
@@ -36,7 +37,7 @@ class SpoSiteDesignSetCommand extends SpoCommand_1.default {
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
             try {
-                const spoUrl = yield utils_1.spo.getSpoUrl(logger, this.debug);
+                const spoUrl = yield spo_1.spo.getSpoUrl(logger, this.debug);
                 const updateInfo = {
                     Id: args.options.id
                 };
@@ -125,7 +126,7 @@ _SpoSiteDesignSetCommand_instances = new WeakSet(), _SpoSiteDesignSetCommand_ini
     });
 }, _SpoSiteDesignSetCommand_initValidators = function _SpoSiteDesignSetCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (!utils_1.validation.isValidGuid(args.options.id)) {
+        if (!validation_1.validation.isValidGuid(args.options.id)) {
             return `${args.options.id} is not a valid GUID`;
         }
         if (args.options.webTemplate &&
@@ -137,7 +138,7 @@ _SpoSiteDesignSetCommand_instances = new WeakSet(), _SpoSiteDesignSetCommand_ini
             const siteScripts = args.options.siteScripts.split(',');
             for (let i = 0; i < siteScripts.length; i++) {
                 const trimmedId = siteScripts[i].trim();
-                if (!utils_1.validation.isValidGuid(trimmedId)) {
+                if (!validation_1.validation.isValidGuid(trimmedId)) {
                     return `${trimmedId} is not a valid GUID`;
                 }
             }

package/dist/m365/spo/commands/sitedesign/sitedesign-task-get.js

@@ -16,7 +16,8 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _SpoSiteDesignTaskGetCommand_instances, _SpoSiteDesignTaskGetCommand_initOptions, _SpoSiteDesignTaskGetCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const spo_1 = require("../../../../utils/spo");
+const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoSiteDesignTaskGetCommand extends SpoCommand_1.default {
@@ -35,7 +36,7 @@ class SpoSiteDesignTaskGetCommand extends SpoCommand_1.default {
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
             try {
-                const spoUrl = yield utils_1.spo.getSpoUrl(logger, this.debug);
+                const spoUrl = yield spo_1.spo.getSpoUrl(logger, this.debug);
                 const requestOptions = {
                     url: `${spoUrl}/_api/Microsoft.Sharepoint.Utilities.WebTemplateExtensions.SiteScriptUtility.GetSiteDesignTask`,
                     headers: {
@@ -63,7 +64,7 @@ _SpoSiteDesignTaskGetCommand_instances = new WeakSet(), _SpoSiteDesignTaskGetCom
     });
 }, _SpoSiteDesignTaskGetCommand_initValidators = function _SpoSiteDesignTaskGetCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (!utils_1.validation.isValidGuid(args.options.taskId)) {
+        if (!validation_1.validation.isValidGuid(args.options.taskId)) {
             return `${args.options.taskId} is not a valid GUID`;
         }
         return true;

package/dist/m365/spo/commands/sitedesign/sitedesign-task-list.js

@@ -16,7 +16,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _SpoSiteDesignTaskListCommand_instances, _SpoSiteDesignTaskListCommand_initOptions, _SpoSiteDesignTaskListCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoSiteDesignTaskListCommand extends SpoCommand_1.default {
@@ -59,7 +59,7 @@ _SpoSiteDesignTaskListCommand_instances = new WeakSet(), _SpoSiteDesignTaskListC
         option: '-u, --webUrl <webUrl>'
     });
 }, _SpoSiteDesignTaskListCommand_initValidators = function _SpoSiteDesignTaskListCommand_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 SpoSiteDesignTaskListCommand();
 //# sourceMappingURL=sitedesign-task-list.js.map

package/dist/m365/spo/commands/sitedesign/sitedesign-task-remove.js

@@ -15,9 +15,10 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _SpoSiteDesignTaskRemoveCommand_instances, _SpoSiteDesignTaskRemoveCommand_initTelemetry, _SpoSiteDesignTaskRemoveCommand_initOptions, _SpoSiteDesignTaskRemoveCommand_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 spo_1 = require("../../../../utils/spo");
+const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoSiteDesignTaskRemoveCommand extends SpoCommand_1.default {
@@ -38,7 +39,7 @@ class SpoSiteDesignTaskRemoveCommand extends SpoCommand_1.default {
         return __awaiter(this, void 0, void 0, function* () {
             const removeSiteDesignTask = () => __awaiter(this, void 0, void 0, function* () {
                 try {
-                    const spoUrl = yield utils_1.spo.getSpoUrl(logger, this.debug);
+                    const spoUrl = yield spo_1.spo.getSpoUrl(logger, this.debug);
                     const requestOptions = {
                         url: `${spoUrl}/_api/Microsoft.Sharepoint.Utilities.WebTemplateExtensions.SiteScriptUtility.RemoveSiteDesignTask`,
                         headers: {
@@ -59,7 +60,7 @@ class SpoSiteDesignTaskRemoveCommand extends SpoCommand_1.default {
                 yield removeSiteDesignTask();
             }
             else {
-                const result = yield cli_1.Cli.prompt({
+                const result = yield Cli_1.Cli.prompt({
                     type: 'confirm',
                     name: 'continue',
                     default: false,
@@ -86,7 +87,7 @@ _SpoSiteDesignTaskRemoveCommand_instances = new WeakSet(), _SpoSiteDesignTaskRem
     });
 }, _SpoSiteDesignTaskRemoveCommand_initValidators = function _SpoSiteDesignTaskRemoveCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (!utils_1.validation.isValidGuid(args.options.taskId)) {
+        if (!validation_1.validation.isValidGuid(args.options.taskId)) {
             return `${args.options.taskId} is not a valid GUID`;
         }
         return true;

package/dist/m365/spo/commands/sitescript/sitescript-add.js

@@ -16,7 +16,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _SpoSiteScriptAddCommand_instances, _SpoSiteScriptAddCommand_initTelemetry, _SpoSiteScriptAddCommand_initOptions, _SpoSiteScriptAddCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
 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 SpoSiteScriptAddCommand extends SpoCommand_1.default {
@@ -36,8 +36,8 @@ class SpoSiteScriptAddCommand extends SpoCommand_1.default {
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
             try {
-                const spoUrl = yield utils_1.spo.getSpoUrl(logger, this.debug);
-                const requestDigest = yield utils_1.spo.getRequestDigest(spoUrl);
+                const spoUrl = yield spo_1.spo.getSpoUrl(logger, this.debug);
+                const requestDigest = yield spo_1.spo.getRequestDigest(spoUrl);
                 const requestOptions = {
                     url: `${spoUrl}/_api/Microsoft.Sharepoint.Utilities.WebTemplateExtensions.SiteScriptUtility.CreateSiteScript(Title=@title, Description=@description)?@title='${encodeURIComponent(args.options.title)}'&@description='${encodeURIComponent(args.options.description || '')}'`,
                     headers: {

package/dist/m365/spo/commands/sitescript/sitescript-get.js

@@ -16,7 +16,8 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _SpoSiteScriptGetCommand_instances, _SpoSiteScriptGetCommand_initOptions, _SpoSiteScriptGetCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const spo_1 = require("../../../../utils/spo");
+const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoSiteScriptGetCommand extends SpoCommand_1.default {
@@ -35,8 +36,8 @@ class SpoSiteScriptGetCommand extends SpoCommand_1.default {
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
             try {
-                const spoUrl = yield utils_1.spo.getSpoUrl(logger, this.debug);
-                const formDigest = yield utils_1.spo.getRequestDigest(spoUrl);
+                const spoUrl = yield spo_1.spo.getSpoUrl(logger, this.debug);
+                const formDigest = yield spo_1.spo.getRequestDigest(spoUrl);
                 const requestOptions = {
                     url: `${spoUrl}/_api/Microsoft.Sharepoint.Utilities.WebTemplateExtensions.SiteScriptUtility.GetSiteScriptMetadata`,
                     headers: {
@@ -62,7 +63,7 @@ _SpoSiteScriptGetCommand_instances = new WeakSet(), _SpoSiteScriptGetCommand_ini
     });
 }, _SpoSiteScriptGetCommand_initValidators = function _SpoSiteScriptGetCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (!utils_1.validation.isValidGuid(args.options.id)) {
+        if (!validation_1.validation.isValidGuid(args.options.id)) {
             return `${args.options.id} is not a valid GUID`;
         }
         return true;

package/dist/m365/spo/commands/sitescript/sitescript-list.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 spo_1 = require("../../../../utils/spo");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoSiteScriptListCommand extends SpoCommand_1.default {
@@ -23,8 +23,8 @@ class SpoSiteScriptListCommand extends SpoCommand_1.default {
     commandAction(logger) {
         return __awaiter(this, void 0, void 0, function* () {
             try {
-                const spoUrl = yield utils_1.spo.getSpoUrl(logger, this.debug);
-                const formDigest = yield utils_1.spo.getRequestDigest(spoUrl);
+                const spoUrl = yield spo_1.spo.getSpoUrl(logger, this.debug);
+                const formDigest = yield spo_1.spo.getRequestDigest(spoUrl);
                 const requestOptions = {
                     url: `${spoUrl}/_api/Microsoft.Sharepoint.Utilities.WebTemplateExtensions.SiteScriptUtility.GetSiteScripts'`,
                     headers: {

package/dist/m365/spo/commands/sitescript/sitescript-remove.js

@@ -15,9 +15,10 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _SpoSiteScriptRemoveCommand_instances, _SpoSiteScriptRemoveCommand_initTelemetry, _SpoSiteScriptRemoveCommand_initOptions, _SpoSiteScriptRemoveCommand_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 spo_1 = require("../../../../utils/spo");
+const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoSiteScriptRemoveCommand extends SpoCommand_1.default {
@@ -38,8 +39,8 @@ class SpoSiteScriptRemoveCommand extends SpoCommand_1.default {
         return __awaiter(this, void 0, void 0, function* () {
             const removeSiteScript = () => __awaiter(this, void 0, void 0, function* () {
                 try {
-                    const spoUrl = yield utils_1.spo.getSpoUrl(logger, this.debug);
-                    const formDigest = yield utils_1.spo.getRequestDigest(spoUrl);
+                    const spoUrl = yield spo_1.spo.getSpoUrl(logger, this.debug);
+                    const formDigest = yield spo_1.spo.getRequestDigest(spoUrl);
                     const requestOptions = {
                         url: `${spoUrl}/_api/Microsoft.Sharepoint.Utilities.WebTemplateExtensions.SiteScriptUtility.DeleteSiteScript`,
                         headers: {
@@ -60,7 +61,7 @@ class SpoSiteScriptRemoveCommand extends SpoCommand_1.default {
                 yield removeSiteScript();
             }
             else {
-                const result = yield cli_1.Cli.prompt({
+                const result = yield Cli_1.Cli.prompt({
                     type: 'confirm',
                     name: 'continue',
                     default: false,
@@ -87,7 +88,7 @@ _SpoSiteScriptRemoveCommand_instances = new WeakSet(), _SpoSiteScriptRemoveComma
     });
 }, _SpoSiteScriptRemoveCommand_initValidators = function _SpoSiteScriptRemoveCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (!utils_1.validation.isValidGuid(args.options.id)) {
+        if (!validation_1.validation.isValidGuid(args.options.id)) {
             return `${args.options.id} is not a valid GUID`;
         }
         return true;

package/dist/m365/spo/commands/sitescript/sitescript-set.js

@@ -16,7 +16,8 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _SpoSiteScriptSetCommand_instances, _SpoSiteScriptSetCommand_initTelemetry, _SpoSiteScriptSetCommand_initOptions, _SpoSiteScriptSetCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const spo_1 = require("../../../../utils/spo");
+const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoSiteScriptSetCommand extends SpoCommand_1.default {
@@ -36,8 +37,8 @@ class SpoSiteScriptSetCommand extends SpoCommand_1.default {
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
             try {
-                const spoUrl = yield utils_1.spo.getSpoUrl(logger, this.debug);
-                const formDigest = yield utils_1.spo.getRequestDigest(spoUrl);
+                const spoUrl = yield spo_1.spo.getSpoUrl(logger, this.debug);
+                const formDigest = yield spo_1.spo.getRequestDigest(spoUrl);
                 const updateInfo = {
                     Id: args.options.id
                 };
@@ -95,7 +96,7 @@ _SpoSiteScriptSetCommand_instances = new WeakSet(), _SpoSiteScriptSetCommand_ini
     });
 }, _SpoSiteScriptSetCommand_initValidators = function _SpoSiteScriptSetCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (!utils_1.validation.isValidGuid(args.options.id)) {
+        if (!validation_1.validation.isValidGuid(args.options.id)) {
             return `${args.options.id} is not a valid GUID`;
         }
         if (args.options.version) {

package/dist/m365/spo/commands/spo-search.js

@@ -17,7 +17,8 @@ var _SpoSearchCommand_instances, _SpoSearchCommand_initTelemetry, _SpoSearchComm
 Object.defineProperty(exports, "__esModule", { value: true });
 const util_1 = require("util");
 const request_1 = require("../../../request");
-const utils_1 = require("../../../utils");
+const spo_1 = require("../../../utils/spo");
+const validation_1 = require("../../../utils/validation");
 const SpoCommand_1 = require("../../base/SpoCommand");
 const commands_1 = require("../commands");
 class SpoSearchCommand extends SpoCommand_1.default {
@@ -42,7 +43,7 @@ class SpoSearchCommand extends SpoCommand_1.default {
                     webUrl = args.options.webUrl;
                 }
                 else {
-                    webUrl = yield utils_1.spo.getSpoUrl(logger, this.debug);
+                    webUrl = yield spo_1.spo.getSpoUrl(logger, this.debug);
                 }
                 if (this.verbose) {
                     logger.logToStderr(`Executing search query '${args.options.queryText}' on site at ${webUrl}...`);
@@ -250,10 +251,10 @@ _SpoSearchCommand_instances = new WeakSet(), _SpoSearchCommand_initTelemetry = f
     });
 }, _SpoSearchCommand_initValidators = function _SpoSearchCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (args.options.sourceId && !utils_1.validation.isValidGuid(args.options.sourceId)) {
+        if (args.options.sourceId && !validation_1.validation.isValidGuid(args.options.sourceId)) {
             return `${args.options.sourceId} is not a valid GUID`;
         }
-        if (args.options.rankingModelId && !utils_1.validation.isValidGuid(args.options.rankingModelId)) {
+        if (args.options.rankingModelId && !validation_1.validation.isValidGuid(args.options.rankingModelId)) {
             return `${args.options.rankingModelId} is not a valid GUID`;
         }
         if (args.options.sortList && !/^([a-z0-9_]+:(ascending|descending))(,([a-z0-9_]+:(ascending|descending)))*$/gi.test(args.options.sortList)) {

package/dist/m365/spo/commands/spo-set.js

@@ -16,7 +16,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _SpoSetCommand_instances, _SpoSetCommand_initOptions, _SpoSetCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
 const Auth_1 = require("../../../Auth");
-const utils_1 = require("../../../utils");
+const validation_1 = require("../../../utils/validation");
 const SpoCommand_1 = require("../../base/SpoCommand");
 const commands_1 = require("../commands");
 class SpoSetCommand extends SpoCommand_1.default {
@@ -49,7 +49,7 @@ _SpoSetCommand_instances = new WeakSet(), _SpoSetCommand_initOptions = function
         option: '-u, --url <url>'
     });
 }, _SpoSetCommand_initValidators = function _SpoSetCommand_initValidators() {
-    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () { return utils_1.validation.isValidSharePointUrl(args.options.url); }));
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () { return validation_1.validation.isValidSharePointUrl(args.options.url); }));
 };
 module.exports = new SpoSetCommand();
 //# sourceMappingURL=spo-set.js.map

package/dist/m365/spo/commands/storageentity/storageentity-get.js

@@ -16,7 +16,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _SpoStorageEntityGetCommand_instances, _SpoStorageEntityGetCommand_initOptions;
 Object.defineProperty(exports, "__esModule", { value: true });
 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 SpoStorageEntityGetCommand extends SpoCommand_1.default {
@@ -34,7 +34,7 @@ class SpoStorageEntityGetCommand extends SpoCommand_1.default {
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
             try {
-                const spoUrl = yield utils_1.spo.getSpoUrl(logger, this.debug);
+                const spoUrl = yield spo_1.spo.getSpoUrl(logger, this.debug);
                 const requestOptions = {
                     url: `${spoUrl}/_api/web/GetStorageEntity('${encodeURIComponent(args.options.key)}')`,
                     headers: {

package/dist/m365/spo/commands/storageentity/storageentity-list.js

@@ -16,7 +16,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _SpoStorageEntityListCommand_instances, _SpoStorageEntityListCommand_initOptions, _SpoStorageEntityListCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoStorageEntityListCommand extends SpoCommand_1.default {
@@ -84,7 +84,7 @@ _SpoStorageEntityListCommand_instances = new WeakSet(), _SpoStorageEntityListCom
         option: '-u, --appCatalogUrl <appCatalogUrl>'
     });
 }, _SpoStorageEntityListCommand_initValidators = function _SpoStorageEntityListCommand_initValidators() {
-    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () { return utils_1.validation.isValidSharePointUrl(args.options.appCatalogUrl); }));
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () { return validation_1.validation.isValidSharePointUrl(args.options.appCatalogUrl); }));
 };
 module.exports = new SpoStorageEntityListCommand();
 //# sourceMappingURL=storageentity-list.js.map

package/dist/m365/spo/commands/storageentity/storageentity-remove.js

@@ -15,10 +15,12 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _SpoStorageEntityRemoveCommand_instances, _SpoStorageEntityRemoveCommand_initTelemetry, _SpoStorageEntityRemoveCommand_initOptions, _SpoStorageEntityRemoveCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
-const cli_1 = require("../../../../cli");
+const Cli_1 = require("../../../../cli/Cli");
 const config_1 = require("../../../../config");
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const formatting_1 = require("../../../../utils/formatting");
+const spo_1 = require("../../../../utils/spo");
+const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoStorageEntityRemoveCommand extends SpoCommand_1.default {
@@ -42,14 +44,14 @@ class SpoStorageEntityRemoveCommand extends SpoCommand_1.default {
                     logger.logToStderr(`Removing tenant property ${args.options.key} from ${args.options.appCatalogUrl}...`);
                 }
                 try {
-                    const spoAdminUrl = yield utils_1.spo.getSpoAdminUrl(logger, this.debug);
-                    const res = yield utils_1.spo.getRequestDigest(spoAdminUrl);
+                    const spoAdminUrl = yield spo_1.spo.getSpoAdminUrl(logger, this.debug);
+                    const res = yield spo_1.spo.getRequestDigest(spoAdminUrl);
                     const requestOptions = {
                         url: `${spoAdminUrl}/_vti_bin/client.svc/ProcessQuery`,
                         headers: {
                             'X-RequestDigest': res.FormDigestValue
                         },
-                        data: `<Request AddExpandoFieldTypeSuffix="true" SchemaVersion="15.0.0.0" LibraryVersion="16.0.0.0" ApplicationName="${config_1.default.applicationName}" xmlns="http://schemas.microsoft.com/sharepoint/clientquery/2009"><Actions><ObjectPath Id="31" ObjectPathId="30" /><ObjectPath Id="33" ObjectPathId="32" /><ObjectPath Id="35" ObjectPathId="34" /><Method Name="RemoveStorageEntity" Id="36" ObjectPathId="34"><Parameters><Parameter Type="String">${utils_1.formatting.escapeXml(args.options.key)}</Parameter></Parameters></Method></Actions><ObjectPaths><Constructor Id="30" TypeId="{268004ae-ef6b-4e9b-8425-127220d84719}" /><Method Id="32" ParentId="30" Name="GetSiteByUrl"><Parameters><Parameter Type="String">${utils_1.formatting.escapeXml(args.options.appCatalogUrl)}</Parameter></Parameters></Method><Property Id="34" ParentId="32" Name="RootWeb" /></ObjectPaths></Request>`
+                        data: `<Request AddExpandoFieldTypeSuffix="true" SchemaVersion="15.0.0.0" LibraryVersion="16.0.0.0" ApplicationName="${config_1.default.applicationName}" xmlns="http://schemas.microsoft.com/sharepoint/clientquery/2009"><Actions><ObjectPath Id="31" ObjectPathId="30" /><ObjectPath Id="33" ObjectPathId="32" /><ObjectPath Id="35" ObjectPathId="34" /><Method Name="RemoveStorageEntity" Id="36" ObjectPathId="34"><Parameters><Parameter Type="String">${formatting_1.formatting.escapeXml(args.options.key)}</Parameter></Parameters></Method></Actions><ObjectPaths><Constructor Id="30" TypeId="{268004ae-ef6b-4e9b-8425-127220d84719}" /><Method Id="32" ParentId="30" Name="GetSiteByUrl"><Parameters><Parameter Type="String">${formatting_1.formatting.escapeXml(args.options.appCatalogUrl)}</Parameter></Parameters></Method><Property Id="34" ParentId="32" Name="RootWeb" /></ObjectPaths></Request>`
                     };
                     const processQuery = yield request_1.default.post(requestOptions);
                     const json = JSON.parse(processQuery);
@@ -66,7 +68,7 @@ class SpoStorageEntityRemoveCommand extends SpoCommand_1.default {
                 yield removeTenantProperty();
             }
             else {
-                const result = yield cli_1.Cli.prompt({
+                const result = yield Cli_1.Cli.prompt({
                     type: 'confirm',
                     name: 'continue',
                     default: false,
@@ -94,7 +96,7 @@ _SpoStorageEntityRemoveCommand_instances = new WeakSet(), _SpoStorageEntityRemov
         option: '--confirm'
     });
 }, _SpoStorageEntityRemoveCommand_initValidators = function _SpoStorageEntityRemoveCommand_initValidators() {
-    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () { return utils_1.validation.isValidSharePointUrl(args.options.appCatalogUrl); }));
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () { return validation_1.validation.isValidSharePointUrl(args.options.appCatalogUrl); }));
 };
 module.exports = new SpoStorageEntityRemoveCommand();
 //# sourceMappingURL=storageentity-remove.js.map

package/dist/m365/spo/commands/storageentity/storageentity-set.js

@@ -17,7 +17,9 @@ var _SpoStorageEntitySetCommand_instances, _SpoStorageEntitySetCommand_initTelem
 Object.defineProperty(exports, "__esModule", { value: true });
 const config_1 = require("../../../../config");
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const formatting_1 = require("../../../../utils/formatting");
+const spo_1 = require("../../../../utils/spo");
+const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoStorageEntitySetCommand extends SpoCommand_1.default {
@@ -37,8 +39,8 @@ class SpoStorageEntitySetCommand extends SpoCommand_1.default {
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
             try {
-                const spoAdminUrl = yield utils_1.spo.getSpoAdminUrl(logger, this.debug);
-                const res = yield utils_1.spo.getRequestDigest(spoAdminUrl);
+                const spoAdminUrl = yield spo_1.spo.getSpoAdminUrl(logger, this.debug);
+                const res = yield spo_1.spo.getRequestDigest(spoAdminUrl);
                 if (this.verbose) {
                     logger.logToStderr(`Setting tenant property ${args.options.key} in ${args.options.appCatalogUrl}...`);
                 }
@@ -47,7 +49,7 @@ class SpoStorageEntitySetCommand extends SpoCommand_1.default {
                     headers: {
                         'X-RequestDigest': res.FormDigestValue
                     },
-                    data: `<Request AddExpandoFieldTypeSuffix="true" SchemaVersion="15.0.0.0" LibraryVersion="16.0.0.0" ApplicationName="${config_1.default.applicationName}" xmlns="http://schemas.microsoft.com/sharepoint/clientquery/2009"><Actions><ObjectPath Id="24" ObjectPathId="23" /><ObjectPath Id="26" ObjectPathId="25" /><ObjectPath Id="28" ObjectPathId="27" /><Method Name="SetStorageEntity" Id="29" ObjectPathId="27"><Parameters><Parameter Type="String">${utils_1.formatting.escapeXml(args.options.key)}</Parameter><Parameter Type="String">${utils_1.formatting.escapeXml(args.options.value)}</Parameter><Parameter Type="String">${utils_1.formatting.escapeXml(args.options.description || '')}</Parameter><Parameter Type="String">${utils_1.formatting.escapeXml(args.options.comment || '')}</Parameter></Parameters></Method></Actions><ObjectPaths><Constructor Id="23" TypeId="{268004ae-ef6b-4e9b-8425-127220d84719}" /><Method Id="25" ParentId="23" Name="GetSiteByUrl"><Parameters><Parameter Type="String">${utils_1.formatting.escapeXml(args.options.appCatalogUrl)}</Parameter></Parameters></Method><Property Id="27" ParentId="25" Name="RootWeb" /></ObjectPaths></Request>`
+                    data: `<Request AddExpandoFieldTypeSuffix="true" SchemaVersion="15.0.0.0" LibraryVersion="16.0.0.0" ApplicationName="${config_1.default.applicationName}" xmlns="http://schemas.microsoft.com/sharepoint/clientquery/2009"><Actions><ObjectPath Id="24" ObjectPathId="23" /><ObjectPath Id="26" ObjectPathId="25" /><ObjectPath Id="28" ObjectPathId="27" /><Method Name="SetStorageEntity" Id="29" ObjectPathId="27"><Parameters><Parameter Type="String">${formatting_1.formatting.escapeXml(args.options.key)}</Parameter><Parameter Type="String">${formatting_1.formatting.escapeXml(args.options.value)}</Parameter><Parameter Type="String">${formatting_1.formatting.escapeXml(args.options.description || '')}</Parameter><Parameter Type="String">${formatting_1.formatting.escapeXml(args.options.comment || '')}</Parameter></Parameters></Method></Actions><ObjectPaths><Constructor Id="23" TypeId="{268004ae-ef6b-4e9b-8425-127220d84719}" /><Method Id="25" ParentId="23" Name="GetSiteByUrl"><Parameters><Parameter Type="String">${formatting_1.formatting.escapeXml(args.options.appCatalogUrl)}</Parameter></Parameters></Method><Property Id="27" ParentId="25" Name="RootWeb" /></ObjectPaths></Request>`
                 };
                 const processQuery = yield request_1.default.post(requestOptions);
                 const json = JSON.parse(processQuery);
@@ -87,7 +89,7 @@ _SpoStorageEntitySetCommand_instances = new WeakSet(), _SpoStorageEntitySetComma
         option: '-c, --comment [comment]'
     });
 }, _SpoStorageEntitySetCommand_initValidators = function _SpoStorageEntitySetCommand_initValidators() {
-    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () { return utils_1.validation.isValidSharePointUrl(args.options.appCatalogUrl); }));
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () { return validation_1.validation.isValidSharePointUrl(args.options.appCatalogUrl); }));
 };
 module.exports = new SpoStorageEntitySetCommand();
 //# sourceMappingURL=storageentity-set.js.map

package/dist/m365/spo/commands/tenant/tenant-appcatalog-add.js

@@ -15,9 +15,9 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _SpoTenantAppCatalogAddCommand_instances, _SpoTenantAppCatalogAddCommand_initTelemetry, _SpoTenantAppCatalogAddCommand_initOptions, _SpoTenantAppCatalogAddCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
-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 SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 const spoSiteAddCommand = require("../site/site-add");
@@ -43,7 +43,7 @@ class SpoTenantAppCatalogAddCommand extends SpoCommand_1.default {
             if (this.verbose) {
                 logger.logToStderr('Checking for existing app catalog URL...');
             }
-            const spoTenantAppCatalogUrlGetCommandOutput = yield cli_1.Cli.executeCommandWithOutput(spoTenantAppCatalogUrlGetCommand, { options: { output: 'text', _: [] } });
+            const spoTenantAppCatalogUrlGetCommandOutput = yield Cli_1.Cli.executeCommandWithOutput(spoTenantAppCatalogUrlGetCommand, { options: { output: 'text', _: [] } });
             const appCatalogUrl = spoTenantAppCatalogUrlGetCommandOutput.stdout;
             if (!appCatalogUrl) {
                 if (this.verbose) {
@@ -74,7 +74,7 @@ class SpoTenantAppCatalogAddCommand extends SpoCommand_1.default {
                     _: []
                 }
             };
-            cli_1.Cli
+            Cli_1.Cli
                 .executeCommandWithOutput(spoSiteGetCommand, siteGetOptions)
                 .then(() => {
                 if (this.verbose) {
@@ -94,7 +94,7 @@ class SpoTenantAppCatalogAddCommand extends SpoCommand_1.default {
                     verbose: this.verbose,
                     debug: this.debug
                 };
-                cli_1.Cli
+                Cli_1.Cli
                     .executeCommand(spoSiteRemoveCommand, { options: Object.assign(Object.assign({}, siteRemoveOptions), { _: [] }) })
                     .then(() => resolve(), (err) => reject(err));
             }, (err) => {
@@ -126,7 +126,7 @@ class SpoTenantAppCatalogAddCommand extends SpoCommand_1.default {
             debug: this.debug,
             removeDeletedSite: false
         };
-        return cli_1.Cli.executeCommand(spoSiteAddCommand, { options: Object.assign(Object.assign({}, siteAddOptions), { _: [] }) });
+        return Cli_1.Cli.executeCommand(spoSiteAddCommand, { options: Object.assign(Object.assign({}, siteAddOptions), { _: [] }) });
     }
 }
 _SpoTenantAppCatalogAddCommand_instances = new WeakSet(), _SpoTenantAppCatalogAddCommand_initTelemetry = function _SpoTenantAppCatalogAddCommand_initTelemetry() {
@@ -150,7 +150,7 @@ _SpoTenantAppCatalogAddCommand_instances = new WeakSet(), _SpoTenantAppCatalogAd
     });
 }, _SpoTenantAppCatalogAddCommand_initValidators = function _SpoTenantAppCatalogAddCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        const isValidSharePointUrl = utils_1.validation.isValidSharePointUrl(args.options.url);
+        const isValidSharePointUrl = validation_1.validation.isValidSharePointUrl(args.options.url);
         if (isValidSharePointUrl !== true) {
             return isValidSharePointUrl;
         }

package/dist/m365/spo/commands/tenant/tenant-appcatalogurl-get.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 spo_1 = require("../../../../utils/spo");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoTenantAppCatalogUrlGetCommand extends SpoCommand_1.default {
@@ -23,7 +23,7 @@ class SpoTenantAppCatalogUrlGetCommand extends SpoCommand_1.default {
     commandAction(logger) {
         return __awaiter(this, void 0, void 0, function* () {
             try {
-                const spoUrl = yield utils_1.spo.getSpoUrl(logger, this.debug);
+                const spoUrl = yield spo_1.spo.getSpoUrl(logger, this.debug);
                 const requestOptions = {
                     url: `${spoUrl}/_api/SP_TenantSettings_Current`,
                     headers: {

package/dist/m365/spo/commands/tenant/tenant-recyclebinitem-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 SpoTenantRecycleBinItemListCommand extends SpoCommand_1.default {
@@ -27,8 +27,8 @@ class SpoTenantRecycleBinItemListCommand extends SpoCommand_1.default {
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
             try {
-                const spoAdminUrl = yield utils_1.spo.getSpoAdminUrl(logger, this.debug);
-                const res = yield utils_1.spo.getRequestDigest(spoAdminUrl);
+                const spoAdminUrl = yield spo_1.spo.getSpoAdminUrl(logger, this.debug);
+                const res = yield spo_1.spo.getRequestDigest(spoAdminUrl);
                 const requestOptions = {
                     url: `${spoAdminUrl}/_vti_bin/client.svc/ProcessQuery`,
                     headers: {